Merge pull request #734 from isanae/permissive-flag

Permissive flag

8 files changed, 13 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40fe2630..57cd2f77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -333,7 +333,7 @@ TARGET_LINK_LIBRARIES(ModOrganizer
                       Dbghelp advapi32 Version Shlwapi liblz4 Crypt32)
 
 IF (MSVC)
-  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest")
+  SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest /permissive-")
 ENDIF()
 IF (MSVC AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
   # 32 bits
diff --git a/src/forcedloaddialogwidget.cpp b/src/forcedloaddialogwidget.cpp
index 10069c35..b92838c3 100644
--- a/src/forcedloaddialogwidget.cpp
+++ b/src/forcedloaddialogwidget.cpp
@@ -54,12 +54,12 @@ void ForcedLoadDialogWidget::setForced(bool forced)
   ui->processEdit->setEnabled(!forced);
 }
 
-void ForcedLoadDialogWidget::setLibraryPath(QString &path)
+void ForcedLoadDialogWidget::setLibraryPath(const QString &path)
 {
   ui->libraryPathEdit->setText(path);
 }
 
-void ForcedLoadDialogWidget::setProcess(QString &name)
+void ForcedLoadDialogWidget::setProcess(const QString &name)
 {
   ui->processEdit->setText(name);
 }
@@ -71,7 +71,7 @@ void ForcedLoadDialogWidget::on_enabledBox_toggled()
 
 void ForcedLoadDialogWidget::on_libraryPathBrowseButton_clicked()
 {
-  QDir gameDir(m_GamePlugin->gameDirectory()); 
+  QDir gameDir(m_GamePlugin->gameDirectory());
   QString startPath = gameDir.absolutePath();
   QString result = QFileDialog::getOpenFileName(nullptr, "Select a library...", startPath, "Dynamic link library (*.dll)", nullptr, QFileDialog::ReadOnly);
   if (!result.isEmpty()) {
@@ -100,7 +100,7 @@ void ForcedLoadDialogWidget::on_processBrowseButton_clicked()
     QString fileName = fileInfo.fileName();
 
     if (fileInfo.exists()) {
-      ui->processEdit->setText(fileName);  
+      ui->processEdit->setText(fileName);
     } else {
       qCritical("%ls does not exist", fileInfo.filePath().toStdWString().c_str());
     }
diff --git a/src/forcedloaddialogwidget.h b/src/forcedloaddialogwidget.h
index eb7c3f4d..239653c8 100644
--- a/src/forcedloaddialogwidget.h
+++ b/src/forcedloaddialogwidget.h
@@ -23,8 +23,8 @@ public:
 
     void setEnabled(bool enabled);
     void setForced(bool forced);
-    void setLibraryPath(QString &path);
-    void setProcess(QString &name);
+    void setLibraryPath(const QString &path);
+    void setProcess(const QString &name);
 
 private slots:
     void on_enabledBox_toggled();
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 1c65f635..5b57827a 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -227,7 +227,7 @@ QString InstanceManager::chooseInstance(const QStringList &instanceList) const
   if (choice.type() == QVariant::String) {
     return choice.toString();
   } else {
-    switch (choice.value<uint8_t>()) {
+    switch (static_cast<Special>(choice.value<uint8_t>())) {
       case Special::NewInstance: return queryInstanceName(instanceList);
       case Special::Portable: return QString();
       case Special::Manage: {
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 19b53b8d..bd64e1bc 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -112,7 +112,7 @@ static bool renameFile(const QString &oldName, const QString &newName,
 static std::wstring getProcessName(HANDLE process)
 {
   wchar_t buffer[MAX_PATH];
-  wchar_t *fileName = L"unknown";
+  const wchar_t *fileName = L"unknown";
 
   if (process == nullptr) return fileName;
 
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 74091469..7f53a9bb 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -88,7 +88,7 @@ QString SettingsDialog::getColoredButtonStyleSheet() const
     "}");
 }
 
-void SettingsDialog::setButtonColor(QPushButton *button, QColor &color)
+void SettingsDialog::setButtonColor(QPushButton *button, const QColor &color)
 {
   button->setStyleSheet(
     QString("QPushButton {"
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 92a97c3f..afe988bd 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -53,7 +53,7 @@ public:
   */
   QString getColoredButtonStyleSheet() const;
 
-  void setButtonColor(QPushButton *button, QColor &color);
+  void setButtonColor(QPushButton *button, const QColor &color);
 
 public slots:
 
diff --git a/src/usvfsconnector.cpp b/src/usvfsconnector.cpp
index 5ad19fb0..b752667d 100644
--- a/src/usvfsconnector.cpp
+++ b/src/usvfsconnector.cpp
@@ -92,7 +92,7 @@ void LogWorker::exit()
 
 LogLevel logLevel(int level)
 {
-  switch (level) {
+  switch (static_cast<LogLevel>(level)) {
     case LogLevel::Info:
       return LogLevel::Info;
     case LogLevel::Warning:
@@ -106,7 +106,7 @@ LogLevel logLevel(int level)
 
 CrashDumpsType crashDumpsType(int type)
 {
-  switch (type) {
+  switch (static_cast<CrashDumpsType>(type)) {
   case CrashDumpsType::Mini:
     return CrashDumpsType::Mini;
   case CrashDumpsType::Data: