From a0dc1e1d664ce19397616bba9d16eb139d4fedd8 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sat, 21 Dec 2013 21:08:52 +0100 Subject: [PATCH] Huge refactorings... --- src/core/basenetworkaccessmanager.cpp | 9 +- src/core/basewebpage.cpp | 7 +- src/core/databasefactory.cpp | 11 ++- src/core/debugging.cpp | 7 +- src/core/dynamicshortcuts.cpp | 7 +- src/core/feedsmodel.cpp | 19 +++-- src/core/feedsmodelcategory.cpp | 5 +- src/core/feedsmodelcategory.h | 4 +- src/core/feedsmodelfeed.cpp | 7 +- src/core/feedsmodelrootitem.cpp | 5 +- src/core/feedsmodelstandardcategory.cpp | 7 +- src/core/feedsmodelstandardcategory.h | 4 +- src/core/feedsmodelstandardfeed.cpp | 5 +- src/core/feedsmodelstandardfeed.h | 4 +- src/core/feedsproxymodel.cpp | 3 +- src/core/localization.cpp | 11 +-- src/core/messagesmodel.cpp | 12 +-- src/core/messagesmodel.h | 4 +- src/core/messagesproxymodel.cpp | 1 + src/core/parsingfactory.cpp | 7 +- src/core/parsingfactory.h | 4 +- src/core/settings.cpp | 7 +- src/core/systemfactory.cpp | 20 +++-- src/core/textfactory.cpp | 7 +- src/core/textfactory.h | 4 +- src/gui/baselineedit.cpp | 4 +- src/gui/basewebview.cpp | 15 ++-- src/gui/cornerbutton.cpp | 1 + src/gui/dynamicshortcutswidget.cpp | 13 +-- src/gui/feedmessageviewer.cpp | 19 +++-- src/gui/feedsview.cpp | 10 ++- src/gui/formabout.cpp | 8 +- src/gui/formabout.h | 5 +- src/gui/formmain.cpp | 27 +++--- src/gui/formmain.h | 4 +- src/gui/formsettings.cpp | 83 +++++++++++-------- src/gui/formsettings.h | 4 +- src/gui/formsettings.ui | 52 +++--------- src/gui/formwelcome.cpp | 7 +- src/gui/formwelcome.h | 4 +- src/gui/iconfactory.cpp | 4 +- src/gui/iconfactory.h | 4 +- src/gui/iconthemefactory.cpp | 11 +-- src/gui/locationlineedit.cpp | 9 +- src/gui/messagesview.cpp | 13 +-- src/gui/messagesview.h | 4 +- src/gui/shortcutbutton.cpp | 5 +- src/gui/shortcutcatcher.cpp | 7 +- src/gui/skinfactory.cpp | 21 ++--- src/gui/systemtrayicon.cpp | 15 ++-- src/gui/tabbar.cpp | 5 +- src/gui/tabwidget.cpp | 7 +- src/gui/tabwidget.h | 6 +- src/gui/webbrowser.cpp | 26 +++--- src/main.cpp | 15 ++-- src/qtsingleapplication/qtlocalpeer.h | 2 +- src/qtsingleapplication/qtlockedfile.h | 4 +- src/qtsingleapplication/qtsingleapplication.h | 12 +-- 58 files changed, 315 insertions(+), 292 deletions(-) diff --git a/src/core/basenetworkaccessmanager.cpp b/src/core/basenetworkaccessmanager.cpp index 2733b57c1..994911e25 100644 --- a/src/core/basenetworkaccessmanager.cpp +++ b/src/core/basenetworkaccessmanager.cpp @@ -1,10 +1,11 @@ +#include "core/basenetworkaccessmanager.h" + +#include "core/defs.h" +#include "core/settings.h" + #include #include -#include "core/settings.h" -#include "core/defs.h" -#include "core/basenetworkaccessmanager.h" - BaseNetworkAccessManager::BaseNetworkAccessManager(QObject *parent) : QNetworkAccessManager(parent) { diff --git a/src/core/basewebpage.cpp b/src/core/basewebpage.cpp index 1458ed263..c21afd0db 100644 --- a/src/core/basewebpage.cpp +++ b/src/core/basewebpage.cpp @@ -1,10 +1,11 @@ -#include -#include +#include "core/basewebpage.h" #include "core/webbrowsernetworkaccessmanager.h" -#include "core/basewebpage.h" #include "gui/webbrowser.h" +#include +#include + BaseWebPage::BaseWebPage(QObject *parent) : QWebPage(parent) { diff --git a/src/core/databasefactory.cpp b/src/core/databasefactory.cpp index c7cb2d90f..46c9b2ded 100644 --- a/src/core/databasefactory.cpp +++ b/src/core/databasefactory.cpp @@ -1,13 +1,14 @@ +#include "core/databasefactory.h" + +#include "core/defs.h" +#include "core/settings.h" + #include #include #include #include #include -#include "core/defs.h" -#include "core/databasefactory.h" -#include "core/settings.h" - QPointer DatabaseFactory::s_instance; @@ -74,8 +75,6 @@ QSqlDatabase DatabaseFactory::initialize(const QString &connection_name) { else { QSqlQuery query_db(database); - // TODO: smazat QSQLDatabase::exec() všude - // a nahradit jej funkcí QSQLquery::exec() query_db.exec("PRAGMA encoding = \"UTF-8\""); query_db.exec("PRAGMA synchronous = OFF"); query_db.exec("PRAGMA journal_mode = MEMORY"); diff --git a/src/core/debugging.cpp b/src/core/debugging.cpp index 2e07d2d9f..7286542e6 100644 --- a/src/core/debugging.cpp +++ b/src/core/debugging.cpp @@ -1,8 +1,9 @@ -#include -#include +#include "core/debugging.h" #include "core/defs.h" -#include "core/debugging.h" + +#include +#include #include diff --git a/src/core/dynamicshortcuts.cpp b/src/core/dynamicshortcuts.cpp index fc457971a..29352a9f5 100644 --- a/src/core/dynamicshortcuts.cpp +++ b/src/core/dynamicshortcuts.cpp @@ -1,8 +1,9 @@ -#include - #include "core/dynamicshortcuts.h" -#include "core/settings.h" + #include "core/defs.h" +#include "core/settings.h" + +#include DynamicShortcuts::DynamicShortcuts() { diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index fa90fa8f8..3b207321b 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -1,16 +1,17 @@ +#include "core/feedsmodel.h" + +#include "core/defs.h" +#include "core/databasefactory.h" +#include "core/feedsmodelstandardcategory.h" +#include "core/feedsmodelstandardfeed.h" +#include "gui/iconthemefactory.h" +#include "gui/iconfactory.h" + #include #include #include #include -#include "core/feedsmodel.h" -#include "core/feedsmodelstandardcategory.h" -#include "core/feedsmodelstandardfeed.h" -#include "core/defs.h" -#include "core/databasefactory.h" -#include "gui/iconthemefactory.h" -#include "gui/iconfactory.h" - FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) { setObjectName("FeedsModel"); @@ -330,7 +331,7 @@ QHash FeedsModel::getCategories() { void FeedsModel::assembleFeeds(FeedAssignment feeds) { QHash categories = getCategories(); - foreach (FeedAssignmentItem feed, feeds) { + foreach (const FeedAssignmentItem &feed, feeds) { if (feed.first == NO_PARENT_CATEGORY) { // This is top-level feed, add it to the root item. m_rootItem->appendChild(feed.second); diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp index 45fe0e4b8..0f62998b3 100755 --- a/src/core/feedsmodelcategory.cpp +++ b/src/core/feedsmodelcategory.cpp @@ -1,9 +1,10 @@ -#include - #include "core/feedsmodelcategory.h" + #include "core/feedsmodelstandardcategory.h" #include "core/feedsmodelstandardfeed.h" +#include + FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) { diff --git a/src/core/feedsmodelcategory.h b/src/core/feedsmodelcategory.h index aa896f8be..bd82e11b0 100755 --- a/src/core/feedsmodelcategory.h +++ b/src/core/feedsmodelcategory.h @@ -1,10 +1,10 @@ #ifndef FEEDSMODELCLASSICCATEGORY_H #define FEEDSMODELCLASSICCATEGORY_H -#include - #include "core/feedsmodelrootitem.h" +#include + class FeedsModelFeed; diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index 0b0d7d14f..dccf02a69 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/src/core/feedsmodelfeed.cpp @@ -1,11 +1,12 @@ +#include "core/feedsmodelfeed.h" + +#include "core/databasefactory.h" + #include #include #include #include -#include "core/databasefactory.h" -#include "core/feedsmodelfeed.h" - FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item), m_totalCount(0), m_unreadCount(0) { diff --git a/src/core/feedsmodelrootitem.cpp b/src/core/feedsmodelrootitem.cpp index 49323e5f3..50a8fea65 100755 --- a/src/core/feedsmodelrootitem.cpp +++ b/src/core/feedsmodelrootitem.cpp @@ -1,7 +1,8 @@ -#include +#include "core/feedsmodelrootitem.h" #include "qtsingleapplication/qtsingleapplication.h" -#include "core/feedsmodelrootitem.h" + +#include FeedsModelRootItem::FeedsModelRootItem(FeedsModelRootItem *parent_item) diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp index ad605338d..65297c8e1 100755 --- a/src/core/feedsmodelstandardcategory.cpp +++ b/src/core/feedsmodelstandardcategory.cpp @@ -1,10 +1,11 @@ -#include - -#include "core/textfactory.h" #include "core/feedsmodelstandardcategory.h" + #include "core/defs.h" +#include "core/textfactory.h" #include "gui/iconfactory.h" +#include + FeedsModelStandardCategory::FeedsModelStandardCategory(FeedsModelRootItem *parent_item) : FeedsModelCategory(parent_item) { diff --git a/src/core/feedsmodelstandardcategory.h b/src/core/feedsmodelstandardcategory.h index c3a9fbadf..e3d10bd7c 100644 --- a/src/core/feedsmodelstandardcategory.h +++ b/src/core/feedsmodelstandardcategory.h @@ -1,11 +1,11 @@ #ifndef FEEDSMODELSTANDARDCATEGORY_H #define FEEDSMODELSTANDARDCATEGORY_H +#include "core/feedsmodelcategory.h" + #include #include -#include "core/feedsmodelcategory.h" - // Represents STANDARD category container. // Standard category container can contain: diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index 5cd44cf45..e14c5a874 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/src/core/feedsmodelstandardfeed.cpp @@ -1,9 +1,10 @@ -#include +#include "core/feedsmodelstandardfeed.h" #include "core/defs.h" #include "gui/iconfactory.h" #include "gui/iconthemefactory.h" -#include "core/feedsmodelstandardfeed.h" + +#include FeedsModelStandardFeed::FeedsModelStandardFeed(FeedsModelRootItem *parent_item) diff --git a/src/core/feedsmodelstandardfeed.h b/src/core/feedsmodelstandardfeed.h index 4fd153dbc..748d5b88b 100644 --- a/src/core/feedsmodelstandardfeed.h +++ b/src/core/feedsmodelstandardfeed.h @@ -1,11 +1,11 @@ #ifndef FEEDSMODELSTANDARDFEED_H #define FEEDSMODELSTANDARDFEED_H +#include "core/feedsmodelfeed.h" + #include #include -#include "core/feedsmodelfeed.h" - // Represents STANDARD RSS/RDF/ATOM feed with no // online synchronization services (NO TT-RSS, NO FEEDLY). diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp index 8dcac04e8..bb1af1066 100755 --- a/src/core/feedsproxymodel.cpp +++ b/src/core/feedsproxymodel.cpp @@ -1,9 +1,10 @@ #include "core/feedsproxymodel.h" + +#include "core/defs.h" #include "core/feedsmodel.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" #include "core/feedsmodelrootitem.h" -#include "core/defs.h" FeedsProxyModel::FeedsProxyModel(QObject *parent) diff --git a/src/core/localization.cpp b/src/core/localization.cpp index 6c12d6c4f..ca31c1ad1 100644 --- a/src/core/localization.cpp +++ b/src/core/localization.cpp @@ -1,12 +1,13 @@ +#include "core/localization.h" + +#include "core/defs.h" +#include "core/settings.h" +#include "qtsingleapplication/qtsingleapplication.h" + #include #include #include -#include "qtsingleapplication/qtsingleapplication.h" -#include "core/localization.h" -#include "core/defs.h" -#include "core/settings.h" - Localization::Localization() { } diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index b8d304864..a2681309e 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -1,14 +1,14 @@ -#include -#include -#include - -#include "qtsingleapplication/qtsingleapplication.h" +#include "core/messagesmodel.h" #include "core/defs.h" #include "core/textfactory.h" -#include "core/messagesmodel.h" #include "core/databasefactory.h" #include "gui/iconthemefactory.h" +#include "qtsingleapplication/qtsingleapplication.h" + +#include +#include +#include MessagesModel::MessagesModel(QObject *parent) diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h index 02ab979d4..e6273a4a3 100644 --- a/src/core/messagesmodel.h +++ b/src/core/messagesmodel.h @@ -1,13 +1,13 @@ #ifndef MESSAGESMODEL_H #define MESSAGESMODEL_H +#include "core/defs.h" + #include #include #include #include -#include "core/defs.h" - // Represents single message. class Message { diff --git a/src/core/messagesproxymodel.cpp b/src/core/messagesproxymodel.cpp index 9d93eaf77..7370b6ad2 100644 --- a/src/core/messagesproxymodel.cpp +++ b/src/core/messagesproxymodel.cpp @@ -1,4 +1,5 @@ #include "core/messagesproxymodel.h" + #include "core/messagesmodel.h" diff --git a/src/core/parsingfactory.cpp b/src/core/parsingfactory.cpp index 494ff8c62..75c9c2c9b 100644 --- a/src/core/parsingfactory.cpp +++ b/src/core/parsingfactory.cpp @@ -1,9 +1,10 @@ +#include "core/parsingfactory.h" + +#include "core/textfactory.h" + #include #include -#include "core/parsingfactory.h" -#include "core/textfactory.h" - ParsingFactory::ParsingFactory() { } diff --git a/src/core/parsingfactory.h b/src/core/parsingfactory.h index b24708db1..06fec1560 100644 --- a/src/core/parsingfactory.h +++ b/src/core/parsingfactory.h @@ -1,10 +1,10 @@ #ifndef PARSINGFACTORY_H #define PARSINGFACTORY_H -#include - #include "core/messagesmodel.h" +#include + class ParsingFactory { private: diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 431269aa6..0c822176f 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -1,12 +1,13 @@ +#include "core/settings.h" + +#include "core/defs.h" + #include #include #include #include #include -#include "core/settings.h" -#include "core/defs.h" - QPointer Settings::s_instance; diff --git a/src/core/systemfactory.cpp b/src/core/systemfactory.cpp index b86166387..6c45f4936 100644 --- a/src/core/systemfactory.cpp +++ b/src/core/systemfactory.cpp @@ -1,16 +1,18 @@ +#include "core/systemfactory.h" + +#include "core/defs.h" + +#if defined(Q_OS_WIN) +#include "qtsingleapplication/qtsingleapplication.h" + +#include +#endif + #include #include #include #include -#if defined(Q_OS_WIN) -#include -#include "qtsingleapplication/qtsingleapplication.h" -#endif - -#include "core/systemfactory.h" -#include "core/defs.h" - QPointer SystemFactory::s_instance; @@ -125,7 +127,7 @@ bool SystemFactory::setAutoStartStatus(const AutoStartStatus &new_status) { // "rssguard.desktop" desktop file. switch (new_status) { case SystemFactory::Enabled: - QFile::link(QString(APP_DESKTOP_ENTRY_PATH) + "/" + APP_DESKTOP_ENTRY_FILE, + QFile::link(QString(APP_DESKTOP_ENTRY_PATH) + '/' + APP_DESKTOP_ENTRY_FILE, getAutostartDesktopFileLocation()); return true; case SystemFactory::Disabled: diff --git a/src/core/textfactory.cpp b/src/core/textfactory.cpp index 4f5a47454..3c1ac914e 100644 --- a/src/core/textfactory.cpp +++ b/src/core/textfactory.cpp @@ -1,11 +1,12 @@ +#include "core/textfactory.h" + +#include "core/defs.h" + #include #include #include #include -#include "core/defs.h" -#include "core/textfactory.h" - TextFactory::TextFactory() { } diff --git a/src/core/textfactory.h b/src/core/textfactory.h index d3f1dcfee..271593489 100644 --- a/src/core/textfactory.h +++ b/src/core/textfactory.h @@ -1,10 +1,10 @@ #ifndef TEXTFACTORY_H #define TEXTFACTORY_H -#include - #include "core/defs.h" +#include + class TextFactory { private: diff --git a/src/gui/baselineedit.cpp b/src/gui/baselineedit.cpp index 05010c94c..f4943001f 100644 --- a/src/gui/baselineedit.cpp +++ b/src/gui/baselineedit.cpp @@ -1,7 +1,7 @@ -#include - #include "gui/baselineedit.h" +#include + BaseLineEdit::BaseLineEdit(QWidget *parent) : QLineEdit(parent) { } diff --git a/src/gui/basewebview.cpp b/src/gui/basewebview.cpp index 3cea2bddc..ca952e220 100644 --- a/src/gui/basewebview.cpp +++ b/src/gui/basewebview.cpp @@ -1,3 +1,11 @@ +#include "gui/basewebview.h" + +#include "core/defs.h" +#include "core/settings.h" +#include "core/basewebpage.h" +#include "gui/skinfactory.h" +#include "gui/iconthemefactory.h" + #include #include #include @@ -7,13 +15,6 @@ #include #include -#include "core/defs.h" -#include "core/settings.h" -#include "core/basewebpage.h" -#include "gui/basewebview.h" -#include "gui/skinfactory.h" -#include "gui/iconthemefactory.h" - BaseWebView::BaseWebView(QWidget *parent) : QWebView(parent), m_page(new BaseWebPage(this)) { diff --git a/src/gui/cornerbutton.cpp b/src/gui/cornerbutton.cpp index dd9de2901..d689bc71a 100644 --- a/src/gui/cornerbutton.cpp +++ b/src/gui/cornerbutton.cpp @@ -1,4 +1,5 @@ #include "gui/cornerbutton.h" + #include "gui/iconthemefactory.h" diff --git a/src/gui/dynamicshortcutswidget.cpp b/src/gui/dynamicshortcutswidget.cpp index fbce426f4..1942d4cde 100755 --- a/src/gui/dynamicshortcutswidget.cpp +++ b/src/gui/dynamicshortcutswidget.cpp @@ -1,14 +1,15 @@ +#include "gui/dynamicshortcutswidget.h" + +#include "core/defs.h" +#include "gui/shortcutcatcher.h" +#include "gui/shortcutbutton.h" + #include #include #include #include #include -#include "core/defs.h" -#include "gui/dynamicshortcutswidget.h" -#include "gui/shortcutcatcher.h" -#include "gui/shortcutbutton.h" - DynamicShortcutsWidget::DynamicShortcutsWidget(QWidget *parent) : QWidget(parent) { // Create layout for this control and set is as active. @@ -42,7 +43,7 @@ bool DynamicShortcutsWidget::areShortcutsUnique() { } void DynamicShortcutsWidget::updateShortcuts() { - foreach (ActionBinding binding, m_actionBindings) { + foreach (const ActionBinding &binding, m_actionBindings) { binding.first->setShortcut(binding.second->shortcut()); } } diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 91415afae..9dfdef116 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -1,3 +1,13 @@ +#include "gui/feedmessageviewer.h" + +#include "core/settings.h" +#include "core/messagesproxymodel.h" +#include "gui/webbrowser.h" +#include "gui/formmain.h" +#include "gui/iconthemefactory.h" +#include "gui/messagesview.h" +#include "gui/feedsview.h" + #include #include #include @@ -8,15 +18,6 @@ #include #include -#include "gui/feedmessageviewer.h" -#include "gui/webbrowser.h" -#include "gui/formmain.h" -#include "gui/iconthemefactory.h" -#include "gui/messagesview.h" -#include "gui/feedsview.h" -#include "core/messagesproxymodel.h" -#include "core/settings.h" - FeedMessageViewer::FeedMessageViewer(QWidget *parent) : TabContent(parent), diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index c0fc823ac..fb595a938 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -1,11 +1,13 @@ -#include - -#include "core/feedsmodelfeed.h" #include "gui/feedsview.h" + +#include "core/defs.h" +#include "core/feedsmodelfeed.h" #include "core/feedsmodel.h" #include "core/feedsproxymodel.h" #include "core/feedsmodelrootitem.h" -#include "core/defs.h" + + +#include FeedsView::FeedsView(QWidget *parent) : QTreeView(parent) { diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index 02e3713ae..53f05dbfa 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -1,10 +1,11 @@ -#include -#include +#include "gui/formabout.h" #include "core/textfactory.h" -#include "gui/formabout.h" #include "gui/iconthemefactory.h" +#include +#include + FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) { m_ui->setupUi(this); @@ -83,5 +84,6 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) } FormAbout::~FormAbout() { + qDebug("Destroying FormAbout instance."); delete m_ui; } diff --git a/src/gui/formabout.h b/src/gui/formabout.h index cf8dd2e67..75f3f5d77 100644 --- a/src/gui/formabout.h +++ b/src/gui/formabout.h @@ -1,11 +1,12 @@ #ifndef FORMABOUT_H #define FORMABOUT_H -#include - #include "ui_formabout.h" + #include "core/defs.h" +#include + namespace Ui { class FormAbout; diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 79b7958dc..eb1391513 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -1,10 +1,7 @@ -#include -#include -#include -#include -#include - #include "gui/formmain.h" + +#include "core/defs.h" +#include "core/settings.h" #include "gui/formabout.h" #include "gui/formsettings.h" #include "gui/webbrowser.h" @@ -12,11 +9,15 @@ #include "gui/systemtrayicon.h" #include "gui/tabbar.h" #include "gui/statusbar.h" -#include "core/settings.h" #include "gui/feedmessageviewer.h" -#include "core/defs.h" #include "qtsingleapplication/qtsingleapplication.h" +#include +#include +#include +#include +#include + FormMain *FormMain::s_instance; @@ -314,12 +315,18 @@ void FormMain::closeEvent(QCloseEvent *event) { } void FormMain::showAbout() { - FormAbout(this).exec(); + QPointer form_pointer = new FormAbout(this); + form_pointer.data()->exec(); + delete form_pointer.data(); } void FormMain::showSettings() { - if (FormSettings(this).exec() == QDialog::Accepted) { + QPointer form_pointer = new FormSettings(this); + + if (form_pointer.data()->exec() == QDialog::Accepted) { // User applied new settings, reload neede components. m_ui->m_tabWidget->checkTabBarVisibility(); } + + delete form_pointer.data(); } diff --git a/src/gui/formmain.h b/src/gui/formmain.h index 4e98e133c..4222faed8 100644 --- a/src/gui/formmain.h +++ b/src/gui/formmain.h @@ -1,11 +1,11 @@ #ifndef FORMMAIN_H #define FORMMAIN_H +#include "ui_formmain.h" + #include #include -#include "ui_formmain.h" - class FormMain : public QMainWindow { Q_OBJECT diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index b92784a17..169529b9a 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -1,21 +1,22 @@ -#include -#include -#include -#include -#include - #include "gui/formsettings.h" + +#include "core/defs.h" +#include "core/settings.h" +#include "core/localization.h" +#include "core/systemfactory.h" +#include "core/dynamicshortcuts.h" +#include "core/webbrowsernetworkaccessmanager.h" #include "gui/iconthemefactory.h" #include "gui/skinfactory.h" #include "gui/systemtrayicon.h" #include "gui/formmain.h" #include "gui/webbrowser.h" -#include "core/settings.h" -#include "core/defs.h" -#include "core/localization.h" -#include "core/systemfactory.h" -#include "core/dynamicshortcuts.h" -#include "core/webbrowsernetworkaccessmanager.h" + +#include +#include +#include +#include +#include FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormSettings) { @@ -78,7 +79,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form this, SLOT(onProxyTypeChanged(int))); connect(m_ui->m_checkShowPassword, SIGNAL(stateChanged(int)), this, SLOT(displayProxyPassword(int))); - connect(m_ui->m_btnBrowserProgressColor, SIGNAL(clicked()), + connect(m_ui->m_btnWebBrowserColorSample, SIGNAL(clicked()), this, SLOT(changeBrowserProgressColor())); connect(m_ui->m_treeSkins, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(onSkinSelected(QTreeWidgetItem*,QTreeWidgetItem*))); @@ -98,6 +99,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form } FormSettings::~FormSettings() { + qDebug("Destroying FormSettings distance."); delete m_ui; } @@ -118,14 +120,17 @@ void FormSettings::onSkinSelected(QTreeWidgetItem *current, } void FormSettings::changeBrowserProgressColor() { - QColorDialog color_dialog(m_initialSettings.m_webBrowserProgress, this); - color_dialog.setWindowTitle(tr("Select color for web browser progress bar")); - color_dialog.setOption(QColorDialog::ShowAlphaChannel); + QPointer color_dialog = new QColorDialog(m_initialSettings.m_webBrowserProgress, + this); + color_dialog.data()->setWindowTitle(tr("Select color for web browser progress bar")); + color_dialog.data()->setOption(QColorDialog::ShowAlphaChannel); - if (color_dialog.exec() == QDialog::Accepted) { - m_initialSettings.m_webBrowserProgress = color_dialog.selectedColor(); + if (color_dialog.data()->exec() == QDialog::Accepted) { + m_initialSettings.m_webBrowserProgress = color_dialog.data()->selectedColor(); loadWebBrowserColor(m_initialSettings.m_webBrowserProgress); } + + delete color_dialog.data(); } void FormSettings::selectBrowserExecutable() { @@ -191,14 +196,16 @@ bool FormSettings::doSaveCheck() { QString::fromUtf8(" • ")); // Some critical errors occurred, display warnings. - QMessageBox msg_error(this); - msg_error.setText(tr("Some critical settings are not set. You must fix these settings in order confirm new settings.")); - msg_error.setWindowTitle(tr("Cannot save settings")); - msg_error.setDetailedText(tr("List of errors:\n%1.").arg(resulting_information.join(",\n"))); - msg_error.setIcon(QMessageBox::Critical); - msg_error.setStandardButtons(QMessageBox::Ok); - msg_error.setDefaultButton(QMessageBox::Ok); - msg_error.exec(); + QPointer msg_error = new QMessageBox(this); + msg_error.data()->setText(tr("Some critical settings are not set. You must fix these settings in order confirm new settings.")); + msg_error.data()->setWindowTitle(tr("Cannot save settings")); + msg_error.data()->setDetailedText(tr("List of errors:\n%1.").arg(resulting_information.join(",\n"))); + msg_error.data()->setIcon(QMessageBox::Critical); + msg_error.data()->setStandardButtons(QMessageBox::Ok); + msg_error.data()->setDefaultButton(QMessageBox::Ok); + msg_error.data()->exec(); + + delete msg_error.data(); } return everything_ok; @@ -218,16 +225,20 @@ void FormSettings::promptForRestart() { changed_data_texts.replaceInStrings(QRegExp("^"), QString::fromUtf8(" • ")); - QMessageBox msg_question(this); - msg_question.setText(tr("Some critical settings were changed and will be applied after the application gets restarted.")); - msg_question.setInformativeText(tr("Do you want to restart now?")); - msg_question.setWindowTitle(tr("Critical settings were changed")); - msg_question.setDetailedText(tr("List of changes:\n%1.").arg(changed_data_texts.join(",\n"))); - msg_question.setIcon(QMessageBox::Question); - msg_question.setStandardButtons(QMessageBox::Yes | QMessageBox::No); - msg_question.setDefaultButton(QMessageBox::Yes); + QPointer msg_question = new QMessageBox(this); + msg_question.data()->setText(tr("Some critical settings were changed and will be applied after the application gets restarted.")); + msg_question.data()->setInformativeText(tr("Do you want to restart now?")); + msg_question.data()->setWindowTitle(tr("Critical settings were changed")); + msg_question.data()->setDetailedText(tr("List of changes:\n%1.").arg(changed_data_texts.join(",\n"))); + msg_question.data()->setIcon(QMessageBox::Question); + msg_question.data()->setStandardButtons(QMessageBox::Yes | QMessageBox::No); + msg_question.data()->setDefaultButton(QMessageBox::Yes); - if (msg_question.exec() == QMessageBox::Yes) { + int question_result = msg_question.data()->exec(); + + delete msg_question.data(); + + if (question_result == QMessageBox::Yes) { if (!QProcess::startDetached(qApp->applicationFilePath())) { QMessageBox::warning(this, tr("Problem with application restart"), @@ -364,7 +375,7 @@ void FormSettings::loadLanguage() { item->setText(2, language.m_version); item->setText(3, language.m_author); item->setText(4, language.m_email); - item->setIcon(0, QIcon(APP_FLAGS_PATH + "/" + language.m_code + ".png")); + item->setIcon(0, QIcon(APP_FLAGS_PATH + '/' + language.m_code + ".png")); } QList matching_items = m_ui->m_treeLanguages->findItems(Settings::getInstance()->value(APP_CFG_GEN, diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h index 12391ac85..e50302f90 100644 --- a/src/gui/formsettings.h +++ b/src/gui/formsettings.h @@ -1,10 +1,10 @@ #ifndef FORMSETTINGS_H #define FORMSETTINGS_H -#include - #include "ui_formsettings.h" +#include + namespace Ui { class FormSettings; diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index b99c7d11b..79ca42dfc 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -6,7 +6,7 @@ 0 0 - 803 + 808 410 @@ -69,8 +69,8 @@ 0 0 - 559 - 363 + 100 + 30 @@ -147,8 +147,8 @@ 0 0 - 553 - 337 + 195 + 238 @@ -436,28 +436,14 @@ - - - - - 0 - 0 - - - - &Change... - - - - - - - Current color - - - + + + 50 + 0 + + true @@ -936,22 +922,6 @@ - - m_checkBrowserProgressColor - toggled(bool) - m_btnBrowserProgressColor - setEnabled(bool) - - - 300 - 48 - - - 577 - 63 - - - m_checkBrowserProgressColor toggled(bool) diff --git a/src/gui/formwelcome.cpp b/src/gui/formwelcome.cpp index a9cfaf4e8..9f34fea4b 100644 --- a/src/gui/formwelcome.cpp +++ b/src/gui/formwelcome.cpp @@ -1,10 +1,11 @@ +#include "gui/formwelcome.h" + +#include "core/defs.h" + #include #include #include -#include "gui/formwelcome.h" -#include "core/defs.h" - FormWelcome::FormWelcome(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormWelcome) { m_ui->setupUi(this); diff --git a/src/gui/formwelcome.h b/src/gui/formwelcome.h index 4159b8cdf..3ac28a4e3 100644 --- a/src/gui/formwelcome.h +++ b/src/gui/formwelcome.h @@ -1,10 +1,10 @@ #ifndef FORMWELCOME_H #define FORMWELCOME_H -#include - #include "ui_formwelcome.h" +#include + namespace Ui { class FormWelcome; diff --git a/src/gui/iconfactory.cpp b/src/gui/iconfactory.cpp index e90eb8003..fbb77cc69 100644 --- a/src/gui/iconfactory.cpp +++ b/src/gui/iconfactory.cpp @@ -1,7 +1,7 @@ -#include - #include "gui/iconfactory.h" +#include + IconFactory::IconFactory() { } diff --git a/src/gui/iconfactory.h b/src/gui/iconfactory.h index c1c13c085..02080c540 100644 --- a/src/gui/iconfactory.h +++ b/src/gui/iconfactory.h @@ -6,12 +6,12 @@ class IconFactory { private: - IconFactory(); + explicit IconFactory(); public: + // Used to store/retrieve QIcons from/to database. static QIcon fromByteArray(QByteArray array); static QByteArray toByteArray(const QIcon &icon); - }; #endif // ICONFACTORY_H diff --git a/src/gui/iconthemefactory.cpp b/src/gui/iconthemefactory.cpp index d738a3bfe..41bc7be02 100755 --- a/src/gui/iconthemefactory.cpp +++ b/src/gui/iconthemefactory.cpp @@ -1,3 +1,9 @@ +#include "gui/iconthemefactory.h" + +#include "core/defs.h" +#include "core/settings.h" +#include "qtsingleapplication/qtsingleapplication.h" + #include #include #include @@ -5,11 +11,6 @@ #include #include -#include "gui/iconthemefactory.h" -#include "qtsingleapplication/qtsingleapplication.h" -#include "core/settings.h" -#include "core/defs.h" - QPointer IconThemeFactory::s_instance; diff --git a/src/gui/locationlineedit.cpp b/src/gui/locationlineedit.cpp index 861dd55bb..53c341b72 100644 --- a/src/gui/locationlineedit.cpp +++ b/src/gui/locationlineedit.cpp @@ -1,12 +1,13 @@ +#include "gui/locationlineedit.h" + +#include "core/defs.h" +#include "core/settings.h" + #include #include #include #include -#include "core/defs.h" -#include "core/settings.h" -#include "gui/locationlineedit.h" - LocationLineEdit::LocationLineEdit(QWidget *parent) : BaseLineEdit(parent), diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 8d4eb7a97..fee539f85 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -1,3 +1,10 @@ +#include "gui/messagesview.h" + +#include "core/messagesproxymodel.h" +#include "core/messagesmodel.h" +#include "core/settings.h" +#include "gui/formmain.h" + #include #include #include @@ -5,12 +12,6 @@ #include #include -#include "gui/messagesview.h" -#include "gui/formmain.h" -#include "core/messagesproxymodel.h" -#include "core/messagesmodel.h" -#include "core/settings.h" - MessagesView::MessagesView(QWidget *parent) : QTreeView(parent), m_contextMenu(NULL), m_batchUnreadSwitch(false) { diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h index b96c0344b..3266334b9 100755 --- a/src/gui/messagesview.h +++ b/src/gui/messagesview.h @@ -1,10 +1,10 @@ #ifndef MESSAGESVIEW_H #define MESSAGESVIEW_H -#include - #include "core/messagesmodel.h" +#include + class MessagesProxyModel; diff --git a/src/gui/shortcutbutton.cpp b/src/gui/shortcutbutton.cpp index c31b87363..868a514ae 100644 --- a/src/gui/shortcutbutton.cpp +++ b/src/gui/shortcutbutton.cpp @@ -26,11 +26,12 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -#include - #include "gui/shortcutbutton.h" + #include "gui/shortcutcatcher.h" +#include + ShortcutButton::ShortcutButton(ShortcutCatcher *catcher, QWidget *parent) : QPushButton(parent), m_catcher(catcher) { diff --git a/src/gui/shortcutcatcher.cpp b/src/gui/shortcutcatcher.cpp index a3165ff6d..ca0a2c272 100644 --- a/src/gui/shortcutcatcher.cpp +++ b/src/gui/shortcutcatcher.cpp @@ -26,13 +26,14 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -#include -#include - #include "gui/shortcutcatcher.h" + #include "gui/shortcutbutton.h" #include "gui/iconthemefactory.h" +#include +#include + ShortcutCatcher::ShortcutCatcher(QWidget *parent) : QWidget(parent) { diff --git a/src/gui/skinfactory.cpp b/src/gui/skinfactory.cpp index 84bbae879..21dd9e5d1 100644 --- a/src/gui/skinfactory.cpp +++ b/src/gui/skinfactory.cpp @@ -1,13 +1,14 @@ +#include "gui/skinfactory.h" + +#include "core/defs.h" +#include "core/settings.h" + #include #include #include #include #include -#include "core/defs.h" -#include "core/settings.h" -#include "gui/skinfactory.h" - QPointer SkinFactory::s_instance; @@ -72,7 +73,7 @@ bool SkinFactory::loadSkinFromData(const Skin &skin) { if (!raw_data.isEmpty()) { QString parsed_data = raw_data.replace("##", - APP_SKIN_PATH + "/" + + APP_SKIN_PATH + '/' + skin_folder + "/images"); qApp->setStyleSheet(parsed_data); } @@ -119,7 +120,7 @@ Skin SkinFactory::getSkinInfo(const QString &skin_name, bool *ok) { // Obtain visible skin name. query.setQuery("string(skin/name)"); query.evaluateTo(&skin.m_visibleName); - skin.m_visibleName = skin.m_visibleName.remove("\n"); + skin.m_visibleName = skin.m_visibleName.remove('\n'); // Obtain skin raw data. query.setQuery("string(skin/data)"); @@ -129,22 +130,22 @@ Skin SkinFactory::getSkinInfo(const QString &skin_name, bool *ok) { // Obtain style name. query.setQuery("string(/skin/style)"); query.evaluateTo(&styles); - skin.m_stylesNames = styles.remove("\n").split(",", QString::SkipEmptyParts); + skin.m_stylesNames = styles.remove('\n').split(",", QString::SkipEmptyParts); // Obtain author. query.setQuery("string(/skin/author/name)"); query.evaluateTo(&skin.m_author); - skin.m_author = skin.m_author.remove("\n"); + skin.m_author = skin.m_author.remove('\n'); // Obtain email. query.setQuery("string(/skin/author/email)"); query.evaluateTo(&skin.m_email); - skin.m_email = skin.m_email.remove("\n"); + skin.m_email = skin.m_email.remove('\n'); // Obtain version. query.setQuery("string(/skin/@version)"); query.evaluateTo(&skin.m_version); - skin.m_version = skin.m_version.remove("\n"); + skin.m_version = skin.m_version.remove('\n'); // Obtain layout markup. query.setQuery("string(/skin/markup)"); diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp index 71cceccdb..5b6538b34 100644 --- a/src/gui/systemtrayicon.cpp +++ b/src/gui/systemtrayicon.cpp @@ -1,14 +1,15 @@ +#include "gui/systemtrayicon.h" + +#include "core/defs.h" +#include "core/settings.h" +#include "gui/formmain.h" +#include "gui/formsettings.h" +#include "qtsingleapplication/qtsingleapplication.h" + #include #include #include -#include "gui/systemtrayicon.h" -#include "gui/formmain.h" -#include "gui/formsettings.h" -#include "core/settings.h" -#include "core/defs.h" -#include "qtsingleapplication/qtsingleapplication.h" - #if defined(Q_OS_WIN) TrayIconMenu::TrayIconMenu(const QString &title, QWidget *parent) diff --git a/src/gui/tabbar.cpp b/src/gui/tabbar.cpp index daf47185f..6a99c698e 100644 --- a/src/gui/tabbar.cpp +++ b/src/gui/tabbar.cpp @@ -1,8 +1,9 @@ -#include +#include "gui/tabbar.h" #include "core/defs.h" #include "core/settings.h" -#include "gui/tabbar.h" + +#include TabBar::TabBar(QWidget *parent) : QTabBar(parent) { diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index ef4bdc71e..d564545f8 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -1,16 +1,17 @@ -#include -#include +#include "gui/tabwidget.h" #include "core/defs.h" #include "core/settings.h" #include "core/textfactory.h" -#include "gui/tabwidget.h" #include "gui/tabbar.h" #include "gui/iconthemefactory.h" #include "gui/webbrowser.h" #include "gui/feedmessageviewer.h" #include "gui/cornerbutton.h" +#include +#include + TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent) { setTabBar(new TabBar(this)); diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h index f2c593ed3..d4a6cc216 100644 --- a/src/gui/tabwidget.h +++ b/src/gui/tabwidget.h @@ -1,12 +1,12 @@ #ifndef TABWIDGET_H #define TABWIDGET_H -#include -#include - #include "gui/tabbar.h" #include "gui/tabcontent.h" +#include +#include + class CornerButton; class Message; diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index a29b7caf9..0eaa640f4 100644 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -1,3 +1,16 @@ +#include "gui/webbrowser.h" + +#include "core/defs.h" +#include "core/basenetworkaccessmanager.h" +#include "core/webbrowsernetworkaccessmanager.h" +#include "core/basewebpage.h" +#include "gui/skinfactory.h" +#include "gui/basewebview.h" +#include "gui/formmain.h" +#include "gui/locationlineedit.h" +#include "gui/iconthemefactory.h" +#include "gui/tabwidget.h" + #include #include #include @@ -6,23 +19,10 @@ #include #include #include - #include #include #include -#include "core/defs.h" -#include "core/basenetworkaccessmanager.h" -#include "core/webbrowsernetworkaccessmanager.h" -#include "core/basewebpage.h" -#include "gui/skinfactory.h" -#include "gui/basewebview.h" -#include "gui/webbrowser.h" -#include "gui/formmain.h" -#include "gui/locationlineedit.h" -#include "gui/iconthemefactory.h" -#include "gui/tabwidget.h" - QPointer WebBrowser::m_networkManager; QList WebBrowser::m_runningWebBrowsers; diff --git a/src/main.cpp b/src/main.cpp index 55b591274..de81168f4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,12 +1,5 @@ -// Needed for setting ini file format on Mac OS. -#ifdef Q_OS_MAC -#include -#endif - -#include - -#include "core/databasefactory.h" #include "core/defs.h" +#include "core/databasefactory.h" #include "core/debugging.h" #include "core/localization.h" #include "core/settings.h" @@ -18,6 +11,12 @@ #include "gui/systemtrayicon.h" #include "qtsingleapplication/qtsingleapplication.h" +// Needed for setting ini file format on Mac OS. +#ifdef Q_OS_MAC +#include +#endif + +#include // TODO: Check if extra UNIX signalling is needed. diff --git a/src/qtsingleapplication/qtlocalpeer.h b/src/qtsingleapplication/qtlocalpeer.h index 1b533b1ab..9407b9c81 100644 --- a/src/qtsingleapplication/qtlocalpeer.h +++ b/src/qtsingleapplication/qtlocalpeer.h @@ -52,7 +52,7 @@ class QtLocalPeer : public QObject Q_OBJECT public: - QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); + explicit QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); bool isClient(); bool sendMessage(const QString &message, int timeout); QString applicationId() const diff --git a/src/qtsingleapplication/qtlockedfile.h b/src/qtsingleapplication/qtlockedfile.h index 84c18e5c9..d21ef2bab 100644 --- a/src/qtsingleapplication/qtlockedfile.h +++ b/src/qtsingleapplication/qtlockedfile.h @@ -69,8 +69,8 @@ class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile public: enum LockMode { NoLock = 0, ReadLock, WriteLock }; - QtLockedFile(); - QtLockedFile(const QString &name); + explicit QtLockedFile(); + explicit QtLockedFile(const QString &name); ~QtLockedFile(); bool open(OpenMode mode); diff --git a/src/qtsingleapplication/qtsingleapplication.h b/src/qtsingleapplication/qtsingleapplication.h index 049406f72..381b77aad 100644 --- a/src/qtsingleapplication/qtsingleapplication.h +++ b/src/qtsingleapplication/qtsingleapplication.h @@ -66,14 +66,14 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication Q_OBJECT public: - QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); - QtSingleApplication(const QString &id, int &argc, char **argv); + explicit QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); + explicit QtSingleApplication(const QString &id, int &argc, char **argv); #if QT_VERSION < 0x050000 - QtSingleApplication(int &argc, char **argv, Type type); + explicit QtSingleApplication(int &argc, char **argv, Type type); # if defined(Q_WS_X11) - QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); - QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0); - QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); + explicit QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); + explicit QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0); + explicit QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); # endif // Q_WS_X11 #endif // QT_VERSION < 0x050000