[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi] src/widget: Use Qt::NoModifier for modifiers, not Qt::NoButton
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2016-02-29 23:12:12
Message-ID: E1aaWz6-0000sv-0m () scm ! kde ! org
[Download RAW message or body]

Git commit 009235f6bfa9d798a9d0016721f6f57785b5ff9d by Jaroslaw Staniek.
Committed on 29/02/2016 at 23:07.
Pushed by staniek into branch 'master'.

Use Qt::NoModifier for modifiers, not Qt::NoButton

Still not a big deal because both values are 0

CID #1353936

M  +3    -3    src/widget/tableview/kexiblobtableedit.cpp
M  +1    -1    src/widget/tableview/kexicomboboxpopup.cpp
M  +1    -1    src/widget/tableview/kexicomboboxtableedit.cpp
M  +1    -1    src/widget/utils/kexidropdownbutton.cpp

http://commits.kde.org/kexi/009235f6bfa9d798a9d0016721f6f57785b5ff9d

diff --git a/src/widget/tableview/kexiblobtableedit.cpp \
b/src/widget/tableview/kexiblobtableedit.cpp index 6a63920..46b71e1 100644
--- a/src/widget/tableview/kexiblobtableedit.cpp
+++ b/src/widget/tableview/kexiblobtableedit.cpp
@@ -428,7 +428,7 @@ bool KexiBlobTableEdit::handleKeyPress(QKeyEvent* ke, bool \
                editorActive)
             QMouseEvent me(QEvent::MouseButtonPress, QPoint(2, 2), Qt::LeftButton, \
Qt::NoButton,  Qt::NoModifier);
             QApplication::sendEvent(d->button, &me);
-        } else if (ke->modifiers() == Qt::NoButton
+        } else if (ke->modifiers() == Qt::NoModifier
                    && (k == Qt::Key_F2 || k == Qt::Key_Space || k == Qt::Key_Enter \
|| k == Qt::Key_Return)) {  d->menu->insertFromFile();
         } else
@@ -464,9 +464,9 @@ bool KexiBlobTableEdit::eventFilter(QObject *o, QEvent *e)
 {
     if (o == d->menu && e->type() == QEvent::KeyPress) {
         QKeyEvent* ke = static_cast<QKeyEvent*>(e);
-        const int mods = ke->modifiers();
+        const Qt::KeyboardModifiers mods = ke->modifiers();
         const int k = ke->key();
-        if ((mods == Qt::NoButton && (k == Qt::Key_Tab || k == Qt::Key_Left || k == \
Qt::Key_Right)) +        if ((mods == Qt::NoModifier && (k == Qt::Key_Tab || k == \
Qt::Key_Left || k == Qt::Key_Right))  || (mods == Qt::ShiftModifier && k == \
Qt::Key_Backtab)  ) {
             d->menu->hide();
diff --git a/src/widget/tableview/kexicomboboxpopup.cpp \
b/src/widget/tableview/kexicomboboxpopup.cpp index 489b009..5e55cdc 100644
--- a/src/widget/tableview/kexicomboboxpopup.cpp
+++ b/src/widget/tableview/kexicomboboxpopup.cpp
@@ -439,7 +439,7 @@ bool KexiComboBoxPopup::eventFilter(QObject *o, QEvent *e)
         if (e->type() == QEvent::KeyPress) {
             QKeyEvent *ke = static_cast<QKeyEvent*>(e);
             const int k = ke->key();
-            if ((ke->modifiers() == Qt::NoButton && (k == Qt::Key_Escape || k == \
Qt::Key_F4)) +            if ((ke->modifiers() == Qt::NoModifier && (k == \
                Qt::Key_Escape || k == Qt::Key_F4))
                     || (ke->modifiers() == Qt::AltModifier && k == Qt::Key_Up)) {
                 hide();
                 emit cancelled();
diff --git a/src/widget/tableview/kexicomboboxtableedit.cpp \
b/src/widget/tableview/kexicomboboxtableedit.cpp index ca3b4fc..b36097d 100644
--- a/src/widget/tableview/kexicomboboxtableedit.cpp
+++ b/src/widget/tableview/kexicomboboxtableedit.cpp
@@ -263,7 +263,7 @@ bool KexiComboBoxTableEdit::handleKeyPress(QKeyEvent *ke, bool \
editorActive)  {
     //qDebug() << ke;
     const int k = ke->key();
-    if ((ke->modifiers() == Qt::NoButton && k == Qt::Key_F4)
+    if ((ke->modifiers() == Qt::NoModifier && k == Qt::Key_F4)
             || (ke->modifiers() == Qt::AltModifier && k == Qt::Key_Down)) {
         //show popup
         slotButtonClicked();
diff --git a/src/widget/utils/kexidropdownbutton.cpp \
b/src/widget/utils/kexidropdownbutton.cpp index 507335a..a7a1051 100644
--- a/src/widget/utils/kexidropdownbutton.cpp
+++ b/src/widget/utils/kexidropdownbutton.cpp
@@ -110,7 +110,7 @@ void KexiDropDownButton::keyPressEvent(QKeyEvent * e)
 {
     const int k = e->key();
     const bool dropDown =
-        (e->modifiers() == Qt::NoButton
+        (e->modifiers() == Qt::NoModifier
          && (k == Qt::Key_Space || k == Qt::Key_Enter || k == Qt::Key_Return || k == \
Qt::Key_F2  || k == Qt::Key_F4)
         )


[prev in list] [next in list] [prev in thread] [next in thread]