TDE
/
krusader
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/krusader
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
feat/lzip-support
Timothy Pearson 13 years ago
parent 02c9636ebc
commit 9fae088770
69 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File

2
iso/iso.cpp
Unescape Escape View File

@ -274,7 +274,7 @@ void kio_isoProtocol::listDir( const KURL & url )
const KArchiveDirectory* dir;
if (!path.isEmpty() && path != "/")
{
kdDebug() << TQString("Looking for entry %1").tqarg(path) << endl;
kdDebug() << TQString("Looking for entry %1").arg(path) << endl;
const KArchiveEntry* e = root->entry( path );
if ( !e )
{

36
krArc/krarc.cpp
Unescape Escape View File

@ -124,7 +124,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){
if( putCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Creating directories is not supported with %1 archives").tqarg(arcType) );
i18n("Creating directories is not supported with %1 archives").arg(arcType) );
return;
}
@ -154,7 +154,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){
// pack the directory
KrShellProcess proc;
proc << putCmd << convertName( arcFile->url().path() ) + " " << convertFileName( tmpDir.mid(arcTempDir.length()) );
infoMessage(i18n("Creating %1 ...").tqarg( url.fileName() ) );
infoMessage(i18n("Creating %1 ...").arg( url.fileName() ) );
TQDir::setCurrent(arcTempDir);
proc.start(KProcess::Block,KProcess::AllOutput);
@ -184,7 +184,7 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool
if( putCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Writing to %1 archives is not supported").tqarg(arcType) );
i18n("Writing to %1 archives is not supported").arg(arcType) );
return;
}
if( !overwrite && findFileEntry(url) ){
@ -225,7 +225,7 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool
// pack the file
KrShellProcess proc;
proc << putCmd << convertName( arcFile->url().path() )+ " " <<convertFileName( tmpFile.mid(arcTempDir.length()) );
infoMessage(i18n("Packing %1 ...").tqarg( url.fileName() ) );
infoMessage(i18n("Packing %1 ...").arg( url.fileName() ) );
TQDir::setCurrent(arcTempDir);
proc.start(KProcess::Block,KProcess::AllOutput);
// remove the file
@ -259,7 +259,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
if( getCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Retrieving data from %1 archives is not supported").tqarg(arcType) );
i18n("Retrieving data from %1 archives is not supported").arg(arcType) );
return;
}
UDSEntry* entry = findFileEntry(url);
@ -317,7 +317,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
this,TQT_SLOT(receivedData(KProcess*,char*,int)) );
}
infoMessage(i18n("Unpacking %1 ...").tqarg( url.fileName() ) );
infoMessage(i18n("Unpacking %1 ...").arg( url.fileName() ) );
// change the working directory to our arcTempDir
TQDir::setCurrent(arcTempDir);
proc.start(KProcess::Block,KProcess::AllOutput);
@ -439,7 +439,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){
if( delCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Deleting files from %1 archives is not supported").tqarg(arcType) );
i18n("Deleting files from %1 archives is not supported").arg(arcType) );
return;
}
if( !findFileEntry(url) ){
@ -455,7 +455,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){
}
KrShellProcess proc;
proc << delCmd << convertName( arcFile->url().path() )+" " << convertFileName( file );
infoMessage(i18n("Deleting %1 ...").tqarg( url.fileName() ) );
infoMessage(i18n("Deleting %1 ...").arg( url.fileName() ) );
proc.start(KProcess::Block, KProcess::AllOutput);
if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(ERR_COULD_NOT_WRITE,url.path() + "\n\n" + proc.getErrorMsg() );
@ -479,7 +479,7 @@ void kio_krarcProtocol::stat( const KURL & url ){
if( listCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Accessing files is not supported with the %1 archives").tqarg(arcType) );
i18n("Accessing files is not supported with the %1 archives").arg(arcType) );
return;
}
TQString path = url.path(-1);
@ -551,7 +551,7 @@ void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overw
if( arcType == "ace" && TQFile( "/dev/ptmx" ).exists() ) // Don't remove, unace crashes if missing!!!
proc << "<" << "/dev/ptmx";
infoMessage(i18n("Unpacking %1 ...").tqarg( url.fileName() ) );
infoMessage(i18n("Unpacking %1 ...").arg( url.fileName() ) );
proc.start(KProcess::Block, KProcess::AllOutput);
if( !proc.normalExit() || !checkStatus( proc.exitStatus() ) ) {
error(KIO::ERR_COULD_NOT_WRITE, dest.path(-1) + "\n\n" + proc.getErrorMsg() );
@ -579,7 +579,7 @@ void kio_krarcProtocol::listDir(const KURL& url){
}
if( listCmd.isEmpty() ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Listing directories is not supported for %1 archives").tqarg(arcType) );
i18n("Listing directories is not supported for %1 archives").arg(arcType) );
return;
}
TQString path = url.path();
@ -983,13 +983,13 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) {
if( perm.length() == 7 ) // windows rar permission format
{
bool isDir = ( perm.tqat(1).lower() == 'd' );
bool isReadOnly = ( perm.tqat(2).lower() == 'r' );
bool isDir = ( perm.at(1).lower() == 'd' );
bool isReadOnly = ( perm.at(2).lower() == 'r' );
perm = isDir ? "drwxr-xr-x" : "-rw-r--r--";
if( isReadOnly )
perm.tqat( 2 ) = '-';
perm.at( 2 ) = '-';
}
if(perm.length() != 10) perm = (perm.at(0)=='d')? "drwxr-xr-x" : "-rw-r--r--" ;
@ -1141,11 +1141,11 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) {
// permissions
perm = nextWord(line);
bool isDir = ( perm.tqat(0).lower() == 'd' );
bool isReadOnly = ( perm.tqat(1).lower() == 'r' );
bool isDir = ( perm.at(0).lower() == 'd' );
bool isReadOnly = ( perm.at(1).lower() == 'r' );
perm = isDir ? "drwxr-xr-x" : "-rw-r--r--";
if( isReadOnly )
perm.tqat( 2 ) = '-';
perm.at( 2 ) = '-';
mode = parsePermString(perm);
@ -1369,7 +1369,7 @@ bool kio_krarcProtocol::initArcParameters() {
if( KStandardDirs::findExe(cmd).isEmpty() ){
error( KIO::ERR_CANNOT_LAUNCH_PROCESS,
cmd+
i18n("\nMake sure that the %1 binary are installed properly on your system.").tqarg(cmd));
i18n("\nMake sure that the %1 binary are installed properly on your system.").arg(cmd));
KRDEBUG("Failed to find cmd: " << cmd);
return false;
}

2
krusader/ActionMan/addplaceholderpopup.cpp
Unescape Escape View File

@ -569,7 +569,7 @@ TQString ParameterInt::text() {
return _spinbox->text();
}
TQString ParameterInt::preset() {
return TQString( "%1" ).tqarg( _default );
return TQString( "%1" ).arg( _default );
}
void ParameterInt::reset() {
return _spinbox->setValue( _default );

2
krusader/ActionMan/useractionpage.cpp
Unescape Escape View File

@ -268,7 +268,7 @@ void UserActionPage::slotExport() {
bool success = UserAction::writeToFile( doc, filename );
if ( ! success )
KMessageBox::error( this,
i18n("Can't open %1 for writing!\nNothing exported.").tqarg(filename),
i18n("Can't open %1 for writing!\nNothing exported.").arg(filename),
i18n("Export failed!")
);
}

2
krusader/BookMan/kraddbookmarkdlg.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) {
}
void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) {
for (KrBookmark *bm = root->tqchildren().first(); bm; bm = root->tqchildren().next()) {
for (KrBookmark *bm = root->children().first(); bm; bm = root->children().next()) {
if (bm->isFolder()) {
KListViewItem *item = new KListViewItem(parent, bm->text());
item->setOpen(true);

2
krusader/BookMan/krbookmark.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQStr
}
}
_tqchildren.setAutoDelete(true);
_children.setAutoDelete(true);
}
KrBookmark::KrBookmark(TQString name, TQString icon):

4
krusader/BookMan/krbookmark.h
Unescape Escape View File

@ -19,7 +19,7 @@ public:
inline void setURL(const KURL& url) { _url = url; }
inline bool isFolder() const { return _folder; }
inline bool isSeparator() const { return _separator; }
TQPtrList<KrBookmark>& tqchildren() { return _tqchildren; }
TQPtrList<KrBookmark>& children() { return _children; }
static KrBookmark* getExistingBookmark(TQString actionName, KActionCollection *collection);
// ----- special bookmarks
@ -40,7 +40,7 @@ private:
TQString _icon;
bool _folder;
bool _separator;
TQPtrList<KrBookmark> _tqchildren;
TQPtrList<KrBookmark> _children;
};
#endif // KRBOOKMARK_H

34
krusader/BookMan/krbookmarkhandler.cpp
Unescape Escape View File

