Skip to content

Commit 8eef0f1

Browse files
vitimitivitimiti
committed
Remove more reduntant return statements I had missed.
1 parent 454b04d commit 8eef0f1

26 files changed

+95
-190
lines changed

‎Core/Tools/W3DView/AnimationSpeed.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ CAnimationSpeed::CAnimationSpeed (CWnd* pParent)
5252
//{{AFX_DATA_INIT(CAnimationSpeed)
5353
// NOTE: the ClassWizard will add member initialization here
5454
//}}AFX_DATA_INIT
55-
return ;
56-
}
55+
}
5756

5857
//////////////////////////////////////////////////////////////
5958
//
@@ -66,8 +65,7 @@ CAnimationSpeed::DoDataExchange (CDataExchange* pDX)
6665
//{{AFX_DATA_MAP(CAnimationSpeed)
6766
DDX_Control(pDX, IDC_SPEED_SLIDER, m_speedSlider);
6867
//}}AFX_DATA_MAP
69-
return ;
70-
}
68+
}
7169

7270

7371
BEGIN_MESSAGE_MAP(CAnimationSpeed, CDialog)
@@ -166,8 +164,7 @@ CAnimationSpeed::OnHScroll
166164

167165
// Allow the base class to process this message
168166
CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
169-
return ;
170-
}
167+
}
171168

172169
//////////////////////////////////////////////////////////////
173170
//
@@ -178,8 +175,7 @@ CAnimationSpeed::OnDestroy (void)
178175
{
179176
m_iInitialPercent = m_speedSlider.GetPos ();
180177
CDialog::OnDestroy();
181-
return ;
182-
}
178+
}
183179

184180
//////////////////////////////////////////////////////////////
185181
//

‎Core/Tools/W3DView/BackgroundColorDialog.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ CBackgroundColorDialog::OnHScroll
165165

166166
// Allow the base class to process this message
167167
CDialog::OnHScroll (nSBCode, nPos, pScrollBar);
168-
return ;
169-
}
168+
}
170169

171170
//////////////////////////////////////////////////////////////
172171
//
@@ -220,8 +219,7 @@ CBackgroundColorDialog::OnCancel (void)
220219

221220
// Allow the base class to process this message
222221
CDialog::OnCancel();
223-
return ;
224-
}
222+
}
225223

226224
//////////////////////////////////////////////////////////////
227225
//

‎Core/Tools/W3DView/BackgroundObjectDialog.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ CBackgroundObjectDialog::OnItemChangedHierarchyList
214214
}
215215

216216
*pResult = 0;
217-
return ;
218-
}
217+
}
219218

220219
/////////////////////////////////////////////////////////////
221220
//

‎Core/Tools/W3DView/ColorBar.cpp‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,7 @@ ColorBarClass::OnPaint (void)
712712
{
713713
CPaintDC dc (this);
714714
Paint_Screen (dc);
715-
return ;
716-
}
715+
}
717716

718717

719718
/////////////////////////////////////////////////////////////////////////////
@@ -1039,8 +1038,7 @@ ColorBarClass::Set_Range
10391038
m_MaxPos = max;
10401039

10411040
m_SelectionPos = m_MinPos;
1042-
return ;
1043-
}
1041+
}
10441042

10451043

10461044
/////////////////////////////////////////////////////////////////////////////
@@ -1115,8 +1113,7 @@ ColorBarClass::Update_Point_Info (void)
11151113

11161114
// Repaint the color bar
11171115
Paint_DIB ();
1118-
return ;
1119-
}
1116+
}
11201117

11211118

11221119
/////////////////////////////////////////////////////////////////////////////
@@ -1204,8 +1201,7 @@ ColorBarClass::Load_Key_Frame_BMP (void)
12041201
::SelectObject (htemp_dc, hold_bmp2);
12051202
::DeleteDC (htemp_dc);
12061203
::DeleteObject (hbmp);
1207-
return ;
1208-
}
1204+
}
12091205

12101206

12111207
/////////////////////////////////////////////////////////////////////////////
@@ -1369,8 +1365,7 @@ ColorBarClass::OnLButtonDown
13691365
}
13701366

13711367
CWnd::OnLButtonDown (nFlags, point);
1372-
return ;
1373-
}
1368+
}
13741369

13751370

13761371
/////////////////////////////////////////////////////////////////////////////
@@ -1397,8 +1392,7 @@ ColorBarClass::OnLButtonUp
13971392
}
13981393

