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

18 files changed, 19 insertions, 19 deletions

diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 4e174cf44..71d6fdfdd 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -20,7 +20,7 @@
 #include <kiconeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index 53bd42767..a1ca8ebdd 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -14,7 +14,7 @@
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class B2Config: public TQObject
 {
diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h
index fcd9fbf23..a09ac1ab3 100644
--- a/twin/clients/default/config/config.h
+++ b/twin/clients/default/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 52fff00f3..938a9e06d 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -12,7 +12,7 @@
 
 #include "kdedefault.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
diff --git a/twin/clients/keramik/config/CMakeLists.txt b/twin/clients/keramik/config/CMakeLists.txt
index 7b5bdb339..6fce6dfaf 100644
--- a/twin/clients/keramik/config/CMakeLists.txt
+++ b/twin/clients/keramik/config/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### twin_keramik_config (module) ##############
 
 tde_add_kpart( twin_keramik_config AUTOMOC
-  SOURCES config.cpp keramikconfig.ui
+  SOURCES config.cpp keramitdeconfig.ui
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/twin/clients/keramik/config/Makefile.am b/twin/clients/keramik/config/Makefile.am
index 19ee4f27d..aa6014cf5 100644
--- a/twin/clients/keramik/config/Makefile.am
+++ b/twin/clients/keramik/config/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES                       = $(all_includes)
 
 kde_module_LTLIBRARIES         = twin_keramik_config.la
 
-twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+twin_keramik_config_la_SOURCES = config.cpp keramitdeconfig.ui
 twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 twin_keramik_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES                    = AUTO
-noinst_HEADERS                 = config.h keramikconfig.h
+noinst_HEADERS                 = config.h keramitdeconfig.h
 
 lnkdir                         = $(kde_datadir)/twin
 
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 4138fe958..7907f28e5 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -25,9 +25,9 @@
 #ifndef __KWIN_KERAMIK_CONFIG_H
 #define __KWIN_KERAMIK_CONFIG_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-#include "keramikconfig.h"
+#include "keramitdeconfig.h"
 
 class KeramikConfig: public TQObject
 {
diff --git a/twin/clients/keramik/config/keramikconfig.ui b/twin/clients/keramik/config/keramitdeconfig.ui
index dda8d5b5f..dda8d5b5f 100644
--- a/twin/clients/keramik/config/keramikconfig.ui
+++ b/twin/clients/keramik/config/keramitdeconfig.ui
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 3825a851a..d90291ad2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 33b71994e..d2bf002ed 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,4 +1,4 @@
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kwmthemeclient.h"
 #include <kglobal.h>
 #include <tqlayout.h>
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 58d54a118..0f91d9005 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -6,7 +6,7 @@
  * Copyright (c) 2003 Luciano Montanaro <[email protected]>
  */
 
-#include <kconfig.h> // up here to avoid X11 header conflict :P
+#include <tdeconfig.h> // up here to avoid X11 header conflict :P
 #include "laptopclient.h"
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 4c87829be..8eefe484d 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -1,7 +1,7 @@
 // Melchior FRANZ  <[email protected]>	-- 2001-04-22
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 8fbd1e38c..f58855fe3 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -1,7 +1,7 @@
 // Daniel M. DULEY <[email protected]>               original work
 // Melchior FRANZ  <[email protected]>   configuration options
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqlayout.h>
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index d79800d4a..4477fdd02 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -27,7 +27,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 2072302d7..5e03b7a51 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index d334930c8..f68b9ef27 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqvbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class QuartzConfig: public TQObject
 {
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 09d3ccf52..00aee9c58 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -14,7 +14,7 @@
  *
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdrawutil.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 94bf98f35..53ec5a4df 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "Web.h"
 #include "WebButton.h"