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

 	void clearUsed () { _iUsed = 0; }
 	void incUsed () { ++_iUsed; }
 	void DeleteData ();
 	// varible setting functions
 	void setFileType(FileType t) { m_iFileType = t; }
-	void SetFilename(CyString filename);
 	void setFilename(const Utils::String &filename);
-	void SetName(CyString name) { _sName = name.ToString(); }
 	void setName(const Utils::String &name) { _sName = name; }
-	void SetDir(CyString dir) { _sDir = dir.ToString(); }
 	void setDir(const Utils::String &dir) { _sDir = dir; }
 	void SetCreationTime ( time_t time ) { m_tTime = time; }
 	void SetFileSize ( long size ) { m_lSize = size; }
 	void SetDataSize ( long size ) { m_lDataSize = size; }
 	void SetUncompressedDataSize ( long size ) { m_lUncomprDataSize = size; }
 	void SetDataCompression ( int c ) { m_iDataCompression = c; }
 	void SetShared ( bool b ) { m_bShared = b; }
 	void SetSigned ( bool b ) { m_bSigned = b; }
-	void SetFullDir(CyString dir) { _sFullDir = dir.ToString(); }
 	void setFullDir(const Utils::String &dir) { _sFullDir = dir; }
 	void setInMod (const Utils::String &s) { _sInMod = s; }
 	void SetCompressedToFile ( bool b ) { m_bCompressedToFile = b; }
 	void SetData(const unsigned char *data, size_t size) { m_sData = (unsigned char *)data, m_lDataSize = (long)size; }
 	void copyData(const unsigned char *data, size_t size);
 	// get functions
 	int getUsed () { return _iUsed; }
 	int GetLastError () { return m_iLastError; }
 	int GetFileType() { return m_iFileType; }
 	FileType fileType() { return m_iFileType; }
-	//CyString GetFilename() { return _sName; }
 	const Utils::String &filename() const { return _sName; }
-	CyString GetFullFilename() { return CyString(_sFullDir.toString()) + "/" + CyString(_sName.toString()); }
 	Utils::String fullFilename() { return _sFullDir + "/" + _sName; }
 	long GetSize () { return m_lSize; }
 	time_t GetCreationTime () { return m_tTime; }
-	CyString GetName() { return _sName.toString(); }
 	const Utils::String &name() { return _sName; }
-	CyString GetDir() { return _sDir.toString(); }
 	const Utils::String &dir() { return _sDir; }
 	Utils::String dataSizeString() const;
-	CyString GetUncompressedSizeString ();
+	Utils::String uncompressedSizeString() const;
-	CyString GetDirectory(CBaseFile *spkfile);
 	Utils::String getDirectory(CBaseFile *spkfile) const;
 	int GetVersion () { return m_iVersion; }
 	time_t GetLastModified() { return m_tTime; }
 	Utils::String fileTypeString() const { return ::GetFileTypeString(m_iFileType); }
-	CyString GetFileTypeString() { return ::GetFileTypeString(m_iFileType); }
-	CyString GetCreationTimeString ();
+	Utils::String creationTimeString() const;
 	const Utils::String &getTempFile () const { return _sTmpFile; }
-	CyString GetFullDir() { return _sFullDir; }
 	const Utils::String fullDir() const { return _sFullDir; }
-	CyString GetBaseName();
 	Utils::String baseName() const;
-	CyString GetOriginalName() { return CyString(_sOriginalName); }
 	const Utils::String &originalName() const { return _sOriginalName; }
 	const Utils::String &getInMod() const { return _sInMod; }
 	const Utils::String &getSignature() { if ( !m_bUpdatedSignature ) updateSignature(); return _sSignature; }
 	void updateSignature();
-	void ChangeBaseName(CyString b) { _sName = CyString(b + "." + this->GetFileExt()).ToString(); }
 	void changeBaseName(const Utils::String &b) { _sName = b + "." + this->fileExt(); }