@ -68,7 +68,7 @@ void KrBookmarkHandler::addBookmark(KrBookmark *bm, KrBookmark *folder) {
folder = _root;
// add to the list (bottom)
folder->tqchildren().append(bm);
folder->children().append(bm);
exportToFile();
}
@ -84,15 +84,15 @@ void KrBookmarkHandler::deleteBookmark(KrBookmark *bm) {
}
void KrBookmarkHandler::removeReferences( KrBookmark *root, KrBookmark *bmToRemove ) {
int index = root->tqchildren().find( bmToRemove );
int index = root->children().find( bmToRemove );
if( index >= 0 )
root->tqchildren().take( index );
root->children().take( index );
KrBookmark *bm = root->tqchildren().first();
KrBookmark *bm = root->children().first();
while (bm) {
if (bm->isFolder())
removeReferences(bm, bmToRemove);
bm = root->tqchildren().next();
bm = root->children().next();
}
}
@ -117,7 +117,7 @@ void KrBookmarkHandler::exportToFileBookmark(TQDomDocument &doc, TQDomElement &w
}
void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder) {
for (KrBookmark *bm = folder->tqchildren().first(); bm; bm = folder->tqchildren().next()) {
for (KrBookmark *bm = folder->children().first(); bm; bm = folder->children().next()) {
if (bm->isFolder()) {
TQDomElement newFolder = doc.createElement("folder");
newFolder.setAttribute("icon", bm->icon());
@ -169,7 +169,7 @@ void KrBookmarkHandler::exportToFile() {
stream << doc.toString();
file.close();
} else {
KMessageBox::error(krApp, i18n("Unable to write to %1").tqarg(filename), i18n("Error"));
KMessageBox::error(krApp, i18n("Unable to write to %1").arg(filename), i18n("Error"));
}
}
@ -199,7 +199,7 @@ bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *pare
KrBookmark *bm = KrBookmark::getExistingBookmark(path+name, _collection);
if (!bm) {
bm = new KrBookmark(name, vfs::fromPathOrURL( url ), _collection, icon, path+name);
parent->tqchildren().append(bm);
parent->children().append(bm);
}
return true;
@ -223,13 +223,13 @@ bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *paren
return false;
} else name = tmp.text();
KrBookmark *folder = new KrBookmark(name, iconName);
parent->tqchildren().append(folder);
parent->children().append(folder);
TQDomNode nextOne = tmp.nextSibling();
if (!importFromFileFolder(nextOne, folder, path + name + "/", errorMsg))
return false;
} else if (e.tagName() == "separator") {
parent->tqchildren().append(KrBookmark::separator());
parent->children().append(KrBookmark::separator());
}
n = n.nextSibling();
}
@ -258,14 +258,14 @@ void KrBookmarkHandler::importFromFile() {
n = n.nextSibling();
if (n.isNull() || n.toElement().tagName()!="xbel") {
errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").tqarg(filename);
errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").arg(filename);
goto ERROR;
} else n = n.firstChild(); // skip the xbel part
importFromFileFolder(n, _root, "", &errorMsg);
goto SUCCESS;
ERROR:
KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").tqarg(errorMsg), i18n( "Error" ));
KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").arg(errorMsg), i18n( "Error" ));
SUCCESS:
file.close();
@ -284,7 +284,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
// run the loop twice, in order to put the folders on top. stupid but easy :-)
// note: this code drops the separators put there by the user
for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) {
for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) {
if (!bm->isFolder()) continue;
KPopupMenu *newMenu = new KPopupMenu(menu);
int id = menu->insertItem(TQIconSet(krLoader->loadIcon(bm->icon(), KIcon::Small)),
@ -298,7 +298,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
buildMenu(bm, newMenu);
--inSecondaryMenu;
}
for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) {
for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) {
if (bm->isFolder()) continue;
if (bm->isSeparator() ) {
menu->insertSeparator();
@ -411,7 +411,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
}
void KrBookmarkHandler::clearBookmarks(KrBookmark *root) {
KrBookmark *bm = root->tqchildren().first();
KrBookmark *bm = root->children().first();
while (bm) {
if (bm->isFolder())
clearBookmarks(bm);
@ -420,9 +420,9 @@ void KrBookmarkHandler::clearBookmarks(KrBookmark *root) {
delete bm;
}
bm = root->tqchildren().next();
bm = root->children().next();
}
root->tqchildren().clear();
root->children().clear();
}
void KrBookmarkHandler::bookmarksChanged(const TQString&, const TQString&) {

12
krusader/Dialogs/checksumdlg.cpp
Unescape Escape View File

@ -282,7 +282,7 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold
krApp->stopWait();
TQApplication::restoreOverrideCursor();
if (!r || !proc.normalExit()) {
KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").tqarg(mytool->binary));
KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").arg(mytool->binary));
return;
}
@ -361,7 +361,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder
TQString file = checksumFileReq->url();
TQString extension;
if (!verifyChecksumFile(file, extension)) {
KMessageBox::error(0, i18n("<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid checksum file.</qt>").tqarg(file));
KMessageBox::error(0, i18n("<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid checksum file.</qt>").arg(file));
return;
}
@ -374,7 +374,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder
break;
}
if (!mytool) {
KMessageBox::error(0, i18n("<qt>Krusader can't find a checksum tool that handles %1 on your system. Please check the <b>Dependencies</b> page in Krusader's settings.</qt>").tqarg(extension));
KMessageBox::error(0, i18n("<qt>Krusader can't find a checksum tool that handles %1 on your system. Please check the <b>Dependencies</b> page in Krusader's settings.</qt>").arg(extension));
return;
}
@ -396,7 +396,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder
}
};
if (!r || !proc.normalExit()) {
KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").tqarg(mytool->binary));
KMessageBox::error(0, i18n("<qt>There was an error while running <b>%1</b>.</qt>").arg(mytool->binary));
return;
}
TQApplication::restoreOverrideCursor();
@ -569,7 +569,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin
bool ChecksumResultsDlg::saveChecksum(const TQStringList& data, TQString filename) {
if (TQFile::exists(filename) &&
KMessageBox::warningContinueCancel(this,
i18n("File %1 already exists.\nAre you sure you want to overwrite it?").tqarg(filename),
i18n("File %1 already exists.\nAre you sure you want to overwrite it?").arg(filename),
i18n("Warning"), i18n("Overwrite")) != KMessageBox::Continue) {
// find a better name to save to
filename = KFileDialog::getSaveFileName(TQString(), "*", 0, i18n("Select a file to save to"));
@ -577,7 +577,7 @@ bool ChecksumResultsDlg::saveChecksum(const TQStringList& data, TQString filenam
}
TQFile file(filename);
if (!file.open(IO_WriteOnly)) {
KMessageBox::detailedError(0, i18n("Error saving file %1").tqarg(filename),
KMessageBox::detailedError(0, i18n("Error saving file %1").arg(filename),
file.errorString());
return false;
}

4
krusader/Dialogs/krkeydialog.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ void KrKeyDialog::slotExportShortcuts() {
TQFile f( filename );
if ( f.exists() &&
KMessageBox::warningContinueCancel( this,
i18n("<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>").tqarg(filename),
i18n("<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>").arg(filename),
i18n("Warning"), i18n("Overwrite") )
!= KMessageBox::Continue)
return;
@ -140,7 +140,7 @@ void KrKeyDialog::slotExportShortcuts() {
// Additionaly this prevents merging if the file already contains some shortcuts
f.close();
else {
KMessageBox::error( this, i18n("<qt>Can't open <b>%1</b> for writing!</qt>").tqarg(filename) );
KMessageBox::error( this, i18n("<qt>Can't open <b>%1</b> for writing!</qt>").arg(filename) );
return;
}

16
krusader/Dialogs/krprogress.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ void KrProgress::showTotals(){
}
void KrProgress::slotPercent( KIO::Job*, unsigned long percent ){
TQString tmp(i18n( "%1% of %2 ").tqarg( percent ).tqarg( KIO::convertSize(m_iTotalSize)));
TQString tmp(i18n( "%1% of %2 ").arg( percent ).arg( KIO::convertSize(m_iTotalSize)));
m_pProgressBar->setValue( percent );
tmp.append(i18n(" (Reading)"));
@ -180,7 +180,7 @@ void KrProgress::slotPercent( KIO::Job*, unsigned long percent ){
void KrProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
{
speedLabel->setText( msg );
speedLabel->setAlignment( speedLabel->tqalignment() & ~TQt::WordBreak );
speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak );
}
@ -188,7 +188,7 @@ void KrProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) {
m_iProcessedSize = bytes;
TQString tmp;
tmp = i18n( "%1 of %2 complete").tqarg( KIO::convertSize(bytes) ).tqarg( KIO::convertSize(m_iTotalSize));
tmp = i18n( "%1 of %2 complete").arg( KIO::convertSize(bytes) ).arg( KIO::convertSize(m_iTotalSize));
sizeLabel->setText( tmp );
}
@ -198,9 +198,9 @@ void KrProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
m_iProcessedDirs = dirs;
TQString tmps;
tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).tqarg( m_iProcessedDirs );
tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).arg( m_iProcessedDirs );
tmps += " ";
tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).tqarg( m_iProcessedFiles );
tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).arg( m_iProcessedFiles );
progressLabel->setText( tmps );
}
@ -211,10 +211,10 @@ void KrProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
TQString tmps;
if ( m_iTotalDirs > 1 ) {
tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).tqarg( m_iProcessedDirs );
tmps = i18n("%1 / %n directory", "%1 / %n directories", m_iTotalDirs).arg( m_iProcessedDirs );
tmps += " ";
}
tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).tqarg( m_iProcessedFiles );
tmps += i18n("%1 / %n file", "%1 / %n files", m_iTotalFiles).arg( m_iProcessedFiles );
progressLabel->setText( tmps );
}
@ -230,7 +230,7 @@ void KrProgress::slotSpeed( KIO::Job*, unsigned long bytes_per_second )
#else
TQString remaining = KIO::calculateRemaining( m_iTotalSize, m_iProcessedSize, bytes_per_second ).toString();
#endif
speedLabel->setText( i18n( "%1/s ( %2 remaining )").tqarg( KIO::convertSize( bytes_per_second )).tqarg( remaining ) );
speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( bytes_per_second )).arg( remaining ) );
}
}

4
krusader/Dialogs/krspwidgets.cpp
Unescape Escape View File

@ -297,7 +297,7 @@ void QuickNavLineEdit::mouseMoveEvent( TQMouseEvent *m) {
if (idx == -1 && !_dummyDisplayed) { // pointing on or after the current directory
if (_pop) delete _pop;
_pop = KPassivePopup::message( i18n("Quick Navigation"),
"<qt>" + i18n("Already at <i>%1</i>").tqarg(tx.left(idx)) + "</qt>",
"<qt>" + i18n("Already at <i>%1</i>").arg(tx.left(idx)) + "</qt>",
*(KCursor::handCursor().bitmap()), this);
_dummyDisplayed=true;
@ -308,7 +308,7 @@ void QuickNavLineEdit::mouseMoveEvent( TQMouseEvent *m) {
_dummyDisplayed=false;
_pop = KPassivePopup::message( i18n("Quick Navigation"),
"<qt>" + i18n("Click to go to <i>%1</i>").tqarg(tx.left(idx)) + "</qt>",
"<qt>" + i18n("Click to go to <i>%1</i>").arg(tx.left(idx)) + "</qt>",
*(KCursor::handCursor().bitmap()), this );
}
KLineEdit::mouseMoveEvent(m);

2
krusader/Dialogs/packgui.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ PackGUI::PackGUI(TQString defaultName, TQString defaultPath, int noOfFiles, TQSt
PackGUIBase(0,0,true) {
// first, fill the WhatToPack textfield with information
if(noOfFiles == 1)
TextLabel1->setText( i18n("Pack %1").tqarg(filename) );
TextLabel1->setText( i18n("Pack %1").arg(filename) );
else
TextLabel1->setText( i18n("Pack %n file", "Pack %n files", noOfFiles) );

2
krusader/Dialogs/packguibase.cpp
Unescape Escape View File

@ -412,7 +412,7 @@ bool PackGUIBase::extraProperties( TQMap<TQString,TQString> & inMap ) {
}
if( setCompressionLevel->isEnabled() && setCompressionLevel->isChecked() ) {
inMap[ "CompressionLevel" ] = TQString("%1").tqarg( compressionSlider->value() );
inMap[ "CompressionLevel" ] = TQString("%1").arg( compressionSlider->value() );
}
TQString cmdArgs = commandLineSwitches->currentText().stripWhiteSpace();

2
krusader/Dialogs/percentalsplitter.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ TQString PercentalSplitter::toolTipString( int p ) {
if( p < 0 )
p = values[ 0 ];
int percent = (int)(((double)p / (double)( values[ 0 ] + values[ 1 ] )) * 10000. + 0.5);
return TQString( "%1.%2%3" ).tqarg( percent / 100 ).tqarg( ( percent / 10 )%10 ).tqarg( percent % 10 ) + "%";
return TQString( "%1.%2%3" ).arg( percent / 100 ).arg( ( percent / 10 )%10 ).arg( percent % 10 ) + "%";
}
return TQString();
}

16
krusader/DiskUsage/diskusage.cpp
Unescape Escape View File

@ -186,9 +186,9 @@ void LoaderWidget::setCurrentURL( KURL url )
void LoaderWidget::setValues( int fileNum, int dirNum, KIO::filesize_t total )
{
files->setText( TQString("%1").tqarg( fileNum ) );
directories->setText( TQString("%1").tqarg( dirNum ) );
totalSize->setText( TQString("%1").tqarg( KRpermHandler::parseSize( total ).stripWhiteSpace() ) );
files->setText( TQString("%1").arg( fileNum ) );
directories->setText( TQString("%1").arg( dirNum ) );
totalSize->setText( TQString("%1").arg( KRpermHandler::parseSize( total ).stripWhiteSpace() ) );
}
void LoaderWidget::slotCancelled()
@ -411,7 +411,7 @@ void DiskUsage::dirUp()
if( KMessageBox::questionYesNo( this, i18n( "Stepping into the parent directory requires "
"loading the content of the \"%1\" URL. Do you wish "
"to continue?" )
.tqarg( vfs::pathOrURL( up ) ),
.arg( vfs::pathOrURL( up ) ),
i18n( "Krusader::DiskUsage" ), KStdGuiItem::yes(),
KStdGuiItem::no(), "DiskUsageLoadParentDir"
) == KMessageBox::Yes )
@ -608,7 +608,7 @@ int DiskUsage::del( File *file, bool calcPercents, int depth )
return 0;
}
emit status( i18n( "Deleting %1..." ).tqarg( file->name() ) );
emit status( i18n( "Deleting %1..." ).arg( file->name() ) );
}
if( file == currentDirectory )
@ -725,9 +725,9 @@ void DiskUsage::createStatus()
url.addPath( dirEntry->directory() );
emit status( i18n( "Current directory:%1, Total size:%2, Own size:%3" )
.tqarg( vfs::pathOrURL( url, -1 ) )
.tqarg( " "+KRpermHandler::parseSize( dirEntry->size() ) )
.tqarg( " "+KRpermHandler::parseSize( dirEntry->ownSize() ) ) );
.arg( vfs::pathOrURL( url, -1 ) )
.arg( " "+KRpermHandler::parseSize( dirEntry->size() ) )
.arg( " "+KRpermHandler::parseSize( dirEntry->ownSize() ) ) );
}
void DiskUsage::changeDirectory( Directory *dir )

