summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-15 20:21:16 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-15 20:21:16 +0300
commit516d635b6cbce6e38cc3e4f227f6ab0b073925b9 (patch)
tree61f4e9eab9bae255375e94c29d4663b5d8f217c5 /src/resources
parent0e7b238a3794a9d2bb8dbf66adfe65bf6f1f4046 (diff)
downloadmv-516d635b6cbce6e38cc3e4f227f6ab0b073925b9.tar.gz
mv-516d635b6cbce6e38cc3e4f227f6ab0b073925b9.tar.bz2
mv-516d635b6cbce6e38cc3e4f227f6ab0b073925b9.tar.xz
mv-516d635b6cbce6e38cc3e4f227f6ab0b073925b9.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/dye/dyepalette_unittest.cc1
-rw-r--r--src/resources/inventory/inventory.h1
-rw-r--r--src/resources/item/complexitem.cpp2
-rw-r--r--src/resources/item/complexitem.h2
4 files changed, 0 insertions, 6 deletions
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 5654a4a08..1393070ea 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -356,5 +356,4 @@ TEST_CASE("DyePalette tests")
REQUIRE(palette.mColors[0].value[2] == 46);
REQUIRE(palette.mColors[0].value[3] == 0x77);
}
-
}
diff --git a/src/resources/inventory/inventory.h b/src/resources/inventory/inventory.h
index 9186fbd73..6b8253857 100644
--- a/src/resources/inventory/inventory.h
+++ b/src/resources/inventory/inventory.h
@@ -38,7 +38,6 @@
#include "utils/intmap.h"
#include <list>
-#include <string>
#include "localconsts.h"
diff --git a/src/resources/item/complexitem.cpp b/src/resources/item/complexitem.cpp
index 95e30ac54..3d50d62e5 100644
--- a/src/resources/item/complexitem.cpp
+++ b/src/resources/item/complexitem.cpp
@@ -20,8 +20,6 @@
#include "resources/item/complexitem.h"
-#include "logger.h"
-
#include "utils/dtor.h"
#include "debug.h"
diff --git a/src/resources/item/complexitem.h b/src/resources/item/complexitem.h
index 9515e13f5..b567c49e8 100644
--- a/src/resources/item/complexitem.h
+++ b/src/resources/item/complexitem.h
@@ -23,8 +23,6 @@
#include "resources/item/item.h"
-#include <vector>
-
#include "localconsts.h"
/**