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

[xonotic/netradiant.git] / libs / gtkutil / button.cpp

diff --git a/libs/gtkutil/button.cpp b/libs/gtkutil/button.cpp
index 2a74c4ba69c135ddddc067e9d29077effbfc6af1..9f40f9e9600fae70f465782742c7b8675e23cf65 100644 (file)
--- a/libs/gtkutil/button.cpp
+++ b/libs/gtkutil/button.cpp
@@ -30,131 +30,121 @@
 #include "image.h"
 #include "pointer.h"
 
-void clicked_closure_callback(ui::Widget widget, gpointer data)
-{
-    (*reinterpret_cast<Callback<void()> *>( data ))();
+void clicked_closure_callback( ui::Widget widget, gpointer data ){
+       ( *reinterpret_cast<Callback<void()>*>( data ) )( );
 }
 
-void button_connect_callback(ui::Button button, const Callback<void()> &callback)
-{
+void button_connect_callback( ui::Button button, const Callback<void()>& callback ){
 #if 1
-    g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(callback.getThunk()), callback.getEnvironment());
+       g_signal_connect_swapped( G_OBJECT( button ), "clicked", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
-    g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE );
+       g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE );
 #endif
 }
 
-void button_connect_callback(ui::ToolButton button, const Callback<void()> &callback)
-{
+void button_connect_callback( ui::ToolButton button, const Callback<void()>& callback ){
 #if 1
-    g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(callback.getThunk()), callback.getEnvironment());
+       g_signal_connect_swapped( G_OBJECT( button ), "clicked", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
-    g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE );
+       g_signal_connect_closure( G_OBJECT( button ), "clicked", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), FALSE );
 #endif
 }
 
-guint toggle_button_connect_callback(ui::ToggleButton button, const Callback<void()> &callback)
-{
+guint toggle_button_connect_callback( ui::ToggleButton button, const Callback<void()>& callback ){
 #if 1
-    guint handler = g_signal_connect_swapped(G_OBJECT(button), "toggled", G_CALLBACK(callback.getThunk()),
-                                             callback.getEnvironment());
+       guint handler = g_signal_connect_swapped( G_OBJECT( button ), "toggled", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
-    guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE );
+       guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE );
 #endif
-    g_object_set_data(G_OBJECT(button), "handler", gint_to_pointer(handler));
-    return handler;
+       g_object_set_data( G_OBJECT( button ), "handler", gint_to_pointer( handler ) );
+       return handler;
 }
 
-guint toggle_button_connect_callback(ui::ToggleToolButton button, const Callback<void()> &callback)
-{
+guint toggle_button_connect_callback( ui::ToggleToolButton button, const Callback<void()>& callback ){
 #if 1
-    guint handler = g_signal_connect_swapped(G_OBJECT(button), "toggled", G_CALLBACK(callback.getThunk()),
-                                             callback.getEnvironment());
+       guint handler = g_signal_connect_swapped( G_OBJECT( button ), "toggled", G_CALLBACK( callback.getThunk() ), callback.getEnvironment() );
 #else
-    guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE );
+       guint handler = g_signal_connect_closure( G_OBJECT( button ), "toggled", create_cclosure( G_CALLBACK( clicked_closure_callback ), callback ), TRUE );
 #endif
-    g_object_set_data(G_OBJECT(button), "handler", gint_to_pointer(handler));
-    return handler;
+       g_object_set_data( G_OBJECT( button ), "handler", gint_to_pointer( handler ) );
+       return handler;
 }
 
