Simplified inpututils functions

Author: gabriel-bolbotina

app/inpututils.cpp

@@ -70,6 +70,11 @@
 
 static const QString DATE_TIME_FORMAT = QStringLiteral( "yyMMdd-hhmmss" );
 static const QString INVALID_DATETIME_STR = QStringLiteral( "Invalid datetime" );
+#ifdef Q_OS_WIN32
+static const QString FILE_PATH_PREFIX = QStringLiteral( "file:///" );
+#else
+static const QString FILE_PATH_PREFIX = QStringLiteral( "file://" );
+#endif
 
 InputUtils::InputUtils( QObject *parent )
   : QObject( parent )
@@ -91,17 +96,10 @@ bool InputUtils::removeFile( const QString &filePath )
 bool InputUtils::copyFile( const QString &srcPath, const QString &dstPath )
 {
   QString modSrcPath = srcPath;
-#ifdef Q_OS_WIN32
-  if ( srcPath.startsWith( "file:///" ) )
+  if ( srcPath.startsWith( FILE_PATH_PREFIX ) )
   {
-    modSrcPath = modSrcPath.replace( "file:///", "" );
+    modSrcPath = modSrcPath.replace( FILE_PATH_PREFIX, "" );
   }
-#else
-  if ( srcPath.startsWith( "file://" ) )
-  {
-    modSrcPath = modSrcPath.replace( "file://", "" );
-  }
-#endif
 
   QFileInfo fi( dstPath );
   if ( !InputUtils::createDirectory( fi.absoluteDir().path() ) )
@@ -1051,15 +1049,10 @@ QString InputUtils::resolvePath( const QString &path, const QString &homePath, c
 QString InputUtils::getRelativePath( const QString &path, const QString &prefixPath )
 {
   QString modPath = path;
-#ifdef Q_OS_WIN32
-  QString filePrefix( "file:///" );
-#else
-  QString filePrefix( "file://" );
-#endif
 
-  if ( path.startsWith( filePrefix ) )
+  if ( path.startsWith( FILE_PATH_PREFIX ) )
   {
-    modPath = modPath.replace( filePrefix, QString() );
+    modPath = modPath.replace( FILE_PATH_PREFIX, QString() );
   }
 
   if ( prefixPath.isEmpty() ) return modPath;
@@ -1994,11 +1987,7 @@ void InputUtils::sanitizeFileName( QString &fileName )
 
 void InputUtils::sanitizePath( QString &path )
 {
-#ifdef Q_OS_WIN32
-  const bool pathStartsWithFileURL = path.startsWith( "file:///" );
-#else
-  const bool pathStartsWithFileURL = path.startsWith( "file://" );
-#endif
+  const bool pathStartsWithFileURL = path.startsWith( FILE_PATH_PREFIX );
 
   if ( pathStartsWithFileURL )
   {
@@ -2032,13 +2021,8 @@ void InputUtils::sanitizePath( QString &path )
 
   if ( pathStartsWithFileURL )
   {
-#ifdef Q_OS_WIN32
-    // restore file:/// prefix for windows
-    sanitizedPath = "file:///" + sanitizedPath;
-#else
     // restore file:// prefix
-    sanitizedPath = "file://" + sanitizedPath;
-#endif
+    sanitizedPath = FILE_PATH_PREFIX + sanitizedPath;
   }
   path = sanitizedPath;
 }