generic: replace obsolete Qt::MidButton with Qt::MiddleButton

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/kwin/clients/oxygen/oxygensizegrip.cpp b/kwin/clients/oxygen/oxygensizegrip.cpp
index 41aa51e..e2c6e42 100644 (file)
--- a/kwin/clients/oxygen/oxygensizegrip.cpp
+++ b/kwin/clients/oxygen/oxygensizegrip.cpp
@@ -179,7 +179,7 @@ namespace Oxygen
                 break;
             }
 
-            case Qt::MidButton:
+            case Qt::MiddleButton:
             {
                 hide();
                 break;

diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp
index 6918230..fff3db9 100755 (executable)
--- a/kwin/effects/presentwindows/presentwindows.cpp
+++ b/kwin/effects/presentwindows/presentwindows.cpp
@@ -578,7 +578,7 @@ void PresentWindowsEffect::windowInputMouseEvent(QEvent *e)
                 mouseActionDesktop(m_leftButtonDesktop);
             }
         }
-        if (me->button() == Qt::MidButton) {
+        if (me->button() == Qt::MiddleButton) {
             if (hovering) {
                 // mouse is hovering above a window - use MouseActionsWindow
                 mouseActionWindow(m_middleButtonWindow);

diff --git a/kwin/events.cpp b/kwin/events.cpp
index ae8f8de..0afffba 100644 (file)
--- a/kwin/events.cpp
+++ b/kwin/events.cpp
@@ -1117,7 +1117,7 @@ void Client::processMousePressEvent(QMouseEvent* e)
     case Qt::LeftButton:
         button = Button1;
         break;
-    case Qt::MidButton:
+    case Qt::MiddleButton:
         button = Button2;
         break;
     case Qt::RightButton:

diff --git a/kwin/libkdecorations/kcommondecoration.cpp b/kwin/libkdecorations/kcommondecoration.cpp
index 3bad31d..9714ccd 100644 (file)
--- a/kwin/libkdecorations/kcommondecoration.cpp
+++ b/kwin/libkdecorations/kcommondecoration.cpp
@@ -460,7 +460,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const QString&
                 if ((!m_button[MaxButton]) && isMaximizable()) {
                     btn = createButton(MaxButton);
                     if (!btn) break;
-                    btn->setRealizeButtons(Qt::LeftButton | Qt::MidButton | Qt::RightButton);
+                    btn->setRealizeButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton);
                     const bool max = maximizeMode() == MaximizeFull;
                     btn->setTipText(max ? i18n("Restore") : i18n("Maximize"));
                     btn->setToggleButton(true);

diff --git a/kwin/libkdecorations/kdecoration.cpp b/kwin/libkdecorations/kdecoration.cpp
index 9b52483..5446d5b 100644 (file)
--- a/kwin/libkdecorations/kdecoration.cpp
+++ b/kwin/libkdecorations/kdecoration.cpp
@@ -600,7 +600,7 @@ KDecorationOptions::BorderSize KDecorationOptions::preferredBorderSize(KDecorati
 KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick(Qt::MouseButtons button) const
 {
     return button == Qt::RightButton ? d->opMaxButtonRightClick :
-           button == Qt::MidButton ?   d->opMaxButtonMiddleClick :
+           button == Qt::MiddleButton ?   d->opMaxButtonMiddleClick :
            d->opMaxButtonLeftClick;
 }
 

diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp
index 5660692..df1d3c5 100755 (executable)
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@ -1021,7 +1021,7 @@ Options::WindowOperation Client::mouseButtonToWindowOperation(Qt::MouseButtons b
 
     if (button == Qt::LeftButton)
         com = active ? options->commandActiveTitlebar1() : options->commandInactiveTitlebar1();
-    else if (button == Qt::MidButton)
+    else if (button == Qt::MiddleButton)
         com = active ? options->commandActiveTitlebar2() : options->commandInactiveTitlebar2();
     else if (button == Qt::RightButton)
         com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3();

diff --git a/kwin/utils.cpp b/kwin/utils.cpp
index 3e4126f..8bfad52 100644 (file)
--- a/kwin/utils.cpp
+++ b/kwin/utils.cpp
@@ -276,7 +276,7 @@ int qtToX11Button(Qt::MouseButton button)
 {
     if (button == Qt::LeftButton)
         return XCB_BUTTON_INDEX_1;
-    else if (button == Qt::MidButton)
+    else if (button == Qt::MiddleButton)
         return XCB_BUTTON_INDEX_2;
     else if (button == Qt::RightButton)
         return XCB_BUTTON_INDEX_3;
@@ -288,7 +288,7 @@ Qt::MouseButton x11ToQtMouseButton(int button)
     if (button == XCB_BUTTON_INDEX_1)
         return Qt::LeftButton;
     if (button == XCB_BUTTON_INDEX_2)
-        return Qt::MidButton;
+        return Qt::MiddleButton;
     if (button == XCB_BUTTON_INDEX_3)
         return Qt::RightButton;
     if (button == XCB_BUTTON_INDEX_4)
@@ -303,7 +303,7 @@ int qtToX11State(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
     int ret = 0;
     if (buttons & Qt::LeftButton)
         ret |= XCB_KEY_BUT_MASK_BUTTON_1;
-    if (buttons & Qt::MidButton)
+    if (buttons & Qt::MiddleButton)
         ret |= XCB_KEY_BUT_MASK_BUTTON_2;
     if (buttons & Qt::RightButton)
         ret |= XCB_KEY_BUT_MASK_BUTTON_3;
@@ -324,7 +324,7 @@ Qt::MouseButtons x11ToQtMouseButtons(int state)
     if (state & XCB_KEY_BUT_MASK_BUTTON_1)
         ret |= Qt::LeftButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_2)
-        ret |= Qt::MidButton;
+        ret |= Qt::MiddleButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_3)
         ret |= Qt::RightButton;
     if (state & XCB_KEY_BUT_MASK_BUTTON_4)

diff --git a/plasma/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp
index 8c11809..b9ba4dd 100644 (file)
--- a/plasma/applets/folderview/iconview.cpp
+++ b/plasma/applets/folderview/iconview.cpp
@@ -2026,7 +2026,7 @@ void IconView::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
     }
 
-    if (event->button() == Qt::MidButton) {
+    if (event->button() == Qt::MiddleButton) {
         event->ignore();
     }
 }

diff --git a/plasma/applets/windowlist/WindowList.cpp b/plasma/applets/windowlist/WindowList.cpp
index 6bd6900..a9d7ea1 100644 (file)
--- a/plasma/applets/windowlist/WindowList.cpp
+++ b/plasma/applets/windowlist/WindowList.cpp
@@ -78,7 +78,7 @@ void WindowList::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Applet::mousePressEvent(event);
 
-    if (event->button() == Qt::MidButton) {
+    if (event->button() == Qt::MiddleButton) {
         event->accept();
     }
 }
@@ -87,7 +87,7 @@ void WindowList::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     Applet::mouseReleaseEvent(event);
 
-    if (event->button() == Qt::MidButton) {
+    if (event->button() == Qt::MiddleButton) {
         showMenu(true);
     }
 }

diff --git a/plasma/dataengines/keystate/keystate.cpp b/plasma/dataengines/keystate/keystate.cpp
index 99a3372..c58faea 100644 (file)
--- a/plasma/dataengines/keystate/keystate.cpp
+++ b/plasma/dataengines/keystate/keystate.cpp
@@ -39,7 +39,7 @@ KeyStatesEngine::KeyStatesEngine(QObject *parent, const QVariantList &args)
 
     m_buttons.insert(Qt::LeftButton, I18N_NOOP("Left Button"));
     m_buttons.insert(Qt::RightButton, I18N_NOOP("Right Button"));
-    m_buttons.insert(Qt::MidButton, I18N_NOOP("Middle Button"));
+    m_buttons.insert(Qt::MiddleButton, I18N_NOOP("Middle Button"));
     m_buttons.insert(Qt::XButton1, I18N_NOOP("First X Button"));
     m_buttons.insert(Qt::XButton2, I18N_NOOP("Second X Button"));
 }

diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
index d7e25e8..fc909c9 100644 (file)
--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
@@ -44,7 +44,7 @@ MouseEventListener::MouseEventListener(QDeclarativeItem *parent)
     qmlRegisterType<KDeclarativeWheelEvent>();
 
     setFiltersChildEvents(true);
-    setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton|Qt::MidButton|Qt::XButton1|Qt::XButton2);
+    setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton|Qt::MiddleButton|Qt::XButton1|Qt::XButton2);
 }
 
 MouseEventListener::~MouseEventListener()

