minor code cleaning

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

4 files changed, 12 insertions, 11 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 284b5c2d15..982f51d51f 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -195,8 +195,6 @@ void MakeButtonSkinned(HWND hWnd);
 

 extern void TRACE_ERROR();

 extern BOOL DebugDeleteObject(HGDIOBJ a);

-extern BOOL ske_ResetTextEffect(HDC hdc);

-extern BOOL ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);

 extern void IvalidateDisplayNameCache(DWORD mode);

 

 extern SortedList *clistCache;

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 328552b6ce..150bb33395 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -138,7 +138,7 @@ int     RowHeight_CalcRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, in
 

 /* SkinEngine */

 BOOL    ske_AlphaBlend(HDC hdcDest,int nXOriginDest,int nYOriginDest,int nWidthDest,int nHeightDest,HDC hdcSrc,int nXOriginSrc,int nYOriginSrc,int nWidthSrc,int nHeightSrc,BLENDFUNCTION blendFunction);

-void    ske_ApplyTransluency(void);

+void    ske_ApplyTranslucency(void);

 int     ske_BltBackImage (HWND destHWND, HDC destDC, RECT *BltClientRect);

 HBITMAP ske_CreateDIB32(int cx, int cy);

 HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits);

@@ -148,7 +148,6 @@ int     ske_DrawImageAt(HDC hdc, RECT *rc);
 BOOL    ske_DrawIconEx(HDC hdc,int xLeft,int yTop,HICON hIcon,int cxWidth,int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);

 int     ske_DrawNonFramedObjects(BOOL Erase,RECT *r);

 BOOL    ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format);

-BOOL    ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT *lpRect, UINT format);

 LPSKINOBJECTDESCRIPTOR   ske_FindObjectByName(const char * szName, BYTE objType, SKINOBJECTSLIST* Skin);

 HBITMAP ske_GetCurrentWindowImage();

 int     ske_GetFullFilename(TCHAR *buf, const TCHAR *file, TCHAR *skinfolder,BOOL madeAbsolute);

@@ -161,22 +160,25 @@ HRESULT SkinEngineLoadModule();
 void    ske_LoadSkinFromDB(void);

 int     ske_LoadSkinFromIniFile(TCHAR*, BOOL);

 TCHAR*  ske_ParseText(TCHAR *stzText);

-int     ske_PrepeareImageButDontUpdateIt(RECT *r);

+int     ske_PrepareImageButDontUpdateIt(RECT *r);

 int     ske_ReCreateBackImage(BOOL Erase,RECT *w);

 int     ske_RedrawCompleteWindow();

-BOOL    ske_ResetTextEffect(HDC);

-BOOL    ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);

+bool    ske_ResetTextEffect(HDC);

+bool    ske_SelectTextEffect(HDC hdc, BYTE EffectID, DWORD FirstColor, DWORD SecondColor);

 INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);

 BOOL    ske_SetRectOpaque(HDC memdc,RECT *fr, BOOL force = FALSE );

 BOOL    ske_SetRgnOpaque(HDC memdc,HRGN hrgn, BOOL force = FALSE );

 BOOL    ske_TextOut(HDC hdc, int x, int y, LPCTSTR lpString, int nCount);

-BOOL    ske_TextOutA(HDC hdc, int x, int y, char * lpString, int nCount);

 int     ske_UnloadGlyphImage(HBITMAP hbmp);

 int     SkinEngineUnloadModule();

 int     ske_UpdateWindowImage();

 int     ske_UpdateWindowImageRect(RECT *lpRect);

 int     ske_ValidateFrameImageProc(RECT *r);

 

+__forceinline BOOL ske_DrawTextA(HDC hdc, char *lpString, int nCount, RECT *lpRect, UINT format)

+{	return ske_DrawText(hdc, _A2T(lpString), nCount, lpRect, format);

+}

+

 /* CLUIFrames.c PROXIED */

 

 int CLUIFrames_ActivateSubContainers(BOOL wParam);

diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
index 87fd769f40..7ada5601b3 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h
@@ -86,11 +86,12 @@ struct tga_header_t
 class IniParser

 {

 public:

-	enum {	FLAG_WITH_SETTINGS = 0,

+	enum {

+		FLAG_WITH_SETTINGS = 0,

 		FLAG_ONLY_OBJECTS = 1,

 	};

 

-	enum {	IT_UNKNOWN,	IT_FILE, IT_RESOURCE };

+	enum { IT_UNKNOWN, IT_FILE, IT_RESOURCE };

 

 	typedef HRESULT (*ParserCallback_t)( const char * szSection, const char * szKey, const char * szValue, IniParser * This );

 

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index 357f3967e9..3f31975f3c 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -79,7 +79,7 @@ void GroupMenus_Init();
 int ModernSkinButtonLoadModule();
 int ModernSkinButton_ReposButtons(HWND parent, BYTE draw,RECT *r);
 
-void ske_ApplyTransluency();
+void ske_ApplyTranslucency();
 HBITMAP ske_CreateDIB32(int cx, int cy);
 HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits);
 int ske_JustUpdateWindowImage();