From 62603d25fbbe31aae3268a14e477cbc5ebb40236 Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 21 May 2020 15:24:44 +0300 Subject: [PATCH] don't check equality to gboolean FALSE and TRUE --- libs/convert.h | 2 +- libs/gtkutil/widget.h | 4 ++-- radiant/build.cpp | 2 +- radiant/camwindow.cpp | 4 ++-- radiant/clippertool.cpp | 2 +- radiant/dialog.cpp | 4 ++-- radiant/entityinspector.cpp | 12 ++++++------ radiant/entitylist.cpp | 6 +++--- radiant/findtexturedialog.cpp | 2 +- radiant/mainframe.cpp | 2 +- radiant/modelwindow.cpp | 2 +- radiant/patchdialog.cpp | 2 +- radiant/preferences.cpp | 2 +- radiant/surfacedialog.cpp | 2 +- radiant/texwindow.cpp | 2 +- radiant/treemodel.cpp | 8 ++++---- radiant/xywindow.cpp | 8 ++++---- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libs/convert.h b/libs/convert.h index a734e6fe..2ca82bf7 100644 --- a/libs/convert.h +++ b/libs/convert.h @@ -86,7 +86,7 @@ class CharacterSet const char* m_charSet; public: CharacterSet(){ - if ( g_get_charset( &m_charSet ) != FALSE ) { + if ( g_get_charset( &m_charSet ) ) { m_charSet = 0; } } diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h index 826858ae..20a183d1 100644 --- a/libs/gtkutil/widget.h +++ b/libs/gtkutil/widget.h @@ -29,8 +29,8 @@ #include "debugging/debugging.h" inline bool widget_is_visible( GtkWidget* widget ){ - //return GTK_WIDGET_VISIBLE( widget ) != FALSE; - return gtk_widget_get_visible( widget ) != FALSE; + //return GTK_WIDGET_VISIBLE( widget ); + return gtk_widget_get_visible( widget ); } inline void widget_set_visible( GtkWidget* widget, bool show ){ diff --git a/radiant/build.cpp b/radiant/build.cpp index 50ba3f38..869e8d18 100644 --- a/radiant/build.cpp +++ b/radiant/build.cpp @@ -669,7 +669,7 @@ void BSPCommandList_Construct( GtkListStore* store, Project& project ){ } static void project_cell_editing_started( GtkCellRenderer* cell, GtkCellEditable* editable, const gchar* path, gpointer data ) { - ASSERT_MESSAGE( GTK_IS_ENTRY( editable ) == TRUE, "editable is not GtkEntry" ); + ASSERT_MESSAGE( GTK_IS_ENTRY( editable ), "editable is not GtkEntry" ); GtkEntry* entry = GTK_ENTRY( editable ); if( string_equal( LAST_ITER_STRING, gtk_entry_get_text( entry ) ) ) gtk_entry_set_text( entry, "" ); diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index a40895ae..f91bac29 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1226,7 +1226,7 @@ gboolean mousecontrol_button_press( GtkWidget* widget, GdkEventButton* event, Ca void camwnd_update_xor_rectangle( CamWnd& self, rect_t area ){ if ( gtk_widget_get_visible( self.m_gl_widget ) ) { - if ( glwidget_make_current( self.m_gl_widget ) != FALSE ) { + if ( glwidget_make_current( self.m_gl_widget ) ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) { GlobalOpenGL_debugAssertNoErrors(); @@ -2177,7 +2177,7 @@ void CamWnd::draw(){ m_drawing = true; //globalOutputStream() << "draw...\n"; - if ( glwidget_make_current( m_gl_widget ) != FALSE ) { + if ( glwidget_make_current( m_gl_widget ) ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) { GlobalOpenGL_debugAssertNoErrors(); Cam_Draw(); diff --git a/radiant/clippertool.cpp b/radiant/clippertool.cpp index f11ec677..d1553444 100644 --- a/radiant/clippertool.cpp +++ b/radiant/clippertool.cpp @@ -101,7 +101,7 @@ void Clipper_modeChanged( bool isClipper ){ gdk_window_set_cursor( gtk_widget_get_window( xywnd->GetWidget() ), cursor ); } ); if( g_pParentWnd->GetCamWnd() ) - if( !isClipper || gdk_pointer_is_grabbed() == FALSE ) /* prevent cursor change `GDK_BLANK_CURSOR->g_clipper_cursor` during freelook */ + if( !isClipper || !gdk_pointer_is_grabbed() ) /* prevent cursor change `GDK_BLANK_CURSOR->g_clipper_cursor` during freelook */ gdk_window_set_cursor( gtk_widget_get_window( CamWnd_getWidget( *g_pParentWnd->GetCamWnd() ) ), cursor ); } diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index 8d1700ca..fbbe7560 100644 --- a/radiant/dialog.cpp +++ b/radiant/dialog.cpp @@ -137,7 +137,7 @@ void BoolToggleImport( GtkToggleButton& widget, bool value ){ gtk_toggle_button_set_active( &widget, value ); } void BoolToggleExport( GtkToggleButton& widget, const BoolImportCallback& importCallback ){ - importCallback( gtk_toggle_button_get_active( &widget ) != FALSE ); + importCallback( gtk_toggle_button_get_active( &widget ) ); } typedef ImportExport BoolToggleImportExport; @@ -509,7 +509,7 @@ void Dialog::addCombo( GtkWidget* vbox, const char* name, int& data, StringArray void addSlider_( GtkAdjustment* adj, GtkWidget* vbox, const char* name, gboolean draw_value, const char* low, const char* high, int digits ){ #if 0 - if ( draw_value == FALSE ) { + if ( !draw_value ) { GtkWidget* hbox2 = gtk_hbox_new( FALSE, 0 ); gtk_widget_show( hbox2 ); gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 ); diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp index 22c6d69e..529a19b4 100644 --- a/radiant/entityinspector.cpp +++ b/radiant/entityinspector.cpp @@ -1055,7 +1055,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){ void EntityClassList_selectEntityClass( EntityClass* eclass ){ GtkTreeModel* model = GTK_TREE_MODEL( g_entlist_store ); GtkTreeIter iter; - for ( gboolean good = gtk_tree_model_get_iter_first( model, &iter ); good != FALSE; good = gtk_tree_model_iter_next( model, &iter ) ) + for ( gboolean good = gtk_tree_model_get_iter_first( model, &iter ); good; good = gtk_tree_model_iter_next( model, &iter ) ) { char* text; gtk_tree_model_get( model, &iter, 0, &text, -1 ); @@ -1259,7 +1259,7 @@ void EntityClassList_convertEntity(){ GtkTreeModel* model; GtkTreeIter iter; - if ( gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) == FALSE ) { + if ( !gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) ) { gtk_MessageBox( gtk_widget_get_toplevel( GTK_WIDGET( g_entityClassList ) ), "You must have a selected class to create an entity", "info" ); return; } @@ -1374,8 +1374,8 @@ static gint EntityClassList_keypress( GtkWidget* widget, GdkEventKey* event, gpo GtkTreeView* view = g_entityClassList; GtkTreeModel* model; GtkTreeIter iter; - if ( gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) == FALSE - || gtk_tree_model_iter_next( model, &iter ) == FALSE ) { + if ( !gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) + || !gtk_tree_model_iter_next( model, &iter ) ) { gtk_tree_model_get_iter_first( model, &iter ); } @@ -1396,7 +1396,7 @@ static gint EntityClassList_keypress( GtkWidget* widget, GdkEventKey* event, gpo g_free( text ); - if ( gtk_tree_model_iter_next( model, &iter ) == FALSE ) { + if ( !gtk_tree_model_iter_next( model, &iter ) ) { gtk_tree_model_get_iter_first( model, &iter ); } } @@ -1411,7 +1411,7 @@ static void EntityProperties_selection_changed( GtkTreeSelection* selection, gpo // find out what type of entity we are trying to create GtkTreeModel* model; GtkTreeIter iter; - if ( gtk_tree_selection_get_selected( selection, &model, &iter ) == FALSE ) { + if ( !gtk_tree_selection_get_selected( selection, &model, &iter ) ) { return; } diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp index 19b9bf1c..edf38a12 100644 --- a/radiant/entitylist.cpp +++ b/radiant/entitylist.cpp @@ -157,7 +157,7 @@ static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeMode Selectable* selectable = Instance_getSelectable( *instance ); if ( node == 0 ) { - if ( path_currently_selected != FALSE ) { + if ( path_currently_selected ) { getEntityList().m_selection_disabled = true; GlobalSelectionSystem().setSelectedAll( false ); getEntityList().m_selection_disabled = false; @@ -165,7 +165,7 @@ static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeMode } else if ( selectable != 0 ) { getEntityList().m_selection_disabled = true; - selectable->setSelected( path_currently_selected == FALSE ); + selectable->setSelected( !path_currently_selected ); getEntityList().m_selection_disabled = false; if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( getEntityList().m_check ) ) ){ FocusAllViews(); @@ -263,7 +263,7 @@ void EntityList_SetShown( bool shown ){ widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown ); if( shown ){ /* expand map's root node for convenience */ GtkTreePath* path = gtk_tree_path_new_from_string( "1" ); - if( gtk_tree_view_row_expanded( getEntityList().m_tree_view, path ) == FALSE ) + if( !gtk_tree_view_row_expanded( getEntityList().m_tree_view, path ) ) gtk_tree_view_expand_row( getEntityList().m_tree_view, path, FALSE ); gtk_tree_path_free( path ); } diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp index 2e9f60d0..991068c4 100644 --- a/radiant/findtexturedialog.cpp +++ b/radiant/findtexturedialog.cpp @@ -228,7 +228,7 @@ void FindTextureDialog::updateTextures( const char* name ){ } bool FindTextureDialog::isOpen(){ - return gtk_widget_get_visible( GTK_WIDGET( g_FindTextureDialog.GetWidget() ) ) == TRUE; + return gtk_widget_get_visible( GTK_WIDGET( g_FindTextureDialog.GetWidget() ) ); } void FindTextureDialog::setFindStr( const char* name ){ diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 5ced78db..a337b9ba 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -1916,7 +1916,7 @@ void ScreenUpdates_Disable( const char* message, const char* title ){ bool isActiveApp = MainFrame_isActiveApp(); g_wait = create_wait_dialog( title, message ); - if( !XYWnd::m_mnuDrop || gtk_widget_get_visible( GTK_WIDGET( XYWnd::m_mnuDrop ) ) != TRUE ){ + if( !XYWnd::m_mnuDrop || !gtk_widget_get_visible( GTK_WIDGET( XYWnd::m_mnuDrop ) ) ){ gtk_grab_add( GTK_WIDGET( g_wait.m_window ) ); //globalOutputStream() << "grab grab grab\n"; } diff --git a/radiant/modelwindow.cpp b/radiant/modelwindow.cpp index a2a9a049..b768798e 100644 --- a/radiant/modelwindow.cpp +++ b/radiant/modelwindow.cpp @@ -964,7 +964,7 @@ gboolean ModelBrowser_size_allocate( GtkWidget* widget, GtkAllocation* allocatio } gboolean ModelBrowser_expose( GtkWidget* widget, GdkEventExpose* event, ModelBrowser* modelBrowser ){ - if ( glwidget_make_current( modelBrowser->m_gl_widget ) != FALSE ) { + if ( glwidget_make_current( modelBrowser->m_gl_widget ) ) { GlobalOpenGL_debugAssertNoErrors(); ModelBrowser_render(); GlobalOpenGL_debugAssertNoErrors(); diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index 7065e1d6..34a997fc 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -190,7 +190,7 @@ typedef MemberCaller CancelCaller; void apply(){ Scene_PatchSetFixedSubdivisions( PatchFixedSubdivisions( - gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( m_enabled ) ) != FALSE, + gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( m_enabled ) ), static_cast( entry_get_int( m_horizontal ) ), static_cast( entry_get_int( m_vertical ) ) ) diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index dbcaa450..3286be28 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -917,7 +917,7 @@ void PreferencesDialog_restartRequired( const char* staticName ){ void PreferencesDialog_showDialog(){ //if ( ConfirmModified( "Edit Preferences" ) && g_Preferences.DoModal() == eIDOK ) { - if( gtk_widget_get_realized( g_Preferences.m_treeview ) == TRUE ) + if( gtk_widget_get_realized( g_Preferences.m_treeview ) ) gtk_widget_grab_focus( g_Preferences.m_treeview ); if ( g_Preferences.DoModal() == eIDOK ) { if ( !g_restart_required.empty() ) { diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index ff3495c8..7ec35500 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -2254,7 +2254,7 @@ gboolean expose( GtkWidget * win, GdkEventExpose * e, gpointer ){ //This needs to go elsewhere... // InitTextool(); - if ( glwidget_make_current( win ) == FALSE ) { + if ( !glwidget_make_current( win ) ) { globalOutputStream() << " FAILED to make current! Oh, the agony! :-(\n"; return true; } diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index ef873443..f9f54445 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1422,7 +1422,7 @@ gboolean TextureBrowser_size_allocate( GtkWidget* widget, GtkAllocation* allocat } gboolean TextureBrowser_expose( GtkWidget* widget, GdkEventExpose* event, TextureBrowser* textureBrowser ){ - if ( glwidget_make_current( textureBrowser->m_gl_widget ) != FALSE ) { + if ( glwidget_make_current( textureBrowser->m_gl_widget ) ) { GlobalOpenGL_debugAssertNoErrors(); TextureBrowser_evaluateHeight( *textureBrowser ); Texture_Draw( *textureBrowser ); diff --git a/radiant/treemodel.cpp b/radiant/treemodel.cpp index 2194d89b..57e6812c 100644 --- a/radiant/treemodel.cpp +++ b/radiant/treemodel.cpp @@ -63,7 +63,7 @@ void graph_tree_model_delete( GraphTreeModel* model ){ bool graph_tree_model_subtree_find_node( GraphTreeModel* model, GtkTreeIter* parent, const scene::Node& node, GtkTreeIter* iter ){ for ( gboolean success = gtk_tree_model_iter_children( GTK_TREE_MODEL( model ), iter, parent ); - success != FALSE; + success; success = gtk_tree_model_iter_next( GTK_TREE_MODEL( model ), iter ) ) { scene::Node* current; @@ -531,7 +531,7 @@ static gboolean graph_tree_model_row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreeModel *src_model = 0; GtkTreePath *src_path = 0; - if ( gtk_tree_get_row_drag_data( selection_data, &src_model, &src_path ) != FALSE ) { + if ( gtk_tree_get_row_drag_data( selection_data, &src_model, &src_path ) ) { /* can only drag to ourselves */ if ( src_model == GTK_TREE_MODEL( drag_dest ) ) { /* Can't drop into ourself. */ @@ -1300,13 +1300,13 @@ TestGraphTreeModel(){ GtkTreeIter iter; gtk_tree_model_get_iter_first( model, &iter ); - ASSERT_MESSAGE( gtk_tree_model_iter_has_child( model, &iter ) == FALSE, "test failed!" ); + ASSERT_MESSAGE( !gtk_tree_model_iter_has_child( model, &iter ), "test failed!" ); ASSERT_MESSAGE( gtk_tree_model_iter_n_children( model, &iter ) == 0, "test failed!" ); gtk_tree_model_iter_next( model, &iter ); - ASSERT_MESSAGE( gtk_tree_model_iter_has_child( model, &iter ) != FALSE, "test failed!" ); + ASSERT_MESSAGE( gtk_tree_model_iter_has_child( model, &iter ), "test failed!" ); ASSERT_MESSAGE( gtk_tree_model_iter_n_children( model, &iter ) == 2, "test failed!" ); diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 10e64a78..b7435e0e 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -463,7 +463,7 @@ Shader* XYWnd::m_state_selected = 0; #endif bool XYWnd::overlayStart(){ if ( gtk_widget_get_visible( m_gl_widget ) ) { - if ( glwidget_make_current( m_gl_widget ) != FALSE ) { + if ( glwidget_make_current( m_gl_widget ) ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) { GlobalOpenGL_debugAssertNoErrors(); #ifdef OVERLAY_GL_FRONT_DRAW_HACK @@ -653,7 +653,7 @@ gboolean xywnd_size_allocate( GtkWidget* widget, GtkAllocation* allocation, XYWn } gboolean xywnd_expose( GtkWidget* widget, GdkEventExpose* event, XYWnd* xywnd ){ - if ( glwidget_make_current( xywnd->GetWidget() ) != FALSE ) { + if ( glwidget_make_current( xywnd->GetWidget() ) ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) { GlobalOpenGL_debugAssertNoErrors(); xywnd->XY_Draw(); @@ -940,7 +940,7 @@ gboolean entitycreate_rightClicked( GtkWidget* widget, GdkEvent* event, gpointer return TRUE; } /* create entities, don't close menu */ - else if ( event->button.button == 1 && ( ( event->button.state & GDK_CONTROL_MASK ) != 0 || gtk_menu_get_tearoff_state( XYWnd::m_mnuDrop ) == TRUE ) ) { + else if ( event->button.button == 1 && ( ( event->button.state & GDK_CONTROL_MASK ) != 0 || gtk_menu_get_tearoff_state( XYWnd::m_mnuDrop ) ) ) { entitycreate_activated( GTK_MENU_ITEM( widget ), 0 ); return TRUE; } @@ -952,7 +952,7 @@ gboolean entitycreate_rightUnClicked( GtkWidget* widget, GdkEvent* event, gpoint if ( event->button.button == 3 ) { return TRUE; } - else if ( event->button.button == 1 && ( ( event->button.state & GDK_CONTROL_MASK ) != 0 || gtk_menu_get_tearoff_state( XYWnd::m_mnuDrop ) == TRUE ) ) { + else if ( event->button.button == 1 && ( ( event->button.state & GDK_CONTROL_MASK ) != 0 || gtk_menu_get_tearoff_state( XYWnd::m_mnuDrop ) ) ) { return TRUE; } return FALSE;