diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-30 16:18:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-10 16:25:54 +0100 |
| commit | b3638e1d113827d135de19ae6868d8174e03ec64 (patch) | |
| tree | c5d1688a56869fc34c3313db2b2403b4500386f4 /src/corelib/io/qdir.cpp | |
| parent | b52ec2ec6b92fd6771e4266c3baa22454c9c2dc1 (diff) | |
Clean up QDebug operators for QDir
Change-Id: Ia0a9eb5058adde98f690288cfbbb62a82a75dc60
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index a5e189a825..92f2fc0815 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2271,6 +2271,8 @@ QStringList QDir::nameFiltersFromString(const QString &nameFilter) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug debug, QDir::Filters filters) { + QDebugStateSaver save(debug); + debug.resetFormat(); QStringList flags; if (filters == QDir::NoFilter) { flags << QLatin1String("NoFilter"); @@ -2291,12 +2293,14 @@ QDebug operator<<(QDebug debug, QDir::Filters filters) if (filters & QDir::System) flags << QLatin1String("System"); if (filters & QDir::CaseSensitive) flags << QLatin1String("CaseSensitive"); } - debug << "QDir::Filters(" << qPrintable(flags.join(QLatin1Char('|'))) << ')'; + debug.noquote() << "QDir::Filters(" << flags.join(QLatin1Char('|')) << ')'; return debug; } static QDebug operator<<(QDebug debug, QDir::SortFlags sorting) { + QDebugStateSaver save(debug); + debug.resetFormat(); if (sorting == QDir::NoSort) { debug << "QDir::SortFlags(NoSort)"; } else { @@ -2312,24 +2316,23 @@ static QDebug operator<<(QDebug debug, QDir::SortFlags sorting) if (sorting & QDir::IgnoreCase) flags << QLatin1String("IgnoreCase"); if (sorting & QDir::LocaleAware) flags << QLatin1String("LocaleAware"); if (sorting & QDir::Type) flags << QLatin1String("Type"); - debug << "QDir::SortFlags(" << qPrintable(type) - << '|' - << qPrintable(flags.join(QLatin1Char('|'))) << ')'; + debug.noquote() << "QDir::SortFlags(" << type << '|' << flags.join(QLatin1Char('|')) << ')'; } return debug; } QDebug operator<<(QDebug debug, const QDir &dir) { - debug.maybeSpace() << "QDir(" << dir.path() - << ", nameFilters = {" - << qPrintable(dir.nameFilters().join(QLatin1Char(','))) - << "}, " - << dir.sorting() - << ',' - << dir.filter() - << ')'; - return debug.space(); + QDebugStateSaver save(debug); + debug.resetFormat(); + debug << "QDir(" << dir.path() << ", nameFilters = {" + << dir.nameFilters().join(QLatin1Char(',')) + << "}, " + << dir.sorting() + << ',' + << dir.filter() + << ')'; + return debug; } #endif // QT_NO_DEBUG_STREAM |