diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /konqueror/sidebar/trees/history_module | |
| 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/history_module')
| -rw-r--r-- | konqueror/sidebar/trees/history_module/history_module.cpp | 2 | ||||
| -rw-r--r-- | konqueror/sidebar/trees/history_module/kcmhistory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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> |