From e02e31c8b9d854cd62cbe9799228f6e08e882773 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:04:08 -0600 Subject: Sync with latest script --- src/dialogs/qcolordialog.cpp | 4 ++-- src/dialogs/qcolordialog.h | 2 +- src/dialogs/qdialog.cpp | 4 ++-- src/dialogs/qdialog.h | 2 +- src/dialogs/qerrormessage.cpp | 2 +- src/dialogs/qerrormessage.h | 2 +- src/dialogs/qfiledialog.cpp | 4 ++-- src/dialogs/qfiledialog.h | 2 +- src/dialogs/qfontdialog.cpp | 8 ++++---- src/dialogs/qfontdialog.h | 2 +- src/dialogs/qinputdialog.cpp | 2 +- src/dialogs/qinputdialog.h | 2 +- src/dialogs/qmessagebox.cpp | 6 +++--- src/dialogs/qmessagebox.h | 4 ++-- src/dialogs/qprintdialog.cpp | 2 +- src/dialogs/qprintdialog.h | 2 +- src/dialogs/qprogressdialog.cpp | 4 ++-- src/dialogs/qprogressdialog.h | 2 +- src/dialogs/qsemimodal.h | 2 +- src/dialogs/qtabdialog.cpp | 2 +- src/dialogs/qtabdialog.h | 2 +- src/dialogs/qwizard.cpp | 2 +- src/dialogs/qwizard.h | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index c3edc0f66..0a3be03fb 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -1428,7 +1428,7 @@ void TQColorDialogPrivate::addCustom() The static functions provide modal color dialogs. \omit - If you retquire a modeless dialog, use the TQColorDialog constructor. + If you require a modeless dialog, use the TQColorDialog constructor. \endomit The static getColor() function shows the dialog and allows the diff --git a/src/dialogs/qcolordialog.h b/src/dialogs/qcolordialog.h index eff846a82..28c8ee1c0 100644 --- a/src/dialogs/qcolordialog.h +++ b/src/dialogs/qcolordialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 9ef43e998..4f99ae9e6 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -159,7 +159,7 @@ \section1 Return value (modal dialogs) Modal dialogs are often used in situations where a return value is - retquired, e.g. to indicate whether the user pressed "OK" or + required, e.g. to indicate whether the user pressed "OK" or "Cancel". A dialog can be closed by calling the accept() or the reject() slots, and exec() will return \c Accepted or \c Rejected as appropriate. The exec() call returns the result of the dialog. diff --git a/src/dialogs/qdialog.h b/src/dialogs/qdialog.h index fc224655d..068b4d360 100644 --- a/src/dialogs/qdialog.h +++ b/src/dialogs/qdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index b5d747a68..7352ee641 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qerrormessage.h b/src/dialogs/qerrormessage.h index 4fd5212f3..fffb7c73b 100644 --- a/src/dialogs/qerrormessage.h +++ b/src/dialogs/qerrormessage.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index da5705092..c9032f853 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -3241,7 +3241,7 @@ void TQFileDialog::setDir( const TQString & pathstr ) Returns the current directory shown in the file dialog. The ownership of the TQDir pointer is transferred to the caller, so - it must be deleted by the caller when no longer retquired. + it must be deleted by the caller when no longer required. \sa setDir() */ diff --git a/src/dialogs/qfiledialog.h b/src/dialogs/qfiledialog.h index 0861aa1a7..ee13267e5 100644 --- a/src/dialogs/qfiledialog.h +++ b/src/dialogs/qfiledialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 995d49621..317a2ec1e 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -517,7 +517,7 @@ void TQListBoxFontText::paint( TQPainter *painter ) /*! \internal Updates the contents of the "font family" list box. This - function can be reimplemented if you have special retquirements. + function can be reimplemented if you have special requirements. */ void TQFontDialog::updateFamilies() @@ -605,7 +605,7 @@ void TQFontDialog::updateFamilies() /*! \internal Updates the contents of the "font style" list box. This - function can be reimplemented if you have special retquirements. + function can be reimplemented if you have special requirements. */ void TQFontDialog::updateStyles() @@ -665,7 +665,7 @@ void TQFontDialog::updateStyles() /*! \internal Updates the contents of the "font size" list box. This - function can be reimplemented if you have special retquirements. + function can be reimplemented if you have special requirements. */ void TQFontDialog::updateSizes() diff --git a/src/dialogs/qfontdialog.h b/src/dialogs/qfontdialog.h index c30836acf..53e625f23 100644 --- a/src/dialogs/qfontdialog.h +++ b/src/dialogs/qfontdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index ac58d979e..a75d24b5c 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qinputdialog.h b/src/dialogs/qinputdialog.h index 7010bd538..96db6e557 100644 --- a/src/dialogs/qinputdialog.h +++ b/src/dialogs/qinputdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index b598917cd..e0545de32 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -788,7 +788,7 @@ void TQMessageBox::setIcon( Icon icon ) Returns the pixmap used for a standard icon. This allows the pixmaps to be used in more complex message boxes. - \a icon specifies the retquired icon, e.g. TQMessageBox::Information, + \a icon specifies the required icon, e.g. TQMessageBox::Information, TQMessageBox::Warning or TQMessageBox::Critical. \a style is unused. @@ -804,7 +804,7 @@ TQPixmap TQMessageBox::standardIcon( Icon icon, GUIStyle style) /*! Returns the pixmap used for a standard icon. This allows the pixmaps to be used in more complex message boxes. \a icon - specifies the retquired icon, e.g. TQMessageBox::Question, + specifies the required icon, e.g. TQMessageBox::Question, TQMessageBox::Information, TQMessageBox::Warning or TQMessageBox::Critical. */ diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/qmessagebox.h index 27468ef0c..2c1713239 100644 --- a/src/dialogs/qmessagebox.h +++ b/src/dialogs/qmessagebox.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -212,7 +212,7 @@ private: // Disabled copy constructor and operator= TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ -TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' retquires TQt "\ +TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\ "%2, found TQt %3.").arg(TQString::fromLatin1(qAppName())).arg(TQString::fromLatin1(\ str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\ "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }} diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 9d6e82b81..0e00609e4 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qprintdialog.h b/src/dialogs/qprintdialog.h index c0cc7dc40..4d411850a 100644 --- a/src/dialogs/qprintdialog.h +++ b/src/dialogs/qprintdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index 7fa745578..a0f63467e 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -643,7 +643,7 @@ void TQProgressDialog::setProgress( int progress, int totalSteps ) /*! Returns a size that fits the contents of the progress dialog. - The progress dialog resizes itself as retquired, so you should not + The progress dialog resizes itself as required, so you should not need to call this yourself. */ diff --git a/src/dialogs/qprogressdialog.h b/src/dialogs/qprogressdialog.h index b96da1188..13b3129a8 100644 --- a/src/dialogs/qprogressdialog.h +++ b/src/dialogs/qprogressdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qsemimodal.h b/src/dialogs/qsemimodal.h index 200c07dbc..580b97bd9 100644 --- a/src/dialogs/qsemimodal.h +++ b/src/dialogs/qsemimodal.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp index 72cf487c7..8360158b0 100644 --- a/src/dialogs/qtabdialog.cpp +++ b/src/dialogs/qtabdialog.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qtabdialog.h b/src/dialogs/qtabdialog.h index 4165b25c0..6391f6630 100644 --- a/src/dialogs/qtabdialog.h +++ b/src/dialogs/qtabdialog.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index eb7ef3058..3b79098fc 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/dialogs/qwizard.h b/src/dialogs/qwizard.h index d9dfad2c0..04754fb7b 100644 --- a/src/dialogs/qwizard.h +++ b/src/dialogs/qwizard.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: -- cgit v1.2.1