mirrors/EQL5
1
Fork 0
mirror of https://gitlab.com/eql/EQL5.git synced 2025-12-17 07:40:37 -08:00
Code Issues Projects Releases Packages Wiki Activity

add missing types in :help module; small rivisions;

Browse source
This commit is contained in:
polos 2016-12-03 21:01:22 +01:00
parent befafa0415
commit 9c6e98a94a
10 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
helper/generate.lisp
View file

@ -796,6 +796,8 @@
~%int LObjects::T_QList_QCameraInfo = -1;~
~%int LObjects::T_QCameraViewfinderSettings = -1;~
~%int LObjects::T_QList_QCameraViewfinderSettings = -1;~
~%int LObjects::T_QHelpSearchQuery = -1;~
~%int LObjects::T_QList_QHelpSearchQuery = -1;~
~%int LObjects::T_QHostAddress = -1;~
~%int LObjects::T_QHostInfo = -1;~
~%int LObjects::T_QImageEncoderSettings = -1;~
@ -850,7 +852,7 @@
(format s "~%DeleteNObject LObjects::deleteNObject_~(~A~) = 0;" module))
(dolist (module *modules*)
(format s "~%Override LObjects::override_~(~A~) = 0;" module))
(dolist (module (list :multimedia :network :sql :webkit))
(dolist (module (list :help :multimedia :network :sql :webkit))
(format s "~%ToMetaArg LObjects::toMetaArg_~(~A~) = 0;~
~%To_lisp_arg LObjects::to_lisp_arg_~(~A~) = 0;"
module module))

16
src/ecl_fun.cpp
View file

@ -2281,12 +2281,7 @@ cl_object qrequire2(cl_object l_name, cl_object l_quiet) { /// qrequire
DeleteNObject del = (DeleteNObject)lib.resolve("deleteNObject");
Override over = (Override)lib.resolve("overrideFunctions");
if(meta && del && over) {
if("help" == name) {
LObjects::staticMetaObject_help = meta;
LObjects::deleteNObject_help = del;
LObjects::override_help = over;
return l_name; }
else if("svg" == name) {
if("svg" == name) {
LObjects::staticMetaObject_svg = meta;
LObjects::deleteNObject_svg = del;
LObjects::override_svg = over;
@ -2295,7 +2290,14 @@ cl_object qrequire2(cl_object l_name, cl_object l_quiet) { /// qrequire
ToMetaArg metaArg = (ToMetaArg)lib.resolve("toMetaArg");
To_lisp_arg lispArg = (To_lisp_arg)lib.resolve("to_lisp_arg");
if(metaArg && lispArg) {
if("multimedia" == name) {
if("help" == name) {
LObjects::staticMetaObject_help = meta;
LObjects::deleteNObject_help = del;
LObjects::override_help = over;
LObjects::toMetaArg_help = metaArg;
LObjects::to_lisp_arg_help = lispArg;
return l_name; }
else if("multimedia" == name) {
LObjects::staticMetaObject_multimedia = meta;
LObjects::deleteNObject_multimedia = del;
LObjects::override_multimedia = over;

4
src/gen/_lobjects.cpp
View file

@ -16,6 +16,8 @@ int LObjects::T_QCameraInfo = -1;
int LObjects::T_QList_QCameraInfo = -1;
int LObjects::T_QCameraViewfinderSettings = -1;
int LObjects::T_QList_QCameraViewfinderSettings = -1;
int LObjects::T_QHelpSearchQuery = -1;
int LObjects::T_QList_QHelpSearchQuery = -1;
int LObjects::T_QHostAddress = -1;
int LObjects::T_QHostInfo = -1;
int LObjects::T_QImageEncoderSettings = -1;
@ -76,6 +78,8 @@ Override LObjects::override_network = 0;
Override LObjects::override_sql = 0;
Override LObjects::override_svg = 0;
Override LObjects::override_webkit = 0;
ToMetaArg LObjects::toMetaArg_help = 0;
To_lisp_arg LObjects::to_lisp_arg_help = 0;
ToMetaArg LObjects::toMetaArg_multimedia = 0;
To_lisp_arg LObjects::to_lisp_arg_multimedia = 0;
ToMetaArg LObjects::toMetaArg_network = 0;

4
src/gen/_lobjects.h
View file

@ -46,6 +46,8 @@ public:
static int T_QList_QCameraInfo;
static int T_QCameraViewfinderSettings;
static int T_QList_QCameraViewfinderSettings;
static int T_QHelpSearchQuery;
static int T_QList_QHelpSearchQuery;
static int T_QHostAddress;
static int T_QHostInfo;
static int T_QImageEncoderSettings;
@ -139,6 +141,8 @@ public:
static Override override_sql;
static Override override_svg;
static Override override_webkit;
static ToMetaArg toMetaArg_help;
static To_lisp_arg to_lisp_arg_help;
static ToMetaArg toMetaArg_multimedia;
static To_lisp_arg to_lisp_arg_multimedia;
static ToMetaArg toMetaArg_network;

35
src/gen/help/_ini2.h
View file

@ -1,11 +1,44 @@
#ifndef INI2_H
#define INI2_H
#include "_ini.h"
#include "../_lobjects.h"
#include "../../eql.h"
#include <QtGui>
QT_BEGIN_NAMESPACE
void ini2() {}
TO_QT_TYPE_PTR2 (QHelpSearchQuery, qhelpsearchquery)
TO_QT_LIST_VAL (QHelpSearchQuery)
TO_CL_LIST_VAL (QHelpSearchQuery, qhelpsearchquery)
#define META_TYPE_(var, type) var = qRegisterMetaType< type >(#type);
void ini2() {
META_TYPE_(LObjects::T_QHelpSearchQuery, QHelpSearchQuery)
META_TYPE_(LObjects::T_QList_QHelpSearchQuery, QList<QHelpSearchQuery>) }
void* toMetaArg(int n, cl_object l_arg, bool* found) {
void* p = 0;
bool _found = true;
if(LObjects::T_QHelpSearchQuery == n) { p = new QHelpSearchQuery(*toQHelpSearchQueryPointer(l_arg)); }
else if(LObjects::T_QList_QHelpSearchQuery == n) { p = new QList<QHelpSearchQuery>(toQHelpSearchQueryList(l_arg)); }
else { _found = false; }
if(_found) {
*found = true; }
return p; }
cl_object to_lisp_arg(int n, void* p, bool* found) {
cl_object l_ret = Cnil;
bool _found = true;
if(LObjects::T_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquery(*(QHelpSearchQuery*)p); }
else if(LObjects::T_QList_QHelpSearchQuery == n) { l_ret = from_qhelpsearchquerylist(*(QList<QHelpSearchQuery>*)p); }
else { _found = false; }
if(_found) {
*found = true; }
return l_ret; }
QT_END_NAMESPACE

6
src/link-wrappers.lisp
View file

@ -1,6 +1,3 @@
#-eql5
(error "Please use the EQL5 executable to run this file")
(require :cmp)
(setf *break-on-signals* 'error)
@ -20,6 +17,3 @@
(format nil "lisp/~A.~A" file #+msvc "obj" #-msvc "o"))
*lisp-files*)
:init-name "ini_EQL")
(eql:qq)

3
src/link.lisp
View file

@ -1,6 +1,3 @@
#-unicode
(error "Please build ECL with unicode support (configure --enable-unicode)")
(require :cmp)
(setf *break-on-signals* 'error)

3
src/lisp/ini.lisp
View file

@ -151,6 +151,9 @@
(defun %break (&rest args)
(apply 'break args))
(defun %windows-version ()
(qfun "QSysInfo" "windowsVersion"))
(let (home)
(defun set-home (path)
(setf home path))

2
src/lisp/quic.lisp
View file

@ -317,7 +317,7 @@
((x:starts-with "QObject::connect" qt-line)
;; qconnect
(let ((line (mapcar (lambda (x) (string-trim " " x)) (x:split qt-line #\,))))
;; commenting out the connections because of possible custom slots (not defined in Lisp)
;; commenting out the connections because of possible custom functions (slots), not defined in Lisp
(format nil "~%~A ;; (qconnect ~A \"~A\" ~A \"~A\")"
(if tr "" " ")
(var-name (subseq (first line) 17))

4
src/lisp/x.lisp
View file

@ -165,5 +165,7 @@
#+(or darwin linux)
(funcall (intern "QUTF8" :eql) name)
#+win32
name) ; works in Windows 8 (for older versions, you'll probably need "qlocal8bit")
(if (< (funcall (intern "%WINDOWS-VERSION" :eql)) #xa0)
(funcall (intern "QLOCAL8BIT" :eql) name) ; Windows 7 and lower
name)) ; Windows 8 and higher