From 3b9846d1f9104a2781178e77dc00b42e57bdb870 Mon Sep 17 00:00:00 2001 From: mkr Date: Wed, 4 Jul 2007 07:07:43 +0000 Subject: [PATCH] Porting to Qt4. --- src/Qtx/QtxPopupMgr.cxx | 4 ++-- src/Qtx/QtxPopupMgr.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx index 2158b6417..d2f9be088 100644 --- a/src/Qtx/QtxPopupMgr.cxx +++ b/src/Qtx/QtxPopupMgr.cxx @@ -340,7 +340,7 @@ void QtxPopupMgr::unRegisterAction( const int id ) \param ruleType rule type (QtxPopupMgr::RuleType) \return action ID */ -int QtxPopupMgr::insert( const int id, const int pId, const QString& rule, const RuleType ruleType ) +int QtxPopupMgr::insertAction( const int id, const int pId, const QString& rule, const RuleType ruleType ) { int res = QtxActionMenuMgr::insert( id, pId, -1 ); setRule( action( id ), rule, ruleType ); @@ -355,7 +355,7 @@ int QtxPopupMgr::insert( const int id, const int pId, const QString& rule, const \param ruleType rule type (QtxPopupMgr::RuleType) \return action ID */ -int QtxPopupMgr::insert( QAction* a, const int pId, const QString& rule, const RuleType ruleType ) +int QtxPopupMgr::insertAction( QAction* a, const int pId, const QString& rule, const RuleType ruleType ) { int res = QtxActionMenuMgr::insert( a, pId, -1 ); setRule( a, rule, ruleType ); diff --git a/src/Qtx/QtxPopupMgr.h b/src/Qtx/QtxPopupMgr.h index 97188b1cb..388410842 100644 --- a/src/Qtx/QtxPopupMgr.h +++ b/src/Qtx/QtxPopupMgr.h @@ -49,8 +49,8 @@ public: QtxPopupMgr( QMenu*, QObject* = 0 ); virtual ~QtxPopupMgr(); - int insert( const int, const int, const QString&, const RuleType = VisibleRule ); - int insert( QAction*, const int, const QString&, const RuleType = VisibleRule ); + int insertAction( const int, const int, const QString&, const RuleType = VisibleRule ); + int insertAction( QAction*, const int, const QString&, const RuleType = VisibleRule ); virtual int registerAction( QAction*, const int, const QString& rule, const RuleType = VisibleRule ); -- 2.39.2