Merge pull request hetelek#63 from Kuci/master

Multiple commits
Gualdimar · May 13, 2014 · 2c15bb6 · 2c15bb6
2 parents 34b5121 + f972689
commit 2c15bb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 moc_*.h
 moc_*.cpp
 ui_*.h
+qrc_Resources.cpp
 
 # Velocity #
 ############
@@ -42,6 +43,7 @@ Makefile
 *.tlog
 *.lastbuildstate
 *.unsuccessfulbuild
+Velocity/Velocity
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -59,6 +61,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+build-*/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

diff --git a/Velocity/mainwindow.cpp b/Velocity/mainwindow.cpp
@@ -380,7 +380,8 @@ void MainWindow::LoadFiles(QList<QUrl> &filePaths)
         std::string fileName = QString(filePaths.at(i).encodedPath()).mid(1).replace("%20",
                 " ").toStdString();
 #else
-        std::string fileName = QString(filePaths.at(i).encodedPath()).replace("%20", " ").toStdString();
+        std::string fileName = QString(filePaths.at(i).toEncoded()).replace("%20", " ").
+                replace("file://", "").toStdString();
 #endif
 
         // make sure the file exists