minor fixes

psi-im · Mar 16, 2024 · cb14602 · cb14602
1 parent b1d08ae
commit cb14602
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/iris b/iris
diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
@@ -334,7 +334,11 @@ QString ApplicationInfo::currentProfileDir(ApplicationInfo::HomedirType type)
     return pathToProfile(activeProfile, type);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 QString ApplicationInfo::desktopFileBaseName() { return QLatin1String(xstr(APP_BIN_NAME) ".desktop"); }
+#else
+QString ApplicationInfo::desktopFileBaseName() { return QLatin1String(xstr(APP_BIN_NAME)); }
+#endif
 
 QString ApplicationInfo::desktopFile()
 {

diff --git a/src/vcardfactory.cpp b/src/vcardfactory.cpp
@@ -169,7 +169,10 @@ VCard VCardFactory::vcard(const Jid &j)
 
     // then try to load from cache on disk
     QFile file(ApplicationInfo::vCardDir() + '/' + JIDUtil::encode(j.bare()).toLower() + ".xml");
-    file.open(QIODevice::ReadOnly);
+    if (!file.open(QIODevice::ReadOnly)) {
+        // REVIEW we can cache which files were really missed. or maybe set a flag for the contact
+        return {};
+    }
     QDomDocument doc;
 
     if (doc.setContent(&file, false)) {
@@ -180,7 +183,7 @@ VCard VCardFactory::vcard(const Jid &j)
         }
     }
 
-    return VCard();
+    return {};
 }
 
 /**

diff --git a/src/whiteboarding/wbmanager.cpp b/src/whiteboarding/wbmanager.cpp
@@ -114,7 +114,7 @@ void WbManager::openWhiteboard(const Jid &target, const Jid &ownJid, bool groupC
 
                 QFile file(fileName);
                 if (file.open(QIODevice::ReadOnly)) {
-                    doc.setContent(file.readAll(), true);
+                    doc.setContent(&file, true);
                     file.close();
                 }
             }