From d73937a9f779e2aafa6c392f94c9c29aa32b78fd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 23 Sep 2023 12:42:20 +0900 Subject: Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro (cherry picked from commit b35e0845dc9b3c8b9a5e52a682c769f383933fae) --- doc/porting3.doc | 142 +++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'doc/porting3.doc') diff --git a/doc/porting3.doc b/doc/porting3.doc index 8d55bbe8..e6e77225 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -188,18 +188,18 @@ All these functions have been removed in TQt 3.x: \i QFont::setCharSet() \i QMenuBar::setActItem() \i QMenuBar::setWindowsAltMode() -\i QObject::initMetaObject() +\i TQObject::initMetaObject() \i QPainter::drawQuadBezier() \i QPointArray::quadBezier() \i QRegExp::find() \i QSpinBox::downButton() \i QSpinBox::upButton() -\i QString::basicDirection() -\i QString::visual() +\i TQString::basicDirection() +\i TQString::visual() \i QStyle::set...() functions \i QStyle::drawArrow() -\i QWidget::setFontPropagation() -\i QWidget::setPalettePropagation() +\i TQWidget::setFontPropagation() +\i TQWidget::setPalettePropagation() \endlist Also, to avoid conflicts with \c , the following three @@ -223,7 +223,7 @@ new code. \list \i QAccel::keyToString( QKeySequence k ) -\i QAccel::stringToKey( const QString \& s ) +\i QAccel::stringToKey( const TQString \& s ) \i QActionGroup::insert( QAction *a ) \i QButton::autoResize() const \i QButton::setAutoResize( bool ) @@ -233,12 +233,12 @@ new code. \i QCanvasItem::visible() const \i QCanvasPixmapArray::QCanvasPixmapArray( QPtrList\ list, QPtrList\ hotspots ) \i QCanvasPixmapArray::operator!() -\i QColorGroup::QColorGroup( const QColor \& foreground, const QColor \& background, const QColor \& light, const QColor \& dark, const QColor \& mid, const QColor \& text, const QColor \& base ) +\i QColorGroup::QColorGroup( const TQColor \& foreground, const TQColor \& background, const TQColor \& light, const TQColor \& dark, const TQColor \& mid, const TQColor \& text, const TQColor \& base ) \i QComboBox::autoResize() const \i QComboBox::setAutoResize( bool ) \i QDate::dayName( int weekday ) \i QDate::monthName( int month ) -\i QDir::encodedEntryList( const QString \& nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const +\i QDir::encodedEntryList( const TQString \& nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const \i QDir::encodedEntryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const \i QDockWindow::isHorizontalStretchable() const \i QDockWindow::isVerticalStretchable() const @@ -247,18 +247,18 @@ new code. \i QFont::defaultFont() \i QFont::setDefaultFont( const QFont \& f ) \i QFont::setPixelSizeFloat( float pixelSize ) -\i QFontDatabase::bold( const QString \& family, const QString \& style, const QString \& ) const +\i QFontDatabase::bold( const TQString \& family, const TQString \& style, const TQString \& ) const \i QFontDatabase::families( bool ) const -\i QFontDatabase::font( const QString \& familyName, const QString \& style, int pointSize, const QString \& ) -\i QFontDatabase::isBitmapScalable( const QString \& family, const QString \& style, const QString \& ) const -\i QFontDatabase::isFixedPitch( const QString \& family, const QString \& style, const QString \& ) const -\i QFontDatabase::isScalable( const QString \& family, const QString \& style, const QString \& ) const -\i QFontDatabase::isSmoothlyScalable( const QString \& family, const QString \& style, const QString \& ) const -\i QFontDatabase::italic( const QString \& family, const QString \& style, const QString \& ) const -\i QFontDatabase::pointSizes( const QString \& family, const QString \& style, const QString \& ) -\i QFontDatabase::smoothSizes( const QString \& family, const QString \& style, const QString \& ) -\i QFontDatabase::styles( const QString \& family, const QString \& ) const -\i QFontDatabase::weight( const QString \& family, const QString \& style, const QString \& ) const +\i QFontDatabase::font( const TQString \& familyName, const TQString \& style, int pointSize, const TQString \& ) +\i QFontDatabase::isBitmapScalable( const TQString \& family, const TQString \& style, const TQString \& ) const +\i QFontDatabase::isFixedPitch( const TQString \& family, const TQString \& style, const TQString \& ) const +\i QFontDatabase::isScalable( const TQString \& family, const TQString \& style, const TQString \& ) const +\i QFontDatabase::isSmoothlyScalable( const TQString \& family, const TQString \& style, const TQString \& ) const +\i QFontDatabase::italic( const TQString \& family, const TQString \& style, const TQString \& ) const +\i QFontDatabase::pointSizes( const TQString \& family, const TQString \& style, const TQString \& ) +\i QFontDatabase::smoothSizes( const TQString \& family, const TQString \& style, const TQString \& ) +\i QFontDatabase::styles( const TQString \& family, const TQString \& ) const +\i QFontDatabase::weight( const TQString \& family, const TQString \& style, const TQString \& ) const \i QLabel::autoResize() const \i QLabel::setAutoResize( bool enable ) \i QLineEdit::cursorLeft( bool mark, int steps = 1 ) @@ -271,7 +271,7 @@ new code. \i QListBox::cellWidth() const \i QListBox::findItem( int yPos ) const \i QListBox::inSort( const QListBoxItem *lbi ) -\i QListBox::inSort( const QString \& text ) +\i QListBox::inSort( const TQString \& text ) \i QListBox::itemYPos( int index, int *yPos ) const \i QListBox::numCols() const \i QListBox::totalHeight() const @@ -281,7 +281,7 @@ new code. \i QListView::removeItem( QListViewItem *item ) \i QListViewItem::removeItem( QListViewItem *item ) \i QMainWindow::addToolBar( QDockWindow *, Dock = DockTop, bool newLine = FALSE ) -\i QMainWindow::addToolBar( QDockWindow *, const QString \& label, Dock = DockTop, bool newLine = FALSE ) +\i QMainWindow::addToolBar( QDockWindow *, const TQString \& label, Dock = DockTop, bool newLine = FALSE ) \i QMainWindow::lineUpToolBars( bool keepNewLines = FALSE ) \i QMainWindow::moveToolBar( QDockWindow *, Dock = DockTop ) \i QMainWindow::moveToolBar( QDockWindow *, Dock, bool nl, int index, int extraOffset = -1 ) @@ -289,30 +289,30 @@ new code. \i QMainWindow::setToolBarsMovable( bool ) \i QMainWindow::toolBarPositionChanged( QToolBar *) \i QMainWindow::toolBarsMovable() const -\i QMessageBox::message( const QString \& caption, const QString \& text, const QString \& buttonText = QString::null, QWidget *parent = 0, const char *= 0 ) -\i QMessageBox::query( const QString \& caption, const QString \& text, const QString \& yesButtonText = QString::null, const QString \& noButtonText = QString::null, QWidget *parent = 0, const char *= 0 ) +\i QMessageBox::message( const TQString \& caption, const TQString \& text, const TQString \& buttonText = TQString::null, TQWidget *parent = 0, const char *= 0 ) +\i QMessageBox::query( const TQString \& caption, const TQString \& text, const TQString \& yesButtonText = TQString::null, const TQString \& noButtonText = TQString::null, TQWidget *parent = 0, const char *= 0 ) \i QMessageBox::standardIcon( Icon icon, GUIStyle style ) \i QPalette::normal() -\i QRegExp::match( const QString \& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const -\i QScrollView::childIsVisible( QWidget *child ) -\i QScrollView::showChild( QWidget *child, bool show = TRUE ) +\i QRegExp::match( const TQString \& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const +\i QScrollView::childIsVisible( TQWidget *child ) +\i QScrollView::showChild( TQWidget *child, bool show = TRUE ) \i QSignal::block( bool b ) \i QSignal::isBlocked() const \i QSignal::parameter() const \i QSignal::setParameter( int value ) \i QSimpleRichText::draw( QPainter *p, int x, int y, const QRegion \& clipRegion, const QColorGroup \& cg, const QBrush *paper = 0 ) const -\i QString::ascii() const -\i QString::data() const -\i QString::setExpand( uint index, QChar c ) +\i TQString::ascii() const +\i TQString::data() const +\i TQString::setExpand( uint index, TQChar c ) \i QStyle::defaultFrameWidth() const \i QStyle::scrollBarExtent() const -\i QStyle::tabbarMetrics( const QWidget *t, int \& hf, int \& vf, int \& ov ) const +\i QStyle::tabbarMetrics( const TQWidget *t, int \& hf, int \& vf, int \& ov ) const \i QTabDialog::isTabEnabled( const char *name ) const -\i QTabDialog::selected( const QString \& ) -\i QTabDialog::selected( const QString \& tabLabel ) +\i QTabDialog::selected( const TQString \& ) +\i QTabDialog::selected( const TQString \& tabLabel ) \i QTabDialog::setTabEnabled( const char *name, bool enable ) -\i QTextStream::QTextStream( QString \& str, int filemode ) -\i QToolBar::QToolBar( const QString \& label, QMainWindow *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 ) +\i QTextStream::QTextStream( TQString \& str, int filemode ) +\i QToolBar::QToolBar( const TQString \& label, QMainWindow *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 ) \i QToolButton::iconSet( bool on ) const \i QToolButton::offIconSet() const \i QToolButton::onIconSet() const @@ -322,17 +322,17 @@ new code. \i QToolTip::enabled() \i QToolTip::setEnabled( bool enable ) \i QTranslator::find( const char *context, const char *sourceText, const char *comment = 0 ) const -\i QTranslator::insert( const char *context, const char *sourceText, const QString \& translation ) +\i QTranslator::insert( const char *context, const char *sourceText, const TQString \& translation ) \i QTranslator::remove( const char *context, const char *sourceText ) \i QUriDrag::setFilenames( const QStringList \& fnames ) -\i QWidget::backgroundColor() const -\i QWidget::backgroundPixmap() const -\i QWidget::iconify() -\i QWidget::setBackgroundColor( const QColor \& c ) -\i QWidget::setBackgroundPixmap( const QPixmap \& pm ) -\i QWidget::setFont( const QFont \& f, bool ) -\i QWidget::setPalette( const QPalette \& p, bool ) -\i QWizard::setFinish( QWidget *, bool ) +\i TQWidget::backgroundColor() const +\i TQWidget::backgroundPixmap() const +\i TQWidget::iconify() +\i TQWidget::setBackgroundColor( const TQColor \& c ) +\i TQWidget::setBackgroundPixmap( const QPixmap \& pm ) +\i TQWidget::setFont( const QFont \& f, bool ) +\i TQWidget::setPalette( const QPalette \& p, bool ) +\i QWizard::setFinish( TQWidget *, bool ) \i QXmlInputSource::QXmlInputSource( QFile \& file ) \i QXmlInputSource::QXmlInputSource( QTextStream \& stream ) \i QXmlReader::parse( const QXmlInputSource \& input ) @@ -387,8 +387,8 @@ in TQt 3.0. This is only relevant if you subclassed QDate and reimplemented these functions: \list -\i QString QDate::monthName( int month ) const -\i QString QDate::dayName( int weekday ) const +\i TQString QDate::monthName( int month ) const +\i TQString QDate::dayName( int weekday ) const \endlist In addition to no longer being virtual, QDate::monthName() and @@ -576,7 +576,7 @@ which is what one expects. The following function is now obsolete, as it has an unwieldy parameter list and was poorly named: \list -\i bool QRegExp::match( const QString \& str, int index = 0, +\i bool QRegExp::match( const TQString \& str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const \endlist It will be removed in a future version of Qt. Its \link @@ -585,34 +585,34 @@ QRegExp::match() documentation \endlink explains how to replace it. \section2 QRegExp::find() This function was removed, after a brief appearance in TQt 2.2. Its -name clashed with QString::find(). Use \l QRegExp::search() or \l -QString::find() instead. +name clashed with TQString::find(). Use \l QRegExp::search() or \l +TQString::find() instead. -\section2 QString::findRev() and QString::contains() +\section2 TQString::findRev() and TQString::contains() -\l QString::findRev()'s and \l QString::contains()'s semantics have changed +\l TQString::findRev()'s and \l TQString::contains()'s semantics have changed between 2.0 and 3.0 to be more consistent with the other overloads. For example, \code - QString( "" ).contains( QRegExp("") ) + TQString( "" ).contains( QRegExp("") ) \endcode returns 1 in TQt 2.0; it returns 0 in TQt 3.0. Also, "^" now really means start of input, so \code - QString( "Heisan Hoppsan" ).contains( QRegExp("^.*$") ) + TQString( "Heisan Hoppsan" ).contains( QRegExp("^.*$") ) \endcode returns 1, not 13 or 14. This change affect very few existing programs. -\section2 QString::replace() +\section2 TQString::replace() -With TQt 1.0 and 2.0, a QString is converted implicitly into a QRegExp -as the first argument to QString::replace(): +With TQt 1.0 and 2.0, a TQString is converted implicitly into a QRegExp +as the first argument to TQString::replace(): \code - QString text = fetch_it_from_somewhere(); - text.replace( QString("[A-Z]+"), "" ); + TQString text = fetch_it_from_somewhere(); + text.replace( TQString("[A-Z]+"), "" ); \endcode With TQt 3.0, the compiler gives an error. The solution is to use a QRegExp cast: @@ -620,7 +620,7 @@ QRegExp cast: text.replace( QRegExp("[A-Z]+"), "" ); \endcode This change makes it possible to introduce a -QString::replace(QString, QString) overload in a future version of Qt +TQString::replace(TQString, TQString) overload in a future version of Qt without breaking source compatibility. \section1 QSemiModal @@ -701,7 +701,7 @@ which functions are obsolete. This function is no longer virtual: \list -\i QString QTranslator::find( const char * context, +\i TQString QTranslator::find( const char * context, const char * sourceText ) const \endlist @@ -711,18 +711,18 @@ In fact, find() is now defined in terms of findMessage(). By doing the conversion, you will also gain support for translator comments and for any future extensions. -\section1 QWidget +\section1 TQWidget -QWidget::backgroundColor(), QWidget::setBackgroundColor(), -QWidget::backgroundPixmap() and QWidget::setBackgroundPixmap() have +TQWidget::backgroundColor(), TQWidget::setBackgroundColor(), +TQWidget::backgroundPixmap() and TQWidget::setBackgroundPixmap() have often been the source of much confusion in previous releases. TQt 3.0 addresses this by obsoleting these functions and by replacing them -with eight new functions: QWidget::eraseColor(), -QWidget::setEraseColor(), QWidget::erasePixmap(), -QWidget::setErasePixmap(), QWidget::paletteBackgroundColor(), -QWidget::setPaletteBackgroundColor(), -QWidget::paletteBackgroundPixmap() and -QWidget::setPaletteBackgroundPixmap(). See their documentation for +with eight new functions: TQWidget::eraseColor(), +TQWidget::setEraseColor(), TQWidget::erasePixmap(), +TQWidget::setErasePixmap(), TQWidget::paletteBackgroundColor(), +TQWidget::setPaletteBackgroundColor(), +TQWidget::paletteBackgroundPixmap() and +TQWidget::setPaletteBackgroundPixmap(). See their documentation for details. \section1 QXml Classes @@ -796,16 +796,16 @@ respectively. Neither the arguments nor the resulting curve have changed. \section1 Locale-aware String Comparisons in QIconView, QListBox, QListView and QTable -In TQt 2.x, QString only provided string comparisons using the Unicode +In TQt 2.x, TQString only provided string comparisons using the Unicode values of the characters of a string. This is efficient and reliable, but it is not the appropriate order for most languages. For example, French users expect 'é' (e acute) to be treated essentially as 'e' and not put after 'z'. -In TQt 3.0, QString::localeAwareCompare() implements locale aware +In TQt 3.0, TQString::localeAwareCompare() implements locale aware string comparisions on certain platforms. The classes \l QIconView, \l QListBox, \l QListView and \l QTable now use -QString::localeAwareCompare() instead of QString::compare(). If you +TQString::localeAwareCompare() instead of TQString::compare(). If you want to control the behaviour yourself you can always reimplement QIconViewItem::compare(), QListBox::text(), QListViewItem::compare() or QTableItem::key() as appropriate. -- cgit v1.2.3