SYNERGY-799 Fix code smells

symless · Mar 24, 2021 · abdbdb5 · abdbdb5
1 parent 0a4be95
commit abdbdb5
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 28 deletions.
diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp
@@ -31,11 +31,11 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget* parent, Screen* pScreen,cons
     setupUi(this);
 
     m_pLineEditName->setText(m_pScreen->name());
-    m_NameValidator = std::make_unique<Validators::ScreenNameValidator>(m_pLineEditName, m_pLabelNameError, pScreens);
+    m_NameValidator = std::make_unique<validators::ScreenNameValidator>(m_pLineEditName, m_pLabelNameError, pScreens);
     m_pLineEditName->setValidator(m_NameValidator.get());
     m_pLineEditName->selectAll();
 
-    m_AliasValidator = std::make_unique<Validators::AliasValidator>(m_pLineEditAlias, m_pLabelAliasError);
+    m_AliasValidator = std::make_unique<validators::AliasValidator>(m_pLineEditAlias, m_pLabelAliasError);
     m_pLineEditAlias->setValidator(m_AliasValidator.get());
 
     for (int i = 0; i < m_pScreen->aliases().count(); i++)

diff --git a/src/gui/src/ScreenSettingsDialog.h b/src/gui/src/ScreenSettingsDialog.h
@@ -51,8 +51,8 @@ class ScreenSettingsDialog : public QDialog, public Ui::ScreenSettingsDialogBase
 
     private:
         Screen* m_pScreen;
-        std::unique_ptr<Validators::ScreenNameValidator> m_NameValidator;
-        std::unique_ptr<Validators::AliasValidator> m_AliasValidator;
+        std::unique_ptr<validators::ScreenNameValidator> m_NameValidator;
+        std::unique_ptr<validators::AliasValidator> m_AliasValidator;
 
 };
 

diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp
@@ -52,7 +52,7 @@ SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
     enableControls(appConfig().isWritable());
 
     const auto& serveConfig = m_pMainWindow->serverConfig();
-    m_ScreenNameValidator = std::make_unique<Validators::ScreenNameValidator>(m_pLineEditScreenName, m_pLabelNameError, (&serveConfig.screens()));
+    m_ScreenNameValidator = std::make_unique<validators::ScreenNameValidator>(m_pLineEditScreenName, m_pLabelNameError, (&serveConfig.screens()));
     m_pLineEditScreenName->setValidator(m_ScreenNameValidator.get());
 
     connect(m_pLineEditLogFilename,     SIGNAL(textChanged(QString)),     this, SLOT(onChange()));

diff --git a/src/gui/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h
@@ -70,7 +70,7 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase
         SynergyLocale m_Locale;
         CoreInterface m_CoreInterface;
         BonjourWindows* m_pBonjourWindows;
-        std::unique_ptr<Validators::ScreenNameValidator> m_ScreenNameValidator;
+        std::unique_ptr<validators::ScreenNameValidator> m_ScreenNameValidator;
 
         /// @brief Stores settings scope at start of settings dialog
         /// This is neccessary to restore state if user changes

diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
@@ -25,7 +25,7 @@ SetupWizard::SetupWizard(MainWindow& mainWindow) :
    setupUi(this);
 
    m_pLineEditName->setText(m_MainWindow.appConfig().screenName());
-   m_ScreenNameValidator = std::make_unique<Validators::ScreenNameValidator>(m_pLineEditName, label_ErrorMessage);
+   m_ScreenNameValidator = std::make_unique<validators::ScreenNameValidator>(m_pLineEditName, label_ErrorMessage);
    m_pLineEditName->setValidator(m_ScreenNameValidator.get());
 
    connect(m_pButtonApply, SIGNAL(clicked()), this, SLOT(accept()));

diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h
@@ -36,7 +36,7 @@ class SetupWizard : public QDialog, public Ui::SetupWizardBase
 
 private:
    MainWindow& m_MainWindow;
-   std::unique_ptr<Validators::ScreenNameValidator> m_ScreenNameValidator;
+   std::unique_ptr<validators::ScreenNameValidator> m_ScreenNameValidator;
 
 private slots:
    void onNameChanged();

diff --git a/src/gui/src/validators/AliasValidator.cpp b/src/gui/src/validators/AliasValidator.cpp
@@ -20,7 +20,7 @@
 
 #include "AliasValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 AliasValidator::AliasValidator(QLineEdit* parent, QLabel* errors) :

diff --git a/src/gui/src/validators/AliasValidator.h b/src/gui/src/validators/AliasValidator.h
@@ -20,7 +20,7 @@
 
 #include "LineEditValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class AliasValidator : public LineEditValidator

