Merge branches 'bugfixes' and 'widget'

Conflicts: src/ingameop.cpp src/intelmap.cpp
Warzone2100 · Mar 15, 2013 · 64c2fde · 64c2fde
3 parents 2753aaa + 6092fe1 + 11b0464
commit 64c2fde
Show file tree

Hide file tree

Showing 56 changed files with 3,533 additions and 8,997 deletions.
diff --git a/data/mp/multiplay/maps/4c-pyramidal/feature.ini b/data/mp/multiplay/maps/4c-pyramidal/feature.ini
@@ -755,36 +755,6 @@ position = 2940, 6204, 306
 rotation = 16384, 0, 0
 name = WreckedSuzukiJeep
 
-[feature_1395]
-id = 1395
-position = 13248, 9664, 6
-rotation = 0, 0, 0
-name = OilDrum
-
-[feature_1396]
-id = 1396
-position = 13180, 9548, 12
-rotation = 0, 0, 0
-name = OilDrum
-
-[feature_1397]
-id = 1397
-position = 13320, 9624, 0
-rotation = 0, 0, 0
-name = OilDrum
-
-[feature_1398]
-id = 1398
-position = 13356, 9748, 4
-rotation = 0, 0, 0
-name = OilDrum
-
-[feature_1399]
-id = 1399
-position = 13178, 9728, 13
-rotation = 0, 0, 0
-name = OilDrum
-
 [feature_1400]
 id = 1400
 position = 13168, 9612, 15
@@ -935,18 +905,6 @@ position = 10944, 320, 63
 rotation = 16384, 0, 0
 name = Ruin3
 
-[feature_1465]
-id = 1465
-position = 9920, 576, 102
-rotation = 0, 0, 0
-name = OilDrum
-
-[feature_1466]
-id = 1466
-position = 10304, 576, 102
-rotation = 49152, 0, 0
-name = OilDrum
-
 [feature_1497]
 id = 1497
 position = 16192, 9920, 510

diff --git a/lib/framework/frame.h b/lib/framework/frame.h
@@ -31,6 +31,10 @@
 # undef Status
 #endif
 
+#ifndef WZ_CXX11
+# define nullptr NULL
+#endif
+
 #include "types.h"
 /**
 * NOTE: the next two #include lines are needed by MSVC to override the default,

diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h
@@ -310,6 +310,9 @@
 */
 #if defined(__cplusplus)
 # define WZ_CXX98
+# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#  define WZ_CXX11
+# endif
 #endif /* WZ_CXXxx */
 
 

diff --git a/lib/ivis_opengl/ivisdef.h b/lib/ivis_opengl/ivisdef.h
@@ -164,6 +164,7 @@ struct Image
 {
 	Image(IMAGEFILE const *images = NULL, unsigned id = 0) : images(const_cast<IMAGEFILE *>(images)), id(id) {}
 
+	bool isNull() const { return images == nullptr; }
 	int width() const { return images->imageDefs[id].Width; }
 	int height() const { return images->imageDefs[id].Height; }
 	int xOffset() const { return images->imageDefs[id].XOffset; }

diff --git a/lib/sdl/main_sdl.cpp b/lib/sdl/main_sdl.cpp
@@ -117,8 +117,6 @@ static InputKey	*pStartBuffer, *pEndBuffer;
 /***     Misc support   ***/
 /**************************/
 
-#define WIDG_MAXSTR 80 // HACK, from widget.h
-
 /* Put a character into a text buffer overwriting any text under the cursor */
 QString wzGetSelection()
 {
@@ -127,7 +125,7 @@ QString wzGetSelection()
 	int scraplen;
 
 	get_scrap(T('T','E','X','T'), &scraplen, &scrap);
-	if (scraplen > 0 && scraplen < WIDG_MAXSTR-2)
+	if (scraplen > 0)
 	{
 		retval = QString::fromUtf8(scrap);
 	}

diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am
@@ -2,25 +2,50 @@ AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS) $(QT4_CFLAGS)
 AM_CFLAGS = $(WZ_CFLAGS)
 AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
 
-noinst_LIBRARIES = libwidget.a
-noinst_HEADERS = \
+# Signals/slots
+MOCHEADER = \
 	bar.h \
 	button.h \
 	editbox.h \
 	form.h \
 	label.h \
+	listwidget.h \
 	slider.h \
 	tip.h \
 	widgbase.h \
 	widget.h \
 	widgint.h
+MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+%_moc.cpp: %.h
+	$(MOC4) -o $@ $<
+CLEANFILES = \
+	$(MOCEDFILES)
+
+noinst_LIBRARIES = libwidget.a
+noinst_HEADERS = \
+	$(MOCHEADER)
+
+#"nodist_libwidget_a_SOURCES = $(MOCEDFILES)" doesn't work here (not sure why).
+nodist_libwidget_a_SOURCES = \
+	bar_moc.cpp \
+	button_moc.cpp \
+	editbox_moc.cpp \
+	form_moc.cpp \
+	label_moc.cpp \
+	listwidget_moc.cpp \
+	slider_moc.cpp \
+	tip_moc.cpp \
+	widgbase_moc.cpp \
+	widget_moc.cpp \
+	widgint_moc.cpp
 
 libwidget_a_SOURCES = \
 	bar.cpp \
 	button.cpp \
 	editbox.cpp \
 	form.cpp \
 	label.cpp \
+	listwidget.cpp \
 	slider.cpp \
 	tip.cpp \
 	widget.cpp