f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: f1x1t:ab09914434475bfdfe22518dc964cf086062bbbb
Branches Tags
f1x1t:master
f1x1t:myx-cmake
..
compare: f1x1t:c503edfe49b06ad7f16537586df67d833b0d9620
Branches Tags
f1x1t:myx-cmake
f1x1t:master

No commits in common. "ab09914434475bfdfe22518dc964cf086062bbbb" and "c503edfe49b06ad7f16537586df67d833b0d9620" have entirely different histories.
ab09914434 ... c503edfe49

3 changed files with 16 additions and 30 deletions
Show Stats Expand all files Collapse all files

20
examples/filesystem/01_minimal/minimal.cpp
View File

@ -29,23 +29,9 @@ int main( int argc, char** argv )
qDebug() << pathsMT.systemConfigDirectory(); qDebug() << pathsMT.systemConfigDirectory();
paths.init( QStringLiteral( CMLIB_PROJECT_NAME ), QStringLiteral( "conf" ) ); paths.init( QStringLiteral( CMLIB_PROJECT_NAME ), QStringLiteral( "conf" ) );
paths.findConfigFile( QStringLiteral( "test" ) );
qDebug() << "executableName : " << paths.executableName(); qDebug() << paths.systemConstDataDirectory();
qDebug() << "executableFilePath : " << paths.executableFilePath(); qDebug() << paths.configFileName();
qDebug() << "executableDirectory : " << paths.executableDirectory();
qDebug() << "configFileName : " << paths.configFileName();
qDebug() << "configFilePath : " << paths.configFilePath();
qDebug() << "systemConfigDirectory : " << paths.systemConfigDirectory();
qDebug() << "systemConstDataDirectory : " << paths.systemConstDataDirectory();
qDebug() << "systemVarDataDirectory : " << paths.systemVarDataDirectory();
qDebug() << "systemLogDirectory : " << paths.systemLogDirectory();
qDebug() << "userConfigDirectory : " << paths.userConfigDirectory();
qDebug() << "userConstDataDirectory : " << paths.userConstDataDirectory();
qDebug() << "userVarDataDirectory : " << paths.userVarDataDirectory();
qDebug() << "userLogDirectory : " << paths.userLogDirectory();
return( 0 ); return( 0 );
} }

2
src/myx/base/endian_types.hpp
View File

@ -121,7 +121,7 @@ public:
friend std::istream& operator >>( std::istream& in, LittleEndianType& b ) { T val; in >> val; b = val; return( in ); } friend std::istream& operator >>( std::istream& in, LittleEndianType& b ) { T val; in >> val; b = val; return( in ); }
std::string toStdString() { return( std::to_string( transform( m_data ) ) ); } std::string toStdString() { return( std::to_string( transform( m_data ) ) ); }
#ifdef QT_CORE_LIB #ifdef QT_CORE_LIB
friend QDebug& operator <<( QDebug& out, const LittleEndianType b ) { out << T( b ); return( out ); } friend QDebug& operator <<( QDebug& out, const BigEndianType b ) { out << T( b ); return( out ); }
QString toQString() { return( QString::number( transform( m_data ) ) ); } QString toQString() { return( QString::number( transform( m_data ) ) ); }
#endif #endif
}; // class LittleEndianType }; // class LittleEndianType

24
src/myx/filesystem/paths.cpp
View File

@ -28,7 +28,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultEtcDirec
const QString& defaultLogDirectory ) const QString& defaultLogDirectory )
{ {
QFileInfo etcDirInfo { defaultEtcDirectory }; QFileInfo etcDirInfo { defaultEtcDirectory };
if ( etcDirInfo.isDir() && etcDirInfo.isReadable() ) if ( !etcDirInfo.isDir() || !etcDirInfo.isReadable() )
{ {
m_systemConfigDirectory = defaultEtcDirectory; m_systemConfigDirectory = defaultEtcDirectory;
} }
@ -38,7 +38,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultEtcDirec
} }
QFileInfo constDataDirInfo { defaultConstDataDirectory }; QFileInfo constDataDirInfo { defaultConstDataDirectory };
if ( constDataDirInfo.isDir() && constDataDirInfo.isReadable() ) if ( !constDataDirInfo.isDir() || !constDataDirInfo.isReadable() )
{ {
m_systemConstDataDirectory = defaultConstDataDirectory; m_systemConstDataDirectory = defaultConstDataDirectory;
} }
@ -48,7 +48,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultEtcDirec
} }
QFileInfo varDataDirInfo { defaultVarDataDirectory }; QFileInfo varDataDirInfo { defaultVarDataDirectory };
if ( varDataDirInfo.isDir() && varDataDirInfo.isWritable() ) if ( !varDataDirInfo.isDir() || !varDataDirInfo.isWritable() )
{ {
m_systemVarDataDirectory = defaultVarDataDirectory; m_systemVarDataDirectory = defaultVarDataDirectory;
} }
@ -58,7 +58,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultEtcDirec
} }
QFileInfo logDirInfo { defaultLogDirectory }; QFileInfo logDirInfo { defaultLogDirectory };
if ( logDirInfo.isDir() && logDirInfo.isWritable() ) if ( !logDirInfo.isDir() || !logDirInfo.isWritable() )
{ {
m_systemLogDirectory = defaultLogDirectory; m_systemLogDirectory = defaultLogDirectory;
} }
@ -195,14 +195,14 @@ MYXLIB_INLINE bool Paths::makeDefaultDirectories()
bool status = true; bool status = true;
QDir dir; QDir dir;
if ( dir.mkpath( m_userConfigDirectory ) ) { status = false; } if (dir.mkpath( m_userConfigDirectory )) { status = false; };
if ( dir.mkpath( m_userVarDataDirectory ) ) { status = false; } if (dir.mkpath( m_userVarDataDirectory )) { status = false; };
if ( dir.mkpath( m_userConstDataDirectory ) ) { status = false; } if (dir.mkpath( m_userConstDataDirectory )) { status = false; };
if ( dir.mkpath( m_userLogDirectory ) ) { status = false; } if (dir.mkpath( m_userLogDirectory )) { status = false; };
if ( dir.mkpath( m_systemConfigDirectory ) ) { status = false; } if (dir.mkpath( m_systemConfigDirectory )) { status = false; };
if ( dir.mkpath( m_systemVarDataDirectory ) ) { status = false; } if (dir.mkpath( m_systemVarDataDirectory )) { status = false; };
if ( dir.mkpath( m_systemConstDataDirectory ) ) { status = false; } if (dir.mkpath( m_systemConstDataDirectory )) { status = false; };
if ( dir.mkpath( m_systemLogDirectory ) ) { status = false; } if (dir.mkpath( m_systemLogDirectory )) { status = false; };
return( status ); return( status );
} }