[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcm-grub2] src: Minor fixes.
From:       Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date:       2013-10-24 20:36:18
Message-ID: E1VZRdi-0006B4-MU () scm ! kde ! org
[Download RAW message or body]

Git commit 179b4412f003dd81feeb7def97564676b1bb67d4 by Konstantinos Smanis.
Committed on 24/10/2013 at 20:35.
Pushed by ksmanis into branch 'master'.

Minor fixes.

while(true) -> Q_FOREVER. Simplify iterators with Q_FOREACH.

M  +3    -3    src/common.cpp
M  +2    -4    src/convertDlg.cpp

http://commits.kde.org/kcm-grub2/179b4412f003dd81feeb7def97564676b1bb67d4

diff --git a/src/common.cpp b/src/common.cpp
index 909b8cd..475dec4 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -44,7 +44,7 @@ QString unquoteWord(const QString &word)
     while (!stream.atEnd()) {
         stream >> ch;
         if (ch == QLatin1Char('\'')) {
-            while (true) {
+            Q_FOREVER {
                 if (stream.atEnd()) {
                     return QString();
                 }
@@ -56,7 +56,7 @@ QString unquoteWord(const QString &word)
                 }
             }
         } else if (ch == QLatin1Char('"')) {
-            while (true) {
+            Q_FOREVER {
                 if (stream.atEnd()) {
                     return QString();
                 }
@@ -86,7 +86,7 @@ QString unquoteWord(const QString &word)
                 }
             }
         } else {
-            while (true) {
+            Q_FOREVER {
                 if (ch == QLatin1Char('\\')) {
                     if (stream.atEnd()) {
                         return unquotedWord;
diff --git a/src/convertDlg.cpp b/src/convertDlg.cpp
index b798b43..6e1cca9 100644
--- a/src/convertDlg.cpp
+++ b/src/convertDlg.cpp
@@ -39,10 +39,8 @@ ConvertDialog::ConvertDialog(QWidget *parent, Qt::WFlags flags) : \
KDialog(parent  QString readFilter;
     QList<Magick::CoderInfo> coderList;
     coderInfoList(&coderList, Magick::CoderInfo::TrueMatch, \
                Magick::CoderInfo::AnyMatch, Magick::CoderInfo::AnyMatch);
-    QList<Magick::CoderInfo>::const_iterator it = coderList.constBegin();
-    QList<Magick::CoderInfo>::const_iterator end = coderList.constEnd();
-    for (; it != end; ++it) {
-        readFilter.append(QString(QLatin1String(" \
*.%1")).arg(QString::fromStdString(it->name()).toLower())); +    Q_FOREACH(const \
Magick::CoderInfo &coder, coderList) { +        \
readFilter.append(QString(QLatin1String(" \
*.%1")).arg(QString::fromStdString(coder.name()).toLower()));  }
     readFilter.remove(0, 1);
     readFilter.append(QLatin1Char('|')).append(i18nc("@item:inlistbox", "ImageMagick \
supported image formats"));


[prev in list] [next in list] [prev in thread] [next in thread]