Remove conditional compilation in get save path function [core]

DOOMer · May 7, 2012 · cb86636 · cb86636
1 parent 1dc6105
commit cb86636
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/src/core/core.cpp b/src/core/core.cpp
@@ -312,32 +312,17 @@ QString Core::getSaveFilePath(QString format)
     {
         if (conf->getDateTimeInFilename() == true)
         {
-            #ifdef Q_WS_X11
-                initPath = conf->getSaveDir()+conf->getSaveFileName() +"-"+getDateTimeFileName() +"."+format;
-            #endif
-            #ifdef Q_WS_WIN
-                initPath = conf->getSaveDir()+conf->getSaveFileName()+"-"+getDateTimeFileName();
-            #endif
+            initPath = conf->getSaveDir()+conf->getSaveFileName() +"-"+getDateTimeFileName() +"."+format;
         }
         else
         {
             if (conf->getScrNum() != 0)
             {
-                #ifdef Q_WS_X11
                 initPath = conf->getSaveDir()+conf->getSaveFileName() + conf->getScrNumStr() +"."+format;
-                #endif
-                #ifdef Q_WS_WIN
-                initPath = conf->getSaveDir()+conf->getSaveFileName() + conf->getScrNumStr();
-                #endif
             }
             else
             {
-                #ifdef Q_WS_X11
                 initPath = conf->getSaveDir() + conf->getSaveFileName()+"."+format;
-                #endif
-                #ifdef Q_WS_WIN
-                initPath = conf->getSaveDir()+conf->getSaveFileName();
-                #endif
             }
         }
     } while(checkExsistFile(initPath) == true);