diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp index 3bc9bf4d2..3200d39fc 100644 --- a/apps/opencs/model/world/infoselectwrapper.cpp +++ b/apps/opencs/model/world/infoselectwrapper.cpp @@ -520,7 +520,6 @@ std::pair CSMWorld::ConstInfoSelectWrapper::getConditionFloatRange const float FloatMax = std::numeric_limits::infinity(); const float FloatMin = -std::numeric_limits::infinity(); const float Epsilon = std::numeric_limits::epsilon(); - const std::pair InvalidRange(FloatMax, FloatMin); float value = mConstSelect.mValue.getFloat(); diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp index 3ec98a935..4c05f5500 100644 --- a/apps/wizard/existinginstallationpage.cpp +++ b/apps/wizard/existinginstallationpage.cpp @@ -31,11 +31,13 @@ void Wizard::ExistingInstallationPage::initializePage() // Hide the default item if there are installations to choose from installationsList->item(0)->setHidden(!paths.isEmpty()); - foreach (const QString &path, paths) { - QListWidgetItem *item = new QListWidgetItem(path); - + foreach (const QString &path, paths) + { if (installationsList->findItems(path, Qt::MatchExactly).isEmpty()) + { + QListWidgetItem *item = new QListWidgetItem(path); installationsList->addItem(item); + } } connect(installationsList, SIGNAL(currentTextChanged(QString)), diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp index 41407ec88..39e91d5a3 100644 --- a/components/contentselector/model/contentmodel.cpp +++ b/components/contentselector/model/contentmodel.cpp @@ -168,7 +168,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int case Qt::DisplayRole: { if (column >=0 && column <=EsmFile::FileProperty_GameFile) - return file->fileProperty(static_cast(column)); + return file->fileProperty(static_cast(column)); return QVariant(); } diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp index 845d0c484..4781ef3fc 100644 --- a/components/myguiplatform/myguirendermanager.cpp +++ b/components/myguiplatform/myguirendermanager.cpp @@ -134,9 +134,9 @@ public: { state->bindVertexBufferObject(bufferobject); - glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)nullptr); - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), (char*)nullptr + 12); - glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)nullptr + 16); + glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), static_cast(0)); + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), static_cast(0) + 12); + glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), static_cast(0) + 16); } else {