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

---
 tdeioslave/media/medianotifier/notificationdialog.cpp    | 2 +-
 tdeioslave/media/medianotifier/notificationdialog.h      | 2 +-
 tdeioslave/media/medianotifier/notificationdialogview.ui | 2 +-
 tdeioslave/media/tdecmodule/notifiermoduleview.ui        | 2 +-
 tdeioslave/media/tdecmodule/serviceconfigdialog.cpp      | 2 +-
 tdeioslave/media/tdecmodule/serviceview.ui               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tdeioslave')

diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index c74228198..4efe155d9 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialog.h b/tdeioslave/media/medianotifier/notificationdialog.h
index 01792c2a5..d50baa492 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.h
+++ b/tdeioslave/media/medianotifier/notificationdialog.h
@@ -21,7 +21,7 @@
 #define _NOTIFICATIONDIALOG_H_
 
 #include <kdialogbase.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kdirwatch.h>
 #include <tdefileitem.h>
 
diff --git a/tdeioslave/media/medianotifier/notificationdialogview.ui b/tdeioslave/media/medianotifier/notificationdialogview.ui
index 351799dd9..1feea8069 100644
--- a/tdeioslave/media/medianotifier/notificationdialogview.ui
+++ b/tdeioslave/media/medianotifier/notificationdialogview.ui
@@ -112,6 +112,6 @@
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/tdeioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
index a5cd11622..ad32f7a3c 100644
--- a/tdeioslave/media/tdecmodule/notifiermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
@@ -166,6 +166,6 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 61dd060f2..989419703 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <klineedit.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <kicondialog.h>
 #include <tqlistbox.h>
 #include <kservice.h>
diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui
index 98a9f8666..2991d4c9f 100644
--- a/tdeioslave/media/tdecmodule/serviceview.ui
+++ b/tdeioslave/media/tdecmodule/serviceview.ui
@@ -240,7 +240,7 @@
 <includehints>
     <includehint>kicondialog.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kactionselector.h</includehint>
+    <includehint>tdeactionselector.h</includehint>
     <includehint>kactivelabel.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-- 
cgit v1.2.3