Selaa lähdekoodia

STYLE: Use namespace ctk instead of a utility class to contain utility functions

Julien Finet 15 vuotta sitten
vanhempi
commit
c1e9ec5450
2 muutettua tiedostoa jossa 18 lisäystä ja 28 poistoa
  1. 3 3
      Libs/Core/ctkUtils.cpp
  2. 15 25
      Libs/Core/ctkUtils.h

+ 3 - 3
Libs/Core/ctkUtils.cpp

@@ -24,7 +24,7 @@
 #include <algorithm>
 
 //------------------------------------------------------------------------------
-void ctkUtils::qListToSTLVector(const QStringList& list,
+void ctk::qListToSTLVector(const QStringList& list,
                                  std::vector<char*>& vector)
 {
   // Resize if required
@@ -52,7 +52,7 @@ static std::string qStringToSTLString(const QString& qstring)
 }
 
 //------------------------------------------------------------------------------
-void ctkUtils::qListToSTLVector(const QStringList& list,
+void ctk::qListToSTLVector(const QStringList& list,
                                  std::vector<std::string>& vector)
 {
   // To avoid unnessesary relocations, let's reserve the required amount of space
@@ -61,7 +61,7 @@ void ctkUtils::qListToSTLVector(const QStringList& list,
 }
 
 //------------------------------------------------------------------------------
-void ctkUtils::stlVectorToQList(const std::vector<std::string>& vector,
+void ctk::stlVectorToQList(const std::vector<std::string>& vector,
                                  QStringList& list)
 {
   std::transform(vector.begin(),vector.end(),std::back_inserter(list),&QString::fromStdString);

+ 15 - 25
Libs/Core/ctkUtils.h

@@ -29,30 +29,20 @@
 
 #include "CTKCoreExport.h"
 
-class CTK_CORE_EXPORT ctkUtils
-{
-  
-public:
-  typedef ctkUtils Self;
-
-  ///
-  /// Convert a QStringList to Vector of char*
-  /// Caller will be responsible to delete the content of the vector
-  static void qListToSTLVector(const QStringList& list, std::vector<char*>& vector);
-
-  ///
-  /// Convert a QStringList to a Vector of string
-  static void qListToSTLVector(const QStringList& list, std::vector<std::string>& vector);
-
-  ///
-  /// Convert a Vector of string to QStringList
-  static void stlVectorToQList(const std::vector<std::string>& vector, QStringList& list);
-
-private:
-  /// Not implemented
-  ctkUtils(){}
-  virtual ~ctkUtils(){}
-
-};
+namespace ctk {
+///
+/// Convert a QStringList to Vector of char*
+/// Caller will be responsible to delete the content of the vector
+void CTK_CORE_EXPORT qListToSTLVector(const QStringList& list, std::vector<char*>& vector);
+
+///
+/// Convert a QStringList to a Vector of string
+void CTK_CORE_EXPORT qListToSTLVector(const QStringList& list, std::vector<std::string>& vector);
+
+///
+/// Convert a Vector of string to QStringList
+void CTK_CORE_EXPORT stlVectorToQList(const std::vector<std::string>& vector, QStringList& list);
+
+}
 
 #endif