yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace foreach with java-style iterator

Browse source 
In preparation for reversing the loop.

REVIEW: 110670
This commit is contained in:
Oliver Henshaw 2013-05-26 14:09:22 +01:00
parent bf044bf509
commit 2d5ebd3b8d
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/aurorae/src/aurorae.cpp
View file

@ -88,8 +88,9 @@ void AuroraeFactory::initAurorae(KConfig &conf, KConfigGroup &group)
m_theme->setButtonSize((KDecorationDefines::BorderSize)themeGroup.readEntry<int>("ButtonSize", KDecorationDefines::BorderNormal));
m_theme->setTabDragMimeType(tabDragMimeType());
// setup the QML engine
foreach (const QString &importPath, KGlobal::dirs()->findDirs("module", "imports")) {
m_engine->addImportPath(importPath);
QStringListIterator paths(KGlobal::dirs()->findDirs("module", "imports"));
while (paths.hasNext()) {
m_engine->addImportPath(paths.next());
}
m_component->loadUrl(QUrl(KStandardDirs::locate("data", "kwin/aurorae/aurorae.qml")));
m_engine->rootContext()->setContextProperty("auroraeTheme", m_theme);
@ -122,8 +123,9 @@ void AuroraeFactory::initQML(const KConfigGroup &group)
}
m_engineType = QMLEngine;
// setup the QML engine
foreach (const QString &importPath, KGlobal::dirs()->findDirs("module", "imports")) {
m_engine->addImportPath(importPath);
QStringListIterator paths(KGlobal::dirs()->findDirs("module", "imports"));
while (paths.hasNext()) {
m_engine->addImportPath(paths.next());
}
m_component->loadUrl(QUrl::fromLocalFile(file));
m_themeName = themeName;

5
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -135,8 +135,9 @@ void KWinDecorationModule::init()
m_proxyModel->setSourceModel(m_model);
m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
m_ui->decorationList->setResizeMode(QDeclarativeView::SizeRootObjectToView);
foreach (const QString &importPath, KGlobal::dirs()->findDirs("module", "imports")) {
m_ui->decorationList->engine()->addImportPath(importPath);
QStringListIterator paths(KGlobal::dirs()->findDirs("module", "imports"));
while (paths.hasNext()) {
m_ui->decorationList->engine()->addImportPath(paths.next());
}
m_ui->decorationList->rootContext()->setContextProperty("decorationModel", m_proxyModel);
m_ui->decorationList->rootContext()->setContextProperty("decorationBaseModel", m_model);