diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /konqueror/sidebar/trees | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/trees')
8 files changed, 9 insertions, 9 deletions
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> |