summaryrefslogtreecommitdiffstats
path: root/kcontrol/icons
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 /kcontrol/icons
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/icons')
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/icons/iconthemes.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 802f1759d..cb0d23508 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -35,7 +35,7 @@
#undef Unsorted
#include <kipc.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurlrequesterdlg.h>
#include <kmessagebox.h>
#include <kprogress.h>
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index fde163127..ccb914846 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -22,7 +22,7 @@
#include <tqimage.h>
#include <tdecmodule.h>
#include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
class TQPushButton;
class DeviceManager;