Attachment #119731 for bug #168077





#include <qdebug.h>

#include <ibase.h>

#include <stdlib.h>
#include <limits.h>
#include <math.h>

    d = new QIBaseDriverPrivate(this);
}

QIBaseDriver::QIBaseDriver(isc_db_handle connection, QObject *parent)
    : QSqlDriver(parent)
{
    d = new QIBaseDriverPrivate(this);
    d->ibase = connection;
    setOpen(true);
    setOpenError(false);
}

Lines 28-33 Link Here

(-)../orig/src/sql/drivers/ibase/qsql_ibase.h (-1 / +3 lines)
28	#include <QtSql/qsqldriver.h>	28	#include <QtSql/qsqldriver.h>
29	#include <QtSql/private/qsqlcachedresult_p.h>	29	#include <QtSql/private/qsqlcachedresult_p.h>
30		30
		31	#include <ibase.h>
		32
31	QT_BEGIN_HEADER	33	QT_BEGIN_HEADER
32	class QIBaseDriverPrivate;	34	class QIBaseDriverPrivate;
33	class QIBaseResultPrivate;	35	class QIBaseResultPrivate;
Lines 62-68 Link Here
62	friend class QIBaseResultPrivate;	64	friend class QIBaseResultPrivate;
63	public:	65	public:
64	explicit QIBaseDriver(QObject *parent = 0);	66	explicit QIBaseDriver(QObject *parent = 0);
65	explicit QIBaseDriver(void connection, QObject parent = 0);	67	explicit QIBaseDriver(isc_db_handle connection, QObject *parent = 0);
66	virtual ~QIBaseDriver();	68	virtual ~QIBaseDriver();
67	bool hasFeature(DriverFeature f) const;	69	bool hasFeature(DriverFeature f) const;
68	bool open(const QString & db,	70	bool open(const QString & db,

Return to bug 168077

Lines 36-43 Link Here

(-)../orig/src/sql/drivers/ibase/qsql_ibase.cpp (-4 / +2 lines)
36		36
37	#include <qdebug.h>	37	#include <qdebug.h>
38		38
39	#include <ibase.h>
40
41	#include <stdlib.h>	39	#include <stdlib.h>
42	#include <limits.h>	40	#include <limits.h>
43	#include <math.h>	41	#include <math.h>
Lines 1179-1189 Link Here
1179	d = new QIBaseDriverPrivate(this);	1177	d = new QIBaseDriverPrivate(this);
1180	}	1178	}
1181		1179
1182	QIBaseDriver::QIBaseDriver(void connection, QObject parent)	1180	QIBaseDriver::QIBaseDriver(isc_db_handle connection, QObject *parent)
1183	: QSqlDriver(parent)	1181	: QSqlDriver(parent)
1184	{	1182	{
1185	d = new QIBaseDriverPrivate(this);	1183	d = new QIBaseDriverPrivate(this);
1186	d->ibase = (isc_db_handle)connection;	1184	d->ibase = connection;
1187	setOpen(true);	1185	setOpen(true);
1188	setOpenError(false);	1186	setOpenError(false);
1189	}	1187	}