From ea78028750bcf6e5ad526763c5916bf39794ae12 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 6 Aug 2018 15:35:28 +0200 Subject: Removed unused code --- common/resultset.cpp | 13 ------------- common/resultset.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/common/resultset.cpp b/common/resultset.cpp index 88110e1..047a0d1 100644 --- a/common/resultset.cpp +++ b/common/resultset.cpp @@ -30,10 +30,6 @@ ResultSet::ResultSet(const ValueGenerator &generator, const SkipValue &skip) : m { } -ResultSet::ResultSet(const IdGenerator &generator) : mIt(nullptr), mGenerator(generator), mSkip([this]() { next(); }) -{ -} - ResultSet::ResultSet(const QVector &resultSet) : mResultSet(resultSet), mIt(mResultSet.constBegin()), @@ -51,9 +47,6 @@ ResultSet::ResultSet(const ResultSet &other) : mResultSet(other.mResultSet), mIt if (other.mValueGenerator) { mValueGenerator = other.mValueGenerator; mSkip = other.mSkip; - } else if (other.mGenerator) { - mGenerator = other.mGenerator; - mSkip = [this]() { next(); }; } else { mResultSet = other.mResultSet; mIt = mResultSet.constBegin(); @@ -74,12 +67,6 @@ bool ResultSet::next() } mFirst = false; return mIt != mResultSet.constEnd(); - } else if (mGenerator) { - Q_ASSERT(mGenerator); - mCurrentValue = mGenerator(); - if (!mCurrentValue.isNull()) { - return true; - } } else { next([](const Result &) { return false; }); } diff --git a/common/resultset.h b/common/resultset.h index 9d83c67..05d0769 100644 --- a/common/resultset.h +++ b/common/resultset.h @@ -53,7 +53,6 @@ public: ResultSet(); ResultSet(const ValueGenerator &generator, const SkipValue &skip); - ResultSet(const IdGenerator &generator); ResultSet(const QVector &resultSet); ResultSet(const ResultSet &other); @@ -76,7 +75,6 @@ private: QVector mResultSet; QVector::ConstIterator mIt; Sink::Storage::Identifier mCurrentValue; - IdGenerator mGenerator; ValueGenerator mValueGenerator; SkipValue mSkip; bool mFirst; -- cgit v1.2.3