Browse Source

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

pull/1/head
Timothy Pearson 10 years ago
parent
commit
e72ae02c24
  1. 6
      keep/app/keepmainwindow.cpp
  2. 2
      keep/common/backupconfig.cpp
  3. 2
      keep/common/backupconfig.h

6
keep/app/keepmainwindow.cpp

@ -154,11 +154,11 @@ void KeepMainWindow::slotConfigure()
//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
//another one
if ( KConfigDialog::showDialog( "settings" ) )
if ( TDEConfigDialog::showDialog( "settings" ) )
return;
//KConfigDialog didn't find an instance of this dialog, so lets create it :
KConfigDialog* dialog = new KConfigDialog( this, "settings", KeepSettings::self() );
//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", KeepSettings::self() );
GeneralConfigView* generalConfigView = new GeneralConfigView( 0, "generalConfigView" );
dialog->addPage( generalConfigView, i18n("General"), "general" );

2
keep/common/backupconfig.cpp

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

2
keep/common/backupconfig.h

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

Loading…
Cancel
Save