Rename a number of libraries and executables to avoid conflicts with KDE4

9 files changed, 69 insertions, 69 deletions

diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt
index 7f2dd2dfc..c437ff6f4 100644
--- a/wizards/CMakeLists.txt
+++ b/wizards/CMakeLists.txt
@@ -22,7 +22,7 @@ tde_import( ktnef )
 tde_import( libkcal )
 tde_import( libtdepim )
 tde_import( knotes )
-tde_import( kresources )
+tde_import( tderesources )
 
 if( WITH_KOLAB OR WITH_GROUPWISE OR WITH_SCALIX )
   tde_import( libtdenetwork )
@@ -38,7 +38,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libtdepim
   ${CMAKE_SOURCE_DIR}/certmanager/lib
   ${CMAKE_SOURCE_DIR}/knotes
-  ${CMAKE_SOURCE_DIR}/kresources/lib
+  ${CMAKE_SOURCE_DIR}/tderesources/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -79,14 +79,14 @@ if( WITH_EGROUPWARE )
 
   install( FILES egroupware.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
-  process_kcfg( egroupwarewizard.cpp kabc_egroupwareprefs.h kresources/egroupware
-    kresources_kabc_egroupware.kcfg kabc_egroupwareprefs.kcfgc )
+  process_kcfg( egroupwarewizard.cpp kabc_egroupwareprefs.h tderesources/egroupware
+    tderesources_kabc_egroupware.kcfg kabc_egroupwareprefs.kcfgc )
 
-  process_kcfg( egroupwarewizard.cpp kcal_egroupwareprefs.h kresources/egroupware
-    kresources_kcal_egroupware.kcfg kcal_egroupwareprefs.kcfgc )
+  process_kcfg( egroupwarewizard.cpp kcal_egroupwareprefs.h tderesources/egroupware
+    tderesources_kcal_egroupware.kcfg kcal_egroupwareprefs.kcfgc )
 
-  process_kcfg( egroupwarewizard.cpp knotes_egroupwareprefs.h kresources/egroupware
-    kresources_knotes_egroupware.kcfg knotes_egroupwareprefs.kcfgc )
+  process_kcfg( egroupwarewizard.cpp knotes_egroupwareprefs.h tderesources/egroupware
+    tderesources_knotes_egroupware.kcfg knotes_egroupwareprefs.kcfgc )
 
   tde_add_library( egroupwarewizard SHARED NO_EXPORT
     SOURCES
@@ -110,11 +110,11 @@ if( WITH_SLOX )
 
   install( FILES slox.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
-  process_kcfg( sloxwizard.cpp kabcsloxprefs.h kresources/slox
-    kresources_kabc_slox.kcfg kabcsloxprefs.kcfgc )
+  process_kcfg( sloxwizard.cpp kabcsloxprefs.h tderesources/slox
+    tderesources_kabc_slox.kcfg kabcsloxprefs.kcfgc )
 
-  process_kcfg( sloxwizard.cpp kcalsloxprefs.h kresources/slox
-    kresources_kcal_slox.kcfg kcalsloxprefs.kcfgc )
+  process_kcfg( sloxwizard.cpp kcalsloxprefs.h tderesources/slox
+    tderesources_kcal_slox.kcfg kcalsloxprefs.kcfgc )
 
   tde_add_library( sloxwizard SHARED NO_EXPORT
     SOURCES
@@ -182,11 +182,11 @@ if( WITH_GROUPWISE )
 
   install( FILES groupwise.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
-  process_kcfg( groupwisewizard.cpp kcal_groupwiseprefsbase.h kresources/groupwise
-    kresources_kcal_groupwise.kcfg kcal_groupwiseprefsbase.kcfgc )
+  process_kcfg( groupwisewizard.cpp kcal_groupwiseprefsbase.h tderesources/groupwise
+    tderesources_kcal_groupwise.kcfg kcal_groupwiseprefsbase.kcfgc )
 
-  process_kcfg( groupwisewizard.cpp kabc_groupwiseprefs.h kresources/groupwise
-    kresources_kabc_groupwise.kcfg kabc_groupwiseprefs.kcfgc )
+  process_kcfg( groupwisewizard.cpp kabc_groupwiseprefs.h tderesources/groupwise
+    tderesources_kabc_groupwise.kcfg kabc_groupwiseprefs.kcfgc )
 
   tde_add_library( groupwisewizard SHARED AUTOMOC NO_EXPORT
     SOURCES
diff --git a/wizards/Makefile.am b/wizards/Makefile.am
index 3447f4ea7..5faa267ae 100644
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@@ -1,12 +1,12 @@
 METASOURCES = AUTO
 
 INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \
-           -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \
+           -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) \
            -I$(top_srcdir)/knotes \
            -I$(top_srcdir)/certmanager/lib \
-            -I$(top_builddir)/kresources/groupwise \
-           -I$(top_builddir)/kresources/lib \
-           -I$(top_srcdir)/kresources/lib \
+            -I$(top_builddir)/tderesources/groupwise \
+           -I$(top_builddir)/tderesources/lib \
+           -I$(top_srcdir)/tderesources/lib \
            $(all_includes)
 
 bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
@@ -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) -lktexteditor
+groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_TDEUI) \
                         libkolabwizard.la \
                         libexchangewizard.la \
@@ -28,9 +28,9 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp
 
 # Kolab
 libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
-libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la \
-                           $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \
-                           $(top_builddir)/kresources/kolab/knotes/libknoteskolab.la \
+libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \
+                           $(top_builddir)/tderesources/kolab/kabc/libkabckolab.la \
+                           $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \
                            $(top_builddir)/libkcal/libkcal.la \
                            $(top_builddir)/libtdepim/libtdepim.la \
                            $(top_builddir)/libkpimidentities/libkpimidentities.la
@@ -39,65 +39,65 @@ 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) -lktexteditor
+kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kolabwizard_SOURCES = kolabmain.cpp
 
 # eGroupware
 libegroupwarewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libegroupwarewizard_la_SOURCES = egroupwarewizard.cpp egroupwareconfig.kcfgc
-libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xmlrpc.la \
-                                $(top_builddir)/kresources/egroupware/libkcal_xmlrpc.la \
-                                $(top_builddir)/kresources/egroupware/libknotes_xmlrpc.la \
+libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libkabc_xmlrpc.la \
+                                $(top_builddir)/tderesources/egroupware/libkcal_xmlrpc.la \
+                                $(top_builddir)/tderesources/egroupware/libknotes_xmlrpc.la \
                                 $(top_builddir)/libkcal/libkcal.la \
                                 $(top_builddir)/libtdepim/libtdepim.la \
                                 $(LIB_TDEUI)
 
 egroupwarewizard_LDADD = libegroupwarewizard.la
-egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 egroupwarewizard_SOURCES = egroupwaremain.cpp
 
 # SLOX
 libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc
-libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \
-                          $(top_builddir)/kresources/slox/libkabc_slox.la \
+libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \
+                          $(top_builddir)/tderesources/slox/libkabc_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) -lktexteditor
+sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 sloxwizard_SOURCES = sloxmain.cpp
 
 # GroupWise
 libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \
   kmailchanges.cpp
-libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \
-                          $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \
+libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_groupwise.la \
+                          $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \
                           $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/libkpimidentities/libkpimidentities.la
-libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \
-                                      $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h
+libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/kabc_groupwiseprefs.h \
+                                      $(top_builddir)/tderesources/groupwise/kcal_groupwiseprefsbase.h
 
 
 groupwisewizard_LDADD = libgroupwisewizard.la
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 groupwisewizard_SOURCES = groupwisemain.cpp
 
 # Exchange
 libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libexchangewizard_la_SOURCES = exchangewizard.cpp
-libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \
-                              $(top_builddir)/kresources/newexchange/libkabc_newexchange.la \
+libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_newexchange.la \
+                              $(top_builddir)/tderesources/newexchange/libkabc_newexchange.la \
                               $(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) -lktexteditor
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 exchangewizard_SOURCES = exchangemain.cpp
 
 # Scalix
 libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
-libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \
-                           $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \
+libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \
+                           $(top_builddir)/tderesources/scalix/kabc/libkabcscalix.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) -lktexteditor
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 scalixwizard_SOURCES = scalixmain.cpp
 
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \
@@ -117,8 +117,8 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot
 
