diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp index c4d4677..2a6ea5c 100644 --- a/src/myx/filesystem/paths.cpp +++ b/src/myx/filesystem/paths.cpp @@ -236,7 +236,21 @@ MYXLIB_INLINE bool Paths::init( const QString& projectName, const QString& confi } -MYXLIB_INLINE bool Paths::makeDefaultDirectories() +MYXLIB_INLINE bool Paths::makeDefaultSystemDirectories() +{ + bool status = true; + QDir dir; + + if ( dir.mkpath( m_systemConfigDirectory ) ) { status = false; } + if ( dir.mkpath( m_systemVarDataDirectory ) ) { status = false; } + if ( dir.mkpath( m_systemConstDataDirectory ) ) { status = false; } + if ( dir.mkpath( m_systemLogDirectory ) ) { status = false; } + + return( status ); +} + + +MYXLIB_INLINE bool Paths::makeDefaultUserDirectories() { bool status = true; QDir dir; @@ -245,15 +259,17 @@ MYXLIB_INLINE bool Paths::makeDefaultDirectories() if ( dir.mkpath( m_userVarDataDirectory ) ) { status = false; } if ( dir.mkpath( m_userConstDataDirectory ) ) { status = false; } if ( dir.mkpath( m_userLogDirectory ) ) { status = false; } - if ( dir.mkpath( m_systemConfigDirectory ) ) { status = false; } - if ( dir.mkpath( m_systemVarDataDirectory ) ) { status = false; } - if ( dir.mkpath( m_systemConstDataDirectory ) ) { status = false; } - if ( dir.mkpath( m_systemLogDirectory ) ) { status = false; } return( status ); } +MYXLIB_INLINE bool Paths::makeDefaultDirectories() +{ + return ( makeDefaultSystemDirectories() && makeDefaultUserDirectories() ); +} + + MYXLIB_INLINE QString Paths::findConfigFile( const QString& defaultConfigFile ) { if ( !defaultConfigFile.isEmpty() && QFileInfo( defaultConfigFile ).isReadable() ) diff --git a/src/myx/filesystem/paths.hpp b/src/myx/filesystem/paths.hpp index 4c62341..590281a 100644 --- a/src/myx/filesystem/paths.hpp +++ b/src/myx/filesystem/paths.hpp @@ -81,6 +81,8 @@ public: /** * @brief Создание стандартных каталогов */ + bool makeDefaultSystemDirectories(); + bool makeDefaultUserDirectories(); bool makeDefaultDirectories(); /**