[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:       2011-01-05 0:04:11
Message-ID: 20110105000411.C971AAC8B0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211798 by jmthomas:

Use const references


 M  +19 -22    package.cpp  


--- trunk/extragear/sysadmin/libqapt/src/package.cpp #1211797:1211798
@@ -170,7 +170,7 @@
 QString Package::sourcePackage() const
 {
     QString sourcePackage;
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!ver.end()) {
         pkgRecords::Parser &rec = d->records->Lookup(ver.FileList());
         sourcePackage = QLatin1String(rec.SourcePkg().c_str());
@@ -187,7 +187,7 @@
 QString Package::shortDescription() const
 {
     QString shortDescription;
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!ver.end()) {
         pkgCache::DescIterator Desc = ver.TranslatedDescription();
         pkgRecords::Parser & parser = d->records->Lookup(Desc.FileList());
@@ -200,7 +200,7 @@
 
 QString Package::longDescription() const
 {
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     if (!ver.end()) {
         QString rawDescription;
@@ -244,7 +244,7 @@
 QString Package::maintainer() const
 {
     QString maintainer;
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!ver.end()) {
         pkgRecords::Parser &parser = d->records->Lookup(ver.FileList());
         maintainer = QString::fromUtf8(parser.Maintainer().data());
@@ -256,7 +256,7 @@
 QString Package::homepage() const
 {
     QString homepage;
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!ver.end()) {
         pkgRecords::Parser &parser = d->records->Lookup(ver.FileList());
         homepage = QString::fromUtf8(parser.Homepage().data());
@@ -324,7 +324,7 @@
 
 QString Package::priority() const
 {
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!ver) {
         return QLatin1String(ver.PriorityType());
     } else {
@@ -369,7 +369,7 @@
 
 QString Package::origin() const
 {
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     if(!Ver.end()) {
          pkgCache::VerFileIterator VF = Ver.FileList();
@@ -385,9 +385,8 @@
     if (!State.CandidateVer) {
         return QString();
     }
-    pkgCache::VerIterator Ver = State.CandidateVerIter(*d->depCache);
-    pkgCache::VerFileIterator VF = Ver.FileList();
-    pkgCache::PkgFileIterator File = VF.File();
+    const pkgCache::VerIterator &Ver = State.CandidateVerIter(*d->depCache);
+    const pkgCache::PkgFileIterator &File = Ver.FileList().File();
 
     if(!File.Component()) {
         return QString();
@@ -505,7 +504,7 @@
 QString Package::controlField(const QLatin1String &name) const
 {
     QString field;
-    pkgCache::VerIterator ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (ver.end()) {
         return field;
     }
@@ -534,7 +533,7 @@
 
 qint64 Package::currentInstalledSize() const
 {
-    pkgCache::VerIterator ver = d->packageIter->CurrentVer();
+    const pkgCache::VerIterator &ver = d->packageIter->CurrentVer();
 
     if (!ver.end()) {
         return qint64(ver->InstalledSize);
@@ -567,7 +566,7 @@
     int packageState = 0;
 
     pkgDepCache::StateCache &stateCache = (*d->depCache)[*d->packageIter];
-    pkgCache::VerIterator ver = d->packageIter->CurrentVer();
+    const pkgCache::VerIterator &ver = d->packageIter->CurrentVer();
 
     if (stateCache.Install()) {
         packageState |= ToInstall;
@@ -650,9 +649,7 @@
 
 bool Package::isInstalled() const
 {
-    pkgCache::VerIterator ver = d->packageIter->CurrentVer();
-
-    return !ver.end();
+    return !d->packageIter->CurrentVer().end();
 }
 
 bool Package::isSupported() const
@@ -769,7 +766,7 @@
 {
     QStringList recommends;
 
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     if (Ver.end()) {
         return recommends;
@@ -795,7 +792,7 @@
 {
     QStringList suggests;
 
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     if (Ver.end()) {
         return suggests;
@@ -821,7 +818,7 @@
 {
     QStringList enhances;
 
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     if (Ver.end()) {
         return enhances;
@@ -859,7 +856,7 @@
 
 QHash<int, QHash<QString, QVariantMap> > Package::brokenReason() const
 {
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
 
     QHash<QString, QVariantMap> notInstallable;
     QHash<QString, QVariantMap> wrongCandidate;
@@ -964,7 +961,7 @@
 
 bool Package::isTrusted() const
 {
-    pkgCache::VerIterator Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
+    const pkgCache::VerIterator &Ver = (*d->depCache)[*d->packageIter].CandidateVerIter(*d->depCache);
     if (!Ver) {
         return false;
     }
@@ -1088,7 +1085,7 @@
 
     bool isDefault = (version == defaultCandVer);
     pkgVersionMatch Match(version.toLatin1().constData(), pkgVersionMatch::Version);
-    pkgCache::VerIterator Ver = Match.Find(*d->packageIter);
+    const pkgCache::VerIterator &Ver = Match.Find(*d->packageIter);
 
     if (Ver.end()) {
         return false;
[prev in list] [next in list] [prev in thread] [next in thread]