summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-29 21:16:55 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-30 14:43:34 +0300
commit9a39234015f092c5eb0f461da91689e71bf43943 (patch)
treee798f45bc08f3015020972a2db0f015eb8cc0c42 /src/gui
parent23a3e48c33b14cc0bda0eb3fda361961e8d6172c (diff)
downloadmanaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.gz
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.bz2
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.xz
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/models/ignorechoiceslistmodel.h1
-rw-r--r--src/gui/models/playerrelationlistmodel.h1
-rw-r--r--src/gui/models/playertablemodel.cpp2
-rw-r--r--src/gui/models/playertablemodel.h2
-rw-r--r--src/gui/widgets/skillinfo.h1
-rw-r--r--src/gui/widgets/skilllistbox.h3
6 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index c6dea9603..8c2711b64 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -26,6 +26,7 @@
#include "gui/models/playerrelationlistmodel.h"
#include "being/playerignorestrategy.h"
+#include "being/playerrelations.h"
/**
* Class for choosing one of the various `what to do when ignoring a player' options
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
index f969b8e20..d34b3c1e1 100644
--- a/src/gui/models/playerrelationlistmodel.h
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -24,7 +24,6 @@
#define GUI_MODELS_PLAYERRELATIONLISTMODEL_H
#include "being/playerrelation.h"
-#include "being/playerrelations.h"
#include "gui/models/listmodel.h"
diff --git a/src/gui/models/playertablemodel.cpp b/src/gui/models/playertablemodel.cpp
index 4affed712..8844404a9 100644
--- a/src/gui/models/playertablemodel.cpp
+++ b/src/gui/models/playertablemodel.cpp
@@ -22,6 +22,8 @@
#include "gui/models/playertablemodel.h"
+#include "being/playerrelations.h"
+
#include "gui/widgets/dropdown.h"
#include "gui/widgets/label.h"
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index de21224b8..6525a38b3 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -27,8 +27,6 @@
#include "gui/models/tablemodel.h"
-#include "being/playerrelation.h"
-
#include "localconsts.h"
class PlayerRelationListModel;
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index 9324091bf..f0e356a58 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -30,7 +30,6 @@
#include "resources/skilltype.h"
#include <string>
-
#include <vector>
#include <map>
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index b8aa3f3c5..62848a98e 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -30,7 +30,6 @@
#include "gui/widgets/createwidget.h"
#include "gui/widgets/listbox.h"
-#include "gui/widgets/skilldata.h"
#include "gui/fonts/font.h"
@@ -38,8 +37,6 @@
#include "gui/popups/skillpopup.h"
-#include "render/graphics.h"
-
#include "utils/delete2.h"
#include "resources/skillconsts.h"