From 2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 3 Dec 2014 01:12:35 +0200 Subject: ZVISION: Remove superfluous spacing and reorder some includes --- engines/zvision/scripting/controls/fist_control.cpp | 1 - engines/zvision/scripting/controls/fist_control.h | 1 - engines/zvision/scripting/controls/hotmov_control.cpp | 1 - engines/zvision/scripting/controls/hotmov_control.h | 1 - engines/zvision/scripting/controls/input_control.cpp | 1 - engines/zvision/scripting/controls/input_control.h | 1 - engines/zvision/scripting/controls/lever_control.cpp | 1 - engines/zvision/scripting/controls/lever_control.h | 1 - engines/zvision/scripting/controls/paint_control.cpp | 2 -- engines/zvision/scripting/controls/paint_control.h | 1 - engines/zvision/scripting/controls/push_toggle_control.cpp | 1 - engines/zvision/scripting/controls/push_toggle_control.h | 1 - engines/zvision/scripting/controls/safe_control.cpp | 1 - engines/zvision/scripting/controls/safe_control.h | 1 - engines/zvision/scripting/controls/save_control.cpp | 1 - engines/zvision/scripting/controls/save_control.h | 1 - engines/zvision/scripting/controls/slot_control.cpp | 1 - engines/zvision/scripting/controls/slot_control.h | 1 - engines/zvision/scripting/controls/titler_control.cpp | 1 - engines/zvision/scripting/controls/titler_control.h | 1 - 20 files changed, 21 deletions(-) (limited to 'engines/zvision/scripting/controls') diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp index 9bb03cba51..dd6a7f11a9 100644 --- a/engines/zvision/scripting/controls/fist_control.cpp +++ b/engines/zvision/scripting/controls/fist_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h index 33c3c7b579..cb765c429a 100644 --- a/engines/zvision/scripting/controls/fist_control.h +++ b/engines/zvision/scripting/controls/fist_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp index fd7afb92d1..68861dc221 100644 --- a/engines/zvision/scripting/controls/hotmov_control.cpp +++ b/engines/zvision/scripting/controls/hotmov_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h index 9e01b40bab..86600d65dc 100644 --- a/engines/zvision/scripting/controls/hotmov_control.h +++ b/engines/zvision/scripting/controls/hotmov_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index 8af436bb40..c541693ec3 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/engines/zvision/scripting/controls/input_control.cpp @@ -35,7 +35,6 @@ #include "common/stream.h" #include "common/rect.h" - namespace ZVision { InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h index 9a829d30f6..410caf6d49 100644 --- a/engines/zvision/scripting/controls/input_control.h +++ b/engines/zvision/scripting/controls/input_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" - namespace ZVision { class InputControl : public Control { diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index 1f176ef9d0..12b07d7584 100644 --- a/engines/zvision/scripting/controls/lever_control.cpp +++ b/engines/zvision/scripting/controls/lever_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h index 8de6d1e5c9..37d4d3bd8d 100644 --- a/engines/zvision/scripting/controls/lever_control.h +++ b/engines/zvision/scripting/controls/lever_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp index cb3c17e0fd..9bad6f2c58 100644 --- a/engines/zvision/scripting/controls/paint_control.cpp +++ b/engines/zvision/scripting/controls/paint_control.cpp @@ -110,8 +110,6 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre delete _paint; _paint = tmp; } - - } PaintControl::~PaintControl() { diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h index aac4755fcd..8097290ac2 100644 --- a/engines/zvision/scripting/controls/paint_control.h +++ b/engines/zvision/scripting/controls/paint_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class PaintControl : public Control { diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp index ea4e947abe..c5ec070899 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.cpp +++ b/engines/zvision/scripting/controls/push_toggle_control.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h index 6d68b8f162..9444c77cb6 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.h +++ b/engines/zvision/scripting/controls/push_toggle_control.h @@ -29,7 +29,6 @@ #include "common/events.h" #include "common/array.h" - namespace ZVision { class PushToggleControl : public Control { diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp index 66ab53085f..3ad5d3a8ae 100644 --- a/engines/zvision/scripting/controls/safe_control.cpp +++ b/engines/zvision/scripting/controls/safe_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h index e682e35050..e32ca97b70 100644 --- a/engines/zvision/scripting/controls/safe_control.h +++ b/engines/zvision/scripting/controls/safe_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp index 7e1a65a9cc..ad01257e6b 100644 --- a/engines/zvision/scripting/controls/save_control.cpp +++ b/engines/zvision/scripting/controls/save_control.cpp @@ -35,7 +35,6 @@ #include "common/str.h" #include "common/stream.h" - namespace ZVision { SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h index fefb0e0ce2..cdc50eb54d 100644 --- a/engines/zvision/scripting/controls/save_control.h +++ b/engines/zvision/scripting/controls/save_control.h @@ -27,7 +27,6 @@ #include "common/list.h" - namespace ZVision { class SaveControl : public Control { diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp index 074d1905b4..1d83b44392 100644 --- a/engines/zvision/scripting/controls/slot_control.cpp +++ b/engines/zvision/scripting/controls/slot_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h index 86fd261f25..e776d99311 100644 --- a/engines/zvision/scripting/controls/slot_control.h +++ b/engines/zvision/scripting/controls/slot_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class SlotControl : public Control { diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp index b803501033..f0126bebc2 100644 --- a/engines/zvision/scripting/controls/titler_control.cpp +++ b/engines/zvision/scripting/controls/titler_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h index ee230afa97..075e47c9e9 100644 --- a/engines/zvision/scripting/controls/titler_control.h +++ b/engines/zvision/scripting/controls/titler_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/array.h" - namespace ZVision { class TitlerControl : public Control { -- cgit v1.2.3