summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-02-07 11:07:33 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-07 11:28:03 +0900
commit746782ba8bfbc2ddc7d062f471c42d165f8b8a44 (patch)
tree9da8f1010e1b880d96cef24008129ef97ab29d62
parentbce54982a6bf61d292f293127118a5010260b63e (diff)
downloadsip4-tqt-746782ba8bfbc2ddc7d062f471c42d165f8b8a44.tar.gz
sip4-tqt-746782ba8bfbc2ddc7d062f471c42d165f8b8a44.zip
Replace Q_SIGNALS and Q_SLOTS
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--doc/html/_sources/c_api.txt2
-rw-r--r--doc/html/_sources/introduction.txt4
-rw-r--r--doc/html/_sources/specification_files.txt12
-rw-r--r--sipgen/lexer.l6
-rw-r--r--sphinx/c_api.rst2
-rw-r--r--sphinx/introduction.rst4
-rw-r--r--sphinx/specification_files.rst12
7 files changed, 16 insertions, 26 deletions
diff --git a/doc/html/_sources/c_api.txt b/doc/html/_sources/c_api.txt
index c1cb25a..db5785d 100644
--- a/doc/html/_sources/c_api.txt
+++ b/doc/html/_sources/c_api.txt
@@ -1696,7 +1696,7 @@ name prefixed by ``sip``. For example, the derived class for class ``Klass``
is ``sipKlass``.
If a C++ class doesn't have any virtual or protected methods in it or any of
-it's super-class hierarchy, or does not emit any TQt Q_SIGNALS, then a derived
+it's super-class hierarchy, or does not emit any TQt signals, then a derived
class is not generated.
Most of the time handwritten code should ignore the derived classes. The only
diff --git a/doc/html/_sources/introduction.txt b/doc/html/_sources/introduction.txt
index e89f48e..fd7d547 100644
--- a/doc/html/_sources/introduction.txt
+++ b/doc/html/_sources/introduction.txt
@@ -74,7 +74,7 @@ SIP, and the bindings it produces, have the following features:
- support for C++ exceptions and wrapping them as Python exceptions
-- the automatic generation of complementary rich comparison Q_SLOTS
+- the automatic generation of complementary rich comparison slots
- support for deprecation warnings
@@ -164,6 +164,6 @@ toolkit.
The SIP code generator understands the signal/slot type safe callback mechanism
that TQt uses to connect objects together. This allows applications to define
-new Python Q_SIGNALS, and allows any Python callable object to be used as a slot.
+new Python signals, and allows any Python callable object to be used as a slot.
SIP itself does not require TQt to be installed.
diff --git a/doc/html/_sources/specification_files.txt b/doc/html/_sources/specification_files.txt
index baa18f5..60afe3d 100644
--- a/doc/html/_sources/specification_files.txt
+++ b/doc/html/_sources/specification_files.txt
@@ -129,16 +129,12 @@ file.
*virtual-operator* |
*class-variable* |
**public:** |
- **public Q_SLOTS:** |
- **public Q_SLOTS:** |
+ **public slots:** |
**protected:** |
- **protected Q_SLOTS:** |
- **protected Q_SLOTS:** |
+ **protected slots:** |
**private:** |
- **private Q_SLOTS:** |
- **private Q_SLOTS:** |
- **Q_SIGNALS:** |
- **Q_SIGNALS:**]
+ **private slots:** |
+ **signals:**]
*constructor* ::= [**explicit**] *name* **(** [*argument-list*] **)**
[*exceptions*] [*function-annotations*]
diff --git a/sipgen/lexer.l b/sipgen/lexer.l
index 91032cc..c6c3f63 100644
--- a/sipgen/lexer.l
+++ b/sipgen/lexer.l
@@ -85,11 +85,9 @@ public {return TK_PUBLIC;}
protected {return TK_PROTECTED;}
private {return TK_PRIVATE;}
signals {return TK_SIGNALS;}
-Q_SIGNALS {return TK_SIGNALS;}
-Q_SIGNAL {return TK_SIGNAL_METHOD;}
+TQ_SIGNAL {return TK_SIGNAL_METHOD;}
slots {return TK_SLOTS;}
-Q_SLOTS {return TK_SLOTS;}
-Q_SLOT {return TK_SLOT_METHOD;}
+TQ_SLOT {return TK_SLOT_METHOD;}
char {return TK_CHAR;}
wchar_t {return TK_WCHAR_T;}
bool {return TK_BOOL;}
diff --git a/sphinx/c_api.rst b/sphinx/c_api.rst
index c1cb25a..db5785d 100644
--- a/sphinx/c_api.rst
+++ b/sphinx/c_api.rst
@@ -1696,7 +1696,7 @@ name prefixed by ``sip``. For example, the derived class for class ``Klass``
is ``sipKlass``.
If a C++ class doesn't have any virtual or protected methods in it or any of
-it's super-class hierarchy, or does not emit any TQt Q_SIGNALS, then a derived
+it's super-class hierarchy, or does not emit any TQt signals, then a derived
class is not generated.
Most of the time handwritten code should ignore the derived classes. The only
diff --git a/sphinx/introduction.rst b/sphinx/introduction.rst
index bdb4681..ab84fe9 100644
--- a/sphinx/introduction.rst
+++ b/sphinx/introduction.rst
@@ -74,7 +74,7 @@ SIP, and the bindings it produces, have the following features:
- support for C++ exceptions and wrapping them as Python exceptions
-- the automatic generation of complementary rich comparison Q_SLOTS
+- the automatic generation of complementary rich comparison slots
- support for deprecation warnings
@@ -164,6 +164,6 @@ toolkit.
The SIP code generator understands the signal/slot type safe callback mechanism
that TQt uses to connect objects together. This allows applications to define
-new Python Q_SIGNALS, and allows any Python callable object to be used as a slot.
+new Python signals, and allows any Python callable object to be used as a slot.
SIP itself does not require TQt to be installed.
diff --git a/sphinx/specification_files.rst b/sphinx/specification_files.rst
index baa18f5..60afe3d 100644
--- a/sphinx/specification_files.rst
+++ b/sphinx/specification_files.rst
@@ -129,16 +129,12 @@ file.
*virtual-operator* |
*class-variable* |
**public:** |
- **public Q_SLOTS:** |
- **public Q_SLOTS:** |
+ **public slots:** |
**protected:** |
- **protected Q_SLOTS:** |
- **protected Q_SLOTS:** |
+ **protected slots:** |
**private:** |
- **private Q_SLOTS:** |
- **private Q_SLOTS:** |
- **Q_SIGNALS:** |
- **Q_SIGNALS:**]
+ **private slots:** |
+ **signals:**]
*constructor* ::= [**explicit**] *name* **(** [*argument-list*] **)**
[*exceptions*] [*function-annotations*]