diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp index 594ec04..99b601f 100644 --- a/krename/ProgressDialog.cpp +++ b/krename/ProgressDialog.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ // QT Includes -#include +#include #include #include #include @@ -157,7 +157,7 @@ void ProgressDialog::error( TQString text ) } //TODO: simplify this (breaks i18n) - KListViewItem* item = new KListViewItem( display, TQString( i18n("Error: %1") ).arg( TQString() ) + simplify( text ), count() ); + KListViewItem* item = new KListViewItem( display, TQString( i18n("Error: %1") ).tqarg( TQString() ) + simplify( text ), count() ); item->setPixmap( 0, SmallIcon("cancel") ); display->insertItem( item ); } @@ -170,7 +170,7 @@ void ProgressDialog::warning( TQString text ) m_timer->start( TIMER_INTERVAL ); } - KListViewItem* item = new KListViewItem( display, TQString( i18n("Warning: %1") ).arg( TQString() ) + simplify( text ), count() ); + KListViewItem* item = new KListViewItem( display, TQString( i18n("Warning: %1") ).tqarg( TQString() ) + simplify( text ), count() ); item->setPixmap( 0, SmallIcon("idea") ); display->insertItem( item ); } diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp index bbf7322..5eed8d3 100644 --- a/krename/batchrenamer.cpp +++ b/krename/batchrenamer.cpp @@ -125,7 +125,7 @@ void BatchRenamer::processFiles( ProgressDialog* p, TQObject* object ) } } - p->print( TQString( i18n("Filenames Processed after %1 seconds.")).arg(t.elapsed()/1000) ); + p->print( TQString( i18n("Filenames Processed after %1 seconds.")).tqarg(t.elapsed()/1000) ); work( p ); } @@ -140,7 +140,7 @@ TQString BatchRenamer::processString( TQString text, TQString oldname, int i ) * * Krename will have problems with files * which contain one of the following - * unicode characters: 60000, 60001, 60002 + * tqunicode characters: 60000, 60001, 60002 * 60003, 60004, 60005, 60006. * * This is not a good solution, if you have a @@ -258,11 +258,11 @@ void BatchRenamer::work( ProgressDialog* p ) * Give the user some information... */ if( m_mode == COPY) - p->print( TQString( i18n("Files will be copied to: %1") ).arg(m_files[0].dst.directory) ); + p->print( TQString( i18n("Files will be copied to: %1") ).tqarg(m_files[0].dst.directory) ); else if( m_mode == MOVE ) - p->print( TQString( i18n("Files will be moved to: %1") ).arg(m_files[0].dst.directory) ); + p->print( TQString( i18n("Files will be moved to: %1") ).tqarg(m_files[0].dst.directory) ); else if( m_mode == LINK ) - p->print( TQString( i18n("Symbolic links will be created in: %1") ).arg(m_files[0].dst.directory) ); + p->print( TQString( i18n("Symbolic links will be created in: %1") ).tqarg(m_files[0].dst.directory) ); else if( m_mode == RENAME ) p->print( i18n("Input files will be renamed.") ); @@ -317,7 +317,7 @@ void BatchRenamer::work( ProgressDialog* p ) (*tundo) << "mv --force -b --suffix=.krename_ \"" << m_files[i].dst.name << "\" \"" << m_files[i].src.name << "\"" << endl; } else - p->warning( TQString( i18n("Undo is not possible for remote file: %1") ).arg( dst.prettyURL() ) ); + p->warning( TQString( i18n("Undo is not possible for remote file: %1") ).tqarg( dst.prettyURL() ) ); } @@ -329,13 +329,13 @@ void BatchRenamer::work( ProgressDialog* p ) } } - const TQString m = TQString( i18n("Renamed %1 files successfully.") ).arg(i-error); + const TQString m = TQString( i18n("Renamed %1 files successfully.") ).tqarg(i-error); ( i - error ) ? p->print( m ) : p->warning( m ); if( error > 0 ) - p->warning( TQString( i18n("%2 errors occurred!") ).arg(error)); + p->warning( TQString( i18n("%2 errors occurred!") ).tqarg(error)); - p->print( TQString( i18n("Elapsed time: %1 seconds") ).arg( t.elapsed()/1000 ), "kalarm" ); + p->print( TQString( i18n("Elapsed time: %1 seconds") ).tqarg( t.elapsed()/1000 ), "kalarm" ); p->print( i18n("KRename finished the renaming process."), "krename" ); p->print( i18n("Press close to quit!") ); p->setRenamedFiles( renamedFiles, m_files.count() ); diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp index cd2a62f..a626c99 100644 --- a/krename/commandplugin.cpp +++ b/krename/commandplugin.cpp @@ -20,7 +20,7 @@ // QT includes #include #include -#include +#include // KDE includes #include @@ -137,7 +137,7 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int ) proc.resume(); if( !noblock && proc.exitStatus() ) - return command.arg( filename ) + TQString( i18n(" exited with error: %1") ).arg( proc.exitStatus() ); + return command.tqarg( filename ) + TQString( i18n(" exited with error: %1") ).tqarg( proc.exitStatus() ); return TQString(); } diff --git a/krename/confdialog.cpp b/krename/confdialog.cpp index 1d2f9c9..985cc43 100644 --- a/krename/confdialog.cpp +++ b/krename/confdialog.cpp @@ -21,7 +21,7 @@ // QT includes #include #include -#include +#include #include #include @@ -48,12 +48,12 @@ void ConfDialog::setupTab1() { const TQString caption = i18n("Look and Feel"); TQFrame* box = addPage( caption, caption, BarIcon("looknfeel") ); - TQVBoxLayout* layout = new TQVBoxLayout( box ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( box ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQButtonGroup* group = new TQButtonGroup( box ); group->setColumnLayout(0, Qt::Vertical ); - TQVBoxLayout* lgroup = new TQVBoxLayout( group->layout() ); + TQVBoxLayout* lgroup = new TQVBoxLayout( group->tqlayout() ); optionWizard = new TQRadioButton( group ); optionWizard->setText( i18n("Use &wizard style GUI (beginners)") ); @@ -65,15 +65,15 @@ void ConfDialog::setupTab1() lgroup->addWidget( optionTabs ); lgroup->addItem( spacer ); - layout->addWidget( group ); - layout->addItem( spacer ); + tqlayout->addWidget( group ); + tqlayout->addItem( spacer ); } void ConfDialog::setupTab2() { const TQString caption = i18n("KRename"); TQFrame* box = addPage( caption, caption, BarIcon("krename") ); - TQVBoxLayout* layout = new TQVBoxLayout( box ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( box ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); checkPlugins = new TQCheckBox( i18n("&Load file plugins on start"), box ); @@ -87,12 +87,12 @@ void ConfDialog::setupTab2() spinHistory->setRange( 2, 500, 1, false ); spinHistory->setLabel( i18n( "&Number of template history items:" ), AlignLeft | AlignVCenter ); - layout->addWidget( checkPlugins ); - layout->addWidget( checkAutosize ); - layout->addItem( spacer ); - layout->addWidget( spinSize ); - layout->addWidget( spinHistory ); - layout->addItem( spacer ); + tqlayout->addWidget( checkPlugins ); + tqlayout->addWidget( checkAutosize ); + tqlayout->addItem( spacer ); + tqlayout->addWidget( spinSize ); + tqlayout->addWidget( spinHistory ); + tqlayout->addItem( spacer ); TQToolTip::add( checkPlugins, i18n("Disabling this option decreases KRename's startup time, because no KFilePlugins are loaded.") ); } diff --git a/krename/coorddialog.cpp b/krename/coorddialog.cpp index dae3831..f76996e 100644 --- a/krename/coorddialog.cpp +++ b/krename/coorddialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include // KDE includes @@ -52,7 +52,7 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char * KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, _parent, name, true, true ), m_file( file ) { TQFrame* parent = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout( parent ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( parent ); filename = new DSLineEdit( parent ); filename->setText( file ); @@ -63,10 +63,10 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char * checkInvert = new TQCheckBox( i18n("&Invert selection"), plainPage() ); checkInvert->setChecked( m_inversion ); - layout->addWidget( new TQLabel( i18n("Please select the text you want to insert:"), plainPage() ) ); - layout->addWidget( filename ); - layout->addWidget( checkInvert ); - layout->addWidget( preview ); + tqlayout->addWidget( new TQLabel( i18n("Please select the text you want to insert:"), plainPage() ) ); + tqlayout->addWidget( filename ); + tqlayout->addWidget( checkInvert ); + tqlayout->addWidget( preview ); updateCommand(); connect( filename, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateCommand() ) ); @@ -102,26 +102,26 @@ void CoordDialog::updateCommand() start++; end++; if( start > 1 ) - m_command = TQString("[$1;%1]").arg(start-1); + m_command = TQString("[$1;%1]").tqarg(start-1); if( end <= (signed int)filename->text().length() ) - m_command.append( TQString("[$%1-[length]]").arg(end) ); + m_command.append( TQString("[$%1-[length]]").tqarg(end) ); } } else if( checkInvert->isChecked() && !filename->hasSelectedText() ) { int p = filename->cursorPosition(); - m_command = TQString("[$1;%1][$%2-[length]]").arg(p).arg(p+1); + m_command = TQString("[$1;%1][$%2-[length]]").tqarg(p).tqarg(p+1); } else if( !checkInvert->isChecked() && filename->hasSelectedText() ){ if( end ) { start++; end++; if( end <= (signed int)filename->text().length() ) - m_command = TQString("[$%1;%2]").arg(start).arg(end-start); + m_command = TQString("[$%1;%2]").tqarg(start).tqarg(end-start); else - m_command = TQString("[$%1-[length]]").arg(start); + m_command = TQString("[$%1-[length]]").tqarg(start); } } else if( !checkInvert->isChecked() && !filename->hasSelectedText() ) { int p = filename->cursorPosition(); - m_command = TQString("[$%1-[length]]").arg( p ); + m_command = TQString("[$%1-[length]]").tqarg( p ); } } diff --git a/krename/dateplugin.cpp b/krename/dateplugin.cpp index 2e51b6d..e55e7ae 100644 --- a/krename/dateplugin.cpp +++ b/krename/dateplugin.cpp @@ -59,7 +59,7 @@ TQString DatePlugin::processFile(BatchRenamer* b, int i, TQString token, int ) token = token.mid( getPattern().length(), token.length() - getPattern().length() ); - TQDate d = TQDate::currentDate(); + TQDate d = TQDate::tqcurrentDate(); TQTime t = TQTime::currentTime(); TQString tmp, text; TQString format = "dd-MM-yyyy"; @@ -71,15 +71,15 @@ TQString DatePlugin::processFile(BatchRenamer* b, int i, TQString token, int ) token = token.lower(); if( token == "date" ) { - return TQDateTime::currentDateTime().toString( format ); + return TQDateTime::tqcurrentDateTime().toString( format ); } else if( token == "year" ) - return TQString( "%1" ).arg( d.year() ); + return TQString( "%1" ).tqarg( d.year() ); else if( token == "month" ) return tmp.sprintf("%0*i", 2, d.month() ); else if( token == "day" ) return tmp.sprintf("%0*i", 2, d.day() ); else if( token == "time" ) - return TQString( "%1-%2-%3" ).arg( t.hour() ).arg( TQString().sprintf("%0*i", 2, t.minute() ) ).arg( TQString().sprintf("%0*i", 2, t.second() ) ); + return TQString( "%1-%2-%3" ).tqarg( t.hour() ).tqarg( TQString().sprintf("%0*i", 2, t.minute() ) ).tqarg( TQString().sprintf("%0*i", 2, t.second() ) ); else if( token == "hour" ) return tmp.sprintf("%0*i", 2, t.hour() ); else if( token == "minute" ) diff --git a/krename/datetime.cpp b/krename/datetime.cpp index 2eac87f..e8cd9da 100644 --- a/krename/datetime.cpp +++ b/krename/datetime.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include // KDE includes @@ -149,7 +149,7 @@ TQString MyDatePlugin::processFile( BatchRenamer* b, int i, TQString, int ) f = fopen((const char *)filename, "r"); if( f == NULL ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); fclose( f ); @@ -165,16 +165,16 @@ TQString MyDatePlugin::processFile( BatchRenamer* b, int i, TQString, int ) ti = mktime( &tmp ); if( ti == -1 ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); if( stat( (const char *)filename, &st ) == -1 ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); t->actime = st.st_atime; t->modtime = ti; if(utime( (const char *)filename, t ) != 0) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); return TQString(); #else @@ -189,7 +189,7 @@ TQString MyDatePlugin::processFile( BatchRenamer* b, int i, TQString, int ) f = fopen((const char *)filename, "r"); if( f == NULL ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); fclose( f ); @@ -204,10 +204,10 @@ TQString MyDatePlugin::processFile( BatchRenamer* b, int i, TQString, int ) ti = mktime( &tmp ); if( ti == -1 ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); if( stat( (const char *)filename, &st ) == -1 ) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); if(dvals.changeAccess) t->actime = ti; @@ -220,7 +220,7 @@ TQString MyDatePlugin::processFile( BatchRenamer* b, int i, TQString, int ) t->modtime = st.st_mtime; if(utime( (const char *)filename, t ) != 0) - return TQString( i18n("Can't change date of file %1.") ).arg(filename); + return TQString( i18n("Can't change date of file %1.") ).tqarg(filename); return TQString(); #endif @@ -231,7 +231,7 @@ void MyDatePlugin::changeDT() spinHour->setValue( TQTime::currentTime().hour()); spinMinute->setValue( TQTime::currentTime().minute()); spinSecond->setValue( TQTime::currentTime().second()); - kDate->setDate( TQDate::currentDate() ); + kDate->setDate( TQDate::tqcurrentDate() ); } diff --git a/krename/dsdirselectdialog.cpp b/krename/dsdirselectdialog.cpp index 23c971a..621003e 100644 --- a/krename/dsdirselectdialog.cpp +++ b/krename/dsdirselectdialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -38,10 +38,10 @@ DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent ) TQVBox* vbox = new TQVBox( this ); - if( layout() ) - layout()->add( vbox ); + if( tqlayout() ) + tqlayout()->add( vbox ); else - qDebug("KFileDialog does not have a layout!!!"); + qDebug("KFileDialog does not have a tqlayout!!!"); checkDir = new TQCheckBox( i18n("Add directory names &with filenames"), vbox ); check = new TQCheckBox( i18n("Add subdirectories &recursively"), vbox ); diff --git a/krename/dsdirselectdialog.h b/krename/dsdirselectdialog.h index 2ccdb4f..1bb9aad 100644 --- a/krename/dsdirselectdialog.h +++ b/krename/dsdirselectdialog.h @@ -24,7 +24,7 @@ class TQCheckBox; class TQLabel; class KComboBox; -/* A small helper class to allow layout changes in KDirSelectDialog */ +/* A small helper class to allow tqlayout changes in KDirSelectDialog */ class DSDirSelectDialog : public KFileDialog { Q_OBJECT TQ_OBJECT diff --git a/krename/encodingplugin.cpp b/krename/encodingplugin.cpp index 7e6a3f9..0b160bb 100644 --- a/krename/encodingplugin.cpp +++ b/krename/encodingplugin.cpp @@ -20,8 +20,8 @@ // QT includes #include #include -#include -#include +#include +#include #include @@ -67,12 +67,12 @@ void EncodingPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) l->addWidget( label ); TQVGroupBox* groupInput = new TQVGroupBox( i18n("Encoding of Input Files:"), w ); - checkInput = new TQCheckBox( i18n("&Use local encoding: %1").arg( m_locale_codec), groupInput ); + checkInput = new TQCheckBox( i18n("&Use local encoding: %1").tqarg( m_locale_codec), groupInput ); comboInput = new KComboBox( false, groupInput ); comboInput->insertStringList( codecs ); TQVGroupBox* groupOutput = new TQVGroupBox( i18n("Encoding of Output Files:"), w ); - checkOutput = new TQCheckBox( i18n("&Use local encoding: %1").arg( m_locale_codec), groupOutput ); + checkOutput = new TQCheckBox( i18n("&Use local encoding: %1").tqarg( m_locale_codec), groupOutput ); checkOutput->setChecked( true ); comboOutput = new KComboBox( false, groupOutput ); comboOutput->insertStringList( codecs ); @@ -106,13 +106,13 @@ bool EncodingPlugin::checkError() TQString EncodingPlugin::processFile( BatchRenamer*, int, TQString token, int ) { TQString input = token; - TQString unicode = TQString(); + TQString tqunicode = TQString(); TQTextCodec* toUnicode = TQTextCodec::codecForName(m_input_codec); // get the codec for KOI8-R TQTextCodec* fromUnicode = TQTextCodec::codecForName(m_output_codec); - unicode = toUnicode->toUnicode( input ); - return fromUnicode->fromUnicode( unicode ); + tqunicode = toUnicode->toUnicode( input ); + return fromUnicode->fromUnicode( tqunicode ); } void EncodingPlugin::finished() diff --git a/krename/fileoperation.cpp b/krename/fileoperation.cpp index b25cdcb..cfc558b 100644 --- a/krename/fileoperation.cpp +++ b/krename/fileoperation.cpp @@ -50,7 +50,7 @@ bool FileOperation::start( const KURL & src, const KURL & dest, int mode, bool o result = 0; if( src == dest && !overwrite ) { - m_error = TQString( i18n( "File %1 exists already!") ).arg( dest.prettyURL() ); + m_error = TQString( i18n( "File %1 exists already!") ).tqarg( dest.prettyURL() ); return false; } @@ -72,7 +72,7 @@ bool FileOperation::start( const KURL & src, const KURL & dest, int mode, bool o } else { - m_error = i18n("Can't create symlinks on different hosts for file %1.").arg( src.prettyURL() ); + m_error = i18n("Can't create symlinks on different hosts for file %1.").tqarg( src.prettyURL() ); result = true; return !result; } diff --git a/krename/fileplugin.cpp b/krename/fileplugin.cpp index 552f7c2..97a2cc4 100644 --- a/krename/fileplugin.cpp +++ b/krename/fileplugin.cpp @@ -20,7 +20,7 @@ // TQt includes #include #include -#include +#include #include // KDE includes diff --git a/krename/guimodeselector.cpp b/krename/guimodeselector.cpp index b1cc2ac..bdd8603 100644 --- a/krename/guimodeselector.cpp +++ b/krename/guimodeselector.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include // KDE includes @@ -54,12 +54,12 @@ const TQString GUIModeSelector::guiModeCaption() const void GUIModeSelector::createFrame( TQFrame* frame ) { - TQVBoxLayout* layout = new TQVBoxLayout( frame ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQButtonGroup* group = new TQButtonGroup( frame ); group->setColumnLayout(0, Qt::Vertical ); - TQVBoxLayout* lgroup = new TQVBoxLayout( group->layout() ); + TQVBoxLayout* lgroup = new TQVBoxLayout( group->tqlayout() ); optionWizard = new TQRadioButton( group ); optionWizard->setText( i18n("Use &wizard style GUI (beginners)") ); @@ -71,8 +71,8 @@ void GUIModeSelector::createFrame( TQFrame* frame ) lgroup->addWidget( optionTabs ); lgroup->addItem( spacer ); - layout->addWidget( group ); - layout->addItem( spacer ); + tqlayout->addWidget( group ); + tqlayout->addItem( spacer ); } diff --git a/krename/helpdialog.cpp b/krename/helpdialog.cpp index d98440c..fe42ef3 100644 --- a/krename/helpdialog.cpp +++ b/krename/helpdialog.cpp @@ -19,7 +19,7 @@ // TQt includes #include -#include +#include #include // KDE includes diff --git a/krename/kmylistbox.cpp b/krename/kmylistbox.cpp index 998b0c4..716cb30 100644 --- a/krename/kmylistbox.cpp +++ b/krename/kmylistbox.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include // KDE includes @@ -161,7 +161,7 @@ void KMyListBox::addDirName( const KURL & dirname, const TQString & filter, bool } else { // escape hiden directories TQString name = dirname.fileName(); - if( !hidden && name.right( 1 ) != TQString::fromLatin1(".") ) + if( !hidden && name.right( 1 ) != TQString::tqfromLatin1(".") ) if( !isInList( dirname ) ) addDirName( dirname ); @@ -715,9 +715,9 @@ void KMyListBox::positionLabel() } else { - int x = (width() - label->minimumSizeHint().width()) / 2; - int y = (height() - label->minimumSizeHint().height()) / 2; - label->setGeometry( x, y, label->minimumSizeHint().width(), label->minimumSizeHint().height() ); + int x = (width() - label->tqminimumSizeHint().width()) / 2; + int y = (height() - label->tqminimumSizeHint().height()) / 2; + label->setGeometry( x, y, label->tqminimumSizeHint().width(), label->tqminimumSizeHint().height() ); label->show(); } } @@ -750,7 +750,7 @@ void KMyListBoxItem::setPixmap( const TQPixmap & pix ) { KMyListBox* box = static_cast(this->listBox()); pm.resize( box->getPreviewSize(), box->getPreviewSize() ); - pm.fill( box->colorGroup().base() ); + pm.fill( box->tqcolorGroup().base() ); TQPainter painter( &pm ); painter.drawPixmap( (pm.width()-pix.width())/2, (pm.height()-pix.height())/2, pix ); m_has_preview = true; @@ -788,7 +788,7 @@ void KMyListBoxItem::paint( TQPainter *painter ) painter->drawPixmap( 3, yPos, pm); else { - KPixmap pix = KPixmapEffect::selectedPixmap( pm, listBox()->colorGroup().highlight() ); + KPixmap pix = KPixmapEffect::selectedPixmap( pm, listBox()->tqcolorGroup().highlight() ); painter->drawPixmap( 3, yPos, pix ); } diff --git a/krename/kmylistview.cpp b/krename/kmylistview.cpp index 62865c0..976e8d3 100644 --- a/krename/kmylistview.cpp +++ b/krename/kmylistview.cpp @@ -164,14 +164,14 @@ KMyListViewItem::~KMyListViewItem() { } void KMyListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup _cg( cg ); TQColor c = _cg.text(); if( modified ) _cg.setColor( TQColorGroup::Text, TQt::red ); - KListViewItem::paintCell( p, _cg, column, width, alignment ); + KListViewItem::paintCell( p, _cg, column, width, tqalignment ); _cg.setColor( TQColorGroup::Text, c ); } diff --git a/krename/kmylistview.h b/krename/kmylistview.h index 66b2852..f694589 100644 --- a/krename/kmylistview.h +++ b/krename/kmylistview.h @@ -85,7 +85,7 @@ class KMyListViewItem : public KListViewItem { virtual ~KMyListViewItem(); - void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); + void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); private: bool modified; diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp index 9ff3f1b..42736e7 100644 --- a/krename/krenameimpl.cpp +++ b/krename/krenameimpl.cpp @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include @@ -423,10 +423,10 @@ void KRenameImpl::setupPage2() groupOptions = new TQButtonGroup( page_2 ); groupOptions->setTitle( i18n( "O&ptions" ) ); groupOptions->setColumnLayout(0, Qt::Vertical ); - groupOptions->layout()->setSpacing( 6 ); - groupOptions->layout()->setMargin( 11 ); - groupOptionsLayout = new TQVBoxLayout( groupOptions->layout() ); - groupOptionsLayout->setAlignment( TQt::AlignTop ); + groupOptions->tqlayout()->setSpacing( 6 ); + groupOptions->tqlayout()->setMargin( 11 ); + groupOptionsLayout = new TQVBoxLayout( groupOptions->tqlayout() ); + groupOptionsLayout->tqsetAlignment( TQt::AlignTop ); optionRename = new TQRadioButton( groupOptions ); optionRename->setText( i18n( "&Rename input files" ) ); @@ -619,7 +619,7 @@ void KRenameImpl::setupFileTab1() TQSpacerItem* spacer_9 = new TQSpacerItem( 200, 20, TQSizePolicy::Maximum, TQSizePolicy::Maximum ); - TQVBoxLayout* layout = new TQVBoxLayout( tab ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( tab ); TQHBoxLayout* Layout1 = new TQHBoxLayout( 0, 6, 6 ); TQHBoxLayout* Layout2 = new TQHBoxLayout( 0, 6, 6 ); TQHBoxLayout* ExtensionLayout = new TQHBoxLayout( 0, 6, 6 ); @@ -641,10 +641,10 @@ void KRenameImpl::setupFileTab1() ExtensionLayout->addWidget( new TQLabel( i18n("File extension starts at:"), tab ) ); ExtensionLayout->addWidget( comboExtension ); - layout->addLayout( Layout1 ); - layout->addLayout( ExtensionLayout ); - layout->addLayout( Layout2 ); - layout->addItem( spacer_9 ); + tqlayout->addLayout( Layout1 ); + tqlayout->addLayout( ExtensionLayout ); + tqlayout->addLayout( Layout2 ); + tqlayout->addItem( spacer_9 ); fileTab->addWidget( tab, ID_TAB ); } @@ -653,7 +653,7 @@ void KRenameImpl::setupFileTab2() { TQWidget* tab = new TQWidget( page_4 ); - TQHBoxLayout* layout = new TQHBoxLayout( tab, 6, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( tab, 6, 6 ); TQVGroupBox* vgroup1 = new TQVGroupBox( i18n("&Filename"), tab ); TQGrid* grid = new TQGrid( 4, vgroup1 ); @@ -708,8 +708,8 @@ void KRenameImpl::setupFileTab2() buttonEasyReplace = new KPushButton( i18n("&Find and Replace..."), rightBox ); buttonEasyReplace->setIconSet( SmallIconSet("find") ); - layout->addWidget( vgroup1 ); - layout->addWidget( rightBox ); + tqlayout->addWidget( vgroup1 ); + tqlayout->addWidget( rightBox ); comboKRenamePrefix->insertItem( "" ); comboKRenamePrefix->insertItem( i18n("Number") ); @@ -737,10 +737,10 @@ void KRenameImpl::setupFileTab2() buttonEasy3->setIconSet( SmallIcon("help") ); buttonEasy4->setIconSet( SmallIcon("help") ); - buttonEasy1->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); - buttonEasy2->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); - buttonEasy3->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); - buttonEasy4->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + buttonEasy1->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + buttonEasy2->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + buttonEasy3->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + buttonEasy4->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); const TQString easy_text( i18n("Insert a special KRename command which inserts file information into the filename.") ); @@ -1004,7 +1004,7 @@ void KRenameImpl::start() } ProgressDialog* p = new ProgressDialog( 0, "p" ); - p->print(TQString( i18n("Starting conversion of %1 files.") ).arg(fileList->count())); + p->print(TQString( i18n("Starting conversion of %1 files.") ).tqarg(fileList->count())); // Save History dirname->saveSettings(); @@ -1065,7 +1065,7 @@ bool KRenameImpl::checkErrors() void KRenameImpl::updateCount() { - labelCount->setText( TQString( i18n("Files: %1") ).arg(fileList->count())); + labelCount->setText( TQString( i18n("Files: %1") ).tqarg(fileList->count())); buttonCoord->setEnabled( (bool)fileList->count() ); buttonReplace->setEnabled( (bool)fileList->count() ); @@ -1165,7 +1165,7 @@ bool KRenameImpl::setupBatchRenamer( BatchRenamer* b, bool preview ) if( !KIO::NetAccess::exists( KURL( url ) ) ) { int m = KMessageBox::warningContinueCancel( parent, i18n("The directory %1 does not exist. " - "KRename will create it for you.").arg( url ) ); + "KRename will create it for you.").tqarg( url ) ); if( m == KMessageBox::Cancel ) return false; diff --git a/krename/krenameimpl.h b/krename/krenameimpl.h index b51e86d..aa8850f 100644 --- a/krename/krenameimpl.h +++ b/krename/krenameimpl.h @@ -187,7 +187,7 @@ class KRenameImpl : public TQObject, public KRenameDCOP { void setupPages(); void updateHist(); void parseCommandline(); - void addTitle( TQWidget* p, TQVBoxLayout* layout, TQString title ); + void addTitle( TQWidget* p, TQVBoxLayout* tqlayout, TQString title ); TQValueList changes; void refreshColumnMode(); diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp index 51dcddf..1f396bf 100644 --- a/krename/mydirplugin.cpp +++ b/krename/mydirplugin.cpp @@ -26,7 +26,7 @@ // QT includes #include -#include +#include #include #include #include @@ -74,10 +74,10 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) groupNumber = new TQGroupBox( w ); groupNumber->setTitle( i18n( "&Options" ) ); groupNumber->setColumnLayout(0, Qt::Vertical ); - groupNumber->layout()->setSpacing( 6 ); - groupNumber->layout()->setMargin( 11 ); - groupNumberLayout = new TQHBoxLayout( groupNumber->layout() ); - groupNumberLayout->setAlignment( TQt::AlignTop ); + groupNumber->tqlayout()->setSpacing( 6 ); + groupNumber->tqlayout()->setMargin( 11 ); + groupNumberLayout = new TQHBoxLayout( groupNumber->tqlayout() ); + groupNumberLayout->tqsetAlignment( TQt::AlignTop ); TQLabel* la2 = new TQLabel( groupNumber ); la2->setText( i18n( "Files per directory:" ) ); @@ -104,10 +104,10 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) groupOutput = new TQGroupBox( w ); groupOutput->setTitle( i18n( "Output &Directory" ) ); groupOutput->setColumnLayout(0, Qt::Vertical ); - groupOutput->layout()->setSpacing( 6 ); - groupOutput->layout()->setMargin( 11 ); - groupOutputLayout = new TQHBoxLayout( groupOutput->layout() ); - groupOutputLayout->setAlignment( TQt::AlignTop ); + groupOutput->tqlayout()->setSpacing( 6 ); + groupOutput->tqlayout()->setMargin( 11 ); + groupOutputLayout = new TQHBoxLayout( groupOutput->tqlayout() ); + groupOutputLayout->tqsetAlignment( TQt::AlignTop ); outputdir = new TQLineEdit( groupOutput ); buttonDir = new TQPushButton( groupOutput ); @@ -131,7 +131,7 @@ void MyDirPlugin::fillStructure() filecounter = 0; dircounter = spinStart->value(); - curdir = dir + TQString("/%1/").arg( dircounter ); + curdir = dir + TQString("/%1/").tqarg( dircounter ); d = new TQDir( dir ); d->mkdir( curdir ); @@ -144,7 +144,7 @@ TQString MyDirPlugin::processFile( BatchRenamer*, int, TQString token, int ) if( filecounter == fpd ) { filecounter = 0; dircounter++; - curdir = dir + TQString("/%1/").arg( dircounter ); + curdir = dir + TQString("/%1/").tqarg( dircounter ); d->mkdir( curdir ); } diff --git a/krename/myinputdialog.cpp b/krename/myinputdialog.cpp index 306aa17..38b42bc 100644 --- a/krename/myinputdialog.cpp +++ b/krename/myinputdialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include MyInputDialog::MyInputDialog( TQString filename, bool revertEnabled, TQWidget* parent ) diff --git a/krename/numberdialog.cpp b/krename/numberdialog.cpp index 0c36d82..14151b3 100644 --- a/krename/numberdialog.cpp +++ b/krename/numberdialog.cpp @@ -20,7 +20,7 @@ // TQt includes #include -#include +#include #include // KDE includes @@ -42,15 +42,15 @@ NumberDialog::NumberDialog(TQValueList & n,TQWidget *parent ) { TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 6, 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 6, 6 ); TQGroupBox* group1 = new TQGroupBox( plainPage() ); group1->setTitle( i18n("&Numbering") ); group1->setColumnLayout(0, Qt::Vertical ); - group1->layout()->setSpacing( 6 ); - group1->layout()->setMargin( 11 ); - TQVBoxLayout* group1Layout = new TQVBoxLayout( group1->layout() ); - group1Layout->setAlignment( TQt::AlignTop ); + group1->tqlayout()->setSpacing( 6 ); + group1->tqlayout()->setMargin( 11 ); + TQVBoxLayout* group1Layout = new TQVBoxLayout( group1->tqlayout() ); + group1Layout->tqsetAlignment( TQt::AlignTop ); spinIndex = new KIntNumInput( group1 ); spinIndex->setMaxValue( SPINMAX ); @@ -66,10 +66,10 @@ NumberDialog::NumberDialog(TQValueList & n,TQWidget *parent ) TQGroupBox* group2 = new TQGroupBox( plainPage() ); group2->setTitle( i18n("S&kip Numbers") ); group2->setColumnLayout(0, Qt::Horizontal ); - group2->layout()->setSpacing( 6 ); - group2->layout()->setMargin( 11 ); - TQHBoxLayout* group2Layout = new TQHBoxLayout( group2->layout() ); - group2Layout->setAlignment( TQt::AlignTop ); + group2->tqlayout()->setSpacing( 6 ); + group2->tqlayout()->setMargin( 11 ); + TQHBoxLayout* group2Layout = new TQHBoxLayout( group2->tqlayout() ); + group2Layout->tqsetAlignment( TQt::AlignTop ); listNumbers = new KListBox( group2 ); @@ -85,21 +85,21 @@ NumberDialog::NumberDialog(TQValueList & n,TQWidget *parent ) spinNumber->setValue( 0 ); spinNumber->setFocus(); - TQVBoxLayout* layout2 = new TQVBoxLayout( 0, 6, 6 ); - layout2->addWidget( buttonAdd ); - layout2->addWidget( buttonRemove ); - layout2->addWidget( spinNumber ); - layout2->addItem( spacer ); + TQVBoxLayout* tqlayout2 = new TQVBoxLayout( 0, 6, 6 ); + tqlayout2->addWidget( buttonAdd ); + tqlayout2->addWidget( buttonRemove ); + tqlayout2->addWidget( spinNumber ); + tqlayout2->addItem( spacer ); group1Layout->addWidget( spinIndex ); group1Layout->addWidget( spinStep ); group1Layout->addWidget( checkResetCounter ); group2Layout->addWidget( listNumbers ); - group2Layout->addLayout( layout2 ); + group2Layout->addLayout( tqlayout2 ); - layout->addWidget( group1 ); - layout->addWidget( group2 ); + tqlayout->addWidget( group1 ); + tqlayout->addWidget( group2 ); TQToolTip::add( spinIndex, i18n( "Number of the first file." ) ); TQToolTip::add( spinStep, i18n( "The counter is increased/decreased by this value." ) ); @@ -113,7 +113,7 @@ NumberDialog::NumberDialog(TQValueList & n,TQWidget *parent ) connect( spinNumber, TQT_SIGNAL( returnPressed()), this, TQT_SLOT( addNumber() ) ); for( unsigned int i = 0; i < n.count(); i++ ) - listNumbers->insertItem( TQString("%1").arg(n[i]), -1 ); + listNumbers->insertItem( TQString("%1").tqarg(n[i]), -1 ); update(); } @@ -124,7 +124,7 @@ NumberDialog::~NumberDialog() void NumberDialog::addNumber() { - TQString tmp = TQString("%1").arg(spinNumber->value()); + TQString tmp = TQString("%1").tqarg(spinNumber->value()); for( unsigned int i = 0; i < listNumbers->count(); i++ ) if( listNumbers->text(i) == tmp ) return; diff --git a/krename/permission.cpp b/krename/permission.cpp index 12fa264..84a1382 100644 --- a/krename/permission.cpp +++ b/krename/permission.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include // KDE includes #include @@ -93,7 +93,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) gl->addWidget (la, 1, 2); la = new TQLabel( i18n("Exec"), groupPermission ); - TQSize size = la->sizeHint(); + TQSize size = la->tqsizeHint(); size.setWidth(size.width() + 15); la->setFixedSize(size); gl->addWidget (la, 1, 3); @@ -137,10 +137,10 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) groupOwner = new TQGroupBox ( i18n("Ownership"), w ); groupOwner->setEnabled( FALSE ); groupOwner->setColumnLayout(0, Qt::Vertical ); - groupOwner->layout()->setSpacing( 6 ); - groupOwner->layout()->setMargin( 11 ); - groupOwnerLayout = new TQVBoxLayout( groupOwner->layout() ); - groupOwnerLayout->setAlignment( TQt::AlignTop ); + groupOwner->tqlayout()->setSpacing( 6 ); + groupOwner->tqlayout()->setMargin( 11 ); + groupOwnerLayout = new TQVBoxLayout( groupOwner->tqlayout() ); + groupOwnerLayout->tqsetAlignment( TQt::AlignTop ); Layout2 = new TQHBoxLayout( 0, 0, 6 ); Layout3 = new TQHBoxLayout( 0, 0, 6 ); @@ -157,10 +157,10 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) setpwent(); for (i=0; ((user = getpwent()) != 0L) && (i < MAXENTRIES); i++) { if( uid == 0 ) - username->insertItem(TQString::fromLatin1(user->pw_name)); + username->insertItem(TQString::tqfromLatin1(user->pw_name)); else if( user->pw_uid == uid ) - username->insertItem(TQString::fromLatin1(user->pw_name)); + username->insertItem(TQString::tqfromLatin1(user->pw_name)); } endpwent(); @@ -171,14 +171,14 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) setgrent(); for (i=0; ((ge = getgrent()) != 0L) && (i < MAXENTRIES); i++) { if( uid == 0 ) { - groupname->insertItem(TQString::fromLatin1(ge->gr_name)); + groupname->insertItem(TQString::tqfromLatin1(ge->gr_name)); } else { char ** members = ge->gr_mem; char * member; while ((member = *members) != 0L) { if (strUser == member) { - groupname->insertItem(TQString::fromLatin1(ge->gr_name)); + groupname->insertItem(TQString::tqfromLatin1(ge->gr_name)); break; } @@ -191,7 +191,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l ) /* add the users group */ ge = getgrgid (getegid()); if (ge) { - TQString name = TQString::fromLatin1(ge->gr_name); + TQString name = TQString::tqfromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); @@ -245,11 +245,11 @@ TQString MyPermPlugin::processFile( BatchRenamer* b, int i, TQString, int ) TQString filename = b->files()[i].dst.name; if( perm.changePermissions ) if( chmod( (const char *)filename, (mode_t)perm.newPermission ) == -1 ) - return TQString( i18n("Can't chmod %1.") ).arg(filename); + return TQString( i18n("Can't chmod %1.") ).tqarg(filename); if( perm.changeOwner ) if( chown( (const char*)filename, getUid( perm.owner), getGid( perm.group ))) - return TQString( i18n("Can't chown %1.") ).arg(filename); + return TQString( i18n("Can't chown %1.") ).tqarg(filename); return TQString(); } diff --git a/krename/pictureplugin.cpp b/krename/pictureplugin.cpp index e619b49..58ce8cd 100644 --- a/krename/pictureplugin.cpp +++ b/krename/pictureplugin.cpp @@ -72,7 +72,7 @@ TQString PicturePlugin::processFile( BatchRenamer* b, int i, TQString token, int if( img.isNull() ) return TQString(); - resolution = TQString( "%1x%2" ).arg(img.width()).arg(img.height()); + resolution = TQString( "%1x%2" ).tqarg(img.width()).tqarg(img.height()); xres = TQString::number( img.width() ); yres = TQString::number( img.height() ); bitdepth = TQString::number( img.depth() ); diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp index ca91f36..c6aef81 100644 --- a/krename/profiledlg.cpp +++ b/krename/profiledlg.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -113,7 +113,7 @@ const TQString ProfileManager::getProfilePath( const TQString & name ) else if( name == PROFILE_TABBED_NAME ) return locate( "data", "krename/krename_system_default_tabbed.xml" ); - TQString path = locateLocal( "data", TQString( "krename/%1.xml" ).arg( name ) ); + TQString path = locateLocal( "data", TQString( "krename/%1.xml" ).tqarg( name ) ); KConfig* conf = kapp->config(); @@ -232,7 +232,7 @@ bool ProfileManager::loadXML( const TQString & path ) { bool wiz, plug; wiz = (bool)e.attribute( "wizard", - TQString( "%1" ).arg( m_krename->m_wizard ) ).toInt(); + TQString( "%1" ).tqarg( m_krename->m_wizard ) ).toInt(); m_krename->setWizardMode( wiz ); // if( wiz != m_krename->m_wizard ) @@ -242,7 +242,7 @@ bool ProfileManager::loadXML( const TQString & path ) } plug = (bool)e.attribute( "fileplugins", - TQString( "%1" ).arg( m_krename->plugin->filePluginsLoaded() ) ).toInt(); + TQString( "%1" ).tqarg( m_krename->plugin->filePluginsLoaded() ) ).toInt(); if( plug && !m_krename->plugin->filePluginsLoaded() ) m_krename->plugin->loadPlugins( true ); } @@ -252,7 +252,7 @@ bool ProfileManager::loadXML( const TQString & path ) m_krename->extemplate->setText( e.attribute("extension", m_krename->extemplate->text() ) ); m_krename->checkExtension->setChecked( (bool)e.attribute("extension_enabled", - TQString("%1").arg(m_krename->checkExtension->isChecked() ) ).toInt() ); + TQString("%1").tqarg(m_krename->checkExtension->isChecked() ) ).toInt() ); m_krename->comboExtension->setCurrentItem( e.attribute("extension_start", TQString::number( m_krename->comboExtension->currentItem() ) ).toInt() ); @@ -344,7 +344,7 @@ const TQString ProfileManager::listToString( TQValueList & list ) { TQString data; for( unsigned int i = 0; i < list.count(); i++ ) - data += TQString( "%1;" ).arg( list[i] ); + data += TQString( "%1;" ).tqarg( list[i] ); return data; } @@ -397,7 +397,7 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name) { int i; - TQHBoxLayout* layout = new TQHBoxLayout( plainPage(), 6, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( plainPage(), 6, 6 ); TQVBoxLayout* button = new TQVBoxLayout( 0, 6, 6 ); profiles = new KListBox( plainPage() ); @@ -420,9 +420,9 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name) button->addItem( spacer ); button->addWidget( checkDefault ); - layout->addWidget( profiles ); - layout->addLayout( button ); - layout->setStretchFactor( profiles, 2 ); + tqlayout->addWidget( profiles ); + tqlayout->addLayout( button ); + tqlayout->setStretchFactor( profiles, 2 ); TQToolTip::add( createProfile, i18n("Save KRename's current settings as a new profile. " "The settings are saved and can be restored with Load Profile later." ) ); @@ -500,13 +500,13 @@ void ProfileDlg::slotSetDefault() void ProfileDlg::slotLoadProfile() { TQString profile = profiles->currentText(); - TQString msg = TQString( i18n("Do you really want to load the profile and overwrite the current settings: %1") ).arg( profile ); + TQString msg = TQString( i18n("Do you really want to load the profile and overwrite the current settings: %1") ).tqarg( profile ); TQString path = getProfilePath( profile ); if( path.isEmpty() ) { - KMessageBox::error( this, i18n("The profile \"%1\" could not be found.").arg( profile ) ); + KMessageBox::error( this, i18n("The profile \"%1\" could not be found.").tqarg( profile ) ); return; } @@ -554,7 +554,7 @@ void ProfileDlg::slotDeleteProfile() } TQString profile = profiles->currentText(); - TQString msg = TQString( i18n("Do you really want to delete the profile: %1") ).arg( profile ); + TQString msg = TQString( i18n("Do you really want to delete the profile: %1") ).tqarg( profile ); if( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes ) { diff --git a/krename/replacedialog.cpp b/krename/replacedialog.cpp index 077e8a8..68435e2 100644 --- a/krename/replacedialog.cpp +++ b/krename/replacedialog.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // KDE includes diff --git a/krename/tabs.cpp b/krename/tabs.cpp index f6092d9..d10ee26 100644 --- a/krename/tabs.cpp +++ b/krename/tabs.cpp @@ -20,7 +20,7 @@ #include "kmyhistorycombo.h" // TQt includes -#include +#include #include #include @@ -38,7 +38,7 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name ) { setIcon( BarIcon( "krename" ) ); - TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 ); TQHBoxLayout* buttons = new TQHBoxLayout( 0, 6, 6 ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -53,12 +53,12 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name ) buttons->addWidget( finishButton ); buttons->addWidget( cancelButton ); - layout->addWidget( tab ); - layout->addLayout( buttons ); - layout->setStretchFactor( tab, 2 ); + tqlayout->addWidget( tab ); + tqlayout->addLayout( buttons ); + tqlayout->setStretchFactor( tab, 2 ); menuBar = new KMenuBar( this ); - layout->setMenuBar( menuBar ); + tqlayout->setMenuBar( menuBar ); connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) ); diff --git a/krename/threadedlister.cpp b/krename/threadedlister.cpp index fab1068..322e268 100644 --- a/krename/threadedlister.cpp +++ b/krename/threadedlister.cpp @@ -113,7 +113,7 @@ void ThreadedLister::reclisterFinished() if( m_dirnames ) { TQString name = m_dirname.fileName(); - if( !m_hidden && name.right( 1 ) != TQString::fromLatin1(".") ) + if( !m_hidden && name.right( 1 ) != TQString::tqfromLatin1(".") ) m_list->addDirName( m_dirname ); } @@ -142,7 +142,7 @@ void ThreadedLister::listerFinished() if( m_dirnames ) { TQString name = m_dirname.fileName(); - if( !m_hidden && name.right( 1 ) != TQString::fromLatin1(".") ) + if( !m_hidden && name.right( 1 ) != TQString::tqfromLatin1(".") ) m_list->addDirName( m_dirname ); } diff --git a/krename/translitplugin.cpp b/krename/translitplugin.cpp index 0e4b262..7d08702 100644 --- a/krename/translitplugin.cpp +++ b/krename/translitplugin.cpp @@ -78,13 +78,13 @@ TQString TranslitPlugin::processFile( BatchRenamer*, int, TQString token, int ) return output; // no error } -TQString TranslitPlugin::translit(const TQString & unicoded) +TQString TranslitPlugin::translit(const TQString & tqunicoded) { int i; TQString transed = ""; - for (i=0; i<(int)unicoded.length(); i++) { - TQString charIn = unicoded.mid(i, 1); + for (i=0; i<(int)tqunicoded.length(); i++) { + TQString charIn = tqunicoded.mid(i, 1); if (m_mapFromUTF8[charIn.utf8()]) { TQString charTrans = m_mapFromUTF8[charIn.utf8()]; transed.append(charTrans); diff --git a/krename/translitplugin.h b/krename/translitplugin.h index 5ca28da..979ba14 100644 --- a/krename/translitplugin.h +++ b/krename/translitplugin.h @@ -18,8 +18,8 @@ // QT includes #include -#include -#include +#include +#include #include #include diff --git a/krename/undodialog.cpp b/krename/undodialog.cpp index 65647c3..487a154 100644 --- a/krename/undodialog.cpp +++ b/krename/undodialog.cpp @@ -19,7 +19,7 @@ // TQt includes #include -#include +#include // KDE includes #include diff --git a/krename/wizard.cpp b/krename/wizard.cpp index 6d4b487..09a9d09 100644 --- a/krename/wizard.cpp +++ b/krename/wizard.cpp @@ -29,7 +29,7 @@ // TQt includes #include -#include +#include #include #include #include @@ -75,18 +75,18 @@ void wizard::slotAddPage( TQWidget* page, const TQString & title ) return; } - TQString t = title + i18n(" - Step %1 of %2").arg( pageCount()+1 ).arg( 3 ); + TQString t = title + i18n(" - Step %1 of %2").tqarg( pageCount()+1 ).tqarg( 3 ); - TQVBox* layout = new TQVBox( this ); + TQVBox* tqlayout = new TQVBox( this ); - new TQLabel( TQString( t ).remove( title.find( "&" ), 1 ), layout ); + new TQLabel( TQString( t ).remove( title.find( "&" ), 1 ), tqlayout ); - TQFrame* hbar1 = new TQFrame( layout, "
", 0 ); + TQFrame* hbar1 = new TQFrame( tqlayout, "
", 0 ); hbar1->setFrameStyle( TQFrame::Sunken + TQFrame::HLine ); - page->reparent( layout, TQPoint( 0, 0 ) ); - addPage( layout, t ); - setHelpEnabled( layout, false ); + page->reparent( tqlayout, TQPoint( 0, 0 ) ); + addPage( tqlayout, t ); + setHelpEnabled( tqlayout, false ); } void wizard::slotShowPage( int page )