diff --git a/.gitignore b/.gitignore index e2b4a751..895b50fd 100644 --- 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 index 8dd95e93..6f717d36 100644 --- a/Velocity/mainwindow.cpp +++ b/Velocity/mainwindow.cpp @@ -380,7 +380,8 @@ void MainWindow::LoadFiles(QList &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