0.7.1

[fapman] / aaptinterface.h

diff --git a/aaptinterface.h b/aaptinterface.h
index c7f1eeb..7925c55 100644 (file)
--- a/aaptinterface.h
+++ b/aaptinterface.h
@@ -31,19 +31,28 @@ const QString KBlacklistFile = "/root/.fapman/black.list";
 const QString KOwnRepoFile = "/root/.fapman/repos.list";
 const QString KOwnRepoNamesFile = "/root/.fapman/repos.names";
 
-const QString KHamRepoListFile = "/etc/apt/sources.list.d/hildon-application-manager.list";
+const QString KDefaultUserOpenSaveDir = "/home/user/MyDocs";
+
+#ifdef Q_WS_MAEMO_5
+       const QString KHamRepoListFile = "/etc/apt/sources.list.d/hildon-application-manager.list";
+#else
+       const QString KHamRepoListFile = "/etc/apt/sources.list";
+#endif
 
 const QString KLastUpdateFile = "/opt/fapman-cache/lastupdate";
 const QString KDateCacheFile = "/opt/fapman-cache/dates.cache";
 const QString KAptSourceList = "/opt/fapman-cache/sources.list";
 const QString KAptListDir = "/opt/fapman-cache/lists";
 const QString KAptArchivePartialDir = "/var/cache/apt/archives/partial";
+const QString KAptPreferencesFile = "/etc/apt/preferences";
 
 const QString KDpkgStatusFile = "/var/lib/dpkg/status";
 const QString KDpkgInfoDir = "/var/lib/dpkg/info";
 
 const int KListExpireTime = 3600;
 
+const int KDataReadBufferSize = 100000;
+
 class MainWindow;
 class FileReadThread;
 class DateFetchThread;
@@ -62,24 +71,24 @@ public:
                                                 ModeAptGetSimulate, ModeAptGetInstall, ModeAptGetClean };
        enum multiLine { MultiLineNone, MultiLineDesc, MultiLineIcon, MultiLineUpgradeDesc };
 
-       AAptInterface(QObject* parent);
-       ~AAptInterface();
+       explicit AAptInterface(QObject* parent);
+       virtual ~AAptInterface();
        void setSettings(Settings* s_) { iSettings = s_; }
 
        void addQueuedOperation(interfaceMode mode_);
        bool run(dimmer* uiDimmer);
        void setProcessPackages(QStringList pkgs) { iProcessPackages=pkgs; iProcessPackagesOrig=pkgs; }
-       QStringList processPackages() { return iProcessPackages; }
-       QStringList processPackageVersions() { return iProcessPackageVersions; }
+       QStringList processPackages() const { return iProcessPackages; }
+       QStringList processPackageVersions() const { return iProcessPackageVersions; }
 
-       bool running();
+       bool running() const;
        bool cancel();
 
-       int numSelectedPackages() { return iNumSelectedPackages; }
+       int numSelectedPackages() const { return iNumSelectedPackages; }
        void setNumSelectedPackages(int p_) { iNumSelectedPackages=p_; }
 
-       QHash<QString, Package*>* packagesAvailable() { return &iPackagesAvailable; }
-       QHash<QString, Package*>* packagesInstalled() { return &iPackagesInstalled; }
+       const QHash<QString, Package*>* packagesAvailable() { return &iPackagesAvailable; }
+       const QHash<QString, Package*>* packagesInstalled() { return &iPackagesInstalled; }
        QList<Repository*>* repositories() { return  &iRepositories; }
 
        QByteArray readLogFile();
@@ -95,12 +104,13 @@ public:
        void setSkipListAndDates() { iSkipRefreshListAndDates=true; }
        bool needListOrDateRefresh();
 
-       bool loadInstallFiles(QStringList files_);
-
        QDateTime lastListUpdate() { return iLastListUpdate; }
        QDateTime lastDpkgUpdate() { return iLastDpkgUpdate; }
 
 private:
+       AAptInterface(const AAptInterface& old);
+       AAptInterface operator= (const AAptInterface& old);
+
        void runNext();
        void cleanAfterRunEach();
        void cleanAfterRunAll();
@@ -127,6 +137,7 @@ private:
        void readBlacklist();
        void writeDateCache();
        void readDateCache();
+       void readPinnedPackages();
 
 private slots:
        void errorAptGetUpdate(QProcess::ProcessError error);
@@ -199,6 +210,7 @@ private:
        QStringList iBlacklist;
 
        multiLine iMultiLine;
+       char* iDataReadBuffer;
 
        int iDateRequestsWaiting;
        int iDateRequestsSent;