diff --git a/src/Database.cpp b/src/Database.cpp index bd9c02b2..f1b0d4ff 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -58,7 +58,6 @@ std::vector Database::files () const //////////////////////////////////////////////////////////////////////////////// // Walk backwards through the files until an interval is found. -// Note: Not an exclusion. std::string Database::lastLine () { if (! _files.size ()) @@ -93,18 +92,6 @@ std::vector Database::allLines () return all; } -//////////////////////////////////////////////////////////////////////////////// -void Database::clearExclusions () -{ - _exclusions.clear (); -} - -//////////////////////////////////////////////////////////////////////////////// -void Database::addExclusion (const std::string& exclusion) -{ - _exclusions.push_back (exclusion); -} - //////////////////////////////////////////////////////////////////////////////// void Database::addInterval (const Interval& interval) { @@ -165,9 +152,6 @@ std::string Database::dump () const { std::stringstream out; out << "Database\n"; - for (auto& exclusion : _exclusions) - out << " Exclusion: " << exclusion << '\n'; - for (auto& df : _files) out << df.dump (); @@ -192,10 +176,9 @@ unsigned int Database::getDatafile (int year, int month) if (_files[i].name () == basename) return i; - // Create the Datafile. New files need the set of current exclusions. + // Create the Datafile. Datafile df; df.initialize (name); - df.setExclusions (_exclusions); // Insert Datafile into _files. The position is not important. _files.push_back (df); diff --git a/src/Database.h b/src/Database.h index c0eb88d2..dfd5b2e2 100644 --- a/src/Database.h +++ b/src/Database.h @@ -44,8 +44,6 @@ public: std::string lastLine (); std::vector allLines (); - void clearExclusions (); - void addExclusion (const std::string&); void addInterval (const Interval&); void deleteInterval (const Interval&); void modifyInterval (const Interval&, const Interval&); @@ -59,9 +57,8 @@ private: void validateAddition (const Interval&) const; private: - std::string _location {"~/.timewarrior/data"}; - std::vector _files {}; - std::vector _exclusions {}; + std::string _location {"~/.timewarrior/data"}; + std::vector _files {}; }; #endif