summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-17 00:36:15 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-17 00:36:15 +0300
commit093e392dd84c920d26bca17d48ac6611393d087c (patch)
tree776845e14448e748f25dcfc92749ed1599b0ce31 /src/gui
parentb30df9b843eae2128431320308510f13296e3e7f (diff)
downloadmanaverse-093e392dd84c920d26bca17d48ac6611393d087c.tar.gz
manaverse-093e392dd84c920d26bca17d48ac6611393d087c.tar.bz2
manaverse-093e392dd84c920d26bca17d48ac6611393d087c.tar.xz
manaverse-093e392dd84c920d26bca17d48ac6611393d087c.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/changepassworddialog.cpp2
-rw-r--r--src/gui/connectiondialog.cpp2
-rw-r--r--src/gui/equipmentwindow.cpp3
-rw-r--r--src/gui/killstats.cpp6
-rw-r--r--src/gui/palette.cpp2
-rw-r--r--src/gui/sdlinput.cpp2
-rw-r--r--src/gui/userpalette.cpp2
-rw-r--r--src/gui/widgets/flowcontainer.cpp2
-rw-r--r--src/gui/widgets/itemlinkhandler.cpp8
-rw-r--r--src/gui/widgets/passwordfield.cpp2
10 files changed, 15 insertions, 16 deletions
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 657bf8fd9..00ac3ab69 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "changepassworddialog.h"
+#include "gui/changepassworddialog.h"
#include "client.h"
#include "logger.h"
diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp
index ba1330881..b5357d83c 100644
--- a/src/gui/connectiondialog.cpp
+++ b/src/gui/connectiondialog.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "connectiondialog.h"
+#include "gui/connectiondialog.h"
#include "logger.h"
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 417dca680..2a61b9a0f 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -22,8 +22,6 @@
#include "gui/equipmentwindow.h"
-#include "gui/widgets/button.h"
-
#include "being.h"
#include "equipment.h"
#include "graphics.h"
@@ -36,6 +34,7 @@
#include "gui/setup.h"
#include "gui/viewport.h"
+#include "gui/widgets/button.h"
#include "gui/widgets/playerbox.h"
#include "net/inventoryhandler.h"
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 37fd70340..9de807c6c 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -22,9 +22,6 @@
#include "gui/killstats.h"
-#include <math.h>
-#include <guichan/widgets/label.hpp>
-
#include "gui/widgets/button.h"
#include "gui/widgets/label.h"
#include "gui/widgets/layout.h"
@@ -39,6 +36,9 @@
#include "utils/gettext.h"
#include "utils/stringutils.h"
+#include <math.h>
+#include <guichan/widgets/label.hpp>
+
#include "debug.h"
KillStats::KillStats():
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index e24907256..a31346b87 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "palette.h"
+#include "gui/palette.h"
#include "configuration.h"
#include "client.h"
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 283d1b33e..7d484e082 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -56,7 +56,7 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sdlinput.h"
+#include "gui/sdlinput.h"
#include "keyinput.h"
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 60f99b66c..5d878a0f0 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "userpalette.h"
+#include "gui/userpalette.h"
#include "configuration.h"
#include "client.h"
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index acda5ad88..be7e3136d 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "flowcontainer.h"
+#include "gui/widgets/flowcontainer.h"
#include "debug.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 45cb25463..00f310c51 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -20,20 +20,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <sstream>
-#include <string>
+#include "gui/widgets/itemlinkhandler.h"
#include "item.h"
#include "gui/itempopup.h"
#include "gui/viewport.h"
-#include "gui/widgets/itemlinkhandler.h"
-
#include "utils/process.h"
#include "resources/itemdb.h"
+#include <sstream>
+#include <string>
+
#include "debug.h"
ItemLinkHandler::ItemLinkHandler() :
diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index 6f339ddd7..a976f440e 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "passwordfield.h"
+#include "gui/widgets/passwordfield.h"
#include "debug.h"