do not write useless empty line at beginning of map file

[xonotic/netradiant.git] / libs / gtkutil / window.h

diff --git a/libs/gtkutil/window.h b/libs/gtkutil/window.h
index 2adc3cafd5101106c3ac505c708dba352a829f0f..69135f833f897bae273569133d746b325047449d 100644 (file)
--- a/libs/gtkutil/window.h
+++ b/libs/gtkutil/window.h
@@ -28,7 +28,7 @@
 #include "generic/callback.h"
 #include "widget.h"
 
-gboolean window_focus_in_clear_focus_widget(ui::Widget widget, GdkEventKey *event, gpointer data);
+gboolean window_focus_in_clear_focus_widget(ui::Window widget, GdkEventKey *event, gpointer data);
 
 guint window_connect_focus_in_clear_focus_widget(ui::Window window);
 
@@ -66,14 +66,13 @@ void window_get_position(ui::Window window, WindowPosition &position);
 
 void window_set_position(ui::Window window, const WindowPosition &position);
 
-void WindowPosition_Parse(WindowPosition &position, const char *value);
+struct WindowPosition_String {
 
-typedef ReferenceCaller1<WindowPosition, const char *, WindowPosition_Parse> WindowPositionImportStringCaller;
+    static void Export(const WindowPosition &self, const Callback<void(const char *)> &returnz);
 
-void WindowPosition_Write(const WindowPosition &position, const StringImportCallback &importCallback);
-
-typedef ConstReferenceCaller1<WindowPosition, const StringImportCallback &, WindowPosition_Write> WindowPositionExportStringCaller;
+    static void Import(WindowPosition &self, const char *value);
 
+};
 
 class WindowPositionTracker {
     WindowPosition m_position;
@@ -97,13 +96,10 @@ public:
 };
 
 
-void WindowPositionTracker_importString(WindowPositionTracker &self, const char *value);
-
-typedef ReferenceCaller1<WindowPositionTracker, const char *, WindowPositionTracker_importString> WindowPositionTrackerImportStringCaller;
-
-void WindowPositionTracker_exportString(const WindowPositionTracker &self, const StringImportCallback &importer);
-
-typedef ConstReferenceCaller1<WindowPositionTracker, const StringImportCallback &, WindowPositionTracker_exportString> WindowPositionTrackerExportStringCaller;
+struct WindowPositionTracker_String {
+    static void Export(const WindowPositionTracker &self, const Callback<void(const char *)> &returnz);
 
+    static void Import(WindowPositionTracker &self, const char *value);
+};
 
 #endif