-void button_set_icon(ui::Button button, const char *icon)
-{
-    ui::Image image = ui::Image(new_local_image(icon));
-    image.show();
-    button.add(image);
+void button_set_icon( ui::Button button, const char* icon ){
+       ui::Image image = ui::Image(new_local_image( icon ));
+       image.show();
+       button.add(image);
 }
 
-void toggle_button_set_active_no_signal(ui::ToggleButton button, gboolean active)
-{
-    //globalOutputStream() << "set active: " << active << "\n";
-    guint handler_id = gpointer_to_int(g_object_get_data(G_OBJECT(button), "handler"));
-    //guint signal_id = g_signal_lookup("toggled", G_OBJECT_TYPE (button));
-    //globalOutputStream() << "signal_id: " << signal_id << "\n";
-    //guint found = g_signal_handler_find(G_OBJECT(button), G_SIGNAL_MATCH_ID, signal_id, 0, 0, 0, 0);
-    //globalOutputStream() << " handler found: " << found << "\n";
-    g_signal_handler_block(G_OBJECT(button), handler_id);
-    gtk_toggle_button_set_active(button, active);
-    g_signal_handler_unblock(G_OBJECT(button), handler_id);
+void toggle_button_set_active_no_signal( ui::ToggleButton button, gboolean active ){
+       //globalOutputStream() << "set active: " << active << "\n";
+       guint handler_id = gpointer_to_int( g_object_get_data( G_OBJECT( button ), "handler" ) );
+       //guint signal_id = g_signal_lookup("toggled", G_OBJECT_TYPE (button));
+       //globalOutputStream() << "signal_id: " << signal_id << "\n";
+       //guint found = g_signal_handler_find(G_OBJECT(button), G_SIGNAL_MATCH_ID, signal_id, 0, 0, 0, 0);
+       //globalOutputStream() << " handler found: " << found << "\n";
+       g_signal_handler_block( G_OBJECT( button ), handler_id );
+       gtk_toggle_button_set_active( button, active );
+       g_signal_handler_unblock( G_OBJECT( button ), handler_id );
 }
 
-void toggle_button_set_active_no_signal(ui::ToggleToolButton button, gboolean active)
-{
-    guint handler_id = gpointer_to_int(g_object_get_data(G_OBJECT(button), "handler"));
-    g_signal_handler_block(G_OBJECT(button), handler_id);
-    gtk_toggle_tool_button_set_active(button, active);
-    g_signal_handler_unblock(G_OBJECT(button), handler_id);
+void toggle_button_set_active_no_signal( ui::ToggleToolButton button, gboolean active ){
+       guint handler_id = gpointer_to_int( g_object_get_data( G_OBJECT( button ), "handler" ) );
+       g_signal_handler_block( G_OBJECT( button ), handler_id );
+       gtk_toggle_tool_button_set_active( button, active );
+       g_signal_handler_unblock( G_OBJECT( button ), handler_id );
 }
 
 
-void radio_button_print_state(ui::RadioButton button)
-{
-    globalOutputStream() << "toggle button: ";
-    for (GSList *radio = gtk_radio_button_get_group(button); radio != 0; radio = g_slist_next(radio)) {
-        globalOutputStream() << gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio->data));
-    }
-    globalOutputStream() << "\n";
+void radio_button_print_state( ui::RadioButton button ){
+       globalOutputStream() << "toggle button: ";
+       for ( GSList* radio = gtk_radio_button_get_group( button ); radio != 0; radio = g_slist_next( radio ) )
+       {
+               globalOutputStream() << gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio->data ) );
+       }
+       globalOutputStream() << "\n";
 }
 
-ui::ToggleButton radio_button_get_nth(ui::RadioButton radio, int index)
-{
-    GSList *group = gtk_radio_button_get_group(radio);
-    return ui::ToggleButton::from(g_slist_nth_data(group, g_slist_length(group) - index - 1));
+ui::ToggleButton radio_button_get_nth( ui::RadioButton radio, int index ){
+       GSList *group = gtk_radio_button_get_group( radio );
+       return ui::ToggleButton::from( g_slist_nth_data( group, g_slist_length( group ) - index - 1 ) );
 }
 
-void radio_button_set_active(ui::RadioButton radio, int index)
-{
-    //radio_button_print_state(radio);
-    gtk_toggle_button_set_active(radio_button_get_nth(radio, index), TRUE);
-    //radio_button_print_state(radio);
+void radio_button_set_active( ui::RadioButton radio, int index ){
+       //radio_button_print_state(radio);
+       gtk_toggle_button_set_active( radio_button_get_nth( radio, index ), TRUE );
+       //radio_button_print_state(radio);
 }
 
-void radio_button_set_active_no_signal(ui::RadioButton radio, int index)
-{
-    {
-        for (GSList *l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) {
-            g_signal_handler_block(G_OBJECT(l->data), gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler")));
-        }
-    }
-    radio_button_set_active(radio, index);
-    {
-        for (GSList *l = gtk_radio_button_get_group(radio); l != 0; l = g_slist_next(l)) {
-            g_signal_handler_unblock(G_OBJECT(l->data),
-                                     gpointer_to_int(g_object_get_data(G_OBJECT(l->data), "handler")));
-        }
-    }
+void radio_button_set_active_no_signal( ui::RadioButton radio, int index ){
+       {
+               for ( GSList* l = gtk_radio_button_get_group( radio ); l != 0; l = g_slist_next( l ) )
+               {
+                       g_signal_handler_block( G_OBJECT( l->data ), gpointer_to_int( g_object_get_data( G_OBJECT( l->data ), "handler" ) ) );
+               }
+       }
+       radio_button_set_active( radio, index );
+       {
+               for ( GSList* l = gtk_radio_button_get_group( radio ); l != 0; l = g_slist_next( l ) )
+               {
+                       g_signal_handler_unblock( G_OBJECT( l->data ), gpointer_to_int( g_object_get_data( G_OBJECT( l->data ), "handler" ) ) );
+               }
+       }
 }
 
-int radio_button_get_active(ui::RadioButton radio)
-{
-    //radio_button_print_state(radio);
-    GSList *group = gtk_radio_button_get_group(radio);
-    int index = g_slist_length(group) - 1;
-    for (; group != 0; group = g_slist_next(group)) {
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(group->data))) {
-            break;
-        } else {
-            index--;
-        }
-    }
-    return index;
+int radio_button_get_active( ui::RadioButton radio ){
+       //radio_button_print_state(radio);
+       GSList *group = gtk_radio_button_get_group( radio );
+       int index = g_slist_length( group ) - 1;
+       for (; group != 0; group = g_slist_next( group ) )
+       {
+               if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( group->data ) ) ) {
+                       break;
+               }
+               else
+               {
+                       index--;
+               }
+       }
+       return index;
 }