From 8bbf210610804623aa581f3a547fc782fed9c118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20P=C3=B6sel?= <robyer@seznam.cz>
Date: Sun, 19 May 2013 12:36:06 +0000
Subject: "PopUp" everywhere was replaced to "Popup"

git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/YAPP/src/notify_imp.cpp | 4 ++--
 plugins/YAPP/src/options.cpp    | 2 +-
 plugins/YAPP/src/services.cpp   | 8 ++++----
 plugins/YAPP/src/yapp.cpp       | 4 ++--
 plugins/YAPP/src/yapp_history.h | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/YAPP')

diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp
index be2e14cdc1..0be4fbd15f 100644
--- a/plugins/YAPP/src/notify_imp.cpp
+++ b/plugins/YAPP/src/notify_imp.cpp
@@ -67,7 +67,7 @@ INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-INT_PTR CALLBACK DlgProcPopUps(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 /* To change options use MNotifySet*(hNotify, ....) Apply/Cancel is implemented in notify.dll */
 	HANDLE hNotify = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
@@ -98,7 +98,7 @@ int NotifyOptionsInitialize(WPARAM wParam,LPARAM lParam)
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
 	odp.pszTitle = LPGEN("YAPP Popups");
 	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = DlgProcPopUps;
+	odp.pfnDlgProc = DlgProcPopups;
 	CallService(MS_NOTIFY_OPT_ADDPAGE, wParam, (LPARAM)&odp);
 	return 0;
 }
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index c8cc3955f0..7158404a00 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -472,7 +472,7 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 	odp.flags = ODPF_BOLDGROUPS;
 	odp.position = -790000000;
 	odp.hInstance = hInst;
-	odp.pszTitle = LPGEN("PopUps");
+	odp.pszTitle = LPGEN("Popups");
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
 	odp.pszTab = LPGEN("Settings");
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index 2fe5802224..25e3093a04 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -298,9 +298,9 @@ static INT_PTR ShowMessageW(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-//=====PopUp/ShowHistory
+//=====Popup/ShowHistory
 
-INT_PTR PopUp_ShowHistory(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_ShowHistory(WPARAM wParam, LPARAM lParam)
 {
 	if (!hHistoryWindow)
 		hHistoryWindow = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LST_HISTORY), NULL, DlgProcHistLst);
@@ -413,8 +413,8 @@ void InitServices()
 	CreateServiceFunction(MS_POPUP_SHOWMESSAGE, ShowMessage);
 	CreateServiceFunction(MS_POPUP_SHOWMESSAGE"W", ShowMessageW);
 
-	CreateServiceFunction(MS_POPUP_SHOWHISTORY, PopUp_ShowHistory);
-	CreateServiceFunction("PopUp/ToggleEnabled", TogglePopups);
+	CreateServiceFunction(MS_POPUP_SHOWHISTORY, Popup_ShowHistory);
+	CreateServiceFunction("Popup/ToggleEnabled", TogglePopups);
 }
 
 void DeinitServices()
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index ba7c30123c..0b7acda833 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -89,7 +89,7 @@ int IconsChanged(WPARAM, LPARAM)
 int TTBLoaded(WPARAM, LPARAM)
 {
 	TTBButton ttb = { sizeof(ttb) };
-	ttb.pszService = "PopUp/ToggleEnabled";
+	ttb.pszService = "Popup/ToggleEnabled";
 	ttb.lParamUp = 1;
 	ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON;
 	if (db_get_b(0, MODULE, "Enabled", 1))
@@ -200,7 +200,7 @@ void InitMenuItems(void)
 	hMenuItemHistory = Menu_AddMainMenuItem(&mi);
 
 	mi.hIcon = IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0);
-	mi.pszService = "PopUp/ToggleEnabled";
+	mi.pszService = "Popup/ToggleEnabled";
 	mi.ptszName = (isEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups"));
 	hMenuItem = Menu_AddMainMenuItem(&mi);
 }
diff --git a/plugins/YAPP/src/yapp_history.h b/plugins/YAPP/src/yapp_history.h
index 540777def0..c07c32f2ae 100644
--- a/plugins/YAPP/src/yapp_history.h
+++ b/plugins/YAPP/src/yapp_history.h
@@ -82,7 +82,7 @@ Useful if you've missed a popup when it appeared.
 wParam - 0
 lParam - 0
 */
-#define MS_POPUP_SHOWHISTORY "PopUp/ShowHistory"
+#define MS_POPUP_SHOWHISTORY "Popup/ShowHistory"
 
 extern PopupHistoryList lstPopupHistory; //defined in main.cpp
 extern HWND hHistoryWindow; //the history window
-- 
cgit v1.2.3