From b4f4aef4166e6b532fcae999d4ed439c14bc8369 Mon Sep 17 00:00:00 2001 From: polos Date: Mon, 12 Dec 2016 23:53:28 +0100 Subject: [PATCH] many small revisions (code, docu formatting); add class QPdfWriter; --- doc/Debugging.htm | 194 +++--- doc/Deploy.htm | 33 +- doc/EQL-Slime-Integration.htm | 73 +-- doc/Notes.htm | 115 ++-- doc/QtDesigner.htm | 51 +- doc/QtLinguist.htm | 47 +- doc/Slime-REPL-hook.htm | 171 +++--- doc/Slime.htm | 106 ++-- doc/auto-doc.htm | 506 +++++++++------- doc/auto-doc.lisp | 10 +- doc/index.html | 37 +- doc/style.css | 7 +- helper/generate.lisp | 9 - helper/missing-types.txt | 2 - helper/multiple-inheritance.txt | 1 + helper/my-class-lists/gui/q-names.lisp | 1 + helper/parse-enums.lisp | 8 +- helper/parse.lisp | 25 +- helper/parsed/n-methods.lisp | 9 +- helper/parsed/q-methods.lisp | 16 +- helper/parsed/q-override.lisp | 5 +- src/compile-ini.lisp | 17 + src/dyn_object.cpp | 8 +- src/eql.cpp | 4 - src/eql.h | 1 - src/gen/_lobjects.cpp | 800 ++++++++++++------------- src/gen/_lobjects.h | 1 - src/gen/_main_n_classes.h | 33 +- src/gen/_main_n_methods.h | 3 +- src/gen/_main_q_classes.h | 218 +++---- src/gen/_main_q_methods.h | 218 +++---- src/gen/help/_q_methods.h | 8 +- src/gen/multimedia/_ini.cpp | 16 +- src/gen/multimedia/_q_classes.h | 6 +- src/gen/multimedia/_q_methods.h | 8 +- src/gen/network/_ini.cpp | 22 +- src/gen/network/_n_classes.h | 3 - src/gen/network/_n_methods.h | 6 - src/gen/network/_q_classes.h | 29 +- src/gen/network/_q_methods.h | 6 +- src/gen/sql/_ini.cpp | 24 +- src/gen/sql/_n_classes.h | 36 +- src/gen/sql/_q_classes.h | 10 +- src/gen/sql/_q_methods.h | 10 +- src/gen/svg/_ini.cpp | 10 +- src/gen/svg/_q_classes.h | 4 +- src/gen/svg/_q_methods.h | 4 +- src/gen/webkit/_ini.cpp | 24 +- src/gen/webkit/_q_classes.h | 10 +- src/gen/webkit/_q_methods.h | 12 +- src/lisp/ini.lisp | 18 +- src/lisp/restart-dialog.lisp | 2 + 52 files changed, 1531 insertions(+), 1466 deletions(-) create mode 100644 src/compile-ini.lisp diff --git a/doc/Debugging.htm b/doc/Debugging.htm index 7b415f6..544c4fd 100644 --- a/doc/Debugging.htm +++ b/doc/Debugging.htm @@ -1,21 +1,22 @@ - - - - - -
-

Debugging

-This is a simple tutorial using the top-level processing Qt events: -
-  $ eql5 -qtpl
-
-
-

Example 1: Error on REPL (trivial)

-
+
+
+  
+    Debugging
+    
+    
+    
+  
+  

+    
Debugging

+    This is a simple tutorial using the top-level processing Qt events:
+    
  $ eql5 -qtpl

+    

+    
Example 1: Error on REPL (trivial)

+    
 
   EQL-USER[1]> (/ 0)
 
@@ -27,47 +28,35 @@ This is a simple tutorial using the top-level processing Qt events:
   2. (RESTART-QT-EVENTS) Restart Qt event processing.
 
   ** BREAK [LEVEL 2]>
-
-

-   
-
Note that all debug input is handled in a debug dialog, not in the
-console window.

-
So, either type the restart number in the dialog
-
  :r1

-or just click Cancel / hit Escape, which will always choose :r1.
-
Type :h for all available debug options.
-
Both restarts will have the same effect here, see note at bottom.

-
 
-
Example 2: Error during Qt event processing

-Start calculator example:
-
-  $ eql5 -qtpl examples/X-extras/calculator
-

-

-Let's run this function:
-
-  EQL-USER[1]> (clc:auto "42 ? blah")
-

-

-This will output 2 errors, without breaking into the debugger:
-
+    

+       debug  dialog
+    
Note that all debug input is handled in a debug dialog, not in the console window.

+    
So, either type the restart number in the dialog

+    
  :r1
or just click Cancel / hit Escape, which will always choose :r1.
+    
Type :h for all available debug options.

+    
Both restarts will have the same effect here, see note at bottom.

+    
 
+    
Example 2: Error during Qt event processing

+    Start calculator example:
+    
  $ eql5 -qtpl examples/X-extras/calculator

+    

+    Let's run this function:
+    
  EQL-USER[1]> (clc:auto "42 ? blah")

+    

+    This will output 2 errors, without breaking into the debugger:
+    
 
   [EQL:err] QFIND-CHILD #<QDialog "" 0x39737d0 [1]> "?"
 
   [EQL:err] QINVOKE-METHOD NIL NIL "animateClick" (400)
-
-

-
Note: After eventual print output (like the above), you
-  won't see a fresh top-level prompt.
Don't get confused by this, as
-  you can continue to enter commands.

-

-Now make EQL errors break into the debugger:
-
-  EQL-USER[2]> (setf eql:*break-on-errors* t)
-

-

-Run our function again:
-
+    

+    
Note: After eventual print output (like the above), you won't see a fresh top-level prompt.
Don't get confused by this, as you can continue to enter commands.

+    

+    Now make EQL errors break into the debugger:
+    
  EQL-USER[2]> (setf eql:*break-on-errors* t)

+    

+    Run our function again:
+    
 
   EQL-USER[3]> (clc:auto "42 ? blah")
 
@@ -81,62 +70,53 @@ Run our function again:
   2. (RESTART-QT-EVENTS) Restart Qt event processing.
 
   ** BREAK [LEVEL 1]>
-
-

-   
-
Now there are 2 possible restarts:

-
  :r1

-(CONTINUE) will continue execution, which will break on
-the next error, then finish our function.
-
  :r2

-(RESTART-QT-EVENTS) will abort execution, returning to
-the REPL immediately.
-


-

-


-
Notes

-There is one situation where interactive debugging won't work, and
-this is in code inside an (overridden)
-
  "paintEvent(QPaintEvent*)"
 function, as this may cause
-recursive paint events and segfaults.
-
 
-
 

-To exit instantly from EQL during debugging (on nasty errors), just type
-
  :qq / :exit

-in the debug dialog (or REPL).
-
 
-
 

-On simple read errors on the REPL (e.g. non-existing packages, non-external symbols), the debugger will not be entered (as this would cause an unrecoverable break, since read runs in its own thread here); instead, the erroneous input string will be returned as-is.
-
 
-
 

-The conflicting case
-
  (RESTART-TOPLEVEL)
+    

+       debug dialog
+    
Now there are 2 possible restarts:

+    
  :r1

+    (CONTINUE) will continue execution, which will break on the next error, then finish our function.
+    
  :r2

+    (RESTART-QT-EVENTS) will abort execution, returning to the REPL immediately.
+    


+    

+    


+    
Notes

+    There is one situation where interactive debugging won't work, and this is in code inside an (overridden)
+    
  "paintEvent(QPaintEvent*)"
 function, as this may cause recursive paint events and segfaults.
+    
 
+    
 

+    To exit instantly from EQL during debugging (on nasty errors), just type
+    
  :qq / :exit
 in the debug dialog (or REPL).
+    
Optionally you can also directly abort (see respective C function) by typing:

+    
  :qa / :abort

+    
On simple read errors on the REPL (e.g. non-existing packages, non-external symbols), the debugger will not be entered (as this would cause an unrecoverable break, since read runs in its own thread here); instead, the erroneous input string will be returned as-is.

+    
The conflicting case

+    
+  (RESTART-TOPLEVEL)
   (RESTART-QT-EVENTS)

 is resolved automatically (RESTART-QT-EVENTS would block the REPL in this case).
-
 
-
 
-

-
Tips

-You might want to put this in your ~/.eclrc file:
-
+    
 
+    
 
+    

+    
Tips

+    You might want to put this in your ~/.eclrc file:
+    
 
   #+eql
   (setf eql:*qtpl*            t  ; same as -qtpl
         eql:*break-on-errors* t)
-
-

-

-
You may find
-
  (qproperties object &optional (depth 1))
 very convenient for debugging, as it prints the current state of the interesting object.

-

-
In order to automatically switch the REPL to a given package after loading a file, add this line:

-
  (qlater (lambda () (in-package :my-package)))

-

