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

List:       kde-commits
Subject:    extragear/sysadmin/libqapt/src
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-12-28 5:05:07
Message-ID: 20101228050507.2AD5EAC8AD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209734 by jmthomas:

LibQApt should use Q_FOREACH explicitly to avoid potential issues with other \
libraries using the foreach keyword as a macro


 M  +5 -5      backend.cpp  
 M  +1 -1      config.cpp  
 M  +3 -3      history.cpp  
 M  +2 -2      package.cpp  


--- trunk/extragear/sysadmin/libqapt/src/backend.cpp #1209733:1209734
@@ -276,7 +276,7 @@
 {
     Q_D(const Backend);
 
-    foreach (Package *package, d->packages) {
+    Q_FOREACH (Package *package, d->packages) {
         if (package->installedFilesList().contains(file)) {
             return package;
         }
@@ -324,7 +324,7 @@
 
     int packageCount = 0;
 
-    foreach(const Package *package, d->packages) {
+    Q_FOREACH(const Package *package, d->packages) {
         if ((package->state() & states)) {
             packageCount++;
         }
@@ -394,7 +394,7 @@
 
     PackageList upgradeablePackages;
 
-    foreach (Package *package, d->packages) {
+    Q_FOREACH (Package *package, d->packages) {
         if (package->state() & Package::Upgradeable) {
             upgradeablePackages << package;
         }
@@ -409,7 +409,7 @@
 
     PackageList markedPackages;
 
-    foreach(Package *package, d->packages) {
+    Q_FOREACH(Package *package, d->packages) {
         if (package->state() & (Package::ToInstall | Package::ToReInstall |
                                 Package::ToUpgrade | Package::ToDowngrade |
                                 Package::ToRemove | Package::ToPurge)) {
@@ -744,7 +744,7 @@
 
     QVariantMap packageList;
 
-    foreach (const Package *package, d->packages) {
+    Q_FOREACH (const Package *package, d->packages) {
         int flags = package->state();
         // Cannot have any of these flags simultaneously
         int status = flags & (Package::ToKeep |
--- trunk/extragear/sysadmin/libqapt/src/config.cpp #1209733:1209734
@@ -95,7 +95,7 @@
 
     if (changed) {
         // No new keys. Recompose lines and set buffer to new buffer
-        foreach (const QByteArray &line, lines) {
+        Q_FOREACH (const QByteArray &line, lines) {
             tempBuffer += QByteArray(line + '\n');
         }
 
--- trunk/extragear/sysadmin/libqapt/src/history.cpp #1209733:1209734
@@ -111,7 +111,7 @@
             // Remove arch info
             actionPackages.remove(QRegExp(":\\w+"));
 
-            foreach (QString package, actionPackages.split("), ")) {
+            Q_FOREACH (QString package, actionPackages.split("), ")) {
                 if (!package.endsWith(QLatin1Char(')'))) {
                     package.append(QLatin1Char(')'));
                 }
@@ -241,7 +241,7 @@
     QDir logDirectory(directoryPath);
     QStringList logFiles = logDirectory.entryList(QDir::Files, QDir::Name);
 
-    foreach (QString file, logFiles) {
+    Q_FOREACH (QString file, logFiles) {
         file.prepend(directoryPath + QLatin1Char('/'));
         if (file.contains(QLatin1String("history"))) {
             if (file.endsWith(QLatin1String(".gz"))) {
@@ -262,7 +262,7 @@
 
     data = data.trimmed();
     QStringList stanzas = data.split(QLatin1String("\n\n"));
-    foreach(const QString &stanza, stanzas) {
+    Q_FOREACH(const QString &stanza, stanzas) {
         HistoryItem *historyItem = new HistoryItem(stanza);
         if (historyItem->isValid()) {
             historyItemList << historyItem;
--- trunk/extragear/sysadmin/libqapt/src/package.cpp #1209733:1209734
@@ -532,7 +532,7 @@
 
     QStringList lines = record.split(QLatin1Char('\n'));
 
-    foreach (const QString &line, lines) {
+    Q_FOREACH (const QString &line, lines) {
         if (line.startsWith(name)) {
             field = line.split(QLatin1String(": ")).at(1);
             break;
@@ -857,7 +857,7 @@
 {
     QStringList enhancedByList;
 
-    foreach (QApt::Package *package, d->backend->availablePackages()) {
+    Q_FOREACH (QApt::Package *package, d->backend->availablePackages()) {
         if (package->enhancesList().contains(latin1Name())) {
             enhancedByList << package->latin1Name();
         }


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