From 1213ce7d1386f5677342951df1a80d589ce2779b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Feb 2017 12:19:25 +0300 Subject: warning fixes --- plugins/StatusManager/src/StartupStatus/ss_options.cpp | 5 +++++ plugins/StatusManager/src/StartupStatus/startupstatus.cpp | 5 +++++ plugins/StatusManager/src/StartupStatus/startupstatus.h | 10 +--------- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'plugins/StatusManager/src/StartupStatus') diff --git a/plugins/StatusManager/src/StartupStatus/ss_options.cpp b/plugins/StatusManager/src/StartupStatus/ss_options.cpp index eaa5566820..22372bcb1f 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_options.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_options.cpp @@ -21,6 +21,11 @@ ///////////////////////////////////////////////////////////////////////////////////////// +int SSCompareSettings(const TSSSetting *p1, const TSSSetting *p2) +{ + return mir_strcmp(p1->szName, p2->szName); +} + TSettingsList* GetCurrentProtoSettings() { int count; diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp index b9de70b28c..7376d1a03c 100644 --- a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp +++ b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp @@ -485,6 +485,11 @@ HANDLE hSSModuleLoadedHook = NULL, hGetProfileCountService, hGetProfileNameService; +static INT_PTR SrvGetProfile(WPARAM wParam, LPARAM lParam) +{ + return GetProfile((int)wParam, *(TSettingsList*)lParam); +} + void StartupStatusLoad() { MUUID muidLast = MIID_LAST; diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.h b/plugins/StatusManager/src/StartupStatus/startupstatus.h index e1ad779103..5d04c24cf5 100644 --- a/plugins/StatusManager/src/StartupStatus/startupstatus.h +++ b/plugins/StatusManager/src/StartupStatus/startupstatus.h @@ -30,10 +30,7 @@ struct TSSSetting : public PROTOCOLSETTINGEX, public MZeroedObject ~TSSSetting(); }; -static int SSCompareSettings(const TSSSetting *p1, const TSSSetting *p2) -{ - return mir_strcmp(p1->szName, p2->szName); -} +int SSCompareSettings(const TSSSetting *p1, const TSSSetting *p2); typedef OBJLIST TSettingsList; @@ -148,11 +145,6 @@ TSettingsList* GetCurrentProtoSettings(); int GetProfile(int profileID, TSettingsList& arSettings ); wchar_t *GetStatusMessage(int profile, char *szProto); -static INT_PTR SrvGetProfile(WPARAM wParam, LPARAM lParam) -{ - return GetProfile((int)wParam, *(TSettingsList*)lParam); -} - INT_PTR LoadAndSetProfile(WPARAM wParam, LPARAM lParam); INT_PTR GetProfileCount(WPARAM wParam, LPARAM lParam); INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam); -- cgit v1.2.3