From 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 8 May 2018 20:40:49 +0200
Subject: merge from master

---
 plugins/DbEditorPP/src/copymodule.cpp   |  3 ++-
 plugins/DbEditorPP/src/deletemodule.cpp |  5 ++---
 plugins/DbEditorPP/src/exportimport.cpp |  3 ++-
 plugins/DbEditorPP/src/renamemodule.cpp |  3 ++-
 plugins/DbEditorPP/src/settinglist.cpp  | 13 ++++++++-----
 plugins/DbEditorPP/src/settingsdlg.cpp  |  3 ++-
 6 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'plugins/DbEditorPP/src')

diff --git a/plugins/DbEditorPP/src/copymodule.cpp b/plugins/DbEditorPP/src/copymodule.cpp
index 5ca149ee4e..052b6fd8d5 100644
--- a/plugins/DbEditorPP/src/copymodule.cpp
+++ b/plugins/DbEditorPP/src/copymodule.cpp
@@ -67,7 +67,8 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 				SetCursor(LoadCursor(nullptr, IDC_ARROW));
 			}
 			refreshTree(1);
-			// fall through
+			__fallthrough;
+
 		case IDCANCEL:
 			mir_free(mac);
 			DestroyWindow(hwnd);
diff --git a/plugins/DbEditorPP/src/deletemodule.cpp b/plugins/DbEditorPP/src/deletemodule.cpp
index 4b07c0519b..2c08c762e4 100644
--- a/plugins/DbEditorPP/src/deletemodule.cpp
+++ b/plugins/DbEditorPP/src/deletemodule.cpp
@@ -90,7 +90,6 @@ INT_PTR CALLBACK DeleteModuleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
 		case IDOK:
-		{
 			char module[FLD_SIZE];
 			GetDlgItemTextA(hwnd, IDC_CONTACTS, module, _countof(module));
 			SetCursor(LoadCursor(nullptr, IDC_WAIT));
@@ -101,8 +100,8 @@ INT_PTR CALLBACK DeleteModuleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)
 			deleteModule(NULL, module, 0);
 			SetCursor(LoadCursor(nullptr, IDC_ARROW));
 			refreshTree(1);
-		}
-		// fall through
+			__fallthrough;
+
 		case IDCANCEL:
 			if (working == 1) {
 				working = 0;
diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index b7a404c980..425abae95a 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -390,7 +390,8 @@ void importSettings(MCONTACT hContact, char *utf8)
 							memmove(pstr + 1, pstr + 2, mir_strlen(pstr + 2) + 1);
 						}
 					}
-					// fall through - write it to database
+					__fallthrough; // write it to database
+
 				case 'u':
 				case 'U':
 					db_set_utf(hContact, module, setting, (end + 2));
diff --git a/plugins/DbEditorPP/src/renamemodule.cpp b/plugins/DbEditorPP/src/renamemodule.cpp
index f242fe5f1f..89122b9b39 100644
--- a/plugins/DbEditorPP/src/renamemodule.cpp
+++ b/plugins/DbEditorPP/src/renamemodule.cpp
@@ -51,7 +51,8 @@ static INT_PTR CALLBACK AddModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 
 				refreshTree(1);
 			}
-			// fall through
+			__fallthrough;
+
 		case IDCANCEL:
 			DestroyWindow(hwnd);
 			break;
diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index 26f5a6f9f7..aaa8591c8b 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -62,11 +62,13 @@ int convertSetting(MCONTACT hContact, const char *module, const char *setting, i
 	case DBVT_WCHAR:
 		if (!value)
 			value = mir_wstrdup(dbv.pwszVal);
-		// fall through
+		__fallthrough;
+
 	case DBVT_UTF8:
 		if (!value)
 			value = mir_utf8decodeW(dbv.pszVal);
-		// fall through
+		__fallthrough;
+
 	case DBVT_ASCIIZ:
 		if (!value)
 			value = mir_a2u(dbv.pszVal);
@@ -519,7 +521,8 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd, UINT msg, WPARAM
 
 					case '0':
 						i = 1;
-						// fall through
+						__fallthrough;
+
 					case '1':
 					case '2':
 					case '3':
@@ -579,8 +582,8 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd, UINT msg, WPARAM
 					msg(TranslateT("Unable to store value in this data type!"));
 					break;
 				}
-
-			} // fall through
+			}
+			__fallthrough;
 
 		case IDCANCEL:
 			DestroyWindow(hwnd);
diff --git a/plugins/DbEditorPP/src/settingsdlg.cpp b/plugins/DbEditorPP/src/settingsdlg.cpp
index 30ddd1b373..10201f6965 100644
--- a/plugins/DbEditorPP/src/settingsdlg.cpp
+++ b/plugins/DbEditorPP/src/settingsdlg.cpp
@@ -247,7 +247,8 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 						db_unset(dbsetting->hContact, dbsetting->module, dbsetting->setting);
 				}
 
-			} // fall through
+			}
+			__fallthrough;
 
 		case IDCANCEL:
 			struct DBsetting *dbsetting = (struct DBsetting*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-- 
cgit v1.2.3