fix -Wnewline-eof warnings

celladd
Scott Howard 10 years ago
parent 491f44869e
commit e2ef8c4022

@ -903,4 +903,4 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
std::cout << "content file: " << filename << " not found" << std::endl; std::cout << "content file: " << filename << " not found" << std::endl;
} }
return writeTime; return writeTime;
} }

@ -28,4 +28,4 @@ void CSMDoc::Blacklist::add (CSMWorld::UniversalId::Type type,
std::transform (ids.begin(), ids.end(), list.begin()+size, Misc::StringUtils::lowerCase); std::transform (ids.begin(), ids.end(), list.begin()+size, Misc::StringUtils::lowerCase);
std::sort (list.begin(), list.end()); std::sort (list.begin(), list.end());
} }

@ -107,4 +107,4 @@ void CSMDoc::DocumentManager::documentNotLoaded (Document *document, const std::
if (error.empty()) // do not remove the document yet, if we have an error if (error.empty()) // do not remove the document yet, if we have an error
removeDocument (document); removeDocument (document);
} }

@ -99,4 +99,4 @@ namespace CSMDoc
}; };
} }
#endif #endif

@ -25,4 +25,4 @@ CSMDoc::Messages::Iterator CSMDoc::Messages::begin() const
CSMDoc::Messages::Iterator CSMDoc::Messages::end() const CSMDoc::Messages::Iterator CSMDoc::Messages::end() const
{ {
return mMessages.end(); return mMessages.end();
} }

@ -68,4 +68,4 @@ namespace CSMDoc
}; };
} }
#endif #endif

@ -97,4 +97,4 @@ CSMDoc::Saving::Saving (Document& document, const boost::filesystem::path& proje
appendStage (new CloseSaveStage (mState)); appendStage (new CloseSaveStage (mState));
appendStage (new FinalSavingStage (mDocument, mState)); appendStage (new FinalSavingStage (mDocument, mState));
} }

@ -1,4 +1,4 @@
#include "stage.hpp" #include "stage.hpp"
CSMDoc::Stage::~Stage() {} CSMDoc::Stage::~Stage() {}

@ -12,4 +12,4 @@ bool CSMFilter::BooleanNode::test (const CSMWorld::IdTableBase& table, int row,
std::string CSMFilter::BooleanNode::toString (bool numericColumns) const std::string CSMFilter::BooleanNode::toString (bool numericColumns) const
{ {
return mTrue ? "true" : "false"; return mTrue ? "true" : "false";
} }

@ -26,4 +26,4 @@ namespace CSMFilter
}; };
} }
#endif #endif

@ -3,4 +3,4 @@
CSMFilter::Node::Node() {} CSMFilter::Node::Node() {}
CSMFilter::Node::~Node() {} CSMFilter::Node::~Node() {}

@ -7,4 +7,4 @@ bool CSMFilter::NotNode::test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const const std::map<int, int>& columns) const
{ {
return !getChild().test (table, row, columns); return !getChild().test (table, row, columns);
} }

@ -82,4 +82,4 @@ std::string CSMFilter::TextNode::toString (bool numericColumns) const
stream << ", \"" << mText << "\")"; stream << ", \"" << mText << "\")";
return stream.str(); return stream.str();
} }

@ -23,4 +23,4 @@ std::vector<int> CSMFilter::UnaryNode::getReferencedColumns() const
std::string CSMFilter::UnaryNode::toString (bool numericColumns) const std::string CSMFilter::UnaryNode::toString (bool numericColumns) const
{ {
return mName + " " + mChild->toString (numericColumns); return mName + " " + mChild->toString (numericColumns);
} }

@ -94,4 +94,4 @@ std::string CSMFilter::ValueNode::toString (bool numericColumns) const
stream << ")"; stream << ")";
return stream.str(); return stream.str();
} }

@ -41,4 +41,4 @@ void CSMTools::BirthsignCheckStage::perform (int stage, CSMDoc::Messages& messag
/// \todo test if the texture exists /// \todo test if the texture exists
/// \todo check data members that can't be edited in the table view /// \todo check data members that can't be edited in the table view
} }

@ -32,4 +32,4 @@ namespace CSMTools
}; };
} }
#endif #endif

@ -65,4 +65,4 @@ void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
messages.push_back (std::make_pair (id, messages.push_back (std::make_pair (id,
ESM::Skill::indexToId (iter->first) + " is listed more than once")); ESM::Skill::indexToId (iter->first) + " is listed more than once"));
} }
} }

