X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpacksource.h;h=35ec8b87a72eb54572057c04328a329e3d364dad;hb=HEAD;hp=3694a3bf8b530e22d0ccf366cc4e251e1ce2793c;hpb=e1b8089be727f651fc2022d6e7ff775047730e85;p=libs%2Fdatafile.git

diff --git a/source/packsource.h b/source/packsource.h
index 3694a3b..d2194e0 100644
--- a/source/packsource.h
+++ b/source/packsource.h
@@ -26,7 +26,7 @@ public:
 	struct FileInfo
 	{
 		std::string name;
-		IO::SeekOffset size;
+		IO::SeekOffset size = 0;
 	};
 
 private:
@@ -49,8 +49,8 @@ private:
 
 	private:
 		std::string filename;
-		IO::Seekable *io;
-		IO::SeekOffset base_offset;
+		IO::Seekable *io = nullptr;
+		IO::SeekOffset base_offset = 0;
 		std::list<File> files;
 
 	public:
@@ -73,16 +73,16 @@ private:
 		public:
 			Loader(File &);
 		private:
-			virtual void finish();
+			void finish() override;
 			void object(const std::string &, const std::string &);
 		};
 
 	private:
 		const Pack &pack;
 		std::string filename;
-		IO::SeekOffset offset;
-		IO::SeekOffset length;
-		bool collection;
+		IO::SeekOffset offset = 0;
+		IO::SeekOffset length = 0;
+		bool collection = false;
 		std::list<Object> objects;
 
 	public:
@@ -120,7 +120,7 @@ private:
 	ObjectMap objects;
 
 public:
-	PackSource() { }
+	PackSource() = default;
 	PackSource(const PackSource &);
 	PackSource &operator=(const PackSource &);
 private:
@@ -150,10 +150,10 @@ public:
 	/// Returns information about the files in the pack.
 	std::list<FileInfo> list_files() const;
 
-	virtual bool is_loadable(const CollectionItemTypeBase &, const std::string &) const;
-	virtual NameList get_names(const CollectionItemTypeBase &) const;
-	virtual void load(Collection &, const CollectionItemTypeBase &, const std::string &) const;
-	virtual IO::Seekable *open(const std::string &) const;
+	bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;
+	NameList get_names(const CollectionItemTypeBase &) const override;
+	void load(Collection &, const CollectionItemTypeBase &, const std::string &) const override;
+	IO::Seekable *open(const std::string &) const override;
 };
 
 } // namespace DataFile