build: migrate to qt 5.15

1 files changed, 45 insertions, 52 deletions

diff --git a/src/dictionaries.cpp b/src/dictionaries.cpp
index 5ae6cc3..9538582 100644
--- a/src/dictionaries.cpp
+++ b/src/dictionaries.cpp
@@ -1,73 +1,66 @@
 #include "dictionaries.h"
-#include <QDir>
+#include "utils.h"
 #include <QCoreApplication>
+#include <QDir>
 #include <QLibraryInfo>
 #include <QString>
 #include <QStringList>
-#include "utils.h"
 
-static QString DICTIONARY_FILE_SUFFIX = ".bdic";
 
-Dictionaries::Dictionaries(QObject *parent) : QObject(parent)
-{
-     setParent(parent);
-}
+QString DICTIONARY_FILE_SUFFIX = ".bdic";
 
-Dictionaries::~Dictionaries()
-{
-    this->deleteLater();
+Dictionaries::Dictionaries(QObject *parent) : QObject(parent) {
+  setParent(parent);
 }
 
+Dictionaries::~Dictionaries() { this->deleteLater(); }
 
-QString Dictionaries::GetDictionaryPath()
-{
-    QString dict_path;
-
-    // the environment variable takes precedence on all platforms
-    if (qEnvironmentVariableIsSet("QTWEBENGINE_DICTIONARIES_PATH")) {
-        dict_path = utils::GetEnvironmentVar("QTWEBENGINE_DICTIONARIES_PATH");
-        return dict_path;
-    }
-
-    // next look relative to the executable
-    dict_path = QCoreApplication::applicationDirPath() + "/qtwebengine_dictionaries";
+QString Dictionaries::GetDictionaryPath() {
+  QString dict_path;
 
+  // the environment variable takes precedence on all platforms
+  if (qEnvironmentVariableIsSet("QTWEBENGINE_DICTIONARIES_PATH")) {
+    dict_path = utils::GetEnvironmentVar("QTWEBENGINE_DICTIONARIES_PATH");
+    return dict_path;
+  }
 
-    if (QDir(dict_path).exists()) {
-        return dict_path;
-    }
+  // next look relative to the executable
+  dict_path =
+      QCoreApplication::applicationDirPath() + "/qtwebengine_dictionaries";
 
-    //inside the installed Qt directories
-    dict_path = QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtwebengine_dictionaries";
+  if (QDir(dict_path).exists()) {
+    return dict_path;
+  }
 
+  // inside the installed Qt directories
+  dict_path = QLibraryInfo::location(QLibraryInfo::DataPath) +
+              "/qtwebengine_dictionaries";
 
-    if (QDir(dict_path).exists()) {
-        return dict_path;
-    }
+  if (QDir(dict_path).exists()) {
+    return dict_path;
+  }
 
-    return QString();
+  return QString();
 }
 
-
-QStringList Dictionaries::GetDictionaries()
-{
-    QStringList dictionaries;
-    QString dict_path = GetDictionaryPath();
-    if (dict_path.isEmpty()) {
-        return dictionaries;
-    }
-    QDir dictDir(dict_path);
-    if (dictDir.exists()) {
-        QStringList filters;
-        // Look for all *.bdic files.
-        filters << "*" + DICTIONARY_FILE_SUFFIX;
-        dictDir.setNameFilters(filters);
-        QStringList dictionary_files = dictDir.entryList();
-        foreach(QString file, dictionary_files) {
-            QFileInfo fileInfo(file);
-            QString dname = fileInfo.baseName();
-            dictionaries.append(dname);
-        }
-    }
+QStringList Dictionaries::GetDictionaries() {
+  QStringList dictionaries;
+  QString dict_path = GetDictionaryPath();
+  if (dict_path.isEmpty()) {
     return dictionaries;
+  }
+  QDir dictDir(dict_path);
+  if (dictDir.exists()) {
+    QStringList filters;
+    // Look for all *.bdic files.
+    filters << "*" + DICTIONARY_FILE_SUFFIX;
+    dictDir.setNameFilters(filters);
+    QStringList dictionary_files = dictDir.entryList();
+    foreach (QString file, dictionary_files) {
+      QFileInfo fileInfo(file);
+      QString dname = fileInfo.baseName();
+      dictionaries.append(dname);
+    }
+  }
+  return dictionaries;
 }