diff --git a/src/Editor/WorldEditor/CWorldEditor.cpp b/src/Editor/WorldEditor/CWorldEditor.cpp index c8a4b129..49a78ae6 100644 --- a/src/Editor/WorldEditor/CWorldEditor.cpp +++ b/src/Editor/WorldEditor/CWorldEditor.cpp @@ -440,17 +440,16 @@ void CWorldEditor::OpenProject() void CWorldEditor::OpenRecentProject() { - QAction *pSender = qobject_cast(sender()); + const auto* pSender = qobject_cast(sender()); + if (!pSender) + return; - if (pSender) - { - QSettings Settings; - QStringList RecentProjectsList = Settings.value(QStringLiteral("WorldEditor/RecentProjectsList")).toStringList(); + QSettings Settings; + const QStringList RecentProjectsList = Settings.value(QStringLiteral("WorldEditor/RecentProjectsList")).toStringList(); - int ProjIndex = pSender->data().toInt(); - QString ProjPath = RecentProjectsList[ProjIndex]; - gpEdApp->OpenProject(ProjPath); - } + const int ProjIndex = pSender->data().toInt(); + const QString& ProjPath = RecentProjectsList[ProjIndex]; + gpEdApp->OpenProject(ProjPath); } void CWorldEditor::ExportGame() @@ -464,7 +463,8 @@ void CWorldEditor::ExportGame() return; CExportGameDialog ExportDialog(IsoPath, ExportDir, this); - if (ExportDialog.HasValidDisc()) ExportDialog.exec(); + if (ExportDialog.HasValidDisc()) + ExportDialog.exec(); if (ExportDialog.ExportSucceeded()) { @@ -965,11 +965,11 @@ void CWorldEditor::LaunchQuickplay() LaunchQuickplayFromLocation(CameraPosition, false); } -void CWorldEditor::LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsSpawnPosition) +void CWorldEditor::LaunchQuickplayFromLocation(const CVector3f& Location, bool ForceAsSpawnPosition) { // This function should not be called if a level is not open in a project. - ASSERT( gpEdApp->ActiveProject() != nullptr ); - ASSERT( mpWorld && mpArea ); + ASSERT(gpEdApp->ActiveProject() != nullptr); + ASSERT(mpWorld && mpArea); // Fill in parameters and start running SQuickplayParameters Parameters = mQuickplayParms; @@ -988,7 +988,7 @@ void CWorldEditor::LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsS } // ************ PROTECTED ************ -QAction* CWorldEditor::AddEditModeButton(QIcon Icon, QString ToolTip, EWorldEditorMode Mode) +QAction* CWorldEditor::AddEditModeButton(const QIcon& Icon, const QString& ToolTip, EWorldEditorMode Mode) { ASSERT(mpEditModeButtonGroup->button(Mode) == nullptr); @@ -1147,7 +1147,7 @@ void CWorldEditor::OnUnlinkClicked() } } -void CWorldEditor::OnPickModeEnter(QCursor Cursor) +void CWorldEditor::OnPickModeEnter(const QCursor& Cursor) { ui->MainViewport->SetCursorState(Cursor); } @@ -1179,9 +1179,10 @@ void CWorldEditor::OnCameraSpeedChange(double Speed) ui->CamSpeedSpinBox->blockSignals(false); } -void CWorldEditor::OnTransformSpinBoxModified(CVector3f Value) +void CWorldEditor::OnTransformSpinBoxModified(const CVector3f& Value) { - if (mpSelection->IsEmpty()) return; + if (mpSelection->IsEmpty()) + return; switch (mGizmo.Mode()) { @@ -1212,9 +1213,10 @@ void CWorldEditor::OnTransformSpinBoxModified(CVector3f Value) UpdateGizmoUI(); } -void CWorldEditor::OnTransformSpinBoxEdited(CVector3f) +void CWorldEditor::OnTransformSpinBoxEdited(const CVector3f&) { - if (mpSelection->IsEmpty()) return; + if (mpSelection->IsEmpty()) + return; if (mGizmo.Mode() == CGizmo::EGizmoMode::Translate) UndoStack().push(CTranslateNodeCommand::End()); else if (mGizmo.Mode() == CGizmo::EGizmoMode::Rotate) UndoStack().push(CRotateNodeCommand::End()); diff --git a/src/Editor/WorldEditor/CWorldEditor.h b/src/Editor/WorldEditor/CWorldEditor.h index 084ca10f..5ca84413 100644 --- a/src/Editor/WorldEditor/CWorldEditor.h +++ b/src/Editor/WorldEditor/CWorldEditor.h @@ -140,10 +140,10 @@ public slots: void UpdateNewLinkLine(); void LaunchQuickplay(); - void LaunchQuickplayFromLocation(CVector3f Location, bool ForceAsSpawnPosition); + void LaunchQuickplayFromLocation(const CVector3f& Location, bool ForceAsSpawnPosition); protected: - QAction* AddEditModeButton(QIcon Icon, QString ToolTip, EWorldEditorMode Mode); + QAction* AddEditModeButton(const QIcon& Icon, const QString& ToolTip, EWorldEditorMode Mode); void SetSidebar(CWorldEditorSidebar *pSidebar); void GizmoModeChanged(CGizmo::EGizmoMode Mode) override; @@ -156,12 +156,12 @@ private slots: void OnLinkEnd(); void OnUnlinkClicked(); - void OnPickModeEnter(QCursor Cursor); + void OnPickModeEnter(const QCursor& Cursor); void OnPickModeExit(); void UpdateCameraOrbit(); void OnCameraSpeedChange(double Speed); - void OnTransformSpinBoxModified(CVector3f Value); - void OnTransformSpinBoxEdited(CVector3f Value); + void OnTransformSpinBoxModified(const CVector3f& Value); + void OnTransformSpinBoxEdited(const CVector3f& Value); void SelectAllTriggered(); void InvertSelectionTriggered();