8
krusader/DiskUsage/dufilelight.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ void DUFilelight::slotDirChanged( Directory *dir )
{
currentDir = dir;
tqinvalidate( false );
invalidate( false );
create( dir );
refreshNeeded = false;
}
@ -67,7 +67,7 @@ void DUFilelight::slotDirChanged( Directory *dir )
void DUFilelight::clear()
{
tqinvalidate( false );
invalidate( false );
currentDir = 0;
}
@ -208,7 +208,7 @@ void DUFilelight::slotAboutToShow( TQWidget *widget )
refreshNeeded = false;
if( ( currentDir = diskUsage->getCurrentDir() ) != 0 )
{
tqinvalidate( false );
invalidate( false );
create( currentDir );
}
}
@ -222,7 +222,7 @@ void DUFilelight::slotRefresh()
refreshNeeded = false;
if( currentDir && currentDir == diskUsage->getCurrentDir() )
{
tqinvalidate( false );
invalidate( false );
create( currentDir );
}
}

2
krusader/DiskUsage/radialMap/builder.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ RadialMap::Builder::build( const Directory* const dir, const unsigned int depth,
{
//append a segment for unrepresented space - a "fake" segment
const TQString s = i18n( "%1 files: ~ %2" ).tqarg( KGlobal::locale()->formatNumber( hiddenFileCount, 0 ) ).tqarg( File::humanReadableSize( hiddenSize/hiddenFileCount ) );
const TQString s = i18n( "%1 files: ~ %2" ).arg( KGlobal::locale()->formatNumber( hiddenFileCount, 0 ) ).arg( File::humanReadableSize( hiddenSize/hiddenFileCount ) );
(m_signature + depth)->append( new Segment( new File( s, hiddenSize ), a_start, a_end - a_start, true ) );
}

2
krusader/DiskUsage/radialMap/map.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ RadialMap::Map::~Map()
}
void
RadialMap::Map::tqinvalidate( const bool desaturateTheImage )
RadialMap::Map::invalidate( const bool desaturateTheImage )
{
delete [] m_signature;
m_signature = 0;

6
krusader/DiskUsage/radialMap/segmentTip.cpp
Unescape Escape View File

@ -90,7 +90,7 @@ SegmentTip::updateTip( const File* const file, const Directory* const root )
uint maxw = 0;
uint h = fontMetrics().height()*2 + 2*MARGIN;
if( pc > 0 ) s2 += TQString( " (%1%)" ).tqarg( loc->formatNumber( pc, 0 ) );
if( pc > 0 ) s2 += TQString( " (%1%)" ).arg( loc->formatNumber( pc, 0 ) );
m_text = s1;
m_text += '\n';
@ -100,9 +100,9 @@ SegmentTip::updateTip( const File* const file, const Directory* const root )
{
double files = static_cast<const Directory*>(file)->fileCount();
const uint pc = uint((100 * files) / (double)root->fileCount());
TQString s3 = i18n( "Files: %1" ).tqarg( loc->formatNumber( files, 0 ) );
TQString s3 = i18n( "Files: %1" ).arg( loc->formatNumber( files, 0 ) );
if( pc > 0 ) s3 += TQString( " (%1%)" ).tqarg( loc->formatNumber( pc, 0 ) );
if( pc > 0 ) s3 += TQString( " (%1%)" ).arg( loc->formatNumber( pc, 0 ) );
maxw = fontMetrics().width( s3 );
h += fontMetrics().height();

14
krusader/DiskUsage/radialMap/widget.cpp
Unescape Escape View File

@ -49,11 +49,11 @@ RadialMap::Widget::url( File const * const file ) const
}
void
RadialMap::Widget::tqinvalidate( const bool b )
RadialMap::Widget::invalidate( const bool b )
{
if( isValid() )
{
//**** have to check that only way to tqinvalidate is this function frankly
//**** have to check that only way to invalidate is this function frankly
//**** otherwise you may get bugs..
//disable mouse tracking
@ -70,7 +70,7 @@ RadialMap::Widget::tqinvalidate( const bool b )
//FIXME move this disablement thing no?
// it is confusing in other areas, like the whole createFromCache() thing
m_map.tqinvalidate( b ); //b signifies whether the pixmap is made to look disabled or not
m_map.invalidate( b ); //b signifies whether the pixmap is made to look disabled or not
if( b )
update();
@ -82,10 +82,10 @@ RadialMap::Widget::tqinvalidate( const bool b )
void
RadialMap::Widget::create( const Directory *tree )
{
//it is not the responsibility of create() to tqinvalidate first
//it is not the responsibility of create() to invalidate first
//skip invalidation at your own risk
//FIXME make it the responsibility of create to tqinvalidate first
//FIXME make it the responsibility of create to invalidate first
if( tree )
{
@ -108,8 +108,8 @@ RadialMap::Widget::create( const Directory *tree )
void
RadialMap::Widget::createFromCache( const Directory *tree )
{
//no scan was necessary, use cached tree, however we MUST still emit tqinvalidate
tqinvalidate( false );
//no scan was necessary, use cached tree, however we MUST still emit invalidate
invalidate( false );
create( tree );
}

4
krusader/DiskUsage/radialMap/widget.h
Unescape Escape View File

@ -28,7 +28,7 @@ namespace RadialMap
bool resize( const TQRect& );
bool isNull() const { return ( m_signature == 0 ); }
void tqinvalidate( const bool );
void invalidate( const bool );
friend class Builder;
friend class Widget;
@ -69,7 +69,7 @@ namespace RadialMap
void zoomIn();
void zoomOut();
void create( const Directory* );
void tqinvalidate( const bool = true );
void invalidate( const bool = true );
void refresh( int );
private slots:

12
krusader/DiskUsage/radialMap/widgetEvents.cpp
Unescape Escape View File

@ -122,8 +122,8 @@ RadialMap::Widget::mouseMoveEvent( TQMouseEvent *e )
m_tip.updateTip( m_focus->file(), m_tree );
emit mouseHover( m_focus->file()->fullPath() );
//tqrepaint required to update labels now before transparency is generated
tqrepaint( false );
//repaint required to update labels now before transparency is generated
repaint( false );
}
m_tip.moveto( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-tranparent background
@ -174,11 +174,11 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
switch( popup.exec( e->globalPos(), 1 ) ) {
case 0:
//KRun::runCommand will show an error message if there was trouble
KRun::runCommand( TQString( "kfmclient openURL '%1'" ).tqarg( url.url() ) );
KRun::runCommand( TQString( "kfmclient openURL '%1'" ).arg( url.url() ) );
break;
case 1:
KRun::runCommand( TQString( "konsole --workdir '%1'" ).tqarg( url.url() ) );
KRun::runCommand( TQString( "konsole --workdir '%1'" ).arg( url.url() ) );
break;
case 2:
@ -190,7 +190,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
const KURL url = Widget::url( m_focus->file() );
const TQString message = ( m_focus->file()->isDir()
? i18n( "<qt>The directory at <i>'%1'</i> will be <b>recursively</b> and <b>permanently</b> deleted!</qt>" )
: i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>" )).tqarg( url.prettyURL() );
: i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>" )).arg( url.prettyURL() );
const int userIntention = KMessageBox::warningContinueCancel( this, message, TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) );
if( userIntention == KMessageBox::Continue ) {
@ -235,7 +235,7 @@ RadialMap::Widget::deleteJobFinished( KIO::Job *job )
{
TQApplication::restoreOverrideCursor();
if( !job->error() )
tqinvalidate();
invalidate();
else
job->showErrorDialog( this );
}

2
krusader/Filter/advancedfilter.cpp
Unescape Escape View File

@ -472,7 +472,7 @@ void AdvancedFilter::invalidDateMessage(TQLineEdit *p)
{
// FIXME p->text() is empty sometimes (to reproduce, set date to "13.09.005")
KMessageBox::detailedError(this, i18n("Invalid date entered."),
i18n("The date %1 is not valid according to your locale. Please re-enter a valid date (use the date button for easy access).").tqarg(p->text()) );
i18n("The date %1 is not valid according to your locale. Please re-enter a valid date (use the date button for easy access).").arg(p->text()) );
p->setFocus();
}

6
krusader/GUI/profilemanager.cpp
Unescape Escape View File

@ -114,12 +114,12 @@ void ProfileManager::newProfile( TQString defaultName )
if( !profile.isEmpty() )
{
int profileNum = 1;
while( profileList.contains( TQString( "%1" ).tqarg( profileNum ) ) )
while( profileList.contains( TQString( "%1" ).arg( profileNum ) ) )
profileNum++;
TQString profileString = TQString( "%1" ).tqarg( profileNum );
TQString profileString = TQString( "%1" ).arg( profileNum );
TQString profileName = profileType + " - " + profileString;
profileList.append( TQString( "%1" ).tqarg( profileString ) );
profileList.append( TQString( "%1" ).arg( profileString ) );
krConfig->setGroup("Private");
krConfig->writeEntry( profileType, profileList );

4
krusader/Konfigurator/kgcolors.cpp
Unescape Escape View File

@ -168,7 +168,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) :
addColorSelector( "Dim Target Color", i18n( "Dim target color:" ), TQt::white);
int index = itemList.count() - offset;
labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) );
labelList.append( addLabel( colorsGrid, index, 0, i18n("Dim factor:"), colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) );
dimFactor = createSpinBox("Colors", "Dim Factor", 100, 0, 100, colorsGrp);
dimFactor->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
connect( dimFactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( generatePreview() ) );
@ -241,7 +241,7 @@ int KgColors::addColorSelector( TQString cfgName, TQString name, TQColor dflt, T
{
int index = itemList.count() - offset;
labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).tqarg( index ).ascii() ) );
labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, TQString( "ColorsLabel%1" ).arg( index ).ascii() ) );
KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false, addColor, addColNum );
chooser->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );

