Make the parameter error caption in the warning messagebox global for

all effects

diff --git a/ffbeffect.cpp b/ffbeffect.cpp
index a496094bb55ee757d6fc981028e5acce153f5ed6..4a693405ef2d139fc9b7a02bd82832f5f443a057 100644 (file)
--- a/ffbeffect.cpp
+++ b/ffbeffect.cpp
@@ -1,6 +1,8 @@
 #include "ffbeffect.h"
 #include "globalsettings.h"
 
+const QString FFBEffect::PRERR_CAPTION("Invalid FFB parameter");
+
 FFBEffect::FFBEffect(FFBEffectTypes type)
 {
   m_status = FFBEffectStatus::NOT_LOADED;

diff --git a/ffbeffect.h b/ffbeffect.h
index aa294aeb1835c72d7ec2777f803f479e58948e70..731333877c2974cc2dc81e76f4a1fa6d05e0b1cf 100644 (file)
--- a/ffbeffect.h
+++ b/ffbeffect.h
@@ -22,6 +22,8 @@ public:
 protected:
   virtual bool checkGenericParameters(const std::shared_ptr<FFBEffectParameters> params) = 0;
 
+  static const QString PRERR_CAPTION;
+
 private:
   FFBEffectStatus m_status;
   FFBEffectTypes m_type;

diff --git a/linuxffbrampeffect.h b/linuxffbrampeffect.h
index 4ed4865cffc7e8bd51a69ad303279afcf3c73205..9293e3a1c3afd54438f51ed3052b652b4854f7ce 100644 (file)
--- a/linuxffbrampeffect.h
+++ b/linuxffbrampeffect.h
@@ -18,4 +18,4 @@ private:
   std::shared_ptr<FFBRampEffectParameters> m_params;
 };
 
-#endif // FFBRAMPEFFECT_H
+#endif // LINUXFFBRAMPEFFECT_H

