summaryrefslogtreecommitdiffstats
path: root/kaddressbook/kcmconfigs
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 /kaddressbook/kcmconfigs
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/kcmconfigs')
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp8
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.cpp2
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.h4
-rw-r--r--kaddressbook/kcmconfigs/kabconfig.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kabcustomfields.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kabldapconfig.desktop2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabcustomfields.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.h2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp8
13 files changed, 23 insertions, 23 deletions
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 80af9227..6bbc45be 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,28 +169,28 @@ AddresseeWidget::~AddresseeWidget()
void AddresseeWidget::restoreSettings()
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
- KConfig cfg( "kaddressbookrc" );
+ TDEConfig cfg( "kaddressbookrc" );
cfg.setGroup( "General" );
mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
}
void AddresseeWidget::saveSettings()
{
- KConfig config( "kabcrc" );
+ TDEConfig config( "kabcrc" );
config.setGroup( "General" );
config.writeEntry( "Prefixes", mPrefix->nameParts() );
config.writeEntry( "Inclusions", mInclusion->nameParts() );
config.writeEntry( "Suffixes", mSuffix->nameParts() );
- KConfig cfg( "kaddressbookrc" );
+ TDEConfig cfg( "kaddressbookrc" );
cfg.setGroup( "General" );
cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 97c8d0b2..5bdec2f8 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -29,7 +29,7 @@
#include "extensionconfigdialog.h"
#include "extensionwidget.h"
-ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
name, true, true ), mWidget( 0 ), mConfig( config )
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 93a3c850..0aa97f74 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -38,7 +38,7 @@ class ExtensionConfigDialog : public KDialogBase
public:
- ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
TQWidget *parent, const char *name = 0 );
~ExtensionConfigDialog();
@@ -47,7 +47,7 @@ class ExtensionConfigDialog : public KDialogBase
private:
KAB::ConfigureWidget *mWidget;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
#endif
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index fdf752b0..fa84b328 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kaddressbook
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4c6e23d..18cb1a90 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
- KConfig config( "kabcrc", false, false );
+ TDEConfig config( "kabcrc", false, false );
config.setGroup( "General" );
mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
KABPrefs::instance()->writeConfig();
- KConfig config( "kabcrc", false, false );
+ TDEConfig config( "kabcrc", false, false );
config.setGroup( "General" );
config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 2806171c..c9cd4742 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=dlgedit
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 321f9c81..33eb263e 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=find
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 296f7955..8f3bb5e5 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -35,13 +35,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
return new KCMKabConfig( parent, "kcmkabconfig" );
}
}
KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index ceadd6c9..c920d409 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -28,7 +28,7 @@
class KABConfigWidget;
-class KCMKabConfig : public KCModule
+class KCMKabConfig : public TDECModule
{
Q_OBJECT
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 0a76b6d2..dcbcd2c5 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -33,7 +33,7 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
}
}
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 66fcde2f..ba512b63 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -36,13 +36,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
}
}
KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 0325c88e..8539c515 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -30,7 +30,7 @@
class LDAPOptionsWidget;
-class KCMKabLdapConfig : public KCModule
+class KCMKabLdapConfig : public TDECModule
{
Q_OBJECT
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 92eda991..0f33eca6 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -197,8 +197,8 @@ void LDAPOptionsWidget::slotMoveDown()
void LDAPOptionsWidget::restoreSettings()
{
mHostListView->clear();
- KConfig *config = KPIM::LdapSearch::config();
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfig *config = KPIM::LdapSearch::config();
+ TDEConfigGroupSaver saver( config, "LDAP" );
TQString host;
@@ -222,10 +222,10 @@ void LDAPOptionsWidget::restoreSettings()
void LDAPOptionsWidget::saveSettings()
{
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->deleteGroup( "LDAP" );
- KConfigGroupSaver saver( config, "LDAP" );
+ TDEConfigGroupSaver saver( config, "LDAP" );
uint selected = 0; uint unselected = 0;
TQListViewItemIterator it( mHostListView );