diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-28 18:16:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-28 18:16:57 +0300 |
| commit | 85f9c6a022a5a8c5b868fed9bd804811360d2e07 (patch) | |
| tree | 6bc81873c809a2e580b33610f5d0cb07ac916a34 /src/gui | |
| parent | dd941148547c6813f8df17f452f32feee7e09f81 (diff) | |
| download | manaplus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.gz manaplus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.bz2 manaplus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.tar.xz manaplus-85f9c6a022a5a8c5b868fed9bd804811360d2e07.zip | |
Join fs/virfs.h and fs/virtfs/virtfs.h
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/theme.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox_unittest.cc | 2 | ||||
| -rw-r--r-- | src/gui/windowmanager_unittest.cc | 2 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 94826e537..eb9d4e075 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -29,7 +29,7 @@ #include "const/gui/theme.h" -#include "fs/virtfs.h" +#include "fs/virtfs/virtfs.h" #include "fs/virtfstools.h" #include "fs/virtlist.h" diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 68342b241..6064dfd72 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -27,7 +27,7 @@ #include "being/actorsprite.h" -#include "fs/virtfs.h" +#include "fs/virtfs/virtfs.h" #include "gui/gui.h" diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 43017c90a..49ea9d97c 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -32,7 +32,7 @@ #include "const/resources/currency.h" -#include "fs/virtfs.h" +#include "fs/virtfs/virtfs.h" #include "gui/gui.h" #include "gui/mailmessage.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index e261dead7..e43ea4138 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -31,7 +31,7 @@ #include "enums/resources/map/blockmask.h" -#include "fs/virtfs.h" +#include "fs/virtfs/virtfs.h" #include "gui/popupmanager.h" #include "gui/viewport.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 783b36635..8f994271e 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -32,7 +32,8 @@ #include "fs/files.h" #include "fs/mkdir.h" #include "fs/paths.h" -#include "fs/virtfs.h" + +#include "fs/virtfs/virtfs.h" #include "fs/virtfstools.h" #include "gui/widgets/browserbox.h" |