-egroupwarewizard.lo: ../kresources/egroupware/kabc_egroupwareprefs.h ../kresources/egroupware/kcal_egroupwareprefs.h ../kresources/egroupware/knotes_egroupwareprefs.h
-exchangewizard.lo: ../kresources/lib/kresources_groupwareprefs.h
-sloxwizard.lo: ../kresources/slox/kabcsloxprefs.h ../kresources/slox/kcalsloxprefs.h
+egroupwarewizard.lo: ../tderesources/egroupware/kabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h
+exchangewizard.lo: ../tderesources/lib/tderesources_groupwareprefs.h
+sloxwizard.lo: ../tderesources/slox/kabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h
 
 xdg_apps_DATA = groupwarewizard.desktop
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index d644d0e4b..843a20596 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -21,12 +21,12 @@
 #include "egroupwarewizard.h"
 #include "egroupwareconfig.h"
 
-#include "kresources/egroupware/kabc_egroupwareprefs.h"
-#include "kresources/egroupware/kabc_resourcexmlrpc.h"
-#include "kresources/egroupware/kcal_egroupwareprefs.h"
-#include "kresources/egroupware/kcal_resourcexmlrpc.h"
-#include "kresources/egroupware/knotes_egroupwareprefs.h"
-#include "kresources/egroupware/knotes_resourcexmlrpc.h"
+#include "tderesources/egroupware/kabc_egroupwareprefs.h"
+#include "tderesources/egroupware/kabc_resourcexmlrpc.h"
+#include "tderesources/egroupware/kcal_egroupwareprefs.h"
+#include "tderesources/egroupware/kcal_resourcexmlrpc.h"
+#include "tderesources/egroupware/knotes_egroupwareprefs.h"
+#include "tderesources/egroupware/knotes_resourcexmlrpc.h"
 
 #include <libkcal/resourcecalendar.h>
 
diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp
index e243b2e22..258d0a54c 100644
--- a/wizards/exchangewizard.cpp
+++ b/wizards/exchangewizard.cpp
@@ -20,10 +20,10 @@
 
 #include "exchangewizard.h"
 
-#include "kresources/newexchange/kabc_resourceexchange.h"
-#include "kresources/newexchange/kcal_resourceexchange.h"
+#include "tderesources/newexchange/kabc_resourceexchange.h"
+#include "tderesources/newexchange/kcal_resourceexchange.h"
 
-#include "kresources/lib/folderconfig.h"
+#include "tderesources/lib/folderconfig.h"
 
 #include <libkcal/resourcecalendar.h>
 
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index ecd472c8c..583615b3f 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -23,10 +23,10 @@
 #include "groupwiseconfig.h"
 #include "kmailchanges.h"
 
-#include "kresources/groupwise/kabc_groupwiseprefs.h"
-#include "kresources/groupwise/kabc_resourcegroupwise.h"
-#include "kresources/groupwise/kcal_groupwiseprefsbase.h"
-#include "kresources/groupwise/kcal_resourcegroupwise.h"
+#include "tderesources/groupwise/kabc_groupwiseprefs.h"
+#include "tderesources/groupwise/kabc_resourcegroupwise.h"
+#include "tderesources/groupwise/kcal_groupwiseprefsbase.h"
+#include "tderesources/groupwise/kcal_resourcegroupwise.h"
 
 #include <libkcal/resourcecalendar.h>
 #include <libemailfunctions/email.h>
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index abcd57d44..387e03eb3 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -30,7 +30,7 @@
 #include <identity.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 using namespace KWallet;
 
 static const char* s_folderContentsType[] = {
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index a35493841..b0002a508 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -25,9 +25,9 @@
 
 #include "kolabkmailchanges.h"
 
-#include "kresources/kolab/kcal/resourcekolab.h"
-#include "kresources/kolab/kabc/resourcekolab.h"
-#include "kresources/kolab/knotes/resourcekolab.h"
+#include "tderesources/kolab/kcal/resourcekolab.h"
+#include "tderesources/kolab/kabc/resourcekolab.h"
+#include "tderesources/kolab/knotes/resourcekolab.h"
 
 #include <libkcal/resourcecalendar.h>
 #include <kabc/resource.h>
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index f6acd0e51..dc8c5e038 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -25,8 +25,8 @@
 
 #include "scalixkmailchanges.h"
 
-#include "kresources/scalix/kcal/resourcescalix.h"
-#include "kresources/scalix/kabc/resourcescalix.h"
+#include "tderesources/scalix/kcal/resourcescalix.h"
+#include "tderesources/scalix/kabc/resourcescalix.h"
 
 #include <libkcal/resourcecalendar.h>
 #include <kabc/resource.h>
diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp
index 9cdd5538b..250f76a45 100644
--- a/wizards/sloxwizard.cpp
+++ b/wizards/sloxwizard.cpp
@@ -21,10 +21,10 @@
 #include "sloxwizard.h"
 #include "sloxconfig.h"
 
-#include "kresources/slox/kabcsloxprefs.h"
-#include "kresources/slox/kabcresourceslox.h"
-#include "kresources/slox/kcalsloxprefs.h"
-#include "kresources/slox/kcalresourceslox.h"
+#include "tderesources/slox/kabcsloxprefs.h"
+#include "tderesources/slox/kabcresourceslox.h"
+#include "tderesources/slox/kcalsloxprefs.h"
+#include "tderesources/slox/kcalresourceslox.h"
 
 #include <libkcal/resourcecalendar.h>