summaryrefslogtreecommitdiffstats
path: root/kcontrol/kcontrol
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/kcontrol
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol')
-rw-r--r--kcontrol/kcontrol/moduleiconview.h2
-rw-r--r--kcontrol/kcontrol/modulemenu.h2
-rw-r--r--kcontrol/kcontrol/moduletreeview.h2
-rw-r--r--kcontrol/kcontrol/searchwidget.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index a5d43a447..12cb14d73 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -20,7 +20,7 @@
#ifndef __moduleiconview_h__
#define __moduleiconview_h__
-#include <klistview.h>
+#include <tdelistview.h>
class ConfigModule;
class ConfigModuleList;
diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index 2ed12aa5b..9ce39b584 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -31,7 +31,7 @@ that is intentional :-]
#include <tqwidget.h>
#include <tqdict.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
class ConfigModule;
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index d5e60cebf..271214c98 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -23,7 +23,7 @@
#include <tqpalette.h>
#include <tqptrlist.h>
#include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqdict.h>
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index c98426641..cee6cbfd4 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -26,7 +26,7 @@
#include <klineedit.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include "searchwidget.h"
#include "searchwidget.moc"
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 329cb6f89..87661f8d5 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -25,7 +25,7 @@
#include <kaboutapplication.h>
#include <kmessagebox.h>
#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <twin.h>
#include <kiconloader.h>
#include <klineedit.h>
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8d4f0212d..39aa25090 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -21,7 +21,7 @@
#ifndef __TOPLEVEL_H__
#define __TOPLEVEL_H__
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqlistview.h>