From 5fc6d9e0f9637e3aaa71972478bee9febbe78ca7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Feb 2014 16:26:52 +0300
Subject: Move listmodel into gui/modesl directory.

---
 src/gui/popups/popupmenu.cpp | 4 ++--
 src/gui/popups/popupmenu.h   | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/gui/popups')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index a37994884..3905d91e6 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -81,7 +81,7 @@
 #include "utils/gettext.h"
 #include "utils/process.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "debug.h"
 
@@ -2685,7 +2685,7 @@ void PopupMenu::addPickupFilter(const std::string &name)
 }
 
 void PopupMenu::showPopup(const int x, const int y,
-                          gcn::ListModel *const model)
+                          ListModel *const model)
 {
     if (!model)
         return;
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 1ce274122..7eb38dc15 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -37,6 +37,7 @@ class Button;
 class ChatTab;
 class FloorItem;
 class Item;
+class ListModel;
 class MapItem;
 class ScrollArea;
 class TextCommand;
@@ -45,11 +46,6 @@ class TextField;
 class ProgressBar;
 class Window;
 
-namespace gcn
-{
-    class ListModel;
-}
-
 class RenameListener final : public ActionListener
 {
     public:
@@ -176,7 +172,7 @@ class PopupMenu final : public Popup, public LinkHandler
 
         void showChangePos(const int x, const int y);
 
-        void showPopup(const int x, const int y, gcn::ListModel *const model);
+        void showPopup(const int x, const int y, ListModel *const model);
 
         void showTextFieldPopup(int x, int y, TextField *const input);
 
-- 
cgit v1.2.3-70-g09d2