summaryrefslogtreecommitdiffstats
path: root/kmail/configuredialog_p.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/configuredialog_p.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/configuredialog_p.cpp')
-rw-r--r--kmail/configuredialog_p.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index daa326d2e..c430171ef 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -333,7 +333,7 @@ void ProfileDialog::setup() {
TQListViewItem * listItem = 0;
for ( TQStringList::const_iterator it = mProfileList.begin() ;
it != mProfileList.end() ; ++it ) {
- KConfig profile( *it, true /* read-only */, false /* no KDE global */ );
+ TDEConfig profile( *it, true /* read-only */, false /* no KDE global */ );
profile.setGroup("KMail Profile");
TQString name = profile.readEntry( "Name" );
if ( name.isEmpty() ) {
@@ -358,7 +358,7 @@ void ProfileDialog::slotOk() {
assert( (unsigned int)index < mProfileList.count() );
- KConfig profile( *mProfileList.at(index), true, false );
+ TDEConfig profile( *mProfileList.at(index), true, false );
emit profileSelected( &profile );
KDialogBase::slotOk();
}
@@ -385,11 +385,11 @@ void ConfigModuleWithTabs::load() {
if ( tab )
tab->load();
}
- KCModule::load();
+ TDECModule::load();
}
void ConfigModuleWithTabs::save() {
- KCModule::save();
+ TDECModule::save();
for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
if ( tab )
@@ -401,10 +401,10 @@ void ConfigModuleWithTabs::defaults() {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->currentPage() );
if ( tab )
tab->defaults();
- KCModule::defaults();
+ TDECModule::defaults();
}
-void ConfigModuleWithTabs::installProfile(KConfig * /* profile */ ) {
+void ConfigModuleWithTabs::installProfile(TDEConfig * /* profile */ ) {
for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
if ( tab )
@@ -421,7 +421,7 @@ void ConfigModuleTab::load()
void ConfigModuleTab::defaults()
{
// reset settings which are available via GlobalSettings to their defaults
- // (stolen from KConfigDialogManager::updateWidgetsDefault())
+ // (stolen from TDEConfigDialogManager::updateWidgetsDefault())
const bool bUseDefaults = GlobalSettings::self()->useDefaults( true );
doLoadFromGlobalSettings();
GlobalSettings::self()->useDefaults( bUseDefaults );