summaryrefslogtreecommitdiff
path: root/plugins/StatusManager/src/StartupStatus
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-02-07 12:19:25 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-02-07 12:19:25 +0300
commit1213ce7d1386f5677342951df1a80d589ce2779b (patch)
tree76ecc7f76b77453b9d3c1800f955e8f7c8da38ac /plugins/StatusManager/src/StartupStatus
parentf18d37c4c90bc39f295fea9fedbfae0e806d9f61 (diff)
warning fixes
Diffstat (limited to 'plugins/StatusManager/src/StartupStatus')
-rw-r--r--plugins/StatusManager/src/StartupStatus/ss_options.cpp5
-rw-r--r--plugins/StatusManager/src/StartupStatus/startupstatus.cpp5
-rw-r--r--plugins/StatusManager/src/StartupStatus/startupstatus.h10
3 files changed, 11 insertions, 9 deletions
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<TSSSetting> 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);