summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manaplus.cbp2
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/setup_chat.cpp2
-rw-r--r--src/gui/setup_other.cpp3
-rw-r--r--src/gui/setup_perfomance.cpp2
-rw-r--r--src/gui/setup_players.cpp2
-rw-r--r--src/gui/widgets/setupitem.cpp (renamed from src/gui/setupitem.cpp)2
-rw-r--r--src/gui/widgets/setupitem.h (renamed from src/gui/setupitem.h)0
-rw-r--r--src/gui/widgets/setuptabscroll.cpp3
11 files changed, 13 insertions, 13 deletions
diff --git a/manaplus.cbp b/manaplus.cbp
index f47e5c271..8ed18dbed 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -349,6 +349,8 @@
<Unit filename="src\gui\widgets\resizegrip.h" />
<Unit filename="src\gui\widgets\scrollarea.cpp" />
<Unit filename="src\gui\widgets\scrollarea.h" />
+ <Unit filename="src\gui\widgets\setupitem.cpp" />
+ <Unit filename="src\gui\widgets\setupitem.h" />
<Unit filename="src\gui\widgets\setuptab.cpp" />
<Unit filename="src\gui\widgets\setuptab.h" />
<Unit filename="src\gui\widgets\shopitems.cpp" />
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76bbeb48a..311ca756d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,7 +42,6 @@ src/gui/setup_audio.cpp
src/gui/setup_chat.cpp
src/gui/setup_colors.cpp
src/gui/setup.cpp
-src/gui/setupitem.cpp
src/gui/setup_joystick.cpp
src/gui/setup_keyboard.cpp
src/gui/setup_other.cpp
@@ -67,6 +66,7 @@ src/gui/whoisonline.cpp
src/gui/widgets/battletab.cpp
src/gui/widgets/channeltab.cpp
src/gui/widgets/chattab.cpp
+src/gui/widgets/setupitem.cpp
src/gui/widgets/tradetab.cpp
src/gui/widgets/whispertab.cpp
src/gui/windowmenu.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fba255c1c..413a72f65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -181,6 +181,8 @@ SET(SRCS
gui/widgets/resizegrip.h
gui/widgets/scrollarea.cpp
gui/widgets/scrollarea.h
+ gui/widgets/setupitem.cpp
+ gui/widgets/setupitem.h
gui/widgets/setuptab.cpp
gui/widgets/setuptab.h
gui/widgets/setuptabscroll.cpp
@@ -299,8 +301,6 @@ SET(SRCS
gui/serverdialog.h
gui/setup.cpp
gui/setup.h
- gui/setupitem.cpp
- gui/setupitem.h
gui/setup_audio.cpp
gui/setup_audio.h
gui/setup_colors.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 697575b97..57bb4e620 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -184,6 +184,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/resizegrip.h \
gui/widgets/scrollarea.cpp \
gui/widgets/scrollarea.h \
+ gui/widgets/setupitem.cpp \
+ gui/widgets/setupitem.h \
gui/widgets/setuptab.cpp \
gui/widgets/setuptab.h \
gui/widgets/setuptabscroll.cpp \
@@ -302,8 +304,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/serverdialog.h \
gui/setup.cpp \
gui/setup.h \
- gui/setupitem.cpp \
- gui/setupitem.h \
gui/setup_audio.cpp \
gui/setup_audio.h \
gui/setup_colors.cpp \
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 7ce44a552..722a3f8b2 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -25,7 +25,6 @@
#include "gui/chatwindow.h"
#include "gui/editdialog.h"
-#include "gui/setupitem.h"
#include "gui/widgets/button.h"
#include "gui/widgets/chattab.h"
@@ -34,6 +33,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
#include "configuration.h"
#include "localplayer.h"
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index 3b603a8ee..b405f5045 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -23,10 +23,9 @@
#include "gui/setup_other.h"
-#include "gui/setupitem.h"
-
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
#include "configuration.h"
#include "logger.h"
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index 583f2909a..dfb119b91 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -25,7 +25,6 @@
#include "gui/chatwindow.h"
#include "gui/editdialog.h"
-#include "gui/setupitem.h"
#include "gui/widgets/button.h"
#include "gui/widgets/chattab.h"
@@ -34,6 +33,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
#include "configuration.h"
#include "localplayer.h"
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index acc6b3d3c..78c77f6f1 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -25,7 +25,6 @@
#include "gui/chatwindow.h"
#include "gui/editdialog.h"
-#include "gui/setupitem.h"
#include "gui/widgets/button.h"
#include "gui/widgets/chattab.h"
@@ -34,6 +33,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
#include "configuration.h"
#include "localplayer.h"
diff --git a/src/gui/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index defdb4005..fd2c937dc 100644
--- a/src/gui/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/setupitem.h"
+#include "gui/widgets/setupitem.h"
#include "configuration.h"
#include "main.h"
diff --git a/src/gui/setupitem.h b/src/gui/widgets/setupitem.h
index 3396edea3..3396edea3 100644
--- a/src/gui/setupitem.h
+++ b/src/gui/widgets/setupitem.h
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index 805c0c8c7..30bb66469 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -20,10 +20,9 @@
#include "gui/widgets/setuptabscroll.h"
-#include "gui/setupitem.h"
-
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
#include "gui/widgets/vertcontainer.h"
#include "debug.h"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 11:10:01 +0000