From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/ExportManager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/BasicHistory/src/ExportManager.h') diff --git a/plugins/BasicHistory/src/ExportManager.h b/plugins/BasicHistory/src/ExportManager.h index 17ed0bb8ef..c0a3a8acf7 100644 --- a/plugins/BasicHistory/src/ExportManager.h +++ b/plugins/BasicHistory/src/ExportManager.h @@ -30,7 +30,7 @@ private: protected: virtual void AddGroup(bool isMe, const std::wstring &time, const std::wstring &user, const std::wstring &eventText, int ico); public: - ExportManager(HWND _hwnd, HANDLE _hContact, int filter); + ExportManager(HWND _hwnd, HCONTACT _hContact, int filter); void SetAutoExport(const std::wstring _file, int _deltaTime, DWORD _now) { @@ -52,8 +52,8 @@ public: bool Export(IExport::ExportType type); void SetDeleteWithoutExportEvents(int _deltaTime, DWORD _now); void DeleteExportedEvents(); - int Import(IImport::ImportType type, const std::vector& contacts); - bool Import(IImport::ImportType type, std::vector& eventList, std::wstring* err = NULL, bool* differentContact = NULL, std::vector* contacts = NULL); + int Import(IImport::ImportType type, const std::vector& contacts); + bool Import(IImport::ImportType type, std::vector& eventList, std::wstring* err = NULL, bool* differentContact = NULL, std::vector* contacts = NULL); static const TCHAR* GetExt(IImport::ImportType type); }; -- cgit v1.2.3