int hLangpack/m_hLang removed and replaced with HPLUGIN

4 files changed, 65 insertions, 64 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index bb67ff24fe..9634eba955 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -1,8 +1,22 @@
 #include "..\stdafx.h"
 #include "dropbox_api.h"
 
-CDropboxService::CDropboxService(const char *protoName, const wchar_t *userName)
-	: CCloudService(protoName, userName)
+struct CMPluginDropbox : public PLUGIN<CMPluginDropbox>
+{
+	CMPluginDropbox() :
+		PLUGIN<CMPluginDropbox>(MODULENAME "/Dropbox", pluginInfoEx)
+	{
+		m_hInst = g_plugin.getInst();
+
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CDropboxService::Init, (pfnUninitProto)CDropboxService::UnInit);
+	}
+}
+g_pluginDropbox;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+CDropboxService::CDropboxService(const char *protoName, const wchar_t *userName) :
+	CCloudService(protoName, userName, &g_pluginDropbox)
 {
 	m_hProtoIcon = GetIconHandle(IDI_DROPBOX);
 }
@@ -286,17 +300,3 @@ void CDropboxService::Upload(FileTransferParam *ftp)
 		}
 	} while (ftp->NextFile());
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-struct CMPluginDropbox : public PLUGIN<CMPluginDropbox>
-{
-	CMPluginDropbox() :
-		PLUGIN<CMPluginDropbox>(MODULENAME "/Dropbox", pluginInfoEx)
-	{
-		m_hInst = g_plugin.getInst();
-
-		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CDropboxService::Init, (pfnUninitProto)CDropboxService::UnInit);
-	}
-}
-g_pluginDropbox;
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index 906e9e817d..9679c17fc0 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -1,8 +1,23 @@
 #include "..\stdafx.h"
 #include "google_api.h"
 
-CGDriveService::CGDriveService(const char *protoName, const wchar_t *userName)
-	: CCloudService(protoName, userName)
+
+struct CMPluginGoogle : public CMPluginBase
+{
+	CMPluginGoogle() :
+		CMPluginBase(MODULENAME "/GDrive", pluginInfoEx)
+	{
+		m_hInst = g_plugin.getInst();
+
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CGDriveService::Init, (pfnUninitProto)CGDriveService::UnInit);
+	}
+}
+g_pluginGoogle;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+CGDriveService::CGDriveService(const char *protoName, const wchar_t *userName) :
+	CCloudService(protoName, userName, &g_pluginGoogle)
 {
 	m_hProtoIcon = GetIconHandle(IDI_GDRIVE);
 }
@@ -280,17 +295,3 @@ void CGDriveService::Upload(FileTransferParam *ftp)
 		}
 	} while (ftp->NextFile());
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-struct CMPluginGoogle : public CMPluginBase
-{
-	CMPluginGoogle() :
-		CMPluginBase(MODULENAME "/GDrive", pluginInfoEx)
-	{
-		m_hInst = g_plugin.getInst();
-
-		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CGDriveService::Init, (pfnUninitProto)CGDriveService::UnInit);
-	}
-}
-g_pluginGoogle;
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index 5adf66649a..c435bc19b4 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -1,8 +1,22 @@
 #include "..\stdafx.h"
 #include "microsoft_api.h"
 
-COneDriveService::COneDriveService(const char *protoName, const wchar_t *userName)
-	: CCloudService(protoName, userName)
+struct CMPluginOnedrive : public CMPluginBase
+{
+	CMPluginOnedrive() :
+		CMPluginBase(MODULENAME "/OneDrive", pluginInfoEx)
+	{
+		m_hInst = g_plugin.getInst();
+
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)COneDriveService::Init, (pfnUninitProto)COneDriveService::UnInit);
+	}
+}
+g_pluginOnedrive;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+COneDriveService::COneDriveService(const char *protoName, const wchar_t *userName) :
+	CCloudService(protoName, userName, &g_pluginOnedrive)
 {
 	m_hProtoIcon = GetIconHandle(IDI_ONEDRIVE);
 }
@@ -253,17 +267,3 @@ void COneDriveService::Upload(FileTransferParam *ftp)
 		}
 	} while (ftp->NextFile());
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-struct CMPluginOnedrive : public CMPluginBase
-{
-	CMPluginOnedrive() :
-		CMPluginBase(MODULENAME "/OneDrive", pluginInfoEx)
-	{
-		m_hInst = g_plugin.getInst();
-
-		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)COneDriveService::Init, (pfnUninitProto)COneDriveService::UnInit);
-	}
-}
-g_pluginOnedrive;
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index c5dbb50400..ca8ba197d6 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -1,8 +1,22 @@
 #include "..\stdafx.h"
 #include "yandex_api.h"
 
-CYandexService::CYandexService(const char *protoName, const wchar_t *userName)
-	: CCloudService(protoName, userName)
+struct CMPluginYandex : public CMPluginBase
+{
+	CMPluginYandex() :
+		CMPluginBase(MODULENAME "/YandexDisk", pluginInfoEx)
+	{
+		m_hInst = g_plugin.getInst();
+
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CYandexService::Init, (pfnUninitProto)CYandexService::UnInit);
+	}
+}
+g_pluginYandex;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+CYandexService::CYandexService(const char *protoName, const wchar_t *userName) :
+	CCloudService(protoName, userName, &g_pluginYandex)
 {
 	m_hProtoIcon = GetIconHandle(IDI_YADISK);
 }
@@ -274,17 +288,3 @@ void CYandexService::Upload(FileTransferParam *ftp)
 		}
 	} while (ftp->NextFile());
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-struct CMPluginYandex : public CMPluginBase
-{
-	CMPluginYandex() :
-		CMPluginBase(MODULENAME "/YandexDisk", pluginInfoEx)
-	{
-		m_hInst = g_plugin.getInst();
-
-		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CYandexService::Init, (pfnUninitProto)CYandexService::UnInit);
-	}
-}
-g_pluginYandex;