obsolete services extincted

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

9 files changed, 8 insertions, 35 deletions

diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp
index 821f1e2c58..39be7c8bd0 100644
--- a/plugins/HistoryStats/src/mu_common.cpp
+++ b/plugins/HistoryStats/src/mu_common.cpp
@@ -258,23 +258,6 @@ namespace mu
 	}

 

 	/*

-	 * utils

-	 */

-

-	namespace utils

-	{

-		int pathToRelative(const TCHAR* pszPath, TCHAR* pszNewPath)

-		{

-			return CallService(MS_UTILS_PATHTORELATIVET, reinterpret_cast<WPARAM>(pszPath), reinterpret_cast<LPARAM>(pszNewPath));

-		}

-

-		int pathToAbsolute(const TCHAR* pszPath, TCHAR* pszNewPath)

-		{

-			return CallService(MS_UTILS_PATHTOABSOLUTET, reinterpret_cast<WPARAM>(pszPath), reinterpret_cast<LPARAM>(pszNewPath));

-		}

-	}

-

-	/*

 	 * core interface functions

 	 */

 

diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h
index 349c68c218..c249659a1a 100644
--- a/plugins/HistoryStats/src/mu_common.h
+++ b/plugins/HistoryStats/src/mu_common.h
@@ -123,16 +123,6 @@ namespace mu
 	}

 

 	/*

-	 * utils

-	 */

-

-	namespace utils

-	{

-		int pathToRelative(const TCHAR* pszPath, TCHAR* pszNewPath);

-		int pathToAbsolute(const TCHAR* pszPath, TCHAR* pszNewPath);

-	}

-

-	/*

 	 * core interface functions

 	 */

 

diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp
index c00fb7a43c..6139ee0b35 100644
--- a/plugins/HistoryStats/src/utils.cpp
+++ b/plugins/HistoryStats/src/utils.cpp
@@ -895,7 +895,7 @@ namespace utils
 		if (strMirandaPath.empty()) {

 			TCHAR szPath[MAX_PATH] = { 0 };

 

-			mu::utils::pathToAbsolute(_T("x"), szPath);

+			PathToAbsoluteT(_T("x"), szPath);

 			strMirandaPath = extractPath(szPath);

 		}

 

diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h
index 1b6d55710e..572ac475f2 100644
--- a/plugins/Import/src/import.h
+++ b/plugins/Import/src/import.h
@@ -105,6 +105,6 @@ extern int nImportOptions;
 extern TCHAR importFile[];

 extern time_t dwSinceDate;

 

-HICON  GetIcon(int iIconId, int size = 0);

+HICON  GetIcon(int iIconId, bool size = false);

 HANDLE GetIconHandle(int iIconId);

 void   RegisterIcons(void);

diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
index 826faa8da7..180294196b 100644
--- a/plugins/Import/src/utils.cpp
+++ b/plugins/Import/src/utils.cpp
@@ -216,7 +216,7 @@ static IconItem iconList[] =
 	{ LPGEN("Import..."), "import_main", IDI_IMPORT }

 };

 

-HICON GetIcon(int iIconId, int size)

+HICON GetIcon(int iIconId, bool size)

 {

 	for (int i = 0; i < SIZEOF(iconList); i++)

 		if (iconList[i].defIconID == iIconId)

diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 0bd02ced23..86b419365d 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -100,7 +100,7 @@ INT_PTR CALLBACK WizardDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lP
 		ShowWindow(hwndPage, SW_SHOW);

 		ShowWindow(hdlg, SW_SHOW);

 		SendMessage(hdlg, WM_SETICON, ICON_SMALL, (LPARAM)GetIcon(IDI_IMPORT));

-		SendMessage(hdlg, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(IDI_IMPORT, 32));

+		SendMessage(hdlg, WM_SETICON, ICON_BIG, (LPARAM)GetIcon(IDI_IMPORT, true));

 		return TRUE;

 

 	case WIZM_GOTOPAGE:

diff --git a/plugins/MirLua/src/m_popup.cpp b/plugins/MirLua/src/m_popup.cpp
index 8f32889f4f..f76a90b91a 100644
--- a/plugins/MirLua/src/m_popup.cpp
+++ b/plugins/MirLua/src/m_popup.cpp
@@ -11,7 +11,7 @@ static POPUPDATA2* MakePopupData(lua_State *L)
 	lua_pop(L, 1);

 

 	if (!(ppd->flags & PU2_TCHAR))

-		ppd->flags | PU2_TCHAR;

+		ppd->flags |= PU2_TCHAR;

 

 	lua_pushstring(L, "Title");

 	lua_gettable(L, -2);

diff --git a/plugins/NewAwaySysMod/src/Path.h b/plugins/NewAwaySysMod/src/Path.h
index e108a919e5..176f08bad7 100644
--- a/plugins/NewAwaySysMod/src/Path.h
+++ b/plugins/NewAwaySysMod/src/Path.h
@@ -27,7 +27,7 @@ __inline TCString Path_ToRelative(TCString &Path)
 {

 	TCString Str;

 	Str.GetBuffer(MAX_PATH);

-	CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)(TCHAR*)Path, (LPARAM)(TCHAR*)Str);

+	PathToRelativeT(Path, Str);

 	Str.ReleaseBuffer();

 	return Str;

 }

@@ -37,7 +37,7 @@ __inline TCString Path_ToAbsolute(TCString &Path)
 {

 	TCString Str;

 	Str.GetBuffer(MAX_PATH);

-	CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)(TCHAR*)Path, (LPARAM)(TCHAR*)Str);

+	PathToAbsoluteT(Path, Str);

 	Str.ReleaseBuffer();

 	return Str;

 }

diff --git a/plugins/Spamotron/src/bayes.cpp b/plugins/Spamotron/src/bayes.cpp
index b85a4249f0..89de53ef23 100644
--- a/plugins/Spamotron/src/bayes.cpp
+++ b/plugins/Spamotron/src/bayes.cpp
@@ -56,7 +56,7 @@ int OpenBayes()
 		mir_free(tmp);

 	}

 

-	CallService(MS_UTILS_CREATEDIRTREE, 0, (LPARAM)bayesdb_fullpath);

+	CreateDirectoryTree(bayesdb_fullpath);

 

 	mir_strcat(bayesdb_fullpath, "\\"BAYESDB_FILENAME);

 	bayesdb_fullpath_utf8 = mir_utf8encode(bayesdb_fullpath);