diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-23 16:19:11 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-09 11:30:02 +0000 |
| commit | 868201155fd677dbc6d14346f5ea61e82ebce27b (patch) | |
| tree | 75d02a144c205d659e5851f95f306e3a12b0ff5e /src/corelib/tools/qlocale.cpp | |
| parent | 6389160f04322449c34bd1ecfe53983e3b588943 (diff) | |
QtCore: Use QDebugStateSaver in (almost) all QDebug operator<<
Unify the behavior of the different operator<< by always using
QDebugStateSaver (appending an optional space at exit), and making
sure that the space(), nospace() setting isn't 'leaked'.
Change-Id: I38e4f82fa6f7419d8b5edfc4dc37495af497e8ac
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 78334563dd..f589777e65 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -3583,10 +3583,12 @@ QString QLocale::nativeCountryName() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QLocale &l) { - dbg.nospace() << "QLocale(" << qPrintable(QLocale::languageToString(l.language())) - << ", " << qPrintable(QLocale::scriptToString(l.script())) - << ", " << qPrintable(QLocale::countryToString(l.country())) << ')'; - return dbg.space(); + QDebugStateSaver saver(dbg); + dbg.nospace().noquote() + << "QLocale(" << QLocale::languageToString(l.language()) + << ", " << QLocale::scriptToString(l.script()) + << ", " << QLocale::countryToString(l.country()) << ')'; + return dbg; } #endif QT_END_NAMESPACE |