@ -20,4 +20,4 @@ void CSMTools::MandatoryIdStage::perform (int stage, CSMDoc::Messages& messages)
if (mIdCollection.searchId (mIds.at (stage))==-1 || if (mIdCollection.searchId (mIds.at (stage))==-1 ||
mIdCollection.getRecord (mIds.at (stage)).isDeleted()) mIdCollection.getRecord (mIds.at (stage)).isDeleted())
messages.add (mCollectionId, "Missing mandatory record: " + mIds.at (stage)); messages.add (mCollectionId, "Missing mandatory record: " + mIds.at (stage));
} }

@ -70,4 +70,4 @@ void CSMTools::RaceCheckStage::perform (int stage, CSMDoc::Messages& messages)
performFinal (messages); performFinal (messages);
else else
performPerRecord (stage, messages); performPerRecord (stage, messages);
} }

@ -26,4 +26,4 @@ namespace CSMTools
}; };
} }
#endif // CSM_TOOLS_REFERENCECHECK_H #endif // CSM_TOOLS_REFERENCECHECK_H

@ -35,4 +35,4 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
/// \todo test that the ID in mSleeplist exists /// \todo test that the ID in mSleeplist exists
/// \todo check data members that can't be edited in the table view /// \todo check data members that can't be edited in the table view
} }

@ -78,4 +78,4 @@ const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId (int row) con
std::string CSMTools::ReportModel::getHint (int row) const std::string CSMTools::ReportModel::getHint (int row) const
{ {
return mRows.at (row).second.second; return mRows.at (row).second.second;
} }

@ -98,4 +98,4 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
} }
mMessages = 0; mMessages = 0;
} }

@ -39,4 +39,4 @@ void CSMTools::SkillCheckStage::perform (int stage, CSMDoc::Messages& messages)
if (skill.mDescription.empty()) if (skill.mDescription.empty())
messages.push_back (std::make_pair (id, skill.mId + " has an empty description")); messages.push_back (std::make_pair (id, skill.mId + " has an empty description"));
} }

@ -31,4 +31,4 @@ void CSMTools::SoundCheckStage::perform (int stage, CSMDoc::Messages& messages)
messages.push_back (std::make_pair (id, "Maximum range larger than minimum range")); messages.push_back (std::make_pair (id, "Maximum range larger than minimum range"));
/// \todo check, if the sound file exists /// \todo check, if the sound file exists
} }

@ -37,4 +37,4 @@ void CSMTools::SpellCheckStage::perform (int stage, CSMDoc::Messages& messages)
messages.push_back (std::make_pair (id, spell.mId + " has a negative spell costs")); messages.push_back (std::make_pair (id, spell.mId + " has a negative spell costs"));
/// \todo check data members that can't be edited in the table view /// \todo check data members that can't be edited in the table view
} }

@ -21,4 +21,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -28,4 +28,4 @@ int CSMWorld::CollectionBase::findColumnIndex (Columns::ColumnId id) const
throw std::logic_error ("invalid column index"); throw std::logic_error ("invalid column index");
return index; return index;
} }

@ -106,4 +106,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -22,4 +22,4 @@ std::string CSMWorld::ColumnBase::getTitle() const
int CSMWorld::ColumnBase::getId() const int CSMWorld::ColumnBase::getId() const
{ {
return mColumnId; return mColumnId;
} }

@ -264,4 +264,4 @@ void CSMWorld::CommandDispatcher::executeExtendedRevert()
if (mExtendedTypes.size()>1) if (mExtendedTypes.size()>1)
mDocument.getUndoStack().endMacro(); mDocument.getUndoStack().endMacro();
} }

@ -170,4 +170,4 @@ void CSMWorld::CloneCommand::redo()
void CSMWorld::CloneCommand::undo() void CSMWorld::CloneCommand::undo()
{ {
mModel.removeRow (mModel.getModelIndex (mId, 0).row()); mModel.removeRow (mModel.getModelIndex (mId, 0).row());
} }

