- code cleaning

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

3 files changed, 22 insertions, 24 deletions

diff --git a/plugins/QuickReplies/common.h b/plugins/QuickReplies/common.h
index 688bf21f03..1955edfded 100644
--- a/plugins/QuickReplies/common.h
+++ b/plugins/QuickReplies/common.h
@@ -67,9 +67,9 @@ extern HANDLE hOnPreShutdown;
 

 INT_PTR QuickRepliesService(WPARAM wParam, LPARAM lParam);

 

-INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam);

-INT_PTR OnOptInitialized(WPARAM wParam, LPARAM lParam);

-INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam);

-INT_PTR OnPreShutdown(WPARAM wParam, LPARAM lParam);

+int OnModulesLoaded(WPARAM wParam, LPARAM lParam);

+int OnOptInitialized(WPARAM wParam, LPARAM lParam);

+int OnButtonPressed(WPARAM wParam, LPARAM lParam);

+int OnPreShutdown(WPARAM wParam, LPARAM lParam);

 

 #endif //__QUICK_REPLY_H__
\ No newline at end of file
diff --git a/plugins/QuickReplies/events.cpp b/plugins/QuickReplies/events.cpp
index 1dfa8c898d..fd4991423d 100644
--- a/plugins/QuickReplies/events.cpp
+++ b/plugins/QuickReplies/events.cpp
@@ -32,7 +32,7 @@ INT_PTR QuickRepliesService(WPARAM, LPARAM)
 	return TRUE;

 }

 

-INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam)

+int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

 	UnhookEvent(hOnModulesLoaded);

 	HICON hIcon = NULL;

@@ -90,7 +90,7 @@ INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam)

+int OnButtonPressed(WPARAM wParam, LPARAM lParam)

 {

 	char key[64];

 	int index = 0;

@@ -175,7 +175,7 @@ INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam)
 	return 1;

 }

 

-INT_PTR OnPreShutdown(WPARAM wParam, LPARAM lParam)

+int OnPreShutdown(WPARAM wParam, LPARAM lParam)

 {

 	if (ServiceExists(MS_BB_REMOVEBUTTON))

 	{

diff --git a/plugins/QuickReplies/options.cpp b/plugins/QuickReplies/options.cpp
index 36776884ae..1c26b9c385 100644
--- a/plugins/QuickReplies/options.cpp
+++ b/plugins/QuickReplies/options.cpp
@@ -62,7 +62,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd,UINT msg,WPARAM wParam
 	return CallWindowProc(OldMessageEditProc, hwnd, msg, wParam, lParam);

 }

 

-BOOL CALLBACK  DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	switch(uMsg)

 	{

@@ -186,27 +186,25 @@ BOOL CALLBACK  DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 

 static UINT expertOnlyControls[] = { IDC_VARIABLES, IDC_VARIABLES_HINT };

 

-INT_PTR OnOptInitialized(WPARAM wParam, LPARAM lParam)

+int OnOptInitialized(WPARAM wParam, LPARAM lParam)

 {

 	TCHAR tabName[32];

 	mir_sntprintf(tabName, SIZEOF(tabName), _T("Button %x"), iNumber + 1);

 

 	OPTIONSDIALOGPAGE odp = {0};

-

-	odp.cbSize						= sizeof(odp);

-	odp.ptszGroup					= _T("Message Sessions");

-	odp.ptszTitle					= _T("Quick Replies");

-	odp.ptszTab						= tabName;

-	odp.position					= iNumber;

-	odp.hInstance					= hInstance;

-	odp.flags						= ODPF_TCHAR;

-

-	odp.expertOnlyControls			= expertOnlyControls;

-	odp.nExpertOnlyControls			= SIZEOF(expertOnlyControls);

-

-	odp.pszTemplate					= MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);

-	odp.pfnDlgProc					= DlgProcOptionsPage;

-

+	odp.cbSize              = sizeof(odp);

+	odp.ptszGroup           = _T("Message Sessions");

+	odp.ptszTitle           = _T("Quick Replies");

+	odp.ptszTab             = tabName;

+	odp.position            = iNumber;

+	odp.hInstance           = hInstance;

+	odp.flags               = ODPF_TCHAR;

+

+	odp.expertOnlyControls  = expertOnlyControls;

+	odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);

+

+	odp.pszTemplate         = MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);

+	odp.pfnDlgProc          = DlgProcOptionsPage;

 	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);

 

 	return 0;