Evaluate a sqlite based version of the quick filter (feedback wanted)

common/i18n.h

@@ -24,7 +24,7 @@
 #define _I18N_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 #endif
 
 #ifdef ENABLE_NLS

common/raptoptions.cc

@@ -20,27 +20,32 @@
  * USA
  */
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
-#include <fstream>
-#include <sstream>
-#include <dirent.h>
-
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
+#include "raptoptions.h"
 
 #include "i18n.h"
 #include "rconfiguration.h"
-#include "raptoptions.h"
 
-RAPTOptions *_roptions = new RAPTOptions;
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/versionmatch.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
+#include <dirent.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <utility>
 
 using namespace std;
 
+RAPTOptions *_roptions = new RAPTOptions;
+
 ostream &operator<<(ostream &os, const RAPTOptions::packageOptions &o)
 {
    os << o.isNew;

common/raptoptions.h

@@ -23,11 +23,11 @@
 #ifndef _RAPTOPTIONS_H_
 #define _RAPTOPTIONS_H_
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #include <map>
+#include <iostream>
 #include <string>
-#include <apt-pkg/configuration.h>
 
 class RAPTOptions {
  public:

common/rcacheactor.cc

@@ -1,14 +1,21 @@
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #include "rcacheactor.h"
+
+#include "rpackage.h"
 #include "rpackagelister.h"
+#include <apt-pkg/fileutl.h>
 
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/tagfile.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
-#include <algorithm>
+#include <apt-pkg/tagfile.h>
+#include <cstddef>
 #include <fnmatch.h>
+#include <regex.h>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace std;
 
@@ -47,10 +54,6 @@ void RCacheActor::notifyCachePostChange()
    }
 }
 
-
-
-
-
 RCacheActorRecommends::RCacheActorRecommends(RPackageLister *lister,
                                              string fileName)
 : RCacheActor(lister)
@@ -194,6 +197,4 @@ void RCacheActorRecommends::run(vector<RPackage *> &PkgList, int Action)
    }
 }
 
-
-
 // vim:sts=3:sw=3

common/rcacheactor.h

@@ -25,10 +25,16 @@
 #ifndef _RCACHEACTOR_H
 #define _RCACHEACTOR_H
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
+#include "rpackage.h"
 #include "rpackagelister.h"
+
+#include <cstddef>
+#include <map>
 #include <regex.h>
+#include <string>
+#include <vector>
 
 class RCacheActor:public RCacheObserver {
  public:

common/rcdscanner.cc

@@ -20,27 +20,27 @@
  * USA
  */
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #ifndef HAVE_APTPKG_CDROM
 
-#include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
-#include <cstdio>
+#include "rcdscanner.h"
+
+#include "i18n.h"
 
+#include <algorithm>
+#include <apt-pkg/cdromutl.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/cdromutl.h>
 #include <apt-pkg/strutl.h>
-
-#include "i18n.h"
-#include "rcdscanner.h"
+#include <cstdio>
+#include <dirent.h>
+#include <fcntl.h>
+#include <fstream>
+#include <iostream>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #ifdef HAVE_RPM
 #include "rpmindexcopy.h"

common/rcdscanner.h

@@ -23,7 +23,7 @@
 #ifndef _RCDSCANNER_H_
 #define _RCDSCANNER_H_
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #ifndef HAVE_APTPKG_CDROM
 

common/rconfiguration.cc

@@ -22,25 +22,26 @@
  * USA
  */
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
-#include <pwd.h>
-#include <sys/types.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>
+#include "rconfiguration.h"
 
-#include <unistd.h>
+#include "i18n.h"
 
-#include <apt-pkg/init.h>
-#include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-
-#include "rconfiguration.h"
-
-#include "i18n.h"
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <pwd.h>
+#include <string>
+#include <sys/stat.h>
+#include <unistd.h>
 
 using namespace std;
 

common/rconfiguration.h

@@ -25,7 +25,7 @@
 #ifndef _RCONFIGURATION_H_
 #define _RCONFIGURATION_H_
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #include <string>
 #include <fstream>

common/rinstallprogress.cc

@@ -22,26 +22,30 @@
  * USA
  */
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
-#include <unistd.h>
-#include <fcntl.h>
+#include "rinstallprogress.h"
+
+#include "i18n.h"
+
+#include <apt-pkg/install-progress.h>
+#include <apt-pkg/packagemanager.h>
+#include <stdlib.h>
+#include <string>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <iostream>
-#include <cstdio>
-#include <apt-pkg/error.h>
-#include <apt-pkg/install-progress.h>
+#include <unistd.h>
+
 #ifdef HAVE_RPM
 #include <apt-pkg/configuration.h>
+#include <fcntl.h>
 #endif
 
-#include "rinstallprogress.h"
+using namespace std;
 
-#include "i18n.h"
-std::string RInstallProgress::finishMsg = _("\nSuccessfully applied all changes. You can close the window now.");
-std::string RInstallProgress::errorMsg = _("\nNot all changes and updates succeeded. For further details of the failure, please expand the 'Details' panel below.");
-std::string RInstallProgress::incompleteMsg = 
+string RInstallProgress::finishMsg = _("\nSuccessfully applied all changes. You can close the window now.");
+string RInstallProgress::errorMsg = _("\nNot all changes and updates succeeded. For further details of the failure, please expand the 'Details' panel below.");
+string RInstallProgress::incompleteMsg = 
       _("\nSuccessfully installed all packages of the current medium. "
 	"To continue the installation with the next medium close "
 	"this window.");
@@ -64,7 +68,6 @@ const char* RInstallProgress::getResultStr(pkgPackageManager::OrderResult res)
    return "Unknown install result.";
 }
 
