1.0-pre1v1.0-pre1

1 files changed, 14 insertions, 13 deletions

diff --git a/loader.h b/loader.h
index 5f22d7a..159f7fe 100644
--- a/loader.h
+++ b/loader.h
@@ -1,5 +1,5 @@
 /*
- * $Id: loader.h,v 1.5 2004/06/07 18:23:11 lordjaxom Exp $
+ * $Id: loader.h,v 1.1.1.1 2004/11/19 16:45:31 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_LOADER_H
@@ -8,33 +8,34 @@
 #include "common.h"
 #include <vdr/skins.h>
 
-class cText2SkinData;
+class cxSkin;
 class cText2SkinI18n;
 class cText2SkinTheme;
 
 class cText2SkinLoader: public cSkin {
 private:
-	cText2SkinData  *mData;
+	cxSkin          *mData;
 	cText2SkinI18n  *mI18n;
 	cText2SkinTheme *mTheme;
-	string           mDescription;
+	std::string      mDescription;
 
 public:
 	static void Start(void);
 	static void Load(const char *Skin);
 
-	cText2SkinLoader(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme, const string &Skin, const string &Description);
+	cText2SkinLoader(cxSkin *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme, 
+			const std::string &Skin, const std::string &Description);
 	~cText2SkinLoader();
   
 	virtual const char *Description(void) { return mDescription.c_str(); }
-  virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
-  virtual cSkinDisplayMenu *DisplayMenu(void);
-  virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
-  virtual cSkinDisplayVolume *DisplayVolume(void);
-  virtual cSkinDisplayMessage *DisplayMessage(void);
-
-	cText2SkinData *Data(void) const { return mData; }
-	cText2SkinI18n *I18n(void) const { return mI18n; }
+	virtual cSkinDisplayChannel *DisplayChannel(bool WithInfo);
+	virtual cSkinDisplayMenu *DisplayMenu(void);
+	virtual cSkinDisplayReplay *DisplayReplay(bool ModeOnly);
+	virtual cSkinDisplayVolume *DisplayVolume(void);
+	virtual cSkinDisplayMessage *DisplayMessage(void);
+
+	cxSkin          *Data(void) const { return mData; }
+	cText2SkinI18n  *I18n(void) const { return mI18n; }
 	cText2SkinTheme *Theme(void) const { return mTheme; }
 };