diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-12 21:05:10 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-12 21:05:10 +0000 |
commit | fff85d59848d265184c80bd6276923b503df95f8 (patch) | |
tree | cd9efd8cfd38dc8ff731624d218a3c2fbc53cffc /plugins/BasicHistory/src/ExportManager.h | |
parent | d4c37690295db5515f19a8b1cd221b4222f16eeb (diff) |
naming conflics resolved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14933 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/BasicHistory/src/ExportManager.h')
-rw-r--r-- | plugins/BasicHistory/src/ExportManager.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/plugins/BasicHistory/src/ExportManager.h b/plugins/BasicHistory/src/ExportManager.h index ea3aa208b3..1cefb47463 100644 --- a/plugins/BasicHistory/src/ExportManager.h +++ b/plugins/BasicHistory/src/ExportManager.h @@ -22,38 +22,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "IImport.h"
class ExportManager : public HistoryEventList
{
-private:
- IExport* exp;
- std::wstring file;
- HWND hwnd;
- bool oldOnTop;
+ IExport* m_exp;
+ std::wstring m_file;
+ HWND m_hwnd;
+ bool m_oldOnTop;
+
protected:
virtual void AddGroup(bool isMe, const std::wstring &time, const std::wstring &user, const std::wstring &eventText, int ico);
+
public:
ExportManager(HWND _hwnd, MCONTACT _hContact, int filter);
- void SetAutoExport(const std::wstring _file, int _deltaTime, DWORD _now)
+ void SetAutoExport(const std::wstring _file, int deltaTime, DWORD now)
{
- file = _file;
- deltaTime = _deltaTime;
- now = _now;
+ m_file = _file;
+ m_deltaTime = deltaTime;
+ m_now = now;
}
void SetAutoImport(const std::wstring _file)
{
- file = _file;
+ m_file = _file;
}
std::wstring GetFileName()
{
- return file;
+ return m_file;
}
bool Export(IExport::ExportType type);
- void SetDeleteWithoutExportEvents(int _deltaTime, DWORD _now);
+ void SetDeleteWithoutExportEvents(int deltaTime, DWORD now);
void DeleteExportedEvents();
- int Import(IImport::ImportType type, const std::vector<MCONTACT>& contacts);
- bool Import(IImport::ImportType type, std::vector<IImport::ExternalMessage>& eventList, std::wstring* err = NULL, bool* differentContact = NULL, std::vector<MCONTACT>* contacts = NULL);
+ int Import(IImport::ImportType type, const std::vector<MCONTACT> &contacts);
+ bool Import(IImport::ImportType type, std::vector<IImport::ExternalMessage> &eventList, std::wstring *err = NULL, bool *differentContact = NULL, std::vector<MCONTACT> *contacts = NULL);
static const TCHAR* GetExt(IImport::ImportType type);
};
|