From d70064efe427fbd94e1b22d52b31b47b0a31677e Mon Sep 17 00:00:00 2001 From: cc9cii Date: Sun, 22 Nov 2015 19:15:06 +1100 Subject: [PATCH] Fix warning C4456 (declaration hides previous local declaration) --- apps/opencs/model/doc/loader.cpp | 8 ++++---- apps/opencs/model/doc/savingstages.cpp | 8 ++++---- apps/opencs/model/filter/parser.cpp | 6 +++--- apps/opencs/model/tools/mergestages.cpp | 6 +++--- apps/opencs/model/world/idtable.cpp | 4 ++-- apps/opencs/model/world/infocollection.cpp | 18 +++++++++--------- apps/opencs/model/world/refcollection.cpp | 6 +++--- apps/opencs/model/world/refidcollection.cpp | 4 ++-- apps/opencs/model/world/resources.cpp | 16 ++++++++-------- apps/opencs/view/render/textoverlay.cpp | 2 +- apps/opencs/view/world/dialoguesubview.cpp | 8 ++++---- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp index cb3ff2cd0f..b522f89f2b 100644 --- a/apps/opencs/model/doc/loader.cpp +++ b/apps/opencs/model/doc/loader.cpp @@ -64,11 +64,11 @@ void CSMDoc::Loader::load() CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0); { // silence a g++ warning - for (CSMDoc::Messages::Iterator iter (messages.begin()); - iter!=messages.end(); ++iter) + for (CSMDoc::Messages::Iterator iter2 (messages.begin()); + iter2!=messages.end(); ++iter2) { - document->getReport (log)->add (*iter); - emit loadMessage (document, iter->mMessage); + document->getReport (log)->add (*iter2); + emit loadMessage (document, iter2->mMessage); } } diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp index 3fba2cd85c..10faf30326 100644 --- a/apps/opencs/model/doc/savingstages.cpp +++ b/apps/opencs/model/doc/savingstages.cpp @@ -119,11 +119,11 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message 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 || - state==CSMWorld::RecordBase::State_ModifiedOnly || - state==CSMWorld::RecordBase::State_Deleted) + if (recState==CSMWorld::RecordBase::State_Modified || + recState==CSMWorld::RecordBase::State_ModifiedOnly || + recState==CSMWorld::RecordBase::State_Deleted) { infoModified = true; break; diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp index 7936a1ae2b..52de60280a 100644 --- a/apps/opencs/model/filter/parser.cpp +++ b/apps/opencs/model/filter/parser.cpp @@ -313,15 +313,15 @@ boost::shared_ptr CSMFilter::Parser::parseNAry (const Token& ke 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(); return boost::shared_ptr(); } - if (token.mType==Token::Type_Close) + if (token2.mType==Token::Type_Close) break; } diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp index 52e1e69649..d936be593e 100644 --- a/apps/opencs/model/tools/mergestages.cpp +++ b/apps/opencs/model/tools/mergestages.cpp @@ -183,11 +183,11 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes CSMWorld::LandTexture texture = mState.mSource.getData().getLandTextures().getRecord (index).get(); - std::ostringstream stream; - stream << mNext->second-1 << "_0"; + std::ostringstream stream2; + stream2 << mNext->second-1 << "_0"; texture.mIndex = mNext->second-1; - texture.mId = stream.str(); + texture.mId = stream2.str(); CSMWorld::Record newRecord ( CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture); diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp index 7f80eaa8e0..e6acf77de7 100644 --- a/apps/opencs/model/world/idtable.cpp +++ b/apps/opencs/model/world/idtable.cpp @@ -172,9 +172,9 @@ void CSMWorld::IdTable::setRecord (const std::string& id, const RecordBase& reco 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); diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp index 60c6130416..9eaa744d23 100644 --- a/apps/opencs/model/world/infocollection.cpp +++ b/apps/opencs/model/world/infocollection.cpp @@ -19,31 +19,31 @@ void CSMWorld::InfoCollection::load (const Info& record, bool base) record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly; (base ? record2.mBase : record2.mModified) = record; - int index = -1; + int index2 = -1; std::string topic = Misc::StringUtils::lowerCase (record2.get().mTopicId); if (!record2.get().mPrev.empty()) { - index = getInfoIndex (record2.get().mPrev, topic); + index2 = getInfoIndex (record2.get().mPrev, topic); - if (index!=-1) - ++index; + if (index2!=-1) + ++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); - index = std::distance (getRecords().begin(), range.second); + index2 = std::distance (getRecords().begin(), range.second); } - insertRecord (record2, index); + insertRecord (record2, index2); } else { diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp index f8818807bc..a60ee3d706 100644 --- a/apps/opencs/model/world/refcollection.cpp +++ b/apps/opencs/model/world/refcollection.cpp @@ -74,9 +74,9 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool std::cerr << "Position: #" << index.first << " " << index.second <<", Target #"<< mref.mTarget[0] << " " << mref.mTarget[1] << std::endl; - std::ostringstream stream; - stream << "#" << mref.mTarget[0] << " " << mref.mTarget[1]; - ref.mCell = stream.str(); // overwrite + std::ostringstream stream2; + stream2 << "#" << mref.mTarget[0] << " " << mref.mTarget[1]; + ref.mCell = stream2.str(); // overwrite } } } diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp index a5e8133386..9045be5843 100644 --- a/apps/opencs/model/world/refidcollection.cpp +++ b/apps/opencs/model/world/refidcollection.cpp @@ -878,10 +878,10 @@ void CSMWorld::RefIdCollection::load (ESM::ESMReader& reader, bool base, Univers if (index==-1) { // new record - int index = mData.getAppendIndex (type); + int newIndex = mData.getAppendIndex (type); mData.appendRecord (type, id, base); - RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (index); + RefIdData::LocalIndex localIndex = mData.globalToLocalIndex (newIndex); mData.load (localIndex, reader, base); diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp index 8bfd832483..fc5b127dc5 100644 --- a/apps/opencs/model/world/resources.cpp +++ b/apps/opencs/model/world/resources.cpp @@ -26,22 +26,22 @@ CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::T Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton().listResourceNames (*iter); - for (Ogre::StringVector::const_iterator iter (resources->begin()); - iter!=resources->end(); ++iter) + for (Ogre::StringVector::const_iterator iter2 (resources->begin()); + iter2!=resources->end(); ++iter2) { - if (static_cast (iter->size())substr (0, baseSize)!=mBaseDirectory || - ((*iter)[baseSize]!='/' && (*iter)[baseSize]!='\\')) + if (static_cast (iter2->size())substr (0, baseSize)!=mBaseDirectory || + ((*iter2)[baseSize]!='/' && (*iter2)[baseSize]!='\\')) continue; 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) continue; - std::string extension = iter->substr (index+1); + std::string extension = iter2->substr (index+1); int i = 0; @@ -53,7 +53,7 @@ CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::T continue; } - std::string file = iter->substr (baseSize+1); + std::string file = iter2->substr (baseSize+1); mFiles.push_back (file); std::replace (file.begin(), file.end(), '\\', '/'); mIndex.insert (std::make_pair ( diff --git a/apps/opencs/view/render/textoverlay.cpp b/apps/opencs/view/render/textoverlay.cpp index 14b60be935..21e898738d 100644 --- a/apps/opencs/view/render/textoverlay.cpp +++ b/apps/opencs/view/render/textoverlay.cpp @@ -105,7 +105,7 @@ TextOverlay::TextOverlay(const Ogre::MovableObject* obj, const Ogre::Camera* cam "TransOverlayMaterial"); if(mQuadMaterial.isNull()) { - Ogre::MaterialPtr mQuadMaterial = Ogre::MaterialManager::getSingleton().create( + mQuadMaterial = Ogre::MaterialManager::getSingleton().create( "TransOverlayMaterial", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true ); Ogre::Pass *pass = mQuadMaterial->getTechnique( 0 )->getPass( 0 ); diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp index 14b7fcac3d..54e58a7cac 100644 --- a/apps/opencs/view/world/dialoguesubview.cpp +++ b/apps/opencs/view/world/dialoguesubview.cpp @@ -667,14 +667,14 @@ void CSVWorld::EditWidget::remake(int row) int displayRole = tree->nestedHeaderData (i, col, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt(); - CSMWorld::ColumnBase::Display display = + CSMWorld::ColumnBase::Display display2 = static_cast (displayRole); - mNestedTableDispatcher->makeDelegate (display); + mNestedTableDispatcher->makeDelegate (display2); // FIXME: assumed all columns are editable 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) { mNestedTableMapper->addMapping (editor, col); @@ -699,7 +699,7 @@ void CSVWorld::EditWidget::remake(int row) label->setEnabled(false); } - createEditorContextMenu(editor, display, row); + createEditorContextMenu(editor, display2, row); } } mNestedTableMapper->setCurrentModelIndex(tree->index(0, 0, tree->index(row, i)));