6 files changed, 12 insertions, 12 deletions
diff --git a/languages/python/app_templates/pyqt/documentdetails.ui b/languages/python/app_templates/pyqt/documentdetails.ui
index f1298465..104f106a 100644
--- a/languages/python/app_templates/pyqt/documentdetails.ui
+++ b/languages/python/app_templates/pyqt/documentdetails.ui
@@ -76,5 +76,5 @@
 </widget>
 <includes>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/app_templates/pyqt/templates-ui-dialog b/languages/python/app_templates/pyqt/templates-ui-dialog
index 4b0c8bb2..92e9bfff 100644
--- a/languages/python/app_templates/pyqt/templates-ui-dialog
+++ b/languages/python/app_templates/pyqt/templates-ui-dialog
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin
index 4e0a093b..fd24b2f5 100644
--- a/languages/python/app_templates/pyqt/templates-ui-mainwin
+++ b/languages/python/app_templates/pyqt/templates-ui-mainwin
@@ -432,5 +432,5 @@
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/python/doc/python.toc b/languages/python/doc/python.toc
index a4604a97..08f3b21d 100644
--- a/languages/python/doc/python.toc
+++ b/languages/python/doc/python.toc
@@ -162,7 +162,7 @@
 <tocsect3 name="5.2 Atoms" url="ref/atoms.html">
 <tocsect4 name="5.2.1 Identifiers (Names)" url="ref/atom-identifiers.html"/>
 <tocsect4 name="5.2.2 Literals" url="ref/atom-literals.html"/>
-<tocsect4 name="5.2.3 Parenthesized forms" url="ref/tqparenthesized.html"/>
+<tocsect4 name="5.2.3 Parenthesized forms" url="ref/parenthesized.html"/>
 <tocsect4 name="5.2.4 List displays" url="ref/lists.html"/>
 <tocsect4 name="5.2.5 Dictionary displays" url="ref/dict.html"/>
 <tocsect4 name="5.2.6 String conversions" url="ref/string-conversions.html"/>
@@ -1031,7 +1031,7 @@
 <entry name="code, block" url="ref/execframes.html#l2h-238"/>
 <entry name="code block" url="ref/execframes.html#l2h-232"/>
 <entry name="code object" url="ref/types.html#l2h-124"/>
-<entry name="comma" url="ref/tqparenthesized.html#l2h-270"/>
+<entry name="comma" url="ref/parenthesized.html#l2h-270"/>
 <entry name="trailing" url="ref/exprlists.html#l2h-331"/>
 <entry name="command line" url="ref/programs.html#l2h-439"/>
 <entry name="comment" url="ref/comments.html#l2h-6"/>
@@ -1077,7 +1077,7 @@
 <entry name="dictionary object" url="ref/types.html#l2h-96"/>
 <entry name="display, dictionary" url="ref/dict.html#l2h-274"/>
 <entry name="display, list" url="ref/lists.html#l2h-271"/>
-<entry name="display, tuple" url="ref/tqparenthesized.html#l2h-270"/>
+<entry name="display, tuple" url="ref/parenthesized.html#l2h-270"/>
 <entry name="division" url="ref/binary.html#l2h-309"/>
 <entry name="divmod() (built-in function)" url="ref/numeric-types.html#l2h-218"/>
 <entry name="documentation string" url="ref/types.html#l2h-125"/>
@@ -1394,7 +1394,7 @@
 <entry name="OverflowError (built-in exception)" url="ref/types.html#l2h-33"/>
 <entry name="packages" url="ref/import.html#l2h-392"/>
 <entry name="parameter, value, default" url="ref/function.html#l2h-430"/>
-<entry name="tqparenthesized form" url="ref/tqparenthesized.html#l2h-268"/>
+<entry name="parenthesized form" url="ref/parenthesized.html#l2h-268"/>
 <entry name="parser" url="ref/lexical.html#l2h-3"/>
 <entry name="Pascal, language" url="ref/for.html#l2h-416"/>
 <entry name="pass statement" url="ref/pass.html#l2h-355"/>
@@ -1527,7 +1527,7 @@
 <entry name="trailing, comma" url="ref/exprlists.html#l2h-331"/>
 <entry name="triple-quoted string" url="ref/strings.html#l2h-16"/>
 <entry name="try statement" url="ref/types.html#l2h-129"/>
-<entry name="tuple, display" url="ref/tqparenthesized.html#l2h-270"/>
+<entry name="tuple, display" url="ref/parenthesized.html#l2h-270"/>
 <entry name="tuple, empty" url="ref/types.html#l2h-91"/>
 <entry name="tuple, singleton" url="ref/types.html#l2h-91"/>
 <entry name="tuple object" url="ref/types.html#l2h-91"/>
diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui
index 0aa9a5bd..af04041b 100644
--- a/languages/python/pythonconfigwidgetbase.ui
+++ b/languages/python/pythonconfigwidgetbase.ui
@@ -113,8 +113,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 3ecc2109..a9efa3e6 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -264,9 +264,9 @@ void PythonSupportPart::parse(const TQString &fileName)
 	    lastClass->setFileName( fileName );
 	    lastClass->setStartPosition( lineNo, 0 );
 
-            TQStringList tqparentList = TQStringList::split(",", classre.cap(3));
+            TQStringList parentList = TQStringList::split(",", classre.cap(3));
             TQStringList::ConstIterator it;
-            for (it = tqparentList.begin(); it != tqparentList.end(); ++it) {
+            for (it = parentList.begin(); it != parentList.end(); ++it) {
                 TQString baseName = (*it).stripWhiteSpace();
                 kdDebug(9014) << "Add tqparent" << baseName << endl;
                 lastClass->addBaseClass( baseName );