Merge lp:~agateau/unity-2d/qt-no-keywords into lp:unity-2d/3.0

[Aurélien Gâteau]

[panel] Build with QT_NO_KEYWORDS. Needed to be able to use UnityCore.

UnityCore uses libsigc++, which does not cope well with Qt definitions of "signals" and "slots". Building with QT_NO_KEYWORDS fixes this. While I was at it I removed the few "#undef signals" we previously used to workaround this.

[lp:~agateau/unity-2d/qt-no-keywords]

613. By Aurélien Gâteau on 2011-06-27

[buildsystem] Define QT_NO_KEYWORDS for all of unity-2d

614. By Aurélien Gâteau on 2011-06-27

[buildsystem] "#undef signals"--

[Florian Boucault (fboucault)]

Builds and works as expected!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-05-25 14:54:08 +0000
+++ CMakeLists.txt	2011-06-27 13:51:28 +0000
@@ -14,6 +14,10 @@
 # https://live.gnome.org/GnomeGoals/UseGseal
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGSEAL_ENABLE -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED")
 
+# gtk and unity-core (actually sigc++) do not like Qt defining macros named
+# "signals" and "slots"
+add_definitions(-DQT_NO_KEYWORDS)
+
 # Dependencies
 include(FindPkgConfig)
 find_package(Qt4 REQUIRED)

=== modified file 'libunity-2d-private/Unity2d/dragitemwithurl.cpp'
--- libunity-2d-private/Unity2d/dragitemwithurl.cpp	2011-05-18 15:47:16 +0000
+++ libunity-2d-private/Unity2d/dragitemwithurl.cpp	2011-06-27 13:51:28 +0000
@@ -23,7 +23,6 @@
 #include <gscopedpointer.h>
 
 // GIO
-#undef signals
 extern "C" {
     #include <gio/gdesktopappinfo.h>
 }

=== modified file 'libunity-2d-private/Unity2d/iconimageprovider.cpp'
--- libunity-2d-private/Unity2d/iconimageprovider.cpp	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/iconimageprovider.cpp	2011-06-27 13:51:28 +0000
@@ -33,7 +33,7 @@
 IconImageProvider::~IconImageProvider()
 {
     /* unreference cached themes */
-    foreach(void* theme, m_themes.values()) {
+    Q_FOREACH(void* theme, m_themes.values()) {
         g_object_unref((GtkIconTheme*)theme);
     }
 }

=== modified file 'libunity-2d-private/Unity2d/launcherapplication.cpp'
--- libunity-2d-private/Unity2d/launcherapplication.cpp	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcherapplication.cpp	2011-06-27 13:51:28 +0000
@@ -257,7 +257,7 @@
     }
 
     m_sticky = sticky;
-    emit stickyChanged(sticky);
+    stickyChanged(sticky);
 }
 
 void
@@ -408,15 +408,15 @@
 void
 LauncherApplication::updateBamfApplicationDependentProperties()
 {
-    emit activeChanged(active());
-    emit runningChanged(running());
-    emit urgentChanged(urgent());
-    emit nameChanged(name());
-    emit iconChanged(icon());
-    emit applicationTypeChanged(application_type());
-    emit desktopFileChanged(desktop_file());
+    activeChanged(active());
+    runningChanged(running());
+    urgentChanged(urgent());
+    nameChanged(name());
+    iconChanged(icon());
+    applicationTypeChanged(application_type());
+    desktopFileChanged(desktop_file());
     m_launching_timer.stop();
-    emit launchingChanged(launching());
+    launchingChanged(launching());
     updateHasVisibleWindow();
     updateWindowCount();
     fetchIndicatorMenus();
@@ -431,7 +431,7 @@
     m_application->disconnect(this);
     m_application = NULL;
     updateBamfApplicationDependentProperties();
-    emit closed();
+    closed();
 }
 
 void
@@ -449,10 +449,10 @@
 
     m_snStartupSequence.reset(sequence);
 
-    emit nameChanged(name());
-    emit iconChanged(icon());
-    emit executableChanged(executable());
-    emit launchingChanged(launching());
+    nameChanged(name());
+    iconChanged(icon());
+    executableChanged(executable());
+    launchingChanged(launching());
 }
 
 void
@@ -510,7 +510,7 @@
     }
 
     if (m_has_visible_window != prev) {
-        emit hasVisibleWindowChanged(m_has_visible_window);
+        hasVisibleWindowChanged(m_has_visible_window);
     }
 }
 
@@ -645,7 +645,7 @@
     /* 'launching' property becomes true for a few seconds and becomes
        false as soon as the application is launched */
     m_launching_timer.start();
-    emit launchingChanged(true);
+    launchingChanged(true);
 
     return true;
 }
@@ -653,7 +653,7 @@
 void
 LauncherApplication::onLaunchingTimeouted()
 {
-    emit launchingChanged(false);
+    launchingChanged(false);
 }
 
 void

