AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtWidgets: use new qUtf16Printable() instead of qPrintable()

Browse Source 
This is more efficient and works even with non-US-ASCII
QStrings.

Change-Id: I4ca19de60347ded03022ef8540a6708c563bc9d7
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2015-11-12 10:13:42 +01:00
parent 1005b7a0de
commit f5a650735e
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/dialogs/qwizard.cpp
View File

@ -800,7 +800,7 @@ void QWizardPrivate::addField(const QWizardField &field)
myField.resolve(defaultPropertyTable);
if (fieldIndexMap.contains(myField.name)) {
qWarning("QWizardPage::addField: Duplicate field '%s'", qPrintable(myField.name));
qWarning("QWizardPage::addField: Duplicate field '%ls'", qUtf16Printable(myField.name));
return;
}
@ -2516,7 +2516,7 @@ void QWizard::setField(const QString &name, const QVariant &value)
return;
}
qWarning("QWizard::setField: No such field '%s'", qPrintable(name));
qWarning("QWizard::setField: No such field '%ls'", qUtf16Printable(name));
}
/*!
@ -2536,7 +2536,7 @@ QVariant QWizard::field(const QString &name) const
return field.object->property(field.property);
}
qWarning("QWizard::field: No such field '%s'", qPrintable(name));
qWarning("QWizard::field: No such field '%ls'", qUtf16Printable(name));
return QVariant();
}

2
src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
View File

@ -2983,7 +2983,7 @@ void QGraphicsAnchorLayoutPrivate::dumpGraph(const QString &name)
{
QFile file(QString::fromLatin1("anchorlayout.%1.dot").arg(name));
if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
qWarning("Could not write to %s", file.fileName().toLocal8Bit().constData());
qWarning("Could not write to %ls", qUtf16Printable(file.fileName()));
QString str = QString::fromLatin1("digraph anchorlayout {\nnode [shape=\"rect\"]\n%1}");
QString dotContents = graph[0].serializeToDot();

44
src/widgets/kernel/qlayout.cpp
View File

@ -130,10 +130,10 @@ QLayout::QLayout(QLayoutPrivate &dd, QLayout *lay, QWidget *w)
lay->addItem(this);
} else if (w) {
if (w->layout()) {
qWarning("QLayout: Attempting to add QLayout \"%s\" to %s \"%s\", which"
qWarning("QLayout: Attempting to add QLayout \"%ls\" to %s \"%ls\", which"
" already has a layout",
qPrintable(QObject::objectName()), w->metaObject()->className(),
w->objectName().toLocal8Bit().data());
qUtf16Printable(QObject::objectName()), w->metaObject()->className(),
qUtf16Printable(w->objectName()));
setParent(0);
} else {
d->topLevel = true;
@ -777,8 +777,8 @@ QLayout::~QLayout()
void QLayout::addChildLayout(QLayout *l)
{
if (l->parent()) {
qWarning("QLayout::addChildLayout: layout \"%s\" already has a parent",
l->objectName().toLocal8Bit().data());
qWarning("QLayout::addChildLayout: layout \"%ls\" already has a parent",
qUtf16Printable(l->objectName()));
return;
}
l->setParent(this);
@ -827,8 +827,8 @@ void QLayoutPrivate::reparentChildWidgets(QWidget *mw)
QWidget *pw = w->parentWidget();
#ifdef QT_DEBUG
if (pw && pw != mw && layoutDebug()) {
qWarning("QLayout::addChildLayout: widget %s \"%s\" in wrong parent; moved to correct parent",
w->metaObject()->className(), w->objectName().toLocal8Bit().data());
qWarning("QLayout::addChildLayout: widget %s \"%ls\" in wrong parent; moved to correct parent",
w->metaObject()->className(), qUtf16Printable(w->objectName()));
}
#endif
bool needShow = mwVisible && !(w->isHidden() && w->testAttribute(Qt::WA_WState_ExplicitShowHide));
@ -850,14 +850,14 @@ bool QLayoutPrivate::checkWidget(QWidget *widget) const
{
Q_Q(const QLayout);
if (!widget) {
qWarning("QLayout: Cannot add a null widget to %s/%s", q->metaObject()->className(),
qPrintable(q->objectName()));
qWarning("QLayout: Cannot add a null widget to %s/%ls", q->metaObject()->className(),
qUtf16Printable(q->objectName()));
return false;
}
if (widget == q->parentWidget()) {
qWarning("QLayout: Cannot add parent widget %s/%s to its child layout %s/%s",
widget->metaObject()->className(), qPrintable(widget->objectName()),
q->metaObject()->className(), qPrintable(q->objectName()));
qWarning("QLayout: Cannot add parent widget %s/%ls to its child layout %s/%ls",
widget->metaObject()->className(), qUtf16Printable(widget->objectName()),
q->metaObject()->className(), qUtf16Printable(q->objectName()));
return false;
}
return true;
@ -871,13 +871,13 @@ bool QLayoutPrivate::checkLayout(QLayout *otherLayout) const
{
Q_Q(const QLayout);
if (!otherLayout) {
qWarning("QLayout: Cannot add a null layout to %s/%s", q->metaObject()->className(),
qPrintable(q->objectName()));
qWarning("QLayout: Cannot add a null layout to %s/%ls",
q->metaObject()->className(), qUtf16Printable(q->objectName()));
return false;
}
if (otherLayout == q) {
qWarning("QLayout: Cannot add layout %s/%s to itself", q->metaObject()->className(),
qPrintable(q->objectName()));
qWarning("QLayout: Cannot add layout %s/%ls to itself",
q->metaObject()->className(), qUtf16Printable(q->objectName()));
return false;
}
return true;
@ -903,16 +903,16 @@ void QLayout::addChildWidget(QWidget *w)
if (l && removeWidgetRecursively(l, w)) {
#ifdef QT_DEBUG
if (layoutDebug())
qWarning("QLayout::addChildWidget: %s \"%s\" is already in a layout; moved to new layout",
w->metaObject()->className(), w->objectName().toLocal8Bit().data());
qWarning("QLayout::addChildWidget: %s \"%ls\" is already in a layout; moved to new layout",
w->metaObject()->className(), qUtf16Printable(w->objectName()));
#endif
}
}
if (pw && mw && pw != mw) {
#ifdef QT_DEBUG
if (layoutDebug())
qWarning("QLayout::addChildWidget: %s \"%s\" in wrong parent; moved to correct parent",
w->metaObject()->className(), w->objectName().toLocal8Bit().data());
qWarning("QLayout::addChildWidget: %s \"%ls\" in wrong parent; moved to correct parent",
w->metaObject()->className(), qUtf16Printable(w->objectName()));
#endif
pw = 0;
}
@ -1065,8 +1065,8 @@ bool QLayout::activate()
return false;
QWidget *mw = static_cast<QWidget*>(parent());
if (mw == 0) {
qWarning("QLayout::activate: %s \"%s\" does not have a main widget",
QObject::metaObject()->className(), QObject::objectName().toLocal8Bit().data());
qWarning("QLayout::activate: %s \"%ls\" does not have a main widget",
metaObject()->className(), qUtf16Printable(objectName()));
return false;
}
activateRecursiveHelper(this);

4
src/widgets/widgets/qdockarealayout.cpp
View File

@ -1803,8 +1803,8 @@ void QDockAreaLayoutInfo::saveState(QDataStream &stream) const
QWidget *w = item.widgetItem->widget();
QString name = w->objectName();
if (name.isEmpty()) {
qWarning("QMainWindow::saveState(): 'objectName' not set for QDockWidget %p '%s;",
w, qPrintable(w->windowTitle()));
qWarning("QMainWindow::saveState(): 'objectName' not set for QDockWidget %p '%ls;",
w, qUtf16Printable(w->windowTitle()));
}
stream << name;