stronger types - better types

miranda-ng · Apr 17, 2023 · 4b63ed5 · 4b63ed5
1 parent 9870ea6
commit 4b63ed5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/include/m_system.h b/include/m_system.h
@@ -667,7 +667,7 @@ __inline CCallback<TArgument> Callback(TClass *object, void (TClass:: *func)(TAr
 }
 
 template<typename TClass, typename TArgument>
-__inline CCallback<TArgument> Callback(TClass *object, bool (TClass:: *func)(TArgument *argument))
+__inline CCallback<TArgument> BCallback(TClass *object, bool (TClass:: *func)(TArgument *argument))
 {
 	return CCallback<TArgument>(object, func);
 }

diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp
@@ -334,8 +334,8 @@ class CContactOptsDlg : public CDlgBase
 		m_nameOrder(this, IDC_NAMEORDER)
 	{
 		m_nameOrder.SetFlags(MTREE_DND);
-		m_nameOrder.OnBeginDrag = Callback(this, &CContactOptsDlg::OnBeginDrag);
-		m_nameOrder.OnEndDrag = Callback(this, &CContactOptsDlg::OnEndDrag);
+		m_nameOrder.OnBeginDrag = BCallback(this, &CContactOptsDlg::OnBeginDrag);
+		m_nameOrder.OnEndDrag = BCallback(this, &CContactOptsDlg::OnEndDrag);
 	}
 
 	bool OnInitDialog() override

diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
@@ -318,7 +318,7 @@ class CGenMenuOptionsPage : public CDlgBase
 
 		m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND);
 		m_menuItems.OnSelChanged = Callback(this, &CGenMenuOptionsPage::onMenuItemChanged);
-		m_menuItems.OnBeginDrag = Callback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
+		m_menuItems.OnBeginDrag = BCallback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
 
 		m_customName.SetSilent();
 		m_service.SetSilent();