Clist_blind common project

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

9 files changed, 37 insertions, 35 deletions

diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index b953dc8abb..e85a8c0631 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 TCHAR* MyDBGetContactSettingTString(MCONTACT hContact, char* module, char* setting, TCHAR* out, size_t len, TCHAR *def);

 

@@ -262,7 +262,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 

 /****************************************************************************************/

 

-int ClcOptInit(WPARAM wParam, LPARAM lParam)

+int ClcOptInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp
index 4465622819..82ffbf2b43 100644
--- a/plugins/Clist_blind/src/clcpaint.cpp
+++ b/plugins/Clist_blind/src/clcpaint.cpp
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "stdafx.h"

 

 extern HIMAGELIST himlCListClc;

 static BYTE divide3[765] = { 255 };

@@ -265,9 +265,9 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			int selected = index == dat->selection && (dat->showSelAlways || dat->exStyle & CLS_EX_SHOWSELALWAYS || GetFocus() == hwnd)

 				&& group->cl.items[group->scanIndex]->type != CLCIT_DIVIDER;

 			int hottrack = dat->exStyle & CLS_EX_TRACKSELECT && group->cl.items[group->scanIndex]->type != CLCIT_DIVIDER && dat->iHotTrack == index;

-			SIZE textSize, countsSize, spaceSize;

+			SIZE textSize, countsSize = { 0 }, spaceSize = { 0 };

 			int width, checkboxWidth;

-			char *szCounts;

+			char *szCounts = NULL;

 

 			//alternating grey

 			if (style & CLS_GREYALTERNATE && index & 1) {

diff --git a/plugins/Clist_blind/src/clistmenus.cpp b/plugins/Clist_blind/src/clistmenus.cpp
index 61fdc627a2..aed1426207 100644
--- a/plugins/Clist_blind/src/clistmenus.cpp
+++ b/plugins/Clist_blind/src/clistmenus.cpp
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "stdafx.h"

 

 INT_PTR CloseAction(WPARAM,LPARAM)

 {

diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp
index 34f9a93111..1517723a09 100644
--- a/plugins/Clist_blind/src/clistopts.cpp
+++ b/plugins/Clist_blind/src/clistopts.cpp
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "stdafx.h"

 

 static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

@@ -225,7 +225,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 static UINT expertOnlyControls[] = { IDC_ALWAYSSTATUS };

 

-int CListOptInit(WPARAM wParam, LPARAM lParam)

+int CListOptInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = -1000000000;

diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp
index 131850c74f..99a496b4cf 100644
--- a/plugins/Clist_blind/src/cluiopts.cpp
+++ b/plugins/Clist_blind/src/cluiopts.cpp
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "stdafx.h"

 

 static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

@@ -305,7 +305,7 @@ static UINT expertOnlyControls[] =
 	IDC_STATIC22, IDC_AUTOSIZEUPWARD, IDC_SHOWMAINMENU, IDC_SHOWCAPTION, IDC_CLIENTDRAG

 };

 

-int CluiOptInit(WPARAM wParam, LPARAM lParam)

+int CluiOptInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

diff --git a/plugins/Clist_blind/src/commonheaders.cpp b/plugins/Clist_blind/src/commonheaders.cpp
deleted file mode 100644
index 14f99f7d71..0000000000
--- a/plugins/Clist_blind/src/commonheaders.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "commonheaders.h"

diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp
index fcda5bb81a..bf7a49885f 100644
--- a/plugins/Clist_blind/src/init.cpp
+++ b/plugins/Clist_blind/src/init.cpp
@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 int hLangpack;

 HINSTANCE g_hInst = 0;

@@ -53,7 +53,7 @@ int CListOptInit(WPARAM wParam, LPARAM lParam);
 /////////////////////////////////////////////////////////////////////////////////////////

 // dll stub

 

-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)

+BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD, LPVOID)

 {

 	g_hInst = hInstDLL;

 	DisableThreadLibraryCalls(g_hInst);

@@ -77,7 +77,7 @@ PLUGININFOEX pluginInfo = {
 	{0x53e095a3, 0x2695, 0x490a, {0x9d, 0xad, 0xd2, 0x4, 0x79, 0x9, 0x38, 0x31}}

 };

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfo;

 }

@@ -90,7 +90,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_CLIST,
 /////////////////////////////////////////////////////////////////////////////////////////

 // called when number of accounts has been changed

 

-static int OnAccountsChanged(WPARAM wParam, LPARAM lParam)

+static int OnAccountsChanged(WPARAM, LPARAM)

 {

 	himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0);

 	return 0;

@@ -99,7 +99,7 @@ static int OnAccountsChanged(WPARAM wParam, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // called when all modules got loaded

 

-static int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

+static int OnModulesLoaded(WPARAM, LPARAM)

 {

 	himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0);

 	return 0;

@@ -119,7 +119,7 @@ static int OnOptsInit(WPARAM wParam, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // menu status services

 

-static INT_PTR GetStatusMode(WPARAM wParam, LPARAM lParam)

+static INT_PTR GetStatusMode(WPARAM, LPARAM)

 {

 	return pcli->currentDesiredStatusMode;

 }

@@ -418,20 +418,6 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	return coreCli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 }

 

-static int GetRealStatus(struct ClcContact *contact, int status)

-{

-	int i;

-	char *szProto = contact->proto;

-	if (!szProto)

-		return status;

-	for (i = 0; i < pcli->hClcProtoCount; i++) {

-		if (!mir_strcmp(pcli->clcProto[i].szProto, szProto)) {

-			return pcli->clcProto[i].dwStatus;

-		}

-	}

-	return status;

-}

-

 TCHAR status_name[128];

 TCHAR *GetStatusName(struct ClcContact *item)

 {

@@ -596,7 +582,6 @@ void RebuildEntireListInternal(HWND hwnd, ClcData *tmp_dat, BOOL call_orig)
 			}

 		case CLCIT_CONTACT:

 			{

-				char *szCounts = pcli->pfnGetGroupCountsText((ClcData*)dat, item);

 				const TCHAR *t[] = {

 					_T("%name%"),

 					_T("%status%"),

@@ -665,11 +650,11 @@ void SetGroupExpand(HWND hwnd, ClcData *dat, struct ClcGroup *group, int newStat
 	dat->need_rebuild = TRUE;

 }

 

-void ScrollTo(HWND hwnd, ClcData *dat, int desty, int noSmooth)

+void ScrollTo(HWND, ClcData*, int, int)

 {

 }

 

-void RecalcScrollBar(HWND hwnd, ClcData *dat)

+void RecalcScrollBar(HWND, ClcData*)

 {

 }

 

@@ -681,7 +666,7 @@ void LoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 	dat->rowHeight = SendMessage(dat->hwnd_list, LB_GETITEMHEIGHT, 0, 0);

 }

 

-int GetRowHeight(ClcData *dat, int item)

+int GetRowHeight(ClcData *dat, int)

 {

 	dat->rowHeight = SendMessage(dat->hwnd_list, LB_GETITEMHEIGHT, 0, 0);

 	return dat->rowHeight;

diff --git a/plugins/Clist_blind/src/stdafx.cxx b/plugins/Clist_blind/src/stdafx.cxx
new file mode 100644
index 0000000000..6fb37564b7
--- /dev/null
+++ b/plugins/Clist_blind/src/stdafx.cxx
@@ -0,0 +1,18 @@
+/*

+Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org)

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation version 2

+of the License.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program. If not, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/Clist_blind/src/commonheaders.h b/plugins/Clist_blind/src/stdafx.h
index 122cd16ca1..122cd16ca1 100644
--- a/plugins/Clist_blind/src/commonheaders.h
+++ b/plugins/Clist_blind/src/stdafx.h