fix wrapper function names from module :webengine

src/eql.cpp

@@ -7,7 +7,7 @@
 #include <QTimer>
 #include <QStringList>
 
-const char EQL::version[] = "17.3.2"; // Mar 2017
+const char EQL::version[] = "17.3.3"; // Mar 2017
 
 extern "C" void ini_EQL(cl_object);
 

src/lisp/all-wrappers-webengine-1.lisp

@@ -1,113 +1,60 @@
 (defpackage :eql
   (:export
-   #:|accept|
-   #:|action|
    #:|audioMutedChanged|
-   #:|authenticationRequired|
-   #:|backgroundColor|
-   #:|back|
    #:|cachePath|
-   #:|cancel|
    #:|clearAllVisitedLinks|
    #:|clearHttpCache|
    #:|clearVisitedLinks|
-   #:|contentsSizeChanged|
-   #:|contentsSize|
    #:|contextMenuData|
    #:|cookieAdded|
    #:|cookieRemoved|
    #:|cookieStore|
-   #:|createStandardContextMenu|
    #:|defaultProfile.QWebEngineProfile|
    #:|deleteAllCookies|
-   #:|deleteCookie|
    #:|deleteSessionCookies|
    #:|destroyedUrlSchemeHandler|
-   #:|downloadProgress|
-   #:|downloadRequested|
    #:|errorDescription|
-   #:|error|
-   #:|event|
    #:|fail|
-   #:|featurePermissionRequestCanceled|
-   #:|featurePermissionRequested|
-   #:|findText|
-   #:|finished|
-   #:|forward|
    #:|fullScreenRequested|
-   #:|geometryChangeRequested|
-   #:|hasSelection|
    #:|httpAcceptLanguage|
    #:|httpCacheMaximumSize|
    #:|httpCacheType|
    #:|httpUserAgent|
-   #:|iconChanged|
    #:|iconUrlChanged|
    #:|iconUrl|
-   #:|icon|
-   #:|id|
    #:|injectionPoint|
    #:|interceptRequest|
    #:|isAudioMuted|
-   #:|isFinished|
-   #:|isNull|
    #:|isOffTheRecord|
    #:|isOverridable|
    #:|isSpellCheckEnabled|
-   #:|linkHovered|
    #:|loadAllCookies|
-   #:|loadFinished|
-   #:|loadProgress|
-   #:|loadStarted|
-   #:|load|
-   #:|mimeType|
-   #:|name|
-   #:|origin|
-   #:|pageAction|
-   #:|page|
-   #:|path|
    #:|persistentCookiesPolicy|
    #:|persistentStoragePath|
    #:|printToPdf|
-   #:|profile|
-   #:|proxyAuthenticationRequired|
    #:|receivedBytes|
    #:|recentlyAudibleChanged|
    #:|recentlyAudible|
    #:|redirect|
-   #:|reject|
-   #:|reload|
    #:|removeUrlScheme|
    #:|renderProcessTerminated|
    #:|replaceMisspelledWord|
    #:|requestMethod|
    #:|requestStarted|
    #:|requestUrl|
-   #:|requestedUrl|
    #:|runJavaScript|
    #:|runsOnSubFrames|
    #:|savePageFormat|
-   #:|save|
    #:|scripts|
    #:|scrollPositionChanged|
-   #:|scrollPosition|
-   #:|selectedText|
-   #:|selectionChanged|
    #:|setAudioMuted|
-   #:|setBackgroundColor|
    #:|setCachePath|
-   #:|setContent|
    #:|setCookie|
-   #:|setFeaturePermission|
-   #:|setHtml|
    #:|setHttpAcceptLanguage|
    #:|setHttpCacheMaximumSize|
    #:|setHttpCacheType|
    #:|setHttpUserAgent|
    #:|setInjectionPoint|
-   #:|setName|
-   #:|setPage|
-   #:|setPath|
    #:|setPersistentCookiesPolicy|
    #:|setPersistentStoragePath|
    #:|setRequestInterceptor|
@@ -116,32 +63,11 @@
    #:|setSourceCode|
    #:|setSpellCheckEnabled|
    #:|setSpellCheckLanguages|
-   #:|setUrl|
-   #:|setView|
    #:|setWebChannel|
    #:|setWorldId|
-   #:|setZoomFactor|
-   #:|settings|
-   #:|sizeHint|
-   #:|sourceCode|
    #:|spellCheckLanguages|
-   #:|stateChanged|
-   #:|state|
-   #:|stop|
    #:|storageName|
-   #:|swap|
-   #:|titleChanged|
-   #:|title|
    #:|toggleOn|
-   #:|totalBytes|
-   #:|triggerAction|
-   #:|triggerPageAction|
-   #:|type|
-   #:|urlChanged|
-   #:|url|
-   #:|view|
    #:|visitedLinksContainsUrl|
    #:|webChannel|
-   #:|windowCloseRequested|
-   #:|worldId|
-   #:|zoomFactor|))
+   #:|worldId|))

src/lisp/all-wrappers-webengine-2.lisp

@@ -1,29 +1,11 @@
 (in-package :eql)
 
-(defun |accept| (object &rest arguments)
-  (%qinvoke-method object nil "accept" arguments))
-
-(defun |action| (object &rest arguments)
-  (%qinvoke-method object nil "action" arguments))
-
 (defun |audioMutedChanged| (object &rest arguments)
   (%qinvoke-method object nil "audioMutedChanged" arguments))
 
-(defun |authenticationRequired| (object &rest arguments)
-  (%qinvoke-method object nil "authenticationRequired" arguments))
-
-(defun |backgroundColor| (object &rest arguments)
-  (%qinvoke-method object nil "backgroundColor" arguments))
-
-(defun |back| (object &rest arguments)
-  (%qinvoke-method object nil "back" arguments))
-
 (defun |cachePath| (object &rest arguments)
   (%qinvoke-method object nil "cachePath" arguments))
 
-(defun |cancel| (object &rest arguments)
-  (%qinvoke-method object nil "cancel" arguments))
-
 (defun |clearAllVisitedLinks| (object &rest arguments)
   (%qinvoke-method object nil "clearAllVisitedLinks" arguments))
 
@@ -33,12 +15,6 @@
 (defun |clearVisitedLinks| (object &rest arguments)
   (%qinvoke-method object nil "clearVisitedLinks" arguments))
 
-(defun |contentsSizeChanged| (object &rest arguments)
-  (%qinvoke-method object nil "contentsSizeChanged" arguments))
-
-(defun |contentsSize| (object &rest arguments)
-  (%qinvoke-method object nil "contentsSize" arguments))
-
 (defun |contextMenuData| (object &rest arguments)
   (%qinvoke-method object nil "contextMenuData" arguments))
 
@@ -51,66 +27,27 @@
 (defun |cookieStore| (object &rest arguments)
   (%qinvoke-method object nil "cookieStore" arguments))
 
-(defun |createStandardContextMenu| (object &rest arguments)
-  (%qinvoke-method object nil "createStandardContextMenu" arguments))
-
 (defun |defaultProfile.QWebEngineProfile| (&rest arguments)
   (%qinvoke-method "QWebEngineProfile" nil "defaultProfile" arguments))
 
 (defun |deleteAllCookies| (object &rest arguments)
   (%qinvoke-method object nil "deleteAllCookies" arguments))
 
-(defun |deleteCookie| (object &rest arguments)
-  (%qinvoke-method object nil "deleteCookie" arguments))
-
 (defun |deleteSessionCookies| (object &rest arguments)
   (%qinvoke-method object nil "deleteSessionCookies" arguments))
 
 (defun |destroyedUrlSchemeHandler| (object &rest arguments)
   (%qinvoke-method object nil "destroyedUrlSchemeHandler" arguments))
 
-(defun |downloadProgress| (object &rest arguments)
-  (%qinvoke-method object nil "downloadProgress" arguments))
-
-(defun |downloadRequested| (object &rest arguments)
-  (%qinvoke-method object nil "downloadRequested" arguments))
-
 (defun |errorDescription| (object &rest arguments)
   (%qinvoke-method object nil "errorDescription" arguments))
 
-(defun |error| (object &rest arguments)
-  (%qinvoke-method object nil "error" arguments))
-
-(defun |event| (object &rest arguments)
-  (%qinvoke-method object nil "event" arguments))
-
 (defun |fail| (object &rest arguments)
   (%qinvoke-method object nil "fail" arguments))
 
-(defun |featurePermissionRequestCanceled| (object &rest arguments)
-  (%qinvoke-method object nil "featurePermissionRequestCanceled" arguments))
-
-(defun |featurePermissionRequested| (object &rest arguments)
-  (%qinvoke-method object nil "featurePermissionRequested" arguments))
-
-(defun |findText| (object &rest arguments)
-  (%qinvoke-method object nil "findText" arguments))
-
-(defun |finished| (object &rest arguments)
-  (%qinvoke-method object nil "finished" arguments))
-
-(defun |forward| (object &rest arguments)
-  (%qinvoke-method object nil "forward" arguments))
-
 (defun |fullScreenRequested| (object &rest arguments)
   (%qinvoke-method object nil "fullScreenRequested" arguments))
 
-(defun |geometryChangeRequested| (object &rest arguments)
-  (%qinvoke-method object nil "geometryChangeRequested" arguments))
-
-(defun |hasSelection| (object &rest arguments)
-  (%qinvoke-method object nil "hasSelection" arguments))
-
 (defun |httpAcceptLanguage| (object &rest arguments)
   (%qinvoke-method object nil "httpAcceptLanguage" arguments))
 
@@ -123,21 +60,12 @@
 (defun |httpUserAgent| (object &rest arguments)
   (%qinvoke-method object nil "httpUserAgent" arguments))
 
-(defun |iconChanged| (object &rest arguments)
-  (%qinvoke-method object nil "iconChanged" arguments))
-
 (defun |iconUrlChanged| (object &rest arguments)
   (%qinvoke-method object nil "iconUrlChanged" arguments))
 
 (defun |iconUrl| (object &rest arguments)
   (%qinvoke-method object nil "iconUrl" arguments))
 
-(defun |icon| (object &rest arguments)
-  (%qinvoke-method object nil "icon" arguments))
-
-(defun |id| (object &rest arguments)
-  (%qinvoke-method object nil "id" arguments))
-
 (defun |injectionPoint| (object &rest arguments)
   (%qinvoke-method object nil "injectionPoint" arguments))
 
@@ -147,12 +75,6 @@
 (defun |isAudioMuted| (object &rest arguments)
   (%qinvoke-method object nil "isAudioMuted" arguments))
 
-(defun |isFinished| (object &rest arguments)
-  (%qinvoke-method object nil "isFinished" arguments))
-
-(defun |isNull| (object &rest arguments)
-  (%qinvoke-method object nil "isNull" arguments))
-
 (defun |isOffTheRecord| (object &rest arguments)
   (%qinvoke-method object nil "isOffTheRecord" arguments))
 
@@ -162,42 +84,9 @@
 (defun |isSpellCheckEnabled| (object &rest arguments)
   (%qinvoke-method object nil "isSpellCheckEnabled" arguments))
 
-(defun |linkHovered| (object &rest arguments)
-  (%qinvoke-method object nil "linkHovered" arguments))
-
 (defun |loadAllCookies| (object &rest arguments)
   (%qinvoke-method object nil "loadAllCookies" arguments))
 
-(defun |loadFinished| (object &rest arguments)
-  (%qinvoke-method object nil "loadFinished" arguments))
-
-(defun |loadProgress| (object &rest arguments)
-  (%qinvoke-method object nil "loadProgress" arguments))
-
-(defun |loadStarted| (object &rest arguments)
-  (%qinvoke-method object nil "loadStarted" arguments))
-
-(defun |load| (object &rest arguments)
-  (%qinvoke-method object nil "load" arguments))
-
-(defun |mimeType| (object &rest arguments)
-  (%qinvoke-method object nil "mimeType" arguments))
-
-(defun |name| (object &rest arguments)
-  (%qinvoke-method object nil "name" arguments))
-
-(defun |origin| (object &rest arguments)
-  (%qinvoke-method object nil "origin" arguments))
-
-(defun |pageAction| (object &rest arguments)
-  (%qinvoke-method object nil "pageAction" arguments))
-
-(defun |page| (object &rest arguments)
-  (%qinvoke-method object nil "page" arguments))
-
-(defun |path| (object &rest arguments)
-  (%qinvoke-method object nil "path" arguments))
-
 (defun |persistentCookiesPolicy| (object &rest arguments)
   (%qinvoke-method object nil "persistentCookiesPolicy" arguments))
 
@@ -207,12 +96,6 @@
 (defun |printToPdf| (object &rest arguments)
   (%qinvoke-method object nil "printToPdf" arguments))
 
-(defun |profile| (object &rest arguments)
-  (%qinvoke-method object nil "profile" arguments))
-
-(defun |proxyAuthenticationRequired| (object &rest arguments)
-  (%qinvoke-method object nil "proxyAuthenticationRequired" arguments))
-
 (defun |receivedBytes| (object &rest arguments)
   (%qinvoke-method object nil "receivedBytes" arguments))
 
@@ -225,12 +108,6 @@
 (defun |redirect| (object &rest arguments)
   (%qinvoke-method object nil "redirect" arguments))
 
-(defun |reject| (object &rest arguments)
-  (%qinvoke-method object nil "reject" arguments))
-
-(defun |reload| (object &rest arguments)
-  (%qinvoke-method object nil "reload" arguments))
-
 (defun |removeUrlScheme| (object &rest arguments)
   (%qinvoke-method object nil "removeUrlScheme" arguments))
 
@@ -249,9 +126,6 @@
 (defun |requestUrl| (object &rest arguments)
   (%qinvoke-method object nil "requestUrl" arguments))
 
-(defun |requestedUrl| (object &rest arguments)
-  (%qinvoke-method object nil "requestedUrl" arguments))
-
 (defun |runJavaScript| (object &rest arguments)
   (%qinvoke-method object nil "runJavaScript" arguments))
 
@@ -261,45 +135,21 @@
 (defun |savePageFormat| (object &rest arguments)
   (%qinvoke-method object nil "savePageFormat" arguments))
 
-(defun |save| (object &rest arguments)
-  (%qinvoke-method object nil "save" arguments))
-
 (defun |scripts| (object &rest arguments)
   (%qinvoke-method object nil "scripts" arguments))
 
 (defun |scrollPositionChanged| (object &rest arguments)
   (%qinvoke-method object nil "scrollPositionChanged" arguments))
 
-(defun |scrollPosition| (object &rest arguments)
-  (%qinvoke-method object nil "scrollPosition" arguments))
-
-(defun |selectedText| (object &rest arguments)
-  (%qinvoke-method object nil "selectedText" arguments))
-
-(defun |selectionChanged| (object &rest arguments)
-  (%qinvoke-method object nil "selectionChanged" arguments))
-
 (defun |setAudioMuted| (object &rest arguments)
   (%qinvoke-method object nil "setAudioMuted" arguments))
 
-(defun |setBackgroundColor| (object &rest arguments)
-  (%qinvoke-method object nil "setBackgroundColor" arguments))
-
 (defun |setCachePath| (object &rest arguments)
   (%qinvoke-method object nil "setCachePath" arguments))
 
-(defun |setContent| (object &rest arguments)
-  (%qinvoke-method object nil "setContent" arguments))
-
 (defun |setCookie| (object &rest arguments)
   (%qinvoke-method object nil "setCookie" arguments))
 
-(defun |setFeaturePermission| (object &rest arguments)
-  (%qinvoke-method object nil "setFeaturePermission" arguments))
-
-(defun |setHtml| (object &rest arguments)
-  (%qinvoke-method object nil "setHtml" arguments))
-
 (defun |setHttpAcceptLanguage| (object &rest arguments)
   (%qinvoke-method object nil "setHttpAcceptLanguage" arguments))
 
@@ -315,15 +165,6 @@
 (defun |setInjectionPoint| (object &rest arguments)
   (%qinvoke-method object nil "setInjectionPoint" arguments))
 
-(defun |setName| (object &rest arguments)
-  (%qinvoke-method object nil "setName" arguments))
-
-(defun |setPage| (object &rest arguments)
-  (%qinvoke-method object nil "setPage" arguments))
-
-(defun |setPath| (object &rest arguments)
-  (%qinvoke-method object nil "setPath" arguments))
-
 (defun |setPersistentCookiesPolicy| (object &rest arguments)
   (%qinvoke-method object nil "setPersistentCookiesPolicy" arguments))
 
@@ -348,89 +189,26 @@
 (defun |setSpellCheckLanguages| (object &rest arguments)
   (%qinvoke-method object nil "setSpellCheckLanguages" arguments))
 
-(defun |setUrl| (object &rest arguments)
-  (%qinvoke-method object nil "setUrl" arguments))
-
-(defun |setView| (object &rest arguments)
-  (%qinvoke-method object nil "setView" arguments))
-
 (defun |setWebChannel| (object &rest arguments)
   (%qinvoke-method object nil "setWebChannel" arguments))
 
 (defun |setWorldId| (object &rest arguments)
   (%qinvoke-method object nil "setWorldId" arguments))
 
-(defun |setZoomFactor| (object &rest arguments)
-  (%qinvoke-method object nil "setZoomFactor" arguments))
-
-(defun |settings| (object &rest arguments)
-  (%qinvoke-method object nil "settings" arguments))
-
-(defun |sizeHint| (object &rest arguments)
-  (%qinvoke-method object nil "sizeHint" arguments))
-
-(defun |sourceCode| (object &rest arguments)
-  (%qinvoke-method object nil "sourceCode" arguments))
-
 (defun |spellCheckLanguages| (object &rest arguments)
   (%qinvoke-method object nil "spellCheckLanguages" arguments))
 
-(defun |stateChanged| (object &rest arguments)
-  (%qinvoke-method object nil "stateChanged" arguments))
-
-(defun |state| (object &rest arguments)
-  (%qinvoke-method object nil "state" arguments))
-
-(defun |stop| (object &rest arguments)
-  (%qinvoke-method object nil "stop" arguments))
-
 (defun |storageName| (object &rest arguments)
   (%qinvoke-method object nil "storageName" arguments))
 
-(defun |swap| (object &rest arguments)
-  (%qinvoke-method object nil "swap" arguments))
-
-(defun |titleChanged| (object &rest arguments)
-  (%qinvoke-method object nil "titleChanged" arguments))
-
-(defun |title| (object &rest arguments)
-  (%qinvoke-method object nil "title" arguments))
-
 (defun |toggleOn| (object &rest arguments)
   (%qinvoke-method object nil "toggleOn" arguments))
 
-(defun |totalBytes| (object &rest arguments)
-  (%qinvoke-method object nil "totalBytes" arguments))
-
-(defun |triggerAction| (object &rest arguments)
-  (%qinvoke-method object nil "triggerAction" arguments))
-
-(defun |triggerPageAction| (object &rest arguments)
-  (%qinvoke-method object nil "triggerPageAction" arguments))
-
-(defun |type| (object &rest arguments)
-  (%qinvoke-method object nil "type" arguments))
-
-(defun |urlChanged| (object &rest arguments)
-  (%qinvoke-method object nil "urlChanged" arguments))
-
-(defun |url| (object &rest arguments)
-  (%qinvoke-method object nil "url" arguments))
-
-(defun |view| (object &rest arguments)
-  (%qinvoke-method object nil "view" arguments))
-
 (defun |visitedLinksContainsUrl| (object &rest arguments)
   (%qinvoke-method object nil "visitedLinksContainsUrl" arguments))
 
 (defun |webChannel| (object &rest arguments)
   (%qinvoke-method object nil "webChannel" arguments))
 
-(defun |windowCloseRequested| (object &rest arguments)
-  (%qinvoke-method object nil "windowCloseRequested" arguments))
-
 (defun |worldId| (object &rest arguments)
   (%qinvoke-method object nil "worldId" arguments))
-
-(defun |zoomFactor| (object &rest arguments)
-  (%qinvoke-method object nil "zoomFactor" arguments))

src/lisp/define-all-wrappers-webengine.lisp

@@ -112,21 +112,30 @@
     (map nil (lambda (object signatures)
                (when (find object *webengine-objects* :test 'string=)
                  (dolist (signature signatures)
-                   (let* ((cast (cast signature))
-                          (static (when (x:starts-with "_s_" signature)
-                                    (setf signature (subseq signature 3))))
-                          (lisp-name (if static
-                                         (format nil "|~A.~A|" signature object)
-                                         (format nil "|~A|" signature))))
-                     (push lisp-name lisp-names)
-                     (push (if static
-                               (format nil "~%(defun ~A (&rest arguments)~
-                                            ~%  (%qinvoke-method ~S nil ~S arguments))~%"
-                                       lisp-name object signature)
-                               (format nil "~%(defun ~A (object &rest arguments)~
-                                            ~%  (%qinvoke-method object ~A ~S arguments))~%"
-                                       lisp-name cast signature))
-                           definitions)))))
+                   (let ((function-name (format nil "|~A|" signature))
+                         found)
+                     ;; add only new function names (checking with 'grep')
+                     (dotimes (i 12) ; TODO: keep in sync!
+                       (when (zerop (|execute.QProcess| "grep" (list function-name
+                                                                     (in-home (format nil "src/lisp/all-wrappers-~D.lisp" (1+ i))))))
+                         (setf found t)
+                         (return)))
+                     (unless found
+                       (let* ((cast (cast signature))
+                              (static (when (x:starts-with "_s_" signature)
+                                        (setf signature (subseq signature 3))))
+                              (lisp-name (if static
+                                             (format nil "|~A.~A|" signature object)
+                                             function-name)))
+                         (push lisp-name lisp-names)
+                         (push (if static
+                                   (format nil "~%(defun ~A (&rest arguments)~
+                                                ~%  (%qinvoke-method ~S nil ~S arguments))~%"
+                                           lisp-name object signature)
+                                   (format nil "~%(defun ~A (object &rest arguments)~
+                                                ~%  (%qinvoke-method object ~A ~S arguments))~%"
+                                           lisp-name cast signature))
+                               definitions)))))))
          *objects* *unambiguous*)
     ;; splitting into more files needed for Windows (string size limit)
     (let ((symbols (sort (delete-duplicates lisp-names :test 'string=) 'string<)))