last portion of fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@6855 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 14 insertions, 37 deletions

diff --git a/plugins/SmileyAdd/src/imagecache.h b/plugins/SmileyAdd/src/imagecache.h
index d8abe2e6b6..615dbecc44 100644
--- a/plugins/SmileyAdd/src/imagecache.h
+++ b/plugins/SmileyAdd/src/imagecache.h
@@ -23,7 +23,7 @@ class ImageBase
 protected:

 	unsigned m_id;

 	long m_lRefCount;

-    time_t m_timestamp;

+	time_t m_timestamp;

 

 public:

 

@@ -33,19 +33,19 @@ public:
 	long AddRef(void);

 	long Release(void);

 

-    void ProcessTimerTick(time_t ts);

+	void ProcessTimerTick(time_t ts);

 

-    virtual void GetSize(SIZE& /* size */) {};

+	virtual void GetSize(SIZE& /* size */) {};

 	virtual int  GetFrameCount(void) const { return 0; }

 	virtual int  GetFrameDelay(void) const { return 0; }

-    virtual HICON GetIcon(void) { return NULL; }; 

-    virtual void DrawInternal(HDC /* dc */, int /* x */, int /* y */, int /* sizeX */, int /* sizeY */) {};

-    virtual void SelectFrame(int /* frame */) {}

+	virtual HICON GetIcon(void) { return NULL; };

+	virtual void DrawInternal(HDC /* dc */, int /* x */, int /* y */, int /* sizeX */, int /* sizeY */) {};

+	virtual void SelectFrame(int /* frame */) {}

 

 	bool IsAnimated(void) const { return GetFrameCount() > 1; }

 	HBITMAP GetBitmap(COLORREF bkgClr, int sizeX, int sizeY);

 	void Draw(HDC dc, RECT &rc, bool clip);

-    int SelectNextFrame(const int frame);

+	int SelectNextFrame(const int frame);

 

 	static int CompareImg(const ImageBase* p1, const ImageBase* p2);

 };

@@ -93,7 +93,7 @@ public:
 class ImageType : public ImageBase

 {

 private:

-	int	m_nCurrentFrame;

+	int m_nCurrentFrame;

 	int m_nFrameCount;

 

 	Gdiplus::Bitmap*        m_bmp;

@@ -102,13 +102,13 @@ private:
 public:

 

 	ImageType(const unsigned id, const CMString& file, IStream* pStream);

-    ImageType(const unsigned id, const CMString& file, const int index, const IcoTypeEnum type);

+	ImageType(const unsigned id, const CMString& file, const int index, const IcoTypeEnum type);

 	~ImageType();

 

-    void SelectFrame(int frame);

+	void SelectFrame(int frame);

 

-    void DrawInternal(HDC dc, int x, int y, int sizeX, int sizeY);

-	HICON GetIcon(void); 

+	void DrawInternal(HDC dc, int x, int y, int sizeX, int sizeY);

+	HICON GetIcon(void);

 	void GetSize(SIZE& size);

 

 	int  GetFrameDelay(void) const;

@@ -122,37 +122,14 @@ protected:
 

 public:

 

-    ImageFType(const unsigned id);

+	ImageFType(const unsigned id);

 	ImageFType(const unsigned id, const CMString& file);

 	~ImageFType();

 

 	void DrawInternal(HDC dc, int x, int y, int sizeX, int sizeY);

-	HICON GetIcon(void); 

+	HICON GetIcon(void);

 	void GetSize(SIZE& size);

 };

-/*

-class ImageFAniType : public ImageFType

-{

-private:

-	int	m_nCurrentFrame;

-	int m_nFrameCount;

-    int *m_FrameDelay;

-

-    FIMULTIBITMAP *m_fmbmp;

-    HBITMAP* m_bmpl;

-

-public:

-

-	ImageFAniType(const unsigned id, const CMString& file);

-	~ImageFAniType();

-

-    void SelectFrame(int frame);

-

-	int  GetFrameDelay(void) const { return m_FrameDelay[m_nCurrentFrame]; }

-	int  GetFrameCount(void) const { return m_nFrameCount; }

-};

-*/

-

 

 ImageBase* AddCacheImage(const CMString& file, int index);