mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 22:39:42 +00:00
Code Issues Releases Wiki Activity

Fix warning C4456 (declaration hides previous local declaration)

Browse source
This commit is contained in:
cc9cii 2015-11-22 19:15:06 +11:00
parent cc984497d7
commit d70064efe4
11 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/opencs/model/doc/loader.cpp
View file

@ -64,11 +64,11 @@ void CSMDoc::Loader::load()
CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0); CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0);
{ // silence a g++ warning { // silence a g++ warning
for (CSMDoc::Messages::Iterator iter (messages.begin()); for (CSMDoc::Messages::Iterator iter2 (messages.begin());
iter!=messages.end(); ++iter) iter2!=messages.end(); ++iter2)
{ {
document->getReport (log)->add (*iter); document->getReport (log)->add (*iter2);
emit loadMessage (document, iter->mMessage); emit loadMessage (document, iter2->mMessage);
} }
} }

8
apps/opencs/model/doc/savingstages.cpp
View file

@ -119,11 +119,11 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message
for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter) for (CSMWorld::InfoCollection::RecordConstIterator iter (range.first); iter!=range.second; ++iter)
{ {
CSMWorld::RecordBase::State state = iter->mState; CSMWorld::RecordBase::State recState = iter->mState;
if (state==CSMWorld::RecordBase::State_Modified || if (recState==CSMWorld::RecordBase::State_Modified ||
state==CSMWorld::RecordBase::State_ModifiedOnly || recState==CSMWorld::RecordBase::State_ModifiedOnly ||
state==CSMWorld::RecordBase::State_Deleted) recState==CSMWorld::RecordBase::State_Deleted)
{ {
infoModified = true; infoModified = true;
break; break;

6
apps/opencs/model/filter/parser.cpp
View file

@ -313,15 +313,15 @@ boost::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& ke
nodes.push_back (node); nodes.push_back (node);
Token token = getNextToken(); Token token2 = getNextToken();
if (!token || (token.mType!=Token::Type_Close && token.mType!=Token::Type_Comma)) if (!token2 || (token2.mType!=Token::Type_Close && token2.mType!=Token::Type_Comma))
{ {
error(); error();
return boost::shared_ptr<Node>(); return boost::shared_ptr<Node>();
} }
if (token.mType==Token::Type_Close) if (token2.mType==Token::Type_Close)
break; break;
} }

6
apps/opencs/model/tools/mergestages.cpp
View file

@ -183,11 +183,11 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes
CSMWorld::LandTexture texture = CSMWorld::LandTexture texture =
mState.mSource.getData().getLandTextures().getRecord (index).get(); mState.mSource.getData().getLandTextures().getRecord (index).get();
std::ostringstream stream; std::ostringstream stream2;
stream << mNext->second-1 << "_0"; stream2 << mNext->second-1 << "_0";
texture.mIndex = mNext->second-1; texture.mIndex = mNext->second-1;
texture.mId = stream.str(); texture.mId = stream2.str();
CSMWorld::Record<CSMWorld::LandTexture> newRecord ( CSMWorld::Record<CSMWorld::LandTexture> newRecord (
CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture); CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture);

4
apps/opencs/model/world/idtable.cpp
View file

@ -172,9 +172,9 @@ void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& reco
if (index==-1) if (index==-1)
{ {
int index = mIdCollection->getAppendIndex (id, type); int index2 = mIdCollection->getAppendIndex (id, type);
beginInsertRows (QModelIndex(), index, index); beginInsertRows (QModelIndex(), index2, index2);
mIdCollection->appendRecord (record, type); mIdCollection->appendRecord (record, type);

18
apps/opencs/model/world/infocollection.cpp
View file

@ -19,31 +19,31 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base)
record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly; record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
(base ? record2.mBase : record2.mModified) = record; (base ? record2.mBase : record2.mModified) = record;
int index = -1; int index2 = -1;
std::string topic = Misc::StringUtils::lowerCase (record2.get().mTopicId); std::string topic = Misc::StringUtils::lowerCase (record2.get().mTopicId);
if (!record2.get().mPrev.empty()) if (!record2.get().mPrev.empty())
{ {
index = getInfoIndex (record2.get().mPrev, topic); index2 = getInfoIndex (record2.get().mPrev, topic);
if (index!=-1) if (index2!=-1)
++index; ++index2;
} }
if (index==-1 && !record2.get().mNext.empty()) if (index2==-1 && !record2.get().mNext.empty())
{ {
index = getInfoIndex (record2.get().mNext, topic); index2 = getInfoIndex (record2.get().mNext, topic);
} }
if (index==-1) if (index2==-1)
{ {
Range range = getTopicRange (topic); Range range = getTopicRange (topic);
index = std::distance (getRecords().begin(), range.second); index2 = std::distance (getRecords().begin(), range.second);
} }
insertRecord (record2, index); insertRecord (record2, index2);
} }
else else
{ {

6
apps/opencs/model/world/refcollection.cpp
View file

@ -74,9 +74,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
std::cerr << "Position: #" << index.first << " " << index.second std::cerr << "Position: #" << index.first << " " << index.second
<<", Target #"<< mref.mTarget[0] << " " << mref.mTarget[1] << std::endl; <<", Target #"<< mref.mTarget[0] << " " << mref.mTarget[1] << std::endl;
std::ostringstream stream; std::ostringstream stream2;
stream << "#" << mref.mTarget[0] << " " << mref.mTarget[1]; stream2 << "#" << mref.mTarget[0] << " " << mref.mTarget[1];
ref.mCell = stream.str(); // overwrite ref.mCell = stream2.str(); // overwrite
} }
} }
} }

