From bc510019c0e0b9cc14f0c580667b384568177f7a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 4 Mar 2014 01:05:30 +0300 Subject: Merge scrollarea classes into one. --- src/gui/windows/socialwindow.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/gui/windows/socialwindow.cpp') diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index f33534a85..607be4f3b 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -198,8 +198,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); } A_DELETE_COPY(SocialGuildTab) @@ -334,8 +334,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); } A_DELETE_COPY(SocialGuildTab2) @@ -403,8 +403,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); } A_DELETE_COPY(SocialPartyTab) @@ -519,8 +519,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); getPlayersAvatars(); setCaption(name); @@ -685,8 +685,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); // TRANSLATORS: Navigation tab name in social window. Should be small setCaption(_("Nav")); @@ -1014,8 +1014,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); // TRANSLATORS: Attack filter tab name in social window. Should be small setCaption(_("Atk")); @@ -1061,8 +1061,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); // TRANSLATORS: Pickup filter tab name in social window. Should be small setCaption(_("Pik")); @@ -1108,8 +1108,8 @@ public: mScroll = new ScrollArea(this, mList, showBackground, "social_background.xml"); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); getPlayersAvatars(); setCaption(name); -- cgit v1.2.3-70-g09d2