Fix compilation on Linux

Author: zenden2k

Source/Core/Settings/CliSettings.cpp

@@ -20,11 +20,6 @@ limitations under the License.
 
 #include "CliSettings.h"
 
-#ifdef _WIN32
-void ImageUploadParams::bind(SettingsNode& n){
-}
-#endif
-
 ThumbCreatingParams ImageUploadParams::getThumb()
 {
     return Thumb;

Source/Core/Settings/WtlGuiSettings.cpp

@@ -1134,27 +1134,6 @@ ServerSettingsStruct& WtlGuiSettings::ServerByUtf8Name(const std::string& name)
     return ServersSettings[name].begin()->second;
 }
 
-void ImageUploadParams::bind(SettingsNode& n){
-    SettingsNode & node = n["ImageUploadParams"];
-    node.n_bind(UseServerThumbs);
-    node.n_bind(CreateThumbs);
-
-    node.n_bind(ProcessImages);
-    node.n_bind(ImageProfileName);
-    node.n_bind(UseDefaultThumbSettings);
-    SettingsNode & thumb = node["Thumb"];
-    thumb.nm_bind(Thumb, TemplateName);
-    thumb.nm_bind(Thumb, Size);
-    thumb.nm_bind(Thumb, Width);
-    thumb.nm_bind(Thumb, Height);
-    thumb["ResizeMode"].bind((int&)Thumb.ResizeMode);
-    thumb.nm_bind(Thumb, AddImageSize);
-    thumb.nm_bind(Thumb, DrawFrame);
-    thumb.nm_bind(Thumb, Quality);
-    thumb.nm_bind(Thumb, Format);
-    thumb.nm_bind(Thumb, Text);
-}
-
 ThumbCreatingParams ImageUploadParams::getThumb()
 {
     WtlGuiSettings* Settings = ServiceLocator::instance()->settings<WtlGuiSettings>();

Source/Core/SettingsManager.h

@@ -28,6 +28,7 @@
 #include "Core/Utils/CoreTypes.h"
 #include "Core/Utils/SimpleXml.h"
 #include "Core/Utils/StringUtils.h"
+#include "Core/Settings/StringConvert.h"
 
 #define n_bind(a) operator[]( #a ).bind(a)
 #define nm_bind(b,a) operator[]( #a ).bind(b.a)
@@ -40,11 +41,11 @@ class SettingsNodeBase
         virtual ~SettingsNodeBase() = default;
 };
 
-template<class T> std::string myToString(const T& value)
-{
-        std::stringstream str;
-        str << value;
-        return str.str();
+template <class T>
+std::string myToString(const T& value) {
+    std::stringstream str;
+    str << value;
+    return str.str();
 }
 
 inline std::string myToString(const std::vector<std::string>& value)
@@ -57,6 +58,7 @@ inline void myFromString(const std::string& text, std::vector<std::string>& valu
     IuStringUtils::Split(text, ";", value);
 }
 
+
 template<class T> void myFromString(const std::string& text, T & value)
 {
    std::stringstream str(text);
@@ -69,7 +71,6 @@ template<class T, class T2> void myFromString(const std::string& text, T & value
    str >> value;
 }
 
-
 inline void myFromString(const std::string& text, std::string & value)
 {
     value = text;

Source/Core/Upload/ServerProfile.cpp

@@ -149,3 +149,24 @@ void ServerProfile::setImageUploadParams(ImageUploadParams iup)
 CUploadEngineData* ServerProfile::uploadEngineData() const {
     return ServiceLocator::instance()->engineList()->byName(serverName_);
 }
+
+void ImageUploadParams::bind(SettingsNode& n) {
+    SettingsNode& node = n["ImageUploadParams"];
+    node.n_bind(UseServerThumbs);
+    node.n_bind(CreateThumbs);
+
+    node.n_bind(ProcessImages);
+    node.n_bind(ImageProfileName);
+    node.n_bind(UseDefaultThumbSettings);
+    SettingsNode& thumb = node["Thumb"];
+    thumb.nm_bind(Thumb, TemplateName);
+    thumb.nm_bind(Thumb, Size);
+    thumb.nm_bind(Thumb, Width);
+    thumb.nm_bind(Thumb, Height);
+    thumb["ResizeMode"].bind((int&)Thumb.ResizeMode);
+    thumb.nm_bind(Thumb, AddImageSize);
+    thumb.nm_bind(Thumb, DrawFrame);
+    thumb.nm_bind(Thumb, Quality);
+    thumb.nm_bind(Thumb, Format);
+    thumb.nm_bind(Thumb, Text);
+}

Source/Core/Upload/ServerProfile.h

@@ -26,9 +26,8 @@ struct ImageUploadParams {
         Thumb.Quality = 85;
         Thumb.Text = "%width%x%height% (%size%)";
     }
-#ifdef _WIN32
+
     void bind(SettingsNode& n);
-#endif
     bool UseServerThumbs;
     bool CreateThumbs;
     bool ProcessImages;