From 45f529de247fc4b3662f6b474abe03fe904306ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kghostview/displayoptions.cpp | 2 +- kghostview/gssettingswidget.ui | 2 +- kghostview/infodialog.cpp | 2 +- kghostview/kgv_miniwidget.cpp | 2 +- kghostview/kgvconfigdialog.cpp | 6 +++--- kghostview/kgvfactory.cpp | 2 +- kghostview/kgvpagedecorator.cpp | 2 +- kghostview/kgvshell.cpp | 2 +- kghostview/viewcontrol.cpp | 30 +++++++++++++++--------------- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'kghostview') diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp index 82ef1f3a..84cae19a 100644 --- a/kghostview/displayoptions.cpp +++ b/kghostview/displayoptions.cpp @@ -76,7 +76,7 @@ TQString DisplayOptions::toString( const DisplayOptions& options ) 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/infodialog.cpp b/kghostview/infodialog.cpp index 431a0ed7..e429d712 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -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/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 1d38ba88..37b8ffdc 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC() } } else { - marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 ); + marklist->insertItem( TQString::fromLatin1( "1" ), 0 ); } } diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 6159a6f2..2f0c8593 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -120,7 +120,7 @@ namespace { 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/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..ea4258fc 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -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/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 8f1c8f0c..97616a26 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -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 ); -- cgit v1.2.1