diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-03 00:11:26 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-04 00:15:39 +0100 |
| commit | 8deb1305726966b3b583865dec1ba7ba1327d8cb (patch) | |
| tree | 291627fbe0123dc35c015b1f398585f204afe8ea /src/ui/mainshort.cpp | |
| parent | dae8d8738908a65a4ee4ef14d88681e196825126 (diff) | |
| download | colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.tar.gz colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.tar.bz2 colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.zip | |
Changed char[] to std::string in restext
Experimental changes
Diffstat (limited to 'src/ui/mainshort.cpp')
| -rw-r--r-- | src/ui/mainshort.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index d33482c..f6dce4b 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -97,7 +97,6 @@ bool CMainShort::CreateShortcuts() ObjectType type; Math::Point pos, dim; int i, rank, icon; - char name[100]; if ( m_main->GetFixScene() ) return false; @@ -208,10 +207,11 @@ bool CMainShort::CreateShortcuts() m_shortcuts[rank] = pObj; pc = m_interface->SearchControl(table_sc_em[rank]); - if ( pc != 0 ) + if ( pc != nullptr ) { - pObj->GetTooltipName(name); - pc->SetTooltip(name); + std::string tooltipName; + pObj->GetTooltipName(tooltipName); + pc->SetTooltip(tooltipName); } rank ++; |