summaryrefslogtreecommitdiffstats
path: root/konq-plugins/kuick
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:00:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:00:38 -0600
commit4bc3dcd8cbc23e1470e121e25a83d57c22e61b26 (patch)
tree7d379893635b06789888944241a976a4f2b440ab /konq-plugins/kuick
parent08a66075486dc740840cfb817bf0ca301c6f0385 (diff)
downloadtdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.tar.gz
tdeaddons-4bc3dcd8cbc23e1470e121e25a83d57c22e61b26.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kuick')
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.cpp2
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.desktop2
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp2
-rw-r--r--konq-plugins/kuick/kmetamenu.cpp4
-rw-r--r--konq-plugins/kuick/kuick_plugin.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index a2894f9..9816d9b 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -18,7 +18,7 @@
#include <tqfile.h>
#include <kglobal.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kstandarddirs.h>
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
index ad46287..2fc4fd4 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=editcopy
Type=Application
-Exec=kcmshell kcmkuick
+Exec=tdecmshell kcmkuick
X-TDE-ModuleType=Library
X-TDE-Library=kuick
Name=Quick Copy & Move Plugin
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index cfe19f0..754de2b 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -24,7 +24,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <klocale.h>
#include <kurl.h>
#include <ksimpleconfig.h>
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index efb85e2..7ba7a87 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -21,8 +21,8 @@
#include <tdeimproxy.h>
#include <kapplication.h>
#include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
#include <kurl.h>
#include <konq_popupmenu.h>
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 589f212..b0ccaef 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -31,8 +31,8 @@
#include <kmessagebox.h>
#include <kgenericfactory.h>
#include <tqobject.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
#include <kurl.h>
typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory;