summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/sidebar')
-rw-r--r--konqueror/sidebar/CMakeLists.txt6
-rw-r--r--konqueror/sidebar/Makefile.am2
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h4
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp6
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.h2
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp4
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp2
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.desktop2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp2
12 files changed, 18 insertions, 18 deletions
diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt
index fa9c3cbd5..45e483d5a 100644
--- a/konqueror/sidebar/CMakeLists.txt
+++ b/konqueror/sidebar/CMakeLists.txt
@@ -36,8 +36,8 @@ install( FILES konqsidebarplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} )
install( FILES konqsidebartng.rc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES konq_sidebartng.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES .version DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
-install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
##### konqsidebarplugin (lib) ###################
@@ -66,6 +66,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared
+ LINK konqsidebarplugin-shared konq-shared tdeio-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 702320841..1cfc7f6ac 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -39,6 +39,6 @@ partrc_DATA = konqsidebartng.rc
versiondir = $(kde_datadir)/konqsidebartng/entries/
version_DATA=.version
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
update_DATA = konqsidebartng.upd
update_SCRIPTS = move_konqsidebartng_entries.sh
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 0433261c7..7540ef398 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -24,9 +24,9 @@
#include <tqstring.h>
#include <tdeparts/part.h>
#include <tdeparts/browserextension.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <tqguardedptr.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
class KonqSidebarPluginPrivate;
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 6a5ecd22d..44b3cca35 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -36,13 +36,13 @@
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <konq_events.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
#include <kpopupmenu.h>
#include <kprocess.h>
#include <kurlrequesterdlg.h>
#include <kinputdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kdesktopfile.h>
#include "konqsidebar.h"
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 9c31acdf5..57109e7cb 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -27,7 +27,7 @@
#include <kuserprofile.h>
#include <tqapplication.h>
#include <tqclipboard.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
#include <tqfile.h>
#include <tqpainter.h>
#include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index af915aa46..89b5dcbaf 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -20,7 +20,7 @@
#define dirtree_module_h
#include <konq_sidebartreemodule.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
#include <tqpixmap.h>
#include <tqdict.h>
#include <tqptrdict.h>
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 30d96f060..fa7f8ba39 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kaction.h>
#include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kmessagebox.h>
@@ -278,7 +278,7 @@ void KonqSidebarHistoryModule::slotRemoveEntry()
void KonqSidebarHistoryModule::slotPreferences()
{
// Run the history sidebar settings.
- KRun::run( "kcmshell kcmhistory", KURL::List() );
+ KRun::run( "tdecmshell kcmhistory", KURL::List() );
}
void KonqSidebarHistoryModule::slotSortByName()
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 701f72776..b51c118e2 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -1,6 +1,6 @@
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <dcopclient.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 967616bd5..b2e92c6fd 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -29,7 +29,7 @@
#include <dcopclient.h>
#include <dcopref.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdialog.h>
#include <kfontdialog.h>
#include <kgenericfactory.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 38b224555..c6c020988 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=history
Type=Application
-Exec=kcmshell kcmhistory
+Exec=tdecmshell kcmhistory
X-TDE-ModuleType=Library
X-TDE-Library=history
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index b156c071d..b53ce2635 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -38,7 +38,7 @@
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kmimetype.h>
#include <kprocess.h>
#include <kpropertiesdialog.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 8c9b787f8..d6eb37857 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -20,7 +20,7 @@
#include "konq_sidebartreemodule.h"
#include <kdebug.h>
#include <kdirnotify_stub.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
#include <konq_operations.h>
#include <kprotocolinfo.h>
#include <kurldrag.h>