-
If you use ECL readline (see ecl-readline.lisp in sources):
After entering :qq (quitting the top-level), the console/shell should always be reset (but you won't probably see the command while typing it; an alias might help):

-
-  $ reset
-

-
 
-
 
-

+
+
+

You may find

+ 
  (qproperties object &optional (depth 1))
+

very convenient for debugging, as it prints the current state of the interesting object.

+
+

In order to automatically switch the REPL to a given package after loading a file, add this line:

+ 
  (qlater (lambda () (in-package :my-package)))
+
+

If you use ECL readline (see ecl-readline.lisp in sources):
After entering :qq (quitting the top-level), the console/shell should always be reset (but you won't probably see the command while typing it; an alias might help):

+ 
  $ reset
+
  +
  +
diff --git a/doc/Deploy.htm b/doc/Deploy.htm index 9765812..8f73bcd 100644 --- a/doc/Deploy.htm +++ b/doc/Deploy.htm @@ -1,14 +1,21 @@ - - - - -

Deploy

-

Please follow the my_app/README.txt (which assumes that your lisp files are in my_app/lisp/)

-

The dependencies are:

- -A detailed description of deploying Qt applications can be found in Qt Assistant. + + + + Deploy + + + + +
+

Deploy

+

Please follow the my_app/README.txt (which assumes that your lisp files are in my_app/lisp/)

+

The dependencies are:

+ +

A detailed description of deploying Qt applications can be found in Qt Assistant.

+
+ diff --git a/doc/EQL-Slime-Integration.htm b/doc/EQL-Slime-Integration.htm index d61c297..05a3fb1 100644 --- a/doc/EQL-Slime-Integration.htm +++ b/doc/EQL-Slime-Integration.htm @@ -1,23 +1,29 @@ - - - - - -
-

EQL (ECL + Qt) in Slime -- how does it work?

- -

The crucial part is passing a Lisp closure from an ECL thread to Qt and calling it from C++ in the GUI/main thread.

-

This is trivial in ECL/Qt, since both ECL and Qt use/wrap native C threads, and Qt offers a nice utility with Q_INVOKABLE.

-

First let's wrap the actual Lisp function, e.g. (foo x y) in a closure, so we only need to pass one ECL closure pointer to C++. -

No need to pass Lisp arguments to C++, they are in the closure; no return value needed from C++, Lisp return values will be assigned in the closure:

-
+
+
+  
+    EQL Slime integration
+    
+    
+  
+  
+    

+      
EQL in Slime -- how does it work?

+      
    
+        
  • Start swank using the EQL executable, running the swank server in an ECL thread, and using the main thread for the Qt main event loop.
    
+        
  • Wrap every internal EQL function in a macro, which will call the function either directly (if called from GUI/main thread), or, if called from another ECL thread, will wrap the function call in a closure.
    
+        
  • This closure will be passed to a queued, blocking Qt function running in the GUI thread, which will in turn call the closure.
    
+      

+      
The crucial part is passing a Lisp closure from an ECL thread to Qt and calling it from C++ in the GUI/main thread.

+      
This is trivial in ECL/Qt, since both ECL and Qt use/wrap native C threads, and Qt offers a nice utility with Q_INVOKABLE.

+      
First let's wrap the actual Lisp function, e.g. (foo x y) in a closure, so we only need to pass one ECL closure pointer to C++.
+      
No need to pass Lisp arguments to C++, they are in the closure; no return value needed from C++, Lisp return values will be assigned in the closure:

+      
 
   ;; in some ECL thread
   (let (values)
@@ -29,10 +35,9 @@ pre  { background-color: #F4F4F4; }
 
     ;; back in some ECL thread
     (values-list values))
-
-

-
Here the implementation of the ECL function run-in-gui-thread (embedded in Qt):

-
+      

+      
Here the implementation of the ECL function run-in-gui-thread (embedded in Qt):

+      
 
   cl_object run_in_gui_thread(cl_object closure) // define ECL function
   {
@@ -44,21 +49,19 @@ pre  { background-color: #F4F4F4; }
 
       return Cnil;
   }
-
-

-
Now the Lisp closure will run in the GUI/main thread, and the implementation of the Qt function runInGuiThread is as simple as:

-
+      

+      
Now the Lisp closure will run in the GUI/main thread, and the implementation of the Qt function runInGuiThread is as simple as:

+      
 
   Q_INVOKABLE void runInGuiThread(void* closure) // note Q_INVOKABLE
   {
       cl_funcall(1, (cl_object)closure); // ECL function call
   }
-
-

-
After introducing a macro qrun*, and wrapping all EQL functions in it (see "slime/thread-safe.lisp"), we are done!

-
(Please note that the above code is a stripped down version, see sources for the actual implementation.)

-

-

-
+
+

After introducing a macro qrun*, and wrapping all EQL functions in it (see "slime/thread-safe.lisp"), we are done!

+

(Please note that the above code is a stripped down version, see sources for the actual implementation.)

+
+
+ diff --git a/doc/Notes.htm b/doc/Notes.htm index 8b13646..56e796b 100644 --- a/doc/Notes.htm +++ b/doc/Notes.htm @@ -1,71 +1,46 @@ - - - - - -

Notes

-

Pass -norc on the command line to not load ~/.eclrc on startup.
Since :eql and :eql5 are in *features*, you can use e.g. #+eql / #-eql5 as usual.

-

To run a Lisp file directly, do e.g. eql5 - examples/5-colliding-mice -qtpl.

-

See the EQL UI (command eql -qgui) for a complete list of all - supported classes and functions.

-

In the above mentioned UI you find a "Select" button, allowing you - to select any Qt widget (even in other main widgets), if previously loaded - from the UI command line. After selecting a widget, the - parameter qsel:*q* will be set to it.

-

See command line option -qtpl for a top-level processing Qt - events (see also readline note in ../README.txt).
It uses a simple GUI dialog for - debug input (needed because read runs in its own thread).
On - eventual print output, you won't see a fresh prompt, but the REPL will - remain ready for input.
You can set this option permanently by adding this in ~./eclrc: -
#+eql (setf eql:*qtpl* t) -

-

If you want to use temporary Qt objects, you can use the qlet - convenience macro (see the function list). It's a let* variant - for Qt objects, deleting them when leaving its body.

-

No universal GC (garbage collection) for Qt objects: -

- -

-

Enumeration example: |Qt.AlignCenter|.
So, all enumerations - are defined as constants, using case preserving symbol names (allowing - convenient tab completion in Emacs). -

-

Errors in EQL functions don't break into the debugger; if you want them to - do so, set the variable eql:*break-on-errors* - to T. -
(So the choice is left to you: depending on the situation, either option -may be more convenient than the other.) -

-

-The currently available Qt5 Modules (see qrequire) are: -
:help :multimedia :network :sql :svg :webkit (module :opengl is obsolete, see QOpenGLWidget etc.) -

-

If you want to use CLOS together with qt-object instances - (which are of type struct), see - examples X-extras/CLOS-encapsulation.lisp - and 5-colliding-mice.lisp.
So there's a simple way to - use either defclass or defstruct to - encapsulate a qt-object.

-
-

If you're interested in embedding EQL in existing Qt/C++ projects, - see example in directory Qt_EQL/ (which can be used - together with Slime). -

-

See also plugin example in directory Qt_EQL_plugin/. -

-
-

The necessary parsing for generating the src/gen/* files is - done by parsing the Qt documentation. See helper/README.txt if you want do it yourself - + + + + Notes + + + + +

+

Notes

+

Pass -norc on the command line to not load ~/.eclrc on startup.
Since :eql and :eql5 are in *features*, you can use e.g. #+eql / #-eql5 as usual.

+

To run a Lisp file directly, do e.g. eql5 examples/5-colliding-mice -qtpl.

+

See the EQL UI (command eql -qgui) for a complete list of all supported classes and functions.

+

In the above mentioned UI you find a "Select" button, allowing you to select any Qt widget (even in other main widgets), if previously loaded from the UI command line. After selecting a widget, the parameter qsel:*q* will be set to it.

+

See command line option -qtpl for a top-level processing Qt events (see also readline note in ../README.txt).
It uses a simple GUI dialog for debug input (needed because read runs in its own thread).
On eventual print output, you won't see a fresh prompt, but the REPL will remain ready for input.
You can set this option permanently by adding this in ~./eclrc: +
#+eql (setf eql:*qtpl* t) +

+

If you want to use temporary Qt objects, you can use the qlet convenience macro (see the function list). It's a let* variant for Qt objects, deleting them when leaving its body.

+

No universal GC (garbage collection) for Qt objects:

+ + +

Enumeration example: |Qt.AlignCenter|.
So, all enumerations are defined as constants, using case preserving symbol names (allowing convenient tab completion in Emacs).

+

Errors in EQL functions don't break into the debugger; if you want them to do so, set the variable eql:*break-on-errors* to T. +
(So the choice is left to you: depending on the situation, either option may be more convenient than the other.) +

+

The currently available Qt5 Modules (see qrequire) are: +
:help :multimedia :network :sql :svg :webkit +
(module :opengl is obsolete, see QOpenGLWidget etc.) +

+

If you want to use CLOS together with qt-object instances (which are of type struct), see examples X-extras/CLOS-encapsulation.lisp and 5-colliding-mice.lisp.
So there's a simple way to use either defclass or defstruct to encapsulate a qt-object.

+
+

If you're interested in embedding EQL in existing Qt/C++ projects, see example in directory Qt_EQL/ (which can be used together with Slime).

+

See also plugin example in directory Qt_EQL_plugin/. +

+
+

The necessary parsing for generating the src/gen/* files is done by parsing the Qt documentation. See helper/README.txt if you want do it yourself.

+

+
+ diff --git a/doc/QtDesigner.htm b/doc/QtDesigner.htm index 2e3ca35..c4e5336 100644 --- a/doc/QtDesigner.htm +++ b/doc/QtDesigner.htm @@ -1,26 +1,27 @@ - - - - -

Qt Designer

- -

For an example, see examples/3-main-window.lisp.

-
-

-If you want to translate your UI files to the corresponding EQL code, do the following -at the command line: -

  eql5 -quic file.ui

-which will generate a file named ui-file.lisp. See also function quic. -
If you want to use widgets from modules, make sure the modules are available when you use -quic (they will then be loaded automatically). -

-

-For a quick test of the generated file, try this: -

  eql5 ui-file.lisp -
  EQL-USER> (ui:ini t)

-(This will only work if you don't use widgets from modules; otherwise you need to load the modules first, using qrequire.) -

+ + + + Qt Designer + + + + +
+

Qt Designer

+ +

For an example, see examples/3-main-window.lisp.

+
+

If you want to translate your UI files to the corresponding EQL code, do the following at the command line:

+

  eql5 -quic file.ui

which will generate a file named ui-file.lisp. See also function quic. +

If you want to use widgets from modules, make sure the modules are available when you use -quic (they will then be loaded automatically).

+

For a quick test of the generated file, try this:

+

  eql5 ui-file.lisp +
  EQL-USER> (ui:ini t)

+

(This will only work if you don't use widgets from modules; otherwise you need to load the modules first, using qrequire.)

+
+ diff --git a/doc/QtLinguist.htm b/doc/QtLinguist.htm index cf415fb..066796c 100644 --- a/doc/QtLinguist.htm +++ b/doc/QtLinguist.htm @@ -1,21 +1,28 @@ - - - - -

Qt Linguist

-For every new project: - -For every new release (in order to create the *.qm files): - -

Note: you may need to copy the respective qt_*.qm files (see translations/ in the Qt sources), in order to load the translated texts used by Qt itself.

-

See my_app/main.cpp for an example how to load your translation files.

+ + + + Qt Linguist + + + + +
+

Qt Linguist

+

For every new project:

+ +

For every new release (in order to create the *.qm files):

+ +

Note: you may need to copy the respective qt_*.qm files (see translations/ in the Qt sources), in order to load the translated texts used by Qt itself.

+

See my_app/main.cpp for an example how to load your translation files.

+
+ diff --git a/doc/Slime-REPL-hook.htm b/doc/Slime-REPL-hook.htm index cd5c5d0..44a48d8 100644 --- a/doc/Slime-REPL-hook.htm +++ b/doc/Slime-REPL-hook.htm @@ -1,102 +1,81 @@ - - - - -

Slime REPL Hook

-

-

Please note:

-

-You need to enable this mode manually by uncommenting this line in eql-start-swank.lisp in your Slime directory: -
  (setf eql:*slime-mode* :repl-hook) -

-

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) -

- -
+ (defvar *edit* (qnew "QLineEdit"))) +

Wrapping forms in qeval will have no effect if you run your code outside of Slime (so there's no need to remove qeval in your final program).

+
+

But note: the advantage using Eval Region (without qeval) is that Lisp error conditions (not driven by Qt events) will not stop/pause your EQL program (that is, Qt event processing will continue).

+

Instead, if there is an error in code you either enter in the Slime REPL, or run with Eval Region wrapped in qeval, the program will always pause (Qt event processing will be stopped until you take some action).

+
+

Abort / Restart

+

Be careful after entering the Slime debugger. If you see this: +
+
[ABORT] Return to SLIME's top level. +
[RESTART-QT-EVENTS] Last resort only - prefer "Return to SLIME's top level" +
+
Always choose the first one, otherwise you'll be stuck. +

+
+

Help

+

For help see the qapropos and qgui functions.

+
+ + diff --git a/doc/Slime.htm b/doc/Slime.htm index 27346af..9069e6b 100644 --- a/doc/Slime.htm +++ b/doc/Slime.htm @@ -1,58 +1,54 @@ - - - - -

Slime

-Requires ECL threads. -

-This should work with any Slime version that plays together with ECL. -

-
-

Prepare

- +
+

Run

+ +
+

Loading files

+

If you experience slow loading of files (compared to direct loading), use qload instead of load, which will reduce all thread switches during the load process to a single one.

+

Another case where you need to use qload is when you use Qt classes which use threads internally (see e.g. examples/X-extras/move-blocks.lisp).

+
+

Help

+

For help see the qapropos, qproperties and qgui functions.

+

To kill the swank process (Slime), use function qquit / qq (since quitting Emacs will not kill it).

+
+

Notes

+

Please note that you need to manually delete the file eql5/slime/thread-safe.fas* after every upgrade of either ECL or EQL (it will then be compiled automatically next time you use Slime).

+

All EQL functions are wrapped in qrun* (see eql5/slime/thread-safe.lisp), so it's safe to call them either directly from the REPL or using 'eval region' (or from any other ECL thread).

+

If the Slime REPL hangs, you can simply try to connect again (losing the old connection): no need to restart Lisp.

+

This Slime mode is both convenient and simple to use, but conses a little more for every EQL function call. +
If you absolutely want direct EQL function calls, please see the less convenient Slime REPL Hook mode.

+
+

How does it work? + + diff --git a/doc/auto-doc.htm b/doc/auto-doc.htm index 90f2796..0c63e6a 100644 --- a/doc/auto-doc.htm +++ b/doc/auto-doc.htm @@ -1,16 +1,18 @@ -

-DEFINE-QT-WRAPPERS (qt-library &rest what) -

Defines Lisp methods for all Qt methods/signals/slots of given library.
(See example Qt_EQL/trafficlight/).

+Function ListDEFINE-QT-WRAPPERS (qt-library &rest what) +

+Defines Lisp methods for all Qt methods/signals/slots of given library.
(See example Qt_EQL/trafficlight/). +
   (define-qt-wrappers *c++*)        ; generate wrappers (see "Qt_EQL/")
   (define-qt-wrappers *c++* :slots) ; Qt slots only (any of :methods :slots :signals)
   
   (my-qt-function *c++* x y) ; instead of: (! "myQtFunction" (:qt *c++*) x y)
-


-

+

DEFVAR-UI (main-widget &rest variables) -

This macro simplifies the definition of UI variables:

+

+This macro simplifies the definition of UI variables: +
   (defvar-ui *main* *label* *line-edit*...)
   
@@ -21,25 +23,29 @@
     (defvar *line-edit* (qfind-child *main* "line_edit"))
     ...)
-


-

+

ENSURE-QT-OBJECT (object) -

Returns the qt-object of the given class/struct (see method the-qt-object in example X-extras/CLOS-encapsulation.lisp).
This function is used internally whenever a qt-object argument is expected.

-


-

+

+Returns the qt-object of the given class/struct (see method the-qt-object in example X-extras/CLOS-encapsulation.lisp).
This function is used internally whenever a qt-object argument is expected. +
+

QADD-EVENT-FILTER (object event function) -

Convenience function. Adds a Lisp function to be called on a given event type.
If the object argument is NIL, the event will be captured for the whole application.
If the Lisp function returns NIL, the event will be processed by Qt afterwards.

Returns a handle which can be used to remove the filter, see qremove-event-filter.

See also qoverride for QObject::eventFilter(QObject*,QEvent*) and
QObject::installEventFilter(QObject*),
QObject::removeEventFilter(QObject*).

The event class corresponds to the respective event type (no cast needed).

+

+Convenience function. Adds a Lisp function to be called on a given event type.
If the object argument is NIL, the event will be captured for the whole application.
If the Lisp function returns NIL, the event will be processed by Qt afterwards.

Returns a handle which can be used to remove the filter, see qremove-event-filter.

See also qoverride for QObject::eventFilter(QObject*,QEvent*) and
QObject::installEventFilter(QObject*),
QObject::removeEventFilter(QObject*).

The event class corresponds to the respective event type (no cast needed). +
   (qadd-event-filter nil |QEvent.MouseButtonPress| (lambda (object mouse-event) (print object) nil))
-


-

+

QAPP () -

Convenience function returning qApp.

-


-

+

+Convenience function returning qApp. +
+

QAPROPOS (&optional search-string class-name) -

Finds all occurrencies of the given search string in the given object's meta information.
Constructors are listed under "Methods".
To list the user defined functions of external C++ classes (see Qt_EQL), pass the object instead of the class name.

+

+Finds all occurrencies of the given search string in the given object's meta information.
Constructors are listed under "Methods".
To list the user defined functions of external C++ classes (see Qt_EQL), pass the object instead of the class name. +
   (qapropos "html" "QTextEdit")
   (qapropos nil "QWidget")
@@ -47,139 +53,161 @@
   (qapropos '|toString|)   ; wrapper function symbol
   (qapropos nil *qt-main*) ; see Qt_EQL, Qt_EQL (custom Qt classes)
-


-

+

QAPROPOS* (&optional search-string class-name) -

Similar to qapropos, returning the results as nested list.

-


-

+

+Similar to qapropos, returning the results as nested list. +
+

QAUTO-RELOAD-C++ (variable library-name) -

Linux only.

Extends qload-c++ (see Qt_EQL/).

Defines a global variable (see return value of qload-c++), which will be updated on every change of the C++ plugin (e.g. after recompiling, the plugin will automatically be reloaded, and the variable will be set to its new value).

If you want to be notified on every change of the plugin, set *<variable>-reloaded*. It will then be called after reloading, passing both the variable name and the plugin name.
See qload-c++ for an example how to call plugin functions.

+

+Linux only.

Extends qload-c++ (see Qt_EQL/).

Defines a global variable (see return value of qload-c++), which will be updated on every change of the C++ plugin (e.g. after recompiling, the plugin will automatically be reloaded, and the variable will be set to its new value).

If you want to be notified on every change of the plugin, set *<variable>-reloaded*. It will then be called after reloading, passing both the variable name and the plugin name.
See qload-c++ for an example how to call plugin functions. +
   (qauto-reload-c++ *c++* "eql_cpp")
   
   (setf *c++-reloaded* (lambda (var lib) (qapropos nil (symbol-value var)))) ; optional: set a notifier
-


-

+

QCALL-DEFAULT () -

To use anywhere inside an overridden function (see qoverride).
Calls the base implementation of the virtual Qt method after leaving the function body.

Optionally call the base implementation directly (if you want to do post-processing of the return value).

-


-

+

+To use anywhere inside an overridden function (see qoverride).
Calls the base implementation of the virtual Qt method after leaving the function body.

Optionally call the base implementation directly (if you want to do post-processing of the return value). +
+

QCLEAR-EVENT-FILTERS () -

Clears all added event filters.

-


-

+

+Clears all added event filters. +
+

QCONNECT (caller signal receiver/function &optional slot) -

Connects either a Qt signal to a Qt slot, or a Qt signal to a Lisp function.

+

+Connects either a Qt signal to a Qt slot, or a Qt signal to a Lisp function. +
   (qconnect edit "textChanged(QString)" label "setText(QString)")
   (qconnect edit "textChanged(QString)" (lambda (txt) (print txt)))
-


-

+

QCOPY (object) -

Copies object using copy-on-write, if such a constructor is available (non QObject derived classes only).
This function is short for e.g: (qnew "QPixmap(QPixmap)" pixmap)

Note that the returned value will not be garbage collected (analogous to qnew).

+

+Copies object using copy-on-write, if such a constructor is available (non QObject derived classes only).
This function is short for e.g: (qnew "QPixmap(QPixmap)" pixmap)

Note that the returned value will not be garbage collected (analogous to qnew). +
   (qcopy pixmap) ; QPen, QBrush, QFont, QPalette, QPixmap, QImage...
-


-

+

QDELETE (object &optional later)
QDEL -

Deletes any Qt object, and sets the pointer value to 0. Deleting a widget deletes all its child widgets, too.
If later is not NIL, the function QObject::deleteLater() will be called instead (but note: the object pointer will be set to 0 immediately.)
Returns T if the object has effectively been deleted.

See also qlet for local Qt objects.

+

+Deletes any Qt object, and sets the pointer value to 0. Deleting a widget deletes all its child widgets, too.
If later is not NIL, the function QObject::deleteLater() will be called instead (but note: the object pointer will be set to 0 immediately.)
Returns T if the object has effectively been deleted.

See also qlet for local Qt objects. +
   (qdel widget)
   (qdel socket :later)
-


-

+

QDISCONNECT (caller &optional signal receiver/function slot) -

Disconnects signals to either Qt slots or Lisp functions. Anything but the caller can be either NIL or omitted.
Returns T if something has effectively been disconnected.

+

+Disconnects signals to either Qt slots or Lisp functions. Anything but the caller can be either NIL or omitted.
Returns T if something has effectively been disconnected. +
   (qdisconnect edit "textChanged(QString)" label "setText(QString)")
   (qdisconnect edit "textChanged(QString)")
   (qdisconnect edit nil label)
   (qdisconnect edit)
-


-

+

QENUMS (class-name &optional enum-name) -

Returns the meta enum list of the given class-name and enum-name (see Q_ENUMS in Qt sources).
Omitting enum-name will return all meta enum lists of the class/scope.

+

+Returns the meta enum list of the given class-name and enum-name (see Q_ENUMS in Qt sources).
Omitting enum-name will return all meta enum lists of the class/scope. +
   (qenums "QLineEdit" "EchoMode") ; gives '("QLineEdit" ("EchoMode" ("Normal" . 0) ...))
   (qenums "Qt")
-


-

+

QEQL (object1 object2) -

Returns T for same instances of a Qt class. Comparing QVariant values will work, too.
To test for same Qt classes only, do:

+

+Returns T for same instances of a Qt class. Comparing QVariant values will work, too.
To test for same Qt classes only, do: +
   (= (qt-object-id object1) (qt-object-id object2))
-


-

+

QESCAPE (string) -

Calls QString::toHtmlEscaped().

-


-

+

+Calls QString::toHtmlEscaped(). +
+

QEVAL (&rest forms) -

Slime mode :repl-hook only (not needed in default Slime mode): evaluate forms in GUI thread. Defaults to a simple progn outside of Slime.

-


-

+

+Slime mode :repl-hook only (not needed in default Slime mode): evaluate forms in GUI thread. Defaults to a simple progn outside of Slime. +
+

QEXEC (&optional milliseconds) -

Convenience function to call QApplication::exec().
Optionally pass the time in milliseconds after which QEventLoop::exit() will be called.
See also qsleep.

-


-

+

+Convenience function to call QApplication::exec().
Optionally pass the time in milliseconds after which QEventLoop::exit() will be called.
See also qsleep. +
+

QEXIT () -

Calls QEventLoop::exit(), in order to exit event processing after a call to qexec with a timeout.
Returns T if the event loop has effectively been exited.

-


-

+

+Calls QEventLoop::exit(), in order to exit event processing after a call to qexec with a timeout.
Returns T if the event loop has effectively been exited. +
+

QFIND-BOUND (&optional class-name) -

Finds all symbols bound to Qt objects, returning both the Qt class names and the respective Lisp variables.
Optionally finds the occurrencies of the passed Qt class name only.

+

+Finds all symbols bound to Qt objects, returning both the Qt class names and the respective Lisp variables.
Optionally finds the occurrencies of the passed Qt class name only. +
   (qfind-bound "QLineEdit")
-


-

+

QFIND-BOUND* (&optional class-name) -

Like qfind-bound, but returning the results as list of conses.

-


-

+

+Like qfind-bound, but returning the results as list of conses. +
+

QFIND-CHILD (object object-name) -

Calls QObject::findChild<QObject*>().
Can be used to get the child objects of any Qt object (typically from a UI, see qload-ui), identified by QObject::objectName().

+

+Calls QObject::findChild<QObject*>().
Can be used to get the child objects of any Qt object (typically from a UI, see qload-ui), identified by QObject::objectName(). +
   (qfind-child *main* "editor")
-


-

+

QFIND-CHILDREN (object &optional object-name class-name) -

Calls QObject::findChildren<QObject*>(), returning a list of all child objects matching object-name and class-name.
Omitting the &optional arguments will find all children, recursively.

+

+Calls QObject::findChildren<QObject*>(), returning a list of all child objects matching object-name and class-name.
Omitting the &optional arguments will find all children, recursively. +
   (qfind-children *qt-main* nil "LightWidget") ; see Qt_EQL example
-


-

+

QFROM-UTF8 (byte-array) -

Returns the byte array (vector of octets) converted using QString::fromUtf8().

-


-

+

+Returns the byte array (vector of octets) converted using QString::fromUtf8(). +
+

QGUI (&optional process-events) -

Launches the EQL convenience GUI.
If you don't have an interactive environment, you can pass T to run a pseudo Qt event loop. A better option is to start the tool like so:
eql -qgui, in order to run the Qt event loop natively.

-


-

+

+Launches the EQL convenience GUI.
If you don't have an interactive environment, you can pass T to run a pseudo Qt event loop. A better option is to start the tool like so:
eql -qgui, in order to run the Qt event loop natively. +
+

QID (name) -

Returns the internally used ID of the object name. Non QObject classes have negative ids.

+

+Returns the internally used ID of the object name. Non QObject classes have negative ids. +
   (qid "QWidget")
-


-

+

QINVOKE-METHOD (object function-name &rest arguments)
QFUN -

Calls any of Qt methods, slots, signals. Static methods can be called by passing the string name of an object.

The most convenient way of calling Qt methods is to use the wrapper functions (see alternative 2 below), which allows for tab completion, showing all possible candidates in case of ambiguous type lists (overloaded methods). Additionally, static functions are shown as one symbol (easily catching the eye).

(Optionally you can pass the argument types (as for qconnect and qoverride), which may result in better performance, but only in some edge cases.)

+

+Calls any of Qt methods, slots, signals. Static methods can be called by passing the string name of an object.

The most convenient way of calling Qt methods is to use the wrapper functions (see alternative 2 below), which allows for tab completion, showing all possible candidates in case of ambiguous type lists (overloaded methods). Additionally, static functions are shown as one symbol (easily catching the eye).

(Optionally you can pass the argument types (as for qconnect and qoverride), which may result in better performance, but only in some edge cases.) +
   (qfun item "setText" 0 "Some objects are EQL.")
   (qfun "QDateTime" "currentDateTime")            ; static method
@@ -197,12 +225,13 @@
   (|currentDateTime.QDateTime|)
   (|valueChanged| slider 10)
-


-

+

QINVOKE-METHOD* (object cast-class-name function-name &rest arguments)
QFUN* -

Similar to qinvoke-method, additionally passing a class name, enforcing a cast to that class.
Note that this cast is not type safe (the same as a C cast, so dirty hacks are possible).

Note: using the (recommended) wrapper functions (see qfun), casts are applied automatically where needed.

+

+Similar to qinvoke-method, additionally passing a class name, enforcing a cast to that class.
Note that this cast is not type safe (the same as a C cast, so dirty hacks are possible).

Note: using the (recommended) wrapper functions (see qfun), casts are applied automatically where needed. +
   (qfun* graphics-text-item "QGraphicsItem" "setPos" (list x y)) ; multiple inheritance problem
   (qfun* event "QKeyEvent" "key")                                ; not needed with QADD-EVENT-FILTER
@@ -216,12 +245,13 @@
   
   (|setPos| graphics-text-item (list x y))
-


-

+

QINVOKE-METHOD+ (object function-name &rest arguments)
QFUN+ -

Use this variant to call user defined functions (declared Q_INVOKABLE), slots, signals from external C++ classes.

In order to call ordinary functions, slots, signals from external C++ classes, just use the ordinary qfun.

+

+Use this variant to call user defined functions (declared Q_INVOKABLE), slots, signals from external C++ classes.

In order to call ordinary functions, slots, signals from external C++ classes, just use the ordinary qfun. +
   (qfun+ *qt-main* "foo") ; see Qt_EQL
   
@@ -229,12 +259,13 @@
   
   (! "foo" (:qt *qt-main*))
-


-

+

QINVOKE-METHODS (object &rest functions)
QFUNS -

A simple syntax for nested qfun calls.

+

+A simple syntax for nested qfun calls. +
   (qfuns object "funA" "funB" "funC")      ; expands to: (qfun (qfun (qfun object "funA") "funB") "funC")
   (qfuns object ("funA" 1) ("funB" a b c)) ; expands to: (qfun (qfun object "funA" 1) "funB" a b c)
@@ -255,17 +286,19 @@
   (|family| (|font.QApplication|))
   (|toString| (|data| (|index| (|model| *table-view*) 0 2)))
-


-

+

QLATER (function) -

Convenience macro: a qsingle-shot with a 0 timeout.
This will call function as soon as the Qt event loop is idle.

+

+Convenience macro: a qsingle-shot with a 0 timeout.
This will call function as soon as the Qt event loop is idle. +
   (qlater 'delayed-ini)
-


-

+

QLET (((variable-1 expression-1) (variable-2 expression-2)) &body body) -

Similar to let* (and to local C++ variables).

Creates temporary Qt objects, deleting them at the end of the qlet body.
If expression is a string, it will be substituted with (qnew expression), optionally including constructor arguments.

+

+Similar to let* (and to local C++ variables).

Creates temporary Qt objects, deleting them at the end of the qlet body.
If expression is a string, it will be substituted with (qnew expression), optionally including constructor arguments. +
   (qlet ((painter "QPainter"))
     ...)
@@ -273,14 +306,16 @@
   (qlet ((reg-exp "QRegExp(QString)" "^\\S+$"))
     ...)
-


-

+

QLOAD (file-name) -

Convenience function for Slime (or when loading EQL files from an ECL thread).
Loading files that create many Qt objects can be slow on the Slime REPL (many thread switches).
This function reduces all thread switches (GUI related) to a single one.

-


-

+

+Convenience function for Slime (or when loading EQL files from an ECL thread).
Loading files that create many Qt objects can be slow on the Slime REPL (many thread switches).
This function reduces all thread switches (GUI related) to a single one. +
+

QLOAD-C++ (library-name &optional unload) -

Loads a custom Qt/C++ plugin (see Qt_EQL/).
The library-name has to be passed as path to the plugin, without file ending.

This offers a simple way to extend your application with your own Qt/C++ functions.
The plugin will be reloaded (if supported by the OS) every time you call this function (Linux: see also qauto-reload-c++).
If the unload argument is not NIL, the plugin will be unloaded (if supported by the OS).

+

+Loads a custom Qt/C++ plugin (see Qt_EQL/).
The library-name has to be passed as path to the plugin, without file ending.

This offers a simple way to extend your application with your own Qt/C++ functions.
The plugin will be reloaded (if supported by the OS) every time you call this function (Linux: see also qauto-reload-c++).
If the unload argument is not NIL, the plugin will be unloaded (if supported by the OS). +
   (defparameter *c++* (qload-c++ "eql_cpp")) ; load (Linux: see also QAUTO-RELOAD-C++)
   
@@ -288,242 +323,279 @@
   
   (! "mySpeedyQtFunction" (:qt *c++*))       ; call library function (note :qt)
-


-

+

QLOAD-UI (file-name) -

Calls a custom QUiLoader::load() function, loading a UI file created by Qt Designer. Returns the top level widget of the UI.
Use qfind-child to retrieve the child widgets.

+

+Calls a custom QUiLoader::load() function, loading a UI file created by Qt Designer. Returns the top level widget of the UI.
Use qfind-child to retrieve the child widgets. +
   (qload-ui "my-fancy-gui.ui")
-


-

+

QLOCAL8BIT (string) -

Converts a Unicode pathname to a simple ECL base string, using QString::toLocal8Bit() (see QLocale settings).
Depending on the OS (namely Windows), this is necessary if you get a filename from Qt and want to use it in ECL.

See also QUTF8.

-


-

+

+Converts a Unicode pathname to a simple ECL base string, using QString::toLocal8Bit() (see QLocale settings).
Depending on the OS (namely Windows), this is necessary if you get a filename from Qt and want to use it in ECL.

See also QUTF8. +
+

QMESSAGE-BOX (x)
QMSG -

Convenience function: a simple message box, converting x to a string if necessary.
Returns its argument (just like print).

-


-

+

+Convenience function: a simple message box, converting x to a string if necessary.
Returns its argument (just like print). +
+

QNEW-INSTANCE (class-name &rest arguments/properties)
QNEW -

Creates a new Qt object, optionally passing the given arguments to the constructor.
Additionally you can pass any number of property/value pairs.
Please note how you can abbreviate long type lists.

+

+Creates a new Qt object, optionally passing the given arguments to the constructor.
Additionally you can pass any number of property/value pairs.
Please note how you can abbreviate long type lists. +
   (qnew "QWidget")
   (qnew "QPixmap(int,int)" 50 50) ; constructor
   (qnew "QLabel" "text" "Readme") ; set property
   (qnew "QMatrix4x4(qreal...)" 1 2 3 4 1 2 3 4 1 2 3 4 1 2 3 4)
-


-

+

QNEW-INSTANCE* (class-name &rest arguments/properties)
QNEW* -

Convenience function for the REPL.
Same as qnew, but showing the object immediately (if of type QWidget).

-


-

+

+Convenience function for the REPL.
Same as qnew, but showing the object immediately (if of type QWidget). +
+

QNULL-OBJECT (object)
QNULL -

Checks for a 0 Qt object pointer.

-


-

+

+Checks for a 0 Qt object pointer. +
+

QOBJECT-NAMES (&optional type) -

Returns all supported object names. Passing either :q or :n returns only the QObject inherited, or not QObject inherited names, respectively.

-


-

+

+Returns all supported object names. Passing either :q or :n returns only the QObject inherited, or not QObject inherited names, respectively. +
+

QOK () -

Needed to get the boolean ok value in cases like this:

+

+Needed to get the boolean ok value in cases like this: +
   (! "getFont(bool*)" "QFontDialog" nil)
   
   (|getFont.QFontDialog| nil) ; NIL needed for <bool*>
-


-

+

QOVERRIDE (object name function) -

Sets a Lisp function to be called on a virtual Qt method.
To remove a function, pass NIL instead of the function argument.

If you call qcall-default anywhere inside your overridden function, the base implementation will be called afterwards.
Instead of qcall-default you can directly call the base implementation, which is useful if you want to do post-processing of the returned value.

+

+Sets a Lisp function to be called on a virtual Qt method.
To remove a function, pass NIL instead of the function argument.

If you call qcall-default anywhere inside your overridden function, the base implementation will be called afterwards.
Instead of qcall-default you can directly call the base implementation, which is useful if you want to do post-processing of the returned value. +
   (qoverride edit "keyPressEvent(QKeyEvent*)" (lambda (ev) (print (|key| ev)) (qcall-default)))
-


-

+

QPROCESS-EVENTS () -

Convenience function to call QApplication::processEvents().

-


-

+

+Convenience function to call QApplication::processEvents(). +
+

QPROPERTIES (object &optional (depth 1)) -

Prints all current properties of object, searching both all Qt properties and all Qt methods which don't require arguments (marked with '*').
Optionally pass a depth indicating how many super-classes to include. Pass T to include all super-classes.

+

+Prints all current properties of object, searching both all Qt properties and all Qt methods which don't require arguments (marked with '*').
Optionally pass a depth indicating how many super-classes to include. Pass T to include all super-classes. +
   (qproperties (|font.QApplication|))
   (qproperties (qnew "QVariant(QString)" "42"))
   (qproperties *tool-button* 2)                 ; depth 2: both QToolButton and QAbstractButton
-


-

+

QPROPERTY (object name)
QGET -

Gets a Qt property. Enumerator values are returned as int values.
Returns T as second return value for successful calls.

+

+Gets a Qt property. Enumerator values are returned as int values.
Returns T as second return value for successful calls. +
   (qget label "text")
-


-

+

QQUIT (&optional (exit-status 0) (kill-all-threads t))
QQ -

Terminates EQL. Use this function to quit gracefully, not ext:quit.

-


-

+

+Terminates EQL. Use this function to quit gracefully, not ext:quit.

Negative values for exit-status will call abort() instead of normal program exit (e.g. to prevent infinite error message loops in some nasty cases). +
+

QREMOVE-EVENT-FILTER (handle) -

Removes the event filter corresponding to handle, which is the return value of qadd-event-filter.
Returns handle if the event filter has effectively been removed.
See also qclear-event-filters.

-


-

+

+Removes the event filter corresponding to handle, which is the return value of qadd-event-filter.
Returns handle if the event filter has effectively been removed.
See also qclear-event-filters. +
+

QREQUIRE (module &optional quiet) -

Loads an EQL module, corresponding to a Qt module.
Returns the module name if both loading and initializing have been successful.
If the quiet argument is not NIL, no error message will be shown on failure.

Currently available modules: :help :multimedia :network :sql :svg :webkit

+

+Loads an EQL module, corresponding to a Qt module.
Returns the module name if both loading and initializing have been successful.
If the quiet argument is not NIL, no error message will be shown on failure.

Currently available modules: :help :multimedia :network :sql :svg :webkit +
   (qrequire :network)
-


-

+

QRGB (red green blue &optional (alpha 255)) -

Constructs a (unsigned-byte 32) value that represents a 32 bit pixel color specified by the red, green, blue and alpha values.

-


-

+

+Constructs a (unsigned-byte 32) value that represents a 32 bit pixel color specified by the red, green, blue and alpha values. +
+

QRUN-IN-GUI-THREAD (function &optional (blocking t))
QRUN -

Runs function in GUI thread while (by default) blocking the calling thread (if called from main thread, function will simply be called directly).
This is needed to run GUI code from ECL threads other than the main thread.
Returns T on success.

There are 2 reasons to always wrap any EQL function like this, if called from another ECL thread:

See also macro qrun*.

+

+Runs function in GUI thread while (by default) blocking the calling thread (if called from main thread, function will simply be called directly).
This is needed to run GUI code from ECL threads other than the main thread.
Returns T on success.

There are 2 reasons to always wrap any EQL function like this, if called from another ECL thread:See also macro qrun*. +
   (qrun 'update-view-data)
-


-

+

QRUN-IN-GUI-THREAD* (&body body)
QRUN* -

Convenience macro for qrun, wrapping body in a closure (passing arguments, return values).

+

+Convenience macro for qrun, wrapping body in a closure (passing arguments, return values). +
   (qrun* (|setValue| ui:*progress-bar* value))
   
   (let ((item (qrun* (qnew "QTableWidgetItem")))) ; return value(s)
     ...)
-


-

+

QSELECT (&optional on-selected)
QSEL -

Allows to select (by clicking) any (child) widget.
The variable qsel:*q* is set to the latest selected widget.

Optionally pass a function to be called upon selecting, with the selected widget as argument.

+

+Allows to select (by clicking) any (child) widget.
The variable qsel:*q* is set to the latest selected widget.

Optionally pass a function to be called upon selecting, with the selected widget as argument. +
   (qsel (lambda (widget) (qmsg widget)))
-


-

+

QSENDER () -

Corresponding to QObject::sender(). To use inside a Lisp function connected to a Qt signal.

-


-

+

+Corresponding to QObject::sender(). To use inside a Lisp function connected to a Qt signal. +
+

QSET-COLOR (widget color-role color) -

Convenience function for simple color settings (avoiding QPalette boilerplate).
Use QPalette directly for anything more involved.

+

+Convenience function for simple color settings (avoiding QPalette boilerplate).
Use QPalette directly for anything more involved. +
   (qset-color widget |QPalette.Window| "white")
-


-

+

QSET-NULL (object) -

Sets the Qt object pointer to 0. This function is called automatically after qdel.

-


-

+

+Sets the Qt object pointer to 0. This function is called automatically after qdel. +
+

QSET-PROPERTY (object name value)
QSET -

Sets a Qt property. Enumerators have to be passed as int values.
Returns T as second return value for successful calls.

+

+Sets a Qt property. Enumerators have to be passed as int values.
Returns T as second return value for successful calls. +
   (qset label "alignment" |Qt.AlignCenter|)
-


-

+

QSIGNAL (name) -

Needed in functions which expect a const char* Qt signal (not needed in qconnect).

-


-

+

+Needed in functions which expect a const char* Qt signal (not needed in qconnect). +
+

QSINGLE-SHOT (milliseconds function) -

A single shot timer similar to QTimer::singleShot().

+

+A single shot timer similar to QTimer::singleShot(). +
   (qsingle-shot 1000 'one-second-later)
   
   (let ((ms 500))
     (qsingle-shot ms (lambda () (qmsg ms))))
-


-

+

QSLEEP (seconds) -

Similar to sleep, but continuing to process Qt events.

-


-

+

+Similar to sleep, but continuing to process Qt events. +
+

QSLOT (name) -

Needed in functions which expect a const char* Qt slot (not needed in qconnect).

-


-

+

+Needed in functions which expect a const char* Qt slot (not needed in qconnect). +
+

QSTATIC-META-OBJECT (class-name) -

Returns the ::staticMetaObject of the given class name.

+

+Returns the ::staticMetaObject of the given class name. +
   (qstatic-meta-object "QEasingCurve")
-


-

+

QSUPER-CLASS-NAME (name) -

Returns the super class of an object name, or NIL if the class doesn't inherit another Qt class.
Returns T as second return value for successful calls.

+

+Returns the super class of an object name, or NIL if the class doesn't inherit another Qt class.
Returns T as second return value for successful calls. +
   (qsuper-class-name "QGraphicsLineItem")
-


-

+

QT-OBJECT-? (object) -

Returns the specific qt-object of a generic qt-object.
Works for QObject and QEvent inherited classes only.

+

+Returns the specific qt-object of a generic qt-object.
Works for QObject and QEvent inherited classes only. +
   (qt-object-? (|parentWidget| widget))
   (qt-object-? (|widget| (|itemAt| box-layout 0)))
   (qt-object-? event)
-


-

+

QT-OBJECT-NAME (object) -

Returns the Qt class name.

-


-

+

+Returns the Qt class name. +
+

QUI-CLASS (file-name &optional object-name) -

Finds the class name for the given user-defined object name in the given UI file.
Omitting the object name will return the top level class name of the UI.

+

+Finds the class name for the given user-defined object name in the given UI file.
Omitting the object name will return the top level class name of the UI. +
   (qui-class "examples/data/main-window.ui" "editor") ; returns "QTextEdit"
-


-

+

QUI-NAMES (file-name) -

Finds all user-defined object names in the given UI file.

+

+Finds all user-defined object names in the given UI file. +
   (qui-names "examples/data/main-window.ui")
-


-

+

QUIC (&optional (file.h "ui.h") (file.lisp "ui.lisp") (ui-package :ui)) -

Takes C++ code from a file generated by the uic user interface compiler, and generates the corresponding EQL code.
See also command line option -quic.

-


-

+

+Takes C++ code from a file generated by the uic user interface compiler, and generates the corresponding EQL code.
See also command line option -quic. +
+

QUTF8 (string) -

Converts a Unicode pathname to a simple ECL base string, using QString::toUtf8().
Depending on the OS (namely OSX, Linux), this is necessary if you get a filename from Qt and want to use it in ECL.

See also QLOCAL8BIT.

-


-

+

+Converts a Unicode pathname to a simple ECL base string, using QString::toUtf8().
Depending on the OS (namely OSX, Linux), this is necessary if you get a filename from Qt and want to use it in ECL.

See also QLOCAL8BIT. +
+

QVERSION () -

Returns the EQL version number as "<year>.<month>.<counter>", analogous to the ECL version number.
The second return value is the Qt version as returned by qVersion().

-


-

+

+Returns the EQL version number as "<year>.<month>.<counter>", analogous to the ECL version number.
The second return value is the Qt version as returned by qVersion(). +
+

TR (source &optional context plural-number) -

Macro expanding to qtranslate, which calls QCoreApplication::translate().
Both source and context can be Lisp forms evaluating to constant strings (at compile time).
The context argument defaults to the Lisp file name. For the plural-number, see Qt Assistant.

-


+

+Macro expanding to qtranslate, which calls QCoreApplication::translate().
Both source and context can be Lisp forms evaluating to constant strings (at compile time).
The context argument defaults to the Lisp file name. For the plural-number, see Qt Assistant. +
+

\ No newline at end of file diff --git a/doc/auto-doc.lisp b/doc/auto-doc.lisp index 2f16c0f..533b830 100644 --- a/doc/auto-doc.lisp +++ b/doc/auto-doc.lisp @@ -46,7 +46,8 @@ (add-cpp-docu) (add-lisp-docu) (with-open-file (s (eql:in-home "doc/auto-doc.htm") :direction :output :if-exists :supersede) - (write-string "" s) + (write-string "Function List" s) + (write-string "" s) (flet ((el (tag x) (format nil "<~A>~A" tag x tag)) (! (x) @@ -55,14 +56,15 @@ (write-string " " s))) (setf *help* (sort *help* #'string< :key #'first)) (dolist (curr *help*) - (! "

") (! (el "b" (format nil "~A ~A" (string-upcase (first curr)) (subseq (second curr) 6)))) (let ((n 2)) (when (x:starts-with "alias:" (third curr)) (incf n) (! "
") (! (el "b" (string-upcase (subseq (third curr) 7))))) - (! (el "p" (nth n curr))) + (! "

") + (! (nth n curr)) + (! "
") (let ((examples (nthcdr (1+ n) curr))) (when examples (! "

")
@@ -70,7 +72,7 @@
                 (tab)
                 (! example))
               (! "
")))) - (! "


")) + (! "

")) (write-string "" s)))) (progn diff --git a/doc/index.html b/doc/index.html index b9de2c7..557344c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -1,18 +1,21 @@ - - - - - - - -

Mailing List (Google Groups)

- + + + + Index + + + + + EQL logo + +

Mailing List (Google Groups)

+ diff --git a/doc/style.css b/doc/style.css index 63aa337..6c459bf 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,5 +1,6 @@ -a:link { text-decoration: none; color: blue; } -a:hover, a:visited, a:visited:hover { text-decoration: underline; color: blue; } -body { font-family: sans-serif; font-size: 10pt; } +a:link, a:visited { text-decoration: none; color: blue; } +a:hover { text-decoration: underline; } +body { font-family: sans-serif; font-size: 10.5pt; } code, pre { color: mediumblue; } .added { color: red; } + diff --git a/helper/generate.lisp b/helper/generate.lisp index be861bc..48eb7c7 100644 --- a/helper/generate.lisp +++ b/helper/generate.lisp @@ -923,15 +923,6 @@ (format s "~% qNames = q_names.keys();~ ~% nNames = n_names.keys(); }}~ ~%~ - ~%void LObjects::cleanUp() {~ - ~% delete EQL::eventLoop;~ - ~% delete[] override_arg_types;~ - ~% for(int i = ~D; i + 1; --i) { delete N[i]; }~ - ~% for(int i = ~D; i + 1; --i) { delete Q[i]; }~ - ~% delete[] N;~ - ~% delete[] Q;~ - ~% delete dynObject; }~ - ~%~ ~%quint64 LObjects::override_id(uint unique, int id) {~ ~% return (~D * (quint64)unique + id); }~ ~%~ diff --git a/helper/missing-types.txt b/helper/missing-types.txt index d8ec262..d39367e 100644 --- a/helper/missing-types.txt +++ b/helper/missing-types.txt @@ -74,5 +74,3 @@ QVector QVector QVector QWindowList -quintptr -sockaddr diff --git a/helper/multiple-inheritance.txt b/helper/multiple-inheritance.txt index 7ab0093..8992e94 100644 --- a/helper/multiple-inheritance.txt +++ b/helper/multiple-inheritance.txt @@ -5,6 +5,7 @@ QGraphicsWidget: QGraphicsObject and QGraphicsLayoutItem QMediaPlaylist: QObject and QMediaBindableInterface QMediaRecorder: QObject and QMediaBindableInterface QPaintDeviceWindow: QWindow and QPaintDevice +QPdfWriter: QObject and QPagedPaintDevice QWidget: QObject and QPaintDevice QWindow: QObject and QSurface QAccessibleWidget: QAccessibleObject and QAccessibleActionInterface diff --git a/helper/my-class-lists/gui/q-names.lisp b/helper/my-class-lists/gui/q-names.lisp index 5704b7e..9b2c632 100644 --- a/helper/my-class-lists/gui/q-names.lisp +++ b/helper/my-class-lists/gui/q-names.lisp @@ -115,6 +115,7 @@ "QPanGesture" "QParallelAnimationGroup" "QPauseAnimation" + "QPdfWriter" "QPinchGesture" "QPlainTextDocumentLayout" "QPlainTextEdit" diff --git a/helper/parse-enums.lisp b/helper/parse-enums.lisp index f693d2a..853f3c6 100644 --- a/helper/parse-enums.lisp +++ b/helper/parse-enums.lisp @@ -6,8 +6,6 @@ (load "../src/lisp/x") (load "share") -(use-package :x) - (defparameter *skip* (list "QStyle::CC_" "QStyle::CT_" @@ -58,9 +56,9 @@ (write-char #\( s) (dolist (names (list *q-names* *n-names* *namespaces*)) (parse-classes (mapcar (lambda (name) - (string-trim "= " (if-it (position #\( name) - (subseq name 0 it) - name))) + (string-trim "= " (x:if-it (position #\( name) + (subseq name 0 it) + name))) names) s)) (terpri s) diff --git a/helper/parse.lisp b/helper/parse.lisp index c04fbc4..5a49ed7 100644 --- a/helper/parse.lisp +++ b/helper/parse.lisp @@ -4,8 +4,6 @@ (load "share") (load "load-modules") -(use-package :x) - (defparameter *skip* (list "(preliminary)" "(deprecated)" @@ -38,7 +36,10 @@ "NSMenu" "NSURL" "qintptr" + "quintptr" + "quint8 *" "qwsSet" + "sockaddr" "uchar *" "void *" "winPage" @@ -206,13 +207,13 @@ (qpainter (and pub (string= "QPainter" class))) (qvariant (and pub (string= "QVariant" class)))) (cond (qpainter - (dolist (device (list "QImage" "QPicture" "QPixmap" "QPrinter" "QWidget")) + (dolist (device (list "QImage" "QPdfWriter" "QPicture" "QPixmap" "QPrinter" "QWidget")) (format s "~% \"new QPainter ( ~A * )\"~ ~% \"bool begin ( ~A * )\"" device device))) (qvariant (format s "~% \"new QVariant ( const QCursor & )\""))) - (let ((static (starts-with "static" type)) + (let ((static (x:starts-with "static" type)) (protected (search "protected" type)) (p (search* (format nil "~%~A~%~%" type) text))) (when p @@ -230,9 +231,9 @@ (setf x:it (concatenate 'string (subseq x:it 0 x:it*) " = QRect_QWIDGET_GRAB)"))) (let* ((fun (tokenize x:it)) (new (and (not static) - (or (starts-with (format nil "Q_INVOKABLE ~A (" class) fun) - (starts-with (format nil "~A (" class) fun)))) - (virtual (starts-with "virtual" fun))) + (or (x:starts-with (format nil "Q_INVOKABLE ~A (" class) fun) + (x:starts-with (format nil "~A (" class) fun)))) + (virtual (x:starts-with "virtual" fun))) (unless (or (and qpainter (search "QPaintDevice" fun :test 'string=)) (and new no-new) (and new protected) @@ -247,11 +248,11 @@ (protected "protected ") (static "static ") (t "")) - (subseq fun (if (starts-with "Q_INVOKABLE" fun) 12 0))))))))))))))) + (subseq fun (if (x:starts-with "Q_INVOKABLE" fun) 12 0))))))))))))))) (defun parse-classes (classes s so non) (dolist (class classes) - (let* ((no-new (starts-with "//" class)) + (let* ((no-new (x:starts-with "//" class)) (class* (string-left-trim "/" class)) (file class*)) (x:when-it (search "::" class*) @@ -284,9 +285,9 @@ (format so "(defparameter *~C-override* '(~%" pre) (format s "(defparameter *~C-methods* '(~%" pre) (parse-classes (mapcar (lambda (name) - (string-trim "= " (if-it (position #\( name) - (subseq name 0 it) - name))) + (string-trim "= " (x:if-it (position #\( name) + (subseq name 0 x:it) + name))) names) s so non))))) (list *q-names* *n-names*) diff --git a/helper/parsed/n-methods.lisp b/helper/parsed/n-methods.lisp index a07870a..a1ea417 100644 --- a/helper/parsed/n-methods.lisp +++ b/helper/parsed/n-methods.lisp @@ -1333,9 +1333,6 @@ (("QHostAddress" . NIL) "new QHostAddress ()" "new QHostAddress ( quint32 )" - "new QHostAddress ( quint8 * )" - "new QHostAddress ( const quint8 * )" - "new QHostAddress ( const sockaddr * )" "new QHostAddress ( const QString & )" "new QHostAddress ( const QHostAddress & )" "new QHostAddress ( SpecialAddress )" @@ -1346,10 +1343,7 @@ "QAbstractSocket::NetworkLayerProtocol protocol () const" "QString scopeId () const" "void setAddress ( quint32 )" - "void setAddress ( quint8 * )" - "void setAddress ( const quint8 * )" "bool setAddress ( const QString & )" - "void setAddress ( const sockaddr * )" "void setScopeId ( const QString & )" "quint32 toIPv4Address () const" "quint32 toIPv4Address ( bool * ) const" @@ -1842,7 +1836,6 @@ "int column () const" "QVariant data ( int = Qt::DisplayRole ) const" "Qt::ItemFlags flags () const" - "quintptr internalId () const" "bool isValid () const" "const QAbstractItemModel * model () const" "QModelIndex parent () const" @@ -2141,6 +2134,8 @@ (("QPainter" . NIL) "new QPainter ( QImage * )" "bool begin ( QImage * )" + "new QPainter ( QPdfWriter * )" + "bool begin ( QPdfWriter * )" "new QPainter ( QPicture * )" "bool begin ( QPicture * )" "new QPainter ( QPixmap * )" diff --git a/helper/parsed/q-methods.lisp b/helper/parsed/q-methods.lisp index 57d9b9a..db03fe6 100644 --- a/helper/parsed/q-methods.lisp +++ b/helper/parsed/q-methods.lisp @@ -93,7 +93,6 @@ "protected void beginResetModel ()" "protected void changePersistentIndex ( const QModelIndex & , const QModelIndex & )" "protected void changePersistentIndexList ( const QModelIndexList & , const QModelIndexList & )" - "protected QModelIndex createIndex ( int , int , quintptr ) const" "protected void endInsertColumns ()" "protected void endInsertRows ()" "protected void endMoveColumns ()" @@ -3144,6 +3143,21 @@ "new QPauseAnimation ( int , QObject * = 0 )" "void setDuration ( int )" "virtual int duration () const") + (("QPdfWriter" . "QObject") + "new QPdfWriter ( const QString & )" + "QString creator () const" + "QPageLayout pageLayout () const" + "int resolution () const" + "void setCreator ( const QString & )" + "bool setPageLayout ( const QPageLayout & )" + "bool setPageMargins ( const QMarginsF & )" + "bool setPageMargins ( const QMarginsF & , QPageLayout::Unit )" + "bool setPageOrientation ( QPageLayout::Orientation )" + "bool setPageSize ( const QPageSize & )" + "void setResolution ( int )" + "void setTitle ( const QString & )" + "QString title () const" + "virtual bool newPage ()") (("QPinchGesture" . "QGesture") "QPointF centerPoint () const" "ChangeFlags changeFlags () const" diff --git a/helper/parsed/q-override.lisp b/helper/parsed/q-override.lisp index 4ab66ba..402f0bb 100644 --- a/helper/parsed/q-override.lisp +++ b/helper/parsed/q-override.lisp @@ -937,8 +937,7 @@ "virtual bool event ( QEvent * )") (("QLocalServer" . "QObject") "virtual bool hasPendingConnections () const" - "virtual QLocalSocket * nextPendingConnection ()" - "virtual void incomingConnection ( quintptr )") + "virtual QLocalSocket * nextPendingConnection ()") (("QLocalSocket" . "QIODevice") "virtual qint64 bytesAvailable () const" "virtual qint64 bytesToWrite () const" @@ -1116,6 +1115,8 @@ "virtual int duration () const" "virtual bool event ( QEvent * )" "virtual void updateCurrentTime ( int )") + (("QPdfWriter" . "QObject") + "virtual bool newPage ()") (("QPinchGesture" . "QGesture")) (("QPlainTextDocumentLayout" . "QAbstractTextDocumentLayout") "virtual QRectF blockBoundingRect ( const QTextBlock & ) const" diff --git a/src/compile-ini.lisp b/src/compile-ini.lisp new file mode 100644 index 0000000..067d72a --- /dev/null +++ b/src/compile-ini.lisp @@ -0,0 +1,17 @@ +#-unicode +(error "Please build ECL with unicode support (configure --enable-unicode)") + +(require :cmp) + +(setf *break-on-signals* 'error) + +#+msvc +(setf c::*compile-in-constants* t) + +(defparameter *lisp-files* (list "x" "package" "ini")) + +(dolist (f *lisp-files*) + (let ((file (format nil "lisp/~A" f))) + (when (probe-file file) + (delete-file (format nil "~A.~A" file #+msvc "obj" #-msvc "o"))) + (compile-file file :system-p t))) diff --git a/src/dyn_object.cpp b/src/dyn_object.cpp index 3f59550..bc0c11b 100644 --- a/src/dyn_object.cpp +++ b/src/dyn_object.cpp @@ -17,10 +17,10 @@ DynObject::DynObject(QObject* par) : QObject(par), event_filters(false) { int DynObject::qt_metacall(QMetaObject::Call c, int id, void** args) { if(QMetaObject::InvokeMetaMethod == c) { - int slot_id = slot_ids.indexOf(id); - if(slot_id != -1) { - currentSender = signal_senders.at(slot_id); - callConnectFun(slot_functions.at(slot_id), slot_types.at(slot_id), args); }} + int index = slot_ids.indexOf(id); + if(index != -1) { + currentSender = signal_senders.at(index); + callConnectFun(slot_functions.at(index), slot_types.at(index), args); }} return -1; } bool DynObject::connect(QObject* from, const char* signal, DynObject* dyn, void* function) { diff --git a/src/eql.cpp b/src/eql.cpp index 10a3b1e..9e55691 100644 --- a/src/eql.cpp +++ b/src/eql.cpp @@ -20,10 +20,6 @@ EQL::EQL() : QObject() { LObjects::ini(this); read_VV(OBJNULL, ini_EQL); } // see "src/make-eql-lib.lisp" -EQL::~EQL() { - LObjects::cleanUp(); - cl_shutdown(); } - void EQL::ini(char** argv) { cl_booted = true; cl_boot(1, argv); } diff --git a/src/eql.h b/src/eql.h index 5bdf4bf..7acecec 100644 --- a/src/eql.h +++ b/src/eql.h @@ -22,7 +22,6 @@ class EQL_EXPORT EQL : public QObject { Q_OBJECT public: EQL(); - ~EQL(); static bool cl_booted; static bool return_value_p; diff --git a/src/gen/_lobjects.cpp b/src/gen/_lobjects.cpp index 3cabe0c..0331d12 100644 --- a/src/gen/_lobjects.cpp +++ b/src/gen/_lobjects.cpp @@ -176,26 +176,27 @@ NumList LLibrary::overrideIds = NumList(); NumList LLineEdit::overrideIds = NumList() << 23 << 24 << 25 << 12 << 28 << 29 << 30 << 31 << 32 << 13 << 14 << 36 << 15 << 38 << 17 << 18 << 19 << 20; NumList LListView::overrideIds = NumList() << 84 << 86 << 91 << 188 << 274 << 30 << 31 << 32 << 93 << 94 << 17 << 19 << 95 << 20 << 40 << 275 << 189 << 96 << 276 << 98 << 99 << 8 << 277 << 100 << 101 << 104 << 102; NumList LListWidget::overrideIds = NumList() << 283 << 284 << 70 << 83 << 32; -NumList LMainWindow::overrideIds = NumList() << 288 << 28; +NumList LMainWindow::overrideIds = NumList() << 287 << 28; NumList LMdiArea::overrideIds = NumList() << 24 << 25 << 6 << 5 << 20 << 40 << 106 << 41 << 8 << 103; NumList LMdiSubWindow::overrideIds = NumList() << 24 << 25 << 12 << 6 << 27 << 28 << 5 << 13 << 14 << 35 << 15 << 37 << 38 << 17 << 18 << 19 << 39 << 20 << 40 << 41 << 8; NumList LMenu::overrideIds = NumList() << 25 << 26 << 12 << 33 << 34 << 35 << 15 << 37 << 17 << 18 << 19 << 20 << 8 << 43; NumList LMenuBar::overrideIds = NumList() << 22 << 24 << 25 << 26 << 12 << 5 << 13 << 14 << 15 << 37 << 17 << 18 << 19 << 20 << 40 << 8; NumList LMessageBox::overrideIds = NumList() << 108 << 12 << 27 << 15 << 40 << 41; -NumList LMimeData::overrideIds = NumList() << 289 << 290 << 291; +NumList LMimeData::overrideIds = NumList() << 288 << 289 << 290; NumList LMouseEventTransition::overrideIds = NumList() << 158 << 159; NumList LMovie::overrideIds = NumList(); NumList LObject::overrideIds = NumList() << 5 << 6 << 7 << 8; NumList LOpenGLContext::overrideIds = NumList(); NumList LOpenGLShader::overrideIds = NumList(); -NumList LOpenGLShaderProgram::overrideIds = NumList() << 303; -NumList LOpenGLWidget::overrideIds = NumList() << 304 << 305 << 306 << 20 << 40; -NumList LOpenGLWindow::overrideIds = NumList() << 304 << 305 << 307 << 308 << 306 << 20 << 40; +NumList LOpenGLShaderProgram::overrideIds = NumList() << 302; +NumList LOpenGLWidget::overrideIds = NumList() << 303 << 304 << 305 << 20 << 40; +NumList LOpenGLWindow::overrideIds = NumList() << 303 << 304 << 306 << 307 << 305 << 20 << 40; NumList LPageSetupDialog::overrideIds = NumList() << 184 << 107 << 108; NumList LPaintDeviceWindow::overrideIds = NumList() << 20; NumList LPanGesture::overrideIds = NumList(); NumList LParallelAnimationGroup::overrideIds = NumList() << 1 << 2 << 3 << 4; NumList LPauseAnimation::overrideIds = NumList() << 1 << 2; +NumList LPdfWriter::overrideIds = NumList() << 313; NumList LPinchGesture::overrideIds = NumList(); NumList LPlainTextDocumentLayout::overrideIds = NumList() << 148 << 149 << 150 << 151 << 152 << 153 << 154; NumList LPlainTextEdit::overrideIds = NumList() << 314 << 315 << 316 << 317 << 23 << 12 << 28 << 29 << 30 << 31 << 32 << 13 << 34 << 14 << 36 << 15 << 16 << 38 << 17 << 18 << 19 << 20 << 40 << 106 << 41 << 43; @@ -266,7 +267,7 @@ NumList LValidator::overrideIds = NumList() << 142 << 144; NumList LVariantAnimation::overrideIds = NumList() << 321 << 320 << 1 << 2 << 4; NumList LWidget::overrideIds = NumList() << 21 << 22 << 23 << 24 << 25 << 26 << 12 << 27 << 28 << 29 << 30 << 31 << 32 << 33 << 13 << 34 << 14 << 35 << 36 << 15 << 16 << 37 << 38 << 17 << 18 << 19 << 39 << 20 << 40 << 41 << 42 << 43 << 44 << 45; NumList LWidgetAction::overrideIds = NumList() << 416 << 417 << 5; -NumList LWindow::overrideIds = NumList() << 309 << 310 << 13 << 14 << 35 << 15 << 16 << 38 << 17 << 18 << 19 << 39 << 40 << 41 << 42 << 311 << 43 << 312 << 141 << 313; +NumList LWindow::overrideIds = NumList() << 308 << 309 << 13 << 14 << 35 << 15 << 16 << 38 << 17 << 18 << 19 << 39 << 40 << 41 << 42 << 310 << 43 << 311 << 141 << 312; NumList LWizard::overrideIds = NumList() << 418 << 419 << 420 << 421 << 108 << 25 << 184 << 20 << 40; NumList LWizardPage::overrideIds = NumList() << 422 << 423 << 424 << 418 << 425; NumList LAbstractGraphicsShapeItem::overrideIds = NumList() << 268 << 269; @@ -365,7 +366,7 @@ NumList LPersistentModelIndex::overrideIds = NumList(); NumList LPicture::overrideIds = NumList() << 464; NumList LPixmap::overrideIds = NumList(); NumList LPixmapCache::overrideIds = NumList(); -NumList LPrinter::overrideIds = NumList() << 465; +NumList LPrinter::overrideIds = NumList() << 313; NumList LPrinterInfo::overrideIds = NumList(); NumList LProcessEnvironment::overrideIds = NumList(); NumList LQuaternion::overrideIds = NumList(); @@ -376,13 +377,13 @@ NumList LRegExp::overrideIds = NumList(); NumList LRegion::overrideIds = NumList(); NumList LRegularExpression::overrideIds = NumList(); NumList LResizeEvent::overrideIds = NumList(); -NumList LRunnable::overrideIds = NumList() << 468; +NumList LRunnable::overrideIds = NumList() << 467; NumList LSemaphore::overrideIds = NumList(); NumList LShortcutEvent::overrideIds = NumList(); NumList LShowEvent::overrideIds = NumList(); NumList LSizePolicy::overrideIds = NumList(); NumList LSpacerItem::overrideIds = NumList() << 164 << 174 << 175 << 167 << 169 << 170 << 25 << 456; -NumList LStandardItem::overrideIds = NumList() << 458 << 459 << 488 << 233; +NumList LStandardItem::overrideIds = NumList() << 458 << 459 << 487 << 233; NumList LStatusTipEvent::overrideIds = NumList(); NumList LStyleOption::overrideIds = NumList(); NumList LStyleOptionGraphicsItem::overrideIds = NumList(); @@ -395,7 +396,7 @@ NumList LTextBlockFormat::overrideIds = NumList(); NumList LTextBlockUserData::overrideIds = NumList(); NumList LTextBoundaryFinder::overrideIds = NumList(); NumList LTextCharFormat::overrideIds = NumList(); -NumList LTextCodec::overrideIds = NumList() << 489 << 490 << 491 << 492 << 493; +NumList LTextCodec::overrideIds = NumList() << 488 << 489 << 490 << 491 << 492; NumList LTextCursor::overrideIds = NumList(); NumList LTextDecoder::overrideIds = NumList(); NumList LTextDocumentFragment::overrideIds = NumList(); @@ -419,8 +420,8 @@ NumList LTimerEvent::overrideIds = NumList(); NumList LToolTip::overrideIds = NumList(); NumList LTouchEvent::overrideIds = NumList(); NumList LTransform::overrideIds = NumList(); -NumList LTreeWidgetItem::overrideIds = NumList() << 458 << 494 << 495; -NumList LUndoCommand::overrideIds = NumList() << 496 << 497 << 498 << 499; +NumList LTreeWidgetItem::overrideIds = NumList() << 458 << 493 << 494; +NumList LUndoCommand::overrideIds = NumList() << 495 << 496 << 497 << 498; NumList LUrl::overrideIds = NumList(); NumList LVariant::overrideIds = NumList(); NumList LVector2D::overrideIds = NumList(); @@ -439,7 +440,7 @@ void LObjects::ini(EQL* e) { ok = true; eql = e; dynObject = new DynObject; - Q = new QObject* [241]; for(int i = 0; i < 241; ++i) { Q[i] = 0; } + Q = new QObject* [242]; for(int i = 0; i < 242; ++i) { Q[i] = 0; } N = new QObject* [215]; for(int i = 0; i < 215; ++i) { N[i] = 0; } Q[0] = new Q1; Q[1] = new Q2; @@ -567,7 +568,7 @@ void LObjects::ini(EQL* e) { Q[156] = new Q157; Q[157] = new Q158; Q[158] = new Q159; - Q[160] = new Q161; + Q[159] = new Q160; Q[161] = new Q162; Q[162] = new Q163; Q[163] = new Q164; @@ -584,7 +585,7 @@ void LObjects::ini(EQL* e) { Q[174] = new Q175; Q[175] = new Q176; Q[176] = new Q177; - Q[182] = new Q183; + Q[177] = new Q178; Q[183] = new Q184; Q[184] = new Q185; Q[185] = new Q186; @@ -593,7 +594,7 @@ void LObjects::ini(EQL* e) { Q[188] = new Q189; Q[189] = new Q190; Q[190] = new Q191; - Q[193] = new Q194; + Q[191] = new Q192; Q[194] = new Q195; Q[195] = new Q196; Q[196] = new Q197; @@ -602,7 +603,7 @@ void LObjects::ini(EQL* e) { Q[199] = new Q200; Q[200] = new Q201; Q[201] = new Q202; - Q[204] = new Q205; + Q[202] = new Q203; Q[205] = new Q206; Q[206] = new Q207; Q[207] = new Q208; @@ -619,17 +620,18 @@ void LObjects::ini(EQL* e) { Q[218] = new Q219; Q[219] = new Q220; Q[220] = new Q221; - Q[222] = new Q223; + Q[221] = new Q222; Q[223] = new Q224; Q[224] = new Q225; Q[225] = new Q226; Q[226] = new Q227; Q[227] = new Q228; - Q[236] = new Q237; + Q[228] = new Q229; Q[237] = new Q238; Q[238] = new Q239; Q[239] = new Q240; Q[240] = new Q241; + Q[241] = new Q242; N[0] = new N1; N[1] = new N2; N[2] = new N3; @@ -947,101 +949,102 @@ void LObjects::ini(EQL* e) { q_names["QPanGesture"] = 144; q_names["QParallelAnimationGroup"] = 145; q_names["QPauseAnimation"] = 146; - q_names["QPinchGesture"] = 147; - q_names["QPlainTextDocumentLayout"] = 148; - q_names["QPlainTextEdit"] = 149; - q_names["QPluginLoader"] = 150; - q_names["QPrintDialog"] = 151; - q_names["QPrintPreviewDialog"] = 152; - q_names["QPrintPreviewWidget"] = 153; - q_names["QProcess"] = 154; - q_names["QProgressBar"] = 155; - q_names["QProgressDialog"] = 156; - q_names["QPropertyAnimation"] = 157; - q_names["QPushButton"] = 158; - q_names["QRadioButton"] = 159; - q_names["QRadioTuner"] = 160; - q_names["QRegExpValidator"] = 161; - q_names["QRubberBand"] = 162; - q_names["QScreen"] = 163; - q_names["QScrollArea"] = 164; - q_names["QScrollBar"] = 165; - q_names["QSequentialAnimationGroup"] = 166; - q_names["QSessionManager"] = 167; - q_names["QSettings"] = 168; - q_names["QShortcut"] = 169; - q_names["QSignalTransition"] = 170; - q_names["QSizeGrip"] = 171; - q_names["QSlider"] = 172; - q_names["QSortFilterProxyModel"] = 173; - q_names["QSpinBox"] = 174; - q_names["QSplashScreen"] = 175; - q_names["QSplitter"] = 176; - q_names["QSplitterHandle"] = 177; - q_names["QSqlDriver"] = 178; - q_names["QSqlQueryModel"] = 179; - q_names["QSqlRelationalDelegate"] = 180; - q_names["QSqlRelationalTableModel"] = 181; - q_names["QSqlTableModel"] = 182; - q_names["QStackedLayout"] = 183; - q_names["QStackedWidget"] = 184; - q_names["QStandardItemModel"] = 185; - q_names["QState"] = 186; - q_names["QStateMachine"] = 187; - q_names["QStatusBar"] = 188; - q_names["QStringListModel"] = 189; - q_names["QStyle"] = 190; - q_names["QStyledItemDelegate"] = 191; - q_names["QSvgRenderer"] = 192; - q_names["QSvgWidget"] = 193; - q_names["QSwipeGesture"] = 194; - q_names["QSyntaxHighlighter"] = 195; - q_names["QSystemTrayIcon"] = 196; - q_names["QTabBar"] = 197; - q_names["QTabWidget"] = 198; - q_names["QTableView"] = 199; - q_names["QTableWidget"] = 200; - q_names["QTapAndHoldGesture"] = 201; - q_names["QTapGesture"] = 202; - q_names["QTcpServer"] = 203; - q_names["QTcpSocket"] = 204; - q_names["QTextBlockGroup"] = 205; - q_names["QTextBrowser"] = 206; - q_names["QTextDocument"] = 207; - q_names["QTextEdit"] = 208; - q_names["QTextFrame"] = 209; - q_names["QTextList"] = 210; - q_names["QTextObject"] = 211; - q_names["QTextTable"] = 212; - q_names["QTimeEdit"] = 213; - q_names["QTimeLine"] = 214; - q_names["QTimer"] = 215; - q_names["QToolBar"] = 216; - q_names["QToolBox"] = 217; - q_names["QToolButton"] = 218; - q_names["QTranslator"] = 219; - q_names["QTreeView"] = 220; - q_names["QTreeWidget"] = 221; - q_names["QUdpSocket"] = 222; - q_names["QUndoGroup"] = 223; - q_names["QUndoStack"] = 224; - q_names["QUndoView"] = 225; - q_names["QVBoxLayout"] = 226; - q_names["QValidator"] = 227; - q_names["QVariantAnimation"] = 228; - q_names["QVideoWidget"] = 229; - q_names["QVideoWidgetControl"] = 230; - q_names["QWebFrame"] = 231; - q_names["QWebHistoryInterface"] = 232; - q_names["QWebInspector"] = 233; - q_names["QWebPage"] = 234; - q_names["QWebPluginFactory"] = 235; - q_names["QWebView"] = 236; - q_names["QWidget"] = 237; - q_names["QWidgetAction"] = 238; - q_names["QWindow"] = 239; - q_names["QWizard"] = 240; - q_names["QWizardPage"] = 241; + q_names["QPdfWriter"] = 147; + q_names["QPinchGesture"] = 148; + q_names["QPlainTextDocumentLayout"] = 149; + q_names["QPlainTextEdit"] = 150; + q_names["QPluginLoader"] = 151; + q_names["QPrintDialog"] = 152; + q_names["QPrintPreviewDialog"] = 153; + q_names["QPrintPreviewWidget"] = 154; + q_names["QProcess"] = 155; + q_names["QProgressBar"] = 156; + q_names["QProgressDialog"] = 157; + q_names["QPropertyAnimation"] = 158; + q_names["QPushButton"] = 159; + q_names["QRadioButton"] = 160; + q_names["QRadioTuner"] = 161; + q_names["QRegExpValidator"] = 162; + q_names["QRubberBand"] = 163; + q_names["QScreen"] = 164; + q_names["QScrollArea"] = 165; + q_names["QScrollBar"] = 166; + q_names["QSequentialAnimationGroup"] = 167; + q_names["QSessionManager"] = 168; + q_names["QSettings"] = 169; + q_names["QShortcut"] = 170; + q_names["QSignalTransition"] = 171; + q_names["QSizeGrip"] = 172; + q_names["QSlider"] = 173; + q_names["QSortFilterProxyModel"] = 174; + q_names["QSpinBox"] = 175; + q_names["QSplashScreen"] = 176; + q_names["QSplitter"] = 177; + q_names["QSplitterHandle"] = 178; + q_names["QSqlDriver"] = 179; + q_names["QSqlQueryModel"] = 180; + q_names["QSqlRelationalDelegate"] = 181; + q_names["QSqlRelationalTableModel"] = 182; + q_names["QSqlTableModel"] = 183; + q_names["QStackedLayout"] = 184; + q_names["QStackedWidget"] = 185; + q_names["QStandardItemModel"] = 186; + q_names["QState"] = 187; + q_names["QStateMachine"] = 188; + q_names["QStatusBar"] = 189; + q_names["QStringListModel"] = 190; + q_names["QStyle"] = 191; + q_names["QStyledItemDelegate"] = 192; + q_names["QSvgRenderer"] = 193; + q_names["QSvgWidget"] = 194; + q_names["QSwipeGesture"] = 195; + q_names["QSyntaxHighlighter"] = 196; + q_names["QSystemTrayIcon"] = 197; + q_names["QTabBar"] = 198; + q_names["QTabWidget"] = 199; + q_names["QTableView"] = 200; + q_names["QTableWidget"] = 201; + q_names["QTapAndHoldGesture"] = 202; + q_names["QTapGesture"] = 203; + q_names["QTcpServer"] = 204; + q_names["QTcpSocket"] = 205; + q_names["QTextBlockGroup"] = 206; + q_names["QTextBrowser"] = 207; + q_names["QTextDocument"] = 208; + q_names["QTextEdit"] = 209; + q_names["QTextFrame"] = 210; + q_names["QTextList"] = 211; + q_names["QTextObject"] = 212; + q_names["QTextTable"] = 213; + q_names["QTimeEdit"] = 214; + q_names["QTimeLine"] = 215; + q_names["QTimer"] = 216; + q_names["QToolBar"] = 217; + q_names["QToolBox"] = 218; + q_names["QToolButton"] = 219; + q_names["QTranslator"] = 220; + q_names["QTreeView"] = 221; + q_names["QTreeWidget"] = 222; + q_names["QUdpSocket"] = 223; + q_names["QUndoGroup"] = 224; + q_names["QUndoStack"] = 225; + q_names["QUndoView"] = 226; + q_names["QVBoxLayout"] = 227; + q_names["QValidator"] = 228; + q_names["QVariantAnimation"] = 229; + q_names["QVideoWidget"] = 230; + q_names["QVideoWidgetControl"] = 231; + q_names["QWebFrame"] = 232; + q_names["QWebHistoryInterface"] = 233; + q_names["QWebInspector"] = 234; + q_names["QWebPage"] = 235; + q_names["QWebPluginFactory"] = 236; + q_names["QWebView"] = 237; + q_names["QWidget"] = 238; + q_names["QWidgetAction"] = 239; + q_names["QWindow"] = 240; + q_names["QWizard"] = 241; + q_names["QWizardPage"] = 242; n_names["QAbstractGraphicsShapeItem"] = 1; n_names["QAccessible"] = 2; n_names["QAccessibleEvent"] = 3; @@ -1543,33 +1546,33 @@ void LObjects::ini(EQL* e) { override_function_ids["mimeData(QList)"] = 284; override_function_ids["hasPendingConnections()"] = 285; override_function_ids["nextPendingConnection()"] = 286; - override_function_ids["incomingConnection(quintptr)"] = 287; - override_function_ids["createPopupMenu()"] = 288; - override_function_ids["formats()"] = 289; - override_function_ids["hasFormat(QString)"] = 290; - override_function_ids["retrieveData(QString,QVariant::Type)"] = 291; - override_function_ids["cookiesForUrl(QUrl)"] = 292; - override_function_ids["deleteCookie(QNetworkCookie)"] = 293; - override_function_ids["insertCookie(QNetworkCookie)"] = 294; - override_function_ids["setCookiesFromUrl(QList,QUrl)"] = 295; - override_function_ids["updateCookie(QNetworkCookie)"] = 296; - override_function_ids["validateCookie(QNetworkCookie,QUrl)"] = 297; - override_function_ids["expire()"] = 298; - override_function_ids["cacheSize()"] = 299; - override_function_ids["metaData(QUrl)"] = 300; - override_function_ids["remove(QUrl)"] = 301; - override_function_ids["updateMetaData(QNetworkCacheMetaData)"] = 302; - override_function_ids["link()"] = 303; - override_function_ids["initializeGL()"] = 304; - override_function_ids["paintGL()"] = 305; - override_function_ids["resizeGL(int,int)"] = 306; - override_function_ids["paintOverGL()"] = 307; - override_function_ids["paintUnderGL()"] = 308; - override_function_ids["focusObject()"] = 309; - override_function_ids["exposeEvent(QExposeEvent*)"] = 310; - override_function_ids["touchEvent(QTouchEvent*)"] = 311; - override_function_ids["format()"] = 312; - override_function_ids["surfaceType()"] = 313; + override_function_ids["createPopupMenu()"] = 287; + override_function_ids["formats()"] = 288; + override_function_ids["hasFormat(QString)"] = 289; + override_function_ids["retrieveData(QString,QVariant::Type)"] = 290; + override_function_ids["cookiesForUrl(QUrl)"] = 291; + override_function_ids["deleteCookie(QNetworkCookie)"] = 292; + override_function_ids["insertCookie(QNetworkCookie)"] = 293; + override_function_ids["setCookiesFromUrl(QList,QUrl)"] = 294; + override_function_ids["updateCookie(QNetworkCookie)"] = 295; + override_function_ids["validateCookie(QNetworkCookie,QUrl)"] = 296; + override_function_ids["expire()"] = 297; + override_function_ids["cacheSize()"] = 298; + override_function_ids["metaData(QUrl)"] = 299; + override_function_ids["remove(QUrl)"] = 300; + override_function_ids["updateMetaData(QNetworkCacheMetaData)"] = 301; + override_function_ids["link()"] = 302; + override_function_ids["initializeGL()"] = 303; + override_function_ids["paintGL()"] = 304; + override_function_ids["resizeGL(int,int)"] = 305; + override_function_ids["paintOverGL()"] = 306; + override_function_ids["paintUnderGL()"] = 307; + override_function_ids["focusObject()"] = 308; + override_function_ids["exposeEvent(QExposeEvent*)"] = 309; + override_function_ids["touchEvent(QTouchEvent*)"] = 310; + override_function_ids["format()"] = 311; + override_function_ids["surfaceType()"] = 312; + override_function_ids["newPage()"] = 313; override_function_ids["loadResource(int,QUrl)"] = 314; override_function_ids["canInsertFromMimeData(QMimeData*)"] = 315; override_function_ids["createMimeDataFromSelection()"] = 316; @@ -1721,42 +1724,41 @@ void LObjects::ini(EQL* e) { override_function_ids["ensureActiveTarget()"] = 462; override_function_ids["metric(QPaintDevice::PaintDeviceMetric)"] = 463; override_function_ids["setData(const char*,uint)"] = 464; - override_function_ids["newPage()"] = 465; - override_function_ids["setPageSize(PageSize)"] = 466; - override_function_ids["setPageSizeMM(QSizeF)"] = 467; - override_function_ids["run()"] = 468; - override_function_ids["bindValue(int,QVariant,QSql::ParamType)"] = 469; - override_function_ids["bindValue(QString,QVariant,QSql::ParamType)"] = 470; - override_function_ids["fetch(int)"] = 471; - override_function_ids["fetchFirst()"] = 472; - override_function_ids["fetchLast()"] = 473; - override_function_ids["fetchNext()"] = 474; - override_function_ids["fetchPrevious()"] = 475; - override_function_ids["isNull(int)"] = 476; - override_function_ids["lastInsertId()"] = 477; - override_function_ids["numRowsAffected()"] = 478; - override_function_ids["prepare(QString)"] = 479; - override_function_ids["record()"] = 480; - override_function_ids["reset(QString)"] = 481; - override_function_ids["savePrepare(QString)"] = 482; - override_function_ids["setActive(bool)"] = 483; - override_function_ids["setAt(int)"] = 484; - override_function_ids["setForwardOnly(bool)"] = 485; - override_function_ids["setQuery(QString)"] = 486; - override_function_ids["setSelect(bool)"] = 487; - override_function_ids["setData(QVariant,int)"] = 488; - override_function_ids["aliases()"] = 489; - override_function_ids["mibEnum()"] = 490; - override_function_ids["name()"] = 491; - override_function_ids["convertFromUnicode(QChar*,int,ConverterState*)"] = 492; - override_function_ids["convertToUnicode(const char*,int,ConverterState*)"] = 493; - override_function_ids["data(int,int)"] = 494; - override_function_ids["setData(int,int,QVariant)"] = 495; - override_function_ids["id()"] = 496; - override_function_ids["mergeWith(QUndoCommand*)"] = 497; - override_function_ids["redo()"] = 498; - override_function_ids["undo()"] = 499; - override_arg_types = new const char** [499]; + override_function_ids["setPageSize(PageSize)"] = 465; + override_function_ids["setPageSizeMM(QSizeF)"] = 466; + override_function_ids["run()"] = 467; + override_function_ids["bindValue(int,QVariant,QSql::ParamType)"] = 468; + override_function_ids["bindValue(QString,QVariant,QSql::ParamType)"] = 469; + override_function_ids["fetch(int)"] = 470; + override_function_ids["fetchFirst()"] = 471; + override_function_ids["fetchLast()"] = 472; + override_function_ids["fetchNext()"] = 473; + override_function_ids["fetchPrevious()"] = 474; + override_function_ids["isNull(int)"] = 475; + override_function_ids["lastInsertId()"] = 476; + override_function_ids["numRowsAffected()"] = 477; + override_function_ids["prepare(QString)"] = 478; + override_function_ids["record()"] = 479; + override_function_ids["reset(QString)"] = 480; + override_function_ids["savePrepare(QString)"] = 481; + override_function_ids["setActive(bool)"] = 482; + override_function_ids["setAt(int)"] = 483; + override_function_ids["setForwardOnly(bool)"] = 484; + override_function_ids["setQuery(QString)"] = 485; + override_function_ids["setSelect(bool)"] = 486; + override_function_ids["setData(QVariant,int)"] = 487; + override_function_ids["aliases()"] = 488; + override_function_ids["mibEnum()"] = 489; + override_function_ids["name()"] = 490; + override_function_ids["convertFromUnicode(QChar*,int,ConverterState*)"] = 491; + override_function_ids["convertToUnicode(const char*,int,ConverterState*)"] = 492; + override_function_ids["data(int,int)"] = 493; + override_function_ids["setData(int,int,QVariant)"] = 494; + override_function_ids["id()"] = 495; + override_function_ids["mergeWith(QUndoCommand*)"] = 496; + override_function_ids["redo()"] = 497; + override_function_ids["undo()"] = 498; + override_arg_types = new const char** [498]; { static const char* s[] = { "int", 0 }; override_arg_types[0] = s; } { static const char* s[] = { 0, "int", 0 }; override_arg_types[1] = s; } { static const char* s[] = { 0, "QAbstractAnimation::Direction", 0 }; override_arg_types[2] = s; } @@ -2043,33 +2045,33 @@ void LObjects::ini(EQL* e) { { static const char* s[] = { "QMimeData*", "QList", 0 }; override_arg_types[283] = s; } { static const char* s[] = { "bool", 0 }; override_arg_types[284] = s; } { static const char* s[] = { "QLocalSocket*", 0 }; override_arg_types[285] = s; } - { static const char* s[] = { 0, "quintptr", 0 }; override_arg_types[286] = s; } - { static const char* s[] = { "QMenu*", 0 }; override_arg_types[287] = s; } - { static const char* s[] = { "QStringList", 0 }; override_arg_types[288] = s; } - { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[289] = s; } - { static const char* s[] = { "QVariant", "QString", "QVariant::Type", 0 }; override_arg_types[290] = s; } - { static const char* s[] = { "QList", "QUrl", 0 }; override_arg_types[291] = s; } + { static const char* s[] = { "QMenu*", 0 }; override_arg_types[286] = s; } + { static const char* s[] = { "QStringList", 0 }; override_arg_types[287] = s; } + { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[288] = s; } + { static const char* s[] = { "QVariant", "QString", "QVariant::Type", 0 }; override_arg_types[289] = s; } + { static const char* s[] = { "QList", "QUrl", 0 }; override_arg_types[290] = s; } + { static const char* s[] = { "bool", "QNetworkCookie", 0 }; override_arg_types[291] = s; } { static const char* s[] = { "bool", "QNetworkCookie", 0 }; override_arg_types[292] = s; } - { static const char* s[] = { "bool", "QNetworkCookie", 0 }; override_arg_types[293] = s; } - { static const char* s[] = { "bool", "QList", "QUrl", 0 }; override_arg_types[294] = s; } - { static const char* s[] = { "bool", "QNetworkCookie", 0 }; override_arg_types[295] = s; } - { static const char* s[] = { "bool", "QNetworkCookie", "QUrl", 0 }; override_arg_types[296] = s; } + { static const char* s[] = { "bool", "QList", "QUrl", 0 }; override_arg_types[293] = s; } + { static const char* s[] = { "bool", "QNetworkCookie", 0 }; override_arg_types[294] = s; } + { static const char* s[] = { "bool", "QNetworkCookie", "QUrl", 0 }; override_arg_types[295] = s; } + { static const char* s[] = { "qlonglong", 0 }; override_arg_types[296] = s; } { static const char* s[] = { "qlonglong", 0 }; override_arg_types[297] = s; } - { static const char* s[] = { "qlonglong", 0 }; override_arg_types[298] = s; } - { static const char* s[] = { "QNetworkCacheMetaData", "QUrl", 0 }; override_arg_types[299] = s; } - { static const char* s[] = { "bool", "QUrl", 0 }; override_arg_types[300] = s; } - { static const char* s[] = { 0, "QNetworkCacheMetaData", 0 }; override_arg_types[301] = s; } - { static const char* s[] = { "bool", 0 }; override_arg_types[302] = s; } + { static const char* s[] = { "QNetworkCacheMetaData", "QUrl", 0 }; override_arg_types[298] = s; } + { static const char* s[] = { "bool", "QUrl", 0 }; override_arg_types[299] = s; } + { static const char* s[] = { 0, "QNetworkCacheMetaData", 0 }; override_arg_types[300] = s; } + { static const char* s[] = { "bool", 0 }; override_arg_types[301] = s; } + { static const char* s[] = { 0, 0 }; override_arg_types[302] = s; } { static const char* s[] = { 0, 0 }; override_arg_types[303] = s; } - { static const char* s[] = { 0, 0 }; override_arg_types[304] = s; } - { static const char* s[] = { 0, "int", "int", 0 }; override_arg_types[305] = s; } + { static const char* s[] = { 0, "int", "int", 0 }; override_arg_types[304] = s; } + { static const char* s[] = { 0, 0 }; override_arg_types[305] = s; } { static const char* s[] = { 0, 0 }; override_arg_types[306] = s; } - { static const char* s[] = { 0, 0 }; override_arg_types[307] = s; } - { static const char* s[] = { "QObject*", 0 }; override_arg_types[308] = s; } - { static const char* s[] = { 0, "QExposeEvent*", 0 }; override_arg_types[309] = s; } - { static const char* s[] = { 0, "QTouchEvent*", 0 }; override_arg_types[310] = s; } - { static const char* s[] = { "QSurfaceFormat", 0 }; override_arg_types[311] = s; } - { static const char* s[] = { "SurfaceType", 0 }; override_arg_types[312] = s; } + { static const char* s[] = { "QObject*", 0 }; override_arg_types[307] = s; } + { static const char* s[] = { 0, "QExposeEvent*", 0 }; override_arg_types[308] = s; } + { static const char* s[] = { 0, "QTouchEvent*", 0 }; override_arg_types[309] = s; } + { static const char* s[] = { "QSurfaceFormat", 0 }; override_arg_types[310] = s; } + { static const char* s[] = { "SurfaceType", 0 }; override_arg_types[311] = s; } + { static const char* s[] = { "bool", 0 }; override_arg_types[312] = s; } { static const char* s[] = { "QVariant", "int", "QUrl", 0 }; override_arg_types[313] = s; } { static const char* s[] = { "bool", "QMimeData*", 0 }; override_arg_types[314] = s; } { static const char* s[] = { "QMimeData*", 0 }; override_arg_types[315] = s; } @@ -2221,55 +2223,45 @@ void LObjects::ini(EQL* e) { { static const char* s[] = { 0, 0 }; override_arg_types[461] = s; } { static const char* s[] = { "int", "QPaintDevice::PaintDeviceMetric", 0 }; override_arg_types[462] = s; } { static const char* s[] = { 0, "const char*", "uint", 0 }; override_arg_types[463] = s; } - { static const char* s[] = { "bool", 0 }; override_arg_types[464] = s; } - { static const char* s[] = { 0, "PageSize", 0 }; override_arg_types[465] = s; } - { static const char* s[] = { 0, "QSizeF", 0 }; override_arg_types[466] = s; } - { static const char* s[] = { 0, 0 }; override_arg_types[467] = s; } - { static const char* s[] = { 0, "int", "QVariant", "QSql::ParamType", 0 }; override_arg_types[468] = s; } - { static const char* s[] = { 0, "QString", "QVariant", "QSql::ParamType", 0 }; override_arg_types[469] = s; } - { static const char* s[] = { "bool", "int", 0 }; override_arg_types[470] = s; } + { static const char* s[] = { 0, "PageSize", 0 }; override_arg_types[464] = s; } + { static const char* s[] = { 0, "QSizeF", 0 }; override_arg_types[465] = s; } + { static const char* s[] = { 0, 0 }; override_arg_types[466] = s; } + { static const char* s[] = { 0, "int", "QVariant", "QSql::ParamType", 0 }; override_arg_types[467] = s; } + { static const char* s[] = { 0, "QString", "QVariant", "QSql::ParamType", 0 }; override_arg_types[468] = s; } + { static const char* s[] = { "bool", "int", 0 }; override_arg_types[469] = s; } + { static const char* s[] = { "bool", 0 }; override_arg_types[470] = s; } { static const char* s[] = { "bool", 0 }; override_arg_types[471] = s; } { static const char* s[] = { "bool", 0 }; override_arg_types[472] = s; } { static const char* s[] = { "bool", 0 }; override_arg_types[473] = s; } - { static const char* s[] = { "bool", 0 }; override_arg_types[474] = s; } - { static const char* s[] = { "bool", "int", 0 }; override_arg_types[475] = s; } - { static const char* s[] = { "QVariant", 0 }; override_arg_types[476] = s; } - { static const char* s[] = { "int", 0 }; override_arg_types[477] = s; } - { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[478] = s; } - { static const char* s[] = { "QSqlRecord", 0 }; override_arg_types[479] = s; } + { static const char* s[] = { "bool", "int", 0 }; override_arg_types[474] = s; } + { static const char* s[] = { "QVariant", 0 }; override_arg_types[475] = s; } + { static const char* s[] = { "int", 0 }; override_arg_types[476] = s; } + { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[477] = s; } + { static const char* s[] = { "QSqlRecord", 0 }; override_arg_types[478] = s; } + { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[479] = s; } { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[480] = s; } - { static const char* s[] = { "bool", "QString", 0 }; override_arg_types[481] = s; } - { static const char* s[] = { 0, "bool", 0 }; override_arg_types[482] = s; } - { static const char* s[] = { 0, "int", 0 }; override_arg_types[483] = s; } - { static const char* s[] = { 0, "bool", 0 }; override_arg_types[484] = s; } - { static const char* s[] = { 0, "QString", 0 }; override_arg_types[485] = s; } - { static const char* s[] = { 0, "bool", 0 }; override_arg_types[486] = s; } - { static const char* s[] = { 0, "QVariant", "int", 0 }; override_arg_types[487] = s; } - { static const char* s[] = { "QList", 0 }; override_arg_types[488] = s; } - { static const char* s[] = { "int", 0 }; override_arg_types[489] = s; } - { static const char* s[] = { "QByteArray", 0 }; override_arg_types[490] = s; } - { static const char* s[] = { "QByteArray", "QChar*", "int", "ConverterState*", 0 }; override_arg_types[491] = s; } - { static const char* s[] = { "QString", "const char*", "int", "ConverterState*", 0 }; override_arg_types[492] = s; } - { static const char* s[] = { "QVariant", "int", "int", 0 }; override_arg_types[493] = s; } - { static const char* s[] = { 0, "int", "int", "QVariant", 0 }; override_arg_types[494] = s; } - { static const char* s[] = { "int", 0 }; override_arg_types[495] = s; } - { static const char* s[] = { "bool", "QUndoCommand*", 0 }; override_arg_types[496] = s; } + { static const char* s[] = { 0, "bool", 0 }; override_arg_types[481] = s; } + { static const char* s[] = { 0, "int", 0 }; override_arg_types[482] = s; } + { static const char* s[] = { 0, "bool", 0 }; override_arg_types[483] = s; } + { static const char* s[] = { 0, "QString", 0 }; override_arg_types[484] = s; } + { static const char* s[] = { 0, "bool", 0 }; override_arg_types[485] = s; } + { static const char* s[] = { 0, "QVariant", "int", 0 }; override_arg_types[486] = s; } + { static const char* s[] = { "QList", 0 }; override_arg_types[487] = s; } + { static const char* s[] = { "int", 0 }; override_arg_types[488] = s; } + { static const char* s[] = { "QByteArray", 0 }; override_arg_types[489] = s; } + { static const char* s[] = { "QByteArray", "QChar*", "int", "ConverterState*", 0 }; override_arg_types[490] = s; } + { static const char* s[] = { "QString", "const char*", "int", "ConverterState*", 0 }; override_arg_types[491] = s; } + { static const char* s[] = { "QVariant", "int", "int", 0 }; override_arg_types[492] = s; } + { static const char* s[] = { 0, "int", "int", "QVariant", 0 }; override_arg_types[493] = s; } + { static const char* s[] = { "int", 0 }; override_arg_types[494] = s; } + { static const char* s[] = { "bool", "QUndoCommand*", 0 }; override_arg_types[495] = s; } + { static const char* s[] = { 0, 0 }; override_arg_types[496] = s; } { static const char* s[] = { 0, 0 }; override_arg_types[497] = s; } - { static const char* s[] = { 0, 0 }; override_arg_types[498] = s; } qNames = q_names.keys(); nNames = n_names.keys(); }} -void LObjects::cleanUp() { - delete EQL::eventLoop; - delete[] override_arg_types; - for(int i = 214; i + 1; --i) { delete N[i]; } - for(int i = 240; i + 1; --i) { delete Q[i]; } - delete[] N; - delete[] Q; - delete dynObject; } - quint64 LObjects::override_id(uint unique, int id) { - return (499 * (quint64)unique + id); } + return (214 * (quint64)unique + id); } void* LObjects::overrideFun(quint64 id) { return override_lisp_functions.value(id, 0); } @@ -2458,82 +2450,83 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 144: m = &QPanGesture::staticMetaObject; break; case 145: m = &QParallelAnimationGroup::staticMetaObject; break; case 146: m = &QPauseAnimation::staticMetaObject; break; - case 147: m = &QPinchGesture::staticMetaObject; break; - case 148: m = &QPlainTextDocumentLayout::staticMetaObject; break; - case 149: m = &QPlainTextEdit::staticMetaObject; break; - case 150: m = &QPluginLoader::staticMetaObject; break; - case 151: m = &QPrintDialog::staticMetaObject; break; - case 152: m = &QPrintPreviewDialog::staticMetaObject; break; - case 153: m = &QPrintPreviewWidget::staticMetaObject; break; - case 154: m = &QProcess::staticMetaObject; break; - case 155: m = &QProgressBar::staticMetaObject; break; - case 156: m = &QProgressDialog::staticMetaObject; break; - case 157: m = &QPropertyAnimation::staticMetaObject; break; - case 158: m = &QPushButton::staticMetaObject; break; - case 159: m = &QRadioButton::staticMetaObject; break; - case 161: m = &QRegExpValidator::staticMetaObject; break; - case 162: m = &QRubberBand::staticMetaObject; break; - case 163: m = &QScreen::staticMetaObject; break; - case 164: m = &QScrollArea::staticMetaObject; break; - case 165: m = &QScrollBar::staticMetaObject; break; - case 166: m = &QSequentialAnimationGroup::staticMetaObject; break; - case 167: m = &QSessionManager::staticMetaObject; break; - case 168: m = &QSettings::staticMetaObject; break; - case 169: m = &QShortcut::staticMetaObject; break; - case 170: m = &QSignalTransition::staticMetaObject; break; - case 171: m = &QSizeGrip::staticMetaObject; break; - case 172: m = &QSlider::staticMetaObject; break; - case 173: m = &QSortFilterProxyModel::staticMetaObject; break; - case 174: m = &QSpinBox::staticMetaObject; break; - case 175: m = &QSplashScreen::staticMetaObject; break; - case 176: m = &QSplitter::staticMetaObject; break; - case 177: m = &QSplitterHandle::staticMetaObject; break; - case 183: m = &QStackedLayout::staticMetaObject; break; - case 184: m = &QStackedWidget::staticMetaObject; break; - case 185: m = &QStandardItemModel::staticMetaObject; break; - case 186: m = &QState::staticMetaObject; break; - case 187: m = &QStateMachine::staticMetaObject; break; - case 188: m = &QStatusBar::staticMetaObject; break; - case 189: m = &QStringListModel::staticMetaObject; break; - case 190: m = &QStyle::staticMetaObject; break; - case 191: m = &QStyledItemDelegate::staticMetaObject; break; - case 194: m = &QSwipeGesture::staticMetaObject; break; - case 195: m = &QSyntaxHighlighter::staticMetaObject; break; - case 196: m = &QSystemTrayIcon::staticMetaObject; break; - case 197: m = &QTabBar::staticMetaObject; break; - case 198: m = &QTabWidget::staticMetaObject; break; - case 199: m = &QTableView::staticMetaObject; break; - case 200: m = &QTableWidget::staticMetaObject; break; - case 201: m = &QTapAndHoldGesture::staticMetaObject; break; - case 202: m = &QTapGesture::staticMetaObject; break; - case 205: m = &QTextBlockGroup::staticMetaObject; break; - case 206: m = &QTextBrowser::staticMetaObject; break; - case 207: m = &QTextDocument::staticMetaObject; break; - case 208: m = &QTextEdit::staticMetaObject; break; - case 209: m = &QTextFrame::staticMetaObject; break; - case 210: m = &QTextList::staticMetaObject; break; - case 211: m = &QTextObject::staticMetaObject; break; - case 212: m = &QTextTable::staticMetaObject; break; - case 213: m = &QTimeEdit::staticMetaObject; break; - case 214: m = &QTimeLine::staticMetaObject; break; - case 215: m = &QTimer::staticMetaObject; break; - case 216: m = &QToolBar::staticMetaObject; break; - case 217: m = &QToolBox::staticMetaObject; break; - case 218: m = &QToolButton::staticMetaObject; break; - case 219: m = &QTranslator::staticMetaObject; break; - case 220: m = &QTreeView::staticMetaObject; break; - case 221: m = &QTreeWidget::staticMetaObject; break; - case 223: m = &QUndoGroup::staticMetaObject; break; - case 224: m = &QUndoStack::staticMetaObject; break; - case 225: m = &QUndoView::staticMetaObject; break; - case 226: m = &QVBoxLayout::staticMetaObject; break; - case 227: m = &QValidator::staticMetaObject; break; - case 228: m = &QVariantAnimation::staticMetaObject; break; - case 237: m = &QWidget::staticMetaObject; break; - case 238: m = &QWidgetAction::staticMetaObject; break; - case 239: m = &QWindow::staticMetaObject; break; - case 240: m = &QWizard::staticMetaObject; break; - case 241: m = &QWizardPage::staticMetaObject; break; + case 147: m = &QPdfWriter::staticMetaObject; break; + case 148: m = &QPinchGesture::staticMetaObject; break; + case 149: m = &QPlainTextDocumentLayout::staticMetaObject; break; + case 150: m = &QPlainTextEdit::staticMetaObject; break; + case 151: m = &QPluginLoader::staticMetaObject; break; + case 152: m = &QPrintDialog::staticMetaObject; break; + case 153: m = &QPrintPreviewDialog::staticMetaObject; break; + case 154: m = &QPrintPreviewWidget::staticMetaObject; break; + case 155: m = &QProcess::staticMetaObject; break; + case 156: m = &QProgressBar::staticMetaObject; break; + case 157: m = &QProgressDialog::staticMetaObject; break; + case 158: m = &QPropertyAnimation::staticMetaObject; break; + case 159: m = &QPushButton::staticMetaObject; break; + case 160: m = &QRadioButton::staticMetaObject; break; + case 162: m = &QRegExpValidator::staticMetaObject; break; + case 163: m = &QRubberBand::staticMetaObject; break; + case 164: m = &QScreen::staticMetaObject; break; + case 165: m = &QScrollArea::staticMetaObject; break; + case 166: m = &QScrollBar::staticMetaObject; break; + case 167: m = &QSequentialAnimationGroup::staticMetaObject; break; + case 168: m = &QSessionManager::staticMetaObject; break; + case 169: m = &QSettings::staticMetaObject; break; + case 170: m = &QShortcut::staticMetaObject; break; + case 171: m = &QSignalTransition::staticMetaObject; break; + case 172: m = &QSizeGrip::staticMetaObject; break; + case 173: m = &QSlider::staticMetaObject; break; + case 174: m = &QSortFilterProxyModel::staticMetaObject; break; + case 175: m = &QSpinBox::staticMetaObject; break; + case 176: m = &QSplashScreen::staticMetaObject; break; + case 177: m = &QSplitter::staticMetaObject; break; + case 178: m = &QSplitterHandle::staticMetaObject; break; + case 184: m = &QStackedLayout::staticMetaObject; break; + case 185: m = &QStackedWidget::staticMetaObject; break; + case 186: m = &QStandardItemModel::staticMetaObject; break; + case 187: m = &QState::staticMetaObject; break; + case 188: m = &QStateMachine::staticMetaObject; break; + case 189: m = &QStatusBar::staticMetaObject; break; + case 190: m = &QStringListModel::staticMetaObject; break; + case 191: m = &QStyle::staticMetaObject; break; + case 192: m = &QStyledItemDelegate::staticMetaObject; break; + case 195: m = &QSwipeGesture::staticMetaObject; break; + case 196: m = &QSyntaxHighlighter::staticMetaObject; break; + case 197: m = &QSystemTrayIcon::staticMetaObject; break; + case 198: m = &QTabBar::staticMetaObject; break; + case 199: m = &QTabWidget::staticMetaObject; break; + case 200: m = &QTableView::staticMetaObject; break; + case 201: m = &QTableWidget::staticMetaObject; break; + case 202: m = &QTapAndHoldGesture::staticMetaObject; break; + case 203: m = &QTapGesture::staticMetaObject; break; + case 206: m = &QTextBlockGroup::staticMetaObject; break; + case 207: m = &QTextBrowser::staticMetaObject; break; + case 208: m = &QTextDocument::staticMetaObject; break; + case 209: m = &QTextEdit::staticMetaObject; break; + case 210: m = &QTextFrame::staticMetaObject; break; + case 211: m = &QTextList::staticMetaObject; break; + case 212: m = &QTextObject::staticMetaObject; break; + case 213: m = &QTextTable::staticMetaObject; break; + case 214: m = &QTimeEdit::staticMetaObject; break; + case 215: m = &QTimeLine::staticMetaObject; break; + case 216: m = &QTimer::staticMetaObject; break; + case 217: m = &QToolBar::staticMetaObject; break; + case 218: m = &QToolBox::staticMetaObject; break; + case 219: m = &QToolButton::staticMetaObject; break; + case 220: m = &QTranslator::staticMetaObject; break; + case 221: m = &QTreeView::staticMetaObject; break; + case 222: m = &QTreeWidget::staticMetaObject; break; + case 224: m = &QUndoGroup::staticMetaObject; break; + case 225: m = &QUndoStack::staticMetaObject; break; + case 226: m = &QUndoView::staticMetaObject; break; + case 227: m = &QVBoxLayout::staticMetaObject; break; + case 228: m = &QValidator::staticMetaObject; break; + case 229: m = &QVariantAnimation::staticMetaObject; break; + case 238: m = &QWidget::staticMetaObject; break; + case 239: m = &QWidgetAction::staticMetaObject; break; + case 240: m = &QWindow::staticMetaObject; break; + case 241: m = &QWizard::staticMetaObject; break; + case 242: m = &QWizardPage::staticMetaObject; break; case 94: case 95: case 96: @@ -2560,9 +2553,9 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 123: case 124: case 125: - case 160: - case 229: + case 161: case 230: + case 231: if(staticMetaObject_multimedia) { m = staticMetaObject_multimedia(n); } break; @@ -2574,33 +2567,33 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 133: case 134: case 135: - case 203: case 204: - case 222: + case 205: + case 223: if(staticMetaObject_network) { m = staticMetaObject_network(n); } break; - case 178: case 179: case 180: case 181: case 182: + case 183: if(staticMetaObject_sql) { m = staticMetaObject_sql(n); } break; case 82: - case 192: case 193: + case 194: if(staticMetaObject_svg) { m = staticMetaObject_svg(n); } break; case 87: - case 231: case 232: case 233: case 234: case 235: case 236: + case 237: if(staticMetaObject_webkit) { m = staticMetaObject_webkit(n); } break; } @@ -3029,79 +3022,80 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 144: ids = LPanGesture::overrideIds; break; case 145: ids = LParallelAnimationGroup::overrideIds; break; case 146: ids = LPauseAnimation::overrideIds; break; - case 147: ids = LPinchGesture::overrideIds; break; - case 148: ids = LPlainTextDocumentLayout::overrideIds; break; - case 149: ids = LPlainTextEdit::overrideIds; break; - case 150: ids = LPluginLoader::overrideIds; break; - case 151: ids = LPrintDialog::overrideIds; break; - case 152: ids = LPrintPreviewDialog::overrideIds; break; - case 153: ids = LPrintPreviewWidget::overrideIds; break; - case 154: ids = LProcess::overrideIds; break; - case 155: ids = LProgressBar::overrideIds; break; - case 156: ids = LProgressDialog::overrideIds; break; - case 157: ids = LPropertyAnimation::overrideIds; break; - case 158: ids = LPushButton::overrideIds; break; - case 159: ids = LRadioButton::overrideIds; break; - case 161: ids = LRegExpValidator::overrideIds; break; - case 162: ids = LRubberBand::overrideIds; break; - case 164: ids = LScrollArea::overrideIds; break; - case 165: ids = LScrollBar::overrideIds; break; - case 166: ids = LSequentialAnimationGroup::overrideIds; break; - case 168: ids = LSettings::overrideIds; break; - case 169: ids = LShortcut::overrideIds; break; - case 170: ids = LSignalTransition::overrideIds; break; - case 171: ids = LSizeGrip::overrideIds; break; - case 172: ids = LSlider::overrideIds; break; - case 173: ids = LSortFilterProxyModel::overrideIds; break; - case 174: ids = LSpinBox::overrideIds; break; - case 175: ids = LSplashScreen::overrideIds; break; - case 176: ids = LSplitter::overrideIds; break; - case 177: ids = LSplitterHandle::overrideIds; break; - case 183: ids = LStackedLayout::overrideIds; break; - case 184: ids = LStackedWidget::overrideIds; break; - case 185: ids = LStandardItemModel::overrideIds; break; - case 186: ids = LState::overrideIds; break; - case 187: ids = LStateMachine::overrideIds; break; - case 188: ids = LStatusBar::overrideIds; break; - case 189: ids = LStringListModel::overrideIds; break; - case 191: ids = LStyledItemDelegate::overrideIds; break; - case 194: ids = LSwipeGesture::overrideIds; break; - case 195: ids = LSyntaxHighlighter::overrideIds; break; - case 196: ids = LSystemTrayIcon::overrideIds; break; - case 197: ids = LTabBar::overrideIds; break; - case 198: ids = LTabWidget::overrideIds; break; - case 199: ids = LTableView::overrideIds; break; - case 200: ids = LTableWidget::overrideIds; break; - case 201: ids = LTapAndHoldGesture::overrideIds; break; - case 202: ids = LTapGesture::overrideIds; break; - case 205: ids = LTextBlockGroup::overrideIds; break; - case 206: ids = LTextBrowser::overrideIds; break; - case 207: ids = LTextDocument::overrideIds; break; - case 208: ids = LTextEdit::overrideIds; break; - case 209: ids = LTextFrame::overrideIds; break; - case 210: ids = LTextList::overrideIds; break; - case 211: ids = LTextObject::overrideIds; break; - case 212: ids = LTextTable::overrideIds; break; - case 213: ids = LTimeEdit::overrideIds; break; - case 214: ids = LTimeLine::overrideIds; break; - case 215: ids = LTimer::overrideIds; break; - case 216: ids = LToolBar::overrideIds; break; - case 217: ids = LToolBox::overrideIds; break; - case 218: ids = LToolButton::overrideIds; break; - case 219: ids = LTranslator::overrideIds; break; - case 220: ids = LTreeView::overrideIds; break; - case 221: ids = LTreeWidget::overrideIds; break; - case 223: ids = LUndoGroup::overrideIds; break; - case 224: ids = LUndoStack::overrideIds; break; - case 225: ids = LUndoView::overrideIds; break; - case 226: ids = LVBoxLayout::overrideIds; break; - case 227: ids = LValidator::overrideIds; break; - case 228: ids = LVariantAnimation::overrideIds; break; - case 237: ids = LWidget::overrideIds; break; - case 238: ids = LWidgetAction::overrideIds; break; - case 239: ids = LWindow::overrideIds; break; - case 240: ids = LWizard::overrideIds; break; - case 241: ids = LWizardPage::overrideIds; break; + case 147: ids = LPdfWriter::overrideIds; break; + case 148: ids = LPinchGesture::overrideIds; break; + case 149: ids = LPlainTextDocumentLayout::overrideIds; break; + case 150: ids = LPlainTextEdit::overrideIds; break; + case 151: ids = LPluginLoader::overrideIds; break; + case 152: ids = LPrintDialog::overrideIds; break; + case 153: ids = LPrintPreviewDialog::overrideIds; break; + case 154: ids = LPrintPreviewWidget::overrideIds; break; + case 155: ids = LProcess::overrideIds; break; + case 156: ids = LProgressBar::overrideIds; break; + case 157: ids = LProgressDialog::overrideIds; break; + case 158: ids = LPropertyAnimation::overrideIds; break; + case 159: ids = LPushButton::overrideIds; break; + case 160: ids = LRadioButton::overrideIds; break; + case 162: ids = LRegExpValidator::overrideIds; break; + case 163: ids = LRubberBand::overrideIds; break; + case 165: ids = LScrollArea::overrideIds; break; + case 166: ids = LScrollBar::overrideIds; break; + case 167: ids = LSequentialAnimationGroup::overrideIds; break; + case 169: ids = LSettings::overrideIds; break; + case 170: ids = LShortcut::overrideIds; break; + case 171: ids = LSignalTransition::overrideIds; break; + case 172: ids = LSizeGrip::overrideIds; break; + case 173: ids = LSlider::overrideIds; break; + case 174: ids = LSortFilterProxyModel::overrideIds; break; + case 175: ids = LSpinBox::overrideIds; break; + case 176: ids = LSplashScreen::overrideIds; break; + case 177: ids = LSplitter::overrideIds; break; + case 178: ids = LSplitterHandle::overrideIds; break; + case 184: ids = LStackedLayout::overrideIds; break; + case 185: ids = LStackedWidget::overrideIds; break; + case 186: ids = LStandardItemModel::overrideIds; break; + case 187: ids = LState::overrideIds; break; + case 188: ids = LStateMachine::overrideIds; break; + case 189: ids = LStatusBar::overrideIds; break; + case 190: ids = LStringListModel::overrideIds; break; + case 192: ids = LStyledItemDelegate::overrideIds; break; + case 195: ids = LSwipeGesture::overrideIds; break; + case 196: ids = LSyntaxHighlighter::overrideIds; break; + case 197: ids = LSystemTrayIcon::overrideIds; break; + case 198: ids = LTabBar::overrideIds; break; + case 199: ids = LTabWidget::overrideIds; break; + case 200: ids = LTableView::overrideIds; break; + case 201: ids = LTableWidget::overrideIds; break; + case 202: ids = LTapAndHoldGesture::overrideIds; break; + case 203: ids = LTapGesture::overrideIds; break; + case 206: ids = LTextBlockGroup::overrideIds; break; + case 207: ids = LTextBrowser::overrideIds; break; + case 208: ids = LTextDocument::overrideIds; break; + case 209: ids = LTextEdit::overrideIds; break; + case 210: ids = LTextFrame::overrideIds; break; + case 211: ids = LTextList::overrideIds; break; + case 212: ids = LTextObject::overrideIds; break; + case 213: ids = LTextTable::overrideIds; break; + case 214: ids = LTimeEdit::overrideIds; break; + case 215: ids = LTimeLine::overrideIds; break; + case 216: ids = LTimer::overrideIds; break; + case 217: ids = LToolBar::overrideIds; break; + case 218: ids = LToolBox::overrideIds; break; + case 219: ids = LToolButton::overrideIds; break; + case 220: ids = LTranslator::overrideIds; break; + case 221: ids = LTreeView::overrideIds; break; + case 222: ids = LTreeWidget::overrideIds; break; + case 224: ids = LUndoGroup::overrideIds; break; + case 225: ids = LUndoStack::overrideIds; break; + case 226: ids = LUndoView::overrideIds; break; + case 227: ids = LVBoxLayout::overrideIds; break; + case 228: ids = LValidator::overrideIds; break; + case 229: ids = LVariantAnimation::overrideIds; break; + case 238: ids = LWidget::overrideIds; break; + case 239: ids = LWidgetAction::overrideIds; break; + case 240: ids = LWindow::overrideIds; break; + case 241: ids = LWizard::overrideIds; break; + case 242: ids = LWizardPage::overrideIds; break; case 94: case 95: case 96: @@ -3130,9 +3124,9 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 123: case 124: case 125: - case 160: - case 229: + case 161: case 230: + case 231: if(override_multimedia) { NumList* _ids = override_multimedia(name); if(_ids) { @@ -3146,39 +3140,39 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 133: case 134: case 135: - case 203: case 204: - case 222: + case 205: + case 223: if(override_network) { NumList* _ids = override_network(name); if(_ids) { ids = *_ids; }} break; - case 178: case 179: case 180: case 181: case 182: + case 183: if(override_sql) { NumList* _ids = override_sql(name); if(_ids) { ids = *_ids; }} break; case 82: - case 192: case 193: + case 194: if(override_svg) { NumList* _ids = override_svg(name); if(_ids) { ids = *_ids; }} break; case 87: - case 231: case 232: case 233: case 234: case 235: case 236: + case 237: if(override_webkit) { NumList* _ids = override_webkit(name); if(_ids) { diff --git a/src/gen/_lobjects.h b/src/gen/_lobjects.h index a5651f2..e9cdbf0 100644 --- a/src/gen/_lobjects.h +++ b/src/gen/_lobjects.h @@ -91,7 +91,6 @@ public: static QHash override_lisp_functions; static void ini(EQL*); - static void cleanUp(); static uint unique() { return ++i_unique; } // safe: e.g. on 32 bit, 100 new QT-OBJECTs/sec would take more than one year to overflow static void deleteNObject(int, void*, int = 0); static const QMetaObject* staticMetaObject(const QByteArray&, int n = 0); diff --git a/src/gen/_main_n_classes.h b/src/gen/_main_n_classes.h index d75a24e..1c37704 100644 --- a/src/gen/_main_n_classes.h +++ b/src/gen/_main_n_classes.h @@ -1181,6 +1181,7 @@ class LPainter : public QPainter { friend class N112; public: LPainter(uint u, QImage* x1) : QPainter(x1), unique(u) {} + LPainter(uint u, QPdfWriter* x1) : QPainter(x1), unique(u) {} LPainter(uint u, QPicture* x1) : QPainter(x1), unique(u) {} LPainter(uint u, QPixmap* x1) : QPainter(x1), unique(u) {} LPainter(uint u, QPrinter* x1) : QPainter(x1), unique(u) {} @@ -1293,9 +1294,9 @@ public: static NumList overrideIds; uint unique; - bool newPage() { quint64 id = LObjects::override_id(unique, 465); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 465, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPrinter::newPage(); } return ret; } - void setPageSize(PageSize x1) { quint64 id = LObjects::override_id(unique, 466); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 466, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSize(x1); }} - void setPageSizeMM(const QSizeF& x1) { quint64 id = LObjects::override_id(unique, 467); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 467, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSizeMM(x1); }} + bool newPage() { quint64 id = LObjects::override_id(unique, 313); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 313, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPrinter::newPage(); } return ret; } + void setPageSize(PageSize x1) { quint64 id = LObjects::override_id(unique, 465); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 465, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSize(x1); }} + void setPageSizeMM(const QSizeF& x1) { quint64 id = LObjects::override_id(unique, 466); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 466, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSizeMM(x1); }} }; class LPrinterInfo : public QPrinterInfo { @@ -1414,7 +1415,7 @@ public: static NumList overrideIds; uint unique; - void run() { quint64 id = LObjects::override_id(unique, 468); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 468, 0, id); }} + void run() { quint64 id = LObjects::override_id(unique, 467); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 467, 0, id); }} }; class LSemaphore : public QSemaphore { @@ -1492,7 +1493,7 @@ public: QStandardItem* clone() const { quint64 id = LObjects::override_id(unique, 458); void* fun = LObjects::overrideFun(id); QStandardItem* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QStandardItem*)callOverrideFun(fun, 458, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QStandardItem::clone(); } return ret; } QVariant data(int x1 = Qt::UserRole+1) const { quint64 id = LObjects::override_id(unique, 459); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 459, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QStandardItem::data(x1); } return ret; } - void setData(const QVariant& x1, int x2 = Qt::UserRole+1) { quint64 id = LObjects::override_id(unique, 488); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 488, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QStandardItem::setData(x1, x2); }} + void setData(const QVariant& x1, int x2 = Qt::UserRole+1) { quint64 id = LObjects::override_id(unique, 487); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 487, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QStandardItem::setData(x1, x2); }} int type() const { quint64 id = LObjects::override_id(unique, 233); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 233, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QStandardItem::type(); } return ret; } }; @@ -1624,11 +1625,11 @@ public: static NumList overrideIds; uint unique; - QList aliases() const { quint64 id = LObjects::override_id(unique, 489); void* fun = LObjects::overrideFun(id); QList ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 489, 0, id).value >(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QTextCodec::aliases(); } return ret; } - int mibEnum() const { quint64 id = LObjects::override_id(unique, 490); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 490, 0, id).toInt(); } return ret; } - QByteArray name() const { quint64 id = LObjects::override_id(unique, 491); void* fun = LObjects::overrideFun(id); QByteArray ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 491, 0, id).value(); } return ret; } - QByteArray convertFromUnicode(const QChar* x1, int x2, ConverterState* x3) const { quint64 id = LObjects::override_id(unique, 492); void* fun = LObjects::overrideFun(id); QByteArray ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 492, args, id).value(); } return ret; } - QString convertToUnicode(const char* x1, int x2, ConverterState* x3) const { quint64 id = LObjects::override_id(unique, 493); void* fun = LObjects::overrideFun(id); QString ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 493, args, id).value(); } return ret; } + QList aliases() const { quint64 id = LObjects::override_id(unique, 488); void* fun = LObjects::overrideFun(id); QList ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 488, 0, id).value >(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QTextCodec::aliases(); } return ret; } + int mibEnum() const { quint64 id = LObjects::override_id(unique, 489); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 489, 0, id).toInt(); } return ret; } + QByteArray name() const { quint64 id = LObjects::override_id(unique, 490); void* fun = LObjects::overrideFun(id); QByteArray ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 490, 0, id).value(); } return ret; } + QByteArray convertFromUnicode(const QChar* x1, int x2, ConverterState* x3) const { quint64 id = LObjects::override_id(unique, 491); void* fun = LObjects::overrideFun(id); QByteArray ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 491, args, id).value(); } return ret; } + QString convertToUnicode(const char* x1, int x2, ConverterState* x3) const { quint64 id = LObjects::override_id(unique, 492); void* fun = LObjects::overrideFun(id); QString ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 492, args, id).value(); } return ret; } }; class LTextCursor : public QTextCursor { @@ -1881,8 +1882,8 @@ public: uint unique; QTreeWidgetItem* clone() const { quint64 id = LObjects::override_id(unique, 458); void* fun = LObjects::overrideFun(id); QTreeWidgetItem* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QTreeWidgetItem*)callOverrideFun(fun, 458, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QTreeWidgetItem::clone(); } return ret; } - QVariant data(int x1, int x2) const { quint64 id = LObjects::override_id(unique, 494); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 494, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QTreeWidgetItem::data(x1, x2); } return ret; } - void setData(int x1, int x2, const QVariant& x3) { quint64 id = LObjects::override_id(unique, 495); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; callOverrideFun(fun, 495, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QTreeWidgetItem::setData(x1, x2, x3); }} + QVariant data(int x1, int x2) const { quint64 id = LObjects::override_id(unique, 493); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 493, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QTreeWidgetItem::data(x1, x2); } return ret; } + void setData(int x1, int x2, const QVariant& x3) { quint64 id = LObjects::override_id(unique, 494); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; callOverrideFun(fun, 494, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QTreeWidgetItem::setData(x1, x2, x3); }} }; class LUndoCommand : public QUndoCommand { @@ -1894,10 +1895,10 @@ public: static NumList overrideIds; uint unique; - int id() const { quint64 id = LObjects::override_id(unique, 496); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 496, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QUndoCommand::id(); } return ret; } - bool mergeWith(const QUndoCommand* x1) { quint64 id = LObjects::override_id(unique, 497); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 497, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QUndoCommand::mergeWith(x1); } return ret; } - void redo() { quint64 id = LObjects::override_id(unique, 498); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 498, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QUndoCommand::redo(); }} - void undo() { quint64 id = LObjects::override_id(unique, 499); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 499, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QUndoCommand::undo(); }} + int id() const { quint64 id = LObjects::override_id(unique, 495); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 495, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QUndoCommand::id(); } return ret; } + bool mergeWith(const QUndoCommand* x1) { quint64 id = LObjects::override_id(unique, 496); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 496, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QUndoCommand::mergeWith(x1); } return ret; } + void redo() { quint64 id = LObjects::override_id(unique, 497); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 497, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QUndoCommand::redo(); }} + void undo() { quint64 id = LObjects::override_id(unique, 498); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 498, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QUndoCommand::undo(); }} }; class LUrl : public QUrl { diff --git a/src/gen/_main_n_methods.h b/src/gen/_main_n_methods.h index 896c50e..2df9d06 100644 --- a/src/gen/_main_n_methods.h +++ b/src/gen/_main_n_methods.h @@ -1296,7 +1296,6 @@ public: Q_INVOKABLE int Mcolumn(QModelIndex* o) const { return o->column(); } Q_INVOKABLE QVariant Mdata(QModelIndex* o, int x1 = Qt::DisplayRole) const { return o->data(x1); } Q_INVOKABLE int Mflags(QModelIndex* o) const { return o->flags(); } - Q_INVOKABLE quintptr MinternalId(QModelIndex* o) const { return o->internalId(); } Q_INVOKABLE bool MisValid(QModelIndex* o) const { return o->isValid(); } Q_INVOKABLE const QAbstractItemModel* Mmodel(QModelIndex* o) const { return o->model(); } Q_INVOKABLE QModelIndex Mparent(QModelIndex* o) const { return o->parent(); } @@ -1409,6 +1408,8 @@ class EQL_EXPORT N112 : public QObject { // QPainter public: Q_INVOKABLE void* C(uint u, QImage* x1) { return new LPainter(u, x1); } Q_INVOKABLE bool Mbegin(QPainter* o, QImage* x1) { return o->begin(x1); } + Q_INVOKABLE void* C(uint u, QPdfWriter* x1) { return new LPainter(u, x1); } + Q_INVOKABLE bool Mbegin(QPainter* o, QPdfWriter* x1) { return o->begin(x1); } Q_INVOKABLE void* C(uint u, QPicture* x1) { return new LPainter(u, x1); } Q_INVOKABLE bool Mbegin(QPainter* o, QPicture* x1) { return o->begin(x1); } Q_INVOKABLE void* C(uint u, QPixmap* x1) { return new LPainter(u, x1); } diff --git a/src/gen/_main_q_classes.h b/src/gen/_main_q_classes.h index c14f64d..5fa5052 100644 --- a/src/gen/_main_q_classes.h +++ b/src/gen/_main_q_classes.h @@ -3239,7 +3239,7 @@ public: static NumList overrideIds; uint unique; - QMenu* createPopupMenu() { quint64 id = LObjects::override_id(unique, 288); void* fun = LObjects::overrideFun(id); QMenu* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QMenu*)callOverrideFun(fun, 288, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMainWindow::createPopupMenu(); } return ret; } + QMenu* createPopupMenu() { quint64 id = LObjects::override_id(unique, 287); void* fun = LObjects::overrideFun(id); QMenu* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QMenu*)callOverrideFun(fun, 287, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMainWindow::createPopupMenu(); } return ret; } void contextMenuEvent(QContextMenuEvent* x1) { quint64 id = LObjects::override_id(unique, 28); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 28, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QMainWindow::contextMenuEvent(x1); }} bool hasHeightForWidth() const { quint64 id = LObjects::override_id(unique, 21); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 21, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMainWindow::hasHeightForWidth(); } return ret; } int heightForWidth(int x1) const { quint64 id = LObjects::override_id(unique, 22); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 22, args, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMainWindow::heightForWidth(x1); } return ret; } @@ -3541,9 +3541,9 @@ public: static NumList overrideIds; uint unique; - QStringList formats() const { quint64 id = LObjects::override_id(unique, 289); void* fun = LObjects::overrideFun(id); QStringList ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 289, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::formats(); } return ret; } - bool hasFormat(const QString& x1) const { quint64 id = LObjects::override_id(unique, 290); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 290, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::hasFormat(x1); } return ret; } - QVariant retrieveData(const QString& x1, QVariant::Type x2) const { quint64 id = LObjects::override_id(unique, 291); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 291, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::retrieveData(x1, x2); } return ret; } + QStringList formats() const { quint64 id = LObjects::override_id(unique, 288); void* fun = LObjects::overrideFun(id); QStringList ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 288, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::formats(); } return ret; } + bool hasFormat(const QString& x1) const { quint64 id = LObjects::override_id(unique, 289); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 289, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::hasFormat(x1); } return ret; } + QVariant retrieveData(const QString& x1, QVariant::Type x2) const { quint64 id = LObjects::override_id(unique, 290); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 290, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::retrieveData(x1, x2); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QMimeData::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QMimeData::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QMimeData::customEvent(x1); }} @@ -3638,7 +3638,7 @@ public: static NumList overrideIds; uint unique; - bool link() { quint64 id = LObjects::override_id(unique, 303); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 303, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLShaderProgram::link(); } return ret; } + bool link() { quint64 id = LObjects::override_id(unique, 302); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 302, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLShaderProgram::link(); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLShaderProgram::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLShaderProgram::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLShaderProgram::customEvent(x1); }} @@ -3654,9 +3654,9 @@ public: static NumList overrideIds; uint unique; - void initializeGL() { quint64 id = LObjects::override_id(unique, 304); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 304, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::initializeGL(); }} - void paintGL() { quint64 id = LObjects::override_id(unique, 305); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 305, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::paintGL(); }} - void resizeGL(int x1, int x2) { quint64 id = LObjects::override_id(unique, 306); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 306, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::resizeGL(x1, x2); }} + void initializeGL() { quint64 id = LObjects::override_id(unique, 303); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 303, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::initializeGL(); }} + void paintGL() { quint64 id = LObjects::override_id(unique, 304); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 304, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::paintGL(); }} + void resizeGL(int x1, int x2) { quint64 id = LObjects::override_id(unique, 305); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 305, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::resizeGL(x1, x2); }} void paintEvent(QPaintEvent* x1) { quint64 id = LObjects::override_id(unique, 20); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 20, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::paintEvent(x1); }} void resizeEvent(QResizeEvent* x1) { quint64 id = LObjects::override_id(unique, 40); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 40, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWidget::resizeEvent(x1); }} bool hasHeightForWidth() const { quint64 id = LObjects::override_id(unique, 21); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 21, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWidget::hasHeightForWidth(); } return ret; } @@ -3707,15 +3707,15 @@ public: static NumList overrideIds; uint unique; - void initializeGL() { quint64 id = LObjects::override_id(unique, 304); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 304, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::initializeGL(); }} - void paintGL() { quint64 id = LObjects::override_id(unique, 305); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 305, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintGL(); }} - void paintOverGL() { quint64 id = LObjects::override_id(unique, 307); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 307, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintOverGL(); }} - void paintUnderGL() { quint64 id = LObjects::override_id(unique, 308); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 308, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintUnderGL(); }} - void resizeGL(int x1, int x2) { quint64 id = LObjects::override_id(unique, 306); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 306, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::resizeGL(x1, x2); }} + void initializeGL() { quint64 id = LObjects::override_id(unique, 303); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 303, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::initializeGL(); }} + void paintGL() { quint64 id = LObjects::override_id(unique, 304); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 304, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintGL(); }} + void paintOverGL() { quint64 id = LObjects::override_id(unique, 306); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 306, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintOverGL(); }} + void paintUnderGL() { quint64 id = LObjects::override_id(unique, 307); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { callOverrideFun(fun, 307, 0, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintUnderGL(); }} + void resizeGL(int x1, int x2) { quint64 id = LObjects::override_id(unique, 305); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; callOverrideFun(fun, 305, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::resizeGL(x1, x2); }} void paintEvent(QPaintEvent* x1) { quint64 id = LObjects::override_id(unique, 20); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 20, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::paintEvent(x1); }} void resizeEvent(QResizeEvent* x1) { quint64 id = LObjects::override_id(unique, 40); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 40, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::resizeEvent(x1); }} - QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 309, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::focusObject(); } return ret; } - void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::exposeEvent(x1); }} + QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 308); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 308, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::focusObject(); } return ret; } + void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 309, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::exposeEvent(x1); }} void focusInEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 13); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 13, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::focusInEvent(x1); }} void focusOutEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 14); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 14, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::focusOutEvent(x1); }} void hideEvent(QHideEvent* x1) { quint64 id = LObjects::override_id(unique, 35); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 35, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::hideEvent(x1); }} @@ -3728,11 +3728,11 @@ public: void moveEvent(QMoveEvent* x1) { quint64 id = LObjects::override_id(unique, 39); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 39, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::moveEvent(x1); }} void showEvent(QShowEvent* x1) { quint64 id = LObjects::override_id(unique, 41); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 41, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::showEvent(x1); }} void tabletEvent(QTabletEvent* x1) { quint64 id = LObjects::override_id(unique, 42); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 42, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::tabletEvent(x1); }} - void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 311, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::touchEvent(x1); }} + void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::touchEvent(x1); }} void wheelEvent(QWheelEvent* x1) { quint64 id = LObjects::override_id(unique, 43); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 43, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::wheelEvent(x1); }} - QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 312, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::format(); } return ret; } + QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 311, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::format(); } return ret; } QSize size() const { quint64 id = LObjects::override_id(unique, 141); void* fun = LObjects::overrideFun(id); QSize ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 141, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::size(); } return ret; } - SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 313); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 313, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::surfaceType(); } return ret; } + SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 312, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::surfaceType(); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QOpenGLWindow::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::customEvent(x1); }} @@ -3801,8 +3801,8 @@ public: uint unique; void paintEvent(QPaintEvent* x1) { quint64 id = LObjects::override_id(unique, 20); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 20, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::paintEvent(x1); }} - QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 309, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::focusObject(); } return ret; } - void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::exposeEvent(x1); }} + QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 308); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 308, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::focusObject(); } return ret; } + void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 309, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::exposeEvent(x1); }} void focusInEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 13); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 13, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::focusInEvent(x1); }} void focusOutEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 14); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 14, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::focusOutEvent(x1); }} void hideEvent(QHideEvent* x1) { quint64 id = LObjects::override_id(unique, 35); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 35, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::hideEvent(x1); }} @@ -3816,11 +3816,11 @@ public: void resizeEvent(QResizeEvent* x1) { quint64 id = LObjects::override_id(unique, 40); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 40, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::resizeEvent(x1); }} void showEvent(QShowEvent* x1) { quint64 id = LObjects::override_id(unique, 41); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 41, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::showEvent(x1); }} void tabletEvent(QTabletEvent* x1) { quint64 id = LObjects::override_id(unique, 42); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 42, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::tabletEvent(x1); }} - void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 311, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::touchEvent(x1); }} + void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::touchEvent(x1); }} void wheelEvent(QWheelEvent* x1) { quint64 id = LObjects::override_id(unique, 43); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 43, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::wheelEvent(x1); }} - QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 312, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::format(); } return ret; } + QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 311, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::format(); } return ret; } QSize size() const { quint64 id = LObjects::override_id(unique, 141); void* fun = LObjects::overrideFun(id); QSize ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 141, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::size(); } return ret; } - SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 313); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 313, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::surfaceType(); } return ret; } + SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 312, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::surfaceType(); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPaintDeviceWindow::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPaintDeviceWindow::customEvent(x1); }} @@ -3880,10 +3880,26 @@ public: void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPauseAnimation::timerEvent(x1); }} }; -class LPinchGesture : public QPinchGesture { +class LPdfWriter : public QPdfWriter { Q_OBJECT friend class Q147; public: + LPdfWriter(uint u, const QString& x1) : QPdfWriter(x1), unique(u) {} + + static NumList overrideIds; + uint unique; + + bool newPage() { quint64 id = LObjects::override_id(unique, 313); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 313, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPdfWriter::newPage(); } return ret; } + bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QPdfWriter::eventFilter(x1, x2); } return ret; } + void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPdfWriter::childEvent(x1); }} + void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPdfWriter::customEvent(x1); }} + void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPdfWriter::timerEvent(x1); }} +}; + +class LPinchGesture : public QPinchGesture { + Q_OBJECT + friend class Q148; +public: static NumList overrideIds; uint unique; @@ -3896,7 +3912,7 @@ public: class LPlainTextDocumentLayout : public QPlainTextDocumentLayout { Q_OBJECT - friend class Q148; + friend class Q149; public: LPlainTextDocumentLayout(uint u, QTextDocument* x1) : QPlainTextDocumentLayout(x1), unique(u) {} @@ -3921,7 +3937,7 @@ public: class LPlainTextEdit : public QPlainTextEdit { Q_OBJECT - friend class Q149; + friend class Q150; public: LPlainTextEdit(uint u, QWidget* x1 = 0) : QPlainTextEdit(x1), unique(u) {} LPlainTextEdit(uint u, const QString& x1, QWidget* x2 = 0) : QPlainTextEdit(x1, x2), unique(u) {} @@ -3979,7 +3995,7 @@ public: class LPluginLoader : public QPluginLoader { Q_OBJECT - friend class Q150; + friend class Q151; public: LPluginLoader(uint u, QObject* x1 = 0) : QPluginLoader(x1), unique(u) {} LPluginLoader(uint u, const QString& x1, QObject* x2 = 0) : QPluginLoader(x1, x2), unique(u) {} @@ -3995,7 +4011,7 @@ public: class LPrintDialog : public QPrintDialog { Q_OBJECT - friend class Q151; + friend class Q152; public: LPrintDialog(uint u, QPrinter* x1, QWidget* x2 = 0) : QPrintDialog(x1, x2), unique(u) {} LPrintDialog(uint u, QWidget* x1 = 0) : QPrintDialog(x1), unique(u) {} @@ -4048,7 +4064,7 @@ public: class LPrintPreviewDialog : public QPrintPreviewDialog { Q_OBJECT - friend class Q152; + friend class Q153; public: LPrintPreviewDialog(uint u, QPrinter* x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) : QPrintPreviewDialog(x1, x2, x3), unique(u) {} LPrintPreviewDialog(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QPrintPreviewDialog(x1, x2), unique(u) {} @@ -4100,7 +4116,7 @@ public: class LPrintPreviewWidget : public QPrintPreviewWidget { Q_OBJECT - friend class Q153; + friend class Q154; public: LPrintPreviewWidget(uint u, QPrinter* x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) : QPrintPreviewWidget(x1, x2, x3), unique(u) {} LPrintPreviewWidget(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QPrintPreviewWidget(x1, x2), unique(u) {} @@ -4151,7 +4167,7 @@ public: class LProcess : public QProcess { Q_OBJECT - friend class Q154; + friend class Q155; public: LProcess(uint u, QObject* x1 = 0) : QProcess(x1), unique(u) {} @@ -4183,7 +4199,7 @@ public: class LProgressBar : public QProgressBar { Q_OBJECT - friend class Q155; + friend class Q156; public: LProgressBar(uint u, QWidget* x1 = 0) : QProgressBar(x1), unique(u) {} @@ -4233,7 +4249,7 @@ public: class LProgressDialog : public QProgressDialog { Q_OBJECT - friend class Q156; + friend class Q157; public: LProgressDialog(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QProgressDialog(x1, x2), unique(u) {} LProgressDialog(uint u, const QString& x1, const QString& x2, int x3, int x4, QWidget* x5 = 0, Qt::WindowFlags x6 = 0) : QProgressDialog(x1, x2, x3, x4, x5, x6), unique(u) {} @@ -4284,7 +4300,7 @@ public: class LPropertyAnimation : public QPropertyAnimation { Q_OBJECT - friend class Q157; + friend class Q158; public: LPropertyAnimation(uint u, QObject* x1 = 0) : QPropertyAnimation(x1), unique(u) {} LPropertyAnimation(uint u, QObject* x1, const QByteArray& x2, QObject* x3 = 0) : QPropertyAnimation(x1, x2, x3), unique(u) {} @@ -4306,7 +4322,7 @@ public: class LPushButton : public QPushButton { Q_OBJECT - friend class Q158; + friend class Q159; public: LPushButton(uint u, QWidget* x1 = 0) : QPushButton(x1), unique(u) {} LPushButton(uint u, const QString& x1, QWidget* x2 = 0) : QPushButton(x1, x2), unique(u) {} @@ -4360,7 +4376,7 @@ public: class LRadioButton : public QRadioButton { Q_OBJECT - friend class Q159; + friend class Q160; public: LRadioButton(uint u, QWidget* x1 = 0) : QRadioButton(x1), unique(u) {} LRadioButton(uint u, const QString& x1, QWidget* x2 = 0) : QRadioButton(x1, x2), unique(u) {} @@ -4413,7 +4429,7 @@ public: class LRegExpValidator : public QRegExpValidator { Q_OBJECT - friend class Q161; + friend class Q162; public: LRegExpValidator(uint u, QObject* x1 = 0) : QRegExpValidator(x1), unique(u) {} LRegExpValidator(uint u, const QRegExp& x1, QObject* x2 = 0) : QRegExpValidator(x1, x2), unique(u) {} @@ -4431,7 +4447,7 @@ public: class LRubberBand : public QRubberBand { Q_OBJECT - friend class Q162; + friend class Q163; public: LRubberBand(uint u, Shape x1, QWidget* x2 = 0) : QRubberBand(x1, x2), unique(u) {} @@ -4480,7 +4496,7 @@ public: class LScrollArea : public QScrollArea { Q_OBJECT - friend class Q164; + friend class Q165; public: LScrollArea(uint u, QWidget* x1 = 0) : QScrollArea(x1), unique(u) {} @@ -4533,7 +4549,7 @@ public: class LScrollBar : public QScrollBar { Q_OBJECT - friend class Q165; + friend class Q166; public: LScrollBar(uint u, QWidget* x1 = 0) : QScrollBar(x1), unique(u) {} LScrollBar(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QScrollBar(x1, x2), unique(u) {} @@ -4584,7 +4600,7 @@ public: class LSequentialAnimationGroup : public QSequentialAnimationGroup { Q_OBJECT - friend class Q166; + friend class Q167; public: LSequentialAnimationGroup(uint u, QObject* x1 = 0) : QSequentialAnimationGroup(x1), unique(u) {} @@ -4603,7 +4619,7 @@ public: class LSettings : public QSettings { Q_OBJECT - friend class Q168; + friend class Q169; public: LSettings(uint u, const QString& x1, const QString& x2 = QString(), QObject* x3 = 0) : QSettings(x1, x2, x3), unique(u) {} LSettings(uint u, Scope x1, const QString& x2, const QString& x3 = QString(), QObject* x4 = 0) : QSettings(x1, x2, x3, x4), unique(u) {} @@ -4622,7 +4638,7 @@ public: class LShortcut : public QShortcut { Q_OBJECT - friend class Q169; + friend class Q170; public: LShortcut(uint u, QWidget* x1) : QShortcut(x1), unique(u) {} LShortcut(uint u, const QKeySequence& x1, QWidget* x2, const char* x3 = 0, const char* x4 = 0, Qt::ShortcutContext x5 = Qt::WindowShortcut) : QShortcut(x1, x2, x3, x4, x5), unique(u) {} @@ -4638,7 +4654,7 @@ public: class LSignalTransition : public QSignalTransition { Q_OBJECT - friend class Q170; + friend class Q171; public: LSignalTransition(uint u, QState* x1 = 0) : QSignalTransition(x1), unique(u) {} LSignalTransition(uint u, const QObject* x1, const char* x2, QState* x3 = 0) : QSignalTransition(x1, x2, x3), unique(u) {} @@ -4656,7 +4672,7 @@ public: class LSizeGrip : public QSizeGrip { Q_OBJECT - friend class Q171; + friend class Q172; public: LSizeGrip(uint u, QWidget* x1) : QSizeGrip(x1), unique(u) {} @@ -4706,7 +4722,7 @@ public: class LSlider : public QSlider { Q_OBJECT - friend class Q172; + friend class Q173; public: LSlider(uint u, QWidget* x1 = 0) : QSlider(x1), unique(u) {} LSlider(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QSlider(x1, x2), unique(u) {} @@ -4757,7 +4773,7 @@ public: class LSortFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT - friend class Q173; + friend class Q174; public: LSortFilterProxyModel(uint u, QObject* x1 = 0) : QSortFilterProxyModel(x1), unique(u) {} @@ -4811,7 +4827,7 @@ public: class LSpinBox : public QSpinBox { Q_OBJECT - friend class Q174; + friend class Q175; public: LSpinBox(uint u, QWidget* x1 = 0) : QSpinBox(x1), unique(u) {} @@ -4866,7 +4882,7 @@ public: class LSplashScreen : public QSplashScreen { Q_OBJECT - friend class Q175; + friend class Q176; public: LSplashScreen(uint u, const QPixmap& x1 = QPixmap(), Qt::WindowFlags x2 = 0) : QSplashScreen(x1, x2), unique(u) {} LSplashScreen(uint u, QWidget* x1, const QPixmap& x2 = QPixmap(), Qt::WindowFlags x3 = 0) : QSplashScreen(x1, x2, x3), unique(u) {} @@ -4917,7 +4933,7 @@ public: class LSplitter : public QSplitter { Q_OBJECT - friend class Q176; + friend class Q177; public: LSplitter(uint u, QWidget* x1 = 0) : QSplitter(x1), unique(u) {} LSplitter(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QSplitter(x1, x2), unique(u) {} @@ -4967,7 +4983,7 @@ public: class LSplitterHandle : public QSplitterHandle { Q_OBJECT - friend class Q177; + friend class Q178; public: static NumList overrideIds; @@ -5015,7 +5031,7 @@ public: class LStackedLayout : public QStackedLayout { Q_OBJECT - friend class Q183; + friend class Q184; public: LStackedLayout(uint u) : unique(u) {} LStackedLayout(uint u, QWidget* x1) : QStackedLayout(x1), unique(u) {} @@ -5049,7 +5065,7 @@ public: class LStackedWidget : public QStackedWidget { Q_OBJECT - friend class Q184; + friend class Q185; public: LStackedWidget(uint u, QWidget* x1 = 0) : QStackedWidget(x1), unique(u) {} @@ -5098,7 +5114,7 @@ public: class LStandardItemModel : public QStandardItemModel { Q_OBJECT - friend class Q185; + friend class Q186; public: LStandardItemModel(uint u, QObject* x1 = 0) : QStandardItemModel(x1), unique(u) {} LStandardItemModel(uint u, int x1, int x2, QObject* x3 = 0) : QStandardItemModel(x1, x2, x3), unique(u) {} @@ -5143,7 +5159,7 @@ public: class LState : public QState { Q_OBJECT - friend class Q186; + friend class Q187; public: LState(uint u, QState* x1 = 0) : QState(x1), unique(u) {} LState(uint u, ChildMode x1, QState* x2 = 0) : QState(x1, x2), unique(u) {} @@ -5161,7 +5177,7 @@ public: class LStateMachine : public QStateMachine { Q_OBJECT - friend class Q187; + friend class Q188; public: LStateMachine(uint u, QObject* x1 = 0) : QStateMachine(x1), unique(u) {} LStateMachine(uint u, QState::ChildMode x1, QObject* x2 = 0) : QStateMachine(x1, x2), unique(u) {} @@ -5179,7 +5195,7 @@ public: class LStatusBar : public QStatusBar { Q_OBJECT - friend class Q188; + friend class Q189; public: LStatusBar(uint u, QWidget* x1 = 0) : QStatusBar(x1), unique(u) {} @@ -5228,7 +5244,7 @@ public: class LStringListModel : public QStringListModel { Q_OBJECT - friend class Q189; + friend class Q190; public: LStringListModel(uint u, QObject* x1 = 0) : QStringListModel(x1), unique(u) {} LStringListModel(uint u, const QStringList& x1, QObject* x2 = 0) : QStringListModel(x1, x2), unique(u) {} @@ -5270,7 +5286,7 @@ public: class LStyledItemDelegate : public QStyledItemDelegate { Q_OBJECT - friend class Q191; + friend class Q192; public: LStyledItemDelegate(uint u, QObject* x1 = 0) : QStyledItemDelegate(x1), unique(u) {} @@ -5296,7 +5312,7 @@ public: class LSwipeGesture : public QSwipeGesture { Q_OBJECT - friend class Q194; + friend class Q195; public: static NumList overrideIds; @@ -5310,7 +5326,7 @@ public: class LSyntaxHighlighter : public QSyntaxHighlighter { Q_OBJECT - friend class Q195; + friend class Q196; public: LSyntaxHighlighter(uint u, QObject* x1) : QSyntaxHighlighter(x1), unique(u) {} LSyntaxHighlighter(uint u, QTextDocument* x1) : QSyntaxHighlighter(x1), unique(u) {} @@ -5327,7 +5343,7 @@ public: class LSystemTrayIcon : public QSystemTrayIcon { Q_OBJECT - friend class Q196; + friend class Q197; public: LSystemTrayIcon(uint u, QObject* x1 = 0) : QSystemTrayIcon(x1), unique(u) {} LSystemTrayIcon(uint u, const QIcon& x1, QObject* x2 = 0) : QSystemTrayIcon(x1, x2), unique(u) {} @@ -5343,7 +5359,7 @@ public: class LTabBar : public QTabBar { Q_OBJECT - friend class Q197; + friend class Q198; public: LTabBar(uint u, QWidget* x1 = 0) : QTabBar(x1), unique(u) {} @@ -5397,7 +5413,7 @@ public: class LTabWidget : public QTabWidget { Q_OBJECT - friend class Q198; + friend class Q199; public: LTabWidget(uint u, QWidget* x1 = 0) : QTabWidget(x1), unique(u) {} @@ -5448,7 +5464,7 @@ public: class LTableView : public QTableView { Q_OBJECT - friend class Q199; + friend class Q200; public: LTableView(uint u, QWidget* x1 = 0) : QTableView(x1), unique(u) {} @@ -5524,7 +5540,7 @@ public: class LTableWidget : public QTableWidget { Q_OBJECT - friend class Q200; + friend class Q201; public: LTableWidget(uint u, QWidget* x1 = 0) : QTableWidget(x1), unique(u) {} LTableWidget(uint u, int x1, int x2, QWidget* x3 = 0) : QTableWidget(x1, x2, x3), unique(u) {} @@ -5604,7 +5620,7 @@ public: class LTapAndHoldGesture : public QTapAndHoldGesture { Q_OBJECT - friend class Q201; + friend class Q202; public: static NumList overrideIds; @@ -5618,7 +5634,7 @@ public: class LTapGesture : public QTapGesture { Q_OBJECT - friend class Q202; + friend class Q203; public: static NumList overrideIds; @@ -5632,7 +5648,7 @@ public: class LTextBlockGroup : public QTextBlockGroup { Q_OBJECT - friend class Q205; + friend class Q206; public: static NumList overrideIds; @@ -5649,7 +5665,7 @@ public: class LTextBrowser : public QTextBrowser { Q_OBJECT - friend class Q206; + friend class Q207; public: LTextBrowser(uint u, QWidget* x1 = 0) : QTextBrowser(x1), unique(u) {} @@ -5706,7 +5722,7 @@ public: class LTextDocument : public QTextDocument { Q_OBJECT - friend class Q207; + friend class Q208; public: LTextDocument(uint u, QObject* x1 = 0) : QTextDocument(x1), unique(u) {} LTextDocument(uint u, const QString& x1, QObject* x2 = 0) : QTextDocument(x1, x2), unique(u) {} @@ -5725,7 +5741,7 @@ public: class LTextEdit : public QTextEdit { Q_OBJECT - friend class Q208; + friend class Q209; public: LTextEdit(uint u, QWidget* x1 = 0) : QTextEdit(x1), unique(u) {} LTextEdit(uint u, const QString& x1, QWidget* x2 = 0) : QTextEdit(x1, x2), unique(u) {} @@ -5783,7 +5799,7 @@ public: class LTextFrame : public QTextFrame { Q_OBJECT - friend class Q209; + friend class Q210; public: LTextFrame(uint u, QTextDocument* x1) : QTextFrame(x1), unique(u) {} @@ -5798,7 +5814,7 @@ public: class LTextList : public QTextList { Q_OBJECT - friend class Q210; + friend class Q211; public: static NumList overrideIds; @@ -5815,7 +5831,7 @@ public: class LTextObject : public QTextObject { Q_OBJECT - friend class Q211; + friend class Q212; public: static NumList overrideIds; @@ -5829,7 +5845,7 @@ public: class LTextTable : public QTextTable { Q_OBJECT - friend class Q212; + friend class Q213; public: static NumList overrideIds; @@ -5843,7 +5859,7 @@ public: class LTimeEdit : public QTimeEdit { Q_OBJECT - friend class Q213; + friend class Q214; public: LTimeEdit(uint u, QWidget* x1 = 0) : QTimeEdit(x1), unique(u) {} LTimeEdit(uint u, const QTime& x1, QWidget* x2 = 0) : QTimeEdit(x1, x2), unique(u) {} @@ -5900,7 +5916,7 @@ public: class LTimeLine : public QTimeLine { Q_OBJECT - friend class Q214; + friend class Q215; public: LTimeLine(uint u, int x1 = 1000, QObject* x2 = 0) : QTimeLine(x1, x2), unique(u) {} @@ -5916,7 +5932,7 @@ public: class LTimer : public QTimer { Q_OBJECT - friend class Q215; + friend class Q216; public: LTimer(uint u, QObject* x1 = 0) : QTimer(x1), unique(u) {} @@ -5931,7 +5947,7 @@ public: class LToolBar : public QToolBar { Q_OBJECT - friend class Q216; + friend class Q217; public: LToolBar(uint u, const QString& x1, QWidget* x2 = 0) : QToolBar(x1, x2), unique(u) {} LToolBar(uint u, QWidget* x1 = 0) : QToolBar(x1), unique(u) {} @@ -5981,7 +5997,7 @@ public: class LToolBox : public QToolBox { Q_OBJECT - friend class Q217; + friend class Q218; public: LToolBox(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QToolBox(x1, x2), unique(u) {} @@ -6032,7 +6048,7 @@ public: class LToolButton : public QToolButton { Q_OBJECT - friend class Q218; + friend class Q219; public: LToolButton(uint u, QWidget* x1 = 0) : QToolButton(x1), unique(u) {} @@ -6084,7 +6100,7 @@ public: class LTranslator : public QTranslator { Q_OBJECT - friend class Q219; + friend class Q220; public: LTranslator(uint u, QObject* x1 = 0) : QTranslator(x1), unique(u) {} @@ -6101,7 +6117,7 @@ public: class LTreeView : public QTreeView { Q_OBJECT - friend class Q220; + friend class Q221; public: LTreeView(uint u, QWidget* x1 = 0) : QTreeView(x1), unique(u) {} @@ -6184,7 +6200,7 @@ public: class LTreeWidget : public QTreeWidget { Q_OBJECT - friend class Q221; + friend class Q222; public: LTreeWidget(uint u, QWidget* x1 = 0) : QTreeWidget(x1), unique(u) {} @@ -6270,7 +6286,7 @@ public: class LUndoGroup : public QUndoGroup { Q_OBJECT - friend class Q223; + friend class Q224; public: LUndoGroup(uint u, QObject* x1 = 0) : QUndoGroup(x1), unique(u) {} @@ -6285,7 +6301,7 @@ public: class LUndoStack : public QUndoStack { Q_OBJECT - friend class Q224; + friend class Q225; public: LUndoStack(uint u, QObject* x1 = 0) : QUndoStack(x1), unique(u) {} @@ -6300,7 +6316,7 @@ public: class LUndoView : public QUndoView { Q_OBJECT - friend class Q225; + friend class Q226; public: LUndoView(uint u, QWidget* x1 = 0) : QUndoView(x1), unique(u) {} LUndoView(uint u, QUndoStack* x1, QWidget* x2 = 0) : QUndoView(x1, x2), unique(u) {} @@ -6380,7 +6396,7 @@ public: class LVBoxLayout : public QVBoxLayout { Q_OBJECT - friend class Q226; + friend class Q227; public: LVBoxLayout(uint u) : unique(u) {} LVBoxLayout(uint u, QWidget* x1) : QVBoxLayout(x1), unique(u) {} @@ -6414,7 +6430,7 @@ public: class LValidator : public QValidator { Q_OBJECT - friend class Q227; + friend class Q228; public: LValidator(uint u, QObject* x1 = 0) : QValidator(x1), unique(u) {} @@ -6431,7 +6447,7 @@ public: class LVariantAnimation : public QVariantAnimation { Q_OBJECT - friend class Q228; + friend class Q229; public: LVariantAnimation(uint u, QObject* x1 = 0) : QVariantAnimation(x1), unique(u) {} @@ -6452,7 +6468,7 @@ public: class LWidget : public QWidget { Q_OBJECT - friend class Q237; + friend class Q238; public: LWidget(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QWidget(x1, x2), unique(u) {} @@ -6501,7 +6517,7 @@ public: class LWidgetAction : public QWidgetAction { Q_OBJECT - friend class Q238; + friend class Q239; public: LWidgetAction(uint u, QObject* x1) : QWidgetAction(x1), unique(u) {} @@ -6518,7 +6534,7 @@ public: class LWindow : public QWindow { Q_OBJECT - friend class Q239; + friend class Q240; public: LWindow(uint u, QScreen* x1 = 0) : QWindow(x1), unique(u) {} LWindow(uint u, QWindow* x1) : QWindow(x1), unique(u) {} @@ -6526,8 +6542,8 @@ public: static NumList overrideIds; uint unique; - QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 309, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::focusObject(); } return ret; } - void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::exposeEvent(x1); }} + QObject* focusObject() const { quint64 id = LObjects::override_id(unique, 308); void* fun = LObjects::overrideFun(id); QObject* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QObject*)callOverrideFun(fun, 308, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::focusObject(); } return ret; } + void exposeEvent(QExposeEvent* x1) { quint64 id = LObjects::override_id(unique, 309); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 309, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::exposeEvent(x1); }} void focusInEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 13); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 13, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::focusInEvent(x1); }} void focusOutEvent(QFocusEvent* x1) { quint64 id = LObjects::override_id(unique, 14); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 14, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::focusOutEvent(x1); }} void hideEvent(QHideEvent* x1) { quint64 id = LObjects::override_id(unique, 35); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 35, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::hideEvent(x1); }} @@ -6541,11 +6557,11 @@ public: void resizeEvent(QResizeEvent* x1) { quint64 id = LObjects::override_id(unique, 40); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 40, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::resizeEvent(x1); }} void showEvent(QShowEvent* x1) { quint64 id = LObjects::override_id(unique, 41); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 41, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::showEvent(x1); }} void tabletEvent(QTabletEvent* x1) { quint64 id = LObjects::override_id(unique, 42); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 42, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::tabletEvent(x1); }} - void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 311, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::touchEvent(x1); }} + void touchEvent(QTouchEvent* x1) { quint64 id = LObjects::override_id(unique, 310); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 310, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::touchEvent(x1); }} void wheelEvent(QWheelEvent* x1) { quint64 id = LObjects::override_id(unique, 43); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 43, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::wheelEvent(x1); }} - QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 312, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::format(); } return ret; } + QSurfaceFormat format() const { quint64 id = LObjects::override_id(unique, 311); void* fun = LObjects::overrideFun(id); QSurfaceFormat ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 311, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::format(); } return ret; } QSize size() const { quint64 id = LObjects::override_id(unique, 141); void* fun = LObjects::overrideFun(id); QSize ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 141, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::size(); } return ret; } - SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 313); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 313, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::surfaceType(); } return ret; } + SurfaceType surfaceType() const { quint64 id = LObjects::override_id(unique, 312); void* fun = LObjects::overrideFun(id); SurfaceType ret = (SurfaceType)0; if(fun && (LObjects::calling != id)) { ret = (SurfaceType)callOverrideFun(fun, 312, 0, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::surfaceType(); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QWindow::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QWindow::customEvent(x1); }} @@ -6554,7 +6570,7 @@ public: class LWizard : public QWizard { Q_OBJECT - friend class Q240; + friend class Q241; public: LWizard(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QWizard(x1, x2), unique(u) {} @@ -6609,7 +6625,7 @@ public: class LWizardPage : public QWizardPage { Q_OBJECT - friend class Q241; + friend class Q242; public: LWizardPage(uint u, QWidget* x1 = 0) : QWizardPage(x1), unique(u) {} diff --git a/src/gen/_main_q_methods.h b/src/gen/_main_q_methods.h index 5373af9..bdaa99e 100644 --- a/src/gen/_main_q_methods.h +++ b/src/gen/_main_q_methods.h @@ -126,7 +126,6 @@ public: Q_INVOKABLE void MbeginResetModel(QAbstractItemModel* o) { ((LAbstractItemModel*)o)->beginResetModel(); } Q_INVOKABLE void MchangePersistentIndex(QAbstractItemModel* o, const QModelIndex& x1, const QModelIndex& x2) { ((LAbstractItemModel*)o)->changePersistentIndex(x1, x2); } Q_INVOKABLE void MchangePersistentIndexList(QAbstractItemModel* o, const QModelIndexList& x1, const QModelIndexList& x2) { ((LAbstractItemModel*)o)->changePersistentIndexList(x1, x2); } - Q_INVOKABLE QModelIndex McreateIndex(QAbstractItemModel* o, int x1, int x2, quintptr x3) const { return ((LAbstractItemModel*)o)->createIndex(x1, x2, x3); } Q_INVOKABLE void MendInsertColumns(QAbstractItemModel* o) { ((LAbstractItemModel*)o)->endInsertColumns(); } Q_INVOKABLE void MendInsertRows(QAbstractItemModel* o) { ((LAbstractItemModel*)o)->endInsertRows(); } Q_INVOKABLE void MendMoveColumns(QAbstractItemModel* o) { ((LAbstractItemModel*)o)->endMoveColumns(); } @@ -1291,7 +1290,26 @@ public: Q_INVOKABLE int Mduration(QPauseAnimation* o) const { return o->duration(); } }; -class EQL_EXPORT Q147 : public Q70 { // QPinchGesture +class EQL_EXPORT Q147 : public Q136 { // QPdfWriter + Q_OBJECT +public: + Q_INVOKABLE void* C(uint u, const QString& x1) { return new LPdfWriter(u, x1); } + Q_INVOKABLE QString Mcreator(QPdfWriter* o) const { return o->creator(); } + Q_INVOKABLE QPageLayout MpageLayout(QPdfWriter* o) const { return o->pageLayout(); } + Q_INVOKABLE int Mresolution(QPdfWriter* o) const { return o->resolution(); } + Q_INVOKABLE void MsetCreator(QPdfWriter* o, const QString& x1) { o->setCreator(x1); } + Q_INVOKABLE bool MsetPageLayout(QPdfWriter* o, const QPageLayout& x1) { return o->setPageLayout(x1); } + Q_INVOKABLE bool MsetPageMargins(QPdfWriter* o, const QMarginsF& x1) { return o->setPageMargins(x1); } + Q_INVOKABLE bool MsetPageMargins(QPdfWriter* o, const QMarginsF& x1, QPageLayout::Unit x2) { return o->setPageMargins(x1, x2); } + Q_INVOKABLE bool MsetPageOrientation(QPdfWriter* o, QPageLayout::Orientation x1) { return o->setPageOrientation(x1); } + Q_INVOKABLE bool MsetPageSize(QPdfWriter* o, const QPageSize& x1) { return o->setPageSize(x1); } + Q_INVOKABLE void MsetResolution(QPdfWriter* o, int x1) { o->setResolution(x1); } + Q_INVOKABLE void MsetTitle(QPdfWriter* o, const QString& x1) { o->setTitle(x1); } + Q_INVOKABLE QString Mtitle(QPdfWriter* o) const { return o->title(); } + Q_INVOKABLE bool MnewPage(QPdfWriter* o) { return o->newPage(); } +}; + +class EQL_EXPORT Q148 : public Q70 { // QPinchGesture Q_OBJECT public: Q_INVOKABLE QPointF McenterPoint(QPinchGesture* o) const { return o->centerPoint(); } @@ -1318,7 +1336,7 @@ public: Q_INVOKABLE qreal MtotalScaleFactor(QPinchGesture* o) const { return o->totalScaleFactor(); } }; -class EQL_EXPORT Q148 : public Q16 { // QPlainTextDocumentLayout +class EQL_EXPORT Q149 : public Q16 { // QPlainTextDocumentLayout Q_OBJECT public: Q_INVOKABLE void* C(uint u, QTextDocument* x1) { return new LPlainTextDocumentLayout(u, x1); } @@ -1334,7 +1352,7 @@ public: Q_INVOKABLE int MpageCount(QPlainTextDocumentLayout* o) const { return o->pageCount(); } }; -class EQL_EXPORT Q150 : public Q136 { // QPluginLoader +class EQL_EXPORT Q151 : public Q136 { // QPluginLoader Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LPluginLoader(u, x1); } @@ -1353,7 +1371,7 @@ public: Q_INVOKABLE QVector SstaticPlugins() { return QPluginLoader::staticPlugins(); } }; -class EQL_EXPORT Q154 : public Q103 { // QProcess +class EQL_EXPORT Q155 : public Q103 { // QProcess Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LProcess(u, x1); } @@ -1407,7 +1425,7 @@ public: Q_INVOKABLE QStringList SsystemEnvironment() { return QProcess::systemEnvironment(); } }; -class EQL_EXPORT Q163 : public Q136 { // QScreen +class EQL_EXPORT Q164 : public Q136 { // QScreen Q_OBJECT public: Q_INVOKABLE int MangleBetween(QScreen* o, Qt::ScreenOrientation x1, Qt::ScreenOrientation x2) const { return o->angleBetween(x1, x2); } @@ -1444,7 +1462,7 @@ public: Q_INVOKABLE QSize MvirtualSize(QScreen* o) const { return o->virtualSize(); } }; -class EQL_EXPORT Q166 : public Q21 { // QSequentialAnimationGroup +class EQL_EXPORT Q167 : public Q21 { // QSequentialAnimationGroup Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSequentialAnimationGroup(u, x1); } @@ -1454,7 +1472,7 @@ public: Q_INVOKABLE int Mduration(QSequentialAnimationGroup* o) const { return o->duration(); } }; -class EQL_EXPORT Q167 : public Q136 { // QSessionManager +class EQL_EXPORT Q168 : public Q136 { // QSessionManager Q_OBJECT public: Q_INVOKABLE bool MallowsErrorInteraction(QSessionManager* o) { return o->allowsErrorInteraction(); } @@ -1475,7 +1493,7 @@ public: Q_INVOKABLE void MsetRestartHint(QSessionManager* o, QSessionManager::RestartHint x1) { o->setRestartHint(x1); } }; -class EQL_EXPORT Q168 : public Q136 { // QSettings +class EQL_EXPORT Q169 : public Q136 { // QSettings Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, const QString& x2 = QString(), QObject* x3 = 0) { return new LSettings(u, x1, x2, x3); } @@ -1517,7 +1535,7 @@ public: Q_INVOKABLE void SsetPath(QSettings::Format x1, QSettings::Scope x2, const QString& x3) { QSettings::setPath(x1, x2, x3); } }; -class EQL_EXPORT Q169 : public Q136 { // QShortcut +class EQL_EXPORT Q170 : public Q136 { // QShortcut Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LShortcut(u, x1); } @@ -1536,7 +1554,7 @@ public: Q_INVOKABLE QString MwhatsThis(QShortcut* o) const { return o->whatsThis(); } }; -class EQL_EXPORT Q170 : public Q17 { // QSignalTransition +class EQL_EXPORT Q171 : public Q17 { // QSignalTransition Q_OBJECT public: Q_INVOKABLE void* C(uint u, QState* x1 = 0) { return new LSignalTransition(u, x1); } @@ -1547,7 +1565,7 @@ public: Q_INVOKABLE QByteArray Msignal(QSignalTransition* o) const { return o->signal(); } }; -class EQL_EXPORT Q173 : public Q9 { // QSortFilterProxyModel +class EQL_EXPORT Q174 : public Q9 { // QSortFilterProxyModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSortFilterProxyModel(u, x1); } @@ -1602,7 +1620,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QSortFilterProxyModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q183 : public Q111 { // QStackedLayout +class EQL_EXPORT Q184 : public Q111 { // QStackedLayout Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LStackedLayout(u); } @@ -1626,7 +1644,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QStackedLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q185 : public Q4 { // QStandardItemModel +class EQL_EXPORT Q186 : public Q4 { // QStandardItemModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStandardItemModel(u, x1); } @@ -1686,7 +1704,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QStandardItemModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q186 : public Q14 { // QState +class EQL_EXPORT Q187 : public Q14 { // QState Q_OBJECT public: Q_INVOKABLE void* C(uint u, QState* x1 = 0) { return new LState(u, x1); } @@ -1705,7 +1723,7 @@ public: Q_INVOKABLE QList Mtransitions(QState* o) const { return o->transitions(); } }; -class EQL_EXPORT Q187 : public Q186 { // QStateMachine +class EQL_EXPORT Q188 : public Q187 { // QStateMachine Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStateMachine(u, x1); } @@ -1729,7 +1747,7 @@ public: Q_INVOKABLE bool MeventFilter(QStateMachine* o, QObject* x1, QEvent* x2) { return o->eventFilter(x1, x2); } }; -class EQL_EXPORT Q189 : public Q6 { // QStringListModel +class EQL_EXPORT Q190 : public Q6 { // QStringListModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStringListModel(u, x1); } @@ -1747,7 +1765,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QStringListModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q190 : public Q136 { // QStyle +class EQL_EXPORT Q191 : public Q136 { // QStyle Q_OBJECT public: Q_INVOKABLE int McombinedLayoutSpacing(QStyle* o, QSizePolicy::ControlTypes x1, QSizePolicy::ControlTypes x2, Qt::Orientation x3, QStyleOption* x4 = 0, QWidget* x5 = 0) const { return o->combinedLayoutSpacing(x1, x2, x3, x4, x5); } @@ -1770,7 +1788,7 @@ public: Q_INVOKABLE QRect SvisualRect(Qt::LayoutDirection x1, const QRect& x2, const QRect& x3) { return QStyle::visualRect(x1, x2, x3); } }; -class EQL_EXPORT Q191 : public Q3 { // QStyledItemDelegate +class EQL_EXPORT Q192 : public Q3 { // QStyledItemDelegate Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStyledItemDelegate(u, x1); } @@ -1785,7 +1803,7 @@ public: Q_INVOKABLE void MupdateEditorGeometry(QStyledItemDelegate* o, QWidget* x1, const QStyleOptionViewItem& x2, const QModelIndex& x3) const { o->updateEditorGeometry(x1, x2, x3); } }; -class EQL_EXPORT Q194 : public Q70 { // QSwipeGesture +class EQL_EXPORT Q195 : public Q70 { // QSwipeGesture Q_OBJECT public: Q_INVOKABLE int MhorizontalDirection(QSwipeGesture* o) const { return o->horizontalDirection(); } @@ -1794,7 +1812,7 @@ public: Q_INVOKABLE int MverticalDirection(QSwipeGesture* o) const { return o->verticalDirection(); } }; -class EQL_EXPORT Q195 : public Q136 { // QSyntaxHighlighter +class EQL_EXPORT Q196 : public Q136 { // QSyntaxHighlighter Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1) { return new LSyntaxHighlighter(u, x1); } @@ -1813,7 +1831,7 @@ public: Q_INVOKABLE void MsetFormat(QSyntaxHighlighter* o, int x1, int x2, const QFont& x3) { ((LSyntaxHighlighter*)o)->setFormat(x1, x2, x3); } }; -class EQL_EXPORT Q196 : public Q136 { // QSystemTrayIcon +class EQL_EXPORT Q197 : public Q136 { // QSystemTrayIcon Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSystemTrayIcon(u, x1); } @@ -1830,7 +1848,7 @@ public: Q_INVOKABLE bool SsupportsMessages() { return QSystemTrayIcon::supportsMessages(); } }; -class EQL_EXPORT Q201 : public Q70 { // QTapAndHoldGesture +class EQL_EXPORT Q202 : public Q70 { // QTapAndHoldGesture Q_OBJECT public: Q_INVOKABLE QPointF Mposition(QTapAndHoldGesture* o) const { return o->position(); } @@ -1839,14 +1857,14 @@ public: Q_INVOKABLE int Stimeout() { return QTapAndHoldGesture::timeout(); } }; -class EQL_EXPORT Q202 : public Q70 { // QTapGesture +class EQL_EXPORT Q203 : public Q70 { // QTapGesture Q_OBJECT public: Q_INVOKABLE QPointF Mposition(QTapGesture* o) const { return o->position(); } Q_INVOKABLE void MsetPosition(QTapGesture* o, const QPointF& x1) { o->setPosition(x1); } }; -class EQL_EXPORT Q207 : public Q136 { // QTextDocument +class EQL_EXPORT Q208 : public Q136 { // QTextDocument Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTextDocument(u, x1); } @@ -1927,7 +1945,7 @@ public: Q_INVOKABLE bool MuseDesignMetrics(QTextDocument* o) const { return o->useDesignMetrics(); } }; -class EQL_EXPORT Q211 : public Q136 { // QTextObject +class EQL_EXPORT Q212 : public Q136 { // QTextObject Q_OBJECT public: Q_INVOKABLE QTextDocument* Mdocument(QTextObject* o) const { return o->document(); } @@ -1937,7 +1955,7 @@ public: Q_INVOKABLE void MsetFormat(QTextObject* o, const QTextFormat& x1) { ((LTextObject*)o)->setFormat(x1); } }; -class EQL_EXPORT Q214 : public Q136 { // QTimeLine +class EQL_EXPORT Q215 : public Q136 { // QTimeLine Q_OBJECT public: Q_INVOKABLE void* C(uint u, int x1 = 1000, QObject* x2 = 0) { return new LTimeLine(u, x1, x2); } @@ -1966,7 +1984,7 @@ public: Q_INVOKABLE qreal MvalueForTime(QTimeLine* o, int x1) const { return o->valueForTime(x1); } }; -class EQL_EXPORT Q215 : public Q136 { // QTimer +class EQL_EXPORT Q216 : public Q136 { // QTimer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTimer(u, x1); } @@ -1980,7 +1998,7 @@ public: Q_INVOKABLE int MtimerType(QTimer* o) const { return o->timerType(); } }; -class EQL_EXPORT Q219 : public Q136 { // QTranslator +class EQL_EXPORT Q220 : public Q136 { // QTranslator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTranslator(u, x1); } @@ -1990,7 +2008,7 @@ public: Q_INVOKABLE QString Mtranslate(QTranslator* o, const char* x1, const char* x2, const char* x3 = 0, int x4 = -1) const { return o->translate(x1, x2, x3, x4); } }; -class EQL_EXPORT Q223 : public Q136 { // QUndoGroup +class EQL_EXPORT Q224 : public Q136 { // QUndoGroup Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUndoGroup(u, x1); } @@ -2007,7 +2025,7 @@ public: Q_INVOKABLE QString MundoText(QUndoGroup* o) const { return o->undoText(); } }; -class EQL_EXPORT Q224 : public Q136 { // QUndoStack +class EQL_EXPORT Q225 : public Q136 { // QUndoStack Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUndoStack(u, x1); } @@ -2032,7 +2050,7 @@ public: Q_INVOKABLE QString MundoText(QUndoStack* o) const { return o->undoText(); } }; -class EQL_EXPORT Q227 : public Q136 { // QValidator +class EQL_EXPORT Q228 : public Q136 { // QValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LValidator(u, x1); } @@ -2042,7 +2060,7 @@ public: Q_INVOKABLE int Mvalidate(QValidator* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q228 : public Q1 { // QVariantAnimation +class EQL_EXPORT Q229 : public Q1 { // QVariantAnimation Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LVariantAnimation(u, x1); } @@ -2058,7 +2076,7 @@ public: Q_INVOKABLE int Mduration(QVariantAnimation* o) const { return o->duration(); } }; -class EQL_EXPORT Q237 : public Q136 { // QWidget +class EQL_EXPORT Q238 : public Q136 { // QWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LWidget(u, x1, x2); } @@ -2278,7 +2296,7 @@ public: Q_INVOKABLE void SsetTabOrder(QWidget* x1, QWidget* x2) { QWidget::setTabOrder(x1, x2); } }; -class EQL_EXPORT Q238 : public Q19 { // QWidgetAction +class EQL_EXPORT Q239 : public Q19 { // QWidgetAction Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1) { return new LWidgetAction(u, x1); } @@ -2289,7 +2307,7 @@ public: Q_INVOKABLE QList McreatedWidgets(QWidgetAction* o) const { return ((LWidgetAction*)o)->createdWidgets(); } }; -class EQL_EXPORT Q239 : public Q136 { // QWindow +class EQL_EXPORT Q240 : public Q136 { // QWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QScreen* x1 = 0) { return new LWindow(u, x1); } @@ -2375,7 +2393,7 @@ public: Q_INVOKABLE QWindow* SfromWinId(WId x1) { return QWindow::fromWinId(x1); } }; -class EQL_EXPORT Q241 : public Q237 { // QWizardPage +class EQL_EXPORT Q242 : public Q238 { // QWizardPage Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWizardPage(u, x1); } @@ -2402,7 +2420,7 @@ public: Q_INVOKABLE QWizard* Mwizard(QWizardPage* o) const { return ((LWizardPage*)o)->wizard(); } }; -class EQL_EXPORT Q2 : public Q237 { // QAbstractButton +class EQL_EXPORT Q2 : public Q238 { // QAbstractButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractButton(u, x1); } @@ -2429,7 +2447,7 @@ public: Q_INVOKABLE QString Mtext(QAbstractButton* o) const { return o->text(); } }; -class EQL_EXPORT Q11 : public Q237 { // QAbstractSlider +class EQL_EXPORT Q11 : public Q238 { // QAbstractSlider Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractSlider(u, x1); } @@ -2458,7 +2476,7 @@ public: Q_INVOKABLE void MsetRepeatAction(QAbstractSlider* o, QAbstractSlider::SliderAction x1, int x2 = 500, int x3 = 50) { ((LAbstractSlider*)o)->setRepeatAction(x1, x2, x3); } }; -class EQL_EXPORT Q13 : public Q237 { // QAbstractSpinBox +class EQL_EXPORT Q13 : public Q238 { // QAbstractSpinBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractSpinBox(u, x1); } @@ -2607,7 +2625,7 @@ public: Q_INVOKABLE qlonglong Msize(QBuffer* o) const { return o->size(); } }; -class EQL_EXPORT Q28 : public Q237 { // QCalendarWidget +class EQL_EXPORT Q28 : public Q238 { // QCalendarWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCalendarWidget(u, x1); } @@ -2658,7 +2676,7 @@ public: Q_INVOKABLE QSize MsizeHint(QCheckBox* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q39 : public Q237 { // QComboBox +class EQL_EXPORT Q39 : public Q238 { // QComboBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LComboBox(u, x1); } @@ -2725,7 +2743,7 @@ public: Q_INVOKABLE QSize MsizeHint(QComboBox* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q41 : public Q190 { // QCommonStyle +class EQL_EXPORT Q41 : public Q191 { // QCommonStyle Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LCommonStyle(u); } @@ -2803,7 +2821,7 @@ public: Q_INVOKABLE void MstepBy(QDateTimeEdit* o, int x1) { o->stepBy(x1); } }; -class EQL_EXPORT Q47 : public Q237 { // QDesktopWidget +class EQL_EXPORT Q47 : public Q238 { // QDesktopWidget Q_OBJECT public: Q_INVOKABLE const QRect MavailableGeometry(QDesktopWidget* o, int x1 = -1) const { return o->availableGeometry(x1); } @@ -2834,7 +2852,7 @@ public: Q_INVOKABLE QSize MsizeHint(QDial* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q49 : public Q237 { // QDialog +class EQL_EXPORT Q49 : public Q238 { // QDialog Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LDialog(u, x1, x2); } @@ -2848,7 +2866,7 @@ public: Q_INVOKABLE QSize MsizeHint(QDialog* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q50 : public Q237 { // QDialogButtonBox +class EQL_EXPORT Q50 : public Q238 { // QDialogButtonBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LDialogButtonBox(u, x1); } @@ -2872,7 +2890,7 @@ public: Q_INVOKABLE int MstandardButtons(QDialogButtonBox* o) const { return o->standardButtons(); } }; -class EQL_EXPORT Q52 : public Q237 { // QDockWidget +class EQL_EXPORT Q52 : public Q238 { // QDockWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) { return new LDockWidget(u, x1, x2, x3); } @@ -2917,7 +2935,7 @@ public: Q_INVOKABLE int Mvalidate(QDoubleSpinBox* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q54 : public Q227 { // QDoubleValidator +class EQL_EXPORT Q54 : public Q228 { // QDoubleValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LDoubleValidator(u, x1); } @@ -3021,7 +3039,7 @@ public: Q_INVOKABLE QUrl SgetSaveFileUrl(QWidget* x1 = 0, const QString& x2 = QString(), const QUrl& x3 = QUrl(), const QString& x4 = QString(), QString* x5 = 0, QFileDialog::Options x6 = 0, const QStringList& x7 = QStringList()) { return QFileDialog::getSaveFileUrl(x1, x2, x3, x4, x5, x6, x7); } }; -class EQL_EXPORT Q65 : public Q237 { // QFocusFrame +class EQL_EXPORT Q65 : public Q238 { // QFocusFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LFocusFrame(u, x1); } @@ -3110,7 +3128,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QFormLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q69 : public Q237 { // QFrame +class EQL_EXPORT Q69 : public Q238 { // QFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LFrame(u, x1, x2); } @@ -3244,7 +3262,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QGridLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q90 : public Q237 { // QGroupBox +class EQL_EXPORT Q90 : public Q238 { // QGroupBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LGroupBox(u, x1); } @@ -3323,7 +3341,7 @@ public: Q_INVOKABLE QString SgetText(QWidget* x1, const QString& x2, const QString& x3, QLineEdit::EchoMode x4 = QLineEdit::Normal, const QString& x5 = QString(), bool* x6 = 0, Qt::WindowFlags x7 = 0, Qt::InputMethodHints x8 = Qt::ImhNone) { return QInputDialog::getText(x1, x2, x3, x4, x5, x6, x7, x8); } }; -class EQL_EXPORT Q105 : public Q227 { // QIntValidator +class EQL_EXPORT Q105 : public Q228 { // QIntValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LIntValidator(u, x1); } @@ -3392,7 +3410,7 @@ public: Q_INVOKABLE QSize MsizeHint(QLabel* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q113 : public Q237 { // QLineEdit +class EQL_EXPORT Q113 : public Q238 { // QLineEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LLineEdit(u, x1); } @@ -3457,7 +3475,7 @@ public: Q_INVOKABLE QSize MsizeHint(QLineEdit* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q118 : public Q237 { // QMainWindow +class EQL_EXPORT Q118 : public Q238 { // QMainWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LMainWindow(u, x1, x2); } @@ -3510,7 +3528,7 @@ public: Q_INVOKABLE bool MunifiedTitleAndToolBarOnMac(QMainWindow* o) const { return o->unifiedTitleAndToolBarOnMac(); } }; -class EQL_EXPORT Q120 : public Q237 { // QMdiSubWindow +class EQL_EXPORT Q120 : public Q238 { // QMdiSubWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LMdiSubWindow(u, x1, x2); } @@ -3530,7 +3548,7 @@ public: Q_INVOKABLE QSize MsizeHint(QMdiSubWindow* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q126 : public Q237 { // QMenu +class EQL_EXPORT Q126 : public Q238 { // QMenu Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LMenu(u, x1); } @@ -3577,7 +3595,7 @@ public: Q_INVOKABLE QAction* Sexec(const QList& x1, const QPoint& x2, QAction* x3 = 0, QWidget* x4 = 0) { return QMenu::exec(x1, x2, x3, x4); } }; -class EQL_EXPORT Q127 : public Q237 { // QMenuBar +class EQL_EXPORT Q127 : public Q238 { // QMenuBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LMenuBar(u, x1); } @@ -3656,7 +3674,7 @@ public: Q_INVOKABLE int Swarning(QWidget* x1, const QString& x2, const QString& x3, QMessageBox::StandardButtons x4 = QMessageBox::Ok, QMessageBox::StandardButton x5 = QMessageBox::NoButton) { return QMessageBox::warning(x1, x2, x3, x4, x5); } }; -class EQL_EXPORT Q140 : public Q237 { // QOpenGLWidget +class EQL_EXPORT Q140 : public Q238 { // QOpenGLWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LOpenGLWidget(u, x1, x2); } @@ -3684,14 +3702,14 @@ public: Q_INVOKABLE void MsetVisible(QPageSetupDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q143 : public Q239 { // QPaintDeviceWindow +class EQL_EXPORT Q143 : public Q240 { // QPaintDeviceWindow Q_OBJECT public: Q_INVOKABLE void Mupdate(QPaintDeviceWindow* o, const QRect& x1) { o->update(x1); } Q_INVOKABLE void Mupdate(QPaintDeviceWindow* o, const QRegion& x1) { o->update(x1); } }; -class EQL_EXPORT Q152 : public Q49 { // QPrintPreviewDialog +class EQL_EXPORT Q153 : public Q49 { // QPrintPreviewDialog Q_OBJECT public: Q_INVOKABLE void* C(uint u, QPrinter* x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) { return new LPrintPreviewDialog(u, x1, x2, x3); } @@ -3702,7 +3720,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintPreviewDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q153 : public Q237 { // QPrintPreviewWidget +class EQL_EXPORT Q154 : public Q238 { // QPrintPreviewWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QPrinter* x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) { return new LPrintPreviewWidget(u, x1, x2, x3); } @@ -3716,7 +3734,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintPreviewWidget* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q155 : public Q237 { // QProgressBar +class EQL_EXPORT Q156 : public Q238 { // QProgressBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LProgressBar(u, x1); } @@ -3741,7 +3759,7 @@ public: Q_INVOKABLE QSize MsizeHint(QProgressBar* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q156 : public Q49 { // QProgressDialog +class EQL_EXPORT Q157 : public Q49 { // QProgressDialog Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LProgressDialog(u, x1, x2); } @@ -3763,7 +3781,7 @@ public: Q_INVOKABLE QSize MsizeHint(QProgressDialog* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q157 : public Q228 { // QPropertyAnimation +class EQL_EXPORT Q158 : public Q229 { // QPropertyAnimation Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LPropertyAnimation(u, x1); } @@ -3774,7 +3792,7 @@ public: Q_INVOKABLE QObject* MtargetObject(QPropertyAnimation* o) const { return o->targetObject(); } }; -class EQL_EXPORT Q158 : public Q2 { // QPushButton +class EQL_EXPORT Q159 : public Q2 { // QPushButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LPushButton(u, x1); } @@ -3793,7 +3811,7 @@ public: Q_INVOKABLE QSize MsizeHint(QPushButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q159 : public Q2 { // QRadioButton +class EQL_EXPORT Q160 : public Q2 { // QRadioButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LRadioButton(u, x1); } @@ -3803,7 +3821,7 @@ public: Q_INVOKABLE QSize MsizeHint(QRadioButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q161 : public Q227 { // QRegExpValidator +class EQL_EXPORT Q162 : public Q228 { // QRegExpValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LRegExpValidator(u, x1); } @@ -3813,7 +3831,7 @@ public: Q_INVOKABLE int Mvalidate(QRegExpValidator* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q162 : public Q237 { // QRubberBand +class EQL_EXPORT Q163 : public Q238 { // QRubberBand Q_OBJECT public: Q_INVOKABLE void* C(uint u, QRubberBand::Shape x1, QWidget* x2 = 0) { return new LRubberBand(u, x1, x2); } @@ -3827,7 +3845,7 @@ public: Q_INVOKABLE void MinitStyleOption(QRubberBand* o, QStyleOptionRubberBand* x1) const { ((LRubberBand*)o)->initStyleOption(x1); } }; -class EQL_EXPORT Q165 : public Q11 { // QScrollBar +class EQL_EXPORT Q166 : public Q11 { // QScrollBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LScrollBar(u, x1); } @@ -3837,7 +3855,7 @@ public: Q_INVOKABLE QSize MsizeHint(QScrollBar* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q171 : public Q237 { // QSizeGrip +class EQL_EXPORT Q172 : public Q238 { // QSizeGrip Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LSizeGrip(u, x1); } @@ -3845,7 +3863,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSizeGrip* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q172 : public Q11 { // QSlider +class EQL_EXPORT Q173 : public Q11 { // QSlider Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSlider(u, x1); } @@ -3860,7 +3878,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSlider* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q174 : public Q13 { // QSpinBox +class EQL_EXPORT Q175 : public Q13 { // QSpinBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSpinBox(u, x1); } @@ -3881,7 +3899,7 @@ public: Q_INVOKABLE int Mvalue(QSpinBox* o) const { return o->value(); } }; -class EQL_EXPORT Q175 : public Q237 { // QSplashScreen +class EQL_EXPORT Q176 : public Q238 { // QSplashScreen Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QPixmap& x1 = QPixmap(), Qt::WindowFlags x2 = 0) { return new LSplashScreen(u, x1, x2); } @@ -3893,7 +3911,7 @@ public: Q_INVOKABLE void MsetPixmap(QSplashScreen* o, const QPixmap& x1) { o->setPixmap(x1); } }; -class EQL_EXPORT Q176 : public Q69 { // QSplitter +class EQL_EXPORT Q177 : public Q69 { // QSplitter Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSplitter(u, x1); } @@ -3925,7 +3943,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSplitter* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q177 : public Q237 { // QSplitterHandle +class EQL_EXPORT Q178 : public Q238 { // QSplitterHandle Q_OBJECT public: Q_INVOKABLE bool MopaqueResize(QSplitterHandle* o) const { return o->opaqueResize(); } @@ -3937,7 +3955,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSplitterHandle* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q184 : public Q69 { // QStackedWidget +class EQL_EXPORT Q185 : public Q69 { // QStackedWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LStackedWidget(u, x1); } @@ -3951,7 +3969,7 @@ public: Q_INVOKABLE QWidget* Mwidget(QStackedWidget* o, int x1) const { return o->widget(x1); } }; -class EQL_EXPORT Q188 : public Q237 { // QStatusBar +class EQL_EXPORT Q189 : public Q238 { // QStatusBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LStatusBar(u, x1); } @@ -3967,7 +3985,7 @@ public: Q_INVOKABLE void Mreformat(QStatusBar* o) { ((LStatusBar*)o)->reformat(); } }; -class EQL_EXPORT Q197 : public Q237 { // QTabBar +class EQL_EXPORT Q198 : public Q238 { // QTabBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTabBar(u, x1); } @@ -4026,7 +4044,7 @@ public: Q_INVOKABLE QSize MsizeHint(QTabBar* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q198 : public Q237 { // QTabWidget +class EQL_EXPORT Q199 : public Q238 { // QTabWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTabWidget(u, x1); } @@ -4080,13 +4098,13 @@ public: Q_INVOKABLE QSize MsizeHint(QTabWidget* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q205 : public Q211 { // QTextBlockGroup +class EQL_EXPORT Q206 : public Q212 { // QTextBlockGroup Q_OBJECT public: Q_INVOKABLE QList MblockList(QTextBlockGroup* o) const { return ((LTextBlockGroup*)o)->blockList(); } }; -class EQL_EXPORT Q209 : public Q211 { // QTextFrame +class EQL_EXPORT Q210 : public Q212 { // QTextFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QTextDocument* x1) { return new LTextFrame(u, x1); } @@ -4100,7 +4118,7 @@ public: Q_INVOKABLE void MsetFrameFormat(QTextFrame* o, const QTextFrameFormat& x1) { o->setFrameFormat(x1); } }; -class EQL_EXPORT Q210 : public Q205 { // QTextList +class EQL_EXPORT Q211 : public Q206 { // QTextList Q_OBJECT public: Q_INVOKABLE void Madd(QTextList* o, const QTextBlock& x1) { o->add(x1); } @@ -4114,7 +4132,7 @@ public: Q_INVOKABLE void MsetFormat(QTextList* o, const QTextListFormat& x1) { o->setFormat(x1); } }; -class EQL_EXPORT Q212 : public Q209 { // QTextTable +class EQL_EXPORT Q213 : public Q210 { // QTextTable Q_OBJECT public: Q_INVOKABLE void MappendColumns(QTextTable* o, int x1) { o->appendColumns(x1); } @@ -4138,14 +4156,14 @@ public: Q_INVOKABLE void MsplitCell(QTextTable* o, int x1, int x2, int x3, int x4) { o->splitCell(x1, x2, x3, x4); } }; -class EQL_EXPORT Q213 : public Q46 { // QTimeEdit +class EQL_EXPORT Q214 : public Q46 { // QTimeEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTimeEdit(u, x1); } Q_INVOKABLE void* C(uint u, const QTime& x1, QWidget* x2 = 0) { return new LTimeEdit(u, x1, x2); } }; -class EQL_EXPORT Q216 : public Q237 { // QToolBar +class EQL_EXPORT Q217 : public Q238 { // QToolBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, QWidget* x2 = 0) { return new LToolBar(u, x1, x2); } @@ -4177,7 +4195,7 @@ public: Q_INVOKABLE QWidget* MwidgetForAction(QToolBar* o, QAction* x1) const { return o->widgetForAction(x1); } }; -class EQL_EXPORT Q217 : public Q69 { // QToolBox +class EQL_EXPORT Q218 : public Q69 { // QToolBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LToolBox(u, x1, x2); } @@ -4201,7 +4219,7 @@ public: Q_INVOKABLE QWidget* Mwidget(QToolBox* o, int x1) const { return o->widget(x1); } }; -class EQL_EXPORT Q218 : public Q2 { // QToolButton +class EQL_EXPORT Q219 : public Q2 { // QToolButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LToolButton(u, x1); } @@ -4219,14 +4237,14 @@ public: Q_INVOKABLE QSize MsizeHint(QToolButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q226 : public Q25 { // QVBoxLayout +class EQL_EXPORT Q227 : public Q25 { // QVBoxLayout Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LVBoxLayout(u); } Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LVBoxLayout(u, x1); } }; -class EQL_EXPORT Q240 : public Q49 { // QWizard +class EQL_EXPORT Q241 : public Q49 { // QWizard Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LWizard(u, x1, x2); } @@ -4336,7 +4354,7 @@ public: Q_INVOKABLE QColor SstandardColor(int x1) { return QColorDialog::standardColor(x1); } }; -class EQL_EXPORT Q40 : public Q158 { // QCommandLinkButton +class EQL_EXPORT Q40 : public Q159 { // QCommandLinkButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCommandLinkButton(u, x1); } @@ -4517,7 +4535,7 @@ public: Q_INVOKABLE int MupdateBehavior(QOpenGLWindow* o) const { return o->updateBehavior(); } }; -class EQL_EXPORT Q149 : public Q10 { // QPlainTextEdit +class EQL_EXPORT Q150 : public Q10 { // QPlainTextEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LPlainTextEdit(u, x1); } @@ -4579,7 +4597,7 @@ public: Q_INVOKABLE QVariant MinputMethodQuery(QPlainTextEdit* o, Qt::InputMethodQuery x1) const { return o->inputMethodQuery(x1); } }; -class EQL_EXPORT Q151 : public Q8 { // QPrintDialog +class EQL_EXPORT Q152 : public Q8 { // QPrintDialog Q_OBJECT public: Q_INVOKABLE void* C(uint u, QPrinter* x1, QWidget* x2 = 0) { return new LPrintDialog(u, x1, x2); } @@ -4595,7 +4613,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q164 : public Q10 { // QScrollArea +class EQL_EXPORT Q165 : public Q10 { // QScrollArea Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LScrollArea(u, x1); } @@ -4612,7 +4630,7 @@ public: Q_INVOKABLE QSize MsizeHint(QScrollArea* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q208 : public Q10 { // QTextEdit +class EQL_EXPORT Q209 : public Q10 { // QTextEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTextEdit(u, x1); } @@ -4919,7 +4937,7 @@ public: Q_INVOKABLE void MdropEvent(QListWidget* o, QDropEvent* x1) { o->dropEvent(x1); } }; -class EQL_EXPORT Q199 : public Q5 { // QTableView +class EQL_EXPORT Q200 : public Q5 { // QTableView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTableView(u, x1); } @@ -4959,7 +4977,7 @@ public: Q_INVOKABLE void MsetSelectionModel(QTableView* o, QItemSelectionModel* x1) { o->setSelectionModel(x1); } }; -class EQL_EXPORT Q200 : public Q199 { // QTableWidget +class EQL_EXPORT Q201 : public Q200 { // QTableWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTableWidget(u, x1); } @@ -5011,7 +5029,7 @@ public: Q_INVOKABLE QList Mitems(QTableWidget* o, const QMimeData* x1) const { return ((LTableWidget*)o)->items(x1); } }; -class EQL_EXPORT Q206 : public Q208 { // QTextBrowser +class EQL_EXPORT Q207 : public Q209 { // QTextBrowser Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTextBrowser(u, x1); } @@ -5032,7 +5050,7 @@ public: Q_INVOKABLE QVariant MloadResource(QTextBrowser* o, int x1, const QUrl& x2) { return o->loadResource(x1, x2); } }; -class EQL_EXPORT Q220 : public Q5 { // QTreeView +class EQL_EXPORT Q221 : public Q5 { // QTreeView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTreeView(u, x1); } @@ -5093,7 +5111,7 @@ public: Q_INVOKABLE QRect MvisualRect(QTreeView* o, const QModelIndex& x1) const { return o->visualRect(x1); } }; -class EQL_EXPORT Q221 : public Q220 { // QTreeWidget +class EQL_EXPORT Q222 : public Q221 { // QTreeWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTreeWidget(u, x1); } @@ -5139,7 +5157,7 @@ public: Q_INVOKABLE void MsetSelectionModel(QTreeWidget* o, QItemSelectionModel* x1) { o->setSelectionModel(x1); } }; -class EQL_EXPORT Q225 : public Q114 { // QUndoView +class EQL_EXPORT Q226 : public Q114 { // QUndoView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LUndoView(u, x1); } diff --git a/src/gen/help/_q_methods.h b/src/gen/help/_q_methods.h index f15906a..0541480 100644 --- a/src/gen/help/_q_methods.h +++ b/src/gen/help/_q_methods.h @@ -65,7 +65,7 @@ public: Q_INVOKABLE QHelpSearchResultWidget* MresultWidget(QHelpSearchEngine* o) { return o->resultWidget(); } }; -class Q97 : public Q189 { // QHelpIndexModel +class Q97 : public Q190 { // QHelpIndexModel Q_OBJECT public: Q_INVOKABLE void McreateIndex(QHelpIndexModel* o, const QString& x1) { o->createIndex(x1); } @@ -73,7 +73,7 @@ public: Q_INVOKABLE bool MisCreatingIndex(QHelpIndexModel* o) const { return o->isCreatingIndex(); } }; -class Q100 : public Q237 { // QHelpSearchQueryWidget +class Q100 : public Q238 { // QHelpSearchQueryWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LHelpSearchQueryWidget(u, x1); } @@ -84,13 +84,13 @@ public: Q_INVOKABLE void MsetQuery(QHelpSearchQueryWidget* o, const QList& x1) { o->setQuery(x1); } }; -class Q101 : public Q237 { // QHelpSearchResultWidget +class Q101 : public Q238 { // QHelpSearchResultWidget Q_OBJECT public: Q_INVOKABLE QUrl MlinkAt(QHelpSearchResultWidget* o, const QPoint& x1) { return o->linkAt(x1); } }; -class Q95 : public Q220 { // QHelpContentWidget +class Q95 : public Q221 { // QHelpContentWidget Q_OBJECT public: Q_INVOKABLE QModelIndex MindexOf(QHelpContentWidget* o, const QUrl& x1) { return o->indexOf(x1); } diff --git a/src/gen/multimedia/_ini.cpp b/src/gen/multimedia/_ini.cpp index e1a7838..b3e0e7e 100644 --- a/src/gen/multimedia/_ini.cpp +++ b/src/gen/multimedia/_ini.cpp @@ -47,9 +47,9 @@ void ini() { LObjects::Q[122] = new Q123; LObjects::Q[123] = new Q124; LObjects::Q[124] = new Q125; - LObjects::Q[159] = new Q160; - LObjects::Q[228] = new Q229; + LObjects::Q[160] = new Q161; LObjects::Q[229] = new Q230; + LObjects::Q[230] = new Q231; LObjects::N[7] = new N8; LObjects::N[8] = new N9; LObjects::N[9] = new N10; @@ -78,9 +78,9 @@ const QMetaObject* staticMetaObject(int n) { case 123: m = &QMediaPlaylist::staticMetaObject; break; case 124: m = &QMediaRecorder::staticMetaObject; break; case 125: m = &QMediaService::staticMetaObject; break; - case 160: m = &QRadioTuner::staticMetaObject; break; - case 229: m = &QVideoWidget::staticMetaObject; break; - case 230: m = &QVideoWidgetControl::staticMetaObject; break; } + case 161: m = &QRadioTuner::staticMetaObject; break; + case 230: m = &QVideoWidget::staticMetaObject; break; + case 231: m = &QVideoWidgetControl::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -110,9 +110,9 @@ NumList* overrideFunctions(const QByteArray& name) { case 122: ids = &LMediaPlayer::overrideIds; break; case 123: ids = &LMediaPlaylist::overrideIds; break; case 124: ids = &LMediaRecorder::overrideIds; break; - case 160: ids = &LRadioTuner::overrideIds; break; - case 229: ids = &LVideoWidget::overrideIds; break; - case 230: ids = &LVideoWidgetControl::overrideIds; break; }} + case 161: ids = &LRadioTuner::overrideIds; break; + case 230: ids = &LVideoWidget::overrideIds; break; + case 231: ids = &LVideoWidgetControl::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/multimedia/_q_classes.h b/src/gen/multimedia/_q_classes.h index ca0907d..b3661b8 100644 --- a/src/gen/multimedia/_q_classes.h +++ b/src/gen/multimedia/_q_classes.h @@ -222,7 +222,7 @@ public: class LRadioTuner : public QRadioTuner { Q_OBJECT - friend class Q160; + friend class Q161; public: LRadioTuner(uint u, QObject* x1 = 0) : QRadioTuner(x1), unique(u) {} @@ -242,7 +242,7 @@ public: class LVideoWidget : public QVideoWidget { Q_OBJECT - friend class Q229; + friend class Q230; public: LVideoWidget(uint u, QWidget* x1 = 0) : QVideoWidget(x1), unique(u) {} @@ -291,7 +291,7 @@ public: class LVideoWidgetControl : public QVideoWidgetControl { Q_OBJECT - friend class Q230; + friend class Q231; public: static NumList overrideIds; diff --git a/src/gen/multimedia/_q_methods.h b/src/gen/multimedia/_q_methods.h index 659ad4c..77f2bb2 100644 --- a/src/gen/multimedia/_q_methods.h +++ b/src/gen/multimedia/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q230 : public QObject { // QVideoWidgetControl +class Q231 : public QObject { // QVideoWidgetControl Q_OBJECT public: Q_INVOKABLE int MaspectRatioMode(QVideoWidgetControl* o) const { return o->aspectRatioMode(); } @@ -297,7 +297,7 @@ class Q125 : public Q136 { // QMediaService public: }; -class Q160 : public Q121 { // QRadioTuner +class Q161 : public Q121 { // QRadioTuner Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LRadioTuner(u, x1); } @@ -362,7 +362,7 @@ public: Q_INVOKABLE int Mavailability(QCamera* o) const { return o->availability(); } }; -class Q229 : public Q237 { // QVideoWidget +class Q230 : public Q238 { // QVideoWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LVideoWidget(u, x1); } @@ -376,7 +376,7 @@ public: Q_INVOKABLE QSize MsizeHint(QVideoWidget* o) const { return o->sizeHint(); } }; -class Q34 : public Q229 { // QCameraViewfinder +class Q34 : public Q230 { // QCameraViewfinder Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCameraViewfinder(u, x1); } diff --git a/src/gen/network/_ini.cpp b/src/gen/network/_ini.cpp index 99f6d89..0e94cba 100644 --- a/src/gen/network/_ini.cpp +++ b/src/gen/network/_ini.cpp @@ -7,11 +7,11 @@ QT_BEGIN_NAMESPACE NumList LAbstractSocket::overrideIds = NumList() << 117 << 118 << 119 << 120 << 121 << 122 << 123 << 124 << 125 << 126 << 127 << 128 << 129 << 130 << 131 << 132 << 133 << 134 << 135 << 136; -NumList LLocalServer::overrideIds = NumList() << 285 << 286 << 287; +NumList LLocalServer::overrideIds = NumList() << 285 << 286; NumList LLocalSocket::overrideIds = NumList() << 127 << 128 << 129 << 130 << 131 << 137 << 132 << 133 << 134 << 136; NumList LNetworkAccessManager::overrideIds = NumList(); -NumList LNetworkCookieJar::overrideIds = NumList() << 292 << 293 << 294 << 295 << 296 << 297; -NumList LNetworkDiskCache::overrideIds = NumList() << 298 << 299 << 300 << 301 << 302; +NumList LNetworkCookieJar::overrideIds = NumList() << 291 << 292 << 293 << 294 << 295 << 296; +NumList LNetworkDiskCache::overrideIds = NumList() << 297 << 298 << 299 << 300 << 301; NumList LTcpServer::overrideIds = NumList() << 285 << 286; NumList LTcpSocket::overrideIds = NumList(); NumList LUdpSocket::overrideIds = NumList(); @@ -43,9 +43,9 @@ void ini() { LObjects::Q[132] = new Q133; LObjects::Q[133] = new Q134; LObjects::Q[134] = new Q135; - LObjects::Q[202] = new Q203; LObjects::Q[203] = new Q204; - LObjects::Q[221] = new Q222; + LObjects::Q[204] = new Q205; + LObjects::Q[222] = new Q223; LObjects::N[10] = new N11; LObjects::N[73] = new N74; LObjects::N[74] = new N75; @@ -74,9 +74,9 @@ const QMetaObject* staticMetaObject(int n) { case 133: m = &QNetworkCookieJar::staticMetaObject; break; case 134: m = &QNetworkDiskCache::staticMetaObject; break; case 135: m = &QNetworkReply::staticMetaObject; break; - case 203: m = &QTcpServer::staticMetaObject; break; - case 204: m = &QTcpSocket::staticMetaObject; break; - case 222: m = &QUdpSocket::staticMetaObject; break; } + case 204: m = &QTcpServer::staticMetaObject; break; + case 205: m = &QTcpSocket::staticMetaObject; break; + case 223: m = &QUdpSocket::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -109,9 +109,9 @@ NumList* overrideFunctions(const QByteArray& name) { case 132: ids = &LNetworkAccessManager::overrideIds; break; case 133: ids = &LNetworkCookieJar::overrideIds; break; case 134: ids = &LNetworkDiskCache::overrideIds; break; - case 203: ids = <cpServer::overrideIds; break; - case 204: ids = <cpSocket::overrideIds; break; - case 222: ids = &LUdpSocket::overrideIds; break; }} + case 204: ids = <cpServer::overrideIds; break; + case 205: ids = <cpSocket::overrideIds; break; + case 223: ids = &LUdpSocket::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/network/_n_classes.h b/src/gen/network/_n_classes.h index f56a6b5..207b7dd 100644 --- a/src/gen/network/_n_classes.h +++ b/src/gen/network/_n_classes.h @@ -26,9 +26,6 @@ class LHostAddress : public QHostAddress { public: LHostAddress(uint u) : unique(u) {} LHostAddress(uint u, quint32 x1) : QHostAddress(x1), unique(u) {} - LHostAddress(uint u, quint8* x1) : QHostAddress(x1), unique(u) {} - LHostAddress(uint u, const quint8* x1) : QHostAddress(x1), unique(u) {} - LHostAddress(uint u, const sockaddr* x1) : QHostAddress(x1), unique(u) {} LHostAddress(uint u, const QString& x1) : QHostAddress(x1), unique(u) {} LHostAddress(uint u, const QHostAddress& x1) : QHostAddress(x1), unique(u) {} LHostAddress(uint u, SpecialAddress x1) : QHostAddress(x1), unique(u) {} diff --git a/src/gen/network/_n_methods.h b/src/gen/network/_n_methods.h index 644313f..eb96556 100644 --- a/src/gen/network/_n_methods.h +++ b/src/gen/network/_n_methods.h @@ -32,9 +32,6 @@ class N74 : public QObject { // QHostAddress public: Q_INVOKABLE void* C(uint u) { return new LHostAddress(u); } Q_INVOKABLE void* C(uint u, quint32 x1) { return new LHostAddress(u, x1); } - Q_INVOKABLE void* C(uint u, quint8* x1) { return new LHostAddress(u, x1); } - Q_INVOKABLE void* C(uint u, const quint8* x1) { return new LHostAddress(u, x1); } - Q_INVOKABLE void* C(uint u, const sockaddr* x1) { return new LHostAddress(u, x1); } Q_INVOKABLE void* C(uint u, const QString& x1) { return new LHostAddress(u, x1); } Q_INVOKABLE void* C(uint u, const QHostAddress& x1) { return new LHostAddress(u, x1); } Q_INVOKABLE void* C(uint u, QHostAddress::SpecialAddress x1) { return new LHostAddress(u, x1); } @@ -45,10 +42,7 @@ public: Q_INVOKABLE int Mprotocol(QHostAddress* o) const { return o->protocol(); } Q_INVOKABLE QString MscopeId(QHostAddress* o) const { return o->scopeId(); } Q_INVOKABLE void MsetAddress(QHostAddress* o, quint32 x1) { o->setAddress(x1); } - Q_INVOKABLE void MsetAddress(QHostAddress* o, quint8* x1) { o->setAddress(x1); } - Q_INVOKABLE void MsetAddress(QHostAddress* o, const quint8* x1) { o->setAddress(x1); } Q_INVOKABLE bool MsetAddress(QHostAddress* o, const QString& x1) { return o->setAddress(x1); } - Q_INVOKABLE void MsetAddress(QHostAddress* o, const sockaddr* x1) { o->setAddress(x1); } Q_INVOKABLE void MsetScopeId(QHostAddress* o, const QString& x1) { o->setScopeId(x1); } Q_INVOKABLE quint32 MtoIPv4Address(QHostAddress* o) const { return o->toIPv4Address(); } Q_INVOKABLE quint32 MtoIPv4Address(QHostAddress* o, bool* x1) const { return o->toIPv4Address(x1); } diff --git a/src/gen/network/_q_classes.h b/src/gen/network/_q_classes.h index 139de3c..6ef5c80 100644 --- a/src/gen/network/_q_classes.h +++ b/src/gen/network/_q_classes.h @@ -61,7 +61,6 @@ public: bool hasPendingConnections() const { quint64 id = LObjects::override_id(unique, 285); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 285, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QLocalServer::hasPendingConnections(); } return ret; } QLocalSocket* nextPendingConnection() { quint64 id = LObjects::override_id(unique, 286); void* fun = LObjects::overrideFun(id); QLocalSocket* ret = 0; if(fun && (LObjects::calling != id)) { ret = (QLocalSocket*)callOverrideFun(fun, 286, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QLocalServer::nextPendingConnection(); } return ret; } - void incomingConnection(quintptr x1) { quint64 id = LObjects::override_id(unique, 287); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 287, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QLocalServer::incomingConnection(x1); }} bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QLocalServer::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QLocalServer::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QLocalServer::customEvent(x1); }} @@ -123,12 +122,12 @@ public: static NumList overrideIds; uint unique; - QList cookiesForUrl(const QUrl& x1) const { quint64 id = LObjects::override_id(unique, 292); void* fun = LObjects::overrideFun(id); QList ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 292, args, id).value >(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::cookiesForUrl(x1); } return ret; } - bool deleteCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 293); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 293, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::deleteCookie(x1); } return ret; } - bool insertCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 294); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 294, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::insertCookie(x1); } return ret; } - bool setCookiesFromUrl(const QList& x1, const QUrl& x2) { quint64 id = LObjects::override_id(unique, 295); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 295, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::setCookiesFromUrl(x1, x2); } return ret; } - bool updateCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 296); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 296, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::updateCookie(x1); } return ret; } - bool validateCookie(const QNetworkCookie& x1, const QUrl& x2) const { quint64 id = LObjects::override_id(unique, 297); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 297, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::validateCookie(x1, x2); } return ret; } + QList cookiesForUrl(const QUrl& x1) const { quint64 id = LObjects::override_id(unique, 291); void* fun = LObjects::overrideFun(id); QList ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 291, args, id).value >(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::cookiesForUrl(x1); } return ret; } + bool deleteCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 292); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 292, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::deleteCookie(x1); } return ret; } + bool insertCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 293); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 293, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::insertCookie(x1); } return ret; } + bool setCookiesFromUrl(const QList& x1, const QUrl& x2) { quint64 id = LObjects::override_id(unique, 294); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 294, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::setCookiesFromUrl(x1, x2); } return ret; } + bool updateCookie(const QNetworkCookie& x1) { quint64 id = LObjects::override_id(unique, 295); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 295, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::updateCookie(x1); } return ret; } + bool validateCookie(const QNetworkCookie& x1, const QUrl& x2) const { quint64 id = LObjects::override_id(unique, 296); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 296, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::validateCookie(x1, x2); } return ret; } bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkCookieJar::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkCookieJar::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkCookieJar::customEvent(x1); }} @@ -144,11 +143,11 @@ public: static NumList overrideIds; uint unique; - qlonglong expire() { quint64 id = LObjects::override_id(unique, 298); void* fun = LObjects::overrideFun(id); qlonglong ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 298, 0, id).toLongLong(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::expire(); } return ret; } - qlonglong cacheSize() const { quint64 id = LObjects::override_id(unique, 299); void* fun = LObjects::overrideFun(id); qlonglong ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 299, 0, id).toLongLong(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::cacheSize(); } return ret; } - QNetworkCacheMetaData metaData(const QUrl& x1) { quint64 id = LObjects::override_id(unique, 300); void* fun = LObjects::overrideFun(id); QNetworkCacheMetaData ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 300, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::metaData(x1); } return ret; } - bool remove(const QUrl& x1) { quint64 id = LObjects::override_id(unique, 301); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 301, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::remove(x1); } return ret; } - void updateMetaData(const QNetworkCacheMetaData& x1) { quint64 id = LObjects::override_id(unique, 302); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 302, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkDiskCache::updateMetaData(x1); }} + qlonglong expire() { quint64 id = LObjects::override_id(unique, 297); void* fun = LObjects::overrideFun(id); qlonglong ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 297, 0, id).toLongLong(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::expire(); } return ret; } + qlonglong cacheSize() const { quint64 id = LObjects::override_id(unique, 298); void* fun = LObjects::overrideFun(id); qlonglong ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 298, 0, id).toLongLong(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::cacheSize(); } return ret; } + QNetworkCacheMetaData metaData(const QUrl& x1) { quint64 id = LObjects::override_id(unique, 299); void* fun = LObjects::overrideFun(id); QNetworkCacheMetaData ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 299, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::metaData(x1); } return ret; } + bool remove(const QUrl& x1) { quint64 id = LObjects::override_id(unique, 300); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 300, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::remove(x1); } return ret; } + void updateMetaData(const QNetworkCacheMetaData& x1) { quint64 id = LObjects::override_id(unique, 301); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 301, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkDiskCache::updateMetaData(x1); }} bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QNetworkDiskCache::eventFilter(x1, x2); } return ret; } void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkDiskCache::childEvent(x1); }} void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QNetworkDiskCache::customEvent(x1); }} @@ -157,7 +156,7 @@ public: class LTcpServer : public QTcpServer { Q_OBJECT - friend class Q203; + friend class Q204; public: LTcpServer(uint u, QObject* x1 = 0) : QTcpServer(x1), unique(u) {} @@ -174,7 +173,7 @@ public: class LTcpSocket : public QTcpSocket { Q_OBJECT - friend class Q204; + friend class Q205; public: LTcpSocket(uint u, QObject* x1 = 0) : QTcpSocket(x1), unique(u) {} @@ -213,7 +212,7 @@ public: class LUdpSocket : public QUdpSocket { Q_OBJECT - friend class Q222; + friend class Q223; public: LUdpSocket(uint u, QObject* x1 = 0) : QUdpSocket(x1), unique(u) {} diff --git a/src/gen/network/_q_methods.h b/src/gen/network/_q_methods.h index 6db7ef4..13da5fe 100644 --- a/src/gen/network/_q_methods.h +++ b/src/gen/network/_q_methods.h @@ -147,7 +147,7 @@ public: Q_INVOKABLE void Mclose(QNetworkReply* o) { o->close(); } }; -class Q203 : public Q136 { // QTcpServer +class Q204 : public Q136 { // QTcpServer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTcpServer(u, x1); } @@ -218,13 +218,13 @@ public: Q_INVOKABLE bool MwaitForReadyRead(QAbstractSocket* o, int x1 = 30000) { return o->waitForReadyRead(x1); } }; -class Q204 : public Q12 { // QTcpSocket +class Q205 : public Q12 { // QTcpSocket Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTcpSocket(u, x1); } }; -class Q222 : public Q12 { // QUdpSocket +class Q223 : public Q12 { // QUdpSocket Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUdpSocket(u, x1); } diff --git a/src/gen/sql/_ini.cpp b/src/gen/sql/_ini.cpp index b850a67..f7cbf4b 100644 --- a/src/gen/sql/_ini.cpp +++ b/src/gen/sql/_ini.cpp @@ -18,16 +18,16 @@ NumList LSqlIndex::overrideIds = NumList(); NumList LSqlQuery::overrideIds = NumList(); NumList LSqlRecord::overrideIds = NumList(); NumList LSqlRelation::overrideIds = NumList(); -NumList LSqlResult::overrideIds = NumList() << 332 << 469 << 470 << 459 << 107 << 471 << 472 << 473 << 474 << 475 << 476 << 477 << 478 << 479 << 480 << 481 << 482 << 483 << 484 << 485 << 346 << 486 << 487 << 141; +NumList LSqlResult::overrideIds = NumList() << 332 << 468 << 469 << 459 << 107 << 470 << 471 << 472 << 473 << 474 << 475 << 476 << 477 << 478 << 479 << 480 << 481 << 482 << 483 << 484 << 346 << 485 << 486 << 141; void ini() { static bool _ = false; if(_) return; _ = true; ini2(); - LObjects::Q[177] = new Q178; LObjects::Q[178] = new Q179; LObjects::Q[179] = new Q180; LObjects::Q[180] = new Q181; LObjects::Q[181] = new Q182; + LObjects::Q[182] = new Q183; LObjects::N[137] = new N138; LObjects::N[138] = new N139; LObjects::N[139] = new N140; @@ -40,11 +40,11 @@ void ini() { const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { - case 178: m = &QSqlDriver::staticMetaObject; break; - case 179: m = &QSqlQueryModel::staticMetaObject; break; - case 180: m = &QSqlRelationalDelegate::staticMetaObject; break; - case 181: m = &QSqlRelationalTableModel::staticMetaObject; break; - case 182: m = &QSqlTableModel::staticMetaObject; break; } + case 179: m = &QSqlDriver::staticMetaObject; break; + case 180: m = &QSqlQueryModel::staticMetaObject; break; + case 181: m = &QSqlRelationalDelegate::staticMetaObject; break; + case 182: m = &QSqlRelationalTableModel::staticMetaObject; break; + case 183: m = &QSqlTableModel::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -63,11 +63,11 @@ NumList* overrideFunctions(const QByteArray& name) { int n = LObjects::q_names.value(name, -1); if(n != -1) { switch(n) { - case 178: ids = &LSqlDriver::overrideIds; break; - case 179: ids = &LSqlQueryModel::overrideIds; break; - case 180: ids = &LSqlRelationalDelegate::overrideIds; break; - case 181: ids = &LSqlRelationalTableModel::overrideIds; break; - case 182: ids = &LSqlTableModel::overrideIds; break; }} + case 179: ids = &LSqlDriver::overrideIds; break; + case 180: ids = &LSqlQueryModel::overrideIds; break; + case 181: ids = &LSqlRelationalDelegate::overrideIds; break; + case 182: ids = &LSqlRelationalTableModel::overrideIds; break; + case 183: ids = &LSqlTableModel::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/sql/_n_classes.h b/src/gen/sql/_n_classes.h index c462b02..a26cee5 100644 --- a/src/gen/sql/_n_classes.h +++ b/src/gen/sql/_n_classes.h @@ -91,27 +91,27 @@ public: uint unique; QVariant handle() const { quint64 id = LObjects::override_id(unique, 332); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 332, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::handle(); } return ret; } - void bindValue(int x1, const QVariant& x2, QSql::ParamType x3) { quint64 id = LObjects::override_id(unique, 469); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; callOverrideFun(fun, 469, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::bindValue(x1, x2, x3); }} + void bindValue(int x1, const QVariant& x2, QSql::ParamType x3) { quint64 id = LObjects::override_id(unique, 468); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; callOverrideFun(fun, 468, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::bindValue(x1, x2, x3); }} QVariant data(int x1) { quint64 id = LObjects::override_id(unique, 459); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 459, args, id).value(); } return ret; } bool exec() { quint64 id = LObjects::override_id(unique, 107); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 107, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::exec(); } return ret; } - bool fetch(int x1) { quint64 id = LObjects::override_id(unique, 471); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 471, args, id).toBool(); } return ret; } - bool fetchFirst() { quint64 id = LObjects::override_id(unique, 472); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 472, 0, id).toBool(); } return ret; } - bool fetchLast() { quint64 id = LObjects::override_id(unique, 473); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 473, 0, id).toBool(); } return ret; } - bool fetchNext() { quint64 id = LObjects::override_id(unique, 474); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 474, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::fetchNext(); } return ret; } - bool fetchPrevious() { quint64 id = LObjects::override_id(unique, 475); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 475, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::fetchPrevious(); } return ret; } - bool isNull(int x1) { quint64 id = LObjects::override_id(unique, 476); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 476, args, id).toBool(); } return ret; } - QVariant lastInsertId() const { quint64 id = LObjects::override_id(unique, 477); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 477, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::lastInsertId(); } return ret; } - int numRowsAffected() { quint64 id = LObjects::override_id(unique, 478); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 478, 0, id).toInt(); } return ret; } - bool prepare(const QString& x1) { quint64 id = LObjects::override_id(unique, 479); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 479, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::prepare(x1); } return ret; } - QSqlRecord record() const { quint64 id = LObjects::override_id(unique, 480); void* fun = LObjects::overrideFun(id); QSqlRecord ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 480, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::record(); } return ret; } - bool reset(const QString& x1) { quint64 id = LObjects::override_id(unique, 481); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 481, args, id).toBool(); } return ret; } - bool savePrepare(const QString& x1) { quint64 id = LObjects::override_id(unique, 482); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 482, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::savePrepare(x1); } return ret; } - void setActive(bool x1) { quint64 id = LObjects::override_id(unique, 483); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 483, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setActive(x1); }} - void setAt(int x1) { quint64 id = LObjects::override_id(unique, 484); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 484, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setAt(x1); }} - void setForwardOnly(bool x1) { quint64 id = LObjects::override_id(unique, 485); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 485, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setForwardOnly(x1); }} + bool fetch(int x1) { quint64 id = LObjects::override_id(unique, 470); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 470, args, id).toBool(); } return ret; } + bool fetchFirst() { quint64 id = LObjects::override_id(unique, 471); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 471, 0, id).toBool(); } return ret; } + bool fetchLast() { quint64 id = LObjects::override_id(unique, 472); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 472, 0, id).toBool(); } return ret; } + bool fetchNext() { quint64 id = LObjects::override_id(unique, 473); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 473, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::fetchNext(); } return ret; } + bool fetchPrevious() { quint64 id = LObjects::override_id(unique, 474); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 474, 0, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::fetchPrevious(); } return ret; } + bool isNull(int x1) { quint64 id = LObjects::override_id(unique, 475); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 475, args, id).toBool(); } return ret; } + QVariant lastInsertId() const { quint64 id = LObjects::override_id(unique, 476); void* fun = LObjects::overrideFun(id); QVariant ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 476, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::lastInsertId(); } return ret; } + int numRowsAffected() { quint64 id = LObjects::override_id(unique, 477); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 477, 0, id).toInt(); } return ret; } + bool prepare(const QString& x1) { quint64 id = LObjects::override_id(unique, 478); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 478, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::prepare(x1); } return ret; } + QSqlRecord record() const { quint64 id = LObjects::override_id(unique, 479); void* fun = LObjects::overrideFun(id); QSqlRecord ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 479, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::record(); } return ret; } + bool reset(const QString& x1) { quint64 id = LObjects::override_id(unique, 480); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 480, args, id).toBool(); } return ret; } + bool savePrepare(const QString& x1) { quint64 id = LObjects::override_id(unique, 481); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; ret = callOverrideFun(fun, 481, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QSqlResult::savePrepare(x1); } return ret; } + void setActive(bool x1) { quint64 id = LObjects::override_id(unique, 482); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 482, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setActive(x1); }} + void setAt(int x1) { quint64 id = LObjects::override_id(unique, 483); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 483, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setAt(x1); }} + void setForwardOnly(bool x1) { quint64 id = LObjects::override_id(unique, 484); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 484, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setForwardOnly(x1); }} void setLastError(const QSqlError& x1) { quint64 id = LObjects::override_id(unique, 346); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 346, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setLastError(x1); }} - void setQuery(const QString& x1) { quint64 id = LObjects::override_id(unique, 486); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 486, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setQuery(x1); }} - void setSelect(bool x1) { quint64 id = LObjects::override_id(unique, 487); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 487, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setSelect(x1); }} + void setQuery(const QString& x1) { quint64 id = LObjects::override_id(unique, 485); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 485, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setQuery(x1); }} + void setSelect(bool x1) { quint64 id = LObjects::override_id(unique, 486); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 486, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QSqlResult::setSelect(x1); }} int size() { quint64 id = LObjects::override_id(unique, 141); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 141, 0, id).toInt(); } return ret; } }; diff --git a/src/gen/sql/_q_classes.h b/src/gen/sql/_q_classes.h index a77ee61..d568275 100644 --- a/src/gen/sql/_q_classes.h +++ b/src/gen/sql/_q_classes.h @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE class LSqlDriver : public QSqlDriver { Q_OBJECT - friend class Q178; + friend class Q179; public: LSqlDriver(uint u, QObject* x1 = 0) : QSqlDriver(x1), unique(u) {} @@ -51,7 +51,7 @@ public: class LSqlQueryModel : public QSqlQueryModel { Q_OBJECT - friend class Q179; + friend class Q180; public: LSqlQueryModel(uint u, QObject* x1 = 0) : QSqlQueryModel(x1), unique(u) {} @@ -95,7 +95,7 @@ public: class LSqlRelationalDelegate : public QSqlRelationalDelegate { Q_OBJECT - friend class Q180; + friend class Q181; public: LSqlRelationalDelegate(uint u, QObject* x1 = 0) : QSqlRelationalDelegate(x1), unique(u) {} @@ -123,7 +123,7 @@ public: class LSqlRelationalTableModel : public QSqlRelationalTableModel { Q_OBJECT - friend class Q181; + friend class Q182; public: LSqlRelationalTableModel(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) : QSqlRelationalTableModel(x1, x2), unique(u) {} @@ -180,7 +180,7 @@ public: class LSqlTableModel : public QSqlTableModel { Q_OBJECT - friend class Q182; + friend class Q183; public: LSqlTableModel(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) : QSqlTableModel(x1, x2), unique(u) {} diff --git a/src/gen/sql/_q_methods.h b/src/gen/sql/_q_methods.h index 8ea0578..5b06ac3 100644 --- a/src/gen/sql/_q_methods.h +++ b/src/gen/sql/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q178 : public Q136 { // QSqlDriver +class Q179 : public Q136 { // QSqlDriver Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlDriver(u, x1); } @@ -42,7 +42,7 @@ public: Q_INVOKABLE bool MunsubscribeFromNotification(QSqlDriver* o, const QString& x1) { return o->unsubscribeFromNotification(x1); } }; -class Q179 : public Q15 { // QSqlQueryModel +class Q180 : public Q15 { // QSqlQueryModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlQueryModel(u, x1); } @@ -65,7 +65,7 @@ public: Q_INVOKABLE bool MsetHeaderData(QSqlQueryModel* o, int x1, Qt::Orientation x2, const QVariant& x3, int x4 = Qt::EditRole) { return o->setHeaderData(x1, x2, x3, x4); } }; -class Q180 : public Q106 { // QSqlRelationalDelegate +class Q181 : public Q106 { // QSqlRelationalDelegate Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlRelationalDelegate(u, x1); } @@ -73,7 +73,7 @@ public: Q_INVOKABLE void MsetModelData(QSqlRelationalDelegate* o, QWidget* x1, QAbstractItemModel* x2, const QModelIndex& x3) const { o->setModelData(x1, x2, x3); } }; -class Q182 : public Q179 { // QSqlTableModel +class Q183 : public Q180 { // QSqlTableModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) { return new LSqlTableModel(u, x1, x2); } @@ -109,7 +109,7 @@ public: Q_INVOKABLE void Msort(QSqlTableModel* o, int x1, Qt::SortOrder x2) { o->sort(x1, x2); } }; -class Q181 : public Q182 { // QSqlRelationalTableModel +class Q182 : public Q183 { // QSqlRelationalTableModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) { return new LSqlRelationalTableModel(u, x1, x2); } diff --git a/src/gen/svg/_ini.cpp b/src/gen/svg/_ini.cpp index 25f8372..ddf140f 100644 --- a/src/gen/svg/_ini.cpp +++ b/src/gen/svg/_ini.cpp @@ -15,16 +15,16 @@ void ini() { static bool _ = false; if(_) return; _ = true; ini2(); LObjects::Q[81] = new Q82; - LObjects::Q[191] = new Q192; LObjects::Q[192] = new Q193; + LObjects::Q[193] = new Q194; LObjects::N[156] = new N157; } const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { case 82: m = &QGraphicsSvgItem::staticMetaObject; break; - case 192: m = &QSvgRenderer::staticMetaObject; break; - case 193: m = &QSvgWidget::staticMetaObject; break; } + case 193: m = &QSvgRenderer::staticMetaObject; break; + case 194: m = &QSvgWidget::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -37,8 +37,8 @@ NumList* overrideFunctions(const QByteArray& name) { if(n != -1) { switch(n) { case 82: ids = &LGraphicsSvgItem::overrideIds; break; - case 192: ids = &LSvgRenderer::overrideIds; break; - case 193: ids = &LSvgWidget::overrideIds; break; }} + case 193: ids = &LSvgRenderer::overrideIds; break; + case 194: ids = &LSvgWidget::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/svg/_q_classes.h b/src/gen/svg/_q_classes.h index a40b73b..1e52000 100644 --- a/src/gen/svg/_q_classes.h +++ b/src/gen/svg/_q_classes.h @@ -32,7 +32,7 @@ public: class LSvgRenderer : public QSvgRenderer { Q_OBJECT - friend class Q192; + friend class Q193; public: LSvgRenderer(uint u, QObject* x1 = 0) : QSvgRenderer(x1), unique(u) {} LSvgRenderer(uint u, const QString& x1, QObject* x2 = 0) : QSvgRenderer(x1, x2), unique(u) {} @@ -49,7 +49,7 @@ public: class LSvgWidget : public QSvgWidget { Q_OBJECT - friend class Q193; + friend class Q194; public: LSvgWidget(uint u, QWidget* x1 = 0) : QSvgWidget(x1), unique(u) {} LSvgWidget(uint u, const QString& x1, QWidget* x2 = 0) : QSvgWidget(x1, x2), unique(u) {} diff --git a/src/gen/svg/_q_methods.h b/src/gen/svg/_q_methods.h index bcfc641..514f64a 100644 --- a/src/gen/svg/_q_methods.h +++ b/src/gen/svg/_q_methods.h @@ -27,7 +27,7 @@ public: Q_INVOKABLE int Mtype(QGraphicsSvgItem* o) const { return o->type(); } }; -class Q192 : public Q136 { // QSvgRenderer +class Q193 : public Q136 { // QSvgRenderer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSvgRenderer(u, x1); } @@ -47,7 +47,7 @@ public: Q_INVOKABLE QRectF MviewBoxF(QSvgRenderer* o) const { return o->viewBoxF(); } }; -class Q193 : public Q237 { // QSvgWidget +class Q194 : public Q238 { // QSvgWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSvgWidget(u, x1); } diff --git a/src/gen/webkit/_ini.cpp b/src/gen/webkit/_ini.cpp index 47e9165..f8f1c05 100644 --- a/src/gen/webkit/_ini.cpp +++ b/src/gen/webkit/_ini.cpp @@ -23,12 +23,12 @@ void ini() { static bool _ = false; if(_) return; _ = true; ini2(); LObjects::Q[86] = new Q87; - LObjects::Q[230] = new Q231; LObjects::Q[231] = new Q232; LObjects::Q[232] = new Q233; LObjects::Q[233] = new Q234; LObjects::Q[234] = new Q235; LObjects::Q[235] = new Q236; + LObjects::Q[236] = new Q237; LObjects::N[201] = new N202; LObjects::N[202] = new N203; LObjects::N[203] = new N204; @@ -42,12 +42,12 @@ const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { case 87: m = &QGraphicsWebView::staticMetaObject; break; - case 231: m = &QWebFrame::staticMetaObject; break; - case 232: m = &QWebHistoryInterface::staticMetaObject; break; - case 233: m = &QWebInspector::staticMetaObject; break; - case 234: m = &QWebPage::staticMetaObject; break; - case 235: m = &QWebPluginFactory::staticMetaObject; break; - case 236: m = &QWebView::staticMetaObject; break; } + case 232: m = &QWebFrame::staticMetaObject; break; + case 233: m = &QWebHistoryInterface::staticMetaObject; break; + case 234: m = &QWebInspector::staticMetaObject; break; + case 235: m = &QWebPage::staticMetaObject; break; + case 236: m = &QWebPluginFactory::staticMetaObject; break; + case 237: m = &QWebView::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -65,11 +65,11 @@ NumList* overrideFunctions(const QByteArray& name) { if(n != -1) { switch(n) { case 87: ids = &LGraphicsWebView::overrideIds; break; - case 232: ids = &LWebHistoryInterface::overrideIds; break; - case 233: ids = &LWebInspector::overrideIds; break; - case 234: ids = &LWebPage::overrideIds; break; - case 235: ids = &LWebPluginFactory::overrideIds; break; - case 236: ids = &LWebView::overrideIds; break; }} + case 233: ids = &LWebHistoryInterface::overrideIds; break; + case 234: ids = &LWebInspector::overrideIds; break; + case 235: ids = &LWebPage::overrideIds; break; + case 236: ids = &LWebPluginFactory::overrideIds; break; + case 237: ids = &LWebView::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/webkit/_q_classes.h b/src/gen/webkit/_q_classes.h index c77f42e..92328d4 100644 --- a/src/gen/webkit/_q_classes.h +++ b/src/gen/webkit/_q_classes.h @@ -73,7 +73,7 @@ public: class LWebHistoryInterface : public QWebHistoryInterface { Q_OBJECT - friend class Q232; + friend class Q233; public: LWebHistoryInterface(uint u, QObject* x1 = 0) : QWebHistoryInterface(x1), unique(u) {} @@ -90,7 +90,7 @@ public: class LWebInspector : public QWebInspector { Q_OBJECT - friend class Q233; + friend class Q234; public: LWebInspector(uint u, QWidget* x1 = 0) : QWebInspector(x1), unique(u) {} @@ -139,7 +139,7 @@ public: class LWebPage : public QWebPage { Q_OBJECT - friend class Q234; + friend class Q235; public: LWebPage(uint u, QObject* x1 = 0) : QWebPage(x1), unique(u) {} @@ -167,7 +167,7 @@ public: class LWebPluginFactory : public QWebPluginFactory { Q_OBJECT - friend class Q235; + friend class Q236; public: LWebPluginFactory(uint u, QObject* x1 = 0) : QWebPluginFactory(x1), unique(u) {} @@ -185,7 +185,7 @@ public: class LWebView : public QWebView { Q_OBJECT - friend class Q236; + friend class Q237; public: LWebView(uint u, QWidget* x1 = 0) : QWebView(x1), unique(u) {} diff --git a/src/gen/webkit/_q_methods.h b/src/gen/webkit/_q_methods.h index 5ceb880..b138839 100644 --- a/src/gen/webkit/_q_methods.h +++ b/src/gen/webkit/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q231 : public Q136 { // QWebFrame +class Q232 : public Q136 { // QWebFrame Q_OBJECT public: Q_INVOKABLE void MaddToJavaScriptWindowObject(QWebFrame* o, const QString& x1, QObject* x2, QWebFrame::ValueOwnership x3 = QWebFrame::QtOwnership) { o->addToJavaScriptWindowObject(x1, x2, x3); } @@ -62,7 +62,7 @@ public: Q_INVOKABLE bool Mevent(QWebFrame* o, QEvent* x1) { return o->event(x1); } }; -class Q232 : public Q136 { // QWebHistoryInterface +class Q233 : public Q136 { // QWebHistoryInterface Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebHistoryInterface(u, x1); } @@ -72,7 +72,7 @@ public: Q_INVOKABLE void SsetDefaultInterface(QWebHistoryInterface* x1) { QWebHistoryInterface::setDefaultInterface(x1); } }; -class Q234 : public Q136 { // QWebPage +class Q235 : public Q136 { // QWebPage Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebPage(u, x1); } @@ -126,7 +126,7 @@ public: Q_INVOKABLE bool Mevent(QWebPage* o, QEvent* x1) { return o->event(x1); } }; -class Q235 : public Q136 { // QWebPluginFactory +class Q236 : public Q136 { // QWebPluginFactory Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebPluginFactory(u, x1); } @@ -173,7 +173,7 @@ public: Q_INVOKABLE void MupdateGeometry(QGraphicsWebView* o) { o->updateGeometry(); } }; -class Q233 : public Q237 { // QWebInspector +class Q234 : public Q238 { // QWebInspector Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWebInspector(u, x1); } @@ -183,7 +183,7 @@ public: Q_INVOKABLE QSize MsizeHint(QWebInspector* o) const { return o->sizeHint(); } }; -class Q236 : public Q237 { // QWebView +class Q237 : public Q238 { // QWebView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWebView(u, x1); } diff --git a/src/lisp/ini.lisp b/src/lisp/ini.lisp index 0866284..68299b5 100644 --- a/src/lisp/ini.lisp +++ b/src/lisp/ini.lisp @@ -1,6 +1,6 @@ ;;; copyright (c) Polos Ruetz -(ffi:clines "#include ") ; for exit() +(ffi:clines "#include ") (in-package :eql) @@ -696,12 +696,15 @@ (defun qquit (&optional (exit-status 0) (kill-all-threads t)) "args: (&optional (exit-status 0) (kill-all-threads t)) alias: qq - Terminates EQL. Use this function to quit gracefully, not ext:quit." + Terminates EQL. Use this function to quit gracefully, not ext:quit.

Negative values for exit-status will call abort() instead of normal program exit (e.g. to prevent infinite error message loops in some nasty cases)." (declare (ignore kill-all-threads)) ; only here to be equivalent to EXT:QUIT (assert (typep exit-status 'fixnum)) (qfun (qapp) "aboutToQuit") (qfun (qapp) "quit") - (ffi:c-inline (exit-status) (:int) :void "cl_shutdown(); exit(#0);" :one-liner nil :side-effects t)) + (ffi:c-inline nil nil :void "cl_shutdown();" :one-liner t :side-effects t) + (if (minusp exit-status) + (ffi:c-inline nil nil :void "abort();" :one-liner t :side-effects t) + (ffi:c-inline (exit-status) (:int) :void "exit(#0);" :one-liner t :side-effects t))) ;; simplify using CLOS; see example "X-extras/CLOS-encapsulation.lisp" @@ -886,9 +889,12 @@ (return (tpl-make-command :EOF ""))) (#\: (let ((exp (read-preserving-whitespace))) - (return (if (find exp '(:qq :exit)) - "(eql:qquit)" - (tpl-make-command exp (read-line)))))) + (return (cond ((find exp '(:qq :exit)) + "(eql:qquit)") + ((find exp '(:qa :abort)) + "(eql:qquit -1)") + (t + tpl-make-command exp (read-line)))))) (#\? (read-char) (case (peek-char nil *standard-input* nil :EOF) diff --git a/src/lisp/restart-dialog.lisp b/src/lisp/restart-dialog.lisp index 7b1f3a8..6516aac 100644 --- a/src/lisp/restart-dialog.lisp +++ b/src/lisp/restart-dialog.lisp @@ -119,6 +119,8 @@ ":r1") ((find (string-downcase cmd) '(":qq" ":exit") :test 'string=) "(eql:qquit)") + ((find (string-downcase cmd) '(":qa" ":abort") :test 'string=) + "(eql:qquit -1)") (t (ensure-safe-restart cmd)))) (princ cmd)