diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
| commit | da05d9dd98315378bdded216184294f376643191 (patch) | |
| tree | ffc4b984c73c3bb68d26a1df6481634254075744 /src/gui/widgets/browserbox.cpp | |
| parent | ec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff) | |
| download | mv-da05d9dd98315378bdded216184294f376643191.tar.gz mv-da05d9dd98315378bdded216184294f376643191.tar.bz2 mv-da05d9dd98315378bdded216184294f376643191.tar.xz mv-da05d9dd98315378bdded216184294f376643191.zip | |
Use resource manager as global variable.
Diffstat (limited to 'src/gui/widgets/browserbox.cpp')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index d5eb6b89a..ea6ca7be4 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -121,7 +121,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget, mSkin = theme->load(skin, "browserbox.xml"); if (mInstances == 0) { - mEmotes = ResourceManager::getInstance()->getImageSet( + mEmotes = resourceManager->getImageSet( "graphics/sprites/chatemotes.png", 17, 18); } mInstances ++; @@ -570,8 +570,6 @@ int BrowserBox::calcHeight() Color selColor[2] = {mForegroundColor, mForegroundColor2}; const Color textColor[2] = {mForegroundColor, mForegroundColor2}; - ResourceManager *const resman = ResourceManager::getInstance(); - mLineParts.clear(); FOR_EACH (TextRowCIter, i, mTextRows) @@ -601,7 +599,7 @@ int BrowserBox::calcHeight() const size_t sz = str.size(); if (sz > 2 && str.substr(sz - 1) == "~") str = str.substr(0, sz - 1); - Image *const img = resman->getImage(str); + Image *const img = resourceManager->getImage(str); if (img) { img->incRef(); |