NO-OP: whitespace

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 89b9914120147b4586ca137ad0d73df5ad17c3b7..99722d426fcd518563bba4d1409400d71622e837 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -37,7 +37,7 @@ using namespace ARDOUR_UI_UTILS;
 ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
        : Dialog (title, modal, use_seperator)
        , proxy (0)
-        , _splash_pushed (false)
+       , _splash_pushed (false)
 {
        init ();
        set_position (Gtk::WIN_POS_MOUSE);
@@ -45,7 +45,7 @@ ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
 
 ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
        : Dialog (title, parent, modal, use_seperator)
-        , _splash_pushed (false)
+       , _splash_pushed (false)
 {
        init ();
        set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
@@ -53,15 +53,15 @@ ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool
 
 ArdourDialog::~ArdourDialog ()
 {
-        if (_splash_pushed) {
-                Splash* spl = Splash::instance();
-
-                if (spl) {
-                        spl->pop_front();
-                }
-        }
-        Keyboard::the_keyboard().focus_out_window (0, this);
-        WM::Manager::instance().remove (proxy);
+       if (_splash_pushed) {
+               Splash* spl = Splash::instance();
+
+               if (spl) {
+                       spl->pop_front();
+               }
+       }
+       Keyboard::the_keyboard().focus_out_window (0, this);
+       WM::Manager::instance().remove (proxy);
 }
 
 bool
@@ -98,7 +98,7 @@ ArdourDialog::on_show ()
 
        if (spl && spl->is_visible()) {
                spl->pop_back_for (*this);
-                _splash_pushed = true;
+               _splash_pushed = true;
        }
 }
 

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index 1224cbb00a0b19298dd965fd30cf2ddeeb530c5b..3c1b869e73473de095513775d523c2f302fcbcea 100644 (file)
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -37,20 +37,20 @@ namespace WM {
  */
 class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
        ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
        ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
        ~ArdourDialog();
 
        bool on_focus_in_event (GdkEventFocus*);
        bool on_focus_out_event (GdkEventFocus*);
-        bool on_delete_event (GdkEventAny*);
+       bool on_delete_event (GdkEventAny*);
        void on_unmap ();
        void on_show ();
 
-  private:
-        WM::ProxyTemporary* proxy;
-        bool _splash_pushed;
+private:
+       WM::ProxyTemporary* proxy;
+       bool _splash_pushed;
        void init ();
 
        static sigc::signal<void> CloseAllDialogs;

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 1784ac8164584d7a78b59c1ee43cb2718e178d3e..744a49fa4f19de85cb2d2be7e6628744fa62ad85 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -54,7 +54,7 @@ Splash::Splash ()
        rc.add_subdirectory_to_paths ("resources");
 
        if (!find_file (rc, PROGRAM_NAME "-splash.png", splash_file)) {
-                cerr << "Cannot find splash screen image file\n";
+               cerr << "Cannot find splash screen image file\n";
                throw failed_constructor();
        }
 
@@ -63,7 +63,7 @@ Splash::Splash ()
        }
 
        catch (...) {
-                cerr << "Cannot construct splash screen image\n";
+               cerr << "Cannot construct splash screen image\n";
                throw failed_constructor();
        }
 
@@ -91,8 +91,8 @@ Splash::Splash ()
        set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
        the_splash = this;
 
-        expose_done = false;
-        expose_is_the_one = false;
+       expose_done = false;
+       expose_is_the_one = false;
 
        ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context());
 }
@@ -106,20 +106,20 @@ void
 Splash::pop_back_for (Gtk::Window& win)
 {
 #if defined  __APPLE__ || defined PLATFORM_WINDOWS
-        /* April 2013: window layering on OS X is a bit different to X Window. at present,
-           the "restack()" functionality in GDK will only operate on windows in the same
-           "level" (e.g. two normal top level windows, or two utility windows) and will not
-           work across them. The splashscreen is on its own "StatusWindowLevel" so restacking
-           is not going to work.
-
-           So for OS X, we just hide ourselves.
-
-           Oct 2014: The Windows situation is similar, although it should be possible
-           to play tricks with gdk's set_type_hint() or directly hack things using
-           SetWindowLong() and UpdateLayeredWindow()
-        */
-        (void) win;
-        hide();
+       /* April 2013: window layering on OS X is a bit different to X Window. at present,
+        * the "restack()" functionality in GDK will only operate on windows in the same
+        * "level" (e.g. two normal top level windows, or two utility windows) and will not
+        * work across them. The splashscreen is on its own "StatusWindowLevel" so restacking
+        * is not going to work.
+        *
+        * So for OS X, we just hide ourselves.
+        *
+        * Oct 2014: The Windows situation is similar, although it should be possible
+        * to play tricks with gdk's set_type_hint() or directly hack things using
+        * SetWindowLong() and UpdateLayeredWindow()
+        */
+       (void) win;
+       hide();
 #else
        set_keep_above (false);
        get_window()->restack (win.get_window(), false);
@@ -129,11 +129,10 @@ Splash::pop_back_for (Gtk::Window& win)
 void
 Splash::pop_front ()
 {
-
 #if defined  __APPLE__ || defined PLATFORM_WINDOWS
-        if (get_window()) {
-                show ();
-        }
+       if (get_window()) {
+               show ();
+       }
 #endif
 }
 
@@ -150,9 +149,9 @@ Splash::on_button_release_event (GdkEventButton* ev)
 {
        RefPtr<Gdk::Window> window = get_window();
 
-        if (!window || ev->window != window->gobj()) {
-                return false;
-        }
+       if (!window || ev->window != window->gobj()) {
+               return false;
+       }
 
        hide ();
        return true;
@@ -199,7 +198,7 @@ Splash::boot_message (std::string msg)
 bool
 Splash::idle_after_expose ()
 {
-        expose_done = true;
+       expose_done = true;
        return false;
 }
 
@@ -231,13 +230,13 @@ Splash::message (const string& msg)
        str += Gtkmm2ext::markup_escape_text (msg);
        str += "</b>";
 
-        show ();
+       show ();
 
        layout->set_markup (str);
        Glib::RefPtr<Gdk::Window> win = darea.get_window();
 
        if (win) {
-                expose_done = false;
+               expose_done = false;
 
                if (win->is_visible ()) {
                        win->invalidate_rect (Gdk::Rectangle (0, darea.get_height() - 30, darea.get_width(), 30), true);