Skip to content

Commit 924844f

Browse files
committed
Remove move reduntant return statements.
1 parent ce3fde2 commit 924844f

36 files changed

+0
-97
lines changed

Core/Tools/W3DView/AggregateNameDialog.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ AggregateNameDialogClass::AggregateNameDialogClass (CWnd* pParent /*=NULL*/)
5454
//{{AFX_DATA_INIT(AggregateNameDialogClass)
5555
// NOTE: the ClassWizard will add member initialization here
5656
//}}AFX_DATA_INIT
57-
return ;
5857
}
5958

6059

@@ -71,7 +70,6 @@ AggregateNameDialogClass::AggregateNameDialogClass
7170
: m_Name (def_name),
7271
CDialog (resource_id, pParent)
7372
{
74-
return ;
7573
}
7674

7775

@@ -86,7 +84,6 @@ AggregateNameDialogClass::DoDataExchange (CDataExchange* pDX)
8684
//{{AFX_DATA_MAP(AggregateNameDialogClass)
8785
// NOTE: the ClassWizard will add DDX and DDV calls here
8886
//}}AFX_DATA_MAP
89-
return ;
9087
}
9188

9289

@@ -105,7 +102,6 @@ AggregateNameDialogClass::OnOK (void)
105102
{
106103
GetDlgItemText (IDC_AGGREGATE_NAME, m_Name);
107104
CDialog::OnOK ();
108-
return ;
109105
}
110106

111107

Core/Tools/W3DView/AmbientLightDialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ CAmbientLightDialog::OnHScroll
162162

163163
// Allow the base class to process this message
164164
CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
165-
return ;
166165
}
167166

168167
//////////////////////////////////////////////////////////////
@@ -188,7 +187,6 @@ CAmbientLightDialog::OnCancel (void)
188187

189188
// Allow the base class to process this message
190189
CDialog::OnCancel();
191-
return ;
192190
}
193191

194192
//////////////////////////////////////////////////////////////

Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ AnimatedSoundOptionsDialogClass::OnOK (void)
147147
theApp.WriteProfileString ("Config", "AnimSoundDataPath", sound_data_path);
148148

149149
Load_Animated_Sound_Settings ();
150-
return ;
151150
}
152151

153152

@@ -220,7 +219,6 @@ AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings (void)
220219
// Add a sub-directory to the file factory for audio use
221220
//
222221
_TheSimpleFileFactory->Append_Sub_Directory (sound_data_path);
223-
return ;
224222
}
225223

226224

Core/Tools/W3DView/AnimationPropPage.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ CAnimationPropPage::CAnimationPropPage (void)
5151
//{{AFX_DATA_INIT(CAnimationPropPage)
5252
// NOTE: the ClassWizard will add member initialization here
5353
//}}AFX_DATA_INIT
54-
return ;
5554
}
5655

5756
////////////////////////////////////////////////////////////////
@@ -60,7 +59,6 @@ CAnimationPropPage::CAnimationPropPage (void)
6059
//
6160
CAnimationPropPage::~CAnimationPropPage (void)
6261
{
63-
return ;
6462
}
6563

6664
////////////////////////////////////////////////////////////////

Core/Tools/W3DView/BackgroundBMPDialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ CBackgroundBMPDialog::OnOK (void)
125125

126126
// Allow the base class to process this message
127127
CDialog::OnOK ();
128-
return ;
129128
}
130129

131130
/////////////////////////////////////////////////////////////

Core/Tools/W3DView/BackgroundObjectDialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CBackgroundObjectDialog::CBackgroundObjectDialog (CWnd* pParent /*=NULL*/)
4444
//{{AFX_DATA_INIT(CBackgroundObjectDialog)
4545
// NOTE: the ClassWizard will add member initialization here
4646
//}}AFX_DATA_INIT
47-
return ;
4847
}
4948

5049
/////////////////////////////////////////////////////////////
@@ -58,7 +57,6 @@ CBackgroundObjectDialog::DoDataExchange (CDataExchange* pDX)
5857
//{{AFX_DATA_MAP(CBackgroundObjectDialog)
5958
DDX_Control(pDX, IDC_HIERARCHY_LIST, m_heirarchyListCtrl);
6059
//}}AFX_DATA_MAP
61-
return ;
6260
}
6361

6462

Core/Tools/W3DView/BoneMgrDialog.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ BoneMgrDialogClass::Update_Controls (HTREEITEM selected_item)
369369
CString text;
370370
text.Format ("Bone: %s", static_cast<const char*>(m_BoneName));
371371
SetDlgItemText (IDC_BONE_GROUPBOX, text);
372-
return ;
373372
}
374373

375374

@@ -387,7 +386,6 @@ BoneMgrDialogClass::OnDestroy (void)
387386

388387
// Allow the base class to process this message
389388
CDialog::OnDestroy ();
390-
return ;
391389
}
392390

393391

@@ -407,7 +405,6 @@ BoneMgrDialogClass::OnOK (void)
407405

408406
// Allow the base class to process this message
409407
CDialog::OnOK ();
410-
return ;
411408
}
412409

