ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 85
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: libindicate-qt
timestamp: Mon 2009-09-14 11:44:41 +0200
message:
  prpoerty(), setProperty() -> indicatorProperty(), setIndicatorProperty()
  
  Avoid hiding QObject methods.
modified:
  examples/qim-client.cpp
  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 'examples/qim-client.cpp'
--- examples/qim-client.cpp	2009-09-14 07:34:48 +0000
+++ examples/qim-client.cpp	2009-09-14 09:44:41 +0000
@@ -44,12 +44,12 @@
     mIndicator = new QIndicate::Indicator(this);
 
     mPos = (mPos + 1) % mUserList.count();
-    mIndicator->setProperty("name", mUserList[mPos]);
+    mIndicator->setIndicatorProperty("name", mUserList[mPos]);
 
-    mIndicator->setProperty("time", QDateTime::currentDateTime());
+    mIndicator->setIndicatorProperty("time", QDateTime::currentDateTime());
 
     QImage image(SOURCE_DIR "/test.png");
-    mIndicator->setProperty("icon", image);
+    mIndicator->setIndicatorProperty("icon", image);
 
     QObject::connect(mIndicator, SIGNAL(display()),
                      SLOT(slotIndicatorDisplay()));
@@ -66,7 +66,7 @@
     }
 
     qDebug() << __FUNCTION__;
-    mIndicator->setProperty("name", mUserList[mPos] + " says 'Boo'");
+    mIndicator->setIndicatorProperty("name", mUserList[mPos] + " says 'Boo'");
 }
 
 void Controller::slotIndicatorDisplay()

=== modified file 'src/qindicateindicator.cpp'
--- src/qindicateindicator.cpp	2009-09-14 07:34:48 +0000
+++ src/qindicateindicator.cpp	2009-09-14 09:44:41 +0000
@@ -68,14 +68,14 @@
     delete d;
 }
 
-void Indicator::setProperty(const QString& key, const QString& value)
+void Indicator::setIndicatorProperty(const QString& key, const QString& value)
 {
     indicate_indicator_set_property(INDICATE_INDICATOR(d->mGIndicator),
         key.toUtf8().data(),
         value.toUtf8().data());
 }
 
-void Indicator::setProperty(const QString& key, const QDateTime& value)
+void Indicator::setIndicatorProperty(const QString& key, const QDateTime& value)
 {
     GTimeVal gTime;
     gTime.tv_sec = value.toTime_t();
@@ -83,7 +83,7 @@
     indicate_indicator_set_property_time(INDICATE_INDICATOR(d->mGIndicator), key.toUtf8().data(), &gTime);
 }
 
-void Indicator::setProperty(const QString& key, const QImage& image)
+void Indicator::setIndicatorProperty(const QString& key, const QImage& image)
 {
     QBuffer buffer;
     buffer.open(QIODevice::WriteOnly);
@@ -95,7 +95,7 @@
         value.data());
 }
 
-QString Indicator::property(const QString& key) const
+QString Indicator::indicatorProperty(const QString& key) const
 {
     const gchar* value = indicate_indicator_get_property(d->mGIndicator, key.toUtf8().data());
     return QString::fromUtf8(value);
@@ -132,22 +132,22 @@
 
 int Indicator::countProperty() const
 {
-    return property("count").toInt();
+    return indicatorProperty("count").toInt();
 }
 
 void Indicator::setCountProperty(int value)
 {
-    setProperty("count", QString::number(value));
+    setIndicatorProperty("count", QString::number(value));
 }
 
 void Indicator::setDrawAttentionProperty(bool value)
 {
-    setProperty("draw_attention", value ? "true" : "false");
+    setIndicatorProperty("draw_attention", value ? "true" : "false");
 }
 
 bool Indicator::drawAttentionProperty() const
 {
-    return property("draw_attention") == "true";
+    return indicatorProperty("draw_attention") == "true";
 }
 
 void Indicator::emitDisplay()

=== modified file 'src/qindicateindicator.h'
--- src/qindicateindicator.h	2009-09-14 07:34:48 +0000
+++ src/qindicateindicator.h	2009-09-14 09:44:41 +0000
@@ -35,13 +35,13 @@
     Indicator(QObject* parent=0);
     ~Indicator();
 
-    void setProperty(const QString& key, const QString& value);
+    void setIndicatorProperty(const QString& key, const QString& value);
     /**
      * @since 0.2.0
      */
-    void setProperty(const QString& key, const QDateTime& value);
-    void setProperty(const QString& key, const QImage& value);
-    QString property(const QString& key) const;
+    void setIndicatorProperty(const QString& key, const QDateTime& value);
+    void setIndicatorProperty(const QString& key, const QImage& value);
+    QString indicatorProperty(const QString& key) const;
 
     /**
      * Convenience method to define count

=== modified file 'tests/communicationtest.cpp'
--- tests/communicationtest.cpp	2009-09-14 09:27:22 +0000
+++ tests/communicationtest.cpp	2009-09-14 09:44:41 +0000
@@ -75,13 +75,13 @@
     QSignalSpy spy(mListener, SIGNAL(indicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)));
 
     // Should not be notified of changes until mIndicator is shown
-    mIndicator->setProperty(key, v1);
+    mIndicator->setIndicatorProperty(key, v1);
     QTest::qWait(500);
     QCOMPARE(spy.count(), 0);
 
     // Now we should get some change
     mIndicator->show();
-    mIndicator->setProperty(key, v2);
+    mIndicator->setIndicatorProperty(key, v2);
     QTest::qWait(500);
 
     QCOMPARE(spy.count(), 1);
@@ -109,9 +109,9 @@
 
     showIndicatorAndGetProxies();
 
-    mIndicator->setProperty(key1, v1);
-    mIndicator->setProperty(key2, v2);
-    mIndicator->setProperty(key3, v3);
+    mIndicator->setIndicatorProperty(key1, v1);
+    mIndicator->setIndicatorProperty(key2, v2);
+    mIndicator->setIndicatorProperty(key3, v3);
     QTest::qWait(500);
 
     PropertyReceiver receiver;

=== modified file 'tests/indicatortest.cpp'
--- tests/indicatortest.cpp	2009-09-11 15:50:33 +0000
+++ tests/indicatortest.cpp	2009-09-14 09:44:41 +0000
@@ -48,7 +48,7 @@
     QSignalSpy removedSpy(mServer, SIGNAL(indicatorRemoved(uint)));
 
     QIndicate::Indicator indicator;
-    indicator.setProperty("name", "Unittest");
+    indicator.setIndicatorProperty("name", "Unittest");
 
     indicator.show();
 
@@ -68,9 +68,9 @@
     QIndicate::Indicator indicator;
     QString key = "key";
     QString value = "value";
-    indicator.setProperty(key, value);
+    indicator.setIndicatorProperty(key, value);
 
-    QCOMPARE(indicator.property(key), value);
+    QCOMPARE(indicator.indicatorProperty(key), value);
 
     QStringList lst = indicator.propertyList();
     QStringList expected = QStringList() << key;
@@ -84,7 +84,7 @@
     QIndicate::Indicator indicator;
     QCOMPARE(indicator.countProperty(), 0);
 
-    indicator.setProperty("count", "1");
+    indicator.setIndicatorProperty("count", "1");
     QCOMPARE(indicator.countProperty(), 1);
 
     indicator.setCountProperty(2);
@@ -96,7 +96,7 @@
     QIndicate::Indicator indicator;
     QVERIFY(!indicator.drawAttentionProperty());
 
-    indicator.setProperty("draw_attention", "true");
+    indicator.setIndicatorProperty("draw_attention", "true");
     QVERIFY(indicator.drawAttentionProperty());
 
     indicator.setDrawAttentionProperty(false);