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

---
 kcm_gtk/kcmgtk.cpp     | 2 +-
 kcm_gtk/kcmgtk.desktop | 2 +-
 src/qt_qt_wrapper.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 5cebe54..97c7aaf 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -41,7 +41,7 @@
 #include <ksqueezedtextlabel.h>
 #include <stdlib.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstyle.h>
 #include <tqheader.h>
 #include <klistview.h>
diff --git a/kcm_gtk/kcmgtk.desktop b/kcm_gtk/kcmgtk.desktop
index f2d7c91..e6ea442 100644
--- a/kcm_gtk/kcmgtk.desktop
+++ b/kcm_gtk/kcmgtk.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=GTK Styles and Fonts
 Comment=Control the style and fonts used by GTK applications
-Exec=kcmshell kcmgtk
+Exec=tdecmshell kcmgtk
 Terminal=false
 Icon=gnome_apps.png
 OnlyShowIn=TDE;
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 0a718af..e1d6873 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -22,7 +22,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #undef signals
 #include <gdk/gdkx.h>
-- 
cgit v1.2.3