From 1b2c7b248b85391ba9880a816e7cbfd240a0d4b7 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 8 Jun 2021 10:02:14 +0300 Subject: [PATCH] Run clazy with qt-keywords fixit In C++20, there will be emit() class member, which can conflict with the emit keyword. Given that, there are plans to enable QT_NO_KEYWORDS by default in the future. See also https://lists.qt-project.org/pipermail/development/2020-February/038812.html --- .../integration/decoration_input_test.cpp | 4 +- .../dont_crash_cursor_physical_size_empty.cpp | 2 +- .../effects/scripted_effects_test.cpp | 4 +- autotests/integration/internal_window.cpp | 16 +-- autotests/integration/lockscreen.cpp | 4 +- .../modifier_only_shortcut_test.cpp | 2 +- .../integration/no_global_shortcuts_test.cpp | 2 +- autotests/integration/test_helpers.cpp | 16 +-- autotests/integration/xwayland_input_test.cpp | 4 +- autotests/mock_abstract_client.cpp | 4 +- autotests/mock_screens.cpp | 2 +- autotests/onscreennotificationtest.h | 2 +- autotests/tabbox/test_tabbox_clientmodel.h | 2 +- autotests/tabbox/test_tabbox_handler.cpp | 2 +- autotests/test_screen_edges.cpp | 14 +-- src/abstract_client.cpp | 100 +++++++-------- src/abstract_wayland_output.cpp | 26 ++-- src/activation.cpp | 4 +- src/activities.cpp | 6 +- src/appmenu.cpp | 4 +- src/appmenu.h | 2 +- src/client_machine.cpp | 4 +- src/colordevice.cpp | 6 +- src/colormanager.cpp | 4 +- src/composite.cpp | 12 +- src/cursor.cpp | 6 +- src/dbusinterface.cpp | 32 ++--- src/debug_console.cpp | 6 +- src/decorationitem.cpp | 2 +- src/decorations/decoratedclient.cpp | 18 +-- src/decorations/settings.cpp | 14 +-- src/deleted.cpp | 2 +- src/effectloader.cpp | 6 +- src/effects.cpp | 80 ++++++------ src/effects/blur/blur.cpp | 4 +- src/effects/coverswitch/coverswitch.cpp | 4 +- src/effects/cube/cube.cpp | 26 ++-- src/effects/cubeslide/cubeslide.cpp | 16 +-- src/effects/desktopgrid/desktopgrid.cpp | 30 ++--- src/effects/flipswitch/flipswitch.cpp | 10 +- src/effects/invert/invert_config.cpp | 6 +- src/effects/magiclamp/magiclamp.cpp | 2 +- src/effects/mouseclick/mouseclick.cpp | 6 +- src/effects/mousemark/mousemark.cpp | 8 +- src/effects/presentwindows/presentwindows.cpp | 56 ++++----- .../screenshot/screenshotdbusinterface1.cpp | 6 +- src/effects/showfps/showfps.cpp | 6 +- src/effects/slideback/slideback.cpp | 18 +-- src/effects/thumbnailaside/thumbnailaside.cpp | 10 +- src/effects/trackmouse/trackmouse_config.cpp | 2 +- .../windowgeometry/windowgeometry_config.cpp | 2 +- src/effects/zoom/accessibilityintegration.cpp | 2 +- src/events.cpp | 16 +-- src/ftrace.cpp | 2 +- src/gestures.cpp | 14 +-- src/input.cpp | 14 +-- src/inputmethod.cpp | 2 +- src/inputpanelv1client.cpp | 2 +- src/inputpanelv1integration.cpp | 2 +- src/internal_client.cpp | 16 +-- src/item.cpp | 18 +-- src/kcmkwin/common/effectsmodel.cpp | 6 +- .../declarative-plugin/previewbridge.cpp | 8 +- .../declarative-plugin/previewbutton.cpp | 6 +- .../declarative-plugin/previewclient.cpp | 34 ++--- .../declarative-plugin/previewitem.cpp | 10 +- .../declarative-plugin/previewsettings.cpp | 22 ++-- src/kcmkwin/kwindecoration/kcm.cpp | 6 +- src/kcmkwin/kwindesktop/animationsmodel.cpp | 10 +- src/kcmkwin/kwindesktop/desktopsmodel.cpp | 44 +++---- .../kwineffects/effectsfilterproxymodel.cpp | 6 +- src/kcmkwin/kwinoptions/main.cpp | 4 +- src/kcmkwin/kwinrules/kcmrules.cpp | 10 +- src/kcmkwin/kwinrules/kcmrules.h | 6 +- src/kcmkwin/kwinrules/optionsmodel.cpp | 4 +- src/kcmkwin/kwinrules/optionsmodel.h | 2 +- src/kcmkwin/kwinrules/rulebookmodel.cpp | 4 +- src/kcmkwin/kwinrules/rulesmodel.cpp | 18 +-- src/kcmkwin/kwinrules/rulesmodel.h | 4 +- .../kwinscreenedges/kwinscreenedge.cpp | 4 +- src/kcmkwin/kwinscreenedges/monitor.cpp | 6 +- .../kwinscreenedges/screenpreviewwidget.cpp | 2 +- src/kcmkwin/kwinscripts/module.cpp | 6 +- .../kwintabbox/kwintabboxconfigform.cpp | 16 +-- src/kcmkwin/kwintabbox/layoutpreview.cpp | 6 +- src/kcmkwin/kwintabbox/thumbnailitem.cpp | 8 +- src/keyboard_input.cpp | 4 +- src/keyboard_layout.cpp | 4 +- src/keyboard_layout_switching.cpp | 2 +- src/keyboard_repeat.cpp | 2 +- src/layers.cpp | 8 +- src/layershellv1client.cpp | 2 +- src/layershellv1integration.cpp | 2 +- src/libinput/connection.cpp | 92 +++++++------- src/libinput/device.cpp | 18 +-- src/libkwineffects/kwinanimationeffect.cpp | 8 +- src/libkwineffects/kwineffectquickview.cpp | 6 +- src/libkwineffects/kwineffects.cpp | 8 +- src/main.cpp | 8 +- src/onscreennotification.cpp | 8 +- src/options.cpp | 118 +++++++++--------- src/outline.cpp | 12 +- src/placement.cpp | 2 +- src/platform.cpp | 4 +- .../vsyncconvenience/softwarevsyncmonitor.cpp | 2 +- .../vsyncconvenience/vsyncmonitor.h | 2 +- src/plugins/idletime/poller.cpp | 4 +- .../aurorae/src/decorationoptions.cpp | 10 +- .../aurorae/src/lib/auroraetheme.cpp | 6 +- src/plugins/nightcolor/clockskewnotifier.cpp | 2 +- src/plugins/nightcolor/clockskewnotifier.h | 2 +- .../clockskewnotifierengine_linux.cpp | 2 +- src/plugins/nightcolor/nightcolormanager.cpp | 30 ++--- src/plugins/platforms/drm/drm_backend.cpp | 30 ++--- src/plugins/platforms/drm/drm_gpu.cpp | 4 +- src/plugins/platforms/drm/drm_output.cpp | 2 +- src/plugins/platforms/fbdev/fb_backend.cpp | 6 +- .../platforms/virtual/virtual_backend.cpp | 26 ++-- .../platforms/wayland/wayland_backend.cpp | 18 +-- .../platforms/wayland/wayland_output.cpp | 10 +- .../standalone/omlsynccontrolvsyncmonitor.cpp | 2 +- .../standalone/sgivideosyncvsyncmonitor.cpp | 4 +- .../platforms/x11/standalone/x11_platform.cpp | 18 +-- .../platforms/x11/standalone/x11cursor.cpp | 4 +- .../x11/windowed/x11windowed_backend.cpp | 12 +- src/plugins/qpa/window.cpp | 8 +- src/pointer_input.cpp | 46 +++---- src/renderloop.cpp | 6 +- src/rules.cpp | 2 +- src/scene.cpp | 8 +- src/screenedge.cpp | 14 +-- src/screenlockerwatcher.cpp | 2 +- src/screens.cpp | 10 +- src/scripting/dbuscall.cpp | 4 +- src/scripting/dbuscall.h | 2 +- src/scripting/screenedgeitem.cpp | 8 +- src/scripting/scriptedeffect.cpp | 6 +- src/scripting/scripting.cpp | 4 +- src/scripting/scripting.h | 2 +- src/scripting/scripting_model.cpp | 42 +++---- src/scripting/workspace_wrapper.cpp | 2 +- src/session_consolekit.cpp | 4 +- src/session_logind.cpp | 4 +- src/shadow.cpp | 10 +- src/sm.cpp | 12 +- src/subsurfacemonitor.cpp | 2 +- src/surfaceitem.cpp | 2 +- src/tabbox/clientmodel.cpp | 4 +- src/tabbox/switcheritem.cpp | 14 +-- src/tabbox/tabbox.cpp | 22 ++-- src/tabbox/tabboxhandler.cpp | 10 +- src/tabletmodemanager.cpp | 4 +- src/thumbnailitem.cpp | 14 +-- src/toplevel.cpp | 24 ++-- src/unmanaged.cpp | 4 +- src/useractions.cpp | 4 +- src/virtualdesktops.cpp | 32 ++--- src/wayland_server.cpp | 16 +-- src/waylandclient.cpp | 16 +-- src/window_property_notify_x11_filter.cpp | 6 +- src/workspace.cpp | 36 +++--- src/workspace.h | 2 +- src/x11client.cpp | 70 +++++------ src/xdgshellclient.cpp | 20 +-- src/xdgshellintegration.cpp | 4 +- src/xkb.cpp | 2 +- src/xwl/xwayland.cpp | 30 ++--- tests/pointergesturestest.cpp | 8 +- 168 files changed, 1006 insertions(+), 1006 deletions(-) diff --git a/autotests/integration/decoration_input_test.cpp b/autotests/integration/decoration_input_test.cpp index ee538e8e6c..2ad112d68c 100644 --- a/autotests/integration/decoration_input_test.cpp +++ b/autotests/integration/decoration_input_test.cpp @@ -695,9 +695,9 @@ public: { Q_UNUSED(watched) if (event->type() == QEvent::HoverMove) { - emit hoverMove(); + Q_EMIT hoverMove(); } else if (event->type() == QEvent::HoverLeave) { - emit hoverLeave(); + Q_EMIT hoverLeave(); } return false; } diff --git a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp index 7992b1756b..b567ae8f2f 100644 --- a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp +++ b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp @@ -92,7 +92,7 @@ void DontCrashCursorPhysicalSizeEmpty::testMoveCursorOverDeco() auto output = display->outputs().first(); output->setPhysicalSize(QSize(0, 0)); // and fake a cursor theme change, so that the theme gets recreated - emit KWin::Cursors::self()->mouse()->themeChanged(); + Q_EMIT KWin::Cursors::self()->mouse()->themeChanged(); KWin::Cursors::self()->mouse()->setPos(QPoint(c->frameGeometry().center().x(), c->clientPos().y() / 2)); } diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp index e307208b03..1591ef9784 100644 --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -81,13 +81,13 @@ public: using AnimationEffect::state; Q_INVOKABLE void sendTestResponse(const QString &out); //proxies triggers out from the tests QList actions(); //returns any QActions owned by the ScriptEngine -signals: +Q_SIGNALS: void testOutput(const QString &data); }; void ScriptedEffectWithDebugSpy::sendTestResponse(const QString &out) { - emit testOutput(out); + Q_EMIT testOutput(out); } QList ScriptedEffectWithDebugSpy::actions() diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp index 785f773449..c1a91b06a2 100644 --- a/autotests/integration/internal_window.cpp +++ b/autotests/integration/internal_window.cpp @@ -126,10 +126,10 @@ void HelperWindow::paintEvent(QPaintEvent *event) bool HelperWindow::event(QEvent *event) { if (event->type() == QEvent::Enter) { - emit entered(); + Q_EMIT entered(); } if (event->type() == QEvent::Leave) { - emit left(); + Q_EMIT left(); } return QRasterWindow::event(event); } @@ -137,39 +137,39 @@ bool HelperWindow::event(QEvent *event) void HelperWindow::mouseMoveEvent(QMouseEvent *event) { m_latestGlobalMousePos = event->globalPos(); - emit mouseMoved(event->globalPos()); + Q_EMIT mouseMoved(event->globalPos()); } void HelperWindow::mousePressEvent(QMouseEvent *event) { m_latestGlobalMousePos = event->globalPos(); m_pressedButtons = event->buttons(); - emit mousePressed(); + Q_EMIT mousePressed(); } void HelperWindow::mouseReleaseEvent(QMouseEvent *event) { m_latestGlobalMousePos = event->globalPos(); m_pressedButtons = event->buttons(); - emit mouseReleased(); + Q_EMIT mouseReleased(); } void HelperWindow::wheelEvent(QWheelEvent *event) { Q_UNUSED(event) - emit wheel(); + Q_EMIT wheel(); } void HelperWindow::keyPressEvent(QKeyEvent *event) { Q_UNUSED(event) - emit keyPressed(); + Q_EMIT keyPressed(); } void HelperWindow::keyReleaseEvent(QKeyEvent *event) { Q_UNUSED(event) - emit keyReleased(); + Q_EMIT keyReleased(); } void InternalWindowTest::initTestCase() diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index fb52332477..ef7c501c57 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -84,10 +84,10 @@ public: ~HelperEffect() override {} void windowInputMouseEvent(QEvent*) override { - emit inputEvent(); + Q_EMIT inputEvent(); } void grabbedKeyboardEvent(QKeyEvent *e) override { - emit keyEvent(e->text()); + Q_EMIT keyEvent(e->text()); } Q_SIGNALS: diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp index 4e7676ba7d..f6cc40d89e 100644 --- a/autotests/integration/modifier_only_shortcut_test.cpp +++ b/autotests/integration/modifier_only_shortcut_test.cpp @@ -74,7 +74,7 @@ Target::~Target() void Target::shortcut() { - emit shortcutTriggered(); + Q_EMIT shortcutTriggered(); } void ModifierOnlyShortcutTest::initTestCase() diff --git a/autotests/integration/no_global_shortcuts_test.cpp b/autotests/integration/no_global_shortcuts_test.cpp index fdca0b6a2e..269da62fdb 100644 --- a/autotests/integration/no_global_shortcuts_test.cpp +++ b/autotests/integration/no_global_shortcuts_test.cpp @@ -83,7 +83,7 @@ Target::~Target() void Target::shortcut() { - emit shortcutTriggered(); + Q_EMIT shortcutTriggered(); } void NoGlobalShortcutsTest::initTestCase() diff --git a/autotests/integration/test_helpers.cpp b/autotests/integration/test_helpers.cpp index 19970f4f94..c7e289f647 100644 --- a/autotests/integration/test_helpers.cpp +++ b/autotests/integration/test_helpers.cpp @@ -64,12 +64,12 @@ LayerSurfaceV1::~LayerSurfaceV1() void LayerSurfaceV1::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height) { - emit configureRequested(serial, QSize(width, height)); + Q_EMIT configureRequested(serial, QSize(width, height)); } void LayerSurfaceV1::zwlr_layer_surface_v1_closed() { - emit closeRequested(); + Q_EMIT closeRequested(); } XdgShell::~XdgShell() @@ -96,7 +96,7 @@ Surface *XdgSurface::surface() const void XdgSurface::xdg_surface_configure(uint32_t serial) { - emit configureRequested(serial); + Q_EMIT configureRequested(serial); } XdgToplevel::XdgToplevel(XdgSurface *surface, QObject *parent) @@ -140,12 +140,12 @@ void XdgToplevel::xdg_toplevel_configure(int32_t width, int32_t height, wl_array } } - emit configureRequested(QSize(width, height), requestedStates); + Q_EMIT configureRequested(QSize(width, height), requestedStates); } void XdgToplevel::xdg_toplevel_close() { - emit closeRequested(); + Q_EMIT closeRequested(); } XdgPositioner::XdgPositioner(XdgShell *shell) @@ -177,12 +177,12 @@ XdgSurface *XdgPopup::xdgSurface() const void XdgPopup::xdg_popup_configure(int32_t x, int32_t y, int32_t width, int32_t height) { - emit configureRequested(QRect(x, y, width, height)); + Q_EMIT configureRequested(QRect(x, y, width, height)); } void XdgPopup::xdg_popup_popup_done() { - emit doneReceived(); + Q_EMIT doneReceived(); } XdgDecorationManagerV1::~XdgDecorationManagerV1() @@ -204,7 +204,7 @@ XdgToplevelDecorationV1::~XdgToplevelDecorationV1() void XdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_configure(uint32_t m) { - emit configureRequested(mode(m)); + Q_EMIT configureRequested(mode(m)); } IdleInhibitManagerV1::~IdleInhibitManagerV1() diff --git a/autotests/integration/xwayland_input_test.cpp b/autotests/integration/xwayland_input_test.cpp index ca0b1c182a..49bdc9aa55 100644 --- a/autotests/integration/xwayland_input_test.cpp +++ b/autotests/integration/xwayland_input_test.cpp @@ -107,11 +107,11 @@ void X11EventReaderHelper::processXcbEvents() switch (eventType) { case XCB_ENTER_NOTIFY: { auto enterEvent = reinterpret_cast(event); - emit entered(QPoint(enterEvent->event_x, enterEvent->event_y)); + Q_EMIT entered(QPoint(enterEvent->event_x, enterEvent->event_y)); break; } case XCB_LEAVE_NOTIFY: { auto leaveEvent = reinterpret_cast(event); - emit left(QPoint(leaveEvent->event_x, leaveEvent->event_y)); + Q_EMIT left(QPoint(leaveEvent->event_x, leaveEvent->event_y)); break; } } free(event); diff --git a/autotests/mock_abstract_client.cpp b/autotests/mock_abstract_client.cpp index edfe03e58e..a3ff5fa381 100644 --- a/autotests/mock_abstract_client.cpp +++ b/autotests/mock_abstract_client.cpp @@ -74,7 +74,7 @@ void AbstractClient::setHiddenInternal(bool set) void AbstractClient::moveResize(const QRect &rect) { m_frameGeometry = rect; - emit geometryChanged(); + Q_EMIT geometryChanged(); } QRect AbstractClient::frameGeometry() const @@ -90,7 +90,7 @@ bool AbstractClient::keepBelow() const void AbstractClient::setKeepBelow(bool keepBelow) { m_keepBelow = keepBelow; - emit keepBelowChanged(); + Q_EMIT keepBelowChanged(); } bool AbstractClient::isInteractiveResize() const diff --git a/autotests/mock_screens.cpp b/autotests/mock_screens.cpp index a645504ebd..bcf1dc24fd 100644 --- a/autotests/mock_screens.cpp +++ b/autotests/mock_screens.cpp @@ -87,7 +87,7 @@ void MockScreens::updateCount() { m_geometries = m_scheduledGeometries; setCount(m_geometries.size()); - emit changed(); + Q_EMIT changed(); } void MockScreens::setGeometries(const QList< QRect > &geometries) diff --git a/autotests/onscreennotificationtest.h b/autotests/onscreennotificationtest.h index 257618464f..6c1583cf95 100644 --- a/autotests/onscreennotificationtest.h +++ b/autotests/onscreennotificationtest.h @@ -13,7 +13,7 @@ class OnScreenNotificationTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void show(); void timeout(); diff --git a/autotests/tabbox/test_tabbox_clientmodel.h b/autotests/tabbox/test_tabbox_clientmodel.h index 71678de587..924bb8005a 100644 --- a/autotests/tabbox/test_tabbox_clientmodel.h +++ b/autotests/tabbox/test_tabbox_clientmodel.h @@ -13,7 +13,7 @@ class TestTabBoxClientModel : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); /** * Tests that calculating the longest caption does not diff --git a/autotests/tabbox/test_tabbox_handler.cpp b/autotests/tabbox/test_tabbox_handler.cpp index 10284f9eae..7a36500e65 100644 --- a/autotests/tabbox/test_tabbox_handler.cpp +++ b/autotests/tabbox/test_tabbox_handler.cpp @@ -17,7 +17,7 @@ using namespace KWin; class TestTabBoxHandler : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); /** * Test to verify that update outline does not crash diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp index aa03d7b86a..e87c44c349 100644 --- a/autotests/test_screen_edges.cpp +++ b/autotests/test_screen_edges.cpp @@ -74,7 +74,7 @@ Q_SIGNALS: bool TestObject::callback(KWin::ElectricBorder border) { - emit gotCallback(border); + Q_EMIT gotCallback(border); return true; } @@ -682,7 +682,7 @@ void TestScreenEdges::testFullScreenBlocking() QAction action; s->reserveTouch(KWin::ElectricRight, &action); // currently there is no active client yet, so check blocking shouldn't do anything - emit s->checkBlocking(); + Q_EMIT s->checkBlocking(); for (auto e: s->findChildren()) { QCOMPARE(e->activatesForTouchGesture(), e->border() == KWin::ElectricRight); } @@ -709,7 +709,7 @@ void TestScreenEdges::testFullScreenBlocking() client.setActive(true); client.setFullScreen(true); ws.setActiveClient(&client); - emit s->checkBlocking(); + Q_EMIT s->checkBlocking(); // the signal doesn't trigger for corners, let's go over all windows just to be sure that it doesn't call for corners for (auto e: s->findChildren()) { e->checkBlocking(); @@ -726,7 +726,7 @@ void TestScreenEdges::testFullScreenBlocking() // let's make the client not fullscreen, which should trigger client.setFullScreen(false); - emit s->checkBlocking(); + Q_EMIT s->checkBlocking(); for (auto e: s->findChildren()) { QCOMPARE(e->activatesForTouchGesture(), e->border() == KWin::ElectricRight); } @@ -739,7 +739,7 @@ void TestScreenEdges::testFullScreenBlocking() QTest::qWait(351); client.setFullScreen(true); client.moveResize(client.frameGeometry().translated(10, 0)); - emit s->checkBlocking(); + Q_EMIT s->checkBlocking(); spy.clear(); Cursors::self()->mouse()->setPos(0, 50); event.time = QDateTime::currentMSecsSinceEpoch(); @@ -750,7 +750,7 @@ void TestScreenEdges::testFullScreenBlocking() // just to be sure, let's set geometry back client.moveResize(screens()->geometry()); - emit s->checkBlocking(); + Q_EMIT s->checkBlocking(); Cursors::self()->mouse()->setPos(0, 50); QVERIFY(isEntered(&event)); QVERIFY(spy.isEmpty()); @@ -852,7 +852,7 @@ void TestScreenEdges::testClientEdge() QCOMPARE(client.isHiddenInternal(), true); // now let's emulate the removal of a Client through Workspace - emit workspace()->clientRemoved(&client); + Q_EMIT workspace()->clientRemoved(&client); for (auto e : s->findChildren()) { QVERIFY(!e->client()); } diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp index b25856b7f6..82c917df43 100644 --- a/src/abstract_client.cpp +++ b/src/abstract_client.cpp @@ -89,7 +89,7 @@ AbstractClient::AbstractClient() ); connect(ApplicationMenu::self(), &ApplicationMenu::applicationMenuEnabledChanged, this, [this] { - emit hasApplicationMenuChanged(hasApplicationMenu()); + Q_EMIT hasApplicationMenuChanged(hasApplicationMenu()); }); } @@ -131,7 +131,7 @@ void AbstractClient::setSkipSwitcher(bool set) m_skipSwitcher = set; doSetSkipSwitcher(); updateWindowRules(Rules::SkipSwitcher); - emit skipSwitcherChanged(); + Q_EMIT skipSwitcherChanged(); } void AbstractClient::setSkipPager(bool b) @@ -142,7 +142,7 @@ void AbstractClient::setSkipPager(bool b) m_skipPager = b; doSetSkipPager(); updateWindowRules(Rules::SkipPager); - emit skipPagerChanged(); + Q_EMIT skipPagerChanged(); } void AbstractClient::doSetSkipPager() @@ -160,7 +160,7 @@ void AbstractClient::setSkipTaskbar(bool b) if (was_wants_tab_focus != wantsTabFocus()) { FocusChain::self()->update(this, isActive() ? FocusChain::MakeFirst : FocusChain::Update); } - emit skipTaskbarChanged(); + Q_EMIT skipTaskbarChanged(); } void AbstractClient::setOriginalSkipTaskbar(bool b) @@ -182,7 +182,7 @@ void AbstractClient::doSetSkipSwitcher() void AbstractClient::setIcon(const QIcon &icon) { m_icon = icon; - emit iconChanged(); + Q_EMIT iconChanged(); } void AbstractClient::setActive(bool act) @@ -216,7 +216,7 @@ void AbstractClient::setActive(bool act) (*it)->updateLayer(); doSetActive(); - emit activeChanged(); + Q_EMIT activeChanged(); updateMouseGrab(); } @@ -234,7 +234,7 @@ void AbstractClient::markAsZombie() Q_ASSERT(!m_zombie); m_zombie = true; addWorkspaceRepaint(visibleGeometry()); - emit markedAsZombie(); + Q_EMIT markedAsZombie(); } Layer AbstractClient::layer() const @@ -339,7 +339,7 @@ void AbstractClient::setKeepAbove(bool b) updateLayer(); updateWindowRules(Rules::Above); - emit keepAboveChanged(m_keepAbove); + Q_EMIT keepAboveChanged(m_keepAbove); } void AbstractClient::doSetKeepAbove() @@ -359,7 +359,7 @@ void AbstractClient::setKeepBelow(bool b) updateLayer(); updateWindowRules(Rules::Below); - emit keepBelowChanged(m_keepBelow); + Q_EMIT keepBelowChanged(m_keepBelow); } void AbstractClient::doSetKeepBelow() @@ -413,7 +413,7 @@ void AbstractClient::demandAttention(bool set) m_demandsAttention = set; doSetDemandsAttention(); workspace()->clientAttentionChanged(this, set); - emit demandsAttentionChanged(); + Q_EMIT demandsAttentionChanged(); } void AbstractClient::doSetDemandsAttention() @@ -487,7 +487,7 @@ void AbstractClient::setDesktops(QVector desktops) // the (just moved) modal dialog will confusingly return to the mainwindow with // the next desktop change { - foreach (AbstractClient * c2, mainClients()) + Q_FOREACH (AbstractClient * c2, mainClients()) c2->setDesktops(desktops); } @@ -496,10 +496,10 @@ void AbstractClient::setDesktops(QVector desktops) FocusChain::self()->update(this, FocusChain::MakeFirst); updateWindowRules(Rules::Desktop); - emit desktopChanged(); + Q_EMIT desktopChanged(); if (wasOnCurrentDesktop != isOnCurrentDesktop()) - emit desktopPresenceChanged(this, was_desk); - emit x11DesktopIdsChanged(); + Q_EMIT desktopPresenceChanged(this, was_desk); + Q_EMIT x11DesktopIdsChanged(); } void AbstractClient::doSetDesktop() @@ -597,7 +597,7 @@ void AbstractClient::setShade(ShadeMode mode) if (wasShade == isShade()) { // Decoration may want to update after e.g. hover-shade changes - emit shadeChanged(); + Q_EMIT shadeChanged(); return; // No real change in shaded state } @@ -607,7 +607,7 @@ void AbstractClient::setShade(ShadeMode mode) doSetShade(previousShadeMode); updateWindowRules(Rules::Shade); - emit shadeChanged(); + Q_EMIT shadeChanged(); } void AbstractClient::doSetShade(ShadeMode previousShadeMode) @@ -711,8 +711,8 @@ void AbstractClient::minimize(bool avoid_animation) // TODO: merge signal with s_minimized addWorkspaceRepaint(visibleGeometry()); - emit clientMinimized(this, !avoid_animation); - emit minimizedChanged(); + Q_EMIT clientMinimized(this, !avoid_animation); + Q_EMIT minimizedChanged(); } void AbstractClient::unminimize(bool avoid_animation) @@ -728,8 +728,8 @@ void AbstractClient::unminimize(bool avoid_animation) doMinimize(); updateWindowRules(Rules::Minimize); - emit clientUnminimized(this, !avoid_animation); - emit minimizedChanged(); + Q_EMIT clientUnminimized(this, !avoid_animation); + Q_EMIT minimizedChanged(); } void AbstractClient::doMinimize() @@ -797,8 +797,8 @@ void AbstractClient::setColorScheme(const QString &colorScheme) connect(m_palette.get(), &Decoration::DecorationPalette::changed, this, &AbstractClient::handlePaletteChange); - emit paletteChanged(palette()); - emit colorSchemeChanged(); + Q_EMIT paletteChanged(palette()); + Q_EMIT colorSchemeChanged(); } } @@ -809,7 +809,7 @@ void AbstractClient::updateColorScheme() void AbstractClient::handlePaletteChange() { - emit paletteChanged(palette()); + Q_EMIT paletteChanged(palette()); } void AbstractClient::keepInArea(QRect area, bool partial) @@ -903,8 +903,8 @@ void AbstractClient::setMaximize(bool vertically, bool horizontally) false); const MaximizeMode newMode = maximizeMode(); if (oldMode != newMode) { - emit clientMaximizedStateChanged(this, newMode); - emit clientMaximizedStateChanged(this, vertically, horizontally); + Q_EMIT clientMaximizedStateChanged(this, newMode); + Q_EMIT clientMaximizedStateChanged(this, vertically, horizontally); } } @@ -940,13 +940,13 @@ bool AbstractClient::startInteractiveMoveResize() updateQuickTileMode(QuickTileFlag::None); // Do so without restoring original geometry setGeometryRestore(moveResizeGeometry()); doSetQuickTileMode(); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); } updateHaveResizeEffect(); updateInitialMoveResizeGeometry(); checkUnrestrictedInteractiveMoveResize(); - emit clientStartUserMovedResized(this); + Q_EMIT clientStartUserMovedResized(this); if (ScreenEdges::self()->isDesktopSwitchingMovingClients()) ScreenEdges::self()->reserveDesktopSwitching(true, Qt::Vertical|Qt::Horizontal); return true; @@ -1003,7 +1003,7 @@ void AbstractClient::finishInteractiveMoveResize(bool cancel) } // FRAME update(); - emit clientFinishUserMovedResized(this); + Q_EMIT clientFinishUserMovedResized(this); } // This function checks if it actually makes sense to perform a restricted move/resize. @@ -1432,7 +1432,7 @@ void AbstractClient::performInteractiveMoveResize() resize(moveResizeGeom.size()); } positionGeometryTip(); - emit clientStepUserMovedResized(this, moveResizeGeom); + Q_EMIT clientStepUserMovedResized(this, moveResizeGeom); } StrutRect AbstractClient::strutRect(StrutArea area) const @@ -1920,7 +1920,7 @@ void AbstractClient::setTransientFor(AbstractClient *transientFor) return; } m_transientFor = transientFor; - emit transientChanged(); + Q_EMIT transientChanged(); } const AbstractClient *AbstractClient::transientFor() const @@ -1962,7 +1962,7 @@ QList< AbstractClient* > AbstractClient::mainClients() const QList AbstractClient::allMainClients() const { auto result = mainClients(); - foreach (const auto *cl, result) { + Q_FOREACH (const auto *cl, result) { result += cl->allMainClients(); } return result; @@ -1974,7 +1974,7 @@ void AbstractClient::setModal(bool m) if (m_modal == m) return; m_modal = m; - emit modalChanged(); + Q_EMIT modalChanged(); // Changing modality for a mapped window is weird (?) // _NET_WM_STATE_MODAL should possibly rather be _NET_WM_WINDOW_TYPE_MODAL_DIALOG } @@ -2103,7 +2103,7 @@ void AbstractClient::updateCursor() if (c == m_interactiveMoveResize.cursor) return; m_interactiveMoveResize.cursor = c; - emit moveResizeCursorChanged(c); + Q_EMIT moveResizeCursorChanged(c); } void AbstractClient::leaveInteractiveMoveResize() @@ -2315,7 +2315,7 @@ void AbstractClient::createDecoration(const QRect &oldGeometry) if (!isShade()) { checkWorkspacePosition(oldGeometry); } - emit geometryShapeChanged(this, oldGeometry); + Q_EMIT geometryShapeChanged(this, oldGeometry); }); connect(decoratedClient()->decoratedClient(), &KDecoration2::DecoratedClient::sizeChanged, this, &AbstractClient::updateDecorationInputShape); @@ -2324,7 +2324,7 @@ void AbstractClient::createDecoration(const QRect &oldGeometry) moveResize(QRect(oldGeometry.topLeft(), clientSizeToFrameSize(clientSize()))); updateDecorationInputShape(); - emit geometryShapeChanged(this, oldGeometry); + Q_EMIT geometryShapeChanged(this, oldGeometry); } void AbstractClient::destroyDecoration() @@ -2337,7 +2337,7 @@ void AbstractClient::destroyDecoration() void AbstractClient::setDecoration(KDecoration2::Decoration *decoration) { m_decoration.decoration = decoration; - emit decorationChanged(); + Q_EMIT decorationChanged(); } void AbstractClient::updateDecorationInputShape() @@ -2653,7 +2653,7 @@ void AbstractClient::setDesktopFileName(QByteArray name) } m_desktopFileName = name; updateWindowRules(Rules::DesktopFile); - emit desktopFileNameChanged(); + Q_EMIT desktopFileNameChanged(); } QString AbstractClient::iconFromDesktopFile() const @@ -2702,9 +2702,9 @@ void AbstractClient::updateApplicationMenuServiceName(const QString &serviceName const bool new_hasApplicationMenu = hasApplicationMenu(); - emit applicationMenuChanged(); + Q_EMIT applicationMenuChanged(); if (old_hasApplicationMenu != new_hasApplicationMenu) { - emit hasApplicationMenuChanged(new_hasApplicationMenu); + Q_EMIT hasApplicationMenuChanged(new_hasApplicationMenu); } } @@ -2716,9 +2716,9 @@ void AbstractClient::updateApplicationMenuObjectPath(const QString &objectPath) const bool new_hasApplicationMenu = hasApplicationMenu(); - emit applicationMenuChanged(); + Q_EMIT applicationMenuChanged(); if (old_hasApplicationMenu != new_hasApplicationMenu) { - emit hasApplicationMenuChanged(new_hasApplicationMenu); + Q_EMIT hasApplicationMenuChanged(new_hasApplicationMenu); } } @@ -2726,7 +2726,7 @@ void AbstractClient::setApplicationMenuActive(bool applicationMenuActive) { if (m_applicationMenuActive != applicationMenuActive) { m_applicationMenuActive = applicationMenuActive; - emit applicationMenuActiveChanged(applicationMenuActive); + Q_EMIT applicationMenuActiveChanged(applicationMenuActive); } } @@ -2749,8 +2749,8 @@ void AbstractClient::setUnresponsive(bool unresponsive) { if (m_unresponsive != unresponsive) { m_unresponsive = unresponsive; - emit unresponsiveChanged(m_unresponsive); - emit captionChanged(); + Q_EMIT unresponsiveChanged(m_unresponsive); + Q_EMIT captionChanged(); } } @@ -2911,7 +2911,7 @@ void AbstractClient::updateActivities(bool includeTransients) m_blockedActivityUpdatesRequireTransients |= includeTransients; return; } - emit activitiesChanged(this); + Q_EMIT activitiesChanged(this); m_blockedActivityUpdatesRequireTransients = false; // reset FocusChain::self()->update(this, FocusChain::MakeFirst); updateWindowRules(Rules::Activity); @@ -3103,7 +3103,7 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard) setGeometryRestore(prev_geom_restore); } doSetQuickTileMode(); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); return; } @@ -3132,7 +3132,7 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard) } doSetQuickTileMode(); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); return; } @@ -3208,7 +3208,7 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard) checkWorkspacePosition(); // Just in case it's a different screen } doSetQuickTileMode(); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); } void AbstractClient::doSetQuickTileMode() @@ -3221,7 +3221,7 @@ void AbstractClient::sendToScreen(int newScreen) if (isActive()) { screens()->setCurrent(newScreen); // might impact the layer of a fullscreen window - foreach (AbstractClient *cc, workspace()->allClientList()) { + Q_FOREACH (AbstractClient *cc, workspace()->allClientList()) { if (cc->isFullScreen() && cc->screen() == newScreen) { cc->updateLayer(); } @@ -3365,7 +3365,7 @@ void AbstractClient::checkWorkspacePosition(QRect oldGeometry, int oldDesktop, Q // we need to find the screen area as it was before the change oldScreenArea = QRect( 0, 0, workspace()->oldDisplayWidth(), workspace()->oldDisplayHeight()); int distance = INT_MAX; - foreach(const QRect &r, workspace()->previousScreenSizes()) { + Q_FOREACH(const QRect &r, workspace()->previousScreenSizes()) { int d = r.contains( oldGeometry.center()) ? 0 : ( r.center() - oldGeometry.center()).manhattanLength(); if( d < distance ) { distance = d; diff --git a/src/abstract_wayland_output.cpp b/src/abstract_wayland_output.cpp index 10aed42978..4182dbe2c8 100644 --- a/src/abstract_wayland_output.cpp +++ b/src/abstract_wayland_output.cpp @@ -39,7 +39,7 @@ void AbstractWaylandOutput::setCapabilityInternal(Capability capability, bool on { if (static_cast(m_capabilities & capability) != on) { m_capabilities.setFlag(capability, on); - emit capabilitiesChanged(); + Q_EMIT capabilitiesChanged(); } } @@ -77,7 +77,7 @@ void AbstractWaylandOutput::setGlobalPos(const QPoint &pos) { if (m_position != pos) { m_position = pos; - emit geometryChanged(); + Q_EMIT geometryChanged(); } } @@ -130,8 +130,8 @@ void AbstractWaylandOutput::setScale(qreal scale) { if (m_scale != scale) { m_scale = scale; - emit scaleChanged(); - emit geometryChanged(); + Q_EMIT scaleChanged(); + Q_EMIT geometryChanged(); } } @@ -186,11 +186,11 @@ void AbstractWaylandOutput::applyChanges(const KWaylandServer::OutputChangeSet * overallSizeCheckNeeded |= emitModeChanged; if (overallSizeCheckNeeded) { - emit screens()->changed(); + Q_EMIT screens()->changed(); } if (emitModeChanged) { - emit modeChanged(); + Q_EMIT modeChanged(); } } @@ -204,7 +204,7 @@ void AbstractWaylandOutput::setEnabled(bool enable) if (m_isEnabled != enable) { m_isEnabled = enable; updateEnablement(enable); - emit enabledChanged(); + Q_EMIT enabledChanged(); } } @@ -218,7 +218,7 @@ void AbstractWaylandOutput::setCurrentModeInternal(const QSize &size, int refres if (m_modeSize != size || m_refreshRate != refreshRate) { m_modeSize = size; m_refreshRate = refreshRate; - emit geometryChanged(); + Q_EMIT geometryChanged(); } } @@ -268,8 +268,8 @@ void AbstractWaylandOutput::setTransformInternal(Transform transform) { if (m_transform != transform) { m_transform = transform; - emit transformChanged(); - emit modeChanged(); + Q_EMIT transformChanged(); + Q_EMIT modeChanged(); } } @@ -282,7 +282,7 @@ void AbstractWaylandOutput::setDpmsModeInternal(DpmsMode dpmsMode) { if (m_dpmsMode != dpmsMode) { m_dpmsMode = dpmsMode; - emit dpmsModeChanged(); + Q_EMIT dpmsModeChanged(); } } @@ -358,7 +358,7 @@ void AbstractWaylandOutput::setOverscanInternal(uint32_t overscan) { if (m_overscan != overscan) { m_overscan = overscan; - emit overscanChanged(); + Q_EMIT overscanChanged(); } } @@ -376,7 +376,7 @@ void AbstractWaylandOutput::setVrrPolicy(RenderLoop::VrrPolicy policy) { if (renderLoop()->vrrPolicy() != policy && (m_capabilities & Capability::Vrr)) { renderLoop()->setVrrPolicy(policy); - emit vrrPolicyChanged(); + Q_EMIT vrrPolicyChanged(); } } diff --git a/src/activation.cpp b/src/activation.cpp index fee629c075..ceb75bfbc6 100644 --- a/src/activation.cpp +++ b/src/activation.cpp @@ -262,7 +262,7 @@ void Workspace::setActiveClient(AbstractClient* c) rootInfo()->setActiveClient(active_client); } - emit clientActivated(active_client); + Q_EMIT clientActivated(active_client); --set_active_client_recursion; } @@ -680,7 +680,7 @@ void Workspace::clientAttentionChanged(AbstractClient* c, bool set) attention_chain.prepend(c); } else attention_chain.removeAll(c); - emit clientDemandsAttentionChanged(c, set); + Q_EMIT clientDemandsAttentionChanged(c, set); } //******************************************** diff --git a/src/activities.cpp b/src/activities.cpp index 1f18be606a..6548e43374 100644 --- a/src/activities.cpp +++ b/src/activities.cpp @@ -55,7 +55,7 @@ void Activities::slotCurrentChanged(const QString &newActivity) } m_previous = m_current; m_current = newActivity; - emit currentChanged(newActivity); + Q_EMIT currentChanged(newActivity); } void Activities::slotRemoved(const QString &activity) @@ -172,7 +172,7 @@ void Activities::reallyStop(const QString &id) } const QStringList activities = c->activities(); - foreach (const QString & activityId, activities) { + Q_FOREACH (const QString & activityId, activities) { if (activityId == id) { saveSessionIds << sessionId; } else if (running().contains(activityId)) { @@ -185,7 +185,7 @@ void Activities::reallyStop(const QString &id) QStringList saveAndClose; QStringList saveOnly; - foreach (const QByteArray & sessionId, saveSessionIds) { + Q_FOREACH (const QByteArray & sessionId, saveSessionIds) { if (dontCloseSessionIds.contains(sessionId)) { saveOnly << sessionId; } else { diff --git a/src/appmenu.cpp b/src/appmenu.cpp index d472cf8375..8bb8e38ef4 100644 --- a/src/appmenu.cpp +++ b/src/appmenu.cpp @@ -40,12 +40,12 @@ ApplicationMenu::ApplicationMenu(QObject *parent) connect(m_kappMenuWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this] () { m_applicationMenuEnabled = true; - emit applicationMenuEnabledChanged(true); + Q_EMIT applicationMenuEnabledChanged(true); }); connect(m_kappMenuWatcher, &QDBusServiceWatcher::serviceUnregistered, this, [this] () { m_applicationMenuEnabled = false; - emit applicationMenuEnabledChanged(false); + Q_EMIT applicationMenuEnabledChanged(false); }); m_applicationMenuEnabled = QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.kappmenu")); diff --git a/src/appmenu.h b/src/appmenu.h index c69b638263..89e94a817c 100644 --- a/src/appmenu.h +++ b/src/appmenu.h @@ -40,7 +40,7 @@ public: void setViewEnabled(bool enabled); -signals: +Q_SIGNALS: void applicationMenuEnabledChanged(bool enabled); private Q_SLOTS: diff --git a/src/client_machine.cpp b/src/client_machine.cpp index 86e1073e00..3eba92c72c 100644 --- a/src/client_machine.cpp +++ b/src/client_machine.cpp @@ -142,7 +142,7 @@ void GetAddrInfo::compare() ownAddress = ownAddress->ai_next; } if (localFound) { - emit local(); + Q_EMIT local(); break; } } @@ -220,7 +220,7 @@ void ClientMachine::checkForLocalhost() void ClientMachine::setLocal() { m_localhost = true; - emit localhostChanged(); + Q_EMIT localhostChanged(); } void ClientMachine::resolveFinished() diff --git a/src/colordevice.cpp b/src/colordevice.cpp index 7ab00945cc..f3e902b915 100644 --- a/src/colordevice.cpp +++ b/src/colordevice.cpp @@ -304,7 +304,7 @@ void ColorDevice::setBrightness(uint brightness) d->brightness = brightness; d->dirtyCurves |= ColorDevicePrivate::DirtyBrightnessToneCurve; scheduleUpdate(); - emit brightnessChanged(); + Q_EMIT brightnessChanged(); } uint ColorDevice::temperature() const @@ -324,7 +324,7 @@ void ColorDevice::setTemperature(uint temperature) d->temperature = temperature; d->dirtyCurves |= ColorDevicePrivate::DirtyTemperatureToneCurve; scheduleUpdate(); - emit temperatureChanged(); + Q_EMIT temperatureChanged(); } QString ColorDevice::profile() const @@ -340,7 +340,7 @@ void ColorDevice::setProfile(const QString &profile) d->profile = profile; d->dirtyCurves |= ColorDevicePrivate::DirtyCalibrationToneCurve; scheduleUpdate(); - emit profileChanged(); + Q_EMIT profileChanged(); } void ColorDevice::update() diff --git a/src/colormanager.cpp b/src/colormanager.cpp index 5cfcc1cf1b..e618925b33 100644 --- a/src/colormanager.cpp +++ b/src/colormanager.cpp @@ -65,7 +65,7 @@ void ColorManager::handleOutputEnabled(AbstractOutput *output) { ColorDevice *device = new ColorDevice(output, this); d->devices.append(device); - emit deviceAdded(device); + Q_EMIT deviceAdded(device); } void ColorManager::handleOutputDisabled(AbstractOutput *output) @@ -79,7 +79,7 @@ void ColorManager::handleOutputDisabled(AbstractOutput *output) } ColorDevice *device = *it; d->devices.erase(it); - emit deviceRemoved(device); + Q_EMIT deviceRemoved(device); delete device; } diff --git a/src/composite.cpp b/src/composite.cpp index 9fcb33db69..039291067f 100644 --- a/src/composite.cpp +++ b/src/composite.cpp @@ -152,7 +152,7 @@ Compositor::Compositor(QObject* workspace) Compositor::~Compositor() { - emit aboutToDestroy(); + Q_EMIT aboutToDestroy(); stop(); deleteUnusedSupportProperties(); destroyCompositorSelection(); @@ -183,7 +183,7 @@ bool Compositor::setupStart() } } - emit aboutToToggleCompositing(); + Q_EMIT aboutToToggleCompositing(); auto supportedCompositors = kwinApp()->platform()->supportedCompositors(); const auto userConfigIt = std::find(supportedCompositors.begin(), supportedCompositors.end(), @@ -280,7 +280,7 @@ bool Compositor::setupStart() } connect(m_scene, &Scene::resetCompositing, this, &Compositor::reinitialize); - emit sceneCreated(); + Q_EMIT sceneCreated(); return true; } @@ -367,7 +367,7 @@ void Compositor::startupWithWorkspace() } m_state = State::On; - emit compositingToggled(true); + Q_EMIT compositingToggled(true); if (m_releaseSelectionTimer.isActive()) { m_releaseSelectionTimer.stop(); @@ -424,7 +424,7 @@ void Compositor::stop() return; } m_state = State::Stopping; - emit aboutToToggleCompositing(); + Q_EMIT aboutToToggleCompositing(); m_releaseSelectionTimer.start(); @@ -484,7 +484,7 @@ void Compositor::stop() m_scene = nullptr; m_state = State::Off; - emit compositingToggled(false); + Q_EMIT compositingToggled(false); } void Compositor::destroyCompositorSelection() diff --git a/src/cursor.cpp b/src/cursor.cpp index f3abca24ee..12c0b98bfb 100644 --- a/src/cursor.cpp +++ b/src/cursor.cpp @@ -125,7 +125,7 @@ void Cursor::updateTheme(const QString &name, int size) if (m_themeName != name || m_themeSize != size) { m_themeName = name; m_themeSize = size; - emit themeChanged(); + Q_EMIT themeChanged(); } } @@ -204,7 +204,7 @@ xcb_cursor_t Cursor::x11Cursor(const QByteArray &name) void Cursor::doSetPos() { - emit posChanged(m_pos); + Q_EMIT posChanged(m_pos); } void Cursor::doGetPos() @@ -217,7 +217,7 @@ void Cursor::updatePos(const QPoint &pos) return; } m_pos = pos; - emit posChanged(m_pos); + Q_EMIT posChanged(m_pos); } void Cursor::startMousePolling() diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp index 40eb8b3a70..bf7fdb1600 100644 --- a/src/dbusinterface.cpp +++ b/src/dbusinterface.cpp @@ -369,21 +369,21 @@ VirtualDesktopManagerDBusInterface::VirtualDesktopManagerDBusInterface(VirtualDe [this](uint previousDesktop, uint newDesktop) { Q_UNUSED(previousDesktop); Q_UNUSED(newDesktop); - emit currentChanged(m_manager->currentDesktop()->id()); + Q_EMIT currentChanged(m_manager->currentDesktop()->id()); } ); connect(m_manager, &VirtualDesktopManager::countChanged, this, [this](uint previousCount, uint newCount) { Q_UNUSED(previousCount); - emit countChanged(newCount); - emit desktopsChanged(desktops()); + Q_EMIT countChanged(newCount); + Q_EMIT desktopsChanged(desktops()); } ); connect(m_manager, &VirtualDesktopManager::navigationWrappingAroundChanged, this, [this]() { - emit navigationWrappingAroundChanged(isNavigationWrappingAround()); + Q_EMIT navigationWrappingAroundChanged(isNavigationWrappingAround()); } ); @@ -393,15 +393,15 @@ VirtualDesktopManagerDBusInterface::VirtualDesktopManagerDBusInterface(VirtualDe connect(vd, &VirtualDesktop::x11DesktopNumberChanged, this, [this, vd]() { DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()}; - emit desktopDataChanged(vd->id(), data); - emit desktopsChanged(desktops()); + Q_EMIT desktopDataChanged(vd->id(), data); + Q_EMIT desktopsChanged(desktops()); } ); connect(vd, &VirtualDesktop::nameChanged, this, [this, vd]() { DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()}; - emit desktopDataChanged(vd->id(), data); - emit desktopsChanged(desktops()); + Q_EMIT desktopDataChanged(vd->id(), data); + Q_EMIT desktopsChanged(desktops()); } ); } @@ -410,26 +410,26 @@ VirtualDesktopManagerDBusInterface::VirtualDesktopManagerDBusInterface(VirtualDe connect(vd, &VirtualDesktop::x11DesktopNumberChanged, this, [this, vd]() { DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()}; - emit desktopDataChanged(vd->id(), data); - emit desktopsChanged(desktops()); + Q_EMIT desktopDataChanged(vd->id(), data); + Q_EMIT desktopsChanged(desktops()); } ); connect(vd, &VirtualDesktop::nameChanged, this, [this, vd]() { DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()}; - emit desktopDataChanged(vd->id(), data); - emit desktopsChanged(desktops()); + Q_EMIT desktopDataChanged(vd->id(), data); + Q_EMIT desktopsChanged(desktops()); } ); DBusDesktopDataStruct data{.position = vd->x11DesktopNumber() - 1, .id = vd->id(), .name = vd->name()}; - emit desktopCreated(vd->id(), data); - emit desktopsChanged(desktops()); + Q_EMIT desktopCreated(vd->id(), data); + Q_EMIT desktopsChanged(desktops()); } ); connect(m_manager, &VirtualDesktopManager::desktopRemoved, this, [this](VirtualDesktop *vd) { - emit desktopRemoved(vd->id()); - emit desktopsChanged(desktops()); + Q_EMIT desktopRemoved(vd->id()); + Q_EMIT desktopsChanged(desktops()); } ); } diff --git a/src/debug_console.cpp b/src/debug_console.cpp index 8820a68bad..1a6e0d77ca 100644 --- a/src/debug_console.cpp +++ b/src/debug_console.cpp @@ -1531,21 +1531,21 @@ void InputDeviceModel::setupDeviceConnections(LibInput::Device *device) [this, device] { const QModelIndex parent = index(m_devices.indexOf(device), 0, QModelIndex()); const QModelIndex child = index(device->metaObject()->indexOfProperty("enabled"), 1, parent); - emit dataChanged(child, child, QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(child, child, QVector{Qt::DisplayRole}); } ); connect(device, &LibInput::Device::leftHandedChanged, this, [this, device] { const QModelIndex parent = index(m_devices.indexOf(device), 0, QModelIndex()); const QModelIndex child = index(device->metaObject()->indexOfProperty("leftHanded"), 1, parent); - emit dataChanged(child, child, QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(child, child, QVector{Qt::DisplayRole}); } ); connect(device, &LibInput::Device::pointerAccelerationChanged, this, [this, device] { const QModelIndex parent = index(m_devices.indexOf(device), 0, QModelIndex()); const QModelIndex child = index(device->metaObject()->indexOfProperty("pointerAcceleration"), 1, parent); - emit dataChanged(child, child, QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(child, child, QVector{Qt::DisplayRole}); } ); } diff --git a/src/decorationitem.cpp b/src/decorationitem.cpp index 3aed875393..ad67fdf58a 100644 --- a/src/decorationitem.cpp +++ b/src/decorationitem.cpp @@ -56,7 +56,7 @@ QRegion DecorationRenderer::damage() const void DecorationRenderer::addDamage(const QRegion ®ion) { m_damage += region; - emit damaged(region); + Q_EMIT damaged(region); } void DecorationRenderer::resetDamage() diff --git a/src/decorations/decoratedclient.cpp b/src/decorations/decoratedclient.cpp index fa16a13d25..7485e183c9 100644 --- a/src/decorations/decoratedclient.cpp +++ b/src/decorations/decoratedclient.cpp @@ -34,7 +34,7 @@ DecoratedClientImpl::DecoratedClientImpl(AbstractClient *client, KDecoration2::D client->setDecoratedClient(QPointer(this)); connect(client, &AbstractClient::activeChanged, this, [decoratedClient, client]() { - emit decoratedClient->activeChanged(client->isActive()); + Q_EMIT decoratedClient->activeChanged(client->isActive()); } ); connect(client, &AbstractClient::clientGeometryChanged, this, @@ -45,27 +45,27 @@ DecoratedClientImpl::DecoratedClientImpl(AbstractClient *client, KDecoration2::D const auto oldSize = m_clientSize; m_clientSize = m_client->clientSize(); if (oldSize.width() != m_clientSize.width()) { - emit decoratedClient->widthChanged(m_clientSize.width()); + Q_EMIT decoratedClient->widthChanged(m_clientSize.width()); } if (oldSize.height() != m_clientSize.height()) { - emit decoratedClient->heightChanged(m_clientSize.height()); + Q_EMIT decoratedClient->heightChanged(m_clientSize.height()); } - emit decoratedClient->sizeChanged(m_clientSize); + Q_EMIT decoratedClient->sizeChanged(m_clientSize); } ); connect(client, &AbstractClient::desktopChanged, this, [decoratedClient, client]() { - emit decoratedClient->onAllDesktopsChanged(client->isOnAllDesktops()); + Q_EMIT decoratedClient->onAllDesktopsChanged(client->isOnAllDesktops()); } ); connect(client, &AbstractClient::captionChanged, this, [decoratedClient, client]() { - emit decoratedClient->captionChanged(client->caption()); + Q_EMIT decoratedClient->captionChanged(client->caption()); } ); connect(client, &AbstractClient::iconChanged, this, [decoratedClient, client]() { - emit decoratedClient->iconChanged(client->icon()); + Q_EMIT decoratedClient->iconChanged(client->icon()); } ); connect(client, &AbstractClient::shadeChanged, this, @@ -74,7 +74,7 @@ DecoratedClientImpl::DecoratedClientImpl(AbstractClient *client, KDecoration2::D connect(client, &AbstractClient::keepBelowChanged, decoratedClient, &KDecoration2::DecoratedClient::keepBelowChanged); connect(client, &AbstractClient::quickTileModeChanged, decoratedClient, [this, decoratedClient]() { - emit decoratedClient->adjacentScreenEdgesChanged(adjacentScreenEdges()); + Q_EMIT decoratedClient->adjacentScreenEdgesChanged(adjacentScreenEdges()); } ); connect(client, &AbstractClient::closeableChanged, decoratedClient, &KDecoration2::DecoratedClient::closeableChanged); @@ -107,7 +107,7 @@ DecoratedClientImpl::~DecoratedClientImpl() } void DecoratedClientImpl::signalShadeChange() { - emit decoratedClient()->shadedChanged(m_client->isShade()); + Q_EMIT decoratedClient()->shadedChanged(m_client->isShade()); } #define DELEGATE(type, name, clientName) \ diff --git a/src/decorations/settings.cpp b/src/decorations/settings.cpp index eacd370466..e493da6bc8 100644 --- a/src/decorations/settings.cpp +++ b/src/decorations/settings.cpp @@ -40,7 +40,7 @@ SettingsImpl::SettingsImpl(KDecoration2::DecorationSettings *parent) if (previous != 1 && current != 1) { return; } - emit parent->onAllDesktopsAvailableChanged(current > 1); + Q_EMIT parent->onAllDesktopsAvailableChanged(current > 1); } ); // prevent changes in Decoration due to Compositor being destroyed @@ -151,7 +151,7 @@ void SettingsImpl::readSettings() })); if (left != m_leftButtons) { m_leftButtons = left; - emit decorationSettings()->decorationButtonsLeftChanged(m_leftButtons); + Q_EMIT decorationSettings()->decorationButtonsLeftChanged(m_leftButtons); } const auto &right = readDecorationButtons(config, "ButtonsOnRight", QVector({ KDecoration2::DecorationButtonType::ContextHelp, @@ -161,13 +161,13 @@ void SettingsImpl::readSettings() })); if (right != m_rightButtons) { m_rightButtons = right; - emit decorationSettings()->decorationButtonsRightChanged(m_rightButtons); + Q_EMIT decorationSettings()->decorationButtonsRightChanged(m_rightButtons); } ApplicationMenu::self()->setViewEnabled(left.contains(KDecoration2::DecorationButtonType::ApplicationMenu) || right.contains(KDecoration2::DecorationButtonType::ApplicationMenu)); const bool close = config.readEntry("CloseOnDoubleClickOnMenu", false); if (close != m_closeDoubleClickMenu) { m_closeDoubleClickMenu = close; - emit decorationSettings()->closeOnDoubleClickOnMenuChanged(m_closeDoubleClickMenu); + Q_EMIT decorationSettings()->closeOnDoubleClickOnMenuChanged(m_closeDoubleClickMenu); } m_autoBorderSize = config.readEntry("BorderSizeAuto", true); @@ -178,15 +178,15 @@ void SettingsImpl::readSettings() } if (size != m_borderSize) { m_borderSize = size; - emit decorationSettings()->borderSizeChanged(m_borderSize); + Q_EMIT decorationSettings()->borderSizeChanged(m_borderSize); } const QFont font = QFontDatabase::systemFont(QFontDatabase::TitleFont); if (font != m_font) { m_font = font; - emit decorationSettings()->fontChanged(m_font); + Q_EMIT decorationSettings()->fontChanged(m_font); } - emit decorationSettings()->reconfigured(); + Q_EMIT decorationSettings()->reconfigured(); } } diff --git a/src/deleted.cpp b/src/deleted.cpp index 9f4188f852..180df19904 100644 --- a/src/deleted.cpp +++ b/src/deleted.cpp @@ -91,7 +91,7 @@ void Deleted::copyToDeleted(Toplevel* c) m_minimized = client->isMinimized(); m_modal = client->isModal(); m_mainClients = client->mainClients(); - foreach (AbstractClient *c, m_mainClients) { + Q_FOREACH (AbstractClient *c, m_mainClients) { connect(c, &AbstractClient::windowClosed, this, &Deleted::mainClientClosed); } m_fullscreen = client->isFullScreen(); diff --git a/src/effectloader.cpp b/src/effectloader.cpp index b9a4c4461a..4e10a91394 100644 --- a/src/effectloader.cpp +++ b/src/effectloader.cpp @@ -158,7 +158,7 @@ bool BuiltInEffectLoader::loadEffect(const QString &name, BuiltInEffect effect, } ); qCDebug(KWIN_CORE) << "Successfully loaded built-in effect: " << name; - emit effectLoaded(e, name); + Q_EMIT effectLoaded(e, name); return true; } @@ -248,7 +248,7 @@ bool ScriptedEffectLoader::loadEffect(const KPluginMetaData &effect, LoadEffectF ); qCDebug(KWIN_CORE) << "Successfully loaded scripted effect: " << name; - emit effectLoaded(e, name); + Q_EMIT effectLoaded(e, name); m_loadedEffects << name; return true; } @@ -428,7 +428,7 @@ bool PluginEffectLoader::loadEffect(const KPluginMetaData &info, LoadEffectFlags } ); qCDebug(KWIN_CORE) << "Successfully loaded plugin effect: " << name; - emit effectLoaded(e, name); + Q_EMIT effectLoaded(e, name); return true; } diff --git a/src/effects.cpp b/src/effects.cpp index ffa7bc8210..578f3b2740 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -144,9 +144,9 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) [this](int old, AbstractClient *c) { const int newDesktop = VirtualDesktopManager::self()->current(); if (old != 0 && newDesktop != old) { - emit desktopChanged(old, newDesktop, c ? c->effectWindow() : nullptr); + Q_EMIT desktopChanged(old, newDesktop, c ? c->effectWindow() : nullptr); // TODO: remove in 4.10 - emit desktopChanged(old, newDesktop); + Q_EMIT desktopChanged(old, newDesktop); } } ); @@ -155,7 +155,7 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) if (!c->effectWindow()) { return; } - emit desktopPresenceChanged(c->effectWindow(), old, c->desktop()); + Q_EMIT desktopPresenceChanged(c->effectWindow(), old, c->desktop()); } ); connect(ws, &Workspace::clientAdded, this, @@ -175,17 +175,17 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) connect(ws, &Workspace::internalClientAdded, this, [this](InternalClient *client) { setupClientConnections(client); - emit windowAdded(client->effectWindow()); + Q_EMIT windowAdded(client->effectWindow()); } ); connect(ws, &Workspace::clientActivated, this, [this](KWin::AbstractClient *c) { - emit windowActivated(c ? c->effectWindow() : nullptr); + Q_EMIT windowActivated(c ? c->effectWindow() : nullptr); } ); connect(ws, &Workspace::deletedRemoved, this, [this](KWin::Deleted *d) { - emit windowDeleted(d->effectWindow()); + Q_EMIT windowDeleted(d->effectWindow()); elevated_windows.removeAll(d->effectWindow()); } ); @@ -232,7 +232,7 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) } else { m_x11WindowPropertyNotify.reset(); } - emit xcbConnectionChanged(); + Q_EMIT xcbConnectionChanged(); } ); @@ -290,17 +290,17 @@ void EffectsHandlerImpl::setupClientConnections(AbstractClient* c) this, &EffectsHandlerImpl::slotClientMaximized); connect(c, &AbstractClient::clientStartUserMovedResized, this, [this](AbstractClient *c) { - emit windowStartUserMovedResized(c->effectWindow()); + Q_EMIT windowStartUserMovedResized(c->effectWindow()); } ); connect(c, &AbstractClient::clientStepUserMovedResized, this, [this](AbstractClient *c, const QRect &geometry) { - emit windowStepUserMovedResized(c->effectWindow(), geometry); + Q_EMIT windowStepUserMovedResized(c->effectWindow(), geometry); } ); connect(c, &AbstractClient::clientFinishUserMovedResized, this, [this](AbstractClient *c) { - emit windowFinishUserMovedResized(c->effectWindow()); + Q_EMIT windowFinishUserMovedResized(c->effectWindow()); } ); connect(c, &AbstractClient::opacityChanged, this, &EffectsHandlerImpl::slotOpacityChanged); @@ -308,7 +308,7 @@ void EffectsHandlerImpl::setupClientConnections(AbstractClient* c) [this](AbstractClient *c, bool animate) { // TODO: notify effects even if it should not animate? if (animate) { - emit windowMinimized(c->effectWindow()); + Q_EMIT windowMinimized(c->effectWindow()); } } ); @@ -316,7 +316,7 @@ void EffectsHandlerImpl::setupClientConnections(AbstractClient* c) [this](AbstractClient* c, bool animate) { // TODO: notify effects even if it should not animate? if (animate) { - emit windowUnminimized(c->effectWindow()); + Q_EMIT windowUnminimized(c->effectWindow()); } } ); @@ -326,38 +326,38 @@ void EffectsHandlerImpl::setupClientConnections(AbstractClient* c) connect(c, &AbstractClient::damaged, this, &EffectsHandlerImpl::slotWindowDamaged); connect(c, &AbstractClient::unresponsiveChanged, this, [this, c](bool unresponsive) { - emit windowUnresponsiveChanged(c->effectWindow(), unresponsive); + Q_EMIT windowUnresponsiveChanged(c->effectWindow(), unresponsive); } ); connect(c, &AbstractClient::windowShown, this, [this](Toplevel *c) { - emit windowShown(c->effectWindow()); + Q_EMIT windowShown(c->effectWindow()); } ); connect(c, &AbstractClient::windowHidden, this, [this](Toplevel *c) { - emit windowHidden(c->effectWindow()); + Q_EMIT windowHidden(c->effectWindow()); } ); connect(c, &AbstractClient::keepAboveChanged, this, [this, c](bool above) { Q_UNUSED(above) - emit windowKeepAboveChanged(c->effectWindow()); + Q_EMIT windowKeepAboveChanged(c->effectWindow()); } ); connect(c, &AbstractClient::keepBelowChanged, this, [this, c](bool below) { Q_UNUSED(below) - emit windowKeepBelowChanged(c->effectWindow()); + Q_EMIT windowKeepBelowChanged(c->effectWindow()); } ); connect(c, &AbstractClient::fullScreenChanged, this, [this, c]() { - emit windowFullScreenChanged(c->effectWindow()); + Q_EMIT windowFullScreenChanged(c->effectWindow()); } ); connect(c, &AbstractClient::visibleGeometryChanged, this, [this, c]() { - emit windowExpandedGeometryChanged(c->effectWindow()); + Q_EMIT windowExpandedGeometryChanged(c->effectWindow()); }); } @@ -369,7 +369,7 @@ void EffectsHandlerImpl::setupUnmanagedConnections(Unmanaged* u) connect(u, &Unmanaged::frameGeometryChanged, this, &EffectsHandlerImpl::slotFrameGeometryChanged); connect(u, &Unmanaged::damaged, this, &EffectsHandlerImpl::slotWindowDamaged); connect(u, &Unmanaged::visibleGeometryChanged, this, [this, u]() { - emit windowExpandedGeometryChanged(u->effectWindow()); + Q_EMIT windowExpandedGeometryChanged(u->effectWindow()); }); } @@ -544,7 +544,7 @@ void EffectsHandlerImpl::slotClientMaximized(KWin::AbstractClient *c, MaximizeMo break; } if (EffectWindowImpl *w = c->effectWindow()) { - emit windowMaximizedStateChanged(w, horizontal, vertical); + Q_EMIT windowMaximizedStateChanged(w, horizontal, vertical); } } @@ -553,7 +553,7 @@ void EffectsHandlerImpl::slotOpacityChanged(Toplevel *t, qreal oldOpacity) if (t->opacity() == oldOpacity || !t->effectWindow()) { return; } - emit windowOpacityChanged(t->effectWindow(), oldOpacity, (qreal)t->opacity()); + Q_EMIT windowOpacityChanged(t->effectWindow(), oldOpacity, (qreal)t->opacity()); } void EffectsHandlerImpl::slotClientShown(KWin::Toplevel *t) @@ -562,7 +562,7 @@ void EffectsHandlerImpl::slotClientShown(KWin::Toplevel *t) AbstractClient *c = static_cast(t); disconnect(c, &Toplevel::windowShown, this, &EffectsHandlerImpl::slotClientShown); setupClientConnections(c); - emit windowAdded(c->effectWindow()); + Q_EMIT windowAdded(c->effectWindow()); } void EffectsHandlerImpl::slotUnmanagedShown(KWin::Toplevel *t) @@ -570,35 +570,35 @@ void EffectsHandlerImpl::slotUnmanagedShown(KWin::Toplevel *t) Q_ASSERT(qobject_cast(t)); Unmanaged *u = static_cast(t); setupUnmanagedConnections(u); - emit windowAdded(u->effectWindow()); + Q_EMIT windowAdded(u->effectWindow()); } void EffectsHandlerImpl::slotWindowClosed(KWin::Toplevel *c, KWin::Deleted *d) { c->disconnect(this); if (d) { - emit windowClosed(c->effectWindow()); + Q_EMIT windowClosed(c->effectWindow()); } } void EffectsHandlerImpl::slotClientModalityChanged() { - emit windowModalityChanged(static_cast(sender())->effectWindow()); + Q_EMIT windowModalityChanged(static_cast(sender())->effectWindow()); } void EffectsHandlerImpl::slotCurrentTabAboutToChange(EffectWindow *from, EffectWindow *to) { - emit currentTabAboutToChange(from, to); + Q_EMIT currentTabAboutToChange(from, to); } void EffectsHandlerImpl::slotTabAdded(EffectWindow* w, EffectWindow* to) { - emit tabAdded(w, to); + Q_EMIT tabAdded(w, to); } void EffectsHandlerImpl::slotTabRemoved(EffectWindow *w, EffectWindow* leaderOfFormerGroup) { - emit tabRemoved(w, leaderOfFormerGroup); + Q_EMIT tabRemoved(w, leaderOfFormerGroup); } void EffectsHandlerImpl::slotWindowDamaged(Toplevel* t, const QRegion& r) @@ -607,7 +607,7 @@ void EffectsHandlerImpl::slotWindowDamaged(Toplevel* t, const QRegion& r) // can happen during tear down of window return; } - emit windowDamaged(t->effectWindow(), r); + Q_EMIT windowDamaged(t->effectWindow(), r); } void EffectsHandlerImpl::slotGeometryShapeChanged(Toplevel* t, const QRect& old) @@ -616,14 +616,14 @@ void EffectsHandlerImpl::slotGeometryShapeChanged(Toplevel* t, const QRect& old) // in some functions that may still call this if (t == nullptr || t->effectWindow() == nullptr) return; - emit windowGeometryShapeChanged(t->effectWindow(), old); + Q_EMIT windowGeometryShapeChanged(t->effectWindow(), old); } void EffectsHandlerImpl::slotFrameGeometryChanged(Toplevel *toplevel, const QRect &oldGeometry) { // effectWindow() might be nullptr during tear down of the client. if (toplevel->effectWindow()) { - emit windowFrameGeometryChanged(toplevel->effectWindow(), oldGeometry); + Q_EMIT windowFrameGeometryChanged(toplevel->effectWindow(), oldGeometry); } } @@ -634,9 +634,9 @@ void EffectsHandlerImpl::setActiveFullScreenEffect(Effect* e) } const bool activeChanged = (e == nullptr || fullscreen_effect == nullptr); fullscreen_effect = e; - emit activeFullScreenEffectChanged(); + Q_EMIT activeFullScreenEffectChanged(); if (activeChanged) { - emit hasActiveFullScreenEffectChanged(); + Q_EMIT hasActiveFullScreenEffectChanged(); } } @@ -804,7 +804,7 @@ bool EffectsHandlerImpl::hasKeyboardGrab() const void EffectsHandlerImpl::desktopResized(const QSize &size) { m_scene->screenGeometryChanged(size); - emit screenGeometryChanged(size); + Q_EMIT screenGeometryChanged(size); } void EffectsHandlerImpl::registerPropertyType(long atom, bool reg) @@ -1268,7 +1268,7 @@ bool EffectsHandlerImpl::checkInputWindowEvent(QMouseEvent *e) if (m_grabbedMouseEffects.isEmpty()) { return false; } - foreach (Effect *effect, m_grabbedMouseEffects) { + Q_FOREACH (Effect *effect, m_grabbedMouseEffects) { effect->windowInputMouseEvent(e); } return true; @@ -1279,7 +1279,7 @@ bool EffectsHandlerImpl::checkInputWindowEvent(QWheelEvent *e) if (m_grabbedMouseEffects.isEmpty()) { return false; } - foreach (Effect *effect, m_grabbedMouseEffects) { + Q_FOREACH (Effect *effect, m_grabbedMouseEffects) { effect->windowInputMouseEvent(e); } return true; @@ -1733,7 +1733,7 @@ void EffectsHandlerImpl::slotOutputEnabled(AbstractOutput *output) { EffectScreen *screen = new EffectScreenImpl(output, this); m_effectScreens.append(screen); - emit screenAdded(screen); + Q_EMIT screenAdded(screen); } void EffectsHandlerImpl::slotOutputDisabled(AbstractOutput *output) @@ -1744,7 +1744,7 @@ void EffectsHandlerImpl::slotOutputDisabled(AbstractOutput *output) if (it != m_effectScreens.end()) { EffectScreen *screen = *it; m_effectScreens.erase(it); - emit screenRemoved(screen); + Q_EMIT screenRemoved(screen); delete screen; } } @@ -2122,7 +2122,7 @@ void EffectWindowImpl::setData(int role, const QVariant &data) dataMap[ role ] = data; else dataMap.remove(role); - emit effects->windowDataChanged(this, role); + Q_EMIT effects->windowDataChanged(this, role); } QVariant EffectWindowImpl::data(int role) const diff --git a/src/effects/blur/blur.cpp b/src/effects/blur/blur.cpp index e194fa6269..fae1c39410 100644 --- a/src/effects/blur/blur.cpp +++ b/src/effects/blur/blur.cpp @@ -62,7 +62,7 @@ BlurEffect::BlurEffect() ); // Fetch the blur regions for all windows - foreach (EffectWindow *window, effects->stackingOrder()) + Q_FOREACH (EffectWindow *window, effects->stackingOrder()) updateBlurRegion(window); } @@ -77,7 +77,7 @@ void BlurEffect::slotScreenGeometryChanged() updateTexture(); // Fetch the blur regions for all windows - foreach (EffectWindow *window, effects->stackingOrder()) + Q_FOREACH (EffectWindow *window, effects->stackingOrder()) updateBlurRegion(window); effects->doneOpenGLContextCurrent(); } diff --git a/src/effects/coverswitch/coverswitch.cpp b/src/effects/coverswitch/coverswitch.cpp index bcb52b43a0..3a851c5a0d 100644 --- a/src/effects/coverswitch/coverswitch.cpp +++ b/src/effects/coverswitch/coverswitch.cpp @@ -141,7 +141,7 @@ void CoverSwitchEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaint if (index >= tempList.count()) index = index % tempList.count(); } - foreach (Direction direction, scheduled_directions) { + Q_FOREACH (Direction direction, scheduled_directions) { if (direction == Right) index++; else @@ -287,7 +287,7 @@ void CoverSwitchEffect::postPaintScreen() if (stop) { stop = false; effects->setActiveFullScreenEffect(nullptr); - foreach (EffectWindow * window, referrencedWindows) { + Q_FOREACH (EffectWindow * window, referrencedWindows) { window->unrefWindow(); } referrencedWindows.clear(); diff --git a/src/effects/cube/cube.cpp b/src/effects/cube/cube.cpp index 94757c7ce3..9f73a2adf5 100644 --- a/src/effects/cube/cube.cpp +++ b/src/effects/cube/cube.cpp @@ -111,13 +111,13 @@ bool CubeEffect::supported() void CubeEffect::reconfigure(ReconfigureFlags) { CubeConfig::self()->read(); - foreach (ElectricBorder border, borderActivate) { + Q_FOREACH (ElectricBorder border, borderActivate) { effects->unreserveElectricBorder(border, this); } - foreach (ElectricBorder border, borderActivateCylinder) { + Q_FOREACH (ElectricBorder border, borderActivateCylinder) { effects->unreserveElectricBorder(border, this); } - foreach (ElectricBorder border, borderActivateSphere) { + Q_FOREACH (ElectricBorder border, borderActivateSphere) { effects->unreserveElectricBorder(border, this); } borderActivate.clear(); @@ -126,21 +126,21 @@ void CubeEffect::reconfigure(ReconfigureFlags) QList borderList = QList(); borderList.append(int(ElectricNone)); borderList = CubeConfig::borderActivate(); - foreach (int i, borderList) { + Q_FOREACH (int i, borderList) { borderActivate.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } borderList.clear(); borderList.append(int(ElectricNone)); borderList = CubeConfig::borderActivateCylinder(); - foreach (int i, borderList) { + Q_FOREACH (int i, borderList) { borderActivateCylinder.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } borderList.clear(); borderList.append(int(ElectricNone)); borderList = CubeConfig::borderActivateSphere(); - foreach (int i, borderList) { + Q_FOREACH (int i, borderList) { borderActivateSphere.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } @@ -1129,7 +1129,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa if (w->isOnDesktop(prev_desktop) && (mask & PAINT_WINDOW_TRANSFORMED)) { QRect rect = effects->clientArea(FullArea, activeScreen, prev_desktop); WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() > rect.width() - w->x()) { new_quads.append(quad); } @@ -1140,7 +1140,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa if (w->isOnDesktop(next_desktop) && (mask & PAINT_WINDOW_TRANSFORMED)) { QRect rect = effects->clientArea(FullArea, activeScreen, next_desktop); WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (w->x() + quad.right() <= rect.x()) { new_quads.append(quad); } @@ -1177,7 +1177,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa if (w->isOnDesktop(painting_desktop) && w->x() < rect.x()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() > -w->x()) { new_quads.append(quad); } @@ -1186,7 +1186,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa } if (w->isOnDesktop(painting_desktop) && w->x() + w->width() > rect.x() + rect.width()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() <= rect.width() - w->x()) { new_quads.append(quad); } @@ -1195,7 +1195,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa } if (w->y() < rect.y()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() > -w->y()) { new_quads.append(quad); } @@ -1204,7 +1204,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa } if (w->y() + w->height() > rect.y() + rect.height()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() <= rect.height() - w->y()) { new_quads.append(quad); } @@ -1537,7 +1537,7 @@ void CubeEffect::rotateToDesktop(int desktop) void CubeEffect::setActive(bool active) { - foreach (CubeInsideEffect * inside, m_cubeInsideEffects) { + Q_FOREACH (CubeInsideEffect * inside, m_cubeInsideEffects) { inside->setActive(true); } if (active) { diff --git a/src/effects/cubeslide/cubeslide.cpp b/src/effects/cubeslide/cubeslide.cpp index aab4674f48..cbea00454a 100644 --- a/src/effects/cubeslide/cubeslide.cpp +++ b/src/effects/cubeslide/cubeslide.cpp @@ -248,7 +248,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win if (w->isOnDesktop(painting_desktop)) { if (w->x() < rect.x()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() > -w->x()) { new_quads.append(quad); } @@ -257,7 +257,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win } if (w->x() + w->width() > rect.x() + rect.width()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() <= rect.width() - w->x()) { new_quads.append(quad); } @@ -266,7 +266,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win } if (w->y() < rect.y()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() > -w->y()) { new_quads.append(quad); } @@ -275,7 +275,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win } if (w->y() + w->height() > rect.y() + rect.height()) { WindowQuadList new_quads; - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() <= rect.height() - w->y()) { new_quads.append(quad); } @@ -290,7 +290,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win (direction == Left || direction == Right)) { WindowQuadList new_quads; data.setXTranslation(rect.width()); - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() <= -w->x()) { new_quads.append(quad); } @@ -301,7 +301,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win (direction == Left || direction == Right)) { WindowQuadList new_quads; data.setXTranslation(-rect.width()); - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.right() > rect.width() - w->x()) { new_quads.append(quad); } @@ -312,7 +312,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win (direction == Upwards || direction == Downwards)) { WindowQuadList new_quads; data.setYTranslation(rect.height()); - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() <= -w->y()) { new_quads.append(quad); } @@ -323,7 +323,7 @@ void CubeSlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Win (direction == Upwards || direction == Downwards)) { WindowQuadList new_quads; data.setYTranslation(-rect.height()); - foreach (const WindowQuad & quad, data.quads) { + Q_FOREACH (const WindowQuad & quad, data.quads) { if (quad.bottom() > rect.height() - w->y()) { new_quads.append(quad); } diff --git a/src/effects/desktopgrid/desktopgrid.cpp b/src/effects/desktopgrid/desktopgrid.cpp index cd4f2d2e50..e3bdd5fe73 100644 --- a/src/effects/desktopgrid/desktopgrid.cpp +++ b/src/effects/desktopgrid/desktopgrid.cpp @@ -107,11 +107,11 @@ void DesktopGridEffect::reconfigure(ReconfigureFlags) { DesktopGridConfig::self()->read(); - foreach (ElectricBorder border, borderActivate) { + Q_FOREACH (ElectricBorder border, borderActivate) { effects->unreserveElectricBorder(border, this); } borderActivate.clear(); - foreach (int i, DesktopGridConfig::borderActivate()) { + Q_FOREACH (int i, DesktopGridConfig::borderActivate()) { borderActivate.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } @@ -218,7 +218,7 @@ void DesktopGridEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaint for (int screen = 0; screen < effects->numScreens(); screen++) { QRect screenGeom = effects->clientArea(ScreenArea, screen, 0); int desktop = 1; - foreach (EffectFrame * frame, desktopNames) { + Q_FOREACH (EffectFrame * frame, desktopNames) { QPointF posTL(scalePos(screenGeom.topLeft(), desktop, screen)); QPointF posBR(scalePos(screenGeom.bottomRight(), desktop, screen)); QRect textArea(posTL.x(), posTL.y(), posBR.x() - posTL.x(), posBR.y() - posTL.y()); @@ -384,7 +384,7 @@ void DesktopGridEffect::slotWindowAdded(EffectWindow* w) if (isUsingPresentWindows()) { if (!isRelevantWithPresentWindows(w)) return; // don't add - foreach (const int i, desktopList(w)) { + Q_FOREACH (const int i, desktopList(w)) { WindowMotionManager& manager = m_managers[ i*effects->numScreens()+w->screen()]; manager.manage(w); m_proxy->calculateWindowTransformations(manager.managedWindows(), w->screen(), manager); @@ -402,7 +402,7 @@ void DesktopGridEffect::slotWindowClosed(EffectWindow* w) windowMove = nullptr; } if (isUsingPresentWindows()) { - foreach (const int i, desktopList(w)) { + Q_FOREACH (const int i, desktopList(w)) { WindowMotionManager& manager = m_managers[i*effects->numScreens()+w->screen()]; manager.unmanage(w); m_proxy->calculateWindowTransformations(manager.managedWindows(), w->screen(), manager); @@ -431,7 +431,7 @@ void DesktopGridEffect::slotWindowFrameGeometryChanged(EffectWindow* w, const QR if (w == windowMove && wasWindowMove) return; if (isUsingPresentWindows()) { - foreach (const int i, desktopList(w)) { + Q_FOREACH (const int i, desktopList(w)) { WindowMotionManager& manager = m_managers[i*effects->numScreens()+w->screen()]; m_proxy->calculateWindowTransformations(manager.managedWindows(), w->screen(), manager); } @@ -466,7 +466,7 @@ void DesktopGridEffect::windowInputMouseEvent(QEvent* e) } if (!wasWindowMove) { // Activate on move if (isUsingPresentWindows()) { - foreach (const int i, desktopList(windowMove)) { + Q_FOREACH (const int i, desktopList(windowMove)) { WindowMotionManager& manager = m_managers[(i)*(effects->numScreens()) + windowMove->screen()]; if ((i + 1) == sourceDesktop) { const QRectF transformedGeo = manager.transformedGeometry(windowMove); @@ -539,7 +539,7 @@ void DesktopGridEffect::windowInputMouseEvent(QEvent* e) for (int i = 0; i < 3; ++i ) { if (desks[i] == desks[i+1]) continue; - foreach (EffectWindow *w, stack[i]) { + Q_FOREACH (EffectWindow *w, stack[i]) { auto desktops = w->desktops(); desktops.removeOne(desks[i]); desktops.append(desks[i+1]); @@ -636,7 +636,7 @@ void DesktopGridEffect::windowInputMouseEvent(QEvent* e) if (windowMove) { if (wasWindowMove && isUsingPresentWindows()) { const int targetDesktop = posToDesktop(cursorPos()); - foreach (const int i, desktopList(windowMove)) { + Q_FOREACH (const int i, desktopList(windowMove)) { WindowMotionManager& manager = m_managers[(i)*(effects->numScreens()) + windowMove->screen()]; manager.manage(windowMove); if (EffectWindow* modal = windowMove->findModal()) @@ -861,12 +861,12 @@ EffectWindow* DesktopGridEffect::windowAt(QPoint pos) const m_managers.at((desktop - 1) * (effects->numScreens()) + screen).windowAtPoint(pos, false); if (w) return w; - foreach (EffectWindow * w, windows) { + Q_FOREACH (EffectWindow * w, windows) { if (w->isOnDesktop(desktop) && w->isDesktop() && w->frameGeometry().contains(pos)) return w; } } else { - foreach (EffectWindow * w, windows) { + Q_FOREACH (EffectWindow * w, windows) { if (w->isOnDesktop(desktop) && w->isOnCurrentActivity() && !w->isMinimized() && w->frameGeometry().contains(pos)) return w; } @@ -1026,7 +1026,7 @@ void DesktopGridEffect::setActive(bool active) if (isUsingPresentWindows()) { QList::iterator it; for (it = m_managers.begin(); it != m_managers.end(); ++it) { - foreach (EffectWindow * w, (*it).managedWindows()) { + Q_FOREACH (EffectWindow * w, (*it).managedWindows()) { (*it).moveWindow(w, w->frameGeometry()); } } @@ -1090,7 +1090,7 @@ void DesktopGridEffect::setup() for (int i = 1; i <= effects->numberOfDesktops(); i++) { for (int j = 0; j < effects->numScreens(); j++) { WindowMotionManager manager; - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (w->isOnDesktop(i) && w->screen() == j &&isRelevantWithPresentWindows(w)) { manager.manage(w); } @@ -1322,7 +1322,7 @@ void DesktopGridEffect::desktopsAdded(int old) for (int i = old+1; i <= effects->numberOfDesktops(); ++i) { for (int j = 0; j < effects->numScreens(); ++j) { WindowMotionManager manager; - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (w->isOnDesktop(i) && w->screen() == j &&isRelevantWithPresentWindows(w)) { manager.manage(w); } @@ -1360,7 +1360,7 @@ void DesktopGridEffect::desktopsRemoved(int old) if (isUsingPresentWindows()) { for (int j = 0; j < effects->numScreens(); ++j) { WindowMotionManager& manager = m_managers[(desktop-1)*(effects->numScreens())+j ]; - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (manager.isManaging(w)) continue; if (w->isOnDesktop(desktop) && w->screen() == j && isRelevantWithPresentWindows(w)) { diff --git a/src/effects/flipswitch/flipswitch.cpp b/src/effects/flipswitch/flipswitch.cpp index 00c948e6a7..f7300d11aa 100644 --- a/src/effects/flipswitch/flipswitch.cpp +++ b/src/effects/flipswitch/flipswitch.cpp @@ -127,7 +127,7 @@ void FlipSwitchEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintD // using stacking order directly is not possible // as not each window in stacking order is shown // TODO: store list instead of calculating in each frame? - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (m_windows.contains(w)) tempList.append(w); } @@ -137,7 +137,7 @@ void FlipSwitchEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintD int tabIndex = index; if (m_mode == TabboxMode) { - foreach (SwitchingDirection direction, m_scheduledDirections) { // krazy:exclude=foreach + Q_FOREACH (SwitchingDirection direction, m_scheduledDirections) { // krazy:exclude=foreach if (direction == DirectionBackward) index++; else @@ -164,7 +164,7 @@ void FlipSwitchEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintD m_flipOrderedWindows.append(w); } } else { - foreach (SwitchingDirection direction, m_scheduledDirections) { // krazy:exclude=foreach + Q_FOREACH (SwitchingDirection direction, m_scheduledDirections) { // krazy:exclude=foreach if (direction == DirectionForward) index++; else @@ -229,7 +229,7 @@ void FlipSwitchEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintD } } - foreach (EffectWindow *w, m_flipOrderedWindows) { + Q_FOREACH (EffectWindow *w, m_flipOrderedWindows) { ItemInfo *info = m_windows.value(w,0); if (!info) continue; @@ -513,7 +513,7 @@ void FlipSwitchEffect::setActive(bool activate, FlipSwitchMode mode) } m_mode = mode; - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (isSelectableWindow(w) && !m_windows.contains(w)) m_windows[ w ] = new ItemInfo; } diff --git a/src/effects/invert/invert_config.cpp b/src/effects/invert/invert_config.cpp index 8ace074f18..334721ffad 100644 --- a/src/effects/invert/invert_config.cpp +++ b/src/effects/invert/invert_config.cpp @@ -67,7 +67,7 @@ void InvertEffectConfig::load() { KCModule::load(); - emit changed(false); + Q_EMIT changed(false); } void InvertEffectConfig::save() @@ -76,7 +76,7 @@ void InvertEffectConfig::save() mShortcutEditor->save(); // undo() will restore to this state from now on - emit changed(false); + Q_EMIT changed(false); OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); @@ -87,7 +87,7 @@ void InvertEffectConfig::defaults() { mShortcutEditor->allDefault(); - emit changed(true); + Q_EMIT changed(true); } diff --git a/src/effects/magiclamp/magiclamp.cpp b/src/effects/magiclamp/magiclamp.cpp index 42d012dc47..0e6321534b 100644 --- a/src/effects/magiclamp/magiclamp.cpp +++ b/src/effects/magiclamp/magiclamp.cpp @@ -129,7 +129,7 @@ void MagicLampEffect::deform(EffectWindow* w, int mask, WindowPaintData& data, W } else { // Assumption: there is a panel containing the icon position EffectWindow* panel = nullptr; - foreach (EffectWindow * window, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * window, effects->stackingOrder()) { if (!window->isDock()) continue; // we have to use intersects as there seems to be a Plasma bug diff --git a/src/effects/mouseclick/mouseclick.cpp b/src/effects/mouseclick/mouseclick.cpp index f1d62b832b..349ec462d2 100644 --- a/src/effects/mouseclick/mouseclick.cpp +++ b/src/effects/mouseclick/mouseclick.cpp @@ -78,7 +78,7 @@ void MouseClickEffect::prePaintScreen(ScreenPrePaintData& data, std::chrono::mil { const int time = m_lastPresentTime.count() ? (presentTime - m_lastPresentTime).count() : 0; - foreach (MouseEvent* click, m_clicks) { + Q_FOREACH (MouseEvent* click, m_clicks) { click->m_time += time; } @@ -111,7 +111,7 @@ void MouseClickEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintD effects->paintScreen(mask, region, data); paintScreenSetup(mask, region, data); - foreach (const MouseEvent* click, m_clicks) { + Q_FOREACH (const MouseEvent* click, m_clicks) { for (int i = 0; i < m_ringCount; ++i) { float alpha = computeAlpha(click, i); float size = computeRadius(click, i); @@ -196,7 +196,7 @@ void MouseClickEffect::repaint() if (m_clicks.size() > 0) { QRegion dirtyRegion; const int radius = m_ringMaxSize + m_lineWidth; - foreach (MouseEvent* click, m_clicks) { + Q_FOREACH (MouseEvent* click, m_clicks) { dirtyRegion |= QRect(click->m_pos.x() - radius, click->m_pos.y() - radius, 2*radius, 2*radius); if (click->m_frame) { // we grant the plasma style 32px padding for stuff like shadows... diff --git a/src/effects/mousemark/mousemark.cpp b/src/effects/mousemark/mousemark.cpp index 73eaa2881f..6975217ad0 100644 --- a/src/effects/mousemark/mousemark.cpp +++ b/src/effects/mousemark/mousemark.cpp @@ -120,10 +120,10 @@ void MouseMarkEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintDa ShaderBinder binder(ShaderTrait::UniformColor); binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, data.projectionMatrix()); QVector verts; - foreach (const Mark & mark, marks) { + Q_FOREACH (const Mark & mark, marks) { verts.clear(); verts.reserve(mark.size() * 2); - foreach (const QPoint & p, mark) { + Q_FOREACH (const QPoint & p, mark) { verts << p.x() << p.y(); } vbo->setData(verts.size() / 2, 2, verts.data(), nullptr); @@ -132,7 +132,7 @@ void MouseMarkEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintDa if (!drawing.isEmpty()) { verts.clear(); verts.reserve(drawing.size() * 2); - foreach (const QPoint & p, drawing) { + Q_FOREACH (const QPoint & p, drawing) { verts << p.x() << p.y(); } vbo->setData(verts.size() / 2, 2, verts.data(), nullptr); @@ -174,7 +174,7 @@ void MouseMarkEffect::paintScreen(int mask, const QRegion ®ion, ScreenPaintDa QPen pen(color); pen.setWidth(width); painter->setPen(pen); - foreach (const Mark &mark, marks) { + Q_FOREACH (const Mark &mark, marks) { drawMark(painter, mark); } drawMark(painter, drawing); diff --git a/src/effects/presentwindows/presentwindows.cpp b/src/effects/presentwindows/presentwindows.cpp index 7fc9177c4e..efb9322b7a 100644 --- a/src/effects/presentwindows/presentwindows.cpp +++ b/src/effects/presentwindows/presentwindows.cpp @@ -126,24 +126,24 @@ PresentWindowsEffect::~PresentWindowsEffect() void PresentWindowsEffect::reconfigure(ReconfigureFlags) { PresentWindowsConfig::self()->read(); - foreach (ElectricBorder border, m_borderActivate) { + Q_FOREACH (ElectricBorder border, m_borderActivate) { effects->unreserveElectricBorder(border, this); } - foreach (ElectricBorder border, m_borderActivateAll) { + Q_FOREACH (ElectricBorder border, m_borderActivateAll) { effects->unreserveElectricBorder(border, this); } m_borderActivate.clear(); m_borderActivateAll.clear(); - foreach (int i, PresentWindowsConfig::borderActivate()) { + Q_FOREACH (int i, PresentWindowsConfig::borderActivate()) { m_borderActivate.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } - foreach (int i, PresentWindowsConfig::borderActivateAll()) { + Q_FOREACH (int i, PresentWindowsConfig::borderActivateAll()) { m_borderActivateAll.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } - foreach (int i, PresentWindowsConfig::borderActivateClass()) { + Q_FOREACH (int i, PresentWindowsConfig::borderActivateClass()) { m_borderActivateClass.append(ElectricBorder(i)); effects->reserveElectricBorder(ElectricBorder(i), this); } @@ -265,7 +265,7 @@ void PresentWindowsEffect::postPaintScreen() } m_windowData.clear(); - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { w->setData(WindowForceBlurRole, QVariant()); w->setData(WindowForceBackgroundContrastRole, QVariant()); } @@ -530,7 +530,7 @@ void PresentWindowsEffect::slotWindowClosed(EffectWindow *w) rearrangeWindows(); - foreach (EffectWindow *w, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow *w, m_motionManager.managedWindows()) { winData = m_windowData.find(w); if (winData != m_windowData.end() && !winData->deleted) return; // found one that is not deleted? then we go on @@ -972,7 +972,7 @@ void PresentWindowsEffect::rearrangeWindows() if (m_windowFilter.isEmpty()) { windowlist = m_motionManager.managedWindows(); - foreach (EffectWindow * w, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * w, m_motionManager.managedWindows()) { DataHash::iterator winData = m_windowData.find(w); if (winData == m_windowData.end() || winData->deleted) continue; // don't include closed windows @@ -981,7 +981,7 @@ void PresentWindowsEffect::rearrangeWindows() } } else { // Can we move this filtering somewhere else? - foreach (EffectWindow * w, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * w, m_motionManager.managedWindows()) { DataHash::iterator winData = m_windowData.find(w); if (winData == m_windowData.end() || winData->deleted) continue; // don't include closed windows @@ -1033,7 +1033,7 @@ void PresentWindowsEffect::rearrangeWindows() // Resize text frames if required QFontMetrics* metrics = nullptr; // All fonts are the same - foreach (EffectWindow * w, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * w, m_motionManager.managedWindows()) { DataHash::iterator winData = m_windowData.find(w); if (winData == m_windowData.end()) continue; @@ -1312,7 +1312,7 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis // If windows do not overlap they scale into nothingness, fix by resetting. To reproduce // just have a single window on a Xinerama screen or have two windows that do not touch. // TODO: Work out why this happens, is most likely a bug in the manager. - foreach (EffectWindow * w, windowlist) + Q_FOREACH (EffectWindow * w, windowlist) if (motionManager.transformedGeometry(w) == w->frameGeometry()) motionManager.reset(w); @@ -1335,7 +1335,7 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis int direction = 0; QHash targets; QHash directions; - foreach (EffectWindow * w, windowlist) { + Q_FOREACH (EffectWindow * w, windowlist) { bounds = bounds.united(w->frameGeometry()); targets[w] = w->frameGeometry(); // Reuse the unused "slot" as a preferred direction attribute. This is used when the window @@ -1351,9 +1351,9 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis bool overlap; do { overlap = false; - foreach (EffectWindow * w, windowlist) { + Q_FOREACH (EffectWindow * w, windowlist) { QRect *target_w = &targets[w]; - foreach (EffectWindow * e, windowlist) { + Q_FOREACH (EffectWindow * e, windowlist) { if (w == e) continue; @@ -1454,7 +1454,7 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis bool moved; do { moved = false; - foreach (EffectWindow * w, windowlist) { + Q_FOREACH (EffectWindow * w, windowlist) { QRect oldRect; QRect *target = &targets[w]; // This may cause some slight distortion if the windows are enlarged a large amount @@ -1531,7 +1531,7 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis // The expanding code above can actually enlarge windows over 1.0/2.0 scale, we don't like this // We can't add this to the loop above as it would cause a never-ending loop so we have to make // do with the less-than-optimal space usage with using this method. - foreach (EffectWindow * w, windowlist) { + Q_FOREACH (EffectWindow * w, windowlist) { QRect *target = &targets[w]; double scale = target->width() / double(w->width()); if (scale > 2.0 || (scale > 1.0 && (w->width() > 300 || w->height() > 300))) { @@ -1546,7 +1546,7 @@ void PresentWindowsEffect::calculateWindowTransformationsNatural(EffectWindowLis } // Notify the motion manager of the targets - foreach (EffectWindow * w, windowlist) + Q_FOREACH (EffectWindow * w, windowlist) motionManager.moveWindow(w, targets.value(w)); } @@ -1597,7 +1597,7 @@ void PresentWindowsEffect::setActive(bool active) } // Add every single window to m_windowData (Just calling [w] creates it) - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { DataHash::iterator winData; if ((winData = m_windowData.find(w)) != m_windowData.end()) { winData->visible = isVisibleWindow(w); @@ -1627,7 +1627,7 @@ void PresentWindowsEffect::setActive(bool active) } // Filter out special windows such as panels and taskbars - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { if (isSelectableWindow(w)) { m_motionManager.manage(w); } @@ -1658,7 +1658,7 @@ void PresentWindowsEffect::setActive(bool active) rearrangeWindows(); setHighlightedWindow(effects->activeWindow()); - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { w->setData(WindowForceBlurRole, QVariant(true)); w->setData(WindowForceBackgroundContrastRole, QVariant(true)); } @@ -1672,7 +1672,7 @@ void PresentWindowsEffect::setActive(bool active) int desktop = effects->currentDesktop(); if (activeWindow && !activeWindow->isOnAllDesktops()) desktop = activeWindow->desktop(); - foreach (EffectWindow * w, effects->stackingOrder()) { + Q_FOREACH (EffectWindow * w, effects->stackingOrder()) { DataHash::iterator winData = m_windowData.find(w); if (winData != m_windowData.end()) winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) && @@ -1682,7 +1682,7 @@ void PresentWindowsEffect::setActive(bool active) m_closeView->hide(); // Move all windows back to their original position - foreach (EffectWindow * w, m_motionManager.managedWindows()) + Q_FOREACH (EffectWindow * w, m_motionManager.managedWindows()) m_motionManager.moveWindow(w, w->frameGeometry()); if (m_filterFrame) { m_filterFrame->free(); @@ -1853,7 +1853,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow(EffectWindow *w, int xdiff, i detectRect = QRect(0, wArea.y(), area.width(), wArea.height()); next = nullptr; - foreach (EffectWindow * e, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * e, m_motionManager.managedWindows()) { DataHash::const_iterator winData = m_windowData.find(e); if (winData == m_windowData.end() || !winData->visible) continue; @@ -1885,7 +1885,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow(EffectWindow *w, int xdiff, i detectRect = QRect(0, wArea.y(), area.width(), wArea.height()); next = nullptr; - foreach (EffectWindow * e, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * e, m_motionManager.managedWindows()) { DataHash::const_iterator winData = m_windowData.find(e); if (winData == m_windowData.end() || !winData->visible) continue; @@ -1922,7 +1922,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow(EffectWindow *w, int xdiff, i detectRect = QRect(wArea.x(), 0, wArea.width(), area.height()); next = nullptr; - foreach (EffectWindow * e, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * e, m_motionManager.managedWindows()) { DataHash::const_iterator winData = m_windowData.find(e); if (winData == m_windowData.end() || !winData->visible) continue; @@ -1954,7 +1954,7 @@ EffectWindow* PresentWindowsEffect::relativeWindow(EffectWindow *w, int xdiff, i detectRect = QRect(wArea.x(), 0, wArea.width(), area.height()); next = nullptr; - foreach (EffectWindow * e, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * e, m_motionManager.managedWindows()) { DataHash::const_iterator winData = m_windowData.find(e); if (winData == m_windowData.end() || !winData->visible) continue; @@ -1990,7 +1990,7 @@ EffectWindow* PresentWindowsEffect::findFirstWindow() const EffectWindow *topLeft = nullptr; QRectF topLeftGeometry; - foreach (EffectWindow * w, m_motionManager.managedWindows()) { + Q_FOREACH (EffectWindow * w, m_motionManager.managedWindows()) { DataHash::const_iterator winData = m_windowData.find(w); if (winData == m_windowData.end()) continue; @@ -2053,7 +2053,7 @@ void CloseWindowView::clicked() { // 50ms until the window is elevated (seen!) and 300ms more to be "realized" by the user. if (m_armTimer.hasExpired(350)) { - emit requestClose(); + Q_EMIT requestClose(); } } diff --git a/src/effects/screenshot/screenshotdbusinterface1.cpp b/src/effects/screenshot/screenshotdbusinterface1.cpp index caf660149d..1af34a4b28 100644 --- a/src/effects/screenshot/screenshotdbusinterface1.cpp +++ b/src/effects/screenshot/screenshotdbusinterface1.cpp @@ -274,14 +274,14 @@ void ScreenShotSourceMulti1::marshal(ScreenShotSink1 *sink) void ScreenShotSourceMulti1::handleSourceCancelled() { - emit cancelled(); + Q_EMIT cancelled(); } void ScreenShotSourceMulti1::handleSourceCompleted() { // If all sources are complete now, emit the completed signal. if (isCompleted()) { - emit completed(); + Q_EMIT completed(); } } @@ -446,7 +446,7 @@ static xcb_pixmap_t xpixmapFromImage(const QImage &image) void ScreenShotSinkXpixmap1::flush(const QImage &image) { const xcb_pixmap_t pixmap = xpixmapFromImage(image); - emit m_interface->screenshotCreated(pixmap); + Q_EMIT m_interface->screenshotCreated(pixmap); } ScreenShotSinkFile1::ScreenShotSinkFile1(ScreenShotDBusInterface1 *interface, diff --git a/src/effects/showfps/showfps.cpp b/src/effects/showfps/showfps.cpp index 9f1df61382..181c8490a5 100644 --- a/src/effects/showfps/showfps.cpp +++ b/src/effects/showfps/showfps.cpp @@ -392,7 +392,7 @@ void ShowFpsEffect::paintGraph(int x, int y, QList values, QList lines vbo->setColor(color); QVector verts; // First draw the lines - foreach (int h, lines) { + Q_FOREACH (int h, lines) { verts << x << y - h; verts << x + values.count() << y - h; } @@ -477,7 +477,7 @@ void ShowFpsEffect::paintGraph(int x, int y, QList values, QList lines // Then the lines col.red = col.green = col.blue = 0; // black QVector rects; - foreach (int h, lines) { + Q_FOREACH (int h, lines) { xcb_rectangle_t rect = {0, int16_t(MAX_TIME - h), uint16_t(values.count()), 1}; rects << rect; } @@ -492,7 +492,7 @@ void ShowFpsEffect::paintGraph(int x, int y, QList values, QList lines QPainter *painter = effects->scenePainter(); painter->setPen(Qt::black); // First draw the lines - foreach (int h, lines) { + Q_FOREACH (int h, lines) { painter->drawLine(x, y - h, x + values.count(), y - h); } QColor color(0, 0, 0); diff --git a/src/effects/slideback/slideback.cpp b/src/effects/slideback/slideback.cpp index fee0094d13..4cd7e919f3 100644 --- a/src/effects/slideback/slideback.cpp +++ b/src/effects/slideback/slideback.cpp @@ -56,7 +56,7 @@ void SlideBackEffect::windowRaised(EffectWindow *w) { // Determine all windows on top of the activated one bool currentFound = false; - foreach (EffectWindow * tmp, oldStackingOrder) { + Q_FOREACH (EffectWindow * tmp, oldStackingOrder) { if (!currentFound) { if (tmp == w) { currentFound = true; @@ -75,7 +75,7 @@ void SlideBackEffect::windowRaised(EffectWindow *w) coveringWindows.append(tmp); } else { //Does it intersect with a moved (elevated) window and do we have to elevate it too? - foreach (EffectWindow * elevatedWindow, elevatedList) { + Q_FOREACH (EffectWindow * elevatedWindow, elevatedList) { if (tmp->frameGeometry().intersects(elevatedWindow->frameGeometry())) { effects->setElevatedWindow(tmp, true); elevatedList.append(tmp); @@ -94,7 +94,7 @@ void SlideBackEffect::windowRaised(EffectWindow *w) // If a window is minimized it could happen that the panels stay elevated without any windows sliding. // clear all elevation settings if (!motionManager.managingWindows()) { - foreach (EffectWindow * tmp, elevatedList) { + Q_FOREACH (EffectWindow * tmp, elevatedList) { effects->setElevatedWindow(tmp, false); } } @@ -173,7 +173,7 @@ void SlideBackEffect::paintWindow(EffectWindow *w, int mask, QRegion region, Win if (motionManager.isManaging(w)) { motionManager.apply(w, data); } - foreach (const QRegion &r, clippedRegions) { + Q_FOREACH (const QRegion &r, clippedRegions) { region = region.intersected(r); } effects->paintWindow(w, mask, region, data); @@ -191,7 +191,7 @@ void SlideBackEffect::postPaintWindow(EffectWindow* w) // restore the stacking order of all windows not intersecting any more except panels if (coveringWindows.contains(w)) { EffectWindowList tmpList; - foreach (EffectWindow * tmp, elevatedList) { + Q_FOREACH (EffectWindow * tmp, elevatedList) { QRect elevatedGeometry = tmp->frameGeometry(); if (motionManager.isManaging(tmp)) { elevatedGeometry = motionManager.transformedGeometry(tmp).toAlignedRect(); @@ -207,7 +207,7 @@ void SlideBackEffect::postPaintWindow(EffectWindow* w) } else { if (!tmp->isDock()) { bool keepElevated = false; - foreach (EffectWindow * elevatedWindow, tmpList) { + Q_FOREACH (EffectWindow * elevatedWindow, tmpList) { if (tmp->frameGeometry().intersects(elevatedWindow->frameGeometry())) { keepElevated = true; } @@ -240,7 +240,7 @@ void SlideBackEffect::postPaintWindow(EffectWindow* w) coveringWindows.removeAll(w); if (coveringWindows.isEmpty()) { // Restore correct stacking order - foreach (EffectWindow * tmp, elevatedList) { + Q_FOREACH (EffectWindow * tmp, elevatedList) { effects->setElevatedWindow(tmp, false); } elevatedList.clear(); @@ -312,7 +312,7 @@ EffectWindowList SlideBackEffect::usableWindows(const EffectWindowList & allWind auto isWindowVisible = [] (const EffectWindow *window) { return window && effects->virtualScreenGeometry().intersects(window->frameGeometry()); }; - foreach (EffectWindow * tmp, allWindows) { + Q_FOREACH (EffectWindow * tmp, allWindows) { if (isWindowUsable(tmp) && isWindowVisible(tmp)) { retList.append(tmp); } @@ -324,7 +324,7 @@ QRect SlideBackEffect::getModalGroupGeometry(EffectWindow *w) { QRect modalGroupGeometry = w->frameGeometry(); if (w->isModal()) { - foreach (EffectWindow * modalWindow, w->mainWindows()) { + Q_FOREACH (EffectWindow * modalWindow, w->mainWindows()) { modalGroupGeometry = modalGroupGeometry.united(getModalGroupGeometry(modalWindow)); } } diff --git a/src/effects/thumbnailaside/thumbnailaside.cpp b/src/effects/thumbnailaside/thumbnailaside.cpp index 629bae82b0..cbae3780ca 100644 --- a/src/effects/thumbnailaside/thumbnailaside.cpp +++ b/src/effects/thumbnailaside/thumbnailaside.cpp @@ -55,7 +55,7 @@ void ThumbnailAsideEffect::paintScreen(int mask, const QRegion ®ion, ScreenPa effects->paintScreen(mask, region, data); const QMatrix4x4 projectionMatrix = data.projectionMatrix(); - foreach (const Data & d, windows) { + Q_FOREACH (const Data & d, windows) { if (painted.intersects(d.rect)) { WindowPaintData data(d.window, projectionMatrix); data.multiplyOpacity(opacity); @@ -75,7 +75,7 @@ void ThumbnailAsideEffect::paintWindow(EffectWindow *w, int mask, QRegion region void ThumbnailAsideEffect::slotWindowDamaged(EffectWindow* w, const QRegion&) { - foreach (const Data & d, windows) { + Q_FOREACH (const Data & d, windows) { if (d.window == w) effects->addRepaint(d.rect); } @@ -83,7 +83,7 @@ void ThumbnailAsideEffect::slotWindowDamaged(EffectWindow* w, const QRegion&) void ThumbnailAsideEffect::slotWindowFrameGeometryChanged(EffectWindow* w, const QRect& old) { - foreach (const Data & d, windows) { + Q_FOREACH (const Data & d, windows) { if (d.window == w) { if (w->size() == old.size()) effects->addRepaint(d.rect); @@ -144,7 +144,7 @@ void ThumbnailAsideEffect::arrange() int height = 0; QVector< int > pos(windows.size()); int mwidth = 0; - foreach (const Data & d, windows) { + Q_FOREACH (const Data & d, windows) { height += d.window->height(); mwidth = qMax(mwidth, d.window->width()); pos[ d.index ] = d.window->height(); @@ -172,7 +172,7 @@ void ThumbnailAsideEffect::arrange() void ThumbnailAsideEffect::repaintAll() { - foreach (const Data & d, windows) + Q_FOREACH (const Data & d, windows) effects->addRepaint(d.rect); } diff --git a/src/effects/trackmouse/trackmouse_config.cpp b/src/effects/trackmouse/trackmouse_config.cpp index 615a60093a..45d6944adc 100644 --- a/src/effects/trackmouse/trackmouse_config.cpp +++ b/src/effects/trackmouse/trackmouse_config.cpp @@ -105,7 +105,7 @@ void TrackMouseEffectConfig::shortcutChanged(const QKeySequence &seq) if (QAction *a = m_actionCollection->action(QStringLiteral("TrackMouse"))) { KGlobalAccel::self()->setShortcut(a, QList() << seq, KGlobalAccel::NoAutoloading); } - emit changed(true); + Q_EMIT changed(true); } } // namespace diff --git a/src/effects/windowgeometry/windowgeometry_config.cpp b/src/effects/windowgeometry/windowgeometry_config.cpp index 8d5a439a49..012ebe952c 100644 --- a/src/effects/windowgeometry/windowgeometry_config.cpp +++ b/src/effects/windowgeometry/windowgeometry_config.cpp @@ -77,7 +77,7 @@ void WindowGeometryConfig::save() void WindowGeometryConfig::defaults() { myUi->shortcuts->allDefault(); - emit changed(true); + Q_EMIT changed(true); } } //namespace diff --git a/src/effects/zoom/accessibilityintegration.cpp b/src/effects/zoom/accessibilityintegration.cpp index 140d0fe3c4..513f4fab9f 100644 --- a/src/effects/zoom/accessibilityintegration.cpp +++ b/src/effects/zoom/accessibilityintegration.cpp @@ -93,7 +93,7 @@ void ZoomAccessibilityIntegration::destroyAccessibilityRegistry() void ZoomAccessibilityIntegration::slotFocusChanged(const AccessibleObject &object) { - emit focusPointChanged(object.focusPoint()); + Q_EMIT focusPointChanged(object.focusPoint()); } } // namespace KWin diff --git a/src/events.cpp b/src/events.cpp index c68f04d09d..06b68dceb6 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -363,7 +363,7 @@ bool X11Client::windowEvent(xcb_generic_event_t *e) // ### Inform the decoration } if (dirtyProperties2.testFlag(NET::WM2WindowRole)) { - emit windowRoleChanged(); + Q_EMIT windowRoleChanged(); } if (dirtyProperties2.testFlag(NET::WM2WindowClass)) { getResourceClass(); @@ -1191,7 +1191,7 @@ bool Unmanaged::windowEvent(xcb_generic_event_t *e) getWmOpaqueRegion(); } if (dirtyProperties2.testFlag(NET::WM2WindowRole)) { - emit windowRoleChanged(); + Q_EMIT windowRoleChanged(); } if (dirtyProperties2.testFlag(NET::WM2WindowClass)) { getResourceClass(); @@ -1237,7 +1237,7 @@ bool Unmanaged::windowEvent(xcb_generic_event_t *e) detectShape(window()); addRepaintFull(); addWorkspaceRepaint(frameGeometry()); // in case shape change removes part of this window - emit geometryShapeChanged(this, frameGeometry()); + Q_EMIT geometryShapeChanged(this, frameGeometry()); } if (eventType == Xcb::Extensions::self()->damageNotifyEvent()) damageNotifyEvent(); @@ -1257,10 +1257,10 @@ void Unmanaged::configureNotifyEvent(xcb_configure_notify_event_t *e) m_clientGeometry = newgeom; m_frameGeometry = newgeom; m_bufferGeometry = newgeom; - emit bufferGeometryChanged(this, old); - emit clientGeometryChanged(this, old); - emit frameGeometryChanged(this, old); - emit geometryShapeChanged(this, old); + Q_EMIT bufferGeometryChanged(this, old); + Q_EMIT clientGeometryChanged(this, old); + Q_EMIT frameGeometryChanged(this, old); + Q_EMIT geometryShapeChanged(this, old); } } @@ -1293,7 +1293,7 @@ void Toplevel::clientMessageEvent(xcb_client_message_event_t *e) setSurface(s); } } - emit surfaceIdChanged(m_surfaceId); + Q_EMIT surfaceIdChanged(m_surfaceId); } } diff --git a/src/ftrace.cpp b/src/ftrace.cpp index 6662ca6912..525a74b1c0 100644 --- a/src/ftrace.cpp +++ b/src/ftrace.cpp @@ -49,7 +49,7 @@ void FTraceLogger::setEnabled(bool enabled) } else { m_file.close(); } - emit enabledChanged(); + Q_EMIT enabledChanged(); } bool FTraceLogger::open() diff --git a/src/gestures.cpp b/src/gestures.cpp index 391bb2c83a..7839e2eba4 100644 --- a/src/gestures.cpp +++ b/src/gestures.cpp @@ -86,7 +86,7 @@ void GestureRecognizer::unregisterGesture(KWin::Gesture* gesture) } m_gestures.removeAll(gesture); if (m_activeSwipeGestures.removeOne(gesture)) { - emit gesture->cancelled(); + Q_EMIT gesture->cancelled(); } } @@ -134,7 +134,7 @@ int GestureRecognizer::startSwipeGesture(uint fingerCount, const QPointF &startP // direction doesn't matter yet m_activeSwipeGestures << swipeGesture; count++; - emit swipeGesture->started(); + Q_EMIT swipeGesture->started(); } return count; } @@ -166,11 +166,11 @@ void GestureRecognizer::updateSwipeGesture(const QSizeF &delta) auto g = qobject_cast(*it); if (g->direction() == direction) { if (g->isMinimumDeltaRelevant()) { - emit g->progress(g->minimumDeltaReachedProgress(combinedDelta)); + Q_EMIT g->progress(g->minimumDeltaReachedProgress(combinedDelta)); } it++; } else { - emit g->cancelled(); + Q_EMIT g->cancelled(); it = m_activeSwipeGestures.erase(it); } } @@ -179,7 +179,7 @@ void GestureRecognizer::updateSwipeGesture(const QSizeF &delta) void GestureRecognizer::cancelActiveSwipeGestures() { for (auto g : qAsConst(m_activeSwipeGestures)) { - emit g->cancelled(); + Q_EMIT g->cancelled(); } m_activeSwipeGestures.clear(); } @@ -195,9 +195,9 @@ void GestureRecognizer::endSwipeGesture() const QSizeF delta = std::accumulate(m_swipeUpdates.constBegin(), m_swipeUpdates.constEnd(), QSizeF(0, 0)); for (auto g : qAsConst(m_activeSwipeGestures)) { if (static_cast(g)->minimumDeltaReached(delta)) { - emit g->triggered(); + Q_EMIT g->triggered(); } else { - emit g->cancelled(); + Q_EMIT g->cancelled(); } } m_activeSwipeGestures.clear(); diff --git a/src/input.cpp b/src/input.cpp index 3e6756d1a9..83a7104d7c 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -1718,7 +1718,7 @@ public: cursor->updateCursor(cursorImage, tcursor->hotspot()); }); - emit cursor->cursorChanged(); + Q_EMIT cursor->cursorChanged(); return tool; } @@ -2392,7 +2392,7 @@ void InputRedirection::setupLibInput() return; } // TODO: this should update the seat, only workaround for QTBUG-54371 - emit hasAlphaNumericKeyboardChanged(set); + Q_EMIT hasAlphaNumericKeyboardChanged(set); } ); connect(conn, &LibInput::Connection::hasTabletModeSwitchChanged, this, @@ -2400,7 +2400,7 @@ void InputRedirection::setupLibInput() if (m_libInput->isSuspended()) { return; } - emit hasTabletModeSwitchChanged(set); + Q_EMIT hasTabletModeSwitchChanged(set); } ); connect(conn, &LibInput::Connection::hasPointerChanged, this, @@ -2578,7 +2578,7 @@ Toplevel *InputRedirection::findToplevel(const QPoint &pos) return nullptr; } const QList &unmanaged = Workspace::self()->unmanagedList(); - foreach (Unmanaged *u, unmanaged) { + Q_FOREACH (Unmanaged *u, unmanaged) { if (u->hitTest(pos)) { return u; } @@ -2725,7 +2725,7 @@ bool InputDeviceHandler::setAt(Toplevel *toplevel) m_at.surfaceCreatedConnection = QMetaObject::Connection(); m_at.at = toplevel; - emit atChanged(old, toplevel); + Q_EMIT atChanged(old, toplevel); return true; } @@ -2740,7 +2740,7 @@ void InputDeviceHandler::setDecoration(Decoration::DecoratedClientImpl *decorati auto oldDeco = m_focus.decoration; m_focus.decoration = decoration; cleanupDecoration(oldDeco.data(), m_focus.decoration.data()); - emit decorationChanged(); + Q_EMIT decorationChanged(); } void InputDeviceHandler::setInternalWindow(QWindow *window) @@ -2786,7 +2786,7 @@ bool InputDeviceHandler::updateDecoration() return false; } cleanupDecoration(oldDeco.data(), m_focus.decoration.data()); - emit decorationChanged(); + Q_EMIT decorationChanged(); return true; } diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp index 3b7bef7acf..9789416aca 100644 --- a/src/inputmethod.cpp +++ b/src/inputmethod.cpp @@ -301,7 +301,7 @@ void InputMethod::setEnabled(bool enabled) return; } m_enabled = enabled; - emit enabledChanged(m_enabled); + Q_EMIT enabledChanged(m_enabled); // send OSD message QDBusMessage msg = QDBusMessage::createMethodCall( diff --git a/src/inputpanelv1client.cpp b/src/inputpanelv1client.cpp index 7c10d5aab9..9480ec67cf 100644 --- a/src/inputpanelv1client.cpp +++ b/src/inputpanelv1client.cpp @@ -94,7 +94,7 @@ void InputPanelV1Client::destroyClient() markAsZombie(); Deleted *deleted = Deleted::create(this); - emit windowClosed(this, deleted); + Q_EMIT windowClosed(this, deleted); StackingUpdatesBlocker blocker(workspace()); waylandServer()->removeClient(this); deleted->unrefWindow(); diff --git a/src/inputpanelv1integration.cpp b/src/inputpanelv1integration.cpp index c4a3c82cf9..e761af1ed7 100644 --- a/src/inputpanelv1integration.cpp +++ b/src/inputpanelv1integration.cpp @@ -27,7 +27,7 @@ InputPanelV1Integration::InputPanelV1Integration(QObject *parent) void InputPanelV1Integration::createClient(InputPanelSurfaceV1Interface *shellSurface) { - emit clientCreated(new InputPanelV1Client(shellSurface)); + Q_EMIT clientCreated(new InputPanelV1Client(shellSurface)); } } // namespace KWin diff --git a/src/internal_client.cpp b/src/internal_client.cpp index 99d44adfab..6f8c4683dd 100644 --- a/src/internal_client.cpp +++ b/src/internal_client.cpp @@ -330,11 +330,11 @@ void InternalClient::destroyClient() markAsZombie(); if (isInteractiveMoveResize()) { leaveInteractiveMoveResize(); - emit clientFinishUserMovedResized(this); + Q_EMIT clientFinishUserMovedResized(this); } Deleted *deleted = Deleted::create(this); - emit windowClosed(this, deleted); + Q_EMIT windowClosed(this, deleted); destroyDecoration(); @@ -438,7 +438,7 @@ void InternalClient::updateCaption() } while (findClientWithSameCaption()); } if (m_captionSuffix != oldSuffix) { - emit captionChanged(); + Q_EMIT captionChanged(); } } @@ -466,13 +466,13 @@ void InternalClient::commitGeometry(const QRect &rect) syncGeometryToInternalWindow(); if (oldClientGeometry != m_clientGeometry) { - emit bufferGeometryChanged(this, oldClientGeometry); - emit clientGeometryChanged(this, oldClientGeometry); + Q_EMIT bufferGeometryChanged(this, oldClientGeometry); + Q_EMIT clientGeometryChanged(this, oldClientGeometry); } if (oldFrameGeometry != m_frameGeometry) { - emit frameGeometryChanged(this, oldFrameGeometry); + Q_EMIT frameGeometryChanged(this, oldFrameGeometry); } - emit geometryShapeChanged(this, oldFrameGeometry); + Q_EMIT geometryShapeChanged(this, oldFrameGeometry); } void InternalClient::setCaption(const QString &caption) @@ -487,7 +487,7 @@ void InternalClient::setCaption(const QString &caption) updateCaption(); if (m_captionSuffix == oldCaptionSuffix) { - emit captionChanged(); + Q_EMIT captionChanged(); } } diff --git a/src/item.cpp b/src/item.cpp index 306f12d6c5..013c7f8579 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -53,7 +53,7 @@ void Item::setX(int x) m_x = x; scheduleRepaint(boundingRect()); discardQuads(); - emit xChanged(); + Q_EMIT xChanged(); } int Item::y() const @@ -70,7 +70,7 @@ void Item::setY(int y) m_y = y; scheduleRepaint(boundingRect()); discardQuads(); - emit yChanged(); + Q_EMIT yChanged(); } int Item::width() const @@ -88,7 +88,7 @@ void Item::setWidth(int width) updateBoundingRect(); scheduleRepaint(rect()); discardQuads(); - emit widthChanged(); + Q_EMIT widthChanged(); } int Item::height() const @@ -106,7 +106,7 @@ void Item::setHeight(int height) updateBoundingRect(); scheduleRepaint(rect()); discardQuads(); - emit heightChanged(); + Q_EMIT heightChanged(); } Item *Item::parentItem() const @@ -186,10 +186,10 @@ void Item::setPosition(const QPoint &point) discardQuads(); if (xDirty) { - emit xChanged(); + Q_EMIT xChanged(); } if (yDirty) { - emit yChanged(); + Q_EMIT yChanged(); } } } @@ -214,10 +214,10 @@ void Item::setSize(const QSize &size) discardQuads(); if (widthDirty) { - emit widthChanged(); + Q_EMIT widthChanged(); } if (heightDirty) { - emit heightChanged(); + Q_EMIT heightChanged(); } } } @@ -240,7 +240,7 @@ void Item::updateBoundingRect() } if (m_boundingRect != boundingRect) { m_boundingRect = boundingRect; - emit boundingRectChanged(); + Q_EMIT boundingRectChanged(); } } diff --git a/src/kcmkwin/common/effectsmodel.cpp b/src/kcmkwin/common/effectsmodel.cpp index 9904200a80..9fe9eb4fdf 100644 --- a/src/kcmkwin/common/effectsmodel.cpp +++ b/src/kcmkwin/common/effectsmodel.cpp @@ -200,7 +200,7 @@ bool EffectsModel::setData(const QModelIndex &index, const QVariant &value, int EffectData &data = m_effects[index.row()]; data.status = Status(value.toInt()); data.changed = data.status != data.originalStatus; - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); if (data.status == Status::Enabled && !data.exclusiveGroup.isEmpty()) { // need to disable all other exclusive effects in the same category @@ -212,7 +212,7 @@ bool EffectsModel::setData(const QModelIndex &index, const QVariant &value, int if (otherData.exclusiveGroup == data.exclusiveGroup) { otherData.status = Status::Disabled; otherData.changed = otherData.status != otherData.originalStatus; - emit dataChanged(this->index(i, 0), this->index(i, 0)); + Q_EMIT dataChanged(this->index(i, 0), this->index(i, 0)); } } } @@ -438,7 +438,7 @@ void EffectsModel::load(LoadOptions options) m_pendingEffects.clear(); endResetModel(); - emit loaded(); + Q_EMIT loaded(); }; OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp index ccd211590c..057bd8c77f 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp @@ -76,7 +76,7 @@ void PreviewBridge::setPlugin(const QString &plugin) return; } m_plugin = plugin; - emit pluginChanged(); + Q_EMIT pluginChanged(); } QString PreviewBridge::theme() const @@ -90,7 +90,7 @@ void PreviewBridge::setTheme(const QString &theme) return; } m_theme = theme; - emit themeChanged(); + Q_EMIT themeChanged(); } QString PreviewBridge::plugin() const @@ -129,7 +129,7 @@ void PreviewBridge::setValid(bool valid) return; } m_valid = valid; - emit validChanged(); + Q_EMIT validChanged(); } Decoration *PreviewBridge::createDecoration(QObject *parent) @@ -177,7 +177,7 @@ void PreviewBridge::configure(QQuickItem *ctx) auto save = [this,kcm] { kcm->save(); if (m_lastCreatedSettings) { - emit m_lastCreatedSettings->decorationSettings()->reconfigured(); + Q_EMIT m_lastCreatedSettings->decorationSettings()->reconfigured(); } // Send signal to all kwin instances QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KWin"), diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp index ceaa424ee0..27c0364ec2 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp @@ -36,7 +36,7 @@ void PreviewButtonItem::setType(KDecoration2::DecorationButtonType type) return; } m_type = type; - emit typeChanged(); + Q_EMIT typeChanged(); } KDecoration2::DecorationButtonType PreviewButtonItem::type() const @@ -55,7 +55,7 @@ void PreviewButtonItem::setBridge(PreviewBridge *bridge) return; } m_bridge = bridge; - emit bridgeChanged(); + Q_EMIT bridgeChanged(); } Settings *PreviewButtonItem::settings() const @@ -69,7 +69,7 @@ void PreviewButtonItem::setSettings(Settings *settings) return; } m_settings = settings; - emit settingsChanged(); + Q_EMIT settingsChanged(); } int PreviewButtonItem::typeAsInt() const diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp index 05d105cd8b..55766f2dc0 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp @@ -68,37 +68,37 @@ PreviewClient::PreviewClient(DecoratedClient *c, Decoration *decoration) connect(this, &PreviewClient::paletteChanged, c, &DecoratedClient::paletteChanged); connect(this, &PreviewClient::maximizedVerticallyChanged, this, [this]() { - emit maximizedChanged(isMaximized()); + Q_EMIT maximizedChanged(isMaximized()); } ); connect(this, &PreviewClient::maximizedHorizontallyChanged, this, [this]() { - emit maximizedChanged(isMaximized()); + Q_EMIT maximizedChanged(isMaximized()); } ); connect(this, &PreviewClient::iconNameChanged, this, [this]() { m_icon = QIcon::fromTheme(m_iconName); - emit iconChanged(m_icon); + Q_EMIT iconChanged(m_icon); } ); connect(this, &PreviewClient::desktopChanged, this, [this]() { - emit onAllDesktopsChanged(isOnAllDesktops()); + Q_EMIT onAllDesktopsChanged(isOnAllDesktops()); } ); connect(&m_palette, &KWin::Decoration::DecorationPalette::changed, [this]() { - emit paletteChanged(m_palette.palette()); + Q_EMIT paletteChanged(m_palette.palette()); }); auto emitEdgesChanged = [this, c]() { - emit c->adjacentScreenEdgesChanged(adjacentScreenEdges()); + Q_EMIT c->adjacentScreenEdgesChanged(adjacentScreenEdges()); }; connect(this, &PreviewClient::bordersTopEdgeChanged, this, emitEdgesChanged); connect(this, &PreviewClient::bordersLeftEdgeChanged, this, emitEdgesChanged); connect(this, &PreviewClient::bordersRightEdgeChanged, this, emitEdgesChanged); connect(this, &PreviewClient::bordersBottomEdgeChanged, this, emitEdgesChanged); auto emitSizeChanged = [c]() { - emit c->sizeChanged(c->size()); + Q_EMIT c->sizeChanged(c->size()); }; connect(this, &PreviewClient::widthChanged, this, emitSizeChanged); connect(this, &PreviewClient::heightChanged, this, emitSizeChanged); @@ -111,7 +111,7 @@ PreviewClient::~PreviewClient() = default; void PreviewClient::setIcon(const QIcon &pixmap) { m_icon = pixmap; - emit iconChanged(m_icon); + Q_EMIT iconChanged(m_icon); } int PreviewClient::width() const @@ -153,7 +153,7 @@ void PreviewClient::setDesktop(int desktop) return; } m_desktop = desktop; - emit desktopChanged(m_desktop); + Q_EMIT desktopChanged(m_desktop); } QIcon PreviewClient::icon() const @@ -315,7 +315,7 @@ void PreviewClient::setBordersBottomEdge(bool enabled) return; } m_bordersBottomEdge = enabled; - emit bordersBottomEdgeChanged(enabled); + Q_EMIT bordersBottomEdgeChanged(enabled); } void PreviewClient::setBordersLeftEdge(bool enabled) @@ -324,7 +324,7 @@ void PreviewClient::setBordersLeftEdge(bool enabled) return; } m_bordersLeftEdge = enabled; - emit bordersLeftEdgeChanged(enabled); + Q_EMIT bordersLeftEdgeChanged(enabled); } void PreviewClient::setBordersRightEdge(bool enabled) @@ -333,7 +333,7 @@ void PreviewClient::setBordersRightEdge(bool enabled) return; } m_bordersRightEdge = enabled; - emit bordersRightEdgeChanged(enabled); + Q_EMIT bordersRightEdgeChanged(enabled); } void PreviewClient::setBordersTopEdge(bool enabled) @@ -342,7 +342,7 @@ void PreviewClient::setBordersTopEdge(bool enabled) return; } m_bordersTopEdge = enabled; - emit bordersTopEdgeChanged(enabled); + Q_EMIT bordersTopEdgeChanged(enabled); } void PreviewClient::requestShowToolTip(const QString &text) @@ -356,7 +356,7 @@ void PreviewClient::requestHideToolTip() void PreviewClient::requestClose() { - emit closeRequested(); + Q_EMIT closeRequested(); } void PreviewClient::requestContextHelp() @@ -378,7 +378,7 @@ void PreviewClient::requestToggleMaximization(Qt::MouseButtons buttons) void PreviewClient::requestMinimize() { - emit minimizeRequested(); + Q_EMIT minimizeRequested(); } void PreviewClient::requestToggleKeepAbove() @@ -394,7 +394,7 @@ void PreviewClient::requestToggleKeepBelow() void PreviewClient::requestShowWindowMenu(const QRect &rect) { Q_UNUSED(rect) - emit showWindowMenuRequested(); + Q_EMIT showWindowMenuRequested(); } void PreviewClient::requestShowApplicationMenu(const QRect &rect, int actionId) @@ -425,7 +425,7 @@ void PreviewClient::name(type variable) \ return; \ } \ m_##variable = variable; \ - emit variable##Changed(m_##variable); \ + Q_EMIT variable##Changed(m_##variable); \ } #define SETTER2(name, variable) SETTER(bool, name, variable) diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp index 83127c834a..ddd8dfc25d 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp @@ -86,7 +86,7 @@ void PreviewItem::setDecoration(Decoration *deco) connect(m_decoration, &Decoration::shadowChanged, this, &PreviewItem::syncSize); connect(m_decoration, &Decoration::shadowChanged, this, &PreviewItem::shadowChanged); connect(m_decoration, &Decoration::damaged, this, [this]() { update(); }); - emit decorationChanged(m_decoration); + Q_EMIT decorationChanged(m_decoration); } QColor PreviewItem::windowColor() const @@ -100,7 +100,7 @@ void PreviewItem::setWindowColor(const QColor &color) return; } m_windowColor = color; - emit windowColorChanged(m_windowColor); + Q_EMIT windowColorChanged(m_windowColor); update(); } @@ -381,7 +381,7 @@ void PreviewItem::setDrawingBackground(bool set) return; } m_drawBackground = set; - emit drawingBackgroundChanged(set); + Q_EMIT drawingBackgroundChanged(set); } PreviewBridge *PreviewItem::bridge() const @@ -401,7 +401,7 @@ void PreviewItem::setBridge(PreviewBridge *bridge) if (m_bridge) { m_bridge->registerPreviewItem(this); } - emit bridgeChanged(); + Q_EMIT bridgeChanged(); } Settings *PreviewItem::settings() const @@ -415,7 +415,7 @@ void PreviewItem::setSettings(Settings *settings) return; } m_settings = settings; - emit settingsChanged(); + Q_EMIT settingsChanged(); } PreviewClient *PreviewItem::client() diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp index 0e71917ab4..cae329d1ec 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp @@ -88,10 +88,10 @@ PreviewSettings::PreviewSettings(DecorationSettings *parent) connect(this, &PreviewSettings::closeOnDoubleClickOnMenuChanged, parent, &DecorationSettings::closeOnDoubleClickOnMenuChanged); connect(this, &PreviewSettings::fontChanged, parent, &DecorationSettings::fontChanged); auto updateLeft = [this, parent]() { - emit parent->decorationButtonsLeftChanged(decorationButtonsLeft()); + Q_EMIT parent->decorationButtonsLeftChanged(decorationButtonsLeft()); }; auto updateRight = [this, parent]() { - emit parent->decorationButtonsRightChanged(decorationButtonsRight()); + Q_EMIT parent->decorationButtonsRightChanged(decorationButtonsRight()); }; connect(m_leftButtons, &QAbstractItemModel::rowsRemoved, this, updateLeft); connect(m_leftButtons, &QAbstractItemModel::rowsMoved, this, updateLeft); @@ -134,7 +134,7 @@ void PreviewSettings::setAlphaChannelSupported(bool supported) return; } m_alphaChannelSupported = supported; - emit alphaChannelSupportedChanged(m_alphaChannelSupported); + Q_EMIT alphaChannelSupportedChanged(m_alphaChannelSupported); } void PreviewSettings::setOnAllDesktopsAvailable(bool available) @@ -143,7 +143,7 @@ void PreviewSettings::setOnAllDesktopsAvailable(bool available) return; } m_onAllDesktopsAvailable = available; - emit onAllDesktopsAvailableChanged(m_onAllDesktopsAvailable); + Q_EMIT onAllDesktopsAvailableChanged(m_onAllDesktopsAvailable); } void PreviewSettings::setCloseOnDoubleClickOnMenu(bool enabled) @@ -152,7 +152,7 @@ void PreviewSettings::setCloseOnDoubleClickOnMenu(bool enabled) return; } m_closeOnDoubleClick = enabled; - emit closeOnDoubleClickOnMenuChanged(enabled); + Q_EMIT closeOnDoubleClickOnMenuChanged(enabled); } QVector< DecorationButtonType > PreviewSettings::decorationButtonsLeft() const @@ -189,8 +189,8 @@ void PreviewSettings::setBorderSizesIndex(int index) return; } m_borderSize = index; - emit borderSizesIndexChanged(index); - emit decorationSettings()->borderSizeChanged(borderSize()); + Q_EMIT borderSizesIndexChanged(index); + Q_EMIT decorationSettings()->borderSizeChanged(borderSize()); } BorderSize PreviewSettings::borderSize() const @@ -204,7 +204,7 @@ void PreviewSettings::setFont(const QFont &font) return; } m_font = font; - emit fontChanged(m_font); + Q_EMIT fontChanged(m_font); } Settings::Settings(QObject *parent) @@ -221,7 +221,7 @@ void Settings::setBridge(PreviewBridge *bridge) return; } m_bridge = bridge; - emit bridgeChanged(); + Q_EMIT bridgeChanged(); } PreviewBridge *Settings::bridge() const @@ -239,7 +239,7 @@ void Settings::createSettings() m_previewSettings->setBorderSizesIndex(m_borderSize); connect(this, &Settings::borderSizesIndexChanged, m_previewSettings, &PreviewSettings::setBorderSizesIndex); } - emit settingsChanged(); + Q_EMIT settingsChanged(); } QSharedPointer Settings::settings() const @@ -258,7 +258,7 @@ void Settings::setBorderSizesIndex(int index) return; } m_borderSize = index; - emit borderSizesIndexChanged(m_borderSize); + Q_EMIT borderSizesIndexChanged(m_borderSize); } } diff --git a/src/kcmkwin/kwindecoration/kcm.cpp b/src/kcmkwin/kwindecoration/kcm.cpp index de2176acdf..80e70bc4b3 100644 --- a/src/kcmkwin/kwindecoration/kcm.cpp +++ b/src/kcmkwin/kwindecoration/kcm.cpp @@ -115,7 +115,7 @@ void KCMKWinDecoration::load() setBorderSize(borderSizeIndexFromString(settings()->borderSize())); - emit themeChanged(); + Q_EMIT themeChanged(); } void KCMKWinDecoration::save() @@ -225,7 +225,7 @@ void KCMKWinDecoration::setBorderSize(int index) { if (m_borderSizeIndex != index) { m_borderSizeIndex = index; - emit borderSizeChanged(); + Q_EMIT borderSizeChanged(); } } @@ -240,7 +240,7 @@ void KCMKWinDecoration::setTheme(int index) if (dataIndex.isValid()) { settings()->setTheme(m_proxyThemesModel->data(dataIndex, KDecoration2::Configuration::DecorationsModel::ThemeNameRole).toString()); settings()->setPluginName(m_proxyThemesModel->data(dataIndex, KDecoration2::Configuration::DecorationsModel::PluginNameRole).toString()); - emit themeChanged(); + Q_EMIT themeChanged(); } } diff --git a/src/kcmkwin/kwindesktop/animationsmodel.cpp b/src/kcmkwin/kwindesktop/animationsmodel.cpp index 28d79d38d9..7359664693 100644 --- a/src/kcmkwin/kwindesktop/animationsmodel.cpp +++ b/src/kcmkwin/kwindesktop/animationsmodel.cpp @@ -33,7 +33,7 @@ AnimationsModel::AnimationsModel(QObject *parent) const bool configurable = index_.data(ConfigurableRole).toBool(); if (configurable != m_currentConfigurable) { m_currentConfigurable = configurable; - emit currentConfigurableChanged(); + Q_EMIT currentConfigurableChanged(); } } ); @@ -48,7 +48,7 @@ void AnimationsModel::setAnimationEnabled(bool enabled) { if (m_animationEnabled != enabled) { m_animationEnabled = enabled; - emit animationEnabledChanged(); + Q_EMIT animationEnabledChanged(); } } @@ -61,7 +61,7 @@ void AnimationsModel::setAnimationIndex(int index) { if (m_animationIndex != index) { m_animationIndex = index; - emit animationIndexChanged(); + Q_EMIT animationIndexChanged(); } } @@ -98,8 +98,8 @@ void AnimationsModel::loadDefaults() if (rowIndex.data(EnabledByDefaultRole).toBool()) { m_defaultAnimationEnabled = true; m_defaultAnimationIndex = i; - emit defaultAnimationEnabledChanged(); - emit defaultAnimationIndexChanged(); + Q_EMIT defaultAnimationEnabledChanged(); + Q_EMIT defaultAnimationIndexChanged(); break; } } diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcmkwin/kwindesktop/desktopsmodel.cpp index dde4175039..491c7ebdeb 100644 --- a/src/kcmkwin/kwindesktop/desktopsmodel.cpp +++ b/src/kcmkwin/kwindesktop/desktopsmodel.cpp @@ -171,8 +171,8 @@ void DesktopsModel::setRows(int rows) if (m_rows != rows) { m_rows = rows; - emit rowsChanged(); - emit dataChanged(index(0, 0), index(m_desktops.count() - 1, 0), QVector{DesktopRow}); + Q_EMIT rowsChanged(); + Q_EMIT dataChanged(index(0, 0), index(m_desktops.count() - 1, 0), QVector{DesktopRow}); updateModifiedState(); } @@ -197,7 +197,7 @@ void DesktopsModel::createDesktop(const QString &name) m_names[dummyId] = name; endInsertRows(); - emit desktopCountChanged(); + Q_EMIT desktopCountChanged(); updateModifiedState(); } @@ -216,7 +216,7 @@ void DesktopsModel::removeDesktop(const QString &id) m_names.remove(id); endRemoveRows(); - emit desktopCountChanged(); + Q_EMIT desktopCountChanged(); updateModifiedState(); } @@ -231,7 +231,7 @@ void DesktopsModel::setDesktopName(const QString &id, const QString &name) const QModelIndex &idx = index(m_desktops.indexOf(id), 0); - emit dataChanged(idx, idx, QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(idx, idx, QVector{Qt::DisplayRole}); updateModifiedState(); } @@ -308,7 +308,7 @@ void DesktopsModel::syncWithServer() m_names[newId] = m_names.take(oldId); } - emit dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector{Qt::DisplayRole}); // Sync names. if (m_names != m_serverSideNames) { @@ -440,7 +440,7 @@ void DesktopsModel::getAllAndConnect(const QDBusMessage &msg) || m_serverSideRows != newServerSideRows) { if (!m_serverSideDesktops.isEmpty() || m_userModified) { m_serverModified = true; - emit serverModifiedChanged(); + Q_EMIT serverModifiedChanged(); } m_serverSideDesktops = newServerSideDesktops; @@ -460,11 +460,11 @@ void DesktopsModel::getAllAndConnect(const QDBusMessage &msg) endResetModel(); } - emit readyChanged(); + Q_EMIT readyChanged(); auto handleConnectionError = [this]() { m_error = i18n("There was an error connecting to the compositor."); - emit errorChanged(); + Q_EMIT errorChanged(); }; bool connected = QDBusConnection::sessionBus().connect( @@ -544,7 +544,7 @@ void DesktopsModel::desktopCreated(const QString &id, const KWin::DBusDesktopDat m_names.remove(dummyId); m_names[id] = data.name; const QModelIndex &idx = index(data.position, 0); - emit dataChanged(idx, idx, QVector{Id}); + Q_EMIT dataChanged(idx, idx, QVector{Id}); updateModifiedState(/* server */ true); } @@ -584,7 +584,7 @@ void DesktopsModel::desktopDataChanged(const QString &id, const KWin::DBusDeskto const QModelIndex &idx = index(desktopIndex, 0); - emit dataChanged(idx, idx, QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(idx, idx, QVector{Qt::DisplayRole}); } else { updateModifiedState(/* server */ true); } @@ -603,8 +603,8 @@ void DesktopsModel::desktopRowsChanged(uint rows) if (!m_userModified) { m_rows = m_serverSideRows; - emit rowsChanged(); - emit dataChanged(index(0, 0), index(m_desktops.count() - 1, 0), QVector{DesktopRow}); + Q_EMIT rowsChanged(); + Q_EMIT dataChanged(index(0, 0), index(m_desktops.count() - 1, 0), QVector{DesktopRow}); } else { updateModifiedState(/* server */ true); } @@ -627,7 +627,7 @@ void DesktopsModel::updateModifiedState(bool server) m_names[newId] = m_names.take(oldId); } - emit dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector{Qt::DisplayRole}); + Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector{Qt::DisplayRole}); } if (m_desktops == m_serverSideDesktops @@ -635,22 +635,22 @@ void DesktopsModel::updateModifiedState(bool server) && m_rows == m_serverSideRows) { m_userModified = false; - emit userModifiedChanged(); + Q_EMIT userModifiedChanged(); m_serverModified = false; - emit serverModifiedChanged(); + Q_EMIT serverModifiedChanged(); } else { if (m_pendingCalls > 0) { m_serverModified = false; - emit serverModifiedChanged(); + Q_EMIT serverModifiedChanged(); syncWithServer(); } else if (server) { m_serverModified = true; - emit serverModifiedChanged(); + Q_EMIT serverModifiedChanged(); } else { m_userModified = true; - emit userModifiedChanged(); + Q_EMIT userModifiedChanged(); } } } @@ -660,13 +660,13 @@ void DesktopsModel::handleCallError() if (m_pendingCalls > 0) { m_serverModified = false; - emit serverModifiedChanged(); + Q_EMIT serverModifiedChanged(); m_error = i18n("There was an error saving the settings to the compositor."); - emit errorChanged(); + Q_EMIT errorChanged(); } else { m_error = i18n("There was an error requesting information from the compositor."); - emit errorChanged(); + Q_EMIT errorChanged(); } } diff --git a/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp b/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp index 6b212e34a4..1bd85279cb 100644 --- a/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp +++ b/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp @@ -29,7 +29,7 @@ void EffectsFilterProxyModel::setQuery(const QString &query) { if (m_query != query) { m_query = query; - emit queryChanged(); + Q_EMIT queryChanged(); invalidateFilter(); } } @@ -43,7 +43,7 @@ void EffectsFilterProxyModel::setExcludeInternal(bool exclude) { if (m_excludeInternal != exclude) { m_excludeInternal = exclude; - emit excludeInternalChanged(); + Q_EMIT excludeInternalChanged(); invalidateFilter(); } } @@ -57,7 +57,7 @@ void EffectsFilterProxyModel::setExcludeUnsupported(bool exclude) { if (m_excludeUnsupported != exclude) { m_excludeUnsupported = exclude; - emit excludeUnsupportedChanged(); + Q_EMIT excludeUnsupportedChanged(); invalidateFilter(); } } diff --git a/src/kcmkwin/kwinoptions/main.cpp b/src/kcmkwin/kwinoptions/main.cpp index 05f6040071..66d1224a52 100644 --- a/src/kcmkwin/kwinoptions/main.cpp +++ b/src/kcmkwin/kwinoptions/main.cpp @@ -224,7 +224,7 @@ void KActionsOptions::save() mTitleBarActions->save(); mWindowActions->save(); - emit KCModule::changed(false); + Q_EMIT KCModule::changed(false); // Send signal to all kwin instances QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); @@ -239,7 +239,7 @@ void KActionsOptions::defaults() void KActionsOptions::moduleChanged(bool state) { - emit KCModule::changed(state); + Q_EMIT KCModule::changed(state); } K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory, diff --git a/src/kcmkwin/kwinrules/kcmrules.cpp b/src/kcmkwin/kwinrules/kcmrules.cpp index 881416f815..822050c609 100644 --- a/src/kcmkwin/kwinrules/kcmrules.cpp +++ b/src/kcmkwin/kwinrules/kcmrules.cpp @@ -116,7 +116,7 @@ void KCMKWinRules::load() createRuleFromProperties(); } else { m_editIndex = QModelIndex(); - emit editIndexChanged(); + Q_EMIT editIndexChanged(); } m_alreadyLoaded = true; @@ -136,7 +136,7 @@ void KCMKWinRules::save() void KCMKWinRules::updateNeedsSave() { setNeedsSave(m_ruleBookModel->isSaveNeeded()); - emit needsSaveChanged(); + Q_EMIT needsSaveChanged(); } void KCMKWinRules::createRuleFromProperties() @@ -191,7 +191,7 @@ void KCMKWinRules::editRule(int index) } m_editIndex = m_ruleBookModel->index(index); - emit editIndexChanged(); + Q_EMIT editIndexChanged(); m_rulesModel->setSettings(m_ruleBookModel->ruleSettingsAt(m_editIndex.row())); @@ -217,7 +217,7 @@ void KCMKWinRules::removeRule(int index) m_ruleBookModel->removeRow(index); - emit editIndexChanged(); + Q_EMIT editIndexChanged(); updateNeedsSave(); } @@ -232,7 +232,7 @@ void KCMKWinRules::moveRule(int sourceIndex, int destIndex) m_ruleBookModel->moveRow(QModelIndex(), sourceIndex, QModelIndex(), destIndex); - emit editIndexChanged(); + Q_EMIT editIndexChanged(); updateNeedsSave(); } diff --git a/src/kcmkwin/kwinrules/kcmrules.h b/src/kcmkwin/kwinrules/kcmrules.h index 555bb0c4aa..06aba842c6 100644 --- a/src/kcmkwin/kwinrules/kcmrules.h +++ b/src/kcmkwin/kwinrules/kcmrules.h @@ -38,14 +38,14 @@ public: Q_INVOKABLE void exportToFile(const QUrl &path, const QList &indexes); Q_INVOKABLE void importFromFile(const QUrl &path); -public slots: +public Q_SLOTS: void load() override; void save() override; -signals: +Q_SIGNALS: void editIndexChanged(); -private slots: +private Q_SLOTS: void updateNeedsSave(); private: diff --git a/src/kcmkwin/kwinrules/optionsmodel.cpp b/src/kcmkwin/kwinrules/optionsmodel.cpp index 729c323f81..7d4fdeef76 100644 --- a/src/kcmkwin/kwinrules/optionsmodel.cpp +++ b/src/kcmkwin/kwinrules/optionsmodel.cpp @@ -94,14 +94,14 @@ void OptionsModel::setValue(QVariant value) int index = indexOf(value); if (index >= 0 && index != m_index) { m_index = index; - emit selectedIndexChanged(index); + Q_EMIT selectedIndexChanged(index); } } void OptionsModel::resetValue() { m_index = 0; - emit selectedIndexChanged(m_index); + Q_EMIT selectedIndexChanged(m_index); } void OptionsModel::updateModelData(const QList &data) { diff --git a/src/kcmkwin/kwinrules/optionsmodel.h b/src/kcmkwin/kwinrules/optionsmodel.h index 397f791438..d23a5cf958 100644 --- a/src/kcmkwin/kwinrules/optionsmodel.h +++ b/src/kcmkwin/kwinrules/optionsmodel.h @@ -59,7 +59,7 @@ public: Q_INVOKABLE QString textOfValue(const QVariant &value) const; int selectedIndex() const; -signals: +Q_SIGNALS: void selectedIndexChanged(int index); public: diff --git a/src/kcmkwin/kwinrules/rulebookmodel.cpp b/src/kcmkwin/kwinrules/rulebookmodel.cpp index 4f879c7b19..f28c71feeb 100644 --- a/src/kcmkwin/kwinrules/rulebookmodel.cpp +++ b/src/kcmkwin/kwinrules/rulebookmodel.cpp @@ -153,7 +153,7 @@ void RuleBookModel::setDescriptionAt(int row, const QString &description) m_ruleBook->ruleSettingsAt(row)->setDescription(description); - emit dataChanged(index(row), index(row), {}); + Q_EMIT dataChanged(index(row), index(row), {}); } void RuleBookModel::setRuleSettingsAt(int row, const RuleSettings &settings) @@ -162,7 +162,7 @@ void RuleBookModel::setRuleSettingsAt(int row, const RuleSettings &settings) copySettingsTo(ruleSettingsAt(row), settings); - emit dataChanged(index(row), index(row), {}); + Q_EMIT dataChanged(index(row), index(row), {}); } void RuleBookModel::load() diff --git a/src/kcmkwin/kwinrules/rulesmodel.cpp b/src/kcmkwin/kwinrules/rulesmodel.cpp index b45b077287..b063a92225 100644 --- a/src/kcmkwin/kwinrules/rulesmodel.cpp +++ b/src/kcmkwin/kwinrules/rulesmodel.cpp @@ -156,12 +156,12 @@ bool RulesModel::setData(const QModelIndex &index, const QVariant &value, int ro writeToSettings(rule); - emit dataChanged(index, index, QVector{role}); + Q_EMIT dataChanged(index, index, QVector{role}); if (rule->hasFlag(RuleItem::AffectsDescription)) { - emit descriptionChanged(); + Q_EMIT descriptionChanged(); } if (rule->hasFlag(RuleItem::AffectsWarning)) { - emit warningMessagesChanged(); + Q_EMIT warningMessagesChanged(); } return true; @@ -325,8 +325,8 @@ void RulesModel::setSettings(RuleSettings *settings) endResetModel(); - emit descriptionChanged(); - emit warningMessagesChanged(); + Q_EMIT descriptionChanged(); + Q_EMIT warningMessagesChanged(); } void RulesModel::writeToSettings(RuleItem *rule) @@ -704,7 +704,7 @@ void RulesModel::setSuggestedProperties(const QVariantMap &info) m_rules[ruleKey]->setSuggestedValue(info.value(property)); } - emit dataChanged(index(0), index(rowCount()-1), {RulesModel::SuggestedValueRole}); + Q_EMIT dataChanged(index(0), index(rowCount()-1), {RulesModel::SuggestedValueRole}); } @@ -836,13 +836,13 @@ void RulesModel::selectX11Window() self->deleteLater(); if (!reply.isValid()) { if (reply.error().name() == QLatin1String("org.kde.KWin.Error.InvalidWindow")) { - emit showErrorMessage(i18n("Could not detect window properties. The window is not managed by KWin.")); + Q_EMIT showErrorMessage(i18n("Could not detect window properties. The window is not managed by KWin.")); } return; } const QVariantMap windowInfo = reply.value(); setSuggestedProperties(windowInfo); - emit showSuggestions(); + Q_EMIT showSuggestions(); } ); } @@ -869,7 +869,7 @@ void RulesModel::updateVirtualDesktops() return; } m_virtualDesktops = qdbus_cast(reply.value()); - emit virtualDesktopsUpdated(); + Q_EMIT virtualDesktopsUpdated(); } ); } diff --git a/src/kcmkwin/kwinrules/rulesmodel.h b/src/kcmkwin/kwinrules/rulesmodel.h index 88febe4744..05ab67b58e 100644 --- a/src/kcmkwin/kwinrules/rulesmodel.h +++ b/src/kcmkwin/kwinrules/rulesmodel.h @@ -75,7 +75,7 @@ public: Q_INVOKABLE void detectWindowProperties(int miliseconds); -signals: +Q_SIGNALS: void descriptionChanged(); void warningMessagesChanged(); @@ -105,7 +105,7 @@ private: QList focusModelData() const; QList colorSchemesModelData() const; -private slots: +private Q_SLOTS: void selectX11Window(); private: diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp b/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp index e71e907f92..d4d269eee7 100644 --- a/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp +++ b/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp @@ -192,13 +192,13 @@ void KWinScreenEdge::onChanged() for (auto it = m_reference.cbegin(); it != m_reference.cend(); ++it) { needSave |= it.value() != monitor()->selectedEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key())); } - emit saveNeededChanged(needSave); + Q_EMIT saveNeededChanged(needSave); bool defaults = isDefault(); for (auto it = m_default.cbegin(); it != m_default.cend(); ++it) { defaults &= it.value() == monitor()->selectedEdgeItem(KWinScreenEdge::electricBorderToMonitorEdge(it.key())); } - emit defaultChanged(defaults); + Q_EMIT defaultChanged(defaults); } void KWinScreenEdge::createConnection() diff --git a/src/kcmkwin/kwinscreenedges/monitor.cpp b/src/kcmkwin/kwinscreenedges/monitor.cpp index c12ca2b91e..35dee1d936 100644 --- a/src/kcmkwin/kwinscreenedges/monitor.cpp +++ b/src/kcmkwin/kwinscreenedges/monitor.cpp @@ -183,7 +183,7 @@ void Monitor::selectEdgeItem(int edge, int index) int Monitor::selectedEdgeItem(int edge) const { - foreach (QAction * act, popup_actions[ edge ]) + Q_FOREACH (QAction * act, popup_actions[ edge ]) if (act->isChecked()) return popup_actions[ edge ].indexOf(act); abort(); @@ -199,8 +199,8 @@ void Monitor::popup(Corner* c, QPoint pos) return; if (QAction* a = popups[ i ]->exec(pos)) { selectEdgeItem(i, popup_actions[ i ].indexOf(a)); - emit changed(); - emit edgeSelectionChanged(i, popup_actions[ i ].indexOf(a)); + Q_EMIT changed(); + Q_EMIT edgeSelectionChanged(i, popup_actions[ i ].indexOf(a)); c->setToolTip(KLocalizedString::removeAcceleratorMarker(a->text())); } return; diff --git a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp b/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp index b506318677..19bfada7c9 100644 --- a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp +++ b/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp @@ -142,7 +142,7 @@ void ScreenPreviewWidget::dropEvent(QDropEvent *e) if (!uris.isEmpty()) { // TODO: Download remote file if (uris.first().isLocalFile()) - emit imageDropped(uris.first().path()); + Q_EMIT imageDropped(uris.first().path()); } } diff --git a/src/kcmkwin/kwinscripts/module.cpp b/src/kcmkwin/kwinscripts/module.cpp index 254ec9b259..35cc0ef10b 100644 --- a/src/kcmkwin/kwinscripts/module.cpp +++ b/src/kcmkwin/kwinscripts/module.cpp @@ -137,7 +137,7 @@ void Module::importScriptInstallFinished(KJob *job) updateListViewContents(); - emit changed(true); + Q_EMIT changed(true); } void Module::updateListViewContents() @@ -159,7 +159,7 @@ void Module::load() updateListViewContents(); ui->scriptSelector->load(); - emit changed(false); + Q_EMIT changed(false); } void Module::save() @@ -189,5 +189,5 @@ void Module::save() QDBusMessage message = QDBusMessage::createMethodCall("org.kde.KWin", "/Scripting", "org.kde.kwin.Scripting", "start"); QDBusConnection::sessionBus().asyncCall(message); - emit changed(false); + Q_EMIT changed(false); } diff --git a/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp b/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp index 0d88e46de8..b1b7b98549 100644 --- a/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp +++ b/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp @@ -381,37 +381,37 @@ void KWinTabBoxConfigForm::tabBoxToggled(bool on) void KWinTabBoxConfigForm::onFilterScreen() { - emit filterScreenChanged(filterScreen()); + Q_EMIT filterScreenChanged(filterScreen()); } void KWinTabBoxConfigForm::onFilterDesktop() { - emit filterDesktopChanged(filterDesktop()); + Q_EMIT filterDesktopChanged(filterDesktop()); } void KWinTabBoxConfigForm::onFilterActivites() { - emit filterActivitiesChanged(filterActivities()); + Q_EMIT filterActivitiesChanged(filterActivities()); } void KWinTabBoxConfigForm::onFilterMinimization() { - emit filterMinimizationChanged(filterMinimization()); + Q_EMIT filterMinimizationChanged(filterMinimization()); } void KWin::KWinTabBoxConfigForm::onApplicationMode() { - emit applicationModeChanged(applicationMode()); + Q_EMIT applicationModeChanged(applicationMode()); } void KWinTabBoxConfigForm::onShowDesktopMode() { - emit showDesktopModeChanged(showDesktopMode()); + Q_EMIT showDesktopModeChanged(showDesktopMode()); } void KWinTabBoxConfigForm::onSwitchingMode() { - emit switchingModeChanged(switchingMode()); + Q_EMIT switchingModeChanged(switchingMode()); } void KWinTabBoxConfigForm::onEffectCombo() @@ -423,7 +423,7 @@ void KWinTabBoxConfigForm::onEffectCombo() } ui->kcfg_HighlightWindows->setEnabled(isAddonEffect && m_isHighlightWindowsEnabled); - emit layoutNameChanged(layoutName()); + Q_EMIT layoutNameChanged(layoutName()); } void KWinTabBoxConfigForm::shortcutChanged(const QKeySequence &seq) diff --git a/src/kcmkwin/kwintabbox/layoutpreview.cpp b/src/kcmkwin/kwintabbox/layoutpreview.cpp index 2fd7468f5d..cca82acc78 100644 --- a/src/kcmkwin/kwintabbox/layoutpreview.cpp +++ b/src/kcmkwin/kwintabbox/layoutpreview.cpp @@ -211,13 +211,13 @@ void SwitcherItem::setVisible(bool visible) return; } m_visible = visible; - emit visibleChanged(); + Q_EMIT visibleChanged(); } void SwitcherItem::setItem(QObject *item) { m_item = item; - emit itemChanged(); + Q_EMIT itemChanged(); } void SwitcherItem::setCurrentIndex(int index) @@ -226,7 +226,7 @@ void SwitcherItem::setCurrentIndex(int index) return; } m_currentIndex = index; - emit currentIndexChanged(m_currentIndex); + Q_EMIT currentIndexChanged(m_currentIndex); } QRect SwitcherItem::screenGeometry() const diff --git a/src/kcmkwin/kwintabbox/thumbnailitem.cpp b/src/kcmkwin/kwintabbox/thumbnailitem.cpp index ea2f8f9c61..a1abb3c55c 100644 --- a/src/kcmkwin/kwintabbox/thumbnailitem.cpp +++ b/src/kcmkwin/kwintabbox/thumbnailitem.cpp @@ -111,7 +111,7 @@ WindowThumbnailItem::~WindowThumbnailItem() void WindowThumbnailItem::setWId(qulonglong wId) { m_wId = wId; - emit wIdChanged(wId); + Q_EMIT wIdChanged(wId); findImage(); } @@ -121,7 +121,7 @@ void WindowThumbnailItem::setClipTo(QQuickItem *clip) return; } m_clipToItem = clip; - emit clipToChanged(); + Q_EMIT clipToChanged(); } void WindowThumbnailItem::findImage() @@ -192,7 +192,7 @@ void WindowThumbnailItem::setBrightness(qreal brightness) } m_brightness = brightness; update(); - emit brightnessChanged(); + Q_EMIT brightnessChanged(); } void WindowThumbnailItem::setSaturation(qreal saturation) @@ -202,7 +202,7 @@ void WindowThumbnailItem::setSaturation(qreal saturation) } m_saturation = saturation; update(); - emit saturationChanged(); + Q_EMIT saturationChanged(); } } // namespace KWin diff --git a/src/keyboard_input.cpp b/src/keyboard_input.cpp index 3f7d717670..b195d24b35 100644 --- a/src/keyboard_input.cpp +++ b/src/keyboard_input.cpp @@ -57,7 +57,7 @@ public: if (event->isAutoRepeat()) { return; } - emit m_input->keyStateChanged(event->nativeScanCode(), event->type() == QEvent::KeyPress ? InputRedirection::KeyboardKeyPressed : InputRedirection::KeyboardKeyReleased); + Q_EMIT m_input->keyStateChanged(event->nativeScanCode(), event->type() == QEvent::KeyPress ? InputRedirection::KeyboardKeyPressed : InputRedirection::KeyboardKeyReleased); } private: @@ -86,7 +86,7 @@ public: if (mods == m_modifiers) { return; } - emit m_input->keyboardModifiersChanged(mods, m_modifiers); + Q_EMIT m_input->keyboardModifiersChanged(mods, m_modifiers); m_modifiers = mods; } diff --git a/src/keyboard_layout.cpp b/src/keyboard_layout.cpp index 8ebc095a94..d2508fe3cf 100644 --- a/src/keyboard_layout.cpp +++ b/src/keyboard_layout.cpp @@ -121,7 +121,7 @@ void KeyboardLayout::resetLayout() loadShortcuts(); initDBusInterface(); - emit layoutsReconfigured(); + Q_EMIT layoutsReconfigured(); } void KeyboardLayout::loadShortcuts() @@ -157,7 +157,7 @@ void KeyboardLayout::checkLayoutChange(uint previousLayout) if (m_layout != currentLayout || previousLayout != currentLayout) { m_layout = currentLayout; notifyLayoutChange(); - emit layoutChanged(currentLayout); + Q_EMIT layoutChanged(currentLayout); } } diff --git a/src/keyboard_layout_switching.cpp b/src/keyboard_layout_switching.cpp index 081e9e22e7..2a71192399 100644 --- a/src/keyboard_layout_switching.cpp +++ b/src/keyboard_layout_switching.cpp @@ -38,7 +38,7 @@ void Policy::setLayout(uint index) m_xkb->switchToLayout(index); const uint currentLayout = m_xkb->currentLayout(); if (previousLayout != currentLayout) { - emit m_layout->layoutChanged(currentLayout); + Q_EMIT m_layout->layoutChanged(currentLayout); } } diff --git a/src/keyboard_repeat.cpp b/src/keyboard_repeat.cpp index c8a6e3e85d..cc946b624e 100644 --- a/src/keyboard_repeat.cpp +++ b/src/keyboard_repeat.cpp @@ -36,7 +36,7 @@ void KeyboardRepeat::handleKeyRepeat() m_timer->setInterval(1000 / waylandServer()->seat()->keyboard()->keyRepeatRate()); } // TODO: better time - emit keyRepeat(m_key, m_time); + Q_EMIT keyRepeat(m_key, m_time); } void KeyboardRepeat::keyEvent(KeyEvent *event) diff --git a/src/layers.cpp b/src/layers.cpp index 8d013589d7..e4886f588e 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -105,7 +105,7 @@ void Workspace::updateStackingOrder(bool propagate_new_clients) if (changed || propagate_new_clients) { propagateClients(propagate_new_clients); markXStackingOrderAsDirty(); - emit stackingOrderChanged(); + Q_EMIT stackingOrderChanged(); if (m_compositor) { m_compositor->addRepaintFull(); } @@ -255,7 +255,7 @@ AbstractClient* Workspace::findDesktop(bool topmost, int desktop) const return c; } } else { // bottom-most - foreach (Toplevel * c, stacking_order) { + Q_FOREACH (Toplevel * c, stacking_order) { AbstractClient *client = qobject_cast(c); if (client && c->isOnDesktop(desktop) && c->isDesktop() && client->isShown(true)) @@ -349,7 +349,7 @@ void Workspace::raiseClient(AbstractClient* c, bool nogroup) AbstractClient *transient_parent = c; while ((transient_parent = transient_parent->transientFor())) transients << transient_parent; - foreach (transient_parent, transients) + Q_FOREACH (transient_parent, transients) raiseClient(transient_parent, true); } @@ -726,7 +726,7 @@ void X11Client::restackWindow(xcb_window_t above, int detail, NET::RequestSource bool X11Client::belongsToDesktop() const { - foreach (const X11Client *c, group()->members()) { + Q_FOREACH (const X11Client *c, group()->members()) { if (c->isDesktop()) return true; } diff --git a/src/layershellv1client.cpp b/src/layershellv1client.cpp index 198a0872ca..47ddaea6a0 100644 --- a/src/layershellv1client.cpp +++ b/src/layershellv1client.cpp @@ -178,7 +178,7 @@ void LayerShellV1Client::destroyClient() markAsZombie(); cleanTabBox(); Deleted *deleted = Deleted::create(this); - emit windowClosed(this, deleted); + Q_EMIT windowClosed(this, deleted); StackingUpdatesBlocker blocker(workspace()); cleanGrouping(); waylandServer()->removeClient(this); diff --git a/src/layershellv1integration.cpp b/src/layershellv1integration.cpp index cdf99bbc25..5bc395f381 100644 --- a/src/layershellv1integration.cpp +++ b/src/layershellv1integration.cpp @@ -49,7 +49,7 @@ void LayerShellV1Integration::createClient(LayerSurfaceV1Interface *shellSurface return; } - emit clientCreated(new LayerShellV1Client(shellSurface, output, this)); + Q_EMIT clientCreated(new LayerShellV1Client(shellSurface, output, this)); } void LayerShellV1Integration::recreateClient(LayerSurfaceV1Interface *shellSurface) diff --git a/src/libinput/connection.cpp b/src/libinput/connection.cpp index 9fdb34d4cf..4a192ecba0 100644 --- a/src/libinput/connection.cpp +++ b/src/libinput/connection.cpp @@ -185,10 +185,10 @@ void Connection::setup() void Connection::doSetup() { connect(s_self, &Connection::deviceAdded, s_self, [](Device* device) { - emit s_self->deviceAddedSysName(device->sysName()); + Q_EMIT s_self->deviceAddedSysName(device->sysName()); }); connect(s_self, &Connection::deviceRemoved, s_self, [](Device* device) { - emit s_self->deviceRemovedSysName(device->sysName()); + Q_EMIT s_self->deviceRemovedSysName(device->sysName()); }); Q_ASSERT(!m_notifier); @@ -236,7 +236,7 @@ void Connection::handleEvent() m_eventQueue << event; } while (true); if (wasEmpty && !m_eventQueue.isEmpty()) { - emit eventsRead(); + Q_EMIT eventsRead(); } } @@ -340,29 +340,29 @@ void Connection::processEvents() if (device->isAlphaNumericKeyboard()) { m_alphaNumericKeyboard++; if (m_alphaNumericKeyboard == 1) { - emit hasAlphaNumericKeyboardChanged(true); + Q_EMIT hasAlphaNumericKeyboardChanged(true); } } if (m_keyboard == 1) { - emit hasKeyboardChanged(true); + Q_EMIT hasKeyboardChanged(true); } } if (device->isPointer()) { m_pointer++; if (m_pointer == 1) { - emit hasPointerChanged(true); + Q_EMIT hasPointerChanged(true); } } if (device->isTouch()) { m_touch++; if (m_touch == 1) { - emit hasTouchChanged(true); + Q_EMIT hasTouchChanged(true); } } if (device->isTabletModeSwitch()) { m_tabletModeSwitch++; if (m_tabletModeSwitch == 1) { - emit hasTabletModeSwitchChanged(true); + Q_EMIT hasTabletModeSwitchChanged(true); } } applyDeviceConfig(device); @@ -371,7 +371,7 @@ void Connection::processEvents() // enable possible leds libinput_device_led_update(device->device(), static_cast(toLibinputLEDS(m_leds))); - emit deviceAdded(device); + Q_EMIT deviceAdded(device); break; } case LIBINPUT_EVENT_DEVICE_REMOVED: { @@ -382,36 +382,36 @@ void Connection::processEvents() } auto device = *it; m_devices.erase(it); - emit deviceRemoved(device); + Q_EMIT deviceRemoved(device); if (device->isKeyboard()) { m_keyboard--; if (device->isAlphaNumericKeyboard()) { m_alphaNumericKeyboard--; if (m_alphaNumericKeyboard == 0) { - emit hasAlphaNumericKeyboardChanged(false); + Q_EMIT hasAlphaNumericKeyboardChanged(false); } } if (m_keyboard == 0) { - emit hasKeyboardChanged(false); + Q_EMIT hasKeyboardChanged(false); } } if (device->isPointer()) { m_pointer--; if (m_pointer == 0) { - emit hasPointerChanged(false); + Q_EMIT hasPointerChanged(false); } } if (device->isTouch()) { m_touch--; if (m_touch == 0) { - emit hasTouchChanged(false); + Q_EMIT hasTouchChanged(false); } } if (device->isTabletModeSwitch()) { m_tabletModeSwitch--; if (m_tabletModeSwitch == 0) { - emit hasTabletModeSwitchChanged(false); + Q_EMIT hasTabletModeSwitchChanged(false); } } device->deleteLater(); @@ -419,21 +419,21 @@ void Connection::processEvents() } case LIBINPUT_EVENT_KEYBOARD_KEY: { KeyEvent *ke = static_cast(event.data()); - emit keyChanged(ke->key(), ke->state(), ke->time(), ke->device()); + Q_EMIT keyChanged(ke->key(), ke->state(), ke->time(), ke->device()); break; } case LIBINPUT_EVENT_POINTER_AXIS: { PointerEvent *pe = static_cast(event.data()); const auto axes = pe->axis(); for (const InputRedirection::PointerAxis &axis : axes) { - emit pointerAxisChanged(axis, pe->axisValue(axis), pe->discreteAxisValue(axis), + Q_EMIT pointerAxisChanged(axis, pe->axisValue(axis), pe->discreteAxisValue(axis), pe->axisSource(), pe->time(), pe->device()); } break; } case LIBINPUT_EVENT_POINTER_BUTTON: { PointerEvent *pe = static_cast(event.data()); - emit pointerButtonChanged(pe->button(), pe->buttonState(), pe->time(), pe->device()); + Q_EMIT pointerButtonChanged(pe->button(), pe->buttonState(), pe->time(), pe->device()); break; } case LIBINPUT_EVENT_POINTER_MOTION: { @@ -455,12 +455,12 @@ void Connection::processEvents() break; } } - emit pointerMotion(delta, deltaNonAccel, latestTime, latestTimeUsec, pe->device()); + Q_EMIT pointerMotion(delta, deltaNonAccel, latestTime, latestTimeUsec, pe->device()); break; } case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: { PointerEvent *pe = static_cast(event.data()); - emit pointerMotionAbsolute(pe->absolutePos(), pe->absolutePos(m_size), pe->time(), pe->device()); + Q_EMIT pointerMotionAbsolute(pe->absolutePos(), pe->absolutePos(m_size), pe->time(), pe->device()); break; } case LIBINPUT_EVENT_TOUCH_DOWN: { @@ -471,13 +471,13 @@ void Connection::processEvents() const QPointF globalPos = devicePointToGlobalPosition(te->absolutePos(output->modeSize()), output); - emit touchDown(te->id(), globalPos, te->time(), te->device()); + Q_EMIT touchDown(te->id(), globalPos, te->time(), te->device()); break; #endif } case LIBINPUT_EVENT_TOUCH_UP: { TouchEvent *te = static_cast(event.data()); - emit touchUp(te->id(), te->time(), te->device()); + Q_EMIT touchUp(te->id(), te->time(), te->device()); break; } case LIBINPUT_EVENT_TOUCH_MOTION: { @@ -488,53 +488,53 @@ void Connection::processEvents() const QPointF globalPos = devicePointToGlobalPosition(te->absolutePos(output->modeSize()), output); - emit touchMotion(te->id(), globalPos, te->time(), te->device()); + Q_EMIT touchMotion(te->id(), globalPos, te->time(), te->device()); break; #endif } case LIBINPUT_EVENT_TOUCH_CANCEL: { - emit touchCanceled(event->device()); + Q_EMIT touchCanceled(event->device()); break; } case LIBINPUT_EVENT_TOUCH_FRAME: { - emit touchFrame(event->device()); + Q_EMIT touchFrame(event->device()); break; } case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN: { PinchGestureEvent *pe = static_cast(event.data()); - emit pinchGestureBegin(pe->fingerCount(), pe->time(), pe->device()); + Q_EMIT pinchGestureBegin(pe->fingerCount(), pe->time(), pe->device()); break; } case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE: { PinchGestureEvent *pe = static_cast(event.data()); - emit pinchGestureUpdate(pe->scale(), pe->angleDelta(), pe->delta(), pe->time(), pe->device()); + Q_EMIT pinchGestureUpdate(pe->scale(), pe->angleDelta(), pe->delta(), pe->time(), pe->device()); break; } case LIBINPUT_EVENT_GESTURE_PINCH_END: { PinchGestureEvent *pe = static_cast(event.data()); if (pe->isCancelled()) { - emit pinchGestureCancelled(pe->time(), pe->device()); + Q_EMIT pinchGestureCancelled(pe->time(), pe->device()); } else { - emit pinchGestureEnd(pe->time(), pe->device()); + Q_EMIT pinchGestureEnd(pe->time(), pe->device()); } break; } case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN: { SwipeGestureEvent *se = static_cast(event.data()); - emit swipeGestureBegin(se->fingerCount(), se->time(), se->device()); + Q_EMIT swipeGestureBegin(se->fingerCount(), se->time(), se->device()); break; } case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE: { SwipeGestureEvent *se = static_cast(event.data()); - emit swipeGestureUpdate(se->delta(), se->time(), se->device()); + Q_EMIT swipeGestureUpdate(se->delta(), se->time(), se->device()); break; } case LIBINPUT_EVENT_GESTURE_SWIPE_END: { SwipeGestureEvent *se = static_cast(event.data()); if (se->isCancelled()) { - emit swipeGestureCancelled(se->time(), se->device()); + Q_EMIT swipeGestureCancelled(se->time(), se->device()); } else { - emit swipeGestureEnd(se->time(), se->device()); + Q_EMIT swipeGestureEnd(se->time(), se->device()); } break; } @@ -542,10 +542,10 @@ void Connection::processEvents() SwitchEvent *se = static_cast(event.data()); switch (se->state()) { case SwitchEvent::State::Off: - emit switchToggledOff(se->time(), se->timeMicroseconds(), se->device()); + Q_EMIT switchToggledOff(se->time(), se->timeMicroseconds(), se->device()); break; case SwitchEvent::State::On: - emit switchToggledOn(se->time(), se->timeMicroseconds(), se->device()); + Q_EMIT switchToggledOn(se->time(), se->timeMicroseconds(), se->device()); break; default: Q_UNREACHABLE(); @@ -581,7 +581,7 @@ void Connection::processEvents() #else const QPointF globalPos; #endif - emit tabletToolEvent(tabletEventType, + Q_EMIT tabletToolEvent(tabletEventType, globalPos, tte->pressure(), tte->xTilt(), tte->yTilt(), tte->rotation(), tte->isTipDown(), tte->isNearby(), createTabletId(tte->tool(), event->device()->groupUserData()), tte->time()); @@ -589,14 +589,14 @@ void Connection::processEvents() } case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: { auto *tabletEvent = static_cast(event.data()); - emit tabletToolButtonEvent(tabletEvent->buttonId(), + Q_EMIT tabletToolButtonEvent(tabletEvent->buttonId(), tabletEvent->isButtonPressed(), createTabletId(tabletEvent->tool(), event->device()->groupUserData())); break; } case LIBINPUT_EVENT_TABLET_PAD_BUTTON: { auto *tabletEvent = static_cast(event.data()); - emit tabletPadButtonEvent(tabletEvent->buttonId(), + Q_EMIT tabletPadButtonEvent(tabletEvent->buttonId(), tabletEvent->isButtonPressed(), { event->device()->groupUserData() }); break; @@ -604,7 +604,7 @@ void Connection::processEvents() case LIBINPUT_EVENT_TABLET_PAD_RING: { auto *tabletEvent = static_cast(event.data()); tabletEvent->position(); - emit tabletPadRingEvent(tabletEvent->number(), + Q_EMIT tabletPadRingEvent(tabletEvent->number(), tabletEvent->position(), tabletEvent->source() == LIBINPUT_TABLET_PAD_RING_SOURCE_FINGER, { event->device()->groupUserData() }); @@ -612,7 +612,7 @@ void Connection::processEvents() } case LIBINPUT_EVENT_TABLET_PAD_STRIP: { auto *tabletEvent = static_cast(event.data()); - emit tabletPadStripEvent(tabletEvent->number(), + Q_EMIT tabletPadStripEvent(tabletEvent->number(), tabletEvent->position(), tabletEvent->source() == LIBINPUT_TABLET_PAD_STRIP_SOURCE_FINGER, { event->device()->groupUserData() }); @@ -625,19 +625,19 @@ void Connection::processEvents() } if (wasSuspended) { if (m_keyboardBeforeSuspend && !m_keyboard) { - emit hasKeyboardChanged(false); + Q_EMIT hasKeyboardChanged(false); } if (m_alphaNumericKeyboardBeforeSuspend && !m_alphaNumericKeyboard) { - emit hasAlphaNumericKeyboardChanged(false); + Q_EMIT hasAlphaNumericKeyboardChanged(false); } if (m_pointerBeforeSuspend && !m_pointer) { - emit hasPointerChanged(false); + Q_EMIT hasPointerChanged(false); } if (m_touchBeforeSuspend && !m_touch) { - emit hasTouchChanged(false); + Q_EMIT hasTouchChanged(false); } if (m_tabletModeSwitchBeforeSuspend && !m_tabletModeSwitch) { - emit hasTabletModeSwitchChanged(false); + Q_EMIT hasTabletModeSwitchChanged(false); } wasSuspended = false; } @@ -809,7 +809,7 @@ void Connection::updateLEDs(Xkb::LEDs leds) QStringList Connection::devicesSysNames() const { QStringList sl; - foreach (Device *d, m_devices) { + Q_FOREACH (Device *d, m_devices) { sl.append(d->sysName()); } return sl; diff --git a/src/libinput/device.cpp b/src/libinput/device.cpp index 690af2acb6..efd50f724c 100644 --- a/src/libinput/device.cpp +++ b/src/libinput/device.cpp @@ -316,7 +316,7 @@ void Device::setPointerAcceleration(qreal acceleration) if (libinput_device_config_accel_set_speed(m_device, acceleration) == LIBINPUT_CONFIG_STATUS_SUCCESS) { if (m_pointerAcceleration != acceleration) { m_pointerAcceleration = acceleration; - emit pointerAccelerationChanged(); + Q_EMIT pointerAccelerationChanged(); writeEntry(ConfigKey::PointerAcceleration, QString::number(acceleration, 'f', 3)); } } @@ -331,7 +331,7 @@ void Device::setScrollButton(quint32 button) if (m_scrollButton != button) { m_scrollButton = button; writeEntry(ConfigKey::ScrollButton, m_scrollButton); - emit scrollButtonChanged(); + Q_EMIT scrollButtonChanged(); } } } @@ -351,7 +351,7 @@ void Device::setPointerAccelerationProfile(bool set, enum libinput_config_accel if (libinput_device_config_accel_set_profile(m_device, profile) == LIBINPUT_CONFIG_STATUS_SUCCESS) { if (m_pointerAccelerationProfile != profile) { m_pointerAccelerationProfile = profile; - emit pointerAccelerationProfileChanged(); + Q_EMIT pointerAccelerationProfileChanged(); writeEntry(ConfigKey::PointerAccelerationProfile, (quint32) profile); } } @@ -372,7 +372,7 @@ void Device::setClickMethod(bool set, enum libinput_config_click_method method) if (libinput_device_config_click_set_method(m_device, method) == LIBINPUT_CONFIG_STATUS_SUCCESS) { if (m_clickMethod != method) { m_clickMethod = method; - emit clickMethodChanged(); + Q_EMIT clickMethodChanged(); writeEntry(ConfigKey::ClickMethod, (quint32) method); } } @@ -397,7 +397,7 @@ void Device::setScrollMethod(bool set, enum libinput_config_scroll_method method if (libinput_device_config_scroll_set_method(m_device, method) == LIBINPUT_CONFIG_STATUS_SUCCESS) { if (!isCurrent) { m_scrollMethod = method; - emit scrollMethodChanged(); + Q_EMIT scrollMethodChanged(); writeEntry(ConfigKey::ScrollMethod, (quint32) method); } } @@ -418,7 +418,7 @@ void Device::setLmrTapButtonMap(bool set) if (m_tapButtonMap != map) { m_tapButtonMap = map; writeEntry(ConfigKey::LmrTapButtonMap, set); - emit tapButtonMapChanged(); + Q_EMIT tapButtonMapChanged(); } } } @@ -450,7 +450,7 @@ void Device::method(bool set) \ if (m_##variable != set) { \ m_##variable = set; \ writeEntry(ConfigKey::key, m_##variable); \ - emit variable##Changed(); \ + Q_EMIT variable##Changed(); \ }\ } \ } @@ -470,7 +470,7 @@ void Device::method(bool set) \ if (m_##variable != set) { \ m_##variable = set; \ writeEntry(ConfigKey::key, m_##variable); \ - emit variable##Changed(); \ + Q_EMIT variable##Changed(); \ }\ } \ } @@ -489,7 +489,7 @@ void Device::setScrollFactor(qreal factor) if (m_scrollFactor != factor) { m_scrollFactor = factor; writeEntry(ConfigKey::ScrollFactor, m_scrollFactor); - emit scrollFactorChanged(); + Q_EMIT scrollFactorChanged(); } } diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/kwinanimationeffect.cpp index d8799dc3f0..742ed01984 100644 --- a/src/libkwineffects/kwinanimationeffect.cpp +++ b/src/libkwineffects/kwinanimationeffect.cpp @@ -455,7 +455,7 @@ void AnimationEffect::clipWindow(const EffectWindow *w, const AniData &anim, Win WindowQuadList filtered; if (clip.left() != geo.left()) { quads = quads.splitAtX(clip.left()); - foreach (const WindowQuad &quad, quads) { + Q_FOREACH (const WindowQuad &quad, quads) { if (quad.right() >= clip.left()) filtered << quad; } @@ -464,7 +464,7 @@ void AnimationEffect::clipWindow(const EffectWindow *w, const AniData &anim, Win } if (clip.right() != geo.right()) { quads = quads.splitAtX(clip.left()); - foreach (const WindowQuad &quad, quads) { + Q_FOREACH (const WindowQuad &quad, quads) { if (quad.right() <= clip.right()) filtered << quad; } @@ -473,7 +473,7 @@ void AnimationEffect::clipWindow(const EffectWindow *w, const AniData &anim, Win } if (clip.top() != geo.top()) { quads = quads.splitAtY(clip.top()); - foreach (const WindowQuad &quad, quads) { + Q_FOREACH (const WindowQuad &quad, quads) { if (quad.top() >= clip.top()) filtered << quad; } @@ -482,7 +482,7 @@ void AnimationEffect::clipWindow(const EffectWindow *w, const AniData &anim, Win } if (clip.bottom() != geo.bottom()) { quads = quads.splitAtY(clip.bottom()); - foreach (const WindowQuad &quad, quads) { + Q_FOREACH (const WindowQuad &quad, quads) { if (quad.bottom() <= clip.bottom()) filtered << quad; } diff --git a/src/libkwineffects/kwineffectquickview.cpp b/src/libkwineffects/kwineffectquickview.cpp index 5f4351b3b6..d62ed607fb 100644 --- a/src/libkwineffects/kwineffectquickview.cpp +++ b/src/libkwineffects/kwineffectquickview.cpp @@ -182,7 +182,7 @@ void EffectQuickView::update() QOpenGLFramebufferObject::bindDefault(); d->m_glcontext->doneCurrent(); } - emit repaintNeeded(); + Q_EMIT repaintNeeded(); } void EffectQuickView::forwardMouseEvent(QEvent *e) @@ -261,7 +261,7 @@ void EffectQuickView::setVisible(bool visible) d->m_visible = visible; if (visible){ - emit d->m_renderControl->renderRequested(); + Q_EMIT d->m_renderControl->renderRequested(); } else { // deferred to not change GL context QTimer::singleShot(0, this, [this]() { @@ -317,7 +317,7 @@ void EffectQuickView::setGeometry(const QRect &rect) { const QRect oldGeometry = d->m_view->geometry(); d->m_view->setGeometry(rect); - emit geometryChanged(oldGeometry, rect); + Q_EMIT geometryChanged(oldGeometry, rect); } void EffectQuickView::Private::releaseResources() diff --git a/src/libkwineffects/kwineffects.cpp b/src/libkwineffects/kwineffects.cpp index 90182bbfb1..b06d689b48 100644 --- a/src/libkwineffects/kwineffects.cpp +++ b/src/libkwineffects/kwineffects.cpp @@ -1011,7 +1011,7 @@ WindowQuadList WindowQuadList::makeGrid(int maxQuadSize) const double top = first().top(); double bottom = first().bottom(); - foreach (const WindowQuad &quad, *this) { + Q_FOREACH (const WindowQuad &quad, *this) { #if !defined(QT_NO_DEBUG) if (quad.isTransformed()) qFatal("Splitting quads is allowed only in pre-paint calls!"); @@ -1269,10 +1269,10 @@ void WindowQuadList::makeArrays(float **vertices, float **texcoords, const QSize WindowQuadList WindowQuadList::select(WindowQuadType type) const { - foreach (const WindowQuad & q, *this) { + Q_FOREACH (const WindowQuad & q, *this) { if (q.type() != type) { // something else than ones to select, make a copy and filter WindowQuadList ret; - foreach (const WindowQuad & q, *this) { + Q_FOREACH (const WindowQuad & q, *this) { if (q.type() == type) ret.append(q); } @@ -1287,7 +1287,7 @@ WindowQuadList WindowQuadList::filterOut(WindowQuadType type) const for (const WindowQuad & q : *this) { if (q.type() == type) { // something to filter out, make a copy and filter WindowQuadList ret; - foreach (const WindowQuad & q, *this) { + Q_FOREACH (const WindowQuad & q, *this) { if (q.type() != type) ret.append(q); } diff --git a/src/main.cpp b/src/main.cpp index c5870356ab..ead9b7914a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -162,7 +162,7 @@ Application::~Application() void Application::notifyStarted() { - emit started(); + Q_EMIT started(); } void Application::destroyAtoms() @@ -278,7 +278,7 @@ void Application::createWorkspace() // create workspace. (void) new Workspace(); - emit workspaceCreated(); + Q_EMIT workspaceCreated(); } void Application::createInput() @@ -295,7 +295,7 @@ void Application::createScreens() return; } Screens::create(this); - emit screensCreated(); + Q_EMIT screensCreated(); } void Application::createAtoms() @@ -597,7 +597,7 @@ void Application::initPlatform(const KPluginMetaData &plugin) } } } - emit platformCreated(); + Q_EMIT platformCreated(); } } diff --git a/src/onscreennotification.cpp b/src/onscreennotification.cpp index cc7bdcdde3..1b0d94662c 100644 --- a/src/onscreennotification.cpp +++ b/src/onscreennotification.cpp @@ -99,7 +99,7 @@ void OnScreenNotification::setVisible(bool visible) return; } m_visible = visible; - emit visibleChanged(); + Q_EMIT visibleChanged(); } QString OnScreenNotification::message() const @@ -113,7 +113,7 @@ void OnScreenNotification::setMessage(const QString &message) return; } m_message = message; - emit messageChanged(); + Q_EMIT messageChanged(); } QString OnScreenNotification::iconName() const @@ -127,7 +127,7 @@ void OnScreenNotification::setIconName(const QString &iconName) return; } m_iconName = iconName; - emit iconNameChanged(); + Q_EMIT iconNameChanged(); } int OnScreenNotification::timeout() const @@ -141,7 +141,7 @@ void OnScreenNotification::setTimeout(int timeout) return; } m_timer->setInterval(timeout); - emit timeoutChanged(); + Q_EMIT timeoutChanged(); } void OnScreenNotification::show() diff --git a/src/options.cpp b/src/options.cpp index 52030f1422..32a93cec6e 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -97,7 +97,7 @@ Options::Options(QObject *parent) m_configWatcher = KConfigWatcher::create(m_settings->sharedConfig()); connect(m_configWatcher.data(), &KConfigWatcher::configChanged, this, [this](const KConfigGroup &group, const QByteArrayList &names) { if (group.name() == QLatin1String("KDE") && names.contains(QByteArrayLiteral("AnimationDurationFactor"))) { - emit animationSpeedChanged(); + Q_EMIT animationSpeedChanged(); } }); } @@ -112,7 +112,7 @@ void Options::setFocusPolicy(FocusPolicy focusPolicy) return; } m_focusPolicy = focusPolicy; - emit focusPolicyChanged(); + Q_EMIT focusPolicyChanged(); if (m_focusPolicy == ClickToFocus) { setAutoRaise(false); setAutoRaiseInterval(0); @@ -126,7 +126,7 @@ void Options::setNextFocusPrefersMouse(bool nextFocusPrefersMouse) return; } m_nextFocusPrefersMouse = nextFocusPrefersMouse; - emit nextFocusPrefersMouseChanged(); + Q_EMIT nextFocusPrefersMouseChanged(); } void Options::setXwaylandCrashPolicy(XwaylandCrashPolicy crashPolicy) @@ -135,7 +135,7 @@ void Options::setXwaylandCrashPolicy(XwaylandCrashPolicy crashPolicy) return; } m_xwaylandCrashPolicy = crashPolicy; - emit xwaylandCrashPolicyChanged(); + Q_EMIT xwaylandCrashPolicyChanged(); } void Options::setXwaylandMaxCrashCount(int maxCrashCount) @@ -144,7 +144,7 @@ void Options::setXwaylandMaxCrashCount(int maxCrashCount) return; } m_xwaylandMaxCrashCount = maxCrashCount; - emit xwaylandMaxCrashCountChanged(); + Q_EMIT xwaylandMaxCrashCountChanged(); } void Options::setClickRaise(bool clickRaise) @@ -157,7 +157,7 @@ void Options::setClickRaise(bool clickRaise) return; } m_clickRaise = clickRaise; - emit clickRaiseChanged(); + Q_EMIT clickRaiseChanged(); } void Options::setAutoRaise(bool autoRaise) @@ -173,7 +173,7 @@ void Options::setAutoRaise(bool autoRaise) // important: autoRaise implies ClickRaise setClickRaise(true); } - emit autoRaiseChanged(); + Q_EMIT autoRaiseChanged(); } void Options::setAutoRaiseInterval(int autoRaiseInterval) @@ -185,7 +185,7 @@ void Options::setAutoRaiseInterval(int autoRaiseInterval) return; } m_autoRaiseInterval = autoRaiseInterval; - emit autoRaiseIntervalChanged(); + Q_EMIT autoRaiseIntervalChanged(); } void Options::setDelayFocusInterval(int delayFocusInterval) @@ -197,7 +197,7 @@ void Options::setDelayFocusInterval(int delayFocusInterval) return; } m_delayFocusInterval = delayFocusInterval; - emit delayFocusIntervalChanged(); + Q_EMIT delayFocusIntervalChanged(); } void Options::setShadeHover(bool shadeHover) @@ -206,7 +206,7 @@ void Options::setShadeHover(bool shadeHover) return; } m_shadeHover = shadeHover; - emit shadeHoverChanged(); + Q_EMIT shadeHoverChanged(); } void Options::setShadeHoverInterval(int shadeHoverInterval) @@ -215,7 +215,7 @@ void Options::setShadeHoverInterval(int shadeHoverInterval) return; } m_shadeHoverInterval = shadeHoverInterval; - emit shadeHoverIntervalChanged(); + Q_EMIT shadeHoverIntervalChanged(); } void Options::setSeparateScreenFocus(bool separateScreenFocus) @@ -224,7 +224,7 @@ void Options::setSeparateScreenFocus(bool separateScreenFocus) return; } m_separateScreenFocus = separateScreenFocus; - emit separateScreenFocusChanged(m_separateScreenFocus); + Q_EMIT separateScreenFocusChanged(m_separateScreenFocus); } void Options::setPlacement(int placement) @@ -233,7 +233,7 @@ void Options::setPlacement(int placement) return; } m_placement = static_cast(placement); - emit placementChanged(); + Q_EMIT placementChanged(); } void Options::setBorderSnapZone(int borderSnapZone) @@ -242,7 +242,7 @@ void Options::setBorderSnapZone(int borderSnapZone) return; } m_borderSnapZone = borderSnapZone; - emit borderSnapZoneChanged(); + Q_EMIT borderSnapZoneChanged(); } void Options::setWindowSnapZone(int windowSnapZone) @@ -251,7 +251,7 @@ void Options::setWindowSnapZone(int windowSnapZone) return; } m_windowSnapZone = windowSnapZone; - emit windowSnapZoneChanged(); + Q_EMIT windowSnapZoneChanged(); } void Options::setCenterSnapZone(int centerSnapZone) @@ -260,7 +260,7 @@ void Options::setCenterSnapZone(int centerSnapZone) return; } m_centerSnapZone = centerSnapZone; - emit centerSnapZoneChanged(); + Q_EMIT centerSnapZoneChanged(); } void Options::setSnapOnlyWhenOverlapping(bool snapOnlyWhenOverlapping) @@ -269,7 +269,7 @@ void Options::setSnapOnlyWhenOverlapping(bool snapOnlyWhenOverlapping) return; } m_snapOnlyWhenOverlapping = snapOnlyWhenOverlapping; - emit snapOnlyWhenOverlappingChanged(); + Q_EMIT snapOnlyWhenOverlappingChanged(); } void Options::setRollOverDesktops(bool rollOverDesktops) @@ -278,7 +278,7 @@ void Options::setRollOverDesktops(bool rollOverDesktops) return; } m_rollOverDesktops = rollOverDesktops; - emit rollOverDesktopsChanged(m_rollOverDesktops); + Q_EMIT rollOverDesktopsChanged(m_rollOverDesktops); } void Options::setFocusStealingPreventionLevel(int focusStealingPreventionLevel) @@ -290,7 +290,7 @@ void Options::setFocusStealingPreventionLevel(int focusStealingPreventionLevel) return; } m_focusStealingPreventionLevel = qMax(0, qMin(4, focusStealingPreventionLevel)); - emit focusStealingPreventionLevelChanged(); + Q_EMIT focusStealingPreventionLevelChanged(); } void Options::setOperationTitlebarDblClick(WindowOperation operationTitlebarDblClick) @@ -299,7 +299,7 @@ void Options::setOperationTitlebarDblClick(WindowOperation operationTitlebarDblC return; } OpTitlebarDblClick = operationTitlebarDblClick; - emit operationTitlebarDblClickChanged(); + Q_EMIT operationTitlebarDblClickChanged(); } void Options::setOperationMaxButtonLeftClick(WindowOperation op) @@ -308,7 +308,7 @@ void Options::setOperationMaxButtonLeftClick(WindowOperation op) return; } opMaxButtonLeftClick = op; - emit operationMaxButtonLeftClickChanged(); + Q_EMIT operationMaxButtonLeftClickChanged(); } void Options::setOperationMaxButtonRightClick(WindowOperation op) @@ -317,7 +317,7 @@ void Options::setOperationMaxButtonRightClick(WindowOperation op) return; } opMaxButtonRightClick = op; - emit operationMaxButtonRightClickChanged(); + Q_EMIT operationMaxButtonRightClickChanged(); } void Options::setOperationMaxButtonMiddleClick(WindowOperation op) @@ -326,7 +326,7 @@ void Options::setOperationMaxButtonMiddleClick(WindowOperation op) return; } opMaxButtonMiddleClick = op; - emit operationMaxButtonMiddleClickChanged(); + Q_EMIT operationMaxButtonMiddleClickChanged(); } void Options::setCommandActiveTitlebar1(MouseCommand commandActiveTitlebar1) @@ -335,7 +335,7 @@ void Options::setCommandActiveTitlebar1(MouseCommand commandActiveTitlebar1) return; } CmdActiveTitlebar1 = commandActiveTitlebar1; - emit commandActiveTitlebar1Changed(); + Q_EMIT commandActiveTitlebar1Changed(); } void Options::setCommandActiveTitlebar2(MouseCommand commandActiveTitlebar2) @@ -344,7 +344,7 @@ void Options::setCommandActiveTitlebar2(MouseCommand commandActiveTitlebar2) return; } CmdActiveTitlebar2 = commandActiveTitlebar2; - emit commandActiveTitlebar2Changed(); + Q_EMIT commandActiveTitlebar2Changed(); } void Options::setCommandActiveTitlebar3(MouseCommand commandActiveTitlebar3) @@ -353,7 +353,7 @@ void Options::setCommandActiveTitlebar3(MouseCommand commandActiveTitlebar3) return; } CmdActiveTitlebar3 = commandActiveTitlebar3; - emit commandActiveTitlebar3Changed(); + Q_EMIT commandActiveTitlebar3Changed(); } void Options::setCommandInactiveTitlebar1(MouseCommand commandInactiveTitlebar1) @@ -362,7 +362,7 @@ void Options::setCommandInactiveTitlebar1(MouseCommand commandInactiveTitlebar1) return; } CmdInactiveTitlebar1 = commandInactiveTitlebar1; - emit commandInactiveTitlebar1Changed(); + Q_EMIT commandInactiveTitlebar1Changed(); } void Options::setCommandInactiveTitlebar2(MouseCommand commandInactiveTitlebar2) @@ -371,7 +371,7 @@ void Options::setCommandInactiveTitlebar2(MouseCommand commandInactiveTitlebar2) return; } CmdInactiveTitlebar2 = commandInactiveTitlebar2; - emit commandInactiveTitlebar2Changed(); + Q_EMIT commandInactiveTitlebar2Changed(); } void Options::setCommandInactiveTitlebar3(MouseCommand commandInactiveTitlebar3) @@ -380,7 +380,7 @@ void Options::setCommandInactiveTitlebar3(MouseCommand commandInactiveTitlebar3) return; } CmdInactiveTitlebar3 = commandInactiveTitlebar3; - emit commandInactiveTitlebar3Changed(); + Q_EMIT commandInactiveTitlebar3Changed(); } void Options::setCommandWindow1(MouseCommand commandWindow1) @@ -389,7 +389,7 @@ void Options::setCommandWindow1(MouseCommand commandWindow1) return; } CmdWindow1 = commandWindow1; - emit commandWindow1Changed(); + Q_EMIT commandWindow1Changed(); } void Options::setCommandWindow2(MouseCommand commandWindow2) @@ -398,7 +398,7 @@ void Options::setCommandWindow2(MouseCommand commandWindow2) return; } CmdWindow2 = commandWindow2; - emit commandWindow2Changed(); + Q_EMIT commandWindow2Changed(); } void Options::setCommandWindow3(MouseCommand commandWindow3) @@ -407,7 +407,7 @@ void Options::setCommandWindow3(MouseCommand commandWindow3) return; } CmdWindow3 = commandWindow3; - emit commandWindow3Changed(); + Q_EMIT commandWindow3Changed(); } void Options::setCommandWindowWheel(MouseCommand commandWindowWheel) @@ -416,7 +416,7 @@ void Options::setCommandWindowWheel(MouseCommand commandWindowWheel) return; } CmdWindowWheel = commandWindowWheel; - emit commandWindowWheelChanged(); + Q_EMIT commandWindowWheelChanged(); } void Options::setCommandAll1(MouseCommand commandAll1) @@ -425,7 +425,7 @@ void Options::setCommandAll1(MouseCommand commandAll1) return; } CmdAll1 = commandAll1; - emit commandAll1Changed(); + Q_EMIT commandAll1Changed(); } void Options::setCommandAll2(MouseCommand commandAll2) @@ -434,7 +434,7 @@ void Options::setCommandAll2(MouseCommand commandAll2) return; } CmdAll2 = commandAll2; - emit commandAll2Changed(); + Q_EMIT commandAll2Changed(); } void Options::setCommandAll3(MouseCommand commandAll3) @@ -443,7 +443,7 @@ void Options::setCommandAll3(MouseCommand commandAll3) return; } CmdAll3 = commandAll3; - emit commandAll3Changed(); + Q_EMIT commandAll3Changed(); } void Options::setKeyCmdAllModKey(uint keyCmdAllModKey) @@ -452,7 +452,7 @@ void Options::setKeyCmdAllModKey(uint keyCmdAllModKey) return; } CmdAllModKey = keyCmdAllModKey; - emit keyCmdAllModKeyChanged(); + Q_EMIT keyCmdAllModKeyChanged(); } void Options::setShowGeometryTip(bool showGeometryTip) @@ -461,7 +461,7 @@ void Options::setShowGeometryTip(bool showGeometryTip) return; } show_geometry_tip = showGeometryTip; - emit showGeometryTipChanged(); + Q_EMIT showGeometryTipChanged(); } void Options::setCondensedTitle(bool condensedTitle) @@ -470,7 +470,7 @@ void Options::setCondensedTitle(bool condensedTitle) return; } condensed_title = condensedTitle; - emit condensedTitleChanged(); + Q_EMIT condensedTitleChanged(); } void Options::setElectricBorderMaximize(bool electricBorderMaximize) @@ -479,7 +479,7 @@ void Options::setElectricBorderMaximize(bool electricBorderMaximize) return; } electric_border_maximize = electricBorderMaximize; - emit electricBorderMaximizeChanged(); + Q_EMIT electricBorderMaximizeChanged(); } void Options::setElectricBorderTiling(bool electricBorderTiling) @@ -488,7 +488,7 @@ void Options::setElectricBorderTiling(bool electricBorderTiling) return; } electric_border_tiling = electricBorderTiling; - emit electricBorderTilingChanged(); + Q_EMIT electricBorderTilingChanged(); } void Options::setElectricBorderCornerRatio(float electricBorderCornerRatio) @@ -497,7 +497,7 @@ void Options::setElectricBorderCornerRatio(float electricBorderCornerRatio) return; } electric_border_corner_ratio = electricBorderCornerRatio; - emit electricBorderCornerRatioChanged(); + Q_EMIT electricBorderCornerRatioChanged(); } void Options::setBorderlessMaximizedWindows(bool borderlessMaximizedWindows) @@ -506,7 +506,7 @@ void Options::setBorderlessMaximizedWindows(bool borderlessMaximizedWindows) return; } borderless_maximized_windows = borderlessMaximizedWindows; - emit borderlessMaximizedWindowsChanged(); + Q_EMIT borderlessMaximizedWindowsChanged(); } void Options::setKillPingTimeout(int killPingTimeout) @@ -515,7 +515,7 @@ void Options::setKillPingTimeout(int killPingTimeout) return; } m_killPingTimeout = killPingTimeout; - emit killPingTimeoutChanged(); + Q_EMIT killPingTimeoutChanged(); } void Options::setHideUtilityWindowsForInactive(bool hideUtilityWindowsForInactive) @@ -524,7 +524,7 @@ void Options::setHideUtilityWindowsForInactive(bool hideUtilityWindowsForInactiv return; } m_hideUtilityWindowsForInactive = hideUtilityWindowsForInactive; - emit hideUtilityWindowsForInactiveChanged(); + Q_EMIT hideUtilityWindowsForInactiveChanged(); } void Options::setCompositingMode(int compositingMode) @@ -533,7 +533,7 @@ void Options::setCompositingMode(int compositingMode) return; } m_compositingMode = static_cast(compositingMode); - emit compositingModeChanged(); + Q_EMIT compositingModeChanged(); } void Options::setUseCompositing(bool useCompositing) @@ -542,7 +542,7 @@ void Options::setUseCompositing(bool useCompositing) return; } m_useCompositing = useCompositing; - emit useCompositingChanged(); + Q_EMIT useCompositingChanged(); } void Options::setHiddenPreviews(int hiddenPreviews) @@ -551,7 +551,7 @@ void Options::setHiddenPreviews(int hiddenPreviews) return; } m_hiddenPreviews = static_cast(hiddenPreviews); - emit hiddenPreviewsChanged(); + Q_EMIT hiddenPreviewsChanged(); } void Options::setGlSmoothScale(int glSmoothScale) @@ -560,7 +560,7 @@ void Options::setGlSmoothScale(int glSmoothScale) return; } m_glSmoothScale = glSmoothScale; - emit glSmoothScaleChanged(); + Q_EMIT glSmoothScaleChanged(); } void Options::setXrenderSmoothScale(bool xrenderSmoothScale) @@ -569,7 +569,7 @@ void Options::setXrenderSmoothScale(bool xrenderSmoothScale) return; } m_xrenderSmoothScale = xrenderSmoothScale; - emit xrenderSmoothScaleChanged(); + Q_EMIT xrenderSmoothScaleChanged(); } void Options::setGlStrictBinding(bool glStrictBinding) @@ -578,7 +578,7 @@ void Options::setGlStrictBinding(bool glStrictBinding) return; } m_glStrictBinding = glStrictBinding; - emit glStrictBindingChanged(); + Q_EMIT glStrictBindingChanged(); } void Options::setGlStrictBindingFollowsDriver(bool glStrictBindingFollowsDriver) @@ -587,7 +587,7 @@ void Options::setGlStrictBindingFollowsDriver(bool glStrictBindingFollowsDriver) return; } m_glStrictBindingFollowsDriver = glStrictBindingFollowsDriver; - emit glStrictBindingFollowsDriverChanged(); + Q_EMIT glStrictBindingFollowsDriverChanged(); } void Options::setGLCoreProfile(bool value) @@ -596,7 +596,7 @@ void Options::setGLCoreProfile(bool value) return; } m_glCoreProfile = value; - emit glCoreProfileChanged(); + Q_EMIT glCoreProfileChanged(); } void Options::setWindowsBlockCompositing(bool value) @@ -605,7 +605,7 @@ void Options::setWindowsBlockCompositing(bool value) return; } m_windowsBlockCompositing = value; - emit windowsBlockCompositingChanged(); + Q_EMIT windowsBlockCompositingChanged(); } void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value) @@ -632,7 +632,7 @@ void Options::setGlPreferBufferSwap(char glPreferBufferSwap) return; } m_glPreferBufferSwap = (GlSwapStrategy)glPreferBufferSwap; - emit glPreferBufferSwapChanged(); + Q_EMIT glPreferBufferSwapChanged(); } LatencyPolicy Options::latencyPolicy() const @@ -646,7 +646,7 @@ void Options::setLatencyPolicy(LatencyPolicy policy) return; } m_latencyPolicy = policy; - emit latencyPolicyChanged(); + Q_EMIT latencyPolicyChanged(); } RenderTimeEstimator Options::renderTimeEstimator() const @@ -660,7 +660,7 @@ void Options::setRenderTimeEstimator(RenderTimeEstimator estimator) return; } m_renderTimeEstimator = estimator; - emit renderTimeEstimatorChanged(); + Q_EMIT renderTimeEstimatorChanged(); } void Options::setGlPlatformInterface(OpenGLPlatformInterface interface) @@ -697,7 +697,7 @@ void Options::setGlPlatformInterface(OpenGLPlatformInterface interface) return; } m_glPlatformInterface = interface; - emit glPlatformInterfaceChanged(); + Q_EMIT glPlatformInterfaceChanged(); } void Options::reparseConfiguration() @@ -720,7 +720,7 @@ void Options::updateSettings() // Driver-specific config detection reloadCompositingSettings(); - emit configChanged(); + Q_EMIT configChanged(); } void Options::loadConfig() diff --git a/src/outline.cpp b/src/outline.cpp index 154362512e..f9ae2ac960 100644 --- a/src/outline.cpp +++ b/src/outline.cpp @@ -51,7 +51,7 @@ void Outline::show() } m_visual->show(); m_active = true; - emit activeChanged(); + Q_EMIT activeChanged(); } void Outline::hide() @@ -60,7 +60,7 @@ void Outline::hide() return; } m_active = false; - emit activeChanged(); + Q_EMIT activeChanged(); if (m_visual.isNull()) { return; } @@ -85,8 +85,8 @@ void Outline::setGeometry(const QRect& outlineGeometry) return; } m_outlineGeometry = outlineGeometry; - emit geometryChanged(); - emit unifiedGeometryChanged(); + Q_EMIT geometryChanged(); + Q_EMIT unifiedGeometryChanged(); } void Outline::setVisualParentGeometry(const QRect &visualParentGeometry) @@ -95,8 +95,8 @@ void Outline::setVisualParentGeometry(const QRect &visualParentGeometry) return; } m_visualParentGeometry = visualParentGeometry; - emit visualParentGeometryChanged(); - emit unifiedGeometryChanged(); + Q_EMIT visualParentGeometryChanged(); + Q_EMIT unifiedGeometryChanged(); } QRect Outline::unifiedGeometry() const diff --git a/src/placement.cpp b/src/placement.cpp index 05e8764080..05de4357ec 100644 --- a/src/placement.cpp +++ b/src/placement.cpp @@ -607,7 +607,7 @@ void Placement::cascadeDesktop() Workspace *ws = Workspace::self(); const int desktop = VirtualDesktopManager::self()->current(); reinitCascading(desktop); - foreach (Toplevel *toplevel, ws->stackingOrder()) { + Q_FOREACH (Toplevel *toplevel, ws->stackingOrder()) { auto client = qobject_cast(toplevel); if (!client || (!client->isOnCurrentDesktop()) || diff --git a/src/platform.cpp b/src/platform.cpp index 5e86995236..ecb41534bf 100644 --- a/src/platform.cpp +++ b/src/platform.cpp @@ -155,7 +155,7 @@ void Platform::requestOutputsChange(KWaylandServer::OutputConfigurationInterface } } - emit screens()->changed(); + Q_EMIT screens()->changed(); config->setApplied(); } @@ -448,7 +448,7 @@ void Platform::setReady(bool ready) return; } m_ready = ready; - emit readyChanged(m_ready); + Q_EMIT readyChanged(m_ready); } bool Platform::isPerScreenRenderingEnabled() const diff --git a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp index 484e445ace..7c7b196061 100644 --- a/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp +++ b/src/platformsupport/vsyncconvenience/softwarevsyncmonitor.cpp @@ -34,7 +34,7 @@ void SoftwareVsyncMonitor::setRefreshRate(int refreshRate) void SoftwareVsyncMonitor::handleSyntheticVsync() { - emit vblankOccurred(m_vblankTimestamp); + Q_EMIT vblankOccurred(m_vblankTimestamp); } template diff --git a/src/platformsupport/vsyncconvenience/vsyncmonitor.h b/src/platformsupport/vsyncconvenience/vsyncmonitor.h index 21641fee15..3c740afb4d 100644 --- a/src/platformsupport/vsyncconvenience/vsyncmonitor.h +++ b/src/platformsupport/vsyncconvenience/vsyncmonitor.h @@ -28,7 +28,7 @@ public: public Q_SLOTS: virtual void arm() = 0; -signals: +Q_SIGNALS: void errorOccurred(); void vblankOccurred(std::chrono::nanoseconds timestamp); }; diff --git a/src/plugins/idletime/poller.cpp b/src/plugins/idletime/poller.cpp index e2165e424e..830a1dd9cb 100644 --- a/src/plugins/idletime/poller.cpp +++ b/src/plugins/idletime/poller.cpp @@ -65,7 +65,7 @@ void KWinIdleTimePoller::addTimeout(int nextTimeout) m_timeouts.insert(nextTimeout, timeout); connect(timeout, &KWayland::Client::IdleTimeout::idle, this, [this, nextTimeout] { - emit timeoutReached(nextTimeout); + Q_EMIT timeoutReached(nextTimeout); } ); connect(timeout, &KWayland::Client::IdleTimeout::resumeFromIdle, this, &KWinIdleTimePoller::resumingFromIdle); @@ -99,7 +99,7 @@ void KWinIdleTimePoller::catchIdleEvent() connect(m_catchResumeTimeout, &KWayland::Client::IdleTimeout::resumeFromIdle, this, [this] { stopCatchingIdleEvents(); - emit resumingFromIdle(); + Q_EMIT resumingFromIdle(); } ); } diff --git a/src/plugins/kdecorations/aurorae/src/decorationoptions.cpp b/src/plugins/kdecorations/aurorae/src/decorationoptions.cpp index 1018c68960..ba4fde8c80 100644 --- a/src/plugins/kdecorations/aurorae/src/decorationoptions.cpp +++ b/src/plugins/kdecorations/aurorae/src/decorationoptions.cpp @@ -168,14 +168,14 @@ void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration) m_paletteConnection = connect(m_decoration->client().toStrongRef().data(), &KDecoration2::DecoratedClient::paletteChanged, this, [this] (const QPalette &pal) { m_colors.update(pal); - emit colorsChanged(); + Q_EMIT colorsChanged(); } ); auto s = m_decoration->settings(); connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged); connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged); connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged); - emit decorationChanged(); + Q_EMIT decorationChanged(); } void DecorationOptions::slotActiveChanged() @@ -187,8 +187,8 @@ void DecorationOptions::slotActiveChanged() return; } m_active = m_decoration->client().toStrongRef().data()->isActive(); - emit colorsChanged(); - emit fontChanged(); + Q_EMIT colorsChanged(); + Q_EMIT fontChanged(); } int DecorationOptions::mousePressAndHoldInterval() const @@ -216,7 +216,7 @@ void Borders::methodName(int name) \ return; \ } \ m_##name = name; \ - emit name##Changed(); \ + Q_EMIT name##Changed(); \ } SETTER(setLeft, left) diff --git a/src/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp b/src/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp index 4020ca9dc1..fbe82affb5 100644 --- a/src/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp +++ b/src/plugins/kdecorations/aurorae/src/lib/auroraetheme.cpp @@ -124,7 +124,7 @@ void AuroraeTheme::loadTheme(const QString &name, const KConfig &config) d->initButtonFrame(HelpButton); d->themeConfig.load(config); - emit themeChanged(); + Q_EMIT themeChanged(); } bool AuroraeTheme::hasButton(AuroraeButtonType button) const @@ -448,7 +448,7 @@ void AuroraeTheme::setBorderSize(KDecoration2::BorderSize size) return; } d->borderSize = size; - emit borderSizesChanged(); + Q_EMIT borderSizesChanged(); } void AuroraeTheme::setButtonSize(KDecoration2::BorderSize size) @@ -457,7 +457,7 @@ void AuroraeTheme::setButtonSize(KDecoration2::BorderSize size) return; } d->buttonSize = size; - emit buttonSizesChanged(); + Q_EMIT buttonSizesChanged(); } void AuroraeTheme::setTabDragMimeType(const QString &mime) diff --git a/src/plugins/nightcolor/clockskewnotifier.cpp b/src/plugins/nightcolor/clockskewnotifier.cpp index b79ee8c07f..6c1f34cad3 100644 --- a/src/plugins/nightcolor/clockskewnotifier.cpp +++ b/src/plugins/nightcolor/clockskewnotifier.cpp @@ -72,7 +72,7 @@ void ClockSkewNotifier::setActive(bool set) d->unloadNotifierEngine(); } - emit activeChanged(); + Q_EMIT activeChanged(); } } // namespace KWin diff --git a/src/plugins/nightcolor/clockskewnotifier.h b/src/plugins/nightcolor/clockskewnotifier.h index 6a894dab41..297077f2db 100644 --- a/src/plugins/nightcolor/clockskewnotifier.h +++ b/src/plugins/nightcolor/clockskewnotifier.h @@ -43,7 +43,7 @@ public: */ void setActive(bool active); -signals: +Q_SIGNALS: /** * This signal is emitted whenever the active property is changed. */ diff --git a/src/plugins/nightcolor/clockskewnotifierengine_linux.cpp b/src/plugins/nightcolor/clockskewnotifierengine_linux.cpp index e06a04e6d8..af23c595a3 100644 --- a/src/plugins/nightcolor/clockskewnotifierengine_linux.cpp +++ b/src/plugins/nightcolor/clockskewnotifierengine_linux.cpp @@ -57,7 +57,7 @@ void LinuxClockSkewNotifierEngine::handleTimerCancelled() uint64_t expirationCount; read(m_fd, &expirationCount, sizeof(expirationCount)); - emit clockSkewed(); + Q_EMIT clockSkewed(); } } // namespace KWin diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp index 1a93af562e..5c81deaa82 100644 --- a/src/plugins/nightcolor/nightcolormanager.cpp +++ b/src/plugins/nightcolor/nightcolormanager.cpp @@ -186,7 +186,7 @@ void NightColorManager::inhibit() if (m_inhibitReferenceCount == 1) { resetAllTimers(); - emit inhibitedChanged(); + Q_EMIT inhibitedChanged(); } } @@ -196,7 +196,7 @@ void NightColorManager::uninhibit() if (!m_inhibitReferenceCount) { resetAllTimers(); - emit inhibitedChanged(); + Q_EMIT inhibitedChanged(); } } @@ -487,7 +487,7 @@ void NightColorManager::updateTargetTemperature() m_targetTemperature = targetTemperature; - emit targetTemperatureChanged(); + Q_EMIT targetTemperatureChanged(); } void NightColorManager::updateTransitionTimings(bool force) @@ -495,8 +495,8 @@ void NightColorManager::updateTransitionTimings(bool force) if (m_mode == NightColorMode::Constant) { m_next = DateTimes(); m_prev = DateTimes(); - emit previousTransitionTimingsChanged(); - emit scheduledTransitionTimingsChanged(); + Q_EMIT previousTransitionTimingsChanged(); + Q_EMIT scheduledTransitionTimingsChanged(); return; } @@ -518,8 +518,8 @@ void NightColorManager::updateTransitionTimings(bool force) m_next = DateTimes(morB.addDays(1), morE.addDays(1)); m_prev = DateTimes(eveB, eveE); } - emit previousTransitionTimingsChanged(); - emit scheduledTransitionTimingsChanged(); + Q_EMIT previousTransitionTimingsChanged(); + Q_EMIT scheduledTransitionTimingsChanged(); return; } @@ -563,8 +563,8 @@ void NightColorManager::updateTransitionTimings(bool force) } } - emit previousTransitionTimingsChanged(); - emit scheduledTransitionTimingsChanged(); + Q_EMIT previousTransitionTimingsChanged(); + Q_EMIT scheduledTransitionTimingsChanged(); } DateTimes NightColorManager::getSunTimings(const QDateTime &dateTime, double latitude, double longitude, bool morning) const @@ -840,7 +840,7 @@ bool NightColorManager::changeConfiguration(QHash data) if (resetNeeded) { resetAllTimers(); } - emit configChange(info()); + Q_EMIT configChange(info()); return true; } @@ -866,7 +866,7 @@ void NightColorManager::autoLocationUpdate(double latitude, double longitude) s->save(); resetAllTimers(); - emit configChange(info()); + Q_EMIT configChange(info()); } void NightColorManager::setEnabled(bool enabled) @@ -876,7 +876,7 @@ void NightColorManager::setEnabled(bool enabled) } m_active = enabled; m_skewNotifier->setActive(enabled); - emit enabledChanged(); + Q_EMIT enabledChanged(); } void NightColorManager::setRunning(bool running) @@ -885,7 +885,7 @@ void NightColorManager::setRunning(bool running) return; } m_running = running; - emit runningChanged(); + Q_EMIT runningChanged(); } void NightColorManager::setCurrentTemperature(int temperature) @@ -894,7 +894,7 @@ void NightColorManager::setCurrentTemperature(int temperature) return; } m_currentTemp = temperature; - emit currentTemperatureChanged(); + Q_EMIT currentTemperatureChanged(); } void NightColorManager::setMode(NightColorMode mode) @@ -903,7 +903,7 @@ void NightColorManager::setMode(NightColorMode mode) return; } m_mode = mode; - emit modeChanged(); + Q_EMIT modeChanged(); } } // namespace KWin diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/plugins/platforms/drm/drm_backend.cpp index 4d15dd5b03..5dbe5a78f3 100644 --- a/src/plugins/platforms/drm/drm_backend.cpp +++ b/src/plugins/platforms/drm/drm_backend.cpp @@ -248,7 +248,7 @@ void DrmBackend::handleUdevEvent() return; } else { qCDebug(KWIN_DRM) << "Removing gpu" << gpu->devNode(); - emit gpuRemoved(gpu); + Q_EMIT gpuRemoved(gpu); m_gpus.removeOne(gpu); delete gpu; updateOutputs(); @@ -301,7 +301,7 @@ DrmGpu *DrmBackend::addGpu(const QString &fileName) m_active = true; connect(gpu, &DrmGpu::outputAdded, this, &DrmBackend::addOutput); connect(gpu, &DrmGpu::outputRemoved, this, &DrmBackend::removeOutput); - emit gpuAdded(gpu); + Q_EMIT gpuAdded(gpu); return gpu; } @@ -309,19 +309,19 @@ void DrmBackend::addOutput(DrmOutput *o) { m_outputs.append(o); m_enabledOutputs.append(o); - emit o->gpu()->outputEnabled(o); - emit outputAdded(o); - emit outputEnabled(o); + Q_EMIT o->gpu()->outputEnabled(o); + Q_EMIT outputAdded(o); + Q_EMIT outputEnabled(o); } void DrmBackend::removeOutput(DrmOutput *o) { - emit o->gpu()->outputDisabled(o); + Q_EMIT o->gpu()->outputDisabled(o); if (m_enabledOutputs.removeOne(o)) { - emit outputDisabled(o); + Q_EMIT outputDisabled(o); } m_outputs.removeOne(o); - emit outputRemoved(o); + Q_EMIT outputRemoved(o); } void DrmBackend::updateOutputs() @@ -333,7 +333,7 @@ void DrmBackend::updateOutputs() if (gpu->outputs().isEmpty() && gpu != primaryGpu()) { qCDebug(KWIN_DRM) << "removing unused GPU" << gpu->devNode(); it = m_gpus.erase(it); - emit gpuRemoved(gpu); + Q_EMIT gpuRemoved(gpu); delete gpu; } else { it++; @@ -345,7 +345,7 @@ void DrmBackend::updateOutputs() readOutputsConfiguration(); } if (!m_outputs.isEmpty()) { - emit screensQueried(); + Q_EMIT screensQueried(); } } @@ -469,17 +469,17 @@ void DrmBackend::enableOutput(DrmOutput *output, bool enable) if (enable) { Q_ASSERT(!m_enabledOutputs.contains(output)); m_enabledOutputs << output; - emit output->gpu()->outputEnabled(output); - emit outputEnabled(output); + Q_EMIT output->gpu()->outputEnabled(output); + Q_EMIT outputEnabled(output); } else { Q_ASSERT(m_enabledOutputs.contains(output)); m_enabledOutputs.removeOne(output); Q_ASSERT(!m_enabledOutputs.contains(output)); - emit output->gpu()->outputDisabled(output); - emit outputDisabled(output); + Q_EMIT output->gpu()->outputDisabled(output); + Q_EMIT outputDisabled(output); } checkOutputsAreOn(); - emit screensQueried(); + Q_EMIT screensQueried(); } void DrmBackend::initCursor() diff --git a/src/plugins/platforms/drm/drm_gpu.cpp b/src/plugins/platforms/drm/drm_gpu.cpp index 6c070ba3ec..4e153ea04c 100644 --- a/src/plugins/platforms/drm/drm_gpu.cpp +++ b/src/plugins/platforms/drm/drm_gpu.cpp @@ -289,7 +289,7 @@ bool DrmGpu::updateOutputs() qCDebug(KWIN_DRM) << "Found new output with uuid" << output->uuid() << "on gpu" << m_devNode; connectedOutputs << output; - emit outputAdded(output); + Q_EMIT outputAdded(output); outputDone = true; break; } @@ -427,7 +427,7 @@ void DrmGpu::dispatchEvents() void DrmGpu::removeOutput(DrmOutput *output) { m_outputs.removeOne(output); - emit outputRemoved(output); + Q_EMIT outputRemoved(output); output->teardown(); output->m_crtc = nullptr; m_connectors.removeOne(output->m_conn); diff --git a/src/plugins/platforms/drm/drm_output.cpp b/src/plugins/platforms/drm/drm_output.cpp index 83b5c0f519..f55ffc87dd 100644 --- a/src/plugins/platforms/drm/drm_output.cpp +++ b/src/plugins/platforms/drm/drm_output.cpp @@ -685,7 +685,7 @@ bool DrmOutput::presentAtomically(const QSharedPointer &buffer) showCursor(); } setCurrentModeInternal(); - emit screens()->changed(); + Q_EMIT screens()->changed(); } return false; } diff --git a/src/plugins/platforms/fbdev/fb_backend.cpp b/src/plugins/platforms/fbdev/fb_backend.cpp index d26273e6af..c38193b3c2 100644 --- a/src/plugins/platforms/fbdev/fb_backend.cpp +++ b/src/plugins/platforms/fbdev/fb_backend.cpp @@ -126,7 +126,7 @@ bool FramebufferBackend::initialize() return false; } setReady(true); - emit screensQueried(); + Q_EMIT screensQueried(); return true; } @@ -161,8 +161,8 @@ bool FramebufferBackend::handleScreenInfo() auto *output = new FramebufferOutput; output->init(QSize(varinfo.xres, varinfo.yres), QSize(varinfo.width, varinfo.height)); m_outputs << output; - emit outputAdded(output); - emit outputEnabled(output); + Q_EMIT outputAdded(output); + Q_EMIT outputEnabled(output); m_id = QByteArray(fixinfo.id); m_red = {varinfo.red.offset, varinfo.red.length}; diff --git a/src/plugins/platforms/virtual/virtual_backend.cpp b/src/plugins/platforms/virtual/virtual_backend.cpp index 823bd6b2fa..dfaffaf679 100644 --- a/src/plugins/platforms/virtual/virtual_backend.cpp +++ b/src/plugins/platforms/virtual/virtual_backend.cpp @@ -69,8 +69,8 @@ bool VirtualBackend::initialize() dummyOutput->init(QPoint(0, 0), initialWindowSize()); m_outputs << dummyOutput ; m_outputsEnabled << dummyOutput; - emit outputAdded(dummyOutput); - emit outputEnabled(dummyOutput); + Q_EMIT outputAdded(dummyOutput); + Q_EMIT outputEnabled(dummyOutput); } setSoftwareCursorForced(true); @@ -79,7 +79,7 @@ bool VirtualBackend::initialize() waylandServer()->seat()->setHasKeyboard(true); waylandServer()->seat()->setHasTouch(true); - emit screensQueried(); + Q_EMIT screensQueried(); return true; } @@ -118,12 +118,12 @@ void VirtualBackend::setVirtualOutputs(int count, QVector geometries, QVe while (!m_outputsEnabled.isEmpty()) { VirtualOutput *output = m_outputsEnabled.takeLast(); - emit outputDisabled(output); + Q_EMIT outputDisabled(output); } while (!m_outputs.isEmpty()) { VirtualOutput *output = m_outputs.takeLast(); - emit outputRemoved(output); + Q_EMIT outputRemoved(output); delete output; } @@ -142,11 +142,11 @@ void VirtualBackend::setVirtualOutputs(int count, QVector geometries, QVe } m_outputs.append(vo); m_outputsEnabled.append(vo); - emit outputAdded(vo); - emit outputEnabled(vo); + Q_EMIT outputAdded(vo); + Q_EMIT outputEnabled(vo); } - emit screensQueried(); + Q_EMIT screensQueried(); } void VirtualBackend::enableOutput(VirtualOutput *output, bool enable) @@ -154,14 +154,14 @@ void VirtualBackend::enableOutput(VirtualOutput *output, bool enable) if (enable) { Q_ASSERT(!m_outputsEnabled.contains(output)); m_outputsEnabled << output; - emit outputEnabled(output); + Q_EMIT outputEnabled(output); } else { Q_ASSERT(m_outputsEnabled.contains(output)); m_outputsEnabled.removeOne(output); - emit outputDisabled(output); + Q_EMIT outputDisabled(output); } - emit screensQueried(); + Q_EMIT screensQueried(); } void VirtualBackend::removeOutput(AbstractOutput *output) @@ -170,11 +170,11 @@ void VirtualBackend::removeOutput(AbstractOutput *output) virtualOutput->setEnabled(false); m_outputs.removeOne(virtualOutput); - emit outputRemoved(virtualOutput); + Q_EMIT outputRemoved(virtualOutput); delete virtualOutput; - emit screensQueried(); + Q_EMIT screensQueried(); } } diff --git a/src/plugins/platforms/wayland/wayland_backend.cpp b/src/plugins/platforms/wayland/wayland_backend.cpp index 16ea571f3b..14409be457 100644 --- a/src/plugins/platforms/wayland/wayland_backend.cpp +++ b/src/plugins/platforms/wayland/wayland_backend.cpp @@ -532,7 +532,7 @@ bool WaylandBackend::initialize() } m_relativePointerManager = m_registry->createRelativePointerManager(name, version, this); if (m_pointerConstraints) { - emit pointerLockSupportedChanged(); + Q_EMIT pointerLockSupportedChanged(); } } ); @@ -543,7 +543,7 @@ bool WaylandBackend::initialize() } m_pointerConstraints = m_registry->createPointerConstraints(name, version, this); if (m_relativePointerManager) { - emit pointerLockSupportedChanged(); + Q_EMIT pointerLockSupportedChanged(); } } ); @@ -573,7 +573,7 @@ bool WaylandBackend::initialize() } m_waylandCursor->installImage(); auto c = Cursors::self()->currentCursor(); - emit c->rendered(c->geometry()); + Q_EMIT c->rendered(c->geometry()); } ); connect(this, &WaylandBackend::pointerLockChanged, this, [this] (bool locked) { @@ -631,7 +631,7 @@ void WaylandBackend::initConnection() connect(m_connectionThreadObject, &ConnectionThread::connectionDied, this, [this]() { setReady(false); - emit systemCompositorDied(); + Q_EMIT systemCompositorDied(); delete m_seat; m_shm->destroy(); @@ -739,19 +739,19 @@ void WaylandBackend::createOutputs() logicalWidthSum += logicalWidth; m_outputs << waylandOutput; - emit outputAdded(waylandOutput); - emit outputEnabled(waylandOutput); + Q_EMIT outputAdded(waylandOutput); + Q_EMIT outputEnabled(waylandOutput); } setReady(true); - emit screensQueried(); + Q_EMIT screensQueried(); } void WaylandBackend::destroyOutputs() { while (!m_outputs.isEmpty()) { WaylandOutput *output = m_outputs.takeLast(); - emit outputDisabled(output); - emit outputRemoved(output); + Q_EMIT outputDisabled(output); + Q_EMIT outputRemoved(output); delete output; } } diff --git a/src/plugins/platforms/wayland/wayland_output.cpp b/src/plugins/platforms/wayland/wayland_output.cpp index 8f4aafde70..db6d0f5d95 100644 --- a/src/plugins/platforms/wayland/wayland_output.cpp +++ b/src/plugins/platforms/wayland/wayland_output.cpp @@ -37,7 +37,7 @@ WaylandOutput::WaylandOutput(Surface *surface, WaylandBackend *backend) connect(surface, &Surface::frameRendered, [this] { m_rendered = true; - emit frameRendered(); + Q_EMIT frameRendered(); }); } @@ -116,7 +116,7 @@ void XdgShellOutput::handleConfigure(const QSize &size, XdgShellSurface::States Q_UNUSED(states); if (size.width() > 0 && size.height() > 0) { setGeometry(geometry().topLeft(), size); - emit sizeChanged(size); + Q_EMIT sizeChanged(size); } m_xdgShellSurface->ackConfigure(serial); } @@ -147,7 +147,7 @@ void XdgShellOutput::lockPointer(Pointer *pointer, bool lock) m_pointerLock = nullptr; m_hasPointerLock = false; if (surfaceWasLocked) { - emit backend()->pointerLockChanged(false); + Q_EMIT backend()->pointerLockChanged(false); } return; } @@ -164,7 +164,7 @@ void XdgShellOutput::lockPointer(Pointer *pointer, bool lock) connect(m_pointerLock, &LockedPointer::locked, this, [this] { m_hasPointerLock = true; - emit backend()->pointerLockChanged(true); + Q_EMIT backend()->pointerLockChanged(true); } ); connect(m_pointerLock, &LockedPointer::unlocked, this, @@ -172,7 +172,7 @@ void XdgShellOutput::lockPointer(Pointer *pointer, bool lock) delete m_pointerLock; m_pointerLock = nullptr; m_hasPointerLock = false; - emit backend()->pointerLockChanged(false); + Q_EMIT backend()->pointerLockChanged(false); } ); } diff --git a/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp b/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp index ef61e41f40..0d3bfddb8b 100644 --- a/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp +++ b/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp @@ -120,7 +120,7 @@ void OMLSyncControlVsyncMonitorHelper::poll() glXGetSyncValuesOML(m_display, m_drawable, &ust, &msc, &sbc); glXWaitForMscOML(m_display, m_drawable, 0, 2, (msc + 1) % 2, &ust, &msc, &sbc); - emit vblankOccurred(std::chrono::microseconds(ust)); + Q_EMIT vblankOccurred(std::chrono::microseconds(ust)); } OMLSyncControlVsyncMonitor::OMLSyncControlVsyncMonitor(QObject *parent) diff --git a/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp b/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp index 9478b90849..748f1e8794 100644 --- a/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp +++ b/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp @@ -112,7 +112,7 @@ void SGIVideoSyncVsyncMonitorHelper::poll() { if (!glXMakeCurrent(m_display, m_drawable, m_localContext)) { qCDebug(KWIN_X11STANDALONE) << "Failed to make vsync monitor OpenGL context current"; - emit errorOccurred(); + Q_EMIT errorOccurred(); return; } @@ -122,7 +122,7 @@ void SGIVideoSyncVsyncMonitorHelper::poll() glXWaitVideoSyncSGI(2, (count + 1) % 2, &count); // Using monotonic clock is inaccurate, but it's still a pretty good estimate. - emit vblankOccurred(std::chrono::steady_clock::now().time_since_epoch()); + Q_EMIT vblankOccurred(std::chrono::steady_clock::now().time_since_epoch()); } SGIVideoSyncVsyncMonitor::SGIVideoSyncVsyncMonitor(QObject *parent) diff --git a/src/plugins/platforms/x11/standalone/x11_platform.cpp b/src/plugins/platforms/x11/standalone/x11_platform.cpp index be5239453b..c661191969 100644 --- a/src/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/src/plugins/platforms/x11/standalone/x11_platform.cpp @@ -488,8 +488,8 @@ void X11StandalonePlatform::doUpdateOutputs() auto fallback = [this]() { X11PlaceholderOutput *dummyOutput = new X11PlaceholderOutput(); m_outputs << dummyOutput; - emit outputAdded(dummyOutput); - emit outputEnabled(dummyOutput); + Q_EMIT outputAdded(dummyOutput); + Q_EMIT outputEnabled(dummyOutput); }; // TODO: instead of resetting all outputs, check if new output is added/removed @@ -497,20 +497,20 @@ void X11StandalonePlatform::doUpdateOutputs() // untouched (like in DRM backend) while (!m_outputs.isEmpty()) { AbstractOutput *output = m_outputs.takeLast(); - emit outputDisabled(output); - emit outputRemoved(output); + Q_EMIT outputDisabled(output); + Q_EMIT outputRemoved(output); delete output; } if (!Xcb::Extensions::self()->isRandrAvailable()) { fallback(); - emit screensQueried(); + Q_EMIT screensQueried(); return; } T resources(rootWindow()); if (resources.isNull()) { fallback(); - emit screensQueried(); + Q_EMIT screensQueried(); return; } xcb_randr_crtc_t *crtcs = resources.crtcs(); @@ -588,8 +588,8 @@ void X11StandalonePlatform::doUpdateOutputs() } m_outputs << o; - emit outputAdded(o); - emit outputEnabled(o); + Q_EMIT outputAdded(o); + Q_EMIT outputEnabled(o); } } @@ -597,7 +597,7 @@ void X11StandalonePlatform::doUpdateOutputs() fallback(); } - emit screensQueried(); + Q_EMIT screensQueried(); } Outputs X11StandalonePlatform::outputs() const diff --git a/src/plugins/platforms/x11/standalone/x11cursor.cpp b/src/plugins/platforms/x11/standalone/x11cursor.cpp index 40a8a9dac7..852f0e660f 100644 --- a/src/plugins/platforms/x11/standalone/x11cursor.cpp +++ b/src/plugins/platforms/x11/standalone/x11cursor.cpp @@ -126,7 +126,7 @@ void X11Cursor::mousePolled() static uint16_t lastMask = m_buttonMask; doGetPos(); // Update if needed if (lastPos != currentPos() || lastMask != m_buttonMask) { - emit mouseChanged(currentPos(), lastPos, + Q_EMIT mouseChanged(currentPos(), lastPos, x11ToQtMouseButtons(m_buttonMask), x11ToQtMouseButtons(lastMask), x11ToQtKeyboardModifiers(m_buttonMask), x11ToQtKeyboardModifiers(lastMask)); lastPos = currentPos(); @@ -180,7 +180,7 @@ void X11Cursor::notifyCursorChanged() // cursor change tracking is currently disabled, so don't emit signal return; } - emit cursorChanged(); + Q_EMIT cursorChanged(); } } diff --git a/src/plugins/platforms/x11/windowed/x11windowed_backend.cpp b/src/plugins/platforms/x11/windowed/x11windowed_backend.cpp index 4ef0e31878..461d4f569e 100644 --- a/src/plugins/platforms/x11/windowed/x11windowed_backend.cpp +++ b/src/plugins/platforms/x11/windowed/x11windowed_backend.cpp @@ -103,7 +103,7 @@ bool X11WindowedBackend::initialize() if (m_hasXInput) { waylandServer()->seat()->setHasTouch(true); } - emit screensQueried(); + Q_EMIT screensQueried(); return true; } else { return false; @@ -185,8 +185,8 @@ void X11WindowedBackend::createOutputs() logicalWidthSum += logicalWidth; m_outputs << output; - emit outputAdded(output); - emit outputEnabled(output); + Q_EMIT outputAdded(output); + Q_EMIT outputEnabled(output); } updateWindowTitle(); @@ -391,8 +391,8 @@ void X11WindowedBackend::handleClientMessage(xcb_client_message_event_t *event) x += (*it)->geometry().width(); } - emit outputDisabled(removedOutput); - emit outputRemoved(removedOutput); + Q_EMIT outputDisabled(removedOutput); + Q_EMIT outputRemoved(removedOutput); delete removedOutput; QMetaObject::invokeMethod(screens(), "updateCount"); } @@ -465,7 +465,7 @@ void X11WindowedBackend::updateSize(xcb_configure_notify_event_t *event) if (s != output->pixelSize()) { output->setGeometry(output->internalPosition(), s); } - emit sizeChanged(); + Q_EMIT sizeChanged(); } void X11WindowedBackend::createCursor(const QImage &srcImage, const QPoint &hotspot) diff --git a/src/plugins/qpa/window.cpp b/src/plugins/qpa/window.cpp index 940a4e1c56..53f2da22ba 100644 --- a/src/plugins/qpa/window.cpp +++ b/src/plugins/qpa/window.cpp @@ -68,16 +68,16 @@ void Window::setGeometry(const QRect &rect) const QRect &oldRect = geometry(); QPlatformWindow::setGeometry(rect); if (rect.x() != oldRect.x()) { - emit window()->xChanged(rect.x()); + Q_EMIT window()->xChanged(rect.x()); } if (rect.y() != oldRect.y()) { - emit window()->yChanged(rect.y()); + Q_EMIT window()->yChanged(rect.y()); } if (rect.width() != oldRect.width()) { - emit window()->widthChanged(rect.width()); + Q_EMIT window()->widthChanged(rect.width()); } if (rect.height() != oldRect.height()) { - emit window()->heightChanged(rect.height()); + Q_EMIT window()->heightChanged(rect.height()); } const QSize nativeSize = rect.size() * m_scale; diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp index d85915b06e..cfcd2fe0d1 100644 --- a/src/pointer_input.cpp +++ b/src/pointer_input.cpp @@ -119,7 +119,7 @@ void PointerInputRedirection::init() auto cursor = Cursors::self()->mouse(); cursor->updateCursor(m_cursor->image(), m_cursor->hotSpot()); }); - emit m_cursor->changed(); + Q_EMIT m_cursor->changed(); connect(Cursors::self()->mouse(), &Cursor::rendered, m_cursor, &CursorImage::markAsRendered); @@ -305,7 +305,7 @@ void PointerInputRedirection::processAxis(InputRedirection::PointerAxis axis, qr { update(); - emit input()->pointerAxisChanged(axis, delta); + Q_EMIT input()->pointerAxisChanged(axis, delta); WheelEvent wheelEvent(m_pos, delta, discreteDelta, (axis == InputRedirection::PointerAxisHorizontal) ? Qt::Horizontal : Qt::Vertical, @@ -826,7 +826,7 @@ void PointerInputRedirection::updatePosition(const QPointF &pos) return; } m_pos = p; - emit input()->globalPointerChanged(m_pos); + Q_EMIT input()->globalPointerChanged(m_pos); } void PointerInputRedirection::updateButton(uint32_t button, InputRedirection::PointerButtonState state) @@ -842,7 +842,7 @@ void PointerInputRedirection::updateButton(uint32_t button, InputRedirection::Po m_qtButtons |= buttonToQtMouseButton(it.key()); } - emit input()->pointerButtonStateChanged(button, state); + Q_EMIT input()->pointerButtonStateChanged(button, state); } void PointerInputRedirection::warp(const QPointF &pos) @@ -1045,7 +1045,7 @@ void CursorImage::updateDecorationCursor() if (AbstractClient *c = deco ? deco->client() : nullptr) { loadThemeCursor(c->cursor(), &m_decorationCursor); if (m_currentSource == CursorSource::Decoration) { - emit changed(); + Q_EMIT changed(); } } reevaluteSource(); @@ -1057,7 +1057,7 @@ void CursorImage::updateMoveResize() if (AbstractClient *c = workspace()->moveResizeClient()) { loadThemeCursor(c->cursor(), &m_moveResizeCursor); if (m_currentSource == CursorSource::MoveResize) { - emit changed(); + Q_EMIT changed(); } } reevaluteSource(); @@ -1071,28 +1071,28 @@ void CursorImage::updateServerCursor() auto p = waylandServer()->seat()->pointer(); if (!p) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto c = p->cursor(); if (!c) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto cursorSurface = c->surface(); if (!cursorSurface) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto buffer = cursorSurface->buffer(); if (!buffer) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } @@ -1100,7 +1100,7 @@ void CursorImage::updateServerCursor() m_serverCursor.cursor.image = buffer->data().copy(); m_serverCursor.cursor.image.setDevicePixelRatio(cursorSurface->bufferScale()); if (needsEmit) { - emit changed(); + Q_EMIT changed(); } } @@ -1108,7 +1108,7 @@ void CursorImage::setEffectsOverrideCursor(Qt::CursorShape shape) { loadThemeCursor(shape, &m_effectsCursor); if (m_currentSource == CursorSource::EffectsOverride) { - emit changed(); + Q_EMIT changed(); } reevaluteSource(); } @@ -1126,7 +1126,7 @@ void CursorImage::setWindowSelectionCursor(const QByteArray &shape) loadThemeCursor(shape, &m_windowSelectionCursor); } if (m_currentSource == CursorSource::WindowSelector) { - emit changed(); + Q_EMIT changed(); } reevaluteSource(); } @@ -1168,28 +1168,28 @@ void CursorImage::updateDragCursor() auto p = waylandServer()->seat()->pointer(); if (!p) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto c = p->cursor(); if (!c) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto cursorSurface = c->surface(); if (!cursorSurface) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } auto buffer = cursorSurface->buffer(); if (!buffer) { if (needsEmit) { - emit changed(); + Q_EMIT changed(); } return; } @@ -1230,7 +1230,7 @@ void CursorImage::updateDragCursor() } if (needsEmit) { - emit changed(); + Q_EMIT changed(); } // TODO: add the cursor image } @@ -1362,7 +1362,7 @@ void CursorImage::setSource(CursorSource source) return; } m_currentSource = source; - emit changed(); + Q_EMIT changed(); } QImage CursorImage::image() const @@ -1438,20 +1438,20 @@ void InputRedirectionCursor::doSetPos() input()->warpPointer(currentPos()); } slotPosChanged(input()->globalPointer()); - emit posChanged(currentPos()); + Q_EMIT posChanged(currentPos()); } void InputRedirectionCursor::slotPosChanged(const QPointF &pos) { const QPoint oldPos = currentPos(); updatePos(pos.toPoint()); - emit mouseChanged(pos.toPoint(), oldPos, m_currentButtons, m_currentButtons, + Q_EMIT mouseChanged(pos.toPoint(), oldPos, m_currentButtons, m_currentButtons, input()->keyboardModifiers(), input()->keyboardModifiers()); } void InputRedirectionCursor::slotModifiersChanged(Qt::KeyboardModifiers mods, Qt::KeyboardModifiers oldMods) { - emit mouseChanged(currentPos(), currentPos(), m_currentButtons, m_currentButtons, mods, oldMods); + Q_EMIT mouseChanged(currentPos(), currentPos(), m_currentButtons, m_currentButtons, mods, oldMods); } void InputRedirectionCursor::slotPointerButtonChanged() @@ -1459,7 +1459,7 @@ void InputRedirectionCursor::slotPointerButtonChanged() const Qt::MouseButtons oldButtons = m_currentButtons; m_currentButtons = input()->qtButtonStates(); const QPoint pos = currentPos(); - emit mouseChanged(pos, pos, m_currentButtons, oldButtons, input()->keyboardModifiers(), input()->keyboardModifiers()); + Q_EMIT mouseChanged(pos, pos, m_currentButtons, oldButtons, input()->keyboardModifiers(), input()->keyboardModifiers()); } void InputRedirectionCursor::doStartCursorTracking() diff --git a/src/renderloop.cpp b/src/renderloop.cpp index 0e405712f7..8504cd10a1 100644 --- a/src/renderloop.cpp +++ b/src/renderloop.cpp @@ -150,7 +150,7 @@ void RenderLoopPrivate::notifyFrameCompleted(std::chrono::nanoseconds timestamp) maybeScheduleRepaint(); } - emit q->framePresented(q, timestamp); + Q_EMIT q->framePresented(q, timestamp); } void RenderLoopPrivate::dispatch() @@ -159,7 +159,7 @@ void RenderLoopPrivate::dispatch() // the Compositor starts repainting. pendingRepaint = true; - emit q->frameRequested(q); + Q_EMIT q->frameRequested(q); // The Compositor may decide to not repaint when the frameRequested() signal is // emitted, in which case the pending repaint flag has to be reset manually. @@ -225,7 +225,7 @@ void RenderLoop::setRefreshRate(int refreshRate) return; } d->refreshRate = refreshRate; - emit refreshRateChanged(); + Q_EMIT refreshRateChanged(); } void RenderLoop::scheduleRepaint() diff --git a/src/rules.cpp b/src/rules.cpp index b62f0fe6cb..f1a6df2671 100644 --- a/src/rules.cpp +++ b/src/rules.cpp @@ -1099,7 +1099,7 @@ void RuleBook::setUpdatesDisabled(bool disable) { m_updatesDisabled = disable; if (!disable) { - foreach (X11Client *c, Workspace::self()->clientList()) + Q_FOREACH (X11Client *c, Workspace::self()->clientList()) c->updateWindowRules(Rules::All); } } diff --git a/src/scene.cpp b/src/scene.cpp index 96b145fc04..b7305c7ea7 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -199,7 +199,7 @@ void Scene::paintScreen(int* mask, const QRegion &damage, const QRegion &repaint Q_EMIT frameRendered(); - foreach (Window *w, stacking_order) { + Q_FOREACH (Window *w, stacking_order) { effects->postPaintWindow(effectWindow(w)); } @@ -244,7 +244,7 @@ void Scene::paintGenericScreen(int orig_mask, const ScreenPaintData &) { QVector phase2; phase2.reserve(stacking_order.size()); - foreach (Window * w, stacking_order) { // bottom to top + Q_FOREACH (Window * w, stacking_order) { // bottom to top // Let the scene window update the window pixmap tree. w->preprocess(w->windowItem()); @@ -284,7 +284,7 @@ void Scene::paintGenericScreen(int orig_mask, const ScreenPaintData &) if (!(orig_mask & PAINT_SCREEN_BACKGROUND_FIRST)) { paintBackground(infiniteRegion()); } - foreach (const Phase2Data & d, phase2) { + Q_FOREACH (const Phase2Data & d, phase2) { paintWindow(d.window, d.mask, d.region, d.quads); } } @@ -497,7 +497,7 @@ void Scene::windowClosed(Toplevel *toplevel, Deleted *deleted) void Scene::createStackingOrder(const QList &toplevels) { // TODO: cache the stacking_order in case it has not changed - foreach (Toplevel *c, toplevels) { + Q_FOREACH (Toplevel *c, toplevels) { Q_ASSERT(m_windows.contains(c)); stacking_order.append(m_windows[ c ]); } diff --git a/src/screenedge.cpp b/src/screenedge.cpp index 4b8f268db2..ffb15038ea 100644 --- a/src/screenedge.cpp +++ b/src/screenedge.cpp @@ -84,7 +84,7 @@ Edge::Edge(ScreenEdges *parent) int factor = progress * 256.0f; if (m_lastApproachingFactor != factor) { m_lastApproachingFactor = factor; - emit approaching(border(), m_lastApproachingFactor/256.0f, m_approachGeometry); + Q_EMIT approaching(border(), m_lastApproachingFactor/256.0f, m_approachGeometry); } } ); @@ -534,7 +534,7 @@ void Edge::checkBlocking() const bool wasTouch = activatesForTouchGesture(); m_blocked = newValue; if (wasTouch != activatesForTouchGesture()) { - emit activatesForTouchGestureChanged(); + Q_EMIT activatesForTouchGestureChanged(); } doUpdateBlocking(); } @@ -577,7 +577,7 @@ void Edge::startApproaching() m_approaching = true; doStartApproaching(); m_lastApproachingFactor = 0; - emit approaching(border(), 0.0, m_approachGeometry); + Q_EMIT approaching(border(), 0.0, m_approachGeometry); } void Edge::doStartApproaching() @@ -592,7 +592,7 @@ void Edge::stopApproaching() m_approaching = false; doStopApproaching(); m_lastApproachingFactor = 0; - emit approaching(border(), 0.0, m_approachGeometry); + Q_EMIT approaching(border(), 0.0, m_approachGeometry); } void Edge::doStopApproaching() @@ -638,7 +638,7 @@ void Edge::updateApproaching(const QPoint &point) factor = 256 - factor; if (m_lastApproachingFactor != factor) { m_lastApproachingFactor = factor; - emit approaching(border(), m_lastApproachingFactor/256.0f, m_approachGeometry); + Q_EMIT approaching(border(), m_lastApproachingFactor/256.0f, m_approachGeometry); } } else { stopApproaching(); @@ -680,7 +680,7 @@ void Edge::setTouchAction(ElectricBorderAction action) { const bool wasTouch = activatesForTouchGesture(); m_touchAction = action; if (wasTouch != activatesForTouchGesture()) { - emit activatesForTouchGestureChanged(); + Q_EMIT activatesForTouchGestureChanged(); } } @@ -689,7 +689,7 @@ void Edge::setClient(AbstractClient *client) const bool wasTouch = activatesForTouchGesture(); m_client = client; if (wasTouch != activatesForTouchGesture()) { - emit activatesForTouchGestureChanged(); + Q_EMIT activatesForTouchGestureChanged(); } } diff --git a/src/screenlockerwatcher.cpp b/src/screenlockerwatcher.cpp index 87f5c91c0c..a47f11baa7 100644 --- a/src/screenlockerwatcher.cpp +++ b/src/screenlockerwatcher.cpp @@ -127,7 +127,7 @@ void ScreenLockerWatcher::setLocked(bool activated) return; } m_locked = activated; - emit locked(m_locked); + Q_EMIT locked(m_locked); } } diff --git a/src/screens.cpp b/src/screens.cpp index 4fb9d75543..262dff98a2 100644 --- a/src/screens.cpp +++ b/src/screens.cpp @@ -69,7 +69,7 @@ void Screens::init() Settings settings; settings.setDefaults(); m_currentFollowsMouse = settings.activeMouseScreen(); - emit changed(); + Q_EMIT changed(); } QString Screens::name(int screen) const @@ -153,11 +153,11 @@ void Screens::updateSize() } if (m_boundingSize != bounding.size()) { m_boundingSize = bounding.size(); - emit sizeChanged(); + Q_EMIT sizeChanged(); } if (!qFuzzyCompare(m_maxScale, maxScale)) { m_maxScale = maxScale; - emit maxScaleChanged(); + Q_EMIT maxScaleChanged(); } } @@ -173,7 +173,7 @@ void Screens::setCount(int count) } const int previous = m_count; m_count = count; - emit countChanged(previous, count); + Q_EMIT countChanged(previous, count); } void Screens::setCurrent(int current) @@ -182,7 +182,7 @@ void Screens::setCurrent(int current) return; } m_current = current; - emit currentChanged(); + Q_EMIT currentChanged(); } void Screens::setCurrent(const QPoint &pos) diff --git a/src/scripting/dbuscall.cpp b/src/scripting/dbuscall.cpp index 565543cea2..0bbd1b58c6 100644 --- a/src/scripting/dbuscall.cpp +++ b/src/scripting/dbuscall.cpp @@ -33,14 +33,14 @@ void DBusCall::call() connect(watcher, &QDBusPendingCallWatcher::finished, [this, watcher]() { watcher->deleteLater(); if (watcher->isError()) { - emit failed(); + Q_EMIT failed(); return; } QVariantList reply = watcher->reply().arguments(); std::for_each(reply.begin(), reply.end(), [](QVariant &variant) { variant = dbusToVariant(variant); }); - emit finished(reply); + Q_EMIT finished(reply); }); } diff --git a/src/scripting/dbuscall.h b/src/scripting/dbuscall.h index b9fdbb89e8..c2fcb26722 100644 --- a/src/scripting/dbuscall.h +++ b/src/scripting/dbuscall.h @@ -117,7 +117,7 @@ inline void DBusCall::set##upperName(type name) \ return; \ } \ m_##name = name; \ - emit name##Changed(); \ + Q_EMIT name##Changed(); \ } #define WRAPPER(name, upperName) \ GENERIC_WRAPPER(const QString&, name, upperName) diff --git a/src/scripting/screenedgeitem.cpp b/src/scripting/screenedgeitem.cpp index 5cd852b644..b24ab61489 100644 --- a/src/scripting/screenedgeitem.cpp +++ b/src/scripting/screenedgeitem.cpp @@ -36,7 +36,7 @@ void ScreenEdgeItem::setEnabled(bool enabled) disableEdge(); m_enabled = enabled; enableEdge(); - emit enabledChanged(); + Q_EMIT enabledChanged(); } void ScreenEdgeItem::setEdge(Edge edge) @@ -47,7 +47,7 @@ void ScreenEdgeItem::setEdge(Edge edge) disableEdge(); m_edge = edge; enableEdge(); - emit edgeChanged(); + Q_EMIT edgeChanged(); } void ScreenEdgeItem::enableEdge() @@ -89,7 +89,7 @@ bool ScreenEdgeItem::borderActivated(ElectricBorder edge) if (edge != static_cast(m_edge) || !m_enabled) { return false; } - emit activated(); + Q_EMIT activated(); return true; } @@ -101,7 +101,7 @@ void ScreenEdgeItem::setMode(Mode mode) disableEdge(); m_mode = mode; enableEdge(); - emit modeChanged(); + Q_EMIT modeChanged(); } } // namespace diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp index 7e5a914415..379a03ef27 100644 --- a/src/scripting/scriptedeffect.cpp +++ b/src/scripting/scriptedeffect.cpp @@ -180,7 +180,7 @@ ScriptedEffect::ScriptedEffect() return; } if (m_activeFullScreenEffect == this || fullScreenEffect == this) { - emit isActiveFullScreenEffectChanged(); + Q_EMIT isActiveFullScreenEffectChanged(); } m_activeFullScreenEffect = fullScreenEffect; }); @@ -280,7 +280,7 @@ bool ScriptedEffect::init(const QString &effectName, const QString &pathToScript void ScriptedEffect::animationEnded(KWin::EffectWindow *w, Attribute a, uint meta) { AnimationEffect::animationEnded(w, a, meta); - emit animationEnded(w, 0); + Q_EMIT animationEnded(w, 0); } QString ScriptedEffect::pluginId() const @@ -561,7 +561,7 @@ void ScriptedEffect::reconfigure(ReconfigureFlags flags) if (m_config) { m_config->read(); } - emit configChanged(); + Q_EMIT configChanged(); } void ScriptedEffect::registerShortcut(const QString &objectName, const QString &text, diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp index 7d3fa0ed4f..27352af485 100644 --- a/src/scripting/scripting.cpp +++ b/src/scripting/scripting.cpp @@ -744,7 +744,7 @@ bool KWin::Scripting::isScriptLoaded(const QString &pluginName) const KWin::AbstractScript *KWin::Scripting::findScript(const QString &pluginName) const { QMutexLocker locker(m_scriptsLock.data()); - foreach (AbstractScript *script, scripts) { + Q_FOREACH (AbstractScript *script, scripts) { if (script->pluginName() == pluginName) { return script; } @@ -755,7 +755,7 @@ KWin::AbstractScript *KWin::Scripting::findScript(const QString &pluginName) con bool KWin::Scripting::unloadScript(const QString &pluginName) { QMutexLocker locker(m_scriptsLock.data()); - foreach (AbstractScript *script, scripts) { + Q_FOREACH (AbstractScript *script, scripts) { if (script->pluginName() == pluginName) { script->deleteLater(); return true; diff --git a/src/scripting/scripting.h b/src/scripting/scripting.h index 7308709242..85ce7b360d 100644 --- a/src/scripting/scripting.h +++ b/src/scripting/scripting.h @@ -73,7 +73,7 @@ protected: return; } m_running = running; - emit runningChanged(m_running); + Q_EMIT runningChanged(m_running); } private: diff --git a/src/scripting/scripting_model.cpp b/src/scripting/scripting_model.cpp index 3a3d05269f..c1d2f06227 100644 --- a/src/scripting/scripting_model.cpp +++ b/src/scripting/scripting_model.cpp @@ -169,9 +169,9 @@ void ClientLevel::addClient(AbstractClient *client) if (containsClient(client)) { return; } - emit beginInsert(m_clients.count(), m_clients.count(), id()); + Q_EMIT beginInsert(m_clients.count(), m_clients.count(), id()); m_clients.insert(nextId(), client); - emit endInsert(); + Q_EMIT endInsert(); } void ClientLevel::removeClient(AbstractClient *client) @@ -186,9 +186,9 @@ void ClientLevel::removeClient(AbstractClient *client) if (it == m_clients.end()) { return; } - emit beginRemove(index, index, id()); + Q_EMIT beginRemove(index, index, id()); m_clients.erase(it); - emit endRemove(); + Q_EMIT endRemove(); } void ClientLevel::init() @@ -418,14 +418,14 @@ void ForkLevel::desktopCountChanged(uint previousCount, uint newCount) } if (previousCount > newCount) { // desktops got removed - emit beginRemove(newCount, previousCount-1, id()); + Q_EMIT beginRemove(newCount, previousCount-1, id()); while (uint(m_children.count()) > newCount) { delete m_children.takeLast(); } - emit endRemove(); + Q_EMIT endRemove(); } else { // desktops got added - emit beginInsert(previousCount, newCount-1, id()); + Q_EMIT beginInsert(previousCount, newCount-1, id()); for (uint i=previousCount+1; i<=newCount; ++i) { AbstractLevel *childLevel = AbstractLevel::create(m_childRestrictions, restrictions(), model(), this); if (!childLevel) { @@ -435,7 +435,7 @@ void ForkLevel::desktopCountChanged(uint previousCount, uint newCount) childLevel->init(); addChild(childLevel); } - emit endInsert(); + Q_EMIT endInsert(); } } @@ -450,14 +450,14 @@ void ForkLevel::screenCountChanged(int previousCount, int newCount) if (previousCount > newCount) { // screens got removed - emit beginRemove(newCount, previousCount-1, id()); + Q_EMIT beginRemove(newCount, previousCount-1, id()); while (m_children.count() > newCount) { delete m_children.takeLast(); } - emit endRemove(); + Q_EMIT endRemove(); } else { // screens got added - emit beginInsert(previousCount, newCount-1, id()); + Q_EMIT beginInsert(previousCount, newCount-1, id()); for (int i=previousCount; iinit(); addChild(childLevel); } - emit endInsert(); + Q_EMIT endInsert(); } } @@ -478,21 +478,21 @@ void ForkLevel::activityAdded(const QString &activityId) return; } // verify that our children do not contain this activity - foreach (AbstractLevel *child, m_children) { + Q_FOREACH (AbstractLevel *child, m_children) { if (child->activity() == activityId) { return; } } - emit beginInsert(m_children.count(), m_children.count(), id()); + Q_EMIT beginInsert(m_children.count(), m_children.count(), id()); AbstractLevel *childLevel = AbstractLevel::create(m_childRestrictions, restrictions(), model(), this); if (!childLevel) { - emit endInsert(); + Q_EMIT endInsert(); return; } childLevel->setActivity(activityId); childLevel->init(); addChild(childLevel); - emit endInsert(); + Q_EMIT endInsert(); #else Q_UNUSED(activityId) #endif @@ -506,9 +506,9 @@ void ForkLevel::activityRemoved(const QString &activityId) } for (int i=0; iactivity() == activityId) { - emit beginRemove(i, i, id()); + Q_EMIT beginRemove(i, i, id()); delete m_children.takeAt(i); - emit endRemove(); + Q_EMIT endRemove(); break; } } @@ -662,7 +662,7 @@ void ClientModel::setExclusions(ClientModel::Exclusions exclusions) return; } m_exclusions = exclusions; - emit exclusionsChanged(); + Q_EMIT exclusionsChanged(); } QVariant ClientModel::data(const QModelIndex &index, int role) const @@ -847,7 +847,7 @@ void ClientFilterModel::setClientModel(ClientModel *clientModel) } m_clientModel = clientModel; setSourceModel(m_clientModel); - emit clientModelChanged(); + Q_EMIT clientModelChanged(); } void ClientFilterModel::setFilter(const QString &filter) @@ -856,7 +856,7 @@ void ClientFilterModel::setFilter(const QString &filter) return; } m_filter = filter; - emit filterChanged(); + Q_EMIT filterChanged(); invalidateFilter(); } diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp index 9a56a25e2f..ed596af531 100644 --- a/src/scripting/workspace_wrapper.cpp +++ b/src/scripting/workspace_wrapper.cpp @@ -50,7 +50,7 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent) connect(screens(), &Screens::countChanged, this, [this] (int previousCount, int currentCount) { Q_UNUSED(previousCount) - emit numberScreensChanged(currentCount); + Q_EMIT numberScreensChanged(currentCount); } ); // TODO Plasma 6: Remove it. diff --git a/src/session_consolekit.cpp b/src/session_consolekit.cpp index c7df93a60a..828ec90e1e 100644 --- a/src/session_consolekit.cpp +++ b/src/session_consolekit.cpp @@ -302,7 +302,7 @@ void ConsoleKitSession::updateActive(bool active) { if (m_isActive != active) { m_isActive = active; - emit activeChanged(active); + Q_EMIT activeChanged(active); } } @@ -331,7 +331,7 @@ void ConsoleKitSession::handlePropertiesChanged(const QString &interfaceName, co void ConsoleKitSession::handlePrepareForSleep(bool sleep) { if (!sleep) { - emit awoke(); + Q_EMIT awoke(); } } diff --git a/src/session_logind.cpp b/src/session_logind.cpp index d0426b1d46..78a2a2d63a 100644 --- a/src/session_logind.cpp +++ b/src/session_logind.cpp @@ -300,7 +300,7 @@ void LogindSession::updateActive(bool active) { if (m_isActive != active) { m_isActive = active; - emit activeChanged(active); + Q_EMIT activeChanged(active); } } @@ -329,7 +329,7 @@ void LogindSession::handlePropertiesChanged(const QString &interfaceName, const void LogindSession::handlePrepareForSleep(bool sleep) { if (!sleep) { - emit awoke(); + Q_EMIT awoke(); } } diff --git a/src/shadow.cpp b/src/shadow.cpp index 671bae7326..b77af4db33 100644 --- a/src/shadow.cpp +++ b/src/shadow.cpp @@ -185,7 +185,7 @@ bool Shadow::init(const QVector< uint32_t > &data) return false; } buildQuads(); - emit textureChanged(); + Q_EMIT textureChanged(); return true; } @@ -216,7 +216,7 @@ bool Shadow::init(KDecoration2::Decoration *decoration) return false; } buildQuads(); - emit textureChanged(); + Q_EMIT textureChanged(); return true; } @@ -245,7 +245,7 @@ bool Shadow::init(const QPointer< KWaylandServer::ShadowInterface > &shadow) return false; } buildQuads(); - emit textureChanged(); + Q_EMIT textureChanged(); return true; } @@ -288,7 +288,7 @@ bool Shadow::init(const QWindow *window) } buildQuads(); - emit textureChanged(); + Q_EMIT textureChanged(); return true; } @@ -300,7 +300,7 @@ void Shadow::updateShadowRegion() const QRect bottom(0, m_topLevel->height(), m_topLevel->width(), m_bottomOffset); const QRect left(- m_leftOffset, - m_topOffset, m_leftOffset, m_topLevel->height() + m_topOffset + m_bottomOffset); m_shadowRegion = QRegion(top).united(right).united(bottom).united(left); - emit regionChanged(); + Q_EMIT regionChanged(); } void Shadow::buildQuads() diff --git a/src/sm.cpp b/src/sm.cpp index cd2e17d3df..222117608b 100644 --- a/src/sm.cpp +++ b/src/sm.cpp @@ -276,7 +276,7 @@ SessionInfo* Workspace::takeSessionInfo(X11Client *c) // First search ``session'' if (! sessionId.isEmpty()) { // look for a real session managed client (algorithm suggested by ICCCM) - foreach (SessionInfo * info, session) { + Q_FOREACH (SessionInfo * info, session) { if (realInfo) break; if (info->sessionId == sessionId && sessionInfoWindowTypeMatch(c, info)) { @@ -297,7 +297,7 @@ SessionInfo* Workspace::takeSessionInfo(X11Client *c) } } else { // look for a sessioninfo with matching features. - foreach (SessionInfo * info, session) { + Q_FOREACH (SessionInfo * info, session) { if (realInfo) break; if (info->resourceName == resourceName @@ -361,22 +361,22 @@ void SessionManager::setState(SessionState state) }); } m_sessionState = state; - emit stateChanged(); + Q_EMIT stateChanged(); } void SessionManager::loadSession(const QString &name) { - emit loadSessionRequested(name); + Q_EMIT loadSessionRequested(name); } void SessionManager::aboutToSaveSession(const QString &name) { - emit prepareSessionSaveRequested(name); + Q_EMIT prepareSessionSaveRequested(name); } void SessionManager::finishSaveSession(const QString &name) { - emit finishSessionSaveRequested(name); + Q_EMIT finishSessionSaveRequested(name); } void SessionManager::quit() diff --git a/src/subsurfacemonitor.cpp b/src/subsurfacemonitor.cpp index e45c684b38..e5ba41e226 100644 --- a/src/subsurfacemonitor.cpp +++ b/src/subsurfacemonitor.cpp @@ -40,7 +40,7 @@ void SubSurfaceMonitor::registerSubSurface(SubSurfaceInterface *subSurface) connect(surface, &SurfaceInterface::bufferSizeChanged, this, &SubSurfaceMonitor::subSurfaceBufferSizeChanged); connect(surface, &SurfaceInterface::committed, - this, [this, subSurface]() { emit subSurfaceCommitted(subSurface); }); + this, [this, subSurface]() { Q_EMIT subSurfaceCommitted(subSurface); }); registerSurface(surface); } diff --git a/src/surfaceitem.cpp b/src/surfaceitem.cpp index b4a5b9ee07..ee14f3ad69 100644 --- a/src/surfaceitem.cpp +++ b/src/surfaceitem.cpp @@ -35,7 +35,7 @@ void SurfaceItem::addDamage(const QRegion ®ion) scheduleRepaint(region); Toplevel *toplevel = window()->window(); - emit toplevel->damaged(toplevel, region); + Q_EMIT toplevel->damaged(toplevel, region); } void SurfaceItem::resetDamage() diff --git a/src/tabbox/clientmodel.cpp b/src/tabbox/clientmodel.cpp index ac8ea2a97d..a8f879e54f 100644 --- a/src/tabbox/clientmodel.cpp +++ b/src/tabbox/clientmodel.cpp @@ -80,7 +80,7 @@ QVariant ClientModel::data(const QModelIndex& index, int role) const QString ClientModel::longestCaption() const { QString caption; - foreach (const QWeakPointer &clientPointer, m_clientList) { + Q_FOREACH (const QWeakPointer &clientPointer, m_clientList) { QSharedPointer client = clientPointer.toStrongRef(); if (!client) { continue; @@ -217,7 +217,7 @@ void ClientModel::createClientList(int desktop, bool partialReset) break; } } - foreach (const QWeakPointer< TabBoxClient > &c, stickyClients) { + Q_FOREACH (const QWeakPointer< TabBoxClient > &c, stickyClients) { m_clientList.removeAll(c); m_clientList.prepend(c); } diff --git a/src/tabbox/switcheritem.cpp b/src/tabbox/switcheritem.cpp index 1aed6c027d..f6b60b1808 100644 --- a/src/tabbox/switcheritem.cpp +++ b/src/tabbox/switcheritem.cpp @@ -47,13 +47,13 @@ void SwitcherItem::setItem(QObject *item) return; } m_item = item; - emit itemChanged(); + Q_EMIT itemChanged(); } void SwitcherItem::setModel(QAbstractItemModel *model) { m_model = model; - emit modelChanged(); + Q_EMIT modelChanged(); } void SwitcherItem::setVisible(bool visible) @@ -62,9 +62,9 @@ void SwitcherItem::setVisible(bool visible) return; } if (visible) - emit screenGeometryChanged(); + Q_EMIT screenGeometryChanged(); m_visible = visible; - emit visibleChanged(); + Q_EMIT visibleChanged(); } QRect SwitcherItem::screenGeometry() const @@ -81,7 +81,7 @@ void SwitcherItem::setCurrentIndex(int index) if (m_model) { tabBox->setCurrentIndex(m_model->index(index, 0)); } - emit currentIndexChanged(m_currentIndex); + Q_EMIT currentIndexChanged(m_currentIndex); } void SwitcherItem::setAllDesktops(bool all) @@ -90,7 +90,7 @@ void SwitcherItem::setAllDesktops(bool all) return; } m_allDesktops = all; - emit allDesktopsChanged(); + Q_EMIT allDesktopsChanged(); } void SwitcherItem::setNoModifierGrab(bool set) @@ -99,7 +99,7 @@ void SwitcherItem::setNoModifierGrab(bool set) return; } m_noModifierGrab = set; - emit noModifierGrabChanged(); + Q_EMIT noModifierGrabChanged(); } bool SwitcherItem::compositing() diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp index 7ea1aa1944..ec2eead7da 100644 --- a/src/tabbox/tabbox.cpp +++ b/src/tabbox/tabbox.cpp @@ -274,7 +274,7 @@ TabBoxClientList TabBoxHandlerImpl::stackingOrder() const { QList stacking = Workspace::self()->stackingOrder(); TabBoxClientList ret; - foreach (Toplevel *toplevel, stacking) { + Q_FOREACH (Toplevel *toplevel, stacking) { if (auto client = qobject_cast(toplevel)) { ret.append(client->tabBoxClient()); } @@ -317,7 +317,7 @@ void TabBoxHandlerImpl::shadeClient(TabBoxClient *c, bool b) const QWeakPointer TabBoxHandlerImpl::desktopClient() const { - foreach (Toplevel *toplevel, Workspace::self()->stackingOrder()) { + Q_FOREACH (Toplevel *toplevel, Workspace::self()->stackingOrder()) { auto client = qobject_cast(toplevel); if (client && client->isDesktop() && client->isOnCurrentDesktop() && client->screen() == screens()->current()) { return client->tabBoxClient(); @@ -628,13 +628,13 @@ void TabBox::reset(bool partial_reset) break; } - emit tabBoxUpdated(); + Q_EMIT tabBoxUpdated(); } void TabBox::nextPrev(bool next) { setCurrentIndex(m_tabBox->nextPrev(next), false); - emit tabBoxUpdated(); + Q_EMIT tabBoxUpdated(); } AbstractClient* TabBox::currentClient() @@ -651,7 +651,7 @@ QList TabBox::currentClientList() { TabBoxClientList list = m_tabBox->clientList(); QList ret; - foreach (const QWeakPointer &clientPointer, list) { + Q_FOREACH (const QWeakPointer &clientPointer, list) { QSharedPointer client = clientPointer.toStrongRef(); if (!client) continue; @@ -687,13 +687,13 @@ void TabBox::setCurrentIndex(QModelIndex index, bool notifyEffects) return; m_tabBox->setCurrentIndex(index); if (notifyEffects) { - emit tabBoxUpdated(); + Q_EMIT tabBoxUpdated(); } } void TabBox::show() { - emit tabBoxAdded(m_tabBoxMode); + Q_EMIT tabBoxAdded(m_tabBoxMode); if (isDisplayed()) { m_isShown = false; return; @@ -711,7 +711,7 @@ void TabBox::hide(bool abort) m_isShown = false; unreference(); } - emit tabBoxClosed(); + Q_EMIT tabBoxClosed(); if (isDisplayed()) qCDebug(KWIN_TABBOX) << "Tab box was not properly closed by an effect"; m_tabBox->hide(abort); @@ -745,12 +745,12 @@ void TabBox::reconfigure() QList *borders = &m_borderActivate; QString borderConfig = QStringLiteral("BorderActivate"); for (int i = 0; i < 2; ++i) { - foreach (ElectricBorder border, *borders) { + Q_FOREACH (ElectricBorder border, *borders) { ScreenEdges::self()->unreserve(border, this); } borders->clear(); QStringList list = config.readEntry(borderConfig, QStringList()); - foreach (const QString &s, list) { + Q_FOREACH (const QString &s, list) { bool ok; const int i = s.toInt(&ok); if (!ok) @@ -876,7 +876,7 @@ bool TabBox::handleWheelEvent(QWheelEvent *event) void TabBox::grabbedKeyEvent(QKeyEvent* event) { - emit tabBoxKeyEvent(event); + Q_EMIT tabBoxKeyEvent(event); if (!m_isShown && isDisplayed()) { // tabbox has been replaced, check effects return; diff --git a/src/tabbox/tabboxhandler.cpp b/src/tabbox/tabboxhandler.cpp index ee70e51aab..9a8500c3eb 100644 --- a/src/tabbox/tabboxhandler.cpp +++ b/src/tabbox/tabboxhandler.cpp @@ -196,7 +196,7 @@ void TabBoxHandlerPrivate::endHighlightWindows(bool abort) { TabBoxClient *currentClient = q->client(index); if (config.isHighlightWindows() && q->isKWinCompositing()) { - foreach (const QWeakPointer &clientPointer, q->stackingOrder()) { + Q_FOREACH (const QWeakPointer &clientPointer, q->stackingOrder()) { if (QSharedPointer client = clientPointer.toStrongRef()) if (client != currentClient) // to not mess up with wanted ShadeActive/ShadeHover state q->shadeClient(client.data(), true); @@ -361,7 +361,7 @@ const KWin::TabBox::TabBoxConfig& TabBoxHandler::config() const void TabBoxHandler::setConfig(const TabBoxConfig& config) { d->config = config; - emit configChanged(); + Q_EMIT configChanged(); } void TabBoxHandler::show() @@ -387,7 +387,7 @@ void TabBoxHandler::show() void TabBoxHandler::initHighlightWindows() { if (isKWinCompositing()) { - foreach (const QWeakPointer &clientPointer, stackingOrder()) { + Q_FOREACH (const QWeakPointer &clientPointer, stackingOrder()) { if (QSharedPointer client = clientPointer.toStrongRef()) shadeClient(client.data(), false); } @@ -503,7 +503,7 @@ void TabBoxHandler::setCurrentIndex(const QModelIndex& index) d->updateHighlightWindows(); } } - emit selectedIndexChanged(); + Q_EMIT selectedIndexChanged(); } const QModelIndex& TabBoxHandler::currentIndex() const @@ -561,7 +561,7 @@ void TabBoxHandler::createModel(bool partialReset) // TODO: C++11 use lambda function bool lastRaised = false; bool lastRaisedSucc = false; - foreach (const QWeakPointer &clientPointer, stackingOrder()) { + Q_FOREACH (const QWeakPointer &clientPointer, stackingOrder()) { QSharedPointer client = clientPointer.toStrongRef(); if (!client) { continue; diff --git a/src/tabletmodemanager.cpp b/src/tabletmodemanager.cpp index 629d287065..1c3d02d26b 100644 --- a/src/tabletmodemanager.cpp +++ b/src/tabletmodemanager.cpp @@ -147,14 +147,14 @@ void TabletModeManager::setIsTablet(bool tablet) } m_isTabletMode = tablet; - emit tabletModeChanged(tablet); + Q_EMIT tabletModeChanged(tablet); } void KWin::TabletModeManager::setTabletModeAvailable(bool detecting) { if (m_detecting != detecting) { m_detecting = detecting; - emit tabletModeAvailableChanged(detecting); + Q_EMIT tabletModeAvailableChanged(detecting); } } diff --git a/src/thumbnailitem.cpp b/src/thumbnailitem.cpp index a3168e8e2e..e1b3284d7d 100644 --- a/src/thumbnailitem.cpp +++ b/src/thumbnailitem.cpp @@ -88,7 +88,7 @@ void AbstractThumbnailItem::setBrightness(qreal brightness) } m_brightness = brightness; update(); - emit brightnessChanged(); + Q_EMIT brightnessChanged(); } void AbstractThumbnailItem::setSaturation(qreal saturation) @@ -98,13 +98,13 @@ void AbstractThumbnailItem::setSaturation(qreal saturation) } m_saturation = saturation; update(); - emit saturationChanged(); + Q_EMIT saturationChanged(); } void AbstractThumbnailItem::setClipTo(QQuickItem *clip) { m_clipToItem = QPointer(clip); - emit clipToChanged(); + Q_EMIT clipToChanged(); } WindowThumbnailItem::WindowThumbnailItem(QQuickItem* parent) @@ -128,9 +128,9 @@ void WindowThumbnailItem::setWId(const QUuid &wId) setClient(workspace()->findAbstractClient([this] (const AbstractClient *c) { return c->internalId() == m_wId; })); } else if (m_client) { m_client = nullptr; - emit clientChanged(); + Q_EMIT clientChanged(); } - emit wIdChanged(wId); + Q_EMIT wIdChanged(wId); } void WindowThumbnailItem::setClient(AbstractClient *client) @@ -144,7 +144,7 @@ void WindowThumbnailItem::setClient(AbstractClient *client) } else { setWId({}); } - emit clientChanged(); + Q_EMIT clientChanged(); } void WindowThumbnailItem::paint(QPainter *painter) @@ -187,7 +187,7 @@ void DesktopThumbnailItem::setDesktop(int desktop) } m_desktop = desktop; update(); - emit desktopChanged(m_desktop); + Q_EMIT desktopChanged(m_desktop); } void DesktopThumbnailItem::paint(QPainter *painter) diff --git a/src/toplevel.cpp b/src/toplevel.cpp index f822e05820..9281cbfc1f 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -97,7 +97,7 @@ void Toplevel::detectShape(xcb_window_t id) const bool wasShape = is_shape; is_shape = Xcb::Extensions::self()->hasShape(id); if (wasShape != is_shape) { - emit shapedChanged(); + Q_EMIT shapedChanged(); } } @@ -234,7 +234,7 @@ void Toplevel::setResourceClass(const QByteArray &name, const QByteArray &classN { resource_name = name; resource_class = className; - emit windowClassChanged(); + Q_EMIT windowClassChanged(); } bool Toplevel::resourceMatch(const Toplevel *c1, const Toplevel *c2) @@ -257,7 +257,7 @@ void Toplevel::setOpacity(qreal opacity) m_opacity = opacity; if (compositing()) { addRepaintFull(); - emit opacityChanged(this, oldOpacity); + Q_EMIT opacityChanged(this, oldOpacity); } } @@ -353,7 +353,7 @@ void Toplevel::setReadyForPainting() ready_for_painting = true; if (compositing()) { addRepaintFull(); - emit windowShown(this); + Q_EMIT windowShown(this); } } } @@ -369,19 +369,19 @@ void Toplevel::checkScreen() if (screens()->count() == 1) { if (m_screen != 0) { m_screen = 0; - emit screenChanged(); + Q_EMIT screenChanged(); } } else { const int s = screens()->number(frameGeometry().center()); if (s != m_screen) { m_screen = s; - emit screenChanged(); + Q_EMIT screenChanged(); } } qreal newScale = screens()->scale(m_screen); if (newScale != m_screenScale) { m_screenScale = newScale; - emit screenScaleChanged(); + Q_EMIT screenScaleChanged(); } } @@ -436,12 +436,12 @@ void Toplevel::updateShadow() if (!shadowItem->shadow()->updateShadow()) { windowItem->setShadow(nullptr); } - emit shadowChanged(); + Q_EMIT shadowChanged(); } else { Shadow *shadow = Shadow::createShadow(this); if (shadow) { windowItem->setShadow(shadow); - emit shadowChanged(); + Q_EMIT shadowChanged(); } } } @@ -590,7 +590,7 @@ void Toplevel::setSkipCloseAnimation(bool set) return; } m_skipCloseAnimation = set; - emit skipCloseAnimationChanged(); + Q_EMIT skipCloseAnimationChanged(); } void Toplevel::setSurface(KWaylandServer::SurfaceInterface *surface) @@ -604,7 +604,7 @@ void Toplevel::setSurface(KWaylandServer::SurfaceInterface *surface) m_surfaceId = 0; }); m_surfaceId = surface->id(); - emit surfaceChanged(); + Q_EMIT surfaceChanged(); } QByteArray Toplevel::windowRole() const @@ -623,7 +623,7 @@ void Toplevel::setDepth(int depth) const bool oldAlpha = hasAlpha(); bit_depth = depth; if (oldAlpha != hasAlpha()) { - emit hasAlphaChanged(); + Q_EMIT hasAlphaChanged(); } } diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp index d5fe9f921a..bb9afca8b9 100644 --- a/src/unmanaged.cpp +++ b/src/unmanaged.cpp @@ -131,12 +131,12 @@ bool Unmanaged::track(xcb_window_t w) void Unmanaged::release(ReleaseReason releaseReason) { addWorkspaceRepaint(visibleGeometry()); - emit markedAsZombie(); + Q_EMIT markedAsZombie(); Deleted* del = nullptr; if (releaseReason != ReleaseReason::KWinShutsDown) { del = Deleted::create(this); } - emit windowClosed(this, del); + Q_EMIT windowClosed(this, del); finishCompositing(releaseReason); if (!QWidget::find(window()) && releaseReason != ReleaseReason::Destroyed) { // don't affect our own windows if (Xcb::Extensions::self()->isShapeAvailable()) diff --git a/src/useractions.cpp b/src/useractions.cpp index 06b2e04958..bb5f07475a 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -652,7 +652,7 @@ void UserActionsMenu::activityPopupAboutToShow() } m_activityMenu->addSeparator(); - foreach (const QString &id, Activities::self()->running()) { + Q_FOREACH (const QString &id, Activities::self()->running()) { KActivities::Info activity(id); QString name = activity.name(); name.replace('&', "&&"); @@ -853,7 +853,7 @@ void ShortcutDialog::accept() void ShortcutDialog::done(int r) { QDialog::done(r); - emit dialogDone(r == Accepted); + Q_EMIT dialogDone(r == Accepted); } void ShortcutDialog::keySequenceChanged() diff --git a/src/virtualdesktops.cpp b/src/virtualdesktops.cpp index 303358d603..67149ad36f 100644 --- a/src/virtualdesktops.cpp +++ b/src/virtualdesktops.cpp @@ -38,7 +38,7 @@ VirtualDesktop::VirtualDesktop(QObject *parent) VirtualDesktop::~VirtualDesktop() { - emit aboutToBeDestroyed(); + Q_EMIT aboutToBeDestroyed(); } void VirtualDesktopManager::setVirtualDesktopManagement(KWaylandServer::PlasmaVirtualDesktopManagementInterface *management) @@ -131,7 +131,7 @@ void VirtualDesktop::setX11DesktopNumber(uint number) m_x11DesktopNumber = number; if (m_x11DesktopNumber != 0) { - emit x11DesktopNumberChanged(); + Q_EMIT x11DesktopNumberChanged(); } } @@ -141,7 +141,7 @@ void VirtualDesktop::setName(const QString &name) return; } m_name = name; - emit nameChanged(); + Q_EMIT nameChanged(); } VirtualDesktopGrid::VirtualDesktopGrid() @@ -483,8 +483,8 @@ VirtualDesktop *VirtualDesktopManager::createVirtualDesktop(uint position, const save(); updateRootInfo(); - emit desktopCreated(vd); - emit countChanged(m_desktops.count()-1, m_desktops.count()); + Q_EMIT desktopCreated(vd); + Q_EMIT countChanged(m_desktops.count()-1, m_desktops.count()); return vd; } @@ -513,14 +513,14 @@ void VirtualDesktopManager::removeVirtualDesktop(const QByteArray &id) const uint newCurrent = qMin(oldCurrent, (uint)m_desktops.count()); m_current = m_desktops.at(newCurrent - 1); if (oldCurrent != newCurrent) { - emit currentChanged(oldCurrent, newCurrent); + Q_EMIT currentChanged(oldCurrent, newCurrent); } save(); updateRootInfo(); - emit desktopRemoved(desktop); - emit countChanged(m_desktops.count()+1, m_desktops.count()); + Q_EMIT desktopRemoved(desktop); + Q_EMIT countChanged(m_desktops.count()+1, m_desktops.count()); desktop->deleteLater(); } @@ -553,7 +553,7 @@ bool VirtualDesktopManager::setCurrent(VirtualDesktop *newDesktop) } const uint oldDesktop = current(); m_current = newDesktop; - emit currentChanged(oldDesktop, newDesktop->x11DesktopNumber()); + Q_EMIT currentChanged(oldDesktop, newDesktop->x11DesktopNumber()); return true; } @@ -575,11 +575,11 @@ void VirtualDesktopManager::setCount(uint count) uint newCurrent = qMin(oldCurrent, count); m_current = m_desktops.at(newCurrent - 1); if (oldCurrent != newCurrent) { - emit currentChanged(oldCurrent, newCurrent); + Q_EMIT currentChanged(oldCurrent, newCurrent); } } for (auto desktop : desktopsToRemove) { - emit desktopRemoved(desktop); + Q_EMIT desktopRemoved(desktop); desktop->deleteLater(); } } else { @@ -612,9 +612,9 @@ void VirtualDesktopManager::setCount(uint count) save(); } for (auto vd : qAsConst(newDesktops)) { - emit desktopCreated(vd); + Q_EMIT desktopCreated(vd); } - emit countChanged(oldCount, m_desktops.count()); + Q_EMIT countChanged(oldCount, m_desktops.count()); } @@ -791,8 +791,8 @@ void VirtualDesktopManager::setNETDesktopLayout(Qt::Orientation orientation, uin m_grid.update(QSize(width, height), orientation, m_desktops); // TODO: why is there no call to m_rootInfo->setDesktopLayout? - emit layoutChanged(width, height); - emit rowsChanged(height); + Q_EMIT layoutChanged(width, height); + Q_EMIT rowsChanged(height); } void VirtualDesktopManager::initShortcuts() @@ -876,7 +876,7 @@ void VirtualDesktopManager::setNavigationWrappingAround(bool enabled) return; } m_navigationWrapsAround = enabled; - emit navigationWrappingAroundChanged(); + Q_EMIT navigationWrappingAroundChanged(); } void VirtualDesktopManager::slotDown() diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp index 2446460737..937e598bc0 100644 --- a/src/wayland_server.cpp +++ b/src/wayland_server.cpp @@ -205,7 +205,7 @@ KWaylandServer::ClientConnection *WaylandServer::xWaylandConnection() const void WaylandServer::destroyInternalConnection() { - emit terminatingInternalClientConnection(); + Q_EMIT terminatingInternalClientConnection(); if (m_internalConnection.client) { // delete all connections hold by plugins like e.g. widget style const auto connections = KWayland::Client::ConnectionThread::connections(); @@ -213,7 +213,7 @@ void WaylandServer::destroyInternalConnection() if (c == m_internalConnection.client) { continue; } - emit c->connectionDied(); + Q_EMIT c->connectionDied(); } delete m_internalConnection.registry; @@ -249,7 +249,7 @@ void WaylandServer::registerShellClient(AbstractClient *client) } if (client->readyForPainting()) { - emit shellClientAdded(client); + Q_EMIT shellClientAdded(client); } else { connect(client, &AbstractClient::windowShown, this, &WaylandServer::shellClientShown); } @@ -281,7 +281,7 @@ void WaylandServer::registerXdgToplevelClient(XdgToplevelClient *client) } connect(m_XdgForeign, &XdgForeignV2Interface::transientChanged, client, [this](SurfaceInterface *child) { - emit foreignTransientChanged(child); + Q_EMIT foreignTransientChanged(child); }); } @@ -559,7 +559,7 @@ void WaylandServer::shellClientShown(Toplevel *toplevel) return; } disconnect(client, &AbstractClient::windowShown, this, &WaylandServer::shellClientShown); - emit shellClientAdded(client); + Q_EMIT shellClientAdded(client); } void WaylandServer::initWorkspace() @@ -603,7 +603,7 @@ void WaylandServer::initWorkspace() connect(m_internalConnection.registry, &KWayland::Client::Registry::interfacesAnnounced, this, &WaylandServer::initScreenLocker); } } else { - emit initialized(); + Q_EMIT initialized(); } } @@ -652,7 +652,7 @@ void WaylandServer::initScreenLocker() if (m_initFlags.testFlag(InitializationFlag::LockScreen)) { ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate); } - emit initialized(); + Q_EMIT initialized(); } WaylandServer::SocketPairConnection WaylandServer::createConnection() @@ -768,7 +768,7 @@ void WaylandServer::createInternalConnection() void WaylandServer::removeClient(AbstractClient *c) { m_clients.removeAll(c); - emit shellClientRemoved(c); + Q_EMIT shellClientRemoved(c); } void WaylandServer::dispatch() diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp index 6ca86ed86d..34ac39a39a 100644 --- a/src/waylandclient.cpp +++ b/src/waylandclient.cpp @@ -208,7 +208,7 @@ void WaylandClient::updateCaption() } while (findClientWithSameCaption()); } if (m_captionSuffix != oldSuffix) { - emit captionChanged(); + Q_EMIT captionChanged(); } } @@ -219,7 +219,7 @@ void WaylandClient::setCaption(const QString &caption) updateCaption(); if (m_captionSuffix == oldSuffix) { // Don't emit caption change twice it already got emitted by the changing suffix. - emit captionChanged(); + Q_EMIT captionChanged(); } } @@ -287,7 +287,7 @@ void WaylandClient::internalShow() } m_isHidden = false; addRepaintFull(); - emit windowShown(this); + Q_EMIT windowShown(this); } void WaylandClient::internalHide() @@ -301,7 +301,7 @@ void WaylandClient::internalHide() m_isHidden = true; addWorkspaceRepaint(visibleGeometry()); workspace()->clientHidden(this); - emit windowHidden(this); + Q_EMIT windowHidden(this); } QRect WaylandClient::frameRectToBufferRect(const QRect &rect) const @@ -338,15 +338,15 @@ void WaylandClient::updateGeometry(const QRect &rect) updateWindowRules(Rules::Position | Rules::Size); if (changedGeometries & WaylandGeometryBuffer) { - emit bufferGeometryChanged(this, oldBufferGeometry); + Q_EMIT bufferGeometryChanged(this, oldBufferGeometry); } if (changedGeometries & WaylandGeometryClient) { - emit clientGeometryChanged(this, oldClientGeometry); + Q_EMIT clientGeometryChanged(this, oldClientGeometry); } if (changedGeometries & WaylandGeometryFrame) { - emit frameGeometryChanged(this, oldFrameGeometry); + Q_EMIT frameGeometryChanged(this, oldFrameGeometry); } - emit geometryShapeChanged(this, oldFrameGeometry); + Q_EMIT geometryShapeChanged(this, oldFrameGeometry); } } // namespace KWin diff --git a/src/window_property_notify_x11_filter.cpp b/src/window_property_notify_x11_filter.cpp index ce2b5f833a..e408fd5ce7 100644 --- a/src/window_property_notify_x11_filter.cpp +++ b/src/window_property_notify_x11_filter.cpp @@ -28,11 +28,11 @@ bool WindowPropertyNotifyX11Filter::event(xcb_generic_event_t *event) return false; } if (pe->window == kwinApp()->x11RootWindow()) { - emit m_effects->propertyNotify(nullptr, pe->atom); + Q_EMIT m_effects->propertyNotify(nullptr, pe->atom); } else if (const auto c = workspace()->findClient(Predicate::WindowMatch, pe->window)) { - emit m_effects->propertyNotify(c->effectWindow(), pe->atom); + Q_EMIT m_effects->propertyNotify(c->effectWindow(), pe->atom); } else if (const auto c = workspace()->findUnmanaged(pe->window)) { - emit m_effects->propertyNotify(c->effectWindow(), pe->atom); + Q_EMIT m_effects->propertyNotify(c->effectWindow(), pe->atom); } return false; } diff --git a/src/workspace.cpp b/src/workspace.cpp index 0e2a50b06b..d1a5adc9f2 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -516,7 +516,7 @@ Workspace::~Workspace() } for (auto it = deleted.begin(); it != deleted.end();) { - emit deletedRemoved(*it); + Q_EMIT deletedRemoved(*it); it = deleted.erase(it); } @@ -700,7 +700,7 @@ Unmanaged* Workspace::createUnmanaged(xcb_window_t w) return nullptr; } addUnmanaged(c); - emit unmanagedAdded(c); + Q_EMIT unmanagedAdded(c); return c; } @@ -708,7 +708,7 @@ void Workspace::addClient(X11Client *c) { Group* grp = findGroup(c->window()); - emit clientAdded(c); + Q_EMIT clientAdded(c); if (grp != nullptr) grp->gotLeader(c); @@ -769,7 +769,7 @@ void Workspace::removeUnmanaged(Unmanaged* c) { Q_ASSERT(m_unmanaged.contains(c)); m_unmanaged.removeAll(c); - emit unmanagedRemoved(c); + Q_EMIT unmanagedRemoved(c); markXStackingOrderAsDirty(); } @@ -784,7 +784,7 @@ void Workspace::addDeleted(Deleted* c, Toplevel *orig) void Workspace::removeDeleted(Deleted* c) { Q_ASSERT(deleted.contains(c)); - emit deletedRemoved(c); + Q_EMIT deletedRemoved(c); deleted.removeAll(c); removeFromStack(c); markXStackingOrderAsDirty(); @@ -842,7 +842,7 @@ void Workspace::addShellClient(AbstractClient *client) updateStackingOrder(true); updateClientArea(); }); - emit clientAdded(client); + Q_EMIT clientAdded(client); } void Workspace::removeShellClient(AbstractClient *client) @@ -873,7 +873,7 @@ void Workspace::removeAbstractClient(AbstractClient *client) clientShortcutUpdated(client); // Needed, since this is otherwise delayed by setShortcut() and wouldn't run } - emit clientRemoved(client); + Q_EMIT clientRemoved(client); markXStackingOrderAsDirty(); updateStackingOrder(true); @@ -1001,7 +1001,7 @@ void Workspace::slotReconfigure() kwinApp()->config()->reparseConfiguration(); options->updateSettings(); - emit configChanged(); + Q_EMIT configChanged(); m_userActionsMenu->discard(); updateToolWindows(true); @@ -1036,7 +1036,7 @@ void Workspace::slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop) --block_focus; activateClientOnNewDesktop(newDesktop); - emit currentDesktopChanged(oldDesktop, movingClient); + Q_EMIT currentDesktopChanged(oldDesktop, movingClient); } void Workspace::updateClientVisibilityOnDesktopChange(uint newDesktop) @@ -1394,7 +1394,7 @@ void Workspace::setShowingDesktop(bool showing) if (!topDesk) topDesk = c; if (auto group = c->group()) { - foreach (X11Client *cm, group->members()) { + Q_FOREACH (X11Client *cm, group->members()) { cm->updateLayer(); } } @@ -1412,7 +1412,7 @@ void Workspace::setShowingDesktop(bool showing) } } if (changed) - emit showingDesktopChanged(showing); + Q_EMIT showingDesktopChanged(showing); } void Workspace::disableGlobalShortcutsForClient(bool disable) @@ -1737,17 +1737,17 @@ QString Workspace::supportInformation() const } support.append(QStringLiteral("\nLoaded Effects:\n")); support.append(QStringLiteral( "---------------\n")); - foreach (const QString &effect, static_cast(effects)->loadedEffects()) { + Q_FOREACH (const QString &effect, static_cast(effects)->loadedEffects()) { support.append(effect + QStringLiteral("\n")); } support.append(QStringLiteral("\nCurrently Active Effects:\n")); support.append(QStringLiteral( "-------------------------\n")); - foreach (const QString &effect, static_cast(effects)->activeEffects()) { + Q_FOREACH (const QString &effect, static_cast(effects)->activeEffects()) { support.append(effect + QStringLiteral("\n")); } support.append(QStringLiteral("\nEffect Settings:\n")); support.append(QStringLiteral( "----------------\n")); - foreach (const QString &effect, static_cast(effects)->loadedEffects()) { + Q_FOREACH (const QString &effect, static_cast(effects)->loadedEffects()) { support.append(static_cast(effects)->supportInformation(effect)); support.append(QStringLiteral("\n")); } @@ -1947,7 +1947,7 @@ void Workspace::addInternalClient(InternalClient *client) updateStackingOrder(true); updateClientArea(); - emit internalClientAdded(client); + Q_EMIT internalClientAdded(client); } void Workspace::removeInternalClient(InternalClient *client) @@ -1958,7 +1958,7 @@ void Workspace::removeInternalClient(InternalClient *client) updateStackingOrder(true); updateClientArea(); - emit internalClientRemoved(client); + Q_EMIT internalClientRemoved(client); } Group* Workspace::findGroup(xcb_window_t leader) const @@ -2021,7 +2021,7 @@ void Workspace::updateMinimizedOfTransients(AbstractClient* c) } } if (c->isModal()) { // if a modal dialog is minimized, minimize its mainwindow too - foreach (AbstractClient * c2, c->mainClients()) + Q_FOREACH (AbstractClient * c2, c->mainClients()) c2->minimize(); } } else { @@ -2035,7 +2035,7 @@ void Workspace::updateMinimizedOfTransients(AbstractClient* c) } } if (c->isModal()) { - foreach (AbstractClient * c2, c->mainClients()) + Q_FOREACH (AbstractClient * c2, c->mainClients()) c2->unminimize(); } } diff --git a/src/workspace.h b/src/workspace.h index ad7978577c..163be79abe 100644 --- a/src/workspace.h +++ b/src/workspace.h @@ -728,7 +728,7 @@ inline AbstractClient *Workspace::mostRecentlyActivatedClient() const inline void Workspace::addGroup(Group* group) { - emit groupAdded(group); + Q_EMIT groupAdded(group); groups.append(group); } diff --git a/src/x11client.cpp b/src/x11client.cpp index 2da24ac27d..e2536642b9 100644 --- a/src/x11client.cpp +++ b/src/x11client.cpp @@ -263,8 +263,8 @@ void X11Client::releaseWindow(bool on_shutdown) del = Deleted::create(this); } if (isInteractiveMoveResize()) - emit clientFinishUserMovedResized(this); - emit windowClosed(this, del); + Q_EMIT clientFinishUserMovedResized(this); + Q_EMIT windowClosed(this, del); finishCompositing(); RuleBook::self()->discardUsed(this, true); // Remove ForceTemporarily rules StackingUpdatesBlocker blocker(workspace()); @@ -327,8 +327,8 @@ void X11Client::destroyClient() cleanTabBox(); Deleted* del = Deleted::create(this); if (isInteractiveMoveResize()) - emit clientFinishUserMovedResized(this); - emit windowClosed(this, del); + Q_EMIT clientFinishUserMovedResized(this); + Q_EMIT windowClosed(this, del); finishCompositing(ReleaseReason::Destroyed); RuleBook::self()->discardUsed(this, true); // Remove ForceTemporarily rules StackingUpdatesBlocker blocker(workspace()); @@ -865,7 +865,7 @@ bool X11Client::manage(xcb_window_t w, bool isMapped) // If the window is on an inactive activity during session saving, temporarily force it to show. if( !isMapped && !session && isSessionSaving && !isOnCurrentActivity()) { setSessionActivityOverride( true ); - foreach( AbstractClient* c, mainClients()) { + Q_FOREACH( AbstractClient* c, mainClients()) { if (X11Client *mc = dynamic_cast(c)) { mc->setSessionActivityOverride(true); } @@ -927,7 +927,7 @@ bool X11Client::manage(xcb_window_t w, bool isMapped) // TODO: there's a small problem here - isManaged() depends on the mapping state, // but this client is not yet in Workspace's client list at this point, will // be only done in addClient() - emit clientManaging(this); + Q_EMIT clientManaging(this); return true; } @@ -1106,7 +1106,7 @@ void X11Client::createDecoration(const QRect& oldgeom) resize(adjustedSize()); if (!isShade()) checkWorkspacePosition(oldgeom); - emit geometryShapeChanged(this, oldgeom); + Q_EMIT geometryShapeChanged(this, oldgeom); } ); connect(decoratedClient()->decoratedClient(), &KDecoration2::DecoratedClient::widthChanged, this, &X11Client::updateInputWindow); @@ -1123,7 +1123,7 @@ void X11Client::createDecoration(const QRect& oldgeom) if (Compositor::compositing()) { discardWindowPixmap(); } - emit geometryShapeChanged(this, oldgeom); + Q_EMIT geometryShapeChanged(this, oldgeom); } void X11Client::destroyDecoration() @@ -1138,7 +1138,7 @@ void X11Client::destroyDecoration() if (compositing()) discardWindowPixmap(); if (!isZombie()) { - emit geometryShapeChanged(this, oldgeom); + Q_EMIT geometryShapeChanged(this, oldgeom); } } m_decoInputExtent.reset(); @@ -1275,11 +1275,11 @@ void X11Client::setClientFrameExtents(const NETStrut &strut) moveResize(moveResizeGeometry()); if (wasClientSideDecorated != isClientSideDecorated()) { - emit clientSideDecoratedChanged(); + Q_EMIT clientSideDecoratedChanged(); } // This will invalidate the window quads cache. - emit geometryShapeChanged(this, frameGeometry()); + Q_EMIT geometryShapeChanged(this, frameGeometry()); } /** @@ -1378,7 +1378,7 @@ void X11Client::updateShape() addRepaintFull(); addWorkspaceRepaint(visibleGeometry()); // In case shape change removes part of this window } - emit geometryShapeChanged(this, frameGeometry()); + Q_EMIT geometryShapeChanged(this, frameGeometry()); } static Xcb::Window shape_helper_window(XCB_WINDOW_NONE); @@ -1502,7 +1502,7 @@ QRect X11Client::iconGeometry() const return geom; else { // Check all mainwindows of this window (recursively) - foreach (AbstractClient * amainwin, mainClients()) { + Q_FOREACH (AbstractClient * amainwin, mainClients()) { X11Client *mainwin = dynamic_cast(amainwin); if (!mainwin) { continue; @@ -1658,7 +1658,7 @@ void X11Client::internalShow() m_decoInputExtent.map(); updateHiddenPreview(); } - emit windowShown(this); + Q_EMIT windowShown(this); } void X11Client::internalHide() @@ -1673,7 +1673,7 @@ void X11Client::internalHide() updateHiddenPreview(); addWorkspaceRepaint(visibleGeometry()); workspace()->clientHidden(this); - emit windowHidden(this); + Q_EMIT windowHidden(this); } void X11Client::internalKeep() @@ -2000,7 +2000,7 @@ bool X11Client::takeFocus() bool breakShowingDesktop = !keepAbove(); if (breakShowingDesktop) { - foreach (const X11Client *c, group()->members()) { + Q_FOREACH (const X11Client *c, group()->members()) { if (c->isDesktop()) { breakShowingDesktop = false; break; @@ -2101,7 +2101,7 @@ void X11Client::setCaption(const QString& _s, bool force) } cap_normal = s; if (!force && !changed) { - emit captionChanged(); + Q_EMIT captionChanged(); return; } @@ -2132,7 +2132,7 @@ void X11Client::setCaption(const QString& _s, bool force) // Keep the same suffix in iconic name if it's set info->setVisibleIconName(QString(cap_iconic + cap_suffix).toUtf8().constData()); - emit captionChanged(); + Q_EMIT captionChanged(); } void X11Client::updateCaption() @@ -2202,7 +2202,7 @@ void X11Client::getMotifHints() if (isManaged()) updateDecoration(true); // Check if noborder state has changed if (closabilityChanged) { - emit closeableChanged(isCloseable()); + Q_EMIT closeableChanged(isCloseable()); } } @@ -2372,7 +2372,7 @@ void X11Client::setBlockingCompositing(bool block) const bool usedToBlock = blocks_compositing; blocks_compositing = rules()->checkBlockCompositing(block && options->windowsBlockCompositing()); if (usedToBlock != blocks_compositing) { - emit blockingCompositingChanged(blocks_compositing ? this : nullptr); + Q_EMIT blockingCompositingChanged(blocks_compositing ? this : nullptr); } } @@ -2407,13 +2407,13 @@ void X11Client::updateAllowedActions(bool force) const NET::Actions relevant = ~(NET::ActionMove|NET::ActionResize); if ((allowed_actions & relevant) != (old_allowed_actions & relevant)) { if ((allowed_actions & NET::ActionMinimize) != (old_allowed_actions & NET::ActionMinimize)) { - emit minimizeableChanged(allowed_actions & NET::ActionMinimize); + Q_EMIT minimizeableChanged(allowed_actions & NET::ActionMinimize); } if ((allowed_actions & NET::ActionShade) != (old_allowed_actions & NET::ActionShade)) { - emit shadeableChanged(allowed_actions & NET::ActionShade); + Q_EMIT shadeableChanged(allowed_actions & NET::ActionShade); } if ((allowed_actions & NET::ActionMax) != (old_allowed_actions & NET::ActionMax)) { - emit maximizeableChanged(allowed_actions & NET::ActionMax); + Q_EMIT maximizeableChanged(allowed_actions & NET::ActionMax); } } } @@ -2978,7 +2978,7 @@ void X11Client::setTransient(xcb_window_t new_transient_for_id) checkGroup(nullptr, true); // force, because transiency has changed updateLayer(); workspace()->resetUpdateToolWindowsTimer(); - emit transientChanged(); + Q_EMIT transientChanged(); } } @@ -3773,7 +3773,7 @@ void X11Client::configureRequest(int value_mask, int rx, int ry, int rw, int rh, if (!ignore) { // either we're not max'd / q'tiled or the user allowed the client to break that - so break it. updateQuickTileMode(QuickTileFlag::None); max_mode = MaximizeRestore; - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); } else if (!app_noborder && quickTileMode() == QuickTileMode(QuickTileFlag::None) && (maximizeMode() == MaximizeVertical || maximizeMode() == MaximizeHorizontal)) { // ignoring can be, because either we do, or the user does explicitly not want it. @@ -4089,15 +4089,15 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode) workspace()->updateStackingOrder(); if (oldBufferGeometry != m_bufferGeometry) { - emit bufferGeometryChanged(this, oldBufferGeometry); + Q_EMIT bufferGeometryChanged(this, oldBufferGeometry); } if (oldClientGeometry != m_clientGeometry) { - emit clientGeometryChanged(this, oldClientGeometry); + Q_EMIT clientGeometryChanged(this, oldClientGeometry); } if (oldFrameGeometry != m_frameGeometry) { - emit frameGeometryChanged(this, oldFrameGeometry); + Q_EMIT frameGeometryChanged(this, oldFrameGeometry); } - emit geometryShapeChanged(this, oldFrameGeometry); + Q_EMIT geometryShapeChanged(this, oldFrameGeometry); } void X11Client::updateServerGeometry() @@ -4229,13 +4229,13 @@ void X11Client::changeMaximize(bool horizontal, bool vertical, bool adjust) changeMaximizeRecursion = true; const auto c = decoration()->client().toStrongRef(); if ((max_mode & MaximizeVertical) != (old_mode & MaximizeVertical)) { - emit c->maximizedVerticallyChanged(max_mode & MaximizeVertical); + Q_EMIT c->maximizedVerticallyChanged(max_mode & MaximizeVertical); } if ((max_mode & MaximizeHorizontal) != (old_mode & MaximizeHorizontal)) { - emit c->maximizedHorizontallyChanged(max_mode & MaximizeHorizontal); + Q_EMIT c->maximizedHorizontallyChanged(max_mode & MaximizeHorizontal); } if ((max_mode == MaximizeFull) != (old_mode == MaximizeFull)) { - emit c->maximizedChanged(max_mode == MaximizeFull); + Q_EMIT c->maximizedChanged(max_mode == MaximizeFull); } changeMaximizeRecursion = false; } @@ -4402,7 +4402,7 @@ void X11Client::changeMaximize(bool horizontal, bool vertical, bool adjust) updateAllowedActions(); updateWindowRules(Rules::MaximizeVert|Rules::MaximizeHoriz|Rules::Position|Rules::Size); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); } bool X11Client::userCanSetFullScreen() const @@ -4465,8 +4465,8 @@ void X11Client::setFullScreen(bool set, bool user) } updateWindowRules(Rules::Fullscreen | Rules::Position | Rules::Size); - emit clientFullScreenSet(this, set, user); - emit fullScreenChanged(); + Q_EMIT clientFullScreenSet(this, set, user); + Q_EMIT fullScreenChanged(); } diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp index bdad722f36..6feb1420eb 100644 --- a/src/xdgshellclient.cpp +++ b/src/xdgshellclient.cpp @@ -331,12 +331,12 @@ void XdgSurfaceClient::destroyClient() markAsZombie(); if (isInteractiveMoveResize()) { leaveInteractiveMoveResize(); - emit clientFinishUserMovedResized(this); + Q_EMIT clientFinishUserMovedResized(this); } m_configureTimer->stop(); cleanTabBox(); Deleted *deleted = Deleted::create(this); - emit windowClosed(this, deleted); + Q_EMIT windowClosed(this, deleted); StackingUpdatesBlocker blocker(workspace()); RuleBook::self()->discardUsed(this, true); destroyDecoration(); @@ -740,7 +740,7 @@ void XdgToplevelClient::doMinimize() if (isMinimized()) { workspace()->clientHidden(this); } else { - emit windowShown(this); + Q_EMIT windowShown(this); } workspace()->updateMinimizedOfTransients(this); } @@ -1211,8 +1211,8 @@ void XdgToplevelClient::updateMaximizeMode(MaximizeMode maximizeMode) } m_maximizeMode = maximizeMode; updateWindowRules(Rules::MaximizeVert | Rules::MaximizeHoriz); - emit clientMaximizedStateChanged(this, maximizeMode); - emit clientMaximizedStateChanged(this, maximizeMode & MaximizeHorizontal, maximizeMode & MaximizeVertical); + Q_EMIT clientMaximizedStateChanged(this, maximizeMode); + Q_EMIT clientMaximizedStateChanged(this, maximizeMode & MaximizeHorizontal, maximizeMode & MaximizeVertical); } void XdgToplevelClient::updateFullScreenMode(bool set) @@ -1224,7 +1224,7 @@ void XdgToplevelClient::updateFullScreenMode(bool set) m_isFullScreen = set; updateLayer(); updateWindowRules(Rules::Fullscreen); - emit fullScreenChanged(); + Q_EMIT fullScreenChanged(); } QString XdgToplevelClient::preferredColorScheme() const @@ -1586,13 +1586,13 @@ void XdgToplevelClient::changeMaximize(bool horizontal, bool vertical, bool adju changeMaximizeRecursion = true; const auto c = decoration()->client().toStrongRef(); if ((m_requestedMaximizeMode & MaximizeVertical) != (oldMode & MaximizeVertical)) { - emit c->maximizedVerticallyChanged(m_requestedMaximizeMode & MaximizeVertical); + Q_EMIT c->maximizedVerticallyChanged(m_requestedMaximizeMode & MaximizeVertical); } if ((m_requestedMaximizeMode & MaximizeHorizontal) != (oldMode & MaximizeHorizontal)) { - emit c->maximizedHorizontallyChanged(m_requestedMaximizeMode & MaximizeHorizontal); + Q_EMIT c->maximizedHorizontallyChanged(m_requestedMaximizeMode & MaximizeHorizontal); } if ((m_requestedMaximizeMode == MaximizeFull) != (oldMode == MaximizeFull)) { - emit c->maximizedChanged(m_requestedMaximizeMode == MaximizeFull); + Q_EMIT c->maximizedChanged(m_requestedMaximizeMode == MaximizeFull); } changeMaximizeRecursion = false; } @@ -1686,7 +1686,7 @@ void XdgToplevelClient::changeMaximize(bool horizontal, bool vertical, bool adju if (oldQuickTileMode != quickTileMode()) { doSetQuickTileMode(); - emit quickTileModeChanged(); + Q_EMIT quickTileModeChanged(); } doSetMaximized(); diff --git a/src/xdgshellintegration.cpp b/src/xdgshellintegration.cpp index 40848e3d07..872aa5ce80 100644 --- a/src/xdgshellintegration.cpp +++ b/src/xdgshellintegration.cpp @@ -60,7 +60,7 @@ void XdgShellIntegration::createXdgToplevelClient(XdgToplevelInterface *toplevel return; } - emit clientCreated(new XdgToplevelClient(toplevel)); + Q_EMIT clientCreated(new XdgToplevelClient(toplevel)); } void XdgShellIntegration::registerXdgPopup(XdgPopupInterface *popup) @@ -71,7 +71,7 @@ void XdgShellIntegration::registerXdgPopup(XdgPopupInterface *popup) return; } - emit clientCreated(new XdgPopupClient(popup)); + Q_EMIT clientCreated(new XdgPopupClient(popup)); } } // namespace KWin diff --git a/src/xkb.cpp b/src/xkb.cpp index 2d5adfd746..e82de0a6c1 100644 --- a/src/xkb.cpp +++ b/src/xkb.cpp @@ -380,7 +380,7 @@ void Xkb::updateModifiers() } if (m_leds != leds) { m_leds = leds; - emit ledsChanged(m_leds); + Q_EMIT ledsChanged(m_leds); } m_currentLayout = xkb_state_serialize_layout(m_state, XKB_STATE_LAYOUT_EFFECTIVE); diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp index 8f319a680c..5ea7adf0fb 100644 --- a/src/xwl/xwayland.cpp +++ b/src/xwl/xwayland.cpp @@ -137,14 +137,14 @@ void Xwayland::start() QScopedPointer socket(new XwaylandSocket()); if (!socket->isValid()) { qCWarning(KWIN_XWL) << "Failed to create Xwayland connection sockets"; - emit errorOccurred(); + Q_EMIT errorOccurred(); return; } if (!qEnvironmentVariableIsSet("KWIN_WAYLAND_NO_XAUTHORITY")) { if (!generateXauthorityFile(socket->display(), &m_authorityFile)) { qCWarning(KWIN_XWL) << "Failed to create an Xauthority file"; - emit errorOccurred(); + Q_EMIT errorOccurred(); return; } } @@ -165,7 +165,7 @@ bool Xwayland::startInternal() const int abstractSocket = dup(m_socket->abstractFileDescriptor()); if (abstractSocket == -1) { qCWarning(KWIN_XWL, "Failed to duplicate file descriptor: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } auto abstractSocketCleanup = qScopeGuard([&abstractSocket]() { @@ -176,7 +176,7 @@ bool Xwayland::startInternal() const int unixSocket = dup(m_socket->unixFileDescriptor()); if (unixSocket == -1) { qCWarning(KWIN_XWL, "Failed to duplicate file descriptor: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } auto unixSocketCleanup = qScopeGuard([&unixSocket]() { @@ -186,32 +186,32 @@ bool Xwayland::startInternal() int pipeFds[2]; if (pipe(pipeFds) != 0) { qCWarning(KWIN_XWL, "Failed to create pipe to start Xwayland: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } int sx[2]; if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) { qCWarning(KWIN_XWL, "Failed to open socket for XCB connection: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } int fd = dup(sx[1]); if (fd < 0) { qCWarning(KWIN_XWL, "Failed to open socket for XCB connection: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } const int waylandSocket = waylandServer()->createXWaylandConnection(); if (waylandSocket == -1) { qCWarning(KWIN_XWL, "Failed to open socket for Xwayland server: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } const int wlfd = dup(waylandSocket); if (wlfd < 0) { qCWarning(KWIN_XWL, "Failed to open socket for Xwayland server: %s", strerror(errno)); - emit errorOccurred(); + Q_EMIT errorOccurred(); return false; } @@ -422,7 +422,7 @@ void Xwayland::handleXwaylandError(QProcess::ProcessError error) qCWarning(KWIN_XWL) << "An unknown error has occurred in Xwayland"; break; } - emit errorOccurred(); + Q_EMIT errorOccurred(); } void Xwayland::handleXwaylandReady() @@ -431,7 +431,7 @@ void Xwayland::handleXwaylandReady() maybeDestroyReadyNotifier(); if (!createX11Connection()) { - emit errorOccurred(); + Q_EMIT errorOccurred(); return; } @@ -479,7 +479,7 @@ void Xwayland::handleSelectionFailedToClaimOwnership() void Xwayland::handleSelectionClaimedOwnership() { - emit started(); + Q_EMIT started(); } void Xwayland::maybeDestroyReadyNotifier() @@ -517,7 +517,7 @@ bool Xwayland::createX11Connection() // Note that it's very important to have valid x11RootWindow(), x11ScreenNumber(), and // atoms when the rest of kwin is notified about the new X11 connection. - emit m_app->x11ConnectionChanged(); + Q_EMIT m_app->x11ConnectionChanged(); return true; } @@ -528,7 +528,7 @@ void Xwayland::destroyX11Connection() return; } - emit m_app->x11ConnectionAboutToBeDestroyed(); + Q_EMIT m_app->x11ConnectionAboutToBeDestroyed(); Xcb::setInputFocus(XCB_INPUT_FOCUS_POINTER_ROOT); m_app->destroyAtoms(); @@ -542,7 +542,7 @@ void Xwayland::destroyX11Connection() m_app->setX11ScreenNumber(-1); m_app->setX11RootWindow(XCB_WINDOW_NONE); - emit m_app->x11ConnectionChanged(); + Q_EMIT m_app->x11ConnectionChanged(); } DragEventReply Xwayland::dragMoveFilter(Toplevel *target, const QPoint &pos) diff --git a/tests/pointergesturestest.cpp b/tests/pointergesturestest.cpp index b5bd1ae848..a240f6b220 100644 --- a/tests/pointergesturestest.cpp +++ b/tests/pointergesturestest.cpp @@ -115,21 +115,21 @@ void PinchGesture::setupGesture() [this] (const QSizeF &delta, qreal scale) { Q_UNUSED(delta) m_progressScale = scale; - emit progressScaleChanged(); + Q_EMIT progressScaleChanged(); } ); connect(m_gesture, &PointerPinchGesture::ended, this, [this] { m_scale = m_scale * m_progressScale; m_progressScale = 1.0; - emit scaleChanged(); - emit progressScaleChanged(); + Q_EMIT scaleChanged(); + Q_EMIT progressScaleChanged(); } ); connect(m_gesture, &PointerPinchGesture::cancelled, this, [this] { m_progressScale = 1.0; - emit progressScaleChanged(); + Q_EMIT progressScaleChanged(); } ); }