WebSVN – spk – Diff – /libspk/src/Packages.h

 	CPackages ();
 	~CPackages ();
 	bool isOldDir(const Utils::String &dir);
-	bool Read(CyString dir, CProgressInfo *progress = NULL);
 	bool read(const Utils::String &dir, CProgressInfo *progress = NULL);
 	void startup(const Utils::String &dir, const Utils::String &tempDir, const Utils::String &myDoc);
 	void startup(const Utils::String &dir, const Utils::String &tempDir, const Utils::String &myDoc, const Utils::String &mod);
 	bool extractAll(CBaseFile *baseFile, const Utils::String &dir, int game, bool includedir = true, CProgressInfo *progress = NULL) const;
 	CGameExe *GetGameExe() { return &m_gameExe; }
 	CLinkList<CBaseFile> *GetInstallPackageList() { return &m_lInstallList; }
 	// installing/uninstalling
 	bool		InstallPackage ( CBaseFile *package, CyStringList *errors, CProgressInfo *progress = NULL, bool disabled = false );
-	CBaseFile		*OpenPackage ( CyString file, int *error, CProgressInfo *progress = NULL, int readtype = SPKREAD_ALL, int flags = READFLAG_NONE );
+	CBaseFile		*openPackage(const Utils::String &file, int *error, CProgressInfo *progress = NULL, int readtype = SPKREAD_ALL, int flags = READFLAG_NONE);
-	CMultiSpkFile	*OpenMultiPackage(CyString file, int *error, CProgressInfo *progress = NULL);
+	CMultiSpkFile	*openMultiPackage(const Utils::String &file, int *error, CProgressInfo *progress = NULL);
-	bool		OpenMultiPackage ( CyString file, CLinkList<CBaseFile> *packageList, int *error, CProgressInfo *progress = NULL );
+	bool			 openMultiPackage(const Utils::String &file, CLinkList<CBaseFile> *packageList, int *error, CProgressInfo *progress = NULL );
 	int			CheckInstallPackage(CBaseFile *package, int check = IC_ALL);
 	bool		RemoveFile(C_File *file, CyStringList *errors = NULL);
 	void		PrepareUninstallPackage(CBaseFile *package);
 	bool		UninstallPreparedPackages(CyStringList *errors, CProgressInfo *progress, CLinkList<CBaseFile> *uninstalledPackages = NULL, CLinkList<CBaseFile> *disabledPackages = NULL);
 	void		ConvertOldPackage(CBaseFile *p);
 	void		PurgeUninstallScripts(CBaseFile *package, CyStringList *errors);
 	int 		PrepareInstallPackage(CBaseFile *package, bool disabled = false, bool force = false, int check = IC_ALL);
 	int			InstallPreparedPackages(CyStringList *errors, CProgressInfo *progress, CLinkList<CBaseFile> *errored, CLinkList<CBaseFile> *installedList = NULL);
 	void		RemovePreparedInstall(CBaseFile *package);
 	int			GetNumPackagesInQueue() { return m_lInstallList.size(); }
-	int			CheckOpenPackage(CyString file, int *error);
+	int			checkOpenPackage(const Utils::String &file, int* error);
 	bool		findAllNeededDependacies(CBaseFile *p, const CLinkList<CBaseFile> &packages, CLinkList<CBaseFile> *foundPackages, bool onlyEnabled = false, bool includePrepared = false) const;
 	int			GetMissingDependacies(CBaseFile *p, Utils::CStringList *list, bool onlyEnabled = false, bool includePrepared = false);
 	size_t		getDownloadableDependacies(CBaseFile* p, std::vector<const SAvailablePackage*>& list, bool onlyEnabled = false, bool includePrepared = false) const;
-	bool		CheckInstalledDependacy(CyString name, CyString author, CyString version, bool onlyEnabled = false, bool includePerpered = false);
 	bool		checkInstalledDependacy(const Utils::String &name, const Utils::String &author, const Utils::String &version, bool onlyEnabled = false, bool includePerpered = false) const;
 	bool		CheckEnabledDependacy(CBaseFile *p);
 	int			GetDependacyList(CBaseFile *package, CLinkList<CBaseFile> *list);
