diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/resultset.cpp | 13 | ||||
-rw-r--r-- | common/resultset.h | 2 |
2 files changed, 0 insertions, 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 | |||
30 | { | 30 | { |
31 | } | 31 | } |
32 | 32 | ||
33 | ResultSet::ResultSet(const IdGenerator &generator) : mIt(nullptr), mGenerator(generator), mSkip([this]() { next(); }) | ||
34 | { | ||
35 | } | ||
36 | |||
37 | ResultSet::ResultSet(const QVector<Identifier> &resultSet) | 33 | ResultSet::ResultSet(const QVector<Identifier> &resultSet) |
38 | : mResultSet(resultSet), | 34 | : mResultSet(resultSet), |
39 | mIt(mResultSet.constBegin()), | 35 | mIt(mResultSet.constBegin()), |
@@ -51,9 +47,6 @@ ResultSet::ResultSet(const ResultSet &other) : mResultSet(other.mResultSet), mIt | |||
51 | if (other.mValueGenerator) { | 47 | if (other.mValueGenerator) { |
52 | mValueGenerator = other.mValueGenerator; | 48 | mValueGenerator = other.mValueGenerator; |
53 | mSkip = other.mSkip; | 49 | mSkip = other.mSkip; |
54 | } else if (other.mGenerator) { | ||
55 | mGenerator = other.mGenerator; | ||
56 | mSkip = [this]() { next(); }; | ||
57 | } else { | 50 | } else { |
58 | mResultSet = other.mResultSet; | 51 | mResultSet = other.mResultSet; |
59 | mIt = mResultSet.constBegin(); | 52 | mIt = mResultSet.constBegin(); |
@@ -74,12 +67,6 @@ bool ResultSet::next() | |||
74 | } | 67 | } |
75 | mFirst = false; | 68 | mFirst = false; |
76 | return mIt != mResultSet.constEnd(); | 69 | return mIt != mResultSet.constEnd(); |
77 | } else if (mGenerator) { | ||
78 | Q_ASSERT(mGenerator); | ||
79 | mCurrentValue = mGenerator(); | ||
80 | if (!mCurrentValue.isNull()) { | ||
81 | return true; | ||
82 | } | ||
83 | } else { | 70 | } else { |
84 | next([](const Result &) { return false; }); | 71 | next([](const Result &) { return false; }); |
85 | } | 72 | } |
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: | |||
53 | 53 | ||
54 | ResultSet(); | 54 | ResultSet(); |
55 | ResultSet(const ValueGenerator &generator, const SkipValue &skip); | 55 | ResultSet(const ValueGenerator &generator, const SkipValue &skip); |
56 | ResultSet(const IdGenerator &generator); | ||
57 | ResultSet(const QVector<Sink::Storage::Identifier> &resultSet); | 56 | ResultSet(const QVector<Sink::Storage::Identifier> &resultSet); |
58 | ResultSet(const ResultSet &other); | 57 | ResultSet(const ResultSet &other); |
59 | 58 | ||
@@ -76,7 +75,6 @@ private: | |||
76 | QVector<Sink::Storage::Identifier> mResultSet; | 75 | QVector<Sink::Storage::Identifier> mResultSet; |
77 | QVector<Sink::Storage::Identifier>::ConstIterator mIt; | 76 | QVector<Sink::Storage::Identifier>::ConstIterator mIt; |
78 | Sink::Storage::Identifier mCurrentValue; | 77 | Sink::Storage::Identifier mCurrentValue; |
79 | IdGenerator mGenerator; | ||
80 | ValueGenerator mValueGenerator; | 78 | ValueGenerator mValueGenerator; |
81 | SkipValue mSkip; | 79 | SkipValue mSkip; |
82 | bool mFirst; | 80 | bool mFirst; |