From a77f8abd48020c23fa894cc0e0e24927696adf1e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 13 May 2012 23:11:43 +0000 Subject: Initialize all members on construction. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4396 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/ConnectWindow.cpp | 13 +++++++++++++ src/gui/ConnectWindow.hpp | 16 ++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 42bfcd92..4bd2ffef 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -48,6 +48,19 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) : Dialog(cobject) , _xml(xml) + , _icon(NULL) + , _progress_bar(NULL) + , _progress_label(NULL) + , _url_entry(NULL) + , _server_radio(NULL) + , _port_spinbutton(NULL) + , _launch_radio(NULL) + , _internal_radio(NULL) + , _activate_button(NULL) + , _deactivate_button(NULL) + , _disconnect_button(NULL) + , _connect_button(NULL) + , _quit_button(NULL) , _mode(CONNECT_REMOTE) , _ping_id(-1) , _attached(false) diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index fa678049..00ba5fd3 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -79,14 +79,6 @@ private: const Glib::RefPtr _xml; - Mode _mode; - int32_t _ping_id; - bool _attached; - bool _finished_connecting; - bool _widgets_loaded; - int _connect_stage; - bool _quit_flag; - Gtk::Image* _icon; Gtk::ProgressBar* _progress_bar; Gtk::Label* _progress_label; @@ -100,6 +92,14 @@ private: Gtk::Button* _disconnect_button; Gtk::Button* _connect_button; Gtk::Button* _quit_button; + + Mode _mode; + int32_t _ping_id; + bool _attached; + bool _finished_connecting; + bool _widgets_loaded; + int _connect_stage; + bool _quit_flag; }; } // namespace GUI -- cgit v1.2.1