|
|
|
@ -1,18 +1,18 @@
|
|
|
|
|
/*
|
|
|
|
|
* The SIP parser.
|
|
|
|
|
* The SIP-TQt parser.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com>
|
|
|
|
|
*
|
|
|
|
|
* This file is part of SIP.
|
|
|
|
|
* This file is part of SIP-TQt.
|
|
|
|
|
*
|
|
|
|
|
* This copy of SIP is licensed for use under the terms of the SIP License
|
|
|
|
|
* This copy of SIP-TQt is licensed for use under the terms of the SIP License
|
|
|
|
|
* Agreement. See the file LICENSE for more details.
|
|
|
|
|
*
|
|
|
|
|
* This copy of SIP may also used under the terms of the GNU General Public
|
|
|
|
|
* This copy of SIP-TQt may also used under the terms of the GNU General Public
|
|
|
|
|
* License v2 or v3 as published by the Free Software Foundation which can be
|
|
|
|
|
* found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
|
|
|
|
|
*
|
|
|
|
|
* SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* SIP-TQt is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
@ -1152,7 +1152,7 @@ unitcode: TK_UNITCODE codeblock {
|
|
|
|
|
prepycode: TK_PREPYCODE codeblock {
|
|
|
|
|
/*
|
|
|
|
|
* This is a no-op and is retained for compatibility
|
|
|
|
|
* until the last use of it (by SIP v3) can be removed
|
|
|
|
|
* until the last use of it (by SIP-TQt v3) can be removed
|
|
|
|
|
* from PyQt.
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
@ -4449,7 +4449,7 @@ codeBlock *templateCode(sipSpec *pt, ifaceFileList **used, codeBlock *ocb,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If the context in which the text is used is in the name of a
|
|
|
|
|
* SIP generated object then translate any "::" scoping to "_".
|
|
|
|
|
* SIP-TQt generated object then translate any "::" scoping to "_".
|
|
|
|
|
*/
|
|
|
|
|
for (gn = gen_names; *gn != NULL; ++gn)
|
|
|
|
|
if (search_back(first, at, *gn))
|
|
|
|
|