s/nullptr/ui::null/ where appropriate

[xonotic/netradiant.git] / radiant / build.cpp

diff --git a/radiant/build.cpp b/radiant/build.cpp
index a2b80dec0c893e1f6f6fe8772a3c715906b52e4f..05ca56456aee56b86bc0aede5000fbe4bbb7bb59 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -663,7 +663,7 @@ class ProjectList
 {
 public:
 Project& m_project;
-ui::ListStore m_store{nullptr};
+ui::ListStore m_store{ui::null};
 bool m_changed;
 ProjectList( Project& project ) : m_project( project ), m_changed( false ){
 }
@@ -711,7 +711,7 @@ gboolean project_cell_edited( GtkCellRendererText* cell, gchar* path_string, gch
 gboolean project_key_press( ui::Widget widget, GdkEventKey* event, ProjectList* projectList ){
        Project& project = projectList->m_project;
 
-       if ( event->keyval == GDK_Delete ) {
+       if ( event->keyval == GDK_KEY_Delete ) {
                GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
                GtkTreeIter iter;
                GtkTreeModel* model;
@@ -816,7 +816,7 @@ gboolean commands_key_press( ui::Widget widget, GdkEventKey* event, ui::ListStor
        }
        Build& build = *g_current_build;
 
-       if ( event->keyval == GDK_Delete ) {
+       if ( event->keyval == GDK_KEY_Delete ) {
                GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
                GtkTreeIter iter;
                GtkTreeModel* model;
@@ -892,7 +892,7 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 
                                        view.connect( "key_press_event", G_CALLBACK( project_key_press ), &projectList );
 
-                                       g_object_unref( G_OBJECT( store ) );
+                                       store.unref();
                                }
                        }
                }
@@ -925,7 +925,7 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 
                                        scr.add(view);
 
-                                       g_object_unref( G_OBJECT( store ) );
+                                       store.unref();
 
                                        view.connect( "key_press_event", G_CALLBACK( commands_key_press ), store );
 
@@ -993,7 +993,7 @@ typedef std::list<BuildMenuItem> BuildMenuItems;
 BuildMenuItems g_BuildMenuItems;
 
 
-ui::Menu g_bsp_menu{nullptr};
+ui::Menu g_bsp_menu{ui::null};
 
 void Build_constructMenu( ui::Menu menu ){
        for ( Project::iterator i = g_build_project.begin(); i != g_build_project.end(); ++i )