diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kaddressbook/kcmconfigs | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/kcmconfigs')
| -rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/kcmconfigs/kcmkabcustomfields.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index bbed600e8..e4c6e23da 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8cc428aa0..0a76b6d2c 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -72,6 +72,6 @@ TQString KCMKabCustomFields::applicationName() TQString KCMKabCustomFields::kabLocalDir() { TQStringList kabdirs = locateLocal("data", "kaddressbook/"); - return kabdirs.grep( TQRegExp( "^"+KGlobal::dirs()->localtdedir() ) ).first(); + return kabdirs.grep( TQRegExp( "^"+TDEGlobal::dirs()->localtdedir() ) ).first(); } |