update

zhuzichu520 · Apr 11, 2024 · 3f6ef13 · 3f6ef13
1 parent 96fef84
commit 3f6ef13
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 79 deletions.
diff --git a/example/src/app_dmp.h b/example/src/app_dmp.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "misc-misplaced-const"
 
 #include <Windows.h>
 #include <DbgHelp.h>
@@ -78,6 +76,4 @@ LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
     arguments << "-crashed=" + dumpFilePath;
     QProcess::startDetached(QGuiApplication::applicationFilePath(), arguments);
     return EXCEPTION_EXECUTE_HANDLER;
-}
-
-#pragma clang diagnostic pop
+}
diff --git a/example/src/component/CircularReveal.h b/example/src/component/CircularReveal.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "NotImplementedFunctions"
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -31,5 +29,3 @@ Q_PROPERTY_AUTO(int, radius)
     QPoint _center;
     QSharedPointer<QQuickItemGrabResult> _grabResult;
 };
-
-#pragma clang diagnostic pop
diff --git a/example/src/component/FileWatcher.h b/example/src/component/FileWatcher.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "NotImplementedFunctions"
 
 #include <QObject>
 #include <QFileSystemWatcher>
@@ -21,5 +19,3 @@ Q_PROPERTY_AUTO(QString, path);
 private:
     QFileSystemWatcher _watcher;
 };
-
-#pragma clang diagnostic pop
diff --git a/example/src/component/OpenGLItem.h b/example/src/component/OpenGLItem.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "NotImplementedFunctions"
 
 #include <QtQuick/QQuickItem>
 #include <QOpenGLFunctions>
@@ -14,11 +12,11 @@ Q_OBJECT
 public:
     explicit OpenGLItem(QQuickItem *parent = nullptr);
 
-    [[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
+    QQuickFramebufferObject::Renderer *createRenderer() const override;
 
     void timerEvent(QTimerEvent *) override;
 
-    [[nodiscard]] qreal t() const { return m_t; }
+    qreal t() const { return m_t; }
 
     void setT(qreal t);
 
@@ -29,5 +27,3 @@ Q_OBJECT
 private:
     qreal m_t{};
 };
-
-#pragma clang diagnostic pop
diff --git a/example/src/helper/InitializrHelper.h b/example/src/helper/InitializrHelper.h
@@ -1,5 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "NotImplementedFunctions"
 #pragma once
 
 #include <QObject>
@@ -30,5 +28,3 @@ SINGLETON(InitializrHelper)
 
     Q_SIGNAL void success(const QString &path);
 };
-
-#pragma clang diagnostic pop
diff --git a/example/src/helper/Network.cpp b/example/src/helper/Network.cpp
@@ -1,7 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "UnusedParameter"
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-
 #include "Network.h"
 
 #include <QUrlQuery>
@@ -666,5 +662,3 @@ NetworkParams *Network::deleteJsonArray(const QString &url) {
 void Network::setInterceptor(QJSValue interceptor) {
     this->_interceptor = std::move(interceptor);
 }
-
-#pragma clang diagnostic pop
diff --git a/example/src/helper/Network.h b/example/src/helper/Network.h
@@ -1,6 +1,4 @@
 #pragma once
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "NotImplementedFunctions"
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -206,13 +204,13 @@ SINGLETON(Network)
     void handleDownload(NetworkParams *params, NetworkCallable *result);
 
 private:
-    static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable>& callable);
+    static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable);
 
     static void addQueryParam(QUrl *url, const QMap<QString, QVariant> &params);
 
     static void addHeaders(QNetworkRequest *request, const QMap<QString, QVariant> &headers);
 
-    void saveResponse(const QString& key, const QString& response);
+    void saveResponse(const QString &key, const QString &response);
 
     QString readCache(const QString &key);
 
@@ -222,14 +220,12 @@ SINGLETON(Network)
 
     static QString headerList2String(const QList<QNetworkReply::RawHeaderPair> &data);
 
-    static void printRequestStartLog(const QNetworkRequest& request, NetworkParams *params);
+    static void printRequestStartLog(const QNetworkRequest &request, NetworkParams *params);
 
-    static void printRequestEndLog(const QNetworkRequest& request, NetworkParams *params, QNetworkReply *&reply, const QString &response);
+    static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response);
 
     static QString map2String(const QMap<QString, QVariant> &map);
 
 public:
     QJSValue _interceptor;
 };
-
-#pragma clang diagnostic pop
diff --git a/example/src/helper/SettingsHelper.cpp b/example/src/helper/SettingsHelper.cpp
@@ -1,6 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-
 #include "SettingsHelper.h"
 
 #include <QDataStream>
@@ -31,5 +28,3 @@ void SettingsHelper::init(char *argv[]) {
     const QString iniFilePath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + iniFileName;
     m_settings.reset(new QSettings(iniFilePath, QSettings::IniFormat));
 }
-
-#pragma clang diagnostic pop
diff --git a/example/src/helper/SettingsHelper.h b/example/src/helper/SettingsHelper.h
@@ -1,5 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
 #pragma once
 
 #include <QtCore/qobject.h>
@@ -43,4 +41,3 @@ SINGLETON(SettingsHelper)
 private:
     QScopedPointer<QSettings> m_settings;
 };
-#pragma clang diagnostic pop
diff --git a/src/FluTools.cpp b/src/FluTools.cpp
@@ -1,7 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#pragma ide diagnostic ignored "readability-convert-member-functions-to-static"
-
 #include "FluTools.h"
 
 #include <QGuiApplication>
@@ -248,5 +244,3 @@ bool FluTools::isWindows10OrGreater() {
 QRect FluTools::desktopAvailableGeometry(QQuickWindow *window) {
     return window->screen()->availableGeometry();
 }
-
-#pragma clang diagnostic pop
diff --git a/src/FluTools.h b/src/FluTools.h
@@ -1,5 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
 #pragma once
 
 #include <QObject>
@@ -94,6 +92,4 @@ SINGLETON(FluTools)
     Q_INVOKABLE bool isWindows10OrGreater();
 
     Q_INVOKABLE QRect desktopAvailableGeometry(QQuickWindow *window);
-};
-
-#pragma clang diagnostic pop
+};
diff --git a/src/FluTreeModel.cpp b/src/FluTreeModel.cpp
@@ -1,7 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#pragma ide diagnostic ignored "google-default-arguments"
-
 #include "FluTreeModel.h"
 
 #include <QMetaEnum>
@@ -276,5 +272,3 @@ void FluTreeModel::allCollapse() {
     _rows = _root->_children;
     endResetModel();
 }
-
-#pragma clang diagnostic pop
diff --git a/src/FluTreeModel.h b/src/FluTreeModel.h
@@ -1,6 +1,3 @@
-#pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#pragma ide diagnostic ignored "google-default-arguments"
 #pragma once
 
 #include <QObject>
@@ -22,10 +19,10 @@ Q_OBJECT
 public:
     explicit FluTreeNode(QObject *parent = nullptr);
 
-    Q_INVOKABLE [[nodiscard]] int depth() const { return _depth; };
-    Q_INVOKABLE [[nodiscard]] bool isExpanded() const { return _isExpanded; };
-    Q_INVOKABLE [[nodiscard]] QVariantMap data() const { return _data; };
-    Q_INVOKABLE [[nodiscard]] bool hasChildren() const { return !_children.isEmpty(); };
+    Q_INVOKABLE int depth() const { return _depth; };
+    Q_INVOKABLE bool isExpanded() const { return _isExpanded; };
+    Q_INVOKABLE QVariantMap data() const { return _data; };
+    Q_INVOKABLE bool hasChildren() const { return !_children.isEmpty(); };
     Q_INVOKABLE bool hasNextNodeByIndex(int index) {
         FluTreeNode *p = this;
         for (int i = 0; i <= _depth - index - 1; i++) {
@@ -37,7 +34,7 @@ Q_OBJECT
         return true;
     }
 
-    Q_INVOKABLE [[nodiscard]] bool checked() const {
+    Q_INVOKABLE bool checked() const {
         if (!hasChildren()) {
             return _checked;
         }
@@ -63,7 +60,7 @@ Q_OBJECT
         return false;
     };
 
-    [[nodiscard]] bool isShown() const {
+    bool isShown() const {
         auto p = _parent;
         while (p) {
             if (!p->_isExpanded) {
@@ -99,17 +96,17 @@ Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
 
     explicit FluTreeModel(QObject *parent = nullptr);
 
-    [[nodiscard]] int rowCount(const QModelIndex &parent = {}) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
 
-    [[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
+    int columnCount(const QModelIndex &parent = {}) const override;
 
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+    QHash<int, QByteArray> roleNames() const override;
 
-    [[nodiscard]] QModelIndex parent(const QModelIndex &child) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
 
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override;
 
     Q_INVOKABLE void removeRows(int row, int count);
 
@@ -144,5 +141,3 @@ Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
     QList<FluTreeNode *> _dataSource;
     FluTreeNode *_root = nullptr;
 };
-
-#pragma clang diagnostic pop