ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00156
[Branch ~agateau/libindicate-qt/trunk] Rev 79: Started to port to v2 api.
------------------------------------------------------------
revno: 79
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: libindicate-qt-v2api
timestamp: Fri 2009-09-11 16:29:05 +0200
message:
Started to port to v2 api.
removed:
src/qindicateindicatormessage.cpp
src/qindicateindicatormessage.h
modified:
CMakeLists.txt
examples/qim-client.cpp
examples/qlisten-and-print.cpp
examples/qlisten-and-print.h
src/CMakeLists.txt
src/qindicatelistener.cpp
src/qindicatelistener.h
src/qindicateserver.cpp
src/qindicateserver.h
tests/communicationtest.cpp
tests/communicationtest.h
tests/indicatortest.cpp
tests/listenertest.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 'CMakeLists.txt'
--- CMakeLists.txt 2009-09-10 13:38:41 +0000
+++ CMakeLists.txt 2009-09-11 14:29:05 +0000
@@ -1,6 +1,6 @@
project(libindicate_qt)
cmake_minimum_required(VERSION 2.6)
-set(indicate_qt_VERSION 0.2.0)
+set(indicate_qt_VERSION 0.3.0)
# Packaging
set(ARCHIVE_NAME libindicate-qt-${indicate_qt_VERSION})
@@ -8,15 +8,15 @@
COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-set(indicate_qt_lib_SOVERSION 0)
-set(indicate_qt_lib_VERSION ${indicate_qt_lib_SOVERSION}.1.0)
+set(indicate_qt_lib_SOVERSION 1)
+set(indicate_qt_lib_VERSION ${indicate_qt_lib_SOVERSION}.0.0)
find_package(Qt4 REQUIRED)
find_package(PkgConfig REQUIRED)
add_definitions(-Wall)
-pkg_check_modules(INDICATE REQUIRED indicate)
+pkg_check_modules(INDICATE REQUIRED indicate>=0.2.0)
include_directories(
${QT_INCLUDE_DIR}
=== modified file 'examples/qim-client.cpp'
--- examples/qim-client.cpp 2009-07-31 12:44:23 +0000
+++ examples/qim-client.cpp 2009-09-11 14:29:05 +0000
@@ -14,7 +14,7 @@
#include <QTimer>
#include <qindicateserver.h>
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
#include "qim-client.h"
@@ -41,11 +41,10 @@
void Controller::createIndicator()
{
qDebug() << "Creating an indicator";
- mIndicator = new QIndicate::IndicatorMessage(this);
- mIndicator->setProperty("subtype", "im");
+ mIndicator = new QIndicate::Indicator(this);
mPos = (mPos + 1) % mUserList.count();
- mIndicator->setProperty("sender", mUserList[mPos]);
+ mIndicator->setProperty("name", mUserList[mPos]);
mIndicator->setProperty("time", QTime::currentTime());
@@ -67,7 +66,7 @@
}
qDebug() << __FUNCTION__;
- mIndicator->setProperty("sender", mUserList[mPos] + " says 'Boo'");
+ mIndicator->setProperty("name", mUserList[mPos] + " says 'Boo'");
}
void Controller::slotIndicatorDisplay()
=== modified file 'examples/qlisten-and-print.cpp'
--- examples/qlisten-and-print.cpp 2009-07-29 08:14:19 +0000
+++ examples/qlisten-and-print.cpp 2009-09-11 14:29:05 +0000
@@ -24,19 +24,19 @@
qDebug() << __FUNCTION__ << type;
}
-void Controller::slotIndicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type)
-{
- qDebug() << __FUNCTION__ << type;
-}
-
-void Controller::slotIndicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type)
-{
- qDebug() << __FUNCTION__ << type;
-}
-
-void Controller::slotIndicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type, const QString& key)
-{
- qDebug() << __FUNCTION__ << type << key;
+void Controller::slotIndicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator)
+{
+ qDebug() << __FUNCTION__;
+}
+
+void Controller::slotIndicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator)
+{
+ qDebug() << __FUNCTION__;
+}
+
+void Controller::slotIndicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& key)
+{
+ qDebug() << __FUNCTION__ << key;
showProperty(server, indicator, key);
}
@@ -44,7 +44,7 @@
{
mListener->getIndicatorProperty(server, indicator, key,
this,
- SLOT(doShowProperty(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& key, const QByteArray& value))
+ SLOT(doShowProperty(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&, const QByteArray&))
);
}
@@ -71,16 +71,16 @@
controller.mListener = listener;
QObject::connect(
- listener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)),
- &controller, SLOT(slotIndicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&))
- );
- QObject::connect(
- listener, SIGNAL(indicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)),
- &controller, SLOT(slotIndicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&))
- );
- QObject::connect(
- listener, SIGNAL(indicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&, const QString&)),
- &controller, SLOT(slotIndicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&, const QString&))
+ listener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)),
+ &controller, SLOT(slotIndicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*))
+ );
+ QObject::connect(
+ listener, SIGNAL(indicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)),
+ &controller, SLOT(slotIndicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*))
+ );
+ QObject::connect(
+ listener, SIGNAL(indicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)),
+ &controller, SLOT(slotIndicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&))
);
QObject::connect(
=== modified file 'examples/qlisten-and-print.h'
--- examples/qlisten-and-print.h 2009-07-28 13:10:11 +0000
+++ examples/qlisten-and-print.h 2009-09-11 14:29:05 +0000
@@ -23,9 +23,9 @@
void slotServerAdded(QIndicate::Listener::Server* server, const QString& type);
void slotServerRemoved(QIndicate::Listener::Server* server, const QString& type);
- void slotIndicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString&);
- void slotIndicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString&);
- void slotIndicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString&, const QString&);
+ void slotIndicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator);
+ void slotIndicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator);
+ void slotIndicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString&);
void doShowProperty(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& key, const QByteArray& value);
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2009-08-04 15:43:59 +0000
+++ src/CMakeLists.txt 2009-09-11 14:29:05 +0000
@@ -1,7 +1,6 @@
set(indicate_qt_SRCS
qindicateserver.cpp
qindicateindicator.cpp
- qindicateindicatormessage.cpp
qindicatelistener.cpp
)
=== removed file 'src/qindicateindicatormessage.cpp'
--- src/qindicateindicatormessage.cpp 2009-07-24 15:41:16 +0000
+++ src/qindicateindicatormessage.cpp 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Qt wrapper for libindicate
- *
- * Copyright 2009 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>
- *
- * License: LGPL v2.1 or LGPL v3
- */
-// Self
-#include "qindicateindicatormessage.h"
-
-// Qt
-
-// libindicate
-#include <libindicate/indicator-message.h>
-
-// Local
-
-namespace QIndicate
-{
-
-
-struct IndicatorMessagePrivate
-{
-};
-
-IndicatorMessage::IndicatorMessage(QObject* parent)
-: Indicator(INDICATE_INDICATOR(indicate_indicator_message_new()), parent)
-, d(new IndicatorMessagePrivate)
-{
-}
-
-IndicatorMessage::~IndicatorMessage()
-{
- delete d;
-}
-
-} // namespace
-
-#include "qindicateindicatormessage.moc"
=== removed file 'src/qindicateindicatormessage.h'
--- src/qindicateindicatormessage.h 2009-07-24 15:41:16 +0000
+++ src/qindicateindicatormessage.h 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Qt wrapper for libindicate
- *
- * Copyright 2009 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <aurelien.gateau@xxxxxxxxxxxxx>
- *
- * License: LGPL v2.1 or LGPL v3
- */
-#ifndef QINDICATEINDICATORMESSAGE_H
-#define QINDICATEINDICATORMESSAGE_H
-
-// Qt
-
-// Local
-#include <qindicateindicator.h>
-
-namespace QIndicate
-{
-
-struct IndicatorMessagePrivate;
-class IndicatorMessage : public Indicator
-{
-Q_OBJECT
-public:
- IndicatorMessage(QObject* parent=0);
- ~IndicatorMessage();
-
-private:
- IndicatorMessagePrivate* const d;
-};
-
-} // namespace
-
-#endif /* QINDICATEINDICATORMESSAGE_H */
=== modified file 'src/qindicatelistener.cpp'
--- src/qindicatelistener.cpp 2009-09-10 09:44:01 +0000
+++ src/qindicatelistener.cpp 2009-09-11 14:29:05 +0000
@@ -76,35 +76,32 @@
QMetaObject::invokeMethod(listener, "serverRemoved", Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QString, type));
}
-static void indicatorAddedCB(IndicateListener* _listener, void* _server, void* _indicator, gchar* _type)
+static void indicatorAddedCB(IndicateListener* _listener, void* _server, void* _indicator)
{
Listener* listener = sQListenerFromGListener.value(_listener);
- QString type = QString::fromUtf8(_type);
Listener::Server* server = reinterpret_cast<Listener::Server*>(_server);
Listener::Indicator* indicator = reinterpret_cast<Listener::Indicator*>(_indicator);
QMetaObject::invokeMethod(listener, "indicatorAdded",
- Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator), Q_ARG(QString, type));
+ Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator));
}
-static void indicatorRemovedCB(IndicateListener* _listener, void* _server, void* _indicator, gchar* _type)
+static void indicatorRemovedCB(IndicateListener* _listener, void* _server, void* _indicator)
{
Listener* listener = sQListenerFromGListener.value(_listener);
- QString type = QString::fromUtf8(_type);
Listener::Server* server = reinterpret_cast<Listener::Server*>(_server);
Listener::Indicator* indicator = reinterpret_cast<Listener::Indicator*>(_indicator);
QMetaObject::invokeMethod(listener, "indicatorRemoved",
- Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator), Q_ARG(QString, type));
+ Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator));
}
-static void indicatorModifiedCB(IndicateListener* _listener, void* _server, void* _indicator, gchar* _type, gchar* _property)
+static void indicatorModifiedCB(IndicateListener* _listener, void* _server, void* _indicator, gchar* _property)
{
Listener* listener = sQListenerFromGListener.value(_listener);
- QString type = QString::fromUtf8(_type);
Listener::Server* server = reinterpret_cast<Listener::Server*>(_server);
Listener::Indicator* indicator = reinterpret_cast<Listener::Indicator*>(_indicator);
QString property = QString::fromUtf8(_property);
QMetaObject::invokeMethod(listener, "indicatorModified",
- Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator), Q_ARG(QString, type), Q_ARG(QString, property));
+ Q_ARG(QIndicate::Listener::Server*, server), Q_ARG(QIndicate::Listener::Indicator*, indicator), Q_ARG(QString, property));
}
Listener::Listener(QObject* parent)
=== modified file 'src/qindicatelistener.h'
--- src/qindicatelistener.h 2009-09-10 13:36:30 +0000
+++ src/qindicatelistener.h 2009-09-11 14:29:05 +0000
@@ -116,9 +116,9 @@
void serverAdded(QIndicate::Listener::Server* server, const QString& type);
void serverRemoved(QIndicate::Listener::Server* server, const QString& type);
- void indicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type);
- void indicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type, const QString& property);
- void indicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& type);
+ void indicatorAdded(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator);
+ void indicatorModified(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator, const QString& property);
+ void indicatorRemoved(QIndicate::Listener::Server* server, QIndicate::Listener::Indicator* indicator);
private:
Listener(struct _IndicateListener*);
=== modified file 'src/qindicateserver.cpp'
--- src/qindicateserver.cpp 2009-07-24 15:41:16 +0000
+++ src/qindicateserver.cpp 2009-09-11 14:29:05 +0000
@@ -63,18 +63,16 @@
QMetaObject::invokeMethod(qServer, "interestRemoved", Q_ARG(QIndicate::Interest, Interest(interest)));
}
-static void indicatorAddedCB(IndicateServer* server, guint id, gchar* _type)
+static void indicatorAddedCB(IndicateServer* server, guint id)
{
Server* qServer = sQServerFromGServer[server];
- QString type = QString::fromUtf8(_type);
- QMetaObject::invokeMethod(qServer, "indicatorAdded", Q_ARG(uint, id), Q_ARG(QString, type));
+ QMetaObject::invokeMethod(qServer, "indicatorAdded", Q_ARG(uint, id));
}
-static void indicatorRemovedCB(IndicateServer* server, guint id, gchar* _type)
+static void indicatorRemovedCB(IndicateServer* server, guint id)
{
Server* qServer = sQServerFromGServer[server];
- QString type = QString::fromUtf8(_type);
- QMetaObject::invokeMethod(qServer, "indicatorRemoved", Q_ARG(uint, id), Q_ARG(QString, type));
+ QMetaObject::invokeMethod(qServer, "indicatorRemoved", Q_ARG(uint, id));
}
static void indicatorModifiedCB(IndicateServer* server, guint id, gchar* _property)
=== modified file 'src/qindicateserver.h'
--- src/qindicateserver.h 2009-07-24 15:41:16 +0000
+++ src/qindicateserver.h 2009-09-11 14:29:05 +0000
@@ -45,8 +45,8 @@
static Server* defaultInstance();
Q_SIGNALS:
- void indicatorAdded(uint id, const QString& type);
- void indicatorRemoved(uint id, const QString& type);
+ void indicatorAdded(uint id);
+ void indicatorRemoved(uint id);
void indicatorModified(uint id, const QString& property);
/**
=== modified file 'tests/communicationtest.cpp'
--- tests/communicationtest.cpp 2009-07-28 15:19:33 +0000
+++ tests/communicationtest.cpp 2009-09-11 14:29:05 +0000
@@ -37,7 +37,7 @@
mServer = QIndicate::Server::defaultInstance();
mServer->setType(SERVER_TYPE);
- mIndicator = new QIndicate::IndicatorMessage(mServer);
+ mIndicator = new QIndicate::Indicator(mServer);
mListenerServer = 0;
mListenerIndicator = 0;
@@ -45,7 +45,7 @@
void CommunicationTest::showIndicatorAndGetProxies()
{
- QSignalSpy addedSpy(mListener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)));
+ QSignalSpy addedSpy(mListener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)));
mIndicator->show();
QTest::qWait(500);
@@ -71,7 +71,7 @@
const QString v1 = "v1";
const QString v2 = "v2";
- QSignalSpy spy(mListener, SIGNAL(indicatorModified(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&, const QString&)));
+ 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);
@@ -85,8 +85,7 @@
QCOMPARE(spy.count(), 1);
QVariantList args = spy.takeFirst();
- QCOMPARE(args[2].toString(), SERVER_TYPE);
- QCOMPARE(args[3].toString(), key);
+ QCOMPARE(args[2].toString(), key);
}
static QImage generateTestImage()
=== modified file 'tests/communicationtest.h'
--- tests/communicationtest.h 2009-07-28 13:10:11 +0000
+++ tests/communicationtest.h 2009-09-11 14:29:05 +0000
@@ -15,7 +15,7 @@
#include <QObject>
// Local
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
#include <qindicatelistener.h>
#include <qindicateserver.h>
=== modified file 'tests/indicatortest.cpp'
--- tests/indicatortest.cpp 2009-09-10 11:22:49 +0000
+++ tests/indicatortest.cpp 2009-09-11 14:29:05 +0000
@@ -16,7 +16,7 @@
// Local
#include <qindicateserver.h>
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
QTEST_MAIN(IndicatorTest)
@@ -44,41 +44,36 @@
{
QVariantList args;
- QSignalSpy addedSpy(mServer, SIGNAL(indicatorAdded(uint, const QString&)));
- QSignalSpy removedSpy(mServer, SIGNAL(indicatorRemoved(uint, const QString&)));
+ QSignalSpy addedSpy(mServer, SIGNAL(indicatorAdded(uint)));
+ QSignalSpy removedSpy(mServer, SIGNAL(indicatorRemoved(uint)));
- QIndicate::IndicatorMessage indicator;
- indicator.setProperty("subtype", "im");
- indicator.setProperty("sender", "Unittest");
+ QIndicate::Indicator indicator;
+ indicator.setProperty("name", "Unittest");
indicator.show();
QCOMPARE(addedSpy.count(), 1);
args = addedSpy.takeFirst();
QCOMPARE(args[0].toUInt(), indicator.id());
- QCOMPARE(args[1].toString(), SERVER_TYPE);
indicator.hide();
QCOMPARE(removedSpy.count(), 1);
args = removedSpy.takeFirst();
QCOMPARE(args[0].toUInt(), indicator.id());
- QCOMPARE(args[1].toString(), SERVER_TYPE);
}
void IndicatorTest::testProperties()
{
- QIndicate::IndicatorMessage indicator;
+ QIndicate::Indicator indicator;
QString key = "key";
QString value = "value";
indicator.setProperty(key, value);
QCOMPARE(indicator.property(key), value);
- QCOMPARE(indicator.property("type"), QString("message"));
-
QStringList lst = indicator.propertyList();
- QStringList expected = QStringList() << "type" << key;
+ QStringList expected = QStringList() << key;
lst.sort();
expected.sort();
QCOMPARE(lst, expected);
@@ -86,7 +81,7 @@
void IndicatorTest::testDisplay()
{
- QIndicate::IndicatorMessage indicator;
+ QIndicate::Indicator indicator;
QSignalSpy spy1(&indicator, SIGNAL(display()));
QSignalSpy spy2(&indicator, SIGNAL(display(QIndicate::Indicator*)));
=== modified file 'tests/listenertest.cpp'
--- tests/listenertest.cpp 2009-09-10 09:44:01 +0000
+++ tests/listenertest.cpp 2009-09-11 14:29:05 +0000
@@ -16,7 +16,7 @@
#include <QtTest>
// Local
-#include <qindicateindicatormessage.h>
+#include <qindicateindicator.h>
#include <qindicatelistener.h>
#include <qindicateserver.h>
@@ -60,23 +60,21 @@
{
QIndicate::Listener listener;
- QSignalSpy addedSpy(&listener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)));
- QSignalSpy removedSpy(&listener, SIGNAL(indicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*, const QString&)));
+ QSignalSpy addedSpy(&listener, SIGNAL(indicatorAdded(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)));
+ QSignalSpy removedSpy(&listener, SIGNAL(indicatorRemoved(QIndicate::Listener::Server*, QIndicate::Listener::Indicator*)));
QIndicate::Server* server = QIndicate::Server::defaultInstance();
server->setType(SERVER_TYPE);
- QIndicate::Indicator* indicator = new QIndicate::IndicatorMessage(server);
+ QIndicate::Indicator* indicator = new QIndicate::Indicator(server);
indicator->show();
QTest::qWait(500);
QCOMPARE(addedSpy.count(), 1);
- QCOMPARE(addedSpy.takeFirst()[2].toString(), SERVER_TYPE);
indicator->hide();
QTest::qWait(500);
QCOMPARE(removedSpy.count(), 1);
- QCOMPARE(removedSpy.takeFirst()[2].toString(), SERVER_TYPE);
}
static QTime localTimeFromUtcTime(int hour, int minute, int second, int msec=0)