413410

@@ -426,7 +423,6 @@ BoneMgrDialogClass::OnCancel (void)
426423

427424
// Allow the base class to process this message
428425
CDialog::OnCancel ();
429-
return ;
430426
}
431427

432428

@@ -486,7 +482,6 @@ BoneMgrDialogClass::OnAttachButton (void)
486482
m_BoneTree.InvalidateRect (NULL, TRUE);
487483
m_BoneTree.UpdateWindow ();
488484
Update_Controls (hbone_item);
489-
return ;
490485
}
491486

492487

Core/Tools/W3DView/CameraSettingsDialog.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ CameraSettingsDialogClass::OnOK (void)
182182
}
183183

184184
CDialog::OnOK ();
185-
return ;
186185
}
187186

188187

@@ -201,7 +200,6 @@ CameraSettingsDialogClass::OnFovCheck (void)
201200
::EnableWindow (::GetDlgItem (m_hWnd, IDC_VFOV_EDIT), manual_fov);
202201
::EnableWindow (::GetDlgItem (m_hWnd, IDC_HFOV_EDIT), manual_fov);
203202
::EnableWindow (::GetDlgItem (m_hWnd, IDC_LENS_EDIT), manual_fov);
204-
return ;
205203
}
206204

207205

@@ -218,7 +216,6 @@ CameraSettingsDialogClass::OnClipPlaneCheck (void)
218216
::EnableWindow (m_FarClipSpin, manual_planes);
219217
::EnableWindow (::GetDlgItem (m_hWnd, IDC_NEAR_CLIP_EDIT), manual_planes);
220218
::EnableWindow (::GetDlgItem (m_hWnd, IDC_FAR_CLIP_EDIT), manual_planes);
221-
return ;
222219
}
223220

224221

@@ -266,7 +263,6 @@ CameraSettingsDialogClass::OnReset (void)
266263
float vfov = camera->Get_Vertical_FOV ();
267264
float lens = ((::atan ((18.0F / 1000.0F)) / vfov) * 2.0F) * 1000.0F;
268265
::SetDlgItemFloat (m_hWnd, IDC_LENS_EDIT, lens);
269-
return ;
270266
}
271267

272268

@@ -357,7 +353,6 @@ CameraSettingsDialogClass::Update_FOV (void)
357353
::SetDlgItemFloat (m_hWnd, IDC_HFOV_EDIT, RAD_TO_DEG (hfov));
358354
::SetDlgItemFloat (m_hWnd, IDC_VFOV_EDIT, RAD_TO_DEG (vfov));
359355
}
360-
return ;
361356
}
362357

363358

Core/Tools/W3DView/ColorBar.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ ColorBarClass::ColorBarClass (void)
114114
m_ColorPoints[6].StartGreen = 0;
115115
m_ColorPoints[6].StartBlue = 0;
116116
m_ColorPoints[6].flags = POINT_VISIBLE | POINT_CAN_MOVE;*/
117-
return ;
118117
}
119118

120119

@@ -131,7 +130,6 @@ ColorBarClass::~ColorBarClass (void)
131130

132131
Free_Marker_Bitmap ();
133132
Free_Bitmap ();
134-
return ;
135133
}
136134

137135

@@ -395,7 +393,6 @@ ColorBarClass::Create_Bitmap (void)
395393
m_iScanlineSize = (m_iBMPWidth * 3) + alignment_offset;
396394

397395
Update_Point_Info ();
398-
return ;
399396
}
400397

401398

@@ -415,7 +412,6 @@ ColorBarClass::Free_Bitmap (void)
415412

416413
m_iBMPWidth = 0;
417414
m_iBMPHeight = 0;
418-
return ;
419415
}
420416

421417

@@ -436,7 +432,6 @@ ColorBarClass::OnSize
436432

437433
// Recreate the BMP to reflect the new window size
438434
Create_Bitmap ();
439-
return ;
440435
}
441436

442437

Core/Tools/W3DView/ColorPicker.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ Polar_To_Rect (float radius, float angle, float &x, float &y)
419419
{
420420
x = radius * float(cos(angle));
421421
y = radius * float(sin(angle));
422-
return ;
423422
}
424423

425424

@@ -487,7 +486,6 @@ RGB_to_Hue (int red_val, int green_val, int blue_val, float &hue, float &value)
487486
}
488487

489488
value = (float)::fabs (hue_radius / 255);
490-
return ;
491489
}
492490

493491

@@ -690,7 +688,6 @@ ColorPickerClass::Free_Bitmap (void)
690688

691689
m_iWidth = 0;
692690
m_iHeight = 0;
693-
return ;
694691
}
695692

696693

@@ -716,7 +713,6 @@ ColorPickerClass::OnSize
716713
// Determine the new point based on the current color
717714
//m_CurrentColor = RGB (128, 222, 199);
718715
//m_CurrentPoint = Point_From_Color (m_CurrentColor);
719-
return ;
720716
}
721717

722718

0 commit comments

Comments
 (0)