summaryrefslogtreecommitdiff
path: root/src/modules/options
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-15 17:08:48 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-15 17:08:48 +0000
commit2b49f2b34e0e3cbcda608c07e5cb206c9fa01c9a (patch)
tree7f40603382e8150bacecbea9abbe4d62c9a394ef /src/modules/options
parent41ca3061eb739eb5f929dbbd1f72e3904cb52d5d (diff)
core: tabs over spaces
git-svn-id: http://svn.miranda-ng.org/main/trunk@2316 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/filter.cpp4
-rw-r--r--src/modules/options/filter.h2
-rw-r--r--src/modules/options/headerbar.cpp4
-rw-r--r--src/modules/options/iconheader.cpp6
-rw-r--r--src/modules/options/options.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp
index 4d75ba55aa..f931012ad5 100644
--- a/src/modules/options/filter.cpp
+++ b/src/modules/options/filter.cpp
@@ -42,7 +42,7 @@ void AddFilterString(const PageHash key, TCHAR *data)
void ClearFilterStrings()
{
- filterStrings.destroy();
+ filterStrings.destroy();
}
BOOL ContainsFilterString(const PageHash key, TCHAR *data)
@@ -155,7 +155,7 @@ static INT_PTR CALLBACK DlgProcOptSearch(HWND hWnd, UINT msg, WPARAM wParam, LPA
case WM_INITDIALOG:
TranslateDialogDefault(hWnd);
- CheckDlgButton(hWnd, IDC_ENABLE_KEYWORDFILTERING, DBGetContactSettingWord(NULL, "Options", "EnableKeywordFiltering", TRUE) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hWnd, IDC_ENABLE_KEYWORDFILTERING, db_get_w(NULL, "Options", "EnableKeywordFiltering", TRUE) ? BST_CHECKED : BST_UNCHECKED);
return TRUE;
case WM_COMMAND:
diff --git a/src/modules/options/filter.h b/src/modules/options/filter.h
index 39c16698f2..a0ee0f8851 100644
--- a/src/modules/options/filter.h
+++ b/src/modules/options/filter.h
@@ -50,7 +50,7 @@ class CPageKeywords
static int _KeyWordsSortFunc(const TCHAR* p1, const TCHAR* p2) { return _tcscmp(p1, p2); };
public:
- CPageKeywords(PageHash pageHashKey) : _pageHashKey(pageHashKey), _pageKeyWords(1, _KeyWordsSortFunc) {};
+ CPageKeywords(PageHash pageHashKey) : _pageHashKey(pageHashKey), _pageKeyWords(1, _KeyWordsSortFunc) {};
~CPageKeywords()
{
for (int j = 0; j < _pageKeyWords.getCount(); j++)
diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp
index 3f2cca1a26..3eddace9e1 100644
--- a/src/modules/options/headerbar.cpp
+++ b/src/modules/options/headerbar.cpp
@@ -56,7 +56,7 @@ struct MHeaderbarCtrl : public MZeroedObject
// UI info
RECT rc;
int width, height;
- HICON hIcon;
+ HICON hIcon;
// control colors
RGBQUAD rgbBkgTop, rgbBkgBottom;
@@ -339,7 +339,7 @@ static LRESULT CALLBACK MHeaderbarWndProc(HWND hwndDlg, UINT msg, WPARAM wParam
SendMessage(GetParent(hwndDlg), WM_SYSCOMMAND, 0xF012, 0);
return 0;
- case WM_SETICON:
+ case WM_SETICON:
if (wParam < 3) {
itc->hIcon = (HICON)lParam;
InvalidateRect(hwndDlg, NULL, FALSE);
diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp
index aeb0bbd833..49fe2e1fe8 100644
--- a/src/modules/options/iconheader.cpp
+++ b/src/modules/options/iconheader.cpp
@@ -88,7 +88,7 @@ static void MITListDestructor(void * adr)
mir_free(mit->tcsName);
if (mit->hIcon && !(mit->flag&MITCF_SHAREDICON))
DestroyIcon(mit->hIcon);
- mir_free(adr);
+ mir_free(adr);
}
void li_ListDestruct(LIST<MIcoTab> &pList, ItemDestuctor pItemDestructor)
@@ -245,9 +245,9 @@ static void MIcoTab_DrawItem(HWND hwnd, HDC hdc, MIcoTabCtrl *dat, MIcoTab *tab,
dto.dwFlags = DTT_COMPOSITED|DTT_GLOWSIZE;
dto.iGlowSize = 10;
HANDLE hTheme = openThemeData(hwnd, L"Window");
- wchar_t *tcsNameW = mir_t2u(tab->tcsName);
+ wchar_t *tcsNameW = mir_t2u(tab->tcsName);
drawThemeTextEx(hTheme, hdc, WP_CAPTION, CS_ACTIVE, tcsNameW, -1, DT_VCENTER|DT_CENTER|DT_END_ELLIPSIS, &textRect, &dto);
- mir_free(tcsNameW);
+ mir_free(tcsNameW);
closeThemeData(hTheme);
}
else DrawText(hdc, tab->tcsName, -1, &textRect, DT_VCENTER|DT_CENTER|DT_END_ELLIPSIS);
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 43ee3f6571..b1d5e2ac3b 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -767,7 +767,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
MapWindowPoints(NULL, hdlg, (LPPOINT)&dat->rcTab, 2);
TabCtrl_AdjustRect( GetDlgItem(hdlg, IDC_TAB), FALSE, &dat->rcTab);
- //!!!!!!!!!! int enableKeywordFiltering = DBGetContactSettingWord(NULL, "Options", "EnableKeywordFiltering", TRUE);
+ //!!!!!!!!!! int enableKeywordFiltering = db_get_w(NULL, "Options", "EnableKeywordFiltering", TRUE);
FillFilterCombo(0, hdlg, dat); //!!!!!!!!!! enableKeywordFiltering,
SendMessage(hdlg, DM_REBUILDPAGETREE, 0, 0);