quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't check equality to gboolean FALSE and TRUE

Browse Source
This commit is contained in:
Garux 2020-05-21 15:24:44 +03:00
parent 790424dbae
commit 62603d25fb
17 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/convert.h
View File

@ -86,7 +86,7 @@ class CharacterSet
const char* m_charSet; const char* m_charSet;
public: public:
CharacterSet(){ CharacterSet(){
if ( g_get_charset( &m_charSet ) != FALSE ) { if ( g_get_charset( &m_charSet ) ) {
m_charSet = 0; m_charSet = 0;
} }
} }

4
libs/gtkutil/widget.h
View File

@ -29,8 +29,8 @@
#include "debugging/debugging.h" #include "debugging/debugging.h"
inline bool widget_is_visible( GtkWidget* widget ){ inline bool widget_is_visible( GtkWidget* widget ){
//return GTK_WIDGET_VISIBLE( widget ) != FALSE; //return GTK_WIDGET_VISIBLE( widget );
return gtk_widget_get_visible( widget ) != FALSE; return gtk_widget_get_visible( widget );
} }
inline void widget_set_visible( GtkWidget* widget, bool show ){ inline void widget_set_visible( GtkWidget* widget, bool show ){

2
radiant/build.cpp
View File

@ -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 ) { 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 ); GtkEntry* entry = GTK_ENTRY( editable );
if( string_equal( LAST_ITER_STRING, gtk_entry_get_text( entry ) ) ) if( string_equal( LAST_ITER_STRING, gtk_entry_get_text( entry ) ) )
gtk_entry_set_text( entry, "" ); gtk_entry_set_text( entry, "" );

4
radiant/camwindow.cpp
View File

@ -1226,7 +1226,7 @@ gboolean mousecontrol_button_press( GtkWidget* widget, GdkEventButton* event, Ca
void camwnd_update_xor_rectangle( CamWnd& self, rect_t area ){ void camwnd_update_xor_rectangle( CamWnd& self, rect_t area ){
if ( gtk_widget_get_visible( self.m_gl_widget ) ) { 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() ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) {
GlobalOpenGL_debugAssertNoErrors(); GlobalOpenGL_debugAssertNoErrors();
@ -2177,7 +2177,7 @@ void CamWnd::draw(){
m_drawing = true; m_drawing = true;
//globalOutputStream() << "draw...\n"; //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() ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) {
GlobalOpenGL_debugAssertNoErrors(); GlobalOpenGL_debugAssertNoErrors();
Cam_Draw(); Cam_Draw();

2
radiant/clippertool.cpp
View File

@ -101,7 +101,7 @@ void Clipper_modeChanged( bool isClipper ){
gdk_window_set_cursor( gtk_widget_get_window( xywnd->GetWidget() ), cursor ); gdk_window_set_cursor( gtk_widget_get_window( xywnd->GetWidget() ), cursor );
} ); } );
if( g_pParentWnd->GetCamWnd() ) 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 ); gdk_window_set_cursor( gtk_widget_get_window( CamWnd_getWidget( *g_pParentWnd->GetCamWnd() ) ), cursor );
} }

4
radiant/dialog.cpp
View File