13991394
CWnd::OnLButtonUp (nFlags, point);
1400-
return ;
1401-
}
1395+
}
14021396

14031397

14041398
/////////////////////////////////////////////////////////////////////////////
@@ -1473,8 +1467,7 @@ ColorBarClass::OnMouseMove
14731467
}
14741468

14751469
CWnd::OnMouseMove (nFlags, point);
1476-
return ;
1477-
}
1470+
}
14781471

14791472

14801473
/////////////////////////////////////////////////////////////////////////////
@@ -1515,8 +1508,7 @@ ColorBarClass::OnKillFocus (CWnd *pNewWnd)
15151508
Repaint ();
15161509

15171510
CWnd::OnKillFocus (pNewWnd);
1518-
return ;
1519-
}
1511+
}
15201512

15211513

15221514
/////////////////////////////////////////////////////////////////////////////

‎Core/Tools/W3DView/ColorPicker.cpp‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,7 @@ ColorPickerClass::OnLButtonDown
775775

776776
// Allow the base class to process this message
777777
CWnd::OnLButtonDown (nFlags, point);
778-
return ;
779-
}
778+
}
780779

781780

782781
/////////////////////////////////////////////////////////////////////////////
@@ -799,8 +798,7 @@ ColorPickerClass::OnLButtonUp
799798

800799
// Allow the base class to process this message
801800
CWnd::OnLButtonUp (nFlags, point);
802-
return ;
803-
}
801+
}
804802

805803

806804
/////////////////////////////////////////////////////////////////////////////
@@ -844,8 +842,7 @@ ColorPickerClass::OnMouseMove
844842

845843
// Allow the base class to process this message
846844
CWnd::OnMouseMove (nFlags, point);
847-
return ;
848-
}
845+
}
849846

850847

851848
/////////////////////////////////////////////////////////////////////////////
@@ -897,8 +894,7 @@ ColorPickerClass::Erase_Marker (void)
897894
}
898895

899896
::ReleaseDC (m_hWnd, hdc);
900-
return ;
901-
}
897+
}
902898

903899

904900
/////////////////////////////////////////////////////////////////////////////
@@ -932,8 +928,7 @@ ColorPickerClass::Paint_Marker (void)
932928
}
933929

934930
::ReleaseDC (m_hWnd, hdc);
935-
return ;
936-
}
931+
}
937932

938933

939934
/////////////////////////////////////////////////////////////////////////////
@@ -951,8 +946,7 @@ ColorPickerClass::Select_Color (int red, int green, int blue)
951946
// Refresh the window
952947
InvalidateRect (NULL, FALSE);
953948
UpdateWindow ();
954-
return ;
955-
}
949+
}
956950

957951

958952
/////////////////////////////////////////////////////////////////////////////
@@ -966,5 +960,4 @@ ColorPickerClass::Get_Current_Color (int *red, int *green, int *blue)
966960
(*red) = GetRValue (m_CurrentColor);
967961
(*green) = GetGValue (m_CurrentColor);
968962
(*blue) = GetBValue (m_CurrentColor);
969-
return ;
970-
}
963+
}

‎Core/Tools/W3DView/ColorPickerDialogClass.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,7 @@ ColorPickerDialogClass::OnReset (void)
582582
m_OrigGreen,
583583
m_OrigBlue,
584584
UPDATE_COLOR_BARS| UPDATE_WHITENESS | UPDATE_HUE_PICKER);
585-
return ;
586-
}
585+
}
587586

588587
LRESULT ColorPickerDialogClass::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
589588
{

‎Core/Tools/W3DView/ColorUtils.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ Draw_Sunken_Rect
4646
::Draw_Vert_Line (pbits, rect.right-1, rect.top, height, ::GetSysColor (COLOR_3DHIGHLIGHT), scanline_size);
4747
::Draw_Horz_Line (pbits, rect.left, rect.top, width, ::GetSysColor (COLOR_3DSHADOW), scanline_size);
4848
::Draw_Horz_Line (pbits, rect.left, rect.bottom-1, width, ::GetSysColor (COLOR_3DHIGHLIGHT), scanline_size);
49-
return ;
50-
}
49+
}
5150

5251

