From a397922e8d53c6f7ff469d38e5139fd003c705b5 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Tue, 18 Sep 2012 00:01:00 +0200 Subject: warnings fight in progress. --- src/ui/displayinfo.cpp | 10 ++++---- src/ui/displaytext.cpp | 6 ++--- src/ui/edit.cpp | 36 +++++++++++++------------- src/ui/list.cpp | 8 +++--- src/ui/maindialog.cpp | 6 ++--- src/ui/maindialog.h | 6 ++--- src/ui/mainmap.cpp | 70 +++++++++++++++++++++++++------------------------- src/ui/mainshort.cpp | 2 +- 8 files changed, 72 insertions(+), 72 deletions(-) (limited to 'src/ui') diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 43909b2..e6e95a2 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -232,7 +232,7 @@ bool CDisplayInfo::EventProcess(const Event &event) m_bInfoMaximized = false; } //? m_main->SetEditFull(m_bInfoMaximized); - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW4); + pw = dynamic_cast(m_interface->SearchControl(EVENT_WINDOW4)); if ( pw != 0 ) { pw->SetMaximized(m_bInfoMaximized); @@ -834,7 +834,7 @@ void CDisplayInfo::StopDisplayInfo() if ( m_bEditLock ) // editing running program? { - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3); + pw = dynamic_cast(m_interface->SearchControl(EVENT_WINDOW3)); if ( pw != 0 ) { pw->SetState(STATE_ENABLE); // CStudio operating @@ -929,7 +929,7 @@ CObject* CDisplayInfo::SearchToto() for ( i=0 ; i<1000000 ; i++ ) { - pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); + pObj = static_cast(m_iMan->SearchInstance(CLASS_OBJECT, i)); if ( pObj == 0 ) break; type = pObj->GetType(); @@ -991,7 +991,7 @@ void ObjectWrite(FILE* file, ObjectList list[], int i) strcat(line, res); strcat(line, "\\u "); - p = GetHelpFilename(list[i].type); + p = const_cast(GetHelpFilename(list[i].type)); if ( p[0] == 0 ) return; strcat(line, p+5); // skip "help\" p = strstr(line, ".txt"); @@ -1019,7 +1019,7 @@ void CDisplayInfo::CreateObjectsFile() bRadar = false; for ( i=0 ; i<1000000 ; i++ ) { - pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); + pObj = static_cast(m_iMan->SearchInstance(CLASS_OBJECT, i)); if ( pObj == 0 ) break; if ( !pObj->GetActif() ) continue; diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 63075ee..8578655 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -55,9 +55,9 @@ CDisplayText::CDisplayText() m_iMan = CInstanceManager::GetInstancePointer(); m_iMan->AddInstance(CLASS_DISPLAYTEXT, this); - m_engine = (Gfx::CEngine*)m_iMan->SearchInstance(CLASS_ENGINE); - m_interface = (CInterface*)m_iMan->SearchInstance(CLASS_INTERFACE); - m_sound = (CSoundInterface*)m_iMan->SearchInstance(CLASS_SOUND); + m_engine = static_cast(m_iMan->SearchInstance(CLASS_ENGINE)); + m_interface = static_cast(m_iMan->SearchInstance(CLASS_INTERFACE)); + m_sound = static_cast(m_iMan->SearchInstance(CLASS_SOUND)); for ( i=0 ; i= ' ' && event.param <= 255 ) { - Insert((char)event.param); + Insert(static_cast(event.param)); SendModifEvent(); return true; } @@ -581,7 +581,7 @@ void CEdit::MouseDoubleClick(Math::Point mouse) while ( i > 0 ) { - character = (unsigned char)m_text[i-1]; + character = static_cast(m_text[i-1]); if ( !IsWord(character) ) break; i --; } @@ -589,7 +589,7 @@ void CEdit::MouseDoubleClick(Math::Point mouse) while ( i < m_len ) { - character = (unsigned char)m_text[i]; + character = static_cast(m_text[i]); if ( !IsWord(character) ) break; i ++; } @@ -1651,12 +1651,12 @@ bool CEdit::ReadText(const char *filename, int addSize) for ( iCount=0 ; iCount(iCount/iLines); m_image[iIndex].height = 1.0f/iLines; m_image[iIndex].width = iWidth*0.75f; - m_text[j] = (char)(iIndex++); // as an index into m_image - m_format[j] = (unsigned char)Gfx::FONT_MASK_IMAGE; + m_text[j] = static_cast(iIndex++); // as an index into m_image + m_format[j] = static_cast(Gfx::FONT_MASK_IMAGE); j ++; } } @@ -2179,7 +2179,7 @@ void CEdit::Scroll() { value = m_scroll->GetVisibleValue(); value *= m_lineTotal-m_lineVisible; - Scroll((int)(value+0.5f), true); + Scroll(static_cast(value+0.5f), true); } } @@ -2293,19 +2293,19 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { while ( m_cursor1 > 0 ) { - character = (unsigned char)m_text[m_cursor1-1]; + character = static_cast(m_text[m_cursor1-1]); if ( !IsSpace(character) ) break; m_cursor1 --; } if ( m_cursor1 > 0 ) { - character = (unsigned char)m_text[m_cursor1-1]; + character = static_cast(m_text[m_cursor1-1]); if ( IsSpace(character) ) { while ( m_cursor1 > 0 ) { - character = (unsigned char)m_text[m_cursor1-1]; + character = static_cast(m_text[m_cursor1-1]); if ( !IsSpace(character) ) break; m_cursor1 --; } @@ -2314,7 +2314,7 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { while ( m_cursor1 > 0 ) { - character = (unsigned char)m_text[m_cursor1-1]; + character = static_cast(m_text[m_cursor1-1]); if ( !IsWord(character) ) break; m_cursor1 --; } @@ -2323,7 +2323,7 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { while ( m_cursor1 > 0 ) { - character = (unsigned char)m_text[m_cursor1-1]; + character = static_cast(m_text[m_cursor1-1]); if ( !IsSep(character) ) break; m_cursor1 --; } @@ -2343,12 +2343,12 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { if ( m_cursor1 < m_len ) { - character = (unsigned char)m_text[m_cursor1]; + character = static_cast(m_text[m_cursor1]); if ( IsSpace(character) ) { while ( m_cursor1 < m_len ) { - character = (unsigned char)m_text[m_cursor1]; + character = static_cast(m_text[m_cursor1]); if ( !IsSpace(character) ) break; m_cursor1 ++; } @@ -2357,7 +2357,7 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { while ( m_cursor1 < m_len ) { - character = (unsigned char)m_text[m_cursor1]; + character = static_cast(m_text[m_cursor1]); if ( !IsWord(character) ) break; m_cursor1 ++; } @@ -2366,7 +2366,7 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) { while ( m_cursor1 < m_len ) { - character = (unsigned char)m_text[m_cursor1]; + character = static_cast(m_text[m_cursor1]); if ( !IsSep(character) ) break; m_cursor1 ++; } @@ -2375,7 +2375,7 @@ void CEdit::MoveChar(int move, bool bWord, bool bSelect) while ( m_cursor1 < m_len ) { - character = (unsigned char)m_text[m_cursor1]; + character = static_cast(m_text[m_cursor1]); if ( !IsSpace(character) ) break; m_cursor1 ++; } @@ -3034,7 +3034,7 @@ bool CEdit::MinMaj(bool bMaj) for ( i=c1 ; i(m_text[i]); if ( bMaj ) character = GetToUpper(character); else character = GetToLower(character); m_text[i] = character; diff --git a/src/ui/list.cpp b/src/ui/list.cpp index 80609d7..2aeb240 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -759,16 +759,16 @@ void CList::UpdateScroll() value = 0.0f; step = 0.0f; } else { - ratio = (float)m_displayLine / m_totalLine; + ratio = static_castm_displayLine / m_totalLine; if ( ratio > 1.0f ) ratio = 1.0f; - value = (float)m_firstLine / (m_totalLine - m_displayLine); + value = static_castm_firstLine / (m_totalLine - m_displayLine); if ( value < 0.0f ) value = 0.0f; if ( value > 1.0f ) value = 1.0f; - step = (float)1.0f/ (m_totalLine - m_displayLine); + step = static_cast1.0f/ (m_totalLine - m_displayLine); if ( step < 0.0f ) step = 0.0f; } @@ -791,7 +791,7 @@ void CList::MoveScroll() n = m_totalLine - m_displayLine; pos = m_scroll->GetVisibleValue(); pos += m_scroll->GetArrowStep() / 2.0f; // it's magic! - m_firstLine = (int)(pos * n); + m_firstLine = static_cast(pos * n); if ( m_firstLine < 0 ) m_firstLine = 0; if ( m_firstLine > n ) diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 4523b2c..96a1a4c 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -6575,7 +6575,7 @@ bool CMainDialog::IsDialog() // Specifies the name of the scene to read. -void CMainDialog::SetSceneRead(char* name) +void CMainDialog::SetSceneRead(const char* name) { strcpy(m_sceneRead, name); } @@ -6589,7 +6589,7 @@ char* CMainDialog::GetSceneRead() // Specifies the name of the scene to read. -void CMainDialog::SetStackRead(char* name) +void CMainDialog::SetStackRead(const char* name) { strcpy(m_stackRead, name); } @@ -6603,7 +6603,7 @@ char* CMainDialog::GetStackRead() // Specifies the name of the chosen to play scene. -void CMainDialog::SetSceneName(char* name) +void CMainDialog::SetSceneName(const char* name) { strcpy(m_sceneName, name); } diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index df36a4d..8b0ef81 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -71,9 +71,9 @@ public: bool EventProcess(const Event &event); void ChangePhase(Phase phase); - void SetSceneRead(char* name); - void SetStackRead(char* name); - void SetSceneName(char* name); + void SetSceneRead(const char* name); + void SetStackRead(const char* name); + void SetSceneName(const char* name); void SetSceneRank(int rank); char* GetSceneRead(); char* GetStackRead(); diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 601c035..f853178 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -35,8 +35,8 @@ CMainMap::CMainMap() m_iMan = CInstanceManager::GetInstancePointer(); m_iMan->AddInstance(CLASS_MAP, this); - m_interface = (CInterface*)m_iMan->SearchInstance(CLASS_INTERFACE); - m_event = (CEventQueue*)m_iMan->SearchInstance(CLASS_EVENT); + m_interface = static_cast(m_iMan->SearchInstance(CLASS_INTERFACE)); + m_event = static_cast(m_iMan->SearchInstance(CLASS_EVENT)); m_engine = (Gfx::CEngine*)m_iMan->SearchInstance(CLASS_ENGINE); m_mapMode = 1; @@ -57,7 +57,7 @@ void CMainMap::CreateMap() CWindow* pw; Math::Point pos, dim; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) { pos.x = 0.0f; pos.y = 0.0f; @@ -83,11 +83,11 @@ void CMainMap::SetFixImage(const char *filename) CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; @@ -104,11 +104,11 @@ void CMainMap::FloorColorMap(Gfx::Color floor, Gfx::Color water) CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm != nullptr) { pm->SetFloorColor(floor); pm->SetWaterColor(water); @@ -123,18 +123,18 @@ void CMainMap::ShowMap(bool bShow) CMap* pm; CSlider* ps; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; if (bShow) { DimMap(); } else { - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm != nullptr) pm->ClearState(STATE_VISIBLE); - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps != nullptr) ps->ClearState(STATE_VISIBLE); } @@ -150,10 +150,10 @@ void CMainMap::DimMap() Math::Point pos, dim; float value; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; @@ -166,7 +166,7 @@ void CMainMap::DimMap() pm->SetPos(pos); pm->SetDim(dim); - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps != nullptr) { ps->SetState(STATE_VISIBLE, (m_mapMode != 0)); @@ -193,15 +193,15 @@ float CMainMap::GetZoomMap() CMap* pm; CSlider* ps; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return ZOOM_MIN; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return ZOOM_MIN; - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps == nullptr) return ZOOM_MIN; @@ -216,14 +216,14 @@ void CMainMap::ZoomMap(float zoom) CMap* pm; CSlider* ps; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps == nullptr) return; @@ -245,14 +245,14 @@ void CMainMap::ZoomMap() CSlider* ps; float zoom; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps == nullptr) return; @@ -273,15 +273,15 @@ void CMainMap::MapEnable(bool bEnable) CMap* pm; CSlider* ps; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm != nullptr) pm->SetEnable(bEnable); - ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_MAPZOOM); + ps = static_cast(pw->SearchControl(EVENT_OBJECT_MAPZOOM)); if (ps != nullptr) ps->SetState(STATE_ENABLE, bEnable); } @@ -293,11 +293,11 @@ void CMainMap::SetToy(bool bToy) CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; @@ -312,11 +312,11 @@ void CMainMap::SetFixParam(float zoom, float ox, float oy, float angle, CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return; @@ -334,11 +334,11 @@ void CMainMap::UpdateMap() CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm != nullptr) pm->UpdateTerrain(); } @@ -365,12 +365,12 @@ CObject* CMainMap::DetectMap(Math::Point pos, bool &bInMap) CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return 0; bInMap = false; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm == nullptr) return 0; return pm->DetectObject(pos, bInMap); @@ -384,11 +384,11 @@ void CMainMap::SetHighlight(CObject* pObj) CWindow* pw; CMap* pm; - pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1); + pw = static_cast(m_interface->SearchControl(EVENT_WINDOW1)); if (pw == nullptr) return; - pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP); + pm = static_cast(pw->SearchControl(EVENT_OBJECT_MAP)); if (pm != nullptr) pm->SetHighlight(pObj); } diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index f51ee9b..5b1271f 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -139,7 +139,7 @@ bool CMainShort::CreateShortcuts() for ( i=0 ; i<1000000 ; i++ ) { - pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); + pObj = static_cast(m_iMan->SearchInstance(CLASS_OBJECT, i)); if ( pObj == nullptr ) break; if ( !pObj->GetActif() ) continue; -- cgit v1.2.3-1-g7c22