summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Schwarzer <[email protected]>2016-04-26 02:22:56 +0200
committerFrederik Schwarzer <[email protected]>2016-04-26 02:22:56 +0200
commit0f061117becda66ca0336d81596cc7ca2909be91 (patch)
tree75dd32f271a64f305490df29cbc42cba5420c197
parentba34ed874b289fbd89f8ac5a0e31452327e3c8ff (diff)
Include order.
-rw-r--r--src/board.cpp19
-rw-r--r--src/board.h8
-rw-r--r--src/bomb.cpp2
-rw-r--r--src/bomb.h1
-rw-r--r--src/bomber.cpp22
-rw-r--r--src/bomber.h8
-rw-r--r--src/bomberwidget.cpp12
-rw-r--r--src/bomberwidget.h7
-rw-r--r--src/building.cpp6
-rw-r--r--src/building.h1
-rw-r--r--src/explodable.cpp7
-rw-r--r--src/explodable.h1
-rw-r--r--src/main.cpp14
-rw-r--r--src/plane.cpp3
14 files changed, 78 insertions, 33 deletions
diff --git a/src/board.cpp b/src/board.cpp
index 3f4e7e9..db8b94c 100644
--- a/src/board.cpp
+++ b/src/board.cpp
@@ -15,20 +15,25 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
+// own
#include "board.h"
+// Qt
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QStandardPaths>
+#include <QTimer>
+
+// KDE
+#include <KRandom>
+
+// Bomber
#include "bomb.h"
#include "building.h"
#include "plane.h"
-
#include "settings.h"
-#include <KRandom>
-
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QStandardPaths>
-#include <QTimer>
/** The value that the plane velocity increases by */
const qreal PLANE_INC_VELOCITY = 0.0005;
diff --git a/src/board.h b/src/board.h
index 44bc3bf..97c9444 100644
--- a/src/board.h
+++ b/src/board.h
@@ -18,14 +18,16 @@
#ifndef BOARD_H
#define BOARD_H
-#include <KGameRenderer>
-#include <QGraphicsScene>
-
+// Qt
#include <QDir>
+#include <QGraphicsScene>
#include <QList>
#include <QQueue>
#include <QSize>
+// KDE
+#include <KGameRenderer>
+
class Plane;
class Building;
class Bomb;
diff --git a/src/bomb.cpp b/src/bomb.cpp
index 6b83bbb..ebc7f7c 100644
--- a/src/bomb.cpp
+++ b/src/bomb.cpp
@@ -16,8 +16,10 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+// own
#include "bomb.h"
+// Bomber
#include "board.h"
#include "explodable.h"
diff --git a/src/bomb.h b/src/bomb.h
index ee0c706..f6a0d38 100644
--- a/src/bomb.h
+++ b/src/bomb.h
@@ -18,6 +18,7 @@
#ifndef BOMB_H
#define BOMB_H
+// Bomber
#include "explodable.h"
/**
diff --git a/src/bomber.cpp b/src/bomber.cpp
index b5ee5c5..8ab021c 100644
--- a/src/bomber.cpp
+++ b/src/bomber.cpp
@@ -15,22 +15,28 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
+// own
#include "bomber.h"
-#include "bomberwidget.h"
-#include "settings.h"
+// Qt
+#include <QAction>
+#include <QLabel>
+#include <QStatusBar>
+// KDE
#include <KActionCollection>
#include <KLocalizedString>
#include <KMessageBox>
+#include <KRandom>
#include <KScoreDialog>
+#include <KStandardGameAction>
#include <KToggleAction>
-#include <QAction>
-#include <QLabel>
-#include <QStatusBar>
-#include <kgthemeselector.h>
-#include <krandom.h>
-#include <kstandardgameaction.h>
+#include <KgThemeSelector>
+
+// Bomber
+#include "bomberwidget.h"
+#include "settings.h"
Bomber::Bomber()
{
diff --git a/src/bomber.h b/src/bomber.h
index d302d5e..deb5825 100644
--- a/src/bomber.h
+++ b/src/bomber.h
@@ -18,10 +18,12 @@
#ifndef BOMBER_H
#define BOMBER_H
-#include "bomberwidget.h"
+// KDE
+#include <KXmlGuiWindow>
+#include <KgThemeProvider>
-#include <kgthemeprovider.h>
-#include <kxmlguiwindow.h>
+// Bomber
+#include "bomberwidget.h"
class QAction;
class QStatusBar;
diff --git a/src/bomberwidget.cpp b/src/bomberwidget.cpp
index 8e981da..742e32f 100644
--- a/src/bomberwidget.cpp
+++ b/src/bomberwidget.cpp
@@ -16,15 +16,23 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
+// own
#include "bomberwidget.h"
-#include "settings.h"
+// STL
+#include <sys/stat.h>
+
+// Qt
#include <QGraphicsItem>
#include <QGraphicsView>
#include <QTimer>
+// KDE
#include <KLocalizedString>
-#include <sys/stat.h>
+
+// Bomber
+#include "settings.h"
#define NEW_LIVE_AT_SCORE 10000;
diff --git a/src/bomberwidget.h b/src/bomberwidget.h
index be67af9..2a5b4bc 100644
--- a/src/bomberwidget.h
+++ b/src/bomberwidget.h
@@ -20,13 +20,16 @@
#ifndef BOMBER_WIDGET_H
#define BOMBER_WIDGET_H
-#include "board.h"
-
+// Qt
#include <QGraphicsView>
#include <QMouseEvent>
+// KDE
#include <KgSound>
+// Bomber
+#include "board.h"
+
class KgThemeProvider;
/**
diff --git a/src/building.cpp b/src/building.cpp
index 18dfaf1..d67e67c 100644
--- a/src/building.cpp
+++ b/src/building.cpp
@@ -16,12 +16,16 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+// own
#include "building.h"
-#include "board.h"
+// KDE
#include <KGameRenderedItem>
#include <KRandom>
+// Bomber
+#include "board.h"
+
/**
* How big is a building in relation to the tiles width.
* 1.0 means it's the same size as the tile.
diff --git a/src/building.h b/src/building.h
index ef31b7c..b201141 100644
--- a/src/building.h
+++ b/src/building.h
@@ -19,6 +19,7 @@
#ifndef BUILDING_H
#define BUILDING_H
+// Qt
#include <QList>
#include <QRect>
#include <QSize>
diff --git a/src/explodable.cpp b/src/explodable.cpp
index d5e43dc..ceb99c4 100644
--- a/src/explodable.cpp
+++ b/src/explodable.cpp
@@ -16,12 +16,15 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+// own
#include "explodable.h"
-#include "board.h"
-
+// KDE
#include <KRandom>
+// Bomber
+#include "board.h"
+
/**
* How big is the explosion in relation to the tiles height.
* 1.0 means it's the same size as the tile.
diff --git a/src/explodable.h b/src/explodable.h
index ea3d109..4739fda 100644
--- a/src/explodable.h
+++ b/src/explodable.h
@@ -19,6 +19,7 @@
#ifndef EXPLODABLE_H
#define EXPLODABLE_H
+// KDE
#include <KGameRenderedItem>
class BomberBoard;
diff --git a/src/main.cpp b/src/main.cpp
index 0b71448..2e8abbc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,16 +15,20 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "bomber.h"
+// Qt
+#include <QApplication>
+#include <QCommandLineParser>
+
+// KDE
#include <KAboutData>
#include <KCrash>
-
#include <KDBusService>
#include <KLocalizedString>
-#include <QApplication>
-#include <QCommandLineParser>
-#include <kdelibs4configmigrator.h>
+#include <Kdelibs4ConfigMigrator>
+
+// Bomber
+#include "bomber.h"
static const char description[] = I18N_NOOP("Arcade bombing game");
diff --git a/src/plane.cpp b/src/plane.cpp
index f6353c3..47c976c 100644
--- a/src/plane.cpp
+++ b/src/plane.cpp
@@ -15,8 +15,11 @@
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
+// own
#include "plane.h"
+// Bomber
#include "board.h"
#include "explodable.h"