Add comments

Author: KangLin

App/Client/Favorite/FavoriteView.cpp

@@ -207,17 +207,22 @@ void CFavoriteView::setupTreeView(QLayout *layout)
     //m_pTreeView->installEventFilter(this);
 }
 
-void CFavoriteView::Initial()
+int CFavoriteView::Initial()
 {
+    int nRet = 0;
     m_pDatabase = new CFavoriteDatabase(this);
-    if(m_pDatabase)
-        m_pDatabase->OpenDatabase(&m_pParaApp->m_Database, "favorite_connect");
+    if(m_pDatabase) {
+        bool bRet = m_pDatabase->OpenDatabase(&m_pParaApp->m_Database, "favorite_connect");
+        if(!bRet)
+            return -1;
+    }
     if(m_pDatabase) {
         m_pModel = new CFavoriteModel(m_pDatabase, this);
         m_pTreeView->setModel(m_pModel);
     }
 
     EnableAction();
+    return nRet;
 }
 
 void CFavoriteView::EnableAction(const QModelIndex &index)

App/Client/Favorite/FavoriteView.h

@@ -23,7 +23,7 @@ class CFavoriteView : public QWidget
     explicit CFavoriteView(CParameterApp* pPara, QWidget *parent = nullptr);
     virtual ~CFavoriteView();
 
-    void Initial();
+    [[nodiscard]] int Initial();
     RabbitCommon::CTitleBar* m_pDockTitleBar;
 
 public Q_SLOTS:

App/Client/Recent/FrmRecent.cpp

@@ -183,7 +183,8 @@ CFrmRecent::~CFrmRecent()
 int CFrmRecent::Init()
 {
     if(!m_Database.IsOpen()) {
-        m_Database.OpenDatabase(&m_ParameterApp.m_Database, "recent_connection");
+        bool bRet = m_Database.OpenDatabase(&m_ParameterApp.m_Database, "recent_connection");
+        if(!bRet) return -1;
     }
     m_pModel = new CRecentModel(&m_ParameterApp, &m_Database, m_pTableView);
     m_pTableView->setModel(m_pModel);

App/Client/Recent/FrmRecent.h

@@ -34,7 +34,7 @@ class CFrmRecent : public QWidget, CManager::Handle
 
     RabbitCommon::CTitleBar* m_pDockTitleBar;
 
-    int Init();
+    [[nodiscard]] int Init();
     int AddRecent(const CRecentDatabase::RecentItem &item);
     bool UpdateRecent(const CRecentDatabase::RecentItem &item);
     QList<CRecentDatabase::RecentItem> GetRecents(int limit = -1, int offset = 0);

App/Client/main.cpp

@@ -165,12 +165,18 @@ int main(int argc, char *argv[])
     try {
         //w->setWindowIcon(QIcon::themeName("app"));
         //w->setWindowTitle(app.applicationDisplayName());
-        
+        app.processEvents();
         w->show();
         app.processEvents();
         // For time-consuming operations
-        w->slotInitial();
-        nRet = app.exec();
+        nRet = w->Initial();
+        if(nRet) {
+            qCritical(log) << "Initialize error";
+            QMessageBox::critical(nullptr, QObject::tr("Error"),
+                                  QObject::tr("Initialize error"));
+        }
+        else
+            nRet = app.exec();
     } catch (std::exception &e) {
         qCritical(log) << "exception:" << e.what();
     } catch(...) {

App/Client/mainwindow.cpp

@@ -399,8 +399,9 @@ MainWindow::~MainWindow()
 }
 
 //! For time-consuming operations
-void MainWindow::slotInitial()
+int MainWindow::Initial()
 {
+    int nRet = 0;
     qDebug(log) << Q_FUNC_INFO;
 
     QMessageBox box(QMessageBox::Information, tr("Load"), tr("Load ......"));
@@ -413,7 +414,8 @@ void MainWindow::slotInitial()
     box.setText(szMsg);
     slotInformation(szMsg);
     qApp->processEvents();
-    m_Manager.Initial();
+    nRet = m_Manager.Initial();
+    if(nRet) return nRet;
     m_Manager.EnumPlugins(this);
 
     if(m_Manager.GetGlobalParameters())
@@ -424,7 +426,8 @@ void MainWindow::slotInitial()
         box.setText(szMsg);
         slotInformation(szMsg);
         qApp->processEvents();
-        m_pRecent->Init();
+        nRet = m_pRecent->Init();
+        if(nRet) return nRet;
     }
 
     if(m_pRecentMenu) {
@@ -446,7 +449,8 @@ void MainWindow::slotInitial()
         box.setText(szMsg);
         slotInformation(szMsg);
         qApp->processEvents();
-        m_pFavoriteView->Initial();
+        nRet = m_pFavoriteView->Initial();
+        if(nRet) return nRet;
     }
 
     slotEnableSystemTrayIcon();
@@ -457,11 +461,12 @@ void MainWindow::slotInitial()
     box.setText(szMsg);
     slotInformation(szMsg);
     qApp->processEvents();
-    LoadOperateLasterClose();
+    nRet = LoadOperateLasterClose();
+    if(nRet) return nRet;
 
     slotInformation(tr("Ready"));
 
-    return;
+    return nRet;
 }
 
 void MainWindow::SetView(CView* pView)
@@ -1531,7 +1536,9 @@ void MainWindow::on_actionOpenListRecent_triggered()
                     m_pFavoriteView, SLOT(slotAddToFavorite(QString,QString,QString,QIcon)));
     Q_ASSERT(check);
 
