ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 81
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: libindicate-qt-v2api
timestamp: Fri 2009-09-11 17:30:23 +0200
message:
  Get rid of Indicator::display() signal
modified:
  src/qindicateindicator.cpp
  src/qindicateindicator.h
  tests/communicationtest.cpp
  tests/indicatortest.cpp


--
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 11:22:49 +0000
+++ src/qindicateindicator.cpp	2009-09-11 15:30:23 +0000
@@ -32,7 +32,6 @@
 static void displayCallBack(IndicateIndicator* indicator, gpointer data)
 {
     Indicator* qIndicator = sQIndicatorFromGIndicator[indicator];
-    QMetaObject::invokeMethod(qIndicator, "display");
     QMetaObject::invokeMethod(qIndicator, "display", Q_ARG(QIndicate::Indicator*, qIndicator));
 }
 

=== modified file 'src/qindicateindicator.h'
--- src/qindicateindicator.h	2009-09-10 13:36:30 +0000
+++ src/qindicateindicator.h	2009-09-11 15:30:23 +0000
@@ -69,11 +69,6 @@
      */
     void display(QIndicate::Indicator*);
 
-    /**
-     * Deprecated, use display(QIndicate::Indicator*) instead
-     */
-    void display();
-
 protected:
     Indicator(struct _IndicateIndicator*, QObject* parent);
 

=== modified file 'tests/communicationtest.cpp'
--- tests/communicationtest.cpp	2009-09-11 14:29:05 +0000
+++ tests/communicationtest.cpp	2009-09-11 15:30:23 +0000
@@ -28,6 +28,7 @@
     qRegisterMetaType<QIndicate::Listener::Server*>("QIndicate::Listener::Server*");
     qRegisterMetaType<QIndicate::Listener::Indicator*>("QIndicate::Listener::Indicator*");
     qRegisterMetaType<QIndicate::Interest>("QIndicate::Interest");
+    qRegisterMetaType<QIndicate::Indicator*>("QIndicate::Indicator*");
 }
 
 void CommunicationTest::init()
@@ -208,7 +209,7 @@
 void CommunicationTest::testDisplay()
 {
     QSignalSpy serverDisplaySpy(mServer, SIGNAL(serverDisplay()));
-    QSignalSpy indicatorDisplaySpy(mIndicator, SIGNAL(display()));
+    QSignalSpy indicatorDisplaySpy(mIndicator, SIGNAL(display(QIndicate::Indicator*)));
 
     showIndicatorAndGetProxies();
 

=== modified file 'tests/indicatortest.cpp'
--- tests/indicatortest.cpp	2009-09-11 14:29:05 +0000
+++ tests/indicatortest.cpp	2009-09-11 15:30:23 +0000
@@ -82,18 +82,15 @@
 void IndicatorTest::testDisplay()
 {
     QIndicate::Indicator indicator;
-    QSignalSpy spy1(&indicator, SIGNAL(display()));
-    QSignalSpy spy2(&indicator, SIGNAL(display(QIndicate::Indicator*)));
+    QSignalSpy spy(&indicator, SIGNAL(display(QIndicate::Indicator*)));
 
     indicator.emitDisplay();
-    QCOMPARE(spy1.count(), 0);
-    QCOMPARE(spy2.count(), 0);
+    QCOMPARE(spy.count(), 0);
 
     indicator.show();
     indicator.emitDisplay();
-    QCOMPARE(spy1.count(), 1);
-    QCOMPARE(spy2.count(), 1);
-    QVariantList args = spy2.takeFirst();
+    QCOMPARE(spy.count(), 1);
+    QVariantList args = spy.takeFirst();
     QCOMPARE(args[0].value<QIndicate::Indicator*>(), &indicator);
 }