Minor conformancy changes

Author: oblivioncth

CMakeLists.txt

@@ -13,7 +13,7 @@ project(FIL
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("d64498ec2654e7f3145d7efa36bfaa73ac30cc74")
+fetch_ob_cmake("3010a962688a63689cdc365722423f5de40c3c59")
 
 # Initialize project according to standard rules
 include(OB/Project)
@@ -74,20 +74,20 @@ endif()
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "1bfe8bdb6047c1d6c3246e431652869e63cbe797"
+    REF "d12b1a3dd8445ba3bae1271e4a6fc6fcb0420dfd"
     COMPONENTS
         ${FIL_QX_COMPONENTS}
 )
 
 # Fetch libfp (build and import from source)
 include(OB/Fetchlibfp)
-ob_fetch_libfp("d2b1960b76c10537f2beb933206d42a31576ab07")
+ob_fetch_libfp("34ff2c06224a4b97b1f3d1bcdc514a537c8116a8")
 
 # Fetch CLIFp (build and import from source)
 include(OB/Utility)
 ob_cache_project_version(CLIFp)
 include(OB/FetchCLIFp)
-ob_fetch_clifp("f56246bad2504af08762d91ea1cc1361135c58ad")
+ob_fetch_clifp("1fa81edb32119d0f0cdf7f9aa2180078361ca62b")
 
 # TODO: The shared build of this is essentially useless as only the CLIFp executable
 # is deployed, which only works if it's statically linked. There isn't a simple way

app/src/kernel/clifp.cpp

@@ -32,14 +32,15 @@ Qx::VersionNumber CLIFp::installedVersion(const Fp::Install& fpInstall)
     {
 #ifdef _WIN32
         return Qx::FileDetails::readFileDetails(standardCLIFpPath(fpInstall)).fileVersion().normalized();
-#endif
+#else
         /* TODO: For now on Linux we just return a null version so that deployment always
          * occurs. Eventually, find a good way to grab version info from the installed ELF.
          *
          * Currently, we can't run it since it doesn't output to console, and there is no
          * standardized way to embed the info as part of the ELF structure.
          */
         return Qx::VersionNumber();
+#endif
     }
 }
 

app/src/launcher/implementation/attractmode/am-settings-data.cpp

@@ -247,8 +247,8 @@ Lr::DocHandlingError CrudeSettingsReader::readTargetDoc()
             {
                 if(!mCurrentSubSettingParser->parse(key, value, depth))
                 {
-                    QString setting = mCurrentSubSettingParser->settingName();
-                    errorStatus = Lr::DocHandlingError(*target(), Lr::DocHandlingError::DocReadFailed, UNKNOWN_KEY_ERROR.arg(key, setting));
+                    QString subSetting = mCurrentSubSettingParser->settingName();
+                    errorStatus = Lr::DocHandlingError(*target(), Lr::DocHandlingError::DocReadFailed, UNKNOWN_KEY_ERROR.arg(key, subSetting));
                     break;
                 }
             }

app/src/launcher/implementation/launchbox/lb-install.cpp

@@ -368,9 +368,9 @@ Qx::Error Install::postPlatformsImport()
     const QList<QString> affectedPlatforms = modifiedPlatforms();
     for(const QString& pn :affectedPlatforms)
     {
-        Lb::Platform::Builder pb;
-        pb.wName(pn);
-        mPlatformsConfig->addPlatform(pb.build());
+        Lb::Platform::Builder plb;
+        plb.wName(pn);
+        mPlatformsConfig->addPlatform(plb.build());
 
         if(!mParents->containsPlatform(pn, PLATFORMS_PLATFORM_CATEGORY))
         {

app/src/launcher/interface/lr-data-interface.cpp

@@ -61,12 +61,9 @@ bool operator== (const IDataDoc::Identifier& lhs, const IDataDoc::Identifier& rh
 }
 
 //-Hashing------------------------------------------------------------------------------------------------------
-uint qHash(const IDataDoc::Identifier& key, uint seed) noexcept
+size_t qHash(const IDataDoc::Identifier& key, size_t seed) noexcept
 {
-    seed = qHash(key.mDocType, seed);
-    seed = qHash(key.mDocName, seed);
-
-    return seed;
+    return qHashMulti(seed, key.mDocType, key.mDocName);
 }
 
 //-Constructor--------------------------------------------------------------------------------------------------------

app/src/launcher/interface/lr-data-interface.h

@@ -118,7 +118,7 @@ class IDataDoc
     class Identifier
     {
         friend bool operator== (const Identifier& lhs, const Identifier& rhs) noexcept;
-        friend uint qHash(const Identifier& key, uint seed) noexcept;
+        friend size_t qHash(const Identifier& key, size_t seed) noexcept;
 
     private:
         Type mDocType;

app/src/ui/mainwindow.cpp

@@ -367,8 +367,6 @@ Fp::Db::InclusionOptions MainWindow::getSelectedInclusionOptions() const
 
 Import::UpdateOptions MainWindow::getSelectedUpdateOptions() const
 {
-    return {ui->radioButton_onlyAdd->isChecked() ? Import::UpdateMode::OnlyNew : Import::UpdateMode::NewAndExisting, ui->checkBox_removeMissing->isChecked() };
-
     QRadioButton* sel = static_cast<QRadioButton*>(ui->buttonGroup_updateMode->checkedButton());
     Q_ASSERT(sel);
     return mUpdateModeMap[sel];