4
krusader/Konfigurator/kgdependencies.cpp
Unescape Escape View File

@ -154,10 +154,10 @@ void KgDependencies::slotApply( TQObject *obj, TQString cls, TQString name )
krConfig->writeEntry( name, usedPath );
if( usedPath.isEmpty() )
KMessageBox::error( this, i18n( "The %1 path is incorrect, no valid path found." )
.tqarg( urlRequester->url() ) );
.arg( urlRequester->url() ) );
else
KMessageBox::error( this, i18n( "The %1 path is incorrect, %2 used instead." )
.tqarg( urlRequester->url() ).tqarg( usedPath ) );
.arg( urlRequester->url() ).arg( usedPath ) );
urlRequester->setURL( usedPath );
}
}

6
krusader/Konfigurator/kgprotocols.cpp
Unescape Escape View File

@ -305,7 +305,7 @@ void KgProtocols::loadInitialValues()
{
addProtocol( *it );
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( *it ) );
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) );
for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ )
addMime( *it2, *it );
@ -354,7 +354,7 @@ bool KgProtocols::isChanged()
if( !protList.contains( item->text( 0 ) ) )
return true;
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ) );
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ) );
if( (int)mimes.count() != item->childCount() )
return true;
@ -390,7 +390,7 @@ bool KgProtocols::apply()
mimes.append( childs->text( 0 ) );
childs = childs->nextSibling();
}
krConfig->writeEntry( TQString( "Mimes For %1" ).tqarg( item->text( 0 ) ), mimes );
krConfig->writeEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ), mimes );
item = item->nextSibling();
}

4
krusader/Konfigurator/konfiguratoritems.cpp
Unescape Escape View File

@ -418,7 +418,7 @@ void KonfiguratorFontChooser::loadInitialValue()
void KonfiguratorFontChooser::setFont()
{
pLabel->setFont( font );
pLabel->setText( font.family()+TQString(", %1").tqarg(font.pointSize()) );
pLabel->setText( font.family()+TQString(", %1").arg(font.pointSize()) );
}
void KonfiguratorFontChooser::slotApply(TQObject *,TQString cls, TQString name)
@ -696,7 +696,7 @@ TQString KonfiguratorColorChooser::getValue()
else if( currentItem() >= 2 && (unsigned)currentItem() < 2 + additionalColors.size() )
return additionalColors[ currentItem() - 2 ].value;
else
return TQString( "%1,%2,%3" ).tqarg( color.red() ).tqarg( color.green() ).tqarg( color.blue() );
return TQString( "%1,%2,%3" ).arg( color.red() ).arg( color.green() ).arg( color.blue() );
}
bool KonfiguratorColorChooser::isValueRGB()

6
krusader/KrJS/krjs.cpp
Unescape Escape View File

@ -62,14 +62,14 @@ bool KrJS::runFile(const TQString & filename) {
KMessageBox::error ( 0, //parent
( line < 0 ?
TQString( i18n("In %1:\nUncaught JavaScript exception '%2'\n%3") ).tqarg(filename).tqarg(type).tqarg(message) :
TQString( i18n("In %1:\nUncaught JavaScript exception '%2' at line %3\n%4") ).tqarg(filename).tqarg(type).tqarg(line).tqarg(message)
TQString( i18n("In %1:\nUncaught JavaScript exception '%2'\n%3") ).arg(filename).arg(type).arg(message) :
TQString( i18n("In %1:\nUncaught JavaScript exception '%2' at line %3\n%4") ).arg(filename).arg(type).arg(line).arg(message)
), //text
i18n("JavaScript error"), //caption
KMessageBox::Dangerous) ;
#else
KMessageBox::error ( 0, //parent
TQString(i18n("In %1:\nThere is an error in the JavaScript")).tqarg(filename), //text
TQString(i18n("In %1:\nThere is an error in the JavaScript")).arg(filename), //text
i18n("JavaScript error"), //caption
KMessageBox::Dangerous) ;
#endif

2
krusader/Locate/locate.cpp
Unescape Escape View File

@ -573,7 +573,7 @@ void LocateDlg::feedToListBox()
int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 );
TQString queryName;
do {
queryName = i18n("Locate results")+TQString( " %1" ).tqarg( listBoxNum++ );
queryName = i18n("Locate results")+TQString( " %1" ).arg( listBoxNum++ );
}while( v.vfs_search( queryName ) != 0 );
krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum );

10
krusader/MountMan/kmountman.cpp
Unescape Escape View File

@ -221,24 +221,24 @@ TQString KMountMan::convertSize( KIO::filesize_t size ) {
fsize = ( float ) size / ( float ) 1073741824;
if ( fsize > 1024 ) // no name for something bigger than tera byte
// let's call it Zega-Byte, who'll ever find out? :-)
s = i18n( "%1 ZB" ).tqarg( KGlobal::locale() ->formatNumber( fsize / ( float ) 1024, 1 ) );
s = i18n( "%1 ZB" ).arg( KGlobal::locale() ->formatNumber( fsize / ( float ) 1024, 1 ) );
else
s = i18n( "%1 TB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
s = i18n( "%1 TB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
}
// Giga-byte
else if ( size >= 1048576 ) {
fsize = ( float ) size / ( float ) 1048576;
s = i18n( "%1 GB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
s = i18n( "%1 GB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
}
// Mega-byte
else if ( size > 1024 ) {
fsize = ( float ) size / ( float ) 1024;
s = i18n( "%1 MB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
s = i18n( "%1 MB" ).arg( KGlobal::locale() ->formatNumber( fsize, 1 ) );
}
// Kilo-byte
else {
fsize = ( float ) size;
s = i18n( "%1 KB" ).tqarg( KGlobal::locale() ->formatNumber( fsize, 0 ) );
s = i18n( "%1 KB" ).arg( KGlobal::locale() ->formatNumber( fsize, 0 ) );
}
return s;
}

10
krusader/MountMan/kmountmangui.cpp
Unescape Escape View File

@ -201,9 +201,9 @@ void KMountManGUI::gettingSpaceData( const TQString &mountPoint, unsigned long k
void KMountManGUI::addItemToMountList( TQListView *lst, fsData &fs ) {
bool mtd = fs.mounted();
TQString tSize = TQString( "%1" ).tqarg( KIO::convertSizeFromKB( fs.totalBlks() ) );
TQString fSize = TQString( "%1" ).tqarg( KIO::convertSizeFromKB( fs.freeBlks() ) );
TQString sPrct = TQString( "%1%" ).tqarg( 100 - ( fs.usedPerct() ) );
TQString tSize = TQString( "%1" ).arg( KIO::convertSizeFromKB( fs.totalBlks() ) );
TQString fSize = TQString( "%1" ).arg( KIO::convertSizeFromKB( fs.freeBlks() ) );
TQString sPrct = TQString( "%1%" ).arg( 100 - ( fs.usedPerct() ) );
TQListViewItem *item = new TQListViewItem( lst, fs.name(),
fs.type(), fs.mntPoint(),
( mtd ? tSize : TQString( "N/A" ) ), ( mtd ? fSize : TQString( "N/A" ) ),
@ -254,7 +254,7 @@ void KMountManGUI::updateList() {
mountList->clearSelection();
if ( info ) {
info->setEmpty( true );
info->tqrepaint();
info->repaint();
}
watcher->start( WATCHER_DELAY, true ); // starting the watch timer ( single shot )
}
@ -300,7 +300,7 @@ void KMountManGUI::changeActive( TQListViewItem *i ) {
info->setEmpty( false );
info->setTotalSpace( system->totalBlks() );
info->setFreeSpace( system->freeBlks() );
info->tqrepaint();
info->repaint();
}
// called when right-clicked on a filesystem

18
krusader/Panel/krbriefview.cpp
Unescape Escape View File

@ -249,7 +249,7 @@ void KrBriefView::addItems( vfs *v, bool addUpDir ) {
// text for updating the status bar
TQString statusText = TQString("%1/ ").tqarg( v->vfs_getOrigin().fileName() ) + i18n("Directory");
TQString statusText = TQString("%1/ ").arg( v->vfs_getOrigin().fileName() ) + i18n("Directory");
bool as = sortDirection();
setSorting( false, as ); // disable sorting
@ -459,7 +459,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) {
lastSwushPosition = newCurrent;
}
newCurrent->setSelected(!newCurrent->isSelected(), true);
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
}
callDefaultHandler = false;
@ -474,7 +474,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) {
if( newCurrent )
{
newCurrent->setSelected(!newCurrent->isSelected());
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
callDefaultHandler = false;
e->accept();
@ -486,7 +486,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) {
if( newCurrent )
{
newCurrent->setSelected( true );
newCurrent->tqrepaint();
newCurrent->repaint();
}
selectionChanged = true;
callDefaultHandler = false;
@ -514,7 +514,7 @@ void KrBriefView::contentsMousePressEvent( TQMouseEvent * e ) {
if (newCurrent)
{
newCurrent->setSelected(!newCurrent->isSelected(), true);
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
}
callDefaultHandler = false;
@ -769,9 +769,9 @@ void KrBriefView::contentsDragMoveEvent( TQDragMoveEvent * e ) {
if( _currDragItem != oldDragItem )
{
if( oldDragItem )
dynamic_cast<KrBriefViewItem *>( oldDragItem )->tqrepaint();
dynamic_cast<KrBriefViewItem *>( oldDragItem )->repaint();
if( _currDragItem )
dynamic_cast<KrBriefViewItem *>( _currDragItem )->tqrepaint();
dynamic_cast<KrBriefViewItem *>( _currDragItem )->repaint();
}
}
@ -783,7 +783,7 @@ void KrBriefView::contentsDragLeaveEvent ( TQDragLeaveEvent *e )
KIconView::contentsDragLeaveEvent( e );
if( oldDragItem )
dynamic_cast<KrBriefViewItem *>( oldDragItem )->tqrepaint();
dynamic_cast<KrBriefViewItem *>( oldDragItem )->repaint();
}
void KrBriefView::imStartEvent(TQIMEvent* e)
@ -1352,7 +1352,7 @@ void KrBriefView::setColumnNr()
for( int i=1; i <= MAX_COLS; i++ )
{
popup.insertItem( TQString( "%1" ).tqarg( i ), COL_ID + i );
popup.insertItem( TQString( "%1" ).arg( i ), COL_ID + i );
popup.setItemChecked( COL_ID + i, PROPS->numberOfColumns == i );
}

2
krusader/Panel/krbriefview.h
Unescape Escape View File

@ -48,7 +48,7 @@ class TQHeader;
/**
* KrBriefView implements everthing and anything regarding a brief view in a filemananger.
* IT MUST USE KrViewItem as the tqchildren to it's *KIconView. KrBriefView and KrViewItem are
* IT MUST USE KrViewItem as the children to it's *KIconView. KrBriefView and KrViewItem are
* tightly coupled and the view will not work with other kinds of items.
* Apart from this, the view is self-reliant and you can use the vast interface to get whatever
* information is necessery from it.

2
krusader/Panel/krcalcspacedialog.cpp
Unescape Escape View File

@ -144,7 +144,7 @@ void KrCalcSpaceDialog::showResult(){
if (!m_thread) return;
TQString msg;
TQString fileName = ( ( m_thread->getItems().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getItems().first() + "\n" ) : TQString( "" ) );
msg = fileName + i18n( "Total occupied space: %1").tqarg( KIO::convertSize( m_thread->getTotalSize() ) );
msg = fileName + i18n( "Total occupied space: %1").arg( KIO::convertSize( m_thread->getTotalSize() ) );
if (m_thread->getTotalSize() >= 1024)
msg += " (" + KRpermHandler::parseSize( m_thread->getTotalSize() ) + "bytes)";
msg += "\n";

10
krusader/Panel/krdetailedview.cpp
Unescape Escape View File

@ -300,7 +300,7 @@ void KrDetailedView::addItems( vfs *v, bool addUpDir ) {
}
// text for updating the status bar
TQString statusText = TQString("%1/ ").tqarg( v->vfs_getOrigin().fileName() ) + i18n("Directory");
TQString statusText = TQString("%1/ ").arg( v->vfs_getOrigin().fileName() ) + i18n("Directory");
int cnt = 0;
int cl = columnSorted();
@ -549,7 +549,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) {
lastSwushPosition = newCurrent;
}
newCurrent->setSelected(!newCurrent->isSelected());
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
}
callDefaultHandler = false;
@ -564,7 +564,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) {
if( newCurrent )
{
newCurrent->setSelected(!newCurrent->isSelected());
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
callDefaultHandler = false;
e->accept();
@ -576,7 +576,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) {
if( newCurrent )
{
newCurrent->setSelected( true );
newCurrent->tqrepaint();
newCurrent->repaint();
}
selectionChanged = true;
callDefaultHandler = false;
@ -604,7 +604,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) {
if (newCurrent)
{
newCurrent->setSelected(!newCurrent->isSelected());
newCurrent->tqrepaint();
newCurrent->repaint();
selectionChanged = true;
}
callDefaultHandler = false;

2
krusader/Panel/krdetailedview.h
Unescape Escape View File

@ -64,7 +64,7 @@ class KrDetailedViewItem;
/**
* KrDetailedView implements everthing and anything regarding a detailed view in a filemananger.
* IT MUST USE KrViewItem as the tqchildren to it's *KListView. KrDetailedView and KrViewItem are
* IT MUST USE KrViewItem as the children to it's *KListView. KrDetailedView and KrViewItem are
* tightly coupled and the view will not work with other kinds of items.
* Apart from this, the view is self-reliant and you can use the vast interface to get whatever
* information is necessery from it.

4
krusader/Panel/krpopupmenu.cpp
Unescape Escape View File

@ -258,7 +258,7 @@ void KrPopupMenu::performAction(int id) {
break;
case SHRED_ID :
if ( KMessageBox::warningContinueCancel( krApp,
i18n("<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone forever!</qt>").tqarg(item->name()),
i18n("<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone forever!</qt>").arg(item->name()),
TQString(), KStdGuiItem::cont(), "Shred" ) == KMessageBox::Continue )
KShred::shred( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ) );
break;
@ -336,7 +336,7 @@ void KrPopupMenu::performAction(int id) {
proc.setUseShell( true );
}
if ( !proc.start( KProcess::DontCare ) )
KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"" ).tqarg(term) );
KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"" ).arg(term) );
} // group-saver is blown out of scope here
chdir( save.local8Bit() );
break;

6
krusader/Panel/krview.cpp
Unescape Escape View File

@ -163,9 +163,9 @@ TQString KrView::statistics() {
_countSize += it->getVfile()->vfile_getSize();
}
TQString tmp = TQString(i18n("%1 out of %2, %3 (%4) out of %5 (%6)"))
.tqarg( _numSelected ).tqarg( _count ).tqarg( KIO::convertSize( _selectedSize ) )
.tqarg( KRpermHandler::parseSize(_selectedSize) )
.tqarg( KIO::convertSize( _countSize ) ).tqarg( KRpermHandler::parseSize(_countSize) );
.arg( _numSelected ).arg( _count ).arg( KIO::convertSize( _selectedSize ) )
.arg( KRpermHandler::parseSize(_selectedSize) )
.arg( KIO::convertSize( _countSize ) ).arg( KRpermHandler::parseSize(_countSize) );
// notify if we're running a filtered view
if (filter() != KrViewProperties::All)
tmp = ">> [ " + filterMask().nameFilter() + " ] "+tmp;

4
krusader/Panel/krviewitem.cpp
Unescape Escape View File

@ -58,14 +58,14 @@ TQString KrViewItem::description() const {
TQString tmp;
if ( comment.isEmpty() ) tmp = i18n ( "Symbolic Link" ) ;
else if( _vf->vfile_getMime() == "Broken Link !" ) tmp = i18n("(broken link !)");
else tmp = i18n("%1 (Link)").tqarg(comment);
else tmp = i18n("%1 (Link)").arg(comment);
text += "->";
text += myLinkDest;
text += " ";
text += tmp;
} else if ( S_ISREG( m_fileMode ) ){
text = TQString("%1 (%2)").tqarg(text2).tqarg( PROPS->humanReadableSize ?
text = TQString("%1 (%2)").arg(text2).arg( PROPS->humanReadableSize ?
KRpermHandler::parseSize(_vf->vfile_getSize()) : KIO::convertSize( mySize ) );
text += " ";
text += comment;

10
krusader/Panel/listpanel.cpp
Unescape Escape View File

@ -760,9 +760,9 @@ void ListPanel::gotStats( const TQString &mountPoint, unsigned long kBSize,
}
TQString stats = i18n( "%1 free out of %2 (%3%) on %4 [ (%5) ]" )
.tqarg( KIO::convertSizeFromKB( kBAvail ) )
.tqarg( KIO::convertSizeFromKB( kBSize ) ).tqarg( perc )
.tqarg( mountPoint ).tqarg( fstype );
.arg( KIO::convertSizeFromKB( kBAvail ) )
.arg( KIO::convertSizeFromKB( kBSize ) ).arg( perc )
.arg( mountPoint ).arg( fstype );
status->setText( stats );
}
@ -917,7 +917,7 @@ void ListPanel::setFilter( KrViewProperties::FilterSpec f ) {
return ;
}
view->setFilter( f ); // do that in any case
func->files()->vfs_tqinvalidate();
func->files()->vfs_invalidate();
func->refresh();
}
@ -1077,7 +1077,7 @@ void ListPanel::inlineRefreshCancel() {
}
void ListPanel::inlineRefreshPercent( KIO::Job*, unsigned long perc) {
TQString msg = TQString(">> %1: %2 % complete...").tqarg(i18n("Reading")).tqarg(perc);
TQString msg = TQString(">> %1: %2 % complete...").arg(i18n("Reading")).arg(perc);
totals->setText(msg);
}

22
krusader/Panel/panelfunc.cpp
Unescape Escape View File

@ -377,7 +377,7 @@ void ListPanelFunc::terminal() {
}
if ( !proc.start( KProcess::DontCare ) )
KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>" ).tqarg(term) );
KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>" ).arg(term) );
chdir( save.local8Bit() );
}
@ -423,7 +423,7 @@ void ListPanelFunc::moveFiles() {
TQString s;
if( fileNames.count() == 1 )
s = i18n("Move %1 to:").tqarg(fileNames.first());
s = i18n("Move %1 to:").arg(fileNames.first());
else
s = i18n("Move %n file to:", "Move %n files to:", fileNames.count());
@ -578,7 +578,7 @@ void ListPanelFunc::copyFiles() {
TQString s;
if( fileNames.count() == 1 )
s = i18n("Copy %1 to:").tqarg(fileNames.first());
s = i18n("Copy %1 to:").arg(fileNames.first());
else
s = i18n("Copy %n file to:", "Copy %n files to:", fileNames.count());
@ -679,7 +679,7 @@ void ListPanelFunc::deleteFiles(bool reallyDelete) {
dir.setPath( panel->virtualPath().path() + "/" + ( *name ) );
if ( dir.entryList(TQDir::All | TQDir::System | TQDir::Hidden ).count() > 2 ) {
switch ( KMessageBox::warningYesNoCancel( krApp,
i18n( "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</p></qt>" ).tqarg(*name),
i18n( "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</p></qt>" ).arg(*name),
TQString(), i18n( "&Skip" ), i18n( "&Delete All" ) ) ) {
case KMessageBox::Cancel :
return ;
@ -806,9 +806,9 @@ void ListPanelFunc::pack() {
}
if ( TQFileInfo( arcFile ).exists() ) {
TQString msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>All data in the previous archive will be lost!</p></qt>").tqarg(PackGUI::filename).tqarg(PackGUI::type);
TQString msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>All data in the previous archive will be lost!</p></qt>").arg(PackGUI::filename).arg(PackGUI::type);
if( PackGUI::type == "zip" ) {
msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>Zip will replace identically named entries in the zip archive or add entries for new names.</p></qt>").tqarg(PackGUI::filename).tqarg(PackGUI::type);
msg = i18n( "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?</p><p>Zip will replace identically named entries in the zip archive or add entries for new names.</p></qt>").arg(PackGUI::filename).arg(PackGUI::type);
}
if ( KMessageBox::warningContinueCancel( krApp,msg,TQString(),i18n( "&Overwrite" ))
== KMessageBox::Cancel )
@ -887,7 +887,7 @@ void ListPanelFunc::testArchive() {
// check we that archive is supported
if ( !KRarcHandler::arcSupported( type ) ) {
KMessageBox::sorry( krApp, i18n( "%1, unknown archive type." ).tqarg( arcName ) );
KMessageBox::sorry( krApp, i18n( "%1, unknown archive type." ).arg( arcName ) );
return ;
}
@ -895,9 +895,9 @@ void ListPanelFunc::testArchive() {
// test the archive
if ( KRarcHandler::test( url, type, password ) )
KMessageBox::information( krApp, i18n( "%1, test passed." ).tqarg( arcName ) );
KMessageBox::information( krApp, i18n( "%1, test passed." ).arg( arcName ) );
else
KMessageBox::error( krApp, i18n( "%1, test failed!" ).tqarg( arcName ) );
KMessageBox::error( krApp, i18n( "%1, test failed!" ).arg( arcName ) );
// remove the downloaded file if necessary
if ( url != arcURL.path( -1 ) )
@ -913,7 +913,7 @@ void ListPanelFunc::unpack() {
TQString s;
if(fileNames.count() == 1)
s = i18n("Unpack %1 to:").tqarg(fileNames[0]);
s = i18n("Unpack %1 to:").arg(fileNames[0]);
else
s = i18n("Unpack %n file to:", "Unpack %n files to:", fileNames.count());
@ -961,7 +961,7 @@ void ListPanelFunc::unpack() {
// check we that archive is supported
if ( !KRarcHandler::arcSupported( type ) ) {
KMessageBox::sorry( krApp, i18n( "%1, unknown archive type" ).tqarg( arcName ) );
KMessageBox::sorry( krApp, i18n( "%1, unknown archive type" ).arg( arcName ) );
continue;
}

2
krusader/RemoteMan/remoteman.cpp
Unescape Escape View File

@ -129,7 +129,7 @@ void remoteMan::refreshData() {
int h=temp.mid(1,1).toInt();
int l=temp.mid(2,1).toInt();
if ((++l)==10) { ++h; l=0; }
temp=TQString("<%1%2>").tqarg(h).tqarg(l);
temp=TQString("<%1%2>").arg(h).arg(l);
temp=currentItem->text(0).replace(currentItem->text(0).length()-4,4,temp);
currentItem->setText(0,temp);
} else currentItem->setText(0,currentItem->text(0)+"<02>");

4
krusader/Search/krsearchdialog.cpp
Unescape Escape View File

@ -357,7 +357,7 @@ void KrSearchDialog::found(TQString what, TQString where, KIO::filesize_t size,
TQDateTime tmp(TQDate(t->tm_year+1900, t->tm_mon+1, t->tm_mday), TQTime(t->tm_hour, t->tm_min));
ResultListViewItem *it =new ResultListViewItem(resultsList, what,
where.replace(TQRegExp("\\\\"),"#"), size, tmp, perm);
TQString totals = TQString(i18n("Found %1 matches.")).tqarg(resultsList->childCount());
TQString totals = TQString(i18n("Found %1 matches.")).arg(resultsList->childCount());
foundLabel->setText(totals);
if (!foundText.isEmpty()) it->setFoundText(foundText);
@ -568,7 +568,7 @@ void KrSearchDialog::feedToListBox()
int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 );
TQString queryName;
do {
queryName = i18n("Search results")+TQString( " %1" ).tqarg( listBoxNum++ );
queryName = i18n("Search results")+TQString( " %1" ).arg( listBoxNum++ );
}while( v.vfs_search( queryName ) != 0 );
krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum );

16
krusader/Splitter/combiner.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ Combiner::~Combiner()
void Combiner::combine()
{
setCaption( i18n("Krusader::Combining...") );
setLabelText( i18n("Combining the file %1...").tqarg( vfs::pathOrURL( baseURL ) ));
setLabelText( i18n("Combining the file %1...").arg( vfs::pathOrURL( baseURL ) ));
/* check whether the .crc file exists */
splURL = baseURL;
@ -71,7 +71,7 @@ void Combiner::combine()
{
int ret = KMessageBox::questionYesNo(0, i18n("The CRC information file (%1) is missing!\n"
"Validity checking is impossible without it. Continue combining?")
.tqarg( vfs::pathOrURL( splURL ) ) );
.arg( vfs::pathOrURL( splURL ) ) );
if( ret == KMessageBox::No )
{
@ -107,7 +107,7 @@ void Combiner::combineSplitFileFinished(KIO::Job *job)
TQString error;
if( job->error() )
error = i18n("Error at reading the CRC file (%1)!").tqarg( vfs::pathOrURL( splURL ) );
error = i18n("Error at reading the CRC file (%1)!").arg( vfs::pathOrURL( splURL ) );
else
{
splitFile.remove( '\r' ); // Windows compatibility
@ -174,7 +174,7 @@ void Combiner::openNextFile()
do
{
ch = name.tqat( pos ).latin1() + 1;
ch = name.at( pos ).latin1() + 1;
if( ch == TQChar( 'Z' + 1 ) )
ch = 'A';
if( ch == TQChar( 'z' + 1 ) )
@ -189,7 +189,7 @@ void Combiner::openNextFile()
else
{
TQString index( "%1" ); /* determining the filename */
index = index.tqarg(++fileCounter).rightJustify( 3, '0' );
index = index.arg(++fileCounter).rightJustify( 3, '0' );
readURL = baseURL;
readURL.setFileName( baseURL.fileName() + "." + index );
}
@ -254,14 +254,14 @@ void Combiner::combineReceiveFinished(KIO::Job *job)
{
combineAbortJobs();
KMessageBox::questionYesNo(0, i18n("Can't open the first split file of %1!")
.tqarg( vfs::pathOrURL( baseURL ) ) );
.arg( vfs::pathOrURL( baseURL ) ) );
emit reject();
return;
}
if( hasValidSplitFile )
{
TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace()
TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace()
.rightJustify(8, '0');
if( receivedSize != expectedSize )
@ -293,7 +293,7 @@ void Combiner::combineSendFinished(KIO::Job *job)
if( job->error() ) /* any error occurred? */
{
combineAbortJobs();
KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) );
KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) );
emit reject();
return;
}

18
krusader/Splitter/splitter.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ void Splitter::split( KIO::filesize_t splitSizeIn )
splitSize = splitSizeIn;
setCaption( i18n("Krusader::Splitting...") );
setLabelText( i18n("Splitting the file %1...").tqarg( vfs::pathOrURL( fileName ) ) );
setLabelText( i18n("Splitting the file %1...").arg( vfs::pathOrURL( fileName ) ) );
if( file.isDir() )
{
@ -122,17 +122,17 @@ void Splitter::splitReceiveFinished(KIO::Job *job)
if( job->error() ) /* any error occurred? */
{
splitAbortJobs();
KMessageBox::error(0, i18n("Error reading file %1!").tqarg( vfs::pathOrURL( fileName ) ) );
KMessageBox::error(0, i18n("Error reading file %1!").arg( vfs::pathOrURL( fileName ) ) );
emit reject();
return;
}
TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace()
TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace()
.rightJustify(8, '0');
splitFile = TQString( "filename=%1\n" ).tqarg( fileName.fileName() )+
TQString( "size=%1\n" ) .tqarg( KIO::number( fileSize ) )+
TQString( "crc32=%1\n" ) .tqarg( crcResult );
splitFile = TQString( "filename=%1\n" ).arg( fileName.fileName() )+
TQString( "size=%1\n" ) .arg( KIO::number( fileSize ) )+
TQString( "crc32=%1\n" ) .arg( crcResult );
}
void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent)
@ -143,7 +143,7 @@ void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent)
void Splitter::splitCreateWriteJob()
{
TQString index( "%1" ); /* making the splitted filename */
index = index.tqarg(++fileNumber).rightJustify( 3, '0' );
index = index.arg(++fileNumber).rightJustify( 3, '0' );
TQString outFileName = fileName.fileName() + "." + index;
writeURL = destinationDir;
@ -198,7 +198,7 @@ void Splitter::splitSendFinished(KIO::Job *job)
if( job->error() ) /* any error occurred? */
{
splitAbortJobs();
KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) );
KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) );
emit reject();
return;
}
@ -241,7 +241,7 @@ void Splitter::splitFileFinished(KIO::Job *job)
if( job->error() ) /* any error occurred? */
{
KMessageBox::error(0, i18n("Error at writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) );
KMessageBox::error(0, i18n("Error at writing file %1!").arg( vfs::pathOrURL( writeURL ) ) );
emit reject();
return;
}

2
krusader/Splitter/splittergui.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) :
grid->setMargin( 11 );
TQLabel *splitterLabel = new TQLabel( this, "SplitterLabel" );
splitterLabel->setText( i18n( "Split the file %1 to directory:" ).tqarg( vfs::pathOrURL( fileURL ) ) );
splitterLabel->setText( i18n( "Split the file %1 to directory:" ).arg( vfs::pathOrURL( fileURL ) ) );
splitterLabel->setMinimumWidth( 400 );
grid->addWidget( splitterLabel,0 ,0 );

4
krusader/Splitter/splittergui.h
Unescape Escape View File

@ -91,14 +91,14 @@ struct PredefinedDevice
if( frac_part )
{
frac = TQString( "%1" ).tqarg( frac_part ).rightJustify( 3, '0' );
frac = TQString( "%1" ).arg( frac_part ).rightJustify( 3, '0' );
frac = "." + frac;
while( frac.endsWith("0") )
frac.truncate( frac.length() - 1 );
}
}
return TQString( "%1%2" ).tqarg( int_part ).tqarg( frac );
return TQString( "%1%2" ).arg( int_part ).arg( frac );
}
int mapTextToValue( bool * )

