summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandr Akulich <akulichalexander@gmail.com>2015-09-01 16:47:46 +0600
committerAlexandr Akulich <akulichalexander@gmail.com>2015-09-03 09:18:26 +0500
commitcc809cf8e109b8577a6b2b51e266255cfeed7ea6 (patch)
treec862a032be7540c57a80804bafd9e3c6f597e7e0
parent2ed094ca132cd59f94ee72f207da8afe6bde4e3c (diff)
BaseChannelRoomInterface: Fixed CreationTimestamp property.
For C++ API the property is QDateTime, but for Telepathy DBus API it is qlonglong (Unix_Timestamp64).
-rw-r--r--TelepathyQt/base-channel-internal.h4
-rw-r--r--TelepathyQt/base-channel.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/TelepathyQt/base-channel-internal.h b/TelepathyQt/base-channel-internal.h
index 2344e745..c86e07bc 100644
--- a/TelepathyQt/base-channel-internal.h
+++ b/TelepathyQt/base-channel-internal.h
@@ -358,7 +358,7 @@ class TP_QT_NO_EXPORT BaseChannelRoomInterface::Adaptee : public QObject
Q_PROPERTY(QString server READ server)
Q_PROPERTY(QString creator READ creator)
Q_PROPERTY(uint creatorHandle READ creatorHandle)
- Q_PROPERTY(QDateTime creationTimestamp READ creationTimestamp)
+ Q_PROPERTY(qlonglong creationTimestamp READ creationTimestamp)
public:
Adaptee(BaseChannelRoomInterface *interface);
@@ -368,7 +368,7 @@ public:
QString server() const;
QString creator() const;
uint creatorHandle() const;
- QDateTime creationTimestamp() const;
+ qlonglong creationTimestamp() const;
private:
BaseChannelRoomInterface *mInterface;
diff --git a/TelepathyQt/base-channel.cpp b/TelepathyQt/base-channel.cpp
index c31eff6e..8eb33cf9 100644
--- a/TelepathyQt/base-channel.cpp
+++ b/TelepathyQt/base-channel.cpp
@@ -2605,9 +2605,9 @@ uint BaseChannelRoomInterface::Adaptee::creatorHandle() const
return mInterface->creatorHandle();
}
-QDateTime BaseChannelRoomInterface::Adaptee::creationTimestamp() const
+qlonglong BaseChannelRoomInterface::Adaptee::creationTimestamp() const
{
- return mInterface->creationTimestamp();
+ return mInterface->creationTimestamp().toTime_t();
}
/**