diff --git a/src/gui/src/validators/EmptyStringValidator.cpp b/src/gui/src/validators/EmptyStringValidator.cpp
@@ -17,7 +17,7 @@
  */
 #include "EmptyStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 EmptyStringValidator::EmptyStringValidator(const QString& message) :

diff --git a/src/gui/src/validators/EmptyStringValidator.h b/src/gui/src/validators/EmptyStringValidator.h
@@ -20,13 +20,13 @@
 
 #include "IStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class EmptyStringValidator : public IStringValidator
 {
 public:
-   EmptyStringValidator(const QString& message);
+   explicit EmptyStringValidator(const QString& message);
    bool validate(const QString& input) const override;
 };
 

diff --git a/src/gui/src/validators/IStringValidator.cpp b/src/gui/src/validators/IStringValidator.cpp
@@ -17,7 +17,7 @@
  */
 #include "EmptyStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 IStringValidator::IStringValidator(const QString& message) :

diff --git a/src/gui/src/validators/IStringValidator.h b/src/gui/src/validators/IStringValidator.h
@@ -20,7 +20,7 @@
 
 #include <QString>
 
-namespace Validators
+namespace validators
 {
 
 class IStringValidator
@@ -29,7 +29,7 @@ class IStringValidator
 
 public:
    IStringValidator() = default;
-   IStringValidator(const QString& message);
+   explicit IStringValidator(const QString& message);
    const QString& getMessage() const;
 
    virtual bool validate(const QString& input) const = 0;

diff --git a/src/gui/src/validators/LineEditValidator.cpp b/src/gui/src/validators/LineEditValidator.cpp
@@ -17,7 +17,7 @@
  */
 #include "LineEditValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 LineEditValidator::LineEditValidator(QLineEdit* parent, QLabel* errors) :

diff --git a/src/gui/src/validators/LineEditValidator.h b/src/gui/src/validators/LineEditValidator.h
@@ -27,7 +27,7 @@
 
 #include "IStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class LineEditValidator : public QValidator

diff --git a/src/gui/src/validators/RegExpValidator.cpp b/src/gui/src/validators/RegExpValidator.cpp
@@ -17,7 +17,7 @@
  */
 #include "RegExpValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 RegExpValidator::RegExpValidator(const QString& message, const QRegExp& validator) :

diff --git a/src/gui/src/validators/RegExpValidator.h b/src/gui/src/validators/RegExpValidator.h
@@ -21,7 +21,7 @@
 #include <qregexp.h>
 #include "IStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class RegExpValidator : public IStringValidator

diff --git a/src/gui/src/validators/ScreenDuplicationsValidator.cpp b/src/gui/src/validators/ScreenDuplicationsValidator.cpp
@@ -17,11 +17,11 @@
  */
 #include "ScreenDuplicationsValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 ScreenDuplicationsValidator::ScreenDuplicationsValidator(const QString& message, const QString& defaultName,const ScreenList* pScreens) :
-   Validators::IStringValidator(message),
+   IStringValidator(message),
    m_defaultName(defaultName),
    m_pScreenList(pScreens)
 {

diff --git a/src/gui/src/validators/ScreenDuplicationsValidator.h b/src/gui/src/validators/ScreenDuplicationsValidator.h
@@ -21,7 +21,7 @@
 #include "Screen.h"
 #include "IStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class ScreenDuplicationsValidator : public IStringValidator

diff --git a/src/gui/src/validators/ScreenNameValidator.cpp b/src/gui/src/validators/ScreenNameValidator.cpp
@@ -23,7 +23,7 @@
 #include "validators/ScreenDuplicationsValidator.h"
 #include "ScreenNameValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 ScreenNameValidator::ScreenNameValidator(QLineEdit* parent, QLabel* errors, const ScreenList* pScreens) :

diff --git a/src/gui/src/validators/ScreenNameValidator.h b/src/gui/src/validators/ScreenNameValidator.h
@@ -21,7 +21,7 @@
 #include "Screen.h"
 #include "LineEditValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class ScreenNameValidator : public LineEditValidator

diff --git a/src/gui/src/validators/SpacesValidator.cpp b/src/gui/src/validators/SpacesValidator.cpp
@@ -17,7 +17,7 @@
  */
 #include "SpacesValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 SpacesValidator::SpacesValidator(const QString& message) :

diff --git a/src/gui/src/validators/SpacesValidator.h b/src/gui/src/validators/SpacesValidator.h
@@ -20,13 +20,13 @@
 
 #include "IStringValidator.h"
 
-namespace Validators
+namespace validators
 {
 
 class SpacesValidator : public IStringValidator
 {
 public:
-   SpacesValidator(const QString& message);
+   explicit SpacesValidator(const QString& message);
    bool validate(const QString& input) const override;
 };