diff -Nru qutim-0.3.1+201401141535/artwork/icons/qutim-default/scalable/actions/bookmark-new-list.svg qutim-0.3.1+201401141737/artwork/icons/qutim-default/scalable/actions/bookmark-new-list.svg
--- qutim-0.3.1+201401141535/artwork/icons/qutim-default/scalable/actions/bookmark-new-list.svg 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/artwork/icons/qutim-default/scalable/actions/bookmark-new-list.svg 2014-01-14 17:37:49.000000000 +0000
@@ -1,8 +1,8 @@
-
diff -Nru qutim-0.3.1+201401141535/artwork/src/icons/status/dialog-information.svg qutim-0.3.1+201401141737/artwork/src/icons/status/dialog-information.svg
--- qutim-0.3.1+201401141535/artwork/src/icons/status/dialog-information.svg 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/artwork/src/icons/status/dialog-information.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-
-
-
-
diff -Nru qutim-0.3.1+201401141535/artwork/src/icons/status/dialog-warning.svg qutim-0.3.1+201401141737/artwork/src/icons/status/dialog-warning.svg
--- qutim-0.3.1+201401141535/artwork/src/icons/status/dialog-warning.svg 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/artwork/src/icons/status/dialog-warning.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-
-
-
-
diff -Nru qutim-0.3.1+201401141535/core/src/corelayers/adiumchat/lib/chatsessionmodel.h qutim-0.3.1+201401141737/core/src/corelayers/adiumchat/lib/chatsessionmodel.h
--- qutim-0.3.1+201401141535/core/src/corelayers/adiumchat/lib/chatsessionmodel.h 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/core/src/corelayers/adiumchat/lib/chatsessionmodel.h 2014-01-14 17:37:49.000000000 +0000
@@ -32,19 +32,19 @@
enum ContactItemRole
{
- BuddyRole = Qt::UserRole,
- StatusRole,
- ContactsCountRole,
- OnlineContactsCountRole,
- AvatarRole,
- ItemTypeRole
+ BuddyRole = Qt::UserRole,
+ StatusRole,
+ ContactsCountRole,
+ OnlineContactsCountRole,
+ AvatarRole,
+ ItemTypeRole
};
Q_DECLARE_FLAGS(ContactItemRoles,ContactItemRole);
enum ContactItemType
{
- InvalidType = 0,
- TagType = 100,
- ContactType = 101
+ InvalidType = 0,
+ TagType = 100,
+ ContactType = 101
};
namespace Core
@@ -55,40 +55,41 @@
class ChatSessionModel : public QAbstractListModel
{
- Q_OBJECT
+ Q_OBJECT
public:
- explicit ChatSessionModel(ChatSessionImpl *parent = 0);
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- void addContact(qutim_sdk_0_3::Buddy *c);
- void removeContact(qutim_sdk_0_3::Buddy *c);
+ explicit ChatSessionModel(ChatSessionImpl *parent = 0);
+ virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ void addContact(qutim_sdk_0_3::Buddy *c);
+ void removeContact(qutim_sdk_0_3::Buddy *c);
private slots:
- void onNameChanged(const QString &title, const QString &oldTitle);
- void onStatusChanged(const qutim_sdk_0_3::Status &status);
- void onContactDestroyed(QObject *obj);
- void onPriorityChanged(const int &oldPriority, const int &newPriority);
+ void onNameChanged(const QString &title, const QString &oldTitle);
+ void onStatusChanged(const qutim_sdk_0_3::Status &status);
+ void onContactDestroyed(QObject *obj);
+ void onPriorityChanged(const int &oldPriority, const int &newPriority);
private:
- struct Node {
- Node(qutim_sdk_0_3::Buddy *u, const QString &t) : title(t), unit(u) { priority = unit->property("priority").toInt(); }
- Node(qutim_sdk_0_3::Buddy *u) : title(u->title()), unit(u) { priority = unit->property("priority").toInt(); }
- Node(qutim_sdk_0_3::Buddy *u, int p) : title(u->title()), unit(u), priority(p) {}
- Node() : unit(NULL), priority(0) {}
- QString title;
- qutim_sdk_0_3::Buddy *unit;
- int priority;
-
- bool operator <(const Node &o) const
- {
- int cmp = o.priority - priority;
- if (cmp == 0)
- cmp = title.compare(o.title, Qt::CaseInsensitive);
- return cmp < 0 || (cmp == 0 && unit < o.unit);
- }
- };
+ struct Node {
+ Node(qutim_sdk_0_3::Buddy *u, const QString &t) : title(t), unit(u) {}
+ Node(qutim_sdk_0_3::Buddy *u) : title(u->title()), unit(u) {}
+ Node(qutim_sdk_0_3::Buddy *u, const int &p) : title(u->title()), unit(u), priority(p) {}
+ Node() : unit(NULL) {}
+ QString title;
+ qutim_sdk_0_3::Buddy *unit;
+ int priority = unit->property("priority").toInt();
+
+ bool operator <(const Node &o) const
+ {
+ int cmp = o.priority - priority;
+ if (cmp == 0)
+ cmp = title.compare(o.title, Qt::CaseInsensitive);
+ return cmp < 0 || (cmp == 0 && unit < o.unit);
+ }
+ };
- QList m_units;
+ QList m_units;
};
}
}
#endif // CHATSESSIONMODEL_H
+
diff -Nru qutim-0.3.1+201401141535/debian/bzr-builder.manifest qutim-0.3.1+201401141737/debian/bzr-builder.manifest
--- qutim-0.3.1+201401141535/debian/bzr-builder.manifest 2014-01-14 15:35:26.000000000 +0000
+++ qutim-0.3.1+201401141737/debian/bzr-builder.manifest 2014-01-14 17:37:56.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+201401141535-49
-lp:~torkvemada/qutim/qutim-qt4-replica revid:torkvema@gmail.com-20140114153244-px8wzdh0dae9uwyj
+# bzr-builder format 0.3 deb-version {debupstream}+201401141737-49
+lp:~torkvemada/qutim/qutim-qt4-replica revid:torkvema@gmail.com-20140114173104-isu0jvdj6alkoqpb
nest packaging lp:~qutim/+junk/quantal debian revid:torkvema@gmail.com-20130319132521-a7c6vtva13kg1iua
diff -Nru qutim-0.3.1+201401141535/debian/changelog qutim-0.3.1+201401141737/debian/changelog
--- qutim-0.3.1+201401141535/debian/changelog 2014-01-14 15:35:26.000000000 +0000
+++ qutim-0.3.1+201401141737/debian/changelog 2014-01-14 17:37:56.000000000 +0000
@@ -1,8 +1,8 @@
-qutim (0.3.1+201401141535-49~ubuntu13.04.1) raring; urgency=low
+qutim (0.3.1+201401141737-49~ubuntu13.04.1) raring; urgency=low
* Auto build.
- -- QutIM Packagers Team Tue, 14 Jan 2014 15:35:26 +0000
+ -- QutIM Packagers Team Tue, 14 Jan 2014 17:37:56 +0000
qutim (0.3.1-1) precise; urgency=low
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/modules/vreen/core/core.qbs qutim-0.3.1+201401141737/protocols/vkontakte/vreen/modules/vreen/core/core.qbs
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/modules/vreen/core/core.qbs 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/modules/vreen/core/core.qbs 2014-01-14 17:37:49.000000000 +0000
@@ -4,9 +4,14 @@
import qbs.File
Module {
- property string binDestination: project.bin_path
- property string libDestination: project.lib_path
- property string qmlDestination: project.qml_path
+ property string binDestination: 'bin'
+ property string libDestination: {
+ if (qbs.targetOS === 'windows')
+ return "bin";
+ else
+ return "lib";
+ }
+ property string qmlDestination: "bin"
property string versionMajor: 1
property string versionMinor: 8
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audio.cpp qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audio.cpp
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audio.cpp 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audio.cpp 2014-01-14 17:37:49.000000000 +0000
@@ -24,7 +24,6 @@
****************************************************************************/
#include "audio.h"
#include "client.h"
-#include "reply_p.h"
#include "utils_p.h"
#include
#include
@@ -63,24 +62,6 @@
}
return QVariant::fromValue(items);
}
-
- static QVariant handleAudioAlbum(const QVariant &response) {
- AudioAlbumItemList items;
- auto list = response.toList();
-
- if (list.count() && list.first().canConvert())
- list.removeFirst();
-
- foreach (auto item, list) {
- auto map = item.toMap();
- AudioAlbumItem audio;
- audio.setId(map.value("album_id").toInt());
- audio.setOwnerId(map.value("owner_id").toInt());
- audio.setTitle(fromHtmlEntities(map.value("title").toString()));
- items.append(audio);
- }
- return QVariant::fromValue(items);
- }
};
AudioProvider::AudioProvider(Client *client) :
@@ -101,14 +82,12 @@
* \param offset
* \return reply
*/
-AudioItemListReply *AudioProvider::getContactAudio(int uid, int count, int offset, int album_id)
+AudioItemListReply *AudioProvider::getContactAudio(int uid, int count, int offset)
{
Q_D(AudioProvider);
QVariantMap args;
if (uid)
args.insert(uid > 0 ? "uid" : "gid", qAbs(uid));
- if (album_id > 0)
- args.insert("album_id", album_id);
args.insert("count", count);
args.insert("offset", offset);
@@ -141,86 +120,6 @@
return reply;
}
-AudioAlbumItemListReply *AudioProvider::getAlbums(int ownerId, int count, int offset)
-{
- Q_D(AudioProvider);
- QVariantMap args;
- args.insert("owner_id", ownerId);
- args.insert("count", count);
- args.insert("offset", offset);
-
- auto reply = d->client->request("audio.getAlbums", args, AudioProviderPrivate::handleAudioAlbum);
- return reply;
-}
-
-AudioItemListReply *AudioProvider::getRecommendationsForUser(int uid, int count, int offset)
-{
- Q_D(AudioProvider);
- QVariantMap args;
- if (uid < 0) {
- qDebug("Vreen::AudioProvider::getRecomendationForUser may not work with groups (uid < 0)");
-
- }
- args.insert("uid",uid);
- args.insert("count", count);
- args.insert("offset", offset);
-
- auto reply = d->client->request("audio.getRecommendations", args, AudioProviderPrivate::handleAudio);
- return reply;
-}
-
-IntReply *AudioProvider::getCount(int oid)
-{
- Q_D(AudioProvider);
-
- oid = oid?oid:d->client->id();
-
- QVariantMap args;
- args.insert("oid", oid);
-
- auto reply = d->client->request("audio.getCount", args, ReplyPrivate::handleInt);
- return reply;
-}
-
-IntReply *AudioProvider::addToLibrary(int aid, int oid, int gid)
-{
- Q_D(AudioProvider);
-
- QVariantMap args;
- args.insert("aid", aid);
- args.insert("oid", oid);
-
- if (gid) {
- args.insert("gid",gid);
- }
-
- auto reply = d->client->request("audio.add", args, ReplyPrivate::handleInt);
- return reply;
-}
-
-IntReply *AudioProvider::removeFromLibrary(int aid, int oid)
-{
- Q_D(AudioProvider);
-
- QVariantMap args;
- args.insert("aid", aid);
- args.insert("oid", oid);
-
- auto reply = d->client->request("audio.delete", args, ReplyPrivate::handleInt);
- return reply;
-}
-
-AudioItemListReply *AudioProvider::getAudiosByIds(const QString &ids)
-{
- Q_D(AudioProvider);
-
- QVariantMap args;
- args.insert("audios", ids);
-
- auto reply = d->client->request("audio.getById", args, AudioProviderPrivate::handleAudio);
- return reply;
-}
-
class AudioModel;
class AudioModelPrivate
{
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audio.h qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audio.h
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audio.h 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audio.h 2014-01-14 17:37:49.000000000 +0000
@@ -34,7 +34,6 @@
class Client;
typedef ReplyBase AudioItemListReply;
-typedef ReplyBase AudioAlbumItemListReply;
class AudioProviderPrivate;
class VK_SHARED_EXPORT AudioProvider : public QObject
@@ -52,14 +51,8 @@
AudioProvider(Client *client);
virtual ~AudioProvider();
- AudioItemListReply *getContactAudio(int uid = 0, int count = 50, int offset = 0, int album_id = -1);
- AudioItemListReply *getAudiosByIds(const QString& ids);
- AudioItemListReply *getRecommendationsForUser(int uid = 0, int count = 50, int offset = 0);
+ AudioItemListReply *getContactAudio(int uid = 0, int count = 50, int offset = 0);
AudioItemListReply *searchAudio(const QString& query, int count = 50, int offset = 0, bool autoComplete = true, Vreen::AudioProvider::SortOrder sort = SortByPopularity, bool withLyrics = false);
- AudioAlbumItemListReply *getAlbums(int ownerId, int count = 50, int offset = 0);
- IntReply *getCount(int oid = 0);
- IntReply *addToLibrary(int aid, int oid, int gid = 0);
- IntReply *removeFromLibrary(int aid, int oid);
protected:
QScopedPointer d_ptr;
};
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audioitem.cpp qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audioitem.cpp
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audioitem.cpp 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audioitem.cpp 2014-01-14 17:37:49.000000000 +0000
@@ -168,71 +168,5 @@
data->albumId = albumId;
}
-class AudioAlbumItemData : public QSharedData {
-public:
- AudioAlbumItemData() :
- id(0),
- ownerId(0)
- {}
- AudioAlbumItemData(AudioAlbumItemData &o) : QSharedData(),
- id(o.id),
- ownerId(o.ownerId),
- title(o.title)
- {}
- int id;
- int ownerId;
- QString title;
-};
-
-AudioAlbumItem::AudioAlbumItem() : data(new AudioAlbumItemData)
-{
-}
-
-AudioAlbumItem::AudioAlbumItem(const AudioAlbumItem &rhs) : data(rhs.data)
-{
-}
-
-AudioAlbumItem &AudioAlbumItem::operator=(const AudioAlbumItem &rhs)
-{
- if (this != &rhs)
- data.operator=(rhs.data);
- return *this;
-}
-
-AudioAlbumItem::~AudioAlbumItem()
-{
-
-}
-
-int AudioAlbumItem::ownerId() const
-{
- return data->ownerId;
-}
-
-void AudioAlbumItem::setOwnerId(int ownerId)
-{
- data->ownerId = ownerId;
-}
-
-int AudioAlbumItem::id() const
-{
- return data->id;
-}
-
-void AudioAlbumItem::setId(int id)
-{
- data->id = id;
-}
-
-QString AudioAlbumItem::title() const
-{
- return data->title;
-}
-
-void AudioAlbumItem::setTitle(const QString &title)
-{
- data->title = title;
-}
-
} // namespace Vreen
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audioitem.h qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audioitem.h
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api/audioitem.h 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api/audioitem.h 2014-01-14 17:37:49.000000000 +0000
@@ -65,26 +65,6 @@
};
typedef QList AudioItemList;
-class AudioAlbumItemData;
-class VK_SHARED_EXPORT AudioAlbumItem
-{
-public:
- AudioAlbumItem();
- AudioAlbumItem(const AudioAlbumItem &other);
- AudioAlbumItem &operator=(const AudioAlbumItem &other);
- ~AudioAlbumItem();
-
- int id() const;
- void setId(int id);
- int ownerId() const;
- void setOwnerId(int ownerId);
- QString title() const;
- void setTitle(const QString &title);
-private:
- QSharedDataPointer data;
-};
-typedef QList AudioAlbumItemList;
-
template<>
AudioItem Attachment::to(const Attachment &data);
@@ -92,8 +72,6 @@
Q_DECLARE_METATYPE(Vreen::AudioItem)
Q_DECLARE_METATYPE(Vreen::AudioItemList)
-Q_DECLARE_METATYPE(Vreen::AudioAlbumItem)
-Q_DECLARE_METATYPE(Vreen::AudioAlbumItemList)
#endif // VK_AUDIOITEM_H
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api.qbs qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api.qbs
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/api.qbs 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/api.qbs 2014-01-14 17:37:49.000000000 +0000
@@ -3,12 +3,12 @@
Product {
name: "vreen"
- property string versionMajor: project.vreen_version_major
- property string versionMinor: project.vreen_version_minor
- property string versionRelease: project.vreen_version_path
+ property string versionMajor: vreen.core.versionMajor
+ property string versionMinor: vreen.core.versionMinor
+ property string versionRelease: vreen.core.versionRelease
//property string version: versionMajor + '.' + versionMinor + '.' + versionRelease
- destinationDirectory: project.vreen_lib_destination
+ destinationDirectory: vreen.core.libDestination
type: ["dynamiclibrary", "installed_content"]
//cpp.warningLevel: "all"
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/oauth/oauth.qbs qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/oauth/oauth.qbs
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/oauth/oauth.qbs 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/oauth/oauth.qbs 2014-01-14 17:37:49.000000000 +0000
@@ -3,7 +3,7 @@
Product {
type: ["staticlibrary"]
name: "vreenoauth"
- destinationDirectory: project.vreen_lib_path
+ destinationDirectory: "lib"
//cpp.warningLevel: "all"
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/oauth/oauthconnection.cpp qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/oauth/oauthconnection.cpp
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/oauth/oauthconnection.cpp 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/oauth/oauthconnection.cpp 2014-01-14 17:37:49.000000000 +0000
@@ -139,7 +139,7 @@
d->password = password;
}
if (!d->uid || d->accessToken.isNull()
- || (d->expiresIn && d->expiresIn < static_cast(QDateTime::currentDateTime().toTime_t()))) {
+ || (d->expiresIn && d->expiresIn < QDateTime::currentDateTime().toTime_t())) {
d->requestToken();
d->setConnectionState(Client::StateConnecting);
} else
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/qml/qml.qbs qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/qml/qml.qbs
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/src/qml/qml.qbs 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/src/qml/qml.qbs 2014-01-14 17:37:49.000000000 +0000
@@ -7,7 +7,7 @@
property string uri: "Vreen.Base"
property bool system: false
- destinationDirectory: project.vreen_qml_path + "/" + uri.replace(/\./g, "/");
+ destinationDirectory: vreen.core.qmlDestination + "/" + uri.replace(/\./g, "/");
cpp.includePaths: [
"src"
diff -Nru qutim-0.3.1+201401141535/protocols/vkontakte/vreen/vreen.qbs qutim-0.3.1+201401141737/protocols/vkontakte/vreen/vreen.qbs
--- qutim-0.3.1+201401141535/protocols/vkontakte/vreen/vreen.qbs 2014-01-14 15:35:20.000000000 +0000
+++ qutim-0.3.1+201401141737/protocols/vkontakte/vreen/vreen.qbs 2014-01-14 17:37:49.000000000 +0000
@@ -1,21 +1,7 @@
import qbs.base 1.0
Project {
- property string vreen_bin_path: "bin"
- property string vreen_qml_path: "bin"
- property string vreen_lib_path: "lib"
- property string vreen_libexec_path: "lib"
-
- property string vreen_version_major: 1
- property string vreen_version_minor: 9
- property string vreen_version_path: 0
-
- Properties {
- condition: qbs.targetOS.contains("windows")
- vreen_libexec_path: "bin"
- }
-
- moduleSearchPaths: [ "modules" ]
+ moduleSearchPaths: [ "qbs/modules", "modules" ]
references: [
"src/3rdparty/k8json/k8json.qbs",