diff options
author | Christian Tismer <tismer@stackless.com> | 2015-09-22 19:25:42 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2015-09-22 19:25:42 +0200 |
commit | b2aaf007c4fc12762d6a56371851758ff1537c24 (patch) | |
tree | 72f2a4bbff885612bd318767609a3a775dbdad1a /PySide2/QtGui | |
parent | caf86443fc67e898bd50d27faf3e5fb2b2677168 (diff) |
finally, pyside needs to be renamed in the XML files
The XML names like "PySide.QtCore" go into the binaries for import, so it is necessary
to change them all. There are also hundreds of Python files which must bechanged, as well.
Diffstat (limited to 'PySide2/QtGui')
-rw-r--r-- | PySide2/QtGui/typesystem_gui.xml.in | 2 | ||||
-rw-r--r-- | PySide2/QtGui/typesystem_gui_common.xml | 14 | ||||
-rw-r--r-- | PySide2/QtGui/typesystem_gui_mac.xml | 2 | ||||
-rw-r--r-- | PySide2/QtGui/typesystem_gui_win.xml | 2 | ||||
-rw-r--r-- | PySide2/QtGui/typesystem_gui_x11.xml | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/PySide2/QtGui/typesystem_gui.xml.in b/PySide2/QtGui/typesystem_gui.xml.in index 8c5cfa9a5..8e2d23cbd 100644 --- a/PySide2/QtGui/typesystem_gui.xml.in +++ b/PySide2/QtGui/typesystem_gui.xml.in @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/> <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml index 62aa03cd1..e0ddb1f0a 100644 --- a/PySide2/QtGui/typesystem_gui_common.xml +++ b/PySide2/QtGui/typesystem_gui_common.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <load-typesystem name="typesystem_core.xml" generate="no"/> <template name="QFontCharFix"> @@ -892,7 +892,7 @@ { qreal r, g, b, a; %CPPSELF.getRgbF(&r, &g, &b, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromRgbF(%.6f, %.6f, %.6f, %.6f)", r, g, b, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -900,7 +900,7 @@ { qreal h, s, v, a; %CPPSELF.getHsvF(&h, &s, &v, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHsvF(%.6f, %.6f, %.6f, %.6f)", h, s, v, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -908,7 +908,7 @@ { qreal c, m, y, k, a; %CPPSELF.getCmykF(&c, &m, &y, &k, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromCmykF(%.6f, %.6f, %.6f, %.6f, %.6f)", c, m, y, k, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } @@ -917,14 +917,14 @@ { qreal h, s, l, a; %CPPSELF.getHslF(&h, &s, &l, &a); - QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a); + QString repr = QString().sprintf("PySide2.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a); %PYARG_0 = Shiboken::String::fromCString(qPrintable(repr)); break; } #endif default: { - %PYARG_0 = Shiboken::String::fromCString("PySide.QtGui.QColor()"); + %PYARG_0 = Shiboken::String::fromCString("PySide2.QtGui.QColor()"); } } </template> @@ -1681,7 +1681,7 @@ } else { PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.", "QValidator.validate", - "PySide.QtGui.QValidator.State, (PySide.QtGui.QValidator.State,), (PySide.QtGui.QValidator.State, unicode) or (PySide.QtGui.QValidator.State, unicode, int)", + "PySide2.QtGui.QValidator.State, (PySide2.QtGui.QValidator.State,), (PySide2.QtGui.QValidator.State, unicode) or (PySide2.QtGui.QValidator.State, unicode, int)", pyResult->ob_type->tp_name); return QValidator::State(); } diff --git a/PySide2/QtGui/typesystem_gui_mac.xml b/PySide2/QtGui/typesystem_gui_mac.xml index a3b5e9a24..a3a48f418 100644 --- a/PySide2/QtGui/typesystem_gui_mac.xml +++ b/PySide2/QtGui/typesystem_gui_mac.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <rejection class="*" function-name="qt_mac_set_cursor"/> <rejection class="*" function-name="macMenu"/> diff --git a/PySide2/QtGui/typesystem_gui_win.xml b/PySide2/QtGui/typesystem_gui_win.xml index b100b6738..0687b75c7 100644 --- a/PySide2/QtGui/typesystem_gui_win.xml +++ b/PySide2/QtGui/typesystem_gui_win.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <primitive-type name="WId" target-lang-api-name="PyObject"> <conversion-rule> <native-to-target> diff --git a/PySide2/QtGui/typesystem_gui_x11.xml b/PySide2/QtGui/typesystem_gui_x11.xml index 5d70c47ec..7cbb8953b 100644 --- a/PySide2/QtGui/typesystem_gui_x11.xml +++ b/PySide2/QtGui/typesystem_gui_x11.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA --> -<typesystem package="PySide.QtGui"> +<typesystem package="PySide2.QtGui"> <rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="QX11Info" field-name="x11data"/> |