@ -137,7 +137,7 @@ void BoolToggleImport( GtkToggleButton& widget, bool value ){
gtk_toggle_button_set_active( &widget, value ); gtk_toggle_button_set_active( &widget, value );
} }
void BoolToggleExport( GtkToggleButton& widget, const BoolImportCallback& importCallback ){ void BoolToggleExport( GtkToggleButton& widget, const BoolImportCallback& importCallback ){
importCallback( gtk_toggle_button_get_active( &widget ) != FALSE ); importCallback( gtk_toggle_button_get_active( &widget ) );
} }
typedef ImportExport<GtkToggleButton, bool, BoolToggleImport, BoolToggleExport> BoolToggleImportExport; typedef ImportExport<GtkToggleButton, bool, BoolToggleImport, BoolToggleExport> 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 ){ void addSlider_( GtkAdjustment* adj, GtkWidget* vbox, const char* name, gboolean draw_value, const char* low, const char* high, int digits ){
#if 0 #if 0
if ( draw_value == FALSE ) { if ( !draw_value ) {
GtkWidget* hbox2 = gtk_hbox_new( FALSE, 0 ); GtkWidget* hbox2 = gtk_hbox_new( FALSE, 0 );
gtk_widget_show( hbox2 ); gtk_widget_show( hbox2 );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 );

12
radiant/entityinspector.cpp
View File

@ -1055,7 +1055,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
void EntityClassList_selectEntityClass( EntityClass* eclass ){ void EntityClassList_selectEntityClass( EntityClass* eclass ){
GtkTreeModel* model = GTK_TREE_MODEL( g_entlist_store ); GtkTreeModel* model = GTK_TREE_MODEL( g_entlist_store );
GtkTreeIter iter; 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; char* text;
gtk_tree_model_get( model, &iter, 0, &text, -1 ); gtk_tree_model_get( model, &iter, 0, &text, -1 );
@ -1259,7 +1259,7 @@ void EntityClassList_convertEntity(){
GtkTreeModel* model; GtkTreeModel* model;
GtkTreeIter iter; 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" ); gtk_MessageBox( gtk_widget_get_toplevel( GTK_WIDGET( g_entityClassList ) ), "You must have a selected class to create an entity", "info" );
return; return;
} }
@ -1374,8 +1374,8 @@ static gint EntityClassList_keypress( GtkWidget* widget, GdkEventKey* event, gpo
GtkTreeView* view = g_entityClassList; GtkTreeView* view = g_entityClassList;
GtkTreeModel* model; GtkTreeModel* model;
GtkTreeIter iter; 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_tree_model_iter_next( model, &iter ) == FALSE ) { || !gtk_tree_model_iter_next( model, &iter ) ) {
gtk_tree_model_get_iter_first( 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 ); 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 ); 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 // find out what type of entity we are trying to create
GtkTreeModel* model; GtkTreeModel* model;
GtkTreeIter iter; GtkTreeIter iter;
if ( gtk_tree_selection_get_selected( selection, &model, &iter ) == FALSE ) { if ( !gtk_tree_selection_get_selected( selection, &model, &iter ) ) {
return; return;
} }

6
radiant/entitylist.cpp
View File

@ -157,7 +157,7 @@ static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeMode
Selectable* selectable = Instance_getSelectable( *instance ); Selectable* selectable = Instance_getSelectable( *instance );
if ( node == 0 ) { if ( node == 0 ) {
if ( path_currently_selected != FALSE ) { if ( path_currently_selected ) {
getEntityList().m_selection_disabled = true; getEntityList().m_selection_disabled = true;
GlobalSelectionSystem().setSelectedAll( false ); GlobalSelectionSystem().setSelectedAll( false );
getEntityList().m_selection_disabled = false; getEntityList().m_selection_disabled = false;
@ -165,7 +165,7 @@ static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeMode
} }
else if ( selectable != 0 ) { else if ( selectable != 0 ) {
getEntityList().m_selection_disabled = true; getEntityList().m_selection_disabled = true;
selectable->setSelected( path_currently_selected == FALSE ); selectable->setSelected( !path_currently_selected );
getEntityList().m_selection_disabled = false; getEntityList().m_selection_disabled = false;
if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( getEntityList().m_check ) ) ){ if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( getEntityList().m_check ) ) ){
FocusAllViews(); FocusAllViews();
@ -263,7 +263,7 @@ void EntityList_SetShown( bool shown ){
widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown ); widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown );
if( shown ){ /* expand map's root node for convenience */ if( shown ){ /* expand map's root node for convenience */
GtkTreePath* path = gtk_tree_path_new_from_string( "1" ); 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_view_expand_row( getEntityList().m_tree_view, path, FALSE );
gtk_tree_path_free( path ); gtk_tree_path_free( path );
} }

2
radiant/findtexturedialog.cpp
View File

@ -228,7 +228,7 @@ void FindTextureDialog::updateTextures( const char* name ){
} }
bool FindTextureDialog::isOpen(){ 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 ){ void FindTextureDialog::setFindStr( const char* name ){

2
radiant/mainframe.cpp
View File

@ -1916,7 +1916,7 @@ void ScreenUpdates_Disable( const char* message, const char* title ){
bool isActiveApp = MainFrame_isActiveApp(); bool isActiveApp = MainFrame_isActiveApp();
g_wait = create_wait_dialog( title, message ); 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 ) ); gtk_grab_add( GTK_WIDGET( g_wait.m_window ) );
//globalOutputStream() << "grab grab grab\n"; //globalOutputStream() << "grab grab grab\n";
} }

2
radiant/modelwindow.cpp
View File

@ -964,7 +964,7 @@ gboolean ModelBrowser_size_allocate( GtkWidget* widget, GtkAllocation* allocatio
} }
gboolean ModelBrowser_expose( GtkWidget* widget, GdkEventExpose* event, ModelBrowser* modelBrowser ){ 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(); GlobalOpenGL_debugAssertNoErrors();
ModelBrowser_render(); ModelBrowser_render();
GlobalOpenGL_debugAssertNoErrors(); GlobalOpenGL_debugAssertNoErrors();

2
radiant/patchdialog.cpp
View File

@ -190,7 +190,7 @@ typedef MemberCaller<Subdivisions, &Subdivisions::cancel> CancelCaller;
void apply(){ void apply(){
Scene_PatchSetFixedSubdivisions( Scene_PatchSetFixedSubdivisions(
PatchFixedSubdivisions( PatchFixedSubdivisions(
gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( m_enabled ) ) != FALSE, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( m_enabled ) ),
static_cast<std::size_t>( entry_get_int( m_horizontal ) ), static_cast<std::size_t>( entry_get_int( m_horizontal ) ),
static_cast<std::size_t>( entry_get_int( m_vertical ) ) static_cast<std::size_t>( entry_get_int( m_vertical ) )
) )

2
radiant/preferences.cpp
View File

@ -917,7 +917,7 @@ void PreferencesDialog_restartRequired( const char* staticName ){
void PreferencesDialog_showDialog(){ void PreferencesDialog_showDialog(){
//if ( ConfirmModified( "Edit Preferences" ) && g_Preferences.DoModal() == eIDOK ) { //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 ); gtk_widget_grab_focus( g_Preferences.m_treeview );
if ( g_Preferences.DoModal() == eIDOK ) { if ( g_Preferences.DoModal() == eIDOK ) {
if ( !g_restart_required.empty() ) { if ( !g_restart_required.empty() ) {

2
radiant/surfacedialog.cpp
View File

@ -2254,7 +2254,7 @@ gboolean expose( GtkWidget * win, GdkEventExpose * e, gpointer ){
//This needs to go elsewhere... //This needs to go elsewhere...
// InitTextool(); // InitTextool();
if ( glwidget_make_current( win ) == FALSE ) { if ( !glwidget_make_current( win ) ) {
globalOutputStream() << " FAILED to make current! Oh, the agony! :-(\n"; globalOutputStream() << " FAILED to make current! Oh, the agony! :-(\n";
return true; return true;
} }

2
radiant/texwindow.cpp
View File

@ -1422,7 +1422,7 @@ gboolean TextureBrowser_size_allocate( GtkWidget* widget, GtkAllocation* allocat
} }
gboolean TextureBrowser_expose( GtkWidget* widget, GdkEventExpose* event, TextureBrowser* textureBrowser ){ 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(); GlobalOpenGL_debugAssertNoErrors();
TextureBrowser_evaluateHeight( *textureBrowser ); TextureBrowser_evaluateHeight( *textureBrowser );
Texture_Draw( *textureBrowser ); Texture_Draw( *textureBrowser );

8
radiant/treemodel.cpp
View File

@ -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 ){ 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 ); 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 ) ) success = gtk_tree_model_iter_next( GTK_TREE_MODEL( model ), iter ) )
{ {
scene::Node* current; scene::Node* current;
@ -531,7 +531,7 @@ static gboolean graph_tree_model_row_drop_possible( GtkTreeDragDest *drag_dest,
GtkTreeModel *src_model = 0; GtkTreeModel *src_model = 0;
GtkTreePath *src_path = 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 */ /* can only drag to ourselves */
if ( src_model == GTK_TREE_MODEL( drag_dest ) ) { if ( src_model == GTK_TREE_MODEL( drag_dest ) ) {
/* Can't drop into ourself. */ /* Can't drop into ourself. */
@ -1300,13 +1300,13 @@ TestGraphTreeModel(){
GtkTreeIter iter; GtkTreeIter iter;
gtk_tree_model_get_iter_first( model, &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!" ); ASSERT_MESSAGE( gtk_tree_model_iter_n_children( model, &iter ) == 0, "test failed!" );
gtk_tree_model_iter_next( model, &iter ); 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!" ); ASSERT_MESSAGE( gtk_tree_model_iter_n_children( model, &iter ) == 2, "test failed!" );

8
radiant/xywindow.cpp
View File

@ -463,7 +463,7 @@ Shader* XYWnd::m_state_selected = 0;
#endif #endif
bool XYWnd::overlayStart(){ bool XYWnd::overlayStart(){
if ( gtk_widget_get_visible( m_gl_widget ) ) { 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() ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) {
GlobalOpenGL_debugAssertNoErrors(); GlobalOpenGL_debugAssertNoErrors();
#ifdef OVERLAY_GL_FRONT_DRAW_HACK #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 ){ 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() ) { if ( Map_Valid( g_map ) && ScreenUpdates_Enabled() ) {
GlobalOpenGL_debugAssertNoErrors(); GlobalOpenGL_debugAssertNoErrors();
xywnd->XY_Draw(); xywnd->XY_Draw();
@ -940,7 +940,7 @@ gboolean entitycreate_rightClicked( GtkWidget* widget, GdkEvent* event, gpointer
return TRUE; return TRUE;
} }
/* create entities, don't close menu */ /* 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 ); entitycreate_activated( GTK_MENU_ITEM( widget ), 0 );
return TRUE; return TRUE;
} }
@ -952,7 +952,7 @@ gboolean entitycreate_rightUnClicked( GtkWidget* widget, GdkEvent* event, gpoint
if ( event->button.button == 3 ) { if ( event->button.button == 3 ) {
return TRUE; 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 TRUE;
} }
return FALSE; return FALSE;