summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /twin/kcmtwin
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/kcmtwin')
-rw-r--r--twin/kcmtwin/twindecoration/buttons.h2
-rw-r--r--twin/kcmtwin/twinrules/ruleslist.cpp2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.h2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui2
4 files changed, 4 insertions, 4 deletions
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index d3a794569..e31c09d4a 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -36,7 +36,7 @@
#include <tqdragobject.h>
#include <tqlistbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
class KDecorationFactory;
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 2f7c4582a..8961874ae 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -18,7 +18,7 @@
#include "ruleslist.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kpushbutton.h>
#include <assert.h>
#include <kdebug.h>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index f3f6f9881..4d22e1826 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
#include <twin.h>
-#include <kshortcutdialog.h>
+#include <tdeshortcutdialog.h>
#include "ruleswidgetbase.h"
#include "editshortcutbase.h"
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index d99b475b2..90a438840 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -2547,7 +2547,7 @@
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint>