From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kghostview/displayoptions.cpp | 10 +++++----- kghostview/gssettingswidget.ui | 2 +- kghostview/gssettingswidget.ui.h | 2 +- kghostview/infodialog.cpp | 4 ++-- kghostview/kdscerrordialog.cpp | 6 +++--- kghostview/kgv_miniwidget.cpp | 14 +++++++------- kghostview/kgv_view.cpp | 10 +++++----- kghostview/kgvconfigdialog.cpp | 12 ++++++------ kghostview/kgvdocument.cpp | 36 ++++++++++++++++++------------------ kghostview/kgvfactory.cpp | 2 +- kghostview/kgvpagedecorator.cpp | 2 +- kghostview/kgvshell.cpp | 6 +++--- kghostview/kpswidget.cpp | 6 +++--- kghostview/logwindow.cpp | 2 +- kghostview/marklist.cpp | 4 ++-- kghostview/scrollbox.cpp | 6 +++--- kghostview/viewcontrol.cpp | 34 +++++++++++++++++----------------- 17 files changed, 79 insertions(+), 79 deletions(-) (limited to 'kghostview') diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp index 82ef1f3a..f2e0fa4b 100644 --- a/kghostview/displayoptions.cpp +++ b/kghostview/displayoptions.cpp @@ -68,15 +68,15 @@ namespace { TQString DisplayOptions::toString( const DisplayOptions& options ) { return TQString( qformat ) - .tqarg( options.page() ) - .tqarg( options.magnification() ) - .tqarg( options.overrideOrientation() ) - .tqarg( options.overridePageMedia().utf8().data() ); + .arg( options.page() ) + .arg( options.magnification() ) + .arg( options.overrideOrientation() ) + .arg( options.overridePageMedia().utf8().data() ); } bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in ) { - TQRegExp regex( TQString::tqfromLatin1( rformat ) ); + TQRegExp regex( TQString::fromLatin1( rformat ) ); if ( regex.search( in ) < 0 ) return false; out.reset(); diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui index 756f8b50..7ba9f637 100644 --- a/kghostview/gssettingswidget.ui +++ b/kghostview/gssettingswidget.ui @@ -46,7 +46,7 @@ Expanding - + 286 20 diff --git a/kghostview/gssettingswidget.ui.h b/kghostview/gssettingswidget.ui.h index 11f4bf63..371d6712 100644 --- a/kghostview/gssettingswidget.ui.h +++ b/kghostview/gssettingswidget.ui.h @@ -9,6 +9,6 @@ void GSSettingsWidget::setDetectedVersion( TQString v) { - mDetectedVersion->setText(mDetectedVersion->text().tqarg( v )); + mDetectedVersion->setText(mDetectedVersion->text().arg( v )); } diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index 431a0ed7..5e480504 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -90,7 +90,7 @@ namespace { "(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?" "\\)" ); if ( exp.exactMatch( dateStr ) ) { - TQStringList list = exp.tqcapturedTexts(); + TQStringList list = exp.capturedTexts(); TQStringList::iterator iter = list.begin(); ++iter; // whole string! #undef GET diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index e831cbcd..a0bbb07e 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -17,8 +17,8 @@ */ #include -#include -#include +#include +#include #include #include @@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err ) break; } - _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) ); + _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) ); _lineLabel->setText( err.line() ); _descriptionLabel->setText( description( err.type() ) ); diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 1d38ba88..c5bbdedf 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber ) /* KNotifyClient::userEvent (i18n("KGhostview cannot load the document, \"%1\".\n" - "It appears to be broken.").tqarg( _fileName ), + "It appears to be broken.").arg( _fileName ), KNotifyClient::Messagebox); _psWidget->disableInterpreter(); _psFile=0; @@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber ) else if( !_usePageLabels || document()->format() == KGVDocument::PDF ) text = i18n( "Page %1 of %2" ) - .tqarg( pageNumber + 1 ) - .tqarg( dsc()->page_count() ); + .arg( pageNumber + 1 ) + .arg( dsc()->page_count() ); else text = i18n( "Page %1 (%2 of %3)" ) - .tqarg( dsc()->page()[ _options.page() ].label ) - .tqarg( pageNumber + 1 ) - .tqarg( dsc()->page_count() ); + .arg( dsc()->page()[ _options.page() ].label ) + .arg( pageNumber + 1 ) + .arg( dsc()->page_count() ); emit setStatusBarText( text ); } @@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC() } } else { - marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 ); + marklist->insertItem( TQString::fromLatin1( "1" ), 0 ); } } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index e8edace1..0a7c1e06 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, for ( TQValueList::iterator first = mags.begin(), last = mags.end(); first != last; ++first ) { - TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 )); + TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 )); str.remove( KGlobal::locale()->decimalSymbol() + "00" ); zooms << str; if ( *first == 1.0 ) idx = cur; @@ -600,7 +600,7 @@ void KGVPart::updateZoomActions() } // Show percentage that isn't predefined - TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 )); + TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 )); str.remove( KGlobal::locale()->decimalSymbol() + "00" ); items.insert( items.at(idx), 1, str ); _zoomTo->setItems( items ); @@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error ) "Below are any error messages which were received from Ghostscript " "(%2) " "which may help you." ) - .tqarg( error ) - .tqarg( Configuration::interpreter() ), + .arg( error ) + .arg( Configuration::interpreter() ), true ); // The true above makes it show a "configure gs" option, but maybe we // should trigger an auto-redetection? diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 6159a6f2..aa821b27 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -19,7 +19,7 @@ // Add header files alphabetically -#include +#include #include #include @@ -114,13 +114,13 @@ namespace { "which are impossible to resolve. Please upgrade to a newer version.\n" "KGhostView will try to work with it, but it may not display any files at all.\n" "Version %2 seems to be appropriate on your system, although newer versions will work as well." ) - .tqarg( version ) - .tqarg( recommended ) ); + .arg( version ) + .arg( recommended ) ); } if ( version < TQString::number( 7.00 ) ) { TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() ); - arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) ); + arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) ); TQString antiAliasArgs = arguments.join( " " ); Configuration::setAntialiasingArguments( antiAliasArgs ); @@ -140,9 +140,9 @@ void ConfigDialog::showSettings( KGVPart* main ) { KConfigDialog* dialog = new KConfigDialog( 0, name, Configuration::self(), KDialogBase::IconList ); dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ), - i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) ); + i18n( "General" ), TQString::fromLatin1( "kghostview" ) ); GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" ); - dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) ); + dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) ); gssw->setDetectedVersion(Configuration::version()); diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 89cd7948..bcfc4d2e 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -98,7 +98,7 @@ void KGVDocument::doOpenFile() KMessageBox::sorry( _part->widget(), i18n( "Could not open %1: " "File does not exist." ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return; } @@ -107,7 +107,7 @@ void KGVDocument::doOpenFile() KMessageBox::sorry( _part->widget(), i18n( "Could not open %1: " "Permission denied." ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return; } @@ -132,7 +132,7 @@ void KGVDocument::doOpenFile() if( _tmpDSC->status() != 0 ) { KMessageBox::error( _part->widget(), i18n( "Could not create temporary file: %1" ) - .tqarg( strerror( _tmpDSC->status() ) ) ); + .arg( strerror( _tmpDSC->status() ) ) ); emit canceled( TQString() ); return; } @@ -159,8 +159,8 @@ void KGVDocument::doOpenFile() "which has type %2. KGhostview can " "only load PostScript (.ps, .eps) and Portable " "Document Format (.pdf) files." ) - .tqarg( _fileName ) - .tqarg( _mimetype ) ); + .arg( _fileName ) + .arg( _mimetype ) ); emit canceled( TQString() ); return; } @@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "Could not uncompress %1." ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return false; } @@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "Could not create temporary file: %2" ) - .tqarg( strerror( _tmpUnzipped->status() ) ) ); + .arg( strerror( _tmpUnzipped->status() ) ) ); emit canceled( TQString() ); return false; } @@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile() { KMessageBox::error( _part->widget(), i18n( "Could not uncompress %1." ) - .tqarg( _fileName ) ); + .arg( _fileName ) ); emit canceled( TQString() ); return false; } @@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult ) { KMessageBox::error( _part->widget(), i18n( "Could not open file %1." ) - .tqarg( _part->url().url() ) ); + .arg( _part->url().url() ) ); emit canceled( TQString() ); return; } @@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file) { KMessageBox::error( _part->widget(), i18n( "Error opening file %1: %2" ) - .tqarg( _part->url().url() ) - .tqarg( strerror( errno ) ) ); + .arg( _part->url().url() ) + .arg( strerror( errno ) ) ); emit canceled( "" ); return; } @@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList ) if( bss == ess ) range += TQString::number( *ess ); else - range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess ); + range += TQString( "%1-%2" ).arg( *bss ).arg( *ess ); bss = it; } @@ -521,7 +521,7 @@ void KGVDocument::print() printer.setOption( "kde-range", pageListToRange( _part->markList()->markList() ) ); - if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) + if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) { KTempFile tf( TQString(), ".ps" ); if( tf.status() == 0 ) @@ -548,7 +548,7 @@ void KGVDocument::print() { printer.setPageSelection( KPrinter::SystemSide ); - if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) + if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) printer.printFiles( _fileName ); } } @@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName, process << _interpreterPath << "-dNODISPLAY" << "-dTQUIET" - << TQString( "-sPDFname=%1" ).tqarg( pdfName ) + << TQString( "-sPDFname=%1" ).arg( pdfName ) << TQString( "-sDSCnamale locale( "kghostview" ); _fallBackPageMedia = pageSizeToString( static_cast< TQPrinter::PageSize >( locale.pageSize() ) ); _usePageLabels = false; -e=%1" ).tqarg( dscName ) +e=%1" ).arg( dscName ) << "pdf2dsc.ps" << "-c" << "quit"; @@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName ) << "-dDELAYSAFER" << "-dNODISPLAY" << "-dTQUIET" - << TQString( "-sPDFname=%1" ).tqarg( pdfName ) - << TQString( "-sDSCname=%1" ).tqarg( dscName ) + << TQString( "-sPDFname=%1" ).arg( pdfName ) + << TQString( "-sDSCname=%1" ).arg( dscName ) << "-c" << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe" << "-f" diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp index 0f11e563..c7024c59 100644 --- a/kghostview/kgvfactory.cpp +++ b/kghostview/kgvfactory.cpp @@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char * * * as we did before. */ - args << TQString::tqfromLatin1( className ); + args << TQString::fromLatin1( className ); if ( !strcmp( className, "Browser/View" ) ) { className = "KParts::ReadOnlyPart"; } diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp index a549d95d..b6304c1d 100644 --- a/kghostview/kgvpagedecorator.cpp +++ b/kghostview/kgvpagedecorator.cpp @@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p ) if( !r.isValid() ) return; - const TQColorGroup& cg = tqcolorGroup(); + const TQColorGroup& cg = colorGroup(); r.moveCenter( r.center() + _shadowOffset ); qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() ); diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 568b209b..7f099032 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -252,7 +252,7 @@ KGVShell::openStdin() if( _tmpFile->status() != 0 ) { KMessageBox::error( this, i18n( "Could not create temporary file: %1" ) - .tqarg( strerror( _tmpFile->status() ) ) ); + .arg( strerror( _tmpFile->status() ) ) ); return; } @@ -269,7 +269,7 @@ KGVShell::openStdin() if( read != 0 ) { KMessageBox::error( this, i18n( "Could not open standard input stream: %1" ) - .tqarg( strerror( errno ) ) ); + .arg( strerror( errno ) ) ); return; } @@ -309,7 +309,7 @@ void KGVShell::slotMaximize() void KGVShell::slotResize() { - resize( m_gvpart->pageView()->tqsizeHint().width(), height() ); + resize( m_gvpart->pageView()->sizeHint().width(), height() ); } void KGVShell::setFullScreen( bool useFullScreen ) diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index c6d5d972..b5234ac6 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -333,7 +333,7 @@ void KPSWidget::setupWidget() // Make sure the properties are updated immediately. XSync( x11Display(), false ); - tqrepaint(); + repaint(); _widgetDirty = false; } @@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter() setupWidget(); _process = new KProcess; - if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) ); + if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) ); else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) ); *_process << _ghostscriptPath.local8Bit(); @@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process ) { kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl; if ( process->normalExit() ) { - emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) ); + emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) ); } else { emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) ); } diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp index 207e88f1..bac46ce7 100644 --- a/kghostview/logwindow.cpp +++ b/kghostview/logwindow.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index ee91af25..259d13a1 100644 --- a/kghostview/marklist.cpp +++ b/kghostview/marklist.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ void MarkListItem::setPixmap( TQPixmap thumbnail ) void MarkListItem::setSelected( bool selected ) { if (selected) - setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() ); + setPaletteBackgroundColor( TQApplication::palette().active().highlight() ); else setPaletteBackgroundColor( _backgroundColor ); } diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp index 0246e893..87d68418 100644 --- a/kghostview/scrollbox.cpp +++ b/kghostview/scrollbox.cpp @@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s ) { pagesize = s; setFixedHeight( s.height() * width() / s.width() ); - tqrepaint(); + repaint(); } void ScrollBox::setViewSize( const TQSize& s ) { viewsize = s; - tqrepaint(); + repaint(); } void ScrollBox::setViewPos( const TQPoint& pos ) { viewpos = pos; - tqrepaint(); + repaint(); } void ScrollBox::setThumbnail( TQPixmap img ) diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 8f1c8f0c..a0ec7fba 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include "viewcontrol.h" @@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) vcGroupBox = new TQGroupBox( this ); vcGroupBox->setFrameStyle( TQFrame::NoFrame ); //vcGroupBox->setTitle( i18n("Force Changes To") ); - //vcGroupBox->tqsetAlignment( 1 ); + //vcGroupBox->setAlignment( 1 ); topLayout->addWidget( vcGroupBox, 10 ); @@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) magComboBox = new TQComboBox( FALSE, vcGroupBox ); - magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + magComboBox->setFixedHeight( magComboBox->sizeHint().height() ); //magComboBox->hide(); @@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) mediaComboBox = new TQComboBox( FALSE, vcGroupBox ); - mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() ); connect ( mediaComboBox, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotMediaSelection (int)) ); @@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) orientComboBox->insertItem(i18n("Landscape")); orientComboBox->insertItem(i18n("Seascape")); orientComboBox->insertItem(i18n("Upside Down")); - orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() ); + orientComboBox->setFixedHeight( magComboBox->sizeHint().height() ); connect ( orientComboBox, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotOrientSelection (int)) ); @@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) TQLabel* vcLabel; vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); vcLabel->hide(); @@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); grid->addWidget( vcLabel, 1, 0 ); vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox ); - vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix ); - if ( vcLabel->tqsizeHint().width() > labelWidth ) - labelWidth = vcLabel->tqsizeHint().width(); + vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix ); + if ( vcLabel->sizeHint().width() > labelWidth ) + labelWidth = vcLabel->sizeHint().width(); vcLabel->setMinimumWidth( labelWidth ); grid->addWidget( vcLabel, 2, 0 ); - vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 ); + vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 ); vcGroupBox->setMinimumWidth( - 40 + labelWidth + orientComboBox->tqsizeHint().width() ); + 40 + labelWidth + orientComboBox->sizeHint().width() ); KSeparator* sep = new KSeparator( KSeparator::HLine, this); topLayout->addWidget( sep ); @@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name ) connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - bbox->tqlayout(); + bbox->layout(); topLayout->addWidget( bbox ); topLayout->activate(); -- cgit v1.2.1