From 668af95136910dfaaad0d9984a7fb84d51eee9a8 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 26 Mar 2021 10:39:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?,=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5?=
 =?UTF-8?q?=D0=BC=D1=8B=D1=85=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/myx/filesystem/paths.cpp | 26 +++++++++++++++++++++-----
 src/myx/filesystem/paths.hpp |  2 ++
 2 files changed, 23 insertions(+), 5 deletions(-)

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();
 
 	/**