mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-04 11:15:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2030 from akortunov/warnfix

Browse source 
Fix some compiler warnings
This commit is contained in:
Bret Curtis 2018-11-08 12:19:04 +01:00 committed by GitHub
commit 3751bc2c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/world/infoselectwrapper.cpp
View file

@ -520,7 +520,6 @@ std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getConditionFloatRange
const float FloatMax = std::numeric_limits<float>::infinity(); const float FloatMax = std::numeric_limits<float>::infinity();
const float FloatMin = -std::numeric_limits<float>::infinity(); const float FloatMin = -std::numeric_limits<float>::infinity();
const float Epsilon = std::numeric_limits<float>::epsilon(); const float Epsilon = std::numeric_limits<float>::epsilon();
const std::pair<float, float> InvalidRange(FloatMax, FloatMin);
float value = mConstSelect.mValue.getFloat(); float value = mConstSelect.mValue.getFloat();

8
apps/wizard/existinginstallationpage.cpp
View file

@ -31,12 +31,14 @@ void Wizard::ExistingInstallationPage::initializePage()
// Hide the default item if there are installations to choose from // Hide the default item if there are installations to choose from
installationsList->item(0)->setHidden(!paths.isEmpty()); installationsList->item(0)->setHidden(!paths.isEmpty());
foreach (const QString &path, paths) { foreach (const QString &path, paths)
QListWidgetItem *item = new QListWidgetItem(path); {
if (installationsList->findItems(path, Qt::MatchExactly).isEmpty()) if (installationsList->findItems(path, Qt::MatchExactly).isEmpty())
{
QListWidgetItem *item = new QListWidgetItem(path);
installationsList->addItem(item); installationsList->addItem(item);
} }
}
connect(installationsList, SIGNAL(currentTextChanged(QString)), connect(installationsList, SIGNAL(currentTextChanged(QString)),
this, SLOT(textChanged(QString))); this, SLOT(textChanged(QString)));

2
components/contentselector/model/contentmodel.cpp
View file

@ -168,7 +168,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex &index, int
case Qt::DisplayRole: case Qt::DisplayRole:
{ {
if (column >=0 && column <=EsmFile::FileProperty_GameFile) if (column >=0 && column <=EsmFile::FileProperty_GameFile)
return file->fileProperty(static_cast<const EsmFile::FileProperty>(column)); return file->fileProperty(static_cast<EsmFile::FileProperty>(column));
return QVariant(); return QVariant();
} }

6
components/myguiplatform/myguirendermanager.cpp
View file

@ -134,9 +134,9 @@ public:
{ {
state->bindVertexBufferObject(bufferobject); state->bindVertexBufferObject(bufferobject);
glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)nullptr); glVertexPointer(3, GL_FLOAT, sizeof(MyGUI::Vertex), static_cast<char*>(0));
glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), (char*)nullptr + 12); glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(MyGUI::Vertex), static_cast<char*>(0) + 12);
glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), (char*)nullptr + 16); glTexCoordPointer(2, GL_FLOAT, sizeof(MyGUI::Vertex), static_cast<char*>(0) + 16);
} }
else else
{ {