-	int			PrepareMultiPackage ( CyString file, CLinkList<CBaseFile> *errorPackageList, int *error, CProgressInfo *progress = 0);
+	int			prepareMultiPackage(const Utils::String &file, CLinkList<CBaseFile> *errorPackageList, int *error, CProgressInfo *progress = 0);
 	bool		IsOldPluginManager() { return m_bOldPlugin; }
 	int			findPackageFiles(CLinkList<CBaseFile> &packages, const Utils::String &dir);
 	int			findPackageDirectories(CLinkList<CBaseFile> &packages, const Utils::String &dir);
 	int			findAllPackages(CLinkList<CBaseFile> &packages, const Utils::String &dir);
 	void WriteData();
 	bool CloseDir ( CyStringList *errors = 0, CProgressInfo *progress = NULL, bool removedir = false );
 	bool RestoreFakePatch();
 	bool ReadyFakePatch();
-	bool CheckValidPluginManagerFile(CyString filename);
+	bool checkValidPluginManagerFile(const Utils::String &filename) const;
-	bool CheckIfPluginManagerFile(CyString filename);
+	bool checkIfPluginManagerFile(const Utils::String &filename) const;
 	// package control
 	void UpdateUsedFiles(CLinkList<CBaseFile> *ignoreList = NULL, bool = true);
 	void UpdateSigned();
 	bool UpdatePackages(int doStatus = -1, bool individual = false);
-	CBaseFile *FindXspPackage(CyString id);
+	CBaseFile *findXspPackage(const Utils::String &id) const;
-	CBaseFile *FindSpkPackage(CyString name, CyString author);
 	CBaseFile *findSpkPackage(const Utils::String &name, const Utils::String &author) const;
-	CArchiveFile *FindArchivePackage(CyString name);
+	CArchiveFile *findArchivePackage(const Utils::String &name) const;
-	CBaseFile* FindPackage(CyString name, CyString author);
 	CBaseFile* findPackage(const Utils::String &name, const Utils::String &author) const;
-	CBaseFile *FindFirstPackageWithFile(C_File *f);
+	CBaseFile *findFirstPackageWithFile(C_File *f) const;
-	CBaseFile *FindNextPackageWithFile(CBaseFile *p, C_File *f);
+	CBaseFile *findNextPackageWithFile(CBaseFile *p, C_File *f) const;
-	CBaseFile *FindPackage(CBaseFile *package);
+	CBaseFile *findPackage(CBaseFile *package) const;
-	C_File *FindFile(int filetype, CyString filename, CyString dir = NullString);
+	C_File *findFile(FileType filetype, const Utils::String &filename, const Utils::String &dir = Utils::String::Null()) const;
 	CBaseFile *FirstPackage() { return m_lPackages.First(); }
 	CBaseFile *NextPackage() { return m_lPackages.Next(); }
 	CBaseFile *GetFirstPackage() { if ( m_lPackages.Front() ) return m_lPackages.Front()->Data(); return NULL; }
 	CBaseFile *GetNextPackage(CBaseFile *from)
+	{
 		return NULL;
+	}
 	void Reset();
 	CBaseFile *GetPackageAt(int i) { return m_lPackages[i]; }
 	Utils::String selectedModName() const;
-	CyString GetModKey();
+	Utils::String getModKey() const;
 	void SetupWares();
 	void SetupShips();
 	void PurgeGameObjects();
 	void PurgeWares();
 	void PurgeShips();
 	int  RemoveUnusedSharedFiles(CyStringList *errors = 0, CProgressInfo *progress = NULL);
 	bool RemoveSharedFile(C_File *file, CyStringList *errors = NULL);
 	void ShufflePatchTo(C_File *file, int to, CyStringList *errors);
 	void ShuffleFakePatches(CyStringList *errors);
 	void ShuffleTextFiles(CyStringList *errors);
