From d7470c7465364d779e9dc90b4c9e942932aec19d Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 11 Jan 2016 13:00:37 +0100 Subject: [PATCH] Const refactoring. --- src/core/feedsmodel.cpp | 8 +-- src/core/feedsmodel.h | 2 +- src/exceptions/ioexception.h | 20 ++++++- src/gui/dialogs/formabout.cpp | 8 --- src/gui/dialogs/formaddaccount.cpp | 16 ++--- src/gui/dialogs/formaddaccount.h | 4 +- .../dialogs/formbackupdatabasesettings.cpp | 4 +- src/gui/dialogs/formbackupdatabasesettings.h | 2 +- src/gui/dialogs/formdatabasecleanup.cpp | 2 +- src/gui/dialogs/formdatabasecleanup.h | 3 +- src/gui/dialogs/formmain.cpp | 60 +++++++++---------- src/gui/dialogs/formmain.h | 10 ++-- src/gui/dialogs/formsettings.cpp | 4 -- src/gui/dialogs/formupdate.cpp | 4 -- src/gui/messagebox.cpp | 39 ------------ src/gui/messagebox.h | 8 --- src/miscellaneous/settings.h | 4 +- src/network-web/webbrowser.h | 2 +- src/services/abstract/serviceentrypoint.h | 14 ++--- src/services/abstract/serviceroot.h | 4 +- .../gui/formstandardcategorydetails.cpp | 4 -- .../standard/gui/formstandardfeeddetails.cpp | 4 -- .../standard/standardserviceentrypoint.cpp | 14 ++--- .../standard/standardserviceentrypoint.h | 14 ++--- src/services/standard/standardserviceroot.cpp | 4 +- src/services/standard/standardserviceroot.h | 4 +- .../tt-rss/ttrssserviceentrypoint.cpp | 14 ++--- src/services/tt-rss/ttrssserviceentrypoint.h | 14 ++--- src/services/tt-rss/ttrssserviceroot.cpp | 4 +- src/services/tt-rss/ttrssserviceroot.h | 4 +- 30 files changed, 115 insertions(+), 183 deletions(-) mode change 100644 => 100755 src/exceptions/ioexception.h mode change 100644 => 100755 src/gui/dialogs/formbackupdatabasesettings.h mode change 100644 => 100755 src/gui/dialogs/formdatabasecleanup.h mode change 100644 => 100755 src/gui/messagebox.h diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 9ca61141a..ba24a3c60 100755 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -495,9 +495,9 @@ QList FeedsModel::serviceRoots() const { return roots; } -bool FeedsModel::containsServiceRootFromEntryPoint(ServiceEntryPoint *point) const { - foreach (RootItem *root, serviceRoots()) { - if (root->toServiceRoot()->code() == point->code()) { +bool FeedsModel::containsServiceRootFromEntryPoint(const ServiceEntryPoint *point) const { + foreach (const ServiceRoot *root, serviceRoots()) { + if (root->code() == point->code()) { return true; } } @@ -506,7 +506,7 @@ bool FeedsModel::containsServiceRootFromEntryPoint(ServiceEntryPoint *point) con } StandardServiceRoot *FeedsModel::standardServiceRoot() const { - foreach (RootItem *root, serviceRoots()) { + foreach (ServiceRoot *root, serviceRoots()) { StandardServiceRoot *std_service_root; if ((std_service_root = dynamic_cast(root)) != NULL) { diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h index 2042f8d30..ca7a31922 100755 --- a/src/core/feedsmodel.h +++ b/src/core/feedsmodel.h @@ -84,7 +84,7 @@ class FeedsModel : public QAbstractItemModel { QList serviceRoots() const; // Determines if there is any account activated from given entry point. - bool containsServiceRootFromEntryPoint(ServiceEntryPoint *point) const; + bool containsServiceRootFromEntryPoint(const ServiceEntryPoint *point) const; // Direct and the only global accessor to standard service root. // NOTE: Standard service root is always activated. diff --git a/src/exceptions/ioexception.h b/src/exceptions/ioexception.h old mode 100644 new mode 100755 index 552aa8755..5efc3fe11 --- a/src/exceptions/ioexception.h +++ b/src/exceptions/ioexception.h @@ -1,11 +1,27 @@ +// This file is part of RSS Guard. +// +// Copyright (C) 2011-2015 by Martin Rotter +// +// RSS Guard is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// RSS Guard is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with RSS Guard. If not, see . + #ifndef IOEXCEPTION_H #define IOEXCEPTION_H #include "exceptions/applicationexception.h" -class IOException : public ApplicationException -{ +class IOException : public ApplicationException { public: explicit IOException(const QString &message = QString()); virtual ~IOException(); diff --git a/src/gui/dialogs/formabout.cpp b/src/gui/dialogs/formabout.cpp index a075c3e08..4e6666254 100755 --- a/src/gui/dialogs/formabout.cpp +++ b/src/gui/dialogs/formabout.cpp @@ -21,10 +21,6 @@ #include "miscellaneous/textfactory.h" #include "miscellaneous/settingsproperties.h" -#if !defined(Q_OS_WIN) -#include "gui/messagebox.h" -#endif - #include #include @@ -39,10 +35,6 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout( //: About RSS Guard dialog title. setWindowTitle(tr("About %1").arg(APP_NAME)); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - m_ui->m_lblIcon->setPixmap(QPixmap(APP_ICON_PATH)); // Load information from embedded text files. diff --git a/src/gui/dialogs/formaddaccount.cpp b/src/gui/dialogs/formaddaccount.cpp index 945a6d28e..4a37e7fcc 100755 --- a/src/gui/dialogs/formaddaccount.cpp +++ b/src/gui/dialogs/formaddaccount.cpp @@ -22,10 +22,6 @@ #include "core/feedsmodel.h" #include "services/standard/standardserviceentrypoint.h" -#if defined(Q_OS_OS2) -#include "gui/messagebox.h" -#endif - FormAddAccount::FormAddAccount(const QList &entry_points, FeedsModel *model, QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAddAccount), m_model(model), m_entryPoints(entry_points) { @@ -35,10 +31,6 @@ FormAddAccount::FormAddAccount(const QList &entry_points, Fe setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); setWindowIcon(qApp->icons()->fromTheme(QSL("item-new"))); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - connect(m_ui->m_listEntryPoints, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(addSelectedAccount())); connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(addSelectedAccount())); connect(m_ui->m_listEntryPoints, SIGNAL(itemSelectionChanged()), this, SLOT(displayActiveEntryPointDetails())); @@ -46,7 +38,7 @@ FormAddAccount::FormAddAccount(const QList &entry_points, Fe } FormAddAccount::~FormAddAccount() { - delete m_ui; + qDebug("Destroying FormAddAccount instance."); } void FormAddAccount::addSelectedAccount() { @@ -64,7 +56,7 @@ void FormAddAccount::addSelectedAccount() { } void FormAddAccount::displayActiveEntryPointDetails() { - ServiceEntryPoint *point = selectedEntryPoint(); + const ServiceEntryPoint *point = selectedEntryPoint(); m_ui->m_txtAuthor->setText(point->author()); m_ui->m_txtDescription->setText(point->description()); @@ -72,12 +64,12 @@ void FormAddAccount::displayActiveEntryPointDetails() { m_ui->m_txtVersion->setText(point->version()); } -ServiceEntryPoint *FormAddAccount::selectedEntryPoint() { +ServiceEntryPoint *FormAddAccount::selectedEntryPoint() const { return m_entryPoints.at(m_ui->m_listEntryPoints->currentRow()); } void FormAddAccount::loadEntryPoints() { - foreach (ServiceEntryPoint *entry_point, m_entryPoints) { + foreach (const ServiceEntryPoint *entry_point, m_entryPoints) { QListWidgetItem *item = new QListWidgetItem(entry_point->icon(), entry_point->name(), m_ui->m_listEntryPoints); if (entry_point->isSingleInstanceService() && m_model->containsServiceRootFromEntryPoint(entry_point)) { diff --git a/src/gui/dialogs/formaddaccount.h b/src/gui/dialogs/formaddaccount.h index bacf59892..59ec97ac3 100755 --- a/src/gui/dialogs/formaddaccount.h +++ b/src/gui/dialogs/formaddaccount.h @@ -42,10 +42,10 @@ class FormAddAccount : public QDialog { void displayActiveEntryPointDetails(); private: - ServiceEntryPoint *selectedEntryPoint(); + ServiceEntryPoint *selectedEntryPoint() const; void loadEntryPoints(); - Ui::FormAddAccount *m_ui; + QScopedPointer m_ui; FeedsModel *m_model; QList m_entryPoints; }; diff --git a/src/gui/dialogs/formbackupdatabasesettings.cpp b/src/gui/dialogs/formbackupdatabasesettings.cpp index a7386ffad..ef80a503a 100755 --- a/src/gui/dialogs/formbackupdatabasesettings.cpp +++ b/src/gui/dialogs/formbackupdatabasesettings.cpp @@ -53,7 +53,7 @@ FormBackupDatabaseSettings::FormBackupDatabaseSettings(QWidget *parent) : QDialo } FormBackupDatabaseSettings::~FormBackupDatabaseSettings() { - delete m_ui; + qDebug("Destroying FormBackupDatabaseSettings instance."); } void FormBackupDatabaseSettings::performBackup() { @@ -64,7 +64,7 @@ void FormBackupDatabaseSettings::performBackup() { tr("Backup was created successfully and stored in target directory."), tr("Backup was created successfully.")); } - catch (ApplicationException &ex) { + catch (const ApplicationException &ex) { m_ui->m_lblResult->setStatus(WidgetWithStatus::Error, ex.message(), tr("Backup failed.")); } } diff --git a/src/gui/dialogs/formbackupdatabasesettings.h b/src/gui/dialogs/formbackupdatabasesettings.h old mode 100644 new mode 100755 index 37144d0aa..522742e68 --- a/src/gui/dialogs/formbackupdatabasesettings.h +++ b/src/gui/dialogs/formbackupdatabasesettings.h @@ -43,7 +43,7 @@ class FormBackupDatabaseSettings : public QDialog { void checkOkButton(); private: - Ui::FormBackupDatabaseSettings *m_ui; + QScopedPointer m_ui; }; #endif // FORMBACKUPDATABASECONFIG_H diff --git a/src/gui/dialogs/formdatabasecleanup.cpp b/src/gui/dialogs/formdatabasecleanup.cpp index 198006eac..b0a203503 100755 --- a/src/gui/dialogs/formdatabasecleanup.cpp +++ b/src/gui/dialogs/formdatabasecleanup.cpp @@ -38,7 +38,7 @@ FormDatabaseCleanup::FormDatabaseCleanup(QWidget *parent) : QDialog(parent), m_u } FormDatabaseCleanup::~FormDatabaseCleanup() { - delete m_ui; + qDebug("Destroying FormDatabaseCleanup instance."); } void FormDatabaseCleanup::setCleaner(DatabaseCleaner *cleaner) { diff --git a/src/gui/dialogs/formdatabasecleanup.h b/src/gui/dialogs/formdatabasecleanup.h old mode 100644 new mode 100755 index 8839da6d0..b37982129 --- a/src/gui/dialogs/formdatabasecleanup.h +++ b/src/gui/dialogs/formdatabasecleanup.h @@ -45,7 +45,6 @@ class FormDatabaseCleanup : public QDialog { private slots: void updateDaysSuffix(int number); - void startPurging(); void onPurgeStarted(); void onPurgeProgress(int progress, const QString &description); @@ -58,7 +57,7 @@ class FormDatabaseCleanup : public QDialog { void loadDatabaseInfo(); private: - Ui::FormDatabaseCleanup *m_ui; + QScopedPointer m_ui; DatabaseCleaner *m_cleaner; }; diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp index 13e1f72de..fe3886bf0 100755 --- a/src/gui/dialogs/formmain.cpp +++ b/src/gui/dialogs/formmain.cpp @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -85,10 +86,10 @@ FormMain::FormMain(QWidget *parent, Qt::WindowFlags f) } FormMain::~FormMain() { - delete m_ui; + qDebug("Destroying FormDatabaseCleanup instance."); } -QList FormMain::allActions() { +QList FormMain::allActions() const { QList actions; // Add basic actions. @@ -172,7 +173,8 @@ void FormMain::prepareMenus() { void FormMain::switchFullscreenMode() { if (!isFullScreen()) { showFullScreen(); - } else { + } + else { showNormal(); } } @@ -198,8 +200,8 @@ void FormMain::updateAddItemMenu() { if (activated_root->supportsFeedAdding()) { QAction *action_new_feed = new QAction(qApp->icons()->fromTheme(QSL("folder-feed")), - tr("Add new feed"), - m_ui->m_menuAddItem); + tr("Add new feed"), + m_ui->m_menuAddItem); root_menu->addAction(action_new_feed); connect(action_new_feed, SIGNAL(triggered()), activated_root, SLOT(addNewFeed())); } @@ -225,7 +227,7 @@ void FormMain::updateAddItemMenu() { void FormMain::updateRecycleBinMenu() { m_ui->m_menuRecycleBin->clear(); - foreach (ServiceRoot *activated_root, tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->serviceRoots()) { + foreach (const ServiceRoot *activated_root, tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->serviceRoots()) { QMenu *root_menu = new QMenu(activated_root->title(), m_ui->m_menuRecycleBin); root_menu->setIcon(activated_root->icon()); root_menu->setToolTip(activated_root->description()); @@ -414,8 +416,8 @@ void FormMain::setupIcons() { } void FormMain::loadSize() { - QRect screen = qApp->desktop()->screenGeometry(); - Settings *settings = qApp->settings(); + const QRect screen = qApp->desktop()->screenGeometry(); + const Settings *settings = qApp->settings(); // Reload main window size & position. resize(settings->value(GROUP(GUI), GUI::MainWindowInitialSize, size()).toSize()); @@ -446,8 +448,8 @@ void FormMain::loadSize() { void FormMain::saveSize() { Settings *settings = qApp->settings(); - bool is_fullscreen = isFullScreen(); - bool is_maximized = isMaximized(); + const bool is_fullscreen = isFullScreen(); + const bool is_maximized = isMaximized(); if (is_fullscreen) { m_ui->m_actionFullscreen->setChecked(false); @@ -519,7 +521,7 @@ void FormMain::createConnections() { } void FormMain::loadWebBrowserMenu(int index) { - WebBrowser *active_browser = m_ui->m_tabWidget->widget(index)->webBrowser(); + const WebBrowser *active_browser = m_ui->m_tabWidget->widget(index)->webBrowser(); m_ui->m_menuCurrentTab->clear(); @@ -539,21 +541,19 @@ void FormMain::loadWebBrowserMenu(int index) { } void FormMain::backupDatabaseSettings() { - QPointer form = new FormBackupDatabaseSettings(this); - form.data()->exec(); - delete form.data(); + QScopedPointer form(new FormBackupDatabaseSettings(this)); + form->exec(); } void FormMain::restoreDatabaseSettings() { - QPointer form = new FormRestoreDatabaseSettings(this); - form.data()->exec(); - delete form.data(); + QScopedPointer form(new FormRestoreDatabaseSettings(this)); + form->exec(); } void FormMain::changeEvent(QEvent *event) { switch (event->type()) { case QEvent::WindowStateChange: { - if (this->windowState() & Qt::WindowMinimized && + if (windowState() & Qt::WindowMinimized && SystemTrayIcon::isSystemTrayActivated() && qApp->settings()->value(GROUP(GUI), SETTING(GUI::HideMainWindowWhenMinimized)).toBool()) { event->ignore(); @@ -571,15 +571,13 @@ void FormMain::changeEvent(QEvent *event) { } void FormMain::showAbout() { - QPointer form_pointer = new FormAbout(this); - form_pointer.data()->exec(); - delete form_pointer.data(); + QScopedPointer form_pointer(new FormAbout(this)); + form_pointer->exec(); } void FormMain::showUpdates() { - QPointer form_update = new FormUpdate(this); - form_update.data()->exec(); - delete form_update.data(); + QScopedPointer form_update(new FormUpdate(this)); + form_update->exec(); } void FormMain::showWiki() { @@ -591,11 +589,10 @@ void FormMain::showWiki() { } void FormMain::showAddAccountDialog() { - QPointer form_update = new FormAddAccount(qApp->feedServices(), - tabWidget()->feedMessageViewer()->feedsView()->sourceModel(), - this); - form_update.data()->exec(); - delete form_update.data(); + QScopedPointer form_update(new FormAddAccount(qApp->feedServices(), + tabWidget()->feedMessageViewer()->feedsView()->sourceModel(), + this)); + form_update->exec(); } void FormMain::reportABugOnGitHub() { @@ -623,7 +620,6 @@ void FormMain::donate() { } void FormMain::showSettings() { - QPointer form_pointer = new FormSettings(this); - form_pointer.data()->exec(); - delete form_pointer.data(); + QScopedPointer form_pointer(new FormSettings(this)); + form_pointer->exec(); } diff --git a/src/gui/dialogs/formmain.h b/src/gui/dialogs/formmain.h index a5e7dac7b..3f8c5117a 100755 --- a/src/gui/dialogs/formmain.h +++ b/src/gui/dialogs/formmain.h @@ -40,24 +40,24 @@ class FormMain : public QMainWindow { virtual ~FormMain(); // Returns menu for the tray icon. - inline QMenu *trayMenu() { + inline QMenu *trayMenu() const { return m_trayMenu; } // Returns global tab widget. - inline TabWidget *tabWidget() { + inline TabWidget *tabWidget() const { return m_ui->m_tabWidget; } // Access to statusbar. - inline StatusBar *statusBar() { + inline StatusBar *statusBar() const { return m_statusBar; } // Returns list of all globally available actions. // NOTE: This is used for setting dynamic shortcuts // for given actions. - QList allActions(); + QList allActions() const; // Loads/saves visual state of the application. void loadSize(); @@ -106,7 +106,7 @@ class FormMain : public QMainWindow { // Sets up proper icons for this widget. void setupIcons(); - Ui::FormMain *m_ui; + QScopedPointer m_ui; QMenu *m_trayMenu; StatusBar *m_statusBar; }; diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp index 259acd104..d7d9bcd9f 100755 --- a/src/gui/dialogs/formsettings.cpp +++ b/src/gui/dialogs/formsettings.cpp @@ -64,10 +64,6 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form m_ui->m_editorMessagesToolbar->availableItemsWidget()->viewport()->installEventFilter(this); m_ui->m_editorFeedsToolbar->availableItemsWidget()->viewport()->installEventFilter(this); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - // Setup behavior. m_ui->m_listSettings->setCurrentRow(0); m_ui->m_treeLanguages->setColumnCount(5); diff --git a/src/gui/dialogs/formupdate.cpp b/src/gui/dialogs/formupdate.cpp index fe385bf83..5083dc213 100755 --- a/src/gui/dialogs/formupdate.cpp +++ b/src/gui/dialogs/formupdate.cpp @@ -42,10 +42,6 @@ FormUpdate::FormUpdate(QWidget *parent) m_btnUpdate->setToolTip(tr("Download new installation files.")); m_ui->m_lblCurrentRelease->setText(APP_VERSION); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint); setWindowIcon(qApp->icons()->fromTheme(QSL("application-about"))); diff --git a/src/gui/messagebox.cpp b/src/gui/messagebox.cpp index 66f5fe8d4..bd3a7f558 100755 --- a/src/gui/messagebox.cpp +++ b/src/gui/messagebox.cpp @@ -42,39 +42,6 @@ void MessageBox::setIcon(QMessageBox::Icon icon) { setIconPixmap(iconForStatus(icon).pixmap(icon_size, icon_size)); } -#if defined(Q_OS_OS2) -void MessageBox::iconify(QDialogButtonBox *button_box) { - foreach (QAbstractButton *button, button_box->buttons()) { - button->setIcon(iconForRole(button_box->standardButton(button))); - } -} - -QIcon MessageBox::iconForRole(QDialogButtonBox::StandardButton button) { - switch (button) { - case QMessageBox::Ok: - return qApp->icons()->fromTheme(QSL("dialog-ok")); - - case QMessageBox::Cancel: - case QMessageBox::Close: - return qApp->icons()->fromTheme(QSL("dialog-cancel")); - - case QMessageBox::Yes: - case QMessageBox::YesToAll: - return qApp->icons()->fromTheme(QSL("dialog-yes")); - - case QMessageBox::No: - case QMessageBox::NoToAll: - return qApp->icons()->fromTheme(QSL("dialog-no")); - - case QMessageBox::Help: - return qApp->icons()->fromTheme(QSL("dialog-question")); - - default: - return QIcon(); - } -} -#endif - QIcon MessageBox::iconForStatus(QMessageBox::Icon status) { switch (status) { case QMessageBox::Information: @@ -115,12 +82,6 @@ QMessageBox::StandardButton MessageBox::show(QWidget *parent, msg_box.setStandardButtons(buttons); msg_box.setDefaultButton(default_button); - // Setup button box icons. -#if defined(Q_OS_OS2) - QDialogButtonBox *button_box = msg_box.findChild(); - iconify(button_box); -#endif - // Display it. if (msg_box.exec() == -1) { return QMessageBox::Cancel; diff --git a/src/gui/messagebox.h b/src/gui/messagebox.h old mode 100644 new mode 100755 index e0ff21c99..aea709589 --- a/src/gui/messagebox.h +++ b/src/gui/messagebox.h @@ -44,14 +44,6 @@ class MessageBox : public QMessageBox { QMessageBox::StandardButton default_button = QMessageBox::Ok); static QIcon iconForStatus(QMessageBox::Icon status); - -#if defined(Q_OS_OS2) - // Performs icon replacements for given button box. - static void iconify(QDialogButtonBox *button_box); - - // Returns icons for standard roles/statuses. - static QIcon iconForRole(QDialogButtonBox::StandardButton button); -#endif }; #endif // MESSAGEBOX_H diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index 89e8a142b..3c5a37a7f 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -339,7 +339,7 @@ class Settings : public QSettings { } // Getters/setters for settings values. - inline QVariant value(const QString §ion, const QString &key, const QVariant &default_value = QVariant()) { + inline QVariant value(const QString §ion, const QString &key, const QVariant &default_value = QVariant()) const { return QSettings::value(QString("%1/%2").arg(section, key), default_value); } @@ -351,7 +351,7 @@ class Settings : public QSettings { QSettings::setValue(key, value); } - inline bool contains(const QString §ion, const QString &key) { + inline bool contains(const QString §ion, const QString &key) const { return QSettings::contains(QString("%1/%2").arg(section, key)); } diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h index 694a7ad91..6fcc6b5f1 100755 --- a/src/network-web/webbrowser.h +++ b/src/network-web/webbrowser.h @@ -72,7 +72,7 @@ class WebBrowser : public TabContent { } // Returns global menu for this web browser. - inline virtual QList globalMenu() { + inline virtual QList globalMenu() const { QList browser_menu; // Add needed actions into the menu. diff --git a/src/services/abstract/serviceentrypoint.h b/src/services/abstract/serviceentrypoint.h index 3502fdb3e..7b2730195 100755 --- a/src/services/abstract/serviceentrypoint.h +++ b/src/services/abstract/serviceentrypoint.h @@ -52,26 +52,26 @@ class ServiceEntryPoint { // Can this service account be added just once? // NOTE: This is true particularly for "standard" service // which operates with normal RSS/ATOM feeds. - virtual bool isSingleInstanceService() = 0; + virtual bool isSingleInstanceService() const = 0; // Human readable service name, for example "TT-RSS". - virtual QString name() = 0; + virtual QString name() const = 0; // Some arbitrary string. // NOTE: Keep in sync with ServiceRoot::code(). - virtual QString code() = 0; + virtual QString code() const = 0; // Human readable service description, for example "Services which offers TT-RSS integration.". - virtual QString description() = 0; + virtual QString description() const = 0; // Version of the service, using of semantic versioning is recommended. - virtual QString version() = 0; + virtual QString version() const = 0; // Author of the service. - virtual QString author() = 0; + virtual QString author() const = 0; // Icon of the service. - virtual QIcon icon() = 0; + virtual QIcon icon() const = 0; ///////////////////////////////////////// // Members to override. */ diff --git a/src/services/abstract/serviceroot.h b/src/services/abstract/serviceroot.h index ff6f85c89..c03b67ae9 100755 --- a/src/services/abstract/serviceroot.h +++ b/src/services/abstract/serviceroot.h @@ -68,7 +68,7 @@ class ServiceRoot : public RootItem { virtual QList serviceMenu() = 0; // Access to recycle bin of this account if there is any. - virtual RecycleBin *recycleBin() = 0; + virtual RecycleBin *recycleBin() const = 0; QList undeletedMessages() const; @@ -84,7 +84,7 @@ class ServiceRoot : public RootItem { // Returns the UNIQUE code of the given service. // NOTE: Keep in sync with ServiceEntryRoot::code(). - virtual QString code() = 0; + virtual QString code() const = 0; // This method should prepare messages for given "item" (download them maybe?) // into predefined "Messages" table diff --git a/src/services/standard/gui/formstandardcategorydetails.cpp b/src/services/standard/gui/formstandardcategorydetails.cpp index 484634cd4..32eb73760 100755 --- a/src/services/standard/gui/formstandardcategorydetails.cpp +++ b/src/services/standard/gui/formstandardcategorydetails.cpp @@ -218,10 +218,6 @@ void FormStandardCategoryDetails::initialize() { // Setup button box. m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - // Setup menu & actions for icon selection. m_iconMenu = new QMenu(tr("Icon selection"), this); m_actionLoadIconFromFile = new QAction(qApp->icons()->fromTheme(QSL("image-generic")), diff --git a/src/services/standard/gui/formstandardfeeddetails.cpp b/src/services/standard/gui/formstandardfeeddetails.cpp index 091f99718..410a94bc1 100755 --- a/src/services/standard/gui/formstandardfeeddetails.cpp +++ b/src/services/standard/gui/formstandardfeeddetails.cpp @@ -412,10 +412,6 @@ void FormStandardFeedDetails::initialize() { m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password")); m_ui->m_txtPassword->lineEdit()->setToolTip(tr("Set password to access the feed.")); -#if defined(Q_OS_OS2) - MessageBox::iconify(m_ui->m_buttonBox); -#endif - // Add standard feed types. m_ui->m_cmbType->addItem(StandardFeed::typeToString(StandardFeed::Atom10), QVariant::fromValue((int) StandardFeed::Atom10)); m_ui->m_cmbType->addItem(StandardFeed::typeToString(StandardFeed::Rdf), QVariant::fromValue((int) StandardFeed::Rdf)); diff --git a/src/services/standard/standardserviceentrypoint.cpp b/src/services/standard/standardserviceentrypoint.cpp index 527186891..4bce26bb4 100755 --- a/src/services/standard/standardserviceentrypoint.cpp +++ b/src/services/standard/standardserviceentrypoint.cpp @@ -31,31 +31,31 @@ StandardServiceEntryPoint::StandardServiceEntryPoint() { StandardServiceEntryPoint::~StandardServiceEntryPoint() { } -bool StandardServiceEntryPoint::isSingleInstanceService() { +bool StandardServiceEntryPoint::isSingleInstanceService() const { return true; } -QString StandardServiceEntryPoint::name() { +QString StandardServiceEntryPoint::name() const { return QSL("Standard online feeds (RSS/RDF/ATOM)"); } -QString StandardServiceEntryPoint::description() { +QString StandardServiceEntryPoint::description() const { return QSL("This service offers integration with standard online RSS/RDF/ATOM feeds and podcasts."); } -QString StandardServiceEntryPoint::version() { +QString StandardServiceEntryPoint::version() const { return APP_VERSION; } -QString StandardServiceEntryPoint::author() { +QString StandardServiceEntryPoint::author() const { return APP_AUTHOR; } -QIcon StandardServiceEntryPoint::icon() { +QIcon StandardServiceEntryPoint::icon() const { return QIcon(APP_ICON_PATH); } -QString StandardServiceEntryPoint::code() { +QString StandardServiceEntryPoint::code() const { return SERVICE_CODE_STD_RSS; } diff --git a/src/services/standard/standardserviceentrypoint.h b/src/services/standard/standardserviceentrypoint.h index 665ab21d6..0101bc113 100755 --- a/src/services/standard/standardserviceentrypoint.h +++ b/src/services/standard/standardserviceentrypoint.h @@ -26,13 +26,13 @@ class StandardServiceEntryPoint : public ServiceEntryPoint { explicit StandardServiceEntryPoint(); virtual ~StandardServiceEntryPoint(); - bool isSingleInstanceService(); - QString name(); - QString description(); - QString version(); - QString author(); - QIcon icon(); - QString code(); + bool isSingleInstanceService() const; + QString name() const; + QString description() const; + QString version() const; + QString author() const; + QIcon icon() const; + QString code() const; ServiceRoot *createNewRoot(); QList initializeSubtree() const; diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp index 32c29bcfa..7687cbd04 100755 --- a/src/services/standard/standardserviceroot.cpp +++ b/src/services/standard/standardserviceroot.cpp @@ -104,7 +104,7 @@ void StandardServiceRoot::stop() { qDebug("Stopping StandardServiceRoot instance."); } -QString StandardServiceRoot::code() { +QString StandardServiceRoot::code() const { return SERVICE_CODE_STD_RSS; } @@ -157,7 +157,7 @@ Qt::ItemFlags StandardServiceRoot::additionalFlags() const { return Qt::ItemIsDropEnabled; } -RecycleBin *StandardServiceRoot::recycleBin() { +RecycleBin *StandardServiceRoot::recycleBin() const { return m_recycleBin; } diff --git a/src/services/standard/standardserviceroot.h b/src/services/standard/standardserviceroot.h index a7d2368f0..092a32f7a 100755 --- a/src/services/standard/standardserviceroot.h +++ b/src/services/standard/standardserviceroot.h @@ -41,7 +41,7 @@ class StandardServiceRoot : public ServiceRoot { void start(bool freshly_activated); void stop(); - QString code(); + QString code() const; bool canBeEdited(); bool canBeDeleted(); @@ -56,7 +56,7 @@ class StandardServiceRoot : public ServiceRoot { Qt::ItemFlags additionalFlags() const; // Access to recycle bin. - RecycleBin *recycleBin(); + RecycleBin *recycleBin() const; // Return "add feed" and "add category" items. QList addItemMenu(); diff --git a/src/services/tt-rss/ttrssserviceentrypoint.cpp b/src/services/tt-rss/ttrssserviceentrypoint.cpp index f36e027a7..ea33376ff 100755 --- a/src/services/tt-rss/ttrssserviceentrypoint.cpp +++ b/src/services/tt-rss/ttrssserviceentrypoint.cpp @@ -40,34 +40,34 @@ TtRssServiceEntryPoint::~TtRssServiceEntryPoint() { } -bool TtRssServiceEntryPoint::isSingleInstanceService() { +bool TtRssServiceEntryPoint::isSingleInstanceService() const { return false; } -QString TtRssServiceEntryPoint::name() { +QString TtRssServiceEntryPoint::name() const { return QSL("Tiny Tiny RSS"); } -QString TtRssServiceEntryPoint::description() { +QString TtRssServiceEntryPoint::description() const { return QObject::tr("This service offers integration with Tiny Tiny RSS.\n\n" "Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, " "designed to allow you to read news from any location, while feeling as close to a real " "desktop application as possible.\n\nAt least API level %1 is required.").arg(MINIMAL_API_LEVEL); } -QString TtRssServiceEntryPoint::version() { +QString TtRssServiceEntryPoint::version() const { return APP_VERSION; } -QString TtRssServiceEntryPoint::author() { +QString TtRssServiceEntryPoint::author() const { return APP_AUTHOR; } -QIcon TtRssServiceEntryPoint::icon() { +QIcon TtRssServiceEntryPoint::icon() const { return qApp->icons()->fromTheme(QSL("application-ttrss")); } -QString TtRssServiceEntryPoint::code() { +QString TtRssServiceEntryPoint::code() const { return SERVICE_CODE_TT_RSS; } diff --git a/src/services/tt-rss/ttrssserviceentrypoint.h b/src/services/tt-rss/ttrssserviceentrypoint.h index fddf9628a..b858c92bd 100755 --- a/src/services/tt-rss/ttrssserviceentrypoint.h +++ b/src/services/tt-rss/ttrssserviceentrypoint.h @@ -27,13 +27,13 @@ class TtRssServiceEntryPoint : public ServiceEntryPoint { explicit TtRssServiceEntryPoint(); virtual ~TtRssServiceEntryPoint(); - bool isSingleInstanceService(); - QString name(); - QString description(); - QString version(); - QString author(); - QIcon icon(); - QString code(); + bool isSingleInstanceService() const; + QString name() const; + QString description() const; + QString version() const; + QString author() const; + QIcon icon() const; + QString code() const; ServiceRoot *createNewRoot(); QList initializeSubtree() const; diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index 17bde213c..c607abfb0 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -66,7 +66,7 @@ void TtRssServiceRoot::stop() { qDebug("Stopping Tiny Tiny RSS account, logging out with result '%d'.", (int) m_network->lastError()); } -QString TtRssServiceRoot::code() { +QString TtRssServiceRoot::code() const { return SERVICE_CODE_TT_RSS; } @@ -163,7 +163,7 @@ QList TtRssServiceRoot::addItemMenu() { return QList(); } -RecycleBin *TtRssServiceRoot::recycleBin() { +RecycleBin *TtRssServiceRoot::recycleBin() const { return m_recycleBin; } diff --git a/src/services/tt-rss/ttrssserviceroot.h b/src/services/tt-rss/ttrssserviceroot.h index e09c665c5..7f232f772 100755 --- a/src/services/tt-rss/ttrssserviceroot.h +++ b/src/services/tt-rss/ttrssserviceroot.h @@ -38,7 +38,7 @@ class TtRssServiceRoot : public ServiceRoot { void start(bool freshly_activated); void stop(); - QString code(); + QString code() const; bool canBeEdited(); bool canBeDeleted(); @@ -56,7 +56,7 @@ class TtRssServiceRoot : public ServiceRoot { QList serviceMenu(); QList contextMenu(); - RecycleBin *recycleBin(); + RecycleBin *recycleBin() const; bool loadMessagesForItem(RootItem *item, QSqlTableModel *model);