refactor project
This commit is contained in:
@ -36,9 +36,9 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
class CKBaseManager {
|
||||
public:
|
||||
CKBaseManager(CKContext* ctx, CKGUID guid, CKSTRING name) :
|
||||
m_ManagerGuid(guid),
|
||||
m_ManagerName(name),
|
||||
m_Context(ctx) {}
|
||||
m_ManagerGuid(guid), m_ManagerName(), m_Context(ctx) {
|
||||
XContainer::NSXString::FromCKSTRING(m_ManagerName, name);
|
||||
}
|
||||
virtual ~CKBaseManager() {}
|
||||
LIBCMO_DISABLE_COPY_MOVE(CKBaseManager);
|
||||
|
||||
@ -77,7 +77,7 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
```
|
||||
*/
|
||||
CKSTRING GetName() {
|
||||
return m_ManagerName.toCKSTRING();
|
||||
return XContainer::NSXString::ToCKSTRING(m_ManagerName);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -155,7 +155,7 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
|
||||
protected:
|
||||
CKGUID m_ManagerGuid; ///> Manager GUID
|
||||
TypeHelper::MKString m_ManagerName; ///> Manager Name
|
||||
XContainer::XString m_ManagerName; ///> Manager Name
|
||||
CKContext* m_Context; ///> A pointer to the CKContext on which this manager is valid.
|
||||
|
||||
};
|
||||
|
@ -32,18 +32,18 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
}
|
||||
}
|
||||
|
||||
std::string CKPathManager::GetTempFolder() {
|
||||
std::string result;
|
||||
XContainer::XString CKPathManager::GetTempFolder() {
|
||||
XContainer::XString result;
|
||||
EncodingHelper::StdPathToU8Path(result, this->m_TempFolder);
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string CKPathManager::GetTempFilePath(CKSTRING u8_filename) {
|
||||
XContainer::XString CKPathManager::GetTempFilePath(CKSTRING u8_filename) {
|
||||
std::filesystem::path stdfilename;
|
||||
EncodingHelper::U8PathToStdPath(stdfilename, u8_filename);
|
||||
auto realfile = this->m_TempFolder / stdfilename;
|
||||
|
||||
std::string result;
|
||||
XContainer::XString result;
|
||||
EncodingHelper::StdPathToU8Path(result, realfile);
|
||||
return result;
|
||||
}
|
||||
@ -64,7 +64,7 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
m_ExtraPathes.clear();
|
||||
}
|
||||
|
||||
bool CKPathManager::ResolveFileName(std::string& u8_filename) {
|
||||
bool CKPathManager::ResolveFileName(XContainer::XString& u8_filename) {
|
||||
std::filesystem::path filepath;
|
||||
EncodingHelper::U8PathToStdPath(filepath, u8_filename.c_str());
|
||||
|
||||
@ -94,7 +94,7 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
return false;
|
||||
}
|
||||
|
||||
void CKPathManager::GetExtension(std::string& u8path) {
|
||||
void CKPathManager::GetExtension(XContainer::XString& u8path) {
|
||||
std::filesystem::path filepath;
|
||||
EncodingHelper::U8PathToStdPath(filepath, u8path.c_str());
|
||||
|
||||
|
@ -22,13 +22,13 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
* @brief Get current temp folder.
|
||||
* @return
|
||||
*/
|
||||
std::string GetTempFolder();
|
||||
XContainer::XString GetTempFolder();
|
||||
/**
|
||||
* @brief Get the path of temp file.
|
||||
* @param u8_filename The relative path of file.
|
||||
* @return The path of given path based on temp folder.
|
||||
*/
|
||||
std::string GetTempFilePath(CKSTRING u8_filename);
|
||||
XContainer::XString GetTempFilePath(CKSTRING u8_filename);
|
||||
|
||||
/**
|
||||
* @brief Add extra path for ResolveFileName
|
||||
@ -51,13 +51,13 @@ namespace LibCmo::CK2::MgrImpls {
|
||||
* + Virtools temp folder.
|
||||
* @return true if success
|
||||
*/
|
||||
bool ResolveFileName(std::string& u8_filename);
|
||||
bool ResolveFileName(XContainer::XString& u8_filename);
|
||||
|
||||
/**
|
||||
* @brief Returns the file extension including period (.)
|
||||
* @param u8path[inout] The given path. overwritten by the gotten extension. set to blank when failed.
|
||||
*/
|
||||
void GetExtension(std::string& u8path);
|
||||
void GetExtension(XContainer::XString& u8path);
|
||||
|
||||
protected:
|
||||
std::filesystem::path m_TempFolder;
|
||||
|
Reference in New Issue
Block a user