Cleanup

Post-merge issues.
skyjake · Jul 16, 2020 · 9f58782 · 9f58782
1 parent fc0f8fb
commit 9f58782
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/doomsday/libs/core/include/de/core/matrix.h b/doomsday/libs/core/include/de/core/matrix.h
@@ -504,8 +504,6 @@ typedef Matrix4<dfloat>  Mat4f;
 typedef Matrix4<ddouble> Mat4d;
 ///@}
 
-using Mat4f = Matrix4f;
-
 } // namespace de
 
 #endif // LIBCORE_MATRIX_H
diff --git a/doomsday/libs/gamekit/libs/common/src/common.cpp b/doomsday/libs/gamekit/libs/common/src/common.cpp
@@ -229,7 +229,7 @@ static de::Value *Function_Game_SetMessage(de::Context &, const de::Function::Ar
     return nullptr;
 }
 
-static de::Value *Function_Game_Rules(de::Context &, const de::Function::ArgumentValues &args)
+static de::Value *Function_Game_Rules(de::Context &, const de::Function::ArgumentValues &)
 {
     return new de::RecordValue(gfw_Session()->rules().asRecord());
 }
@@ -379,7 +379,7 @@ void Common_Load()
             setMessageArgs["player"] = new NoneValue;
 
             gameBindings->init(*gameModule)
-                << DE_FUNC_DEFS(Game_SetMessage, "setMessage", "message" << "player", setMessageArgs);
+                << DE_FUNC_DEFS(Game_SetMessage, "setMessage", "message" << "player", setMessageArgs)
                 << DE_FUNC_NOARG(Game_Rules, "rules");
 
 #if defined(__JHEXEN__)
@@ -439,7 +439,7 @@ void Common_Load()
             gameBindings->init(playerClass)
                 << DE_FUNC_NOARG (Player_Health, "health")
                 << DE_FUNC       (Player_Power, "power", "type")
-                << DE_FUNC_NOARG (Player_ShotAmmo, "shotAmmo");
+                << DE_FUNC_NOARG (Player_ShotAmmo, "shotAmmo")
                 << DE_FUNC       (Player_GiveArmor, "giveArmor", "type" << "points");
 
 #if defined(HAVE_DOOM_ARMOR_BINDINGS)
@@ -452,7 +452,7 @@ void Common_Load()
             Function::Defaults setLocalQuakeArgs;
             setLocalQuakeArgs["duration"] = new NumberValue(0);
             *gameBindings
-                << DENG2_FUNC_DEFS (Player_SetLocalQuake, "setLocalQuake", "intensity" << "duration", setLocalQuakeArgs);
+                << DE_FUNC_DEFS (Player_SetLocalQuake, "setLocalQuake", "intensity" << "duration", setLocalQuakeArgs);
 #endif
 
 #if defined(__JHERETIC__)

diff --git a/doomsday/libs/gamekit/libs/heretic/include/doomdef.h b/doomsday/libs/gamekit/libs/heretic/include/doomdef.h
@@ -274,7 +274,7 @@ void       *G_GetVariable(int id);
 
 #define DEFAULT_PLAYER_VIEWHEIGHT (41)
 
-DENG_EXTERN_C int localQuakeHappening[MAXPLAYERS];
-DENG_EXTERN_C int localQuakeTimeout[MAXPLAYERS];
+DE_EXTERN_C int localQuakeHappening[MAXPLAYERS];
+DE_EXTERN_C int localQuakeTimeout[MAXPLAYERS];
 
 #endif /* LIBHERETIC_DEFS_H */
diff --git a/doomsday/libs/gamekit/libs/heretic/src/h_main.cpp b/doomsday/libs/gamekit/libs/heretic/src/h_main.cpp
@@ -26,7 +26,7 @@
 #include <de/App>
 #include <de/CommandLine>
 #include <de/Function>
-#include <de/NumberValue>>
+#include <de/NumberValue>
 #include "d_netsv.h"
 #include "g_defs.h"
 #include "gamesession.h"

diff --git a/doomsday/libs/gamekit/libs/heretic/src/intermission.cpp b/doomsday/libs/gamekit/libs/heretic/src/intermission.cpp
@@ -793,21 +793,21 @@ static void drawStats()
         }
     }
 