-	bool RenameScript(CyString baseName);
+	bool renameScript(const Utils::String &baseName);
 	bool isInMod() { return !_sInMod.empty(); }
 	void FixOriginalName() { _sOriginalName = _sName; }
 	void SetOriginalName(const Utils::String &name) { _sOriginalName = name; }
 	bool isFileInAddon() const;
 	bool IsFakePatch () const;
 	bool isAutoTextFile();
-	int  GetTextFileID(CyString name = NullString);
+	int  textFileID(const Utils::String &name = Utils::String::Null()) const;
 	bool IsCompressedToFile () { return m_bCompressedToFile; }
 	bool CompareNew ( C_File *file );
-	CyString GetFileExt() { return _sName.token(".", -1); }
 	Utils::String fileExt() const;
-	bool CheckFileExt ( const CyString &ext ) {
+	bool checkFileExt(const Utils::String& ext);
-		if ( GetFileExt().Compare(ext) ) return true; return false;
-	}
-	CyString ChangeFileExt(CyString ext);
 	const Utils::String &changeFileExt(const Utils::String &ext);
 	bool CheckPackedExtension();
 	bool shouldCheckBaseName() const;
 	int GetCompressionType () { return m_iDataCompression; }
 	long GetDataSize () { return m_lDataSize; }
 	// returns the Uncompressed Data size, based on how the file is loaded, ie view data, view pointer, etc
-	long GetUncompressedDataSize ()
+	long uncompressedDataSize() const;
-	{
-		if ( m_lUncomprDataSize )
-			return m_lUncomprDataSize;
-		if ( m_lSize )
-			return m_lSize;
-		return m_lDataSize;
-	}
-	CyString GetNameDirectory(CBaseFile *spkfile);
 	Utils::String getNameDirectory(CBaseFile *spkfile) const;
 	unsigned int game() const;
 	bool isForGame(int game) const;
 	int getForSingleGame() const;
 	// file reading functions
 	long ReadFileSize ();
 	time_t ReadLastModified ();
 	bool readFromFile(const Utils::String filename);
-	bool ReadFromFile (CyString filename);
 	bool ReadFromFile ();
 	bool readFromFile(CFileIO &File);
 	bool readFromFile(CFileIO &File, int lSize, bool bDoSize = true);
-	//bool readFromFile(std::fstream &stream, long lSize, bool bDoSize = true );
 	bool ReadFromData ( char *data, long size );
 	int ReadScriptVersion ();
-	CyString GetFilePointer();
 	Utils::String filePointer() const;
 	bool isExternalFile() const;
 	// file writing functions
 	bool writeToDir(const Utils::String &dir, CBaseFile *, bool = true, const Utils::String &appendDir = Utils::String::Null(), unsigned char * = NULL, long = 0);
 	bool writeToFile(const Utils::String &filename, unsigned char * = NULL, long = 0);
 	bool writeFilePointer(unsigned char *cData = NULL, long len = 0);
 	// file compression functions
 	unsigned char *CompressToData(int compressionType, unsigned long *outSize, CProgressInfo *progress = NULL, int level = DEFAULT_COMPRESSION_LEVEL);
-	bool UncompressToFile ( CyString, CBaseFile *, bool = true, CProgressInfo * = NULL );
+	bool uncompressToFile(const Utils::String &toFile, CBaseFile *spkFile, bool includeDir = true, CProgressInfo *progress = NULL);
 	bool ChangeCompression(int compresstyp, CProgressInfo *progress);
 	bool CompressData ( int compressionType, CProgressInfo * = NULL, int level = DEFAULT_COMPRESSION_LEVEL );
 	bool CompressFile ( CProgressInfo * = NULL );
 	bool UncompressData ( CProgressInfo * = NULL );
 	unsigned char *UncompressData ( long *size, CProgressInfo * = NULL );

Subversion Repositories spk

(root)/libspk/src/File.h – Rev 174 → 178