summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 14:18:09 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-07-07 11:51:48 +0200
commit6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch)
tree727427eb4c603e74954d4da462484ea7bf5c65bb /src/corelib/io
parentd9cc1499954829faf9486fb72056e29f1bad58e3 (diff)
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qabstractfileengine.cpp2
-rw-r--r--src/corelib/io/qdir.cpp2
-rw-r--r--src/corelib/io/qfilesystemengine_unix.cpp2
-rw-r--r--src/corelib/io/qfilesystemengine_win.cpp6
-rw-r--r--src/corelib/io/qfilesystemiterator_unix.cpp6
-rw-r--r--src/corelib/io/qfilesystemiterator_win.cpp4
-rw-r--r--src/corelib/io/qiodevice.cpp2
-rw-r--r--src/corelib/io/qsettings_wasm.cpp2
-rw-r--r--src/corelib/io/qstandardpaths_win.cpp2
-rw-r--r--src/corelib/io/qtemporaryfile.cpp2
10 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index 070139b608..cc603dd63f 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -1076,7 +1076,7 @@ QFileInfo QAbstractFileEngineIterator::currentFileInfo() const
*/
QVariant QAbstractFileEngineIterator::entryInfo(EntryInfoType type) const
{
- Q_UNUSED(type)
+ Q_UNUSED(type);
return QVariant();
}
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 8bf87eacae..e202be154a 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1100,7 +1100,7 @@ QT_WARNING_DISABLE_DEPRECATED
QResource::addSearchPath(path);
QT_WARNING_POP
#else
- Q_UNUSED(path)
+ Q_UNUSED(path);
#endif
}
#endif
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index d91807c342..fb41b372a2 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -615,7 +615,7 @@ void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry)
clear();
}
#else
- Q_UNUSED(entry)
+ Q_UNUSED(entry);
#endif
}
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index e91a7558d7..4e7824522c 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -1321,9 +1321,9 @@ QFileSystemEntry QFileSystemEngine::currentPath()
bool QFileSystemEngine::createLink(const QFileSystemEntry &source, const QFileSystemEntry &target, QSystemError &error)
{
Q_ASSERT(false);
- Q_UNUSED(source)
- Q_UNUSED(target)
- Q_UNUSED(error)
+ Q_UNUSED(source);
+ Q_UNUSED(target);
+ Q_UNUSED(error);
return false; // TODO implement; - code needs to be moved from qfsfileengine_win.cpp
}
diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp
index fd96298f69..c69138e3ba 100644
--- a/src/corelib/io/qfilesystemiterator_unix.cpp
+++ b/src/corelib/io/qfilesystemiterator_unix.cpp
@@ -66,9 +66,9 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi
, dirEntry(nullptr)
, lastError(0)
{
- Q_UNUSED(filters)
- Q_UNUSED(nameFilters)
- Q_UNUSED(flags)
+ Q_UNUSED(filters);
+ Q_UNUSED(nameFilters);
+ Q_UNUSED(flags);
if ((dir = QT_OPENDIR(nativePath.constData())) == nullptr) {
lastError = errno;
diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp
index 65596643bc..ca9f83c0ab 100644
--- a/src/corelib/io/qfilesystemiterator_win.cpp
+++ b/src/corelib/io/qfilesystemiterator_win.cpp
@@ -57,8 +57,8 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi
, uncShareIndex(0)
, onlyDirs(false)
{
- Q_UNUSED(nameFilters)
- Q_UNUSED(flags)
+ Q_UNUSED(nameFilters);
+ Q_UNUSED(flags);
if (nativePath.endsWith(QLatin1String(".lnk"))) {
QFileSystemMetaData metaData;
QFileSystemEntry link = QFileSystemEngine::getLinkTarget(entry, metaData);
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index cc1d110252..9def33ad9f 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -102,7 +102,7 @@ static void checkWarnMessage(const QIODevice *device, const char *function, cons
d << ", \"" << QDir::toNativeSeparators(f->fileName()) << '"';
d << ')';
#else
- Q_UNUSED(device)
+ Q_UNUSED(device);
#endif // !QT_NO_QOBJECT
d << ": " << what;
#else
diff --git a/src/corelib/io/qsettings_wasm.cpp b/src/corelib/io/qsettings_wasm.cpp
index 8d8f4b505c..949b478c40 100644
--- a/src/corelib/io/qsettings_wasm.cpp
+++ b/src/corelib/io/qsettings_wasm.cpp
@@ -126,7 +126,7 @@ QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format,
const QString &organization,
const QString &application)
{
- Q_UNUSED(format)
+ Q_UNUSED(format);
if (organization == QLatin1String("Qt"))
{
QString organizationDomain = QCoreApplication::organizationDomain();
diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
index a120db32fc..3637c11c0a 100644
--- a/src/corelib/io/qstandardpaths_win.cpp
+++ b/src/corelib/io/qstandardpaths_win.cpp
@@ -84,7 +84,7 @@ static void appendOrganizationAndApp(QString &path) // Courtesy qstandardpaths_u
if (!appName.isEmpty())
path += QLatin1Char('/') + appName;
#else // !QT_BOOTSTRAPPED
- Q_UNUSED(path)
+ Q_UNUSED(path);
#endif
}
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index e6a160c3b2..56a3d1982f 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -242,7 +242,7 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t
return false;
}
#else // POSIX
- Q_UNUSED(flags)
+ Q_UNUSED(flags);
file = QT_OPEN(path.constData(),
QT_OPEN_CREAT | QT_OPEN_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE,
static_cast<mode_t>(mode));