4
krusader/Synchronizer/feedtolistboxdialog.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy
int listBoxNum = krConfig->readNumEntry( "Feed To Listbox Counter", 1 );
TQString queryName;
do {
queryName = i18n("Synchronize results")+TQString( " %1" ).tqarg( listBoxNum++ );
queryName = i18n("Synchronize results")+TQString( " %1" ).arg( listBoxNum++ );
}while( v.vfs_search( queryName ) != 0 );
krConfig->writeEntry( "Feed To Listbox Counter", listBoxNum );
@ -188,7 +188,7 @@ void FeedToListBoxDialog::slotOk() {
KURL url = KURL::fromPathOrURL(TQString("virt:/")+ name);
virt_vfs v(0,true);
if( !v.vfs_refresh( url ) ) {
KMessageBox::error( parentWidget(), i18n( "Cannot open %1!" ).tqarg( url.prettyURL() ) );
KMessageBox::error( parentWidget(), i18n( "Cannot open %1!" ).arg( url.prettyURL() ) );
return;
}
v.vfs_addFiles( &urlList, KIO::CopyJob::Copy, 0 );

30
krusader/Synchronizer/synchronizedialog.cpp
Unescape Escape View File

@ -57,8 +57,8 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool
cbRightToLeft->setEnabled( leftCopyNr != 0 );
tqlayout->addWidget( cbRightToLeft );
lbRightToLeft = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", leftCopyNr).tqarg( 0 )
.tqarg( 0 ).tqarg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ),
lbRightToLeft = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", leftCopyNr).arg( 0 )
.arg( 0 ).arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ),
this, "lbRightToLeft" );
lbRightToLeft->setEnabled( leftCopyNr != 0 );
tqlayout->addWidget( lbRightToLeft );
@ -70,8 +70,8 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool
cbLeftToRight->setEnabled( rightCopyNr != 0 );
tqlayout->addWidget( cbLeftToRight );
lbLeftToRight = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", rightCopyNr ).tqarg( 0 )
.tqarg( 0 ).tqarg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ),
lbLeftToRight = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", rightCopyNr ).arg( 0 )
.arg( 0 ).arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ),
this, "lbLeftToRight" );
lbLeftToRight->setEnabled( rightCopyNr != 0 );
tqlayout->addWidget( lbLeftToRight );
@ -83,8 +83,8 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool
cbDeletable->setEnabled( deleteNr != 0 );
tqlayout->addWidget( cbDeletable );
lbDeletable = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", deleteNr ).tqarg( 0 )
.tqarg( 0 ).tqarg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ),
lbDeletable = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", deleteNr ).arg( 0 )
.arg( 0 ).arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ),
this, "lbDeletable" );
lbDeletable->setEnabled( deleteNr != 0 );
tqlayout->addWidget( lbDeletable );
@ -155,15 +155,15 @@ void SynchronizeDialog::synchronizationFinished()
void SynchronizeDialog::processedSizes( int leftNr, KIO::filesize_t leftSize, int rightNr,
KIO::filesize_t rightSize, int delNr, KIO::filesize_t delSize )
{
lbRightToLeft->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( leftNr ).tqarg( leftCopyNr )
.tqarg( KRpermHandler::parseSize( leftSize ).stripWhiteSpace() )
.tqarg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ) );
lbLeftToRight->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( rightNr ).tqarg( rightCopyNr )
.tqarg( KRpermHandler::parseSize( rightSize ).stripWhiteSpace() )
.tqarg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ) );
lbDeletable->setText ( i18n( "\tReady: %1/%2 files, %3/%4" ).tqarg( delNr ).tqarg( deleteNr )
.tqarg( KRpermHandler::parseSize( delSize ).stripWhiteSpace() )
.tqarg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ) );
lbRightToLeft->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( leftNr ).arg( leftCopyNr )
.arg( KRpermHandler::parseSize( leftSize ).stripWhiteSpace() )
.arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ) );
lbLeftToRight->setText( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( rightNr ).arg( rightCopyNr )
.arg( KRpermHandler::parseSize( rightSize ).stripWhiteSpace() )
.arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ) );
lbDeletable->setText ( i18n( "\tReady: %1/%2 files, %3/%4" ).arg( delNr ).arg( deleteNr )
.arg( KRpermHandler::parseSize( delSize ).stripWhiteSpace() )
.arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ) );
KIO::filesize_t totalSum = leftCopySize + rightCopySize + deleteSize;
KIO::filesize_t processedSum = leftSize + rightSize + delSize;

