diff options
author | George Hazan <george.hazan@gmail.com> | 2016-03-03 14:07:30 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2016-03-03 14:07:30 +0000 |
commit | 44223012ce0fa631cc5af6fc588166bccc3a66f6 (patch) | |
tree | ce2964a947203e59056e7987dc675c21d291b222 /plugins/SmileyAdd/src/general.cpp | |
parent | 5357bfc0d1ca654ae51f71ca67a8faad0d5b5264 (diff) |
- more obsolete shit removed;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@16404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/src/general.cpp')
-rw-r--r-- | plugins/SmileyAdd/src/general.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index 2900f276b6..f09ccbb30e 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -25,7 +25,7 @@ static bool gdiPlusFail = false; //
// General functions
//
-int CalculateTextHeight(HDC hdc, CHARFORMAT2* chf)
+int CalculateTextHeight(HDC hdc, CHARFORMAT2 *chf)
{
HDC hcdc = CreateCompatibleDC(hdc);
@@ -61,7 +61,7 @@ HICON GetDefaultIcon(bool copy) const TCHAR* GetImageExt(CMString &fname)
{
- const TCHAR* ext = _T("");
+ const TCHAR *ext = _T("");
int fileId = _topen(fname.c_str(), O_RDONLY | _O_BINARY);
if (fileId != -1) {
@@ -99,22 +99,20 @@ HICON ImageList_GetIconFixed(HIMAGELIST himl, INT i, UINT fStyle) ii.xHotspot = 0;
ii.yHotspot = 0;
- /* draw mask*/
+ // draw mask
ii.hbmMask = CreateBitmap(cx, cy, 1, 1, NULL);
hOldDstBitmap = (HBITMAP)SelectObject(hdcDst, ii.hbmMask);
PatBlt(hdcDst, 0, 0, cx, cy, WHITENESS);
ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle | ILD_MASK);
- /* draw image*/
+ // draw image
ii.hbmColor = CreateBitmap(cx, cy, 1, 32, NULL);
SelectObject(hdcDst, ii.hbmColor);
PatBlt(hdcDst, 0, 0, cx, cy, BLACKNESS);
ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle | ILD_TRANSPARENT);
- /*
- * CreateIconIndirect requires us to deselect the bitmaps from
- * the DCs before calling
- */
+ // CreateIconIndirect requires us to deselect the bitmaps from
+ // the DCs before calling
SelectObject(hdcDst, hOldDstBitmap);
hIcon = CreateIconIndirect(&ii);
@@ -126,14 +124,14 @@ HICON ImageList_GetIconFixed(HIMAGELIST himl, INT i, UINT fStyle) return hIcon;
}
-void pathToRelative(const CMString& pSrc, CMString& pOut)
+void pathToRelative(const CMString &pSrc, CMString &pOut)
{
TCHAR szOutPath[MAX_PATH];
PathToRelativeT(pSrc.c_str(), szOutPath);
pOut = szOutPath;
}
-void pathToAbsolute(const CMString& pSrc, CMString& pOut)
+void pathToAbsolute(const CMString &pSrc, CMString &pOut)
{
TCHAR szOutPath[MAX_PATH];
@@ -161,9 +159,9 @@ static int __fastcall SingleHexToDecimal(char c) return -1;
}
-void UrlDecode(char* str)
+void UrlDecode(char *str)
{
- char* s = str, *d = str;
+ char *s = str, *d = str;
while (*s) {
if (*s == '%') {
|