summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-02-19 22:09:21 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-02-19 22:09:21 +0200
commit8b139c32a3b4a92e32a4737b599cf14e61b8a096 (patch)
tree6d145d2a1098753286929d516dff983e31479349 /include
parentNotify the user on upload failures (diff)
downloadnheko-8b139c32a3b4a92e32a4737b599cf14e61b8a096.tar.xz
Minor adjustments
Diffstat (limited to 'include')
-rw-r--r--include/MatrixClient.h16
-rw-r--r--include/Utils.h2
-rw-r--r--include/dialogs/PreviewUploadOverlay.h2
-rw-r--r--include/timeline/TimelineView.h8
-rw-r--r--include/timeline/TimelineViewManager.h8
-rw-r--r--include/timeline/widgets/AudioItem.h2
-rw-r--r--include/timeline/widgets/FileItem.h2
-rw-r--r--include/timeline/widgets/ImageItem.h2
-rw-r--r--include/timeline/widgets/VideoItem.h2
9 files changed, 22 insertions, 22 deletions
diff --git a/include/MatrixClient.h b/include/MatrixClient.h

index 03cd8669..91e6db28 100644 --- a/include/MatrixClient.h +++ b/include/MatrixClient.h
@@ -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); diff --git a/include/Utils.h b/include/Utils.h
index 2c764f88..30e592cd 100644 --- a/include/Utils.h +++ b/include/Utils.h
@@ -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); } diff --git a/include/dialogs/PreviewUploadOverlay.h b/include/dialogs/PreviewUploadOverlay.h
index c9516719..48795ca0 100644 --- a/include/dialogs/PreviewUploadOverlay.h +++ b/include/dialogs/PreviewUploadOverlay.h
@@ -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_; diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index 782f3afd..96d7690d 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -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. diff --git a/include/timeline/TimelineViewManager.h b/include/timeline/TimelineViewManager.h
index a531be88..c7bbd71a 100644 --- a/include/timeline/TimelineViewManager.h +++ b/include/timeline/TimelineViewManager.h
@@ -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); diff --git a/include/timeline/widgets/AudioItem.h b/include/timeline/widgets/AudioItem.h
index 06f4b8ff..88e84d0c 100644 --- a/include/timeline/widgets/AudioItem.h +++ b/include/timeline/widgets/AudioItem.h
@@ -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; diff --git a/include/timeline/widgets/FileItem.h b/include/timeline/widgets/FileItem.h
index 36d72f25..cc6cd2ee 100644 --- a/include/timeline/widgets/FileItem.h +++ b/include/timeline/widgets/FileItem.h
@@ -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; diff --git a/include/timeline/widgets/ImageItem.h b/include/timeline/widgets/ImageItem.h
index 9e5fa82b..28a0b461 100644 --- a/include/timeline/widgets/ImageItem.h +++ b/include/timeline/widgets/ImageItem.h
@@ -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); diff --git a/include/timeline/widgets/VideoItem.h b/include/timeline/widgets/VideoItem.h
index 65b87c95..89732975 100644 --- a/include/timeline/widgets/VideoItem.h +++ b/include/timeline/widgets/VideoItem.h
@@ -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: