adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor adjustments

Browse Source
remotes/origin/HEAD
Konstantinos Sideris 7 years ago
parent a8e17b9c91
commit 8b139c32a3
18 changed files with 37 additions and 37 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      include/MatrixClient.h
  2. 2
      include/Utils.h
  3. 2
      include/dialogs/PreviewUploadOverlay.h
  4. 8
      include/timeline/TimelineView.h
  5. 8
      include/timeline/TimelineViewManager.h
  6. 2
      include/timeline/widgets/AudioItem.h
  7. 2
      include/timeline/widgets/FileItem.h
  8. 2
      include/timeline/widgets/ImageItem.h
  9. 2
      include/timeline/widgets/VideoItem.h
  10. 8
      src/ChatPage.cc
  11. 2
      src/MatrixClient.cc
  12. 2
      src/Utils.cc
  13. 2
      src/dialogs/PreviewUploadOverlay.cc
  14. 8
      src/timeline/TimelineViewManager.cc
  15. 2
      src/timeline/widgets/AudioItem.cc
  16. 2
      src/timeline/widgets/FileItem.cc
  17. 2
      src/timeline/widgets/ImageItem.cc
  18. 2
      src/timeline/widgets/VideoItem.cc

16
include/MatrixClient.h
Unescape View File

@ -40,7 +40,7 @@ public:
const QString &roomid,
const QString &msg,
const QString &mime,
const int64_t media_size,
uint64_t media_size,
const QString &url = "") noexcept;
void login(const QString &username, const QString &password) noexcept;
void registerUser(const QString &username,
@ -116,22 +116,22 @@ signals:
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
uint64_t size);
void fileUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
uint64_t size);
void audioUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
uint64_t size);
void videoUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
uint64_t size);
void roomAvatarRetrieved(const QString &roomid,
const QPixmap &img,
const QString &url,
@ -151,9 +151,9 @@ signals:
void syncCompleted(const mtx::responses::Sync &response);
void syncFailed(const QString &msg);
void joinFailed(const QString &msg);
void messageSent(const QString &event_id, const QString &roomid, const int txn_id);
void messageSendFailed(const QString &roomid, const int txn_id);
void emoteSent(const QString &event_id, const QString &roomid, const int txn_id);
void messageSent(const QString &event_id, const QString &roomid, int txn_id);
void messageSendFailed(const QString &roomid, int txn_id);
void emoteSent(const QString &event_id, const QString &roomid, int txn_id);
void messagesRetrieved(const QString &room_id, const mtx::responses::Messages &msgs);
void joinedRoom(const QString &room_id);
void leftRoom(const QString &room_id);

2
include/Utils.h
Unescape View File

@ -25,5 +25,5 @@ firstChar(const QString &input);
//! Get a human readable file size with the appropriate units attached.
QString
humanReadableFileSize(const uint64_t bytes);
humanReadableFileSize(uint64_t bytes);
}

2
include/dialogs/PreviewUploadOverlay.h
Unescape View File

@ -42,7 +42,7 @@ signals:
private:
void init();
void setLabels(const QString &type, const QString &mime, const int upload_size);
void setLabels(const QString &type, const QString &mime, uint64_t upload_size);
bool isImage_;
QPixmap image_;

8
include/timeline/TimelineView.h
Unescape View File

@ -45,7 +45,7 @@ struct PendingMessage
QString body;
QString filename;
QString mime;
int64_t media_size;
uint64_t media_size;
QString event_id;
TimelineItem *widget;
@ -54,7 +54,7 @@ struct PendingMessage
QString body,
QString filename,
QString mime,
int64_t media_size,
uint64_t media_size,
QString event_id,
TimelineItem *widget)
: ty(ty)
@ -96,7 +96,7 @@ public:
void addUserMessage(const QString &url,
const QString &filename,
const QString &mime,
const int64_t size);
uint64_t size);
void updatePendingMessage(int txn_id, QString event_id);
void scrollDown();
QLabel *createDateSeparator(QDateTime datetime);
@ -243,7 +243,7 @@ void
TimelineView::addUserMessage(const QString &url,
const QString &filename,
const QString &mime,
const int64_t size)
uint64_t size)
{
auto with_sender = lastSender_ != local_user_;
auto trimmed = QFileInfo{filename}.fileName(); // Trim file path.

8
include/timeline/TimelineViewManager.h
Unescape View File

@ -67,22 +67,22 @@ public slots:
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
uint64_t dsize);
void queueFileMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
uint64_t dsize);
void queueAudioMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
uint64_t dsize);
void queueVideoMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
uint64_t dsize);
private slots:
void messageSent(const QString &eventid, const QString &roomid, int txnid);

