ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 83
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: libindicate-qt
timestamp: Mon 2009-09-14 09:34:48 +0200
message:
  Removed QTime based methods.
modified:
  examples/qim-client.cpp
  examples/qlisten-and-print.cpp
  src/qindicateindicator.cpp
  src/qindicateindicator.h
  src/qindicatelistener.cpp
  src/qindicatelistener.h
  tests/communicationtest.cpp
  tests/listenertest.cpp
  tests/listenertest.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 'examples/qim-client.cpp'
--- examples/qim-client.cpp	2009-09-11 14:29:05 +0000
+++ examples/qim-client.cpp	2009-09-14 07:34:48 +0000
@@ -9,8 +9,8 @@
  * License: LGPL v2.1 or LGPL v3
  */
 #include <QDebug>
+#include <QDateTime>
 #include <QImage>
-#include <QTime>
 #include <QTimer>
 
 #include <qindicateserver.h>
@@ -46,7 +46,7 @@
     mPos = (mPos + 1) % mUserList.count();
     mIndicator->setProperty("name", mUserList[mPos]);
 
-    mIndicator->setProperty("time", QTime::currentTime());
+    mIndicator->setProperty("time", QDateTime::currentDateTime());
 
     QImage image(SOURCE_DIR "/test.png");
     mIndicator->setProperty("icon", image);

