fixes #12752 - added missing path seperator in GUI library lookup / u…

…se `qDebug()` for GUI library loading logging (#6529)
danmar · Jun 15, 2024 · 27f155c · 27f155c
1 parent 3c772a4
commit 27f155c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -836,16 +836,15 @@ void MainWindow::addIncludeDirs(const QStringList &includeDirs, Settings &result
     }
 }
 
-Library::Error MainWindow::loadLibrary(Library &library, const QString &filename, bool debug)
+Library::Error MainWindow::loadLibrary(Library &library, const QString &filename)
 {
     Library::Error ret;
 
     // Try to load the library from the project folder..
     if (mProjectFile) {
         QString path = QFileInfo(mProjectFile->getFilename()).canonicalPath();
         QString libpath = path+"/"+filename;
-        if (debug)
-            std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
         ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
@@ -854,14 +853,12 @@ Library::Error MainWindow::loadLibrary(Library &library, const QString &filename
     // Try to load the library from the application folder..
     const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
     QString libpath = appPath+"/"+filename;
-    if (debug)
-        std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+    qDebug().noquote() << "looking for library '" + libpath + "'";
     ret = library.load(nullptr, libpath.toLatin1());
     if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
         return ret;
     libpath = appPath+"/cfg/"+filename;
-    if (debug)
-        std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+    qDebug().noquote() << "looking for library '" + libpath + "'";
     ret = library.load(nullptr, libpath.toLatin1());
     if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
         return ret;
@@ -871,14 +868,12 @@ Library::Error MainWindow::loadLibrary(Library &library, const QString &filename
     const QString filesdir = FILESDIR;
     if (!filesdir.isEmpty()) {
         libpath = filesdir+"/cfg/"+filename;
-        if (debug)
-            std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
         ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
-        libpath = filesdir+filename;
-        if (debug)
-            std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+        libpath = filesdir+"/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
         ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
@@ -889,21 +884,18 @@ Library::Error MainWindow::loadLibrary(Library &library, const QString &filename
     const QString datadir = getDataDir();
     if (!datadir.isEmpty()) {
         libpath = datadir+"/"+filename;
-        if (debug)
-            std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
         ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
         libpath = datadir+"/cfg/"+filename;
-        if (debug)
-            std::cout << "looking for library '" + libpath.toStdString() + "'" << std::endl;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
         ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
     }
 
-    if (debug)
-        std::cout << "library not found: '" + filename.toStdString() + "'" << std::endl;
+    qDebug().noquote() << "library not found: '" + filename + "'";
 
     return ret;
 }

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -394,7 +394,7 @@ private slots:
      * @param filename filename (no path)
      * @return error code
      */
-    Library::Error loadLibrary(Library &library, const QString &filename, bool debug = false);
+    Library::Error loadLibrary(Library &library, const QString &filename);
 
     /**
      * @brief Tries to load library file, prints message on error