=== modified file 'libunity-2d-private/Unity2d/launcherdevice.cpp'
--- libunity-2d-private/Unity2d/launcherdevice.cpp	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/launcherdevice.cpp	2011-06-27 13:51:28 +0000
@@ -26,7 +26,6 @@
 #include <QDebug>
 #include <QAction>
 
-#undef signals
 extern "C" {
     #include <gtk/gtk.h>
 }

=== modified file 'libunity-2d-private/Unity2d/launcherdropitem.cpp'
--- libunity-2d-private/Unity2d/launcherdropitem.cpp	2011-06-15 14:21:09 +0000
+++ libunity-2d-private/Unity2d/launcherdropitem.cpp	2011-06-27 13:51:28 +0000
@@ -42,9 +42,9 @@
 {
     Q_FOREACH(QUrl url, getEventUrls(event)) {
         if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
-            emit desktopFileDropped(url.path());
+            desktopFileDropped(url.path());
         } else if (url.scheme().startsWith("http")) {
-            emit webpageUrlDropped(url);
+            webpageUrlDropped(url);
         }
     }
     event->setAccepted(false);

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-06-22 08:33:52 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-06-27 13:51:28 +0000
@@ -65,8 +65,6 @@
 #include <QGraphicsEffect>
 #include <QAbstractListModel>
 
