ve --new-file hk_classes-0.8.3/hk_classes/hk_actionquery.cpp hk_classes-0.8.3.new/hk_classes/hk_actionquery.cpp --- hk_classes-0.8.3/hk_classes/hk_actionquery.cpp 2006-04-13 20:02:01.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_actionquery.cpp 2008-04-22 13:38:01.000000000 +0200 @@ -12,6 +12,7 @@ #include "hk_actionquery.h" #include "hk_database.h" +#include #include class hk_actionqueryprivate diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_button.cpp hk_classes-0.8.3.new/hk_classes/hk_button.cpp --- hk_classes-0.8.3/hk_classes/hk_button.cpp 2006-07-09 16:33:28.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_button.cpp 2008-04-22 13:40:55.000000000 +0200 @@ -17,7 +17,7 @@ #include "hk_actionquery.h" #include "hk_interpreter.h" - +#include class hk_buttonprivate { diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_column.cpp hk_classes-0.8.3.new/hk_classes/hk_column.cpp --- hk_classes-0.8.3/hk_classes/hk_column.cpp 2006-10-02 19:54:17.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_column.cpp 2008-04-22 13:42:05.000000000 +0200 @@ -14,6 +14,7 @@ #include "hk_dsdatavisible.h" #include "hk_datetime.h" #include +#include hk_column::hk_column(hk_datasource* ds, const hk_string& lTRUE,const hk_string& lFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_datasource.cpp hk_classes-0.8.3.new/hk_classes/hk_datasource.cpp --- hk_classes-0.8.3/hk_classes/hk_datasource.cpp 2006-10-29 20:38:25.000000000 +0100 +++ hk_classes-0.8.3.new/hk_classes/hk_datasource.cpp 2008-04-22 13:43:11.000000000 +0200 @@ -21,7 +21,7 @@ #include #include #include - +#include voidfunction* hk_datasource::p_enablefunction=NULL; long hk_datasource::p_enablefunctioncounter=0; diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_dsimage.cpp hk_classes-0.8.3.new/hk_classes/hk_dsimage.cpp --- hk_classes-0.8.3/hk_classes/hk_dsimage.cpp 2006-05-20 22:07:19.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_dsimage.cpp 2008-04-22 13:44:57.000000000 +0200 @@ -12,6 +12,7 @@ #include "hk_form.h" #include "hk_url.h" +#include hk_dsimage::imagetypelisttype hk_dsimage::p_imagetypefunctions; diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_reportsection.cpp hk_classes-0.8.3.new/hk_classes/hk_reportsection.cpp --- hk_classes-0.8.3/hk_classes/hk_reportsection.cpp 2006-08-06 16:37:45.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_reportsection.cpp 2008-04-22 13:48:08.000000000 +0200 @@ -19,6 +19,8 @@ #include "hk_column.h" #include "hk_datasource.h" +#include + const double teiler=10000.0; //******************************************** diff -u --recursive --new-file hk_classes-0.8.3/hk_classes/hk_storagedatasource.cpp hk_classes-0.8.3.new/hk_classes/hk_storagedatasource.cpp --- hk_classes-0.8.3/hk_classes/hk_storagedatasource.cpp 2006-04-13 20:02:05.000000000 +0200 +++ hk_classes-0.8.3.new/hk_classes/hk_storagedatasource.cpp 2008-04-22 13:49:13.000000000 +0200 @@ -10,6 +10,8 @@ // **************************************************************************** #include "hk_storagedatasource.h" +#include + hk_storagedatasource::hk_storagedatasource(hk_database* d,hk_presentation* p):hk_datasource(d,p) { #ifdef HK_DEBUG diff -u --recursive --new-file hk_classes-0.8.3/hk_mysqlclasses/hk_mysqlcolumn.cpp hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqlcolumn.cpp --- hk_classes-0.8.3/hk_mysqlclasses/hk_mysqlcolumn.cpp 2005-05-16 21:01:50.000000000 +0200 +++ hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqlcolumn.cpp 2008-04-22 13:52:09.000000000 +0200 @@ -18,6 +18,8 @@ #include #include +#include + hk_mysqlcolumn::hk_mysqlcolumn(hk_mysqldatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_mysqlclasses/hk_mysqldatasource.cpp hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqldatasource.cpp --- hk_classes-0.8.3/hk_mysqlclasses/hk_mysqldatasource.cpp 2006-06-29 20:10:17.000000000 +0200 +++ hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqldatasource.cpp 2008-04-22 13:54:17.000000000 +0200 @@ -15,6 +15,7 @@ #include "hk_mysqlactionquery.h" #include #include +#include hk_mysqldatasource::hk_mysqldatasource(hk_mysqldatabase* d,hk_presentation* p):hk_storagedatasource(d,p) { diff -u --recursive --new-file hk_classes-0.8.3/hk_mysqlclasses/hk_mysqltable.cpp hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqltable.cpp --- hk_classes-0.8.3/hk_mysqlclasses/hk_mysqltable.cpp 2006-04-24 20:17:30.000000000 +0200 +++ hk_classes-0.8.3.new/hk_mysqlclasses/hk_mysqltable.cpp 2008-04-22 13:55:09.000000000 +0200 @@ -12,6 +12,9 @@ #include "hk_mysqltable.h" #include "hk_mysqldatabase.h" #include "hk_actionquery.h" + +#include + hk_mysqltable::hk_mysqltable(hk_mysqldatabase* db,hk_presentation* p):hk_mysqldatasource(db,p) { diff -u --recursive --new-file hk_classes-0.8.3/hk_odbcclasses/hk_odbccolumn.cpp hk_classes-0.8.3.new/hk_odbcclasses/hk_odbccolumn.cpp --- hk_classes-0.8.3/hk_odbcclasses/hk_odbccolumn.cpp 2005-01-26 21:33:41.000000000 +0100 +++ hk_classes-0.8.3.new/hk_odbcclasses/hk_odbccolumn.cpp 2008-04-22 14:01:57.000000000 +0200 @@ -18,6 +18,8 @@ #include //#include +#include + hk_odbccolumn::hk_odbccolumn(hk_odbcdatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_odbcclasses/hk_odbcdatasource.cpp hk_classes-0.8.3.new/hk_odbcclasses/hk_odbcdatasource.cpp --- hk_classes-0.8.3/hk_odbcclasses/hk_odbcdatasource.cpp 2006-06-29 20:10:17.000000000 +0200 +++ hk_classes-0.8.3.new/hk_odbcclasses/hk_odbcdatasource.cpp 2008-04-22 14:00:49.000000000 +0200 @@ -18,6 +18,8 @@ #include #include +#include + hk_odbcdatasource::hk_odbcdatasource(hk_odbcdatabase* d,hk_presentation* p):hk_storagedatasource(d,p) { #ifdef HK_DEBUG diff -u --recursive --new-file hk_classes-0.8.3/hk_odbcclasses/hk_odbctable.cpp hk_classes-0.8.3.new/hk_odbcclasses/hk_odbctable.cpp --- hk_classes-0.8.3/hk_odbcclasses/hk_odbctable.cpp 2006-10-02 19:54:17.000000000 +0200 +++ hk_classes-0.8.3.new/hk_odbcclasses/hk_odbctable.cpp 2008-04-22 14:02:48.000000000 +0200 @@ -16,6 +16,8 @@ #include #include +#include + hk_odbctable::hk_odbctable(hk_odbcdatabase* db,hk_presentation* p):hk_odbcdatasource(db,p) { diff -u --recursive --new-file hk_classes-0.8.3/hk_postgresclasses/hk_postgresqlcolumn.cpp hk_classes-0.8.3.new/hk_postgresclasses/hk_postgresqlcolumn.cpp --- hk_classes-0.8.3/hk_postgresclasses/hk_postgresqlcolumn.cpp 2006-10-02 15:52:53.000000000 +0200 +++ hk_classes-0.8.3.new/hk_postgresclasses/hk_postgresqlcolumn.cpp 2008-04-22 13:56:27.000000000 +0200 @@ -12,6 +12,9 @@ #include "hk_postgresqlcolumn.h" #include "hk_postgresqldatasource.h" #include "hk_postgresqldatabase.h" + +#include + hk_postgresqlcolumn::hk_postgresqlcolumn(hk_postgresqldatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_postgresclasses/hk_postgresqldatasource.cpp hk_classes-0.8.3.new/hk_postgresclasses/hk_postgresqldatasource.cpp --- hk_classes-0.8.3/hk_postgresclasses/hk_postgresqldatasource.cpp 2006-11-27 18:30:13.000000000 +0100 +++ hk_classes-0.8.3.new/hk_postgresclasses/hk_postgresqldatasource.cpp 2008-04-22 13:59:33.000000000 +0200 @@ -17,6 +17,8 @@ #include #include +#include + hk_postgresqldatasource::hk_postgresqldatasource(hk_postgresqldatabase* d,hk_presentation* p):hk_storagedatasource(d,p) { #ifdef HK_DEBUG diff -u --recursive --new-file hk_classes-0.8.3/hk_sqlite3classes/hk_sqlite3column.cpp hk_classes-0.8.3.new/hk_sqlite3classes/hk_sqlite3column.cpp --- hk_classes-0.8.3/hk_sqlite3classes/hk_sqlite3column.cpp 2006-01-06 15:04:31.000000000 +0100 +++ hk_classes-0.8.3.new/hk_sqlite3classes/hk_sqlite3column.cpp 2008-04-22 14:07:09.000000000 +0200 @@ -18,6 +18,8 @@ #include +#include + hk_sqlite3column::hk_sqlite3column(hk_sqlite3datasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_sqlite3classes/hk_sqlite3datasource.cpp hk_classes-0.8.3.new/hk_sqlite3classes/hk_sqlite3datasource.cpp --- hk_classes-0.8.3/hk_sqlite3classes/hk_sqlite3datasource.cpp 2006-06-29 20:10:18.000000000 +0200 +++ hk_classes-0.8.3.new/hk_sqlite3classes/hk_sqlite3datasource.cpp 2008-04-22 14:07:55.000000000 +0200 @@ -17,6 +17,8 @@ #include #include +#include + hk_sqlite3datasource::hk_sqlite3datasource(hk_sqlite3database* d,hk_presentation* p):hk_storagedatasource(d,p) { #ifdef HK_DEBUG diff -u --recursive --new-file hk_classes-0.8.3/hk_sqliteclasses/hk_sqlitecolumn.cpp hk_classes-0.8.3.new/hk_sqliteclasses/hk_sqlitecolumn.cpp --- hk_classes-0.8.3/hk_sqliteclasses/hk_sqlitecolumn.cpp 2006-01-06 15:04:31.000000000 +0100 +++ hk_classes-0.8.3.new/hk_sqliteclasses/hk_sqlitecolumn.cpp 2008-04-22 14:05:05.000000000 +0200 @@ -18,6 +18,8 @@ #include +#include + hk_sqlitecolumn::hk_sqlitecolumn(hk_sqlitedatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) { diff -u --recursive --new-file hk_classes-0.8.3/hk_sqliteclasses/hk_sqlitedatasource.cpp hk_classes-0.8.3.new/hk_sqliteclasses/hk_sqlitedatasource.cpp --- hk_classes-0.8.3/hk_sqliteclasses/hk_sqlitedatasource.cpp 2006-06-29 20:10:18.000000000 +0200 +++ hk_classes-0.8.3.new/hk_sqliteclasses/hk_sqlitedatasource.cpp 2008-04-22 14:04:09.000000000 +0200 @@ -17,6 +17,8 @@ #include #include +#include + hk_sqlitedatasource::hk_sqlitedatasource(hk_sqlitedatabase* d,hk_presentation* p):hk_storagedatasource(d,p) { #ifdef HK_DEBUG --- hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp~ 2008-07-31 05:24:53.000000000 +0200 +++ hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp 2008-07-31 05:25:00.000000000 +0200 @@ -48,7 +48,7 @@ #include "xbase64.h" - +#include #ifdef HAVE_IO_H // windows locking #include #endif @@ -124,7 +124,7 @@ return 0; } -#elif HAVE_FCNTL_H +#else xbShort xbLock::LockFile( int fn, xbShort LockType, xbOffT lockLen ) { --- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp~ 2006-04-19 15:11:18.000000000 +0200 +++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp 2008-07-31 05:33:42.000000000 +0200 @@ -10,7 +10,7 @@ // **************************************************************************** #include "hk_paradoxcolumn.h" #include "hk_paradoxdatasource.h" - +#include hk_paradoxcolumn::hk_paradoxcolumn(hk_paradoxdatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) --- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp~ 2006-06-29 20:10:18.000000000 +0200 +++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp 2008-07-31 05:34:19.000000000 +0200 @@ -16,6 +16,7 @@ #include "hk_paradoxconnection.h" #include "hk_paradoxdatabase.h" #include "hk_url.h" +#include //#include hk_paradoxtable::hk_paradoxtable(hk_paradoxdatabase* db,hk_presentation* p):hk_paradoxdatasource(db,p) --- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp~ 2005-07-02 16:15:04.000000000 +0200 +++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp 2008-07-31 07:53:52.000000000 +0200 @@ -10,7 +10,7 @@ // **************************************************************************** #include "hk_firebirdcolumn.h" #include "hk_firebirddatasource.h" - +#include hk_firebirdcolumn::hk_firebirdcolumn(hk_firebirddatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) :hk_storagecolumn(ds,tTRUE,tFALSE) --- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp~ 2006-07-16 21:11:52.000000000 +0200 +++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp 2008-07-31 07:52:59.000000000 +0200 @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef HAVE_SSTREAM #include #else --- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp~ 2006-06-29 20:10:17.000000000 +0200 +++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp 2008-07-31 07:53:29.000000000 +0200 @@ -15,6 +15,7 @@ #include "hk_firebirdactionquery.h" #include #include +#include #include #include --- hk_classes-0.8.3/hk_xbaseclasses/Makefile.in~ 2006-12-17 15:27:52.000000000 +0100 +++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.in 2008-07-31 11:08:48.000000000 +0200 @@ -233,7 +233,7 @@ AM_CPPFLAGS = AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@ -libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la +libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la lib_LTLIBRARIES = libhk_xbasedriver.la noinst_HEADERS = hk_xbaseconnection.h hk_xbaseactionquery.h hk_xbaseconnection.h \ hk_xbasedatabase.h hk_xbasedatasource.h hk_xbasecolumn.h \ --- hk_classes-0.8.3/hk_xbaseclasses/Makefile.am~ 2006-10-02 19:54:20.000000000 +0200 +++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.am 2008-07-31 11:08:24.000000000 +0200 @@ -6,7 +6,7 @@ AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@ -libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la +libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la lib_LTLIBRARIES = libhk_xbasedriver.la