diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-08-02 17:46:34 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-20 13:16:20 +0000 |
| commit | 677ead12a2bb7da5d4de6d3b78e8dd95ba13923c (patch) | |
| tree | 49d95af19f677333f3cd0e26f6eac17f572e48c8 /src/lib/corelib/tools | |
| parent | f98170dc4411c76bc02e4ed48af29006e7f91ef8 (diff) | |
corelib: Apply modernize-use-auto
Use more auto.
Change-Id: I27e1e2345c6bede459a375663be72ec3370a5e39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools')
| -rw-r--r-- | src/lib/corelib/tools/filetime.cpp | 10 | ||||
| -rw-r--r-- | src/lib/corelib/tools/qbspluginmanager.cpp | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/lib/corelib/tools/filetime.cpp b/src/lib/corelib/tools/filetime.cpp index 42f11b46b..263950d9c 100644 --- a/src/lib/corelib/tools/filetime.cpp +++ b/src/lib/corelib/tools/filetime.cpp @@ -93,8 +93,8 @@ FileTime::FileTime(const FileTime::InternalType &ft) : m_fileTime(ft) int FileTime::compare(const FileTime &other) const { #ifdef Q_OS_WIN - const FILETIME *const t1 = reinterpret_cast<const FILETIME *>(&m_fileTime); - const FILETIME *const t2 = reinterpret_cast<const FILETIME *>(&other.m_fileTime); + auto const t1 = reinterpret_cast<const FILETIME *>(&m_fileTime); + auto const t2 = reinterpret_cast<const FILETIME *>(&other.m_fileTime); return CompareFileTime(t1, t2); #elif HAS_CLOCK_GETTIME if (m_fileTime.tv_sec < other.m_fileTime.tv_sec) @@ -135,7 +135,7 @@ FileTime FileTime::currentTime() FileTime result; SYSTEMTIME st; GetSystemTime(&st); - FILETIME *const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); + auto const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); SystemTimeToFileTime(&st, ft); return result; #elif defined APPLE_CUSTOM_CLOCK_GETTIME @@ -168,7 +168,7 @@ FileTime FileTime::oldestTime() 0 }; FileTime result; - FILETIME *const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); + auto const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); SystemTimeToFileTime(&st, ft); return result; #elif HAS_CLOCK_GETTIME @@ -190,7 +190,7 @@ double FileTime::asDouble() const QString FileTime::toString() const { #ifdef Q_OS_WIN - const FILETIME *const ft = reinterpret_cast<const FILETIME *>(&m_fileTime); + auto const ft = reinterpret_cast<const FILETIME *>(&m_fileTime); SYSTEMTIME stUTC, stLocal; FileTimeToSystemTime(ft, &stUTC); SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal); diff --git a/src/lib/corelib/tools/qbspluginmanager.cpp b/src/lib/corelib/tools/qbspluginmanager.cpp index a8d22f458..d0be73891 100644 --- a/src/lib/corelib/tools/qbspluginmanager.cpp +++ b/src/lib/corelib/tools/qbspluginmanager.cpp @@ -80,8 +80,7 @@ QbsPluginManager::~QbsPluginManager() unloadStaticPlugins(); for (QLibrary * const lib : qAsConst(d->libs)) { - QbsPluginUnloadFunction unload = reinterpret_cast<QbsPluginUnloadFunction>( - lib->resolve("QbsPluginUnload")); + auto unload = reinterpret_cast<QbsPluginUnloadFunction>(lib->resolve("QbsPluginUnload")); if (unload) unload(); lib->unload(); @@ -146,8 +145,7 @@ void QbsPluginManager::loadPlugins(const std::vector<std::string> &pluginPaths, continue; } - QbsPluginLoadFunction load = reinterpret_cast<QbsPluginLoadFunction>( - lib->resolve("QbsPluginLoad")); + auto load = reinterpret_cast<QbsPluginLoadFunction>(lib->resolve("QbsPluginLoad")); if (load) { load(); qCDebug(lcPluginManager) << "plugin" << QDir::toNativeSeparators(fileName) |