From d9c0d1c3b2800b0c995393426b65a031203ca2f0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 29 Mar 2017 17:16:27 +0300
Subject: Merge virtfileprivate with virtfile.

Because now physfs is gone and nothing to hide from other code.
---
 src/fs/virtfs/virtfsdir.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/fs/virtfs/virtfsdir.cpp')

diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp
index 7521764fd..923d1409d 100644
--- a/src/fs/virtfs/virtfsdir.cpp
+++ b/src/fs/virtfs/virtfsdir.cpp
@@ -26,7 +26,6 @@
 
 #include "fs/virtfs/virtdirentry.h"
 #include "fs/virtfs/virtfile.h"
-#include "fs/virtfs/virtfileprivate.h"
 #include "fs/virtfs/virtfsfuncs.h"
 #include "fs/virtfs/virtlist.h"
 
@@ -73,9 +72,7 @@ namespace VirtFsDir
                 filename.c_str());
             return nullptr;
         }
-        VirtFile *restrict const file = new VirtFile(&funcs);
-        file->mPrivate = new VirtFilePrivate(fd);
-
+        VirtFile *restrict const file = new VirtFile(&funcs, fd);
         return file;
     }
 
@@ -311,7 +308,7 @@ namespace VirtFsDir
     {
         if (file == nullptr)
             return 0;
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::read file not opened.");
@@ -335,7 +332,7 @@ namespace VirtFsDir
     {
         if (file == nullptr)
             return 0;
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::write file not opened.");
@@ -356,7 +353,7 @@ namespace VirtFsDir
     {
         if (file == nullptr)
             return -1;
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::fileLength file not opened.");
@@ -384,7 +381,7 @@ namespace VirtFsDir
         if (file == nullptr)
             return -1;
 
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::tell file not opened.");
@@ -404,7 +401,7 @@ namespace VirtFsDir
         if (file == nullptr)
             return 0;
 
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::seek file not opened.");
@@ -421,7 +418,7 @@ namespace VirtFsDir
         if (file == nullptr)
             return -1;
 
-        FILEHTYPE fd = file->mPrivate->mFd;
+        FILEHTYPE fd = file->mFd;
         if (fd == FILEHDEFAULT)
         {
             reportAlways("VirtFsDir::eof file not opened.");
-- 
cgit v1.2.3-70-g09d2