From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 twin/kcmtwin/twindecoration/preview.cpp            | 2 +-
 twin/kcmtwin/twindecoration/twindecoration.desktop | 2 +-
 twin/kcmtwin/twindecoration/twindecoration.h       | 2 +-
 twin/kcmtwin/twinoptions/main.cpp                  | 2 +-
 twin/kcmtwin/twinoptions/mouse.cpp                 | 2 +-
 twin/kcmtwin/twinoptions/twinactions.desktop       | 2 +-
 twin/kcmtwin/twinoptions/twinadvanced.desktop      | 2 +-
 twin/kcmtwin/twinoptions/twinfocus.desktop         | 2 +-
 twin/kcmtwin/twinoptions/twinmoving.desktop        | 2 +-
 twin/kcmtwin/twinoptions/twinoptions.desktop       | 2 +-
 twin/kcmtwin/twinoptions/twintranslucency.desktop  | 2 +-
 twin/kcmtwin/twinoptions/windows.cpp               | 2 +-
 twin/kcmtwin/twinrules/kcm.h                       | 2 +-
 twin/kcmtwin/twinrules/main.cpp                    | 2 +-
 twin/kcmtwin/twinrules/ruleslist.cpp               | 2 +-
 twin/kcmtwin/twinrules/twinrules.desktop           | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'twin/kcmtwin')

diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 8c12f9048..238bb2498 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
diff --git a/twin/kcmtwin/twindecoration/twindecoration.desktop b/twin/kcmtwin/twindecoration/twindecoration.desktop
index cc9c29084..f036b36ab 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.desktop
+++ b/twin/kcmtwin/twindecoration/twindecoration.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell twindecoration
+Exec=tdecmshell twindecoration
 Icon=kcmkwm
 Type=Application
 DocPath=kcontrol/twindecoration/index.html
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 49af27d71..cf968df1d 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -33,7 +33,7 @@
 #include <tdecmodule.h>
 #include <dcopobject.h>
 #include <buttons.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klibloader.h>
 
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 0743ca31f..aac2436d1 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 5c1e22d35..41a635c51 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kseparator.h>
diff --git a/twin/kcmtwin/twinoptions/twinactions.desktop b/twin/kcmtwin/twinoptions/twinactions.desktop
index bde13343d..b6cacad48 100644
--- a/twin/kcmtwin/twinoptions/twinactions.desktop
+++ b/twin/kcmtwin/twinoptions/twinactions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinactions
+Exec=tdecmshell twinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinadvanced.desktop b/twin/kcmtwin/twinoptions/twinadvanced.desktop
index 529a806c6..1929d330f 100644
--- a/twin/kcmtwin/twinoptions/twinadvanced.desktop
+++ b/twin/kcmtwin/twinoptions/twinadvanced.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinadvanced
+Exec=tdecmshell twinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinfocus.desktop b/twin/kcmtwin/twinoptions/twinfocus.desktop
index 5db9181e1..530d09206 100644
--- a/twin/kcmtwin/twinoptions/twinfocus.desktop
+++ b/twin/kcmtwin/twinoptions/twinfocus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinfocus
+Exec=tdecmshell twinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinmoving.desktop b/twin/kcmtwin/twinoptions/twinmoving.desktop
index 1845b682e..144406d97 100644
--- a/twin/kcmtwin/twinoptions/twinmoving.desktop
+++ b/twin/kcmtwin/twinoptions/twinmoving.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinmoving
+Exec=tdecmshell twinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinoptions.desktop b/twin/kcmtwin/twinoptions/twinoptions.desktop
index 2f1eab87c..1fc2e1a95 100644
--- a/twin/kcmtwin/twinoptions/twinoptions.desktop
+++ b/twin/kcmtwin/twinoptions/twinoptions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinoptions
+Exec=tdecmshell twinoptions
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twintranslucency.desktop b/twin/kcmtwin/twinoptions/twintranslucency.desktop
index 164fe8d7a..3ff002dac 100644
--- a/twin/kcmtwin/twinoptions/twintranslucency.desktop
+++ b/twin/kcmtwin/twinoptions/twintranslucency.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twintranslucency
+Exec=tdecmshell twintranslucency
 DocPath=kcontrol/windowmanagement/index.html#action-translucency
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 41a593388..991b425b6 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -37,7 +37,7 @@
 #include <kactivelabel.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kapplication.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 33d7c2664..5e89a7773 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -21,7 +21,7 @@
 #define __KCM_H__
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 class TDEAboutData;
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 4b36bd795..78bec0302 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index c7634c3ac..2f7c4582a 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -22,7 +22,7 @@
 #include <kpushbutton.h>
 #include <assert.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ruleswidget.h"
 
diff --git a/twin/kcmtwin/twinrules/twinrules.desktop b/twin/kcmtwin/twinrules/twinrules.desktop
index eba872171..061609041 100644
--- a/twin/kcmtwin/twinrules/twinrules.desktop
+++ b/twin/kcmtwin/twinrules/twinrules.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinrules
+Exec=tdecmshell twinrules
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
-- 
cgit v1.2.1