diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/widgets/popupmenu.cpp | |
parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/widgets/popupmenu.cpp')
-rw-r--r-- | muse2/muse/widgets/popupmenu.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp index 2b0b6711..af546ec3 100644 --- a/muse2/muse/widgets/popupmenu.cpp +++ b/muse2/muse/widgets/popupmenu.cpp @@ -41,7 +41,7 @@ #include "route.h" -namespace MusEWidget { +namespace MusEGui { //====================== // PopupMenu @@ -152,9 +152,9 @@ QAction* PopupMenu::findActionFromData(const QVariant& v) const // are not called. Instead the values' addresses are compared." // // Take care of struct Route first. Insert other future custom structures here too ! - if(act->data().canConvert<Route>() && v.canConvert<Route>()) + if(act->data().canConvert<MusECore::Route>() && v.canConvert<MusECore::Route>()) { - if(act->data().value<Route>() == v.value<Route>()) + if(act->data().value<MusECore::Route>() == v.value<MusECore::Route>()) return act; } else @@ -174,7 +174,7 @@ bool PopupMenu::event(QEvent* event) case QEvent::MouseButtonDblClick: { if(_stayOpen) - //if(_stayOpen && MusEConfig::config.popupsDefaultStayOpen) + //if(_stayOpen && MusEGlobal::config.popupsDefaultStayOpen) { QMouseEvent* e = static_cast<QMouseEvent*>(event); if(e->modifiers() == Qt::NoModifier) @@ -193,7 +193,7 @@ bool PopupMenu::event(QEvent* event) case QEvent::KeyPress: { if(_stayOpen) - //if(_stayOpen && MusEConfig::config.popupsDefaultStayOpen) + //if(_stayOpen && MusEGlobal::config.popupsDefaultStayOpen) { QKeyEvent* e = static_cast<QKeyEvent*>(event); if(e->modifiers() == Qt::NoModifier && e->key() == Qt::Key_Space) @@ -347,7 +347,7 @@ void PopupMenu::mouseReleaseEvent(QMouseEvent *e) #else // Check for Ctrl to stay open. - if(!_stayOpen || (!MusEConfig::config.popupsDefaultStayOpen && (e->modifiers() & Qt::ControlModifier) == 0)) + if(!_stayOpen || (!MusEGlobal::config.popupsDefaultStayOpen && (e->modifiers() & Qt::ControlModifier) == 0)) { QMenu::mouseReleaseEvent(e); return; @@ -390,4 +390,4 @@ void PopupView::clear() } */ -} // namespace MusEWidget +} // namespace MusEGui |