Sync with master conversion script

6 files changed, 13 insertions, 13 deletions

diff --git a/doc/application-walkthrough.doc b/doc/application-walkthrough.doc
index 4527eeba3..39247a6f7 100644
--- a/doc/application-walkthrough.doc
+++ b/doc/application-walkthrough.doc
@@ -420,7 +420,7 @@ simple.
 Last but not least we implement the slots used by the help menu entries.
 
 \printline ::about
-\printuntil aboutQt
+\printuntil aboutTQt
 \printuntil }
 
 These two slots use ready-made "about" functions to provide some
diff --git a/doc/html/index b/doc/html/index
index cc7ca3050..e6f742994 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -237,7 +237,7 @@
 "QApplication::ColorSpec" qapplication.html#ColorSpec
 "QApplication::Encoding" qapplication.html#Encoding
 "QApplication::Type" qapplication.html#Type
-"QApplication::aboutQt" qapplication.html#aboutQt
+"QApplication::aboutTQt" qapplication.html#aboutTQt
 "QApplication::aboutToQuit" qapplication.html#aboutToQuit
 "QApplication::activeModalWidget" qapplication.html#activeModalWidget
 "QApplication::activePopupWidget" qapplication.html#activePopupWidget
@@ -4150,7 +4150,7 @@
 "QMessageBox" qmessagebox.html
 "QMessageBox::Icon" qmessagebox.html#Icon
 "QMessageBox::about" qmessagebox.html#about
-"QMessageBox::aboutQt" qmessagebox.html#aboutQt
+"QMessageBox::aboutTQt" qmessagebox.html#aboutTQt
 "QMessageBox::adjustSize" qmessagebox.html#adjustSize
 "QMessageBox::buttonText" qmessagebox.html#buttonText
 "QMessageBox::critical" qmessagebox.html#critical
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 0882ceb83..cf14d5774 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -135,7 +135,7 @@
     <keyword ref="qapplication.html#ColorSpec">ColorSpec</keyword>
     <keyword ref="qapplication.html#Encoding">Encoding</keyword>
     <keyword ref="qapplication.html#Type">Type</keyword>
-    <keyword ref="qapplication.html#aboutQt">aboutQt</keyword>
+    <keyword ref="qapplication.html#aboutTQt">aboutTQt</keyword>
     <keyword ref="qapplication.html#aboutToQuit">aboutToQuit</keyword>
     <keyword ref="qapplication.html#activeModalWidget">activeModalWidget</keyword>
     <keyword ref="qapplication.html#activePopupWidget">activePopupWidget</keyword>
@@ -4822,7 +4822,7 @@
     <keyword ref="qmessagebox.html">QMessageBox</keyword>
     <keyword ref="qmessagebox.html#Icon">Icon</keyword>
     <keyword ref="qmessagebox.html#about">about</keyword>
-    <keyword ref="qmessagebox.html#aboutQt">aboutQt</keyword>
+    <keyword ref="qmessagebox.html#aboutTQt">aboutTQt</keyword>
     <keyword ref="qmessagebox.html#adjustSize">adjustSize</keyword>
     <keyword ref="qmessagebox.html#buttonText">buttonText</keyword>
     <keyword ref="qmessagebox.html#critical">critical</keyword>
diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt
index 88db7b847..19693773f 100644
--- a/doc/man/man3/qapplication.3qt
+++ b/doc/man/man3/qapplication.3qt
@@ -175,7 +175,7 @@ Inherits QObject.
 .BI "void \fBcloseAllWindows\fR ()"
 .br
 .ti -1c
-.BI "void \fBaboutQt\fR ()"
+.BI "void \fBaboutTQt\fR ()"
 .br
 .in -1c
 .SS "Signals"
@@ -622,12 +622,12 @@ Create an application, given an already open display \fIdpy\fR and using \fIargc
 This is available only on X11.
 .SH "QApplication::~QApplication ()\fC [virtual]\fR"
 Cleans up any window system resources that were allocated by this application. Sets the global variable \fCqApp\fR to 0.
