diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 15:43:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 15:43:12 +0300 |
commit | 4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06 (patch) | |
tree | 22b6f851e3ac90590828761a79e91fe1512c2adf /src/gui/windows | |
parent | 2c110bf45eb53807378bbd2abf70268aa0c2197f (diff) | |
download | mv-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.gz mv-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.bz2 mv-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.xz mv-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.zip |
Move Widget into gui/widgets directory.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/botcheckerwindow.cpp | 8 | ||||
-rw-r--r-- | src/gui/windows/charselectdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/inventorywindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/socialwindow.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 3bdebff71..d1fc0e7bd 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -125,7 +125,7 @@ public: continue; const Being *const player = mPlayers.at(r); - gcn::Widget *widget = new Label(this, player->getName()); + Widget *widget = new Label(this, player->getName()); mWidgets.push_back(widget); @@ -235,14 +235,14 @@ public: { } - gcn::Widget *getElementAt(const int row, const int column) const + Widget *getElementAt(const int row, const int column) const { return mWidgets[WIDGET_AT(row, column)]; } void freeWidgets() { - for (std::vector<gcn::Widget *>::const_iterator it = mWidgets.begin(); + for (std::vector<Widget *>::const_iterator it = mWidgets.begin(); it != mWidgets.end(); ++it) { delete *it; @@ -253,7 +253,7 @@ public: protected: std::vector<Being*> mPlayers; - std::vector<gcn::Widget*> mWidgets; + std::vector<Widget*> mWidgets; }; diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 12a78ce10..d67c15bf0 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -210,7 +210,7 @@ void CharSelectDialog::postInit() void CharSelectDialog::action(const ActionEvent &event) { // Check if a button of a character was pressed - const gcn::Widget *const sourceParent = event.getSource()->getParent(); + const Widget *const sourceParent = event.getSource()->getParent(); int selected = -1; for (unsigned int i = 0, sz = static_cast<unsigned int>( mCharacterEntries.size()); i < sz; ++i) diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 1754ca0bf..acd4c50bd 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -424,7 +424,7 @@ void ChatWindow::adjustTabSize() const ChatTab *const tab = getFocused(); if (tab) { - gcn::Widget *const content = tab->mScrollArea; + Widget *const content = tab->mScrollArea; if (content) { const int contentFrame2 = 2 * content->getFrameSize(); diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index bd6719df9..0b0e6c6de 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -593,7 +593,7 @@ void InventoryWindow::mouseClicked(MouseEvent &event) void InventoryWindow::mouseMoved(MouseEvent &event) { Window::mouseMoved(event); - const gcn::Widget *const src = event.getSource(); + const Widget *const src = event.getSource(); if (src == mSlotsBar || src == mWeightBar) { const int x = event.getX(); diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 86b4b9ba3..3dbfa566d 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -1261,7 +1261,7 @@ public: setVisible(false); } - void show(gcn::Widget *parent) + void show(Widget *parent) { if (!parent) return; |