X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=0097d9be95131dbef03d56b599762f829f5d5af1;hb=1ede3dc63143af40210a3e9c1c601028359fac11;hp=2894305cc491bd2f414e6a149573ae9f7e92f317;hpb=c9d78eecedad850196f7b2e2b5f5d72e980f3c8e;p=xonotic%2Fnetradiant.git diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 2894305c..0097d9be 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -111,7 +111,7 @@ void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ #endif } } -typedef ReferenceCaller1 TextureGroupsAddWadCaller; +typedef ReferenceCaller TextureGroupsAddWadCaller; namespace { @@ -167,12 +167,12 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ } } } -typedef ReferenceCaller1 TextureGroupsAddShaderCaller; +typedef ReferenceCaller TextureGroupsAddShaderCaller; void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ groups.insert( directory ); } -typedef ReferenceCaller1 TextureGroupsAddDirectoryCaller; +typedef ReferenceCaller TextureGroupsAddDirectoryCaller; class DeferredAdjustment { @@ -215,7 +215,7 @@ static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustm class TextureBrowser; -typedef ReferenceCaller TextureBrowserQueueDrawCaller; +typedef ReferenceCaller TextureBrowserQueueDrawCaller; void TextureBrowser_scrollChanged( void* data, gdouble value ); @@ -227,25 +227,25 @@ enum StartupShaders }; void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserHideUnusedExport; +typedef FreeCaller TextureBrowserHideUnusedExport; void TextureBrowser_showShadersExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShadersExport; +typedef FreeCaller TextureBrowserShowShadersExport; void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; +typedef FreeCaller TextureBrowserShowShaderlistOnlyExport; void TextureBrowser_fixedSize( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFixedSizeExport; +typedef FreeCaller TextureBrowserFixedSizeExport; void TextureBrowser_filterMissing( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterMissingExport; +typedef FreeCaller TextureBrowserFilterMissingExport; void TextureBrowser_filterFallback( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterFallbackExport; +typedef FreeCaller TextureBrowserFilterFallbackExport; void TextureBrowser_enableAlpha( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserEnableAlphaExport; +typedef FreeCaller TextureBrowserEnableAlphaExport; class TextureBrowser { @@ -259,13 +259,13 @@ CopiedString shader; ui::Window m_parent{ui::null}; ui::GLArea m_gl_widget{ui::null}; ui::Widget m_texture_scroll{ui::null}; -ui::Widget m_treeViewTree{ui::null}; -ui::Widget m_treeViewTags{ui::null}; +ui::TreeView m_treeViewTree{ui::null}; +ui::TreeView m_treeViewTags{ui::null}; ui::Frame m_tag_frame{ui::null}; ui::ListStore m_assigned_store{ui::null}; ui::ListStore m_available_store{ui::null}; -ui::Widget m_assigned_tree{ui::null}; -ui::Widget m_available_tree{ui::null}; +ui::TreeView m_assigned_tree{ui::null}; +ui::TreeView m_available_tree{ui::null}; ui::Widget m_scr_win_tree{ui::null}; ui::Widget m_scr_win_tags{ui::null}; ui::Widget m_tag_notebook{ui::null}; @@ -678,7 +678,7 @@ void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool va TextureBrowser_updateScroll( textureBrowser ); } } -typedef ReferenceCaller1 TextureBrowserImportShowScrollbarCaller; +typedef ReferenceCaller TextureBrowserImportShowScrollbarCaller; /* @@ -756,7 +756,7 @@ class TextureCategoryLoadShader const char* m_directory; std::size_t& m_count; public: -typedef const char* first_argument_type; +using func = void(const char *); TextureCategoryLoadShader( const char* directory, std::size_t& count ) : m_directory( directory ), m_count( count ){ @@ -791,7 +791,7 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ IShader* shader = QERApp_Shader_ForName( name.c_str() ); shader->DecRef(); } -typedef ConstPointerCaller1 TextureDirectoryLoadTextureCaller; +typedef ConstPointerCaller TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor { @@ -818,7 +818,7 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -842,7 +842,7 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -866,37 +866,37 @@ bool TextureBrowser_hideUnused(); void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ){ importer( TextureBrowser_hideUnused() ); } -typedef FreeCaller1 TextureBrowserHideUnusedExport; +typedef FreeCaller TextureBrowserHideUnusedExport; void TextureBrowser_showShadersExport( const BoolImportCallback& importer ){ importer( GlobalTextureBrowser().m_showShaders ); } -typedef FreeCaller1 TextureBrowserShowShadersExport; +typedef FreeCaller TextureBrowserShowShadersExport; void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ){ importer( g_TextureBrowser_shaderlistOnly ); } -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; +typedef FreeCaller TextureBrowserShowShaderlistOnlyExport; void TextureBrowser_fixedSize( const BoolImportCallback& importer ){ importer( g_TextureBrowser_fixedSize ); } -typedef FreeCaller1 TextureBrowser_FixedSizeExport; +typedef FreeCaller TextureBrowser_FixedSizeExport; void TextureBrowser_filterMissing( const BoolImportCallback& importer ){ importer( g_TextureBrowser_filterMissing ); } -typedef FreeCaller1 TextureBrowser_filterMissingExport; +typedef FreeCaller TextureBrowser_filterMissingExport; void TextureBrowser_filterFallback( const BoolImportCallback& importer ){ importer( g_TextureBrowser_filterFallback ); } -typedef FreeCaller1 TextureBrowser_filterFallbackExport; +typedef FreeCaller TextureBrowser_filterFallbackExport; void TextureBrowser_enableAlpha( const BoolImportCallback& importer ){ importer( g_TextureBrowser_enableAlpha ); } -typedef FreeCaller1 TextureBrowser_enableAlphaExport; +typedef FreeCaller TextureBrowser_enableAlphaExport; void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ if ( hideUnused ) { @@ -1426,7 +1426,7 @@ void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){ totalHeight = std::max( totalHeight, textureBrowser.height ); - GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); + auto vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); gtk_adjustment_set_value(vadjustment, -TextureBrowser_getOriginY( textureBrowser )); gtk_adjustment_set_page_size(vadjustment, textureBrowser.height); @@ -1540,7 +1540,7 @@ void TextureBrowser_constructTreeStore(){ auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); TextureGroups_constructTreeModel( groups, store ); - gtk_tree_view_set_model(GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), store); + gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store); g_object_unref( G_OBJECT( store ) ); } @@ -1548,17 +1548,17 @@ void TextureBrowser_constructTreeStore(){ void TextureBrowser_constructTreeStoreTags(){ TextureGroups groups; auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); - GtkTreeModel* model = g_TextureBrowser.m_all_tags_list; + auto model = g_TextureBrowser.m_all_tags_list; - gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), model ); + gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model ); g_object_unref( G_OBJECT( store ) ); } -void TreeView_onRowActivated( GtkTreeView* treeview, GtkTreePath* path, GtkTreeViewColumn* col, gpointer userdata ){ +void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::TreeViewColumn col, gpointer userdata ){ GtkTreeIter iter; - GtkTreeModel* model = gtk_tree_view_get_model( GTK_TREE_VIEW( treeview ) ); + auto model = gtk_tree_view_get_model(treeview ); if ( gtk_tree_model_get_iter( model, &iter, path ) ) { gchar dirName[1024]; @@ -1582,13 +1582,13 @@ void TreeView_onRowActivated( GtkTreeView* treeview, GtkTreePath* path, GtkTreeV void TextureBrowser_createTreeViewTree(){ g_TextureBrowser.m_treeViewTree = ui::TreeView(ui::New); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); + gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTree, FALSE ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTree, FALSE ); g_TextureBrowser.m_treeViewTree.connect( "row-activated", (GCallback) TreeView_onRowActivated, NULL ); auto renderer = ui::CellRendererText(ui::New); - gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), -1, "", renderer, "text", 0, NULL ); + gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTree, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStore(); } @@ -1619,12 +1619,12 @@ void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *even gdk_event_get_time( (GdkEvent*)event ) ); } -gboolean TreeViewTags_onButtonPressed( ui::Widget treeview, GdkEventButton *event ){ +gboolean TreeViewTags_onButtonPressed( ui::TreeView treeview, GdkEventButton *event ){ if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) { GtkTreePath *path; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( treeview ) ); + auto selection = gtk_tree_view_get_selection(treeview ); - if ( gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW( treeview ), event->x, event->y, &path, NULL, NULL, NULL ) ) { + if ( gtk_tree_view_get_path_at_pos(treeview, event->x, event->y, &path, NULL, NULL, NULL ) ) { gtk_tree_selection_unselect_all( selection ); gtk_tree_selection_select_path( selection, path ); gtk_tree_path_free( path ); @@ -1638,14 +1638,14 @@ gboolean TreeViewTags_onButtonPressed( ui::Widget treeview, GdkEventButton *even void TextureBrowser_createTreeViewTags(){ g_TextureBrowser.m_treeViewTags = ui::TreeView(ui::New); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); + gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTags, FALSE ); g_TextureBrowser.m_treeViewTags.connect( "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTags, FALSE ); auto renderer = ui::CellRendererText(ui::New); - gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), -1, "", renderer, "text", 0, NULL ); + gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTags, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStoreTags(); } @@ -1729,10 +1729,10 @@ ui::MenuItem TextureBrowser_constructTagsMenu( ui::Menu menu ){ return textures_menu_item; } -gboolean TextureBrowser_tagMoveHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ +gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ g_assert( selected != NULL ); - GtkTreeRowReference* rowref = gtk_tree_row_reference_new( model, path ); + auto rowref = gtk_tree_row_reference_new( model, path ); *selected = g_slist_append( *selected, rowref ); return FALSE; @@ -1743,14 +1743,14 @@ void TextureBrowser_assignTags(){ GSList* node; gchar* tag_assigned; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); if ( selected != NULL ) { for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; @@ -1793,14 +1793,14 @@ void TextureBrowser_removeTags(){ GSList* node; gchar* tag; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); if ( selected != NULL ) { for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; @@ -1842,7 +1842,7 @@ void TextureBrowser_searchTags(){ char buffer[256]; char tags_searched[256]; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); @@ -1852,7 +1852,7 @@ void TextureBrowser_searchTags(){ for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; @@ -1994,7 +1994,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_checkTagFile(); TextureBrowser_SetNotex(); - GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); g_TextureBrowser.m_parent = toplevel; @@ -2068,7 +2068,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ if ( g_TextureBrowser.m_tags ) { { // fill tag GtkListStore g_TextureBrowser.m_all_tags_list = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); TagBuilder.GetAllTags( g_TextureBrowser.m_all_tags ); @@ -2089,7 +2089,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_createTreeViewTags(); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), g_TextureBrowser.m_treeViewTags ); @@ -2123,7 +2123,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ g_TextureBrowser.m_assigned_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); @@ -2131,13 +2131,13 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_assigned_store )); g_TextureBrowser.m_assigned_store.unref(); g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_assigned_tree, FALSE ); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); + gtk_tree_view_append_column(g_TextureBrowser.m_assigned_tree, column ); g_TextureBrowser.m_assigned_tree.show(); scrolled_win.show(); @@ -2151,7 +2151,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); g_TextureBrowser.m_available_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); @@ -2159,13 +2159,13 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_available_store )); g_TextureBrowser.m_available_store.unref(); g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_available_tree, FALSE ); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); + gtk_tree_view_append_column(g_TextureBrowser.m_available_tree, column ); g_TextureBrowser.m_available_tree.show(); scrolled_win.show(); @@ -2182,8 +2182,8 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ m_btn_right.add(m_arrow_right); // workaround. the size of the tag frame depends of the requested size of the arrow buttons. - gtk_widget_set_size_request( m_arrow_left, -1, 68 ); - gtk_widget_set_size_request( m_arrow_right, -1, 68 ); + m_arrow_left.dimensions(-1, 68); + m_arrow_right.dimensions(-1, 68); frame_table.attach(m_btn_left, {1, 2, 1, 2}, {GTK_SHRINK, GTK_EXPAND}); frame_table.attach(m_btn_right, {1, 2, 2, 3}, {GTK_SHRINK, GTK_EXPAND}); @@ -2218,7 +2218,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ } void TextureBrowser_destroyWindow(){ - GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); + GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler ); g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler ); @@ -2235,7 +2235,7 @@ void TextureBrowser_setBackgroundColour( TextureBrowser& textureBrowser, const V TextureBrowser_queueDraw( textureBrowser ); } -void TextureBrowser_selectionHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ +void TextureBrowser_selectionHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ g_assert( selected != NULL ); gchar* name; @@ -2264,7 +2264,7 @@ void TextureBrowser_addTag(){ gtk_list_store_set( g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1 ); // Select the currently added tag in the available list - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_select_iter( selection, &iter ); g_TextureBrowser.m_all_tags_list.append(TAG_COLUMN, tag.c_str()); @@ -2281,7 +2281,7 @@ void TextureBrowser_renameTag(){ GSList* selected = NULL; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only rename a single tag @@ -2323,7 +2323,7 @@ void TextureBrowser_renameTag(){ void TextureBrowser_deleteTag(){ GSList* selected = NULL; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag @@ -2408,7 +2408,7 @@ void TextureBrowser_RefreshShaders(){ ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); GlobalShaderSystem().refresh(); UpdateAllWindows(); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(GlobalTextureBrowser().m_treeViewTree)); + auto selection = gtk_tree_view_get_selection(GlobalTextureBrowser().m_treeViewTree); GtkTreeModel* model = NULL; GtkTreeIter iter; if ( gtk_tree_selection_get_selected (selection, &model, &iter) ) @@ -2534,7 +2534,7 @@ void TextureScaleImport( TextureBrowser& textureBrowser, int value ){ break; } } -typedef ReferenceCaller1 TextureScaleImportCaller; +typedef ReferenceCaller TextureScaleImportCaller; void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback& importer ){ switch ( textureBrowser.m_textureScale ) @@ -2556,7 +2556,7 @@ void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback break; } } -typedef ReferenceCaller1 TextureScaleExportCaller; +typedef ReferenceCaller TextureScaleExportCaller; void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ @@ -2564,7 +2564,7 @@ void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ if ( value > 16 ) TextureBrowser_setUniformSize( textureBrowser, value ); } -typedef ReferenceCaller1 UniformTextureSizeImportCaller; +typedef ReferenceCaller UniformTextureSizeImportCaller; void TextureBrowser_constructPreferences( PreferencesPage& page ){ page.appendCheckBox( @@ -2598,37 +2598,37 @@ void TextureBrowser_constructPage( PreferenceGroup& group ){ TextureBrowser_constructPreferences( page ); } void TextureBrowser_registerPreferencesPage(){ - PreferencesDialog_addSettingsPage( FreeCaller1() ); + PreferencesDialog_addSettingsPage( makeCallbackF(TextureBrowser_constructPage) ); } #include "preferencesystem.h" #include "stringio.h" -typedef ReferenceCaller1 TextureBrowserSetScaleCaller; +typedef ReferenceCaller TextureBrowserSetScaleCaller; void TextureClipboard_textureSelected( const char* shader ); void TextureBrowser_Construct(){ - GlobalCommands_insert( "ShaderInfo", FreeCaller() ); - GlobalCommands_insert( "ShowUntagged", FreeCaller() ); - GlobalCommands_insert( "AddTag", FreeCaller() ); - GlobalCommands_insert( "RenameTag", FreeCaller() ); - GlobalCommands_insert( "DeleteTag", FreeCaller() ); - GlobalCommands_insert( "CopyTag", FreeCaller() ); - GlobalCommands_insert( "PasteTag", FreeCaller() ); - GlobalCommands_insert( "RefreshShaders", FreeCaller() ); - GlobalToggles_insert( "ShowInUse", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); - GlobalCommands_insert( "ShowAllTextures", FreeCaller(), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "ToggleTextures", FreeCaller(), Accelerator( 'T' ) ); - GlobalToggles_insert( "ToggleShowShaders", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); - GlobalToggles_insert( "ToggleShowShaderlistOnly", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); - GlobalToggles_insert( "FixedSize", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); - GlobalToggles_insert( "FilterMissing", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); - GlobalToggles_insert( "FilterFallback", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); - GlobalToggles_insert( "EnableAlpha", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); + GlobalCommands_insert( "ShaderInfo", makeCallbackF(TextureBrowser_shaderInfo) ); + GlobalCommands_insert( "ShowUntagged", makeCallbackF(TextureBrowser_showUntagged) ); + GlobalCommands_insert( "AddTag", makeCallbackF(TextureBrowser_addTag) ); + GlobalCommands_insert( "RenameTag", makeCallbackF(TextureBrowser_renameTag) ); + GlobalCommands_insert( "DeleteTag", makeCallbackF(TextureBrowser_deleteTag) ); + GlobalCommands_insert( "CopyTag", makeCallbackF(TextureBrowser_copyTag) ); + GlobalCommands_insert( "PasteTag", makeCallbackF(TextureBrowser_pasteTag) ); + GlobalCommands_insert( "RefreshShaders", makeCallbackF(VFS_Refresh) ); + GlobalToggles_insert( "ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); + GlobalCommands_insert( "ShowAllTextures", makeCallbackF(TextureBrowser_showAll), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ToggleTextures", makeCallbackF(TextureBrowser_toggleShow), Accelerator( 'T' ) ); + GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); + GlobalToggles_insert( "ToggleShowShaderlistOnly", makeCallbackF(TextureBrowser_ToggleShowShaderListOnly), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); + GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); + GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); + GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); + GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); GlobalPreferenceSystem().registerPreference( "TextureScale", makeSizeStringImportCallback( TextureBrowserSetScaleCaller( g_TextureBrowser ) ), @@ -2652,7 +2652,7 @@ void TextureBrowser_Construct(){ g_TextureBrowser.shader = texdef_name_default(); - Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); TextureBrowser_registerPreferencesPage(); @@ -2663,5 +2663,5 @@ void TextureBrowser_Construct(){ void TextureBrowser_Destroy(){ GlobalShaderSystem().detach( g_ShadersObserver ); - Textures_setModeChangedNotify( Callback() ); + Textures_setModeChangedNotify( Callback() ); }