From b2aaf007c4fc12762d6a56371851758ff1537c24 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Tue, 22 Sep 2015 19:25:42 +0200 Subject: 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. --- doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp | 2 +- .../doc/src/snippets/code/src_corelib_kernel_qtimer.cpp | 2 +- doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp | 4 ++-- doc/codesnippets/doc/src/snippets/droparea.cpp | 2 +- doc/codesnippets/doc/src/snippets/myscrollarea.cpp | 4 ++-- doc/codesnippets/doc/src/snippets/network/tcpwait.cpp | 4 ++-- doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp | 2 +- doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp | 2 +- doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp | 2 +- doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp | 2 +- doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp | 2 +- doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp | 4 ++-- doc/codesnippets/doc/src/snippets/timers/timers.cpp | 2 +- doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp | 6 +++--- doc/codesnippets/examples/dbus/example-client.py | 2 +- doc/codesnippets/examples/dbus/example-server.py | 4 ++-- doc/codesnippets/examples/dialogs/extension/finddialog.cpp | 2 +- doc/codesnippets/examples/linguist/hellotr/main.cpp | 2 +- doc/codesnippets/examples/mainwindows/application/mainwindow.cpp | 2 +- doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp | 2 +- doc/codesnippets/examples/mainwindows/mainwindow.cpp | 2 +- doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp | 2 +- doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp | 2 +- .../examples/sql/relationaltablemodel/relationaltablemodel.cpp | 4 ++-- doc/codesnippets/examples/widgets/spinboxes/window.cpp | 2 +- doc/codesnippets/snippets/customstyle/main.cpp | 2 +- doc/codesnippets/webkitsnippets/simple/main.cpp | 6 +++--- doc/extras/PySide.QtCore.ClassInfo.rst | 2 +- doc/extras/PySide.QtCore.Signal.rst | 2 +- doc/extras/PySide.QtCore.Slot.rst | 2 +- doc/extras/PySide.QtCore.rst | 2 +- doc/extras/PySide.QtDeclarative.ListProperty.rst | 2 +- doc/extras/PySide.QtDeclarative.rst | 2 +- doc/extras/PySide.QtGui.rst | 4 ++-- doc/extras/PySide.QtHelp.rst | 2 +- doc/extras/PySide.QtMultimedia.rst | 2 +- doc/extras/PySide.QtNetwork.rst | 2 +- doc/extras/PySide.QtOpenGL.rst | 2 +- doc/extras/PySide.QtScript.rst | 2 +- doc/extras/PySide.QtScriptTools.rst | 2 +- doc/extras/PySide.QtSql.rst | 2 +- doc/extras/PySide.QtSvg.rst | 2 +- doc/extras/PySide.QtTest.rst | 2 +- doc/extras/PySide.QtUiTools.rst | 2 +- doc/extras/PySide.QtWebKit.rst | 2 +- doc/extras/PySide.QtXml.rst | 2 +- doc/extras/PySide.QtXmlPatterns.rst | 2 +- doc/pysideapi2.rst | 2 +- doc/pysideversion.rst | 6 +++--- 49 files changed, 62 insertions(+), 62 deletions(-) (limited to 'doc') diff --git a/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp b/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp index bf76ce16..e5a22354 100644 --- a/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp +++ b/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp @@ -39,7 +39,7 @@ ## ############################################################################ -form PySide.QtGui import * +form PySide2.QtGui import * def __init__(self, parent): diff --git a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp index bb646a10..3fa7e48f 100644 --- a/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp +++ b/doc/codesnippets/doc/src/snippets/code/src_corelib_kernel_qtimer.cpp @@ -1,5 +1,5 @@ //! [0] -from PySide.QtCore import QApplication, QTimer +from PySide2.QtCore import QApplication, QTimer def main(): diff --git a/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp index 80474122..3896cd66 100644 --- a/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp +++ b/doc/codesnippets/doc/src/snippets/code/src_opengl_qglcolormap.cpp @@ -1,8 +1,8 @@ //! [0] import sys -from PySide.QtGui import QApplication, qRgb -from PySide.QtOpenGL import QGLColormap +from PySide2.QtGui import QApplication, qRgb +from PySide2.QtOpenGL import QGLColormap def main(argv): app = QApplication(argv) diff --git a/doc/codesnippets/doc/src/snippets/droparea.cpp b/doc/codesnippets/doc/src/snippets/droparea.cpp index 46173716..a89e22d9 100644 --- a/doc/codesnippets/doc/src/snippets/droparea.cpp +++ b/doc/codesnippets/doc/src/snippets/droparea.cpp @@ -37,7 +37,7 @@ ## ############################################################################/ -from PySide.QtGui import * +from PySide2.QtGui import * DropArea.DropArea(QWidget *parent) diff --git a/doc/codesnippets/doc/src/snippets/myscrollarea.cpp b/doc/codesnippets/doc/src/snippets/myscrollarea.cpp index d8b1bf3c..61c95427 100644 --- a/doc/codesnippets/doc/src/snippets/myscrollarea.cpp +++ b/doc/codesnippets/doc/src/snippets/myscrollarea.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -from PySide.QtCore import * -from PySide.QtGui import * +from PySide2.QtCore import * +from PySide2.QtGui import * import sys class MyScrollArea (QAbstractScrollArea): diff --git a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp index d433fc29..eef9a194 100644 --- a/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp +++ b/doc/codesnippets/doc/src/snippets/network/tcpwait.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -from PySide.QtGui import * -from PySide.QtNetwork import QTcpSocket +from PySide2.QtGui import * +from PySide2.QtNetwork import QTcpSocket def main(): app = QCoreApplication() diff --git a/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp b/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp index 6c8fbcf2..10ba04a2 100644 --- a/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qdir-listfiles/main.cpp @@ -41,7 +41,7 @@ //! [0] -from PySide.QtCore import QDir, QCoreApplication +from PySide2.QtCore import QDir, QCoreApplication import sys app = QCoreApplication(sys.argv) diff --git a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp index 163134da..12573199 100644 --- a/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qdir-namefilters/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -from PySide.QtCore import * +from PySide2.QtCore import * def main(): dir_ = QDir() diff --git a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp index d26da756..c0af622b 100644 --- a/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qprocess-environment/main.cpp @@ -45,7 +45,7 @@ void startProcess() { //! [0] import re -from PySide.QtCore import QProcess +from PySide2.QtCore import QProcess process = QProcess() diff --git a/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp b/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp index a5201412..7b53dcdf 100644 --- a/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp +++ b/doc/codesnippets/doc/src/snippets/scribe-overview/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -from PySide.QtGui import * +from PySide2.QtGui import * # edit : QTextEdit def mergeFormat(edit): diff --git a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp index bbaf9351..9837f414 100644 --- a/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp +++ b/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp @@ -46,7 +46,7 @@ selection model. """ -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp index 89cece62..6374b287 100644 --- a/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -39,8 +39,8 @@ # ###################################### -from PySide.QtGui import * -from PySide.QtSql import * +from PySide2.QtGui import * +from PySide2.QtSql import * def tr(text): diff --git a/doc/codesnippets/doc/src/snippets/timers/timers.cpp b/doc/codesnippets/doc/src/snippets/timers/timers.cpp index 918ba74a..0adfa890 100644 --- a/doc/codesnippets/doc/src/snippets/timers/timers.cpp +++ b/doc/codesnippets/doc/src/snippets/timers/timers.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -from PySide.QtCore import QTimer +from PySide2.QtCore import QTimer class Foo : public QObject { diff --git a/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp b/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp index 239309e6..19674ff1 100644 --- a/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp +++ b/doc/codesnippets/doc/src/snippets/webkit/webpage/main.cpp @@ -1,7 +1,7 @@ -from PySide.QtGui import * -from PySide.QWebKit import QWebPage -from PySide.QWebKit import QWebFrame +from PySide2.QtGui import * +from PySide2.QWebKit import QWebPage +from PySide2.QWebKit import QWebFrame //! [0] diff --git a/doc/codesnippets/examples/dbus/example-client.py b/doc/codesnippets/examples/dbus/example-client.py index 605d4b45..6c38c7b1 100755 --- a/doc/codesnippets/examples/dbus/example-client.py +++ b/doc/codesnippets/examples/dbus/example-client.py @@ -11,7 +11,7 @@ import dbus # import python dbus GLib mainloop support import dbus.mainloop.glib # import QtCore -from PySide.QtCore import * +from PySide2.QtCore import * # signal handler def button_clicked(): diff --git a/doc/codesnippets/examples/dbus/example-server.py b/doc/codesnippets/examples/dbus/example-server.py index 3f51ef50..4eab67cc 100755 --- a/doc/codesnippets/examples/dbus/example-server.py +++ b/doc/codesnippets/examples/dbus/example-server.py @@ -8,8 +8,8 @@ import dbus.service import dbus.mainloop.glib import random -from PySide.QtCore import * -from PySide.QtGui import QPushButton, QApplication +from PySide2.QtCore import * +from PySide2.QtGui import QPushButton, QApplication # The adaptor, MUST inherit dbus.service.Object class DBusWidget(dbus.service.Object): diff --git a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp index 70a9984f..729c3778 100644 --- a/doc/codesnippets/examples/dialogs/extension/finddialog.cpp +++ b/doc/codesnippets/examples/dialogs/extension/finddialog.cpp @@ -40,7 +40,7 @@ ############################################################################ -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self, parent): diff --git a/doc/codesnippets/examples/linguist/hellotr/main.cpp b/doc/codesnippets/examples/linguist/hellotr/main.cpp index 32914ce1..1ac29348 100644 --- a/doc/codesnippets/examples/linguist/hellotr/main.cpp +++ b/doc/codesnippets/examples/linguist/hellotr/main.cpp @@ -42,7 +42,7 @@ #include #include //! [0] -from PySide.QtCore import QTranslator +from PySide2.QtCore import QTranslator //! [0] //! [1] //! [2] diff --git a/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp index 73b469b7..67a2886f 100644 --- a/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp @@ -40,7 +40,7 @@ ###################################### //! [0] -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp index aac0e25f..4d0de73f 100644 --- a/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp @@ -40,7 +40,7 @@ ############################################################################ //! [0] -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] //! [1] diff --git a/doc/codesnippets/examples/mainwindows/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/mainwindow.cpp index bf33d9f6..aa892bb2 100644 --- a/doc/codesnippets/examples/mainwindows/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/mainwindow.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp index 985bcfaa..15015efc 100644 --- a/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp @@ -39,7 +39,7 @@ ## ############################################################################ -from PySide.QtGui import * +from PySide2.QtGui import * def __init__(self): diff --git a/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp b/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp index bf33d9f6..aa892bb2 100644 --- a/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp +++ b/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp index 170902e6..ea33baf5 100644 --- a/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp @@ -39,8 +39,8 @@ # ###################################### -from PySide.QtGui import * -from PySide.QtSql import * +from PySide2.QtGui import * +from PySide2.QtSql import * def initializeModel(model): //! [0] diff --git a/doc/codesnippets/examples/widgets/spinboxes/window.cpp b/doc/codesnippets/examples/widgets/spinboxes/window.cpp index aa1db717..626fdb12 100644 --- a/doc/codesnippets/examples/widgets/spinboxes/window.cpp +++ b/doc/codesnippets/examples/widgets/spinboxes/window.cpp @@ -39,7 +39,7 @@ # ###################################### -from PySide.QtGui import * +from PySide2.QtGui import * //! [0] def __init__(self): diff --git a/doc/codesnippets/snippets/customstyle/main.cpp b/doc/codesnippets/snippets/customstyle/main.cpp index a1ac4aca..3fac5293 100644 --- a/doc/codesnippets/snippets/customstyle/main.cpp +++ b/doc/codesnippets/snippets/customstyle/main.cpp @@ -1,7 +1,7 @@ //! [using a custom style] import sys -from PySide.QtGui import * +from PySide2.QtGui import * QApplication.setStyle(CustomStyle()) app = QApplication(sys.argv) diff --git a/doc/codesnippets/webkitsnippets/simple/main.cpp b/doc/codesnippets/webkitsnippets/simple/main.cpp index 3a90db9a..d10da4eb 100644 --- a/doc/codesnippets/webkitsnippets/simple/main.cpp +++ b/doc/codesnippets/webkitsnippets/simple/main.cpp @@ -1,7 +1,7 @@ -from PySide.QtCore import * -from PySide.QtGui import * -from PySide.QtWebKit import * +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWebKit import * import sys app = QApplication(sys.argv) diff --git a/doc/extras/PySide.QtCore.ClassInfo.rst b/doc/extras/PySide.QtCore.ClassInfo.rst index 39edf3f6..d2267be9 100644 --- a/doc/extras/PySide.QtCore.ClassInfo.rst +++ b/doc/extras/PySide.QtCore.ClassInfo.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _ClassInfo: ClassInfo diff --git a/doc/extras/PySide.QtCore.Signal.rst b/doc/extras/PySide.QtCore.Signal.rst index b4c4e366..16c64083 100644 --- a/doc/extras/PySide.QtCore.Signal.rst +++ b/doc/extras/PySide.QtCore.Signal.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _Signal: Signal diff --git a/doc/extras/PySide.QtCore.Slot.rst b/doc/extras/PySide.QtCore.Slot.rst index 307c2299..6b93014c 100644 --- a/doc/extras/PySide.QtCore.Slot.rst +++ b/doc/extras/PySide.QtCore.Slot.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtCore +.. module:: PySide2.QtCore .. _Slot: Slot diff --git a/doc/extras/PySide.QtCore.rst b/doc/extras/PySide.QtCore.rst index f9e05d24..d3277a41 100644 --- a/doc/extras/PySide.QtCore.rst +++ b/doc/extras/PySide.QtCore.rst @@ -2,4 +2,4 @@ All other Qt modules rely on this module. To include the definitions of the modu :: - import PySide.QtCore + import PySide2.QtCore diff --git a/doc/extras/PySide.QtDeclarative.ListProperty.rst b/doc/extras/PySide.QtDeclarative.ListProperty.rst index dcbd57f2..d32621a4 100644 --- a/doc/extras/PySide.QtDeclarative.ListProperty.rst +++ b/doc/extras/PySide.QtDeclarative.ListProperty.rst @@ -1,4 +1,4 @@ -.. module:: PySide.QtDeclarative +.. module:: PySide2.QtDeclarative .. _ListProperty: ListProperty diff --git a/doc/extras/PySide.QtDeclarative.rst b/doc/extras/PySide.QtDeclarative.rst index 4b94adc7..cb4cc42c 100644 --- a/doc/extras/PySide.QtDeclarative.rst +++ b/doc/extras/PySide.QtDeclarative.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtDeclarative + import PySide2.QtDeclarative diff --git a/doc/extras/PySide.QtGui.rst b/doc/extras/PySide.QtGui.rst index f575c2f2..e16329c3 100644 --- a/doc/extras/PySide.QtGui.rst +++ b/doc/extras/PySide.QtGui.rst @@ -2,6 +2,6 @@ To include the definitions of modules classes, use the following directive: :: - import PySide.QtGui + import PySide2.QtGui -.. seealso:: :mod:`PySide.QtCore` +.. seealso:: :mod:`PySide2.QtCore` diff --git a/doc/extras/PySide.QtHelp.rst b/doc/extras/PySide.QtHelp.rst index 8332f57d..6ecfc3d9 100644 --- a/doc/extras/PySide.QtHelp.rst +++ b/doc/extras/PySide.QtHelp.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtHelp + import PySide2.QtHelp License Information ------------------- diff --git a/doc/extras/PySide.QtMultimedia.rst b/doc/extras/PySide.QtMultimedia.rst index 540a7061..5088db4d 100644 --- a/doc/extras/PySide.QtMultimedia.rst +++ b/doc/extras/PySide.QtMultimedia.rst @@ -2,6 +2,6 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtMultimedia + import PySide2.QtMultimedia diff --git a/doc/extras/PySide.QtNetwork.rst b/doc/extras/PySide.QtNetwork.rst index 44249d30..07303b15 100644 --- a/doc/extras/PySide.QtNetwork.rst +++ b/doc/extras/PySide.QtNetwork.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtNetwork + import PySide2.QtNetwork diff --git a/doc/extras/PySide.QtOpenGL.rst b/doc/extras/PySide.QtOpenGL.rst index 1758ee0a..38783d9f 100644 --- a/doc/extras/PySide.QtOpenGL.rst +++ b/doc/extras/PySide.QtOpenGL.rst @@ -7,7 +7,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtOpenGL + import PySide2.QtOpenGL The Qt OpenGL module is implemented as a platform-independent wrapper around the platform-dependent GLX (version 1.3 or later), WGL, or AGL C APIs. Although the basic functionality provided is very similar to Mark Kilgard's GLUT library, applications using the Qt OpenGL module can take advantage of the whole Qt API for non-OpenGL-specific GUI functionality. diff --git a/doc/extras/PySide.QtScript.rst b/doc/extras/PySide.QtScript.rst index 00488cbe..8ce7681e 100644 --- a/doc/extras/PySide.QtScript.rst +++ b/doc/extras/PySide.QtScript.rst @@ -4,7 +4,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtScript + import PySide2.QtScript License Information ------------------- diff --git a/doc/extras/PySide.QtScriptTools.rst b/doc/extras/PySide.QtScriptTools.rst index c3f69074..a54ed914 100644 --- a/doc/extras/PySide.QtScriptTools.rst +++ b/doc/extras/PySide.QtScriptTools.rst @@ -2,4 +2,4 @@ Applications that use the Qt Script Tools classes need to be configured to be bu :: - import PySide.QtScriptTools + import PySide2.QtScriptTools diff --git a/doc/extras/PySide.QtSql.rst b/doc/extras/PySide.QtSql.rst index 41c1794f..fcdd6ba0 100644 --- a/doc/extras/PySide.QtSql.rst +++ b/doc/extras/PySide.QtSql.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtSql + import PySide2.QtSql diff --git a/doc/extras/PySide.QtSvg.rst b/doc/extras/PySide.QtSvg.rst index b1064523..d7784655 100644 --- a/doc/extras/PySide.QtSvg.rst +++ b/doc/extras/PySide.QtSvg.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtSvg + import PySide2.QtSvg License Information ------------------- diff --git a/doc/extras/PySide.QtTest.rst b/doc/extras/PySide.QtTest.rst index d5963cb5..0b89a22d 100644 --- a/doc/extras/PySide.QtTest.rst +++ b/doc/extras/PySide.QtTest.rst @@ -2,6 +2,6 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtTest + import PySide2.QtTest .. note:: All macros in the C++ version of QtTest were not binded in PySide, this module is useful only for GUI testing and benchmarking, for ordinary unit testing you should use the ``unittest`` Python module. diff --git a/doc/extras/PySide.QtUiTools.rst b/doc/extras/PySide.QtUiTools.rst index c8558f2d..55322452 100644 --- a/doc/extras/PySide.QtUiTools.rst +++ b/doc/extras/PySide.QtUiTools.rst @@ -1,6 +1,6 @@ These forms are processed at run-time to produce dynamically-generated user interfaces. In order to generate a form at run-time, a resource file containing a UI file is needed. -A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The :meth:`PySide.QtUiTools.QUiLoader.load` function takes the user interface description contained in the file and constructs the form widget. +A form loader object, provided by the QUiLoader class, is used to construct the user interface. This user interface can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form stored in a project's resources. The :meth:`PySide2.QtUiTools.QUiLoader.load` function takes the user interface description contained in the file and constructs the form widget. To include the definitions of the module's classes, use the following directive: diff --git a/doc/extras/PySide.QtWebKit.rst b/doc/extras/PySide.QtWebKit.rst index 7a165be8..58f9230a 100644 --- a/doc/extras/PySide.QtWebKit.rst +++ b/doc/extras/PySide.QtWebKit.rst @@ -15,7 +15,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtWebKit + import PySide2.QtWebKit .. note:: Web site icons, also known as "FavIcons", are currently not supported on Windows. We plan to address this in a future release. diff --git a/doc/extras/PySide.QtXml.rst b/doc/extras/PySide.QtXml.rst index ba69e509..4b48ef21 100644 --- a/doc/extras/PySide.QtXml.rst +++ b/doc/extras/PySide.QtXml.rst @@ -2,4 +2,4 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtXml + import PySide2.QtXml diff --git a/doc/extras/PySide.QtXmlPatterns.rst b/doc/extras/PySide.QtXmlPatterns.rst index 0431aaf7..3830efb4 100644 --- a/doc/extras/PySide.QtXmlPatterns.rst +++ b/doc/extras/PySide.QtXmlPatterns.rst @@ -2,7 +2,7 @@ To include the definitions of the module's classes, use the following directive: :: - import PySide.QtXmlPatterns + import PySide2.QtXmlPatterns Further Reading --------------- diff --git a/doc/pysideapi2.rst b/doc/pysideapi2.rst index 48f87c3a..e86be05c 100644 --- a/doc/pysideapi2.rst +++ b/doc/pysideapi2.rst @@ -20,7 +20,7 @@ your code will run on both bindings. __hash__() function return value ================================ -The hash value returned for the classes :class:`PySide.QtCore.QDate`, :class:`PySide.QtCore.QDateTime`, :class:`PySide.QtCore.QTime`, :class:`PySide.QtCore.QUrl` will be +The hash value returned for the classes :class:`PySide2.QtCore.QDate`, :class:`PySide2.QtCore.QDateTime`, :class:`PySide2.QtCore.QTime`, :class:`PySide2.QtCore.QUrl` will be based on their string representations, thus objects with the same value will produce the same hash. diff --git a/doc/pysideversion.rst b/doc/pysideversion.rst index 23666b8e..3bcebe0d 100644 --- a/doc/pysideversion.rst +++ b/doc/pysideversion.rst @@ -17,15 +17,15 @@ PySide exports their version numbers among the version of Qt used to compile PyS # Prints the Qt version used to compile PySide # e.g. "4.7.2" - print PySide.QtCore.__version__ + print PySide2.QtCore.__version__ # Gets a tuple with each version components of Qt used to compile PySide # e.g. (4, 7, 2) - print PySide.QtCore.__version_info__ + print PySide2.QtCore.__version_info__ Note that the Qt version used to compile PySide may differ from the version used to run PySide, to get the current running Qt version you can do: :: - print PySide.QtCore.qVersion() + print PySide2.QtCore.qVersion() -- cgit v1.2.3