From 533bad2a1503973aaf8186691422c2eda91d02d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 3 Sep 2013 20:02:55 +0200
Subject: Additional k => tde renaming and fixes

---
 kaddressbook/kcmconfigs/Makefile.am         | 4 ++--
 kaddressbook/kcmconfigs/addresseewidget.cpp | 4 ++--
 kaddressbook/kcmconfigs/kabconfigwidget.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kaddressbook/kcmconfigs')

diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am
index d066dfed..d7659639 100644
--- a/kaddressbook/kcmconfigs/Makefile.am
+++ b/kaddressbook/kcmconfigs/Makefile.am
@@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \
                            extensionconfigdialog.cpp addresseewidget.cpp
 kcm_kabconfig_la_LDFLAGS  = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                             -avoid-version -no-undefined
-kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
+kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \
                           $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
                           $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/kaddressbook/common/libkabcommon.la
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
                                ldapoptionswidget.cpp
 kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                -avoid-version -no-undefined
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
+kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
 
 kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
 kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 226bb309..ad1364f5 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget()
 
 void AddresseeWidget::restoreSettings()
 {
-  TDEConfig config( "kabcrc" );
+  TDEConfig config( "tdeabcrc" );
   config.setGroup( "General" );
 
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
@@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings()
 
 void AddresseeWidget::saveSettings()
 {
-  TDEConfig config( "kabcrc" );
+  TDEConfig config( "tdeabcrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 83e0bc89..b41bdf84 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 );
 
-  TDEConfig config( "kabcrc", false, false );
+  TDEConfig config( "tdeabcrc", 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();
 
-  TDEConfig config( "kabcrc", false, false );
+  TDEConfig config( "tdeabcrc", false, false );
   config.setGroup( "General" );
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
-- 
cgit v1.2.3