From 9cdac30c42e47b7cd20a09ffbebbc550644f71d1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 15 Jan 2014 21:51:54 +0100 Subject: [PATCH] Refactoring... --- src/gui/formwelcome.h | 1 + src/gui/iconthemefactory.cpp | 14 ------------- src/gui/iconthemefactory.h | 18 ++++++++++++++++- src/gui/messagesview.cpp | 14 ------------- src/gui/messagesview.h | 15 +++++++++++--- src/gui/shortcutcatcher.cpp | 14 +------------ src/gui/shortcutcatcher.h | 14 ++++++++++--- src/gui/skinfactory.cpp | 8 -------- src/gui/skinfactory.h | 9 +++++++-- src/gui/statusbar.cpp | 4 +--- src/gui/statusbar.h | 4 +++- src/gui/tabbar.cpp | 8 -------- src/gui/tabbar.h | 10 +++++++-- src/gui/tabcontent.cpp | 8 -------- src/gui/tabcontent.h | 9 +++++++-- src/gui/tabwidget.cpp | 12 ++--------- src/gui/tabwidget.h | 13 +++++++++--- src/gui/webbrowser.cpp | 17 ++-------------- src/gui/webbrowser.h | 39 ++++++++++++++++++++++++------------ 19 files changed, 108 insertions(+), 123 deletions(-) diff --git a/src/gui/formwelcome.h b/src/gui/formwelcome.h index 3ac28a4e3..8377ceb4d 100644 --- a/src/gui/formwelcome.h +++ b/src/gui/formwelcome.h @@ -19,6 +19,7 @@ class FormWelcome : public QDialog { virtual ~FormWelcome(); private slots: + // Opens given link in a default web browser. void openLink(const QString &link); private: diff --git a/src/gui/iconthemefactory.cpp b/src/gui/iconthemefactory.cpp index 6965a80d0..b92a0b9d6 100755 --- a/src/gui/iconthemefactory.cpp +++ b/src/gui/iconthemefactory.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -41,20 +40,7 @@ QString IconThemeFactory::currentIconTheme() { return m_currentIconTheme; } -QIcon IconThemeFactory::fromTheme(const QString &name) { - if (m_currentIconTheme == APP_NO_THEME) { - return QIcon(); - } - if (!m_cachedIcons.contains(name)) { - // Icon is not cached yet. - m_cachedIcons.insert(name, QIcon(APP_THEME_PATH + QDir::separator() + - m_currentIconTheme + QDir::separator() + - name + APP_THEME_SUFFIX)); - } - - return m_cachedIcons.value(name); -} void IconThemeFactory::setCurrentIconTheme(const QString &theme_name) { Settings::instance()->setValue(APP_CFG_GUI, diff --git a/src/gui/iconthemefactory.h b/src/gui/iconthemefactory.h index 0f4d9fb95..d7e86192e 100755 --- a/src/gui/iconthemefactory.h +++ b/src/gui/iconthemefactory.h @@ -1,10 +1,13 @@ #ifndef THEMEFACTORY_H #define THEMEFACTORY_H +#include "core/defs.h" + #include #include #include #include +#include class IconThemeFactory : public QObject { @@ -19,7 +22,20 @@ class IconThemeFactory : public QObject { // Returns icon from active theme or invalid icon if // "no icon theme" is set. - QIcon fromTheme(const QString &name); + inline QIcon fromTheme(const QString &name) { + if (m_currentIconTheme == APP_NO_THEME) { + return QIcon(); + } + + if (!m_cachedIcons.contains(name)) { + // Icon is not cached yet. + m_cachedIcons.insert(name, QIcon(APP_THEME_PATH + QDir::separator() + + m_currentIconTheme + QDir::separator() + + name + APP_THEME_SUFFIX)); + } + + return m_cachedIcons.value(name); + } // Adds custom application path to be search for icons. void setupSearchPaths(); diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 3da6c0b31..2deb29982 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -5,7 +5,6 @@ #include "core/settings.h" #include "gui/formmain.h" -#include #include #include #include @@ -88,19 +87,6 @@ void MessagesView::reloadSelections(int mark_current_index_read) { } } -MessagesModel *MessagesView::sourceModel() { - return m_sourceModel; -} - -MessagesProxyModel *MessagesView::model() { - return m_proxyModel; -} - -void MessagesView::setSortingEnabled(bool enable) { - QTreeView::setSortingEnabled(enable); - header()->setSortIndicatorShown(false); -} - void MessagesView::setupAppearance() { header()->setDefaultSectionSize(MESSAGES_VIEW_DEFAULT_COL); header()->setStretchLastSection(false); diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h index 1698705d4..afec01090 100755 --- a/src/gui/messagesview.h +++ b/src/gui/messagesview.h @@ -4,6 +4,7 @@ #include "core/messagesmodel.h" #include +#include class MessagesProxyModel; @@ -16,11 +17,19 @@ class MessagesView : public QTreeView { explicit MessagesView(QWidget *parent = 0); virtual ~MessagesView(); - void setSortingEnabled(bool enable); + inline void setSortingEnabled(bool enable) { + QTreeView::setSortingEnabled(enable); + header()->setSortIndicatorShown(false); + } // Model accessors. - MessagesProxyModel *model(); - MessagesModel *sourceModel(); + inline MessagesProxyModel *model() { + return m_proxyModel; + } + + inline MessagesModel *sourceModel() { + return m_sourceModel; + } // Creates needed connections. void createConnections(); diff --git a/src/gui/shortcutcatcher.cpp b/src/gui/shortcutcatcher.cpp index 31eb03826..4f335d2cf 100644 --- a/src/gui/shortcutcatcher.cpp +++ b/src/gui/shortcutcatcher.cpp @@ -98,8 +98,7 @@ void ShortcutCatcher::controlModifierlessTimout() { } } -void ShortcutCatcher::updateDisplayShortcut() -{ +void ShortcutCatcher::updateDisplayShortcut() { QString str = m_currentSequence.toString(QKeySequence::NativeText); str.replace('&', QLatin1String("&&")); @@ -126,15 +125,4 @@ void ShortcutCatcher::updateDisplayShortcut() m_sequenceButton->setText(str); } -QKeySequence ShortcutCatcher::shortcut() const { - return m_currentSequence; -} -void ShortcutCatcher::setShortcut(const QKeySequence &key) { - m_currentSequence = m_defaultSequence = key; - doneRecording(); -} - -void ShortcutCatcher::clearShortcut() { - setShortcut(m_defaultSequence); -} diff --git a/src/gui/shortcutcatcher.h b/src/gui/shortcutcatcher.h index 4ccab706b..3312c5c4a 100644 --- a/src/gui/shortcutcatcher.h +++ b/src/gui/shortcutcatcher.h @@ -50,15 +50,23 @@ class ShortcutCatcher : public QWidget { void controlModifierlessTimout(); void updateDisplayShortcut(); - QKeySequence shortcut() const; - void setShortcut(const QKeySequence &key); + inline QKeySequence shortcut() const { + return m_currentSequence; + } + + inline void setShortcut(const QKeySequence &key) { + m_currentSequence = m_defaultSequence = key; + doneRecording(); + } protected slots: void startRecording(); void doneRecording(); public slots: - void clearShortcut(); + inline void clearShortcut() { + setShortcut(m_defaultSequence); + } signals: void shortcutChanged(const QKeySequence &seguence); diff --git a/src/gui/skinfactory.cpp b/src/gui/skinfactory.cpp index f84b34364..5214bca55 100644 --- a/src/gui/skinfactory.cpp +++ b/src/gui/skinfactory.cpp @@ -102,14 +102,6 @@ QString SkinFactory::selectedSkinName() { APP_SKIN_DEFAULT).toString(); } -QString SkinFactory::currentMarkup() { - return m_currentSkin.m_layoutMarkup; -} - -QString SkinFactory::currentMarkupLayout() { - return m_currentSkin.m_layoutMarkupWrapper; -} - Skin SkinFactory::skinInfo(const QString &skin_name, bool *ok) { Skin skin; QString styles; diff --git a/src/gui/skinfactory.h b/src/gui/skinfactory.h index d469b7aa3..67230a1ef 100644 --- a/src/gui/skinfactory.h +++ b/src/gui/skinfactory.h @@ -48,8 +48,13 @@ class SkinFactory : public QObject { void loadCurrentSkin(); // Returns contents of current layout markup. - QString currentMarkup(); - QString currentMarkupLayout(); + inline QString currentMarkup() { + return m_currentSkin.m_layoutMarkup; + } + + inline QString currentMarkupLayout() { + return m_currentSkin.m_layoutMarkupWrapper; + } // Returns the name of the skin, that should be activated // after application restart. diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 324a41a2f..b28f4fc37 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -37,9 +37,7 @@ StatusBar::~StatusBar() { qDebug("Destroying StatusBar instance."); } -QToolButton *StatusBar::fullscreenSwitcher() const { - return m_fullscreenSwitcher; -} + void StatusBar::showProgress(int progress, const QString &label) { m_progressLabel->setVisible(true); diff --git a/src/gui/statusbar.h b/src/gui/statusbar.h index 470b7dc36..530e14b67 100644 --- a/src/gui/statusbar.h +++ b/src/gui/statusbar.h @@ -16,7 +16,9 @@ class StatusBar : public QStatusBar { explicit StatusBar(QWidget *parent = 0); virtual ~StatusBar(); - QToolButton *fullscreenSwitcher() const; + inline QToolButton *fullscreenSwitcher() const { + return m_fullscreenSwitcher; + } // Progress bar operations void showProgress(int progress, const QString &label); diff --git a/src/gui/tabbar.cpp b/src/gui/tabbar.cpp index 82ac04434..e91de5aff 100644 --- a/src/gui/tabbar.cpp +++ b/src/gui/tabbar.cpp @@ -16,14 +16,6 @@ TabBar::~TabBar() { qDebug("Destroying TabBar instance."); } -void TabBar::setTabType(int index, const TabBar::TabType &type) { - setTabData(index, QVariant(type)); -} - -TabBar::TabType TabBar::tabType(int index) { - return static_cast(tabData(index).value()); -} - void TabBar::wheelEvent(QWheelEvent *event) { int current_index = currentIndex(); int number_of_tabs = count(); diff --git a/src/gui/tabbar.h b/src/gui/tabbar.h index f11fa0f4c..ee7bfde01 100644 --- a/src/gui/tabbar.h +++ b/src/gui/tabbar.h @@ -2,6 +2,7 @@ #define TABBAR_H #include +#include class TabBar : public QTabBar { @@ -19,8 +20,13 @@ class TabBar : public QTabBar { virtual ~TabBar(); // Getter/setter for tab type. - void setTabType(int index, const TabBar::TabType &type); - TabBar::TabType tabType(int index); + inline void setTabType(int index, const TabBar::TabType &type) { + setTabData(index, QVariant(type)); + } + + inline TabBar::TabType tabType(int index) { + return static_cast(tabData(index).value()); + } protected: // Reimplementations. diff --git a/src/gui/tabcontent.cpp b/src/gui/tabcontent.cpp index a53103686..94d1bfd88 100644 --- a/src/gui/tabcontent.cpp +++ b/src/gui/tabcontent.cpp @@ -6,11 +6,3 @@ TabContent::TabContent(QWidget *parent) : QWidget(parent), m_index(-1) { TabContent::~TabContent() { } - -void TabContent::setIndex(int index) { - m_index = index; -} - -int TabContent::index() const { - return m_index; -} diff --git a/src/gui/tabcontent.h b/src/gui/tabcontent.h index db14cb10d..2d87f3974 100644 --- a/src/gui/tabcontent.h +++ b/src/gui/tabcontent.h @@ -18,8 +18,13 @@ class TabContent : public QWidget { // Gets/sets current index of this TabContent. // NOTE: This is the index under which this object lies // in some TabWidget instance. - virtual int index() const; - virtual void setIndex(int index); + inline virtual int index() const { + return m_index; + } + + inline virtual void setIndex(int index) { + m_index = index; + } // Obtains instance contained in this TabContent or nullptr. // This can be used for obtaining the menu from the instance and so on. diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 315861c07..cae2905a4 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -52,9 +52,7 @@ void TabWidget::createConnections() { connect(tabBar(), SIGNAL(currentChanged(int)), this, SLOT(fixContentAfterIndexChange(int))); } -TabBar *TabWidget::tabBar() { - return static_cast(QTabWidget::tabBar()); -} + void TabWidget::initializeTabs() { // Create widget for "Feeds" page and add it. @@ -66,10 +64,6 @@ void TabWidget::initializeTabs() { setTabToolTip(index_of_browser, tr("Browse your feeds and messages")); } -TabContent *TabWidget::widget(int index) const { - return static_cast(QTabWidget::widget(index)); -} - void TabWidget::setupIcons() { // Iterate through all tabs and update icons // accordingly. @@ -249,9 +243,7 @@ int TabWidget::addBrowser(bool move_after_current, return final_index; } -FeedMessageViewer *TabWidget::feedMessageViewer() const { - return m_feedMessageViewer; -} + void TabWidget::changeIcon(int index, const QIcon &new_icon) { setTabIcon(index, new_icon); diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h index 5f2fce4f4..afb9886ad 100644 --- a/src/gui/tabwidget.h +++ b/src/gui/tabwidget.h @@ -32,8 +32,13 @@ class TabWidget : public QTabWidget { void removeTab(int index); // Returns tab bar. - TabBar *tabBar(); - TabContent *widget(int index) const; + inline TabBar *tabBar() { + return static_cast(QTabWidget::tabBar()); + } + + inline TabContent *widget(int index) const { + return static_cast(QTabWidget::widget(index)); + } // Initializes TabWidget with tabs, this includes initialization // of main "Feeds" widget. @@ -43,7 +48,9 @@ class TabWidget : public QTabWidget { void setupIcons(); // Accessor to feed/message viewer. - FeedMessageViewer *feedMessageViewer() const; + inline FeedMessageViewer *feedMessageViewer() const { + return m_feedMessageViewer; + } protected: // Creates necesary connections. diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index 624069442..3e40dfc47 100644 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -232,22 +232,11 @@ WebBrowser::~WebBrowser() { delete m_actionZoom; } -WebBrowser *WebBrowser::webBrowser() { - return this; -} -QList WebBrowser::globalMenu() { - QList browser_menu; - // Add needed actions into the menu. - browser_menu.append(m_actionZoom); - return browser_menu; -} -QIcon WebBrowser::icon() { - return m_webView->icon(); -} + void WebBrowser::setFocus(Qt::FocusReason reason) { m_txtLocation->setFocus(reason); @@ -266,9 +255,7 @@ QList WebBrowser::runningWebBrowsers() { return m_runningWebBrowsers; } -void WebBrowser::setNavigationBarVisible(bool visible) { - m_toolBar->setVisible(visible); -} + WebBrowserNetworkAccessManager *WebBrowser::globalNetworkManager() { if (m_networkManager.isNull()) { diff --git a/src/gui/webbrowser.h b/src/gui/webbrowser.h index 230e8d94a..6f217e986 100644 --- a/src/gui/webbrowser.h +++ b/src/gui/webbrowser.h @@ -1,22 +1,22 @@ #ifndef WEBBROWSER_H #define WEBBROWSER_H -#include -#include -#include - #include "core/messagesmodel.h" #include "gui/tabcontent.h" +#include "gui/webview.h" + +#include +#include +#include +#include +#include -class QToolBar; class QToolButton; -class QWidgetAction; class QVBoxLayout; -class LocationLineEdit; -class WebView; -class WebBrowserNetworkAccessManager; class QMenu; +class LocationLineEdit; +class WebBrowserNetworkAccessManager; class TabWidget; class WebBrowser : public TabContent { @@ -31,17 +31,28 @@ class WebBrowser : public TabContent { void setupIcons(); // Returns icon associated with currently loaded website. - QIcon icon(); + inline QIcon icon() { + return m_webView->icon(); + } // Sets this WebBrowser instance as focused. void setFocus(Qt::FocusReason reason); // Returns this instance. // NOTE: This is needed due to TabContent interface. - WebBrowser *webBrowser(); + inline WebBrowser *webBrowser() { + return this; + } // Returns global menu for this web browser. - virtual QList globalMenu(); + inline virtual QList globalMenu() { + QList browser_menu; + + // Add needed actions into the menu. + browser_menu.append(m_actionZoom); + + return browser_menu; + } // Returns pointer to global network access manager // for web browsers. @@ -54,7 +65,9 @@ class WebBrowser : public TabContent { public slots: // Switches visibility of navigation bar. - void setNavigationBarVisible(bool visible); + inline void setNavigationBarVisible(bool visible) { + m_toolBar->setVisible(visible); + } // Loads new url into the web browser. void navigateToUrl(const QString &url);