1 files changed, 15 insertions, 8 deletions
diff --git a/options/globals.cpp b/options/globals.cpp
index 33327090..0f0e536b 100644
--- a/options/globals.cpp
+++ b/options/globals.cpp
@@ -11,14 +11,15 @@ namespace options::globals::detail {
 
 ini_ctx::ini_ctx() = default;
 
-bool is_portable_installation()
+static bool is_portable_installation()
 {
 #if defined _WIN32
     // must keep consistent between invocations
     static const bool ret = QFile::exists(OPENTRACK_BASE_PATH + "/portable.txt");
     return ret;
-#endif
+#else
     return false;
+#endif
 }
 
 saver_::~saver_()
@@ -104,9 +105,9 @@ bool is_ini_modified()
 QString ini_filename()
 {
     return with_global_settings_object([&](QSettings& settings) {
-        const QString ret = settings.value(OPENTRACK_CONFIG_FILENAME_KEY, OPENTRACK_DEFAULT_CONFIG).toString();
+        const QString ret = settings.value(OPENTRACK_PROFILE_FILENAME_KEY, OPENTRACK_DEFAULT_PROFILE).toString();
         if (ret.size() == 0)
-            return QStringLiteral(OPENTRACK_DEFAULT_CONFIG);
+            return QStringLiteral(OPENTRACK_DEFAULT_PROFILE);
         return ret;
     });
 }
@@ -116,7 +117,7 @@ QString ini_pathname()
     const auto dir = ini_directory();
     if (dir.isEmpty())
         return {};
-    return dir + "/" + ini_filename();
+    return dir + QStringLiteral("/") + ini_filename();
 }
 
 QString ini_combine(const QString& filename)
@@ -128,9 +129,9 @@ QStringList ini_list()
 {
     const auto dirname = ini_directory();
     if (dirname == "")
-        return QStringList();
+        return {};
     QDir settings_dir(dirname);
-    QStringList list = settings_dir.entryList( QStringList { "*.ini" } , QDir::Files, QDir::Name );
+    QStringList list = settings_dir.entryList( QStringList { QStringLiteral("*.ini") } , QDir::Files, QDir::Name );
     std::sort(list.begin(), list.end());
     return list;
 }
@@ -142,7 +143,7 @@ void mark_ini_modified(bool value)
     ini.mtx.unlock();
 }
 
-QString ini_directory()
+static QString ini_directory_()
 {
     QString dir;
 
@@ -172,4 +173,10 @@ QString ini_directory()
     return dir;
 }
 
+QString ini_directory()
+{
+    static const QString dir = ini_directory_();
+    return dir;
+}
+
 } // ns options::globals