From 8b59bb595779721f884fedf4e16965031b223413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Mon, 11 Apr 2011 23:15:46 +0200 Subject: [PATCH] Make it possible to actually pass a IOStream instance to File --- taglib/toolkit/tfile.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp index c4789221..5cf368a1 100644 --- a/taglib/toolkit/tfile.cpp +++ b/taglib/toolkit/tfile.cpp @@ -69,33 +69,32 @@ struct FileNameHandle : public std::string class File::FilePrivate { public: - FilePrivate(FileName fileName); + FilePrivate(IOStream *stream); IOStream *stream; bool valid; static const uint bufferSize = 1024; }; -File::FilePrivate::FilePrivate(FileName fileName) : - stream(0), +File::FilePrivate::FilePrivate(IOStream *stream) : + stream(stream), valid(true) { - stream = new FileStream(fileName); } //////////////////////////////////////////////////////////////////////////////// // public members //////////////////////////////////////////////////////////////////////////////// -File::File(FileName file) +File::File(FileName fileName) { - d = new FilePrivate(file); + IOStream *stream = new FileStream(fileName); + d = new FilePrivate(stream); } File::File(IOStream *stream) { - d = new FilePrivate(""); // TODO - d->stream = stream; + d = new FilePrivate(stream); } File::~File()