aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-19 07:08:11 +0200
committerMontel Laurent <[email protected]>2017-04-19 07:08:11 +0200
commit0efb7c2b49f3c9c7f8ada0022071f359f957249e (patch)
treefb979ef8888678e1c0979ffa7f7e94bf9b17b912
parent8b2ab834a1b019e22c8e707795f50b5e00cc271a (diff)
now we depend against qt5.7
-rw-r--r--src/qsqlite/src/qsql_sqlite.cpp25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/qsqlite/src/qsql_sqlite.cpp b/src/qsqlite/src/qsql_sqlite.cpp
index 7bc8188..df86374 100644
--- a/src/qsqlite/src/qsql_sqlite.cpp
+++ b/src/qsqlite/src/qsql_sqlite.cpp
@@ -140,9 +140,6 @@ protected:
void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
private:
-#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
- QSQLiteResultPrivate *d_ptr;
-#endif
Q_DECLARE_PRIVATE(QSQLiteResult)
};
@@ -157,19 +154,10 @@ public:
QList<QSQLiteResult *> results;
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
class QSQLiteResultPrivate : public QSqlCachedResultPrivate
-#else
-class QSQLiteResultPrivate
-#endif
{
public:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv);
-#else
- QSQLiteResultPrivate(QSQLiteResult *res);
- QSQLiteResult *q_ptr;
-#endif
void cleanup();
bool fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch);
@@ -189,13 +177,8 @@ public:
Q_DECLARE_PUBLIC(QSQLiteResult)
};
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult *res, const QSQLiteDriver *drv)
: QSqlCachedResultPrivate(res, drv)
-#else
-QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult * res)
- : q_ptr(res)
-#endif
, access(nullptr)
, stmt(nullptr)
, skippedStatus(false)
@@ -389,12 +372,7 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i
}
QSQLiteResult::QSQLiteResult(const QSQLiteDriver *db)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
: QSqlCachedResult(*new QSQLiteResultPrivate(this, db))
-#else
- : QSqlCachedResult(db)
- , d_ptr(new QSQLiteResultPrivate(this))
-#endif
{
Q_D(QSQLiteResult);
d->access = db->d_func()->access;
@@ -409,9 +387,6 @@ QSQLiteResult::~QSQLiteResult()
const_cast<QSQLiteDriverPrivate *>(qobject_cast<const QSQLiteDriver *>(sqlDriver)->d_func())->results.removeOne(this);
}
d->cleanup();
-#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
- delete d;
-#endif
}
void QSQLiteResult::virtual_hook(int id, void *data)