-.SH "void QApplication::aboutQt ()\fC [slot]\fR"
+.SH "void QApplication::aboutTQt ()\fC [slot]\fR"
 Displays a simple message box about Qt. The message includes the version number of Qt being used by the application.
 .PP
 This is useful for inclusion in the Help menu of an application. See the examples/menu/menu.cpp example.
 .PP
-This function is a convenience slot for QMessageBox::aboutQt().
+This function is a convenience slot for QMessageBox::aboutTQt().
 .SH "void QApplication::aboutToQuit ()\fC [signal]\fR"
 This signal is emitted when the application is about to quit the main event loop, e.g. when the event loop level drops to zero. This may happen either after a call to quit() from inside the application or when the users shuts down the entire desktop session.
 .PP
diff --git a/doc/man/man3/qmessagebox.3qt b/doc/man/man3/qmessagebox.3qt
index 843eaacbb..4785bbc66 100644
--- a/doc/man/man3/qmessagebox.3qt
+++ b/doc/man/man3/qmessagebox.3qt
@@ -91,7 +91,7 @@ Inherits QDialog.
 .BI "void \fBabout\fR ( QWidget * parent, const QString & caption, const QString & text )"
 .br
 .ti -1c
-.BI "void \fBaboutQt\fR ( QWidget * parent, const QString & caption = QString::null )"
+.BI "void \fBaboutTQt\fR ( QWidget * parent, const QString & caption = QString::null )"
 .br
 .ti -1c
 .BI "int message ( const QString & caption, const QString & text, const QString & buttonText = QString::null, QWidget * parent = 0, const char * = 0 )  \fI(obsolete)\fR"
@@ -332,7 +332,7 @@ QMessageBox provides a very simple About box which displays an appropriate icon
 .PP
 See about() for more information.
 .PP
-If you want your users to know that the application is built using Qt (so they know that you use high quality tools) you might like to add an "About Qt" menu option under the Help menu to invoke aboutQt().
+If you want your users to know that the application is built using Qt (so they know that you use high quality tools) you might like to add an "About Qt" menu option under the Help menu to invoke aboutTQt().
 .PP
 If none of the standard message boxes is suitable, you can create a QMessageBox from scratch and use custom button texts:
 .PP
@@ -536,14 +536,14 @@ See also QWidget::icon and QApplication::mainWidget().
 .PP
 Examples:
 .)l action/application.cpp, application/application.cpp, chart/chartform.cpp, helpviewer/helpwindow.cpp, mdi/application.cpp, menu/menu.cpp, and themes/themes.cpp.
-.SH "void QMessageBox::aboutQt ( QWidget * parent, const QString & caption = QString::null )\fC [static]\fR"
+.SH "void QMessageBox::aboutTQt ( QWidget * parent, const QString & caption = QString::null )\fC [static]\fR"
 Displays a simple message box about Qt, with caption \fIcaption\fR and centered over \fIparent\fR (if \fIparent\fR is not 0). The message includes the version number of Qt being used by the application.
 .PP
 This is useful for inclusion in the Help menu of an application. See the examples/menu/menu.cpp example.
 .PP
 QApplication provides this functionality as a slot.
 .PP
-See also QApplication::aboutQt().
+See also QApplication::aboutTQt().
 .PP
 Examples:
 .)l action/application.cpp, application/application.cpp, chart/chartform.cpp, helpviewer/helpwindow.cpp, menu/menu.cpp, themes/themes.cpp, and trivial/trivial.cpp.
diff --git a/doc/porting2.doc b/doc/porting2.doc
index e29ea73d8..227ca1ddd 100644
--- a/doc/porting2.doc
+++ b/doc/porting2.doc
@@ -1125,7 +1125,7 @@ QMessageBox::warning(QWidget *, const char *, const char *, int, int, int)
 QMessageBox::critical(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int)
 QMessageBox::critical(QWidget *, const char *, const char *, int, int, int)
 QMessageBox::about(QWidget *, const char *, const char *)
-QMessageBox::aboutQt(QWidget *, const char *)
+QMessageBox::aboutTQt(QWidget *, const char *)
 QMessageBox::message(const char *, const char *, const char *, QWidget *, const char *)
 QMessageBox::buttonText(void) const
 QMessageBox::query(const char *, const char *, const char *, const char *, QWidget *, const char *)