I have made the following changes intended for : CE:MW:Shared / connman-qt
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5137 Thank You, rojkov [This message was auto-generated] --- Request # 5137: Messages from BOSS: State: review at 2012-06-26T09:20:48 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rojkov:branches:CE:MW:Shared / connman-qt -> CE:MW:Shared / connman-qt changes files: -------------- --- connman-qt.changes +++ connman-qt.changes @@ -0,0 +1,3 @@ +* Fri Jun 15 2012 Dmitry Rozhkov <[email protected]> - 0.1.4 +- initial adaptation for connman 1.1 + old: ---- BMC20075-method-not-updating.patch BMC20803-remove-a-bunch-of-console-spam.patch BMC20805-remove-ClockModel.currentDate-currentTime.patch Makefile connman-qt-0.1.3.tar.bz2 new: ---- connman-qt-0.1.4.tar.bz2 initial-adaptation-for-connman-1.1.patch spec files: ----------- --- connman-qt.spec +++ connman-qt.spec @@ -1,23 +1,23 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.24.1 # + +Name: connman-qt + # >> macros # << macros -Name: connman-qt Summary: qt bindings for connman -Version: 0.1.3 +Version: 0.1.4 Release: 1 Group: System/GUI/Other License: Apache License URL: http://www.meego.com Source0: %{name}-%{version}.tar.bz2 Source100: connman-qt.yaml -Patch0: BMC20075-method-not-updating.patch -Patch1: BMC20803-remove-a-bunch-of-console-spam.patch -Patch2: BMC20805-remove-ClockModel.currentDate-currentTime.patch -Requires: connman-qt-declarative +Patch0: initial-adaptation-for-connman-1.1.patch +Requires: connman >= 1.1 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) >= 4.6.0 @@ -28,12 +28,10 @@ BuildRequires: doxygen BuildRequires: qt-devel-tools - %description This is a library for working with connman using Qt - %package tests Summary: tests for connman-qt Group: Development/Libraries @@ -69,12 +67,8 @@ %prep %setup -q -n %{name}-%{version} -# BMC20075-method-not-updating.patch +# initial-adaptation-for-connman-1.1.patch %patch0 -p1 -# BMC20803-remove-a-bunch-of-console-spam.patch -%patch1 -p1 -# BMC20805-remove-ClockModel.currentDate-currentTime.patch -%patch2 -p1 # >> setup # << setup @@ -90,6 +84,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -101,28 +96,16 @@ # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - - - - - - - %files %defattr(-,root,root,-) %{_libdir}/libconnman-qt4.so.* # >> files # << files - %files tests %defattr(-,root,root,-) %{_usr}/lib/libconnman-qt4/test @@ -144,4 +127,3 @@ %{_usr}/lib/libconnman-qt4.so # >> files devel # << files devel - other changes: -------------- ++++++ connman-qt-0.1.3.tar.bz2 -> connman-qt-0.1.4.tar.bz2 --- libconnman-qt/clockmodel.h +++ libconnman-qt/clockmodel.h @@ -36,19 +36,6 @@ void setDate(QDate date); void setTime(QTime time); - // localized time/date strings - QString currentDate() - { - QLocale locale; - return QDateTime::currentDateTime().date().currentDate().toString(locale.dateFormat(QLocale::LongFormat)); - } - - QString currentTime() - { - QLocale locale; - return QDateTime::currentDateTime().time().currentTime().toString(locale.timeFormat(QLocale::ShortFormat)); - } - // helper function for Timepicker QTime time(QString h, QString m) { return QTime(h.toInt(), m.toInt()); } --- libconnman-qt/libconnman-qt.pro +++ libconnman-qt/libconnman-qt.pro @@ -1,7 +1,7 @@ #-*-Shell-Script-*- TEMPLATE = lib -VERSION=0.1.3 +VERSION=0.1.4 CONFIG += qt \ debug QT += dbus --- libconnman-qt/networkitem.cpp +++ libconnman-qt/networkitem.cpp @@ -485,24 +485,6 @@ emit propertyChanged(name,value.variant()); } - -void NetworkItemModel::timerEvent(QTimerEvent *event) -{ - Q_UNUSED(event); - //qDebug("hello!"); - //setStrength(rand()*100.0/RAND_MAX); -} - -void NetworkItemModel::dump() const -{ - qDebug("%s", STR(dumpToString())); -} - -QString NetworkItemModel::dumpToString() const -{ - return QString("id: %1 name: %2 state: %3 type: %4: path: %5").arg(id).arg(m_name).arg(m_state).arg(type()).arg(m_servicePath); -} - void NetworkItemModel::setPropertyFinished(QDBusPendingCallWatcher *call) { QDBusPendingReply<void> reply = *call; --- libconnman-qt/networkitem.h +++ libconnman-qt/networkitem.h @@ -123,8 +123,6 @@ int id; static int instances; static int idCounter; - void dump() const; - QString dumpToString() const; const QString& servicePath() const; @@ -145,9 +143,6 @@ void typeChanged(QString newType); void strengthChanged(int newStrength); - protected: - void timerEvent(QTimerEvent *event); //hack - private: bool isListEqual(const QStringList &a, const QStringList &b) const; StateType state(const QString &); --- libconnman-qt/networkmanager.cpp +++ libconnman-qt/networkmanager.cpp @@ -40,7 +40,6 @@ m_headerData.append("NetworkItemModel"); m_headerData.append("Type"); connectToConnman(); - startTimer(60000); connect(this,SIGNAL(countChanged(int)),this,SLOT(countChangedSlot(int))); } @@ -69,7 +68,7 @@ void NetworkManager::enableTechnology(const QString &technology) { - qDebug("enabling technology \"%s\"", STR(technology)); + // qDebug("enabling technology \"%s\"", STR(technology)); QDBusReply<void> reply = m_manager->EnableTechnology(technology); if(reply.error().isValid()) { @@ -80,7 +79,7 @@ void NetworkManager::disableTechnology(const QString &technology) { - qDebug("disenabling technology \"%s\"", STR(technology)); + // qDebug("disenabling technology \"%s\"", STR(technology)); m_manager->DisableTechnology(technology); } @@ -238,7 +237,7 @@ foreach (QDBusObjectPath p, services) { - qDebug()<< QString("service path:\t%1").arg(p.path()); + // qDebug()<< QString("service path:\t%1").arg(p.path()); NetworkItemModel *pNIM = new NetworkItemModel(p.path(), this); connect(pNIM,SIGNAL(propertyChanged(QString, QVariant)),this,SLOT(itemPropertyChanged(QString, QVariant))); connect(pNIM,SIGNAL(stateChanged(NetworkItemModel::StateType)), @@ -270,7 +269,7 @@ qDebug("error type: %s", STR(QDBusError::errorString(error.type()))); } else { QDBusObjectPath p = reply.value(); - qDebug("object path: %s", STR(p.path())); + // qDebug("object path: %s", STR(p.path())); } } @@ -387,7 +386,7 @@ qDebug()<<"caught property changed signal for network item not in our list"; return; } - qDebug()<<"Properties changed for "<< m_networks[row]->name(); + // qDebug()<<"Properties changed for "<< m_networks[row]->name(); networkChanged(row); } @@ -448,9 +447,9 @@ (m_propertiesCache[NetworkManager::enablTechs]); const QStringList connectedTechnologies = qdbus_cast<QStringList> (m_propertiesCache[NetworkManager::connTechs]); - qDebug() << availTechs << ": " << m_propertiesCache[NetworkManager::availTechs]; - qDebug() << enablTechs << ": " << m_propertiesCache[NetworkManager::enablTechs]; - qDebug() << connTechs << ": " << m_propertiesCache[NetworkManager::connTechs]; + // qDebug() << availTechs << ": " << m_propertiesCache[NetworkManager::availTechs]; + // qDebug() << enablTechs << ": " << m_propertiesCache[NetworkManager::enablTechs]; + // qDebug() << connTechs << ": " << m_propertiesCache[NetworkManager::connTechs]; emit technologiesChanged(availableTechnologies, enabledTechnologies, connectedTechnologies); @@ -462,15 +461,6 @@ } -void NetworkManager::timerEvent(QTimerEvent *event) -{ - Q_UNUSED(event); -// DCP_CRITICAL("Dumping list of networks"); - foreach(NetworkItemModel* pNIM, m_networks) { - pNIM->dump(); - } -} - void NetworkManager::requestScan() { if (!m_manager) return; --- libconnman-qt/networkmanager.h +++ libconnman-qt/networkmanager.h @@ -90,10 +90,6 @@ void networksRemoved(int from, int to); void networkChanged(int index); -protected: - void timerEvent(QTimerEvent *event); //hack - - private: int findNetworkItemModel(const QDBusObjectPath &path) const; void emitTechnologiesChanged(); ++++++ connman-qt.yaml --- connman-qt.yaml +++ connman-qt.yaml @@ -1,6 +1,6 @@ Name: connman-qt Summary: qt bindings for connman -Version: 0.1.3 +Version: 0.1.4 Release: 1 Group: System/GUI/Other License: Apache License @@ -9,13 +9,11 @@ - "%{name}-%{version}.tar.bz2" Description: | This is a library for working with connman using Qt -Patches: - - "BMC20075-method-not-updating.patch" - - "BMC20803-remove-a-bunch-of-console-spam.patch" - - "BMC20805-remove-ClockModel.currentDate-currentTime.patch" +Patches: + - "initial-adaptation-for-connman-1.1.patch" -Requires: - - connman +Requires: + - connman >= 1.1 PkgBR: - doxygen - qt-devel-tools @@ -27,9 +25,7 @@ - dbus-1 Configure: none Builder: qmake -Requires: - - connman-qt-declarative -Files: +Files: - "%{_libdir}/libconnman-qt4.so.*" SubPackages: - Name: tests ++++++ initial-adaptation-for-connman-1.1.patch (new) --- initial-adaptation-for-connman-1.1.patch +++ initial-adaptation-for-connman-1.1.patch @@ -0,0 +1,3899 @@ +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..5ea1798 +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,3 @@ ++*.swp ++*.o ++moc_*.cpp +diff --git a/README.rst b/README.rst +new file mode 100644 +index 0000000..80cdd18 +--- /dev/null ++++ b/README.rst +@@ -0,0 +1,10 @@ ++Qt bindings for ConnMan ++======================= ++ ++The Qt bindings are dirrect reflection of ConnMan's D-Bus interfaces: ++the class `NetworkManager` represents `net.connman.Manager`, ++`NetworkTechnology` represents `net.connman.Technology` and ++`NetworkService` represents `net.connman.Service`. ++ ++The class `NetworkingModel` is a QML component adapting a static instance of ++`NetworkManager`. Also it provides the D-Bus interface `net.connman.Agent`. +diff --git a/libconnman-qt/commondbustypes.cpp b/libconnman-qt/commondbustypes.cpp +new file mode 100644 +index 0000000..a57568f +--- /dev/null ++++ b/libconnman-qt/commondbustypes.cpp +@@ -0,0 +1,28 @@ ++/* ++ * Copyright © 2010, Intel Corporation. ++ * ++ * This program is licensed under the terms and conditions of the ++ * Apache License, version 2.0. The full text of the Apache License is at ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ */ ++ ++#include "commondbustypes.h" ++ ++// Marshall the ConnmanObject data into a D-Bus argument ++QDBusArgument &operator<<(QDBusArgument &argument, const ConnmanObject &obj) ++{ ++ argument.beginStructure(); ++ argument << obj.objpath << obj.properties; ++ argument.endStructure(); ++ return argument; ++} ++ ++// Retrieve the ConnmanObject data from the D-Bus argument ++const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanObject &obj) ++{ ++ argument.beginStructure(); ++ argument >> obj.objpath >> obj.properties; ++ argument.endStructure(); ++ return argument; ++} +diff --git a/libconnman-qt/commondbustypes.h b/libconnman-qt/commondbustypes.h +index 0322b06..d06544b 100644 +--- a/libconnman-qt/commondbustypes.h ++++ b/libconnman-qt/commondbustypes.h +@@ -1,5 +1,4 @@ +-/* -*- Mode: C++ -*- +- * meegotouchcp-connman - connectivity plugin for duicontrolpanel ++/* + * Copyright © 2010, Intel Corporation. + * + * This program is licensed under the terms and conditions of the +@@ -12,15 +11,32 @@ + #define COMMONDBUSTYPES_H + + #include <QtCore/QMap> ++#include <QtCore/QList> + #include <QtCore/QString> + #include <QtCore/QMetaType> + #include <QtDBus/QtDBus> ++#include <QtDBus/QDBusObjectPath> + + typedef QMap<QString, QString> StringMap; + Q_DECLARE_METATYPE ( StringMap ); + ++// TODO: re-implement with better interface i.e. "const QString path() const" instead of objpath ++struct ConnmanObject { ++ QDBusObjectPath objpath; ++ QVariantMap properties; ++}; ++Q_DECLARE_METATYPE ( ConnmanObject ); ++QDBusArgument &operator<<(QDBusArgument &argument, const ConnmanObject &obj); ++const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanObject &obj); ++ ++typedef QList<ConnmanObject> ConnmanObjectList; ++Q_DECLARE_METATYPE ( ConnmanObjectList ); ++ + inline void registerCommonDataTypes() { +- qDBusRegisterMetaType<StringMap >(); ++ qDBusRegisterMetaType<StringMap>(); ++ qDBusRegisterMetaType<ConnmanObject>(); ++ qDBusRegisterMetaType<ConnmanObjectList>(); ++ qRegisterMetaType<ConnmanObjectList>("ConnmanObjectList"); + } + + #endif //COMMONDBUSTYPES_H +diff --git a/libconnman-qt/connman-manager.xml b/libconnman-qt/connman-manager.xml +index 5c7e60d..bf04796 100644 +--- a/libconnman-qt/connman-manager.xml ++++ b/libconnman-qt/connman-manager.xml +@@ -12,24 +12,40 @@ + <arg name="value" type="v"/> + </method> + +- <method name="RequestScan" tp:name-for-bindings="Request_Scan"> +- <arg name="type" type="s"/> ++ <method name="GetTechnologies" tp:name-for-bindings="Get_Technologies"> ++ <arg name="technologies" type="a(oa{sv})" direction="out"/> ++ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="ConnmanObjectList"/> + </method> + +- <method name="EnableTechnology" tp:name-for-bindings="Enable_Technology"> +- <arg name="type" type="s"/> ++ <method name="GetServices" tp:name-for-bindings="Get_Services"> ++ <arg name="services" type="a(oa{sv})" direction="out"/> ++ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="ConnmanObjectList"/> + </method> + +- <method name="DisableTechnology" tp:name-for-bindings="Disable_Technology"> +- <arg name="type" type="s"/> ++ <method name="RegisterAgent" tp:name-for-bindings="Register_Agent"> ++ <arg name="path" type="o"/> + </method> + +- <method name="ConnectService" tp:name-for-bindings="Connect_Service"> +- <arg name="network" type="a{sv}"/> +- <arg name="service" type="o" direction="out" /> +- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/> ++ <method name="UnregisterAgent" tp:name-for-bindings="Unregister_Agent"> ++ <arg name="path" type="o"/> + </method> + ++ <signal name="TechnologyAdded" tp:name-for-bindings="Technology_Added"> ++ <arg name="technology" type="o"/> ++ <arg name="properties" type="a{sv}"/> ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/> ++ </signal> ++ ++ <signal name="TechnologyRemoved" tp:name-for-bindings="Technology_Removed"> ++ <arg name="technology" type="o"/> ++ </signal> ++ ++ <signal name="ServicesChanged" tp:name-for-bindings="Services_Changed"> ++ <arg name="changed" type="a(oa{sv})"/> ++ <arg name="removed" type="ao"/> ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="ConnmanObjectList"/> ++ </signal> ++ + <signal name="PropertyChanged" tp:name-for-bindings="Property_Changed"> + <arg name="name" type="s"/> + <arg name="value" type="v"/> +diff --git a/libconnman-qt/connman-technology.xml b/libconnman-qt/connman-technology.xml +new file mode 100644 +index 0000000..4b7cbac +--- /dev/null ++++ b/libconnman-qt/connman-technology.xml +@@ -0,0 +1,18 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<node name="/Service" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> ++ <interface name="net.connman.Technology"> ++ ++ <method name="SetProperty" tp:name-for-bindings="Set_Property"> ++ <arg name="name" type="s"/> ++ <arg name="value" type="v"/> ++ </method> ++ ++ <method name="Scan" tp:name-for-bindings="Scan"/> ++ ++ <signal name="PropertyChanged" tp:name-for-bindings="Property_Changed"> ++ <arg name="name" type="s"/> ++ <arg name="value" type="v"/> ++ </signal> ++ ++ </interface> ++</node> +diff --git a/libconnman-qt/debug.h b/libconnman-qt/debug.h +deleted file mode 100644 +index a8d9f0b..0000000 +--- a/libconnman-qt/debug.h ++++ /dev/null +@@ -1,22 +0,0 @@ +-/* -*- Mode: C++ -*- +- * meegotouchcp-connman - connectivity plugin for duicontrolpanel +- * Copyright © 2010, Intel Corporation. +- * +- * This program is licensed under the terms and conditions of the +- * Apache License, version 2.0. The full text of the Apache License is at +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- */ +-#ifndef DEBUG_H (3700 more lines skipped) ++++++ deleted files: --- BMC20075-method-not-updating.patch --- BMC20803-remove-a-bunch-of-console-spam.patch --- BMC20805-remove-ClockModel.currentDate-currentTime.patch --- Makefile
