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

This commit is contained in:
Andrei Astafev 2021-05-30 22:52:44 +03:00
parent 9f62d67135
commit fcac4dd4fe
3 changed files with 7 additions and 5 deletions

View File

@ -18,6 +18,8 @@ portability-*,
-readability-else-after-return, -readability-else-after-return,
-modernize-use-trailing-return-type, -modernize-use-trailing-return-type,
-modernize-avoid-c-arrays, -modernize-avoid-c-arrays,
-modernize-use-nodiscard,
-modernize-concat-nested-namespaces,
-performance-no-automatic-move, -performance-no-automatic-move,
' '

View File

@ -36,7 +36,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultPrefixDi
} }
else else
{ {
m_prefixDirectory = "."; m_prefixDirectory = QStringLiteral( "." );
} }
QFileInfo etcDirInfo { defaultEtcDirectory }; QFileInfo etcDirInfo { defaultEtcDirectory };
@ -125,7 +125,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
if ( binaryDir.startsWith( QStringLiteral( "/usr/local/rtis" ) ) ) if ( binaryDir.startsWith( QStringLiteral( "/usr/local/rtis" ) ) )
{ {
setupSystemDirectories( "/usr/local/rtis", setupSystemDirectories( QStringLiteral( "/usr/local/rtis" ),
"/usr/local/rtis/etc/" + m_projectName, "/usr/local/rtis/etc/" + m_projectName,
"/usr/local/rtis/share/" + m_projectName, "/usr/local/rtis/share/" + m_projectName,
"/usr/local/rtis/var/" + m_projectName, "/usr/local/rtis/var/" + m_projectName,
@ -136,7 +136,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
if ( binaryDir.startsWith( QStringLiteral( "/usr/local" ) ) ) if ( binaryDir.startsWith( QStringLiteral( "/usr/local" ) ) )
{ {
setupSystemDirectories( "/usr/local", setupSystemDirectories( QStringLiteral( "/usr/local" ),
"/usr/local/etc/" + m_projectName, "/usr/local/etc/" + m_projectName,
"/usr/local/share/" + m_projectName, "/usr/local/share/" + m_projectName,
"/var/lib/" + m_projectName, "/var/lib/" + m_projectName,
@ -147,7 +147,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
if ( binaryDir.startsWith( QStringLiteral( "/usr" ) ) ) if ( binaryDir.startsWith( QStringLiteral( "/usr" ) ) )
{ {
setupSystemDirectories( "/usr", setupSystemDirectories( QStringLiteral( "/usr" ),
"/etc/" + m_projectName, "/etc/" + m_projectName,
"/usr/share/" + m_projectName, "/usr/share/" + m_projectName,
"/var/lib/" + m_projectName, "/var/lib/" + m_projectName,

View File

@ -11,7 +11,7 @@ namespace myx {
namespace qt { namespace qt {
std::array< int, 2 > PosixSignalWatcherPrivate::mSockpair { { 0, 0 } }; std::array< int, 2 > PosixSignalWatcherPrivate::mSockpair { { 0, 0 } }; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
PosixSignalWatcherPrivate::~PosixSignalWatcherPrivate() = default; PosixSignalWatcherPrivate::~PosixSignalWatcherPrivate() = default;