summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-19 15:36:06 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-19 15:36:06 +0300
commit7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b (patch)
tree6923dc394bf51e81574c526c233331e265adb838
parentad3ee95f90bfd368a511407c13718b900e44be0f (diff)
downloadmv-7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b.tar.gz
mv-7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b.tar.bz2
mv-7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b.tar.xz
mv-7f97219905c2ad4ffcf9a36a019bf43ad4f0f93b.zip
Move wallpaperdata into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/resources/wallpaper.cpp14
-rw-r--r--src/resources/wallpaperdata.h43
4 files changed, 46 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22afcb8ed..a00277521 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -611,6 +611,7 @@ SET(SRCS
resources/updatefile.h
resources/wallpaper.cpp
resources/wallpaper.h
+ resources/wallpaperdata.h
utils/translation/podict.cpp
utils/translation/podict.h
utils/translation/poparser.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d89bf185..faa6a241d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -715,6 +715,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/surfaceimagehelper.h \
resources/wallpaper.cpp \
resources/wallpaper.h \
+ resources/wallpaperdata.h \
utils/translation/podict.cpp \
utils/translation/podict.h \
utils/translation/poparser.cpp \
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 1866241bb..4674035cf 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -25,6 +25,7 @@
#include "configuration.h"
#include "resources/resourcemanager.h"
+#include "resources/wallpaperdata.h"
#include "utils/physfstools.h"
@@ -34,19 +35,6 @@
#include "debug.h"
-struct WallpaperData
-{
- WallpaperData() :
- filename(),
- width(0),
- height(0)
- {
- }
- std::string filename;
- int width;
- int height;
-};
-
static bool wallpaperCompare(const WallpaperData &a, const WallpaperData &b);
static std::vector<WallpaperData> wallpaperData;
diff --git a/src/resources/wallpaperdata.h b/src/resources/wallpaperdata.h
new file mode 100644
index 000000000..0b28c9e3e
--- /dev/null
+++ b/src/resources/wallpaperdata.h
@@ -0,0 +1,43 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_WALLPAPERDATA_H
+#define RESOURCES_WALLPAPERDATA_H
+
+#include <string>
+
+#include "localconsts.h"
+
+struct WallpaperData final
+{
+ WallpaperData() :
+ filename(),
+ width(0),
+ height(0)
+ {
+ }
+ std::string filename;
+ int width;
+ int height;
+};
+
+#endif // RESOURCES_WALLPAPERDATA_H