Refactoring.

src/gui/dialogs/formmain.cpp

@@ -46,18 +46,14 @@
 #include "services/abstract/serviceroot.h"
 #include "services/abstract/recyclebin.h"
 #include "services/standard/gui/formstandardimportexport.h"
+#include "services/owncloud/network/owncloudnetworkfactory.h"
 
 #include <QCloseEvent>
-#include <QSessionManager>
 #include <QRect>
 #include <QScopedPointer>
 #include <QDesktopWidget>
-#include <QReadWriteLock>
 #include <QTimer>
 #include <QFileDialog>
-#include <QTextStream>
-
-#include "services/owncloud/network/owncloudnetworkfactory.h"
 
 
 FormMain::FormMain(QWidget *parent, Qt::WindowFlags f)
@@ -98,6 +94,18 @@ FormMain::~FormMain() {
   qDebug("Destroying FormMain instance.");
 }
 
+QMenu *FormMain::trayMenu() const {
+  return m_trayMenu;
+}
+
+TabWidget *FormMain::tabWidget() const {
+  return m_ui->m_tabWidget;
+}
+
+StatusBar *FormMain::statusBar() const {
+  return m_statusBar;
+}
+
 void FormMain::showDbCleanupAssistant() {
   if (qApp->feedUpdateLock()->tryLock()) {
     QScopedPointer<FormDatabaseCleanup> form_pointer(new FormDatabaseCleanup(this));

src/gui/dialogs/formmain.h

@@ -29,10 +29,8 @@ class FormMain : public QMainWindow {
     Q_OBJECT
 
     friend class TabWidget;
-    friend class FeedMessageViewer;
     friend class MessagesView;
     friend class FeedsView;
-    friend class MessagesToolBar;
 
   public:
     // Constructors and destructors.
@@ -40,19 +38,13 @@ class FormMain : public QMainWindow {
     virtual ~FormMain();
 
     // Returns menu for the tray icon.
-    inline QMenu *trayMenu() const {
+    QMenu *trayMenu() const;
-      return m_trayMenu;
-    }
 
     // Returns global tab widget.
-    inline TabWidget *tabWidget() const {
+    TabWidget *tabWidget() const;
-      return m_ui->m_tabWidget;
-    }
 
     // Access to statusbar.
-    inline StatusBar *statusBar() const {
+    StatusBar *statusBar() const;
-      return m_statusBar;
-    }
 
     // Returns list of all globally available actions.
     // NOTE: This is used for setting dynamic shortcuts

src/gui/dialogs/formupdate.cpp

@@ -18,14 +18,12 @@
 #include "gui/dialogs/formupdate.h"
 
 #include "definitions/definitions.h"
-#include "miscellaneous/systemfactory.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/iofactory.h"
 #include "network-web/networkfactory.h"
 #include "network-web/webfactory.h"
 #include "network-web/downloader.h"
 #include "gui/messagebox.h"
-#include "gui/systemtrayicon.h"
 
 #include <QNetworkReply>
 #include <QProcess>

src/miscellaneous/autosaver.h

@@ -20,10 +20,10 @@
 
 #include <QObject>
 #include <QBasicTimer>
-#include <QDateTime>
+#include <QTime>
 
 
-class AutoSaver : public QObject{
+class AutoSaver : public QObject {
     Q_OBJECT
 
   public: