From 1d2c2d5982047d79a8281227006f852eb06ada5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 22 Jul 2013 16:07:39 +0200 Subject: [PATCH] Use Q_SLOTS and Q_SIGNALS instead of slots and signals Fixes compilation with Qt5/KF5 setup. --- client.h | 8 ++++---- composite.h | 2 +- cursor.h | 2 +- effects/coverswitch/coverswitch_config.h | 2 +- effects/cube/cube.h | 2 +- effects/cube/cube_config.h | 4 ++-- effects/cube/cubeslide_config.h | 2 +- effects/desktopgrid/desktopgrid.h | 2 +- effects/desktopgrid/desktopgrid_config.h | 4 ++-- effects/flipswitch/flipswitch_config.h | 2 +- effects/invert/invert.h | 2 +- effects/invert/invert_config.h | 2 +- effects/lookingglass/lookingglass.h | 2 +- effects/magiclamp/magiclamp_config.h | 2 +- effects/magnifier/magnifier.h | 2 +- effects/mouseclick/mouseclick.h | 2 +- effects/mousemark/mousemark.h | 2 +- effects/presentwindows/presentwindows.h | 6 +++--- effects/presentwindows/presentwindows_config.h | 2 +- effects/resize/resize_config.h | 2 +- effects/screenshot/screenshot.h | 2 +- effects/showfps/showfps_config.h | 2 +- effects/thumbnailaside/thumbnailaside.h | 2 +- effects/trackmouse/trackmouse.h | 2 +- effects/trackmouse/trackmouse_config.h | 4 ++-- effects/windowgeometry/windowgeometry.h | 2 +- effects/windowgeometry/windowgeometry_config.h | 2 +- effects/wobblywindows/wobblywindows_config.h | 4 ++-- effects/zoom/zoom.h | 2 +- effects/zoom/zoom_config.h | 2 +- focuschain.h | 2 +- libkwineffects/kwinglcolorcorrection.h | 4 ++-- libkwineffects/kwinglcolorcorrection_p.h | 8 ++++---- main.h | 2 +- paintredirector.h | 2 +- scripting/genericscriptedconfig.h | 2 +- scripting/scripting.h | 2 +- scripting/workspace_wrapper.h | 2 +- sm.h | 2 +- tabbox/desktopchain.h | 2 +- tabbox/tabbox.h | 4 ++-- tabbox/tabboxhandler.h | 4 ++-- tabbox/tests/test_desktopchain.cpp | 2 +- tabbox/tests/test_tabbox_config.cpp | 2 +- tabgroup.h | 2 +- tests/test_client_machine.cpp | 2 +- tests/test_screen_paint_data.cpp | 2 +- tests/test_update_kwin_49.cpp | 2 +- tests/test_virtual_desktops.cpp | 2 +- tests/test_window_paint_data.cpp | 2 +- tests/test_xcb_window.cpp | 2 +- tests/test_xcb_wrapper.cpp | 2 +- toplevel.h | 2 +- useractions.h | 6 +++--- virtualdesktops.h | 4 ++-- workspace.h | 5 ++--- 56 files changed, 75 insertions(+), 76 deletions(-) diff --git a/client.h b/client.h index 40811f2e39..61b53ee7fb 100644 --- a/client.h +++ b/client.h @@ -647,11 +647,11 @@ public: template void print(T &stream) const; -public slots: +public Q_SLOTS: void closeWindow(); void updateCaption(); -private slots: +private Q_SLOTS: void autoRaise(); void shadeHover(); void shadeUnhover(); @@ -696,7 +696,7 @@ protected: virtual void debug(QDebug& stream) const; virtual bool shouldUnredirect() const; -private slots: +private Q_SLOTS: void delayedSetShortcut(); void performMoveResize(); void removeSyncSupport(); @@ -706,7 +706,7 @@ private slots: //Signals make an excellent way for communication //in between objects as compared to simple function //calls -signals: +Q_SIGNALS: void clientManaging(KWin::Client*); void clientFullScreenSet(KWin::Client*, bool, bool); void clientMaximizedStateChanged(KWin::Client*, KDecorationDefines::MaximizeMode); diff --git a/composite.h b/composite.h index 6516ea954c..ea01ebb87d 100644 --- a/composite.h +++ b/composite.h @@ -45,7 +45,7 @@ public: private: friend class Compositor; bool owning; -private slots: +private Q_SLOTS: void looseOwnership(); }; diff --git a/cursor.h b/cursor.h index b1d91061af..cd9b19e7ef 100644 --- a/cursor.h +++ b/cursor.h @@ -189,7 +189,7 @@ protected: virtual void doStartCursorTracking(); virtual void doStopCursorTracking(); -private slots: +private Q_SLOTS: /** * Because of QTimer's and the impossibility to get events for all mouse * movements (at least I haven't figured out how) the position needs diff --git a/effects/coverswitch/coverswitch_config.h b/effects/coverswitch/coverswitch_config.h index 696e580880..7945de230b 100644 --- a/effects/coverswitch/coverswitch_config.h +++ b/effects/coverswitch/coverswitch_config.h @@ -42,7 +42,7 @@ class CoverSwitchEffectConfig : public KCModule public: explicit CoverSwitchEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/cube/cube.h b/effects/cube/cube.h index 2de304570a..f2e482a653 100644 --- a/effects/cube/cube.h +++ b/effects/cube/cube.h @@ -125,7 +125,7 @@ public: bool isTexturedCaps() const { return texturedCaps; } -private slots: +private Q_SLOTS: void toggleCube(); void toggleCylinder(); void toggleSphere(); diff --git a/effects/cube/cube_config.h b/effects/cube/cube_config.h index d62d4bf4ee..378d7e13d8 100644 --- a/effects/cube/cube_config.h +++ b/effects/cube/cube_config.h @@ -42,10 +42,10 @@ class CubeEffectConfig : public KCModule public: explicit CubeEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); -public slots: +public Q_SLOTS: virtual void save(); -private slots: +private Q_SLOTS: void capsSelectionChanged(); private: CubeEffectConfigForm* m_ui; diff --git a/effects/cube/cubeslide_config.h b/effects/cube/cubeslide_config.h index 97d26cd472..fa7f18ddba 100644 --- a/effects/cube/cubeslide_config.h +++ b/effects/cube/cubeslide_config.h @@ -42,7 +42,7 @@ class CubeSlideEffectConfig : public KCModule public: explicit CubeSlideEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/desktopgrid/desktopgrid.h b/effects/desktopgrid/desktopgrid.h index 226591a276..12c18550ba 100644 --- a/effects/desktopgrid/desktopgrid.h +++ b/effects/desktopgrid/desktopgrid.h @@ -92,7 +92,7 @@ public: bool isUsePresentWindows() const { return m_usePresentWindows; } -private slots: +private Q_SLOTS: void toggle(); // slots for global shortcut changed // needed to toggle the effect diff --git a/effects/desktopgrid/desktopgrid_config.h b/effects/desktopgrid/desktopgrid_config.h index 631ab88b07..8bd87276b5 100644 --- a/effects/desktopgrid/desktopgrid_config.h +++ b/effects/desktopgrid/desktopgrid_config.h @@ -44,12 +44,12 @@ public: explicit DesktopGridEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~DesktopGridEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); virtual void load(); virtual void defaults(); -private slots: +private Q_SLOTS: void layoutSelectionChanged(); private: diff --git a/effects/flipswitch/flipswitch_config.h b/effects/flipswitch/flipswitch_config.h index 32956a9539..2c1e0fa570 100644 --- a/effects/flipswitch/flipswitch_config.h +++ b/effects/flipswitch/flipswitch_config.h @@ -44,7 +44,7 @@ public: explicit FlipSwitchEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~FlipSwitchEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/invert/invert.h b/effects/invert/invert.h index 908eef4aff..1f946f6c45 100644 --- a/effects/invert/invert.h +++ b/effects/invert/invert.h @@ -49,7 +49,7 @@ public: static bool supported(); -public slots: +public Q_SLOTS: void toggleScreenInversion(); void toggleWindow(); void slotWindowClosed(KWin::EffectWindow *w); diff --git a/effects/invert/invert_config.h b/effects/invert/invert_config.h index 0d14c479ce..1fab78ccd5 100644 --- a/effects/invert/invert_config.h +++ b/effects/invert/invert_config.h @@ -35,7 +35,7 @@ public: explicit InvertEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~InvertEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); virtual void load(); virtual void defaults(); diff --git a/effects/lookingglass/lookingglass.h b/effects/lookingglass/lookingglass.h index 8ce9f1323d..268a4ecd42 100644 --- a/effects/lookingglass/lookingglass.h +++ b/effects/lookingglass/lookingglass.h @@ -57,7 +57,7 @@ public: int initialRadius() const { return initialradius; } -public slots: +public Q_SLOTS: void toggle(); void zoomIn(); void zoomOut(); diff --git a/effects/magiclamp/magiclamp_config.h b/effects/magiclamp/magiclamp_config.h index 99a9d0eb6c..4f07dd8817 100644 --- a/effects/magiclamp/magiclamp_config.h +++ b/effects/magiclamp/magiclamp_config.h @@ -42,7 +42,7 @@ class MagicLampEffectConfig : public KCModule public: explicit MagicLampEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/magnifier/magnifier.h b/effects/magnifier/magnifier.h index 6b6ca0f48c..14345bc456 100644 --- a/effects/magnifier/magnifier.h +++ b/effects/magnifier/magnifier.h @@ -54,7 +54,7 @@ public: qreal targetZoom() const { return target_zoom; } -private slots: +private Q_SLOTS: void zoomIn(); void zoomOut(); void toggle(); diff --git a/effects/mouseclick/mouseclick.h b/effects/mouseclick/mouseclick.h index 2d0bb0dd32..b57865c324 100644 --- a/effects/mouseclick/mouseclick.h +++ b/effects/mouseclick/mouseclick.h @@ -139,7 +139,7 @@ public: return m_enabled; } -private slots: +private Q_SLOTS: void toggleEnabled(); void slotMouseChanged(const QPoint& pos, const QPoint& old, Qt::MouseButtons buttons, Qt::MouseButtons oldbuttons, diff --git a/effects/mousemark/mousemark.h b/effects/mousemark/mousemark.h index 45e9f8dd41..dac8544524 100644 --- a/effects/mousemark/mousemark.h +++ b/effects/mousemark/mousemark.h @@ -50,7 +50,7 @@ public: QColor configuredColor() const { return color; } -private slots: +private Q_SLOTS: void clear(); void clearLast(); void slotMouseChanged(const QPoint& pos, const QPoint& old, diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h index 89ccca796a..dc319ffb91 100644 --- a/effects/presentwindows/presentwindows.h +++ b/effects/presentwindows/presentwindows.h @@ -39,7 +39,7 @@ public: explicit CloseWindowView(QWidget *parent = 0); void windowInputMouseEvent(QMouseEvent* e); void disarm(); -public slots: +public Q_SLOTS: void arm(); Q_SIGNALS: @@ -185,7 +185,7 @@ public: bool isDragToClose() const { return m_dragToClose; } -public slots: +public Q_SLOTS: void setActive(bool active); void toggleActive() { m_mode = ModeCurrentDesktop; @@ -210,7 +210,7 @@ public slots: // atoms void slotPropertyNotify(KWin::EffectWindow* w, long atom); -private slots: +private Q_SLOTS: void closeWindow(); void elevateCloseWindow(); void screenCountChanged(); diff --git a/effects/presentwindows/presentwindows_config.h b/effects/presentwindows/presentwindows_config.h index ce6fdc32d8..5e5ca63049 100644 --- a/effects/presentwindows/presentwindows_config.h +++ b/effects/presentwindows/presentwindows_config.h @@ -44,7 +44,7 @@ public: explicit PresentWindowsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~PresentWindowsEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); virtual void defaults(); diff --git a/effects/resize/resize_config.h b/effects/resize/resize_config.h index e179e8ca2f..f9742e0ff5 100644 --- a/effects/resize/resize_config.h +++ b/effects/resize/resize_config.h @@ -42,7 +42,7 @@ class ResizeEffectConfig : public KCModule public: explicit ResizeEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/screenshot/screenshot.h b/effects/screenshot/screenshot.h index 4ee138c2da..a7439df458 100644 --- a/effects/screenshot/screenshot.h +++ b/effects/screenshot/screenshot.h @@ -74,7 +74,7 @@ public Q_SLOTS: Q_SIGNALS: Q_SCRIPTABLE void screenshotCreated(qulonglong handle); -private slots: +private Q_SLOTS: void windowClosed( KWin::EffectWindow* w ); private: diff --git a/effects/showfps/showfps_config.h b/effects/showfps/showfps_config.h index 2492871297..9858d5f4cb 100644 --- a/effects/showfps/showfps_config.h +++ b/effects/showfps/showfps_config.h @@ -35,7 +35,7 @@ public: explicit ShowFpsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~ShowFpsEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/effects/thumbnailaside/thumbnailaside.h b/effects/thumbnailaside/thumbnailaside.h index 2c3cb05578..bfe4931cd5 100644 --- a/effects/thumbnailaside/thumbnailaside.h +++ b/effects/thumbnailaside/thumbnailaside.h @@ -62,7 +62,7 @@ public: int configuredScreen() const { return screen; } -private slots: +private Q_SLOTS: void toggleCurrentThumbnail(); void slotWindowClosed(KWin::EffectWindow *w); void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old); diff --git a/effects/trackmouse/trackmouse.h b/effects/trackmouse/trackmouse.h index cb767adc41..ad05af8a5c 100644 --- a/effects/trackmouse/trackmouse.h +++ b/effects/trackmouse/trackmouse.h @@ -52,7 +52,7 @@ public: bool isMousePolling() const { return m_mousePolling; } -private slots: +private Q_SLOTS: void toggle(); void slotMouseChanged(const QPoint& pos, const QPoint& old, Qt::MouseButtons buttons, Qt::MouseButtons oldbuttons, diff --git a/effects/trackmouse/trackmouse_config.h b/effects/trackmouse/trackmouse_config.h index ad8b3f117a..d1850fea3d 100644 --- a/effects/trackmouse/trackmouse_config.h +++ b/effects/trackmouse/trackmouse_config.h @@ -46,11 +46,11 @@ public: explicit TrackMouseEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~TrackMouseEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); virtual void load(); virtual void defaults(); -private slots: +private Q_SLOTS: void shortcutChanged(const QKeySequence &seq); private: void checkModifiers(); diff --git a/effects/windowgeometry/windowgeometry.h b/effects/windowgeometry/windowgeometry.h index 3211fdd7e7..3ee29209ba 100644 --- a/effects/windowgeometry/windowgeometry.h +++ b/effects/windowgeometry/windowgeometry.h @@ -49,7 +49,7 @@ public: bool isHandlesResizes() const { return iHandleResizes; } -private slots: +private Q_SLOTS: void toggle(); void slotWindowStartUserMovedResized(KWin::EffectWindow *w); void slotWindowFinishUserMovedResized(KWin::EffectWindow *w); diff --git a/effects/windowgeometry/windowgeometry_config.h b/effects/windowgeometry/windowgeometry_config.h index 67c660842f..eaa49c43b0 100644 --- a/effects/windowgeometry/windowgeometry_config.h +++ b/effects/windowgeometry/windowgeometry_config.h @@ -43,7 +43,7 @@ public: explicit WindowGeometryConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~WindowGeometryConfig(); -public slots: +public Q_SLOTS: void save(); void defaults(); diff --git a/effects/wobblywindows/wobblywindows_config.h b/effects/wobblywindows/wobblywindows_config.h index 6531c77561..cb984c563a 100644 --- a/effects/wobblywindows/wobblywindows_config.h +++ b/effects/wobblywindows/wobblywindows_config.h @@ -38,10 +38,10 @@ public: explicit WobblyWindowsEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); ~WobblyWindowsEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); -private slots: +private Q_SLOTS: void wobblinessChanged(); private: diff --git a/effects/zoom/zoom.h b/effects/zoom/zoom.h index 7c49c59264..84f92be598 100644 --- a/effects/zoom/zoom.h +++ b/effects/zoom/zoom.h @@ -77,7 +77,7 @@ public: qreal targetZoom() const { return target_zoom; } -private slots: +private Q_SLOTS: inline void zoomIn() { zoomIn(-1.0); }; void zoomIn(double to); void zoomOut(); diff --git a/effects/zoom/zoom_config.h b/effects/zoom/zoom_config.h index 9b97cc28d1..b59aa55f03 100644 --- a/effects/zoom/zoom_config.h +++ b/effects/zoom/zoom_config.h @@ -44,7 +44,7 @@ public: explicit ZoomEffectConfig(QWidget* parent = 0, const QVariantList& args = QVariantList()); virtual ~ZoomEffectConfig(); -public slots: +public Q_SLOTS: virtual void save(); private: diff --git a/focuschain.h b/focuschain.h index 3eed84eb64..a565f5ba86 100644 --- a/focuschain.h +++ b/focuschain.h @@ -165,7 +165,7 @@ public: **/ Client *firstMostRecentlyUsed() const; -public slots: +public Q_SLOTS: /** * @brief Resizes the per virtual desktop focus chains from @p previousSize to @p newSize. * This means that for each virtual desktop between previous and new size a new focus chain is diff --git a/libkwineffects/kwinglcolorcorrection.h b/libkwineffects/kwinglcolorcorrection.h index 801d4fb25f..1d7ea8de71 100644 --- a/libkwineffects/kwinglcolorcorrection.h +++ b/libkwineffects/kwinglcolorcorrection.h @@ -74,7 +74,7 @@ public: */ bool isEnabled() const; -public slots: +public Q_SLOTS: /** * Enables or disables color correction. Compositing should be restarted * for changes to take effect. @@ -83,7 +83,7 @@ public slots: */ bool setEnabled(bool enabled); -signals: +Q_SIGNALS: /** * Emitted when some changes happened to the color correction settings, and * a full repaint of the scene should be done to make the new settings visible. diff --git a/libkwineffects/kwinglcolorcorrection_p.h b/libkwineffects/kwinglcolorcorrection_p.h index 7e77bb2513..0c39b5a7fa 100644 --- a/libkwineffects/kwinglcolorcorrection_p.h +++ b/libkwineffects/kwinglcolorcorrection_p.h @@ -85,7 +85,7 @@ public: bool deleteCCTextures(); static bool setupCCTexture(GLuint texture, const Clut &clut); -public slots: +public Q_SLOTS: void colorServerUpdateSucceededSlot(); void colorServerUpdateFailedSlot(); @@ -131,10 +131,10 @@ public: const ClutList& outputCluts() const; const RegionalClutMap& regionCluts() const; -public slots: +public Q_SLOTS: void update(); -signals: +Q_SIGNALS: void updateSucceeded(); void updateFailed(); void outputClutsChanged(); @@ -145,7 +145,7 @@ private: QDBusPendingReply< ClutList > getOutputCluts(); QDBusPendingReply< RegionalClutMap > getRegionCluts(); -private slots: +private Q_SLOTS: void callFinishedSlot(QDBusPendingCallWatcher *watcher); private: diff --git a/main.h b/main.h index c865deafbd..cac9e9df95 100644 --- a/main.h +++ b/main.h @@ -55,7 +55,7 @@ protected: bool notify(QObject* o, QEvent* e); static void crashHandler(int signal); -private slots: +private Q_SLOTS: void lostSelection(); void resetCrashesCount(); diff --git a/paintredirector.h b/paintredirector.h index e56c90343c..f1e1c985b0 100644 --- a/paintredirector.h +++ b/paintredirector.h @@ -86,7 +86,7 @@ public: void reparent(Deleted *d); static PaintRedirector *create(Client *c, QWidget* widget); -public slots: +public Q_SLOTS: void ensurePixmapsPainted(); protected: PaintRedirector(Client *c, QWidget* widget); diff --git a/scripting/genericscriptedconfig.h b/scripting/genericscriptedconfig.h index d1affdfac2..6d61bafce0 100644 --- a/scripting/genericscriptedconfig.h +++ b/scripting/genericscriptedconfig.h @@ -45,7 +45,7 @@ public: GenericScriptedConfig(const KComponentData &data, const QString &keyword, QWidget *parent, const QVariantList &args); virtual ~GenericScriptedConfig(); -public slots: +public Q_SLOTS: virtual void save(); protected: diff --git a/scripting/scripting.h b/scripting/scripting.h index e8a56b2d73..43d819ce69 100644 --- a/scripting/scripting.h +++ b/scripting/scripting.h @@ -234,7 +234,7 @@ public Q_SLOTS: Q_SIGNALS: Q_SCRIPTABLE void printError(const QString &text); -private slots: +private Q_SLOTS: /** * A nice clean way to handle exceptions in scripting. * TODO: Log to file, show from notifier.. diff --git a/scripting/workspace_wrapper.h b/scripting/workspace_wrapper.h index b32f84c8d2..965ce3dea6 100644 --- a/scripting/workspace_wrapper.h +++ b/scripting/workspace_wrapper.h @@ -71,7 +71,7 @@ class WorkspaceWrapper : public QObject private: Q_DISABLE_COPY(WorkspaceWrapper) -signals: +Q_SIGNALS: void desktopPresenceChanged(KWin::Client *client, int desktop); void currentDesktopChanged(int desktop, KWin::Client *client); void clientAdded(KWin::Client *client); diff --git a/sm.h b/sm.h index 9e5c53b5ac..a0f6e3c7bd 100644 --- a/sm.h +++ b/sm.h @@ -91,7 +91,7 @@ public: } void saveDone(); void close(); -private slots: +private Q_SLOTS: void processData(); private: QSocketNotifier* notifier; diff --git a/tabbox/desktopchain.h b/tabbox/desktopchain.h index 5c8c3da759..ceeeb977a9 100644 --- a/tabbox/desktopchain.h +++ b/tabbox/desktopchain.h @@ -99,7 +99,7 @@ public: **/ uint next(uint indexDesktop) const; -public slots: +public Q_SLOTS: /** * Adds the @p currentDesktop to the currently used desktop chain. * @param previousDesktop The previously used desktop, should be the top element of the chain diff --git a/tabbox/tabbox.h b/tabbox/tabbox.h index 058b202d23..51049ff8b0 100644 --- a/tabbox/tabbox.h +++ b/tabbox/tabbox.h @@ -175,7 +175,7 @@ public: static TabBox *self(); static TabBox *create(QObject *parent); -public slots: +public Q_SLOTS: void show(); /** * Only for DBus Interface to start primary KDE Walk through windows. @@ -236,7 +236,7 @@ public slots: bool toggle(ElectricBorder eb); -signals: +Q_SIGNALS: void tabBoxAdded(int); Q_SCRIPTABLE void tabBoxClosed(); Q_SCRIPTABLE void itemSelected(); diff --git a/tabbox/tabboxhandler.h b/tabbox/tabboxhandler.h index 26d3e91ef1..e620df8347 100644 --- a/tabbox/tabboxhandler.h +++ b/tabbox/tabboxhandler.h @@ -335,7 +335,7 @@ public: Qt::Alignment embeddedAlignment() const; void resetEmbedded(); -signals: +Q_SIGNALS: /** * This signal is fired when the TabBoxConfig changes * @see setConfig @@ -344,7 +344,7 @@ signals: void embeddedChanged(bool enabled); void selectedIndexChanged(); -private slots: +private Q_SLOTS: void updateHighlightWindows(); private: diff --git a/tabbox/tests/test_desktopchain.cpp b/tabbox/tests/test_desktopchain.cpp index eb69c5bf7b..968d0c6cba 100644 --- a/tabbox/tests/test_desktopchain.cpp +++ b/tabbox/tests/test_desktopchain.cpp @@ -28,7 +28,7 @@ using namespace KWin::TabBox; class TestDesktopChain : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void chainInit_data(); void chainInit(); void chainAdd_data(); diff --git a/tabbox/tests/test_tabbox_config.cpp b/tabbox/tests/test_tabbox_config.cpp index bee68f9784..03678ada1e 100644 --- a/tabbox/tests/test_tabbox_config.cpp +++ b/tabbox/tests/test_tabbox_config.cpp @@ -25,7 +25,7 @@ using namespace KWin::TabBox; class TestTabBoxConfig : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testDefaultCtor(); void testAssignmentOperator(); }; diff --git a/tabgroup.h b/tabgroup.h index 5c4b6d124d..8bb8dce914 100644 --- a/tabgroup.h +++ b/tabgroup.h @@ -146,7 +146,7 @@ public: */ void updateMinMaxSize(); -signals: +Q_SIGNALS: void minSizeChanged(); void maxSizeChanged(); diff --git a/tests/test_client_machine.cpp b/tests/test_client_machine.cpp index 574e688aff..fab57731bc 100644 --- a/tests/test_client_machine.cpp +++ b/tests/test_client_machine.cpp @@ -44,7 +44,7 @@ using namespace KWin; class TestClientMachine : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void hostName_data(); diff --git a/tests/test_screen_paint_data.cpp b/tests/test_screen_paint_data.cpp index 82b7506f67..6f02c93631 100644 --- a/tests/test_screen_paint_data.cpp +++ b/tests/test_screen_paint_data.cpp @@ -30,7 +30,7 @@ using namespace KWin; class TestScreenPaintData : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testCtor(); void testCopyCtor(); diff --git a/tests/test_update_kwin_49.cpp b/tests/test_update_kwin_49.cpp index 79a0522b74..8b6bcd5e7d 100644 --- a/tests/test_update_kwin_49.cpp +++ b/tests/test_update_kwin_49.cpp @@ -27,7 +27,7 @@ along with this program. If not, see . class TestUpdateKWin49 : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: /** * Tests that migrating the Present Windows TabBox settings * does not affect an empty configuration. diff --git a/tests/test_virtual_desktops.cpp b/tests/test_virtual_desktops.cpp index 854f6f14ec..1d7ebda22a 100644 --- a/tests/test_virtual_desktops.cpp +++ b/tests/test_virtual_desktops.cpp @@ -38,7 +38,7 @@ using namespace KWin; class TestVirtualDesktops : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void init(); void cleanup(); void count_data(); diff --git a/tests/test_window_paint_data.cpp b/tests/test_window_paint_data.cpp index 81807e8153..b333acf03a 100644 --- a/tests/test_window_paint_data.cpp +++ b/tests/test_window_paint_data.cpp @@ -161,7 +161,7 @@ void MockEffectWindow::unrefWindow() class TestWindowPaintData : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testCtor(); void testCopyCtor(); void testOperatorMultiplyAssign(); diff --git a/tests/test_xcb_window.cpp b/tests/test_xcb_window.cpp index 3e6ac7eab9..ea45e3833e 100644 --- a/tests/test_xcb_window.cpp +++ b/tests/test_xcb_window.cpp @@ -31,7 +31,7 @@ using namespace KWin; class TestXcbWindow : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void defaultCtor(); void ctor(); void classCtor(); diff --git a/tests/test_xcb_wrapper.cpp b/tests/test_xcb_wrapper.cpp index 7369cc82ae..815b342d3c 100644 --- a/tests/test_xcb_wrapper.cpp +++ b/tests/test_xcb_wrapper.cpp @@ -32,7 +32,7 @@ using namespace KWin::Xcb; class TestXcbWrapper : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void init(); void cleanup(); void defaultCtor(); diff --git a/toplevel.h b/toplevel.h index 3ad7563d4f..e7c8c05bde 100644 --- a/toplevel.h +++ b/toplevel.h @@ -306,7 +306,7 @@ public: */ void getDamageRegionReply(); -signals: +Q_SIGNALS: void opacityChanged(KWin::Toplevel* toplevel, qreal oldOpacity); void damaged(KWin::Toplevel* toplevel, const QRect& damage); void propertyNotify(KWin::Toplevel* toplevel, long a); diff --git a/useractions.h b/useractions.h index 3c71c4779c..41d809ad40 100644 --- a/useractions.h +++ b/useractions.h @@ -95,7 +95,7 @@ public: **/ void show(const QRect &pos, const QWeakPointer &client); -public slots: +public Q_SLOTS: /** * Delayed initialization of the activity menu. * @@ -107,7 +107,7 @@ public slots: **/ void showHideActivityMenu(); -private slots: +private Q_SLOTS: /** * The menu will become visible soon. * @@ -270,7 +270,7 @@ public: QKeySequence shortcut() const; public Q_SLOTS: void keySequenceChanged(const QKeySequence &seq); -signals: +Q_SIGNALS: void dialogDone(bool ok); protected: virtual void done(int r); diff --git a/virtualdesktops.h b/virtualdesktops.h index 14f13e2543..0630ba6196 100644 --- a/virtualdesktops.h +++ b/virtualdesktops.h @@ -185,7 +185,7 @@ public: */ static uint maximum(); -public slots: +public Q_SLOTS: /** * Set the number of available desktops to @a count. This function overrides any previous * grid layout. @@ -267,7 +267,7 @@ Q_SIGNALS: **/ void navigationWrappingAroundChanged(); -private slots: +private Q_SLOTS: /** * Common slot for all "Switch to Desktop n" shortcuts. * This method uses the sender() method to access some data. diff --git a/workspace.h b/workspace.h index e278b98858..991f7b3bdd 100644 --- a/workspace.h +++ b/workspace.h @@ -294,7 +294,7 @@ public: **/ bool compositing() const; -public slots: +public Q_SLOTS: // Keybindings //void slotSwitchToWindow( int ); void slotWindowToDesktop(); @@ -375,7 +375,7 @@ public slots: void slotActivatePrevTab(); // Slot to move right the active Client. void slotUntab(); // Slot to remove the active client from its group. -private slots: +private Q_SLOTS: void desktopResized(); void slotUpdateToolWindows(); void delayFocus(); @@ -395,7 +395,6 @@ Q_SIGNALS: void workspaceInitialized(); //Signals required for the scripting interface -signals: void desktopPresenceChanged(KWin::Client*, int); void currentDesktopChanged(int, KWin::Client*); void clientAdded(KWin::Client*);