=== modified file 'examples/qlisten-and-print.cpp'
--- examples/qlisten-and-print.cpp	2009-09-11 14:29:05 +0000
+++ examples/qlisten-and-print.cpp	2009-09-14 07:34:48 +0000
@@ -52,7 +52,7 @@
 {
     qDebug() << "Property" << key;
     if (key == "time") {
-        qDebug() << "  " << QIndicate::Listener::timeFromValue(value);
+        qDebug() << "  " << QIndicate::Listener::dateTimeFromValue(value);
     } else if (key == "icon") {
         QImage image = QIndicate::Listener::imageFromValue(value);
         qDebug() << "  size:" << image.size() << "depth:" << image.depth();

=== modified file 'src/qindicateindicator.cpp'
--- src/qindicateindicator.cpp	2009-09-11 15:50:33 +0000
+++ src/qindicateindicator.cpp	2009-09-14 07:34:48 +0000
@@ -14,10 +14,10 @@
 // Qt
 #include <QBuffer>
 #include <QByteArray>
+#include <QDateTime>
 #include <QHash>
 #include <QImage>
 #include <QStringList>
-#include <QTime>
 
 // libindicate
 #include <libindicate/indicator.h>
@@ -83,11 +83,6 @@
     indicate_indicator_set_property_time(INDICATE_INDICATOR(d->mGIndicator), key.toUtf8().data(), &gTime);
 }
 
-void Indicator::setProperty(const QString& key, const QTime& value)
-{
-    setProperty(key, QDateTime(QDate::currentDate(), value));
-}
-
 void Indicator::setProperty(const QString& key, const QImage& image)
 {
     QBuffer buffer;

=== modified file 'src/qindicateindicator.h'
--- src/qindicateindicator.h	2009-09-11 15:50:33 +0000
+++ src/qindicateindicator.h	2009-09-14 07:34:48 +0000
@@ -40,7 +40,6 @@
      * @since 0.2.0
      */
     void setProperty(const QString& key, const QDateTime& value);
-    void setProperty(const QString& key, const QTime& value);
     void setProperty(const QString& key, const QImage& value);
     QString property(const QString& key) const;
 

=== modified file 'src/qindicatelistener.cpp'
--- src/qindicatelistener.cpp	2009-09-11 14:29:05 +0000
+++ src/qindicatelistener.cpp	2009-09-14 07:34:48 +0000
@@ -271,11 +271,6 @@
     return QImage::fromData(data);
 }
 
-QTime Listener::timeFromValue(const QByteArray& value)
-{
-    return dateTimeFromValue(value).time();
-}
-
 QDateTime Listener::dateTimeFromValue(const QByteArray& _value)
 {
     if (_value.isEmpty()) {

=== modified file 'src/qindicatelistener.h'
--- src/qindicatelistener.h	2009-09-11 14:29:05 +0000
+++ src/qindicatelistener.h	2009-09-14 07:34:48 +0000
@@ -100,12 +100,6 @@
 
     /**
      * Converts a value received from getServerType, getServerDesktopFile or
-     * getIndicatorProperty into a localtime QTime
-     */
-    static QTime timeFromValue(const QByteArray& value);
-
-    /**
-     * Converts a value received from getServerType, getServerDesktopFile or
      * getIndicatorProperty into a localtime QDateTime
      *
      * @since 0.2.0

=== modified file 'tests/communicationtest.cpp'
--- tests/communicationtest.cpp	2009-09-11 15:30:23 +0000
+++ tests/communicationtest.cpp	2009-09-14 07:34:48 +0000
@@ -105,7 +105,7 @@
     const QString key2 = "key2";
     const QImage v2(generateTestImage());
     const QString key3 = "key3";
-    const QTime v3 = QTime(23, 45, 56);
+    const QDateTime v3 = QDateTime(QDate::currentDate(), QTime(23, 45, 56));
 
     showIndicatorAndGetProxies();
 
@@ -162,7 +162,7 @@
     QCOMPARE(receiver.server, mListenerServer);
     QCOMPARE(receiver.indicator, mListenerIndicator);
     QCOMPARE(receiver.key, key3);
-    QCOMPARE(QIndicate::Listener::timeFromValue(receiver.value), v3);
+    QCOMPARE(QIndicate::Listener::dateTimeFromValue(receiver.value), v3);
 }
 
 void CommunicationTest::testGetServerDesktop()

=== modified file 'tests/listenertest.cpp'
--- tests/listenertest.cpp	2009-09-11 14:29:05 +0000
+++ tests/listenertest.cpp	2009-09-14 07:34:48 +0000
@@ -77,19 +77,19 @@
     QCOMPARE(removedSpy.count(), 1);
 }
 
-static QTime localTimeFromUtcTime(int hour, int minute, int second, int msec=0)
+static QDateTime localDateTimeFromUtcTime(int hour, int minute, int second, int msec=0)
 {
     QTime utcTime(hour, minute, second, msec);
     QDateTime utcDateTime(QDate(1970, 1, 1), utcTime, Qt::UTC);
-    return utcDateTime.toLocalTime().time();
+    return utcDateTime.toLocalTime();
 }
 
-void ListenerTest::testTimeFromValue()
+void ListenerTest::testDateTimeFromValue()
 {
-    QCOMPARE(QIndicate::Listener::timeFromValue("1970-01-01T23:45:56.001000Z"), localTimeFromUtcTime(23, 45, 56, 1));
-    QCOMPARE(QIndicate::Listener::timeFromValue("1970-01-01T23:45:56Z"), localTimeFromUtcTime(23, 45, 56));
-    QCOMPARE(QIndicate::Listener::timeFromValue("John Doe"), QTime());
-    QCOMPARE(QIndicate::Listener::timeFromValue("1970-01-01T23:45:56.aZ"), QTime());
+    QCOMPARE(QIndicate::Listener::dateTimeFromValue("1970-01-01T23:45:56.001000Z"), localDateTimeFromUtcTime(23, 45, 56, 1));
+    QCOMPARE(QIndicate::Listener::dateTimeFromValue("1970-01-01T23:45:56Z"), localDateTimeFromUtcTime(23, 45, 56));
+    QCOMPARE(QIndicate::Listener::dateTimeFromValue("John Doe"), QDateTime());
+    QCOMPARE(QIndicate::Listener::dateTimeFromValue("1970-01-01T23:45:56.aZ"), QDateTime());
 }
 
 #include "listenertest.moc"

=== modified file 'tests/listenertest.h'
--- tests/listenertest.h	2009-07-28 15:19:33 +0000
+++ tests/listenertest.h	2009-09-14 07:34:48 +0000
@@ -22,7 +22,7 @@
     void initTestCase();
     void testServerAddedRemoved();
     void testIndicatorAddedRemoved();
-    void testTimeFromValue();
+    void testDateTimeFromValue();
 };
 
 #endif /* LISTENERTEST_H */