feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CorePlugin: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-12-22 14:44:14 +01:00
parent 0d72da2fd4
commit 2892f13b8c
24 changed files with 155 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -405,7 +405,11 @@ bool MenuActionContainer::updateInternal()
if (ActionContainerPrivate *container = qobject_cast<ActionContainerPrivate*>(item)) {
actions.removeAll(container->menu()->menuAction());
if (container == this) {
qWarning() << Q_FUNC_INFO << "container" << (this->menu() ? this->menu()->title() : "") << "contains itself as subcontainer";
QByteArray warning = Q_FUNC_INFO + QByteArray(" container '");
if (this->menu())
warning += this->menu()->title().toLocal8Bit();
warning += "' contains itself as subcontainer";
qWarning("%s", warning.constData());
continue;
}
if (container->updateInternal()) {