ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 75
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: libindicate-qt
timestamp: Thu 2009-09-10 13:22:49 +0200
message:
  Added a new version of the display() signal.
  
  This one pass the indicator as an argument. Will make code using it cleaner.
modified:
  src/qindicateindicator.cpp
  src/qindicateindicator.h
  tests/indicatortest.cpp
  tests/indicatortest.h


--
lp:libindicate-qt
https://code.launchpad.net/~agateau/libindicate-qt/trunk

Your team ayatana-commits is subscribed to branch lp:libindicate-qt.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/libindicate-qt/trunk/+edit-subscription.

=== modified file 'src/qindicateindicator.cpp'
--- src/qindicateindicator.cpp	2009-09-10 09:44:01 +0000
+++ src/qindicateindicator.cpp	2009-09-10 11:22:49 +0000
@@ -33,6 +33,7 @@
 {
     Indicator* qIndicator = sQIndicatorFromGIndicator[indicator];
     QMetaObject::invokeMethod(qIndicator, "display");
+    QMetaObject::invokeMethod(qIndicator, "display", Q_ARG(QIndicate::Indicator*, qIndicator));
 }
 
 struct IndicatorPrivate

=== modified file 'src/qindicateindicator.h'
--- src/qindicateindicator.h	2009-09-10 09:44:01 +0000
+++ src/qindicateindicator.h	2009-09-10 11:22:49 +0000
@@ -12,6 +12,7 @@
 #define QINDICATEINDICATOR_H
 
 // Qt
+#include <QMetaType>
 #include <QObject>
 
 // Local
@@ -61,6 +62,11 @@
      * indicator this would be when someone clicks on the menu item for the
      * indicator.
      */
+    void display(QIndicate::Indicator*);
+
+    /**
+     * Deprecated, use display(QIndicate::Indicator*) instead
+     */
     void display();
 
 protected:
@@ -72,4 +78,6 @@
 
 } // namespace
 
+Q_DECLARE_METATYPE(QIndicate::Indicator*);
+
 #endif /* QINDICATEINDICATOR_H */

=== modified file 'tests/indicatortest.cpp'
--- tests/indicatortest.cpp	2009-07-24 15:41:16 +0000
+++ tests/indicatortest.cpp	2009-09-10 11:22:49 +0000
@@ -22,6 +22,11 @@
 
 static const QString SERVER_TYPE = "message";
 
+void IndicatorTest::initTestCase()
+{
+    qRegisterMetaType<QIndicate::Indicator*>("QIndicate::Indicator*");
+}
+
 void IndicatorTest::init()
 {
     mServer = QIndicate::Server::defaultInstance();
@@ -82,14 +87,19 @@
 void IndicatorTest::testDisplay()
 {
     QIndicate::IndicatorMessage indicator;
-    QSignalSpy spy(&indicator, SIGNAL(display()));
+    QSignalSpy spy1(&indicator, SIGNAL(display()));
+    QSignalSpy spy2(&indicator, SIGNAL(display(QIndicate::Indicator*)));
 
     indicator.emitDisplay();
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy1.count(), 0);
+    QCOMPARE(spy2.count(), 0);
 
     indicator.show();
     indicator.emitDisplay();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy1.count(), 1);
+    QCOMPARE(spy2.count(), 1);
+    QVariantList args = spy2.takeFirst();
+    QCOMPARE(args[0].value<QIndicate::Indicator*>(), &indicator);
 }
 
 #include "indicatortest.moc"

=== modified file 'tests/indicatortest.h'
--- tests/indicatortest.h	2009-07-24 15:41:16 +0000
+++ tests/indicatortest.h	2009-09-10 11:22:49 +0000
@@ -21,6 +21,7 @@
 {
 Q_OBJECT
 private Q_SLOTS:
+    void initTestCase();
     void init();
     void cleanup();
     void testAddRemove();