forked from qt-creator/qt-creator
Fix various clang warnings
Unused variables & functions, unneeded copies in range-for loops, missing overrides. Change-Id: I27b60e7c92a6ca425a84c89b537d5c3815449a94 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -1450,16 +1450,14 @@ AndroidConfigurations::~AndroidConfigurations() = default;
|
||||
|
||||
static Utils::FilePath androidStudioPath()
|
||||
{
|
||||
if (Utils::HostOsInfo::isWindowsHost()) {
|
||||
const QLatin1String registryKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio");
|
||||
const QLatin1String valueName("Path");
|
||||
#if defined(Q_OS_WIN)
|
||||
const QSettings settings64(registryKey, QSettings::Registry64Format);
|
||||
const QSettings settings32(registryKey, QSettings::Registry32Format);
|
||||
return Utils::FilePath::fromUserInput(
|
||||
settings64.value(valueName, settings32.value(valueName).toString()).toString());
|
||||
#endif
|
||||
}
|
||||
#if defined(Q_OS_WIN)
|
||||
const QLatin1String registryKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio");
|
||||
const QLatin1String valueName("Path");
|
||||
const QSettings settings64(registryKey, QSettings::Registry64Format);
|
||||
const QSettings settings32(registryKey, QSettings::Registry32Format);
|
||||
return Utils::FilePath::fromUserInput(
|
||||
settings64.value(valueName, settings32.value(valueName).toString()).toString());
|
||||
#endif
|
||||
return {}; // TODO non-Windows
|
||||
}
|
||||
|
||||
|
@@ -31,7 +31,6 @@ namespace Internal {
|
||||
namespace Constants {
|
||||
const QLatin1String CUSTOMCOMMANDBUILDER_COMMAND("IncrediBuild.BuildConsole.%1.Command");
|
||||
const QLatin1String CUSTOMCOMMANDBUILDER_ARGS("IncrediBuild.BuildConsole.%1.Arguments");
|
||||
const QLatin1String CUSTOMCOMMANDBUILDER_ARGSSET("IncrediBuild.BuildConsole.%1.ArgumentsSet");
|
||||
} // namespace Constants
|
||||
|
||||
void CommandBuilder::fromMap(const QVariantMap &map)
|
||||
|
@@ -59,7 +59,6 @@ using namespace Utils;
|
||||
const char BUILD_TARGETS_SUFFIX[] = ".BuildTargets";
|
||||
const char MAKE_ARGUMENTS_SUFFIX[] = ".MakeArguments";
|
||||
const char MAKE_COMMAND_SUFFIX[] = ".MakeCommand";
|
||||
const char CLEAN_SUFFIX[] = ".Clean";
|
||||
const char OVERRIDE_MAKEFLAGS_SUFFIX[] = ".OverrideMakeflags";
|
||||
const char JOBCOUNT_SUFFIX[] = ".JobCount";
|
||||
|
||||
|
@@ -57,7 +57,7 @@ void BindingModel::resetModel()
|
||||
QStringList({tr("Item"), tr("Property"), tr("Source Item"), tr("Source Property")}));
|
||||
|
||||
if (connectionView()->isAttached()) {
|
||||
for (const ModelNode modelNode : connectionView()->selectedModelNodes())
|
||||
for (const ModelNode &modelNode : connectionView()->selectedModelNodes())
|
||||
addModelNode(modelNode);
|
||||
}
|
||||
|
||||
|
@@ -49,7 +49,7 @@ namespace {
|
||||
QStringList propertyNameListToStringList(const QmlDesigner::PropertyNameList &propertyNameList)
|
||||
{
|
||||
QStringList stringList;
|
||||
for (const QmlDesigner::PropertyName propertyName : propertyNameList) {
|
||||
for (const QmlDesigner::PropertyName &propertyName : propertyNameList) {
|
||||
stringList << QString::fromUtf8(propertyName);
|
||||
}
|
||||
stringList.removeDuplicates();
|
||||
|
@@ -134,7 +134,7 @@ void DynamicPropertiesModel::resetModel()
|
||||
QStringList({tr("Item"), tr("Property"), tr("Property Type"), tr("Property Value")}));
|
||||
|
||||
if (connectionView()->isAttached()) {
|
||||
for (const ModelNode modelNode : connectionView()->selectedModelNodes())
|
||||
for (const ModelNode &modelNode : connectionView()->selectedModelNodes())
|
||||
addModelNode(modelNode);
|
||||
}
|
||||
|
||||
|
@@ -126,7 +126,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void walCheckpointFull()
|
||||
void walCheckpointFull() override
|
||||
{
|
||||
try {
|
||||
database.walCheckpointFull();
|
||||
|
@@ -837,7 +837,7 @@ ModelNode QmlFlowItemNode::decisionNodeForTransition(const ModelNode &transition
|
||||
}
|
||||
QmlFlowViewNode flowView(transition.view()->rootModelNode());
|
||||
if (flowView.isValid()) {
|
||||
for (const ModelNode target : flowView.decicions()) {
|
||||
for (const ModelNode &target : flowView.decicions()) {
|
||||
if (target.hasBindingProperty("targets")
|
||||
&& target.bindingProperty("targets").resolveToModelNodeList().contains(transition))
|
||||
return target;
|
||||
@@ -853,7 +853,7 @@ ModelNode QmlFlowTargetNode::findSourceForDecisionNode() const
|
||||
if (!isFlowDecision())
|
||||
return {};
|
||||
|
||||
for (const ModelNode transition : flowView().transitionsForTarget(modelNode())) {
|
||||
for (const ModelNode &transition : flowView().transitionsForTarget(modelNode())) {
|
||||
if (transition.hasBindingProperty("from")) {
|
||||
const ModelNode source = transition.bindingProperty("from").resolveToModelNode();
|
||||
if (source.isValid()) {
|
||||
|
@@ -34,16 +34,6 @@
|
||||
using namespace ProjectExplorer;
|
||||
using namespace QtSupport;
|
||||
|
||||
static QString format(const QString &fileName, int lineNo, const QString &msg)
|
||||
{
|
||||
if (lineNo > 0)
|
||||
return QString::fromLatin1("%1(%2): %3").arg(fileName, QString::number(lineNo), msg);
|
||||
else if (lineNo)
|
||||
return QString::fromLatin1("%1: %3").arg(fileName, msg);
|
||||
else
|
||||
return msg;
|
||||
}
|
||||
|
||||
ProMessageHandler::ProMessageHandler(bool verbose, bool exact)
|
||||
: m_verbose(verbose)
|
||||
, m_exact(exact)
|
||||
|
Reference in New Issue
Block a user