X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fentitylist.cpp;h=0230fe6d01cf9a7e2e2a80e169cbc4050efa9e05;hb=917037aaad6866d48ef9dcce1bb7b35e66a1ab93;hp=290f8bac0e1c7bb11a3d13075a6745ca32df0bdd;hpb=51fa1a72ab2099fab13b429097300ed464c25a9d;p=xonotic%2Fnetradiant.git

diff --git a/radiant/entitylist.cpp b/radiant/entitylist.cpp
index 290f8bac..0230fe6d 100644
--- a/radiant/entitylist.cpp
+++ b/radiant/entitylist.cpp
@@ -41,7 +41,7 @@
 #include "treemodel.h"
 
 void RedrawEntityList();
-typedef FreeCaller<RedrawEntityList> RedrawEntityListCaller;
+typedef FreeCaller<void(), RedrawEntityList> RedrawEntityListCaller;
 
 
 class EntityList
@@ -67,7 +67,7 @@ bool m_selection_disabled;
 EntityList() :
 	m_dirty( EntityList::eDefault ),
 	m_idleDraw( RedrawEntityListCaller() ),
-	m_window( 0 ),
+	m_window( ui::null ),
 	m_selection_disabled( false ){
 }
 
@@ -107,7 +107,7 @@ inline void gtk_tree_model_get_pointer( ui::TreeModel model, GtkTreeIter* iter,
 
 
 
-void entitylist_treeviewcolumn_celldatafunc( ui::TreeViewColumn column, GtkCellRenderer* renderer, ui::TreeModel model, GtkTreeIter* iter, gpointer data ){
+void entitylist_treeviewcolumn_celldatafunc( ui::TreeViewColumn column, ui::CellRenderer renderer, ui::TreeModel model, GtkTreeIter* iter, gpointer data ){
 	scene::Node* node;
 	gtk_tree_model_get_pointer( model, iter, 0, &node );
 	scene::Instance* instance;
@@ -177,7 +177,7 @@ void EntityList_DisconnectSignals( ui::TreeView view ){
 
 
 gboolean treemodel_update_selection( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, gpointer data ){
-	auto view = reinterpret_cast<GtkTreeView*>( data );
+	auto view = ui::TreeView::from( data );
 
 	scene::Instance* instance;
 	gtk_tree_model_get_pointer( model, iter, 1, &instance );
@@ -375,9 +375,9 @@ void EntityList_Construct(){
 
 	getEntityList().m_positionTracker.setPosition( c_default_window_pos );
 
-	GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", WindowPositionTrackerImportStringCaller( getEntityList().m_positionTracker ), WindowPositionTrackerExportStringCaller( getEntityList().m_positionTracker ) );
+	GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", make_property<WindowPositionTracker_String>( getEntityList().m_positionTracker ) );
 
-	typedef FreeCaller1<const Selectable&, EntityList_SelectionChanged> EntityListSelectionChangedCaller;
+	typedef FreeCaller<void(const Selectable&), EntityList_SelectionChanged> EntityListSelectionChangedCaller;
 	GlobalSelectionSystem().addSelectionChangeCallback( EntityListSelectionChangedCaller() );
 }
 void EntityList_Destroy(){