@ -141,4 +141,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -6,4 +6,4 @@ CSMWorld::IdTableBase::IdTableBase (unsigned int features) : mFeatures (features
unsigned int CSMWorld::IdTableBase::getFeatures() const unsigned int CSMWorld::IdTableBase::getFeatures() const
{ {
return mFeatures; return mFeatures;
} }

@ -47,4 +47,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -26,4 +26,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -18,4 +18,4 @@ bool CSMWorld::RecordBase::isErased() const
bool CSMWorld::RecordBase::isModified() const bool CSMWorld::RecordBase::isModified() const
{ {
return mState==State_Modified || mState==State_ModifiedOnly; return mState==State_Modified || mState==State_ModifiedOnly;
} }

@ -5,4 +5,4 @@ CSMWorld::CellRef::CellRef()
{ {
mRefNum.mIndex = 0; mRefNum.mIndex = 0;
mRefNum.mContentFile = 0; mRefNum.mContentFile = 0;
} }

@ -3,4 +3,4 @@
CSMWorld::RefIdAdapter::RefIdAdapter() {} CSMWorld::RefIdAdapter::RefIdAdapter() {}
CSMWorld::RefIdAdapter::~RefIdAdapter() {} CSMWorld::RefIdAdapter::~RefIdAdapter() {}

@ -35,4 +35,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -503,4 +503,4 @@ void CSMWorld::RegionMap::cellsChanged (const QModelIndex& topLeft, const QModel
// columns we are interested in. If not we can exit the function here and avoid all updating. // columns we are interested in. If not we can exit the function here and avoid all updating.
addCells (topLeft.row(), bottomRight.row()); addCells (topLeft.row(), bottomRight.row());
} }

@ -105,4 +105,4 @@ int CSMWorld::Resources::searchId (const std::string& id) const
CSMWorld::UniversalId::Type CSMWorld::Resources::getType() const CSMWorld::UniversalId::Type CSMWorld::Resources::getType() const
{ {
return mType; return mType;
} }

@ -30,4 +30,4 @@ const CSMWorld::Resources& CSMWorld::ResourcesManager::get (UniversalId::Type ty
throw std::logic_error ("Unknown resource type"); throw std::logic_error ("Unknown resource type");
return iter->second; return iter->second;
} }

@ -25,4 +25,4 @@ namespace CSMWorld
}; };
} }
#endif #endif

@ -143,4 +143,4 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::ResourceTable::view (int
bool CSMWorld::ResourceTable::isDeleted (const std::string& id) const bool CSMWorld::ResourceTable::isDeleted (const std::string& id) const
{ {
return false; return false;
} }

@ -22,4 +22,4 @@ CSMWorld::Scope CSMWorld::getScopeFromId (const std::string& id)
return Scope_Session; return Scope_Session;
return Scope_Content; return Scope_Content;
} }

@ -120,4 +120,4 @@ void CSMWorld::ScriptContext::clear()
mIds.clear(); mIds.clear();
mIdsUpdated = false; mIdsUpdated = false;
mLocals.clear(); mLocals.clear();
} }

@ -90,4 +90,4 @@ void CSVDoc::GlobalDebugProfileMenu::profileChanged (const QModelIndex& topLeft,
void CSVDoc::GlobalDebugProfileMenu::actionTriggered (QAction *action) void CSVDoc::GlobalDebugProfileMenu::actionTriggered (QAction *action)
{ {
emit triggered (std::string (action->text().toUtf8().constData())); emit triggered (std::string (action->text().toUtf8().constData()));
} }

@ -17,4 +17,4 @@ CSVDoc::RunLogSubView::RunLogSubView (const CSMWorld::UniversalId& id,
void CSVDoc::RunLogSubView::setEditLock (bool locked) void CSVDoc::RunLogSubView::setEditLock (bool locked)
{ {
// ignored since this SubView does not have editing // ignored since this SubView does not have editing
} }

@ -35,4 +35,4 @@ CSVDoc::SubView *CSVDoc::SubViewFactoryManager::makeSubView (const CSMWorld::Uni
throw std::runtime_error ("Failed to create a sub view for: " + id.toString()); throw std::runtime_error ("Failed to create a sub view for: " + id.toString());
return iter->second->makeSubView (id, document); return iter->second->makeSubView (id, document);
} }

@ -48,4 +48,4 @@ namespace CSVDoc
} }
} }
#endif #endif

@ -193,4 +193,4 @@ std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::
} }
return ss.str(); return ss.str();
} }

@ -43,4 +43,4 @@ namespace CSVFilter
} }
#endif #endif

@ -16,4 +16,4 @@ unsigned int CSVRender::EditMode::getInteractionMask() const
void CSVRender::EditMode::activate (CSVWidget::SceneToolbar *toolbar) void CSVRender::EditMode::activate (CSVWidget::SceneToolbar *toolbar)
{ {
mWorldspaceWidget->setInteractionMask (mMask); mWorldspaceWidget->setInteractionMask (mMask);
} }

@ -1,4 +1,4 @@
#include "lighting.hpp" #include "lighting.hpp"
CSVRender::Lighting::~Lighting() {} CSVRender::Lighting::~Lighting() {}

@ -27,4 +27,4 @@ void CSVRender::LightingBright::deactivate()
} }
} }
void CSVRender::LightingBright::setDefaultAmbient (const Ogre::ColourValue& colour) {} void CSVRender::LightingBright::setDefaultAmbient (const Ogre::ColourValue& colour) {}

