"PopUp" everywhere was replaced to "Popup"

git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 6 insertions, 6 deletions

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 9809c4d3a4..387eef44de 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -126,7 +126,7 @@ void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata)
 		break;

 	}

 	case PCA_CLOSEPOPUP: // close popup

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 		break;

 

 	case PCA_DONOTHING: // do nothing

@@ -196,7 +196,7 @@ void ShowPopup(SHOWPOPUP_DATA *sd)
 	pdata->PopupRClickAction = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_RCLICK_ACTION);

 	ppd.iSeconds = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_POPUPDELAY);

 	ppd.PluginData = pdata;

-	PUAddPopUpT(&ppd);

+	PUAddPopupT(&ppd);

 }

 

 int ContactSettingChanged(WPARAM wParam, LPARAM lParam)

@@ -345,7 +345,7 @@ static int PrebuildMainMenu(WPARAM wParam, LPARAM lParam)
 			mi.ptszName = LPGENT("Enable c&lient change notification");

 			mi.hIcon = Skin_GetIcon("popup_disabled");

 		}

-		mi.ptszPopupName = LPGENT("PopUps");

+		mi.ptszPopupName = LPGENT("Popups");

 		Menu_ModifyItem(g_hTogglePopupsMenuItem, &mi);

 	}

 	return 0;

@@ -406,7 +406,7 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam)
 			mi.ptszName = LPGENT("Enable c&lient change notification");

 

 		mi.pszService = MS_CCN_TOGGLEPOPUPS;

-		mi.ptszPopupName = LPGENT("PopUps");

+		mi.ptszPopupName = LPGENT("Popups");

 		g_hTogglePopupsMenuItem = Menu_AddMainMenuItem(&mi);

 	}

 

diff --git a/plugins/ClientChangeNotify/src/Misc.h b/plugins/ClientChangeNotify/src/Misc.h
index 6853fcc442..e64855bb5b 100644
--- a/plugins/ClientChangeNotify/src/Misc.h
+++ b/plugins/ClientChangeNotify/src/Misc.h
@@ -31,7 +31,7 @@ __inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = _T(""), bool IsError
 		ppd.colorBack = IsErrorMsg ? 0x0202E3 : 0xE8F1FD;

 		ppd.colorText = IsErrorMsg ? 0xE8F1FD : 0x000000;

 		ppd.iSeconds = Timeout;

-		PUAddPopUpT(&ppd);

+		PUAddPopupT(&ppd);

 	} else

 	{

 		MessageBox(NULL, SecondLine, FirstLine, MB_OK | (IsErrorMsg ? MB_ICONEXCLAMATION : MB_ICONINFORMATION));

diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 7edc46a53c..9de39b0705 100644
--- a/plugins/ClientChangeNotify/src/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
@@ -180,7 +180,7 @@ int OptionsDlgInit(WPARAM wParam, LPARAM lParam)
 		optDi.pfnDlgProc = PopupOptDlg;

 		optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);

 		optDi.hInstance = g_hInstance;

-		optDi.ptszGroup = LPGENT("PopUps");

+		optDi.ptszGroup = LPGENT("Popups");

 		optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 		Options_AddPage(wParam, &optDi);

 	}