Fix compatible issues on Qt6 framework (#1487)

haiwen · Sep 8, 2023 · 5bc61af · 5bc61af
1 parent dee48d5
commit 5bc61af
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/src/seafile-applet.cpp b/src/seafile-applet.cpp
@@ -712,7 +712,7 @@ QVariant SeafileApplet::readPreconfigureEntry(const QString& key, const QVariant
     return value;
 }
 
-QString SeafileApplet::readPreconfigureExpandedString(const QString& key, const QString& default_value)
+QString SeafileApplet::readPreconfigureExpandedString(const QString& key, const QVariant& default_value)
 {
     QVariant retval = readPreconfigureEntry(key, default_value);
     if (retval.isNull() || retval.type() != QVariant::String)

diff --git a/src/seafile-applet.h b/src/seafile-applet.h
@@ -60,7 +60,7 @@ class SeafileApplet : QObject {
     // Read preconfigure settings
     QVariant readPreconfigureEntry(const QString& key, const QVariant& default_value = QVariant());
     // ExpandedVars String
-    QString readPreconfigureExpandedString(const QString& key, const QString& default_value = QString());
+    QString readPreconfigureExpandedString(const QString& key, const QVariant& default_value = QVariant());
 
     // Create a unique device id to replace obselete ccnet id
     QString getUniqueClientId();

diff --git a/src/utils/file-utils.cpp b/src/utils/file-utils.cpp
@@ -3,6 +3,7 @@
 #include <QDir>
 #include <QStringList>
 #include "stl.h"
+#include "utils.h"
 
 #ifdef Q_OS_WIN32
 #include <windows.h>
@@ -817,6 +818,7 @@ QString expandVars(const QString& origin)
         retval = QString::fromWCharArray(&expanded[0], expanded_size);
         // workaround with a bug
         retval = QString::fromUtf8(retval.toUtf8());
+        retval = trimNULL(retval);
     } else {
         retval = origin;
     }

diff --git a/src/utils/registry.cpp b/src/utils/registry.cpp
@@ -232,6 +232,7 @@ void RegElement::read()
 
     // workaround with a bug
     string_value_ = QString::fromUtf8(string_value_.toUtf8());
+    string_value_ = trimNULL(string_value_);
 
     return;
 }

diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -831,3 +831,10 @@ const QRect getScreenSize(int index) {
         return QRect();
     }
 }
+
+QString trimNULL(QString& s) {
+    if (s.endsWith(QChar::Null)) {
+        s.chop(1);
+    }
+    return s;
+}
diff --git a/src/utils/utils.h b/src/utils/utils.h
@@ -97,4 +97,6 @@ bool shouldUseFramelessWindow();
 
 const QRect getScreenSize(int index);
 
+QString trimNULL(QString& s);
+
 #endif