feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix some warnings about unused variables and functions

Browse Source 
Change-Id: I5f0acd9598bc7f3a79963cc4e1b255e2b6fb2e5d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-23 17:49:52 +02:00
parent a8d44b04da
commit 49569574de
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/tracing/runscenegraphtest.cpp
View File

@@ -37,6 +37,7 @@
namespace Timeline {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
static void renderMessageHandler(QtMsgType type, const QMessageLogContext &context,
const QString &message)
{
@@ -45,6 +46,7 @@ static void renderMessageHandler(QtMsgType type, const QMessageLogContext &conte
else
QTest::qWarn(message.toLatin1().constData(), context.file, context.line);
}
#endif // < Qt 6
void runSceneGraphTest(QSGNode *node)
{
@@ -78,6 +80,8 @@ void runSceneGraphTest(QSGNode *node)
// Unfortunately we cannot check the results of the rendering. But at least we know the shaders
// have not crashed here.
#else
Q_UNUSED(node)
#endif // < Qt 6
context.doneCurrent();

4
src/plugins/android/androiddevice.cpp
View File

@@ -426,7 +426,7 @@ void AndroidDeviceManager::devicesListUpdated()
}
// Set devices no longer connected to disconnected state.
for (const IDevice::ConstPtr dev : existingDevs) {
for (const IDevice::ConstPtr &dev : existingDevs) {
if (dev->id() != Constants::ANDROID_DEVICE_ID && !connectedDevs.contains(dev)
&& dev->deviceState() != IDevice::DeviceDisconnected) {
qCDebug(androidDeviceLog, "Device id \"%s\" is no longer connected.",
@@ -443,7 +443,7 @@ AndroidDeviceManager *AndroidDeviceManager::instance()
}
AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
: m_androidConfig(AndroidConfigurations::currentConfig())
: QObject(parent), m_androidConfig(AndroidConfigurations::currentConfig())
{
connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() {
m_devicesUpdaterTimer.stop();

1
src/plugins/android/androidmanager.cpp
View File

@@ -552,7 +552,6 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP
const QStringList appAbis = AndroidManager::applicationAbis(target);
if (appAbis.isEmpty())
return;
const int deviceAPILevel = AndroidManager::minimumSDK(target);
const IDevice::ConstPtr device = DeviceKitAspect::device(target->kit());
AndroidDeviceInfo info = AndroidDevice::androidDeviceInfoFromIDevice(device.data());
if (!info.isValid()) // aborted

2
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -136,7 +136,7 @@ FilePath AndroidPackageInstallationStep::androidBuildDirectory() const
FilePath AndroidPackageInstallationStep::buildDirectory() const
{
if (const BuildSystem *bs = buildSystem())
return buildSystem()->buildTarget(target()->activeBuildKey()).workingDirectory;
return bs->buildTarget(target()->activeBuildKey()).workingDirectory;
return {};
}

2
src/plugins/android/androidpotentialkit.cpp
View File

@@ -68,7 +68,6 @@ bool AndroidPotentialKit::isEnabled() const
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected() && !kit->isSdkProvided()) {
return false;
}
@@ -118,7 +117,6 @@ void AndroidPotentialKitWidget::recheck()
{
QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *kit, kits) {
Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit);
if (kit->isAutoDetected() && !kit->isSdkProvided()) {
setVisible(false);
return;

1
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -262,7 +262,6 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
if (!avdMan.isAvdBooted(devSN)) {
m_devInfo = {};
int minTargetApi = AndroidManager::minimumSDK(m_rc->target()->kit());
using namespace ProjectExplorer;
const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).data();
AndroidDeviceInfo devInfoLocal = AndroidDevice::androidDeviceInfoFromIDevice(dev);

1
src/plugins/android/androidrunner.cpp
View File

@@ -184,7 +184,6 @@ void AndroidRunner::launchAVD()
if (!m_target || !m_target->project())
return;
int deviceAPILevel = AndroidManager::minimumSDK(m_target);
QStringList androidAbis = AndroidManager::applicationAbis(m_target);
// Get AVD info

30
src/plugins/qmakeprojectmanager/makefileparse.cpp
View File

@@ -396,7 +396,6 @@ void QmakeProjectManagerPlugin::testMakefileParser_data()
QTest::addColumn<QString>("command");
QTest::addColumn<QString>("project");
QTest::addColumn<QString>("unparsedArguments");
QTest::addColumn<int>("archConfig");
QTest::addColumn<int>("osType");
QTest::addColumn<bool>("linkQmlDebuggingQQ2");
QTest::addColumn<bool>("useQtQuickCompiler");
@@ -407,85 +406,85 @@ void QmakeProjectManagerPlugin::testMakefileParser_data()
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra1")
<< QString::fromLatin1("SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra2")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra3")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra4")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra5")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra6")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra1")
<< QString::fromLatin1("SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra2")
<< QString::fromLatin1("-o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra3")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra4")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra5")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra6")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
}
@@ -494,7 +493,6 @@ void QmakeProjectManagerPlugin::testMakefileParser()
QFETCH(QString, command);
QFETCH(QString, project);
QFETCH(QString, unparsedArguments);
QFETCH(int, archConfig);
QFETCH(int, osType);
QFETCH(bool, linkQmlDebuggingQQ2);
QFETCH(bool, useQtQuickCompiler);

2
src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
View File

@@ -292,6 +292,7 @@ TimelineWidget::TimelineWidget(TimelineView *view)
connect(graphicsScene()->layoutRuler(), &TimelineRulerSectionItem::playbackLoopValuesChanged, updatePlaybackLoopValues);
auto setPlaybackState = [this](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) {
Q_UNUSED(oldState)
m_toolbar->setPlayState(newState == QAbstractAnimation::State::Running);
};
connect(m_playbackAnimation, &QVariantAnimation::stateChanged, setPlaybackState);
@@ -431,7 +432,6 @@ void TimelineWidget::updatePlaybackValues()
if (m_playbackAnimation->state() == QAbstractAnimation::Running)
m_playbackAnimation->stop();
}
qreal a = m_playbackAnimation->duration();
qreal newCurrentTime = (currentTimeline.currentKeyframe() - startFrame) * (1.0 / m_playbackSpeed);
if (qRound(m_playbackAnimation->startValue().toDouble()) != qRound(startFrame)
|| qRound(m_playbackAnimation->endValue().toDouble()) != qRound(endFrame)) {

3
src/shared/help/indexwindow.cpp
View File

@@ -247,6 +247,9 @@ int IndexFilterModel::columnCount(const QModelIndex &parent) const
QVariant IndexFilterModel::headerData(int section, Qt::Orientation orientation, int role) const
{
// we don't show header
Q_UNUSED(section)
Q_UNUSED(orientation)
Q_UNUSED(role)
return {};
}