@ -33,4 +33,4 @@ void CSVRender::LightingDay::deactivate()
void CSVRender::LightingDay::setDefaultAmbient (const Ogre::ColourValue& colour) void CSVRender::LightingDay::setDefaultAmbient (const Ogre::ColourValue& colour)
{ {
mSceneManager->setAmbientLight (colour); mSceneManager->setAmbientLight (colour);
} }

@ -33,4 +33,4 @@ void CSVRender::LightingNight::deactivate()
void CSVRender::LightingNight::setDefaultAmbient (const Ogre::ColourValue& colour) void CSVRender::LightingNight::setDefaultAmbient (const Ogre::ColourValue& colour)
{ {
mSceneManager->setAmbientLight (colour); mSceneManager->setAmbientLight (colour);
} }

@ -97,4 +97,4 @@ bool CSVRender::NavigationOrbit::handleRollKeys (int delta)
{ {
mCamera->roll (Ogre::Degree (getFactor (false) * delta)); mCamera->roll (Ogre::Degree (getFactor (false) * delta));
return true; return true;
} }

@ -133,4 +133,4 @@ void CSVTools::ReportTable::removeSelection()
mModel->removeRows (iter->row(), 1); mModel->removeRows (iter->row(), 1);
selectionModel()->clear(); selectionModel()->clear();
} }

@ -11,4 +11,4 @@ void CSVTools::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
new CSVDoc::SubViewFactory<ReportSubView>); new CSVDoc::SubViewFactory<ReportSubView>);
manager.add (CSMWorld::UniversalId::Type_LoadErrorLog, manager.add (CSMWorld::UniversalId::Type_LoadErrorLog,
new CSVDoc::SubViewFactory<ReportSubView>); new CSVDoc::SubViewFactory<ReportSubView>);
} }

@ -106,4 +106,4 @@ CSVWidget::PushButton::Type CSVWidget::PushButton::getType() const
void CSVWidget::PushButton::checkedStateChanged (bool checked) void CSVWidget::PushButton::checkedStateChanged (bool checked)
{ {
setExtendedToolTip(); setExtendedToolTip();
} }

@ -100,4 +100,4 @@ void CSVWidget::SceneToolMode::selected()
emit modeChanged (iter->second); emit modeChanged (iter->second);
} }
} }

@ -148,4 +148,4 @@ void CSVWidget::SceneToolRun::clicked (const QModelIndex& index)
removeProfile (*iter); removeProfile (*iter);
updatePanel(); updatePanel();
} }
} }

@ -19,4 +19,4 @@ CSVWorld::Creator *CSVWorld::NullCreatorFactory::makeCreator (CSMWorld::Data& da
QUndoStack& undoStack, const CSMWorld::UniversalId& id) const QUndoStack& undoStack, const CSMWorld::UniversalId& id) const
{ {
return 0; return 0;
} }

@ -101,4 +101,4 @@ namespace CSVWorld
} }
} }
#endif #endif

@ -32,4 +32,4 @@ CSVWorld::Creator *CSVWorld::JournalCreatorFactory::makeCreator (CSMWorld::Data&
QUndoStack& undoStack, const CSMWorld::UniversalId& id) const QUndoStack& undoStack, const CSMWorld::UniversalId& id) const
{ {
return new DialogueCreator (data, undoStack, id, ESM::Dialogue::Journal); return new DialogueCreator (data, undoStack, id, ESM::Dialogue::Journal);
} }

@ -209,4 +209,4 @@ namespace CSVWorld
}; };
} }
#endif #endif

@ -276,4 +276,4 @@ void CSVWorld::GenericCreator::scopeChanged (int index)
{ {
update(); update();
updateNamespace(); updateNamespace();
} }

@ -111,4 +111,4 @@ namespace CSVWorld
}; };
} }
#endif #endif

@ -120,4 +120,4 @@ void CSVWorld::IdValidator::setNamespace (const std::string& namespace_)
std::string CSVWorld::IdValidator::getError() const std::string CSVWorld::IdValidator::getError() const
{ {
return mError; return mError;
} }

@ -94,4 +94,4 @@ std::string CSVWorld::InfoCreator::getErrors() const
void CSVWorld::InfoCreator::topicChanged() void CSVWorld::InfoCreator::topicChanged()
{ {
update(); update();
} }

@ -67,4 +67,4 @@ void CSVWorld::PreviewSubView::referenceableIdChanged (const std::string& id)
setWindowTitle (QString::fromUtf8 (mTitle.c_str())); setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
emit updateTitle(); emit updateTitle();
} }

