fixed some "using namespace" in headers

apps/openmw/mwgui/alchemywindow.cpp

@@ -493,7 +493,7 @@ namespace MWGui
 
         MyGUI::IntCoord coord(0, 0, mEffectsBox->getWidth(), 24);
         Widgets::MWEffectListPtr effectsWidget = mEffectsBox->createWidget<Widgets::MWEffectList>
-            ("MW_StatName", coord, Align::Left | Align::Top);
+            ("MW_StatName", coord, MyGUI::Align::Left | MyGUI::Align::Top);
         effectsWidget->setWindowManager(&mWindowManager);
         effectsWidget->setEffectList(effects);
 

apps/openmw/mwgui/birth.hpp

@@ -10,9 +10,6 @@
 
 namespace MWGui
 {
-    /// \todo remove
-    using namespace MyGUI;
-
     class BirthDialog : public WindowBase
     {
     public:
@@ -31,7 +28,7 @@ namespace MWGui
         virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n

apps/openmw/mwgui/class.hpp

@@ -12,9 +12,6 @@
 
 namespace MWGui
 {
-    /// \todo remove!
-    using namespace MyGUI;
-
     class InfoBoxDialog : public WindowBase
     {
     public:
@@ -30,7 +27,7 @@ namespace MWGui
         int getChosenButton() const;
 
         // Events
-        typedef delegates::CMultiDelegate1<int> EventHandle_Int;
+        typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Button was clicked.\n
             signature : void method(int index)\n
@@ -75,7 +72,7 @@ namespace MWGui
         void setClassId(const std::string &classId);
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -105,7 +102,7 @@ namespace MWGui
         virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -141,7 +138,7 @@ namespace MWGui
         ESM::Class::Specialization getSpecializationId() const { return mSpecializationId; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -174,7 +171,7 @@ namespace MWGui
         void setAffectedWidget(Widgets::MWAttributePtr widget) { mAffectedWidget = widget; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -207,7 +204,7 @@ namespace MWGui
         void setAffectedWidget(Widgets::MWSkillPtr widget) { mAffectedWidget = widget; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -264,7 +261,7 @@ namespace MWGui
         void setNextButtonShow(bool shown);
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n

apps/openmw/mwgui/container.cpp

@@ -76,7 +76,7 @@ ContainerBase::ContainerBase(DragAndDrop* dragAndDrop) :
 {
 }
 
-void ContainerBase::setWidgets(Widget* containerWidget, ScrollView* itemView)
+void ContainerBase::setWidgets(MyGUI::Widget* containerWidget, MyGUI::ScrollView* itemView)
 {
     mContainerWidget = containerWidget;
     mItemView = itemView;
@@ -471,7 +471,7 @@ void ContainerBase::drawItems()
 
             // background widget (for the "equipped" frame and magic item background image)
             bool isMagic = (MWWorld::Class::get(*iter).getEnchantment(*iter) != "");
-            MyGUI::ImageBox* backgroundWidget = mContainerWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 42, 42), MyGUI::Align::Default);
+            MyGUI::ImageBox* backgroundWidget = mContainerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 42, 42), MyGUI::Align::Default);
             backgroundWidget->setUserString("ToolTipType", "ItemPtr");
             backgroundWidget->setUserData(*iter);
 
@@ -503,7 +503,7 @@ void ContainerBase::drawItems()
             backgroundWidget->eventMouseWheel += MyGUI::newDelegate(this, &ContainerBase::onMouseWheel);
 
             // image
-            ImageBox* image = backgroundWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
+            MyGUI::ImageBox* image = backgroundWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
             int pos = path.rfind(".");
             path.erase(pos);
             path.append(".dds");

apps/openmw/mwgui/dialogue.cpp

@@ -54,7 +54,7 @@ DialogueWindow::DialogueWindow(MWBase::WindowManager& parWindowManager)
     getWidget(mHistory, "History");
     mHistory->setOverflowToTheLeft(true);
     mHistory->setMaxTextLength(1000000);
-    Widget* eventbox;
+    MyGUI::Widget* eventbox;
 
     //An EditBox cannot receive mouse click events, so we use an
     //invisible widget on top of the editbox to receive them
@@ -78,11 +78,11 @@ DialogueWindow::DialogueWindow(MWBase::WindowManager& parWindowManager)
 
 void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
 {
-    ISubWidgetText* t = mHistory->getClient()->getSubWidgetText();
+    MyGUI::ISubWidgetText* t = mHistory->getClient()->getSubWidgetText();
     if(t == nullptr)
         return;
 
-    const IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
+    const MyGUI::IntPoint& lastPressed = MyGUI::InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
 
     size_t cursorPosition = t->getCursorPosition(lastPressed);
     MyGUI::UString color = mHistory->getColorAtPos(cursorPosition);
@@ -92,7 +92,7 @@ void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
 
     if(color != "#B29154")
     {
-        UString key = mHistory->getColorTextAt(cursorPosition);
+        MyGUI::UString key = mHistory->getColorTextAt(cursorPosition);
         if(color == "#686EBA") MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(key));
 
         if(color == "#572D21") MWBase::Environment::get().getDialogueManager()->questionAnswered(lower_string(key));

apps/openmw/mwgui/dialogue_history.cpp

@@ -14,10 +14,10 @@
 using namespace MWGui;
 using namespace Widgets;
 
-UString DialogueHistory::getColorAtPos(size_t _pos)
+MyGUI::UString DialogueHistory::getColorAtPos(size_t _pos)
 {
-    UString colour = TextIterator::convertTagColour(getTextColour());
+    MyGUI::UString colour = MyGUI::TextIterator::convertTagColour(getTextColour());
-    TextIterator iterator(getCaption());
+    MyGUI::TextIterator iterator(getCaption());
     while(iterator.moveNext())
     {
         size_t pos = iterator.getPosition();
@@ -30,13 +30,13 @@ UString DialogueHistory::getColorAtPos(size_t _pos)
     return colour;
 }
 
-UString DialogueHistory::getColorTextAt(size_t _pos)
+MyGUI::UString DialogueHistory::getColorTextAt(size_t _pos)
 {
     bool breakOnNext = false;
-    UString colour = TextIterator::convertTagColour(getTextColour());
+    MyGUI::UString colour = MyGUI::TextIterator::convertTagColour(getTextColour());
-    UString colour2 = colour;
+    MyGUI::UString colour2 = colour;
-    TextIterator iterator(getCaption());
+    MyGUI::TextIterator iterator(getCaption());
-    TextIterator col_start = iterator;
+    MyGUI::TextIterator col_start = iterator;
     while(iterator.moveNext())
     {
         size_t pos = iterator.getPosition();
@@ -60,15 +60,15 @@ UString DialogueHistory::getColorTextAt(size_t _pos)
     return "";
 }
 
-void DialogueHistory::addDialogHeading(const UString& parText)
+void DialogueHistory::addDialogHeading(const MyGUI::UString& parText)
 {
-    UString head("\n#D8C09A");
+    MyGUI::UString head("\n#D8C09A");
     head.append(parText);
     head.append("#B29154\n");
     addText(head);
 }
 
-void DialogueHistory::addDialogText(const UString& parText)
+void DialogueHistory::addDialogText(const MyGUI::UString& parText)
 {
     addText(parText);
     addText("\n");

apps/openmw/mwgui/dialogue_history.hpp

@@ -4,16 +4,15 @@
 
 namespace MWGui
 {
-    using namespace MyGUI;
     class DialogueHistory : public MyGUI::EditBox
     {
         MYGUI_RTTI_DERIVED( DialogueHistory )
         public:
             Widget* getClient() { return mClient; }
-            UString getColorAtPos(size_t _pos);
+            MyGUI::UString getColorAtPos(size_t _pos);
-            UString getColorTextAt(size_t _pos);
+            MyGUI::UString getColorTextAt(size_t _pos);
-            void addDialogHeading(const UString& parText);
+            void addDialogHeading(const MyGUI::UString& parText);
-            void addDialogText(const UString& parText);
+            void addDialogText(const MyGUI::UString& parText);
     };
 }
 #endif

apps/openmw/mwgui/inventorywindow.cpp

@@ -328,12 +328,12 @@ namespace MWGui
 
         std::string path = std::string("icons\\");
         path += MWWorld::Class::get(newObject).getInventoryIcon(newObject);
-        MyGUI::ImageBox* baseWidget = mContainerWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
+        MyGUI::ImageBox* baseWidget = mContainerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
         baseWidget->detachFromWidget();
         baseWidget->attachToWidget(mDragAndDrop->mDragAndDropWidget);
         baseWidget->setUserData(newObject);
         mDragAndDrop->mDraggedWidget = baseWidget;
-        ImageBox* image = baseWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
+        MyGUI::ImageBox* image = baseWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");

apps/openmw/mwgui/race.hpp

@@ -19,8 +19,6 @@ namespace MWGui
 
 namespace MWGui
 {
-    using namespace MyGUI;
-
     class RaceDialog : public WindowBase
     {
     public:
@@ -46,7 +44,7 @@ namespace MWGui
         virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n

apps/openmw/mwgui/review.cpp

@@ -30,7 +30,7 @@ ReviewDialog::ReviewDialog(MWBase::WindowManager& parWindowManager)
     center();
 
     // Setup static stats
-    ButtonPtr button;
+    MyGUI::Button* button;
     getWidget(mNameWidget, "NameText");
     getWidget(button, "NameButton");
     adjustButtonSize(button);

apps/openmw/mwgui/review.hpp

@@ -17,8 +17,6 @@ Layout is defined by resources/mygui/openmw_chargen_review.layout.
 
 namespace MWGui
 {
-    using namespace MyGUI;
-
     class ReviewDialog : public WindowBase
     {
     public:
@@ -49,8 +47,8 @@ namespace MWGui
         virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
-        typedef delegates::CMultiDelegate1<int> EventHandle_Int;
+        typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Back button clicked.\n
         signature : void method()\n

apps/openmw/mwgui/text_input.hpp

@@ -13,8 +13,6 @@ namespace MWGui
 
 namespace MWGui
 {
-    using namespace MyGUI;
-
     class TextInputDialog : public WindowBase
     {
     public:

apps/openmw/mwgui/widgets.hpp

@@ -7,9 +7,6 @@
 
 #include "../mwmechanics/stat.hpp"
 
-#undef MYGUI_EXPORT
-#define MYGUI_EXPORT
-
 namespace MWBase
 {
     class WindowManager;
@@ -21,9 +18,6 @@ namespace MWBase
 
 namespace MWGui
 {
-    /// \todo remove!
-    using namespace MyGUI;
-
     namespace Widgets
     {
         class MWEffectList;
@@ -78,9 +72,9 @@ namespace MWGui
 
         typedef std::vector<SpellEffectParams> SpellEffectList;
 
-        class MYGUI_EXPORT MWSkill : public MyGUI::Widget
+        class MWSkill : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSkill );
+            MYGUI_RTTI_DERIVED( MWSkill )
         public:
             MWSkill();
 
@@ -96,7 +90,7 @@ namespace MWGui
             const SkillValue& getSkillValue() const { return mValue; }
 
             // Events
-            typedef delegates::CMultiDelegate1<MWSkill*> EventHandle_SkillVoid;
+            typedef MyGUI::delegates::CMultiDelegate1<MWSkill*> EventHandle_SkillVoid;
 
             /** Event : Skill clicked.\n
                 signature : void method(MWSkill* _sender)\n
@@ -121,9 +115,9 @@ namespace MWGui
         };
         typedef MWSkill* MWSkillPtr;
 
-        class MYGUI_EXPORT MWAttribute : public MyGUI::Widget
+        class MWAttribute : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWAttribute );
+            MYGUI_RTTI_DERIVED( MWAttribute )
         public:
             MWAttribute();
 
@@ -138,7 +132,7 @@ namespace MWGui
             const AttributeValue& getAttributeValue() const { return mValue; }
 
             // Events
-            typedef delegates::CMultiDelegate1<MWAttribute*> EventHandle_AttributeVoid;
+            typedef MyGUI::delegates::CMultiDelegate1<MWAttribute*> EventHandle_AttributeVoid;
 
             /** Event : Attribute clicked.\n
                 signature : void method(MWAttribute* _sender)\n
@@ -167,9 +161,9 @@ namespace MWGui
          * @todo remove this class and use MWEffectList instead
          */
         class MWSpellEffect;
-        class MYGUI_EXPORT MWSpell : public MyGUI::Widget
+        class MWSpell : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSpell );
+            MYGUI_RTTI_DERIVED( MWSpell )
         public:
             MWSpell();
 
@@ -203,9 +197,9 @@ namespace MWGui
         };
         typedef MWSpell* MWSpellPtr;
 
-        class MYGUI_EXPORT MWEffectList : public MyGUI::Widget
+        class MWEffectList : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWEffectList );
+            MYGUI_RTTI_DERIVED( MWEffectList )
         public:
             MWEffectList();
 
@@ -244,9 +238,9 @@ namespace MWGui
         };
         typedef MWEffectList* MWEffectListPtr;
 
-        class MYGUI_EXPORT MWSpellEffect : public MyGUI::Widget
+        class MWSpellEffect : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWSpellEffect );
+            MYGUI_RTTI_DERIVED( MWSpellEffect )
         public:
             MWSpellEffect();
 
@@ -280,9 +274,9 @@ namespace MWGui
         };
         typedef MWSpellEffect* MWSpellEffectPtr;
 
-        class MYGUI_EXPORT MWDynamicStat : public MyGUI::Widget
+        class MWDynamicStat : public MyGUI::Widget
         {
-            MYGUI_RTTI_DERIVED( MWDynamicStat );
+            MYGUI_RTTI_DERIVED( MWDynamicStat )
         public:
             MWDynamicStat();