summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media
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 /tdeioslave/media
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/media')
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.h2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialogview.ui2
-rw-r--r--tdeioslave/media/tdecmodule/notifiermoduleview.ui2
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/serviceview.ui2
6 files changed, 6 insertions, 6 deletions
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>