1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark the old style unprefixed stream functions deprecated

Browse Source 
Requires a third definition for the source-compatible but deprecated
version.

Change-Id: I260ae79f4547f99eed701b10e0b25222f81cd5ff
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2019-12-05 10:44:37 +01:00
parent d6266c757d
commit deeaa500ad
4 changed files with 78 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/generators/unix/unixmake2.cpp
View File

@ -1542,14 +1542,14 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t,
t << "\\\n\t\t" << (*objit);
}
if (incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl;
t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl;
} else if (!incrs_out.count()) {
t << endl;
t << Qt::endl;
} else {
src_incremental = true;
t << endl;
t << Qt::endl;
t << "INCREMENTAL_OBJECTS = "
<< escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl;
<< escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl;
}
} else {
const ProString &objMax = project->first("QMAKE_LINK_OBJECT_MAX");
@ -1566,7 +1566,7 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t,
createResponseFile(ld_response_file, objs);
objectsLinkLine = "@" + escapeFilePath(ld_response_file);
}
t << "OBJECTS = " << valList(escapeDependencyPaths(objs)) << endl;
t << "OBJECTS = " << valList(escapeDependencyPaths(objs)) << Qt::endl;
}
return std::make_pair(src_incremental, objectsLinkLine);
}

52
src/corelib/serialization/qtextstream.cpp
View File

