cleanup some warnings suppression
This commit is contained in:
parent
5fbb03fc46
commit
23ec80ccba
GPG key ID:
9B203B252A63EE38
26 changed files with 630 additions and 924 deletions
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
#include <ui/models/element.h>
|
||||
#include <ui/models/room.h>
|
||||
#include <shared/defines.h>
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
|
@ -228,24 +229,20 @@ std::set<Models::MessageFeed::MessageRoles> Models::MessageFeed::detectChanges(c
|
|||
return roles;
|
||||
}
|
||||
|
||||
void Models::MessageFeed::removeMessage(const QString& id)
|
||||
{
|
||||
void Models::MessageFeed::removeMessage(const QString& id) {
|
||||
//todo;
|
||||
}
|
||||
|
||||
Shared::Message Models::MessageFeed::getMessage(const QString& id)
|
||||
{
|
||||
Shared::Message Models::MessageFeed::getMessage(const QString& id) {
|
||||
StorageById::iterator itr = indexById.find(id);
|
||||
if (itr == indexById.end()) {
|
||||
if (itr == indexById.end())
|
||||
throw NotFound(id.toStdString(), rosterItem->getJid().toStdString(), rosterItem->getAccountName().toStdString());
|
||||
}
|
||||
|
||||
return **itr;
|
||||
}
|
||||
|
||||
|
||||
QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const
|
||||
{
|
||||
QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const {
|
||||
int i = index.row();
|
||||
QVariant answer;
|
||||
|
||||
|
|
@ -266,11 +263,10 @@ QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const
|
|||
if (sentByMe(*msg)) {
|
||||
answer = rosterItem->getAccountName();
|
||||
} else {
|
||||
if (rosterItem->isRoom()) {
|
||||
if (rosterItem->isRoom())
|
||||
answer = msg->getFromResource();
|
||||
} else {
|
||||
else
|
||||
answer = rosterItem->getDisplayedName();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Date:
|
||||
|
|
@ -290,19 +286,17 @@ QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const
|
|||
if (sentByMe(*msg)) {
|
||||
path = rosterItem->getAccountAvatarPath();
|
||||
} else if (!rosterItem->isRoom()) {
|
||||
if (rosterItem->getAvatarState() != Shared::Avatar::empty) {
|
||||
if (rosterItem->getAvatarState() != Shared::Avatar::empty)
|
||||
path = rosterItem->getAvatarPath();
|
||||
}
|
||||
} else {
|
||||
const Room* room = static_cast<const Room*>(rosterItem);
|
||||
path = room->getParticipantIconPath(msg->getFromResource());
|
||||
}
|
||||
|
||||
if (path.size() == 0) {
|
||||
if (path.size() == 0)
|
||||
answer = Shared::iconPath("user", true);
|
||||
} else {
|
||||
else
|
||||
answer = path;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Attach:
|
||||
|
|
@ -342,15 +336,14 @@ QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const
|
|||
item.avatar = room->getParticipantIconPath(msg->getFromResource());
|
||||
} else {
|
||||
item.sender = rosterItem->getDisplayedName();
|
||||
if (rosterItem->getAvatarState() != Shared::Avatar::empty) {
|
||||
if (rosterItem->getAvatarState() != Shared::Avatar::empty)
|
||||
item.avatar = rosterItem->getAvatarPath();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (item.avatar.size() == 0) {
|
||||
if (item.avatar.size() == 0)
|
||||
item.avatar = Shared::iconPath("user", true);
|
||||
}
|
||||
|
||||
item.attach = fillAttach(*msg);
|
||||
answer.setValue(item);
|
||||
}
|
||||
|
|
@ -363,13 +356,12 @@ QVariant Models::MessageFeed::data(const QModelIndex& index, int role) const
|
|||
return answer;
|
||||
}
|
||||
|
||||
int Models::MessageFeed::rowCount(const QModelIndex& parent) const
|
||||
{
|
||||
int Models::MessageFeed::rowCount(const QModelIndex& parent) const {
|
||||
SHARED_UNUSED(parent);
|
||||
return storage.size();
|
||||
}
|
||||
|
||||
bool Models::MessageFeed::markMessageAsRead(const QString& id) const
|
||||
{
|
||||
bool Models::MessageFeed::markMessageAsRead(const QString& id) const {
|
||||
std::set<QString>::const_iterator umi = unreadMessages->find(id);
|
||||
if (umi != unreadMessages->end()) {
|
||||
unreadMessages->erase(umi);
|
||||
|
|
@ -379,32 +371,29 @@ bool Models::MessageFeed::markMessageAsRead(const QString& id) const
|
|||
return false;
|
||||
}
|
||||
|
||||
unsigned int Models::MessageFeed::unreadMessagesCount() const
|
||||
{
|
||||
unsigned int Models::MessageFeed::unreadMessagesCount() const {
|
||||
return unreadMessages->size();
|
||||
}
|
||||
|
||||
bool Models::MessageFeed::canFetchMore(const QModelIndex& parent) const
|
||||
{
|
||||
bool Models::MessageFeed::canFetchMore(const QModelIndex& parent) const {
|
||||
SHARED_UNUSED(parent);
|
||||
return syncState == incomplete;
|
||||
}
|
||||
|
||||
void Models::MessageFeed::fetchMore(const QModelIndex& parent)
|
||||
{
|
||||
void Models::MessageFeed::fetchMore(const QModelIndex& parent) {
|
||||
SHARED_UNUSED(parent);
|
||||
if (syncState == incomplete) {
|
||||
syncState = syncing;
|
||||
emit syncStateChange(syncState);
|
||||
|
||||
if (storage.size() == 0) {
|
||||
if (storage.size() == 0)
|
||||
emit requestArchive("");
|
||||
} else {
|
||||
else
|
||||
emit requestArchive((*indexByTime.rbegin())->getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Models::MessageFeed::responseArchive(const std::list<Shared::Message> list, bool last)
|
||||
{
|
||||
void Models::MessageFeed::responseArchive(const std::list<Shared::Message> list, bool last) {
|
||||
Storage::size_type size = storage.size();
|
||||
|
||||
beginInsertRows(QModelIndex(), size, size + list.size() - 1);
|
||||
|
|
@ -415,21 +404,19 @@ void Models::MessageFeed::responseArchive(const std::list<Shared::Message> list,
|
|||
endInsertRows();
|
||||
|
||||
if (syncState == syncing) {
|
||||
if (last) {
|
||||
if (last)
|
||||
syncState = complete;
|
||||
} else {
|
||||
else
|
||||
syncState = incomplete;
|
||||
}
|
||||
|
||||
emit syncStateChange(syncState);
|
||||
}
|
||||
}
|
||||
|
||||
QModelIndex Models::MessageFeed::index(int row, int column, const QModelIndex& parent) const
|
||||
{
|
||||
if (!hasIndex(row, column, parent)) {
|
||||
QModelIndex Models::MessageFeed::index(int row, int column, const QModelIndex& parent) const{
|
||||
if (!hasIndex(row, column, parent))
|
||||
return QModelIndex();
|
||||
}
|
||||
|
||||
|
||||
StorageByTime::iterator itr = indexByTime.nth(row);
|
||||
if (itr != indexByTime.end()) {
|
||||
Shared::Message* msg = *itr;
|
||||
|
|
@ -442,8 +429,7 @@ QModelIndex Models::MessageFeed::index(int row, int column, const QModelIndex& p
|
|||
|
||||
QHash<int, QByteArray> Models::MessageFeed::roleNames() const {return roles;}
|
||||
|
||||
bool Models::MessageFeed::sentByMe(const Shared::Message& msg) const
|
||||
{
|
||||
bool Models::MessageFeed::sentByMe(const Shared::Message& msg) const {
|
||||
if (rosterItem->isRoom()) {
|
||||
const Room* room = static_cast<const Room*>(rosterItem);
|
||||
return room->getNick().toLower() == msg.getFromResource().toLower();
|
||||
|
|
@ -452,8 +438,7 @@ bool Models::MessageFeed::sentByMe(const Shared::Message& msg) const
|
|||
}
|
||||
}
|
||||
|
||||
Models::Attachment Models::MessageFeed::fillAttach(const Shared::Message& msg) const
|
||||
{
|
||||
Models::Attachment Models::MessageFeed::fillAttach(const Shared::Message& msg) const {
|
||||
::Models::Attachment att;
|
||||
QString id = msg.getId();
|
||||
|
||||
|
|
@ -501,16 +486,14 @@ Models::Attachment Models::MessageFeed::fillAttach(const Shared::Message& msg) c
|
|||
return att;
|
||||
}
|
||||
|
||||
Models::Edition Models::MessageFeed::fillCorrection(const Shared::Message& msg) const
|
||||
{
|
||||
Models::Edition Models::MessageFeed::fillCorrection(const Shared::Message& msg) const {
|
||||
::Models::Edition ed({msg.getEdited(), msg.getOriginalBody(), msg.getLastModified()});
|
||||
|
||||
return ed;
|
||||
}
|
||||
|
||||
|
||||
void Models::MessageFeed::downloadAttachment(const QString& messageId)
|
||||
{
|
||||
void Models::MessageFeed::downloadAttachment(const QString& messageId) {
|
||||
bool notify = false;
|
||||
Err::const_iterator eitr = failedDownloads.find(messageId);
|
||||
if (eitr != failedDownloads.end()) {
|
||||
|
|
@ -532,13 +515,11 @@ void Models::MessageFeed::downloadAttachment(const QString& messageId)
|
|||
qDebug() << "An attempt to download an attachment for the message that doesn't exist. ID:" << messageId;
|
||||
}
|
||||
|
||||
if (notify) {
|
||||
if (notify)
|
||||
emit dataChanged(ind, ind, {MessageRoles::Attach});
|
||||
}
|
||||
}
|
||||
|
||||
bool Models::MessageFeed::registerUpload(const QString& messageId)
|
||||
{
|
||||
bool Models::MessageFeed::registerUpload(const QString& messageId) {
|
||||
bool success = uploads.insert(std::make_pair(messageId, 0)).second;
|
||||
|
||||
QVector<int> roles({});
|
||||
|
|
@ -556,8 +537,7 @@ bool Models::MessageFeed::registerUpload(const QString& messageId)
|
|||
return success;
|
||||
}
|
||||
|
||||
void Models::MessageFeed::fileProgress(const QString& messageId, qreal value, bool up)
|
||||
{
|
||||
void Models::MessageFeed::fileProgress(const QString& messageId, qreal value, bool up) {
|
||||
Progress* pr = 0;
|
||||
Err* err = 0;
|
||||
if (up) {
|
||||
|
|
@ -583,13 +563,11 @@ void Models::MessageFeed::fileProgress(const QString& messageId, qreal value, bo
|
|||
}
|
||||
}
|
||||
|
||||
void Models::MessageFeed::fileComplete(const QString& messageId, bool up)
|
||||
{
|
||||
void Models::MessageFeed::fileComplete(const QString& messageId, bool up) {
|
||||
fileProgress(messageId, 1, up);
|
||||
}
|
||||
|
||||
void Models::MessageFeed::fileError(const QString& messageId, const QString& error, bool up)
|
||||
{
|
||||
void Models::MessageFeed::fileError(const QString& messageId, const QString& error, bool up) {
|
||||
Err* failed;
|
||||
Progress* loads;
|
||||
if (up) {
|
||||
|
|
@ -601,33 +579,28 @@ void Models::MessageFeed::fileError(const QString& messageId, const QString& err
|
|||
}
|
||||
|
||||
Progress::iterator pitr = loads->find(messageId);
|
||||
if (pitr != loads->end()) {
|
||||
if (pitr != loads->end())
|
||||
loads->erase(pitr);
|
||||
}
|
||||
|
||||
std::pair<Err::iterator, bool> pair = failed->insert(std::make_pair(messageId, error));
|
||||
if (!pair.second) {
|
||||
if (!pair.second)
|
||||
pair.first->second = error;
|
||||
}
|
||||
|
||||
QModelIndex ind = modelIndexById(messageId);
|
||||
if (ind.isValid()) {
|
||||
if (ind.isValid())
|
||||
emit dataChanged(ind, ind, {MessageRoles::Attach});
|
||||
}
|
||||
}
|
||||
|
||||
void Models::MessageFeed::incrementObservers()
|
||||
{
|
||||
void Models::MessageFeed::incrementObservers() {
|
||||
++observersAmount;
|
||||
}
|
||||
|
||||
void Models::MessageFeed::decrementObservers()
|
||||
{
|
||||
void Models::MessageFeed::decrementObservers() {
|
||||
--observersAmount;
|
||||
}
|
||||
|
||||
|
||||
QModelIndex Models::MessageFeed::modelIndexById(const QString& id) const
|
||||
{
|
||||
QModelIndex Models::MessageFeed::modelIndexById(const QString& id) const {
|
||||
StorageById::const_iterator itr = indexById.find(id);
|
||||
if (itr != indexById.end()) {
|
||||
Shared::Message* msg = *itr;
|
||||
|
|
@ -637,8 +610,7 @@ QModelIndex Models::MessageFeed::modelIndexById(const QString& id) const
|
|||
return QModelIndex();
|
||||
}
|
||||
|
||||
QModelIndex Models::MessageFeed::modelIndexByTime(const QString& id, const QDateTime& time) const
|
||||
{
|
||||
QModelIndex Models::MessageFeed::modelIndexByTime(const QString& id, const QDateTime& time) const {
|
||||
if (indexByTime.size() > 0) {
|
||||
StorageByTime::const_iterator tItr = indexByTime.lower_bound(time);
|
||||
StorageByTime::const_iterator tEnd = indexByTime.upper_bound(time);
|
||||
|
|
@ -660,8 +632,7 @@ QModelIndex Models::MessageFeed::modelIndexByTime(const QString& id, const QDate
|
|||
return QModelIndex();
|
||||
}
|
||||
|
||||
void Models::MessageFeed::reportLocalPathInvalid(const QString& messageId)
|
||||
{
|
||||
void Models::MessageFeed::reportLocalPathInvalid(const QString& messageId) {
|
||||
StorageById::iterator itr = indexById.find(messageId);
|
||||
if (itr == indexById.end()) {
|
||||
qDebug() << "received a command to change a message, but the message couldn't be found, skipping";
|
||||
|
|
@ -679,13 +650,11 @@ void Models::MessageFeed::reportLocalPathInvalid(const QString& messageId)
|
|||
emit dataChanged(index, index, {MessageRoles::Attach});
|
||||
}
|
||||
|
||||
Models::MessageFeed::SyncState Models::MessageFeed::getSyncState() const
|
||||
{
|
||||
Models::MessageFeed::SyncState Models::MessageFeed::getSyncState() const {
|
||||
return syncState;
|
||||
}
|
||||
|
||||
void Models::MessageFeed::requestLatestMessages()
|
||||
{
|
||||
void Models::MessageFeed::requestLatestMessages() {
|
||||
if (syncState != syncing) {
|
||||
syncState = syncing;
|
||||
emit syncStateChange(syncState);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue