summaryrefslogtreecommitdiffstats
path: root/kicker/applets/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 /kicker/applets/media
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/media')
-rw-r--r--kicker/applets/media/mediaapplet.cpp2
-rw-r--r--kicker/applets/media/mediumbutton.cpp2
-rw-r--r--kicker/applets/media/mediumbutton.h2
-rw-r--r--kicker/applets/media/preferencesdialog.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b6e1e7995..f2aa6be2b 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -24,7 +24,7 @@
#include <kaboutdata.h>
#include <kaboutapplication.h>
#include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include "mediaapplet.h"
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index a180cfbd9..7f4118bf8 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -38,7 +38,7 @@
#include <kipc.h>
#include <kiconloader.h>
#include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <konq_operations.h>
#include <konq_popupmenu.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 1bc6380c2..76e448b27 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -28,7 +28,7 @@
#include <tqtimer.h>
#include <tdefileitem.h>
#include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
class MediumButton : public PanelPopupButton
{
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bd1a21b0d..8fbd958fa 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -23,7 +23,7 @@
#include <kmimetype.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tdefiledetailview.h>
class MediumTypeItem : public TQCheckListItem