Make "Helpers" a full class

diff --git a/datafileexporter.cpp b/datafileexporter.cpp
index 536152f1ec183e2ef9b3b69f18923892513a25dd..823b4b615e7a5fab786e047e110d619a6d9e2858 100644 (file)
--- a/datafileexporter.cpp
+++ b/datafileexporter.cpp
@@ -163,7 +163,7 @@ DataFileExporter::ReturnCode DataFileExporter::writeToFile(QFile& file, const Da
 
 void DataFileExporter::guessFormatFromSuffix(const QString& name)
 {
-  QString suffix = getFileNameSuffix(name);
+  QString suffix = Helpers::getFileNameSuffix(name);
 
   if (suffix.length() == 0)
     return;

diff --git a/gui/graphview.h b/gui/graphview.h
index 9e44c0eb7a0647c9e20067e1791d6f3a3f5649c5..2718ef70414020a13adc5980544bce7cb851b83e 100644 (file)
--- a/gui/graphview.h
+++ b/gui/graphview.h
@@ -26,7 +26,6 @@
 
 #include "gui/graphviewcontextmenu.h"
 #include "signaldrawer.h"
-#include "helpers.h"
 #include "metatypes.h"
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QWidget>

diff --git a/gui/signalview.cpp b/gui/signalview.cpp
index 2b8d620beb46b852e684a6f772dfcef4a17f24a3..6edaeab5ce3c7816c5d64b98c4b0bea07400652d 100644 (file)
--- a/gui/signalview.cpp
+++ b/gui/signalview.cpp
@@ -23,7 +23,6 @@
 
 #include "gui/signalview.h"
 #include "ui_signalview.h"
-#include "helpers.h"
 #include <cmath>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QPainter>

diff --git a/helpers.h b/helpers.h
index c3b889a7eb87ae0f8933e1803d1118e90ad17be0..f492ed28025261e80af5048b679c77d3971c6068 100644 (file)
--- a/helpers.h
+++ b/helpers.h
@@ -26,29 +26,33 @@
 
 #include <QtCore/QString>
 
-template <typename T> static T average(T* vals, size_t len) {
-  T sum = 0;
-  for (size_t i = 0; i < len; i++)
-    sum += vals[i];
-  return sum / len;
-}
 
-template <typename T> static T clamp(T in, T min, T max) {
-  if (in < min)
-    return min;
-  if (in > max)
-    return max;
-}
+class Helpers {
 
-static QString getFileNameSuffix(const QString& name)
-{
-  int dotIdx = name.lastIndexOf('.');
+public:
+  template <typename T> static T average(T* vals, size_t len) {
+    T sum = 0;
+    for (size_t i = 0; i < len; i++)
+      sum += vals[i];
+    return sum / len;
+  }
 
-  if (dotIdx < 0)
-    return "";
+  template <typename T> static T clamp(T in, T min, T max) {
+    if (in < min)
+      return min;
+    if (in > max)
+      return max;
+  }
 
-  return name.mid(dotIdx+1).toLower();
-}
+  static QString getFileNameSuffix(const QString& name)
+  {
+    int dotIdx = name.lastIndexOf('.');
 
+    if (dotIdx < 0)
+      return "";
 
+    return name.mid(dotIdx+1).toLower();
+  }
+
+};
 #endif // MATHHELPERS_H

diff --git a/imagedrawer.cpp b/imagedrawer.cpp
index af82ad6ef8395f1b5c455fc8a2fe1aa53274f3ad..e751a5fcb4d056c35ea4c86254493c1fe19753ad 100644 (file)
--- a/imagedrawer.cpp
+++ b/imagedrawer.cpp
@@ -94,7 +94,7 @@ QList<QByteArray> ImageDrawer::supportedImageFormats()
 int ImageDrawer::guessFormatFromSuffix(const QString& name)
 {
   QList<QByteArray> formats = ImageDrawer::supportedImageFormats();
-  QString suffix = getFileNameSuffix(name);
+  QString suffix = Helpers::getFileNameSuffix(name);
 
   if (suffix.length() == 0)
     return -1;