2
include/timeline/widgets/AudioItem.h
Unescape View File

@ -49,7 +49,7 @@ public:
AudioItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent = nullptr);
QSize sizeHint() const override;

2
include/timeline/widgets/FileItem.h
Unescape View File

@ -43,7 +43,7 @@ public:
FileItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent = nullptr);
QSize sizeHint() const override;

2
include/timeline/widgets/ImageItem.h
Unescape View File

@ -37,7 +37,7 @@ public:
ImageItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent = nullptr);
void setImage(const QPixmap &image);

2
include/timeline/widgets/VideoItem.h
Unescape View File

@ -38,7 +38,7 @@ public:
VideoItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent = nullptr);
private:

8
src/ChatPage.cc
Unescape View File

@ -263,28 +263,28 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
connect(client_.data(),
&MatrixClient::imageUploaded,
this,
[=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
[=](QString roomid, QString filename, QString url, QString mime, uint64_t dsize) {
text_input_->hideUploadSpinner();
view_manager_->queueImageMessage(roomid, filename, url, mime, dsize);
});
connect(client_.data(),
&MatrixClient::fileUploaded,
this,
[=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
[=](QString roomid, QString filename, QString url, QString mime, uint64_t dsize) {
text_input_->hideUploadSpinner();
view_manager_->queueFileMessage(roomid, filename, url, mime, dsize);
});
connect(client_.data(),
&MatrixClient::audioUploaded,
this,
[=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
[=](QString roomid, QString filename, QString url, QString mime, uint64_t dsize) {
text_input_->hideUploadSpinner();
view_manager_->queueAudioMessage(roomid, filename, url, mime, dsize);
});
connect(client_.data(),
&MatrixClient::videoUploaded,
this,
[=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
[=](QString roomid, QString filename, QString url, QString mime, uint64_t dsize) {
text_input_->hideUploadSpinner();
view_manager_->queueVideoMessage(roomid, filename, url, mime, dsize);
});

2
src/MatrixClient.cc
Unescape View File

@ -281,7 +281,7 @@ MatrixClient::sendRoomMessage(mtx::events::MessageType ty,
const QString &roomid,
const QString &msg,
const QString &mime,
const int64_t media_size,
uint64_t media_size,
const QString &url) noexcept
{
QUrlQuery query;

2
src/Utils.cc
Unescape View File

@ -135,7 +135,7 @@ utils::firstChar(const QString &input)
}
QString
utils::humanReadableFileSize(const uint64_t bytes)
utils::humanReadableFileSize(uint64_t bytes)
{
constexpr static const char *units[] = {"B", "KiB", "MiB", "GiB", "TiB"};
constexpr static const int length = sizeof(units) / sizeof(units[0]);

2
src/dialogs/PreviewUploadOverlay.cc
Unescape View File

@ -103,7 +103,7 @@ PreviewUploadOverlay::init()
}
void
PreviewUploadOverlay::setLabels(const QString &type, const QString &mime, const int upload_size)
PreviewUploadOverlay::setLabels(const QString &type, const QString &mime, uint64_t upload_size)
{
if (mediaType_ == "image") {
if (!image_.loadFromData(data_)) {

8
src/timeline/TimelineViewManager.cc
Unescape View File

@ -93,7 +93,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size)
uint64_t size)
{
if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.image message to a non-managed view";
@ -110,7 +110,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size)
uint64_t size)
{
if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.file message to a non-managed view";
@ -127,7 +127,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size)
uint64_t size)
{
if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.audio message to a non-managed view";
@ -144,7 +144,7 @@ TimelineViewManager::queueVideoMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size)
uint64_t size)
{
if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.video message to a non-managed view";

2
src/timeline/widgets/AudioItem.cc
Unescape View File

@ -91,7 +91,7 @@ AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent)
: QWidget(parent)
, url_{url}

2
src/timeline/widgets/FileItem.cc
Unescape View File

@ -78,7 +78,7 @@ FileItem::FileItem(QSharedPointer<MatrixClient> client,
FileItem::FileItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent)
: QWidget(parent)
, url_{url}

2
src/timeline/widgets/ImageItem.cc
Unescape View File

@ -62,7 +62,7 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent)
: QWidget(parent)
, url_{url}

2
src/timeline/widgets/VideoItem.cc
Unescape View File

@ -68,7 +68,7 @@ VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QString &filename,
const int64_t size,
uint64_t size,
QWidget *parent)
: QWidget(parent)
, url_{url}

Write Preview
Loading…
Cancel
Save