[Sepiola-commits] SF.net SVN: sepiola:[334] trunk/src/settings

[<tiz...@us...>]

Revision: 334
          http://sepiola.svn.sourceforge.net/sepiola/?rev=334&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:12:58 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Move executable suffix const to Platform

- Move const variable for executable suffix to Platform namespace
- Create an array instead of a pointer+data which also solves warnings about
  unused variables.

Modified Paths:
--------------
    trunk/src/settings/platform.hh
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh

Modified: trunk/src/settings/platform.hh
===================================================================
--- trunk/src/settings/platform.hh	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/platform.hh	2012-09-14 19:12:58 UTC (rev 334)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007-2011 stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License
@@ -24,9 +24,11 @@
 namespace Platform {
 
 #ifdef Q_OS_WIN32
-    static const char* EOL_CHARACTER = "\r\n";
+    static const char EOL_CHARACTER[] = "\r\n";
+    static const char EXECUTABLE_SUFFIX[] = ".exe";
 #else
-    static const char* EOL_CHARACTER = "\n";
+    static const char EOL_CHARACTER[] = "\n";
+    static const char EXECUTABLE_SUFFIX[] = "";
 #endif
 
 }

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/settings.cc	2012-09-14 19:12:58 UTC (rev 334)
@@ -26,6 +26,7 @@
 #include <cstdio>
 #include <QtCore/QTranslator>
 
+#include "settings/platform.hh"
 #include "settings/settings.hh"
 #include "utils/file_system_utils.hh"
 #include "utils/string_utils.hh"
@@ -35,13 +36,6 @@
 
 #include "config.h"
 
-#ifdef Q_OS_WIN32
-const QString Settings::SETTINGS_EXECUTABLE_EXTENSION = ".exe";
-#else
-const QString Settings::SETTINGS_EXECUTABLE_EXTENSION = "";
-#endif
-
-
 const bool Settings::SHOW_PROGRESS = false;
 
 const QString Settings::EXECUTABLE_NAME = QString( SSBACKUP_EXECUTABLE_NAME );
@@ -249,13 +243,13 @@
 
 	// [Executables]
 	applicationSettings->beginGroup( SETTINGS_GROUP_EXECUTABLES );
-	thisApplication = StringUtils::encaps( EXECUTABLE_NAME, "", SETTINGS_EXECUTABLE_EXTENSION );
-	rsync = StringUtils::encaps( applicationSettings->value( SETTINGS_RSYNC ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	plink = StringUtils::encaps( applicationSettings->value( SETTINGS_PLINK ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	ssh = StringUtils::encaps( applicationSettings->value( SETTINGS_SSH ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	getfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_GETFACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	setfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETFACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	setacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
+	thisApplication = StringUtils::encaps( EXECUTABLE_NAME, "", Platform::EXECUTABLE_SUFFIX );
+	rsync = StringUtils::encaps( applicationSettings->value( SETTINGS_RSYNC ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	plink = StringUtils::encaps( applicationSettings->value( SETTINGS_PLINK ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	ssh = StringUtils::encaps( applicationSettings->value( SETTINGS_SSH ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	getfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_GETFACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	setfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETFACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	setacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
 	applicationSettings->endGroup();
 
 	// [Reseller]

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/settings.hh	2012-09-14 19:12:58 UTC (rev 334)
@@ -348,7 +348,6 @@
 
 
 		// Settings given at build-time or by platform
-		static const QString SETTINGS_EXECUTABLE_EXTENSION;
 		static const bool IS_RESELLER;
 
 		static Settings* instance;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.