From befafa041528935f373d86ea0c7c298a759984d3 Mon Sep 17 00:00:00 2001 From: polos Date: Sat, 3 Dec 2016 17:55:19 +0100 Subject: [PATCH] add module :multimedia; fixes because of QMetaType differences Qt4/Qt5 --- .gitignore | 2 +- README-1.txt | 2 +- doc/Slime.htm | 12 +- doc/auto-doc.htm | 2 +- helper/generate.lisp | 74 +- helper/missing-types.txt | 13 +- helper/modules.lisp | 2 +- helper/multiple-inheritance.txt | 3 + helper/my-class-lists/gui/n-names.lisp | 1 + helper/my-class-lists/multimedia/n-names.lisp | 12 + helper/my-class-lists/multimedia/q-names.lisp | 23 + helper/no-static-meta-object.lisp | 11 +- helper/parse-enums.lisp | 5 +- helper/parse.lisp | 3 + helper/parsed/n-methods.lisp | 173 + helper/parsed/n-override.lisp | 9 + helper/parsed/q-methods.lisp | 306 ++ helper/parsed/q-override.lisp | 59 + src/ecl_fun.cpp | 74 +- src/eql.cpp | 2 +- src/gen/_lobjects.cpp | 4382 +++++++-------- src/gen/_lobjects.h | 30 +- src/gen/_main_n_classes.h | 960 ++-- src/gen/_main_n_methods.h | 345 +- src/gen/_main_q_classes.h | 1128 ++-- src/gen/_main_q_methods.h | 370 +- src/gen/help/_ini.cpp | 58 +- src/gen/help/_n_classes.h | 4 +- src/gen/help/_n_methods.h | 4 +- src/gen/help/_q_classes.h | 46 +- src/gen/help/_q_methods.h | 16 +- src/gen/multimedia/_ini.cpp | 126 + src/gen/multimedia/_ini.h | 30 + src/gen/multimedia/_ini2.h | 86 + src/gen/multimedia/_n_classes.h | 100 + src/gen/multimedia/_n_methods.h | 210 + src/gen/multimedia/_q_classes.h | 317 ++ src/gen/multimedia/_q_methods.h | 389 ++ src/gen/network/_ini.cpp | 150 +- src/gen/network/_ini.h | 4 +- src/gen/network/_ini2.h | 12 +- src/gen/network/_n_classes.h | 34 +- src/gen/network/_n_methods.h | 32 +- src/gen/network/_q_classes.h | 48 +- src/gen/network/_q_methods.h | 22 +- src/gen/sql/_ini.cpp | 84 +- src/gen/sql/_ini.h | 4 +- src/gen/sql/_ini2.h | 12 +- src/gen/sql/_n_classes.h | 58 +- src/gen/sql/_n_methods.h | 16 +- src/gen/sql/_q_classes.h | 126 +- src/gen/sql/_q_methods.h | 10 +- src/gen/svg/_ini.cpp | 28 +- src/gen/svg/_n_classes.h | 4 +- src/gen/svg/_n_methods.h | 2 +- src/gen/svg/_q_classes.h | 12 +- src/gen/svg/_q_methods.h | 6 +- src/gen/webkit/_ini.cpp | 90 +- src/gen/webkit/_ini.h | 4 +- src/gen/webkit/_ini2.h | 12 +- src/gen/webkit/_n_classes.h | 12 +- src/gen/webkit/_n_methods.h | 16 +- src/gen/webkit/_q_classes.h | 114 +- src/gen/webkit/_q_methods.h | 14 +- src/link-wrappers.lisp | 2 +- src/lisp/all-wrappers-1.lisp | 146 +- src/lisp/all-wrappers-10.lisp | 4452 +++++++++------ src/lisp/all-wrappers-11.lisp | 3601 +++++++++++++ src/lisp/all-wrappers-12.lisp | 22 + src/lisp/all-wrappers-2.lisp | 284 +- src/lisp/all-wrappers-3.lisp | 448 +- src/lisp/all-wrappers-4.lisp | 582 +- src/lisp/all-wrappers-5.lisp | 362 +- src/lisp/all-wrappers-6.lisp | 3610 +------------ src/lisp/all-wrappers-7.lisp | 4800 ++++++++--------- src/lisp/all-wrappers-8.lisp | 4800 ++++++++--------- src/lisp/all-wrappers-9.lisp | 4800 ++++++++--------- src/lisp/all-wrappers.lisp | 2 +- src/lisp/define-all-wrappers.lisp | 3 +- src/lisp/enum-lists/dynamic-enums.lisp | 168 + src/lisp/enum-lists/parsed-enums.lisp | 332 +- src/lisp/enums1.lisp | 326 +- src/lisp/enums2.lisp | 420 +- src/lisp/enums3.lisp | 452 +- src/lisp/enums4.lisp | 662 +-- src/lisp/enums5.lisp | 331 ++ src/lisp/get-dynamic-enums.lisp | 2 +- src/lisp/merged-enums.lisp | 331 ++ src/lisp/quic.lisp | 5 +- src/make-eql-lib-wrappers.lisp | 2 +- src/module_multimedia.pro | 19 + src/rebuild | 2 + 92 files changed, 22998 insertions(+), 18283 deletions(-) create mode 100644 helper/my-class-lists/multimedia/n-names.lisp create mode 100644 helper/my-class-lists/multimedia/q-names.lisp create mode 100644 src/gen/multimedia/_ini.cpp create mode 100644 src/gen/multimedia/_ini.h create mode 100644 src/gen/multimedia/_ini2.h create mode 100644 src/gen/multimedia/_n_classes.h create mode 100644 src/gen/multimedia/_n_methods.h create mode 100644 src/gen/multimedia/_q_classes.h create mode 100644 src/gen/multimedia/_q_methods.h create mode 100644 src/lisp/all-wrappers-11.lisp create mode 100644 src/lisp/all-wrappers-12.lisp create mode 100644 src/module_multimedia.pro diff --git a/.gitignore b/.gitignore index 9e7b0e4..9066c80 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,6 @@ src/tmp eql_profile* eql_local_server cache -tmp +tmp* palindrome.htm positions.js diff --git a/README-1.txt b/README-1.txt index f7f9a56..a9e9a4b 100644 --- a/README-1.txt +++ b/README-1.txt @@ -141,7 +141,7 @@ In order to run (sort of) a top-level processing Qt events, do (requires ECL thr -QT MODULES (help, network, sql, svg, webkit) +QT MODULES (help, multimedia, network, sql, svg, webkit) ========== To build an EQL module (corresponding to a Qt module), do the following in src/: diff --git a/doc/Slime.htm b/doc/Slime.htm index c6f6910..27346af 100644 --- a/doc/Slime.htm +++ b/doc/Slime.htm @@ -6,7 +6,6 @@ Requires ECL threads.

This should work with any Slime version that plays together with ECL. -
Tested with ECL 12.7.1 (Windows: ECL 12.12.1)


Prepare

@@ -17,19 +16,19 @@ This should work with any Slime version that plays together with ECL. (require 'slime) (slime-setup '(slime-fancy)) -
  • Add to your ~/.swank.lisp file (or copy file eql/slime/.swank.lisp in your home directory): +
  • Add to your ~/.swank.lisp file (or copy file eql5/slime/.swank.lisp in your home directory):
    (Please note: this isn't really optional -- you need to set this option for a useful Slime + EQL.)
     (setf swank:*globally-redirect-io* t) ; show print output in Emacs
     
    -
  • Copy file eql/slime/eql-start-swank.lisp in your slime/ directory +
  • Copy file eql5/slime/eql-start-swank.lisp in your slime/ directory

    Run