massive code cleaning due to numerous name conflicts

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

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/FTPFileYM/src/dialog.h b/plugins/FTPFileYM/src/dialog.h
index 0f8db40f6f..9354d45e3c 100644
--- a/plugins/FTPFileYM/src/dialog.h
+++ b/plugins/FTPFileYM/src/dialog.h
@@ -33,7 +33,7 @@ class UploadDialog
 private:

 	static UploadDialog *instance;

 	static mir_cs mutexTabs;

-	TCHAR stzToolTipText[1024];

+	TCHAR m_tszToolTipText[1024];

 

 	UploadDialog();

 

@@ -41,16 +41,16 @@ public:
 	class Tab

 	{

 	public:

-		GenericJob *job;

+		GenericJob *m_job;

 

-		bool bOptCloseDlg;

-		bool bOptCopyLink;

-		bool bOptAutosend;

-		int iOptAutoDelete;

+		bool m_bOptCloseDlg;

+		bool m_bOptCopyLink;

+		bool m_bOptAutosend;

+		int  m_iOptAutoDelete;

 

-		TCHAR stzSpeed[64];

-		TCHAR stzComplet[64];

-		TCHAR stzRemain[64];

+		TCHAR m_stzSpeed[64];

+		TCHAR m_stzComplet[64];

+		TCHAR m_stzRemain[64];

 

 		Tab(GenericJob *Job);

 		~Tab();

@@ -60,11 +60,11 @@ public:
 		void labelCompleted();

 	};

 

-	HWND hwnd;

-	HWND hwndTabs;

-	int activeTab;

+	HWND m_hwnd;

+	HWND m_hwndTabs;

+	int  m_activeTab;

 

-	vector<Tab *> tabs;

+	vector<Tab *> m_tabs;

 

 	~UploadDialog();

 

@@ -80,4 +80,4 @@ public:
 

 	static LRESULT CALLBACK TabControlProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); 

 	static INT_PTR CALLBACK UploadDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-};
\ No newline at end of file
+};