From 637c1a1d7ce176106ffc6e8d64d945aa4ace47a5 Mon Sep 17 00:00:00 2001
From: aacid <aacid@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 18 May 2008 14:01:39 +0000
Subject: [PATCH] fix ebn warnings regarding includes

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegames@809199 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kubrick/src/cube.cpp        | 4 +++-
 kubrick/src/game.cpp        | 3 +--
 kubrick/src/gameglview.cpp  | 7 +++----
 kubrick/src/gameglview.h    | 2 +-
 kubrick/src/kubrick.cpp     | 5 ++++-
 kubrick/src/movetracker.cpp | 4 ++--
 kubrick/src/quaternion.cpp  | 4 ++--
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/kubrick/src/cube.cpp b/kubrick/src/cube.cpp
index 2c27a4ff8..3d85ae523 100644
--- a/kubrick/src/cube.cpp
+++ b/kubrick/src/cube.cpp
@@ -16,13 +16,15 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *******************************************************************************/
 
+// Own header
+#include "cube.h"
+
 // The RubikCube object uses the sqrt() function.
 #include <math.h>
 #include <stdlib.h>
 
 // Local includes
 #include "gameglview.h"
-#include "cube.h"
 
 // Create a Cube
 
diff --git a/kubrick/src/game.cpp b/kubrick/src/game.cpp
index 7a6771623..580c43a4f 100644
--- a/kubrick/src/game.cpp
+++ b/kubrick/src/game.cpp
@@ -16,13 +16,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *******************************************************************************/
 
-#include <KDebug>
-
 // Local includes
 #include "game.h"
 #include "movetracker.h"
 #include "scenelabel.h"
 
+#include <KDebug>
 
 // Create the main game/document object
 Game::Game (Kubrick * parent)
diff --git a/kubrick/src/gameglview.cpp b/kubrick/src/gameglview.cpp
index 3d51ca87e..dd63bddbd 100644
--- a/kubrick/src/gameglview.cpp
+++ b/kubrick/src/gameglview.cpp
@@ -16,20 +16,19 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *******************************************************************************/
 
+// Local includes
+#include "gameglview.h"
+
 // Qt includes
 #include <QStringList>
 #include <QPoint>
 #include <QImage>
 #include <QLabel>
 #include <QMouseEvent>
-#include <QtOpenGL>
 
 // C++ includes
 #include <iostream>
 
-// Local includes
-#include "gameglview.h"
-
 GameGLView::GameGLView(Game * g, QWidget * parent)
             : QGLWidget(QGLFormat (QGL::AlphaChannel), parent),
               bgColor (QColor (0, 0, 35))
diff --git a/kubrick/src/gameglview.h b/kubrick/src/gameglview.h
index 6e600f08f..4785d628f 100644
--- a/kubrick/src/gameglview.h
+++ b/kubrick/src/gameglview.h
@@ -20,7 +20,7 @@
 #define GAMEGLVIEW_H
 
 // Qt includes
-#include <QtOpenGL>
+#include <QGLWidget>
 #include <QMouseEvent>
 
 // Local includes
diff --git a/kubrick/src/kubrick.cpp b/kubrick/src/kubrick.cpp
index e55a6a1cd..721bcd505 100644
--- a/kubrick/src/kubrick.cpp
+++ b/kubrick/src/kubrick.cpp
@@ -16,8 +16,12 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *******************************************************************************/
 
+// Own header
+#include "kubrick.h"
+
 // Qt includes.
 #include <QDir>
+#include <QLineEdit>
 #include <QString>
 #include <QAction>
 #include <QSignalMapper>
@@ -35,7 +39,6 @@
 #include <KShortcutsDialog>
 
 // Local includes.
-#include "kubrick.h"
 #include "game.h"
 #include "gameglview.h"
 
diff --git a/kubrick/src/movetracker.cpp b/kubrick/src/movetracker.cpp
index 358d006ce..773051ec5 100644
--- a/kubrick/src/movetracker.cpp
+++ b/kubrick/src/movetracker.cpp
@@ -16,6 +16,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *******************************************************************************/
 
+#include "movetracker.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,8 +26,6 @@
 #include <KLocale>
 #include <KMessageBox>
 
-#include "movetracker.h"
-
 MoveTracker::MoveTracker (QWidget * parent)
     :
     QObject (parent),
diff --git a/kubrick/src/quaternion.cpp b/kubrick/src/quaternion.cpp
index 83c9be3ce..5bc400f6e 100644
--- a/kubrick/src/quaternion.cpp
+++ b/kubrick/src/quaternion.cpp
@@ -21,12 +21,12 @@
   Acknowledgements and thanks to John Darrington and the Gnubik package.
 */
 
+#include "quaternion.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "quaternion.h"
-
 Quaternion::Quaternion ()
 {
     quaternionSetIdentity();
-- 
2.11.4.GIT