From 62e557c6933e314b2872b3100344142787add02b Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Sun, 7 Apr 2024 10:59:57 +0200 Subject: [PATCH] Remove old sqlite3 references. --- AutoSave/AutoSave.project | 1 - CMakeLists.txt | 15 - CMakePlugin/CMakePlugin.project | 3 - CallGraph/CallGraph.project | 1 - CodeLite/CodeLite.project | 1 - CodeLiteDiff/CodeLiteDiff.project | 1 - CommentParser/CommentParser/main.cpp | 1 - ContinuousBuild/ContinuousBuild.project | 3 - Copyright/Copyright.project | 3 - DebugAdapterClient/DebugAdapterClient.project | 1 - Debugger/DebuggerGDB.project | 1 - Docker/Docker.project | 1 - EOSWiki/EOSWiki.project | 1 - EditorConfigPlugin/EditorConfigPlugin.project | 1 - ExternalTools/ExternalTools.project | 3 - Gizmos/Gizmos.project | 1 - HelpPlugin/HelpPlugin.project | 1 - LiteEditor/CodeLiteIDE.project | 28 -- MacBundler/MacBundler.project | 5 - Outline/Outline.project | 3 - PHPLint/PHPLint.project | 1 - Plugin/plugin_sdk.project | 1 - QmakePlugin/QMakePlugin.project | 3 - Remoty/Remoty.project | 1 - Rust/Rust.project | 1 - SFTP/SFTP.project | 1 - SmartCompletion/SmartCompletion.project | 1 - SnipWiz/snipwiz.project | 4 - SpellChecker/SpellCheck.project | 5 - Subversion2/Subversion2.project | 2 - Tail/Tail.project | 2 - UnitTestCPP/UnitTestPP.project | 4 - WebTools/WebTools.project | 2 - WordCompletion/WordCompletion.project | 2 - ZoomNavigator/ZoomNavigator.project | 2 - abbreviation/abbreviation.project | 3 - cmake/Modules/plugin.cmake | 3 +- codelitephp/PHPParser/PHPParser.project | 1 - cppchecker/CppChecker.project | 3 - cscope/Cscope.project | 3 - git/git.project | 2 - sdk/databaselayer/CMakeLists.txt | 8 +- sdk/databaselayer/src/sqlite3/README | 32 -- sdk/databaselayer/src/sqlite3/sqlite3ext.h | 447 ------------------ sdk/wxsqlite3/sqlite3/Readme.txt | 2 - sdk/wxsqlite3/wxsqlite3.project | 31 -- wxformbuilder/wxFormBuilder.project | 4 - 47 files changed, 3 insertions(+), 643 deletions(-) delete mode 100644 sdk/databaselayer/src/sqlite3/README delete mode 100644 sdk/databaselayer/src/sqlite3/sqlite3ext.h delete mode 100644 sdk/wxsqlite3/sqlite3/Readme.txt diff --git a/AutoSave/AutoSave.project b/AutoSave/AutoSave.project index 36bcb6da3a..8544ad25df 100644 --- a/AutoSave/AutoSave.project +++ b/AutoSave/AutoSave.project @@ -113,7 +113,6 @@ - diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e053c5dc9..c42fab3d82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -866,11 +866,6 @@ if(APPLE) add_definitions(-mmacosx-version-min=10.8) endif() -if(NOT SQLite3_FOUND) - # On Linux, we use the distro's libsqlite3 - add_subdirectory(sqlite3) -endif() - # add the dtl module include path before we include Plugin folder include_directories(dtl) @@ -978,16 +973,6 @@ else() add_subdirectory(codelite_echo) add_subdirectory(ctagsd) - # - # Setup the proper dependencies - # - if(NOT SQLite3_FOUND) - if(USE_PCH AND NOT MINGW) - add_dependencies(sqlite3lib ${CL_PCH_TARGET}) - endif() - add_dependencies(wxsqlite3 sqlite3lib) - endif() - add_subdirectory(LiteEditor) add_dependencies(databaselayersqlite wxsqlite3) add_dependencies(wxshapeframework wxsqlite3) diff --git a/CMakePlugin/CMakePlugin.project b/CMakePlugin/CMakePlugin.project index 512de2f4cb..785efbaba4 100644 --- a/CMakePlugin/CMakePlugin.project +++ b/CMakePlugin/CMakePlugin.project @@ -112,7 +112,6 @@ - @@ -227,7 +226,6 @@ - @@ -287,7 +285,6 @@ - diff --git a/CallGraph/CallGraph.project b/CallGraph/CallGraph.project index aa3c10d025..e5ae9d7528 100644 --- a/CallGraph/CallGraph.project +++ b/CallGraph/CallGraph.project @@ -191,7 +191,6 @@ - diff --git a/CodeLite/CodeLite.project b/CodeLite/CodeLite.project index 9c106ae8ff..333bb7179b 100644 --- a/CodeLite/CodeLite.project +++ b/CodeLite/CodeLite.project @@ -540,7 +540,6 @@ - diff --git a/CodeLiteDiff/CodeLiteDiff.project b/CodeLiteDiff/CodeLiteDiff.project index 09e05b1ec1..3523c28801 100644 --- a/CodeLiteDiff/CodeLiteDiff.project +++ b/CodeLiteDiff/CodeLiteDiff.project @@ -256,7 +256,6 @@ - diff --git a/CommentParser/CommentParser/main.cpp b/CommentParser/CommentParser/main.cpp index dca1093249..472de7701d 100644 --- a/CommentParser/CommentParser/main.cpp +++ b/CommentParser/CommentParser/main.cpp @@ -6,7 +6,6 @@ int main(int argc, char **argv) { CommentParseResult comments; -// ParseComments("C:\\Users\\eran\\src\\Development\\C++\\codelite\\CL_trunk\\sqlite3\\sqlite3.h", comments); ParseComments("../test.h", comments); comments.print(); diff --git a/ContinuousBuild/ContinuousBuild.project b/ContinuousBuild/ContinuousBuild.project index 541a58e27d..108a37c856 100644 --- a/ContinuousBuild/ContinuousBuild.project +++ b/ContinuousBuild/ContinuousBuild.project @@ -89,7 +89,6 @@ - @@ -204,7 +203,6 @@ - @@ -266,7 +264,6 @@ - diff --git a/Copyright/Copyright.project b/Copyright/Copyright.project index 3877114d16..fdfeae1ba1 100644 --- a/Copyright/Copyright.project +++ b/Copyright/Copyright.project @@ -73,7 +73,6 @@ - @@ -188,7 +187,6 @@ - @@ -250,7 +248,6 @@ - diff --git a/DebugAdapterClient/DebugAdapterClient.project b/DebugAdapterClient/DebugAdapterClient.project index 41b42086c8..0c92e31c37 100644 --- a/DebugAdapterClient/DebugAdapterClient.project +++ b/DebugAdapterClient/DebugAdapterClient.project @@ -306,7 +306,6 @@ - diff --git a/Debugger/DebuggerGDB.project b/Debugger/DebuggerGDB.project index aa00d07a19..d7525b127b 100644 --- a/Debugger/DebuggerGDB.project +++ b/Debugger/DebuggerGDB.project @@ -189,7 +189,6 @@ - diff --git a/Docker/Docker.project b/Docker/Docker.project index abc2ccddf0..f259b80cc0 100644 --- a/Docker/Docker.project +++ b/Docker/Docker.project @@ -137,7 +137,6 @@ - diff --git a/EOSWiki/EOSWiki.project b/EOSWiki/EOSWiki.project index 9cb9881344..ce9eb41066 100644 --- a/EOSWiki/EOSWiki.project +++ b/EOSWiki/EOSWiki.project @@ -111,7 +111,6 @@ - diff --git a/EditorConfigPlugin/EditorConfigPlugin.project b/EditorConfigPlugin/EditorConfigPlugin.project index ccfab20dd9..605938db1b 100644 --- a/EditorConfigPlugin/EditorConfigPlugin.project +++ b/EditorConfigPlugin/EditorConfigPlugin.project @@ -113,7 +113,6 @@ - diff --git a/ExternalTools/ExternalTools.project b/ExternalTools/ExternalTools.project index 89861ef078..1986e9a338 100644 --- a/ExternalTools/ExternalTools.project +++ b/ExternalTools/ExternalTools.project @@ -83,7 +83,6 @@ - @@ -198,7 +197,6 @@ - @@ -259,7 +257,6 @@ - diff --git a/Gizmos/Gizmos.project b/Gizmos/Gizmos.project index 16528b1109..e2cf35c024 100644 --- a/Gizmos/Gizmos.project +++ b/Gizmos/Gizmos.project @@ -205,7 +205,6 @@ - diff --git a/HelpPlugin/HelpPlugin.project b/HelpPlugin/HelpPlugin.project index 9b52c4e228..ec3fa6ed70 100644 --- a/HelpPlugin/HelpPlugin.project +++ b/HelpPlugin/HelpPlugin.project @@ -143,7 +143,6 @@ - diff --git a/LiteEditor/CodeLiteIDE.project b/LiteEditor/CodeLiteIDE.project index e07fc6b3c8..ce8461b718 100644 --- a/LiteEditor/CodeLiteIDE.project +++ b/LiteEditor/CodeLiteIDE.project @@ -597,7 +597,6 @@ - @@ -647,7 +646,6 @@ - @@ -664,7 +662,6 @@ - @@ -686,7 +683,6 @@ - @@ -698,7 +694,6 @@ - @@ -814,7 +809,6 @@ - @@ -826,7 +820,6 @@ - @@ -839,7 +832,6 @@ - @@ -852,7 +844,6 @@ - @@ -893,7 +884,6 @@ - @@ -907,7 +897,6 @@ - @@ -921,7 +910,6 @@ - @@ -935,7 +923,6 @@ - @@ -949,7 +936,6 @@ - @@ -963,7 +949,6 @@ - @@ -977,7 +962,6 @@ - @@ -991,7 +975,6 @@ - @@ -1005,7 +988,6 @@ - @@ -1019,7 +1001,6 @@ - @@ -1033,7 +1014,6 @@ - @@ -1047,7 +1027,6 @@ - @@ -1061,7 +1040,6 @@ - @@ -1074,7 +1052,6 @@ - @@ -1083,7 +1060,6 @@ - @@ -1119,7 +1095,6 @@ - @@ -1177,7 +1152,6 @@ - @@ -1238,7 +1212,6 @@ - @@ -1294,7 +1267,6 @@ - diff --git a/MacBundler/MacBundler.project b/MacBundler/MacBundler.project index e12f9134f4..0dcbd5d44d 100644 --- a/MacBundler/MacBundler.project +++ b/MacBundler/MacBundler.project @@ -38,7 +38,6 @@ - @@ -91,7 +90,6 @@ - @@ -144,7 +142,6 @@ - @@ -199,7 +196,6 @@ - @@ -254,7 +250,6 @@ - diff --git a/Outline/Outline.project b/Outline/Outline.project index 4067199cae..86693816e3 100644 --- a/Outline/Outline.project +++ b/Outline/Outline.project @@ -71,7 +71,6 @@ - @@ -186,7 +185,6 @@ - @@ -248,7 +246,6 @@ - diff --git a/PHPLint/PHPLint.project b/PHPLint/PHPLint.project index f6054d9d09..6f99ee1b60 100644 --- a/PHPLint/PHPLint.project +++ b/PHPLint/PHPLint.project @@ -107,7 +107,6 @@ - diff --git a/Plugin/plugin_sdk.project b/Plugin/plugin_sdk.project index d7c6d0e479..c2cf42e612 100644 --- a/Plugin/plugin_sdk.project +++ b/Plugin/plugin_sdk.project @@ -885,7 +885,6 @@ - diff --git a/QmakePlugin/QMakePlugin.project b/QmakePlugin/QMakePlugin.project index 3b816e92dc..aedf3b12b4 100644 --- a/QmakePlugin/QMakePlugin.project +++ b/QmakePlugin/QMakePlugin.project @@ -104,7 +104,6 @@ - @@ -219,7 +218,6 @@ - @@ -281,7 +279,6 @@ - diff --git a/Remoty/Remoty.project b/Remoty/Remoty.project index 05c9b60163..e93b220b92 100644 --- a/Remoty/Remoty.project +++ b/Remoty/Remoty.project @@ -243,7 +243,6 @@ - diff --git a/Rust/Rust.project b/Rust/Rust.project index 7726553741..4a81e6b080 100644 --- a/Rust/Rust.project +++ b/Rust/Rust.project @@ -229,7 +229,6 @@ - diff --git a/SFTP/SFTP.project b/SFTP/SFTP.project index 1a8a9a909a..33098bf4d9 100644 --- a/SFTP/SFTP.project +++ b/SFTP/SFTP.project @@ -264,7 +264,6 @@ - diff --git a/SmartCompletion/SmartCompletion.project b/SmartCompletion/SmartCompletion.project index b24b733d17..a29b0da17f 100644 --- a/SmartCompletion/SmartCompletion.project +++ b/SmartCompletion/SmartCompletion.project @@ -106,7 +106,6 @@ - diff --git a/SnipWiz/snipwiz.project b/SnipWiz/snipwiz.project index 6241d21138..d31b5b584e 100644 --- a/SnipWiz/snipwiz.project +++ b/SnipWiz/snipwiz.project @@ -81,7 +81,6 @@ - @@ -191,12 +190,10 @@ - - @@ -258,7 +255,6 @@ - diff --git a/SpellChecker/SpellCheck.project b/SpellChecker/SpellCheck.project index e22b824ab4..136da4386c 100644 --- a/SpellChecker/SpellCheck.project +++ b/SpellChecker/SpellCheck.project @@ -99,7 +99,6 @@ - @@ -152,7 +151,6 @@ - @@ -268,12 +266,10 @@ - - @@ -337,7 +333,6 @@ - diff --git a/Subversion2/Subversion2.project b/Subversion2/Subversion2.project index 785c619a9a..3857236f0d 100644 --- a/Subversion2/Subversion2.project +++ b/Subversion2/Subversion2.project @@ -252,7 +252,6 @@ - @@ -311,7 +310,6 @@ - diff --git a/Tail/Tail.project b/Tail/Tail.project index e703247984..566e2cc998 100644 --- a/Tail/Tail.project +++ b/Tail/Tail.project @@ -102,12 +102,10 @@ - - diff --git a/UnitTestCPP/UnitTestPP.project b/UnitTestCPP/UnitTestPP.project index d57942324c..80679a662a 100644 --- a/UnitTestCPP/UnitTestPP.project +++ b/UnitTestCPP/UnitTestPP.project @@ -89,7 +89,6 @@ - @@ -199,12 +198,10 @@ - - @@ -266,7 +263,6 @@ - diff --git a/WebTools/WebTools.project b/WebTools/WebTools.project index c7c48dcd7a..fe32f59ea3 100644 --- a/WebTools/WebTools.project +++ b/WebTools/WebTools.project @@ -288,12 +288,10 @@ - - diff --git a/WordCompletion/WordCompletion.project b/WordCompletion/WordCompletion.project index eb26407c39..7f27ef8966 100644 --- a/WordCompletion/WordCompletion.project +++ b/WordCompletion/WordCompletion.project @@ -253,12 +253,10 @@ - - diff --git a/ZoomNavigator/ZoomNavigator.project b/ZoomNavigator/ZoomNavigator.project index 004419da92..3738cfc49c 100755 --- a/ZoomNavigator/ZoomNavigator.project +++ b/ZoomNavigator/ZoomNavigator.project @@ -231,12 +231,10 @@ - - diff --git a/abbreviation/abbreviation.project b/abbreviation/abbreviation.project index 3bba680f26..d938661088 100644 --- a/abbreviation/abbreviation.project +++ b/abbreviation/abbreviation.project @@ -73,7 +73,6 @@ - @@ -183,7 +182,6 @@ - @@ -241,7 +239,6 @@ - diff --git a/cmake/Modules/plugin.cmake b/cmake/Modules/plugin.cmake index 4413658da6..ac1086c484 100644 --- a/cmake/Modules/plugin.cmake +++ b/cmake/Modules/plugin.cmake @@ -48,8 +48,7 @@ function(CL_PLUGIN PLUGIN_NAME) ${wxWidgets_LIBRARIES} libcodelite plugin - wxsqlite3 - sqlite3lib) + wxsqlite3) # Installation destination install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIR}) diff --git a/codelitephp/PHPParser/PHPParser.project b/codelitephp/PHPParser/PHPParser.project index c53f3c40ec..830488c73e 100644 --- a/codelitephp/PHPParser/PHPParser.project +++ b/codelitephp/PHPParser/PHPParser.project @@ -339,7 +339,6 @@ php_expr_lexer.cpp: php_expr.l - diff --git a/cppchecker/CppChecker.project b/cppchecker/CppChecker.project index 036699b5e6..b26e531d30 100644 --- a/cppchecker/CppChecker.project +++ b/cppchecker/CppChecker.project @@ -94,7 +94,6 @@ - @@ -211,7 +210,6 @@ - @@ -273,7 +271,6 @@ - diff --git a/cscope/Cscope.project b/cscope/Cscope.project index 7147a90d6e..6473e96244 100644 --- a/cscope/Cscope.project +++ b/cscope/Cscope.project @@ -85,7 +85,6 @@ - @@ -199,7 +198,6 @@ - @@ -266,7 +264,6 @@ - diff --git a/git/git.project b/git/git.project index 6b1e5e7cef..6b0bf11cdb 100644 --- a/git/git.project +++ b/git/git.project @@ -281,7 +281,6 @@ - @@ -342,7 +341,6 @@ - diff --git a/sdk/databaselayer/CMakeLists.txt b/sdk/databaselayer/CMakeLists.txt index 3dd6c68aed..8becce0d99 100644 --- a/sdk/databaselayer/CMakeLists.txt +++ b/sdk/databaselayer/CMakeLists.txt @@ -7,7 +7,7 @@ project(databaselayersqlite) include("${wxWidgets_USE_FILE}") # Include paths -include_directories(./include/wx/dblayer/include src/sqlite3) +include_directories(./include/wx/dblayer/include) if(USE_PCH AND NOT MINGW) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${CL_PCH_FILE} -Winvalid-pch ") @@ -27,11 +27,7 @@ if(APPLE) add_definitions(-fPIC) endif() -if(NOT SQLite3_FOUND) - file(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" "src/dblayer/Prepared*.cpp" "src/sqlite3/*.c") -else() - file(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" "src/dblayer/Prepared*.cpp") -endif() +file(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" "src/dblayer/Prepared*.cpp") if(WITH_MYSQL) find_library(LIBMYSQLCLIENT NAMES mysql mysqlclient mariadb mariadbclient) diff --git a/sdk/databaselayer/src/sqlite3/README b/sdk/databaselayer/src/sqlite3/README deleted file mode 100644 index dd8cca24bd..0000000000 --- a/sdk/databaselayer/src/sqlite3/README +++ /dev/null @@ -1,32 +0,0 @@ - -This package contains: - - * the SQLite library amalgamation (single file) source code distribution, - * the shell.c file used to build the sqlite3 shell too, and - * the sqlite3.h and sqlite3ext.h header files required to link programs - and sqlite extensions against the installed libary. - * autoconf/automake installation infrastucture. - -The generic installation instructions for autoconf/automake are found -in the INSTALL file. - -The following SQLite specific boolean options are supported: - - --enable-readline use readline in shell tool [default=yes] - --enable-threadsafe build a thread-safe library [default=yes] - --enable-dynamic-extensions support loadable extensions [default=yes] - -The default value for the CFLAGS variable (options passed to the C -compiler) includes debugging symbols in the build, resulting in larger -binaries than are necessary. Override it on the configure command -line like this: - - $ CFLAGS="-Os" ./configure - -to produce a smaller installation footprint. - -Other SQLite compilation parameters can also be set using CFLAGS. For -example: - - $ CFLAGS="-Os -DSQLITE_OMIT_TRIGGERS" ./configure - diff --git a/sdk/databaselayer/src/sqlite3/sqlite3ext.h b/sdk/databaselayer/src/sqlite3/sqlite3ext.h deleted file mode 100644 index 5abcde2c8f..0000000000 --- a/sdk/databaselayer/src/sqlite3/sqlite3ext.h +++ /dev/null @@ -1,447 +0,0 @@ -/* -** 2006 June 7 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -************************************************************************* -** This header file defines the SQLite interface for use by -** shared libraries that want to be imported as extensions into -** an SQLite instance. Shared libraries that intend to be loaded -** as extensions by SQLite should #include this file instead of -** sqlite3.h. -*/ -#ifndef _SQLITE3EXT_H_ -#define _SQLITE3EXT_H_ -#include "sqlite3.h" - -typedef struct sqlite3_api_routines sqlite3_api_routines; - -/* -** The following structure holds pointers to all of the SQLite API -** routines. -** -** WARNING: In order to maintain backwards compatibility, add new -** interfaces to the end of this structure only. If you insert new -** interfaces in the middle of this structure, then older different -** versions of SQLite will not be able to load each others' shared -** libraries! -*/ -struct sqlite3_api_routines { - void * (*aggregate_context)(sqlite3_context*,int nBytes); - int (*aggregate_count)(sqlite3_context*); - int (*bind_blob)(sqlite3_stmt*,int,const void*,int n,void(*)(void*)); - int (*bind_double)(sqlite3_stmt*,int,double); - int (*bind_int)(sqlite3_stmt*,int,int); - int (*bind_int64)(sqlite3_stmt*,int,sqlite_int64); - int (*bind_null)(sqlite3_stmt*,int); - int (*bind_parameter_count)(sqlite3_stmt*); - int (*bind_parameter_index)(sqlite3_stmt*,const char*zName); - const char * (*bind_parameter_name)(sqlite3_stmt*,int); - int (*bind_text)(sqlite3_stmt*,int,const char*,int n,void(*)(void*)); - int (*bind_text16)(sqlite3_stmt*,int,const void*,int,void(*)(void*)); - int (*bind_value)(sqlite3_stmt*,int,const sqlite3_value*); - int (*busy_handler)(sqlite3*,int(*)(void*,int),void*); - int (*busy_timeout)(sqlite3*,int ms); - int (*changes)(sqlite3*); - int (*close)(sqlite3*); - int (*collation_needed)(sqlite3*,void*,void(*)(void*,sqlite3*, - int eTextRep,const char*)); - int (*collation_needed16)(sqlite3*,void*,void(*)(void*,sqlite3*, - int eTextRep,const void*)); - const void * (*column_blob)(sqlite3_stmt*,int iCol); - int (*column_bytes)(sqlite3_stmt*,int iCol); - int (*column_bytes16)(sqlite3_stmt*,int iCol); - int (*column_count)(sqlite3_stmt*pStmt); - const char * (*column_database_name)(sqlite3_stmt*,int); - const void * (*column_database_name16)(sqlite3_stmt*,int); - const char * (*column_decltype)(sqlite3_stmt*,int i); - const void * (*column_decltype16)(sqlite3_stmt*,int); - double (*column_double)(sqlite3_stmt*,int iCol); - int (*column_int)(sqlite3_stmt*,int iCol); - sqlite_int64 (*column_int64)(sqlite3_stmt*,int iCol); - const char * (*column_name)(sqlite3_stmt*,int); - const void * (*column_name16)(sqlite3_stmt*,int); - const char * (*column_origin_name)(sqlite3_stmt*,int); - const void * (*column_origin_name16)(sqlite3_stmt*,int); - const char * (*column_table_name)(sqlite3_stmt*,int); - const void * (*column_table_name16)(sqlite3_stmt*,int); - const unsigned char * (*column_text)(sqlite3_stmt*,int iCol); - const void * (*column_text16)(sqlite3_stmt*,int iCol); - int (*column_type)(sqlite3_stmt*,int iCol); - sqlite3_value* (*column_value)(sqlite3_stmt*,int iCol); - void * (*commit_hook)(sqlite3*,int(*)(void*),void*); - int (*complete)(const char*sql); - int (*complete16)(const void*sql); - int (*create_collation)(sqlite3*,const char*,int,void*, - int(*)(void*,int,const void*,int,const void*)); - int (*create_collation16)(sqlite3*,const void*,int,void*, - int(*)(void*,int,const void*,int,const void*)); - int (*create_function)(sqlite3*,const char*,int,int,void*, - void (*xFunc)(sqlite3_context*,int,sqlite3_value**), - void (*xStep)(sqlite3_context*,int,sqlite3_value**), - void (*xFinal)(sqlite3_context*)); - int (*create_function16)(sqlite3*,const void*,int,int,void*, - void (*xFunc)(sqlite3_context*,int,sqlite3_value**), - void (*xStep)(sqlite3_context*,int,sqlite3_value**), - void (*xFinal)(sqlite3_context*)); - int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*); - int (*data_count)(sqlite3_stmt*pStmt); - sqlite3 * (*db_handle)(sqlite3_stmt*); - int (*declare_vtab)(sqlite3*,const char*); - int (*enable_shared_cache)(int); - int (*errcode)(sqlite3*db); - const char * (*errmsg)(sqlite3*); - const void * (*errmsg16)(sqlite3*); - int (*exec)(sqlite3*,const char*,sqlite3_callback,void*,char**); - int (*expired)(sqlite3_stmt*); - int (*finalize)(sqlite3_stmt*pStmt); - void (*free)(void*); - void (*free_table)(char**result); - int (*get_autocommit)(sqlite3*); - void * (*get_auxdata)(sqlite3_context*,int); - int (*get_table)(sqlite3*,const char*,char***,int*,int*,char**); - int (*global_recover)(void); - void (*interruptx)(sqlite3*); - sqlite_int64 (*last_insert_rowid)(sqlite3*); - const char * (*libversion)(void); - int (*libversion_number)(void); - void *(*malloc)(int); - char * (*mprintf)(const char*,...); - int (*open)(const char*,sqlite3**); - int (*open16)(const void*,sqlite3**); - int (*prepare)(sqlite3*,const char*,int,sqlite3_stmt**,const char**); - int (*prepare16)(sqlite3*,const void*,int,sqlite3_stmt**,const void**); - void * (*profile)(sqlite3*,void(*)(void*,const char*,sqlite_uint64),void*); - void (*progress_handler)(sqlite3*,int,int(*)(void*),void*); - void *(*realloc)(void*,int); - int (*reset)(sqlite3_stmt*pStmt); - void (*result_blob)(sqlite3_context*,const void*,int,void(*)(void*)); - void (*result_double)(sqlite3_context*,double); - void (*result_error)(sqlite3_context*,const char*,int); - void (*result_error16)(sqlite3_context*,const void*,int); - void (*result_int)(sqlite3_context*,int); - void (*result_int64)(sqlite3_context*,sqlite_int64); - void (*result_null)(sqlite3_context*); - void (*result_text)(sqlite3_context*,const char*,int,void(*)(void*)); - void (*result_text16)(sqlite3_context*,const void*,int,void(*)(void*)); - void (*result_text16be)(sqlite3_context*,const void*,int,void(*)(void*)); - void (*result_text16le)(sqlite3_context*,const void*,int,void(*)(void*)); - void (*result_value)(sqlite3_context*,sqlite3_value*); - void * (*rollback_hook)(sqlite3*,void(*)(void*),void*); - int (*set_authorizer)(sqlite3*,int(*)(void*,int,const char*,const char*, - const char*,const char*),void*); - void (*set_auxdata)(sqlite3_context*,int,void*,void (*)(void*)); - char * (*snprintf)(int,char*,const char*,...); - int (*step)(sqlite3_stmt*); - int (*table_column_metadata)(sqlite3*,const char*,const char*,const char*, - char const**,char const**,int*,int*,int*); - void (*thread_cleanup)(void); - int (*total_changes)(sqlite3*); - void * (*trace)(sqlite3*,void(*xTrace)(void*,const char*),void*); - int (*transfer_bindings)(sqlite3_stmt*,sqlite3_stmt*); - void * (*update_hook)(sqlite3*,void(*)(void*,int ,char const*,char const*, - sqlite_int64),void*); - void * (*user_data)(sqlite3_context*); - const void * (*value_blob)(sqlite3_value*); - int (*value_bytes)(sqlite3_value*); - int (*value_bytes16)(sqlite3_value*); - double (*value_double)(sqlite3_value*); - int (*value_int)(sqlite3_value*); - sqlite_int64 (*value_int64)(sqlite3_value*); - int (*value_numeric_type)(sqlite3_value*); - const unsigned char * (*value_text)(sqlite3_value*); - const void * (*value_text16)(sqlite3_value*); - const void * (*value_text16be)(sqlite3_value*); - const void * (*value_text16le)(sqlite3_value*); - int (*value_type)(sqlite3_value*); - char *(*vmprintf)(const char*,va_list); - /* Added ??? */ - int (*overload_function)(sqlite3*, const char *zFuncName, int nArg); - /* Added by 3.3.13 */ - int (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**); - int (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**); - int (*clear_bindings)(sqlite3_stmt*); - /* Added by 3.4.1 */ - int (*create_module_v2)(sqlite3*,const char*,const sqlite3_module*,void*, - void (*xDestroy)(void *)); - /* Added by 3.5.0 */ - int (*bind_zeroblob)(sqlite3_stmt*,int,int); - int (*blob_bytes)(sqlite3_blob*); - int (*blob_close)(sqlite3_blob*); - int (*blob_open)(sqlite3*,const char*,const char*,const char*,sqlite3_int64, - int,sqlite3_blob**); - int (*blob_read)(sqlite3_blob*,void*,int,int); - int (*blob_write)(sqlite3_blob*,const void*,int,int); - int (*create_collation_v2)(sqlite3*,const char*,int,void*, - int(*)(void*,int,const void*,int,const void*), - void(*)(void*)); - int (*file_control)(sqlite3*,const char*,int,void*); - sqlite3_int64 (*memory_highwater)(int); - sqlite3_int64 (*memory_used)(void); - sqlite3_mutex *(*mutex_alloc)(int); - void (*mutex_enter)(sqlite3_mutex*); - void (*mutex_free)(sqlite3_mutex*); - void (*mutex_leave)(sqlite3_mutex*); - int (*mutex_try)(sqlite3_mutex*); - int (*open_v2)(const char*,sqlite3**,int,const char*); - int (*release_memory)(int); - void (*result_error_nomem)(sqlite3_context*); - void (*result_error_toobig)(sqlite3_context*); - int (*sleep)(int); - void (*soft_heap_limit)(int); - sqlite3_vfs *(*vfs_find)(const char*); - int (*vfs_register)(sqlite3_vfs*,int); - int (*vfs_unregister)(sqlite3_vfs*); - int (*xthreadsafe)(void); - void (*result_zeroblob)(sqlite3_context*,int); - void (*result_error_code)(sqlite3_context*,int); - int (*test_control)(int, ...); - void (*randomness)(int,void*); - sqlite3 *(*context_db_handle)(sqlite3_context*); - int (*extended_result_codes)(sqlite3*,int); - int (*limit)(sqlite3*,int,int); - sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*); - const char *(*sql)(sqlite3_stmt*); - int (*status)(int,int*,int*,int); - int (*backup_finish)(sqlite3_backup*); - sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*); - int (*backup_pagecount)(sqlite3_backup*); - int (*backup_remaining)(sqlite3_backup*); - int (*backup_step)(sqlite3_backup*,int); - const char *(*compileoption_get)(int); - int (*compileoption_used)(const char*); - int (*create_function_v2)(sqlite3*,const char*,int,int,void*, - void (*xFunc)(sqlite3_context*,int,sqlite3_value**), - void (*xStep)(sqlite3_context*,int,sqlite3_value**), - void (*xFinal)(sqlite3_context*), - void(*xDestroy)(void*)); - int (*db_config)(sqlite3*,int,...); - sqlite3_mutex *(*db_mutex)(sqlite3*); - int (*db_status)(sqlite3*,int,int*,int*,int); - int (*extended_errcode)(sqlite3*); - void (*log)(int,const char*,...); - sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64); - const char *(*sourceid)(void); - int (*stmt_status)(sqlite3_stmt*,int,int); - int (*strnicmp)(const char*,const char*,int); - int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*); - int (*wal_autocheckpoint)(sqlite3*,int); - int (*wal_checkpoint)(sqlite3*,const char*); - void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*); - int (*blob_reopen)(sqlite3_blob*,sqlite3_int64); - int (*vtab_config)(sqlite3*,int op,...); - int (*vtab_on_conflict)(sqlite3*); -}; - -/* -** The following macros redefine the API routines so that they are -** redirected throught the global sqlite3_api structure. -** -** This header file is also used by the loadext.c source file -** (part of the main SQLite library - not an extension) so that -** it can get access to the sqlite3_api_routines structure -** definition. But the main library does not want to redefine -** the API. So the redefinition macros are only valid if the -** SQLITE_CORE macros is undefined. -*/ -#ifndef SQLITE_CORE -#define sqlite3_aggregate_context sqlite3_api->aggregate_context -#ifndef SQLITE_OMIT_DEPRECATED -#define sqlite3_aggregate_count sqlite3_api->aggregate_count -#endif -#define sqlite3_bind_blob sqlite3_api->bind_blob -#define sqlite3_bind_double sqlite3_api->bind_double -#define sqlite3_bind_int sqlite3_api->bind_int -#define sqlite3_bind_int64 sqlite3_api->bind_int64 -#define sqlite3_bind_null sqlite3_api->bind_null -#define sqlite3_bind_parameter_count sqlite3_api->bind_parameter_count -#define sqlite3_bind_parameter_index sqlite3_api->bind_parameter_index -#define sqlite3_bind_parameter_name sqlite3_api->bind_parameter_name -#define sqlite3_bind_text sqlite3_api->bind_text -#define sqlite3_bind_text16 sqlite3_api->bind_text16 -#define sqlite3_bind_value sqlite3_api->bind_value -#define sqlite3_busy_handler sqlite3_api->busy_handler -#define sqlite3_busy_timeout sqlite3_api->busy_timeout -#define sqlite3_changes sqlite3_api->changes -#define sqlite3_close sqlite3_api->close -#define sqlite3_collation_needed sqlite3_api->collation_needed -#define sqlite3_collation_needed16 sqlite3_api->collation_needed16 -#define sqlite3_column_blob sqlite3_api->column_blob -#define sqlite3_column_bytes sqlite3_api->column_bytes -#define sqlite3_column_bytes16 sqlite3_api->column_bytes16 -#define sqlite3_column_count sqlite3_api->column_count -#define sqlite3_column_database_name sqlite3_api->column_database_name -#define sqlite3_column_database_name16 sqlite3_api->column_database_name16 -#define sqlite3_column_decltype sqlite3_api->column_decltype -#define sqlite3_column_decltype16 sqlite3_api->column_decltype16 -#define sqlite3_column_double sqlite3_api->column_double -#define sqlite3_column_int sqlite3_api->column_int -#define sqlite3_column_int64 sqlite3_api->column_int64 -#define sqlite3_column_name sqlite3_api->column_name -#define sqlite3_column_name16 sqlite3_api->column_name16 -#define sqlite3_column_origin_name sqlite3_api->column_origin_name -#define sqlite3_column_origin_name16 sqlite3_api->column_origin_name16 -#define sqlite3_column_table_name sqlite3_api->column_table_name -#define sqlite3_column_table_name16 sqlite3_api->column_table_name16 -#define sqlite3_column_text sqlite3_api->column_text -#define sqlite3_column_text16 sqlite3_api->column_text16 -#define sqlite3_column_type sqlite3_api->column_type -#define sqlite3_column_value sqlite3_api->column_value -#define sqlite3_commit_hook sqlite3_api->commit_hook -#define sqlite3_complete sqlite3_api->complete -#define sqlite3_complete16 sqlite3_api->complete16 -#define sqlite3_create_collation sqlite3_api->create_collation -#define sqlite3_create_collation16 sqlite3_api->create_collation16 -#define sqlite3_create_function sqlite3_api->create_function -#define sqlite3_create_function16 sqlite3_api->create_function16 -#define sqlite3_create_module sqlite3_api->create_module -#define sqlite3_create_module_v2 sqlite3_api->create_module_v2 -#define sqlite3_data_count sqlite3_api->data_count -#define sqlite3_db_handle sqlite3_api->db_handle -#define sqlite3_declare_vtab sqlite3_api->declare_vtab -#define sqlite3_enable_shared_cache sqlite3_api->enable_shared_cache -#define sqlite3_errcode sqlite3_api->errcode -#define sqlite3_errmsg sqlite3_api->errmsg -#define sqlite3_errmsg16 sqlite3_api->errmsg16 -#define sqlite3_exec sqlite3_api->exec -#ifndef SQLITE_OMIT_DEPRECATED -#define sqlite3_expired sqlite3_api->expired -#endif -#define sqlite3_finalize sqlite3_api->finalize -#define sqlite3_free sqlite3_api->free -#define sqlite3_free_table sqlite3_api->free_table -#define sqlite3_get_autocommit sqlite3_api->get_autocommit -#define sqlite3_get_auxdata sqlite3_api->get_auxdata -#define sqlite3_get_table sqlite3_api->get_table -#ifndef SQLITE_OMIT_DEPRECATED -#define sqlite3_global_recover sqlite3_api->global_recover -#endif -#define sqlite3_interrupt sqlite3_api->interruptx -#define sqlite3_last_insert_rowid sqlite3_api->last_insert_rowid -#define sqlite3_libversion sqlite3_api->libversion -#define sqlite3_libversion_number sqlite3_api->libversion_number -#define sqlite3_malloc sqlite3_api->malloc -#define sqlite3_mprintf sqlite3_api->mprintf -#define sqlite3_open sqlite3_api->open -#define sqlite3_open16 sqlite3_api->open16 -#define sqlite3_prepare sqlite3_api->prepare -#define sqlite3_prepare16 sqlite3_api->prepare16 -#define sqlite3_prepare_v2 sqlite3_api->prepare_v2 -#define sqlite3_prepare16_v2 sqlite3_api->prepare16_v2 -#define sqlite3_profile sqlite3_api->profile -#define sqlite3_progress_handler sqlite3_api->progress_handler -#define sqlite3_realloc sqlite3_api->realloc -#define sqlite3_reset sqlite3_api->reset -#define sqlite3_result_blob sqlite3_api->result_blob -#define sqlite3_result_double sqlite3_api->result_double -#define sqlite3_result_error sqlite3_api->result_error -#define sqlite3_result_error16 sqlite3_api->result_error16 -#define sqlite3_result_int sqlite3_api->result_int -#define sqlite3_result_int64 sqlite3_api->result_int64 -#define sqlite3_result_null sqlite3_api->result_null -#define sqlite3_result_text sqlite3_api->result_text -#define sqlite3_result_text16 sqlite3_api->result_text16 -#define sqlite3_result_text16be sqlite3_api->result_text16be -#define sqlite3_result_text16le sqlite3_api->result_text16le -#define sqlite3_result_value sqlite3_api->result_value -#define sqlite3_rollback_hook sqlite3_api->rollback_hook -#define sqlite3_set_authorizer sqlite3_api->set_authorizer -#define sqlite3_set_auxdata sqlite3_api->set_auxdata -#define sqlite3_snprintf sqlite3_api->snprintf -#define sqlite3_step sqlite3_api->step -#define sqlite3_table_column_metadata sqlite3_api->table_column_metadata -#define sqlite3_thread_cleanup sqlite3_api->thread_cleanup -#define sqlite3_total_changes sqlite3_api->total_changes -#define sqlite3_trace sqlite3_api->trace -#ifndef SQLITE_OMIT_DEPRECATED -#define sqlite3_transfer_bindings sqlite3_api->transfer_bindings -#endif -#define sqlite3_update_hook sqlite3_api->update_hook -#define sqlite3_user_data sqlite3_api->user_data -#define sqlite3_value_blob sqlite3_api->value_blob -#define sqlite3_value_bytes sqlite3_api->value_bytes -#define sqlite3_value_bytes16 sqlite3_api->value_bytes16 -#define sqlite3_value_double sqlite3_api->value_double -#define sqlite3_value_int sqlite3_api->value_int -#define sqlite3_value_int64 sqlite3_api->value_int64 -#define sqlite3_value_numeric_type sqlite3_api->value_numeric_type -#define sqlite3_value_text sqlite3_api->value_text -#define sqlite3_value_text16 sqlite3_api->value_text16 -#define sqlite3_value_text16be sqlite3_api->value_text16be -#define sqlite3_value_text16le sqlite3_api->value_text16le -#define sqlite3_value_type sqlite3_api->value_type -#define sqlite3_vmprintf sqlite3_api->vmprintf -#define sqlite3_overload_function sqlite3_api->overload_function -#define sqlite3_prepare_v2 sqlite3_api->prepare_v2 -#define sqlite3_prepare16_v2 sqlite3_api->prepare16_v2 -#define sqlite3_clear_bindings sqlite3_api->clear_bindings -#define sqlite3_bind_zeroblob sqlite3_api->bind_zeroblob -#define sqlite3_blob_bytes sqlite3_api->blob_bytes -#define sqlite3_blob_close sqlite3_api->blob_close -#define sqlite3_blob_open sqlite3_api->blob_open -#define sqlite3_blob_read sqlite3_api->blob_read -#define sqlite3_blob_write sqlite3_api->blob_write -#define sqlite3_create_collation_v2 sqlite3_api->create_collation_v2 -#define sqlite3_file_control sqlite3_api->file_control -#define sqlite3_memory_highwater sqlite3_api->memory_highwater -#define sqlite3_memory_used sqlite3_api->memory_used -#define sqlite3_mutex_alloc sqlite3_api->mutex_alloc -#define sqlite3_mutex_enter sqlite3_api->mutex_enter -#define sqlite3_mutex_free sqlite3_api->mutex_free -#define sqlite3_mutex_leave sqlite3_api->mutex_leave -#define sqlite3_mutex_try sqlite3_api->mutex_try -#define sqlite3_open_v2 sqlite3_api->open_v2 -#define sqlite3_release_memory sqlite3_api->release_memory -#define sqlite3_result_error_nomem sqlite3_api->result_error_nomem -#define sqlite3_result_error_toobig sqlite3_api->result_error_toobig -#define sqlite3_sleep sqlite3_api->sleep -#define sqlite3_soft_heap_limit sqlite3_api->soft_heap_limit -#define sqlite3_vfs_find sqlite3_api->vfs_find -#define sqlite3_vfs_register sqlite3_api->vfs_register -#define sqlite3_vfs_unregister sqlite3_api->vfs_unregister -#define sqlite3_threadsafe sqlite3_api->xthreadsafe -#define sqlite3_result_zeroblob sqlite3_api->result_zeroblob -#define sqlite3_result_error_code sqlite3_api->result_error_code -#define sqlite3_test_control sqlite3_api->test_control -#define sqlite3_randomness sqlite3_api->randomness -#define sqlite3_context_db_handle sqlite3_api->context_db_handle -#define sqlite3_extended_result_codes sqlite3_api->extended_result_codes -#define sqlite3_limit sqlite3_api->limit -#define sqlite3_next_stmt sqlite3_api->next_stmt -#define sqlite3_sql sqlite3_api->sql -#define sqlite3_status sqlite3_api->status -#define sqlite3_backup_finish sqlite3_api->backup_finish -#define sqlite3_backup_init sqlite3_api->backup_init -#define sqlite3_backup_pagecount sqlite3_api->backup_pagecount -#define sqlite3_backup_remaining sqlite3_api->backup_remaining -#define sqlite3_backup_step sqlite3_api->backup_step -#define sqlite3_compileoption_get sqlite3_api->compileoption_get -#define sqlite3_compileoption_used sqlite3_api->compileoption_used -#define sqlite3_create_function_v2 sqlite3_api->create_function_v2 -#define sqlite3_db_config sqlite3_api->db_config -#define sqlite3_db_mutex sqlite3_api->db_mutex -#define sqlite3_db_status sqlite3_api->db_status -#define sqlite3_extended_errcode sqlite3_api->extended_errcode -#define sqlite3_log sqlite3_api->log -#define sqlite3_soft_heap_limit64 sqlite3_api->soft_heap_limit64 -#define sqlite3_sourceid sqlite3_api->sourceid -#define sqlite3_stmt_status sqlite3_api->stmt_status -#define sqlite3_strnicmp sqlite3_api->strnicmp -#define sqlite3_unlock_notify sqlite3_api->unlock_notify -#define sqlite3_wal_autocheckpoint sqlite3_api->wal_autocheckpoint -#define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint -#define sqlite3_wal_hook sqlite3_api->wal_hook -#define sqlite3_blob_reopen sqlite3_api->blob_reopen -#define sqlite3_vtab_config sqlite3_api->vtab_config -#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict -#endif /* SQLITE_CORE */ - -#define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0; -#define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v; - -#endif /* _SQLITE3EXT_H_ */ diff --git a/sdk/wxsqlite3/sqlite3/Readme.txt b/sdk/wxsqlite3/sqlite3/Readme.txt deleted file mode 100644 index 6b031833d1..0000000000 --- a/sdk/wxsqlite3/sqlite3/Readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -This directory contains all SQLite3 version 3.3.4 files needed on Windows platforms. - diff --git a/sdk/wxsqlite3/wxsqlite3.project b/sdk/wxsqlite3/wxsqlite3.project index 73fdf68788..3b940ae0fa 100644 --- a/sdk/wxsqlite3/wxsqlite3.project +++ b/sdk/wxsqlite3/wxsqlite3.project @@ -54,21 +54,6 @@ - - - - - - - - - - - - - - - @@ -84,7 +69,6 @@ - @@ -130,7 +114,6 @@ - @@ -176,7 +159,6 @@ - @@ -222,7 +204,6 @@ - @@ -265,16 +246,4 @@ - - - - - - - - - - - - diff --git a/wxformbuilder/wxFormBuilder.project b/wxformbuilder/wxFormBuilder.project index 6e765ff168..522fd190d7 100644 --- a/wxformbuilder/wxFormBuilder.project +++ b/wxformbuilder/wxFormBuilder.project @@ -71,7 +71,6 @@ - @@ -181,12 +180,10 @@ - - @@ -248,7 +245,6 @@ -