Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 2a5a604bb4
commit e72ae02c24

@ -154,11 +154,11 @@ void KeepMainWindow::slotConfigure()
//An instance of your dialog could be already created and could be cached, //An instance of your dialog could be already created and could be cached,
//in which case you want to display the cached dialog instead of creating //in which case you want to display the cached dialog instead of creating
//another one //another one
if ( KConfigDialog::showDialog( "settings" ) ) if ( TDEConfigDialog::showDialog( "settings" ) )
return; return;
//KConfigDialog didn't find an instance of this dialog, so lets create it : //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
KConfigDialog* dialog = new KConfigDialog( this, "settings", KeepSettings::self() ); TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", KeepSettings::self() );
GeneralConfigView* generalConfigView = new GeneralConfigView( 0, "generalConfigView" ); GeneralConfigView* generalConfigView = new GeneralConfigView( 0, "generalConfigView" );
dialog->addPage( generalConfigView, i18n("General"), "general" ); dialog->addPage( generalConfigView, i18n("General"), "general" );

@ -22,7 +22,7 @@
BackupConfig::BackupConfig() BackupConfig::BackupConfig()
{ {
m_config = new KConfig( "keepbackuplist.rc", false ); m_config = new TDEConfig( "keepbackuplist.rc", false );
} }
BackupConfig::~BackupConfig() BackupConfig::~BackupConfig()

@ -36,7 +36,7 @@ public:
void setBackupList(TQValueList<Backup> backups); void setBackupList(TQValueList<Backup> backups);
private: private:
KConfig *m_config; TDEConfig *m_config;
int generateId(); int generateId();
}; };

Loading…
Cancel
Save