summaryrefslogtreecommitdiff
path: root/plugins/StatusManager
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-12-26 17:06:04 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-12-26 17:06:04 +0300
commit1039b2829a264280493ba0fa979214fe024dc70c (patch)
tree8fa6a60eb46627582c372b56a4a1d4754d6732c3 /plugins/StatusManager
parent62a186697df33c96dc1a6dac0f4dfc38652fb96f (diff)
WORD -> uint16_t
Diffstat (limited to 'plugins/StatusManager')
-rw-r--r--plugins/StatusManager/src/aaa_options.cpp16
-rw-r--r--plugins/StatusManager/src/commonstatus.h2
-rw-r--r--plugins/StatusManager/src/keepstatus.h4
-rw-r--r--plugins/StatusManager/src/ks_options.cpp2
-rw-r--r--plugins/StatusManager/src/ss_main.cpp2
-rw-r--r--plugins/StatusManager/src/ss_options.cpp4
-rw-r--r--plugins/StatusManager/src/ss_profiles.cpp4
-rw-r--r--plugins/StatusManager/src/startupstatus.h2
8 files changed, 18 insertions, 18 deletions
diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp
index c8b7e511e5..a773698ef1 100644
--- a/plugins/StatusManager/src/aaa_options.cpp
+++ b/plugins/StatusManager/src/aaa_options.cpp
@@ -196,17 +196,17 @@ static int WriteAutoAwaySetting(SMProto &autoAwaySetting, char *protoName)
{
char setting[128];
mir_snprintf(setting, "%s_OptionFlags", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.optionFlags);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.optionFlags);
mir_snprintf(setting, "%s_AwayTime", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.awayTime);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.awayTime);
mir_snprintf(setting, "%s_NATime", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.naTime);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.naTime);
mir_snprintf(setting, "%s_StatusFlags", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.statusFlags);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.statusFlags);
mir_snprintf(setting, "%s_Lv1Status", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.lv1Status);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.lv1Status);
mir_snprintf(setting, "%s_Lv2Status", protoName);
- AAAPlugin.setWord(setting, (WORD)autoAwaySetting.lv2Status);
+ AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.lv2Status);
return 0;
}
@@ -584,8 +584,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayGeneralOpts(HWND hwndDlg, UINT msg, WPARA
AAAPlugin.setByte(SETTING_IGNSYSKEYS, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_IGNSYSKEYS));
AAAPlugin.setByte(SETTING_IGNALTCOMBO, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_IGNALTCOMBO));
AAAPlugin.setByte(SETTING_SAMESETTINGS, (uint8_t)g_bAAASettingSame);
- AAAPlugin.setWord(SETTING_AWAYCHECKTIMEINSECS, (WORD)GetDlgItemInt(hwndDlg, IDC_AWAYCHECKTIMEINSECS, nullptr, FALSE));
- AAAPlugin.setWord(SETTING_CONFIRMDELAY, (WORD)GetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, nullptr, FALSE));
+ AAAPlugin.setWord(SETTING_AWAYCHECKTIMEINSECS, (uint16_t)GetDlgItemInt(hwndDlg, IDC_AWAYCHECKTIMEINSECS, nullptr, FALSE));
+ AAAPlugin.setWord(SETTING_CONFIRMDELAY, (uint16_t)GetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, nullptr, FALSE));
AAAPlugin.setByte(SETTING_MONITORMOUSE, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_MONITORMOUSE));
AAAPlugin.setByte(SETTING_MONITORKEYBOARD, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_MONITORKEYBOARD));
}
diff --git a/plugins/StatusManager/src/commonstatus.h b/plugins/StatusManager/src/commonstatus.h
index fd1117902e..6695cebaa8 100644
--- a/plugins/StatusManager/src/commonstatus.h
+++ b/plugins/StatusManager/src/commonstatus.h
@@ -103,7 +103,7 @@ struct SMProto : public PROTOCOLSETTINGEX, public MZeroedObject
int awayTime; // db: time to wait for inactivity
int naTime; // db: time to wait after away is set
int statusFlags; // db: set lv1 status if this is original status
- WORD lv1Status, lv2Status; // db: statuses to switch protocol to
+ uint16_t lv1Status, lv2Status; // db: statuses to switch protocol to
unsigned int sts1setTimer;
// KeepStatus
diff --git a/plugins/StatusManager/src/keepstatus.h b/plugins/StatusManager/src/keepstatus.h
index e4b1f5a7a4..dbfbc916d8 100644
--- a/plugins/StatusManager/src/keepstatus.h
+++ b/plugins/StatusManager/src/keepstatus.h
@@ -91,8 +91,8 @@
/* old; replaced by PROTOCOLSETTINGEX see m_statusplugins.h */
typedef struct {
char *szName; // pointer to protocol modulename
- WORD status; // the status
- WORD lastStatus;// last status
+ uint16_t status; // the status
+ uint16_t lastStatus;// last status
} PROTOCOLSETTING;
/* old; replaced by ME_CS_STATUSCHANGE see m_statusplugins.h */
diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp
index fcaae56b23..4848eff393 100644
--- a/plugins/StatusManager/src/ks_options.cpp
+++ b/plugins/StatusManager/src/ks_options.cpp
@@ -231,7 +231,7 @@ static INT_PTR CALLBACK DlgProcKSAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
else KSPlugin.setByte(SETTING_LOGINERR, LOGINERR_NOTHING);
KSPlugin.setByte(SETTING_CHECKAPMRESUME, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CHECKAPMRESUME));
- KSPlugin.setWord(SETTING_PINGCOUNT, (WORD)GetDlgItemInt(hwndDlg, IDC_PINGCOUNT, nullptr, FALSE));
+ KSPlugin.setWord(SETTING_PINGCOUNT, (uint16_t)GetDlgItemInt(hwndDlg, IDC_PINGCOUNT, nullptr, FALSE));
KSPlugin.setDword(SETTING_CNTDELAY, (DWORD)GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE) == 0 ? CHECKCONTIN_DELAY : GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE));
}
break;
diff --git a/plugins/StatusManager/src/ss_main.cpp b/plugins/StatusManager/src/ss_main.cpp
index e5118785a3..2f10ca761f 100644
--- a/plugins/StatusManager/src/ss_main.cpp
+++ b/plugins/StatusManager/src/ss_main.cpp
@@ -426,7 +426,7 @@ void StartupStatusLoad()
HookEvent(ME_SYSTEM_MODULESLOADED, SSModuleLoaded);
if (SSPlugin.getByte(SETTING_SETPROFILE, 1) || SSPlugin.getByte(SETTING_OFFLINECLOSE, 0))
- db_set_w(0, "CList", "Status", (WORD)ID_STATUS_OFFLINE);
+ db_set_w(0, "CList", "Status", (uint16_t)ID_STATUS_OFFLINE);
// docking
if (SSPlugin.getByte(SETTING_SETDOCKED, 0)) {
diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp
index 244575feb5..fad9da5be4 100644
--- a/plugins/StatusManager/src/ss_options.cpp
+++ b/plugins/StatusManager/src/ss_options.cpp
@@ -364,7 +364,7 @@ public:
SSPlugin.setDword(SETTING_SETPROFILEDELAY, GetDlgItemInt(m_hwnd, IDC_SETPROFILEDELAY, nullptr, FALSE));
if (bChecked || chkShowDialog.GetState())
- SSPlugin.setWord(SETTING_DEFAULTPROFILE, (WORD)profiles.GetCurData());
+ SSPlugin.setWord(SETTING_DEFAULTPROFILE, (uint16_t)profiles.GetCurData());
SSPlugin.setByte(SETTING_OVERRIDE, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_OVERRIDE));
SSPlugin.setByte(SETTING_SHOWDIALOG, bChecked = chkShowDialog.GetState());
@@ -736,7 +736,7 @@ public:
SSPlugin.setWord(OptName(i, jt->m_szName), jt->m_status);
}
}
- SSPlugin.setWord(SETTING_PROFILECOUNT, (WORD)arProfiles.getCount());
+ SSPlugin.setWord(SETTING_PROFILECOUNT, (uint16_t)arProfiles.getCount());
// Rebuild status menu
if (bNeedRebuildMenu)
diff --git a/plugins/StatusManager/src/ss_profiles.cpp b/plugins/StatusManager/src/ss_profiles.cpp
index c5f2038ed2..da945ccb85 100644
--- a/plugins/StatusManager/src/ss_profiles.cpp
+++ b/plugins/StatusManager/src/ss_profiles.cpp
@@ -216,7 +216,7 @@ INT_PTR LoadAndSetProfile(WPARAM iProfileNo, LPARAM)
return 0;
}
-static UINT GetFsModifiers(WORD wHotKey)
+static UINT GetFsModifiers(uint16_t wHotKey)
{
UINT fsm = 0;
if (HIBYTE(wHotKey)&HOTKEYF_ALT)
@@ -269,7 +269,7 @@ int RegisterHotKeys()
if (!SSPlugin.getByte(OptName(i, SETTING_REGHOTKEY), 0))
continue;
- WORD wHotKey = SSPlugin.getWord(OptName(i, SETTING_HOTKEY), 0);
+ uint16_t wHotKey = SSPlugin.getWord(OptName(i, SETTING_HOTKEY), 0);
hkInfo = (HKINFO*)mir_realloc(hkInfo, (hkiCount + 1)*sizeof(HKINFO));
if (hkInfo == nullptr)
return -1;
diff --git a/plugins/StatusManager/src/startupstatus.h b/plugins/StatusManager/src/startupstatus.h
index 12a8f7900b..7e3ad71123 100644
--- a/plugins/StatusManager/src/startupstatus.h
+++ b/plugins/StatusManager/src/startupstatus.h
@@ -39,7 +39,7 @@ struct PROFILEOPTIONS : public MZeroedObject
BOOL createMmi;
BOOL inSubMenu;
BOOL regHotkey;
- WORD hotKey;
+ uint16_t hotKey;
};
typedef struct {