-    p->Init();
+    int nRet = p->Init();
+    if(nRet) return;
+
     QDialog d;
     d.resize(540, 400);
     d.setWindowIcon(windowIcon());

App/Client/mainwindow.h

@@ -41,7 +41,7 @@ class MainWindow : public QMainWindow, CManager::Handle
     virtual ~MainWindow() override;
 public:
     //! For time-consuming operations
-    void slotInitial();
+    [[nodiscard]] int Initial();
 
 Q_SIGNALS:
     void sigFullScreen(bool bFullScreen);

CMakeLists.txt

@@ -9,9 +9,19 @@ project(RabbitRemoteControl
     )
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_CXX_STANDARD 17)
+# 确保编译器支持 C++17
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
+# 避免使用编译器特定的扩展语法，从而提高跨平台一致性。
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(CMAKE_C_STANDARD 17)
+# 确保编译器支持 C17
+set(CMAKE_C_STANDARD_REQUIRED ON)
+# 避免使用编译器特定的扩展语法，从而提高跨平台一致性。
+set(CMAKE_C_EXTENSIONS OFF)
+
 #set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "verbose")
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 

Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp

@@ -313,7 +313,7 @@ void CBookmarkDatabase::buildBookmarkTree(QDomDocument &doc,
     // 获取该文件夹下的书签
     QList<BookmarkItem> bookmarks = getAllBookmarks(folderId);
 
-    for (const auto &bookmark : bookmarks) {
+    foreach (const auto &bookmark, bookmarks) {
         QDomElement dtElement = doc.createElement("DT");
         parentElement.appendChild(dtElement);
 
@@ -324,7 +324,7 @@ void CBookmarkDatabase::buildBookmarkTree(QDomDocument &doc,
     // 获取子文件夹
     QList<BookmarkItem> subFolders = getSubFolders(folderId);
 
-    for (const auto &folder : subFolders) {
+    foreach (const auto &folder, subFolders) {
         // 创建文件夹
         QDomElement dtElement = doc.createElement("DT");
         parentElement.appendChild(dtElement);
@@ -682,7 +682,7 @@ int CBookmarkDatabase::getOrCreateFolder(const QString &folderPath,
     int currentParentId = 0;
 
     // 逐级创建文件夹
-    for (const QString &part : pathParts) {
+    foreach (const QString &part, pathParts) {
         if (part.isEmpty()) continue;
 
         currentParentId = getOrCreateFolder(part, currentParentId);

Plugins/WebBrowser/Bookmark/BookmarkDatabase.h

@@ -36,11 +36,11 @@ struct BookmarkItem {
         , type(BookmarkType_Bookmark)
     {}
 
-    bool isFolder() const { return type == BookmarkType_Folder; }
-    bool isSeparator() const { return type == BookmarkType_Separator; }
-    bool isBookmark() const { return type == BookmarkType_Bookmark; }
+    [[nodiscard]] bool isFolder() const { return type == BookmarkType_Folder; }
+    [[nodiscard]] bool isSeparator() const { return type == BookmarkType_Separator; }
+    [[nodiscard]] bool isBookmark() const { return type == BookmarkType_Bookmark; }
 
-    QIcon getIcon() const {
+    [[nodiscard]] QIcon getIcon() const {
         if (!icon.isNull()) {
             return icon;
         }
@@ -80,23 +80,23 @@ class CBookmarkDatabase : public CDatabase
     bool moveFolder(int folderId, int newParentId);
 
     // 查询操作
-    BookmarkItem getBookmark(int id);
-    QList<BookmarkItem> getBookmarkByUrl(const QString &url);
-    QList<BookmarkItem> getAllBookmarks(int folderId = 0);
-    QList<BookmarkItem> searchBookmarks(const QString &keyword);
+    [[nodiscard]] BookmarkItem getBookmark(int id);
+    [[nodiscard]] QList<BookmarkItem> getBookmarkByUrl(const QString &url);
+    [[nodiscard]] QList<BookmarkItem> getAllBookmarks(int folderId = 0);
+    [[nodiscard]] QList<BookmarkItem> searchBookmarks(const QString &keyword);
 
     // 文件夹查询
-    QList<BookmarkItem> getAllFolders();
-    QList<BookmarkItem> getSubFolders(int folderId);
+    [[nodiscard]] QList<BookmarkItem> getAllFolders();
+    [[nodiscard]] QList<BookmarkItem> getSubFolders(int folderId);
 
     // 导入导出
     bool importFromHtml(const QString &filename);
     bool exportToHtml(const QString &filename);
     bool importFromBrowser(const QString &browserName);
 
-    TreeItem BookmarkToTree(const BookmarkItem& tree, bool setKey = false);
-    BookmarkItem TreeToBookmark(const TreeItem& tree);
-    BookmarkItem TreeToBookmark(const TreeItem& item, const CDatabaseUrl::UrlItem& url);
+    [[nodiscard]] TreeItem BookmarkToTree(const BookmarkItem& tree, bool setKey = false);
+    [[nodiscard]] BookmarkItem TreeToBookmark(const TreeItem& tree);
+    [[nodiscard]] BookmarkItem TreeToBookmark(const TreeItem& item, const CDatabaseUrl::UrlItem& url);
 
 signals:
     void bookmarksChanged();
@@ -110,7 +110,7 @@ class CBookmarkDatabase : public CDatabase
 private:
     explicit CBookmarkDatabase(QObject *parent = nullptr);
     ~CBookmarkDatabase();
-    bool OnInitializeDatabase() override;
+    [[nodiscard]] bool OnInitializeDatabase() override;
 
     void buildBookmarkDocument(QDomDocument &doc);
     void buildBookmarkTree(