1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00

Merge branch 'rm_semicolons' into 'master'

Remove redundant semicolons

See merge request OpenMW/openmw!996
This commit is contained in:
Alexei Dobrohotov 2021-07-05 12:09:52 +00:00
commit 15965972f4
5 changed files with 5 additions and 5 deletions

View file

@ -69,7 +69,7 @@ namespace
AreaType generateAreaType(Random& random) AreaType generateAreaType(Random& random)
{ {
std::uniform_int_distribution<int> distribution(0, 4); std::uniform_int_distribution<int> distribution(0, 4);
return toAreaType(distribution(random));; return toAreaType(distribution(random));
} }
template <typename OutputIterator, typename Random> template <typename OutputIterator, typename Random>

View file

@ -78,7 +78,7 @@ void CSMDoc::Runner::start (bool delayed)
else else
arguments << "--new-game=1"; arguments << "--new-game=1";
arguments << ("--script-run="+mStartup->fileName());; arguments << ("--script-run="+mStartup->fileName());
arguments << arguments <<
QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str()); QString::fromUtf8 (("--data=\""+mProjectPath.parent_path().string()+"\"").c_str());

View file

@ -109,7 +109,7 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
sizes << 1 << 0; sizes << 1 << 0;
mMain->setSizes (sizes); mMain->setSizes (sizes);
QWidget *widget = new QWidget (this);; QWidget *widget = new QWidget (this);
widget->setLayout (&mLayout); widget->setLayout (&mLayout);
setWidget (widget); setWidget (widget);

View file

@ -217,7 +217,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
profile.mTimePlayed = mTimePlayed; profile.mTimePlayed = mTimePlayed;
profile.mDescription = description; profile.mDescription = description;
Log(Debug::Info) << "Making a screenshot for saved game '" << description << "'";; Log(Debug::Info) << "Making a screenshot for saved game '" << description << "'";
writeScreenshot(profile.mScreenshot); writeScreenshot(profile.mScreenshot);
if (!slot) if (!slot)

View file

@ -524,7 +524,7 @@ public:
uint64_t seek_target = self->mSeekPos; uint64_t seek_target = self->mSeekPos;
int streamIndex = -1; int streamIndex = -1;
int videoStreamIndex = -1;; int videoStreamIndex = -1;
int audioStreamIndex = -1; int audioStreamIndex = -1;
if (self->video_st) if (self->video_st)
videoStreamIndex = self->video_st - self->format_ctx->streams; videoStreamIndex = self->video_st - self->format_ctx->streams;