[Scummvm-git-logs] scummvm master -> 4522cfff118c222befd3695e23ab1a65f1fbacac

sev- noreply at scummvm.org
Sat Aug 24 23:27:28 UTC 2024 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4522cfff11 QDENGINE: Remove spurious semicolons


Commit: 4522cfff118c222befd3695e23ab1a65f1fbacac
    https://github.com/scummvm/scummvm/commit/4522cfff118c222befd3695e23ab1a65f1fbacac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-25T01:26:05+02:00

Commit Message:
QDENGINE: Remove spurious semicolons

Changed paths:
    engines/qdengine/parser/xml_parser.cpp
    engines/qdengine/parser/xml_parser.h
    engines/qdengine/parser/xml_tag_buffer.cpp
    engines/qdengine/qd_runtime.cpp
    engines/qdengine/qdcore/qd_camera.cpp
    engines/qdengine/qdcore/qd_engine_interface.h
    engines/qdengine/qdcore/qd_grid_zone.cpp
    engines/qdengine/qdcore/qd_minigame_interface.cpp
    engines/qdengine/system/graphics/gr_tile_sprite.cpp
    engines/qdengine/system/input/input_wndproc.cpp
    engines/qdengine/system/input/input_wndproc.h


diff --git a/engines/qdengine/parser/xml_parser.cpp b/engines/qdengine/parser/xml_parser.cpp
index 77e4e04fd3c..27fefad99cf 100644
--- a/engines/qdengine/parser/xml_parser.cpp
+++ b/engines/qdengine/parser/xml_parser.cpp
@@ -110,6 +110,6 @@ bool parser::is_script_binary(const char *fname) const {
 	return false;
 }
 
-}; /* namespace xml */
+} /* namespace xml */
 
 } // namespace QDEngine
diff --git a/engines/qdengine/parser/xml_parser.h b/engines/qdengine/parser/xml_parser.h
index 82c06bdde0e..4332f2d170a 100644
--- a/engines/qdengine/parser/xml_parser.h
+++ b/engines/qdengine/parser/xml_parser.h
@@ -93,7 +93,7 @@ private:
 	bool _skip_mode;
 };
 
-}; /* namespace xml */
+} /* namespace xml */
 
 } // namespace QDEngine
 
diff --git a/engines/qdengine/parser/xml_tag_buffer.cpp b/engines/qdengine/parser/xml_tag_buffer.cpp
index 7228b0dd073..0b74ba38faf 100644
--- a/engines/qdengine/parser/xml_tag_buffer.cpp
+++ b/engines/qdengine/parser/xml_tag_buffer.cpp
@@ -107,6 +107,6 @@ tag_buffer &tag_buffer::operator >= (float &var) {
 	return *this;
 }
 
-}; /* namespace xml */
+} /* namespace xml */
 
 } // namespace QDEngine
diff --git a/engines/qdengine/qd_runtime.cpp b/engines/qdengine/qd_runtime.cpp
index db489673f2e..f512f132501 100644
--- a/engines/qdengine/qd_runtime.cpp
+++ b/engines/qdengine/qd_runtime.cpp
@@ -56,7 +56,7 @@ grDispatcher *grD = NULL;
 
 qdGameDispatcher *qd_gameD = NULL;
 
-}; // namespace qdrt
+} // namespace qdrt
 
 using namespace qdrt;
 
@@ -381,5 +381,6 @@ void restore_graphics() {
 void restore() {
 }
 
-}; // namespace main
+} // namespace main
+
 } // namespace QDEngine