4
apps/opencs/model/world/refidcollection.cpp
View file

@ -878,10 +878,10 @@ void CSMWorld::RefIdCollection::load (ESM::ESMReader& reader, bool base, Univers
if (index==-1) if (index==-1)
{ {
// new record // new record
int index = mData.getAppendIndex (type); int newIndex = mData.getAppendIndex (type);
mData.appendRecord (type, id, base); mData.appendRecord (type, id, base);
RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (index); RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (newIndex);
mData.load (localIndex, reader, base); mData.load (localIndex, reader, base);

16
apps/opencs/model/world/resources.cpp
View file

@ -26,22 +26,22 @@ CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::T
Ogre::StringVectorPtr resources = Ogre::StringVectorPtr resources =
Ogre::ResourceGroupManager::getSingleton().listResourceNames (*iter); Ogre::ResourceGroupManager::getSingleton().listResourceNames (*iter);
for (Ogre::StringVector::const_iterator iter (resources->begin()); for (Ogre::StringVector::const_iterator iter2 (resources->begin());
iter!=resources->end(); ++iter) iter2!=resources->end(); ++iter2)
{ {
if (static_cast<int> (iter->size())<baseSize+1 || if (static_cast<int> (iter2->size())<baseSize+1 ||
iter->substr (0, baseSize)!=mBaseDirectory || iter2->substr (0, baseSize)!=mBaseDirectory ||
((*iter)[baseSize]!='/' && (*iter)[baseSize]!='\\')) ((*iter2)[baseSize]!='/' && (*iter2)[baseSize]!='\\'))
continue; continue;
if (extensions) if (extensions)
{ {
std::string::size_type index = iter->find_last_of ('.'); std::string::size_type index = iter2->find_last_of ('.');
if (index==std::string::npos) if (index==std::string::npos)
continue; continue;
std::string extension = iter->substr (index+1); std::string extension = iter2->substr (index+1);
int i = 0; int i = 0;
@ -53,7 +53,7 @@ CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::T
continue; continue;
} }
std::string file = iter->substr (baseSize+1); std::string file = iter2->substr (baseSize+1);
mFiles.push_back (file); mFiles.push_back (file);
std::replace (file.begin(), file.end(), '\\', '/'); std::replace (file.begin(), file.end(), '\\', '/');
mIndex.insert (std::make_pair ( mIndex.insert (std::make_pair (

2
apps/opencs/view/render/textoverlay.cpp
View file

@ -105,7 +105,7 @@ TextOverlay::TextOverlay(const Ogre::MovableObject* obj, const Ogre::Camera* cam
"TransOverlayMaterial"); "TransOverlayMaterial");
if(mQuadMaterial.isNull()) if(mQuadMaterial.isNull())
{ {
Ogre::MaterialPtr mQuadMaterial = Ogre::MaterialManager::getSingleton().create( mQuadMaterial = Ogre::MaterialManager::getSingleton().create(
"TransOverlayMaterial", "TransOverlayMaterial",
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true ); Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true );
Ogre::Pass *pass = mQuadMaterial->getTechnique( 0 )->getPass( 0 ); Ogre::Pass *pass = mQuadMaterial->getTechnique( 0 )->getPass( 0 );

8
apps/opencs/view/world/dialoguesubview.cpp
View file

@ -667,14 +667,14 @@ void CSVWorld::EditWidget::remake(int row)
int displayRole = tree->nestedHeaderData (i, col, int displayRole = tree->nestedHeaderData (i, col,
Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt(); Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt();
CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display display2 =
static_cast<CSMWorld::ColumnBase::Display> (displayRole); static_cast<CSMWorld::ColumnBase::Display> (displayRole);
mNestedTableDispatcher->makeDelegate (display); mNestedTableDispatcher->makeDelegate (display2);
// FIXME: assumed all columns are editable // FIXME: assumed all columns are editable
QWidget* editor = QWidget* editor =
mNestedTableDispatcher->makeEditor (display, tree->index (0, col, tree->index(row, i))); mNestedTableDispatcher->makeEditor (display2, tree->index (0, col, tree->index(row, i)));
if (editor) if (editor)
{ {
mNestedTableMapper->addMapping (editor, col); mNestedTableMapper->addMapping (editor, col);
@ -699,7 +699,7 @@ void CSVWorld::EditWidget::remake(int row)
label->setEnabled(false); label->setEnabled(false);
} }
createEditorContextMenu(editor, display, row); createEditorContextMenu(editor, display2, row);
} }
} }
mNestedTableMapper->setCurrentModelIndex(tree->index(0, 0, tree->index(row, i))); mNestedTableMapper->setCurrentModelIndex(tree->index(0, 0, tree->index(row, i)));