From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 twin/kcmtwin/twinrules/ruleslist.cpp      | 2 +-
 twin/kcmtwin/twinrules/ruleswidget.h      | 2 +-
 twin/kcmtwin/twinrules/ruleswidgetbase.ui | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'twin/kcmtwin/twinrules')

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>
-- 
cgit v1.2.1