-
 pkgPackageManager::OrderResult RInstallProgress::start(pkgPackageManager *pm,
                                                        int numPackages,
                                                        int numPackagesTotal)

common/rinstallprogress.h

@@ -25,10 +25,12 @@
 #ifndef _RINSTALLPROGRESS_H_
 #define _RINSTALLPROGRESS_H_
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
 #include <apt-pkg/packagemanager.h>
 
+#include <string>
+
 class RInstallProgress {
  protected:
    int _stdout;

common/rpackage.cc

@@ -26,39 +26,43 @@
  * USA
  */
 
-#include "config.h"
+#include "config.h"  // IWYU pragma: associated
 
-#include "i18n.h"
 #include "rpackage.h"
+
+#include "i18n.h"
+#include "rconfiguration.h"
+#include "rpackagecache.h"
 #include "rpackagelister.h"
 
 #include <algorithm>
-#include <assert.h>
-#include <cstdio>
-#include <fstream>
-#include <map>
-#include <string>
-#include <sstream>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
 #include <apt-pkg/algorithms.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/version.h>
 #include <apt-pkg/versionmatch.h>
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <utility>
+#include <vector>
 
 #ifdef WITH_LUA
 #include <apt-pkg/luaiface.h>
@@ -1146,26 +1150,23 @@ bool RPackage::isShallowDependency(RPackage *pkg)
 
 
 // format: first version, second archives
-vector<pair<string, string> > RPackage::getAvailableVersions()
+vector<pair<string, string>> RPackage::getAvailableVersions()
 {
-   string VerTag;
-   vector<pair<string, string> > versions;
+   vector<pair<string, string>> versions;
 
    // Get available Versions.
-   for (pkgCache::VerIterator Ver = _package->VersionList();
-        Ver.end() == false; Ver++) {
+   for (pkgCache::VerIterator Ver = _package->VersionList(); Ver.end() == false; Ver++) {
 
       // We always take the first available version.
       pkgCache::VerFileIterator VF = Ver.FileList();
       if (!VF.end()) {
          pkgCache::PkgFileIterator File = VF.File();
-
-         if (File.Archive() != 0)
-            versions.push_back(pair < string,
-                               string > (Ver.VerStr(), File.Archive()));
-         else
-            versions.push_back(pair < string,
-                               string > (Ver.VerStr(), File.Site()));
+
+         if (File.Archive() != NULL) {
+            versions.push_back(pair<string, string>(Ver.VerStr(), File.Archive()));
+         } else {
+            versions.push_back(pair<string, string>(Ver.VerStr(), File.Site()));
+         }
       }
    }