From 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:15:13 -0600 Subject: Rename common header files for consistency with class renaming --- konqueror/KonqMainWindowIface.cc | 2 +- konqueror/KonqViewIface.cc | 2 +- konqueror/KonquerorIface.cc | 2 +- konqueror/about/konq_aboutpage.cc | 4 ++-- konqueror/client/kfmclient.cc | 2 +- konqueror/client/kfmclient.h | 2 +- konqueror/iconview/konq_iconview.cc | 2 +- konqueror/keditbookmarks/actionsimpl.cpp | 2 +- konqueror/keditbookmarks/bookmarkinfo.cpp | 2 +- konqueror/keditbookmarks/dcop.cpp | 2 +- konqueror/keditbookmarks/exporters.cpp | 2 +- konqueror/keditbookmarks/favicons.cpp | 2 +- konqueror/keditbookmarks/kbookmarkmerger.cpp | 6 +++--- konqueror/keditbookmarks/listview.cpp | 2 +- konqueror/keditbookmarks/main.cpp | 4 ++-- konqueror/keditbookmarks/toplevel.cpp | 2 +- konqueror/keditbookmarks/updater.cpp | 2 +- konqueror/konq_actions.cc | 2 +- konqueror/konq_combo.cc | 2 +- konqueror/konq_factory.cc | 2 +- konqueror/konq_frame.cc | 2 +- konqueror/konq_main.cc | 2 +- konqueror/konq_main.h | 2 +- konqueror/konq_mainwindow.cc | 2 +- konqueror/konq_misc.cc | 2 +- konqueror/konq_view.cc | 2 +- konqueror/konq_viewmgr.cc | 2 +- konqueror/kttsplugin/tdehtmlkttsd.cpp | 2 +- konqueror/listview/konq_listview.cc | 2 +- konqueror/listview/konq_listview.kcfg | 2 +- konqueror/preloader/preloader.cc | 2 +- konqueror/shellcmdplugin/kshellcmdplugin.cpp | 2 +- konqueror/sidebar/konqsidebar.cpp | 2 +- konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp | 2 +- konqueror/sidebar/trees/history_module/history_module.cpp | 2 +- konqueror/sidebar/trees/history_module/history_settings.cpp | 2 +- konqueror/sidebar/trees/history_module/kcmhistory.cpp | 2 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 2 +- 38 files changed, 42 insertions(+), 42 deletions(-) (limited to 'konqueror') diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 6010aa502..ade50e948 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cc index 8219fc861..77bfbb61c 100644 --- a/konqueror/KonqViewIface.cc +++ b/konqueror/KonqViewIface.cc @@ -21,7 +21,7 @@ #include "KonqViewIface.h" #include "konq_view.h" -#include +#include #include #include diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index 9d62fb1ce..cd3ed7591 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -25,7 +25,7 @@ #include "konq_viewmgr.h" #include "konq_view.h" #include -#include +#include #include #include #include diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 809eb2576..f10c0ecb0 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index ca61d80e4..37e7a1502 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 54ffcfb53..1e17279c6 100644 --- a/konqueror/client/kfmclient.h +++ b/konqueror/client/kfmclient.h @@ -20,7 +20,7 @@ #ifndef __kfmclient_h #define __kfmclient_h -#include +#include #include class clientApp : public TDEApplication diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 7d3dc810c..1e495efe3 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index ff83c2d28..d191718f9 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 31d76edd7..c84ce50de 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index a31af0c80..5b7886895 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include KBookmarkEditorIface::KBookmarkEditorIface() diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 912edcb9a..784802564 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 3ee09fb35..19bdb39db 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include FavIconsItrHolder *FavIconsItrHolder::s_self = 0; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index 6d7357bb6..f4cf038fd 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -22,10 +22,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 6efd1440b..e33737956 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 956573280..8f6b3695e 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index aafd988ca..737fdd4f7 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 56214e3d0..8c8a662f9 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index a8b6640d9..61c433170 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "konq_view.h" #include "konq_settingsxt.h" diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 44f5e3fb9..e1bd27173 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index c730991b5..f6535c97c 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 99f31dba2..05eb3be10 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index c166315e8..ad3706a36 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h index 21f09f212..c7bdb36b9 100644 --- a/konqueror/konq_main.h +++ b/konqueror/konq_main.h @@ -1,7 +1,7 @@ #ifndef __konq_main_h #define __konq_main_h -#include +#include // This is used to know if we are being closed by session management // or by the user. See KonqMainWindow::~KonqMainWindow. diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 33fdb3de2..67a907671 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -68,7 +68,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 2353b4c44..690dd6d1f 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 2c4a1a5b5..aec59ef0b 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -20,7 +20,7 @@ #include "konq_view.h" -#include "kapplication.h" +#include "tdeapplication.h" #include "KonqViewIface.h" #include "konq_settingsxt.h" #include "konq_frame.h" diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 136c34093..148d7db1b 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index 9502f3388..af2eae5d8 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index a98a6baa9..3d1090e1f 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -24,7 +24,7 @@ #include "konq_listviewsettings.h" #include -#include +#include #include #include #include diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg index 883bfe2bb..bce9798a6 100644 --- a/konqueror/listview/konq_listview.kcfg +++ b/konqueror/listview/konq_listview.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - kapplication.h + tdeapplication.h diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index aa3d97169..5d87a8b07 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index d55243d6d..d4b3041ab 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "kshellcmddialog.h" #include #include diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bf30ce023..91eb43bf5 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -77,7 +77,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data -#include +#include #include #include diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 9194e8f0c..b190790de 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index ba3428c96..a6c092e0e 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index b51c118e2..5614122ca 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -1,5 +1,5 @@ -#include +#include #include #include #include diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 6c84fdf37..52005e2b5 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 4d1a7ba93..e690c6000 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.3