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

Android: eradicate Q_FOREACH loops [already const]

Browse Source 
... (or trivially marked const) local variables,
parameters, or data members with trivial loop bodies,
by replacing them with C++11 range-for loops.

Change-Id: I25e9e2148abd7676305ebd18754dc647f217e48b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2016-01-26 14:38:54 +01:00
parent 0909a94af2
commit 54d26804d7
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -494,7 +494,7 @@ static jboolean startQtApplication(JNIEnv *env, jobject /*object*/, jstring para
const char *nativeString = env->GetStringUTFChars(environmentString, 0);
const QList<QByteArray> envVars = QByteArray(nativeString).split('\t');
env->ReleaseStringUTFChars(environmentString, nativeString);
foreach (const QByteArray &envVar, envVars) {
for (const QByteArray &envVar : envVars) {
const QList<QByteArray> envVarPair = envVar.split('=');
if (envVarPair.size() == 2 && ::setenv(envVarPair[0], envVarPair[1], 1) != 0)
qWarning() << "Can't set environment" << envVarPair;

2
src/plugins/platforms/android/androidjnimenu.cpp
View File

@ -257,7 +257,7 @@ namespace QtAndroidMenu
if (menus.size() == 1) { // Expand the menu
order = addAllMenuItemsToMenu(env, menu, static_cast<QAndroidPlatformMenu *>(menus.front()));
} else {
foreach (QAndroidPlatformMenu *item, menus) {
for (QAndroidPlatformMenu *item : menus) {
QString itemText = removeAmpersandEscapes(item->text());
jstring jtext = env->NewString(reinterpret_cast<const jchar *>(itemText.data()),
itemText.length());

2
src/plugins/platforms/android/qandroidplatformmenu.cpp
View File

@ -159,7 +159,7 @@ QPlatformMenuItem *QAndroidPlatformMenu::menuItemAt(int position) const
QPlatformMenuItem *QAndroidPlatformMenu::menuItemForTag(quintptr tag) const
{
foreach (QPlatformMenuItem *menuItem, m_menuItems) {
for (QPlatformMenuItem *menuItem : m_menuItems) {
if (menuItem->tag() == tag)
return menuItem;
}

2
src/plugins/platforms/android/qandroidplatformmenubar.cpp
View File

@ -86,7 +86,7 @@ void QAndroidPlatformMenuBar::handleReparent(QWindow *newParentWindow)
QPlatformMenu *QAndroidPlatformMenuBar::menuForTag(quintptr tag) const
{
foreach (QPlatformMenu *menu, m_menus) {
for (QPlatformMenu *menu : m_menus) {
if (menu->tag() == tag)
return menu;
}

8
src/plugins/platforms/android/qandroidplatformscreen.cpp
View File

@ -117,7 +117,7 @@ QAndroidPlatformScreen::~QAndroidPlatformScreen()
QWindow *QAndroidPlatformScreen::topWindow() const
{
foreach (QAndroidPlatformWindow *w, m_windowStack) {
for (QAndroidPlatformWindow *w : m_windowStack) {
if (w->window()->type() == Qt::Window ||
w->window()->type() == Qt::Popup ||
w->window()->type() == Qt::Dialog) {
@ -129,7 +129,7 @@ QWindow *QAndroidPlatformScreen::topWindow() const
QWindow *QAndroidPlatformScreen::topLevelAt(const QPoint &p) const
{
foreach (QAndroidPlatformWindow *w, m_windowStack) {
for (QAndroidPlatformWindow *w : m_windowStack) {
if (w->geometry().contains(p, false) && w->window()->isVisible())
return w->window();
}
@ -363,8 +363,8 @@ void QAndroidPlatformScreen::doRedraw()
|| !window->isRaster())
continue;
QVector<QRect> visibleRects = visibleRegion.rects();
foreach (const QRect &rect, visibleRects) {
const QVector<QRect> visibleRects = visibleRegion.rects();
for (const QRect &rect : visibleRects) {
QRect targetRect = window->geometry();
targetRect &= rect;

18
src/widgets/styles/qandroidstyle.cpp
View File

@ -838,7 +838,7 @@ int QAndroidStyle::Android9PatchDrawable::calculateStretch(int boundsLimit,
void QAndroidStyle::Android9PatchDrawable::extractIntArray(const QVariantList &values,
QVector<int> & array)
{
foreach (QVariant value, values)
for (const QVariant &value : values)
array << value.toInt();
}
@ -1140,8 +1140,8 @@ QAndroidStyle::AndroidStateDrawable::AndroidStateDrawable(const QVariantMap &dra
QAndroidStyle::ItemType itemType)
: AndroidDrawable(drawable, itemType)
{
QVariantList states = drawable.value(QLatin1String("stateslist")).toList();
foreach (QVariant stateVariant, states) {
const QVariantList states = drawable.value(QLatin1String("stateslist")).toList();
for (const QVariant &stateVariant : states) {
QVariantMap state = stateVariant.toMap();
const int s = extractState(state.value(QLatin1String("states")).toMap());
if (-1 == s)
@ -1192,7 +1192,7 @@ const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::best
}
uint bestCost = 0xffff;
foreach (const StateType & state, m_states) {
for (const StateType & state : m_states) {
if (int(opt->state) == state.first)
return state.second;
uint cost = 1;
@ -1293,8 +1293,8 @@ QAndroidStyle::AndroidLayerDrawable::AndroidLayerDrawable(const QVariantMap &dra
m_id = 0;
m_factor = 1;
m_orientation = Qt::Horizontal;
QVariantList layers = drawable.value(QLatin1String("layers")).toList();
foreach (QVariant layer, layers) {
const QVariantList layers = drawable.value(QLatin1String("layers")).toList();
for (const QVariant &layer : layers) {
QVariantMap layerMap = layer.toMap();
AndroidDrawable *ad = fromMap(layerMap, itemType);
if (ad) {
@ -1326,7 +1326,7 @@ void QAndroidStyle::AndroidLayerDrawable::setFactor(int id, double factor, Qt::O
void QAndroidStyle::AndroidLayerDrawable::draw(QPainter *painter, const QStyleOption *opt) const
{
foreach (const LayerType &layer, m_layers) {
for (const LayerType &layer : m_layers) {
if (layer.first == m_id) {
QStyleOption copy(*opt);
if (m_orientation == Qt::Horizontal)
@ -1342,7 +1342,7 @@ void QAndroidStyle::AndroidLayerDrawable::draw(QPainter *painter, const QStyleOp
QAndroidStyle::AndroidDrawable *QAndroidStyle::AndroidLayerDrawable::layer(int id) const
{
foreach (const LayerType &layer, m_layers)
for (const LayerType &layer : m_layers)
if (layer.first == id)
return layer.second;
return 0;
@ -1351,7 +1351,7 @@ QAndroidStyle::AndroidDrawable *QAndroidStyle::AndroidLayerDrawable::layer(int i
QSize QAndroidStyle::AndroidLayerDrawable::size() const
{
QSize sz;
foreach (const LayerType &layer, m_layers)
for (const LayerType &layer : m_layers)
sz = sz.expandedTo(layer.second->size());
return sz;
}