@ -24,4 +24,4 @@ void CSVWorld::RegionMapSubView::editRequest (const CSMWorld::UniversalId& id,
const std::string& hint) const std::string& hint)
{ {
focusId (id, hint); focusId (id, hint);
} }

@ -156,4 +156,4 @@ void CSVWorld::ScriptEdit::updateHighlighting()
ChangeLock lock (*this); ChangeLock lock (*this);
mHighlighter->rehighlight(); mHighlighter->rehighlight();
} }

@ -76,4 +76,4 @@ namespace CSVWorld
void updateHighlighting(); void updateHighlighting();
}; };
} }
#endif // SCRIPTEDIT_H #endif // SCRIPTEDIT_H

@ -142,4 +142,4 @@ void CSVWorld::ScriptHighlighter::highlightBlock (const QString& text)
void CSVWorld::ScriptHighlighter::invalidateIds() void CSVWorld::ScriptHighlighter::invalidateIds()
{ {
mContext.invalidateIds(); mContext.invalidateIds();
} }

@ -46,4 +46,4 @@ namespace CSVWorld
}; };
} }
#endif #endif

@ -172,4 +172,4 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
//preview //preview
manager.add (CSMWorld::UniversalId::Type_Preview, new CSVDoc::SubViewFactory<PreviewSubView>); manager.add (CSMWorld::UniversalId::Type_Preview, new CSVDoc::SubViewFactory<PreviewSubView>);
} }

@ -31,4 +31,4 @@ void MWMechanics::SkillValue::readState (const ESM::StatState<int>& state)
{ {
AttributeValue::readState (state); AttributeValue::readState (state);
mProgress = state.mProgress; mProgress = state.mProgress;
} }

@ -20,4 +20,4 @@ namespace MWScript
} }
} }
#endif #endif

@ -17,4 +17,4 @@ namespace MWWorld
}; };
} }
#endif #endif

@ -64,4 +64,4 @@ MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const std::string&
} }
mPtr.getRefData().setCount(count); mPtr.getRefData().setCount(count);
} }

@ -50,4 +50,4 @@ void Bsa::registerResources (const Files::Collections& collections,
throw std::runtime_error(message.str()); throw std::runtime_error(message.str());
} }
} }
} }

@ -78,4 +78,4 @@ namespace Compiler
} }
} }
#endif #endif

@ -3,4 +3,4 @@
void Compiler::NullErrorHandler::report (const std::string& message, const TokenLoc& loc, Type type) {} void Compiler::NullErrorHandler::report (const std::string& message, const TokenLoc& loc, Type type) {}
void Compiler::NullErrorHandler::report (const std::string& message, Type type) {} void Compiler::NullErrorHandler::report (const std::string& message, Type type) {}

@ -10,4 +10,4 @@ namespace Compiler
"playerviewswitch", "vanitymode" "playerviewswitch", "vanitymode"
}; };
} }
} }

@ -49,4 +49,4 @@ bool Compiler::QuickFileParser::parseSpecial (int code, const TokenLoc& loc, Sca
void Compiler::QuickFileParser::parseEOF (Scanner& scanner) void Compiler::QuickFileParser::parseEOF (Scanner& scanner)
{ {
} }

@ -28,4 +28,4 @@ namespace ESM
bool operator!= (const CellId& left, const CellId& right); bool operator!= (const CellId& left, const CellId& right);
} }
#endif #endif

@ -13,4 +13,4 @@ void ESM::ContainerState::save (ESMWriter &esm, bool inInventory) const
ObjectState::save (esm, inInventory); ObjectState::save (esm, inInventory);
mInventory.save (esm); mInventory.save (esm);
} }

@ -26,4 +26,4 @@ void ESM::GlobalScript::save (ESMWriter &esm) const
esm.writeHNT ("RUN_", mRunning); esm.writeHNT ("RUN_", mRunning);
esm.writeHNOString ("TARG", mTargetId); esm.writeHNOString ("TARG", mTargetId);
} }

@ -16,4 +16,4 @@ void ESM::QuestState::save (ESMWriter &esm) const
esm.writeHNString ("YETO", mTopic); esm.writeHNString ("YETO", mTopic);
esm.writeHNT ("QSTA", mState); esm.writeHNT ("QSTA", mState);
esm.writeHNT ("QFIN", mFinished); esm.writeHNT ("QFIN", mFinished);
} }

@ -43,4 +43,4 @@ namespace ICS
} }
#endif #endif

@ -43,4 +43,4 @@ namespace ICS
} }
#endif #endif

Loading…
Cancel
Save