diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 15da0467a..023782d3c 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -605,6 +605,7 @@ namespace BlackCore return this->initFromLocalResourceFiles(this->getSupportedEntities(), inBackground); } + //! \cond PRIVATE CStatusMessageList CDatabaseReader::initFromLocalResourceFiles(CEntityFlags::Entity entities, bool inBackground) { const bool overrideNewerOnly = true; @@ -622,6 +623,7 @@ namespace BlackCore return this->readFromJsonFiles(CDirectoryUtils::staticDbFilesDirectory(), entities, overrideNewerOnly); } } + //! \endcond void CDatabaseReader::setReplyStatus(QNetworkReply::NetworkError status, const QString &message) { diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 0a099b634..ead6c3040 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -1600,6 +1600,7 @@ namespace BlackCore return msgs; } + //! \cond PRIVATE CStatusMessageList CWebDataServices::initDbCachesFromLocalResourceFiles(CEntityFlags::Entity entities, bool inBackground) { CStatusMessageList msgs; @@ -1620,4 +1621,5 @@ namespace BlackCore ); return msgs; } + //! \endcond } // ns diff --git a/src/blackgui/components/dbownmodelsetcomponent.h b/src/blackgui/components/dbownmodelsetcomponent.h index d35c4e854..ddb0059a5 100644 --- a/src/blackgui/components/dbownmodelsetcomponent.h +++ b/src/blackgui/components/dbownmodelsetcomponent.h @@ -27,7 +27,6 @@ #include class QAction; -class QWidget; namespace Ui { class CDbOwnModelSetComponent; } namespace BlackMisc { namespace Simulation { class CAircraftModel; } } diff --git a/src/blackmisc/atomicfile.cpp b/src/blackmisc/atomicfile.cpp index d94018919..caf7c3424 100644 --- a/src/blackmisc/atomicfile.cpp +++ b/src/blackmisc/atomicfile.cpp @@ -34,7 +34,6 @@ int qt_ntfs_permission_lookup = 0; namespace BlackMisc { - //! \private bool checkPermissions(CAtomicFile::OpenMode mode, const QFileInfo &fileInfo) { diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 6a26e5d7e..02769c1b7 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -132,7 +132,7 @@ namespace BlackMisc if (modelDirs.isEmpty()) { this->clearCachedModels(CSimulatorInfo::xplane()); - emit this->loadingFinished(CStatusMessage(this, CStatusMessage::SeverityError, "Model directories '%1' are empty") << modelDirectories.join(", "), simulator, ParsedData); + emit this->loadingFinished(CStatusMessage(this, CStatusMessage::SeverityError, "XPlane model directories '%1' are empty") << modelDirectories.join(", "), simulator, ParsedData); return; } @@ -142,7 +142,7 @@ namespace BlackMisc m_parserWorker = BlackMisc::CWorker::fromTask(this, "CAircraftModelLoaderXPlane::performParsing", [this, modelDirs, excludedDirectoryPatterns, modelConsolidation]() { - //! \todo KB/MS 2017-09 not high prio, but still needed: according to meeting XP needs to support multiple directories + //! \todo KB/MS 2017-09 not high prio, but still needed: according to meet XP needs to support multiple directories //! \todo KB with T118 now model directories are passed (changed signatures) but the code below needs to support multiple dirs const QString modelDirectory = modelDirs.front(); auto models = performParsing(modelDirectory, excludedDirectoryPatterns); @@ -196,7 +196,7 @@ namespace BlackMisc { if (models.containsModelString(model.getModelString())) { - CLogMessage(static_cast(nullptr)).warning("Model %1 exists already! Potential model string conflict! Ignoring it.") << model.getModelString(); + CLogMessage(static_cast(nullptr)).warning("XPlane model '%1' exists already! Potential model string conflict! Ignoring it.") << model.getModelString(); } models.push_back(model); } @@ -337,7 +337,7 @@ namespace BlackMisc { if (installedModels.containsModelString(plane.getModelName())) { - const CStatusMessage msg = CStatusMessage(this).warning("Model %1 exists already! Potential model string conflict! Ignoring it.") << plane.getModelName(); + const CStatusMessage msg = CStatusMessage(this).warning("XPlane model '%1' exists already! Potential model string conflict! Ignoring it.") << plane.getModelName(); m_loadingMessages.push_back(msg); continue; } @@ -384,7 +384,7 @@ namespace BlackMisc { if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: EXPORT_NAME command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': EXPORT_NAME command requires 1 argument.") << path << lineNum; return false; } @@ -397,7 +397,7 @@ namespace BlackMisc } else { - CLogMessage(this).warning("WARNING: Package name %1 already in use by %2 reqested by use by %3") << tokens[1] << p->path << path; + CLogMessage(this).warning("XPlane package name '%1' already in use by '%2' reqested by use by '%3'") << tokens[1] << p->path << path; return false; } } @@ -407,13 +407,13 @@ namespace BlackMisc Q_UNUSED(package); if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: DEPENDENCY command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("'%1' - '%2': DEPENDENCY command requires 1 argument.") << path << lineNum; return false; } if (std::count_if(m_cslPackages.cbegin(), m_cslPackages.cend(), [&tokens](const CSLPackage & p) { return p.name == tokens[1]; }) == 0) { - CLogMessage(this).warning("WARNING: required package %1 not found. Aborting processing of this package.") << tokens[1]; + CLogMessage(this).warning("XPlane required package %1 not found. Aborting processing of this package.") << tokens[1]; return false; } @@ -437,7 +437,7 @@ namespace BlackMisc { if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: OBJECT command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': OBJECT command requires 1 argument.") << path << lineNum; return false; } @@ -446,7 +446,7 @@ namespace BlackMisc QString fullPath(relativePath); if (!doPackageSub(fullPath)) { - CLogMessage(this).warning("%1 - %2: package not found.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2: package not found.") << path << lineNum; return false; } @@ -454,7 +454,7 @@ namespace BlackMisc QFile objFile(fullPath); if (!objFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - CLogMessage(this).warning("Object %1 does not exist.") << fullPath; + CLogMessage(this).warning("XPlane object '%1' does not exist.") << fullPath; return false; } QTextStream ts(&objFile); @@ -499,7 +499,7 @@ namespace BlackMisc { if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: TEXTURE command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': TEXTURE command requires 1 argument.") << path << lineNum; return false; } @@ -510,14 +510,14 @@ namespace BlackMisc if (!doPackageSub(absoluteTexPath)) { - CLogMessage(this).warning("%1 - %2: package not found.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': package not found.") << path << lineNum; return false; } QFileInfo fileInfo(absoluteTexPath); if (!fileInfo.exists()) { - CLogMessage(this).warning("Texture %1 does not exist.") << absoluteTexPath; + CLogMessage(this).warning("XPlane texture '%1' does not exist.") << absoluteTexPath; return false; } @@ -531,7 +531,7 @@ namespace BlackMisc // AIRCAFT if (tokens.size() != 4) { - CLogMessage(this).warning("%1 - %2: AIRCRAFT command requires 3 arguments.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': AIRCRAFT command requires 3 arguments.") << path << lineNum; } // Flyable aircrafts are parsed by a different method. We don't know any aircraft files in CSL packages. @@ -545,7 +545,7 @@ namespace BlackMisc // OBJ8_AIRCRAFT if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': OBJ8_AIRCARFT command requires 1 argument.") << path << lineNum; } package.planes.push_back(CSLPlane()); @@ -559,7 +559,7 @@ namespace BlackMisc // OBJ8 { {}} if (tokens.size() < 4 || tokens.size() > 6) { - CLogMessage(this).warning("%1 - %2: OBJ8 command takes 3-5 arguments.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': OBJ8 command takes 3-5 arguments.") << path << lineNum; } if (tokens[1] != "SOLID") { return true; } @@ -569,7 +569,7 @@ namespace BlackMisc QString fullPath(relativePath); if (!doPackageSub(fullPath)) { - CLogMessage(this).warning("%1 - %2: package not found.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': package not found.") << path << lineNum; return false; } @@ -595,14 +595,14 @@ namespace BlackMisc if (!doPackageSub(absoluteTexPath)) { - CLogMessage(this).warning("%1 - %2: package not found.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': package not found.") << path << lineNum; return false; } QFileInfo fileInfo(absoluteTexPath); if (!fileInfo.exists()) { - CLogMessage(this).warning("Texture %1 does not exist.") << absoluteTexPath; + CLogMessage(this).warning("XPlane texture '%1' does not exist.") << absoluteTexPath; return false; } @@ -625,7 +625,7 @@ namespace BlackMisc // ICAO if (tokens.size() != 2) { - CLogMessage(this).warning("%1 - %2: ICAO command requires 1 argument.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': ICAO command requires 1 argument.") << path << lineNum; return false; } @@ -639,7 +639,7 @@ namespace BlackMisc // AIRLINE if (tokens.size() != 3) { - CLogMessage(this).warning("%1 - %2: AIRLINE command requires 2 arguments.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': AIRLINE command requires 2 arguments.") << path << lineNum; return false; } @@ -655,7 +655,7 @@ namespace BlackMisc // LIVERY if (tokens.size() != 4) { - CLogMessage(this).warning("%1 - %2: LIVERY command requires 3 arguments.") << path << lineNum; + CLogMessage(this).warning("XPlane '%1' - '%2': LIVERY command requires 3 arguments.") << path << lineNum; return false; } @@ -747,14 +747,14 @@ namespace BlackMisc bool result = it.value()(tokens, package, package.path, lineNum); if (!result) { - const CStatusMessage m = CStatusMessage(this).warning("Ignoring CSL package %1") << package.name; + const CStatusMessage m = CStatusMessage(this).warning("XPlane ignoring CSL package '%1'") << package.name; m_loadingMessages.push_back(m); break; } } else { - const CStatusMessage m = CStatusMessage(this).warning("Unrecognized command %1 in %2") << tokens[0] << package.name; + const CStatusMessage m = CStatusMessage(this).warning("XPlane unrecognized command '%1' in '%2'") << tokens[0] << package.name; m_loadingMessages.push_back(m); break; }