Remove implicit Window constructor

diff --git a/contrib/brushexport/plugin.cpp b/contrib/brushexport/plugin.cpp
index 8e498987317783abd092ce0e18208ba6db4b4378..a2d0d6219333f0048243e5c86b411f2b0c847915 100644 (file)
--- a/contrib/brushexport/plugin.cpp
+++ b/contrib/brushexport/plugin.cpp
@@ -49,7 +49,7 @@ bool IsWindowOpen( void );
 
 namespace BrushExport
 {
-ui::Window g_mainwnd;
+ui::Window g_mainwnd{ui::null};
 
 const char* init( void* hApp, void* pMainWidget ){
        g_mainwnd = ui::Window(GTK_WINDOW(pMainWidget));

diff --git a/contrib/shaderplug/shaderplug.cpp b/contrib/shaderplug/shaderplug.cpp
index ebe2e6c674f6539700aade92e7284d159a201cd3..e8f4f5fc4e0fb868e4a6c762a1a3269cd1dbb804 100644 (file)
--- a/contrib/shaderplug/shaderplug.cpp
+++ b/contrib/shaderplug/shaderplug.cpp
@@ -57,7 +57,7 @@ ShaderPlugPluginDependencies() :
 
 namespace Shaderplug
 {
-ui::Window g_window;
+ui::Window g_window{ui::null};
 
 std::vector<const char*> archives;
 std::set<std::string> shaders;

diff --git a/contrib/sunplug/sunplug.cpp b/contrib/sunplug/sunplug.cpp
index 3ace8f02464f6d1166153a0dcd5666d9360187d7..974429df65c99a4c22504ed8e0776918e1fc56db 100644 (file)
--- a/contrib/sunplug/sunplug.cpp
+++ b/contrib/sunplug/sunplug.cpp
@@ -184,7 +184,7 @@ SunPlugPluginDependencies() :
 //  *************************
 namespace SunPlug
 {
-ui::Window main_window;
+ui::Window main_window{ui::null};
 char MenuList[100] = "";
 
 const char* init( void* hApp, void* pMainWidget ){

diff --git a/contrib/ufoaiplug/ufoai.cpp b/contrib/ufoaiplug/ufoai.cpp
index 9bfb46eca6899d0e14298ccde198986379e02273..d654edc7ba44c88ead04af10538c7008b5e1f834 100644 (file)
--- a/contrib/ufoaiplug/ufoai.cpp
+++ b/contrib/ufoaiplug/ufoai.cpp
@@ -59,7 +59,7 @@ UFOAIPluginDependencies( void ) :
 
 namespace UFOAI
 {
-       ui::Window g_mainwnd;
+       ui::Window g_mainwnd{ui::null};
 
 const char* init( void* hApp, void* pMainWidget ){
        g_mainwnd = ui::Window(GTK_WINDOW( pMainWidget ));

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 85ee46dfdf22dd68863388de132feb3c3da73ea9..a6ff998d6227b48c1d7c5d94e4159e55ddd06068 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -158,7 +158,7 @@ gboolean dialog_delete_callback( ui::Widget widget, GdkEventAny* event, ModalDia
 }
 
 ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, ui::Widget contents ){
-       ui::Window window = create_fixedsize_modal_dialog_window(ui::Window(), title, dialog );
+       ui::Window window = create_fixedsize_modal_dialog_window(ui::Window{ui::null}, title, dialog );
 
        auto vbox1 = create_dialog_vbox( 8, 4 );
        window.add(vbox1);

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index a27d2d841a866cb875c72d684319128da54cf6e9..b064da65267419bbd7518fbb3aac3a382d7a4c51 100644 (file)
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -29,7 +29,7 @@ namespace ui {
         }
     }
 
-    Widget root{nullptr};
+    Widget root;
 
 #define IMPL(T, F) template<> _IMPL(T, F)
 #define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self(F(it)); } }
@@ -101,9 +101,6 @@ namespace ui {
 
     IMPL(Window, GTK_WINDOW);
 
-    Window::Window() : Window(nullptr)
-    {}
-
     Window::Window(window_type type) : Window(GTK_WINDOW(gtk_window_new(
             type == window_type::TOP ? GTK_WINDOW_TOPLEVEL :
             type == window_type::POPUP ? GTK_WINDOW_POPUP :

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index 4dbdd7910ae1493c1200337ece777513810834c5..945f762e76af310f9171f39fbfb83c3007e00d9d 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -231,7 +231,6 @@ namespace ui {
 
     class AccelGroup;
     WRAP(Window, Bin, _GtkWindow, (),
-         Window();
          Window(window_type type);
     ,
          Window create_dialog_window(

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 86a0b1391d42298abe89cfa98b20060894485eec..ae523fa14c3c156fd4a649c030ba79c2b7aa0c3a 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -671,7 +671,7 @@ FreezePointer m_freezePointer;
 
 public:
 ui::Widget m_gl_widget;
-ui::Window m_parent;
+ui::Window m_parent{ui::null};
 
 SelectionSystemWindowObserver* m_window_observer;
 XORRectangle m_XORRectangle;

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index a77ddedde753c99b322958ba545262dce3c71a53..b5d7052cbf8b580e7b2e95fff6d38f1c20be185f 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -337,7 +337,7 @@ void Dialog::Destroy(){
        ASSERT_MESSAGE( m_window, "dialog cannot be destroyed" );
 
        gtk_widget_destroy( GTK_WIDGET( m_window ) );
-       m_window = ui::Window();
+       m_window = ui::Window{ui::null};
 }
 
 

diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp
index 6559da1988a8ffdae162b42ed2ba20e3365a4571..2158f59a5a3b3a7b15feaacd8f246c89b30f9328 100644 (file)
--- a/radiant/groupdialog.cpp
+++ b/radiant/groupdialog.cpp
@@ -147,7 +147,7 @@ void GroupDialog_constructWindow( ui::Window main_window ){
 void GroupDialog_destroyWindow(){
        ASSERT_TRUE( g_GroupDlg.m_window );
        destroy_floating_window( g_GroupDlg.m_window );
-       g_GroupDlg.m_window = ui::Window();
+       g_GroupDlg.m_window = ui::Window{ui::null};
 }
 
 

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 7b1b80ef75689b79613838015748aa6bb634d805..7c9fc3c867476caf651e209cf66ae85f024f3736 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1607,7 +1607,7 @@ gint window_realize_remove_decoration( ui::Widget widget, gpointer data ){
 class WaitDialog
 {
 public:
-ui::Window m_window;
+ui::Window m_window{ui::null};
 ui::Label m_label{(GtkLabel *) nullptr};
 };
 
@@ -1710,7 +1710,7 @@ void ScreenUpdates_Enable(){
 
                gtk_grab_remove( GTK_WIDGET( g_wait.m_window ) );
                destroy_floating_window( g_wait.m_window );
-               g_wait.m_window = ui::Window();
+               g_wait.m_window = ui::Window{ui::null};
 
                //gtk_window_present(MainFrame_getWindow());
        }
@@ -2502,7 +2502,7 @@ MainFrame* g_pParentWnd = 0;
 
 ui::Window MainFrame_getWindow()
 {
-       return g_pParentWnd ? g_pParentWnd->m_window : ui::Window();
+       return g_pParentWnd ? g_pParentWnd->m_window : ui::Window{ui::null};
 }
 
 std::vector<ui::Widget> g_floating_windows;
@@ -2676,7 +2676,7 @@ ui::Window create_splash(){
        return window;
 }
 
-static ui::Window splash_screen;
+static ui::Window splash_screen{ui::null};
 
 void show_splash(){
        splash_screen = create_splash();

diff --git a/radiant/select.cpp b/radiant/select.cpp
index f88cf1aad979d19cf12f3d17c42005193195d9ca..0ac4467deb5e18784737dda335b8c4953f84e11b 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -866,7 +866,7 @@ struct RotateDialog
        GtkSpinButton* x;
        GtkSpinButton* y;
        GtkSpinButton* z;
-       ui::Window window;
+       ui::Window window{ui::null};
 };
 
 static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog ){
@@ -1017,7 +1017,7 @@ struct ScaleDialog
        ui::Widget x;
        ui::Widget y;
        ui::Widget z;
-       ui::Window window;
+       ui::Window window{ui::null};
 };
 
 static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 3cf2939c4d17bf4476751a5092427df54dd3421c..08f55508950fbca912b540c94c03ac89d5269324 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -254,7 +254,7 @@ int m_nTotalHeight;
 
 CopiedString shader;
 
-ui::Window m_parent;
+ui::Window m_parent{ui::null};
 ui::Widget m_gl_widget;
 ui::Widget m_texture_scroll;
 ui::Widget m_treeViewTree;