16
krusader/Synchronizer/synchronizer.cpp
Unescape Escape View File

@ -154,7 +154,7 @@ int Synchronizer::compare( TQString leftURL, TQString rightURL, KRQuery *query,
if( !autoScroll )
refresh( true );
emit statusInfo( i18n( "Number of files: %1" ).tqarg( fileCount ) );
emit statusInfo( i18n( "Number of files: %1" ).arg( fileCount ) );
return fileCount;
}
@ -185,7 +185,7 @@ void Synchronizer::compareLoop() {
break;
case ST_STATE_READY:
case ST_STATE_ERROR:
emit statusInfo( i18n( "Number of compared directories: %1" ).tqarg( comparedDirs ) );
emit statusInfo( i18n( "Number of compared directories: %1" ).arg( comparedDirs ) );
stack.removeRef( entry );
continue;
default:
@ -645,7 +645,7 @@ int Synchronizer::refresh(bool nostatus)
}
if( !nostatus )
emit statusInfo( i18n( "Number of files: %1" ).tqarg( fileCount ) );
emit statusInfo( i18n( "Number of files: %1" ).arg( fileCount ) );
return fileCount;
}
@ -1207,16 +1207,16 @@ void Synchronizer::slotTaskFinished(KIO::Job *job )
{
case TT_COPY_TO_LEFT:
error = i18n("Error at copying file %1 to %2!")
.tqarg( vfs::pathOrURL( rightURL ) )
.tqarg( vfs::pathOrURL( leftURL ) );
.arg( vfs::pathOrURL( rightURL ) )
.arg( vfs::pathOrURL( leftURL ) );
break;
case TT_COPY_TO_RIGHT:
error = i18n("Error at copying file %1 to %2!")
.tqarg( vfs::pathOrURL( leftURL ) )
.tqarg( vfs::pathOrURL( rightURL ) );
.arg( vfs::pathOrURL( leftURL ) )
.arg( vfs::pathOrURL( rightURL ) );
break;
case TT_DELETE:
error = i18n("Error at deleting file %1!").tqarg( vfs::pathOrURL( leftURL ) );
error = i18n("Error at deleting file %1!").arg( vfs::pathOrURL( leftURL ) );
break;
default:
break;

2
krusader/Synchronizer/synchronizerdirlist.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ bool SynchronizerDirList::load( const TQString &urlIn, bool wait ) {
TQString path = url.path( -1 );
DIR* dir = opendir(path.local8Bit());
if(!dir) {
KMessageBox::error(parentWidget, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error"));
KMessageBox::error(parentWidget, i18n("Can't open the %1 directory!").arg( path ), i18n("Error"));
emit finished( result = false );
return false;
}

12
krusader/Synchronizer/synchronizertask.cpp
Unescape Escape View File

@ -131,14 +131,14 @@ void CompareContentTask::start() {
if( leftURL.isLocalFile() && rightURL.isLocalFile() ) {
leftFile = new TQFile( leftURL.path() );
if( !leftFile->open( IO_ReadOnly ) ) {
KMessageBox::error(parentWidget, i18n("Error at opening %1!").tqarg( leftURL.path() ));
KMessageBox::error(parentWidget, i18n("Error at opening %1!").arg( leftURL.path() ));
m_state = ST_STATE_ERROR;
return;
}
rightFile = new TQFile( rightURL.path() );
if( !rightFile->open( IO_ReadOnly ) ) {
KMessageBox::error(parentWidget, i18n("Error at opening %1!").tqarg( rightURL.path() ));
KMessageBox::error(parentWidget, i18n("Error at opening %1!").arg( rightURL.path() ));
m_state = ST_STATE_ERROR;
return;
}
@ -300,8 +300,8 @@ void CompareContentTask::slotFinished(KIO::Job *job)
{
errorPrinted = true;
KMessageBox::error(parentWidget, i18n("IO error at comparing file %1 with %2!")
.tqarg( vfs::pathOrURL( leftURL ) )
.tqarg( vfs::pathOrURL( rightURL ) ) );
.arg( vfs::pathOrURL( leftURL ) )
.arg( vfs::pathOrURL( rightURL ) ) );
}
if( leftReadJob == 0 && rightReadJob == 0 )
@ -335,8 +335,8 @@ void CompareContentTask::sendStatusMessage()
{
double perc = (size == 0) ? 1. : (double)received / (double)size;
int percent = (int)(perc * 10000. + 0.5);
TQString statstr = TQString( "%1.%2%3" ).tqarg( percent / 100 ).tqarg( ( percent / 10 )%10 ).tqarg( percent % 10 ) + "%";
setStatusMessage( i18n( "Comparing file %1 (%2)..." ).tqarg( leftURL.fileName() ).tqarg( statstr ) );
TQString statstr = TQString( "%1.%2%3" ).arg( percent / 100 ).arg( ( percent / 10 )%10 ).arg( percent % 10 ) + "%";
setStatusMessage( i18n( "Comparing file %1 (%2)..." ).arg( leftURL.fileName() ).arg( statstr ) );
timer->start( 500, true );
}

22
krusader/UserAction/expander.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ TQValueList<const exp_placeholder*>& Expander::_placeholder()
void exp_placeholder::panelMissingError(const TQString &s, Expander& exp)
{
exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").tqarg(s)) );
exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").arg(s)) );
}
TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQString& type,const TQString& mask,const bool ommitPath,const bool useUrl,Expander& exp,const TQString& error)
@ -69,7 +69,7 @@ TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQStri
else if ( type == "selected" )
panel->view->getSelectedItems( &items );
else {
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").tqarg(error,type) ) );
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier").arg(error,type) ) );
return TQString();
}
if ( !ommitPath ) { // add the current path
@ -397,11 +397,11 @@ TagString exp_Count::expFunc( const ListPanel* panel, const TQStringList& parame
else if ( parameter[ 0 ].lower() == "selected" )
n = panel->view->numSelected();
else {
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").tqarg(parameter[0]) ));
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier").arg(parameter[0]) ));
return TQString();
}
return TagString(TQString("%1").tqarg( n ));
return TagString(TQString("%1").arg( n ));
}
exp_Filter::exp_Filter() {
@ -503,7 +503,7 @@ TagString exp_ListFile::expFunc( const ListPanel* panel, const TQStringList& par
KTempFile tmpFile( locateLocal("tmp", "krusader"), ".itemlist" );
if ( tmpFile.status() != 0 ) {
setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).tqarg(strerror( tmpFile.status() )) ));
setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)" ).arg(strerror( tmpFile.status() )) ));
return TQString();
}
@ -832,7 +832,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para
*/
// krOut << "start: exp_ColSort::expFunc" << endl;
#define MODE_OUT krOut << TQString( "mode: %1" ).tqarg( mode, 0, 2 ) << endl; // displays mode in base-2
#define MODE_OUT krOut << TQString( "mode: %1" ).arg( mode, 0, 2 ) << endl; // displays mode in base-2
//MODE_OUT
if ( parameter.count() <= 1 || ( parameter[1].lower() != "asc" && parameter[1].lower() != "desc" ) ) { //default == toggle
@ -882,7 +882,7 @@ TagString exp_ColSort::expFunc( const ListPanel* panel, const TQStringList& para
if ( parameter[0].lower() == "group" ) {
mode |= KrViewProperties::Group;
} else {
setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").tqarg(parameter[0]) ));
setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%").arg(parameter[0]) ));
return TQString();
}
@ -909,7 +909,7 @@ TagString exp_PanelSize::expFunc( const ListPanel* panel, const TQStringList& pa
newSize = parameter[0].toInt();
if ( newSize < 0 || newSize > 100 ) {
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").tqarg(newSize)) );
setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100").arg(newSize)) );
return TQString();
}
@ -1031,7 +1031,7 @@ TagString exp_simpleplaceholder::expFunc( const ListPanel* p, const TagStringLis
if((*it).isSimple())
lst.push_back((*it).string());
else {
setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").tqarg(description())));
setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1").arg(description())));
return TQString();
}
return expFunc(p,lst,useUrl,exp);
@ -1052,7 +1052,7 @@ ListPanel* Expander::getPanel( const char panelIndicator, const exp_placeholder*
case '_':
return 0;
default:
exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").tqarg(panelIndicator).tqarg(pl->description())));
exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2").arg(panelIndicator).arg(pl->description())));
return 0;
}
}
@ -1111,7 +1111,7 @@ TagString Expander::expandCurrent( const TQString& stringToExpand, bool useUrl )
break;
}
if ( i == placeholderCount() ) { // didn't find an expander
setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").tqarg(panelIndicator).tqarg(exp)) );
setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand").arg(panelIndicator).arg(exp)) );
return TQString();
}
} //else

2
krusader/UserAction/kraction.cpp
Unescape Escape View File

@ -151,7 +151,7 @@ void KrActionProcDlg::slotUser1() {
if ( ! open ) {
KMessageBox::error( this,
i18n("Can't open %1 for writing!\nNothing exported.").tqarg(filename),
i18n("Can't open %1 for writing!\nNothing exported.").arg(filename),
i18n("Export failed!")
);
return;

8
krusader/UserAction/useraction.cpp
Unescape Escape View File

@ -97,7 +97,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction
file.close();
delete doc; doc = 0;
KMessageBox::error( MAIN_VIEW,
i18n( "The file %1 does not contain valid UserActions.\n" ).tqarg( filename ), // text
i18n( "The file %1 does not contain valid UserActions.\n" ).arg( filename ), // text
i18n("UserActions - can't read from file!") // caption
);
}
@ -108,7 +108,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction
// check if the file got the right root-element (ACTION_ROOT) - this finds out if the xml-file read to the DOM is realy an krusader useraction-file
if( root.tagName() != ACTION_ROOT ) {
KMessageBox::error( MAIN_VIEW,
i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").tqarg( filename ),
i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").arg( filename ),
i18n( "UserActions - can't read from file!" )
);
delete doc; doc = 0;
@ -120,7 +120,7 @@ void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrAction
} // if ( file.open( IO_ReadOnly ) )
else {
KMessageBox::error( MAIN_VIEW,
i18n( "Unable to open actionfile %1").tqarg( filename ),
i18n( "Unable to open actionfile %1").arg( filename ),
i18n( "UserActions - can't read from file!" )
);
}
@ -150,7 +150,7 @@ void UserAction::readFromElement( const TQDomElement& element, ReadMode mode, Kr
int i = 0;
// appent a counter till the name is unique... (this checks every action, not only useractions)
while ( krApp->actionCollection()->action( name.latin1() ) )
name = basename.tqarg( ++i );
name = basename.arg( ++i );
KrAction* act = new KrAction( krApp->actionCollection(), name.latin1() );
if ( act->xmlRead( e ) ) {

2
krusader/VFS/arc_vfs.cpp
Unescape Escape View File

@ -215,7 +215,7 @@ bool arc_vfs::getDirs(){
proc.start(KProcess::Block);
if( !proc.normalExit() || !proc.exitStatus() == 0 ){
if (!quietMode) KMessageBox::error(krApp, i18n("<qt>Can't read <b>%1</b>. Archive "
"might be corrupted!</qt>").tqarg(arcFile.mid(arcFile.findRev('/')+1)));
"might be corrupted!</qt>").arg(arcFile.mid(arcFile.findRev('/')+1)));
error = true;
return false;
}

4
krusader/VFS/ftp_vfs.cpp
Unescape Escape View File

@ -161,12 +161,12 @@ void ftp_vfs::slotListResult( KIO::Job *job ) {
bool ftp_vfs::populateVfsList( const KURL& origin, bool showHidden ) {
TQString errorMsg = TQString();
if ( !origin.isValid() )
errorMsg = i18n( "Malformed URL:\n%1" ).tqarg( origin.url() );
errorMsg = i18n( "Malformed URL:\n%1" ).arg( origin.url() );
if ( !KProtocolInfo::supportsListing( origin ) ) {
if( origin.protocol() == "ftp" && KProtocolInfo::supportsReading( origin ) )
errorMsg = i18n( "Krusader doesn't support FTP access via HTTP.\nIf it is not the case, please check and change the Proxy settings in kcontrol." );
else
errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).tqarg( origin.url() );
errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).arg( origin.url() );
}
if ( !errorMsg.isEmpty() ) {

22
krusader/VFS/krarchandler.cpp
Unescape Escape View File

@ -202,7 +202,7 @@ long KRarcHandler::arcFileCount( TQString archive, TQString type, TQString passw
krApp->stopWait();
if( !list.normalExit() || !checkStatus( type, list.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).tqarg( archive ),
KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).arg( archive ),
list.getErrorMsg(), i18n("Error" ) );
return 0;
}
@ -259,7 +259,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
cpio << KrServices::fullPathName( "rpm2cpio" ) << " " + KrServices::quote( archive ) << " > " << cpioName;
cpio.start(KProcess::Block, KProcess::AllOutput );
if( !cpio.normalExit() || !checkStatus( "cpio", cpio.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).tqarg( archive ),
KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).arg( archive ),
cpio.getErrorMsg(), i18n("Error" ) );
return 0;
}
@ -276,7 +276,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
dpkg << KrServices::fullPathName( "dpkg" ) << " --fsys-tarfile " + KrServices::quote( archive ) << " > " << cpioName;
dpkg.start(KProcess::Block, KProcess::AllOutput );
if( !dpkg.normalExit() || !checkStatus( "-deb", dpkg.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).tqarg( archive ),
KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).arg( archive ),
dpkg.getErrorMsg(), i18n("Error" ) );
return 0;
}
@ -336,7 +336,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
// check the return value
if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).tqarg( archive ),
KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).arg( archive ),
krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) :
proc.getErrorMsg(), i18n("Error" ) );
return false;
@ -446,7 +446,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
if( size >= 10000 ) {
if( type == "-arj" || type == "-rar" )
packer += TQString( " -v%1b" ).tqarg( sizeStr );
packer += TQString( " -v%1b" ).arg( sizeStr );
}
}
@ -459,24 +459,24 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
if( type == "-rar" ) {
static const int rarLevels[] = { 0, 1, 2, 2, 3, 3, 4, 4, 5 };
packer += TQString( " -m%1" ).tqarg( rarLevels[ level ] );
packer += TQString( " -m%1" ).arg( rarLevels[ level ] );
}
else if( type == "-arj" ) {
static const int arjLevels[] = { 0, 4, 4, 3, 3, 2, 2, 1, 1 };
packer += TQString( " -m%1" ).tqarg( arjLevels[ level ] );
packer += TQString( " -m%1" ).arg( arjLevels[ level ] );
}
else if( type == "-zip" ) {
static const int zipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 };
packer += TQString( " -%1" ).tqarg( zipLevels[ level ] );
packer += TQString( " -%1" ).arg( zipLevels[ level ] );
}
else if( type == "-7z" ) {
static const int sevenZipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 };
packer += TQString( " -mx%1" ).tqarg( sevenZipLevels[ level ] );
packer += TQString( " -mx%1" ).arg( sevenZipLevels[ level ] );
}
}
if( extraProps.count( "CommandLineSwitches" ) > 0 )
packer += TQString( " %1" ).tqarg( extraProps[ "CommandLineSwitches" ] );
packer += TQString( " %1" ).arg( extraProps[ "CommandLineSwitches" ] );
// prepare to pack
KrShellProcess proc;
@ -505,7 +505,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
// check the return value
if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).tqarg( dest ),
KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).arg( dest ),
krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(),
i18n("Error" ) );
return false;

