summaryrefslogtreecommitdiffstats
path: root/kcm_gtk
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:09:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:09:57 -0600
commit73e73cc7fdbbbf0307a91edc237b4c521ebe272d (patch)
tree05aee6864bc323e47b27860695637405b68d3c3a /kcm_gtk
parent8f88fbd71dfcee8eaddcf466580f55d4174eb7cb (diff)
downloadgtk-qt-engine-73e73cc7fdbbbf0307a91edc237b4c521ebe272d.tar.gz
gtk-qt-engine-73e73cc7fdbbbf0307a91edc237b4c521ebe272d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcm_gtk')
-rw-r--r--kcm_gtk/kcmgtk.cpp6
-rw-r--r--kcm_gtk/mozillaprofile.ui2
2 files changed, 4 insertions, 4 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 687e351..e42c8ef 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
#include <kglobal.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kiconloader.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -36,7 +36,7 @@
#include <tqlabel.h>
#include <kurllabel.h>
#include <kapplication.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <tqspinbox.h>
#include <ksqueezedtextlabel.h>
#include <stdlib.h>
@@ -44,7 +44,7 @@
#include <tdeconfig.h>
#include <tqstyle.h>
#include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqmessagebox.h>
#include <tqcheckbox.h>
#include <kglobal.h>
diff --git a/kcm_gtk/mozillaprofile.ui b/kcm_gtk/mozillaprofile.ui
index 26a8066..f41ae1b 100644
--- a/kcm_gtk/mozillaprofile.ui
+++ b/kcm_gtk/mozillaprofile.ui
@@ -69,6 +69,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>