From 7a6d52cddfb66e7433405c9835b0995e308011dd Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 22 Jul 2017 17:36:49 +1000 Subject: [PATCH] Remove from radiant/dialog.h --- radiant/camwindow.cpp | 4 +++- radiant/dialog.cpp | 2 ++ radiant/dialog.h | 43 +++++++++++++++++------------------ radiant/feedback.cpp | 2 ++ radiant/findtexturedialog.cpp | 2 ++ radiant/gtkdlgs.cpp | 2 ++ radiant/mainframe.cpp | 2 ++ radiant/map.cpp | 2 ++ radiant/patchdialog.cpp | 2 ++ radiant/patchmanip.cpp | 4 +++- radiant/pluginmenu.cpp | 2 ++ radiant/preferences.cpp | 2 ++ radiant/qe3.cpp | 2 ++ radiant/surfacedialog.cpp | 2 ++ radiant/texwindow.cpp | 2 ++ radiant/xywindow.cpp | 2 ++ 16 files changed, 53 insertions(+), 24 deletions(-) diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index d77b519b..cf5bc385 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -25,9 +25,11 @@ // Leonardo Zide (leo@lokigames.com) // -#include #include "camwindow.h" +#include +#include + #include "debugging/debugging.h" #include "iscenegraph.h" diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index c576ba46..84b2ee2a 100644 --- a/radiant/dialog.cpp +++ b/radiant/dialog.cpp @@ -28,6 +28,8 @@ #include "dialog.h" +#include + #include "debugging/debugging.h" diff --git a/radiant/dialog.h b/radiant/dialog.h index c2bd20a8..f4ce1667 100644 --- a/radiant/dialog.h +++ b/radiant/dialog.h @@ -24,7 +24,6 @@ #include #include -#include #include "gtkutil/dialog.h" #include "generic/callback.h" @@ -162,27 +161,27 @@ ui::SpinButton addSpinner( ui::Widget vbox, const char* name, double value, doub protected: -void AddBoolToggleData( GtkToggleButton& object, const BoolImportCallback& importCallback, const BoolExportCallback& exportCallback ); -void AddIntRadioData( GtkRadioButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); -void AddTextEntryData( GtkEntry& object, const StringImportCallback& importCallback, const StringExportCallback& exportCallback ); -void AddIntEntryData( GtkEntry& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); -void AddSizeEntryData( GtkEntry& object, const SizeImportCallback& importCallback, const SizeExportCallback& exportCallback ); -void AddFloatEntryData( GtkEntry& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ); -void AddFloatSpinnerData( GtkSpinButton& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ); -void AddIntSpinnerData( GtkSpinButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); -void AddIntAdjustmentData( GtkAdjustment& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); -void AddIntComboData( GtkComboBox& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); - -void AddDialogData( GtkToggleButton& object, bool& data ); -void AddDialogData( GtkRadioButton& object, int& data ); -void AddDialogData( GtkEntry& object, CopiedString& data ); -void AddDialogData( GtkEntry& object, int& data ); -void AddDialogData( GtkEntry& object, std::size_t& data ); -void AddDialogData( GtkEntry& object, float& data ); -void AddDialogData( GtkSpinButton& object, float& data ); -void AddDialogData( GtkSpinButton& object, int& data ); -void AddDialogData( GtkAdjustment& object, int& data ); -void AddDialogData( GtkComboBox& object, int& data ); +void AddBoolToggleData( struct _GtkToggleButton& object, const BoolImportCallback& importCallback, const BoolExportCallback& exportCallback ); +void AddIntRadioData( struct _GtkRadioButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); +void AddTextEntryData( struct _GtkEntry& object, const StringImportCallback& importCallback, const StringExportCallback& exportCallback ); +void AddIntEntryData( struct _GtkEntry& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); +void AddSizeEntryData( struct _GtkEntry& object, const SizeImportCallback& importCallback, const SizeExportCallback& exportCallback ); +void AddFloatEntryData( struct _GtkEntry& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ); +void AddFloatSpinnerData( struct _GtkSpinButton& object, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ); +void AddIntSpinnerData( struct _GtkSpinButton& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); +void AddIntAdjustmentData( struct _GtkAdjustment& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); +void AddIntComboData( struct _GtkComboBox& object, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); + +void AddDialogData( struct _GtkToggleButton& object, bool& data ); +void AddDialogData( struct _GtkRadioButton& object, int& data ); +void AddDialogData( struct _GtkEntry& object, CopiedString& data ); +void AddDialogData( struct _GtkEntry& object, int& data ); +void AddDialogData( struct _GtkEntry& object, std::size_t& data ); +void AddDialogData( struct _GtkEntry& object, float& data ); +void AddDialogData( struct _GtkSpinButton& object, float& data ); +void AddDialogData( struct _GtkSpinButton& object, int& data ); +void AddDialogData( struct _GtkAdjustment& object, int& data ); +void AddDialogData( struct _GtkComboBox& object, int& data ); }; #endif diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp index 00512547..4ef14154 100644 --- a/radiant/feedback.cpp +++ b/radiant/feedback.cpp @@ -27,6 +27,8 @@ #include "feedback.h" +#include + #include "debugging/debugging.h" #include "igl.h" diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp index e4319c1e..04983314 100644 --- a/radiant/findtexturedialog.cpp +++ b/radiant/findtexturedialog.cpp @@ -27,6 +27,8 @@ #include "findtexturedialog.h" +#include + #include "debugging/debugging.h" #include "ishaders.h" diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index 3ad56a8b..2ba4ea3d 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -36,6 +36,8 @@ #include "gtkdlgs.h" +#include + #include "debugging/debugging.h" #include "version.h" #include "aboutmsg.h" diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index eb3fdff4..4af997f9 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -27,6 +27,8 @@ #include "mainframe.h" +#include + #include "ifilesystem.h" #include "iundo.h" #include "editable.h" diff --git a/radiant/map.cpp b/radiant/map.cpp index 518886f6..7b362552 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -21,6 +21,8 @@ #include "map.h" +#include + #include "debugging/debugging.h" #include "imap.h" diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index 2121b928..c13280c4 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -27,6 +27,8 @@ #include "patchdialog.h" +#include + #include "itexdef.h" #include "debugging/debugging.h" diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp index 16d5d5e2..8b9123b1 100644 --- a/radiant/patchmanip.cpp +++ b/radiant/patchmanip.cpp @@ -19,9 +19,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include "patchmanip.h" +#include +#include + #include "debugging/debugging.h" diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp index e3b278c5..4227bba1 100644 --- a/radiant/pluginmenu.cpp +++ b/radiant/pluginmenu.cpp @@ -21,6 +21,8 @@ #include "pluginmenu.h" +#include + #include "stream/textstream.h" #include "gtkutil/pointer.h" diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 46ed23ff..82100d61 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -26,6 +26,8 @@ // #include "preferences.h" + +#include #include "environment.h" #include "debugging/debugging.h" diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp index 193a0a49..7d685bae 100644 --- a/radiant/qe3.cpp +++ b/radiant/qe3.cpp @@ -34,6 +34,8 @@ #include "qe3.h" +#include + #include "debugging/debugging.h" #include "ifilesystem.h" diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index f4e621cb..ab0fc4fc 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -27,6 +27,8 @@ #include "surfacedialog.h" +#include + #include "debugging/debugging.h" #include "warnings.h" diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 08f55508..3ab5900c 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -27,6 +27,8 @@ #include "texwindow.h" +#include + #include "debugging/debugging.h" #include "warnings.h" diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 0d457d2c..d375ef8e 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -27,6 +27,8 @@ #include "xywindow.h" +#include + #include "debugging/debugging.h" #include "ientity.h" -- 2.39.2