GIT_REPOSITORIES/LPP/PythonQt Files · generator/shellheadergenerator.cpp

improved code generation for virtual functions to support overriding getter slots that are named as properties...

improved code generation for virtual functions to support overriding getter slots that are named as properties git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@240 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

florianlink - - Load All Authors

File last commit:

r192:b923cb867b60


                r199:1f55453df6ee

Download file

             shellheadergenerator.cpp
        
                    317 lines
            
             | 11.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / generator / shellheadergenerator.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      /****************************************************************************

      **

        florianlink
    
updated generator to LGPLed version from gitorious...

              r87
            
      ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).

      ** All rights reserved.

      ** Contact: Nokia Corporation (qt-info@nokia.com)

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      **

        florianlink
    
updated generator to LGPLed version from gitorious...

              r87
            
      ** This file is part of the Qt Script Generator project on Qt Labs.

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      **

        florianlink
    
updated generator to LGPLed version from gitorious...

              r87
            
      ** $QT_BEGIN_LICENSE:LGPL$

      ** No Commercial Usage

      ** This file contains pre-release code and may not be distributed.

      ** You may use this file in accordance with the terms and conditions

      ** contained in the Technology Preview License Agreement accompanying

      ** this package.

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      **

        florianlink
    
updated generator to LGPLed version from gitorious...

              r87
            
      ** GNU Lesser General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU Lesser

      ** General Public License version 2.1 as published by the Free Software

      ** Foundation and appearing in the file LICENSE.LGPL included in the

      ** packaging of this file.  Please review the following information to

      ** ensure the GNU Lesser General Public License version 2.1 requirements

      ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      **

        florianlink
    
updated generator to LGPLed version from gitorious...

              r87
            
      ** In addition, as a special exception, Nokia gives you certain additional

      ** rights.  These rights are described in the Nokia Qt LGPL Exception

      ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.

      **

      ** If you have questions regarding the use of this file, please contact

      ** Nokia at qt-info@nokia.com.

      **

      **

      **

      **

      **

      **

      **

      **

      ** $QT_END_LICENSE$

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      **

      ****************************************************************************/

      #include "shellheadergenerator.h"

      #include "fileout.h"

      #include <QtCore/QDir>

      #include <qdebug.h>

      QString ShellHeaderGenerator::fileNameForClass(const AbstractMetaClass *meta_class) const

      {

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        return QString("PythonQtWrapper_%1.h").arg(meta_class->name());

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      }

        florianlink
    
added generation of setter_/getter_ slots for public member variables...

              r114
            
      void ShellHeaderGenerator::writeFieldAccessors(QTextStream &s, const AbstractMetaField *field)

      {

        const AbstractMetaFunction *setter = field->setter();

        const AbstractMetaFunction *getter = field->getter();

        florianlink
    
fixed some badly generated fields...

              r118
            
        // static fields are not supported (yet?)

        if (setter->isStatic()) return;

        // Uuid data4 did not work (TODO: move to typesystem...(

        florianlink
    
changed special generated method prefix to py_, added py_toString() generation...

              r115
            
        if (field->enclosingClass()->name()=="QUuid" &&  setter->name()=="data4") return;

        florianlink
    
fixed some badly generated fields...

              r118
            
        if (field->enclosingClass()->name()=="QIPv6Address") return;

        florianlink
    
added generation of setter_/getter_ slots for public member variables...

              r114
            
        if (!field->type()->isConstant()) {

          writeFunctionSignature(s, setter, 0, QString(),

                                 Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));

          s << "{ theWrappedObject->" << field->name() << " = " << setter->arguments()[0]->argumentName() << "; }\n";

        }

        writeFunctionSignature(s, getter, 0, QString(),

                               Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

        s << "{ return theWrappedObject->" << field->name() << "; }\n";

      }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)

      {

        florianlink
    
added builtin support for variants etc., this will replace the direct includes in PythonQt...

              r93
            
        QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";

        QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";

        priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));

        setupGenerator->addClass(meta_class->package().replace(".", "_") + builtIn, meta_class);

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        QString include_block = "PYTHONQTWRAPPER_" + meta_class->name().toUpper() + "_H";

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        s << "#ifndef " << include_block << endl

          << "#define " << include_block << endl << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        Include inc = meta_class->typeEntry()->include();

        ShellGenerator::writeInclude(s, inc);

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        s << "#include <QObject>" << endl << endl;

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        s << "#include <PythonQt.h>" << endl << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        IncludeList list = meta_class->typeEntry()->extraIncludes();

        qSort(list.begin(), list.end());

        foreach (const Include &inc, list) {

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          ShellGenerator::writeInclude(s, inc);

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        }  

        s << endl;

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        AbstractMetaFunctionList ctors = meta_class->queryFunctions(AbstractMetaClass::Constructors

          | AbstractMetaClass::WasVisible

          | AbstractMetaClass::NotRemovedFromTargetLang);

        florianlink
    
