diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /konqueror/sidebar/trees | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/trees')
6 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 5b170b102..9194e8f0c 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -20,8 +20,8 @@ #include <tqcursor.h> #include <tqpopupmenu.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kbookmarkdrag.h> #include <kiconloader.h> diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 5d27e010f..ba3428c96 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -21,7 +21,7 @@ #include <tqpopupmenu.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcursor.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 813ece3df..6c84fdf37 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -31,7 +31,7 @@ #include <kapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kgenericfactory.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 028a531fa..4d1a7ba93 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -30,7 +30,7 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kdesktopfile.h> diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index f8626298c..6498d0ffe 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -20,7 +20,7 @@ #ifndef konq_tree_h #define konq_tree_h -#include <klistview.h> +#include <tdelistview.h> #include "konq_sidebartreetoplevelitem.h" #include "konqsidebar_tree.h" #include <kdirnotify.h> diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 04454ecb1..1903c2328 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -6,7 +6,7 @@ #include <ksimpleconfig.h> #include <kinputdialog.h> #include <kiconloader.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <tqclipboard.h> #include <tqdragobject.h> |