Qt Editor: Win32 build fixes

src/editor/C4ConsoleQtViewport.cpp

@@ -45,47 +45,6 @@ bool C4ConsoleQtViewportView::IsPlayViewport() const
 		&& (::Console.EditCursor.GetMode() == C4CNS_ModePlay));
 }
 
-bool C4ConsoleQtViewportView::nativeEvent(const QByteArray &eventType, void *message, long *result)
-{
-	// Handle native Windows messages
-#ifdef USE_WIN32_WINDOWS
-	MSG *msg = static_cast<MSG*>(message);
-	switch (msg->message)
-	{
-	//----------------------------------------------------------------------------------------------------------------------------------
-	case WM_HSCROLL:
-		switch (LOWORD(msg->wParam))
-		{
-		case SB_THUMBTRACK:
-		case SB_THUMBPOSITION: cvp->SetViewX(float(HIWORD(msg->wParam)) / cvp->GetZoom()); break;
-		case SB_LINELEFT: cvp->ScrollView(-ViewportScrollSpeed, 0.0f); break;
-		case SB_LINERIGHT: cvp->ScrollView(+ViewportScrollSpeed, 0.0f); break;
-		case SB_PAGELEFT: cvp->ScrollView(-cvp->ViewWdt / cvp->GetZoom(), 0.0f); break;
-		case SB_PAGERIGHT: cvp->ScrollView(+cvp->ViewWdt / cvp->GetZoom(), 0.0f); break;
-		}
-		cvp->Execute();
-		cvp->ScrollBarsByViewPosition();
-		return true;
-	//----------------------------------------------------------------------------------------------------------------------------------
-	case WM_VSCROLL:
-		switch (LOWORD(msg->wParam))
-		{
-		case SB_THUMBTRACK:
-		case SB_THUMBPOSITION: cvp->SetViewY(float(HIWORD(msg->wParam)) / cvp->GetZoom()); break;
-		case SB_LINEUP: cvp->ScrollView(0.0f, -ViewportScrollSpeed); break;
-		case SB_LINEDOWN: cvp->ScrollView(0.0f, +ViewportScrollSpeed); break;
-		case SB_PAGEUP: cvp->ScrollView(0.0f, -cvp->ViewWdt / cvp->GetZoom()); break;
-		case SB_PAGEDOWN: cvp->ScrollView(0.0f, +cvp->ViewWdt / cvp->GetZoom()); break;
-		}
-		cvp->Execute();
-		cvp->ScrollBarsByViewPosition();
-		return true;
-		//----------------------------------------------------------------------------------------------------------------------------------
-	}
-#endif
-	return false;
-}
-
 // Get Shift state as Win32 wParam
 uint32_t GetShiftWParam()
 {

src/editor/C4ConsoleQtViewport.h

@@ -37,7 +37,6 @@ private:
 protected:
 	void focusInEvent(QFocusEvent * event) override;
 	void focusOutEvent(QFocusEvent * event) override;
-	bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
 	void mouseMoveEvent(QMouseEvent *eventMove) override;
 	void mousePressEvent(QMouseEvent *eventPress) override;
 	void mouseDoubleClickEvent(QMouseEvent *eventPress) override;

src/graphics/C4DrawGLCtx.cpp

@@ -655,6 +655,8 @@ bool CStdGLCtx::PageFlip()
 
 #ifdef WITH_QT_EDITOR
 #undef LineFeed // conflicts with Qt
+#undef new
+#undef delete
 #include <QOpenGLWidget>
 #include <QOpenGLContext>
 #include <QOffscreenSurface>

src/script/C4ValueArray.cpp

@@ -104,7 +104,7 @@ struct C4ValueArraySortStringscomp
 	{
 		if (v1.getStr() && v2.getStr())
 			return std::strcmp(v1._getStr()->GetCStr(), v2._getStr()->GetCStr()) < 0;
-		return v2.getStr();
+		return !!v2.getStr();
 	}
 };