diff options
31 files changed, 77 insertions, 40 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b175b90d..e2d5e7da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,8 @@ linting: image: alpine:latest tags: [docker] before_script: - - apk update && apk add clang-extra-tools make git python3 py3-pip + - apk update && apk add make git python3 py3-pip + - apk add clang-extra-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main - export PATH="$PATH:/root/.local/bin" - pip3 install --user reuse script: diff --git a/src/AliasEditModel.h b/src/AliasEditModel.h index 4fccf9ce..a7b9588d 100644 --- a/src/AliasEditModel.h +++ b/src/AliasEditModel.h @@ -18,7 +18,8 @@ class FetchPublishedAliasesJob : public QObject public: explicit FetchPublishedAliasesJob(QObject *p = nullptr) : QObject(p) - {} + { + } signals: void aliasFetched(std::string alias, std::string target); diff --git a/src/BlurhashProvider.h b/src/BlurhashProvider.h index bbe28c2c..566e07ac 100644 --- a/src/BlurhashProvider.h +++ b/src/BlurhashProvider.h @@ -20,7 +20,8 @@ public: BlurhashRunnable(const QString &id, const QSize &requestedSize) : m_id(id) , m_requestedSize(requestedSize) - {} + { + } void run() override; signals: diff --git a/src/CacheCryptoStructs.h b/src/CacheCryptoStructs.h index 6c32667e..04e852b4 100644 --- a/src/CacheCryptoStructs.h +++ b/src/CacheCryptoStructs.h @@ -96,7 +96,8 @@ struct MegolmSessionIndex MegolmSessionIndex(std::string room_id_, const mtx::events::msg::Encrypted &e) : room_id(std::move(room_id_)) , session_id(e.session_id) - {} + { + } //! The room in which this session exists. std::string room_id; diff --git a/src/ColorImageProvider.h b/src/ColorImageProvider.h index e7fa1571..05cc1084 100644 --- a/src/ColorImageProvider.h +++ b/src/ColorImageProvider.h @@ -10,7 +10,8 @@ class ColorImageProvider : public QQuickImageProvider public: ColorImageProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) - {} + { + } QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override; }; diff --git a/src/EventAccessors.h b/src/EventAccessors.h index 9d8a34e7..8e130c29 100644 --- a/src/EventAccessors.h +++ b/src/EventAccessors.h @@ -15,8 +15,8 @@ namespace nheko { struct nonesuch { - ~nonesuch() = delete; - nonesuch(nonesuch const &) = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const &) = delete; void operator=(nonesuch const &) = delete; }; diff --git a/src/InviteesModel.cpp b/src/InviteesModel.cpp index aa6d41d8..8e30847c 100644 --- a/src/InviteesModel.cpp +++ b/src/InviteesModel.cpp @@ -12,7 +12,8 @@ InviteesModel::InviteesModel(QObject *parent) : QAbstractListModel{parent} -{} +{ +} void InviteesModel::addUser(QString mxid) diff --git a/src/JdenticonProvider.cpp b/src/JdenticonProvider.cpp index 03c7cd82..22d2b887 100644 --- a/src/JdenticonProvider.cpp +++ b/src/JdenticonProvider.cpp @@ -83,7 +83,8 @@ JdenticonRunnable::JdenticonRunnable(const QString &key, , m_crop{crop} , m_radius{radius} , m_requestedSize(requestedSize.isValid() ? requestedSize : QSize(100, 100)) -{} +{ +} void JdenticonRunnable::run() diff --git a/src/MainWindow.h b/src/MainWindow.h index 996d292c..780e14e6 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -57,7 +57,10 @@ public: void showChatPage(); #ifdef NHEKO_DBUS_SYS - bool dbusAvailable() const { return dbusAvailable_; } + bool dbusAvailable() const + { + return dbusAvailable_; + } #endif Q_INVOKABLE void addPerRoomWindow(const QString &room, QWindow *window); diff --git a/src/MxcImageProvider.h b/src/MxcImageProvider.h index 2a09df87..5d8330aa 100644 --- a/src/MxcImageProvider.h +++ b/src/MxcImageProvider.h @@ -29,7 +29,8 @@ public: , m_requestedSize(requestedSize) , m_crop(crop) , m_radius(radius) - {} + { + } void run(); diff --git a/src/dbus/NhekoDBusApi.cpp b/src/dbus/NhekoDBusApi.cpp index c6604633..cc19f0a0 100644 --- a/src/dbus/NhekoDBusApi.cpp +++ b/src/dbus/NhekoDBusApi.cpp @@ -44,7 +44,8 @@ RoomInfoItem::RoomInfoItem(const QString &roomId, , roomName_{title} , image_{image} , unreadNotifications_{unreadNotifications} -{} +{ +} RoomInfoItem::RoomInfoItem(const RoomInfoItem &other) : QObject{other.parent()} @@ -53,7 +54,8 @@ RoomInfoItem::RoomInfoItem(const RoomInfoItem &other) , roomName_{other.roomName_} , image_{other.image_} , unreadNotifications_{other.unreadNotifications_} -{} +{ +} RoomInfoItem & RoomInfoItem::operator=(const RoomInfoItem &other) diff --git a/src/dbus/NhekoDBusBackend.cpp b/src/dbus/NhekoDBusBackend.cpp index 9abc0433..4d611122 100644 --- a/src/dbus/NhekoDBusBackend.cpp +++ b/src/dbus/NhekoDBusBackend.cpp @@ -19,7 +19,8 @@ NhekoDBusBackend::NhekoDBusBackend(RoomlistModel *parent) : QObject{parent} , m_parent{parent} -{} +{ +} namespace { struct RoomReplyState diff --git a/src/dock/Dock.cpp b/src/dock/Dock.cpp index 4dedf94f..25b65c0c 100644 --- a/src/dock/Dock.cpp +++ b/src/dock/Dock.cpp @@ -82,8 +82,10 @@ Dock::unitySetNotificationCount(const int count) #else Dock::Dock(QObject *parent) : QObject(parent) -{} +{ +} void Dock::setUnreadCount(const int) -{} +{ +} #endif diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp index 5b373f8b..2cf8b060 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp @@ -661,7 +661,7 @@ DeviceVerificationFlow::startVerificationRequest() req.hashes = {"sha256"}; req.message_authentication_codes = {"hkdf-hmac-sha256"}; req.short_authentication_string = {mtx::events::msg::SASMethods::Decimal, - mtx::events::msg::SASMethods::Emoji}; + mtx::events::msg::SASMethods::Emoji}; if (this->type == DeviceVerificationFlow::Type::ToDevice) { mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationStart> body; diff --git a/src/encryption/VerificationManager.cpp b/src/encryption/VerificationManager.cpp index ca712922..bb986665 100644 --- a/src/encryption/VerificationManager.cpp +++ b/src/encryption/VerificationManager.cpp @@ -15,7 +15,8 @@ VerificationManager::VerificationManager(TimelineViewManager *o) : QObject(o) , rooms_(o->rooms()) -{} +{ +} static bool isValidTime(std::optional<uint64_t> t) diff --git a/src/main.cpp b/src/main.cpp index f76d8ca6..defa5c88 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -102,7 +102,8 @@ registerSignalHandlers() // No implementation for systems with no stacktrace support. void registerSignalHandlers() -{} +{ +} #endif diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp index 5d269a8b..2d2dba37 100644 --- a/src/notifications/ManagerWin.cpp +++ b/src/notifications/ManagerWin.cpp @@ -44,7 +44,8 @@ init() NotificationsManager::NotificationsManager(QObject *parent) : QObject(parent) -{} +{ +} void NotificationsManager::postNotification(const mtx::responses::Notification ¬ification, diff --git a/src/timeline/CommunitiesModel.h b/src/timeline/CommunitiesModel.h index 3a599476..786516e0 100644 --- a/src/timeline/CommunitiesModel.h +++ b/src/timeline/CommunitiesModel.h @@ -62,7 +62,8 @@ public: , canonical(canonical_) , canEditParent(canEditParent_) , canEditChild(canEditChild_) - {} + { + } QString roomid, name; int treeIndex = 0; diff --git a/src/timeline/DelegateChooser.h b/src/timeline/DelegateChooser.h index 1772c0c2..8dff66ad 100644 --- a/src/timeline/DelegateChooser.h +++ b/src/timeline/DelegateChooser.h @@ -74,7 +74,8 @@ private: DelegateIncubator(DelegateChooser &parent) : QQmlIncubator(QQmlIncubator::AsynchronousIfNested) , chooser(parent) - {} + { + } void statusChanged(QQmlIncubator::Status status) override; DelegateChooser &chooser; diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h index 8590d84f..7df556e8 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h @@ -48,7 +48,8 @@ class InputVideoSurface : public QAbstractVideoSurface public: InputVideoSurface(QObject *parent) : QAbstractVideoSurface(parent) - {} + { + } bool present(const QVideoFrame &frame) override; diff --git a/src/timeline/PresenceEmitter.h b/src/timeline/PresenceEmitter.h index 6cbfa96a..7028c501 100644 --- a/src/timeline/PresenceEmitter.h +++ b/src/timeline/PresenceEmitter.h @@ -19,7 +19,8 @@ class PresenceEmitter : public QObject public: PresenceEmitter(QObject *p = nullptr) : QObject(p) - {} + { + } void sync(const std::vector<mtx::events::Event<mtx::events::presence::Presence>> &presences); diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 36e21e53..34568385 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1467,7 +1467,8 @@ struct SendMessageVisitor { explicit SendMessageVisitor(TimelineModel *model) : model_(model) - {} + { + } template<typename T, mtx::events::EventType Event> void sendRoomEvent(mtx::events::RoomEvent<T> msg) @@ -1491,7 +1492,8 @@ struct SendMessageVisitor // Do-nothing operator for all unhandled events template<typename T> void operator()(const mtx::events::Event<T> &) - {} + { + } // Operator for m.room.message events that contain a msgtype in their content template<typename T, diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index a098f1bd..e16e79b0 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -152,7 +152,8 @@ class StateKeeper public: StateKeeper(std::function<void()> &&fn) : fn_(std::move(fn)) - {} + { + } ~StateKeeper() { fn_(); } diff --git a/src/ui/HiddenEvents.h b/src/ui/HiddenEvents.h index e61cac0a..3c0e0c67 100644 --- a/src/ui/HiddenEvents.h +++ b/src/ui/HiddenEvents.h @@ -18,7 +18,8 @@ class HiddenEvents : public QObject public: explicit HiddenEvents(QObject *p = nullptr) : QObject(p) - {} + { + } Q_INVOKABLE void toggle(int type); Q_INVOKABLE void save(); diff --git a/src/ui/NhekoCursorShape.cpp b/src/ui/NhekoCursorShape.cpp index 10a6ddab..1c5918b4 100644 --- a/src/ui/NhekoCursorShape.cpp +++ b/src/ui/NhekoCursorShape.cpp @@ -10,7 +10,8 @@ NhekoCursorShape::NhekoCursorShape(QQuickItem *parent) : QQuickItem(parent) , currentShape_(Qt::CursorShape::ArrowCursor) -{} +{ +} Qt::CursorShape NhekoCursorShape::cursorShape() const diff --git a/src/ui/UIA.h b/src/ui/UIA.h index c7c88675..9c10dade 100644 --- a/src/ui/UIA.h +++ b/src/ui/UIA.h @@ -20,7 +20,8 @@ public: UIA(QObject *parent = nullptr) : QObject(parent) - {} + { + } mtx::http::UIAHandler genericHandler(QString context); diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h index 0f94914d..1675c0e5 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h @@ -39,7 +39,8 @@ class UserProfileFetchProxy : public QObject public: UserProfileFetchProxy(QObject *p = nullptr) : QObject(p) - {} + { + } signals: void profileFetched(mtx::responses::Profile); @@ -58,7 +59,8 @@ public: , verification_status(verification_status_) , lastIp(lastIp_) , lastTs(lastTs_) - {} + { + } DeviceInfo(const QString deviceID, const QString displayName, verification::Status verification_status_) @@ -66,10 +68,12 @@ public: , display_name(displayName) , verification_status(verification_status_) , lastTs(0) - {} + { + } DeviceInfo() : verification_status(verification::UNVERIFIED) - {} + { + } QString device_id; QString display_name; diff --git a/src/voip/CallDevices.cpp b/src/voip/CallDevices.cpp index 4ab3adc5..49eca6d5 100644 --- a/src/voip/CallDevices.cpp +++ b/src/voip/CallDevices.cpp @@ -20,7 +20,8 @@ extern "C" CallDevices::CallDevices() : QObject() -{} +{ +} #ifdef GSTREAMER_AVAILABLE namespace { diff --git a/src/voip/CallDevices.h b/src/voip/CallDevices.h index cecb6357..4b2c1e48 100644 --- a/src/voip/CallDevices.h +++ b/src/voip/CallDevices.h @@ -43,6 +43,6 @@ private: GstDevice *videoDevice(std::pair<int, int> &resolution, std::pair<int, int> &frameRate) const; public: - CallDevices(CallDevices const &) = delete; + CallDevices(CallDevices const &) = delete; void operator=(CallDevices const &) = delete; }; diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp index 48e878e8..49a5cca0 100644 --- a/src/voip/WebRTCSession.cpp +++ b/src/voip/WebRTCSession.cpp @@ -1153,7 +1153,8 @@ WebRTCSession::acceptAnswer(const std::string &) void WebRTCSession::acceptICECandidates( const std::vector<mtx::events::voip::CallCandidates::Candidate> &) -{} +{ +} bool WebRTCSession::isMicMuted() const @@ -1169,10 +1170,12 @@ WebRTCSession::toggleMicMute() void WebRTCSession::toggleLocalPiP() -{} +{ +} void WebRTCSession::end() -{} +{ +} #endif diff --git a/src/voip/WebRTCSession.h b/src/voip/WebRTCSession.h index ac1845c7..0c5ebcc7 100644 --- a/src/voip/WebRTCSession.h +++ b/src/voip/WebRTCSession.h @@ -113,6 +113,6 @@ private: void clear(); public: - WebRTCSession(WebRTCSession const &) = delete; + WebRTCSession(WebRTCSession const &) = delete; void operator=(WebRTCSession const &) = delete; }; |