Fixes for Qt6 and MSVC

nomacs · Jun 30, 2024 · efd0242 · efd0242
1 parent 40aa26e
commit efd0242
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ImageLounge/src/DkCore/DkActionManager.cpp b/ImageLounge/src/DkCore/DkActionManager.cpp
@@ -251,7 +251,7 @@ void DkAppManager::assignIcon(QAction *app) const
         return;
     }
 
-    QFileInfo file = app->toolTip();
+    QFileInfo file(app->toolTip());
 
     if (!file.exists())
         return;

diff --git a/ImageLounge/src/DkCore/DkImageLoader.cpp b/ImageLounge/src/DkCore/DkImageLoader.cpp
@@ -197,7 +197,7 @@ bool DkImageLoader::loadZipArchive(const QString &zipPath)
     QFileInfoList fileInfoList;
     // encode both the input zip file and the output image into a single fileInfo
     for (const QString &filePath : fileList)
-        fileInfoList.append(DkZipContainer::encodeZipFile(zipPath, filePath));
+        fileInfoList.append(QFileInfo(DkZipContainer::encodeZipFile(zipPath, filePath)));
 
     QFileInfo zipInfo(zipPath);
 

diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
@@ -96,7 +96,7 @@
 #include <winsock2.h> // needed since libraw 0.16
 #endif
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #include <QWinTaskbarButton>
 #endif
 
@@ -1127,7 +1127,7 @@ void DkNoMacs::openFile()
 
         if (!dup) {
             // > 1: only open in tab if more than one file is opened
-            bool newTab = filePaths.size() > 1 | getTabWidget()->getTabs().size() > 1;
+            bool newTab = (filePaths.size() > 1) || (getTabWidget()->getTabs().size() > 1);
             getTabWidget()->loadFile(fp, newTab);
         }
     }
@@ -1584,7 +1584,7 @@ void DkNoMacs::onWindowLoaded()
     getTabWidget()->loadSettings();
 
 // init global taskbar
-#ifdef WIN32
+#if defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     QWinTaskbarButton *button = new QWinTaskbarButton(this);
     button->setWindow(windowHandle());
-Original file line number
+Diff line change
@@ Expand Up / @@ -251,7 +251,7 @@ void DkAppManager::assignIcon(QAction *app) const @@
             return;
         }
-        QFileInfo file = app->toolTip();
+        QFileInfo file(app->toolTip());
         if (!file.exists())
             return;
@@ Expand Down @@