Merge lp:~aacid/unity-2d/unity-2d_gobject_callback_header into lp:unity-2d

[Albert Astals Cid]

Move the handy gobject callback macros to a header so we don't copy the code everywhere

[lp:~aacid/unity-2d/unity-2d_gobject_callback_header]

935. By Albert Astals Cid on 2012-02-24

Make that 2012 as Gerry suggests

=== added file 'libunity-2d-private/src/gobjectcallback.h'
--- libunity-2d-private/src/gobjectcallback.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/gobjectcallback.h	2012-02-24 12:51:19 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Handy macros to declare GObject callbacks. The 'n' in CALLBACKn refers to
+// the number of dummy arguments the callback returns
+#define GOBJECT_CALLBACK0(callbackName, slot) \
+static void \
+callbackName(GObject* src, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+#define GOBJECT_CALLBACK1(callbackName, slot) \
+static void \
+callbackName(GObject* src, void* dummy1, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}
+
+#define GOBJECT_CALLBACK2(callbackName, slot) \
+static void \
+callbackName(GObject* src, void* dummy1, void* dummy2, QObject* dst) \
+{ \
+    QMetaObject::invokeMethod(dst, slot); \
+}

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-02-09 10:56:45 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-02-24 12:51:19 +0000
@@ -20,6 +20,7 @@
 #include <config.h>
 
 #include "screeninfo.h"
+#include "gobjectcallback.h"
 
 #include <QDebug>
 #include <QGLWidget>
@@ -36,14 +37,7 @@
 #include <libwnck/libwnck.h>
 }
 
-#define GOBJECT_CALLBACK0(callbackName, slot) \
-static void \
-callbackName(GObject* src, void* dummy1, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-GOBJECT_CALLBACK0(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
+GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "onActiveWorkspaceChanged");
 
 Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
     QDeclarativeView(parent),

=== modified file 'libunity-2d-private/src/windowsintersectmonitor.cpp'
--- libunity-2d-private/src/windowsintersectmonitor.cpp	2012-02-08 14:18:37 +0000
+++ libunity-2d-private/src/windowsintersectmonitor.cpp	2012-02-24 12:51:19 +0000
@@ -16,6 +16,7 @@
 
 // libunity-2d
 #include <debug_p.h>
+#include "gobjectcallback.h"
 
 // Qt
 #include <QCursor>
@@ -29,29 +30,6 @@
 #include <libwnck/libwnck.h>
 }
 
-// Handy macros to declare GObject callbacks. The 'n' in CALLBACKn refers to
-// the number of dummy arguments the callback returns
-#define GOBJECT_CALLBACK0(callbackName, slot) \
-static void \
-callbackName(GObject* src, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-#define GOBJECT_CALLBACK1(callbackName, slot) \
-static void \
-callbackName(GObject* src, void* dummy1, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
-#define GOBJECT_CALLBACK2(callbackName, slot) \
-static void \
-callbackName(GObject* src, void* dummy1, void* dummy2, QObject* dst) \
-{ \
-    QMetaObject::invokeMethod(dst, slot); \
-}
-
 // Screen callbacks
 GOBJECT_CALLBACK1(activeWindowChangedCB, "updateActiveWindowConnections");
 GOBJECT_CALLBACK1(activeWorkspaceChangedCB, "updateIntersect");