X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=aaptinterface.h;h=7925c55be919a3efa18a88dc9e31cab25ce24d1d;hb=HEAD;hp=23902492d4210d44aa2a5003bbb9e9742917516e;hpb=0cd056de74ad46cfcd0cdca7f21a4ea47ff06b14;p=fapman

diff --git a/aaptinterface.h b/aaptinterface.h
index 2390249..7925c55 100644
--- a/aaptinterface.h
+++ b/aaptinterface.h
@@ -31,7 +31,13 @@ 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";
@@ -65,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();
@@ -98,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();