From 2399c39d1f3561a179c78d07a3326d615551964e Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 27 Mar 2014 08:40:23 +0100 Subject: [PATCH] Refactorings...... --- CMakeLists.txt | 38 ++++++++++--------- src/core/feedsmodel.cpp | 10 ++--- src/core/feedsmodelcategory.cpp | 12 +++--- src/core/feedsmodelfeed.cpp | 12 +++--- src/core/feedsproxymodel.cpp | 2 +- src/core/messagesmodel.cpp | 8 ++-- src/core/messagesmodel.h | 2 +- src/core/parsingfactory.cpp | 2 +- .../definitions.h.in} | 0 src/dynamic-shortcuts/dynamicshortcuts.cpp | 4 +- .../dynamicshortcutswidget.cpp | 2 +- src/dynamic-shortcuts/shortcutcatcher.cpp | 2 +- src/gui/feedmessageviewer.cpp | 8 ++-- src/gui/feedsview.cpp | 6 +-- src/gui/feedsview.h | 2 +- src/gui/formabout.cpp | 4 +- src/gui/formabout.h | 2 +- src/gui/formmain.cpp | 12 +++--- src/gui/formsettings.cpp | 16 ++++---- src/gui/formstandardcategorydetails.cpp | 4 +- src/gui/formstandardfeeddetails.cpp | 6 +-- src/gui/formupdate.cpp | 6 +-- src/gui/formupdate.h | 2 +- src/gui/locationlineedit.cpp | 4 +- src/gui/messagebox.cpp | 2 +- src/gui/messagesview.cpp | 2 +- src/gui/statusbar.cpp | 2 +- src/gui/systemtrayicon.cpp | 4 +- src/gui/tabbar.cpp | 4 +- src/gui/tabbar.h | 2 +- src/gui/tabwidget.cpp | 8 ++-- src/gui/widgetwithstatus.cpp | 2 +- src/main.cpp | 14 +++---- .../databasefactory.cpp | 6 +-- src/{core => miscellaneous}/databasefactory.h | 0 src/{core => miscellaneous}/debugging.cpp | 4 +- src/{core => miscellaneous}/debugging.h | 0 src/{gui => miscellaneous}/iconfactory.cpp | 2 +- src/{gui => miscellaneous}/iconfactory.h | 0 .../iconthemefactory.cpp | 6 +-- src/{gui => miscellaneous}/iconthemefactory.h | 2 +- src/{core => miscellaneous}/localization.cpp | 6 +-- src/{core => miscellaneous}/localization.h | 0 src/{core => miscellaneous}/settings.cpp | 4 +- src/{core => miscellaneous}/settings.h | 0 src/{gui => miscellaneous}/skinfactory.cpp | 6 +-- src/{gui => miscellaneous}/skinfactory.h | 0 src/{core => miscellaneous}/systemfactory.cpp | 4 +- src/{core => miscellaneous}/systemfactory.h | 0 src/{core => miscellaneous}/textfactory.cpp | 4 +- src/{core => miscellaneous}/textfactory.h | 2 +- src/network-web/basenetworkaccessmanager.cpp | 4 +- src/network-web/networkfactory.cpp | 4 +- src/network-web/webbrowser.cpp | 6 +-- src/network-web/webfactory.cpp | 4 +- src/network-web/webview.cpp | 8 ++-- 56 files changed, 141 insertions(+), 137 deletions(-) rename src/{core/defs.h.in => definitions/definitions.h.in} (100%) mode change 100755 => 100644 rename src/{core => miscellaneous}/databasefactory.cpp (96%) rename src/{core => miscellaneous}/databasefactory.h (100%) rename src/{core => miscellaneous}/debugging.cpp (93%) rename src/{core => miscellaneous}/debugging.h (100%) rename src/{gui => miscellaneous}/iconfactory.cpp (97%) rename src/{gui => miscellaneous}/iconfactory.h (100%) rename src/{gui => miscellaneous}/iconthemefactory.cpp (97%) mode change 100755 => 100644 rename src/{gui => miscellaneous}/iconthemefactory.h (98%) mode change 100755 => 100644 rename src/{core => miscellaneous}/localization.cpp (94%) rename src/{core => miscellaneous}/localization.h (100%) rename src/{core => miscellaneous}/settings.cpp (94%) rename src/{core => miscellaneous}/settings.h (100%) rename src/{gui => miscellaneous}/skinfactory.cpp (95%) rename src/{gui => miscellaneous}/skinfactory.h (100%) rename src/{core => miscellaneous}/systemfactory.cpp (98%) rename src/{core => miscellaneous}/systemfactory.h (100%) rename src/{core => miscellaneous}/textfactory.cpp (97%) mode change 100755 => 100644 rename src/{core => miscellaneous}/textfactory.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72c48c80a..834d3710c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,8 +137,8 @@ endif(UNIX) # Configure internal C++ defines. configure_file ( - ${PROJECT_SOURCE_DIR}/src/core/defs.h.in - ${CMAKE_CURRENT_BINARY_DIR}/src/core/defs.h + ${PROJECT_SOURCE_DIR}/src/definitions/definitions.h.in + ${CMAKE_CURRENT_BINARY_DIR}/src/definitions/definitions.h ) # Define some useful DEBUG for, ehrm, debug build. @@ -272,8 +272,6 @@ set(APP_SOURCES # GUI sources. src/gui/formmain.cpp src/gui/systemtrayicon.cpp - src/gui/iconthemefactory.cpp - src/gui/skinfactory.cpp src/gui/formsettings.cpp src/gui/formabout.cpp src/gui/baselineedit.cpp @@ -285,7 +283,6 @@ set(APP_SOURCES src/gui/feedsview.cpp src/gui/messagesview.cpp src/gui/statusbar.cpp - src/gui/iconfactory.cpp src/gui/formstandardcategorydetails.cpp src/gui/formstandardfeeddetails.cpp src/gui/plaintoolbutton.cpp @@ -302,13 +299,18 @@ set(APP_SOURCES src/dynamic-shortcuts/dynamicshortcutswidget.cpp src/dynamic-shortcuts/dynamicshortcuts.cpp + # MISCELLANEOUS sources. + src/miscellaneous/debugging.cpp + src/miscellaneous/settings.cpp + src/miscellaneous/systemfactory.cpp + src/miscellaneous/localization.cpp + src/miscellaneous/textfactory.cpp + src/miscellaneous/databasefactory.cpp + src/miscellaneous/iconthemefactory.cpp + src/miscellaneous/skinfactory.cpp + src/miscellaneous/iconfactory.cpp + # CORE sources. - src/core/debugging.cpp - src/core/settings.cpp - src/core/systemfactory.cpp - src/core/localization.cpp - src/core/textfactory.cpp - src/core/databasefactory.cpp src/core/messagesmodel.cpp src/core/messagesproxymodel.cpp src/core/feedsmodel.cpp @@ -344,8 +346,6 @@ set(APP_HEADERS # GUI headers. src/gui/formmain.h src/gui/systemtrayicon.h - src/gui/iconthemefactory.h - src/gui/skinfactory.h src/gui/formsettings.h src/gui/formabout.h src/gui/baselineedit.h @@ -372,11 +372,15 @@ set(APP_HEADERS src/dynamic-shortcuts/shortcutcatcher.h src/dynamic-shortcuts/shortcutbutton.h + # MISCELLANEOUS headers. + src/miscellaneous/settings.h + src/miscellaneous/localization.h + src/miscellaneous/systemfactory.h + src/miscellaneous/databasefactory.h + src/miscellaneous/iconthemefactory.h + src/miscellaneous/skinfactory.h + # CORE headers. - src/core/settings.h - src/core/localization.h - src/core/systemfactory.h - src/core/databasefactory.h src/core/messagesmodel.h src/core/messagesproxymodel.h src/core/feedsmodel.h diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 1dc6f08b7..092621402 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -17,13 +17,13 @@ #include "core/feedsmodel.h" -#include "core/defs.h" -#include "core/databasefactory.h" +#include "definitions/definitions.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" -#include "core/textfactory.h" -#include "gui/iconthemefactory.h" -#include "gui/iconfactory.h" +#include "miscellaneous/textfactory.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/iconthemefactory.h" +#include "miscellaneous/iconfactory.h" #include #include diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp index ec86a7f2a..9dc1c7051 100755 --- a/src/core/feedsmodelcategory.cpp +++ b/src/core/feedsmodelcategory.cpp @@ -17,12 +17,12 @@ #include "core/feedsmodelcategory.h" -#include "core/defs.h" -#include "core/databasefactory.h" -#include "core/textfactory.h" -#include "core/settings.h" -#include "gui/iconthemefactory.h" -#include "gui/iconfactory.h" +#include "definitions/definitions.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/textfactory.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/iconthemefactory.h" +#include "miscellaneous/iconfactory.h" #include #include diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index f069db200..6c6df85cc 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/src/core/feedsmodelfeed.cpp @@ -17,14 +17,14 @@ #include "core/feedsmodelfeed.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" #include "core/parsingfactory.h" -#include "core/databasefactory.h" -#include "core/textfactory.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/textfactory.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/iconfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "network-web/networkfactory.h" -#include "gui/iconfactory.h" -#include "gui/iconthemefactory.h" #include #include diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp index 342b72ae0..86a517d03 100755 --- a/src/core/feedsproxymodel.cpp +++ b/src/core/feedsproxymodel.cpp @@ -17,7 +17,7 @@ #include "core/feedsproxymodel.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include "core/feedsmodel.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 271dcb3e0..042412bb6 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -17,10 +17,10 @@ #include "core/messagesmodel.h" -#include "core/defs.h" -#include "core/textfactory.h" -#include "core/databasefactory.h" -#include "gui/iconthemefactory.h" +#include "definitions/definitions.h" +#include "miscellaneous/textfactory.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/iconthemefactory.h" #include "qtsingleapplication/qtsingleapplication.h" #include diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h index ee3771530..e16e13ede 100644 --- a/src/core/messagesmodel.h +++ b/src/core/messagesmodel.h @@ -18,7 +18,7 @@ #ifndef MESSAGESMODEL_H #define MESSAGESMODEL_H -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/core/parsingfactory.cpp b/src/core/parsingfactory.cpp index e1d3df51d..c1fa9d536 100755 --- a/src/core/parsingfactory.cpp +++ b/src/core/parsingfactory.cpp @@ -17,7 +17,7 @@ #include "core/parsingfactory.h" -#include "core/textfactory.h" +#include "miscellaneous/textfactory.h" #include "network-web/webfactory.h" #include diff --git a/src/core/defs.h.in b/src/definitions/definitions.h.in old mode 100755 new mode 100644 similarity index 100% rename from src/core/defs.h.in rename to src/definitions/definitions.h.in diff --git a/src/dynamic-shortcuts/dynamicshortcuts.cpp b/src/dynamic-shortcuts/dynamicshortcuts.cpp index cc6b41cd5..a09519a29 100644 --- a/src/dynamic-shortcuts/dynamicshortcuts.cpp +++ b/src/dynamic-shortcuts/dynamicshortcuts.cpp @@ -17,8 +17,8 @@ #include "dynamic-shortcuts/dynamicshortcuts.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include diff --git a/src/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp index aed1609c9..634cdcf3b 100644 --- a/src/dynamic-shortcuts/dynamicshortcutswidget.cpp +++ b/src/dynamic-shortcuts/dynamicshortcutswidget.cpp @@ -19,7 +19,7 @@ #include "dynamic-shortcuts/shortcutcatcher.h" #include "dynamic-shortcuts/shortcutbutton.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/dynamic-shortcuts/shortcutcatcher.cpp b/src/dynamic-shortcuts/shortcutcatcher.cpp index 7c19693ae..9db6c7a83 100644 --- a/src/dynamic-shortcuts/shortcutcatcher.cpp +++ b/src/dynamic-shortcuts/shortcutcatcher.cpp @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "dynamic-shortcuts/shortcutbutton.h" #include "gui/plaintoolbutton.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index c499b5924..2f1c8876b 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -17,15 +17,15 @@ #include "gui/feedmessageviewer.h" -#include "core/settings.h" -#include "core/databasefactory.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/systemfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "core/messagesproxymodel.h" #include "core/feeddownloader.h" #include "core/feedsmodelfeed.h" -#include "core/systemfactory.h" #include "network-web/webbrowser.h" #include "gui/formmain.h" -#include "gui/iconthemefactory.h" #include "gui/messagesview.h" #include "gui/feedsview.h" #include "gui/statusbar.h" diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 5ee916405..f4ffdd413 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -17,14 +17,14 @@ #include "gui/feedsview.h" -#include "core/defs.h" -#include "core/systemfactory.h" +#include "definitions/definitions.h" #include "core/feedsmodelfeed.h" #include "core/feedsmodel.h" #include "core/feedsproxymodel.h" #include "core/feedsmodelrootitem.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" +#include "miscellaneous/systemfactory.h" #include "gui/formmain.h" #include "gui/formstandardcategorydetails.h" #include "gui/formstandardfeeddetails.h" @@ -430,7 +430,7 @@ void FeedsView::deleteSelectedItem() { if (m_sourceModel->removeItem(m_proxyModel->mapToSource(current_index))) { // Item WAS removed, update counts. - // TODO:_I do not need to update counts of all items here. + // TODO: I do not need to update counts of all items here. // Updating counts of parent item (feed) should be enough. updateCountsOfAllFeeds(true); } diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h index e29b6c313..e0c15ed50 100644 --- a/src/gui/feedsview.h +++ b/src/gui/feedsview.h @@ -22,7 +22,7 @@ #include "core/messagesmodel.h" #include "core/feedsmodel.h" -#include "core/settings.h" +#include "miscellaneous/settings.h" class FeedsProxyModel; diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index 29fe1e9e9..4d62d5b1d 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -17,8 +17,8 @@ #include "gui/formabout.h" -#include "core/textfactory.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" +#include "miscellaneous/textfactory.h" #if !defined(Q_OS_WIN) #include "gui/messagebox.h" diff --git a/src/gui/formabout.h b/src/gui/formabout.h index 485bc1c7d..83f1d2d88 100644 --- a/src/gui/formabout.h +++ b/src/gui/formabout.h @@ -20,7 +20,7 @@ #include "ui_formabout.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 479718de1..1ae1edecd 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -17,23 +17,23 @@ #include "gui/formmain.h" -#include "core/defs.h" -#include "core/settings.h" -#include "core/systemfactory.h" -#include "core/databasefactory.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/systemfactory.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/iconthemefactory.h" #include "network-web/webfactory.h" #include "network-web/webbrowser.h" #include "gui/formabout.h" #include "gui/formsettings.h" #include "gui/feedsview.h" #include "gui/messagebox.h" -#include "gui/iconthemefactory.h" #include "gui/systemtrayicon.h" #include "gui/tabbar.h" #include "gui/statusbar.h" #include "gui/feedmessageviewer.h" -#include "qtsingleapplication/qtsingleapplication.h" #include "gui/formupdate.h" +#include "qtsingleapplication/qtsingleapplication.h" #include #include diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 967f5072f..6a870dfa0 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -17,26 +17,26 @@ #include "gui/formsettings.h" -#include "core/defs.h" -#include "core/settings.h" -#include "core/databasefactory.h" -#include "core/localization.h" -#include "core/systemfactory.h" +#include "definitions/definitions.h" #include "core/feeddownloader.h" #include "core/feedsmodel.h" -#include "dynamic-shortcuts/dynamicshortcuts.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/localization.h" +#include "miscellaneous/systemfactory.h" +#include "miscellaneous/iconthemefactory.h" +#include "miscellaneous/skinfactory.h" #include "network-web/webfactory.h" #include "network-web/webbrowsernetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h" #include "network-web/webbrowser.h" -#include "gui/iconthemefactory.h" -#include "gui/skinfactory.h" #include "gui/systemtrayicon.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" #include "gui/formmain.h" #include "gui/messagebox.h" #include "qtsingleapplication/qtsingleapplication.h" +#include "dynamic-shortcuts/dynamicshortcuts.h" #include #include diff --git a/src/gui/formstandardcategorydetails.cpp b/src/gui/formstandardcategorydetails.cpp index 5d0f1c06f..8a3d54aa1 100644 --- a/src/gui/formstandardcategorydetails.cpp +++ b/src/gui/formstandardcategorydetails.cpp @@ -17,11 +17,11 @@ #include "gui/formstandardcategorydetails.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include "core/feedsmodelrootitem.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodel.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include "gui/feedsview.h" #include "gui/baselineedit.h" #include "gui/messagebox.h" diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index dcfe6618d..d7c8e8017 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -17,14 +17,14 @@ #include "gui/formstandardfeeddetails.h" -#include "core/defs.h" -#include "core/textfactory.h" +#include "definitions/definitions.h" #include "core/feedsmodel.h" #include "core/feedsmodelrootitem.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" +#include "miscellaneous/textfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "network-web/networkfactory.h" -#include "gui/iconthemefactory.h" #include "gui/baselineedit.h" #include "gui/messagebox.h" #include "gui/systemtrayicon.h" diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index 91453226e..7a7a64953 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -17,11 +17,11 @@ #include "gui/formupdate.h" -#include "core/defs.h" -#include "core/systemfactory.h" +#include "definitions/definitions.h" +#include "miscellaneous/systemfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "network-web/networkfactory.h" #include "network-web/webfactory.h" -#include "gui/iconthemefactory.h" #include "gui/messagebox.h" #include "gui/systemtrayicon.h" diff --git a/src/gui/formupdate.h b/src/gui/formupdate.h index 3d18d6e37..f978e7394 100644 --- a/src/gui/formupdate.h +++ b/src/gui/formupdate.h @@ -23,7 +23,7 @@ #include "ui_formupdate.h" -#include "core/systemfactory.h" +#include "miscellaneous/systemfactory.h" namespace Ui { diff --git a/src/gui/locationlineedit.cpp b/src/gui/locationlineedit.cpp index 6918ecdc5..f2aa96e4d 100644 --- a/src/gui/locationlineedit.cpp +++ b/src/gui/locationlineedit.cpp @@ -17,8 +17,8 @@ #include "gui/locationlineedit.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/gui/messagebox.cpp b/src/gui/messagebox.cpp index 887afeece..a5845f6e4 100644 --- a/src/gui/messagebox.cpp +++ b/src/gui/messagebox.cpp @@ -17,7 +17,7 @@ #include "gui/messagebox.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include #include diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 573bff128..064401825 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -19,7 +19,7 @@ #include "core/messagesproxymodel.h" #include "core/messagesmodel.h" -#include "core/settings.h" +#include "miscellaneous/settings.h" #include "network-web/networkfactory.h" #include "network-web/webfactory.h" #include "gui/formmain.h" diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 657c4871e..942be1b80 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -17,7 +17,7 @@ #include "gui/statusbar.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include #include diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp index 7df7738d5..fde662880 100644 --- a/src/gui/systemtrayicon.cpp +++ b/src/gui/systemtrayicon.cpp @@ -17,8 +17,8 @@ #include "gui/systemtrayicon.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include "gui/formmain.h" #include "gui/formsettings.h" #include "qtsingleapplication/qtsingleapplication.h" diff --git a/src/gui/tabbar.cpp b/src/gui/tabbar.cpp index 60a7720a8..0a0801966 100644 --- a/src/gui/tabbar.cpp +++ b/src/gui/tabbar.cpp @@ -17,8 +17,8 @@ #include "gui/tabbar.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include "gui/plaintoolbutton.h" #include diff --git a/src/gui/tabbar.h b/src/gui/tabbar.h index 1b028c045..c5280df8f 100644 --- a/src/gui/tabbar.h +++ b/src/gui/tabbar.h @@ -18,7 +18,7 @@ #ifndef TABBAR_H #define TABBAR_H -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include #include diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 1402e8232..402f379d8 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -17,12 +17,12 @@ #include "gui/tabwidget.h" -#include "core/defs.h" -#include "core/settings.h" -#include "core/textfactory.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/textfactory.h" #include "network-web/webbrowser.h" +#include "miscellaneous/iconthemefactory.h" #include "gui/tabbar.h" -#include "gui/iconthemefactory.h" #include "gui/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/plaintoolbutton.h" diff --git a/src/gui/widgetwithstatus.cpp b/src/gui/widgetwithstatus.cpp index 9306d9e3b..78f6f1bf6 100644 --- a/src/gui/widgetwithstatus.cpp +++ b/src/gui/widgetwithstatus.cpp @@ -18,7 +18,7 @@ #include "gui/widgetwithstatus.h" #include "gui/plaintoolbutton.h" -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" #include diff --git a/src/main.cpp b/src/main.cpp index d5b12a38e..6471f4ad7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,14 +15,14 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/defs.h" -#include "core/databasefactory.h" -#include "core/debugging.h" -#include "core/localization.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/databasefactory.h" +#include "miscellaneous/debugging.h" +#include "miscellaneous/localization.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/iconthemefactory.h" +#include "miscellaneous/skinfactory.h" #include "dynamic-shortcuts/dynamicshortcuts.h" -#include "gui/iconthemefactory.h" -#include "gui/skinfactory.h" #include "gui/formmain.h" #include "gui/systemtrayicon.h" #include "gui/feedmessageviewer.h" diff --git a/src/core/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp similarity index 96% rename from src/core/databasefactory.cpp rename to src/miscellaneous/databasefactory.cpp index 5727f2d81..a0612cdee 100644 --- a/src/core/databasefactory.cpp +++ b/src/miscellaneous/databasefactory.cpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/databasefactory.h" +#include "miscellaneous/databasefactory.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/core/databasefactory.h b/src/miscellaneous/databasefactory.h similarity index 100% rename from src/core/databasefactory.h rename to src/miscellaneous/databasefactory.h diff --git a/src/core/debugging.cpp b/src/miscellaneous/debugging.cpp similarity index 93% rename from src/core/debugging.cpp rename to src/miscellaneous/debugging.cpp index 38e9ec85f..bf57b6abe 100644 --- a/src/core/debugging.cpp +++ b/src/miscellaneous/debugging.cpp @@ -15,9 +15,9 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/debugging.h" +#include "miscellaneous/debugging.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/core/debugging.h b/src/miscellaneous/debugging.h similarity index 100% rename from src/core/debugging.h rename to src/miscellaneous/debugging.h diff --git a/src/gui/iconfactory.cpp b/src/miscellaneous/iconfactory.cpp similarity index 97% rename from src/gui/iconfactory.cpp rename to src/miscellaneous/iconfactory.cpp index 7cc28bff6..82ffd4910 100644 --- a/src/gui/iconfactory.cpp +++ b/src/miscellaneous/iconfactory.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/iconfactory.h" +#include "miscellaneous/iconfactory.h" #include diff --git a/src/gui/iconfactory.h b/src/miscellaneous/iconfactory.h similarity index 100% rename from src/gui/iconfactory.h rename to src/miscellaneous/iconfactory.h diff --git a/src/gui/iconthemefactory.cpp b/src/miscellaneous/iconthemefactory.cpp old mode 100755 new mode 100644 similarity index 97% rename from src/gui/iconthemefactory.cpp rename to src/miscellaneous/iconthemefactory.cpp index 6c7e424a2..b15d59894 --- a/src/gui/iconthemefactory.cpp +++ b/src/miscellaneous/iconthemefactory.cpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/iconthemefactory.h" +#include "miscellaneous/iconthemefactory.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include "qtsingleapplication/qtsingleapplication.h" #include diff --git a/src/gui/iconthemefactory.h b/src/miscellaneous/iconthemefactory.h old mode 100755 new mode 100644 similarity index 98% rename from src/gui/iconthemefactory.h rename to src/miscellaneous/iconthemefactory.h index 932649fe9..9ce17e52d --- a/src/gui/iconthemefactory.h +++ b/src/miscellaneous/iconthemefactory.h @@ -18,7 +18,7 @@ #ifndef THEMEFACTORY_H #define THEMEFACTORY_H -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/core/localization.cpp b/src/miscellaneous/localization.cpp similarity index 94% rename from src/core/localization.cpp rename to src/miscellaneous/localization.cpp index ce1e3fd7c..33e73bcc1 100644 --- a/src/core/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/localization.h" +#include "miscellaneous/localization.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include "qtsingleapplication/qtsingleapplication.h" #include diff --git a/src/core/localization.h b/src/miscellaneous/localization.h similarity index 100% rename from src/core/localization.h rename to src/miscellaneous/localization.h diff --git a/src/core/settings.cpp b/src/miscellaneous/settings.cpp similarity index 94% rename from src/core/settings.cpp rename to src/miscellaneous/settings.cpp index ce082693e..0200511ab 100644 --- a/src/core/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -15,9 +15,9 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/settings.h" +#include "miscellaneous/settings.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/core/settings.h b/src/miscellaneous/settings.h similarity index 100% rename from src/core/settings.h rename to src/miscellaneous/settings.h diff --git a/src/gui/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp similarity index 95% rename from src/gui/skinfactory.cpp rename to src/miscellaneous/skinfactory.cpp index f4e23eac1..ee60e17c9 100644 --- a/src/gui/skinfactory.cpp +++ b/src/miscellaneous/skinfactory.cpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/skinfactory.h" +#include "miscellaneous/skinfactory.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/gui/skinfactory.h b/src/miscellaneous/skinfactory.h similarity index 100% rename from src/gui/skinfactory.h rename to src/miscellaneous/skinfactory.h diff --git a/src/core/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp similarity index 98% rename from src/core/systemfactory.cpp rename to src/miscellaneous/systemfactory.cpp index b8577730f..4e21c5f55 100644 --- a/src/core/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -15,9 +15,9 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/systemfactory.h" +#include "miscellaneous/systemfactory.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include "network-web/networkfactory.h" #if defined(Q_OS_WIN) diff --git a/src/core/systemfactory.h b/src/miscellaneous/systemfactory.h similarity index 100% rename from src/core/systemfactory.h rename to src/miscellaneous/systemfactory.h diff --git a/src/core/textfactory.cpp b/src/miscellaneous/textfactory.cpp old mode 100755 new mode 100644 similarity index 97% rename from src/core/textfactory.cpp rename to src/miscellaneous/textfactory.cpp index 0941ffeb8..0848e7614 --- a/src/core/textfactory.cpp +++ b/src/miscellaneous/textfactory.cpp @@ -15,9 +15,9 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/textfactory.h" +#include "miscellaneous/textfactory.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/core/textfactory.h b/src/miscellaneous/textfactory.h similarity index 97% rename from src/core/textfactory.h rename to src/miscellaneous/textfactory.h index 321bdf40a..7a94b1e6f 100644 --- a/src/core/textfactory.h +++ b/src/miscellaneous/textfactory.h @@ -18,7 +18,7 @@ #ifndef TEXTFACTORY_H #define TEXTFACTORY_H -#include "core/defs.h" +#include "definitions/definitions.h" #include #include diff --git a/src/network-web/basenetworkaccessmanager.cpp b/src/network-web/basenetworkaccessmanager.cpp index 196175a42..1b8d57c4a 100644 --- a/src/network-web/basenetworkaccessmanager.cpp +++ b/src/network-web/basenetworkaccessmanager.cpp @@ -17,8 +17,8 @@ #include "network-web/basenetworkaccessmanager.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/network-web/networkfactory.cpp b/src/network-web/networkfactory.cpp index 2737b3ce2..821cb53a9 100644 --- a/src/network-web/networkfactory.cpp +++ b/src/network-web/networkfactory.cpp @@ -17,8 +17,8 @@ #include "network-web/networkfactory.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include "network-web/silentnetworkaccessmanager.h" #include diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp index cf2e0b110..4031ed5d5 100644 --- a/src/network-web/webbrowser.cpp +++ b/src/network-web/webbrowser.cpp @@ -17,13 +17,13 @@ #include "network-web/webbrowser.h" -#include "core/defs.h" +#include "definitions/definitions.h" #include "network-web/webbrowsernetworkaccessmanager.h" #include "network-web/webpage.h" #include "network-web/webview.h" -#include "gui/skinfactory.h" +#include "miscellaneous/skinfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "gui/formmain.h" -#include "gui/iconthemefactory.h" #include "gui/tabwidget.h" #include diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp index 72f796d64..13941bc71 100644 --- a/src/network-web/webfactory.cpp +++ b/src/network-web/webfactory.cpp @@ -1,7 +1,7 @@ #include "network-web/webfactory.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp index aaf138553..454f9d1c8 100644 --- a/src/network-web/webview.cpp +++ b/src/network-web/webview.cpp @@ -17,11 +17,11 @@ #include "network-web/webview.h" -#include "core/defs.h" -#include "core/settings.h" +#include "definitions/definitions.h" +#include "miscellaneous/settings.h" +#include "miscellaneous/skinfactory.h" +#include "miscellaneous/iconthemefactory.h" #include "network-web/webpage.h" -#include "gui/skinfactory.h" -#include "gui/iconthemefactory.h" #include #include