-	int  FindNextFakePatch(int start = 0, CyString dir = NullString);
+	int  findNextFakePatch(int start = 0, const Utils::String &dir = Utils::String::Null()) const;
 	unsigned int  findNextTextFile(unsigned int start = 4) const;
 	unsigned int  findNextTextFile(const Utils::String &dir, unsigned int start = 4) const;
-	int  FindLastFakePatch(int start = 99, CyString dir = NullString);
+	int  findLastFakePatch(int start = 99, const Utils::String &dir = Utils::String::Null()) const;
-	int  FindLastTextFile(int start = 9999, CyString dir = NullString);
+	int  findLastTextFile(int start = 9999, const Utils::String &dir = Utils::String::Null()) const;
 	int  FindLowestFakePatchInstalled();
 	void ReadGameLanguage(bool force = true);
 	int	 RemoveAllPackages(CyStringList *errors = NULL, CProgressInfo *progress = NULL);
 	void AssignPackageNumbers();
 	int  GetChildPackages(CBaseFile *package, CLinkList<CBaseFile> *children, bool recursive = false);
 	Utils::String saveDirectory();
 	void backupSaves() { backupSaves(m_bVanilla); }
 	void backupSaves(bool vanilla);
 	void restoreSaves() { restoreSaves(m_bVanilla); }
 	void restoreSaves(bool vanilla);
-	bool UnPackFile(const Utils::String &filename, bool checkxml = true);
+	bool unPackFile(const Utils::String &filename, bool checkxml = true) const;
-	bool PackFile(CyString filename);
-	bool PackFile(CFileIO* File, CyString filename);
+	bool packFile(const Utils::String &filename) const;
-	bool packFile(CFileIO* File, const Utils::String &filename);
+	bool packFile(CFileIO* File, const Utils::String &filename) const;
 	Utils::String ConvertTextString(const Utils::String &text);
 	void LoadVirtualFileSystem();
-	bool CheckAccessRights(CyString dir);
+	bool checkAccessRights(const Utils::String &dir) const;
-	bool LoadShipData(CyString file, CyStringList *list);
-	bool LoadShipData(CVirtualFileSystem *pVfs, CyStringList *list);
-	bool ReadTextPage(CyString file, CyStringList *list, bool search, int page);
+	bool readTextPage(const Utils::String &file, Utils::CStringList &list, bool search, int page) const;
-	CyStringList *LoadShipData(CyString file);
-	CyStringList *ReadTextPage(CyString file, bool search, int page);
+	size_t loadShipData(const Utils::String& file, Utils::CStringList& list) const;
 	FileType adjustFileType(const Utils::String &name, FileType filetype) const;
 	CXspFile *extractShip(const Utils::String &sCatFile, const Utils::String &sId, CProgressInfo *progress = NULL);
-	CyString ReadShipData(CyString file, CyString entry);
+	Utils::String readShipData(const Utils::String &file, const Utils::String &entry) const;
-	bool IsSamePackage(CBaseFile *p1, CBaseFile *p2);
+	bool isSamePackage(CBaseFile *p1, CBaseFile *p2) const;
 	void ApplyFakePatchOrder(Utils::CStringList *list);
-	CBaseFile *CreateFromArchive(CyString filename, bool toInstall = false );
+	CBaseFile *createFromArchive(const Utils::String &filename, bool toInstall = false) const;
-	void ReadArchiveData(const char *buf, size_t len, CBaseFile *archive);
+	void readArchiveData(const char *buf, size_t len, CBaseFile *archive) const;
-	void ReadArchiveData(CyString filename, CBaseFile *archive);
+	void readArchiveData(const Utils::String &filename, CBaseFile *archive) const;
-	int VerifyInstalledFiles(CyStringList *missingFiles = NULL, bool getPackages = true);
+	size_t verifyInstalledFiles(Utils::CStringList *missingFiles = nullptr, bool getPackages = true) const;
 	Utils::String empWaresForGame(size_t *maxsize = NULL);
 	void addEMPPriceOverride(int empId, int price);
 	void addEMPNotoOverride(int empId, int noto);
 	void addBuiltInWarePriceOverride(int empId, int price);
 	void addBuiltInWareNotoOverride(int empId, int noto);
 	int GetCurrentGameFlags() { return m_iGameFlags; }
 	void setCurrentDir(const Utils::String &dir);
 	// merge mods
