Change Settings to singleton and add AutoMouseArea.
Also fixes acceptInvitation issue.
This commit is contained in:
@@ -38,6 +38,7 @@ int main(int argc, char *argv[]) {
|
||||
qmlRegisterUncreatableType<RoomType>("Matrique", 0, 1, "RoomType", "ENUM");
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
engine.addImportPath("qrc:/qml");
|
||||
|
||||
ImageProvider *m_provider = new ImageProvider();
|
||||
|
||||
|
||||
@@ -69,12 +69,7 @@ void MatriqueRoom::saveFileAs(QString eventId) {
|
||||
if (!fileName.isEmpty()) downloadFile(eventId, QUrl::fromLocalFile(fileName));
|
||||
}
|
||||
|
||||
void MatriqueRoom::acceptInvitation() { setJoinState(JoinState::Join); }
|
||||
|
||||
void MatriqueRoom::rejectInvitation() {
|
||||
setJoinState(JoinState::Leave);
|
||||
forget();
|
||||
}
|
||||
void MatriqueRoom::acceptInvitation() { connection()->joinRoom(id()); }
|
||||
|
||||
void MatriqueRoom::forget() { connection()->forgetRoom(id()); }
|
||||
|
||||
|
||||
@@ -57,7 +57,6 @@ class MatriqueRoom : public Room {
|
||||
void chooseAndUploadFile();
|
||||
void saveFileAs(QString eventId);
|
||||
void acceptInvitation();
|
||||
void rejectInvitation();
|
||||
void forget();
|
||||
void sendTypingNotification(bool isTyping);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user