summaryrefslogtreecommitdiffstats
path: root/ark
diff options
context:
space:
mode:
Diffstat (limited to 'ark')
-rw-r--r--ark/arch.cpp10
-rw-r--r--ark/archiveformatdlg.cpp4
-rw-r--r--ark/ark_part.cpp4
-rw-r--r--ark/arkviewer.cpp2
-rw-r--r--ark/arkwidget.cpp22
-rw-r--r--ark/extractiondialog.cpp8
-rw-r--r--ark/filelistview.cpp22
-rw-r--r--ark/filelistview.h2
-rw-r--r--ark/mainwindow.cpp2
-rw-r--r--ark/sevenzip.cpp10
-rw-r--r--ark/tar.cpp4
-rw-r--r--ark/zoo.cpp2
12 files changed, 46 insertions, 46 deletions
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 29bdf63..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::fromLatin1( "%1-%2-%3 %4" )
- .tqarg( year )
- .tqarg( month )
- .tqarg( columns[ m_fixDay ] )
- .tqarg( columns[ m_fixTime ] );
+ .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 8834e61..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 )
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index ce0c18c..21cd510 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -80,7 +80,7 @@ bool ArkViewer::view( const KURL& filename )
TQVBox *headerRight = new TQVBox( header );
new TQLabel( TQString( "<qt><b>%1</b></qt>" )
- .tqarg( filename.fileName() ), headerRight
+ .arg( filename.fileName() ), headerRight
);
new TQLabel( mimetype->comment(), headerRight );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 5091bb3..80fd413 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -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);
}
@@ -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/extractiondialog.cpp b/ark/extractiondialog.cpp
index 905cfcb..26b8eaf 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -63,7 +63,7 @@ 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();
@@ -80,7 +80,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQVBox *whichFiles = new TQVBox( header );
whichFiles->tqlayout()->setSpacing( 6 );
new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" )
- .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,7 +90,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
else
{
new TQLabel( TQString( "<qt><b><font size=\"+2\">%1</font></b></qt>" )
- .tqarg( i18n( "Extract all files" ) ), header );
+ .arg( i18n( "Extract all files" ) ), header );
}
TQHBox *destDirBox = new TQHBox( vbox );
@@ -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<FileLVI*>( 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<FileLVI*>( 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<int, columnName> m_columnMap;
bool m_pressed;
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 005aa92..fc26023 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -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/sevenzip.cpp b/ark/sevenzip.cpp
index a85d127..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::fromLatin1( "%1-%2-%3 %4" )
- .tqarg( year )
- .tqarg( month )
- .tqarg( columns[ m_fixDay ] )
- .tqarg( columns[ m_fixTime ] );
+ .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 0a87d4e..4cdb792 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -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/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();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 06:47:52 +0000