no more pluginLink in load()

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

3 files changed, 4 insertions, 8 deletions

diff --git a/plugins/Dbx_tree/DatabaseLink.cpp b/plugins/Dbx_tree/DatabaseLink.cpp
index 36110d141c..f4bb812d0c 100644
--- a/plugins/Dbx_tree/DatabaseLink.cpp
+++ b/plugins/Dbx_tree/DatabaseLink.cpp
@@ -29,7 +29,7 @@ static int getCapability(int);
 static int getFriendlyName(char*, size_t, int);

 static int makeDatabase(char*, int*);

 static int grokHeader(char*, int*);

-static int Load(char*, void*);

+static int Load(char*);

 static int Unload(int);

 

 DATABASELINK gDBLink = {

@@ -42,10 +42,8 @@ DATABASELINK gDBLink = {
 	Unload,

 };

 

-PLUGINLINK *pluginLink = NULL;

 HANDLE hSystemModulesLoaded = 0;

 

-

 static int SystemModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

 	Update upd = {0,0,0,0,0,0,0,0,0,0,0,0,0};

@@ -141,12 +139,11 @@ Affect: Tell the database to create all services/hooks that a 3.xx legecy databa
 	which is a PLUGINLINK structure

 Returns: 0 on success, nonzero on failure

 */

-static int Load(char* profile, void* link)

+static int Load(char* profile)

 {

 	if (gDataBase) delete gDataBase;

 	gDataBase = new CDataBase(profile);

 

-	pluginLink = (PLUGINLINK*)link;


 	RegisterServices();

 	CompatibilityRegister();

 

@@ -158,7 +155,7 @@ static int Load(char* profile, void* link)
 /*

 Affect: The database plugin should shutdown, unloading things from the core and freeing internal structures

 Returns: 0 on success, nonzero on failure

-Note: Unload() might be called even if Load() was never called, wasLoaded is set to 1 if Load() was ever called.

+Note: Unload() might be called even if Load(void) was never called, wasLoaded is set to 1 if Load(void) was ever called.

 */

 static int Unload(int wasLoaded)

 {

diff --git a/plugins/Dbx_tree/Interface.h b/plugins/Dbx_tree/Interface.h
index b8e72e15ee..438434176a 100644
--- a/plugins/Dbx_tree/Interface.h
+++ b/plugins/Dbx_tree/Interface.h
@@ -36,7 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_dbx_tree.h"

 

 extern HINSTANCE   hInstance;

-extern PLUGINLINK *pluginLink;

 

 extern DATABASELINK gDBLink;

 #endif

diff --git a/plugins/Dbx_tree/init.cpp b/plugins/Dbx_tree/init.cpp
index 8c11e04a9f..6844fa83c8 100644
--- a/plugins/Dbx_tree/init.cpp
+++ b/plugins/Dbx_tree/init.cpp
@@ -61,7 +61,7 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 	return gInterfaces;

 }

 

-extern "C" __declspec(dllexport) int Load(PLUGINLINK * Link)

+extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&gPluginInfoEx);

 	return 1;