diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kdeui/kcmenumngr.cpp | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kcmenumngr.cpp')
| -rw-r--r-- | kdeui/kcmenumngr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp index 9cd9d6288..2288a5963 100644 --- a/kdeui/kcmenumngr.cpp +++ b/kdeui/kcmenumngr.cpp @@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; - menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); - saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; - showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); + KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ; + menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt(); + saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ; + showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true ); } KContextMenuManager::~KContextMenuManager() @@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) TQPoint pos; switch ( e->type() ) { case TQEvent::MouseButtonPress: - if (((TQMouseEvent*) e )->button() != RightButton ) + if (((TQMouseEvent*) e )->button() != Qt::RightButton ) break; if ( !showOnPress ) return true; // eat event for safety @@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) pos = ((TQMouseEvent*) e )->globalPos(); break; case TQEvent::MouseButtonRelease: - if ( showOnPress || ((TQMouseEvent*) e )->button() != RightButton ) + if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) break; popup = menus[o]; pos = ((TQMouseEvent*) e )->globalPos(); @@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) void KContextMenuManager::widgetDestroyed() { - if ( menus.find( (TQObject*)sender() ) ) + if ( menus.tqfind( (TQObject*)sender() ) ) menus.remove( (TQObject*)sender() ); } |