-minor signature fixes

-fixed path to precompiled headers

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

9 files changed, 13 insertions, 18 deletions

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 0f75c0df43..537fb0d8c8 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $
 

 ===============================================================================

 */

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 #include "..\svc_contactinfo.h"

 #include "classExImContactBase.h"

 #include "mir_rfcCodecs.h"

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 2264f4d278..0f29f08c25 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $
 

 ===============================================================================

 */

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 #include "classExImContactXML.h"

 #include "svc_ExImXML.h"

 #include "mir_rfcCodecs.h"

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 9ca27d7289..09431edde5 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $
 ===============================================================================

 */

 

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 //#include "svc_ExImport.h"

 #include "dlg_ExImModules.h"

 

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 6b72dbdb46..1b62985ec9 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $
 ===============================================================================

 */

 

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 

 

  #include <dlgs.h>

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index 9da4ee4373..2f7ee91aca 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $
 ===============================================================================

 */

 

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 #include "dlg_ExImProgress.h"

 

 /***********************************************************************************************************

@@ -41,7 +41,7 @@ Last change by : $Author: ing.u.horn $
  * params:	none

  * return:	nothing

  **/

-LRESULT CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) 

 	{

@@ -102,7 +102,7 @@ LRESULT CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
 CProgress::CProgress()

 {

 	_dwStartTime = GetTickCount();

-	_hDlg = CreateDialog(ghInst, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, (DLGPROC)DlgProcProgress);

+	_hDlg = CreateDialog(ghInst, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, DlgProcProgress);

 }

 

 /**

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index f3c4ce6362..24c4e7eab9 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -31,17 +31,12 @@ Last change by : $Author: ing.u.horn $
 /**

  * system & local includes:

  **/

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 #include "classExImContactBase.h"

 #include "dlg_ExImModules.h"

 #include "svc_ExImport.h"

 #include "svc_ExImINI.h"

 

-/**

- * Miranda includes

- **/

-#include <m_protocols.h>

-#include <m_protosvc.h>

 

 /***********************************************************************************************************

  * exporting stuff

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 53faf60c02..2a3144b878 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -31,7 +31,7 @@ Last change by : $Author: ing.u.horn $
 /**

  * system & local includes:

  **/

-#include "commonheaders.h"

+#include "../commonheaders.h"

 #include "../svc_reminder.h"

 #include "svc_ExImport.h"

 #include "svc_ExImVCF.h"

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index dca52f1685..f43b5fe9c6 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $
 

 ===============================================================================

 */

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 

 #define XMLCARD_VERSION	"1.1"

 

@@ -38,7 +38,7 @@ Last change by : $Author: ing.u.horn $
 #include "classExImContactXML.h"

 #include "svc_ExImport.h"

 

-LRESULT CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) 

 	{

@@ -112,7 +112,7 @@ INT CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName)
 

 	result = (DWORD)DialogBox(ghInst, 

 							MAKEINTRESOURCE(IDD_EXPORT_DATAHISTORY),

-							NULL, (DLGPROC)DlgProc_DataHistory);

+							NULL, DlgProc_DataHistory);

 	if (LOWORD(result) != IDOK)

 	{

 		return 0;

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 35bb59c3b9..1570aa6e01 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $
 ===============================================================================

 */

 

-#include "commonheaders.h"

+#include "..\commonheaders.h"

 #include "classExImContactBase.h"

 #include "dlg_ExImModules.h"

 #include "dlg_ExImOpenSaveFile.h"