summaryrefslogtreecommitdiffhomepage
path: root/StarsEx/DataSource.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'StarsEx/DataSource.cpp')
-rw-r--r--StarsEx/DataSource.cpp24
1 files changed, 7 insertions, 17 deletions
diff --git a/StarsEx/DataSource.cpp b/StarsEx/DataSource.cpp
index b413d82..3ace2ca 100644
--- a/StarsEx/DataSource.cpp
+++ b/StarsEx/DataSource.cpp
@@ -16,14 +16,11 @@
#include "Text.h"
#include "Utils.h"
-using Group = DataSource::Group;
-
int DataSource::s_next_id {0};
-DataSource::DataSource(Group group) :
- m_group {group},
+DataSource::DataSource() :
m_id {s_next_id++}
{
}
@@ -41,21 +38,14 @@ DataSource::Id() const
}
-Group
-DataSource::GetGroup() const
-{
- return m_group;
-}
-
-
-ArchiveDataSource::ArchiveDataSource(const char* name, Group group) :
- ArchiveDataSource(new DataArchive(name), group)
+ArchiveDataSource::ArchiveDataSource(const char* name) :
+ ArchiveDataSource(new DataArchive(name))
{
}
-ArchiveDataSource::ArchiveDataSource(DataArchive* archive, Group group) :
- DataSource(group),
+ArchiveDataSource::ArchiveDataSource(DataArchive* archive) :
+ DataSource(),
m_archive {archive}
{
}
@@ -106,8 +96,8 @@ ArchiveDataSource::Load(const Text& prefix, const char* name, std::uint8_t*& buf
}
-FileSystemDataSource::FileSystemDataSource(const char* path, Group group) :
- DataSource(group),
+FileSystemDataSource::FileSystemDataSource(const char* path) :
+ DataSource(),
m_path {path}
{
}