GIT_REPOSITORIES/LPP/PythonQt Commit - r12:e79e720ed706

- added quitools...

florianlink -

r12:e79e720ed706

parent child

Context file:

r12:e79e720ed706

Collapse all files

examples/PyCPPWrapperExample/main.cpp +3 -5

               // Alternative 1: make CustomObject known and use decorators for wrapping:
               // -----------------------------------------------------------------
-              // register the new object as a known classname
+              // register the new object as a known classname and add it's wrapper object
-              PythonQt::self()->registerCPPClassNames(QStringList() << "CustomObject");
+              PythonQt::self()->registerCPPClass("CustomObject", "","", PythonQtCreateObject<CustomObjectWrapper>);
-              // add a decorator which can access CustomObject instances
-              PythonQt::self()->addDecorators(new CustomObjectWrapper());
               // -----------------------------------------------------------------
               // Alternative 2: make CustomObject2 known and use a wrapper factory for wrapping:
               // the following is optional and only needed if you want a constructor:
               // register the new object as a known classname
-              PythonQt::self()->registerCPPClassNames(QStringList() << "CustomObject2");
+              PythonQt::self()->registerCPPClass("CustomObject2");
               // add a constructor for CustomObject2
               PythonQt::self()->addClassDecorators(new CustomObject2Constructor());

examples/PyCustomMetaTypeExample/main.cpp +1 -1

               // register the type with QMetaType
               qRegisterMetaType<CustomObject>("CustomObject");
               // add a wrapper object for the new variant type
-              PythonQt::self()->registerCPPWrapper("CustomObject","","", PythonQtCreateObject<CustomObjectWrapper>);
+              PythonQt::self()->registerCPPClass("CustomObject","","", PythonQtCreateObject<CustomObjectWrapper>);
               mainContext.evalFile(":example.py");

examples/PyDecoratorsExample/main.cpp +1 -1

               PythonQt::self()->addDecorators(new PyExampleDecorators());
               PythonQt::self()->registerClass(&QPushButton::staticMetaObject);
-              PythonQt::self()->registerCPPClassNames(QStringList() << "YourCPPObject");
+              PythonQt::self()->registerCPPClass("YourCPPObject");
               mainContext.evalFile(":example.py");

extensions/PythonQt_QtAll/PythonQt_QtAll.cpp +2 0

             void PythonQt_init_QtOpenGL();
             void PythonQt_init_QtXml();
             void PythonQt_init_QtXmlPatterns();
+            void PythonQt_init_QtUiTools();
             //void PythonQt_init_QtPhonon();
             namespace PythonQt_QtAll
                 PythonQt_init_QtSql();
                 PythonQt_init_QtWebKit();
                 PythonQt_init_QtOpenGL();
+                PythonQt_init_QtUiTools();
             //    PythonQt_init_QtPhonon();
               };
             };

extensions/PythonQt_QtAll/PythonQt_QtAll.pro +2 -1

             TEMPLATE = lib
             DESTDIR    = ../../lib
-            DLLDESTDIR = ../../lib
             include ( ../../build/common.prf )
             include ( ../../build/PythonQt.prf )
             SOURCES +=                \
               PythonQt_QtAll.cpp
+            CONFIG += uitools
             QT += webkit gui svg sql network xml xmlpatterns opengl
             #QT += phonon
             include (../../generated_cpp/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
             include (../../generated_cpp/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
             include (../../generated_cpp/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
+            include (../../generated_cpp/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
             #include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri)

generator/setupgenerator.cpp +11 -9

             //#define Q_SCRIPT_LAZY_GENERATOR
             void SetupGenerator::addClass(const AbstractMetaClass *cls)
             {
                 packHash[cls->package()].append(cls);
             }
                     }
                     packName.replace(".", "_");
                     packKey.replace(".", "_");
                     QString shortPackName;
                     foreach (QString comp, components) {
                       comp[0] = comp[0].toUpper();
                       shortPackName = "QtXmlPatterns";
                     } else if (shortPackName == "QtOpengl") {
                       shortPackName = "QtOpenGL";
+                    } else if (shortPackName == "QtUitools") {
+                      shortPackName = "QtUiTools";
+                    }
                     {
                         FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");
                         QTextStream &s = initFile.stream;
                         if (FileOut::license)
                             writeQtScriptQtBindingsLicense(s);
                         s << "#include <PythonQt.h>" << endl;
                       foreach (const AbstractMetaClass *cls, list) {
                         s << "#include \"PythonQtWrapper_" << cls->name() << ".h\"" << endl;
                       }
                       s << endl;
                         // declare individual class creation functions
                         s << "void PythonQt_init_" << shortPackName << "() {" << endl;
                       QStringList cppClassNames;
                       foreach (const AbstractMetaClass *cls, list) {
                         if (ClassGenerator::isBuiltIn(cls->name())) { continue; }
                         }
                       }
                       s << endl;
                         s << "}";
                         s << endl;
                     }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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