Refactoring...

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:

src/gui/iconthemefactory.cpp

@@ -6,7 +6,6 @@
 
 #include <QIcon>
 #include <QFile>
-#include <QDir>
 #include <QPointer>
 #include <QApplication>
 #include <QHash>
@@ -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,

src/gui/iconthemefactory.h

@@ -1,10 +1,13 @@
 #ifndef THEMEFACTORY_H
 #define THEMEFACTORY_H
 
+#include "core/defs.h"
+
 #include <QString>
 #include <QIcon>
 #include <QPointer>
 #include <QHash>
+#include <QDir>
 
 
 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();

src/gui/messagesview.cpp

@@ -5,7 +5,6 @@
 #include "core/settings.h"
 #include "gui/formmain.h"
 
-#include <QHeaderView>
 #include <QKeyEvent>
 #include <QScrollBar>
 #include <QMenu>
@@ -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);

src/gui/messagesview.h

@@ -4,6 +4,7 @@
 #include "core/messagesmodel.h"
 
 #include <QTreeView>
+#include <QHeaderView>
 
 
 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();
+    inline MessagesProxyModel *model() {
-    MessagesModel *sourceModel();
+      return m_proxyModel;
+    }
+
+    inline MessagesModel *sourceModel() {
+      return m_sourceModel;
+    }
 
     // Creates needed connections.
     void createConnections();

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);
-}

src/gui/shortcutcatcher.h

@@ -50,15 +50,23 @@ class ShortcutCatcher : public QWidget {
     void controlModifierlessTimout();
     void updateDisplayShortcut();
 
-    QKeySequence shortcut() const;
+    inline QKeySequence shortcut() const {
-    void setShortcut(const QKeySequence &key);
+      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);

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;

src/gui/skinfactory.h

@@ -48,8 +48,13 @@ class SkinFactory : public QObject {
     void loadCurrentSkin();
 
     // Returns contents of current layout markup.
-    QString currentMarkup();
+    inline QString currentMarkup() {
-    QString currentMarkupLayout();
+      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.

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);

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);

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<TabBar::TabType>(tabData(index).value<int>());
-}
-
 void TabBar::wheelEvent(QWheelEvent *event) {
   int current_index = currentIndex();
   int number_of_tabs = count();

src/gui/tabbar.h

@@ -2,6 +2,7 @@
 #define TABBAR_H
 
 #include <QTabBar>
+#include <QVariant>
 
 
 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);
+    inline void setTabType(int index, const TabBar::TabType &type) {
-    TabBar::TabType tabType(int index);
+      setTabData(index, QVariant(type));
+    }
+
+    inline TabBar::TabType tabType(int index) {
+      return static_cast<TabBar::TabType>(tabData(index).value<int>());
+    }
     
   protected:
     // Reimplementations.

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;
-}

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;
+    inline virtual int index() const {
-    virtual void setIndex(int index);
+      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.

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<TabBar*>(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<TabContent*>(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);

src/gui/tabwidget.h

@@ -32,8 +32,13 @@ class TabWidget : public QTabWidget {
     void removeTab(int index);
 
     // Returns tab bar.
-    TabBar *tabBar();
+    inline TabBar *tabBar() {
-    TabContent *widget(int index) const;
+      return static_cast<TabBar*>(QTabWidget::tabBar());
+    }
+
+    inline TabContent *widget(int index) const {
+      return static_cast<TabContent*>(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.

src/gui/webbrowser.cpp

@@ -232,22 +232,11 @@ WebBrowser::~WebBrowser() {
   delete m_actionZoom;
 }
 
-WebBrowser *WebBrowser::webBrowser() {
-  return this;
-}
 
-QList<QAction *> WebBrowser::globalMenu() {
-  QList<QAction*> 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 *> WebBrowser::runningWebBrowsers() {
   return m_runningWebBrowsers;
 }
 
-void WebBrowser::setNavigationBarVisible(bool visible) {
+
-  m_toolBar->setVisible(visible);
-}
 
 WebBrowserNetworkAccessManager *WebBrowser::globalNetworkManager() {
   if (m_networkManager.isNull()) {

src/gui/webbrowser.h

@@ -1,22 +1,22 @@
 #ifndef WEBBROWSER_H
 #define WEBBROWSER_H
 
-#include <QWidget>
-#include <QPointer>
-#include <QUrl>
-
 #include "core/messagesmodel.h"
 #include "gui/tabcontent.h"
+#include "gui/webview.h"
+
+#include <QWidget>
+#include <QWidgetAction>
+#include <QPointer>
+#include <QUrl>
+#include <QToolBar>
 
 
-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<QAction*> globalMenu();
+    inline virtual QList<QAction*> globalMenu() {
+      QList<QAction*> 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);