From 81e8caf42867b65677efe2bffaa52ecff7303c3a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jun 2012 13:58:25 +0000 Subject: no more pluginLink in load() git-svn-id: http://svn.miranda-ng.org/main/trunk@652 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CSList/cslist.cpp | 4 +--- plugins/CSList/cslist.h | 17 ++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'plugins/CSList') diff --git a/plugins/CSList/cslist.cpp b/plugins/CSList/cslist.cpp index cc0f0f989b..ff4870f4d4 100644 --- a/plugins/CSList/cslist.cpp +++ b/plugins/CSList/cslist.cpp @@ -72,10 +72,8 @@ extern "C" __declspec( dllexport ) const MUUID* MirandaPluginInterfaces( void ) // ====[ LOADER ]============================================================= -extern "C" __declspec( dllexport ) int Load( PLUGINLINK *link ) +extern "C" __declspec( dllexport ) int Load( ) { - // link plugin - pluginLink = link; mir_getLP(&pluginInfoEx); servicesList = List_Create(0, 10); diff --git a/plugins/CSList/cslist.h b/plugins/CSList/cslist.h index 9fd1b5a5c9..b2cffb6549 100644 --- a/plugins/CSList/cslist.h +++ b/plugins/CSList/cslist.h @@ -327,7 +327,7 @@ template< class T > struct ListItem { T* item; ListItem* next; - + ListItem( ) { this->item = NULL; @@ -338,7 +338,7 @@ template< class T > struct ListItem { delete this->item; } - + ListItem( StatusItem* si ) { this->item = si; @@ -358,7 +358,7 @@ template< class T > struct List private: ListItem< T >* items; unsigned int count; - + public: typedef int ( *compareFunc )( const T* p1, const T* p2 ); compareFunc compare; @@ -448,7 +448,7 @@ public: this->count--; return position; } - + T* get( const unsigned int item ) { ListItem< T >* help = items; @@ -625,9 +625,9 @@ BOOL CSList::bAccountsSupported = FALSE; static const MUUID interfaces[] = { PLUGIN_GUUID, MIID_LAST }; -PLUGINLINK* pluginLink = NULL; -PLUGININFOEX pluginInfoEx = { - sizeof(PLUGININFOEX), +PLUGININFOEX pluginInfoEx = +{ + sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), __DESCRIPTION, @@ -642,7 +642,6 @@ PLUGININFOEX pluginInfoEx = { CSList* cslist = NULL; - // ====[ INIT STUFF ]========================================================= BOOL WINAPI DllMain( HINSTANCE, DWORD, LPVOID ); @@ -650,7 +649,7 @@ BOOL WINAPI DllMain( HINSTANCE, DWORD, LPVOID ); extern "C" __declspec( dllexport ) PLUGININFOEX* MirandaPluginInfoEx( DWORD ); extern "C" __declspec( dllexport ) const MUUID* MirandaPluginInterfaces( void ); -extern "C" __declspec( dllexport ) int Load( PLUGINLINK* ); +extern "C" __declspec( dllexport ) int Load(void); extern "C" __declspec( dllexport ) int Unload( void ); -- cgit v1.2.3