diff --git a/sdl2ffbconditioneffect.cpp b/sdl2ffbconditioneffect.cpp
index fa7c6e6ff6a331a27c5357fd3222c60d6bfe4936..d76f56b8aee4d4c12a586ec43ea8fcd8751d38c0 100644 (file)
--- a/sdl2ffbconditioneffect.cpp
+++ b/sdl2ffbconditioneffect.cpp
@@ -73,62 +73,62 @@ bool SDL2FFBConditionEffect::setParameters(std::shared_ptr<FFBConditionEffectPar
     return false;
 
   if (!checkBoundsInclusive(params->leftSat.at(FFBConditionEffectParameters::Axis::X), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Left X saturation must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Left X saturation must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->leftSat.at(FFBConditionEffectParameters::Axis::Y), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Left Y saturation must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Left Y saturation must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->rightSat.at(FFBConditionEffectParameters::Axis::X), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Right X saturation must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Right X saturation must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->rightSat.at(FFBConditionEffectParameters::Axis::Y), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Right Y saturation must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Right Y saturation must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->leftCoeff.at(FFBConditionEffectParameters::Axis::X), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Left X coefficient must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Left X coefficient must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->leftCoeff.at(FFBConditionEffectParameters::Axis::Y), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Left Y coefficient must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Left Y coefficient must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->rightCoeff.at(FFBConditionEffectParameters::Axis::X), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Right X coefficient must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Right X coefficient must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->rightCoeff.at(FFBConditionEffectParameters::Axis::Y), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Right Y coefficient must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Right Y coefficient must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->deadband.at(FFBConditionEffectParameters::Axis::X), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Deadband X must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Deadband X must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->deadband.at(FFBConditionEffectParameters::Axis::Y), 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Deadband Y must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Deadband Y must be within <0; 65535>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->center.at(FFBConditionEffectParameters::Axis::X), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Center X must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Center X must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->center.at(FFBConditionEffectParameters::Axis::Y), -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Center Y must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Center Y must be within <-32767; 32767>");
     return false;
   }
 

diff --git a/sdl2ffbconstanteffect.cpp b/sdl2ffbconstanteffect.cpp
index d21f1db402abdda3ae086b5a9090f5d1f2f65fd2..e913468e5d3845b91ba77e3684f518bff026f6e1 100644 (file)
--- a/sdl2ffbconstanteffect.cpp
+++ b/sdl2ffbconstanteffect.cpp
@@ -55,7 +55,7 @@ bool SDL2FFBConstantEffect::setParameters(const std::shared_ptr<FFBConstantEffec
     return false;
 
   if (!checkBoundsInclusive(m_params->level, -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Level parameters must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Level parameters must be within <-32767; 32767>");
     return false;
   }
 

diff --git a/sdl2ffbeffect.cpp b/sdl2ffbeffect.cpp
index c527ea5013a9cb2fed65b920634a2f8b525e2a0d..c18955ece145934c99a8db239c57639f6e20c88e 100644 (file)
--- a/sdl2ffbeffect.cpp
+++ b/sdl2ffbeffect.cpp
@@ -2,8 +2,6 @@
 #include "globalsettings.h"
 #include <QtWidgets/QMessageBox>
 
-const QString SDL2FFBEffect::CAPTION("Invalid FFB parameter");
-
 SDL_HapticEffect* SDL2FFBEffect::createFFstruct()
 {
   SDL_HapticEffect* effect = new SDL_HapticEffect;
@@ -21,22 +19,22 @@ bool SDL2FFBEffect::checkEnvelopeParameters(const int attackLength, const int at
     return true;
 
   if (!checkBoundsInclusive(attackLength, 0, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Attack length must be within <0; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Attack length must be within <0; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(attackLevel, 0, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Attack level must be within <0; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Attack level must be within <0; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(fadeLength, 0, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Fade length must be within <0; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Fade length must be within <0; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(fadeLevel, 0, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Fade level must be within <0; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Fade level must be within <0; 32767>");
     return false;
   }
 
@@ -49,17 +47,17 @@ bool SDL2FFBEffect::checkGenericParameters(const std::shared_ptr<FFBEffectParame
     return true;
 
   if (!checkBoundsInclusive(params->direction, 0, 36000)) {
-    QMessageBox::warning(nullptr, CAPTION, "Direction must be within <0; 36000)");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Direction must be within <0; 36000)");
     return false;
   }
 
   if (!checkBoundsInclusive(params->replayLength, static_cast<int64_t>(0), static_cast<int64_t>(0x7FFF))) {
-    QMessageBox::warning(nullptr, CAPTION, "Replay length must be within <0; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Replay length must be within <0; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->replayDelay, 0, 0xFFFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Replay delay must be within <0; 65535>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Replay delay must be within <0; 65535>");
     return false;
   }
 

diff --git a/sdl2ffbeffect.h b/sdl2ffbeffect.h
index 833727f47d561396f6a3f9b4946bd03c4c8078e3..27ffa00e35098541ed267a039e457027ff8bf488 100644 (file)
--- a/sdl2ffbeffect.h
+++ b/sdl2ffbeffect.h
@@ -13,8 +13,6 @@ public:
 protected:
   virtual bool checkGenericParameters(const std::shared_ptr<FFBEffectParameters> params);
   bool checkEnvelopeParameters(const int attackLength, const int attackLevel, const int fadeLength, const int fadeLevel);
-
-  static const QString CAPTION;
 };
 
 #endif // SDL2FFBEFFECT_H

diff --git a/sdl2ffbperiodiceffect.cpp b/sdl2ffbperiodiceffect.cpp
index c8302f6e59eae4815f46c88799e92ebd09ae42c5..1c1f1005489fb6b26b4809d9afcec585a30e31a8 100644 (file)
--- a/sdl2ffbperiodiceffect.cpp
+++ b/sdl2ffbperiodiceffect.cpp
@@ -75,28 +75,28 @@ bool SDL2FFBPeriodicEffect::setParameters(const std::shared_ptr<FFBPeriodicEffec
     return false;
 
   if (!checkBoundsInclusive(params->period, 0, 36000)) {
-    QMessageBox::warning(nullptr, CAPTION, "Period must be within <0; 36000>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Period must be within <0; 36000>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->magnitude, -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Magnitude must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Magnitude must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->offset, -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Offset must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Offset must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->phase, 0, 36000)) {
-    QMessageBox::warning(nullptr, CAPTION, "Phase must be withing <0; 36000>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Phase must be withing <0; 36000>");
     return false;
   }
 
   if (params->waveform == PeriodicWaveforms::NONE ||
       params->waveform == PeriodicWaveforms::SQUARE) {
-    QMessageBox::warning(nullptr, CAPTION, "Unsupported waveform");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Unsupported waveform");
     return false;
   }
 

diff --git a/sdl2ffbrampeffect.cpp b/sdl2ffbrampeffect.cpp
index ba60f72790a70b4d64c86f3c7fd8f4c7d31c4733..279b4cae8c72ddcedc2f603a0f834648b8e4d474 100644 (file)
--- a/sdl2ffbrampeffect.cpp
+++ b/sdl2ffbrampeffect.cpp
@@ -58,12 +58,12 @@ bool SDL2FFBRampEffect::setParameters(const std::shared_ptr<FFBRampEffectParamet
     return false;
 
   if (checkBoundsInclusive(params->startLevel, -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "Start level must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "Start level must be within <-32767; 32767>");
     return false;
   }
 
   if (!checkBoundsInclusive(params->endLevel, -0x7FFF, 0x7FFF)) {
-    QMessageBox::warning(nullptr, CAPTION, "End level must be within <-32767; 32767>");
+    QMessageBox::warning(nullptr, PRERR_CAPTION, "End level must be within <-32767; 32767>");
     return false;
   }