diff options
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfile.cpp (renamed from src/fs/virtfile.cpp) | 2 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfile.h (renamed from src/fs/virtfile.h) | 0 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfs.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfsdir.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfszip.cpp | 5 |
7 files changed, 15 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e71e47170..6532d0455 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -923,8 +923,8 @@ SET(SRCS utils/stringvector.h utils/timer.cpp utils/timer.h - fs/virtfile.cpp - fs/virtfile.h + fs/virtfs/virtfile.cpp + fs/virtfs/virtfile.h utils/mutex.h utils/naclmessages.cpp utils/naclmessages.h @@ -1820,8 +1820,8 @@ SET(DYE_CMD_SRCS utils/stringutils.h utils/timer.cpp utils/timer.h - fs/virtfile.cpp - fs/virtfile.h + fs/virtfs/virtfile.cpp + fs/virtfs/virtfile.h utils/xml.cpp utils/xml.h utils/xml.inc diff --git a/src/Makefile.am b/src/Makefile.am index 5ac464a5a..7a7c19b48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -594,8 +594,8 @@ BASE_SRC += events/actionevent.h \ utils/stringvector.h \ utils/timer.cpp \ utils/timer.h \ - fs/virtfile.cpp \ - fs/virtfile.h \ + fs/virtfs/virtfile.cpp \ + fs/virtfs/virtfile.h \ utils/mutex.h \ utils/naclmessages.cpp \ utils/naclmessages.h \ diff --git a/src/fs/virtfile.cpp b/src/fs/virtfs/virtfile.cpp index ff7be9627..b60db8c99 100644 --- a/src/fs/virtfile.cpp +++ b/src/fs/virtfs/virtfile.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "fs/virtfile.h" +#include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfileprivate.h" diff --git a/src/fs/virtfile.h b/src/fs/virtfs/virtfile.h index 1cb819a6a..1cb819a6a 100644 --- a/src/fs/virtfile.h +++ b/src/fs/virtfs/virtfile.h diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp index 8718a9738..19e42fab7 100644 --- a/src/fs/virtfs/virtfs.cpp +++ b/src/fs/virtfs/virtfs.cpp @@ -22,13 +22,13 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfile.h" -#include "fs/virtfsfuncs.h" -#include "fs/virtlist.h" #include "fs/virtfs/virtdirentry.h" +#include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfsdir.h" +#include "fs/virtfsfuncs.h" #include "fs/virtfs/virtfszip.h" +#include "fs/virtlist.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp index 357702de6..ba1961649 100644 --- a/src/fs/virtfs/virtfsdir.cpp +++ b/src/fs/virtfs/virtfsdir.cpp @@ -23,12 +23,12 @@ #include "fs/files.h" #include "fs/mkdir.h" #include "fs/paths.h" -#include "fs/virtfile.h" -#include "fs/virtfsfuncs.h" -#include "fs/virtlist.h" #include "fs/virtfs/virtdirentry.h" +#include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfileprivate.h" +#include "fs/virtfsfuncs.h" +#include "fs/virtlist.h" #include "utils/checkutils.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp index e9414136f..a28f4d89f 100644 --- a/src/fs/virtfs/virtfszip.cpp +++ b/src/fs/virtfs/virtfszip.cpp @@ -20,11 +20,10 @@ #include "fs/virtfs/virtfszip.h" +#include "fs/virtfs/virtfile.h" +#include "fs/virtfs/virtfileprivate.h" #include "fs/virtfsfuncs.h" -#include "fs/virtfile.h" #include "fs/virtlist.h" - -#include "fs/virtfs/virtfileprivate.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" #include "fs/virtfs/ziplocalheader.h" |