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

Правки предупреждений

Browse Source
This commit is contained in:
Andrei Astafev 2020-04-05 17:28:55 +03:00
parent c38781b2e7
commit ce596d8113
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@ int main( int argc, char** argv )
{
(void)argc;
(void)argv;
QCoreApplication::setApplicationName( CMLIB_PROJECT_NAME );
QCoreApplication::setApplicationName( QStringLiteral( CMLIB_PROJECT_NAME ) );
MF::Paths* paths = MF::Paths::getInstance();
paths->init( CMLIB_PROJECT_NAME, "conf" );
paths->init( QStringLiteral( CMLIB_PROJECT_NAME ), QStringLiteral( "conf" ) );
paths->makeDefaultDirectories();
paths->findConfigFile( "test" );
paths->findConfigFile( QStringLiteral( "test" ) );
return( 0 );
}

2
examples/qt/01_translators/translators.cpp
View File

@ -12,7 +12,7 @@ int main( int argc, char** argv )
MQ::QTranslatorsList tl;
qDebug() << QObject::tr( "Yes" );
MQ::append_translators( tl, "example-qt-translators" );
MQ::append_translators( tl, QStringLiteral( "example-qt-translators" ) );
qDebug() << QObject::tr( "Yes" );
return( 0 );

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

@ -48,7 +48,7 @@ Paths::HierarchyType Paths::getHierarchyType()
return ( HierarchyType::kOpt );
}
if ( binaryDir.startsWith( "/usr" ) )
if ( binaryDir.startsWith( QStringLiteral( "/usr" ) ) )
{
QFileInfo etcDirInfo { "/etc/" + m_projectName };
if ( !etcDirInfo.isDir() || !etcDirInfo.isReadable() ) { return( HierarchyType::kFlat ); }
@ -120,25 +120,25 @@ bool Paths::init( const QString& projectDir, const QString& configFileExtension
{
m_projectName = projectDir.isEmpty() ? m_currentExecutable.m_canonicalFilePath.fileName()
: projectDir;
m_configFileExtension = configFileExtension.isEmpty() ? "conf"
m_configFileExtension = configFileExtension.isEmpty() ? QStringLiteral( "conf" )
: configFileExtension;
m_configFileName = m_projectName + "." + m_configFileExtension;
m_homeDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "HOME" ) ) );
m_tempDirectory = QString::fromLocal8Bit( qgetenv( qPrintable( "TMPDIR" ) ) );
if ( m_tempDirectory.canonicalPath().isEmpty() || ( m_tempDirectory.path() == "." ) )
m_homeDirectory = QString::fromLocal8Bit( qgetenv( "HOME" ) );
m_tempDirectory = QString::fromLocal8Bit( qgetenv( "TMPDIR" ) );
if ( m_tempDirectory.canonicalPath().isEmpty() || ( m_tempDirectory.path() == QStringLiteral( "." ) ) )
{
m_tempDirectory = QStringLiteral( _PATH_TMP );
}
auto configHome = QString::fromLocal8Bit( qgetenv( qPrintable( "XDG_CONFIG_HOME" ) ) );
auto configHome = QString::fromLocal8Bit( qgetenv( "XDG_CONFIG_HOME" ) );
if ( configHome.isEmpty() )
{
configHome = m_homeDirectory.canonicalPath() + "/.config";
}
m_userConfigDirectory = configHome + "/" + m_projectName;
auto dataHome = QString::fromLocal8Bit( qgetenv( qPrintable( "XDG_DATA_HOME" ) ) );
auto dataHome = QString::fromLocal8Bit( qgetenv( "XDG_DATA_HOME" ) );
if ( dataHome.isEmpty() )
{
dataHome = m_homeDirectory.canonicalPath() + "/.local/share";

12
src/myx/filesystem/paths.hpp
View File

@ -93,25 +93,25 @@ public:
*/
static Paths* getInstance()
{
Paths* localInstance = mInstance.load( std::memory_order_acquire );
volatile Paths* localInstance = mInstance.load( std::memory_order_acquire );
if ( !localInstance )
{
std::lock_guard< std::mutex > myLock( mMutex );
localInstance = mInstance.load( std::memory_order_relaxed );
if ( !localInstance )
if ( !localInstance ) // -V1036
{
localInstance = new Paths();
mInstance.store( localInstance, std::memory_order_release );
mInstance.store( const_cast< Paths* >( localInstance ), std::memory_order_release );
}
}
return( localInstance );
return( const_cast< Paths* >( localInstance ) );
}
/**
* @brief Обновление путей с учётом расположения исполняемого файла
*/
bool init( const QString& projectDir, const QString& configFileExtension = "conf" );
bool init( const QString& projectDir, const QString& configFileExtension = QStringLiteral("conf") );
/**
* @brief Создание стандартных каталогов
@ -126,7 +126,7 @@ public:
* 3. Имя файла, полученное из внутренней переменной класса
* Если файл настройки не будет найден, то будет возвращена пустая строка
*/
QString findConfigFile( const QString& defaultConfigFile = "" );
QString findConfigFile( const QString& defaultConfigFile = QLatin1String("") );
/**
* @brief Получение пути к базовому каталогу