-	void getMergedFiles(Utils::CStringList &list, CCatFile *cat1, CCatFile *cat2);
+	void getMergedFiles(Utils::CStringList &list, CCatFile *cat1, CCatFile *cat2) const;
-	bool CanWeMerge(const Utils::String &file) const;
+	bool canWeMerge(const Utils::String &file) const;
-	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
+	bool mergeMods(CCatFile *mod1, CCatFile *mod2, const Utils::String &outFile, Utils::CStringList *cantMerge) const;
-	bool NeedToMerge(CyString file);
+	bool needToMerge(const Utils::String &file) const;
-	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
-	bool getModCompatabilityList(C_File *file, Utils::CStringList *list = NULL);
+	bool getModCompatabilityList(C_File *file, Utils::CStringList *list = NULL) const;
-	bool CheckCompatabilityBetweenModFiles(C_File *from, C_File *to, CyStringList *list = NULL);
+	bool checkCompatabilityBetweenModFiles(C_File *from, C_File *to, Utils::CStringList *list = NULL) const;
-	bool CheckCompatabilityBetweenMods(CBaseFile *from, CBaseFile *to, CyStringList *list = NULL);
+	bool checkCompatabilityBetweenMods(CBaseFile *from, CBaseFile *to, Utils::CStringList *list = NULL) const;
-	int CheckCompatabilityAgainstPackages(CBaseFile *newFile, CyStringList *list = NULL, CLinkList<CBaseFile> *packages = NULL);
+	int checkCompatabilityAgainstPackages(CBaseFile *newFile, Utils::CStringList *list = NULL, CLinkList<CBaseFile> *packages = NULL) const;
-	CyString GetLanguageName() const;
+	Utils::String getLanguageName() const;
-	int	GetGameLanguage() const;
+	int			  getGameLanguage() const;
-	int	GetGameLanguage(const Utils::String &dir) const;
+	int			  getGameLanguage(const Utils::String &dir) const;
-	int      GetGameAddons(Utils::CStringList &exes);
+	int			  getGameAddons(Utils::CStringList &exes) const;
-	int      GetGameAddons(Utils::CStringList &exes, const Utils::String &dir);
+	int			  getGameAddons(Utils::CStringList &exes, const Utils::String &dir) const;
 	Utils::String getGameName() const;
 	Utils::String getGameName(const Utils::String &dir) const;
-	CyString GetGameName(CyString dir = NullString);
-	CyString GetGameVersionFromType(int game, int version, CyString sVersion);
+	Utils::String getGameVersionFromType(int game, int version, const Utils::String &sVersion) const;
-	CyString GetGameNameFromType(int game);
+	Utils::String getGameNameFromType(int game) const;
-	Utils::String getGameTypesString(CBaseFile *package, bool includeVersion);
+	Utils::String getGameTypesString(CBaseFile *package, bool includeVersion) const;
-	CyString GetGameVersionString(CBaseFile *package);
+	Utils::String getGameVersionString(CBaseFile *package) const;
-	Utils::String GetGameRunExe(const Utils::String &dir);
+	Utils::String getGameRunExe(const Utils::String &dir) const;
-	CyString GetProperDir(CyString dir = NullString);
-	CyString GetAddonDir(CyString dir = NullString);
-	Utils::String GetGameRunExe();
+	Utils::String getGameRunExe() const;
 	Utils::String getProperDir() const;
 	Utils::String getProperDir(const Utils::String &dir) const;
 	Utils::String getAddonDir() const;
 	Utils::String getAddonDir(const Utils::String &dir) const;
 	// text files
 	void CreateLanguageTextFiles(Utils::CStringList *errors = 0);
 	bool RenameTextFile(const Utils::String &textid, int languageid, Utils::CStringList *errors);
-	void AddTextFileToScripts(C_File *file, CyString textid);
+	void addTextFileToScripts(C_File *file, const Utils::String &textid);
 	void CreatePluginManagerText();
 	void createPluginManagerOpenText();
 	// game control
