fixup compiler errors hiding behind flags

xournalpp · Jul 27, 2021 · 4edec25 · 4edec25
1 parent 4abc8df
commit 4edec25
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 59 deletions.
diff --git a/src/Xournalpp.cpp b/src/Xournalpp.cpp
@@ -12,6 +12,7 @@
 #include <config-dev.h>
 
 #include "control/XournalMain.h"
+#include "util/logger/Logger.h"
 
 #include "CrashHandler.h"
 #include "Stacktrace.h"

diff --git a/src/control/shaperecognizer/ShapeRecognizerConfig.h b/src/control/shaperecognizer/ShapeRecognizerConfig.h
@@ -10,8 +10,8 @@
  */
 
 #pragma once
-
 #include <config-debug.h>
+#include <glib.h>
 
 #define MAX_POLYGON_SIDES 4
 

diff --git a/src/gui/inputdevices/InputContext.cpp b/src/gui/inputdevices/InputContext.cpp
@@ -206,68 +206,68 @@ void InputContext::printDebug(GdkEvent* event) {
     gdk_set_show_events(true);
 #else
 #ifdef DEBUG_INPUT
-    string message = "Event\n";
-    string gdkEventTypes[] = {"GDK_NOTHING",
-                              "GDK_DELETE",
-                              "GDK_DESTROY",
-                              "GDK_EXPOSE",
-                              "GDK_MOTION_NOTIFY",
-                              "GDK_BUTTON_PRESS",
-                              "GDK_DOUBLE_BUTTON_PRESS",
-                              "GDK_TRIPLE_BUTTON_PRESS",
-                              "GDK_BUTTON_RELEASE",
-                              "GDK_KEY_PRESS",
-                              "GDK_KEY_RELEASE",
-                              "GDK_ENTER_NOTIFY",
-                              "GDK_LEAVE_NOTIFY",
-                              "GDK_FOCUS_CHANGE",
-                              "GDK_CONFIGURE",
-                              "GDK_MAP",
-                              "GDK_UNMAP",
-                              "GDK_PROPERTY_NOTIFY",
-                              "GDK_SELECTION_CLEAR",
-                              "GDK_SELECTION_REQUEST",
-                              "GDK_SELECTION_NOTIFY",
-                              "GDK_PROXIMITY_IN",
-                              "GDK_PROXIMITY_OUT",
-                              "GDK_DRAG_ENTER",
-                              "GDK_DRAG_LEAVE",
-                              "GDK_DRAG_MOTION",
-                              "GDK_DRAG_STATUS",
-                              "GDK_DROP_START",
-                              "GDK_DROP_FINISHED",
-                              "GDK_CLIENT_EVENT",
-                              "GDK_VISIBILITY_NOTIFY",
-                              "",
-                              "GDK_SCROLL",
-                              "GDK_WINDOW_STATE",
-                              "GDK_SETTING",
-                              "GDK_OWNER_CHANGE",
-                              "GDK_GRAB_BROKEN",
-                              "GDK_DAMAGE",
-                              "GDK_TOUCH_BEGIN",
-                              "GDK_TOUCH_UPDATE",
-                              "GDK_TOUCH_END",
-                              "GDK_TOUCH_CANCEL",
-                              "GDK_TOUCHPAD_SWIPE",
-                              "GDK_TOUCHPAD_PINCH",
-                              "GDK_PAD_BUTTON_PRESS",
-                              "GDK_PAD_BUTTON_RELEASE",
-                              "GDK_PAD_RING",
-                              "GDK_PAD_STRIP",
-                              "GDK_PAD_GROUP_MODE",
-                              "GDK_EVENT_LAST"};
+    std::string message = "Event\n";
+    std::string gdkEventTypes[] = {"GDK_NOTHING",
+                                   "GDK_DELETE",
+                                   "GDK_DESTROY",
+                                   "GDK_EXPOSE",
+                                   "GDK_MOTION_NOTIFY",
+                                   "GDK_BUTTON_PRESS",
+                                   "GDK_DOUBLE_BUTTON_PRESS",
+                                   "GDK_TRIPLE_BUTTON_PRESS",
+                                   "GDK_BUTTON_RELEASE",
+                                   "GDK_KEY_PRESS",
+                                   "GDK_KEY_RELEASE",
+                                   "GDK_ENTER_NOTIFY",
+                                   "GDK_LEAVE_NOTIFY",
+                                   "GDK_FOCUS_CHANGE",
+                                   "GDK_CONFIGURE",
+                                   "GDK_MAP",
+                                   "GDK_UNMAP",
+                                   "GDK_PROPERTY_NOTIFY",
+                                   "GDK_SELECTION_CLEAR",
+                                   "GDK_SELECTION_REQUEST",
+                                   "GDK_SELECTION_NOTIFY",
+                                   "GDK_PROXIMITY_IN",
+                                   "GDK_PROXIMITY_OUT",
+                                   "GDK_DRAG_ENTER",
+                                   "GDK_DRAG_LEAVE",
+                                   "GDK_DRAG_MOTION",
+                                   "GDK_DRAG_STATUS",
+                                   "GDK_DROP_START",
+                                   "GDK_DROP_FINISHED",
+                                   "GDK_CLIENT_EVENT",
+                                   "GDK_VISIBILITY_NOTIFY",
+                                   "",
+                                   "GDK_SCROLL",
+                                   "GDK_WINDOW_STATE",
+                                   "GDK_SETTING",
+                                   "GDK_OWNER_CHANGE",
+                                   "GDK_GRAB_BROKEN",
+                                   "GDK_DAMAGE",
+                                   "GDK_TOUCH_BEGIN",
+                                   "GDK_TOUCH_UPDATE",
+                                   "GDK_TOUCH_END",
+                                   "GDK_TOUCH_CANCEL",
+                                   "GDK_TOUCHPAD_SWIPE",
+                                   "GDK_TOUCHPAD_PINCH",
+                                   "GDK_PAD_BUTTON_PRESS",
+                                   "GDK_PAD_BUTTON_RELEASE",
+                                   "GDK_PAD_RING",
+                                   "GDK_PAD_STRIP",
+                                   "GDK_PAD_GROUP_MODE",
+                                   "GDK_EVENT_LAST"};
     message += "Event type:\t" + gdkEventTypes[event->type + 1] + "\n";
 
-    string gdkInputSources[] = {"GDK_SOURCE_MOUSE",    "GDK_SOURCE_PEN",        "GDK_SOURCE_ERASER",
-                                "GDK_SOURCE_CURSOR",   "GDK_SOURCE_KEYBOARD",   "GDK_SOURCE_TOUCHSCREEN",
-                                "GDK_SOURCE_TOUCHPAD", "GDK_SOURCE_TRACKPOINT", "GDK_SOURCE_TABLET_PAD"};
+    std::string gdkInputSources[] = {"GDK_SOURCE_MOUSE",    "GDK_SOURCE_PEN",        "GDK_SOURCE_ERASER",
+                                     "GDK_SOURCE_CURSOR",   "GDK_SOURCE_KEYBOARD",   "GDK_SOURCE_TOUCHSCREEN",
+                                     "GDK_SOURCE_TOUCHPAD", "GDK_SOURCE_TRACKPOINT", "GDK_SOURCE_TABLET_PAD"};
     GdkDevice* device = gdk_event_get_source_device(event);
     message += "Source device:\t" + gdkInputSources[gdk_device_get_source(device)] + "\n";
-    string gdkInputClasses[] = {"INPUT_DEVICE_MOUSE",    "INPUT_DEVICE_PEN",
-                                "INPUT_DEVICE_ERASER",   "INPUT_DEVICE_TOUCHSCREEN",
-                                "INPUT_DEVICE_KEYBOARD", "INPUT_DEVICE_MOUSE_KEYBOARD_COMBO",
-                                "INPUT_DEVICE_IGNORE"};
+    std::string gdkInputClasses[] = {"INPUT_DEVICE_MOUSE",    "INPUT_DEVICE_PEN",
+                                     "INPUT_DEVICE_ERASER",   "INPUT_DEVICE_TOUCHSCREEN",
+                                     "INPUT_DEVICE_KEYBOARD", "INPUT_DEVICE_MOUSE_KEYBOARD_COMBO",
+                                     "INPUT_DEVICE_IGNORE"};
     InputDeviceClass deviceClass = InputEvents::translateDeviceType(device, this->getSettings());
     message += "Device Class:\t" + gdkInputClasses[deviceClass] + "\n";
 

diff --git a/test/TestMain.cpp b/test/TestMain.cpp
@@ -17,6 +17,9 @@
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+
+#include "util/logger/Logger.h"
+
 using std::cout;
 using std::endl;