2
krusader/VFS/krquery.cpp
Unescape Escape View File

@ -451,7 +451,7 @@ bool KRQuery::checkTimer() const {
if( timer.elapsed() >= STATUS_SEND_DELAY ) {
int pcnt = (int)(100.*(double)receivedBytes/(double)totalBytes + .5);
TQString message = i18n( "Searching content of '%1' (%2%)" )
.tqarg( fileName ).tqarg( pcnt );
.arg( fileName ).arg( pcnt );
timer.start();
emit ((KRQuery *)this)->status( message );
return true;

4
krusader/VFS/normal_vfs.cpp
Unescape Escape View File

@ -87,7 +87,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
// check that the new origin exists
if ( !TQDir(path).exists() )
{
if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").tqarg( path ), i18n("Error"));
if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").arg( path ), i18n("Error"));
return false;
}
@ -97,7 +97,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
DIR* dir = opendir(path.local8Bit());
if(!dir)
{
if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error"));
if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").arg( path ), i18n("Error"));
return false;
}

2
krusader/VFS/vfs.h
Unescape Escape View File

@ -124,7 +124,7 @@ public slots:
bool vfs_refresh();
void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; }
void vfs_enableRefresh(bool enable);
void vfs_tqinvalidate() { invalidated = true; }
void vfs_invalidate() { invalidated = true; }
signals:
void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles.

2
krusader/krservices.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ TQString KrServices::registerdProtocol(TQString mimetype){
krConfig->setGroup( "Protocols" );
TQStringList protList = krConfig->readListEntry( "Handled Protocols" );
for( TQStringList::Iterator it = protList.begin(); it != protList.end(); it++ ){
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).tqarg( *it ) );
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) );
for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ )
(*slaveMap)[*it2] = *it;
}

6
krusader/krslots.cpp
Unescape Escape View File

@ -738,7 +738,7 @@ void KRslots::slotCombine(){
{
if( windowsStyle )
{
KMessageBox::error(0,i18n("Not a split file %1!").tqarg( vfs::pathOrURL( url ) ));
KMessageBox::error(0,i18n("Not a split file %1!").arg( vfs::pathOrURL( url ) ));
return;
}
unixStyle = true;
@ -801,14 +801,14 @@ void KRslots::slotCombine(){
if( error )
{
KMessageBox::error(0,i18n("Not a splitted file %1!").tqarg( vfs::pathOrURL( url ) ));
KMessageBox::error(0,i18n("Not a splitted file %1!").arg( vfs::pathOrURL( url ) ));
return;
}
}
}
// ask the user for the copy dest
KURL dest = KChooseDir::getDir(i18n("Combining %1.* to directory:" ).tqarg( vfs::pathOrURL( baseURL ) ),
KURL dest = KChooseDir::getDir(i18n("Combining %1.* to directory:" ).arg( vfs::pathOrURL( baseURL ) ),
ACTIVE_PANEL->otherPanel->virtualPath(), ACTIVE_PANEL->virtualPath());
if ( dest.isEmpty() ) return ; // the user canceled

2
krusader/main.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
// ABOUT data information
#ifdef RELEASE_NAME
TQString versionName = TQString("%1 \"%2\"").tqarg(VERSION).tqarg(RELEASE_NAME);
TQString versionName = TQString("%1 \"%2\"").arg(VERSION).arg(RELEASE_NAME);
#else
TQString versionName = VERSION;
#endif

6
krusader/panelmanager.cpp
Unescape Escape View File

@ -315,15 +315,15 @@ void PanelManager::slotPreviousTab() {
slotChangePanel(nextp);
}
void PanelManager::refreshAllTabs( bool tqinvalidate ) {
void PanelManager::refreshAllTabs( bool invalidate ) {
int i=0;
while (i < _tabbar->count()) {
PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i));
if (t && t->panel && t->panel->func ) {
vfs * vfs = t->panel->func->files();
if( vfs ) {
if( tqinvalidate )
vfs->vfs_tqinvalidate();
if( invalidate )
vfs->vfs_invalidate();
vfs->vfs_refresh();
}
}

2
krusader/panelmanager.h
Unescape Escape View File

@ -44,7 +44,7 @@ class PanelManager: public TQWidget {
int activeTab();
void setActiveTab( int );
void setCurrentTab( int );
void refreshAllTabs( bool tqinvalidate = false );
void refreshAllTabs( bool invalidate = false );
public slots:
/**

4
tar/tar.cc
Unescape Escape View File

@ -79,7 +79,7 @@ void ArchiveProtocol::put( const KURL& url, int, bool, bool resume ){
if( !m_archiveFile->prepareWriting(filename,user,group,size) ){
error(ERR_UNSUPPORTED_ACTION,
i18n("Writing to %1 is not supported").tqarg(filename) );
i18n("Writing to %1 is not supported").arg(filename) );
return;
}
while( (temp=buffer.dequeue()) ){
@ -259,7 +259,7 @@ void ArchiveProtocol::listDir( const KURL & url ) {
const KArchiveDirectory* root = m_archiveFile->directory();
const KArchiveDirectory* dir;
if ( !path.isEmpty() && path != "/" ) {
kdDebug( 7109 ) << TQString( "Looking for entry %1" ).tqarg( path ) << endl;
kdDebug( 7109 ) << TQString( "Looking for entry %1" ).arg( path ) << endl;
const KArchiveEntry* e = root->entry( path );
if ( !e ) {
error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );

Write Preview
Loading…
Cancel
Save