[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=1ac2ab5
The following commit has been merged in the master branch:
commit 1ac2ab55ff2d7523a887e5ad673d8f6143882bfb
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Dec 15 17:10:49 2014 +0100
Port away from Qt4 deprecated API
Reviewed by David Edmundson
---
KTp/Declarative/conversations-model.cpp | 10 +++++++---
KTp/Declarative/conversations-model.h | 5 +++--
KTp/Declarative/messages-model.cpp | 25 ++++++++++++++-----------
KTp/Declarative/messages-model.h | 5 +++--
KTp/Declarative/pinned-contacts-model.cpp | 19 +++++++++++--------
KTp/Declarative/pinned-contacts-model.h | 5 +++--
KTp/Models/abstract-grouping-proxy-model.cpp | 5 ++++-
KTp/Models/abstract-grouping-proxy-model.h | 2 ++
KTp/Models/accounts-list-model.cpp | 19 +++++++++++--------
KTp/Models/accounts-list-model.h | 1 +
KTp/Models/contacts-model.cpp | 24 +++++-------------------
KTp/Models/contacts-model.h | 5 +----
KTp/Models/kpeopletranslationproxy.cpp | 4 ++--
KTp/Widgets/join-chat-room-dialog.cpp | 12 ++++++------
KTp/contact.cpp | 6 +++---
KTp/message-escape-filter.cpp | 4 ++--
16 files changed, 78 insertions(+), 73 deletions(-)
diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index b824878..544b175 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -44,9 +44,6 @@ ConversationsModel::ConversationsModel(QObject *parent) :
Tp::AbstractClientHandler(channelClassList()),
d(new ConversationsModelPrivate)
{
- QHash<int, QByteArray> roles;
- roles[ConversationRole] = "conversation";
- setRoleNames(roles);
d->activeChatIndex = -1;
connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalUnreadCountChanged()));
connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalUnreadCountChanged()));
@@ -58,6 +55,13 @@ ConversationsModel::~ConversationsModel()
delete d;
}
+QHash<int, QByteArray> ConversationsModel::roleNames() const
+{
+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+ roles[ConversationRole] = "conversation";
+ return roles;
+}
+
QVariant ConversationsModel::data(const QModelIndex &index, int role) const
{
QVariant result;
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index 3756dde..06e3b59 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -37,8 +37,9 @@ class ConversationsModel : public QAbstractListModel, public Tp::AbstractClientH
explicit ConversationsModel(QObject *parent=0);
virtual ~ConversationsModel();
- virtual QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const;
- virtual int rowCount ( const QModelIndex &parent = QModelIndex() ) const;
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+ virtual QVariant data ( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
+ virtual int rowCount ( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
/** @returns the sum of all unread messages among all conversations */
int totalUnreadCount() const;
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 8810a34..61cae16 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -69,17 +69,6 @@ MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
{
qCDebug(KTP_DECLARATIVE);
- QHash<int, QByteArray> roles;
- roles[TextRole] = "text";
- roles[TimeRole] = "time";
- roles[TypeRole] = "type";
- roles[SenderIdRole] = "senderId";
- roles[SenderAliasRole] = "senderAlias";
- roles[SenderAvatarRole] = "senderAvatar";
- roles[DeliveryStatusRole] = "deliveryStatus";
- roles[DeliveryReportReceiveTimeRole] = "deliveryReportReceiveTime";
- setRoleNames(roles);
-
d->account = account;
d->visible = false;
@@ -93,6 +82,20 @@ MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
d->logManager->setScrollbackLength(tabConfig.readEntry<int>("scrollbackLength", 10));
}
+QHash<int, QByteArray> MessagesModel::roleNames() const
+{
+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+ roles[TextRole] = "text";
+ roles[TimeRole] = "time";
+ roles[TypeRole] = "type";
+ roles[SenderIdRole] = "senderId";
+ roles[SenderAliasRole] = "senderAlias";
+ roles[SenderAvatarRole] = "senderAvatar";
+ roles[DeliveryStatusRole] = "deliveryStatus";
+ roles[DeliveryReportReceiveTimeRole] = "deliveryReportReceiveTime";
+ return roles;
+}
+
Tp::TextChannelPtr MessagesModel::textChannel() const
{
return d->textChannel;
diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index b7ee113..5782b98 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -65,8 +65,9 @@ class MessagesModel : public QAbstractListModel
DeliveryStatusFailed
};
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+ virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
Tp::TextChannelPtr textChannel() const;
void setTextChannel(const Tp::TextChannelPtr &channel);
diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index 4914328..f32c4bc 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -60,14 +60,6 @@ PinnedContactsModel::PinnedContactsModel(QObject *parent)
: QAbstractListModel(parent)
, d(new PinnedContactsModelPrivate)
{
- QHash<int, QByteArray> roles = roleNames();
- roles[PresenceIconRole] = "presenceIcon";
- roles[AvailabilityRole] = "available";
- roles[ContactRole] = "contact";
- roles[AccountRole] = "account";
- roles[AlreadyChattingRole] = "alreadyChatting";
- setRoleNames(roles);
-
connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
}
@@ -77,6 +69,17 @@ PinnedContactsModel::~PinnedContactsModel()
delete d;
}
+QHash<int, QByteArray> PinnedContactsModel::roleNames() const
+{
+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+ roles[PresenceIconRole] = "presenceIcon";
+ roles[AvailabilityRole] = "available";
+ roles[ContactRole] = "contact";
+ roles[AccountRole] = "account";
+ roles[AlreadyChattingRole] = "alreadyChatting";
+ return roles;
+}
+
QStringList PinnedContactsModel::state() const
{
return d->pinsToString();
diff --git a/KTp/Declarative/pinned-contacts-model.h b/KTp/Declarative/pinned-contacts-model.h
index 01fabbb..f9fca7a 100644
--- a/KTp/Declarative/pinned-contacts-model.h
+++ b/KTp/Declarative/pinned-contacts-model.h
@@ -49,8 +49,9 @@ class PinnedContactsModel : public QAbstractListModel
AlreadyChattingRole
};
- virtual QVariant data(const QModelIndex &index, int role) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+ virtual QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+ virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
Q_SLOT void setPinning(const Tp::AccountPtr &account, const KTp::ContactPtr &contact, bool newState);
diff --git a/KTp/Models/abstract-grouping-proxy-model.cpp b/KTp/Models/abstract-grouping-proxy-model.cpp
index fea3c4f..7a941e7 100644
--- a/KTp/Models/abstract-grouping-proxy-model.cpp
+++ b/KTp/Models/abstract-grouping-proxy-model.cpp
@@ -132,7 +132,6 @@ KTp::AbstractGroupingProxyModel::AbstractGroupingProxyModel(QAbstractItemModel *
d(new KTp::AbstractGroupingProxyModel::Private())
{
d->source = source;
- setRoleNames(source->roleNames());
//we have to process all existing rows in the model, but must never call a virtual method from a constructor as it will crash.
//we use a single shot timer to get round this
@@ -144,6 +143,10 @@ KTp::AbstractGroupingProxyModel::~AbstractGroupingProxyModel()
delete d;
}
+QHash<int, QByteArray> KTp::AbstractGroupingProxyModel::roleNames() const
+{
+ return d->source->roleNames();
+}
void KTp::AbstractGroupingProxyModel::forceGroup(const QString &group)
{
diff --git a/KTp/Models/abstract-grouping-proxy-model.h b/KTp/Models/abstract-grouping-proxy-model.h
index b13546d..ba45d57 100644
--- a/KTp/Models/abstract-grouping-proxy-model.h
+++ b/KTp/Models/abstract-grouping-proxy-model.h
@@ -44,6 +44,8 @@ public:
void groupChanged(const QString &group);
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+
//protected:
/** Return a list of all groups this items belongs to. Subclasses must override this*/
virtual QSet<QString> groupsForIndex(const QModelIndex &sourceIndex) const = 0;
diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index f73d4d7..2161026 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -44,8 +44,16 @@ KTp::AccountsListModel::AccountsListModel(QObject *parent)
: QAbstractListModel(parent),
d(new AccountsListModel::Private)
{
-
- QHash<int, QByteArray> roles = roleNames();
+}
+
+KTp::AccountsListModel::~AccountsListModel()
+{
+ delete d;
+}
+
+QHash<int, QByteArray> KTp::AccountsListModel::roleNames() const
+{
+ QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
roles[ConnectionStateRole] = "connectionState";
roles[ConnectionStateDisplayRole] = "conectionStateDisplay";
roles[ConnectionStateIconRole] = "connectionStateIcon";
@@ -53,12 +61,7 @@ KTp::AccountsListModel::AccountsListModel(QObject *parent)
roles[ConnectionProtocolNameRole] = "connectionProtocolName";
roles[EnabledRole] = "enabled";
roles[AccountRole] = "account";
- setRoleNames(roles);
-}
-
-KTp::AccountsListModel::~AccountsListModel()
-{
- delete d;
+ return roles;
}
void KTp::AccountsListModel::setAccountSet(const Tp::AccountSetPtr &accountSet)
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index a624b19..09b1c28 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -51,6 +51,7 @@ public:
explicit AccountsListModel(QObject *parent = 0);
virtual ~AccountsListModel();
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
void setAccountSet(const Tp::AccountSetPtr &accountSet);
virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;
diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index 19d1f8e..1c1628e 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -142,12 +142,6 @@ bool KTp::ContactsModel::trackUnreadMessages() const
void KTp::ContactsModel::updateGroupProxyModels()
{
- //reset the filter
- //trying to track current selections whilst updating proxy models can cause issues
- //debug versions of Qt will assert
- reset();
-
- //if there no account manager there's not a lot point doing anything
if (!d->accountManager) {
return;
}
@@ -191,27 +185,19 @@ void KTp::ContactsModel::updateGroupProxyModels()
setSourceModel(modelToGroup);
break;
case AccountGrouping:
- d->proxy = new KTp::AccountsTreeProxyModel(modelToGroup, d->accountManager);
+ d->proxy = QSharedPointer<KTp::AbstractGroupingProxyModel>(new KTp::AccountsTreeProxyModel(modelToGroup, d->accountManager));
setSourceModel(d->proxy.data());
break;
case GroupGrouping:
- d->proxy = new KTp::GroupsTreeProxyModel(modelToGroup);
+ d->proxy = QSharedPointer<KTp::AbstractGroupingProxyModel>(new KTp::GroupsTreeProxyModel(modelToGroup));
setSourceModel(d->proxy.data());
break;
}
}
-void KTp::ContactsModel::setSourceModel(QAbstractItemModel *sourceModel)
+QHash<int, QByteArray> KTp::ContactsModel::roleNames() const
{
- KTp::ContactsFilterModel::setSourceModel(sourceModel);
-
- //Qt automatically updates the role names to use that of the source model
- //this causes problems when we have multiple source models that we change between
- //instead we update here just after we set a source model
-
- //in Qt5.0 override the virtual roleNames() method and do it there.
-
- QHash<int, QByteArray> roles = roleNames();
+ QHash<int, QByteArray> roles = KTp::ContactsFilterModel::roleNames();
roles[KTp::RowTypeRole]= "type";
roles[KTp::IdRole]= "id";
@@ -239,5 +225,5 @@ void KTp::ContactsModel::setSourceModel(QAbstractItemModel *sourceModel)
roles[KTp::ContactCanVideoCallRole]= "videoCall";
roles[KTp::ContactTubesRole]= "tubes";
roles[KTp::PersonIdRole]= "personId";
- setRoleNames(roles);
+ return roles;
}
diff --git a/KTp/Models/contacts-model.h b/KTp/Models/contacts-model.h
index fb2fd07..5c95822 100644
--- a/KTp/Models/contacts-model.h
+++ b/KTp/Models/contacts-model.h
@@ -73,10 +73,7 @@ public:
*/
void setTrackUnreadMessages(bool trackUnread);
bool trackUnreadMessages() const;
-
-protected:
- //prevent previously public setSourceModel being called externally
- virtual void setSourceModel(QAbstractItemModel *sourceModel);
+ QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
Q_SIGNALS:
void modelInitialized(bool success);
diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 24187da..c0b5273 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -230,15 +230,15 @@ QPixmap KPeopleTranslationProxy::contactPixmap(const QModelIndex &index) const
//if the contact is offline, gray it out
if (presenceType == Tp::ConnectionPresenceTypeOffline) {
QImage image = avatar.toImage();
- const QPixmap alpha = avatar.alphaChannel();
+ const QImage alpha = image.alphaChannel();
for (int i = 0; i < image.width(); ++i) {
for (int j = 0; j < image.height(); ++j) {
int colour = qGray(image.pixel(i, j));
image.setPixel(i, j, qRgb(colour, colour, colour));
}
}
+ image.setAlphaChannel(alpha);
avatar = avatar.fromImage(image);
- avatar.setAlphaChannel(alpha);
}
//insert the contact into pixmap cache for faster lookup
diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index acddba0..50405ae 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -121,8 +121,8 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
d->ui->previousView->setModel(d->favoritesProxyModel);
d->ui->previousView->setHeaderHidden(true);
d->ui->previousView->header()->setStretchLastSection(false);
- d->ui->previousView->header()->setResizeMode(FavoriteRoomsModel::BookmarkColumn, QHeaderView::ResizeToContents);
- d->ui->previousView->header()->setResizeMode(FavoriteRoomsModel::HandleNameColumn, QHeaderView::Stretch);
+ d->ui->previousView->header()->setSectionResizeMode(FavoriteRoomsModel::BookmarkColumn, QHeaderView::ResizeToContents);
+ d->ui->previousView->header()->setSectionResizeMode(FavoriteRoomsModel::HandleNameColumn, QHeaderView::Stretch);
d->ui->previousView->setColumnHidden(FavoriteRoomsModel::AccountIdentifierColumn, true);
d->ui->previousView->sortByColumn(FavoriteRoomsModel::BookmarkColumn, Qt::DescendingOrder);
@@ -136,10 +136,10 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
d->ui->queryView->setModel(proxyModel);
d->ui->queryView->header()->setStretchLastSection(false);
- d->ui->queryView->header()->setResizeMode(0, QHeaderView::Stretch);
- d->ui->queryView->header()->setResizeMode(1, QHeaderView::Stretch);
- d->ui->queryView->header()->setResizeMode(2, QHeaderView::ResizeToContents);
- d->ui->queryView->header()->setResizeMode(3, QHeaderView::ResizeToContents);
+ d->ui->queryView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+ d->ui->queryView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+ d->ui->queryView->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+ d->ui->queryView->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
d->ui->queryView->header()->setSortIndicatorShown(false);
d->ui->queryView->sortByColumn(RoomsModel::NameColumn, Qt::AscendingOrder);
diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 2d9d041..6310fb3 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -201,15 +201,15 @@ QPixmap KTp::Contact::avatarPixmap()
void KTp::Contact::avatarToGray(QPixmap &avatar)
{
QImage image = avatar.toImage();
- QPixmap alpha= avatar.alphaChannel();
+ QImage alpha= image.alphaChannel();
for (int i = 0; i < image.width(); ++i) {
for (int j = 0; j < image.height(); ++j) {
int colour = qGray(image.pixel(i, j));
image.setPixel(i, j, qRgb(colour, colour, colour));
}
}
- avatar = avatar.fromImage(image);
- avatar.setAlphaChannel(alpha);
+ image.setAlphaChannel(alpha);
+ avatar = QPixmap::fromImage(image);
}
QString KTp::Contact::keyCache() const
diff --git a/KTp/message-escape-filter.cpp b/KTp/message-escape-filter.cpp
index ba7a30a..c568216 100644
--- a/KTp/message-escape-filter.cpp
+++ b/KTp/message-escape-filter.cpp
@@ -55,7 +55,7 @@ void MessageEscapeFilter::filterMessage(KTp::Message &message, const KTp::Messag
QUrl url(parsedUrl.fixedUrls.at(i));
if (url.scheme() != QLatin1String("mailto")) {
QString originalText = messageText.mid(parsedUrl.urlRanges.at(i).first + offset, parsedUrl.urlRanges.at(i).second);
- QString link = QString::fromLatin1("<a href=\"%1\">%2</a>").arg(QString::fromAscii(url.toEncoded()), originalText);
+ QString link = QString::fromLatin1("<a href=\"%1\">%2</a>").arg(QString::fromLatin1(url.toEncoded()), originalText);
QString placeholder = QString::fromLatin1("#K#T#P%1").arg(i);
@@ -74,7 +74,7 @@ void MessageEscapeFilter::filterMessage(KTp::Message &message, const KTp::Messag
message.setProperty("Urls", urls);
- QString escapedMessage = Qt::escape(messageText);
+ QString escapedMessage = messageText.toHtmlEscaped();
escapedMessage.replace(QLatin1String("
"), QLatin1String("<br/> ")); //keep leading whitespaces
escapedMessage.replace(QLatin1Char('
'), QLatin1String("<br/>"));
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list