forked from qt-creator/qt-creator
Fix various compiler warnings
Change-Id: I59db57e8501bbd0d0293ccce1b520df8acc07413 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -151,7 +151,7 @@ AndroidDevice::AndroidDevice()
|
|||||||
setOsType(Utils::OsTypeOtherUnix);
|
setOsType(Utils::OsTypeOtherUnix);
|
||||||
setDeviceState(DeviceConnected);
|
setDeviceState(DeviceConnected);
|
||||||
|
|
||||||
addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) {
|
addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &, QWidget *) {
|
||||||
AndroidDeviceManager::instance()->updateDevicesListOnce();
|
AndroidDeviceManager::instance()->updateDevicesListOnce();
|
||||||
}});
|
}});
|
||||||
|
|
||||||
@@ -614,8 +614,8 @@ AndroidDeviceManager *AndroidDeviceManager::instance()
|
|||||||
|
|
||||||
AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
|
AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
|
||||||
: QObject(parent),
|
: QObject(parent),
|
||||||
m_androidConfig(AndroidConfigurations::currentConfig()),
|
m_avdManager(m_androidConfig),
|
||||||
m_avdManager(m_androidConfig)
|
m_androidConfig(AndroidConfigurations::currentConfig())
|
||||||
{
|
{
|
||||||
connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() {
|
connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() {
|
||||||
m_devicesUpdaterTimer.stop();
|
m_devicesUpdaterTimer.stop();
|
||||||
|
@@ -133,7 +133,6 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
|
|||||||
|
|
||||||
m_ui->searchField->setPlaceholderText("Filter");
|
m_ui->searchField->setPlaceholderText("Filter");
|
||||||
connect(m_ui->searchField, &QLineEdit::textChanged, [this, proxyModel](const QString &text) {
|
connect(m_ui->searchField, &QLineEdit::textChanged, [this, proxyModel](const QString &text) {
|
||||||
const bool isExpanded = m_ui->expandCheck->isChecked();
|
|
||||||
proxyModel->setAcceptedSearchPackage(text);
|
proxyModel->setAcceptedSearchPackage(text);
|
||||||
m_sdkModel->resetSelection();
|
m_sdkModel->resetSelection();
|
||||||
// It is more convenient to expand the view with the results
|
// It is more convenient to expand the view with the results
|
||||||
@@ -513,7 +512,7 @@ bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return showTopLevel || (packageState(srcIndex) & m_packageState) && packageFound(srcIndex);
|
return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
|
||||||
}
|
}
|
||||||
|
|
||||||
OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
|
OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
|
||||||
|
@@ -105,7 +105,7 @@ void ClangFormatFile::saveNewFormat()
|
|||||||
|
|
||||||
// workaround: configurationAsText() add comment "# " before BasedOnStyle line
|
// workaround: configurationAsText() add comment "# " before BasedOnStyle line
|
||||||
const int pos = style.find("# BasedOnStyle");
|
const int pos = style.find("# BasedOnStyle");
|
||||||
if (pos < style.size())
|
if (pos < int(style.size()))
|
||||||
style.erase(pos, 2);
|
style.erase(pos, 2);
|
||||||
m_filePath.writeFileContents(QByteArray::fromStdString(style));
|
m_filePath.writeFileContents(QByteArray::fromStdString(style));
|
||||||
}
|
}
|
||||||
|
@@ -344,6 +344,7 @@ void FormEditorView::nodeReparented(const ModelNode &node, const NodeAbstractPro
|
|||||||
|
|
||||||
void FormEditorView::nodeSourceChanged(const ModelNode &node, const QString &newNodeSource)
|
void FormEditorView::nodeSourceChanged(const ModelNode &node, const QString &newNodeSource)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(newNodeSource)
|
||||||
addOrRemoveFormEditorItem(node);
|
addOrRemoveFormEditorItem(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -89,6 +89,7 @@ void MetaInfoReader::setQualifcation(const TypeName &qualification)
|
|||||||
|
|
||||||
void MetaInfoReader::elementStart(const QString &name, const QmlJS::SourceLocation &nameLocation)
|
void MetaInfoReader::elementStart(const QString &name, const QmlJS::SourceLocation &nameLocation)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(nameLocation)
|
||||||
switch (parserState()) {
|
switch (parserState()) {
|
||||||
case ParsingDocument: setParserState(readDocument(name)); break;
|
case ParsingDocument: setParserState(readDocument(name)); break;
|
||||||
case ParsingMetaInfo: setParserState(readMetaInfoRootElement(name)); break;
|
case ParsingMetaInfo: setParserState(readMetaInfoRootElement(name)); break;
|
||||||
@@ -133,6 +134,8 @@ void MetaInfoReader::propertyDefinition(const QString &name,
|
|||||||
const QVariant &value,
|
const QVariant &value,
|
||||||
const QmlJS::SourceLocation &valueLocation)
|
const QmlJS::SourceLocation &valueLocation)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(nameLocation)
|
||||||
|
Q_UNUSED(valueLocation)
|
||||||
switch (parserState()) {
|
switch (parserState()) {
|
||||||
case ParsingType: readTypeProperty(name, value); break;
|
case ParsingType: readTypeProperty(name, value); break;
|
||||||
case ParsingImports: readImportsProperty(name, value); break;
|
case ParsingImports: readImportsProperty(name, value); break;
|
||||||
|
@@ -332,7 +332,7 @@ static void removeStateOperationsForChildren(const QmlObjectNode &node)
|
|||||||
stateOperation.modelNode().destroy(); //remove of belonging StatesOperations
|
stateOperation.modelNode().destroy(); //remove of belonging StatesOperations
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const QmlObjectNode &childNode : node.modelNode().directSubModelNodes()) {
|
for (const QmlObjectNode childNode : node.modelNode().directSubModelNodes()) {
|
||||||
removeStateOperationsForChildren(childNode);
|
removeStateOperationsForChildren(childNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -310,7 +310,7 @@ QList<QmlTimelineKeyframeGroup> QmlTimelineKeyframeGroup::allInvalidTimelineKeyf
|
|||||||
QTC_ASSERT(view->rootModelNode().isValid(), return ret);
|
QTC_ASSERT(view->rootModelNode().isValid(), return ret);
|
||||||
|
|
||||||
const auto groups = view->rootModelNode().subModelNodesOfType("QtQuick.Timeline.KeyframeGroup");
|
const auto groups = view->rootModelNode().subModelNodesOfType("QtQuick.Timeline.KeyframeGroup");
|
||||||
for (const QmlTimelineKeyframeGroup &group : groups) {
|
for (const QmlTimelineKeyframeGroup group : groups) {
|
||||||
if (group.isDangling())
|
if (group.isDangling())
|
||||||
ret.append(group);
|
ret.append(group);
|
||||||
}
|
}
|
||||||
|
@@ -650,9 +650,9 @@ public:
|
|||||||
, functionDeclarations{std::move(functionDeclarations)}
|
, functionDeclarations{std::move(functionDeclarations)}
|
||||||
, signalDeclarations{std::move(signalDeclarations)}
|
, signalDeclarations{std::move(signalDeclarations)}
|
||||||
, enumerationDeclarations{std::move(enumerationDeclarations)}
|
, enumerationDeclarations{std::move(enumerationDeclarations)}
|
||||||
, moduleId{moduleId}
|
|
||||||
, accessSemantics{accessSemantics}
|
, accessSemantics{accessSemantics}
|
||||||
, sourceId{sourceId}
|
, sourceId{sourceId}
|
||||||
|
, moduleId{moduleId}
|
||||||
, changeLevel{changeLevel}
|
, changeLevel{changeLevel}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@@ -663,9 +663,9 @@ public:
|
|||||||
int sourceId)
|
int sourceId)
|
||||||
: typeName{typeName}
|
: typeName{typeName}
|
||||||
, prototype{NativeType{prototype}}
|
, prototype{NativeType{prototype}}
|
||||||
, moduleId{moduleId}
|
|
||||||
, accessSemantics{static_cast<TypeAccessSemantics>(accessSemantics)}
|
, accessSemantics{static_cast<TypeAccessSemantics>(accessSemantics)}
|
||||||
, sourceId{sourceId}
|
, sourceId{sourceId}
|
||||||
|
, moduleId{moduleId}
|
||||||
|
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@@ -677,10 +677,10 @@ public:
|
|||||||
int sourceId)
|
int sourceId)
|
||||||
: typeName{typeName}
|
: typeName{typeName}
|
||||||
, prototype{NativeType{prototype}}
|
, prototype{NativeType{prototype}}
|
||||||
, moduleId{moduleId}
|
|
||||||
, accessSemantics{static_cast<TypeAccessSemantics>(accessSemantics)}
|
, accessSemantics{static_cast<TypeAccessSemantics>(accessSemantics)}
|
||||||
, sourceId{sourceId}
|
, sourceId{sourceId}
|
||||||
, typeId{typeId}
|
, typeId{typeId}
|
||||||
|
, moduleId{moduleId}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
friend bool operator==(const Type &first, const Type &second) noexcept
|
friend bool operator==(const Type &first, const Type &second) noexcept
|
||||||
|
Reference in New Issue
Block a user