Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/libs/gtkutil/dialog.h b/libs/gtkutil/dialog.h
index b359bc17b71262a6089877060cfb90d702f47e72..79330143679b85a05e49fdfb3574294c3a1a9990 100644 (file)
--- a/libs/gtkutil/dialog.h
+++ b/libs/gtkutil/dialog.h
@@ -31,118 +31,94 @@ typedef gint gboolean;
 typedef struct _GdkEventAny GdkEventAny;
 
 
-struct ModalDialog {
-    ModalDialog()
-            : loop(true), ret(eIDCANCEL)
-    {
-    }
-
-    bool loop;
-    EMessageBoxReturn ret;
+struct ModalDialog
+{
+       ModalDialog()
+               : loop( true ), ret( eIDCANCEL ){
+       }
+       bool loop;
+       EMessageBoxReturn ret;
 };
 
-struct ModalDialogButton {
-    ModalDialogButton(ModalDialog &dialog, EMessageBoxReturn value)
-            : m_dialog(dialog), m_value(value)
-    {
-    }
-
-    ModalDialog &m_dialog;
-    EMessageBoxReturn m_value;
+struct ModalDialogButton
+{
+       ModalDialogButton( ModalDialog& dialog, EMessageBoxReturn value )
+               : m_dialog( dialog ), m_value( value ){
+       }
+       ModalDialog& m_dialog;
+       EMessageBoxReturn m_value;
 };
 
-typedef void ( *GCallback )(void);
-
-typedef void *gpointer;
-
-ui::Window create_fixedsize_modal_window(ui::Window parent, const char *title, int width, int height);
-
-ui::Window create_dialog_window(ui::Window parent, const char *title, GCallback func, gpointer data, int default_w = -1,
-                                int default_h = -1);
-
-ui::Table
-create_dialog_table(unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing,
-                    int border = 0);
-
-ui::Button create_dialog_button(const char *label, GCallback func, gpointer data);
-
-ui::VBox create_dialog_vbox(int spacing, int border = 0);
-
-ui::HBox create_dialog_hbox(int spacing, int border = 0);
+typedef void ( *GCallback )( void );
+typedef void* gpointer;
 
-ui::Frame create_dialog_frame(const char *label, ui::Shadow shadow = ui::Shadow::ETCHED_IN);
+ui::Window create_fixedsize_modal_window( ui::Window parent, const char* title, int width, int height );
 
-ui::Button create_modal_dialog_button(const char *label, ModalDialogButton &button);
+ui::Window create_dialog_window( ui::Window parent, const char* title, GCallback func, gpointer data, int default_w = -1, int default_h = -1 );
+ui::Table create_dialog_table( unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing, int border = 0 );
+ui::Button create_dialog_button( const char* label, GCallback func, gpointer data );
+ui::VBox create_dialog_vbox( int spacing, int border = 0 );
+ui::HBox create_dialog_hbox( int spacing, int border = 0 );
+ui::Frame create_dialog_frame( const char* label, ui::Shadow shadow = ui::Shadow::ETCHED_IN );
 
-ui::Window create_modal_dialog_window(ui::Window parent, const char *title, ModalDialog &dialog, int default_w = -1,
-                                      int default_h = -1);
+ui::Button create_modal_dialog_button( const char* label, ModalDialogButton& button );
+ui::Window create_modal_dialog_window( ui::Window parent, const char* title, ModalDialog& dialog, int default_w = -1, int default_h = -1 );
+ui::Window create_fixedsize_modal_dialog_window( ui::Window parent, const char* title, ModalDialog& dialog, int width = -1, int height = -1 );
+EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog );
 
-ui::Window
-create_fixedsize_modal_dialog_window(ui::Window parent, const char *title, ModalDialog &dialog, int width = -1,
-                                     int height = -1);
 
-EMessageBoxReturn modal_dialog_show(ui::Window window, ModalDialog &dialog);
+gboolean dialog_button_ok( ui::Widget widget, ModalDialog* data );
+gboolean dialog_button_cancel( ui::Widget widget, ModalDialog* data );
+gboolean dialog_button_yes( ui::Widget widget, ModalDialog* data );
+gboolean dialog_button_no( ui::Widget widget, ModalDialog* data );
+gboolean dialog_delete_callback( ui::Widget widget, GdkEventAny* event, ModalDialog* data );
 
+ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, ui::Widget contents );
 
-gboolean dialog_button_ok(ui::Widget widget, ModalDialog *data);
-
-gboolean dialog_button_cancel(ui::Widget widget, ModalDialog *data);
-
-gboolean dialog_button_yes(ui::Widget widget, ModalDialog *data);
-
-gboolean dialog_button_no(ui::Widget widget, ModalDialog *data);
-
-gboolean dialog_delete_callback(ui::Widget widget, GdkEventAny *event, ModalDialog *data);
-
-ui::Window create_simple_modal_dialog_window(const char *title, ModalDialog &dialog, ui::Widget contents);
-
-class RadioHBox {
+class RadioHBox
+{
 public:
-    ui::HBox m_hbox;
-    ui::RadioButton m_radio;
-
-    RadioHBox(ui::HBox hbox, ui::RadioButton radio) :
-            m_hbox(hbox),
-            m_radio(radio)
-    {
-    }
+ui::HBox m_hbox;
+ui::RadioButton m_radio;
+RadioHBox( ui::HBox hbox, ui::RadioButton radio ) :
+       m_hbox( hbox ),
+       m_radio( radio ){
+}
 };
 
-RadioHBox RadioHBox_new(StringArrayRange names);
+RadioHBox RadioHBox_new( StringArrayRange names );
 
 
-class PathEntry {
+class PathEntry
+{
 public:
-    ui::Frame m_frame;
-    ui::Entry m_entry;
-    ui::Button m_button;
-
-    PathEntry(ui::Frame frame, ui::Entry entry, ui::Button button) :
-            m_frame(frame),
-            m_entry(entry),
-            m_button(button)
-    {
-    }
+ui::Frame m_frame;
+ui::Entry m_entry;
+ui::Button m_button;
+PathEntry( ui::Frame frame, ui::Entry entry, ui::Button button ) :
+       m_frame( frame ),
+       m_entry( entry ),
+       m_button( button ){
+}
 };
 
 PathEntry PathEntry_new();
 
-class BrowsedPathEntry {
+class BrowsedPathEntry
+{
 public:
-    typedef Callback<void(const char *)> SetPathCallback;
-    typedef Callback<void(const SetPathCallback &)> BrowseCallback;
+typedef Callback<void(const char*)> SetPathCallback;
+typedef Callback<void(const SetPathCallback&)> BrowseCallback;
 
-    PathEntry m_entry;
-    BrowseCallback m_browse;
+PathEntry m_entry;
+BrowseCallback m_browse;
 
-    BrowsedPathEntry(const BrowseCallback &browse);
+BrowsedPathEntry( const BrowseCallback& browse );
 };
 
-ui::Label DialogLabel_new(const char *name);
-
-ui::Table DialogRow_new(const char *name, ui::Widget widget);
-
-void DialogVBox_packRow(ui::Box vbox, ui::Widget row);
+ui::Label DialogLabel_new( const char* name );
+ui::Table DialogRow_new( const char* name, ui::Widget widget );
+void DialogVBox_packRow( ui::Box vbox, ui::Widget row );
 
 
 #endif