compiler warning fixes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-11-18 23:02:48 +00:00
parent b911a502d1
commit 0e87a02a0b
5 changed files with 21 additions and 22 deletions

View file

@ -1931,7 +1931,6 @@ int QObject::receivers(const char *signal) const
return false;
}
Q_D(const QObject);
QMutexLocker locker(signalSlotLock(this));
if (d->connectionLists) {
if (signal_index < d->connectionLists->count()) {

View file

@ -240,8 +240,8 @@ class QScopedLoopLevelCounter
{
QThreadData *threadData;
public:
inline QScopedLoopLevelCounter(QThreadData *threadData)
: threadData(threadData)
inline QScopedLoopLevelCounter(QThreadData *threaddata)
: threadData(threaddata)
{ ++threadData->loopLevel; }
inline ~QScopedLoopLevelCounter()
{ --threadData->loopLevel; }

View file

@ -3913,12 +3913,12 @@ bool QDateTimeParser::parseFormat(const QString &newFormat)
QVector<SectionNode> newSectionNodes;
Sections newDisplay = Q_NULLPTR;
QStringList newSeparators;
int i, index = 0;
int index = 0;
int add = 0;
QChar status(zero);
const int max = newFormat.size();
int lastQuote = -1;
for (i = 0; i<max; ++i) {
for (int i = 0; i<max; ++i) {
if (newFormat.at(i) == quote) {
lastQuote = i;
++add;
@ -5175,12 +5175,12 @@ QString QDateTimeParser::stateName(int s) const
}
#ifndef QT_NO_DATESTRING
bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) const
bool QDateTimeParser::fromString(const QString &format, QDate *date, QTime *time) const
{
QDateTime val(QDate(1900, 1, 1), QDATETIMEEDIT_TIME_MIN);
QString text = t;
QString formatcopy = format;
int copy = -1;
const StateNode tmp = parse(text, copy, val, false);
const StateNode tmp = parse(formatcopy, copy, val, false);
if (tmp.state != Acceptable || tmp.conflicts) {
return false;
}

View file

@ -85,23 +85,23 @@ void QBenchmarkGlobalData::setMode(Mode mode)
QBenchmarkMeasurerBase * QBenchmarkGlobalData::createMeasurer()
{
QBenchmarkMeasurerBase *measurer = 0;
QBenchmarkMeasurerBase *m = 0;
if (0) {
#ifdef QTESTLIB_USE_VALGRIND
} else if (mode_ == CallgrindChildProcess || mode_ == CallgrindParentProcess) {
measurer = new QBenchmarkCallgrindMeasurer;
m = new QBenchmarkCallgrindMeasurer;
#endif
#ifdef HAVE_TICK_COUNTER
} else if (mode_ == TickCounter) {
measurer = new QBenchmarkTickMeasurer;
m = new QBenchmarkTickMeasurer;
#endif
} else if (mode_ == EventCounter) {
measurer = new QBenchmarkEvent;
m = new QBenchmarkEvent;
} else {
measurer = new QBenchmarkTimeMeasurer;
m = new QBenchmarkTimeMeasurer;
}
measurer->init();
return measurer;
m->init();
return m;
}
int QBenchmarkGlobalData::adjustMedianIterationCount()

View file

@ -101,13 +101,13 @@ public:
{ }
QBenchmarkResult(
const QBenchmarkContext &context, const qreal value, const int iterations,
QTest::QBenchmarkMetric metric, bool setByMacro)
: context(context)
, value(value)
, iterations(iterations)
, metric(metric)
, setByMacro(setByMacro)
const QBenchmarkContext &acontext, const qreal avalue, const int aiterations,
QTest::QBenchmarkMetric ametric, bool asetByMacro)
: context(acontext)
, value(avalue)
, iterations(aiterations)
, metric(ametric)
, setByMacro(asetByMacro)
, valid(true)
{ }