CProgress => CCtrlProgress: fix for a class name

7 files changed, 23 insertions, 23 deletions

diff --git a/include/m_gui.h b/include/m_gui.h
index 6b0e1bddd6..7234e37ebb 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -680,10 +680,10 @@ protected:
 /////////////////////////////////////////////////////////////////////////////////////////

 // CProgress

 

-class MIR_CORE_EXPORT CProgress : public CCtrlBase

+class MIR_CORE_EXPORT CCtrlProgress : public CCtrlBase

 {

 public:

-	CProgress(CDlgBase *dlg, int ctrlId);

+	CCtrlProgress(CDlgBase *dlg, int ctrlId);

 

 	void SetRange(WORD max, WORD min = 0);

 	void SetPosition(WORD value);

diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index abb6ab6c22..343ce469b6 100644
--- a/libs/win32/mir_core.lib
+++ b/libs/win32/mir_core.lib
diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib
index f8e53b9646..ac36f200a1 100644
--- a/libs/win64/mir_core.lib
+++ b/libs/win64/mir_core.lib
diff --git a/src/mir_app/src/miranda.cpp b/src/mir_app/src/miranda.cpp
index 00771a987a..17d415d8e5 100644
--- a/src/mir_app/src/miranda.cpp
+++ b/src/mir_app/src/miranda.cpp
@@ -212,7 +212,7 @@ class CWaitRestartDlg : public CDlgBase
 {

 	HANDLE m_hProcess;

 	CTimer m_timer;

-	CProgress m_progress;

+	CCtrlProgress m_progress;

 	CCtrlButton m_cancel;

 

 protected:

diff --git a/src/mir_core/src/CProgress.cpp b/src/mir_core/src/CProgress.cpp
index 457f62328c..335f8113f0 100644
--- a/src/mir_core/src/CProgress.cpp
+++ b/src/mir_core/src/CProgress.cpp
@@ -23,29 +23,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
-// CProgress
+// CCtrlProgress
 
-CProgress::CProgress(CDlgBase *wnd, int idCtrl)
+CCtrlProgress::CCtrlProgress(CDlgBase *wnd, int idCtrl)
 	: CCtrlBase(wnd, idCtrl)
 {
 }
 
-void CProgress::SetRange(WORD max, WORD min)
+void CCtrlProgress::SetRange(WORD max, WORD min)
 {
 	SendMsg(PBM_SETRANGE, 0, MAKELPARAM(min, max));
 }
 
-void CProgress::SetPosition(WORD value)
+void CCtrlProgress::SetPosition(WORD value)
 {
 	SendMsg(PBM_SETPOS, value, 0);
 }
 
-void CProgress::SetStep(WORD value)
+void CCtrlProgress::SetStep(WORD value)
 {
 	SendMsg(PBM_SETSTEP, value, 0);
 }
 
-WORD CProgress::Move(WORD delta)
+WORD CCtrlProgress::Move(WORD delta)
 {
 	return delta == 0
 		? SendMsg(PBM_STEPIT, 0, 0)
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 735cffd6f6..cc0713af90 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -960,21 +960,21 @@ db_delete_module @1161
 ?SetMaxLength@CCtrlEdit@@QAEXI@Z @1167 NONAME

 db_get_current @1169

 CallFunctionSync @1170

-??0CProgress@@QAE@PAVCDlgBase@@H@Z @1172 NONAME

+??0CCtrlProgress@@QAE@PAVCDlgBase@@H@Z @1172 NONAME

 ??0CTimer@@QAE@ABV0@@Z @1173 NONAME

 ??0CTimer@@QAE@PAVCDlgBase@@I@Z @1174 NONAME

-??1CProgress@@UAE@XZ @1175 NONAME

+??1CCtrlProgress@@UAE@XZ @1175 NONAME

 ??4CTimer@@QAEAAV0@ABV0@@Z @1177 NONAME

-??_7CProgress@@6B@ @1178 NONAME

+??_7CCtrlProgress@@6B@ @1178 NONAME

 ??_7CTimer@@6B@ @1179 NONAME

 ?FindTimer@CDlgBase@@AAEPAVCTimer@@H@Z @1180 NONAME

 ?GetEventId@CTimer@@QBEIXZ @1181 NONAME

-?Move@CProgress@@QAEGG@Z @1182 NONAME

+?Move@CCtrlProgress@@QAEGG@Z @1182 NONAME

 ?OnTimer@CDlgBase@@MAEXPAVCTimer@@@Z @1183 NONAME

 ?OnTimer@CTimer@@UAEHXZ @1184 NONAME

-?SetPosition@CProgress@@QAEXG@Z @1185 NONAME

-?SetRange@CProgress@@QAEXGG@Z @1186 NONAME

-?SetStep@CProgress@@QAEXG@Z @1187 NONAME

+?SetPosition@CCtrlProgress@@QAEXG@Z @1185 NONAME

+?SetRange@CCtrlProgress@@QAEXGG@Z @1186 NONAME

+?SetStep@CCtrlProgress@@QAEXG@Z @1187 NONAME

 ?Start@CTimer@@QAEXH@Z @1188 NONAME

 ?Stop@CTimer@@QAEXXZ @1189 NONAME

 ?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 9f5bddc8bb..640a6628f3 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -960,21 +960,21 @@ db_delete_module @1161
 ?SetMaxLength@CCtrlEdit@@QEAAXI@Z @1167 NONAME

 db_get_current @1169

 CallFunctionSync @1170

-??0CProgress@@QEAA@PEAVCDlgBase@@H@Z @1172 NONAME

+??0CCtrlProgress@@QEAA@PEAVCDlgBase@@H@Z @1172 NONAME

 ??0CTimer@@QEAA@AEBV0@@Z @1173 NONAME

 ??0CTimer@@QEAA@PEAVCDlgBase@@_K@Z @1174 NONAME

-??1CProgress@@UEAA@XZ @1175 NONAME

+??1CCtrlProgress@@UEAA@XZ @1175 NONAME

 ??4CTimer@@QEAAAEAV0@AEBV0@@Z @1177 NONAME

-??_7CProgress@@6B@ @1178 NONAME

+??_7CCtrlProgress@@6B@ @1178 NONAME

 ??_7CTimer@@6B@ @1179 NONAME

 ?FindTimer@CDlgBase@@AEAAPEAVCTimer@@H@Z @1180 NONAME

 ?GetEventId@CTimer@@QEBA_KXZ @1181 NONAME

-?Move@CProgress@@QEAAGG@Z @1182 NONAME

+?Move@CCtrlProgress@@QEAAGG@Z @1182 NONAME

 ?OnTimer@CDlgBase@@MEAAXPEAVCTimer@@@Z @1183 NONAME

 ?OnTimer@CTimer@@UEAAHXZ @1184 NONAME

-?SetPosition@CProgress@@QEAAXG@Z @1185 NONAME

-?SetRange@CProgress@@QEAAXGG@Z @1186 NONAME

-?SetStep@CProgress@@QEAAXG@Z @1187 NONAME

+?SetPosition@CCtrlProgress@@QEAAXG@Z @1185 NONAME

+?SetRange@CCtrlProgress@@QEAAXGG@Z @1186 NONAME

+?SetStep@CCtrlProgress@@QEAAXG@Z @1187 NONAME

 ?Start@CTimer@@QEAAXH@Z @1188 NONAME

 ?Stop@CTimer@@QEAAXXZ @1189 NONAME

 ?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME