kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 3 Packages Projects 9 Releases 2 Wiki Activity

remove using namespace Base::FileInfo

Browse Source
This commit is contained in:
bofdahof
2025-03-08 13:22:49 +10:00
parent bfe6d21163
commit 7b3b7068ca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/App/Application.cpp
View File

@@ -175,7 +175,7 @@ using namespace App;
//using namespace std;
//using namespace boost;
//using namespace boost::program_options;
using Base::FileInfo;
//using Base::FileInfo;
namespace sp = std::placeholders;
//==========================================================================
@@ -534,7 +534,7 @@ bool Application::closeDocument(const char* name)
setActiveDocument(static_cast<Document*>(nullptr));
std::unique_ptr<Document> delDoc (pos->second);
DocMap.erase( pos );
DocFileMap.erase(FileInfo(delDoc->FileName.getValue()).filePath());
DocFileMap.erase(Base::FileInfo(delDoc->FileName.getValue()).filePath());
_objCount = -1;
@@ -684,17 +684,17 @@ Document *Application::getDocumentByPath(const char *path, PathMatchMode checkCa
for(const auto &v : DocMap) {
const auto &file = v.second->FileName.getStrValue();
if(!file.empty())
DocFileMap[FileInfo(file.c_str()).filePath()] = v.second;
DocFileMap[Base::FileInfo(file.c_str()).filePath()] = v.second;
}
}
auto it = DocFileMap.find(FileInfo(path).filePath());
auto it = DocFileMap.find(Base::FileInfo(path).filePath());
if(it != DocFileMap.end())
return it->second;
if (checkCanonical == PathMatchMode::MatchAbsolute)
return nullptr;
std::string filepath = FileInfo(path).filePath();
std::string filepath = Base::FileInfo(path).filePath();
QString canonicalPath = QFileInfo(QString::fromUtf8(path)).canonicalFilePath();
for (const auto &v : DocMap) {
QFileInfo fi(QString::fromUtf8(v.second->FileName.getValue()));
@@ -922,7 +922,7 @@ Document* Application::openDocumentPrivate(const char * FileName,
bool isMainDoc, DocumentInitFlags initFlags,
std::vector<std::string> &&objNames)
{
FileInfo File(FileName);
Base::FileInfo File(FileName);
if (!File.exists()) {
std::stringstream str;
@@ -983,7 +983,7 @@ Document* Application::openDocumentPrivate(const char * FileName,
std::string name;
if(propFileName != FileName) {
FileInfo fi(propFileName);
Base::FileInfo fi(propFileName);
name = fi.fileNamePure();
}else
name = File.fileNamePure();
@@ -1002,7 +1002,7 @@ Document* Application::openDocumentPrivate(const char * FileName,
// read the document
newDoc->restore(File.filePath().c_str(),true,objNames);
if(!DocFileMap.empty())
DocFileMap[FileInfo(newDoc->FileName.getValue()).filePath()] = newDoc;
DocFileMap[Base::FileInfo(newDoc->FileName.getValue()).filePath()] = newDoc;
return newDoc;
}
// if the project file itself is corrupt then