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

---
 kcontrol/randr/configdialog.cpp | 2 +-
 kcontrol/randr/configdialog.h   | 2 +-
 kcontrol/randr/tderandrtray.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/randr')

diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index f2344f1c0..1d7ffcc41 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twinmodule.h>
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 9ec755834..0728146ee 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -30,7 +30,7 @@
 #include <kdialogbase.h>
 #include <keditlistbox.h>
 #include <kkeydialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 
 class TDEGlobalAccel;
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 845f3e498..d44600c1d 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -20,14 +20,14 @@
 #include <tqimage.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 #include <kglobal.h>
-- 
cgit v1.2.1