Compare commits
3 Commits
master
...
various-fi
Author | SHA1 | Date | |
---|---|---|---|
0c93aa55f7 | |||
8d88aa5d09 | |||
849159d5a5 |
@ -318,7 +318,7 @@ void Core::Archive::changeMessage(const QString& id, const QMap<QString, QVarian
|
|||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
throw Unknown(jid.toStdString(), mdb_strerror(rc));
|
throw Unknown(jid.toStdString(), mdb_strerror(rc));
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
lmdbData.mv_size = ba.size();
|
lmdbData.mv_size = ba.size();
|
||||||
lmdbData.mv_data = (uint8_t*)ba.data();
|
lmdbData.mv_data = (uint8_t*)ba.data();
|
||||||
|
@ -53,7 +53,7 @@ void Core::MessageHandler::onMessageReceived(const QXmppMessage& msg)
|
|||||||
if (cnt != 0) {
|
if (cnt != 0) {
|
||||||
cnt->changeMessage(id, cData);
|
cnt->changeMessage(id, cData);
|
||||||
}
|
}
|
||||||
;
|
|
||||||
emit acc->changeMessage(jid, id, cData);
|
emit acc->changeMessage(jid, id, cData);
|
||||||
pendingStateMessages.erase(itr);
|
pendingStateMessages.erase(itr);
|
||||||
handled = true;
|
handled = true;
|
||||||
|
@ -202,7 +202,7 @@ void Core::UrlStorage::addFile(const std::list<Shared::MessageInfo>& msgs, const
|
|||||||
}
|
}
|
||||||
|
|
||||||
UrlInfo info (path, msgs);
|
UrlInfo info (path, msgs);
|
||||||
writeInfo(url, info, true);;
|
writeInfo(url, info, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Core::UrlStorage::addMessageAndCheckForPath(const QString& url, const QString& account, const QString& jid, const QString& id)
|
QString Core::UrlStorage::addMessageAndCheckForPath(const QString& url, const QString& account, const QString& jid, const QString& id)
|
||||||
|
@ -211,7 +211,7 @@ QIcon Models::Contact::getStatusIcon(bool big) const
|
|||||||
if (getMessagesCount() > 0) {
|
if (getMessagesCount() > 0) {
|
||||||
return Shared::icon("mail-message", big);
|
return Shared::icon("mail-message", big);
|
||||||
} else if (state == Shared::SubscriptionState::both || state == Shared::SubscriptionState::to) {
|
} else if (state == Shared::SubscriptionState::both || state == Shared::SubscriptionState::to) {
|
||||||
return Shared::availabilityIcon(availability, big);;
|
return Shared::availabilityIcon(availability, big);
|
||||||
} else {
|
} else {
|
||||||
return Shared::subscriptionStateIcon(state, big);
|
return Shared::subscriptionStateIcon(state, big);
|
||||||
}
|
}
|
||||||
|
@ -187,9 +187,9 @@ struct FeedItem {
|
|||||||
Shared::Message::State state;
|
Shared::Message::State state;
|
||||||
Attachment attach;
|
Attachment attach;
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(Models::Attachment);
|
Q_DECLARE_METATYPE(Models::Attachment)
|
||||||
Q_DECLARE_METATYPE(Models::FeedItem);
|
Q_DECLARE_METATYPE(Models::FeedItem)
|
||||||
|
|
||||||
#endif // MESSAGEFEED_H
|
#endif // MESSAGEFEED_H
|
||||||
|
@ -29,6 +29,6 @@
|
|||||||
|
|
||||||
namespace Utils {
|
namespace Utils {
|
||||||
void exponentialblur(QImage &img, qreal radius, bool improvedQuality = false, int transposed = 0);
|
void exponentialblur(QImage &img, qreal radius, bool improvedQuality = false, int transposed = 0);
|
||||||
};
|
}
|
||||||
|
|
||||||
#endif // EXPONENTIALBLUR_H
|
#endif // EXPONENTIALBLUR_H
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
namespace Models {
|
namespace Models {
|
||||||
struct FeedItem;
|
struct FeedItem;
|
||||||
};
|
}
|
||||||
|
|
||||||
class MessageDelegate : public QStyledItemDelegate
|
class MessageDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
|
@ -59,7 +59,7 @@ QMap<QString, QVariant> Account::value() const
|
|||||||
|
|
||||||
void Account::lockId()
|
void Account::lockId()
|
||||||
{
|
{
|
||||||
m_ui->name->setReadOnly(true);;
|
m_ui->name->setReadOnly(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Account::setData(const QMap<QString, QVariant>& data)
|
void Account::setData(const QMap<QString, QVariant>& data)
|
||||||
|
Loading…
Reference in New Issue
Block a user