diff --git a/plasma/scriptengine/plasmoid/appletinterface.h b/plasma/scriptengine/plasmoid/appletinterface.h
index 6df491f..e6ea8a8 100644 (file)
--- a/plasma/scriptengine/plasmoid/appletinterface.h
+++ b/plasma/scriptengine/plasmoid/appletinterface.h
@@ -213,7 +213,7 @@ enum QtMouseButton {
     QtNoButton = Qt::NoButton,
     QtLeftButton = Qt::LeftButton,
     QtRightButton = Qt::RightButton,
-    QtMidButton = Qt::MidButton,
+    QtMidButton = Qt::MiddleButton,
     QtXButton1 = Qt::XButton1,
     QtXButton2 = Qt::XButton2
 };

diff --git a/plasma/shells/plasma-desktop/desktopcorona.cpp b/plasma/shells/plasma-desktop/desktopcorona.cpp
index 898d41b..0b8b223 100644 (file)
--- a/plasma/shells/plasma-desktop/desktopcorona.cpp
+++ b/plasma/shells/plasma-desktop/desktopcorona.cpp
@@ -78,7 +78,7 @@ void DesktopCorona::init()
 
     Plasma::ContainmentActionsPluginsConfig desktopPlugins;
     desktopPlugins.addPlugin(Qt::NoModifier, Qt::Vertical, "switchdesktop");
-    desktopPlugins.addPlugin(Qt::NoModifier, Qt::MidButton, "paste");
+    desktopPlugins.addPlugin(Qt::NoModifier, Qt::MiddleButton, "paste");
     desktopPlugins.addPlugin(Qt::NoModifier, Qt::RightButton, "contextmenu");
     Plasma::ContainmentActionsPluginsConfig panelPlugins;
     panelPlugins.addPlugin(Qt::NoModifier, Qt::RightButton, "contextmenu");