summaryrefslogtreecommitdiffstats
path: root/konq-plugins/sidebar/metabar/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:49 -0600
commita9184bb205c837f932e03b2a6cac578582f36ed5 (patch)
tree0b69cad530a4c1d0aa8f36ecd50f72f2f589e980 /konq-plugins/sidebar/metabar/src
parent74a2067d286867e313f736d6733407586b71195e (diff)
downloadtdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.tar.gz
tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/metabar/src')
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.h4
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp6
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.h2
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.cpp6
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index b37469a..85d6fae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -22,12 +22,12 @@
#include <tqdialog.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <knuminput.h>
#include <tdeconfig.h>
#include <tqptrdict.h>
#include <tqlistbox.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqcheckbox.h>
#include <kcombobox.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 2548c3f..fc35e54 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -48,9 +48,9 @@
#include <krun.h>
#include <kdesktopfile.h>
#include <kpropertiesdialog.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdeshortcut.h>
#include <kmimetype.h>
#include <tdecmoduleinfo.h>
#include <kmdcodec.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index b832bc5..72aff09 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -27,7 +27,7 @@
#include <tdefileitem.h>
#include <kurl.h>
#include <kservice.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdirwatch.h>
#include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index bbffb01..344c814 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -28,10 +28,10 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include <kiconloader.h>
-#include <kaction.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
#include <ksimpleconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 42268de..e5b0d17 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -26,7 +26,7 @@
#include <tqmap.h>
#include <tqwidget.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdefileitem.h>
#include <kmimetype.h>
#include <kurl.h>