Subversion Repositories spk

Rev

Rev 173 | Rev 179 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 173 Rev 178
Line 223... Line 223...
223 
	void getMergedFiles(Utils::CStringList &list, CCatFile *cat1, CCatFile *cat2);
 223 
	void getMergedFiles(Utils::CStringList &list, CCatFile *cat1, CCatFile *cat2);
224 
	bool CanWeMerge(const Utils::String &file) const;
 224 
	bool CanWeMerge(const Utils::String &file) const;
225 
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
 225 
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
226 
	bool NeedToMerge(CyString file);
 226 
	bool NeedToMerge(CyString file);
227 
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
 227 
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
228 
	bool GetModCompatabilityList(C_File *file, CyStringList *list = NULL);
 228 
	bool getModCompatabilityList(C_File *file, Utils::CStringList *list = NULL);
229 
	bool CheckCompatabilityBetweenModFiles(C_File *from, C_File *to, CyStringList *list = NULL);
 229 
	bool CheckCompatabilityBetweenModFiles(C_File *from, C_File *to, CyStringList *list = NULL);
230 
	bool CheckCompatabilityBetweenMods(CBaseFile *from, CBaseFile *to, CyStringList *list = NULL);
 230 
	bool CheckCompatabilityBetweenMods(CBaseFile *from, CBaseFile *to, CyStringList *list = NULL);
231 
	int CheckCompatabilityAgainstPackages(CBaseFile *newFile, CyStringList *list = NULL, CLinkList<CBaseFile> *packages = NULL);
 231 
	int CheckCompatabilityAgainstPackages(CBaseFile *newFile, CyStringList *list = NULL, CLinkList<CBaseFile> *packages = NULL);
232 
 
 232 
 
233 
	CyString GetLanguageName() const;
 233 
	CyString GetLanguageName() const;