remove 'Sky' name prefix for most stuff (not needed anymore since we are in namespace 'Sky' now)

svn-id: r12114

1 files changed, 19 insertions, 19 deletions

diff --git a/sky/sky.h b/sky/sky.h
index d6e2ddd0c1..69b2208d95 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -42,15 +42,15 @@ struct SystemVars {
 };
 
 struct Compact;
-class SkySound;
-class SkyDisk;
-class SkyText;
-class SkyLogic;
-class SkyMouse;
-class SkyScreen;
-class SkyControl;
-class SkyMusicBase;
-class SkyIntro;
+class Sound;
+class Disk;
+class Text;
+class Logic;
+class Mouse;
+class Screen;
+class Control;
+class MusicBase;
+class Intro;
 
 class SkyEngine : public Engine {
 	void errorString(const char *buf_input, char *buf_output);
@@ -69,16 +69,16 @@ protected:
 
 	int _sdl_mouse_x, _sdl_mouse_y;
 
-	SkySound *_skySound;
-	SkyDisk *_skyDisk;
-	SkyText *_skyText;
-	SkyLogic *_skyLogic;
-	SkyMouse *_skyMouse;
-	SkyScreen *_skyScreen;
-	SkyControl *_skyControl;
+	Sound *_skySound;
+	Disk *_skyDisk;
+	Text *_skyText;
+	Logic *_skyLogic;
+	Mouse *_skyMouse;
+	Screen *_skyScreen;
+	Control *_skyControl;
 
-	SkyMusicBase *_skyMusic;
-	SkyIntro *_skyIntro;
+	MusicBase *_skyMusic;
+	Intro *_skyIntro;
 	
 public:
 	SkyEngine(GameDetector *detector, OSystem *syst);
@@ -105,7 +105,7 @@ protected:
 
 	uint32 _lastSaveTime;
 
-	SkyText *getSkyText();
+	Text *getText();
 	void initialise();
 	void initItemList();