diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-08-09 16:11:36 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-09 16:48:40 -0600 |
commit | 4f5f84e1687e75fe7e80f0f31316b6efe2feae49 (patch) | |
tree | 25c46bef77957aee4370186fd4fc8defea40f9fd | |
parent | d51e707dff682e86c2d390b9e24981f511fa03c9 (diff) | |
download | mana-4f5f84e1687e75fe7e80f0f31316b6efe2feae49.tar.gz mana-4f5f84e1687e75fe7e80f0f31316b6efe2feae49.tar.bz2 mana-4f5f84e1687e75fe7e80f0f31316b6efe2feae49.tar.xz mana-4f5f84e1687e75fe7e80f0f31316b6efe2feae49.zip |
Replace remaining gcn::Label instances with Label instances
Reviewed-by: Chuck Miller
-rw-r--r-- | src/gui/itempopup.cpp | 3 | ||||
-rw-r--r-- | src/gui/speechbubble.cpp | 3 | ||||
-rw-r--r-- | src/gui/textpopup.cpp | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index ce4d1126..c926670a 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -28,6 +28,7 @@ #include "gui/gui.h" #include "gui/widgets/icon.h" +#include "gui/widgets/label.h" #include "gui/widgets/textbox.h" #include "utils/gettext.h" @@ -46,7 +47,7 @@ ItemPopup::ItemPopup(): mIcon(0) { // Item Name - mItemName = new gcn::Label; + mItemName = new Label; mItemName->setFont(boldFont); mItemName->setPosition(getPadding(), getPadding()); diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index af42feb7..e0a9f8a0 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -26,6 +26,7 @@ #include "gui/gui.h" +#include "gui/widgets/label.h" #include "gui/widgets/textbox.h" #include "resources/theme.h" @@ -41,7 +42,7 @@ SpeechBubble::SpeechBubble(): setMinWidth(29); setMinHeight(29); - mCaption = new gcn::Label; + mCaption = new Label; mCaption->setFont(boldFont); mSpeechBox = new TextBox; diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 6aeae319..d0a0c495 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -26,6 +26,8 @@ #include "gui/gui.h" #include "gui/palette.h" +#include "gui/widgets/label.h" + #include "graphics.h" #include "units.h" @@ -40,10 +42,10 @@ TextPopup::TextPopup(): { const int fontHeight = getFont()->getHeight(); - mText1 = new gcn::Label; + mText1 = new Label; mText1->setPosition(getPadding(), getPadding()); - mText2 = new gcn::Label; + mText2 = new Label; mText2->setPosition(getPadding(), fontHeight + getPadding()); add(mText1); |