From e315a725825a2c21bf8460fc112f3920871d7741 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Sat, 6 Sep 2014 13:04:52 -0500 Subject: [PATCH] Remove extra semicolons at the end of some lines. --- apps/opencs/model/world/resourcetable.cpp | 2 +- apps/openmw/mwgui/merchantrepair.cpp | 2 +- apps/openmw/mwgui/review.cpp | 8 ++++---- apps/openmw/mwrender/videoplayer.cpp | 2 +- components/misc/utf8stream.hpp | 2 +- components/nifogre/ogrenifloader.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/opencs/model/world/resourcetable.cpp b/apps/opencs/model/world/resourcetable.cpp index 58e03ff6d3..a7180434af 100644 --- a/apps/opencs/model/world/resourcetable.cpp +++ b/apps/opencs/model/world/resourcetable.cpp @@ -86,7 +86,7 @@ bool CSMWorld::ResourceTable::setData ( const QModelIndex &index, const QVariant Qt::ItemFlags CSMWorld::ResourceTable::flags (const QModelIndex & index) const { - return Qt::ItemIsSelectable | Qt::ItemIsEnabled;; + return Qt::ItemIsSelectable | Qt::ItemIsEnabled; } QModelIndex CSMWorld::ResourceTable::index (int row, int column, const QModelIndex& parent) diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp index b6f9936a8e..499383d5f9 100644 --- a/apps/openmw/mwgui/merchantrepair.cpp +++ b/apps/openmw/mwgui/merchantrepair.cpp @@ -69,7 +69,7 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor) std::string name = iter->getClass().getName(*iter) + " - " + boost::lexical_cast(price) + MWBase::Environment::get().getWorld()->getStore().get() - .find("sgp")->getString();; + .find("sgp")->getString(); MyGUI::Button* button = diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 072411707e..d1f8a76a62 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/apps/openmw/mwgui/review.cpp @@ -27,22 +27,22 @@ namespace MWGui getWidget(mNameWidget, "NameText"); getWidget(button, "NameButton"); adjustButtonSize(button); - button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onNameClicked);; + button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onNameClicked); getWidget(mRaceWidget, "RaceText"); getWidget(button, "RaceButton"); adjustButtonSize(button); - button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked);; + button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked); getWidget(mClassWidget, "ClassText"); getWidget(button, "ClassButton"); adjustButtonSize(button); - button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onClassClicked);; + button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onClassClicked); getWidget(mBirthSignWidget, "SignText"); getWidget(button, "SignButton"); adjustButtonSize(button); - button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked);; + button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked); // Setup dynamic stats getWidget(mHealth, "Health"); diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp index 2d05f27705..08d047472f 100644 --- a/apps/openmw/mwrender/videoplayer.cpp +++ b/apps/openmw/mwrender/videoplayer.cpp @@ -1065,7 +1065,7 @@ void VideoState::deinit() this->format_ctx->pb->buffer = NULL; av_free(this->format_ctx->pb); - this->format_ctx->pb = NULL;; + this->format_ctx->pb = NULL; } avformat_close_input(&this->format_ctx); } diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp index 5e9dde2514..4856d65039 100644 --- a/components/misc/utf8stream.hpp +++ b/components/misc/utf8stream.hpp @@ -73,7 +73,7 @@ public: while (cur != eoc) { if ((*cur & 0xC0) != 0x80) // check continuation mark - return std::make_pair (sBadChar(), cur);; + return std::make_pair (sBadChar(), cur); chr = (chr << 6) | UnicodeChar ((*cur++) & 0x3F); } diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp index 910b8b3523..504c24c2ae 100644 --- a/components/nifogre/ogrenifloader.cpp +++ b/components/nifogre/ogrenifloader.cpp @@ -1258,7 +1258,7 @@ public: ObjectScenePtr Loader::createObjects(Ogre::SceneNode *parentNode, std::string name, const std::string &group) { - ObjectScenePtr scene = ObjectScenePtr (new ObjectScene(parentNode->getCreator()));; + ObjectScenePtr scene = ObjectScenePtr (new ObjectScene(parentNode->getCreator())); Misc::StringUtils::toLower(name); NIFObjectLoader::load(parentNode, scene, name, group);