last code patch from gta5sync

5 years ago · f62b1b08c0
22 changed files with 208 additions and 201 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -32,14 +32,14 @@ before_script:

 script:
  - cd qt5
-  - qmake -qt=5 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev1\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro
+  - qmake -qt=5 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev2\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro
  - make -j 4
-  - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev1 --pkggroup=utility --maintainer="Syping on Travis \<[email protected]\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=../../package
+  - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev2 --pkggroup=utility --maintainer="Syping on Travis \<[email protected]\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=../../package
  - cd ..
  - cd qt4
-  - qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev1\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro
+  - qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev2\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro
  - make -j 4
-  - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev1 --pkggroup=utility --maintainer="Syping on Travis \<[email protected]\>" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=../../package
+  - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev2 --pkggroup=utility --maintainer="Syping on Travis \<[email protected]\>" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=../../package
  - cd ..

 deploy:
--- a/DatabaseThread.cpp
+++ b/DatabaseThread.cpp
@ -125,9 +125,9 @@ void DatabaseThread::run()

 void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &requestDelay)
 {
-    foreach (const QString &crewID, crewList)
+    for (QString crewID : crewList)
    {
-        if (threadRunning && crewID != "0")
+        if (threadRunning && crewID != QLatin1String("0"))
        {
            QNetworkAccessManager *netManager = new QNetworkAccessManager();

@ -182,9 +182,9 @@ void DatabaseThread::scanCrewReference(const QStringList &crewList, const int &r

 void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay)
 {
-    foreach (const QString &crewID, crewList)
+    for (QString crewID : crewList)
    {
-        if (threadRunning && crewID != "0")
+        if (threadRunning && crewID != QLatin1String("0"))
        {
            int currentPage = 0;
            int foundPlayers = 0;
@ -223,8 +223,8 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int

                    if (crewMap.contains("Members"))
                    {
-                        QList<QVariant> memberList = crewMap["Members"].toList();
-                        foreach (const QVariant &memberVariant, memberList)
+                        const QList<QVariant> memberList = crewMap["Members"].toList();
+                        for (QVariant memberVariant : memberList)
                        {
                            QMap<QString, QVariant> memberMap = memberVariant.toMap();
                            foundPlayers++;
@ -232,7 +232,7 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
                            {
                                int RockstarId = memberMap["RockstarId"].toInt();
                                QString memberName = memberMap["Name"].toString();
-                                if (memberName != "" && RockstarId != 0)
+                                if (!memberName.isEmpty() && RockstarId != 0)
                                {
                                    emit playerNameFound(RockstarId, memberName);
                                }
@ -256,10 +256,21 @@ void DatabaseThread::scanCrewMembersList(const QStringList &crewList, const int
    }
 }

+void DatabaseThread::deleteCompatibleCrews(QStringList *crewList)
+{
+    for (QString& crewNID : *crewList)
+    {
+        if (crewDB->isCompatibleCrew(crewNID))
+        {
+            crewList->removeAll(crewNID);
+        }
+    }
+}
+
 QStringList DatabaseThread::deleteCompatibleCrews(const QStringList &crewList)
 {
    QStringList crewListR = crewList;
-    foreach(const QString &crewNID, crewListR)
+    for (QString& crewNID : crewListR)
    {
        if (crewDB->isCompatibleCrew(crewNID))
        {
--- a/DatabaseThread.h
+++ b/DatabaseThread.h
@ -36,6 +36,7 @@ private:
    CrewDatabase *crewDB;
    void scanCrewMembersList(const QStringList &crewList, const int &maxPages, const int &requestDelay);
    void scanCrewReference(const QStringList &crewList, const int &requestDelay);
+    void deleteCompatibleCrews(QStringList *crewList);
    QStringList deleteCompatibleCrews(const QStringList &crewList);
    bool threadRunning;
    int plyrPerReq;
--- a/GlobalString.cpp
+++ b/GlobalString.cpp
@ -37,8 +37,7 @@ QMap<QString, QString> GlobalString::getGlobalMap()
    QSettings globalFile(getLanguageFile(), QSettings::IniFormat);
    globalFile.setIniCodec("UTF-8");
    globalFile.beginGroup("Global");
-    QStringList globalStrList = globalFile.childKeys();
-    foreach(const QString &globalStr, globalStrList)
+    for (QString globalStr : globalFile.childKeys())
    {
        globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString();
    }
@ -55,7 +54,7 @@ QString GlobalString::getString(QString valueStr, bool *ok)
    QStringList globalStrList = globalFile.childKeys();
    if (globalStrList.contains(valueStr))
    {
-        if (ok != NULL) *ok = true;
+        if (ok != nullptr) *ok = true;
        globalString = globalFile.value(valueStr, valueStr).toString();
    }
    globalFile.endGroup();
--- a/GlobalString.h
+++ b/GlobalString.h
@ -26,7 +26,7 @@ class GlobalString
 {
 public:
    GlobalString();
-    static QString getString(QString valueStr, bool *ok = 0);
+    static QString getString(QString valueStr, bool *ok = nullptr);
    static QString getLanguageFile();
    static QString getLanguage();
    static QMap<QString, QString> getGlobalMap();
--- a/OptionsDialog.cpp
+++ b/OptionsDialog.cpp
@ -94,16 +94,14 @@ OptionsDialog::OptionsDialog(ProfileDatabase *profileDB, QWidget *parent) :
 OptionsDialog::~OptionsDialog()
 {
    delete settings;
-    foreach(QTreeWidgetItem *playerItem, playerItems)
-    {
-        delete playerItem;
-    }
+    qDeleteAll(playerItems.begin(), playerItems.end());
+    playerItems.clear();
    delete ui;
 }

 void OptionsDialog::setupTreeWidget()
 {
-    foreach(const QString &playerIDStr, profileDB->getPlayers())
+    for (QString playerIDStr : profileDB->getPlayers())
    {
        bool ok;
        int playerID = playerIDStr.toInt(&ok);
@ -112,8 +110,8 @@ void OptionsDialog::setupTreeWidget()
            QString playerName = profileDB->getPlayerName(playerID);

            QStringList playerTreeViewList;
-            playerTreeViewList << playerIDStr;
-            playerTreeViewList << playerName;
+            playerTreeViewList += playerIDStr;
+            playerTreeViewList += playerName;

            QTreeWidgetItem *playerItem = new QTreeWidgetItem(playerTreeViewList);
            ui->twPlayers->addTopLevelItem(playerItem);
@ -126,7 +124,7 @@ void OptionsDialog::setupTreeWidget()
 void OptionsDialog::setupLanguageBox()
 {
    settings->beginGroup("Interface");
-    currentLanguage = settings->value("Language","System").toString();
+    currentLanguage = settings->value("Language", "System").toString();
    settings->endGroup();

    QString cbSysStr = tr("%1 (Next Closest Language)", "First language a person can talk with a different person/application. \"Native\" or \"Not Native\".").arg(tr("System",
@ -142,7 +140,7 @@ void OptionsDialog::setupLanguageBox()
    availableLanguages.removeDuplicates();
    availableLanguages.sort();

-    foreach(const QString &lang, availableLanguages)
+    for (QString lang : availableLanguages)
    {
        QLocale langLocale(lang);
        QString cbLangStr = langLocale.nativeLanguageName() % " (" % langLocale.nativeCountryName() % ") [" % lang % "]";
@ -285,9 +283,9 @@ void OptionsDialog::setupDefaultProfile()
    ui->cbProfiles->addItem(cbNoneStr, "");
 }

-void OptionsDialog::commitProfiles(QStringList profiles)
+void OptionsDialog::commitProfiles(const QStringList &profiles)
 {
-    foreach(const QString &profile, profiles)
+    for (QString profile : profiles)
    {
        ui->cbProfiles->addItem(tr("Profile: %1").arg(profile), profile);
        if (defaultProfile == profile)
--- a/OptionsDialog.h
+++ b/OptionsDialog.h
@ -36,7 +36,7 @@ class OptionsDialog : public QDialog

 public:
    explicit OptionsDialog(ProfileDatabase *profileDB, QWidget *parent = 0);
-    void commitProfiles(QStringList profiles);
+    void commitProfiles(const QStringList &profiles);
    ~OptionsDialog();

 private slots:
--- a/PictureDialog.cpp
+++ b/PictureDialog.cpp
@ -594,7 +594,7 @@ QString PictureDialog::generatePlayersString()
    QString plyrsStr;
    if (plyrsList.length() >= 1)
    {
-        foreach (const QString &player, plyrsList)
+        for (QString player : plyrsList)
        {
            QString playerName;
            if (withDatabase)
--- a/ProfileInterface.cpp
+++ b/ProfileInterface.cpp
@ -96,19 +96,19 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre

 ProfileInterface::~ProfileInterface()
 {
-    foreach(ProfileWidget *widget, widgets.keys())
+    foreach (ProfileWidget *widget, widgets.keys())
    {
        widgets.remove(widget);
        widget->removeEventFilter(this);
        widget->disconnect();
        delete widget;
    }
-    foreach(SavegameData *savegame, savegames)
+    foreach (SavegameData *savegame, savegames)
    {
        savegames.removeAll(savegame);
        delete savegame;
    }
-    foreach(SnapmaticPicture *picture, pictures)
+    foreach (SnapmaticPicture *picture, pictures)
    {
        pictures.removeAll(picture);
        delete picture;
@ -308,7 +308,7 @@ void ProfileInterface::sortingProfileInterface()
    QStringList widgetsKeyList = widgets.values();
    qSort(widgetsKeyList.begin(), widgetsKeyList.end());

-    foreach(QString widgetKey, widgetsKeyList)
+    for (QString widgetKey : widgetsKeyList)
    {
        ProfileWidget *widget = widgets.key(widgetKey);
        if (widget->getWidgetType() == "SnapmaticWidget")
@ -413,7 +413,7 @@ fileDialogPreOpen: //Work?

    // Getting readable Image formats
    QString imageFormatsStr = " ";
-    foreach(const QByteArray &imageFormat, QImageReader::supportedImageFormats())
+    for (QByteArray imageFormat : QImageReader::supportedImageFormats())
    {
        imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
    }
@ -486,7 +486,7 @@ void ProfileInterface::importFilesProgress(QStringList selectedFiles)

    QTime t;
    t.start();
-    foreach(const QString &selectedFile, selectedFiles)
+    for (QString selectedFile : selectedFiles)
    {
        pbDialog.setValue(overallId);
        pbDialog.setLabelText(tr("Import file %1 of %2 files").arg(QString::number(overallId), QString::number(maximumId)));
@ -497,7 +497,7 @@ void ProfileInterface::importFilesProgress(QStringList selectedFiles)
        overallId++;
    }
    pbDialog.close();
-    foreach (const QString &curErrorStr, failedFiles)
+    for (QString curErrorStr : failedFiles)
    {
        errorStr += ", " % curErrorStr;
    }
@ -820,7 +820,7 @@ void ProfileInterface::profileWidgetSelected()
 {
    if (selectedWidgts == 0)
    {
-        foreach(ProfileWidget *widget, widgets.keys())
+        foreach (ProfileWidget *widget, widgets.keys())
        {
            widget->setSelectionMode(true);
        }
@ -833,7 +833,7 @@ void ProfileInterface::profileWidgetDeselected()
    if (selectedWidgts == 1)
    {
        int scrollBarValue = ui->saProfile->verticalScrollBar()->value();
-        foreach(ProfileWidget *widget, widgets.keys())
+        foreach (ProfileWidget *widget, widgets.keys())
        {
            if (contentMode != 2)
            {
@ -847,7 +847,7 @@ void ProfileInterface::profileWidgetDeselected()

 void ProfileInterface::selectAllWidgets()
 {
-    foreach(ProfileWidget *widget, widgets.keys())
+    foreach (ProfileWidget *widget, widgets.keys())
    {
        widget->setSelected(true);
    }
@ -855,7 +855,7 @@ void ProfileInterface::selectAllWidgets()

 void ProfileInterface::deselectAllWidgets()
 {
-    foreach(ProfileWidget *widget, widgets.keys())
+    foreach (ProfileWidget *widget, widgets.keys())
    {
        widget->setSelected(false);
    }
@ -985,7 +985,7 @@ void ProfileInterface::exportSelected()
            errorList << getFailedCopyPictures;
            errorList << getFailedSavegames;

-            foreach (const QString &curErrorStr, errorList)
+            for (QString curErrorStr : errorList)
            {
                errorStr += ", " % curErrorStr;
            }
@ -1069,7 +1069,7 @@ void ProfileInterface::settingsApplied(int _contentMode, bool languageChanged)
    contentMode = _contentMode;
    if (contentMode == 2)
    {
-        foreach(ProfileWidget *widget, widgets.keys())
+        foreach (ProfileWidget *widget, widgets.keys())
        {
            widget->setSelectionMode(true);
            widget->setContentMode(contentMode);
@ -1078,7 +1078,7 @@ void ProfileInterface::settingsApplied(int _contentMode, bool languageChanged)
    }
    else
    {
-        foreach(ProfileWidget *widget, widgets.keys())
+        foreach (ProfileWidget *widget, widgets.keys())
        {
            if (selectedWidgts == 0)
            {
@ -1217,9 +1217,8 @@ void ProfileInterface::on_saProfileContent_dropped(const QMimeData *mimeData)
 {
    if (!mimeData) return;
    QStringList pathList;
-    QList<QUrl> urlList = mimeData->urls();

-    foreach(const QUrl &currentUrl, urlList)
+    for (QUrl currentUrl : mimeData->urls())
    {
        if (currentUrl.isLocalFile())
        {
@ -1287,7 +1286,7 @@ bool ProfileInterface::eventFilter(QObject *watched, QEvent *event)
        if ((watched->objectName() == "SavegameWidget" || watched->objectName() == "SnapmaticWidget") && isProfileLoaded)
        {
            ProfileWidget *pWidget = nullptr;
-            foreach(ProfileWidget *widget, widgets.keys())
+            foreach (ProfileWidget *widget, widgets.keys())
            {
                QPoint mousePos = widget->mapFromGlobal(QCursor::pos());
                if (widget->rect().contains(mousePos))
@ -1356,7 +1355,7 @@ bool ProfileInterface::eventFilter(QObject *watched, QEvent *event)
 void ProfileInterface::hoverProfileWidgetCheck()
 {
    ProfileWidget *pWidget = nullptr;
-    foreach(ProfileWidget *widget, widgets.keys())
+    foreach (ProfileWidget *widget, widgets.keys())
    {
        if (widget->underMouse())
        {
@ -1424,7 +1423,7 @@ void ProfileInterface::updatePalette()

 bool ProfileInterface::isSupportedImageFile(QString selectedFileName)
 {
-    foreach(const QByteArray &imageFormat, QImageReader::supportedImageFormats())
+    for (QByteArray imageFormat : QImageReader::supportedImageFormats())
    {
        QString imageFormatStr = QString(".") % QString::fromUtf8(imageFormat).toLower();
        if (selectedFileName.length() >= imageFormatStr.length() && selectedFileName.toLower().right(imageFormatStr.length()) == imageFormatStr)
--- a/ProfileLoader.cpp
+++ b/ProfileLoader.cpp
@ -50,7 +50,7 @@ void ProfileLoader::run()

    SavegameFiles.removeDuplicates();
    SnapmaticPics.removeDuplicates();
-    foreach(const QString &BackupFile, BackupFiles)
+    for (QString BackupFile : BackupFiles)
    {
        SavegameFiles.removeAll(BackupFile);
        SnapmaticPics.removeAll(BackupFile);
@ -60,7 +60,7 @@ void ProfileLoader::run()

    // Loading pictures and savegames
    emit loadingProgress(curFile, maximumV);
-    foreach(const QString &SavegameFile, SavegameFiles)
+    for (QString SavegameFile : SavegameFiles)
    {
        emit loadingProgress(curFile, maximumV);
        QString sgdPath = profileFolder % "/" % SavegameFile;
@ -71,7 +71,7 @@ void ProfileLoader::run()
        }
        curFile++;
    }
-    foreach(const QString &SnapmaticPic, SnapmaticPics)
+    for (QString SnapmaticPic : SnapmaticPics)
    {
        emit loadingProgress(curFile, maximumV);
        QString picturePath = profileFolder % "/" % SnapmaticPic;
@ -90,7 +90,7 @@ void ProfileLoader::run()

    // adding found crews
    crewDB->setAddingCrews(true);
-    foreach(int crewID, crewList)
+    for (int crewID : crewList)
    {
        crewDB->addCrew(crewID);
    }
--- a/SnapmaticEditor.cpp
+++ b/SnapmaticEditor.cpp
@ -309,7 +309,7 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
            crewList += QLatin1String("0");
        }
        crewList.sort();
-        foreach(const QString &crew, crewList)
+        for (QString crew : crewList)
        {
            itemList += QString("%1 (%2)").arg(crew, returnCrewName(crew.toInt()));
        }
@ -322,7 +322,7 @@ void SnapmaticEditor::on_labCrew_linkActivated(const QString &link)
        {
            if (newCrew.contains(" ")) newCrew = newCrew.split(" ").at(0);
            if (newCrew.length() > 10) return;
-            foreach (const QChar &crewChar, newCrew)
+            for (QChar crewChar : newCrew)
            {
                if (!crewChar.isNumber())
                {
--- a/SnapmaticPicture.cpp
+++ b/SnapmaticPicture.cpp
@ -1137,7 +1137,7 @@ bool SnapmaticPicture::verifyTitle(const QString &title)
    // VERIFY TITLE FOR BE A VALID SNAPMATIC TITLE
    if (title.length() <= titlStreamCharacterMax)
    {
-        foreach(const QChar &titleChar, title)
+        for (QChar titleChar : title)
        {
            if (!verifyTitleChar(titleChar)) return false;
        }
--- a/TranslationClass.cpp
+++ b/TranslationClass.cpp
@ -279,7 +279,7 @@ QStringList TranslationClass::listTranslations(const QString &langPath)
    langDir.setNameFilters(QStringList("gta5sync_*.qm"));
    langDir.setPath(langPath);
    QStringList availableLanguages;
-    foreach(const QString &lang, langDir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort))
+    for (QString &lang : langDir.entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort))
    {
        availableLanguages << QString(lang).remove("gta5sync_").remove(".qm");
    }
@ -292,7 +292,7 @@ bool TranslationClass::loadSystemTranslation_p(const QString &langPath, QTransla
    qDebug() << "loadSystemTranslation_p";
 #endif
    int currentLangCounter = 0;
-    foreach(const QString &languageName, QLocale::system().uiLanguages())
+    for (QString languageName : QLocale::system().uiLanguages())
    {
 #ifdef GTA5SYNC_DEBUG
        qDebug() << "loadLanguage" << languageName;
--- a/UserInterface.cpp
+++ b/UserInterface.cpp
@ -40,7 +40,6 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QFileInfo>
-#include <QProcess>
 #include <QDebug>
 #include <QFile>
 #include <QDir>
@ -158,7 +157,7 @@ void UserInterface::setupDirEnv()
 void UserInterface::setupProfileUi()
 {
    qreal screenRatio = AppEnv::screenRatio();
-    if (GTAV_Profiles.length() == 0)
+    if (GTAV_Profiles.isEmpty())
    {
        QPushButton *changeDirBtn = new QPushButton(tr("Select &GTA V Folder..."), ui->swSelection);
        changeDirBtn->setObjectName("cmdChangeDir");
@ -169,7 +168,7 @@ void UserInterface::setupProfileUi()

        QObject::connect(changeDirBtn, SIGNAL(clicked(bool)), this, SLOT(changeFolder_clicked()));
    }
-    else foreach(const QString &GTAV_Profile, GTAV_Profiles)
+    else for (QString GTAV_Profile : GTAV_Profiles)
    {
        QPushButton *profileBtn = new QPushButton(GTAV_Profile, ui->swSelection);
        profileBtn->setObjectName(GTAV_Profile);
@ -190,7 +189,7 @@ void UserInterface::changeFolder_clicked()

 void UserInterface::on_cmdReload_clicked()
 {
-    foreach(QPushButton *profileBtn, profileBtns)
+    foreach (QPushButton *profileBtn, profileBtns)
    {
        ui->vlButtons->removeWidget(profileBtn);
        profileBtns.removeAll(profileBtn);
--- a/config.h
+++ b/config.h
@ -50,7 +50,7 @@

 #ifndef GTA5SYNC_APPVER
 #ifndef GTA5SYNC_DAILYB
-#define GTA5SYNC_APPVER "1.5.0-dev1"
+#define GTA5SYNC_APPVER "1.5.0-dev2"
 #else
 #define GTA5SYNC_APPVER GTA5SYNC_DAILYB
 #endif
--- a/main.cpp
+++ b/main.cpp
@ -50,6 +50,7 @@ int main(int argc, char *argv[])
    QApplication a(argc, argv);
    a.setApplicationName(GTA5SYNC_APPSTR);
    a.setApplicationVersion(GTA5SYNC_APPVER);
+    a.setQuitOnLastWindowClosed(false);

 #ifdef GTA5SYNC_WIN
 #if QT_VERSION >= 0x050400
@ -87,7 +88,7 @@ int main(int argc, char *argv[])
    QString arg1;
    applicationArgs.removeAt(0);

-    foreach(QString currentArg, applicationArgs)
+    for (QString currentArg : applicationArgs)
    {
        QString reworkedArg;
        if (currentArg.left(9) == "-showpic=" && selectedAction == "")
@ -182,10 +183,9 @@ int main(int argc, char *argv[])
    ProfileDatabase profileDB;
    DatabaseThread threadDB(&crewDB);

-    QEventLoop threadLoop;
    QObject::connect(&threadDB, SIGNAL(crewNameFound(int,QString)), &crewDB, SLOT(setCrewName(int, QString)));
    QObject::connect(&threadDB, SIGNAL(playerNameFound(int, QString)), &profileDB, SLOT(setPlayerName(int, QString)));
-    QObject::connect(&threadDB, SIGNAL(finished()), &threadLoop, SLOT(quit()));
+    QObject::connect(&threadDB, SIGNAL(finished()), &a, SLOT(quit()));
    threadDB.start();

    UserInterface uiWindow(&profileDB, &crewDB, &threadDB);
@ -197,7 +197,7 @@ int main(int argc, char *argv[])
    uiWindow.show();
 #endif

-    threadLoop.exec();
+    a.exec();

    return 0;
 }
--- a/res/app.rc
+++ b/res/app.rc
@ -25,12 +25,12 @@ BEGIN
        BEGIN
            VALUE   "CompanyName",      "Syping"
            VALUE   "FileDescription",  "gta5view\0"
-            VALUE   "FileVersion",      "1.5.0-dev1\0"
+            VALUE   "FileVersion",      "1.5.0-dev2\0"
            VALUE   "InternalName",     "gta5view\0"
            VALUE   "LegalCopyright",   "Copyright © 2016-2017 Syping\0"
            VALUE   "OriginalFilename", "gta5view.exe\0"
            VALUE   "ProductName",      "gta5view\0"
-            VALUE   "ProductVersion",   "1.5.0-dev1\0"
+            VALUE   "ProductVersion",   "1.5.0-dev2\0"
        END
    END
 END
--- a/res/gta5sync_de.ts
+++ b/res/gta5sync_de.ts
@ -673,7 +673,7 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
        <translation type="vanished">%1 (%2 wenn verfügbar)</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>%1</source>
        <comment>%1</comment>
        <translation>%1</translation>
@ -687,19 +687,19 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
        <translation type="vanished">Der eigene Ordner initialisiert sobald du %1 neugestartet hast.</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>%1 (Next Closest Language)</source>
        <comment>First language a person can talk with a different person/application. &quot;Native&quot; or &quot;Not Native&quot;.</comment>
        <translation>%1 (Erste näheste Sprache)</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>System</source>
        <comment>System in context of System default</comment>
        <translation>System</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>The new Custom Folder will initialise after you restart %1.</source>
        <translation>Der eigene Ordner wird initialisiert sobald du %1 neugestartet hast.</translation>
    </message>
@ -708,15 +708,15 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
        <translation type="vanished">Die Änderung der Sprache nimmt Effekt sobald du %1 neugestartet hast.</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="284"/>
+        <location filename="../OptionsDialog.cpp" line="282"/>
        <source>No Profile</source>
        <comment>No Profile, as default</comment>
        <translation>Kein Profil</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="292"/>
+        <location filename="../OptionsDialog.cpp" line="290"/>
+        <location filename="../OptionsDialog.cpp" line="294"/>
        <location filename="../OptionsDialog.cpp" line="296"/>
-        <location filename="../OptionsDialog.cpp" line="298"/>
        <source>Profile: %1</source>
        <translation>Profil: %1</translation>
    </message>
@ -1214,13 +1214,13 @@ Drücke A für Standardansicht</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="429"/>
-        <location filename="../UserInterface.cpp" line="365"/>
+        <location filename="../UserInterface.cpp" line="364"/>
        <source>Savegames files (SGTA*)</source>
        <translation>Spielstanddateien (SGTA*)</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="430"/>
-        <location filename="../UserInterface.cpp" line="366"/>
+        <location filename="../UserInterface.cpp" line="365"/>
        <source>Snapmatic pictures (PGTA*)</source>
        <translation>Snapmatic Bilder (PGTA*)</translation>
    </message>
@ -1240,7 +1240,7 @@ Drücke A für Standardansicht</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="432"/>
-        <location filename="../UserInterface.cpp" line="367"/>
+        <location filename="../UserInterface.cpp" line="366"/>
        <source>All files (**)</source>
        <translation>Alle Dateien (**)</translation>
    </message>
@ -1261,13 +1261,13 @@ Drücke A für Standardansicht</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="527"/>
-        <location filename="../UserInterface.cpp" line="407"/>
+        <location filename="../UserInterface.cpp" line="406"/>
        <source>Failed to read Snapmatic picture</source>
        <translation>Fehler beim Lesen vom Snapmatic Bild</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="543"/>
-        <location filename="../UserInterface.cpp" line="423"/>
+        <location filename="../UserInterface.cpp" line="422"/>
        <source>Failed to read Savegame file</source>
        <translation>Fehler beim Lesen von Spielstanddatei</translation>
    </message>
@ -1308,7 +1308,7 @@ Drücke A für Standardansicht</translation>
    <message>
        <location filename="../ProfileInterface.cpp" line="455"/>
        <location filename="../ProfileInterface.cpp" line="745"/>
-        <location filename="../UserInterface.cpp" line="455"/>
+        <location filename="../UserInterface.cpp" line="454"/>
        <source>No valid file is selected</source>
        <translation>Keine gültige Datei wurde ausgewählt</translation>
    </message>
@ -1475,13 +1475,13 @@ Exportieren als:</translation>
        <translation>Exportiere Datei %1 von %2 Dateien</translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="363"/>
+        <location filename="../UserInterface.cpp" line="362"/>
        <source>All profile files (*.g5e SGTA* PGTA*)</source>
        <translation>Alle Profildateien (*.g5e SGTA* PGTA*)</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="428"/>
-        <location filename="../UserInterface.cpp" line="364"/>
+        <location filename="../UserInterface.cpp" line="363"/>
        <source>GTA V Export (*.g5e)</source>
        <translation>GTA V Export (*.g5e)</translation>
    </message>
@ -1489,12 +1489,12 @@ Exportieren als:</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../main.cpp" line="66"/>
+        <location filename="../main.cpp" line="67"/>
        <source>Font</source>
        <translation>Schrift</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="66"/>
+        <location filename="../main.cpp" line="67"/>
        <source>Selected Font: %1</source>
        <translation>Ausgewähle Schrift: %1</translation>
    </message>
@ -2305,7 +2305,7 @@ Exportieren als:</translation>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="309"/>
-        <location filename="../UserInterface.cpp" line="163"/>
+        <location filename="../UserInterface.cpp" line="162"/>
        <source>Select &amp;GTA V Folder...</source>
        <translation>Wähle &amp;GTA V Ordner...</translation>
    </message>
@ -2408,17 +2408,17 @@ Exportieren als:</translation>
        <translation type="obsolete">GTA V Ordner nicht gefunden!</translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="64"/>
-        <location filename="../UserInterface.cpp" line="234"/>
-        <location filename="../UserInterface.cpp" line="549"/>
+        <location filename="../UserInterface.cpp" line="63"/>
+        <location filename="../UserInterface.cpp" line="233"/>
+        <location filename="../UserInterface.cpp" line="548"/>
        <source>Select Profile</source>
        <translation>Profil auswählen</translation>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="312"/>
-        <location filename="../OptionsDialog.cpp" line="430"/>
-        <location filename="../UserInterface.cpp" line="104"/>
-        <location filename="../UserInterface.cpp" line="512"/>
+        <location filename="../OptionsDialog.cpp" line="428"/>
+        <location filename="../UserInterface.cpp" line="103"/>
+        <location filename="../UserInterface.cpp" line="511"/>
        <source>Select GTA V Folder...</source>
        <translation>Wähle GTA V Ordner...</translation>
    </message>
@ -2427,7 +2427,7 @@ Exportieren als:</translation>
        <translation type="vanished">Wähle GTA V &amp;Ordner...</translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="360"/>
+        <location filename="../UserInterface.cpp" line="359"/>
        <source>Open File...</source>
        <translation>Datei öffnen...</translation>
    </message>
@ -2437,27 +2437,27 @@ Exportieren als:</translation>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="20"/>
-        <location filename="../UserInterface.cpp" line="62"/>
+        <location filename="../UserInterface.cpp" line="61"/>
        <source>%2 - %1</source>
        <translation>%2 - %1</translation>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="226"/>
-        <location filename="../UserInterface.cpp" line="60"/>
-        <location filename="../UserInterface.cpp" line="541"/>
+        <location filename="../UserInterface.cpp" line="59"/>
+        <location filename="../UserInterface.cpp" line="540"/>
        <source>&amp;About %1</source>
        <translation>&amp;Über %1</translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="407"/>
-        <location filename="../UserInterface.cpp" line="423"/>
-        <location filename="../UserInterface.cpp" line="450"/>
-        <location filename="../UserInterface.cpp" line="455"/>
+        <location filename="../UserInterface.cpp" line="406"/>
+        <location filename="../UserInterface.cpp" line="422"/>
+        <location filename="../UserInterface.cpp" line="449"/>
+        <location filename="../UserInterface.cpp" line="454"/>
        <source>Open File</source>
        <translation>Datei öffnen</translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="450"/>
+        <location filename="../UserInterface.cpp" line="449"/>
        <source>Can&apos;t open %1 because of not valid file format</source>
        <translation>Kann nicht %1 öffnen weil Dateiformat nicht gültig ist</translation>
    </message>
--- a/res/gta5sync_en_US.ts
+++ b/res/gta5sync_en_US.ts
@ -432,38 +432,38 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>%1 (Next Closest Language)</source>
        <comment>First language a person can talk with a different person/application. &quot;Native&quot; or &quot;Not Native&quot;.</comment>
        <translation></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>System</source>
        <comment>System in context of System default</comment>
        <translation></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>%1</source>
        <comment>%1</comment>
        <translation></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>The new Custom Folder will initialise after you restart %1.</source>
        <translation>The new Custom Folder will initialize after you restart %1.</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="284"/>
+        <location filename="../OptionsDialog.cpp" line="282"/>
        <source>No Profile</source>
        <comment>No Profile, as default</comment>
        <translation></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="292"/>
+        <location filename="../OptionsDialog.cpp" line="290"/>
+        <location filename="../OptionsDialog.cpp" line="294"/>
        <location filename="../OptionsDialog.cpp" line="296"/>
-        <location filename="../OptionsDialog.cpp" line="298"/>
        <source>Profile: %1</source>
        <translation></translation>
    </message>
@ -756,19 +756,19 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="428"/>
-        <location filename="../UserInterface.cpp" line="364"/>
+        <location filename="../UserInterface.cpp" line="363"/>
        <source>GTA V Export (*.g5e)</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="429"/>
-        <location filename="../UserInterface.cpp" line="365"/>
+        <location filename="../UserInterface.cpp" line="364"/>
        <source>Savegames files (SGTA*)</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="430"/>
-        <location filename="../UserInterface.cpp" line="366"/>
+        <location filename="../UserInterface.cpp" line="365"/>
        <source>Snapmatic pictures (PGTA*)</source>
        <translation></translation>
    </message>
@ -779,14 +779,14 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="432"/>
-        <location filename="../UserInterface.cpp" line="367"/>
+        <location filename="../UserInterface.cpp" line="366"/>
        <source>All files (**)</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="455"/>
        <location filename="../ProfileInterface.cpp" line="745"/>
-        <location filename="../UserInterface.cpp" line="455"/>
+        <location filename="../UserInterface.cpp" line="454"/>
        <source>No valid file is selected</source>
        <translation></translation>
    </message>
@ -805,13 +805,13 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="527"/>
-        <location filename="../UserInterface.cpp" line="407"/>
+        <location filename="../UserInterface.cpp" line="406"/>
        <source>Failed to read Snapmatic picture</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="543"/>
-        <location filename="../UserInterface.cpp" line="423"/>
+        <location filename="../UserInterface.cpp" line="422"/>
        <source>Failed to read Savegame file</source>
        <translation></translation>
    </message>
@ -922,7 +922,7 @@ Press 1 for Default View</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="363"/>
+        <location filename="../UserInterface.cpp" line="362"/>
        <source>All profile files (*.g5e SGTA* PGTA*)</source>
        <translation></translation>
    </message>
@ -930,12 +930,12 @@ Press 1 for Default View</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../main.cpp" line="66"/>
+        <location filename="../main.cpp" line="67"/>
        <source>Font</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="66"/>
+        <location filename="../main.cpp" line="67"/>
        <source>Selected Font: %1</source>
        <translation></translation>
    </message>
@ -1396,7 +1396,7 @@ Press 1 for Default View</source>
    <name>UserInterface</name>
    <message>
        <location filename="../UserInterface.ui" line="20"/>
-        <location filename="../UserInterface.cpp" line="62"/>
+        <location filename="../UserInterface.cpp" line="61"/>
        <source>%2 - %1</source>
        <translation></translation>
    </message>
@ -1458,8 +1458,8 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="226"/>
-        <location filename="../UserInterface.cpp" line="60"/>
-        <location filename="../UserInterface.cpp" line="541"/>
+        <location filename="../UserInterface.cpp" line="59"/>
+        <location filename="../UserInterface.cpp" line="540"/>
        <source>&amp;About %1</source>
        <translation></translation>
    </message>
@ -1565,15 +1565,15 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="309"/>
-        <location filename="../UserInterface.cpp" line="163"/>
+        <location filename="../UserInterface.cpp" line="162"/>
        <source>Select &amp;GTA V Folder...</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../UserInterface.ui" line="312"/>
-        <location filename="../OptionsDialog.cpp" line="430"/>
-        <location filename="../UserInterface.cpp" line="104"/>
-        <location filename="../UserInterface.cpp" line="512"/>
+        <location filename="../OptionsDialog.cpp" line="428"/>
+        <location filename="../UserInterface.cpp" line="103"/>
+        <location filename="../UserInterface.cpp" line="511"/>
        <source>Select GTA V Folder...</source>
        <translation></translation>
    </message>
@ -1603,27 +1603,27 @@ Press 1 for Default View</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="64"/>
-        <location filename="../UserInterface.cpp" line="234"/>
-        <location filename="../UserInterface.cpp" line="549"/>
+        <location filename="../UserInterface.cpp" line="63"/>
+        <location filename="../UserInterface.cpp" line="233"/>
+        <location filename="../UserInterface.cpp" line="548"/>
        <source>Select Profile</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="360"/>
+        <location filename="../UserInterface.cpp" line="359"/>
        <source>Open File...</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="407"/>
-        <location filename="../UserInterface.cpp" line="423"/>
-        <location filename="../UserInterface.cpp" line="450"/>
-        <location filename="../UserInterface.cpp" line="455"/>
+        <location filename="../UserInterface.cpp" line="406"/>
+        <location filename="../UserInterface.cpp" line="422"/>
+        <location filename="../UserInterface.cpp" line="449"/>
+        <location filename="../UserInterface.cpp" line="454"/>
        <source>Open File</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../UserInterface.cpp" line="450"/>
+        <location filename="../UserInterface.cpp" line="449"/>
        <source>Can&apos;t open %1 because of not valid file format</source>
        <translation></translation>
    </message>
--- a/res/gta5sync_fr.ts
+++ b/res/gta5sync_fr.ts
@ -567,25 +567,25 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation type="vanished">Système</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>%1 (Next Closest Language)</source>
        <comment>First language a person can talk with a different person/application. &quot;Native&quot; or &quot;Not Native&quot;.</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="132"/>
+        <location filename="../OptionsDialog.cpp" line="130"/>
        <source>System</source>
        <comment>System in context of System default</comment>
        <translation>Système</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>%1</source>
        <comment>%1</comment>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="274"/>
+        <location filename="../OptionsDialog.cpp" line="272"/>
        <source>The new Custom Folder will initialise after you restart %1.</source>
        <translation type="unfinished"></translation>
    </message>
@ -598,15 +598,15 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation type="vanished">Le changement de langue sera actif au prochain lancement de %1.</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="284"/>
+        <location filename="../OptionsDialog.cpp" line="282"/>
        <source>No Profile</source>
        <comment>No Profile, as default</comment>
        <translation>Aucun profil</translation>
    </message>
    <message>
-        <location filename="../OptionsDialog.cpp" line="292"/>
+        <location filename="../OptionsDialog.cpp" line="290"/>
+        <location filename="../OptionsDialog.cpp" line="294"/>
        <location filename="../OptionsDialog.cpp" line="296"/>
-        <location filename="../OptionsDialog.cpp" line="298"/>
        <source>Profile: %1</source>
        <translation>Profil : %1</translation>
    </message>
@ -976,13 +976,13 @@ Appuyer sur 1 pour le mode par défaut</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="429"/>
-        <location filename="../UserInterface.cpp" line="365"/>
+        <location filename="../UserInterface.cpp" line="364"/>
        <source>Savegames files (SGTA*)</source>
        <translation>Fichiers de sauvegarde GTA (SGTA*)</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="430"/>
-        <location filename="../UserInterface.cpp" line="366"/>
+        <location filename="../UserInterface.cpp" line="365"/>
        <source>Snapmatic pictures (PGTA*)</source>
        <translation>Photos Snapmatic (PGTA*)</translation>
    </message>
@ -993,7 +993,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="432"/>
-        <location filename="../UserInterface.cpp" line="367"/>
+        <location filename="../UserInterface.cpp" line="366"/>
        <source>All files (**)</source>
        <translation>Tous les fichiers (**)</translation>
    </message>
@ -1015,7 +1015,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
    <message>
        <location filename="../ProfileInterface.cpp" line="455"/>
        <location filename="../ProfileInterface.cpp" line="745"/>
-        <location filename="../UserInterface.cpp" line="455"/>
+        <location filename="../UserInterface.cpp" line="454"/>
        <source>No valid file is selected</source>
        <translation>Fichier invalide</translation>
    </message>
@ -1026,13 +1026,13 @@ Appuyer sur 1 pour le mode par défaut</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="527"/>
-        <location filename="../UserInterface.cpp" line="407"/>
+        <location filename="../UserInterface.cpp" line="406"/>
        <source>Failed to read Snapmatic picture</source>
        <translation>Impossible d&apos;ouvrir la photo Snapmatic</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="543"/>
-        <location filename="../UserInterface.cpp" line="423"/>
+        <location filename="../UserInterface.cpp" line="422"/>
        <source>Failed to read Savegame file</source>