[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [picmi] src/gui: Replace includes by forward declarations
From:       Jakob Gruber <jakob.gruber () gmail ! com>
Date:       2015-07-15 13:42:41
Message-ID: E1ZFMxN-0006mw-0N () scm ! kde ! org
[Download RAW message or body]

Git commit cf54e87b7db2cd4cb0eb1e6903bb8537aa7f5874 by Jakob Gruber.
Committed on 15/07/2015 at 09:40.
Pushed by gruber into branch 'master'.

Replace includes by forward declarations

These used to be required by QSharedPointer but may now be handled by
simple forward declarations.

M  +4    -2    src/gui/mainwindow.cpp
M  +3    -4    src/gui/mainwindow.h

http://commits.kde.org/picmi/cf54e87b7db2cd4cb0eb1e6903bb8537aa7f5874

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index d85873f..48bd217 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -31,10 +31,12 @@
 #include <QPushButton>
 #include <QStatusBar>
 =

-#include "selectboardwindow.h"
-#include "settingswindow.h"
 #include "src/constants.h"
 #include "src/logic/levelloader.h"
+#include "src/logic/picmi.h"
+#include "selectboardwindow.h"
+#include "settingswindow.h"
+#include "scene.h"
 =

 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 8683c18..23b2b3a 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -28,12 +28,11 @@
 #include <kxmlguiwindow.h>
 #include <kgdifficulty.h>
 =

-#include "scene.h"
-#include "src/logic/levelloader.h" /* TODO: Replace with Level forward dec=
laration
-                                    * with Qt 5 (see struct LineInfo) */
-#include "src/logic/picmi.h"
 #include "view.h"
 =

+class Level;
+class Picmi;
+class Scene;
 class QLabel;
 =

 class MainWindow : public KXmlGuiWindow

[prev in list] [next in list] [prev in thread] [next in thread]