[Facturalux-cvs] CVS: lite/src/sqlite dataset.cpp,1.3,1.4 dataset.h,1.3,1.4 encode.c,1.6,1.7 qry_dat

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/facturalux/lite/src/sqlite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25001/src/sqlite

Modified Files:
	dataset.cpp dataset.h encode.c qry_dat.h sqlite.pro 
	sqlitedataset.cpp sqlitedataset.h 
Log Message:

Index: dataset.cpp
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/dataset.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dataset.cpp	23 Oct 2004 15:08:18 -0000	1.3
--- dataset.cpp	14 Jan 2005 22:32:52 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----

  #include "dataset.h"
+ #include "config_sqlite.h"

  namespace dbiplus {
***************
*** 112,116 ****
--- 113,121 ----

    va_start(ap, t);
+ #ifdef Q_CC_MSVC
+   _vsnprintf(sqlCmd, DB_BUFF_MAX-1, sqlFrmt, ap);
+ #else
    vsnprintf(sqlCmd, DB_BUFF_MAX-1, sqlFrmt, ap);
+ #endif
    va_end(ap);

***************
*** 462,466 ****
--- 467,475 ----
    va_start(vl, msg);
    char buf[DB_BUFF_MAX]="";
+ #ifdef Q_CC_MSVC
+   _vsnprintf(buf, DB_BUFF_MAX-1, msg, vl);
+ #else
    vsnprintf(buf, DB_BUFF_MAX-1, msg, vl);
+ #endif
    va_end(vl);
    msg_ =   "Database Error: ";

Index: dataset.h
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/dataset.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dataset.h	23 Oct 2004 15:08:18 -0000	1.3
--- dataset.h	14 Jan 2005 22:32:53 -0000	1.4
***************
*** 66,70 ****

  ******************************************************************/
! class Database  {
  protected:
    bool active;
--- 66,70 ----

  ******************************************************************/
! class FL_EXPORT Database  {
  protected:
    bool active;
***************
*** 151,155 ****

! class Dataset  {
  protected:
  /*  char *Host     = ""; //WORK_HOST;
--- 151,155 ----

! class FL_EXPORT Dataset  {
  protected:
  /*  char *Host     = ""; //WORK_HOST;
***************
*** 385,389 ****

  ******************************************************************/
! class DbErrors  {

  public:
--- 385,389 ----

  ******************************************************************/
! class FL_EXPORT DbErrors  {

  public:

Index: qry_dat.h
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/qry_dat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qry_dat.h	23 Oct 2004 15:08:19 -0000	1.3
--- qry_dat.h	14 Jan 2005 22:32:53 -0000	1.4
***************
*** 56,60 ****
      };

! class field_value {
  private:
    fType field_type;
--- 56,60 ----
      };

! class FL_EXPORT field_value {
  private:
    fType field_type;

Index: sqlite.pro
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/sqlite.pro,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sqlite.pro	29 Oct 2004 13:02:33 -0000	1.6
--- sqlite.pro	14 Jan 2005 22:32:53 -0000	1.7
***************
*** 1,68 ****
! exists(../../settings.pro) {
! 	include(../../settings.pro)
! }
! else {
! 	error("settings.pro missing, unable to build")
! }
! 
! TEMPLATE = lib
! CONFIG += release \
! 	warn_off \
! 	create_prl
! CONFIG -= qt x11
! DESTDIR = $$PREFIX/lib
! TARGET = sqlite
! unix {
! 	DEFINES += OS_UNIX=1 OS_WIN=0 HAVE_USLEEP=1
! }
! else:win32 {
! 	DEFINES += OS_UNIX=0 OS_WIN=0 HAVE_USLEEP=1
! }
! INCLUDEPATH = $$ROOT/src/qt/include
! VERSION = 2.8.6
! 
! SOURCES += attach.c \
!            auth.c \
!            btree.c \
!            btree_rb.c \
!            build.c \
!            copy.c \
!            date.c \
!            delete.c \
!            expr.c \
!            func.c \
!            hash.c \
!            insert.c \
!            main.c \
!            opcodes.c \
!            os.c \
!            pager.c \
!            parse.c \
!            pragma.c \
!            printf.c \
!            random.c \
!            select.c \
!            shell.c \
!            table.c \
!            tokenize.c \
!            trigger.c \
!            update.c \
!            util.c \
!            vacuum.c \
!            vdbe.c \
!            vdbeaux.c \
!            where.c \
!            dataset.cpp qry_dat.cpp  sqlitedataset.cpp
! 
! HEADERS += btree.h \
!            config_sqlite.h \
!            hash.h \
!            opcodes.h \
!            os.h \
!            pager.h \
!            parse.h \
!            sqlite.h \
!            sqliteInt.h \
!            vdbe.h \
!            vdbeInt.h \
!            dataset.h  qry_dat.h  sqlitedataset.h
--- 1,72 ----
! exists(../../settings.pro) {

! 	include(../../settings.pro)

! }

! else {

! 	error("settings.pro missing, unable to build")

! }

! 

! TEMPLATE = lib

! 

! CONFIG += warn_off

! win32 {

! 	CONFIG += dll exceptions

! 	DLLDESTDIR = $$PREFIX/bin

! 	DEFINES += OS_WIN=1

! }

! else:unix {

! 	CONFIG +=release create_prl

! 	CONFIG -= qt x11

! 	DEFINES += OS_UNIX=1

! }

! DESTDIR = $$PREFIX/lib

! TARGET = sqlite

! LIBS += -L$$PREFIX/lib

! INCLUDEPATH = $$ROOT/src/qt/include

! 

! VERSION = 2.8.6

! 

! SOURCES += attach.c \

!            auth.c \

!            btree.c \

!            btree_rb.c \

!            build.c \

!            copy.c \

! 	     date.c \

!            delete.c \

!            expr.c \

!            func.c \

!            hash.c \

!            insert.c \

!            main.c \

!            opcodes.c \

!            os.c \

!            pager.c \

!            parse.c \

!            pragma.c \

!            printf.c \

!            random.c \

!            select.c \

!            shell.c \

!            table.c \

!            tokenize.c \

!            trigger.c \

!            update.c \

!            util.c \

!            vacuum.c \

!            vdbe.c \

! 	     vdbeaux.c \

!            where.c \

! 	     dataset.cpp qry_dat.cpp  sqlitedataset.cpp

! 

! HEADERS += btree.h \

!            config.h \

!            hash.h \

!            opcodes.h \

!            os.h \

!            pager.h \

!            parse.h \

!            sqlite.h \

!            sqliteInt.h \

!            vdbe.h \

! 	     vdbeInt.h \

! 	     dataset.h  qry_dat.h  sqlitedataset.h

Index: sqlitedataset.cpp
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/sqlitedataset.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqlitedataset.cpp	3 Dec 2004 21:24:14 -0000	1.4
--- sqlitedataset.cpp	14 Jan 2005 22:32:53 -0000	1.5
***************
*** 32,36 ****

  #include "sqlitedataset.h"
! #include <unistd.h>

--- 32,36 ----

  #include "sqlitedataset.h"
! //#include <unistd.h>

***************
*** 257,261 ****

   SqliteDataset::~SqliteDataset(){
!    if (errmsg) sqlite_freemem(&errmsg);
   }

--- 257,261 ----

   SqliteDataset::~SqliteDataset(){
!    //if (errmsg) sqlite_freemem(&errmsg);
   }

Index: sqlitedataset.h
===================================================================
RCS file: /cvsroot/facturalux/lite/src/sqlite/sqlitedataset.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqlitedataset.h	23 Oct 2004 15:08:19 -0000	1.3
--- sqlitedataset.h	14 Jan 2005 22:32:53 -0000	1.4
***************
*** 41,45 ****
  ******************************************************************/

! class SqliteDatabase: public Database {
  protected:
  /* connect descriptor */
--- 41,45 ----
  ******************************************************************/

! class FL_EXPORT SqliteDatabase: public Database {
  protected:
  /* connect descriptor */
***************
*** 93,97 ****
  ******************************************************************/

! class SqliteDataset : public Dataset {
  protected:
  /* query results*/
--- 93,97 ----
  ******************************************************************/

! class FL_EXPORT SqliteDataset : public Dataset {
  protected:
  /* query results*/

[Facturalux-cvs] CVS: lite/src/sqlite dataset.cpp,1.3,1.4 dataset.h,1.3,1.4 encode.c,1.6,1.7 qry_dat

[Facturalux-cvs] CVS: lite/src/sqlite dataset.cpp,1.3,1.4 dataset.h,1.3,1.4 encode.c,1.6,1.7 qry_dat.h,1.3,1.4 sqlite.pro,1.6,1.7 sqlitedataset.cpp,1.4,1.5 sqlitedataset.h,1.3,1.4