Additional k => tde renaming and fixes

8 files changed, 54 insertions, 54 deletions

diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt
index a82b735fb..443a90220 100644
--- a/wizards/CMakeLists.txt
+++ b/wizards/CMakeLists.txt
@@ -143,7 +143,7 @@ if( WITH_KOLAB )
       kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc
       kolabkmailchanges.cpp
     LINK
-      kcalkolab-shared kabckolab-shared knoteskolab-shared
+      kcalkolab-shared tdeabckolab-shared knoteskolab-shared
       kpimidentities-shared
     DESTINATION ${PLUGIN_INSTALL_DIR} )
 
@@ -212,7 +212,7 @@ if( WITH_SCALIX )
     SOURCES
       scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc
       scalixkmailchanges.cpp
-    LINK kcalscalix-shared kabcscalix-shared kpimidentities-shared
+    LINK kcalscalix-shared tdeabcscalix-shared kpimidentities-shared
     DESTINATION ${PLUGIN_INSTALL_DIR} )
 
   tde_add_executable( scalixwizard
diff --git a/wizards/Makefile.am b/wizards/Makefile.am
index 0df70a16b..bdb4e29ee 100644
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
                          libscalixwizard.la
 
 
-groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \
                         libkolabwizard.la \
                         libexchangewizard.la \
@@ -29,7 +29,7 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp
 # Kolab
 libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \
-                           $(top_builddir)/tderesources/kolab/tdeabc/libkabckolab.la \
+                           $(top_builddir)/tderesources/kolab/tdeabc/libtdeabckolab.la \
                            $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \
                            $(top_builddir)/libkcal/libkcal.la \
                            $(top_builddir)/libtdepim/libtdepim.la \
@@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \
   kolabkmailchanges.cpp
 
 kolabwizard_LDADD = libkolabwizard.la $(LIB_TDEUI)
-kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kolabwizard_SOURCES = kolabmain.cpp
 
 # eGroupware
@@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libtdeab
                                 $(LIB_TDEUI)
 
 egroupwarewizard_LDADD = libegroupwarewizard.la
-egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 egroupwarewizard_SOURCES = egroupwaremain.cpp
 
 # SLOX
@@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \
                           $(top_builddir)/libtdepim/libtdepim.la
 
 sloxwizard_LDADD = libsloxwizard.la
-sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 sloxwizard_SOURCES = sloxmain.cpp
 
 # GroupWise
@@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tde
 
 
 groupwisewizard_LDADD = libgroupwisewizard.la
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 groupwisewizard_SOURCES = groupwisemain.cpp
 
 # Exchange
@@ -91,13 +91,13 @@ libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_n
                               $(top_builddir)/libtdepim/libtdepim.la
 
 exchangewizard_LDADD = libexchangewizard.la
-exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 exchangewizard_SOURCES = exchangemain.cpp
 
 # Scalix
 libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \
-                           $(top_builddir)/tderesources/scalix/tdeabc/libkabcscalix.la \
+                           $(top_builddir)/tderesources/scalix/tdeabc/libtdeabcscalix.la \
                            $(top_builddir)/libkcal/libkcal.la \
                            $(top_builddir)/libtdepim/libtdepim.la \
                            $(top_builddir)/libkpimidentities/libkpimidentities.la
@@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg
   scalixkmailchanges.cpp
 
 scalixwizard_LDADD = libscalixwizard.la $(LIB_TDEUI)
-scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 scalixwizard_SOURCES = scalixmain.cpp
 
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index fc4f68a12..647d1bf53 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -55,10 +55,10 @@ static TQString createURL( const TQString &server, bool useSSL, const TQString &
   return url.url();
 }
 
-class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change
+class CreateEGroupwareTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    CreateEGroupwareKabcResource()
+    CreateEGroupwareTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") )
     {
     }
@@ -82,10 +82,10 @@ class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change
 };
 
 // TODO: fix the i18n strings after freeze...
-class ChangeEGroupwareKabcResource : public TDEConfigPropagator::Change
+class ChangeEGroupwareTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    ChangeEGroupwareKabcResource( const TQString &identifier )
+    ChangeEGroupwareTdeabcResource( const TQString &identifier )
       : TDEConfigPropagator::Change( i18n("Create eGroupware Addressbook Resource") ),
         mIdentifier( identifier )
     {
@@ -273,16 +273,16 @@ class EGroupwarePropagator : public TDEConfigPropagator
         changes.append( new ChangeEGroupwareKcalResource( (*kcalIt)->identifier() ) );
       }
 