-	void CreateEMPFile(CyString progDir = NullString);
+	void createEMPFile(const Utils::String &progDir = Utils::String::Null());
 	void CreateWareFiles();
-	int ExtractGameFile(CyString aFilename, CyString aTo, CyString dir = NullString, CyString addon = NullString) { return extractGameFile(aFilename.ToString(), aTo.ToString(), dir.ToString(), addon.ToString());	}
-	int extractGameFile(const Utils::String &aFilename, const Utils::String &aTo, const Utils::String &dir = Utils::String::Null(), const Utils::String &addon = Utils::String::Null()) const;
+	int  extractGameFile(const Utils::String &aFilename, const Utils::String &aTo, const Utils::String &dir = Utils::String::Null(), const Utils::String &addon = Utils::String::Null()) const;
 	void CreateDummies();
 	void CreateComponants();
 	void CreateCutData();
 	void CreateBodies();
 	void CreateGlobals();
 	void CreateAnimations();
 	void CreateTShips();
 	void CreateCustomStarts();
-	void AddCreatedFile(CyString file);
+	void addCreatedFile(const Utils::String &file);
 	bool readGlobals(Utils::CStringList &globals) const;
 	bool readWares(int iLang, CLinkList<SWareEntry> &list);
 	bool readCommands(int iLang, CLinkList<SCommandSlot> &list);
 	bool readWingCommands(int iLang, CLinkList<SCommandSlot> &list);
 	void removeEmpOverride(int pos);
 	void removeBuiltinWareOverride(int pos);
 	void removeCustomWareOverride(const Utils::String &id);
 	// install text
-	CyString GetInstallBeforeText(CBaseFile *package);
+	Utils::String getInstallBeforeText(CBaseFile *package) const;
-	CyString GetInstallAfterText(CBaseFile *package);
+	Utils::String getInstallAfterText(CBaseFile *package) const;
-	CyString GetUninstallBeforeText(CBaseFile *package);
+	Utils::String getUninstallBeforeText(CBaseFile *package) const;
-	CyString GetUninstallAfterText(CBaseFile *package);
+	Utils::String getUninstallAfterText(CBaseFile *package) const;
 	//setting functions
 	void SetRenameText(bool b) { m_bRenameText = b; }
 	void SetLanguage(int i) { m_iLanguage = i; }
 	void SetAutoEnable(bool b) { m_bAutoEnableChild = b; }
 	const SAvailablePackage* findAvailablePackage(const Utils::String& filename) const;
 	const SAvailablePackage* findAvailablePackage(const Utils::String& name, const Utils::String& author) const;
 	CBaseFile* findFoundPackage(const Utils::String& name, const Utils::String& author) const;
 	int findAllServers(Utils::CStringList *list) const;
-	CBaseFile *FindScriptByAuthor(CyString author, CBaseFile *prev = NULL);
+	CBaseFile *findScriptByAuthor(const Utils::String &author, CBaseFile *prev = NULL);
 	void RemoveFailedFiles();
 private:
 	size_t _createCockpits(Utils::CStringList &list);
 	bool _checkForDisable(CBaseFile *package, bool disabled, CBaseFile *oldPackage);
-	CBaseFile *_archive_fromRar(CyString filename, bool toInstall);
+	CBaseFile *_archive_fromRar(const Utils::String &filename, bool toInstall) const;
-	CBaseFile *_archive_fromZip(CyString filename, bool toInstall);
+	CBaseFile *_archive_fromZip(const Utils::String &filename, bool toInstall) const;
 	void _addToFakePatch(CBaseFile *pPackage);
 	int _gameTextNumber() const;
 	void _addWareOverride(enum WareTypes type, int pos, const Utils::String &id, int value, bool noto);
 	int _warePriceOverride(enum WareTypes type, int pos, const Utils::String &id);
 	bool _wareNotoOverride(enum WareTypes type, int pos, const Utils::String &id, int *noto);

Subversion Repositories spk

(root)/libspk/src/Packages.h – Rev 179 → 182