From f59dfa08651a47f21d004e8e4cb5020b8035287e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345. --- krec/krecconfig_files.cpp | 2 +- krec/krecconfigure.cpp | 10 +++++----- krec/krecfile.cpp | 6 +++--- krec/krecfileview.cpp | 2 +- krec/krecfileviewhelpers.cpp | 26 +++++++++++++------------- krec/krecfilewidgets.cpp | 12 ++++++------ krec/krecnewproperties.cpp | 6 +++--- krec/krecord.cpp | 6 +++--- krec/krecord_private.h | 2 +- krec/ogg_export/krecexport_ogg.cpp | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) (limited to 'krec') diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp index a5ab2a68..4b62ed9c 100644 --- a/krec/krecconfig_files.cpp +++ b/krec/krecconfig_files.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index faf31fb3..5201c28d 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -87,13 +87,13 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this ); connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) ); _layout->addWidget( _tipofday ); - TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + TQBoxLayout* _tmptqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this ); connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) ); - _tmplayout->addWidget( _enableAllMessages ); + _tmptqlayout->addWidget( _enableAllMessages ); TQLabel* _tmplbl = new TQLabel( i18n( "All messages with the \"Don't show this message again\" option are shown again after selecting this button." ), this ); - _tmplayout->addWidget( _tmplbl ); - _layout->addLayout( _tmplayout ); + _tmptqlayout->addWidget( _tmplbl ); + _layout->addLayout( _tmptqlayout ); _layout->addStretch( 100 ); diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index a1e5c584..29d4640b 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -94,7 +94,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) _config->setGroup( "File-" + TQString::number( i ) ); newBuffer( KRecBuffer::fromConfig( _config, _dir->qDir(), this ) ); } - KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).arg( filename ) ); + KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).tqarg( filename ) ); delete tar; @@ -168,7 +168,7 @@ void KRecFile::save( const TQString &fname ) { delete tar; KIO::file_move( tmpname, filetosave, -1, true, false, true ); - KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) ); + KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).tqarg( filename() ) ); _saved = true; } @@ -429,7 +429,7 @@ void KRecBuffer::setActive( bool n ) { } void KRecBuffer::deleteBuffer() { - if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).arg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).tqarg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) _krecfile->deleteBuffer( this ); } diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index 03557acc..a5a989d8 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index cd96914b..26acdb2a 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -64,12 +64,12 @@ void KRecTimeBar::mouseReleaseEvent( TQMouseEvent* qme ) { void KRecTimeBar::newPos( int n ) { _pos = n; - repaint(); + tqrepaint(); } void KRecTimeBar::newSize( int n ) { _size = n; - repaint(); + tqrepaint(); } @@ -216,10 +216,10 @@ TQString KRecTimeDisplay::formatTime( const int mode, const int sample ) const { void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _posvalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Position" ) ); menu->insertItem( tmp, -1, 0 ); @@ -235,10 +235,10 @@ void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) { void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _sizevalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Size" ) ); menu->insertItem( tmp, -1, 0 ); @@ -255,10 +255,10 @@ void KRecTimeDisplay::jumpToTime() { } TQString KRecTimeDisplay::positionText( int m, int n ) { - return i18n( "Position: %1" ).arg( formatTime( m,n ) ); + return i18n( "Position: %1" ).tqarg( formatTime( m,n ) ); } TQString KRecTimeDisplay::sizeText( int m, int n ) { - return i18n( "Size: %1" ).arg( formatTime( m,n ) ); + return i18n( "Size: %1" ).tqarg( formatTime( m,n ) ); } void AKLabel::mousePressEvent( TQMouseEvent* qme ) { diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 04283e2b..cbcaba81 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -189,18 +189,18 @@ void KRecBufferWidget::initLayout() { void KRecBufferWidget::drawFrame( TQPainter* p ) { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _buffer->active() ) - p->setBrush( colorGroup().highlight() ); + p->setBrush( tqcolorGroup().highlight() ); else - p->setBrush( colorGroup().highlight().dark() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setBrush( tqcolorGroup().highlight().dark() ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _title_region->boundingRect() ); p->drawRect( _fileend_region->boundingRect() ); p->setBrush( TQBrush() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _main_region->boundingRect() ); - p->setPen( TQPen( colorGroup().highlightedText() ) ); + p->setPen( TQPen( tqcolorGroup().highlightedText() ) ); p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() ); } diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index 05392748..56ec7228 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -53,7 +53,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; labelfont.setPointSize( labelfont.pointSize()*3/2 ); captionlabel->setFont( labelfont ); captionlabel->setText( i18n( "Properties for the new File" ) ); - captionlabel->setAlignment( AlignCenter ); + captionlabel->tqsetAlignment( AlignCenter ); _layout->addWidget( captionlabel ); _filewidget = new KRecConfigFilesWidget( this ); @@ -74,7 +74,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout->addWidget( new KSeparator( KSeparator::HLine, this ) ); _layout->addWidget( _btnWidget ); - setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); } KRecNewProperties::~KRecNewProperties() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/krec/krecord.cpp b/krec/krecord.cpp index d73b4371..e6205c8a 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ bool KRecPrivate::closeFile() { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _currentFile ) { if ( !_currentFile->saved() ) { - int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).arg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); + int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).tqarg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if ( choice == KMessageBox::Yes ) saveFile(); if ( choice == KMessageBox::Cancel ) return false; // go on if KMessageBox::No @@ -179,7 +179,7 @@ void KRecPrivate::exportFile() { "you did everything right, please file a bugreport saying what " \ "you where about to do and please quote the following line:
" \ "%1" \ - "" ).arg( KRecGlobal::the()->exportFormatEndings() ), + "" ).tqarg( KRecGlobal::the()->exportFormatEndings() ), i18n( "Could not determine encodingmethod" ) ); } } else KRecGlobal::the()->message( i18n( "There is nothing to export." ) ); diff --git a/krec/krecord_private.h b/krec/krecord_private.h index c34f5b10..ab1debde 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "krecfileview.h" diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index 32f274df..32223cb8 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -95,7 +95,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; vorbis_comment_add_tag ( &vc, const_cast( "kde-encoder" ), const_cast( "KRec" ) ); if ( write_vorbis_comments ) { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); vorbis_comment_add_tag ( &vc, const_cast( "title" ), const_cast( "" ) ); vorbis_comment_add_tag ( &vc, const_cast( "artist" ), -- cgit v1.2.1