diff options
author | Georg Zotti <Georg.Zotti@univie.ac.at> | 2022-05-20 13:18:33 +0200 |
---|---|---|
committer | Georg Zotti <Georg.Zotti@univie.ac.at> | 2022-05-20 13:18:50 +0200 |
commit | 388de48682fb8bb8376814afc14efb346bf82959 (patch) | |
tree | 5b228e87392f593386f7f60d0d0d3ce322b76ca8 | |
parent | 75f3c3b4355e0534fb7597020864f5cc450206fe (diff) |
Fix a few clazy warnings
-rw-r--r-- | src/scripting/StelScriptMgr.cpp | 19 | ||||
-rw-r--r-- | src/scripting/StelScriptMgr.hpp | 5 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/scripting/StelScriptMgr.cpp b/src/scripting/StelScriptMgr.cpp index d6aa7e4f2d..d4ee9e4a8c 100644 --- a/src/scripting/StelScriptMgr.cpp +++ b/src/scripting/StelScriptMgr.cpp @@ -365,7 +365,8 @@ StelScriptMgr::StelScriptMgr(QObject *parent): QObject(parent) void StelScriptMgr::initActions() { StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManager(); - for (const auto& script : getScriptList()) + const QStringList scriptList = getScriptList(); + for (const auto& script : scriptList) { QString shortcut = getShortcut(script); QString actionId = "actionScript/" + script; @@ -382,7 +383,8 @@ void StelScriptMgr::addModules() { // Add all the StelModules into the script engine StelModuleMgr* mmgr = &StelApp::getInstance().getModuleMgr(); - for (auto* m : mmgr->getAllModules()) + const QList allModules = mmgr->getAllModules(); + for (auto* m : allModules) { QScriptValue objectValue = engine->newQObject(m); engine->globalObject().setProperty(m->objectName(), objectValue); @@ -400,7 +402,7 @@ QStringList StelScriptMgr::getScriptList() const QStringList scriptFiles; QSet<QString> files = StelFileMgr::listContents("scripts", StelFileMgr::File, true); - QRegularExpression fileRE("^.*\\.ssc$"); + static const QRegularExpression fileRE("^.*\\.ssc$"); for (const auto& f : files) { if (fileRE.match(f).hasMatch()) @@ -457,7 +459,8 @@ QString StelScriptMgr::getHtmlDescription(const QString &s, bool generateDocumen html += "<h2>" + q_(getName(s).trimmed()) + "</h2>"; QString d = getDescription(s).trimmed(); d.replace("\n", "<br />"); - d.replace(QRegularExpression("\\s{2,}"), " "); + static const QRegularExpression spaceExp("\\s{2,}"); + d.replace(spaceExp, " "); html += "<p>" + q_(d) + "</p>"; html += "<p>"; @@ -532,9 +535,9 @@ QString StelScriptMgr::getDescription(const QString& s) const QString desc = ""; bool inDesc = false; - QRegularExpression descExp("^\\s*//\\s*Description:\\s*([^\\s].+)\\s*$"); - QRegularExpression descNewlineExp("^\\s*//\\s*$"); - QRegularExpression descContExp("^\\s*//\\s*([^\\s].*)\\s*$"); + static const QRegularExpression descExp("^\\s*//\\s*Description:\\s*([^\\s].+)\\s*$"); + static const QRegularExpression descNewlineExp("^\\s*//\\s*$"); + static const QRegularExpression descContExp("^\\s*//\\s*([^\\s].*)\\s*$"); while (!textStream.atEnd()) { QString line = textStream.readLine(); @@ -817,7 +820,7 @@ bool StelScriptMgr::preprocessScript(const QString fileName, const QString &inpu void StelScriptMgr::expand(const QString fileName, const QString &input, QString &output, const QString &scriptDir, int &errLoc){ QStringList lines = input.split("\n"); - QRegularExpression includeRe("^include\\s*\\(\\s*\"([^\"]+)\"\\s*\\)\\s*;\\s*(//.*)?$"); + static const QRegularExpression includeRe("^include\\s*\\(\\s*\"([^\"]+)\"\\s*\\)\\s*;\\s*(//.*)?$"); int curline = 0; for (const auto& line : lines) { diff --git a/src/scripting/StelScriptMgr.hpp b/src/scripting/StelScriptMgr.hpp index ea2e1e626f..4f71da61d7 100644 --- a/src/scripting/StelScriptMgr.hpp +++ b/src/scripting/StelScriptMgr.hpp @@ -29,7 +29,6 @@ #include <QPair> #include <QSet> -// class StelMainScriptAPI; #include "StelMainScriptAPI.hpp" class StelScriptEngineAgent; @@ -243,9 +242,9 @@ signals: //! Notification when a script has stopped running void scriptStopped(); //! Notification of a script event - warnings, current execution line etc. - void scriptDebug(const QString&) const; + void scriptDebug(const QString&); //! Notification of a script event - output line. - void scriptOutput(const QString&) const; + void scriptOutput(const QString&); private: // Utility functions for preprocessor |