From fcac4dd4fe9dc3c1c9d4f858e973dfcb88bbe30f Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sun, 30 May 2021 22:52:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .clang-tidy                         | 2 ++
 src/myx/filesystem/paths.cpp        | 8 ++++----
 src/myx/qt/posix_signal_watcher.cpp | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 3d64070..1122c1d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -18,6 +18,8 @@ portability-*,
 -readability-else-after-return,
 -modernize-use-trailing-return-type,
 -modernize-avoid-c-arrays,
+-modernize-use-nodiscard,
+-modernize-concat-nested-namespaces,
 -performance-no-automatic-move,
 '
 
diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp
index d93a997..0706a95 100644
--- a/src/myx/filesystem/paths.cpp
+++ b/src/myx/filesystem/paths.cpp
@@ -36,7 +36,7 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultPrefixDi
 	}
 	else
 	{
-		m_prefixDirectory = ".";
+		m_prefixDirectory = QStringLiteral( "." );
 	}
 
 	QFileInfo etcDirInfo { defaultEtcDirectory };
@@ -125,7 +125,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
 
 	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/share/" + m_projectName,
 		                        "/usr/local/rtis/var/" + m_projectName,
@@ -136,7 +136,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
 
 	if ( binaryDir.startsWith( QStringLiteral( "/usr/local" ) ) )
 	{
-		setupSystemDirectories( "/usr/local",
+		setupSystemDirectories( QStringLiteral( "/usr/local" ),
 		                        "/usr/local/etc/" + m_projectName,
 		                        "/usr/local/share/" + m_projectName,
 		                        "/var/lib/" + m_projectName,
@@ -147,7 +147,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
 
 	if ( binaryDir.startsWith( QStringLiteral( "/usr" ) ) )
 	{
-		setupSystemDirectories( "/usr",
+		setupSystemDirectories( QStringLiteral( "/usr" ),
 		                        "/etc/" + m_projectName,
 		                        "/usr/share/" + m_projectName,
 		                        "/var/lib/" + m_projectName,
diff --git a/src/myx/qt/posix_signal_watcher.cpp b/src/myx/qt/posix_signal_watcher.cpp
index 91d2a1a..507be40 100644
--- a/src/myx/qt/posix_signal_watcher.cpp
+++ b/src/myx/qt/posix_signal_watcher.cpp
@@ -11,7 +11,7 @@ namespace myx {
 
 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;