From 006c9f17d4f35850ea390a665ac36b89e0e2706e Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 18 Jul 2010 11:20:10 +0300
Subject: [PATCH] GUI: Avoid unnecessary path separator conversion.

---
 gui/threadresult.cpp |  2 +-
 lib/errorlogger.cpp  |  5 +++--
 lib/errorlogger.h    | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index 571e7bd3c..3484cffd5 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -59,7 +59,7 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
          tok != msg._callStack.end();
          ++tok)
     {
-        files << QString((*tok).getfile().c_str());
+        files << QString((*tok).getfile(false).c_str());
         lines << (*tok).line;
     }
 
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 64755a499..2b1fd8190 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -216,7 +216,7 @@ std::string ErrorLogger::callStackToString(const std::list<ErrorLogger::ErrorMes
 }
 
 
-std::string ErrorLogger::ErrorMessage::FileLocation::getfile() const
+std::string ErrorLogger::ErrorMessage::FileLocation::getfile(bool convert) const
 {
     std::string f(_file);
 
@@ -246,7 +246,8 @@ std::string ErrorLogger::ErrorMessage::FileLocation::getfile() const
         pos = sep;
     }
 
-    f = Path::toNativeSeparators(f);
+    if (convert)
+        f = Path::toNativeSeparators(f);
     return f;
 }
 
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index 826d00329..56772d9d7 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -81,6 +81,8 @@ public:
     public:
         /**
          * File name and line number.
+         * Internally paths are stored with / separator. When getting the filename
+         * it is by default converted to native separators.
          */
         class FileLocation
         {
@@ -90,7 +92,17 @@ public:
                 line = 0;
             }
 
-            std::string getfile() const;
+            /**
+             * Return the filename.
+             * @param convert If true convert path to native separators.
+             * @return filename.
+             */
+            std::string getfile(bool convert = true) const;
+
+            /**
+             * Set the filename.
+             * @param file Filename to set.
+             */
             void setfile(const std::string &file);
             unsigned int line;
         private: