HistorySweeperLight:

plusified

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

5 files changed, 14 insertions, 21 deletions

diff --git a/plugins/HistorySweeperLight/historysweeperlight.cpp b/plugins/HistorySweeperLight/historysweeperlight.cpp
index 50cc7e1386..50e37ddc34 100644
--- a/plugins/HistorySweeperLight/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/historysweeperlight.cpp
@@ -21,14 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "historysweeperlight.h"

 

-#ifdef VC6BUILD

-#define _____TIMEPROC time

-#else

-#define _____TIMEPROC _time32

-#endif

-

-_CRTIMP __time32_t __cdecl _____TIMEPROC(_Out_opt_ __time32_t * _Time);

-

 typedef struct

 {

 	time_t time;

@@ -38,7 +30,7 @@ typedef struct
 // build criteria

 time_t BuildCriteria(int dwti)

 {

-	time_t tim =  _____TIMEPROC(NULL);

+	time_t tim =  time(NULL);

 

 	switch (dwti)

 	{

@@ -119,7 +111,7 @@ static void GetBookmarks(HANDLE hContact, BEventData** books, size_t* bookcnt )
 			size_t recSize = *(WORD*)dbv.pbVal;

 			size_t numb = (dbv.cpbVal - sizeof(WORD)) / recSize;

 

-			BEventData* tbooks = mir_alloc(sizeof(BEventData)*numb);

+			BEventData* tbooks = (BEventData*)mir_alloc(sizeof(BEventData)*numb);

 			size_t tbookcnt = 0;

 

 			size_t i;

@@ -253,4 +245,4 @@ int OnWindowEvent(WPARAM wParam, LPARAM lParam)
 	}

 

 	return 0;

-}

+}
\ No newline at end of file
diff --git a/plugins/HistorySweeperLight/historysweeperlight.h b/plugins/HistorySweeperLight/historysweeperlight.h
index 2600cc2d67..c7fbeaeb25 100644
--- a/plugins/HistorySweeperLight/historysweeperlight.h
+++ b/plugins/HistorySweeperLight/historysweeperlight.h
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <windows.h>

 #include <commctrl.h>

+#include <time.h>

 

 #include <win2k.h>

 #include <newpluginapi.h>

diff --git a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
index b6b1ab01e2..5d16028b05 100644
--- a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
+++ b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
@@ -170,9 +170,9 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="historysweeperlight.c" />

-    <ClCompile Include="main.c" />

-    <ClCompile Include="options.c" />

+    <ClCompile Include="historysweeperlight.cpp" />

+    <ClCompile Include="main.cpp" />

+    <ClCompile Include="options.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="historysweeperlight.h" />

diff --git a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
index feb246208c..215f46c7f5 100644
--- a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
+++ b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
@@ -15,13 +15,13 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="historysweeperlight.c">

+    <ClCompile Include="historysweeperlight.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.c">

+    <ClCompile Include="main.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.c">

+    <ClCompile Include="options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/HistorySweeperLight/main.cpp b/plugins/HistorySweeperLight/main.cpp
index 3174ab1369..9c1e4e8c66 100644
--- a/plugins/HistorySweeperLight/main.cpp
+++ b/plugins/HistorySweeperLight/main.cpp
@@ -149,12 +149,12 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

 {

 	return &pluginInfoEx;

 }

 

-int __declspec(dllexport) Load(PLUGINLINK *link)

+extern "C" __declspec(dllexport) int Load(PLUGINLINK *link)

 {

 	pluginLink = link;

 

@@ -169,7 +169,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link)
 	return 0;

 }

 

-int __declspec(dllexport) Unload(void)

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

 { 

 	int i;

 

@@ -182,4 +182,4 @@ int __declspec(dllexport) Unload(void)
 	}

 

 	return 0;

-}

+}
\ No newline at end of file