diff --git a/engines/qdengine/qdcore/qd_camera.cpp b/engines/qdengine/qdcore/qd_camera.cpp
index 79981e3c058..2efa372dfe7 100644
--- a/engines/qdengine/qdcore/qd_camera.cpp
+++ b/engines/qdengine/qdcore/qd_camera.cpp
@@ -187,35 +187,35 @@ const Vect3f qdCamera::rscr2global(const Vect2s rScrPoint, const float zInCamera
 	Vect3f _t = rscr2camera_coord(rScrPoint, zInCameraCoord);
 	//Преобразование координаты в системе камеры - в координаты глобальные(в системе основной плоскости)
 	return camera_coord2global(_t);
-};
+}
 
 const Vect3f qdCamera::global2camera_coord(const Vect3f &glCoord) const {
 	return TransformVector(glCoord, _m_cam);
-};
+}
 
 const Vect3f qdCamera::rscr2camera_coord(const Vect2s &rScrPoint, float z) const {
 	float x = ((float)rScrPoint.x * (z + _focus)) / _focus;
 	float y = ((float)rScrPoint.y * (z + _focus)) / _focus;
 	return Vect3f(x, y, z);
-};
+}
 
 const Vect2s qdCamera::camera_coord2rscr(const Vect3f &coord) const {
 	int16 sx = round(coord.x * _focus / (coord.z + _focus));
 	int16 sy = round(coord.y * _focus / (coord.z + _focus));
 	return Vect2s(sx, sy);
-};
+}
 
 const Vect2s qdCamera::camera_coord2scr(const Vect3f &coord) const {
 	return rscr2scr(camera_coord2rscr(coord));
-};
+}
 
 const Vect2s qdCamera::global2scr(const Vect3f &glCoord) const {
 	return camera_coord2scr(global2camera_coord(glCoord));
-};
+}
 
 const Vect2s qdCamera::global2rscr(const Vect3f &glCoord) const {
 	return camera_coord2rscr(global2camera_coord(glCoord));
-};
+}
 
 void qdCamera::set_R(const float r) {
 	_m_fR = r;
diff --git a/engines/qdengine/qdcore/qd_engine_interface.h b/engines/qdengine/qdcore/qd_engine_interface.h
index 93ab218e296..35a0b329a3f 100644
--- a/engines/qdengine/qdcore/qd_engine_interface.h
+++ b/engines/qdengine/qdcore/qd_engine_interface.h
@@ -79,7 +79,7 @@ public:
 	}
 };
 
-}; // namespace qdmg
+} // namespace qdmg
 
 } // namespace QDEngine
 
diff --git a/engines/qdengine/qdcore/qd_grid_zone.cpp b/engines/qdengine/qdcore/qd_grid_zone.cpp
index 4180b26847f..ad5c409abd5 100644
--- a/engines/qdengine/qdcore/qd_grid_zone.cpp
+++ b/engines/qdengine/qdcore/qd_grid_zone.cpp
@@ -57,7 +57,7 @@ qdGridZone::qdGridZone(const qdGridZone &gz) : qdNamedObject(gz), qdContour(gz),
 }
 
 qdGridZone::~qdGridZone() {
-};
+}
 
 qdGridZone &qdGridZone::operator = (const qdGridZone &gz) {
 	if (this == &gz) return *this;
diff --git a/engines/qdengine/qdcore/qd_minigame_interface.cpp b/engines/qdengine/qdcore/qd_minigame_interface.cpp
index 58146b3ce4e..481e56ebf59 100644
--- a/engines/qdengine/qdcore/qd_minigame_interface.cpp
+++ b/engines/qdengine/qdcore/qd_minigame_interface.cpp
@@ -220,7 +220,7 @@ private:
 	qdCounter *_counter;
 };
 
-}; // namespace qdmg
+} // namespace qdmg
 
 /* ----------------------------- EXTERN SECTION ----------------------------- */
 /* --------------------------- PROTOTYPE SECTION ---------------------------- */
@@ -580,5 +580,5 @@ void qdMinigameCounterInterfaceImpl::add_value(int value_delta) {
 		_counter->add_value(value_delta);
 }
 
-}; // namespace qdmg
+} // namespace qdmg
 } // namespace QDEngine
diff --git a/engines/qdengine/system/graphics/gr_tile_sprite.cpp b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
index f5d1b47ba9c..48541991c21 100644
--- a/engines/qdengine/system/graphics/gr_tile_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
@@ -94,7 +94,7 @@ bool decodeRLE(const uint32 *in_data, uint32 *out_data) {
 	return true;
 }
 
-}; // namespace tile_compress
+} // namespace tile_compress
 
 void grDispatcher::putTileSpr(int x, int y, const grTileSprite &sprite, bool has_alpha, int mode) {
 	int px = 0;
diff --git a/engines/qdengine/system/input/input_wndproc.cpp b/engines/qdengine/system/input/input_wndproc.cpp
index fee77744fbc..c27bb1fb4a0 100644
--- a/engines/qdengine/system/input/input_wndproc.cpp
+++ b/engines/qdengine/system/input/input_wndproc.cpp
@@ -80,6 +80,6 @@ bool mouse_wndproc(const Common::Event &event, mouseDispatcher *dsp) {
 	return false;
 }
 
-}; /* namespace input */
+} /* namespace input */
 
 } // namespace QDEngine
diff --git a/engines/qdengine/system/input/input_wndproc.h b/engines/qdengine/system/input/input_wndproc.h
index 86f78d220a9..9f7bf9d7794 100644
--- a/engines/qdengine/system/input/input_wndproc.h
+++ b/engines/qdengine/system/input/input_wndproc.h
@@ -55,7 +55,7 @@ WM_LBUTTONUP
 WM_RBUTTONUP
 */
 bool mouse_wndproc(const Common::Event &event, mouseDispatcher *dsp);
-};
+}
 
 } // namespace QDEngine

More information about the Scummvm-git-logs mailing list