Use Q_SLOTS and Q_SIGNALS instead of slots and signals

Fixes compilation with Qt5/KF5 setup.

client.h

@@ -647,11 +647,11 @@ public:
     template <typename T>
     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);

composite.h

@@ -45,7 +45,7 @@ public:
 private:
     friend class Compositor;
     bool owning;
-private slots:
+private Q_SLOTS:
     void looseOwnership();
 };
 

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

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:

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();

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;

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:

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

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:

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:

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);

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();

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();

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:

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();

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,

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,

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();

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();
 

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:

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:

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:

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);

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,

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();

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);

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();
 

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:

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();

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:

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

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.

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:

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();
 

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);

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:

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..

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);

sm.h

@@ -91,7 +91,7 @@ public:
     }
     void saveDone();
     void close();
-private slots:
+private Q_SLOTS:
     void processData();
 private:
     QSocketNotifier* notifier;

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

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();

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:

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();

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();
 };

tabgroup.h

@@ -146,7 +146,7 @@ public:
      */
     void updateMinMaxSize();
 
-signals:
+Q_SIGNALS:
     void minSizeChanged();
     void maxSizeChanged();
 

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();

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();

tests/test_update_kwin_49.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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.

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();

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();

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();

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();

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);

useractions.h

@@ -95,7 +95,7 @@ public:
      **/
     void show(const QRect &pos, const QWeakPointer<Client> &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);

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.

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*);