@ -2689,11 +2689,8 @@ QTextStream &QTextStream::operator<<(const void *ptr)
d->params.numberFlags = oldFlags;
return *this;
}
#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
namespace Qt {
#else
namespace QTextStreamFunctions {
#endif
/*!
\relates QTextStream
@ -3020,7 +3017,7 @@ QTextStream &ws(QTextStream &stream)
return stream;
}
} // namespace QTextStreamFunctions
} // namespace Qt
/*!
\fn QTextStreamManipulator qSetFieldWidth(int width)
@ -3045,11 +3042,7 @@ QTextStream &ws(QTextStream &stream)
#if QT_CONFIG(textcodec)
#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
namespace Qt {
#else
namespace QTextStreamFunctions {
#endif
/*!
\relates QTextStream
@ -3064,7 +3057,7 @@ QTextStream &bom(QTextStream &stream)
return stream;
}
} // namespace QTextStreamFunctions
} // namespace Qt
/*!
Sets the codec for this stream to \a codec. The codec is used for
@ -3215,6 +3208,45 @@ QLocale QTextStream::locale() const
return d->locale;
}
#if QT_DEPRECATED_SINCE(5, 15) && !defined(Q_QDOC)
// Deprecated source compatible migration versions:
namespace QTextStreamFunctions {
QTextStream &bin(QTextStream &s) { return Qt::bin(s); }
QTextStream &oct(QTextStream &s) { return Qt::oct(s); }
QTextStream &dec(QTextStream &s) { return Qt::dec(s); }
QTextStream &hex(QTextStream &s) { return Qt::hex(s); }
QTextStream &showbase(QTextStream &s) { return Qt::showbase(s); }
QTextStream &forcesign(QTextStream &s) { return Qt::forcesign(s); }
QTextStream &forcepoint(QTextStream &s) { return Qt::forcepoint(s); }
QTextStream &noshowbase(QTextStream &s) { return Qt::noshowbase(s); }
QTextStream &noforcesign(QTextStream &s) { return Qt::noforcesign(s); }
QTextStream &noforcepoint(QTextStream &s) { return Qt::noforcepoint(s); }
QTextStream &uppercasebase(QTextStream &s) { return Qt::uppercasebase(s); }
QTextStream &uppercasedigits(QTextStream &s) { return Qt::uppercasedigits(s); }
QTextStream &lowercasebase(QTextStream &s) { return Qt::lowercasebase(s); }
QTextStream &lowercasedigits(QTextStream &s) { return Qt::lowercasedigits(s); }
QTextStream &fixed(QTextStream &s) { return Qt::fixed(s); }
QTextStream &scientific(QTextStream &s) { return Qt::scientific(s); }
QTextStream &left(QTextStream &s) { return Qt::left(s); }
QTextStream &right(QTextStream &s) { return Qt::right(s); }
QTextStream &center(QTextStream &s) { return Qt::center(s); }
QTextStream &endl(QTextStream &s) { return Qt::endl(s); }
QTextStream &flush(QTextStream &s) { return Qt::flush(s); }
QTextStream &reset(QTextStream &s) { return Qt::reset(s); }
QTextStream &ws(QTextStream &s) { return Qt::ws(s); }
#if QT_CONFIG(textcodec)
QTextStream &bom(QTextStream &s) { return Qt::bom(s); }
#endif
} // namespace QTextStreamFunctions
#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
// Binary compatible definitions for Qt<5.14
Q_CORE_EXPORT QTextStream &bin(QTextStream &s) { return Qt::bin(s); }

42
src/corelib/serialization/qtextstream.h
View File

@ -233,13 +233,7 @@ inline QTextStream &operator<<(QTextStream &s, QTextStreamFunction f)
inline QTextStream &operator<<(QTextStream &s, QTextStreamManipulator m)
{ m.exec(s); return s; }
#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
namespace Qt {
#else
// This namespace only exists for 'using namespace' declarations.
namespace QTextStreamFunctions {
#endif
Q_CORE_EXPORT QTextStream &bin(QTextStream &s);
Q_CORE_EXPORT QTextStream &oct(QTextStream &s);
Q_CORE_EXPORT QTextStream &dec(QTextStream &s);
@ -272,12 +266,36 @@ Q_CORE_EXPORT QTextStream &bom(QTextStream &s);
Q_CORE_EXPORT QTextStream &ws(QTextStream &s);
} // namespace QTextStreamFunctions
} // namespace Qt
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
namespace Qt {
using namespace QTextStreamFunctions;
}
#if QT_DEPRECATED_SINCE(5, 15) && !defined(Q_QDOC)
// This namespace only exists for 'using namespace' declarations.
namespace QTextStreamFunctions {
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::bin") QTextStream &bin(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::oct") QTextStream &oct(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::dec") QTextStream &dec(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::hex") QTextStream &hex(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::showbase") QTextStream &showbase(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::forcesign") QTextStream &forcesign(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::forcepoint") QTextStream &forcepoint(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::noshowbase") QTextStream &noshowbase(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::noforcesign") QTextStream &noforcesign(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::noforcepoint") QTextStream &noforcepoint(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::uppercasebase") QTextStream &uppercasebase(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::uppercasedigits") QTextStream &uppercasedigits(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::lowercasebase") QTextStream &lowercasebase(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::lowercasedigits") QTextStream &lowercasedigits(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::fixed") QTextStream &fixed(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::scientific") QTextStream &scientific(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::left") QTextStream &left(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::right") QTextStream &right(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::center") QTextStream &center(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::endl") QTextStream &endl(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::flush") QTextStream &flush(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::reset") QTextStream &reset(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::bom") QTextStream &bom(QTextStream &s);
Q_CORE_EXPORT QT_DEPRECATED_X("Use Qt::ws") QTextStream &ws(QTextStream &s);
} // namespace QTextStreamFunctions
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wheader-hygiene")
@ -285,7 +303,7 @@ QT_WARNING_DISABLE_CLANG("-Wheader-hygiene")
// conflicting definitions compiler errors.
using namespace QTextStreamFunctions;
QT_WARNING_POP
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC)
#endif // QT_DEPRECATED_SINCE(5, 15) && !defined(Q_QDOC)
inline QTextStreamManipulator qSetFieldWidth(int width)
{

2
src/tools/tracegen/etw.cpp
View File

@ -90,7 +90,7 @@ static QString createGuid(const QUuid &uuid)
QTextStream stream(&guid);
hex(stream);
Qt::hex(stream);
stream << "("
<< "0x" << uuid.data1 << ", "