-    if (bgMaterial.startsWith("Flats:") || bgMaterial.startsWith("flats:"))
+    if (bgMaterial.beginsWith("Flats:") || bgMaterial.beginsWith("flats:"))
     {
         // Draw a background flat.
         DGL_SetMaterialUI(
             (world_Material *) P_ToPtr(DMU_MATERIAL, Materials_ResolveUriCString(bgMaterial)),
             DGL_REPEAT,
             DGL_REPEAT);
-    DGL_Enable(DGL_TEXTURE_2D);
-    DGL_Color4f(1, 1, 1, 1);
-    DGL_DrawRectf2Tiled(0, 0, SCREENWIDTH, SCREENHEIGHT, 64, 64);
-    DGL_Disable(DGL_TEXTURE_2D);
+        DGL_Enable(DGL_TEXTURE_2D);
+        DGL_Color4f(1, 1, 1, 1);
+        DGL_DrawRectf2Tiled(0, 0, SCREENWIDTH, SCREENHEIGHT, 64, 64);
+        DGL_Disable(DGL_TEXTURE_2D);
     }
-    else if (bgMaterial.startsWith("Patches:") || bgMaterial.startsWith("patches:"))
+    else if (bgMaterial.beginsWith("Patches:") || bgMaterial.beginsWith("patches:"))
     {
-        drawBackground(R_DeclarePatch(bgMaterial.constData() + strlen("Patches:")));
+        drawBackground(R_DeclarePatch(bgMaterial.c_str() + strlen("Patches:")));
     }
 
     switch (gameType)

diff --git a/doomsday/libs/gamekit/libs/hexen/include/h2def.h b/doomsday/libs/gamekit/libs/hexen/include/h2def.h
@@ -368,7 +368,7 @@ DE_EXTERN_C dd_bool  modifiedgame;
 #define MAX_PLAYER_STARTS   (8)
 
 DE_EXTERN_C int localQuakeHappening[MAXPLAYERS];
-DENG_EXTERN_C int localQuakeTimeout[MAXPLAYERS]; // zero for unlimited
+DE_EXTERN_C int localQuakeTimeout[MAXPLAYERS]; // zero for unlimited
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/doomsday/libs/gui/CMakeLists.txt b/doomsday/libs/gui/CMakeLists.txt
@@ -38,6 +38,7 @@ deng_merge_sources (text     src/text/*.cpp)
 deng_merge_sources (vr       src/vr/*.cpp)
 deng_merge_sources (widgets  src/widgets/*.cpp)
 
+list (FILTER SOURCES EXCLUDE REGEX ".*/filedialog_.*")
 if (DE_X11 OR RASPBERRYPI)
     list (APPEND SOURCES src/dialogs/filedialog_generic.cpp)
 else ()

diff --git a/doomsday/libs/gui/src/graphics/gltextureframebuffer.cpp b/doomsday/libs/gui/src/graphics/gltextureframebuffer.cpp
@@ -123,19 +123,19 @@ DE_PIMPL(GLTextureFramebuffer)
         if (isMultisampled())
         {
             self().configure(size, ColorDepthStencil, sampleCount());
-            resolvedFbo.configure(color[0].texture.get(), &depthStencil);
+            resolvedFbo.configure(color[0].texture.get(), &depthStencil, &depthStencil);
         }
         else
         {
             try
             {
                 if (color.size() == 1)
                 {
-                    self().configure(color[0].texture.get(), &depthStencil);
+                    self().configure(color[0].texture.get(), &depthStencil, &depthStencil);
                 }
                 else
                 {
-                    self().configure(colorAttachments(), &depthStencil);
+                    self().configure(colorAttachments(), &depthStencil, &depthStencil);
                 }
                 resolvedFbo.setState(NotReady);
             }

diff --git a/doomsday/libs/gui/src/windoweventhandler.cpp b/doomsday/libs/gui/src/windoweventhandler.cpp
@@ -474,12 +474,12 @@ void WindowEventHandler::setKeyboardMode(KeyboardMode kbMode)
         d->keyboardMode = kbMode;
         if (kbMode == TextInput)
         {
-            LOG_INPUT_MSG("Keyboard mode changed to text input");
+            LOGDEV_INPUT_VERBOSE("Keyboard mode changed to text input");
             SDL_StartTextInput();
         }
         else
         {
-            LOG_INPUT_MSG("Keyboard mode changed to raw key events");
+            LOGDEV_INPUT_VERBOSE("Keyboard mode changed to raw key events");
             SDL_StopTextInput();
         }
     }