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/tdm/tdm-conv.h   | 4 ++--
 kcontrol/tdm/tdm-font.cpp | 2 +-
 kcontrol/tdm/tdm-users.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/tdm')

diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h
index 1a086ec6c..4015e21b3 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -30,10 +30,10 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kcolorbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include <pwd.h>
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 954759df6..c0e317180 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -31,7 +31,7 @@
 
 #include <kdialog.h>
 #include <ksimpleconfig.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <klocale.h>
 
 #include "tdm-font.h"
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index c5167655c..08c66c6f8 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -30,7 +30,7 @@
 #include <tqwidgetstack.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <kurl.h>
 
-- 
cgit v1.2.1