5352
/////////////////////////////////////////////////////////////////////////////
@@ -70,8 +69,7 @@ Draw_Raised_Rect
7069
::Draw_Vert_Line (pbits, rect.right-1, rect.top, height, ::GetSysColor (COLOR_3DSHADOW), scanline_size);
7170
::Draw_Horz_Line (pbits, rect.left, rect.top, width, ::GetSysColor (COLOR_3DHIGHLIGHT), scanline_size);
7271
::Draw_Horz_Line (pbits, rect.left, rect.bottom-1, width, ::GetSysColor (COLOR_3DSHADOW), scanline_size);
73-
return ;
74-
}
72+
}
7573

7674

7775
/////////////////////////////////////////////////////////////////////////////

‎Core/Tools/W3DView/DataTreeView.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ END_MESSAGE_MAP()
131131
void
132132
CDataTreeView::OnDraw (CDC *pDC)
133133
{
134-
return ;
135-
}
134+
}
136135

137136
/////////////////////////////////////////////////////////////////////////////
138137
// CDataTreeView diagnostics
@@ -179,8 +178,7 @@ CDataTreeView::OnInitialUpdate (void)
179178
CTreeView::OnInitialUpdate ();
180179

181180
// TODO: Add your specialized code here and/or call the base class
182-
return ;
183-
}
181+
}
184182

185183

186184
////////////////////////////////////////////////////////////////////////////
@@ -200,8 +198,7 @@ CDataTreeView::CreateRootNodes (void)
200198
m_hEmitterRoot = GetTreeCtrl ().InsertItem ("Emitter", m_iEmitterIcon, m_iEmitterIcon);
201199
m_hPrimitivesRoot = GetTreeCtrl ().InsertItem ("Primitives", m_iPrimitivesIcon, m_iPrimitivesIcon);
202200
m_hSoundRoot = GetTreeCtrl ().InsertItem ("Sounds", m_iSoundIcon, m_iSoundIcon);
203-
return ;
204-
}
201+
}
205202

206203

207204
////////////////////////////////////////////////////////////////////////////
@@ -430,8 +427,7 @@ CDataTreeView::LoadAssetsIntoTree (void)
430427
// Force the window to be repainted
431428
Invalidate (FALSE);
432429
UpdateWindow ();
433-
return ;
434-
}
430+
}
435431

436432
////////////////////////////////////////////////////////////////////////////
437433
//

‎Core/Tools/W3DView/DeviceSelectionDialog.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ CDeviceSelectionDialog::CDeviceSelectionDialog
5555
//{{AFX_DATA_INIT(CDeviceSelectionDialog)
5656
// NOTE: the ClassWizard will add member initialization here
5757
//}}AFX_DATA_INIT
58-
return ;
59-
}
58+
}
6059

6160
////////////////////////////////////////////////////////////////////
6261
//
@@ -70,8 +69,7 @@ CDeviceSelectionDialog::DoDataExchange (CDataExchange* pDX)
7069
//{{AFX_DATA_MAP(CDeviceSelectionDialog)
7170
DDX_Control(pDX, IDC_RENDER_DEVICE_COMBO, m_deviceListComboBox);
7271
//}}AFX_DATA_MAP
73-
return ;
74-
}
72+
}
7573

7674

7775
BEGIN_MESSAGE_MAP(CDeviceSelectionDialog, CDialog)

‎Core/Tools/W3DView/EmitterColorPropPage.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ EmitterColorPropPageClass::DoDataExchange (CDataExchange* pDX)
102102
DDX_Control(pDX, IDC_GREEN_RANDOM_SPIN, m_GreenRandomSpin);
103103
DDX_Control(pDX, IDC_BLUE_RANDOM_SPIN, m_BlueRandomSpin);
104104
//}}AFX_DATA_MAP
105-
return ;
106-
}
105+
}
107106

108107

109108
BEGIN_MESSAGE_MAP(EmitterColorPropPageClass, CPropertyPage)
@@ -261,8 +260,7 @@ void
261260
EmitterColorPropPageClass::OnDestroy (void)
262261
{
263262
CPropertyPage::OnDestroy();
264-
return ;
265-
}
263+
}
266264

267265

268266
/////////////////////////////////////////////////////////////
@@ -421,8 +419,7 @@ EmitterColorPropPageClass::OnCancel (void)
421419
m_pEmitterList->Set_Opacity_Keyframes (m_OrigOpacities);
422420

423421
CPropertyPage::OnCancel ();
424-
return ;
425-
}
422+
}
426423

427424

428425
/////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)