-#undef signals
-
 #include <X11/Xlib.h>
 
 /* FIXME: This should be done more properly, it's just an hack this way.

=== modified file 'libunity-2d-private/Unity2d/screeninfo.cpp'
--- libunity-2d-private/Unity2d/screeninfo.cpp	2011-05-23 17:23:38 +0000
+++ libunity-2d-private/Unity2d/screeninfo.cpp	2011-06-27 13:51:28 +0000
@@ -1,4 +1,3 @@
-#undef signals
 extern "C" {
 #include <libwnck/screen.h>
 #include <libwnck/window.h>

=== modified file 'libunity-2d-private/Unity2d/trash.cpp'
--- libunity-2d-private/Unity2d/trash.cpp	2011-06-07 16:34:46 +0000
+++ libunity-2d-private/Unity2d/trash.cpp	2011-06-27 13:51:28 +0000
@@ -345,7 +345,7 @@
 Trash::fileChanged()
 {
     updateTrashIcon();
-    emit iconChanged(icon());
+    iconChanged(icon());
 }
 
 void

=== modified file 'libunity-2d-private/Unity2d/workspacesinfo.cpp'
--- libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-04-28 13:09:25 +0000
+++ libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-06-27 13:51:28 +0000
@@ -3,7 +3,6 @@
 #include "signalwaiter.h"
 #include <debug_p.h>
 
-#undef signals
 extern "C" {
 #include <libwnck/screen.h>
 #include <libwnck/window.h>

=== modified file 'libunity-2d-private/src/intellihidebehavior.cpp'
--- libunity-2d-private/src/intellihidebehavior.cpp	2011-06-11 11:33:52 +0000
+++ libunity-2d-private/src/intellihidebehavior.cpp	2011-06-27 13:51:28 +0000
@@ -25,7 +25,6 @@
 #include <QWidget>
 
 // libwnck
-#undef signals
 extern "C" {
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-04-13 14:04:45 +0000
+++ panel/applets/appname/windowhelper.cpp	2011-06-27 13:51:28 +0000
@@ -32,7 +32,6 @@
 #include <bamf-window.h>
 
 // libwnck
-#undef signals
 extern "C" {
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>

=== modified file 'panel/applets/indicator/indicator.h'
--- panel/applets/indicator/indicator.h	2010-10-23 05:01:13 +0000
+++ panel/applets/indicator/indicator.h	2011-06-27 13:51:28 +0000
@@ -18,7 +18,6 @@
 #ifndef __INDICATOR_H__
 #define __INDICATOR_H__
 
-#undef signals
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

=== modified file 'panel/applets/indicator/indicatorapplet.cpp'
--- panel/applets/indicator/indicatorapplet.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/indicatorapplet.cpp	2011-06-27 13:51:28 +0000
@@ -36,7 +36,6 @@
 #include <QX11EmbedContainer>
 
 // Gtk
-#undef signals
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

=== modified file 'panel/applets/legacytray/fdoselectionmanager.cpp'
--- panel/applets/legacytray/fdoselectionmanager.cpp	2011-03-02 14:38:45 +0000
+++ panel/applets/legacytray/fdoselectionmanager.cpp	2011-06-27 13:51:28 +0000
@@ -316,7 +316,7 @@
     tasks[winId] = task;
     q->connect(task, SIGNAL(taskDeleted(WId)), q, SLOT(cleanupTask(WId)));
 
-    emit q->taskCreated(task);
+    q->taskCreated(task);
 }
 
 

=== modified file 'panel/applets/legacytray/fdoselectionmanager.h'
--- panel/applets/legacytray/fdoselectionmanager.h	2010-11-18 14:11:59 +0000
+++ panel/applets/legacytray/fdoselectionmanager.h	2011-06-27 13:51:28 +0000
@@ -47,14 +47,14 @@
     void removeDamageWatch(QWidget *container);
     bool haveComposite() const;
 
-signals:
+Q_SIGNALS:
     void taskCreated(SystemTray::Task *task);
     void notificationCreated(SystemTray::Notification *notification);
 
 protected:
     bool x11Event(XEvent *event);
 
-private slots:
+private Q_SLOTS:
     void initSelection();
     void cleanupTask(WId winId);
 

=== modified file 'panel/applets/legacytray/x11embedcontainer.cpp'
--- panel/applets/legacytray/x11embedcontainer.cpp	2011-03-02 15:06:58 +0000
+++ panel/applets/legacytray/x11embedcontainer.cpp	2011-06-27 13:51:28 +0000
@@ -92,7 +92,7 @@
     Display *display = QX11Info::display();
 
     if (!XGetWindowAttributes(display, clientId, &d->attr)) {
-        emit error(QX11EmbedContainer::Unknown);
+        error(QX11EmbedContainer::Unknown);
         return;
     }
 
@@ -108,7 +108,7 @@
 
     XWindowAttributes attr;
     if (!XGetWindowAttributes(display, winId, &attr)) {
-        emit error(QX11EmbedContainer::Unknown);
+        error(QX11EmbedContainer::Unknown);
         return;
     }
 
@@ -157,7 +157,7 @@
     // if the close happens after this point? Should checks happen on a timer
     // until embedding completes perhaps?
     if (!XGetWindowAttributes(QX11Info::display(), clientId, &d->attr)) {
-        emit error(QX11EmbedContainer::Unknown);
+        error(QX11EmbedContainer::Unknown);
         return;
     }
 }

=== modified file 'panel/applets/legacytray/x11embedcontainer.h'
--- panel/applets/legacytray/x11embedcontainer.h	2010-11-18 14:11:59 +0000
+++ panel/applets/legacytray/x11embedcontainer.h	2011-06-27 13:51:28 +0000
@@ -43,7 +43,7 @@
 protected:
     void paintEvent(QPaintEvent *event);
 
-private slots:
+private Q_SLOTS:
     void ensureValidSize();
 
 private:

=== modified file 'panel/applets/legacytray/x11embedpainter.cpp'
--- panel/applets/legacytray/x11embedpainter.cpp	2010-11-18 14:11:59 +0000
+++ panel/applets/legacytray/x11embedpainter.cpp	2011-06-27 13:51:28 +0000
@@ -108,7 +108,7 @@
 {
     QMultiHash<QWidget*, X11EmbedContainer*> containersByParent;
 
-    foreach (X11EmbedContainer *container, d->containers) {
+    Q_FOREACH (X11EmbedContainer *container, d->containers) {
         QWidget *topWidget = container;
         while (topWidget->parentWidget()) {
             topWidget = topWidget->parentWidget();
@@ -117,13 +117,13 @@
         container->setUpdatesEnabled(false);
     }
 
-    foreach (QWidget *parent, containersByParent.uniqueKeys()) {
+    Q_FOREACH (QWidget *parent, containersByParent.uniqueKeys()) {
         QList<X11EmbedContainer*> containers = containersByParent.values(parent);
         containersByParent.remove(parent);
 
         QRegion paintRegion;
         QHash<X11EmbedContainer *, QRect> containerRects;
-        foreach (X11EmbedContainer *container, containers) {
+        Q_FOREACH (X11EmbedContainer *container, containers) {
             QRect rect = QRect(container->mapTo(parent, QPoint(0, 0)), container->size());
             containerRects.insert(container, rect);
             paintRegion = paintRegion.united(rect);
@@ -132,12 +132,12 @@
         QPixmap background = QPixmap(parent->size());
         parent->render(&background, paintRegion.boundingRect().topLeft(), paintRegion);
 
-        foreach (X11EmbedContainer *container, containers) {
+        Q_FOREACH (X11EmbedContainer *container, containers) {
             container->setBackgroundPixmap(background.copy(containerRects.value(container)));
         }
     }
 
-    foreach (X11EmbedContainer *container, d->containers) {
+    Q_FOREACH (X11EmbedContainer *container, d->containers) {
         container->setUpdatesEnabled(true);
         disconnect(container, SIGNAL(destroyed(QObject*)),
                    this, SLOT(removeContainer(QObject*)));

=== modified file 'panel/applets/legacytray/x11embedpainter.h'
--- panel/applets/legacytray/x11embedpainter.h	2010-11-18 14:11:59 +0000
+++ panel/applets/legacytray/x11embedpainter.h	2011-06-27 13:51:28 +0000
@@ -40,7 +40,7 @@
 
     void updateContainer(X11EmbedContainer *container);
 
-private slots:
+private Q_SLOTS:
     void performUpdates();
     void removeContainer(QObject *container);
 

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-06-22 08:33:52 +0000
+++ places/app/places.cpp	2011-06-27 13:51:28 +0000
@@ -31,7 +31,6 @@
 
 #include <X11/Xlib.h>
 
-#undef signals
 #include <gtk/gtk.h>
 
 // unity-2d