Hi, Since it's API change in version, do we have corresponding changes in place for apps/middleware dependant on this? I didn't see any other request to Trunk:handset for such API change
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Kaitlin Rupert > Sent: Tuesday, October 26, 2010 2:43 AM > To: [email protected] > Subject: [meego-commits] 8823: Changes to Trunk:Testing/libsocialweb-qt > > Hi, > I have made the following changes to libsocialweb-qt in project Trunk:Testing. > Please review and accept ASAP. > > Thank You, > Kaitlin Rupert > > [This message was auto-generated] > > --- > > Request #8823: > > submit: devel:qt-mtf/libsocialweb-qt(r15) -> Trunk:Testing/libsocialweb-qt > > > Message: > * Sun Oct 24 2010 James Ausmus <[email protected]> - 0.1.7 > - Remove QPixmap usage in library - enables library use in QCoreApplication > apps - > NOTE: this breaks API/ABI compatibility with previous versions! > - Misc comment/dead code cleanup > > State: new 2010-10-25T11:43:08 krupert > Comment: None > > > > changes files: > -------------- > --- libsocialweb-qt.changes > +++ libsocialweb-qt.changes > @@ -0,0 +1,5 @@ > +* Sun Oct 24 2010 James Ausmus <[email protected]> - 0.1.7 > +- Remove QPixmap usage in library - enables library use in QCoreApplication > apps - > + NOTE: this breaks API/ABI compatibility with previous versions! > +- Misc comment/dead code cleanup > + > > old: > ---- > libsocialweb-qt-0.1.6.tar.bz2 > > new: > ---- > libsocialweb-qt-0.1.7.tar.bz2 > > spec files: > ----------- > --- libsocialweb-qt.spec > +++ libsocialweb-qt.spec > @@ -7,7 +7,7 @@ > > Name: libsocialweb-qt > Summary: Qt4 API for libsocialweb client DBUS interface > -Version: 0.1.6 > +Version: 0.1.7 > Release: 1 > Group: System/Libraries > License: LGPL 2.1 > > other changes: > -------------- > > ++++++ libsocialweb-qt-0.1.6.tar.bz2 -> libsocialweb-qt-0.1.7.tar.bz2 > --- interfaces/lastfm_interface.cpp > +++ interfaces/lastfm_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/lastfm_interface.h:interfaces/lastfm_interface.cpp > interfaces/lastfm.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/lastfm_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebServiceLastfmInterface > - */ > - > -ComMeegoLibsocialwebServiceLastfmInterface::ComMeegoLibsocialwebServi > ceLastfmInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebServiceLastfmInterface::~ComMeegoLibsocialwebSer > viceLastfmInterface() > -{ > -} > - > --- interfaces/lastfm_interface.h > +++ interfaces/lastfm_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/lastfm_interface.h:interfaces/lastfm_interface.cpp > interfaces/lastfm.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef LASTFM_INTERFACE_H_1287534348 > -#define LASTFM_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.Service.Lastfm > - */ > -class ComMeegoLibsocialwebServiceLastfmInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.Service.Lastfm"; } > - > -public: > - ComMeegoLibsocialwebServiceLastfmInterface(const QString &service, > const QString &path, const QDBusConnection &connection, QObject *parent = > 0); > - > - ~ComMeegoLibsocialwebServiceLastfmInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> NowPlaying(const QString &artist, const > QString &album, const QString &track, uint length, uint tracknumber, const > QString &musicbrainz) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(artist) << > qVariantFromValue(album) << qVariantFromValue(track) << > qVariantFromValue(length) << qVariantFromValue(tracknumber) << > qVariantFromValue(musicbrainz); > - return asyncCallWithArgumentList(QLatin1String("NowPlaying"), > argumentList); > - } > - > - inline QDBusPendingReply<> SubmitTrack(const QString &artist, const > QString &album, const QString &track, qlonglong time, const QString &source, > const QString &rating, uint length, uint tracknumber, const QString > &musicbrainz) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(artist) << > qVariantFromValue(album) << qVariantFromValue(track) << > qVariantFromValue(time) << qVariantFromValue(source) << > qVariantFromValue(rating) << qVariantFromValue(length) << > qVariantFromValue(tracknumber) << qVariantFromValue(musicbrainz); > - return asyncCallWithArgumentList(QLatin1String("SubmitTrack"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > -}; > - > -#endif > --- interfaces/patches.old > +++ interfaces/patches.old > +(directory) > --- interfaces/patches.old/sw-avatar.xml-qt.patch > +++ interfaces/patches.old/sw-avatar.xml-qt.patch > +--- interfaces.orig/sw-avatar.xml 2010-08-25 13:38:47.639767295 -0700 > ++++ interfaces/sw-avatar.xml 2010-08-25 13:44:01.858767291 -0700 > +@@ -5,7 +5,7 @@ > + <method name="RequestAvatar" > tp:name-for-bindings="Request_Avatar"/> > + > + <signal name="AvatarRetrieved" > tp:name-for-bindings="Avatar_Retrieved"> > +- <arg name="path" type="s"/> > ++ <arg name="path" type="s" direction="out"/> > + </signal> > + </interface> > + </node> > --- interfaces/patches.old/sw-core.xml-qt.patch > +++ interfaces/patches.old/sw-core.xml-qt.patch > +--- interfaces.orig/sw-core.xml 2010-08-25 13:38:47.641767293 -0700 > ++++ interfaces/sw-core.xml 2010-08-25 13:44:08.897767294 -0700 > +@@ -24,7 +24,7 @@ > + </method> > + > + <signal name="OnlineChanged" > tp:name-for-bindings="Online_Changed"> > +- <arg name="online" type="b"/> > ++ <arg name="online" type="b" direction="out"/> > + </signal> > + > + </interface> > --- interfaces/patches.old/sw-item-view.xml-qt.patch > +++ interfaces/patches.old/sw-item-view.xml-qt.patch > +--- interfaces.orig/sw-item-view.xml 2010-08-25 13:38:47.641767293 -0700 > ++++ interfaces/sw-item-view.xml 2010-08-25 13:44:12.628767293 -0700 > +@@ -10,15 +10,18 @@ > + <method name="Close" tp:name-for-bindings="Close"/> > + > + <signal name="ItemsAdded" tp:name-for-bindings="Items_Added"> > +- <arg name="items" type="a(ssxa{ss})"/> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" > value="ArrayOfSwItemStruct"/> > ++ <arg name="items" type="a(ssxa{ss})" direction="out"/> > + </signal> > + > + <signal name="ItemsRemoved" > tp:name-for-bindings="Items_Removed"> > +- <arg name="items" type="a(ss)"/> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" > value="ArrayOfSwItemId"/> > ++ <arg name="items" type="a(ss)" direction="out"/> > + </signal> > + > + <signal name="ItemsChanged" > tp:name-for-bindings="Items_Changed"> > +- <arg name="items" type="a(ssxa{ss})"/> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" > value="ArrayOfSwItemStruct"/> > ++ <arg name="items" type="a(ssxa{ss})" direction="out"/> > + </signal> > + > + </interface> > --- interfaces/patches.old/sw-photo-upload.xml-qt.patch > +++ interfaces/patches.old/sw-photo-upload.xml-qt.patch > +--- interfaces.orig/sw-photo-upload.xml 2010-08-25 13:38:47.642767292 > -0700 > ++++ interfaces/sw-photo-upload.xml 2010-08-25 13:44:16.171767297 -0700 > +@@ -10,6 +10,7 @@ > + </doc:doc> > + > + <method name="UploadPhoto" tp:name-for-bindings="Upload_Photo"> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" > value="SwParams"/> > + <doc:doc> > + <doc:description> > + <doc:para> > --- interfaces/patches.old/sw-query.xml-qt.patch > +++ interfaces/patches.old/sw-query.xml-qt.patch > +--- interfaces.orig/sw-query.xml 2010-08-25 13:38:47.643767292 -0700 > ++++ interfaces/sw-query.xml 2010-08-25 13:44:19.002767292 -0700 > +@@ -2,6 +2,7 @@ > + <node name="/Query_Iface" > xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>> > + <interface name="com.meego.libsocialweb.Query"> > + <method name="OpenView" tp:name-for-bindings="Open_View"> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" > value="SwParams"/> > + <arg name="query" type="s" direction="in"/> > + <arg name="params" type="a{ss}" direction="in"/> > + <arg name="view" type="o" direction="out"/> > --- interfaces/patches.old/sw-status-update.xml-qt.patch > +++ interfaces/patches.old/sw-status-update.xml-qt.patch > +--- interfaces.orig/sw-status-update.xml 2010-08-25 13:38:47.649767292 > -0700 > ++++ interfaces/sw-status-update.xml 2010-08-25 13:44:26.521767311 -0700 > +@@ -10,6 +10,7 @@ > + </doc:doc> > + > + <method name="UpdateStatus" > tp:name-for-bindings="Update_Status"> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" > value="SwParams"/> > + <doc:doc> > + <doc:description> > + <doc:para> > --- interfaces/patches.old/sw-video-upload.xml-qt.patch > +++ interfaces/patches.old/sw-video-upload.xml-qt.patch > +--- interfaces.orig/sw-video-upload.xml 2010-08-25 13:38:47.642767292 > -0700 > ++++ interfaces/sw-video-upload.xml 2010-08-25 13:44:16.171767297 -0700 > +@@ -10,6 +10,7 @@ > + </doc:doc> > + > + <method name="UploadVideo" tp:name-for-bindings="Upload_Video"> > ++ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" > value="SwParams"/> > + <doc:doc> > + <doc:description> > + <doc:para> > --- interfaces/sw-avatar_interface.cpp > +++ interfaces/sw-avatar_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-avatar_interface.h:interfaces/sw-avatar_interface.cpp > interfaces/sw-avatar.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-avatar_interface.h" > - > -/* > - * Implementation of interface class ComMeegoLibsocialwebAvatarInterface > - */ > - > -ComMeegoLibsocialwebAvatarInterface::ComMeegoLibsocialwebAvatarInterf > ace(const QString &service, const QString &path, const QDBusConnection > &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebAvatarInterface::~ComMeegoLibsocialwebAvatarInte > rface() > -{ > -} > - > --- interfaces/sw-avatar_interface.h > +++ interfaces/sw-avatar_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-avatar_interface.h:interfaces/sw-avatar_interface.cpp > interfaces/sw-avatar.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_AVATAR_INTERFACE_H_1287534348 > -#define SW_AVATAR_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.Avatar > - */ > -class ComMeegoLibsocialwebAvatarInterface: public QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.Avatar"; } > - > -public: > - ComMeegoLibsocialwebAvatarInterface(const QString &service, const > QString &path, const QDBusConnection &connection, QObject *parent = 0); > - > - ~ComMeegoLibsocialwebAvatarInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> RequestAvatar() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("RequestAvatar"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void AvatarRetrieved(const QString &path); > -}; > - > -#endif > --- interfaces/sw-banishable_interface.cpp > +++ interfaces/sw-banishable_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-banishable_interface.h:interfaces/sw-banishable_interface.cpp > interfaces/sw-banishable.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-banishable_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebBanishableInterface > - */ > - > -ComMeegoLibsocialwebBanishableInterface::ComMeegoLibsocialwebBanisha > bleInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebBanishableInterface::~ComMeegoLibsocialwebBanish > ableInterface() > -{ > -} > - > --- interfaces/sw-banishable_interface.h > +++ interfaces/sw-banishable_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-banishable_interface.h:interfaces/sw-banishable_interface.cpp > interfaces/sw-banishable.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_BANISHABLE_INTERFACE_H_1287534348 > -#define SW_BANISHABLE_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.Banishable > - */ > -class ComMeegoLibsocialwebBanishableInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.Banishable"; } > - > -public: > - ComMeegoLibsocialwebBanishableInterface(const QString &service, > const QString &path, const QDBusConnection &connection, QObject *parent = > 0); > - > - ~ComMeegoLibsocialwebBanishableInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> HideItem(const QString &uid) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(uid); > - return asyncCallWithArgumentList(QLatin1String("HideItem"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void ItemHidden(const QString &uid); > -}; > - > -#endif > --- interfaces/sw-core_interface.cpp > +++ interfaces/sw-core_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-core_interface.h:interfaces/sw-core_interface.cpp > interfaces/sw-core.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-core_interface.h" > - > -/* > - * Implementation of interface class ComMeegoLibsocialwebInterface > - */ > - > -ComMeegoLibsocialwebInterface::ComMeegoLibsocialwebInterface(const > QString &service, const QString &path, const QDBusConnection &connection, > QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebInterface::~ComMeegoLibsocialwebInterface() > -{ > -} > - > --- interfaces/sw-core_interface.h > +++ interfaces/sw-core_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-core_interface.h:interfaces/sw-core_interface.cpp > interfaces/sw-core.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_CORE_INTERFACE_H_1287534348 > -#define SW_CORE_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb > - */ > -class ComMeegoLibsocialwebInterface: public QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb"; } > - > -public: > - ComMeegoLibsocialwebInterface(const QString &service, const QString > &path, const QDBusConnection &connection, QObject *parent = 0); > - > - ~ComMeegoLibsocialwebInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<QStringList> GetServices() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("GetServices"), > argumentList); > - } > - > - inline QDBusPendingReply<bool> IsOnline() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("IsOnline"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void OnlineChanged(bool online); > -}; > - > -#endif > --- interfaces/sw-item-view_interface.cpp > +++ interfaces/sw-item-view_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-item-view_interface.h:interfaces/sw-item-view_interface.cpp > interfaces/sw-item-view.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-item-view_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebItemViewInterface > - */ > - > -ComMeegoLibsocialwebItemViewInterface::ComMeegoLibsocialwebItemVie > wInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebItemViewInterface::~ComMeegoLibsocialwebItemVie > wInterface() > -{ > -} > - > --- interfaces/sw-item-view_interface.h > +++ interfaces/sw-item-view_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-item-view_interface.h:interfaces/sw-item-view_interface.cpp > interfaces/sw-item-view.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_ITEM_VIEW_INTERFACE_H_1287534348 > -#define SW_ITEM_VIEW_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.ItemView > - */ > -class ComMeegoLibsocialwebItemViewInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.ItemView"; } > - > -public: > - ComMeegoLibsocialwebItemViewInterface(const QString &service, const > QString &path, const QDBusConnection &connection, QObject *parent = 0); > - > - ~ComMeegoLibsocialwebItemViewInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> Close() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("Close"), > argumentList); > - } > - > - inline QDBusPendingReply<> Refresh() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("Refresh"), > argumentList); > - } > - > - inline QDBusPendingReply<> Start() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("Start"), > argumentList); > - } > - > - inline QDBusPendingReply<> Stop() > - { > - QList<QVariant> argumentList; > - return asyncCallWithArgumentList(QLatin1String("Stop"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void ItemsAdded(const ArrayOfSwItemStruct &items); > - void ItemsChanged(const ArrayOfSwItemStruct &items); > - void ItemsRemoved(const ArrayOfSwItemId &items); > -}; > - > -#endif > --- interfaces/sw-photo-upload_interface.cpp > +++ interfaces/sw-photo-upload_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-photo-upload_interface.h:interfaces/sw-photo-upload_interface. > cpp interfaces/sw-photo-upload.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-photo-upload_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebPhotoUploadInterface > - */ > - > -ComMeegoLibsocialwebPhotoUploadInterface::ComMeegoLibsocialwebPhoto > UploadInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebPhotoUploadInterface::~ComMeegoLibsocialwebPhot > oUploadInterface() > -{ > -} > - > --- interfaces/sw-photo-upload_interface.h > +++ interfaces/sw-photo-upload_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-photo-upload_interface.h:interfaces/sw-photo-upload_interface. > cpp interfaces/sw-photo-upload.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_PHOTO_UPLOAD_INTERFACE_H_1287534348 > -#define SW_PHOTO_UPLOAD_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.PhotoUpload > - */ > -class ComMeegoLibsocialwebPhotoUploadInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.PhotoUpload"; } > - > -public: > - ComMeegoLibsocialwebPhotoUploadInterface(const QString &service, > const QString &path, const QDBusConnection &connection, QObject *parent = > 0); > - > - ~ComMeegoLibsocialwebPhotoUploadInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<int> UploadPhoto(const QString > &local_filename, SwParams fields) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(local_filename) << > qVariantFromValue(fields); > - return asyncCallWithArgumentList(QLatin1String("UploadPhoto"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void PhotoUploadProgress(int opid, int progress, const QString > &error_message); > -}; > - > -#endif > --- interfaces/sw-query_interface.cpp > +++ interfaces/sw-query_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-query_interface.h:interfaces/sw-query_interface.cpp > interfaces/sw-query.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-query_interface.h" > - > -/* > - * Implementation of interface class ComMeegoLibsocialwebQueryInterface > - */ > - > -ComMeegoLibsocialwebQueryInterface::ComMeegoLibsocialwebQueryInterfa > ce(const QString &service, const QString &path, const QDBusConnection > &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebQueryInterface::~ComMeegoLibsocialwebQueryInterf > ace() > -{ > -} > - > --- interfaces/sw-query_interface.h > +++ interfaces/sw-query_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-query_interface.h:interfaces/sw-query_interface.cpp > interfaces/sw-query.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_QUERY_INTERFACE_H_1287534348 > -#define SW_QUERY_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.Query > - */ > -class ComMeegoLibsocialwebQueryInterface: public QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.Query"; } > - > -public: > - ComMeegoLibsocialwebQueryInterface(const QString &service, const > QString &path, const QDBusConnection &connection, QObject *parent = 0); > - > - ~ComMeegoLibsocialwebQueryInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<QDBusObjectPath> OpenView(const QString > &query, SwParams params) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(query) << > qVariantFromValue(params); > - return asyncCallWithArgumentList(QLatin1String("OpenView"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > -}; > - > -#endif > --- interfaces/sw-service_interface.cpp > +++ interfaces/sw-service_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-service_interface.h:interfaces/sw-service_interface.cpp > interfaces/sw-service.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-service_interface.h" > - > -/* > - * Implementation of interface class ComMeegoLibsocialwebServiceInterface > - */ > - > -ComMeegoLibsocialwebServiceInterface::ComMeegoLibsocialwebServiceInter > face(const QString &service, const QString &path, const QDBusConnection > &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebServiceInterface::~ComMeegoLibsocialwebServiceInt > erface() > -{ > -} > - > --- interfaces/sw-service_interface.h > +++ interfaces/sw-service_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-service_interface.h:interfaces/sw-service_interface.cpp > interfaces/sw-service.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_SERVICE_INTERFACE_H_1287534348 > -#define SW_SERVICE_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.Service > - */ > -class ComMeegoLibsocialwebServiceInterface: public QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.Service"; } > - > -public: > - ComMeegoLibsocialwebServiceInterface(const QString &service, const > QString &path, const QDBusConnection &connection, QObject *parent = 0); > - > - ~ComMeegoLibsocialwebServiceInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> CredentialsUpdated() > - { > - QList<QVariant> argumentList; > - return > asyncCallWithArgumentList(QLatin1String("CredentialsUpdated"), > argumentList); > - } > - > - inline QDBusPendingReply<QStringList> GetDynamicCapabilities() > - { > - QList<QVariant> argumentList; > - return > asyncCallWithArgumentList(QLatin1String("GetDynamicCapabilities"), > argumentList); > - } > - > - inline QDBusPendingReply<QStringList> GetStaticCapabilities() > - { > - QList<QVariant> argumentList; > - return > asyncCallWithArgumentList(QLatin1String("GetStaticCapabilities"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void CapabilitiesChanged(const QStringList &caps); > - void UserChanged(); > -}; > - > -#endif > --- interfaces/sw-status-update_interface.cpp > +++ interfaces/sw-status-update_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-status-update_interface.h:interfaces/sw-status-update_interfac > e.cpp interfaces/sw-status-update.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-status-update_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebStatusUpdateInterface > - */ > - > -ComMeegoLibsocialwebStatusUpdateInterface::ComMeegoLibsocialwebStatu > sUpdateInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebStatusUpdateInterface::~ComMeegoLibsocialwebStat > usUpdateInterface() > -{ > -} > - > --- interfaces/sw-status-update_interface.h > +++ interfaces/sw-status-update_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-status-update_interface.h:interfaces/sw-status-update_interfac > e.cpp interfaces/sw-status-update.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_STATUS_UPDATE_INTERFACE_H_1287534348 > -#define SW_STATUS_UPDATE_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.StatusUpdate > - */ > -class ComMeegoLibsocialwebStatusUpdateInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.StatusUpdate"; } > - > -public: > - ComMeegoLibsocialwebStatusUpdateInterface(const QString &service, > const QString &path, const QDBusConnection &connection, QObject *parent = > 0); > - > - ~ComMeegoLibsocialwebStatusUpdateInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<> UpdateStatus(const QString > &status_message, SwParams fields) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(status_message) << > qVariantFromValue(fields); > - return asyncCallWithArgumentList(QLatin1String("UpdateStatus"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void StatusUpdated(bool success); > -}; > - > -#endif > --- interfaces/sw-video-upload_interface.cpp > +++ interfaces/sw-video-upload_interface.cpp > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-video-upload_interface.h:interfaces/sw-video-upload_interface.c > pp interfaces/sw-video-upload.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * This file may have been hand-edited. Look for HAND-EDIT comments > - * before re-generating it. > - */ > - > -#include "interfaces/sw-video-upload_interface.h" > - > -/* > - * Implementation of interface class > ComMeegoLibsocialwebVideoUploadInterface > - */ > - > -ComMeegoLibsocialwebVideoUploadInterface::ComMeegoLibsocialwebVideo > UploadInterface(const QString &service, const QString &path, const > QDBusConnection &connection, QObject *parent) > - : QDBusAbstractInterface(service, path, staticInterfaceName(), > connection, parent) > -{ > -} > - > -ComMeegoLibsocialwebVideoUploadInterface::~ComMeegoLibsocialwebVide > oUploadInterface() > -{ > -} > - > --- interfaces/sw-video-upload_interface.h > +++ interfaces/sw-video-upload_interface.h > -/* > - * This file was generated by qdbusxml2cpp version 0.7 > - * Command line was: qdbusxml2cpp -N -i swclientdbustypes.h -p > interfaces/sw-video-upload_interface.h:interfaces/sw-video-upload_interface.c > pp interfaces/sw-video-upload.xml > - * > - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its > subsidiary(-ies). > - * > - * This is an auto-generated file. > - * Do not edit! All changes made to it will be lost. > - */ > - > -#ifndef SW_VIDEO_UPLOAD_INTERFACE_H_1287534348 > -#define SW_VIDEO_UPLOAD_INTERFACE_H_1287534348 > - > -#include <QtCore/QObject> > -#include <QtCore/QByteArray> > -#include <QtCore/QList> > -#include <QtCore/QMap> > -#include <QtCore/QString> > -#include <QtCore/QStringList> > -#include <QtCore/QVariant> > -#include <QtDBus/QtDBus> > -#include "swclientdbustypes.h" > - > -/* > - * Proxy class for interface com.meego.libsocialweb.VideoUpload > - */ > -class ComMeegoLibsocialwebVideoUploadInterface: public > QDBusAbstractInterface > -{ > - Q_OBJECT > -public: > - static inline const char *staticInterfaceName() > - { return "com.meego.libsocialweb.VideoUpload"; } > - > -public: > - ComMeegoLibsocialwebVideoUploadInterface(const QString &service, > const QString &path, const QDBusConnection &connection, QObject *parent = > 0); > - > - ~ComMeegoLibsocialwebVideoUploadInterface(); > - > -public Q_SLOTS: // METHODS > - inline QDBusPendingReply<int> UploadVideo(const QString > &local_filename, SwParams fields) > - { > - QList<QVariant> argumentList; > - argumentList << qVariantFromValue(local_filename) << > qVariantFromValue(fields); > - return asyncCallWithArgumentList(QLatin1String("UploadVideo"), > argumentList); > - } > - > -Q_SIGNALS: // SIGNALS > - void VideoUploadProgress(int opid, int progress, const QString > &error_message); > -}; > - > -#endif > --- libsocialweb-qt.pc > +++ libsocialweb-qt.pc > @@ -5,7 +5,7 @@ > > Name: libsocialweb-qt > Description: Qt Client side library for libsocialweb > -Version: 0.1.6 > +Version: 0.1.7 > Libs: -L${libdir} -lsocialweb-qt > Cflags: -I${includedir} > Requires: QtDBus glib-2.0 libsocialweb-keystore rest-0.7 rest-extras-0.7 > gnome-keyring-1 > --- libsocialweb-qt.pro > +++ libsocialweb-qt.pro > @@ -1,4 +1,4 @@ > -VERSION = 0.1.6 > +VERSION = 0.1.7 > unix { > PREFIX = /usr > LIBDIR = $$PREFIX/lib > --- libsocialweb-qt.pro.user.2.1pre1 > +++ libsocialweb-qt.pro.user.2.1pre1 > -<!DOCTYPE QtCreatorProject> > -<qtcreator> > - <data> > - <variable>ProjectExplorer.Project.ActiveTarget</variable> > - <value type="int">0</value> > - </data> > - <data> > - <variable>ProjectExplorer.Project.EditorSettings</variable> > - <valuemap type="QVariantMap"> > - <value key="EditorConfiguration.Codec" > type="QByteArray">System</value> > - </valuemap> > - </data> > - <data> > - <variable>ProjectExplorer.Project.Target.0</variable> > - <valuemap type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Desktop</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.Target.DesktopTarget</value> > - <value key="ProjectExplorer.Target.ActiveBuildConfiguration" > type="int">0</value> > - <value key="ProjectExplorer.Target.ActiveRunConfiguration" > type="int">0</value> > - <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" > type="QVariantMap"> > - <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">qmake</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">QtProjectManager.QMakeBuildStep</value> > - <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" > type="QVariantList"/> > - </valuemap> > - <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Make</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.MakeStep</value> > - <value key="Qt4ProjectManager.MakeStep.Clean" > type="bool">false</value> > - <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" > type="QVariantList"/> > - <value key="Qt4ProjectManager.MakeStep.MakeCommand" > type="QString"></value> > - </valuemap> > - <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" > type="int">2</value> > - <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Make</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.MakeStep</value> > - <value key="Qt4ProjectManager.MakeStep.Clean" > type="bool">true</value> > - <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" > type="QVariantList"> > - <value type="QString">clean</value> > - </valuelist> > - <value key="Qt4ProjectManager.MakeStep.MakeCommand" > type="QString"></value> > - </valuemap> > - <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" > type="int">1</value> > - <value > key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" > type="bool">false</value> > - <valuelist > key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" > type="QVariantList"/> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Debug</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> > - <value > key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" > type="int">2</value> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" > type="QString">/home/jausmus/shared/devel/repos/m2/libsocialweb-qt</valu > e> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" > type="int">3</value> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" > type="int">0</value> > - <value > key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" > type="bool">false</value> > - </valuemap> > - <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" > type="QVariantMap"> > - <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">qmake</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">QtProjectManager.QMakeBuildStep</value> > - <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" > type="QVariantList"/> > - </valuemap> > - <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Make</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.MakeStep</value> > - <value key="Qt4ProjectManager.MakeStep.Clean" > type="bool">false</value> > - <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" > type="QVariantList"/> > - <value key="Qt4ProjectManager.MakeStep.MakeCommand" > type="QString"></value> > - </valuemap> > - <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" > type="int">2</value> > - <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" > type="QVariantMap"> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Make</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.MakeStep</value> > - <value key="Qt4ProjectManager.MakeStep.Clean" > type="bool">true</value> > - <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" > type="QVariantList"> > - <value type="QString">clean</value> > - </valuelist> > - <value key="Qt4ProjectManager.MakeStep.MakeCommand" > type="QString"></value> > - </valuemap> > - <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" > type="int">1</value> > - <value > key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" > type="bool">false</value> > - <valuelist > key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" > type="QVariantList"/> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">Release</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value> > - <value > key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" > type="int">0</value> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" > type="QString"></value> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" > type="int">3</value> > - <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" > type="int">0</value> > - <value > key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" > type="bool">false</value> > - </valuemap> > - <value key="ProjectExplorer.Target.BuildConfigurationCount" > type="int">2</value> > - <valuemap key="ProjectExplorer.Target.RunConfiguration.0" > type="QVariantMap"> > - <valuelist > key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" > type="QVariantList"> > - <value type="QString">-output-level</value> > - <value type="QString">debug</value> > - </valuelist> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBa > se" type="int">2</value> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.Executable" > type="QString">/usr/bin/duicontrolpanel</value> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal" > type="bool">false</value> > - <valuelist > key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentCh > anges" type="QVariantList"/> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.UserName" > type="QString">dcp</value> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.UserSetName" > type="bool">true</value> > - <value > key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory" > type="QString">$BUILDDIR</value> > - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" > type="QString">dcp</value> > - <value key="ProjectExplorer.ProjectConfiguration.Id" > type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value> > - </valuemap> > - <value key="ProjectExplorer.Target.RunConfigurationCount" > type="int">1</value> > - </valuemap> > - </data> > - <data> > - <variable>ProjectExplorer.Project.TargetCount</variable> > - <value type="int">1</value> > - </data> > - <data> > - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> > - <value type="int">4</value> > - </data> > -</qtcreator> > --- swclientitem.cpp > +++ swclientitem.cpp > @@ -23,8 +23,6 @@ > #include "swclientitem.h" > #include "swclientservice.h" > > -#include <QPixmap> > - > SwClientItem::SwClientItem(const SwClientService *service, SwItemStruct > item, QObject *parent) : > QObject(parent), > mService(service), > @@ -130,15 +128,6 @@ > return mSwItem.props.value("id", QString()); > } > > -//Returns 0 if we don't have an authoricon key > -QPixmap * SwClientItem::getAuthorIcon() const > -{ > - if (mSwItem.props.contains("authoricon")) > - return new QPixmap(mSwItem.props.value("authoricon")); > - else > - return 0; > -} > - > QString SwClientItem::getAuthorIconPath() const > { > return mSwItem.props.value("authoricon", QString()); > @@ -159,14 +148,6 @@ > return mSwItem.props.value("title", QString()); > } > > -QPixmap * SwClientItem::getThumbnail() const > -{ > - if (mSwItem.props.contains("thumbnail")) > - return new QPixmap(mSwItem.props.value("thumbnail")); > - else > - return 0; > -} > - > QString SwClientItem::getThumbnailPath() const > { > return mSwItem.props.value("thumbnail", QString()); > --- swclientitem.h > +++ swclientitem.h > @@ -57,7 +57,6 @@ > QString getURL() const; > QString getAuthorName() const; > QString getID() const; > - QPixmap * getAuthorIcon() const; > QString getAuthorIconPath() const; > > /* ItemTypeText */ > @@ -65,7 +64,6 @@ > > /* ItemTypePic */ > QString getTitle() const; > - QPixmap * getThumbnail() const; > QString getThumbnailPath() const; > > > --- swclientservice.cpp > +++ swclientservice.cpp > @@ -35,7 +35,6 @@ > #include "interfaces/lastfm_interface.h" > > #include <QFile> > -#include <QPixmap> > > #define SWCLIENTSERVICEPATH > QString("/com/meego/libsocialweb/Service/%1") > > @@ -60,7 +59,7 @@ > mStaticCaps(QStringList()), > mDynCaps(QStringList()), > mServiceName(serviceName), > - mUserAvatar(0), > + mUserAvatarPath(QString()), > //Begin static caps... > mHaveStaticCaps(false), > mHaveDynCaps(false), > @@ -101,20 +100,6 @@ > //can use it for isConfigured() replacement for vimeo for now, > //as vimeo doesn't implement DynCaps as of lsw 0.26.2 > getServiceConfig(); > -/* QDBusPendingCall staticCall = mServiceIf->GetStaticCapabilities(); > - QDBusPendingCallWatcher *staticWatcher = new > QDBusPendingCallWatcher(staticCall, this); > - connect(staticWatcher, > - SIGNAL(finished(QDBusPendingCallWatcher*)), > - this, > - SLOT(onGetStaticCapsFinished(QDBusPendingCallWatcher*))); > - > - QDBusPendingCall dynCall = mServiceIf->GetDynamicCapabilities(); > - QDBusPendingCallWatcher *dynWatcher = new > QDBusPendingCallWatcher(dynCall, this); > - connect(dynWatcher, > - SIGNAL(finished(QDBusPendingCallWatcher*)), > - this, > - SLOT(onGetDynCapsFinished(QDBusPendingCallWatcher*))); > - */ > } > > SwClientServiceConfig * SwClientService::getServiceConfig() > @@ -178,19 +163,13 @@ > return mServiceConfig->getDisplayName(); > } > > -const QPixmap * SwClientService::getUserAvatar() > +const QString SwClientService::getUserAvatarPath() const > { > - if (mUserAvatar) > - return mUserAvatar; > - > - //If we don't have one yet, blindly request it > - //return 0. Since the request is async anyway, > - //the client app should just hook to the AvatarRetrieved > - //signal (which will never come if !hasRequestAvatar > || !canRequestAvatar), > - //and utilize the avatar once it's retrieved > + if (!mUserAvatarPath.isEmpty()) > + return mUserAvatarPath; > > requestAvatar(); > - return 0; > + return QString(); > } > > > @@ -253,7 +232,7 @@ > > bool SwClientService::canRequestAvatar() const > { > - return (mCanRequestAvatarDyn); > + return mCanRequestAvatarDyn; > } > > //Current dynamic status > @@ -385,7 +364,7 @@ > > > //Avatar interface > -bool SwClientService::requestAvatar() > +bool SwClientService::requestAvatar() const > { > if (!credsOK() > || !hasRequestAvatar() > @@ -519,8 +498,7 @@ > > void SwClientService::onAvatarRetrieved(const QString &avatarLocation) > { > - mUserAvatar = new QPixmap(avatarLocation); > - emit AvatarRetrieved(this, new QPixmap(avatarLocation)); > + mUserAvatarPath = avatarLocation; > emit AvatarRetrieved(this, avatarLocation); > } > > --- swclientservice.h > +++ swclientservice.h > @@ -64,7 +64,7 @@ > const QString getServiceName() const; > const QString getDisplayName() const; > > - const QPixmap * getUserAvatar(); > + const QString getUserAvatarPath() const; > > //These tell us if this service has this capability at all > bool hasOpenView() const; > @@ -128,9 +128,9 @@ > //Returns true if we can successfully call the appropriate > //Avatar interface call, returns false otherwise. > //NOTE: The "RequestAvatar" operation is async - we will emit > - //"AvatarRetrieved({QString path, QPixmap *avatar})" signals when > + //the "AvatarRetrieved(QString path)" signal when > //the avatar is actually retrieved > - bool requestAvatar(); > + bool requestAvatar() const; > > //Lastfm interface > //Both of these return true if we can successfully call the appropriate > @@ -170,7 +170,6 @@ > > //Avatar interface signals > void AvatarRetrieved(SwClientService *service, const QString > &avatarPath); > - void AvatarRetrieved(SwClientService *service, QPixmap *avatar); > > public slots: > void onCredentialsUpdated(); > @@ -210,7 +209,7 @@ > QStringList mDynCaps; > > QString mServiceName; > - QPixmap *mUserAvatar; > + QString mUserAvatarPath; > > bool mHaveStaticCaps; > bool mHaveDynCaps; > --- swclientserviceconfig.cpp > +++ swclientserviceconfig.cpp > @@ -69,7 +69,8 @@ > SwClientServiceConfig::SwClientServiceConfig(SwClientService *swService, > QObject *parent) : > QObject(parent), > mSwService(swService), > - mIcon(0), > +// mIcon(0), > + mIconPath(QString()), > mCurGKRID(0), > mAuthType(AuthTypeUnknown), > mValid(false) > @@ -110,7 +111,6 @@ > return; > > mIconPath = ICON_FILE_PATH.arg(mSwService->getServiceName()); > - mIcon = new QPixmap(mIconPath); > > mValid = true; > } > @@ -143,21 +143,9 @@ > return mConfigParams; > } > > -const QPixmap * SwClientServiceConfig::getIcon() const > -{ > - return mIcon; > -} > - > QString SwClientServiceConfig::getIconPath() const > { > - //If mIcon is valid, that means the path is valid > - //and we can return it. Otherwise, return an empty > - //QString, so the client doesn't get the idea that > - //we're giving them a valid path when it isn't. > - if (mIcon) > - return mIconPath; > - else > - return QString(); > + return mIconPath; > } > > const QString SwClientServiceConfig::getDisplayName() const > --- swclientserviceconfig.h > +++ swclientserviceconfig.h > @@ -27,7 +27,6 @@ > #include <QString> > #include <QHash> > #include <QMap> > -#include <QPixmap> > > //For Flickr support > extern "C" { > @@ -59,7 +58,6 @@ > QString getCustomAuthtype() const; > > QHash<QString, QString> getConfigParams() const; > - const QPixmap * getIcon() const; > QString getIconPath() const; > const QString getDisplayName() const; > QString getDescription() const; > @@ -98,7 +96,6 @@ > > SwClientService *mSwService; > QSettings *mSettings; > - QPixmap *mIcon; > QHash<QString, QString> mConfigParams; > QString mCustomAuthType; > > > ++++++ libsocialweb-qt.yaml > --- libsocialweb-qt.yaml > +++ libsocialweb-qt.yaml > @@ -1,6 +1,6 @@ > Name: libsocialweb-qt > Summary: Qt4 API for libsocialweb client DBUS interface > -Version: 0.1.6 > +Version: 0.1.7 > Release: 1 > Group: System/Libraries > License: LGPL 2.1 > > _______________________________________________ > Meego-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
