From bf280726d5d22f33d33e4f9e771220c725249407 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- ark/ace.cpp | 2 +- ark/addition.ui | 2 +- ark/arch.cpp | 12 ++++++------ ark/archiveformatdlg.cpp | 4 ++-- ark/ark_part.cpp | 10 +++++----- ark/arkviewer.cpp | 10 +++++----- ark/arkwidget.cpp | 26 +++++++++++++------------- ark/compressedfile.cpp | 2 +- ark/extraction.ui | 2 +- ark/extractiondialog.cpp | 20 ++++++++++---------- ark/filelistview.cpp | 22 +++++++++++----------- ark/filelistview.h | 2 +- ark/general.ui | 6 +++--- ark/mainwindow.cpp | 8 ++++---- ark/rar.cpp | 6 +++--- ark/sevenzip.cpp | 12 ++++++------ ark/tar.cpp | 8 ++++---- ark/tarlistingthread.h | 8 ++++---- ark/zoo.cpp | 2 +- 19 files changed, 82 insertions(+), 82 deletions(-) (limited to 'ark') diff --git a/ark/ace.cpp b/ark/ace.cpp index 4ce0709..6ad5cd0 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -174,7 +174,7 @@ void AceArch::unarchFileInternal( ) void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen ) { - TQString myBuf = TQString::tqfromLatin1( buffer, buflen ); + TQString myBuf = TQString::fromLatin1( buffer, buflen ); kdDebug(1601) << " Wololo!: " << myBuf << endl; } diff --git a/ark/addition.ui b/ark/addition.ui index ac12593..401c146 100644 --- a/ark/addition.ui +++ b/ark/addition.ui @@ -66,7 +66,7 @@ Expanding - + 20 51 diff --git a/ark/arch.cpp b/ark/arch.cpp index 5ff9a61..ee2a23e 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -365,13 +365,13 @@ bool Arch::processLine( const TQCString &line ) : columns[ m_fixYear ]; TQString month = ( m_repairMonth >= 0 ) ? TQString( "%1" ) - .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) + .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) : columns[ m_fixMonth ]; - TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" ) - .tqarg( year ) - .tqarg( month ) - .tqarg( columns[ m_fixDay ] ) - .tqarg( columns[ m_fixTime ] ); + TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" ) + .arg( year ) + .arg( month ) + .arg( columns[ m_fixDay ] ) + .arg( columns[ m_fixTime ] ); columns[ m_dateCol ] = timestamp; } diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp index 18f4102..5ac942c 100644 --- a/ark/archiveformatdlg.cpp +++ b/ark/archiveformatdlg.cpp @@ -40,12 +40,12 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultT text = i18n( "This file appears to be of type %1,\n" "which is not a supported archive format.\n" "In order to proceed, please choose the format\n" - "of the file." ).tqarg( defaultType ); + "of the file." ).arg( defaultType ); else text = i18n( "You are about to open a file that has a non-standard extension.\n" "Ark has detected the format: %1\n" "If this is not correct, please choose " - "the appropriate format." ).tqarg( defaultDescription ); + "the appropriate format." ).arg( defaultDescription ); TQVBox * page = makeVBoxMainWidget(); diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 20ac169..f52d763 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -294,7 +294,7 @@ bool ArkPart::closeURL() int res = KMessageBox::warningYesNoCancel( widget(), i18n( "The archive \"%1\" has been modified.\n" - "Do you want to save it?" ).tqarg( docName ), + "Do you want to save it?" ).arg( docName ), i18n( "Save Archive?" ), KStdGuiItem::save(), KStdGuiItem::discard() ); switch ( res ) @@ -320,7 +320,7 @@ void ArkPart::transferStarted( KIO::Job *job ) { m_job = job; - m_bar->slotSetBusy( i18n( "Downloading %1..." ).tqarg( m_url.prettyURL() ), + m_bar->slotSetBusy( i18n( "Downloading %1..." ).arg( m_url.prettyURL() ), (job != 0), (job != 0) ); if ( job ) @@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar() m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" ); m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame ); - m_pStatusLabelTotal->tqsetAlignment( AlignRight ); + m_pStatusLabelTotal->setAlignment( AlignRight ); m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) ); m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" ); m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame ); - m_pStatusLabelSelect->tqsetAlignment( AlignLeft ); + m_pStatusLabelSelect->setAlignment( AlignLeft ); m_pStatusLabelSelect->setText(i18n( "0 files selected" ) ); m_cancelButton = new KPushButton( SmallIcon( "cancel" ), TQString(), statusBar(), "CancelButton" ); @@ -454,7 +454,7 @@ void ArkStatusBarExtension::slotSetBusy( const TQString & text, bool showCancelB { m_pBusyText = new TQLabel( statusBar() ); - m_pBusyText->tqsetAlignment( AlignLeft ); + m_pBusyText->setAlignment( AlignLeft ); m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); } diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index b2ae335..13db475 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) : KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 ) { m_widget = new TQVBox( this ); - m_widget->tqlayout()->setSpacing( 10 ); + m_widget->layout()->setSpacing( 10 ); connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); @@ -76,15 +76,15 @@ bool ArkViewer::view( const KURL& filename ) TQLabel *iconLabel = new TQLabel( header ); iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) ); - iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); TQVBox *headerRight = new TQVBox( header ); new TQLabel( TQString( "%1" ) - .tqarg( filename.fileName() ), headerRight + .arg( filename.fileName() ), headerRight ); new TQLabel( mimetype->comment(), headerRight ); - header->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); + header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) ); diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index a83cb14..62a3cea 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -33,7 +33,7 @@ #include // TQt includes -#include +#include #include #include #include @@ -199,7 +199,7 @@ ArkWidget::updateStatusTotals() m_nSizeOfFiles = m_fileListView->totalSize(); TQString strInfo = i18n( "%n file %1", "%n files %1", m_nNumFiles ) - .tqarg( KIO::convertSize( m_nSizeOfFiles ) ); + .arg( KIO::convertSize( m_nSizeOfFiles ) ); emit setStatusBarText(strInfo); } @@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success ) // addFile( const TQString & baseDir, // // const TQStringList & filesToAdd ) // ////////////////////////////////////////////////////// - *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; + *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; } bool bOldRecVal = ArkSettings::rarRecurseSubdirs(); connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); @@ -431,7 +431,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b { if ( !KIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) ) { - KMessageBox::error( 0, i18n( "Could not create the folder %1" ).tqarg( + KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg( targetDirectory.prettyURL() ) ); emit request_file_quit(); return; @@ -467,7 +467,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); if ( !success ) { - KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).tqarg( m_url.prettyURL() ) ); + KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) ); emit request_file_quit(); return; } @@ -712,7 +712,7 @@ ArkWidget::file_open(const KURL& url) TQFileInfo fileInfo( strFile ); if ( !fileInfo.exists() ) { - KMessageBox::error(this, i18n("The archive %1 does not exist.").tqarg(strFile)); + KMessageBox::error(this, i18n("The archive %1 does not exist.").arg(strFile)); emit removeRecentURL( m_realURL ); return; } @@ -821,7 +821,7 @@ ArkWidget::getCreateFilename(const TQString & _caption, { KMessageBox::error( this, i18n( "You do not have permission" - " to write to the directory %1" ).tqarg(url.directory() ) ); + " to write to the directory %1" ).arg(url.directory() ) ); return TQString(); } } // end of while loop @@ -1817,13 +1817,13 @@ ArkWidget::updateStatusSelection() else if (m_nNumSelectedFiles != 1) { strInfo = i18n("%1 files selected %2") - .tqarg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) - .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .arg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) + .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); } else { strInfo = i18n("1 file selected %2") - .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); } emit setStatusBarSelectedFiles(strInfo); @@ -2044,7 +2044,7 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi if (!newArch->archUtilityIsAvailable()) { - KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getArchUtility())); + KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getArchUtility())); return NULL; } @@ -2156,7 +2156,7 @@ ArkWidget::openArchive( const TQString & _filename ) if (!newArch->unarchUtilityIsAvailable()) { - KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getUnarchUtility())); + KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getUnarchUtility())); return; } @@ -2211,7 +2211,7 @@ ArkWidget::slotOpen( Arch * /* _newarch */, bool _success, const TQString & _fil { emit removeRecentURL( m_realURL ); emit setWindowCaption( TQString() ); - KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).tqarg( _filename ) ); + KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).arg( _filename ) ); if ( m_extractOnly ) emit request_file_quit(); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index f935eac..862d357 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con m_openAsMimeType = _openAsMimeType; kdDebug(1601) << "CompressedFile constructor" << endl; m_tempDirectory = new KTempDir( _gui->tmpDir() - + TQString::tqfromLatin1( "compressed_file_temp" ) ); + + TQString::fromLatin1( "compressed_file_temp" ) ); m_tempDirectory->setAutoDelete( true ); m_tmpdir = m_tempDirectory->name(); initData(); diff --git a/ark/extraction.ui b/ark/extraction.ui index b51ebee..1ac60b8 100644 --- a/ark/extraction.ui +++ b/ark/extraction.ui @@ -66,7 +66,7 @@ Expanding - + 20 20 diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index 923f108..e5568ab 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include @@ -63,24 +63,24 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, { if ( !archiveName.isNull() ) { - setCaption( i18n( "Extract Files From %1" ).tqarg( archiveName ) ); + setCaption( i18n( "Extract Files From %1" ).arg( archiveName ) ); } TQVBox *vbox = makeVBoxMainWidget(); TQHBox *header = new TQHBox( vbox ); - header->tqlayout()->setSpacing( 10 ); + header->layout()->setSpacing( 10 ); TQLabel *icon = new TQLabel( header ); icon->setPixmap( DesktopIcon( "ark_extract" ) ); - icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); if ( enableSelected ) { TQVBox *whichFiles = new TQVBox( header ); - whichFiles->tqlayout()->setSpacing( 6 ); + whichFiles->layout()->setSpacing( 6 ); new TQLabel( TQString( "%1" ) - .tqarg( i18n( "Extract:" ) ), whichFiles ); + .arg( i18n( "Extract:" ) ), whichFiles ); TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles ); m_selectedButton = new TQRadioButton( i18n( "Selected files only" ), filesGroup ); m_allButton = new TQRadioButton( i18n( "All files" ), filesGroup ); @@ -90,13 +90,13 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, else { new TQLabel( TQString( "%1" ) - .tqarg( i18n( "Extract all files" ) ), header ); + .arg( i18n( "Extract all files" ) ), header ); } TQHBox *destDirBox = new TQHBox( vbox ); TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox ); - destFolderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); KHistoryCombo *combobox = new KHistoryCombo( true, destDirBox ); combobox->setPixmapProvider( new KURLPixmapProvider ); @@ -111,7 +111,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, combobox->setInsertionPolicy( TQComboBox::AtTop ); m_urlRequester = new KURLRequester( combobox, destDirBox ); - m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + m_urlRequester->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); m_urlRequester->setMode( KFile::Directory ); if (!defaultExtractionDir.prettyURL().isEmpty() ) @@ -145,7 +145,7 @@ void ExtractionDialog::accept() TQFileInfo fi( p.path() ); if ( !fi.isDir() && !fi.exists() ) { - TQString ltext = i18n( "Create folder %1?").tqarg(p.path()); + TQString ltext = i18n( "Create folder %1?").arg(p.path()); int createDir = KMessageBox::questionYesNo( this, ltext, i18n( "Missing Folder" ) , i18n("Create Folder"), i18n("Do Not Create")); if( createDir == 4 ) { diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 5aa1122..ca941bd 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -153,7 +153,7 @@ void FileLVI::setText( int column, const TQString &text ) else m_ratio = text.toDouble(); TQListViewItem::setText( column, i18n( "Packed Ratio", "%1 %" ) - .tqarg(KGlobal::locale()->formatNumber( m_ratio, 1 ) ) + .arg(KGlobal::locale()->formatNumber( m_ratio, 1 ) ) ); } else if ( colName == timeStampStrCol ) @@ -264,14 +264,14 @@ TQStringList FileListView::selectedFilenames() { if ( item->isSelected() ) { - // If the item has tqchildren, add each child and the item + // If the item has children, add each child and the item if ( item->childCount() > 0 ) { files += item->fileName(); - files += tqchildrenOf( item ); + files += childrenOf( item ); /* If we got here, then the logic for "going to the next item" - * is a bit different: as we already dealt with all the tqchildren, + * is a bit different: as we already dealt with all the children, * the "next item" is the next sibling of the current item, not * its first child. If the current item has no siblings, then * the next item is the next sibling of its parent, and so on. @@ -288,7 +288,7 @@ TQStringList FileListView::selectedFilenames() } else { - // If the item has no tqchildren, just add it to the list + // If the item has no children, just add it to the list files += item->fileName(); } } @@ -559,10 +559,10 @@ FileLVI* FileListView::findParent( const TQString& fullname ) return static_cast< FileLVI* >( item ); } -TQStringList FileListView::tqchildrenOf( FileLVI* parent ) +TQStringList FileListView::childrenOf( FileLVI* parent ) { Q_ASSERT( parent ); - TQStringList tqchildren; + TQStringList children; FileLVI *item = static_cast( parent->firstChild() ); @@ -570,17 +570,17 @@ TQStringList FileListView::tqchildrenOf( FileLVI* parent ) { if ( item->childCount() == 0 ) { - tqchildren += item->fileName(); + children += item->fileName(); } else { - tqchildren += item->fileName(); - tqchildren += tqchildrenOf( item ); + children += item->fileName(); + children += childrenOf( item ); } item = static_cast( item->nextSibling() ); } - return tqchildren; + return children; } #include "filelistview.moc" diff --git a/ark/filelistview.h b/ark/filelistview.h index 7605e01..b670feb 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -153,7 +153,7 @@ class FileListView: public KListView private: FileLVI* findParent( const TQString& fullname ); - TQStringList tqchildrenOf( FileLVI* parent ); + TQStringList childrenOf( FileLVI* parent ); TQMap m_columnMap; bool m_pressed; diff --git a/ark/general.ui b/ark/general.ui index 150e1e4..5f50883 100644 --- a/ark/general.ui +++ b/ark/general.ui @@ -37,7 +37,7 @@ - tqlayout1 + layout1 @@ -53,7 +53,7 @@ Fixed - + 15 31 @@ -80,7 +80,7 @@ Expanding - + 20 90 diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 8541e1a..09fdc0a 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -22,7 +22,7 @@ */ // QT includes -#include +#include // KDE includes #include @@ -177,7 +177,7 @@ MainWindow::file_reload() void MainWindow::editToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); + saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -187,7 +187,7 @@ void MainWindow::slotNewToolbarConfig() { createGUI( m_part ); - applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); + applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); } void @@ -221,7 +221,7 @@ MainWindow::arkAlreadyOpen( const KURL & url ) window_close(); // notify the user what's going on - KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").tqarg(url.prettyURL())); + KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").arg(url.prettyURL())); return true; } return false; diff --git a/ark/rar.cpp b/ark/rar.cpp index 1cebe05..f324f31 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -32,7 +32,7 @@ // QT includes #include #include -#include +#include // KDE includes #include @@ -90,10 +90,10 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName ) bool RarArch::processLine( const TQCString &line ) { - TQString tqunicode_line; + TQString unicode_line; TQTextCodec *codec = TQTextCodec::codecForLocale(); - tqunicode_line = codec->toUnicode( line ); + unicode_line = codec->toUnicode( line ); if ( m_isFirstLine ) { diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 0673f6c..216fb8d 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -283,13 +283,13 @@ bool SevenZipArch::processLine( const TQCString& _line ) : columns[ m_fixYear ]; TQString month = ( m_repairMonth >= 0 ) ? TQString( "%1" ) - .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) + .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) : columns[ m_fixMonth ]; - TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" ) - .tqarg( year ) - .tqarg( month ) - .tqarg( columns[ m_fixDay ] ) - .tqarg( columns[ m_fixTime ] ); + TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" ) + .arg( year ) + .arg( month ) + .arg( columns[ m_fixDay ] ) + .arg( columns[ m_fixTime ] ); columns[ m_dateCol ] = timestamp; } diff --git a/ark/tar.cpp b/ark/tar.cpp index e91f5ca..4cdb792 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -106,12 +106,12 @@ TarArch::TarArch( ArkWidget *_gui, { compressed = true; m_tmpDir = new KTempDir( _gui->tmpDir() - + TQString::tqfromLatin1( "temp_tar" ) ); + + TQString::fromLatin1( "temp_tar" ) ); m_tmpDir->setAutoDelete( true ); m_tmpDir->qDir()->cd( m_tmpDir->name() ); // build the temp file name KTempFile *pTempFile = new KTempFile( m_tmpDir->name(), - TQString::tqfromLatin1(".tar") ); + TQString::fromLatin1(".tar") ); tmpfile = pTempFile->name(); delete pTempFile; @@ -322,14 +322,14 @@ void TarArch::slotListingDone(KProcess *_kp) if (flv!=NULL && flv->totalFiles()>0) { const TQString firstfile = ((FileLVI *) flv->firstChild())->fileName(); - if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").tqarg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").arg(firstfile)))>=0) { m_dotslash = true; kdDebug(1601) << k_funcinfo << "archive has dot-slash" << endl; } else { - if (list.find(TQRegExp(TQString("\\s%1[/\\n]").tqarg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s%1[/\\n]").arg(firstfile)))>=0) { // archive doesn't have dot-slash m_dotslash = false; diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h index 6dcdbe5..070b483 100644 --- a/ark/tarlistingthread.h +++ b/ark/tarlistingthread.h @@ -32,16 +32,16 @@ class KArchive; class ListingEvent: public TQCustomEvent { public: - enum tqStatus { Normal, Error, ListingFinished }; - ListingEvent( const TQStringList& data, tqStatus st = Normal ) + enum Status { Normal, Error, ListingFinished }; + ListingEvent( const TQStringList& data, Status st = Normal ) : TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {} const TQStringList& columns() const { return m_data; } - tqStatus status() const { return m_status; } + Status status() const { return m_status; } private: TQStringList m_data; - tqStatus m_status; + Status m_status; }; class TarListingThread: public TQThread diff --git a/ark/zoo.cpp b/ark/zoo.cpp index 32b161b..1ef7377 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -289,7 +289,7 @@ TQString fixTime( const TQString &_strTime ) if ( strTime.contains("+") || strTime.contains("-") ) { - TQCharRef c = strTime.tqat( 8 ); + TQCharRef c = strTime.at( 8 ); int offset = strTime.right( strTime.length() - 9 ).toInt(); TQString strHour = strTime.left( 2 ); int nHour = strHour.toInt(); -- cgit v1.2.1