Refactoring.

src/gui/skinfactory.h

@@ -38,9 +38,6 @@ class SkinFactory : public QObject {
     bool loadSkinFromData(const Skin &skin);
 
   public:
-    // Singleton getter.
-    static SkinFactory *instance();
-
     // Destructor.
     virtual ~SkinFactory();
 
@@ -70,6 +67,9 @@ class SkinFactory : public QObject {
     // Sets the desired skin as the active one if it exists.
     void setCurrentSkinName(const QString &skin_name);
 
+    // Singleton getter.
+    static SkinFactory *instance();
+
   private:
     // Holds name of the current skin.
     Skin m_currentSkin;

src/gui/webbrowser.cpp

@@ -6,7 +6,6 @@
 #include "gui/skinfactory.h"
 #include "gui/webview.h"
 #include "gui/formmain.h"
-#include "gui/locationlineedit.h"
 #include "gui/iconthemefactory.h"
 #include "gui/tabwidget.h"
 
@@ -162,10 +161,6 @@ void WebBrowser::navigateToUrl(const QUrl &url) {
   }
 }
 
-void WebBrowser::clear() {
-  m_webView->load(QUrl());
-}
-
 void WebBrowser::navigateToMessages(const QList<Message> &messages) {
   SkinFactory *factory = SkinFactory::instance();
   QString messages_layout;
@@ -232,16 +227,6 @@ WebBrowser::~WebBrowser() {
   delete m_actionZoom;
 }
 
-
-
-
-
-
-
-void WebBrowser::setFocus(Qt::FocusReason reason) {
-  m_txtLocation->setFocus(reason);
-}
-
 void WebBrowser::setupIcons() {
   m_actionZoom->setIcon(IconThemeFactory::instance()->fromTheme("zoom-fit-best"));
   m_actionBack->setIcon(IconThemeFactory::instance()->fromTheme("go-previous"));

src/gui/webbrowser.h

@@ -4,6 +4,7 @@
 #include "core/messagesmodel.h"
 #include "gui/tabcontent.h"
 #include "gui/webview.h"
+#include "gui/locationlineedit.h"
 
 #include <QWidget>
 #include <QWidgetAction>
@@ -15,7 +16,6 @@
 class QToolButton;
 class QVBoxLayout;
 class QMenu;
-class LocationLineEdit;
 class WebBrowserNetworkAccessManager;
 class TabWidget;
 
@@ -36,7 +36,9 @@ class WebBrowser : public TabContent {
     }
 
     // Sets this WebBrowser instance as focused.
-    void setFocus(Qt::FocusReason reason);
+    inline void setFocus(Qt::FocusReason reason) {
+      m_txtLocation->setFocus(reason);
+    }
 
     // Returns this instance.
     // NOTE: This is needed due to TabContent interface.
@@ -77,7 +79,9 @@ class WebBrowser : public TabContent {
     void navigateToMessages(const QList<Message> &messages);
 
     // Clears contents.
-    void clear();
+    inline void clear() {
+      m_webView->load(QUrl());
+    }
 
     // Zoom manipulators.
     void increaseZoom();

src/gui/webview.cpp

@@ -28,9 +28,7 @@ WebView::~WebView() {
   qDebug("Destroying BaseWebView.");
 }
 
-WebPage *WebView::page() const {
+
-  return m_page;
-}
 
 void WebView::onLoadFinished(bool ok) {
   // If page was not loaded, then display custom error page.

src/gui/webview.h

@@ -17,7 +17,9 @@ class WebView : public QWebView {
     virtual ~WebView();
 
     // Page accessor.
-    WebPage *page() const;
+    inline WebPage *page() const {
+      return m_page;
+    }
 
     void setupIcons();