summary refs log tree commit diff
path: root/src/TextInputWidget.h
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2019-12-05 20:15:01 -0500
committerGitHub <noreply@github.com>2019-12-05 20:15:01 -0500
commit9d9b214e4c340bac4a64994d2c1a7da1b3883ce5 (patch)
tree91c33080a83eed2d8f3d16268c263c799bc917b3 /src/TextInputWidget.h
parentRename qml namespace from com.github.nheko to im.nheko (diff)
parentUpdate mtxclient to current 0.3.0-dev version (diff)
downloadnheko-9d9b214e4c340bac4a64994d2c1a7da1b3883ce5.tar.xz
Merge pull request #100 from Nheko-Reborn/file-encryption
Add file encryption / decryption support
Diffstat (limited to 'src/TextInputWidget.h')
-rw-r--r--src/TextInputWidget.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h

index 71f794d1..d498be72 100644 --- a/src/TextInputWidget.h +++ b/src/TextInputWidget.h
@@ -63,10 +63,7 @@ signals: void message(QString); void reply(QString, const RelatedInfo &); void command(QString name, QString args); - void image(QSharedPointer<QIODevice> data, const QString &filename); - void audio(QSharedPointer<QIODevice> data, const QString &filename); - void video(QSharedPointer<QIODevice> data, const QString &filename); - void file(QSharedPointer<QIODevice> data, const QString &filename); + void media(QSharedPointer<QIODevice> data, QString mimeClass, const QString &filename); //! Trigger the suggestion popup. void showSuggestions(const QString &query); @@ -179,10 +176,9 @@ signals: void sendEmoteMessage(QString msg); void heightChanged(int height); - void uploadImage(const QSharedPointer<QIODevice> data, const QString &filename); - void uploadFile(const QSharedPointer<QIODevice> data, const QString &filename); - void uploadAudio(const QSharedPointer<QIODevice> data, const QString &filename); - void uploadVideo(const QSharedPointer<QIODevice> data, const QString &filename); + void uploadMedia(const QSharedPointer<QIODevice> data, + QString mimeClass, + const QString &filename); void sendJoinRoomRequest(const QString &room);