-      KRES::Manager<TDEABC::Resource> kabcManager( "contact" );
-      kabcManager.readConfig();
-      KRES::Manager<TDEABC::Resource>::Iterator kabcIt;
-      for ( kabcIt = kabcManager.begin(); kabcIt != kabcManager.end(); ++kabcIt ) {
-        if ( (*kabcIt)->type() == "xmlrpc" ) break;
+      KRES::Manager<TDEABC::Resource> tdeabcManager( "contact" );
+      tdeabcManager.readConfig();
+      KRES::Manager<TDEABC::Resource>::Iterator tdeabcIt;
+      for ( tdeabcIt = tdeabcManager.begin(); tdeabcIt != tdeabcManager.end(); ++tdeabcIt ) {
+        if ( (*tdeabcIt)->type() == "xmlrpc" ) break;
       }
-      if ( kabcIt == kabcManager.end() ) {
-        changes.append( new CreateEGroupwareKabcResource );
+      if ( tdeabcIt == tdeabcManager.end() ) {
+        changes.append( new CreateEGroupwareTdeabcResource );
       } else {
-        changes.append( new ChangeEGroupwareKabcResource( (*kabcIt)->identifier() ) );
+        changes.append( new ChangeEGroupwareTdeabcResource( (*tdeabcIt)->identifier() ) );
       }
 
       KRES::Manager<ResourceNotes> knotesManager( "notes" );
diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp
index 58ca94004..35c8fe3bc 100644
--- a/wizards/exchangewizard.cpp
+++ b/wizards/exchangewizard.cpp
@@ -107,10 +107,10 @@ class UpdateExchangeKcalResource : public TDEConfigPropagator::Change
     }
 };
 
-class CreateExchangeKabcResource : public TDEConfigPropagator::Change
+class CreateExchangeTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    CreateExchangeKabcResource()
+    CreateExchangeTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Create Exchange Addressbook Resource") )
     {
     }
@@ -130,15 +130,15 @@ class CreateExchangeKabcResource : public TDEConfigPropagator::Change
       m.add( r );
       m.writeConfig();
 
-      ExchangeConfig::self()->setKabcResource( r->identifier() );
+      ExchangeConfig::self()->setTdeabcResource( r->identifier() );
       #endif
     }
 };
 
-class UpdateExchangeKabcResource : public TDEConfigPropagator::Change
+class UpdateExchangeTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    UpdateExchangeKabcResource()
+    UpdateExchangeTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Update Exchange Addressbook Resource") )
     {
     }
@@ -153,7 +153,7 @@ class UpdateExchangeKabcResource : public TDEConfigPropagator::Change
 
       KRES::Manager<TDEABC::Resource>::Iterator it;
       for ( it = m.begin(); it != m.end(); ++it ) {
-        if ( (*it)->identifier() == ExchangeConfig::kabcResource() ) {
+        if ( (*it)->identifier() == ExchangeConfig::tdeabcResource() ) {
           TDEABC::ResourceExchange *r = static_cast<TDEABC::ResourceExchange *>( *it );
           r->prefs()->setUrl( url.url() );
           r->prefs()->setUser( ExchangeConfig::self()->user() );
@@ -208,14 +208,14 @@ class ExchangePropagator : public TDEConfigPropagator
         if ( (*it2)->type() == "exchange" ) break;
       }
       if ( it2 == m2.end() ) {
-        changes.append( new CreateExchangeKabcResource );
+        changes.append( new CreateExchangeTdeabcResource );
       } else {
-        if ( (*it2)->identifier() == ExchangeConfig::kabcResource() ) {
+        if ( (*it2)->identifier() == ExchangeConfig::tdeabcResource() ) {
           TDEABC::ExchangePrefs *prefs = static_cast<TDEABC::ResourceExchange *>( *it2 )->prefs();
           if ( prefs->url() != exchangeUrl() ||
                prefs->user() != ExchangeConfig::user() ||
                prefs->password() != ExchangeConfig::password() ) {
-            changes.append( new UpdateExchangeKabcResource );
+            changes.append( new UpdateExchangeTdeabcResource );
           }
         }
       }
diff --git a/wizards/groupwise.kcfg b/wizards/groupwise.kcfg
index 8885e0ecf..3f01eb1c8 100644
--- a/wizards/groupwise.kcfg
+++ b/wizards/groupwise.kcfg
@@ -52,8 +52,8 @@
     <entry key="KcalResource" type="String" >
       <label>Id of KCal resource</label>
     </entry>
-    <entry key="KabcResource" type="String" >
-      <label>Id of KABC resource</label>
+    <entry key="TdeabcResource" type="String" >
+      <label>Id of TDEABC resource</label>
     </entry>
     <entry key="KMailAccountId" type="Int">
       <label>Id of KMail account for receiving mail</label>
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 44a962925..4e8282917 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -109,10 +109,10 @@ class UpdateGroupwiseKcalResource : public TDEConfigPropagator::Change
     }
 };
 
-class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change
+class CreateGroupwiseTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    CreateGroupwiseKabcResource()
+    CreateGroupwiseTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Create GroupWise Addressbook Resource") )
     {
     }
@@ -134,14 +134,14 @@ class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change
       m.add( r );
       m.writeConfig();
 
-      GroupwiseConfig::self()->setKabcResource( r->identifier() );
+      GroupwiseConfig::self()->setTdeabcResource( r->identifier() );
     }
 };
 
-class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change
+class UpdateGroupwiseTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    UpdateGroupwiseKabcResource()
+    UpdateGroupwiseTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Update GroupWise Addressbook Resource") )
     {
     }
@@ -153,7 +153,7 @@ class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change
 
       KRES::Manager<TDEABC::Resource>::Iterator it;
       for ( it = m.begin(); it != m.end(); ++it ) {
-        if ( (*it)->identifier() == GroupwiseConfig::kabcResource() ) {
+        if ( (*it)->identifier() == GroupwiseConfig::tdeabcResource() ) {
           TDEABC::ResourceGroupwise *r = static_cast<TDEABC::ResourceGroupwise *>( *it );
           r->prefs()->setUrl( serverUrl() );
           r->prefs()->setUser( GroupwiseConfig::self()->user() );
@@ -228,14 +228,14 @@ class GroupwisePropagator : public TDEConfigPropagator
         if ( (*it2)->type() == "groupwise" ) break;
       }
       if ( it2 == m2.end() ) {
-        changes.append( new CreateGroupwiseKabcResource );
+        changes.append( new CreateGroupwiseTdeabcResource );
       } else {
-        if ( (*it2)->identifier() == GroupwiseConfig::kabcResource() ) {
+        if ( (*it2)->identifier() == GroupwiseConfig::tdeabcResource() ) {
           TDEABC::GroupwisePrefs *prefs = static_cast<TDEABC::ResourceGroupwise *>( *it2 )->prefs();
           if ( prefs->url() != serverUrl() ||
                prefs->user() != GroupwiseConfig::user() ||
                prefs->password() != GroupwiseConfig::password() ) {
-            changes.append( new UpdateGroupwiseKabcResource );
+            changes.append( new UpdateGroupwiseTdeabcResource );
           }
         }
       }
diff --git a/wizards/slox.kcfg b/wizards/slox.kcfg
index 4f27f8a3b..d47cf7404 100644
--- a/wizards/slox.kcfg
+++ b/wizards/slox.kcfg
@@ -35,8 +35,8 @@
     <entry name="KcalResource" type="String">
       <label>Id of KCal resource</label>
     </entry>
-    <entry name="KabcResource" type="String">
-      <label>Id of KABC resource</label>
+    <entry name="TdeabcResource" type="String">
+      <label>Id of TDEABC resource</label>
     </entry>
   </group>
 
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index 6107f75ce..7d8ccf321 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -108,10 +108,10 @@ class UpdateSloxKcalResource : public TDEConfigPropagator::Change
     }
 };
 
-class CreateSloxKabcResource : public TDEConfigPropagator::Change
+class CreateSloxTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    CreateSloxKabcResource()
+    CreateSloxTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Create SLOX Addressbook Resource") )
     {
     }
@@ -130,14 +130,14 @@ class CreateSloxKabcResource : public TDEConfigPropagator::Change
       m.add( r );
       m.writeConfig();
 
-      SloxConfig::self()->setKabcResource( r->identifier() );
+      SloxConfig::self()->setTdeabcResource( r->identifier() );
     }
 };
 
-class UpdateSloxKabcResource : public TDEConfigPropagator::Change
+class UpdateSloxTdeabcResource : public TDEConfigPropagator::Change
 {
   public:
-    UpdateSloxKabcResource()
+    UpdateSloxTdeabcResource()
       : TDEConfigPropagator::Change( i18n("Update SLOX Addressbook Resource") )
     {
     }
@@ -151,7 +151,7 @@ class UpdateSloxKabcResource : public TDEConfigPropagator::Change
 
       KRES::Manager<TDEABC::Resource>::Iterator it;
       for ( it = m.begin(); it != m.end(); ++it ) {
-        if ( (*it)->identifier() == SloxConfig::kabcResource() ) {
+        if ( (*it)->identifier() == SloxConfig::tdeabcResource() ) {
           TDEABC::ResourceSlox *r = static_cast<TDEABC::ResourceSlox *>( *it );
           r->prefs()->setUrl( url.url() );
           r->prefs()->setUser( SloxConfig::self()->user() );
@@ -205,14 +205,14 @@ class SloxPropagator : public TDEConfigPropagator
         if ( (*it2)->type() == "slox" ) break;
       }
       if ( it2 == m2.end() ) {
-        changes.append( new CreateSloxKabcResource );
+        changes.append( new CreateSloxTdeabcResource );
       } else {
-        if ( (*it2)->identifier() == SloxConfig::kabcResource() ) {
+        if ( (*it2)->identifier() == SloxConfig::tdeabcResource() ) {
           TDEABC::SloxPrefs *prefs = static_cast<TDEABC::ResourceSlox *>( *it2 )->prefs();
           if ( prefs->url() != sloxUrl() ||
                prefs->user() != SloxConfig::user() ||
                prefs->password() != SloxConfig::password() ) {
-            changes.append( new UpdateSloxKabcResource );
+            changes.append( new UpdateSloxTdeabcResource );
           }
         }
       }