added data accessors for QImage (bits()/scanLine() and const versions)...

              r192
            
        if (meta_class->qualifiedCppName().contains("Ssl")) {

          s << "#ifndef QT_NO_OPENSSL"  << endl;

        }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        // Shell-------------------------------------------------------------------

        if (meta_class->generateShellClass()) {

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);

          s << "class " << shellClassName(meta_class)

            << " : public " << meta_class->qualifiedCppName() << endl << "{" << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          s << "public:" << endl;

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          foreach(AbstractMetaFunction* fun, ctors) {

            s << "    ";

            writeFunctionSignature(s, fun, 0,"PythonQtShell_",

              Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

            s << ":" << meta_class->qualifiedCppName() << "(";

            QString scriptFunctionName = fun->originalName();

            AbstractMetaArgumentList args = fun->arguments();

            for (int i = 0; i < args.size(); ++i) {

              if (i > 0)

                s << ", ";

              s << args.at(i)->argumentName();

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
            }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
            s << "),_wrapper(NULL) {};" << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          s << endl;

        florianlink
    
added destructor creation for shells...

              r178
            
          s << "   ~" << shellClassName(meta_class) << "();" << endl;

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          foreach(AbstractMetaFunction* fun, virtualsForShell) {

            s << "virtual ";

            writeFunctionSignature(s, fun, 0, QString(),

              Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

            s << ";" << endl;

          }

          s << endl;

          s << "  PythonQtInstanceWrapper* _wrapper; " << endl;

          s << "};" << endl << endl;

        }

        // Promoter-------------------------------------------------------------------

        AbstractMetaFunctionList promoteFunctions = getProtectedFunctionsThatNeedPromotion(meta_class);

        if (!promoteFunctions.isEmpty()) {

          s << "class " << promoterClassName(meta_class)

            << " : public " << meta_class->qualifiedCppName() << endl << "{ public:" << endl;

          foreach(AbstractMetaFunction* fun, promoteFunctions) {

            s << "inline ";

        florianlink
    
- upgraded generator to generate polymorphic handlers for downcasting...

              r29
            
            writeFunctionSignature(s, fun, 0, "promoted_",

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
              Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

            s << " { ";

            QString scriptFunctionName = fun->originalName();

            AbstractMetaArgumentList args = fun->arguments();

            if (fun->type())

              s << "return ";

            s << meta_class->qualifiedCppName() << "::";

            s << fun->originalName() << "(";

            for (int i = 0; i < args.size(); ++i) {

              if (i > 0)

                s << ", ";

              s << args.at(i)->argumentName();

            }

            s << "); }" << endl;

          }

          s << "};" << endl << endl;

        }

        // Wrapper-------------------------------------------------------------------

        s << "class " << wrapperClassName(meta_class)

          << " : public QObject" << endl

          << "{ Q_OBJECT" << endl;

        s << "public:" << endl;

        AbstractMetaEnumList enums1 = meta_class->enums();

        AbstractMetaEnumList enums;

        florianlink
    
added support for qflags, which where previously missing...

              r49
            
        QList<FlagsTypeEntry*> flags;

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        foreach(AbstractMetaEnum* enum1, enums1) {

          // catch gadgets and enums that are not exported on QObjects...

          if (enum1->wasPublic() && (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration())) {

            enums << enum1;

        florianlink
    
added support for qflags, which where previously missing...

              r49
            
            if (enum1->typeEntry()->flags()) {

              flags << enum1->typeEntry()->flags();

            }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
          }

        }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        if (enums.count()) {

          s << "Q_ENUMS(";

          foreach(AbstractMetaEnum* enum1, enums) {

            s << enum1->name() << " ";

          }

          s << ")" << endl;

        florianlink
    
added support for qflags, which where previously missing...

              r49
            
          if (flags.count()) {

            s << "Q_FLAGS(";

            foreach(FlagsTypeEntry* flag1, flags) {

              QString origName = flag1->originalName();

              int idx = origName.lastIndexOf("::");

              if (idx!= -1) {

                origName = origName.mid(idx+2);

              }

              s << origName << " ";

            }

            s << ")" << endl;

          }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          foreach(AbstractMetaEnum* enum1, enums) {

            s << "enum " << enum1->name() << "{" << endl;

            bool first = true;

            foreach(AbstractMetaEnumValue* value, enum1->values()) {

              if (first) { first = false; }

              else { s << ", "; }

              s << "  " << value->name() << " = " << meta_class->qualifiedCppName() << "::" << value->name();

            }

            s << "};" << endl;

          }

        florianlink
    
added support for qflags, which where previously missing...

              r49
            
          if (flags.count()) {

            foreach(AbstractMetaEnum* enum1, enums) {

              if (enum1->typeEntry()->flags()) {

                QString origName = enum1->typeEntry()->flags()->originalName();

                int idx = origName.lastIndexOf("::");

                if (idx!= -1) {

                  origName = origName.mid(idx+2);

                }

                s << "Q_DECLARE_FLAGS("<< origName << ", " << enum1->name() <<")"<<endl;

              }

            }

          }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        s << "public slots:" << endl;

        if (meta_class->generateShellClass() || !meta_class->isAbstract()) {

          bool copyConstructorSeen = false;

          bool defaultConstructorSeen = false;

          foreach (const AbstractMetaFunction *fun, ctors) {

            if (!fun->isPublic() || fun->isAbstract()) { continue; }

            s << meta_class->qualifiedCppName() << "* ";

            writeFunctionSignature(s, fun, 0, "new_",

              Option(IncludeDefaultExpression | OriginalName | ShowStatic));

            s << ";" << endl;

            if (fun->arguments().size()==1 && meta_class->qualifiedCppName() == fun->arguments().at(0)->type()->typeEntry()->qualifiedCppName()) {

              copyConstructorSeen = true;

            }

            if (fun->arguments().size()==0) {

              defaultConstructorSeen = true;

            }

          }

          if (meta_class->typeEntry()->isValue()

              && !copyConstructorSeen && defaultConstructorSeen) {

            QString className = meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName();

            s << meta_class->qualifiedCppName() << "* new_" << meta_class->name() << "(const " << meta_class->qualifiedCppName() << "& other) {" << endl;

            s << className << "* a = new " << className << "();" << endl;

            s << "*((" << meta_class->qualifiedCppName() << "*)a) = other;" << endl;

            s << "return a; }" << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          }

        }

        if (meta_class->hasPublicDestructor() && !meta_class->isNamespace()) {

          s << "void delete_" << meta_class->name() << "(" << meta_class->qualifiedCppName() << "* obj) { delete obj; } ";

          s << endl;

        }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);

        foreach (const AbstractMetaFunction *function, functions) {

        florianlink
    
generate extra wrappers for virtual slots to allow correct deriving via Python and to avoid recursion...

              r175
            
          if (!function->isSlot() || function->isVirtual()) {

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
            s << "   ";

            writeFunctionSignature(s, function, 0, QString(),

        florianlink
    
added return value conversion from reference to pointer to work around moc limitations, added toString method generation...

              r70
            
              Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
            s << ";" << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        }

        florianlink
    
changed special generated method prefix to py_, added py_toString() generation...

              r115
            
        if (meta_class->hasDefaultToStringFunction() || meta_class->hasToStringCapability()) {

          s << "    QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl; 

        florianlink
    
added return value conversion from reference to pointer to work around moc limitations, added toString method generation...

              r70
            
        }

        florianlink
    
added support for operators and rich compare...

              r119
            
        if (meta_class->hasDefaultIsNull()) {

          s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->isNull(); }" << endl; 

        }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        florianlink
    
added generation of setter_/getter_ slots for public member variables...

              r114
            
        // Field accessors

        foreach (const AbstractMetaField *field, meta_class->fields()) {

          if (field->isPublic()) {

            writeFieldAccessors(s, field);

          }

        }

        florianlink
    
enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...

              r124
            
        writeInjectedCode(s, meta_class);

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
        florianlink
    
enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...

              r124
            
        florianlink
    
added data accessors for QImage (bits()/scanLine() and const versions)...

              r192
            
        s  << "};" << endl << endl;

        if (meta_class->qualifiedCppName().contains("Ssl")) {

          s << "#endif"  << endl << endl;

        }

        s  << "#endif // " << include_block << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      }

      void ShellHeaderGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)

      {

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        CodeSnipList code_snips = meta_class->typeEntry()->codeSnips();

        foreach (const CodeSnip &cs, code_snips) {

        florianlink
    
enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...

              r124
            
          if (cs.language == TypeSystem::PyWrapperDeclaration) {

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
            s << cs.code() << endl;

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
          }

        florianlink
    
- added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...

              r24
            
        }

        florianlink
    
syncing with my current work, updating to 1.2, see changelog...

              r10
            
      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

florianlink syncing with my current work, updating to 1.2, see changelog...	r10	/****************************************************************************
		**
florianlink updated generator to LGPLed version from gitorious...	r87	** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
		** All rights reserved.
		** Contact: Nokia Corporation (qt-info@nokia.com)
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	**
florianlink updated generator to LGPLed version from gitorious...	r87	** This file is part of the Qt Script Generator project on Qt Labs.
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	**
florianlink updated generator to LGPLed version from gitorious...	r87	** $QT_BEGIN_LICENSE:LGPL$
		** No Commercial Usage
		** This file contains pre-release code and may not be distributed.
		** You may use this file in accordance with the terms and conditions
		** contained in the Technology Preview License Agreement accompanying
		** this package.
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	**
florianlink updated generator to LGPLed version from gitorious...	r87	** GNU Lesser General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU Lesser
		** General Public License version 2.1 as published by the Free Software
		** Foundation and appearing in the file LICENSE.LGPL included in the
		** packaging of this file. Please review the following information to
		** ensure the GNU Lesser General Public License version 2.1 requirements
		** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	**
florianlink updated generator to LGPLed version from gitorious...	r87	** In addition, as a special exception, Nokia gives you certain additional
		** rights. These rights are described in the Nokia Qt LGPL Exception
		** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
		**
		** If you have questions regarding the use of this file, please contact
		** Nokia at qt-info@nokia.com.
		**
		**
		**
		**
		**
		**
		**
		**
		** $QT_END_LICENSE$
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	**
		****************************************************************************/

		#include "shellheadergenerator.h"
		#include "fileout.h"

		#include <QtCore/QDir>

		#include <qdebug.h>

		QString ShellHeaderGenerator::fileNameForClass(const AbstractMetaClass *meta_class) const
		{
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	return QString("PythonQtWrapper_%1.h").arg(meta_class->name());
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}

florianlink added generation of setter_/getter_ slots for public member variables...	r114
		void ShellHeaderGenerator::writeFieldAccessors(QTextStream &s, const AbstractMetaField *field)
		{
		const AbstractMetaFunction *setter = field->setter();
		const AbstractMetaFunction *getter = field->getter();
florianlink fixed some badly generated fields...	r118
		// static fields are not supported (yet?)
		if (setter->isStatic()) return;

		// Uuid data4 did not work (TODO: move to typesystem...(
florianlink changed special generated method prefix to py_, added py_toString() generation...	r115	if (field->enclosingClass()->name()=="QUuid" && setter->name()=="data4") return;
florianlink fixed some badly generated fields...	r118	if (field->enclosingClass()->name()=="QIPv6Address") return;

florianlink added generation of setter_/getter_ slots for public member variables...	r114	if (!field->type()->isConstant()) {
		writeFunctionSignature(s, setter, 0, QString(),
		Option(ConvertReferenceToPtr \| FirstArgIsWrappedObject\| IncludeDefaultExpression \| ShowStatic \| UnderscoreSpaces));
		s << "{ theWrappedObject->" << field->name() << " = " << setter->arguments()[0]->argumentName() << "; }\n";
		}

		writeFunctionSignature(s, getter, 0, QString(),
		Option(ConvertReferenceToPtr \| FirstArgIsWrappedObject\| IncludeDefaultExpression \| OriginalName \| ShowStatic \| UnderscoreSpaces));
		s << "{ return theWrappedObject->" << field->name() << "; }\n";
		}

florianlink syncing with my current work, updating to 1.2, see changelog...	r10	void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
		{
florianlink added builtin support for variants etc., this will replace the direct includes in PythonQt...	r93	QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
		QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
		priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
		setupGenerator->addClass(meta_class->package().replace(".", "_") + builtIn, meta_class);
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24
		QString include_block = "PYTHONQTWRAPPER_" + meta_class->name().toUpper() + "_H";
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << "#ifndef " << include_block << endl
		<< "#define " << include_block << endl << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	Include inc = meta_class->typeEntry()->include();
		ShellGenerator::writeInclude(s, inc);
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
		s << "#include <QObject>" << endl << endl;
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << "#include <PythonQt.h>" << endl << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
		IncludeList list = meta_class->typeEntry()->extraIncludes();
		qSort(list.begin(), list.end());
		foreach (const Include &inc, list) {
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	ShellGenerator::writeInclude(s, inc);
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
		s << endl;

florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	AbstractMetaFunctionList ctors = meta_class->queryFunctions(AbstractMetaClass::Constructors
		\| AbstractMetaClass::WasVisible
		\| AbstractMetaClass::NotRemovedFromTargetLang);

florianlink added data accessors for QImage (bits()/scanLine() and const versions)...	r192	if (meta_class->qualifiedCppName().contains("Ssl")) {
		s << "#ifndef QT_NO_OPENSSL" << endl;
		}

florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	// Shell-------------------------------------------------------------------
		if (meta_class->generateShellClass()) {
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);

		s << "class " << shellClassName(meta_class)
		<< " : public " << meta_class->qualifiedCppName() << endl << "{" << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	s << "public:" << endl;
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	foreach(AbstractMetaFunction* fun, ctors) {
		s << " ";
		writeFunctionSignature(s, fun, 0,"PythonQtShell_",
		Option(IncludeDefaultExpression \| OriginalName \| ShowStatic \| UnderscoreSpaces));
		s << ":" << meta_class->qualifiedCppName() << "(";
		QString scriptFunctionName = fun->originalName();
		AbstractMetaArgumentList args = fun->arguments();
		for (int i = 0; i < args.size(); ++i) {
		if (i > 0)
		s << ", ";
		s << args.at(i)->argumentName();
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << "),_wrapper(NULL) {};" << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << endl;
florianlink added destructor creation for shells...	r178	s << " ~" << shellClassName(meta_class) << "();" << endl;
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24
		foreach(AbstractMetaFunction* fun, virtualsForShell) {
		s << "virtual ";
		writeFunctionSignature(s, fun, 0, QString(),
		Option(IncludeDefaultExpression \| OriginalName \| ShowStatic \| UnderscoreSpaces));
		s << ";" << endl;
		}
		s << endl;
		s << " PythonQtInstanceWrapper* _wrapper; " << endl;

		s << "};" << endl << endl;
		}

		// Promoter-------------------------------------------------------------------
		AbstractMetaFunctionList promoteFunctions = getProtectedFunctionsThatNeedPromotion(meta_class);
		if (!promoteFunctions.isEmpty()) {
		s << "class " << promoterClassName(meta_class)
		<< " : public " << meta_class->qualifiedCppName() << endl << "{ public:" << endl;

		foreach(AbstractMetaFunction* fun, promoteFunctions) {
		s << "inline ";
florianlink - upgraded generator to generate polymorphic handlers for downcasting...	r29	writeFunctionSignature(s, fun, 0, "promoted_",
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	Option(IncludeDefaultExpression \| OriginalName \| ShowStatic \| UnderscoreSpaces));
		s << " { ";
		QString scriptFunctionName = fun->originalName();
		AbstractMetaArgumentList args = fun->arguments();
		if (fun->type())
		s << "return ";
		s << meta_class->qualifiedCppName() << "::";
		s << fun->originalName() << "(";
		for (int i = 0; i < args.size(); ++i) {
		if (i > 0)
		s << ", ";
		s << args.at(i)->argumentName();
		}
		s << "); }" << endl;
		}

		s << "};" << endl << endl;
		}

		// Wrapper-------------------------------------------------------------------

		s << "class " << wrapperClassName(meta_class)
		<< " : public QObject" << endl
		<< "{ Q_OBJECT" << endl;

		s << "public:" << endl;

		AbstractMetaEnumList enums1 = meta_class->enums();
		AbstractMetaEnumList enums;
florianlink added support for qflags, which where previously missing...	r49	QList<FlagsTypeEntry*> flags;
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	foreach(AbstractMetaEnum* enum1, enums1) {
		// catch gadgets and enums that are not exported on QObjects...
		if (enum1->wasPublic() && (!meta_class->isQObject() \|\| !enum1->hasQEnumsDeclaration())) {
		enums << enum1;
florianlink added support for qflags, which where previously missing...	r49	if (enum1->typeEntry()->flags()) {
		flags << enum1->typeEntry()->flags();
		}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	}
		}
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	if (enums.count()) {
		s << "Q_ENUMS(";
		foreach(AbstractMetaEnum* enum1, enums) {
		s << enum1->name() << " ";
		}
		s << ")" << endl;
florianlink added support for qflags, which where previously missing...	r49
		if (flags.count()) {
		s << "Q_FLAGS(";
		foreach(FlagsTypeEntry* flag1, flags) {
		QString origName = flag1->originalName();
		int idx = origName.lastIndexOf("::");
		if (idx!= -1) {
		origName = origName.mid(idx+2);
		}
		s << origName << " ";
		}
		s << ")" << endl;
		}

florianlink syncing with my current work, updating to 1.2, see changelog...	r10	foreach(AbstractMetaEnum* enum1, enums) {
		s << "enum " << enum1->name() << "{" << endl;
		bool first = true;
		foreach(AbstractMetaEnumValue* value, enum1->values()) {
		if (first) { first = false; }
		else { s << ", "; }
		s << " " << value->name() << " = " << meta_class->qualifiedCppName() << "::" << value->name();
		}
		s << "};" << endl;
		}
florianlink added support for qflags, which where previously missing...	r49	if (flags.count()) {
		foreach(AbstractMetaEnum* enum1, enums) {
		if (enum1->typeEntry()->flags()) {
		QString origName = enum1->typeEntry()->flags()->originalName();
		int idx = origName.lastIndexOf("::");
		if (idx!= -1) {
		origName = origName.mid(idx+2);
		}
		s << "Q_DECLARE_FLAGS("<< origName << ", " << enum1->name() <<")"<<endl;
		}
		}
		}
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << "public slots:" << endl;
		if (meta_class->generateShellClass() \|\| !meta_class->isAbstract()) {

		bool copyConstructorSeen = false;
		bool defaultConstructorSeen = false;
		foreach (const AbstractMetaFunction *fun, ctors) {
		if (!fun->isPublic() \|\| fun->isAbstract()) { continue; }
		s << meta_class->qualifiedCppName() << "* ";
		writeFunctionSignature(s, fun, 0, "new_",
		Option(IncludeDefaultExpression \| OriginalName \| ShowStatic));
		s << ";" << endl;
		if (fun->arguments().size()==1 && meta_class->qualifiedCppName() == fun->arguments().at(0)->type()->typeEntry()->qualifiedCppName()) {
		copyConstructorSeen = true;
		}
		if (fun->arguments().size()==0) {
		defaultConstructorSeen = true;
		}
		}

		if (meta_class->typeEntry()->isValue()
		&& !copyConstructorSeen && defaultConstructorSeen) {
		QString className = meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName();
		s << meta_class->qualifiedCppName() << "* new_" << meta_class->name() << "(const " << meta_class->qualifiedCppName() << "& other) {" << endl;
		s << className << "* a = new " << className << "();" << endl;
		s << "((" << meta_class->qualifiedCppName() << ")a) = other;" << endl;
		s << "return a; }" << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
		}
		if (meta_class->hasPublicDestructor() && !meta_class->isNamespace()) {
		s << "void delete_" << meta_class->name() << "(" << meta_class->qualifiedCppName() << "* obj) { delete obj; } ";
		s << endl;
		}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24
		AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);

		foreach (const AbstractMetaFunction *function, functions) {
florianlink generate extra wrappers for virtual slots to allow correct deriving via Python and to avoid recursion...	r175	if (!function->isSlot() \|\| function->isVirtual()) {
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << " ";
		writeFunctionSignature(s, function, 0, QString(),
florianlink added return value conversion from reference to pointer to work around moc limitations, added toString method generation...	r70	Option(ConvertReferenceToPtr \| FirstArgIsWrappedObject\| IncludeDefaultExpression \| OriginalName \| ShowStatic \| UnderscoreSpaces));
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << ";" << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	}
florianlink changed special generated method prefix to py_, added py_toString() generation...	r115	if (meta_class->hasDefaultToStringFunction() \|\| meta_class->hasToStringCapability()) {
		s << " QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl;
florianlink added return value conversion from reference to pointer to work around moc limitations, added toString method generation...	r70	}
florianlink added support for operators and rich compare...	r119	if (meta_class->hasDefaultIsNull()) {
		s << " bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->isNull(); }" << endl;
		}
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
florianlink added generation of setter_/getter_ slots for public member variables...	r114	// Field accessors
		foreach (const AbstractMetaField *field, meta_class->fields()) {
		if (field->isPublic()) {
		writeFieldAccessors(s, field);
		}
		}

florianlink enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...	r124	writeInjectedCode(s, meta_class);
florianlink syncing with my current work, updating to 1.2, see changelog...	r10
florianlink enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...	r124
florianlink added data accessors for QImage (bits()/scanLine() and const versions)...	r192	s << "};" << endl << endl;
		if (meta_class->qualifiedCppName().contains("Ssl")) {
		s << "#endif" << endl << endl;
		}

		s << "#endif // " << include_block << endl;

florianlink syncing with my current work, updating to 1.2, see changelog...	r10
		}

		void ShellHeaderGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)
		{
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	CodeSnipList code_snips = meta_class->typeEntry()->codeSnips();
		foreach (const CodeSnip &cs, code_snips) {
florianlink enabled shell injection and added data() for bytearray and addAction for QMenu/Bar and QToolBar, moved QByteArray to builtin classes...	r124	if (cs.language == TypeSystem::PyWrapperDeclaration) {
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	s << cs.code() << endl;
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}
florianlink - added support for deriving CPP classes in Python and to override all public and protected virtual functions from PythonQt...	r24	}
florianlink syncing with my current work, updating to 1.2, see changelog...	r10	}