More compile-time strings

oblivioncth · Jul 23, 2023 · 69596c5 · 69596c5
1 parent abd460d
commit 69596c5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "6812df5c1fe1c584a9dfa0ded76db8727ca059b5"
+    REF "5c4b3a0f84f6d4e42da9a431f887aafdfb9aae32"
     COMPONENTS
         ${CLIFP_QX_COMPONENTS}
 )
@@ -118,4 +118,3 @@ ob_standard_project_misc_install()
 
 include(OB/Packaging)
 ob_standard_project_package(VENDOR "oblivioncth")
-
diff --git a/app/src/command/c-run.cpp b/app/src/command/c-run.cpp
@@ -54,7 +54,7 @@ Qx::Error CRun::perform()
     if(Qx::Error ee = mCore.enqueueStartupTasks(); ee.isValid())
         return ee;
 
-    QString inputPath = mCore.resolveTrueAppPath(mParser.value(CL_OPTION_APP), ""); // No way of knowing platform
+    QString inputPath = mCore.resolveTrueAppPath(mParser.value(CL_OPTION_APP), u""_s); // No way of knowing platform
     QFileInfo inputInfo = QFileInfo(mCore.fpInstall().fullPath() + '/' + inputPath);
 
     TExec* runTask = new TExec(&mCore);

diff --git a/app/src/kernel/core.cpp b/app/src/kernel/core.cpp
@@ -418,7 +418,7 @@ CoreError Core::enqueueStartupTasks()
     xhostSet->setStage(Task::Stage::Startup);
     xhostSet->setExecutable(u"xhost"_s);
     xhostSet->setDirectory(mFlashpointInstall->fullPath());
-    xhostSet->setParameters({"+SI:localuser:root"});
+    xhostSet->setParameters({u"+SI:localuser:root"_s});
     xhostSet->setProcessType(TExec::ProcessType::Blocking);
 
     mTaskQueue.push(xhostSet);

diff --git a/app/src/task/task.cpp b/app/src/task/task.cpp
@@ -23,7 +23,7 @@ Task::Task(QObject* parent) :
 
 //-Instance Functions-------------------------------------------------------------
 //Public:
-QStringList Task::members() const { return {".stage() = " + ENUM_NAME(mStage)}; }
+QStringList Task::members() const { return {u".stage() = "_s + ENUM_NAME(mStage)}; }
 
 Task::Stage Task::stage() const { return mStage; }
 void Task::setStage(Stage stage) { mStage = stage; }