summaryrefslogtreecommitdiffstats
path: root/src/fileaccess.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:36:20 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:36:20 -0600
commit9b57232f1beb774a8a4bab4ae1f85999e193d037 (patch)
tree38c3bc221a50176fafef2efb58e2f9337e1aaf39 /src/fileaccess.cpp
parentc7e29c4606e72cf1d3d0052eec08805c8cf3fce7 (diff)
downloadkdiff3-9b57232f1beb774a8a4bab4ae1f85999e193d037.tar.gz
kdiff3-9b57232f1beb774a8a4bab4ae1f85999e193d037.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/fileaccess.cpp')
-rw-r--r--src/fileaccess.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index 01b8d48..1f90d5d 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -625,7 +625,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
connect( pStatJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*)));
- g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
+ g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess;
}
@@ -668,7 +668,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
connect( pJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(KIO::Job*, const TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess;
}
else
@@ -704,7 +704,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
connect( pJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(KIO::Job*, TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
- g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess;
}
else
@@ -721,7 +721,7 @@ void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data )
{
long maxChunkSize = 100000;
long length = min2( maxChunkSize, m_maxLength - m_transferredBytes );
- bool bSuccess = data.tqresize( length );
+ bool bSuccess = data.resize( length );
if ( bSuccess )
{
if ( length>0 )
@@ -767,7 +767,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
KIO::SimpleJob* pJob = KIO::mkdir( dirURL );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").tqarg(dirName) );
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
return m_bSuccess;
}
}
@@ -787,7 +787,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
KIO::SimpleJob* pJob = KIO::rmdir( dirURL );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").tqarg(dirName));
+ g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
return m_bSuccess;
}
}
@@ -802,7 +802,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
- g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").tqarg(fileName) );
+ g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
return m_bSuccess;
}
}
@@ -818,7 +818,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob,
- i18n("Creating symbolic link: %1 -> %2").tqarg(linkLocation).tqarg(linkTarget) );
+ i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
return m_bSuccess;
}
}
@@ -848,7 +848,7 @@ bool FileAccessJobHandler::rename( const TQString& dest )
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob,
- i18n("Renaming file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
+ i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
return m_bSuccess;
}
}
@@ -884,7 +884,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob,
- i18n("Copying file: %1 -> %2").tqarg(m_pFileAccess->prettyAbsPath()).tqarg(dest) );
+ i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
return m_bSuccess;
// Note that the KIO-slave preserves the original date, if this is supported.
@@ -898,13 +898,13 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
bool bReadSuccess = srcFile.open( IO_ReadOnly );
if ( bReadSuccess == false )
{
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").tqarg(srcName);
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for reading failed. Filename: %1").arg(srcName);
return false;
}
bool bWriteSuccess = destFile.open( IO_WriteOnly );
if ( bWriteSuccess == false )
{
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").tqarg(destName);
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Opening file for writing failed. Filename: %1").arg(destName);
return false;
}
@@ -916,7 +916,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
TQ_LONG readSize = srcFile.readBlock( &buffer[0], min2( srcSize, bufSize ) );
if ( readSize==-1 || readSize==0 )
{
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").tqarg(srcName);
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Reading failed. Filename: %1").arg(srcName);
return false;
}
srcSize -= readSize;
@@ -925,7 +925,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
TQ_LONG writeSize = destFile.writeBlock( &buffer[0], readSize );
if ( writeSize==-1 || writeSize==0 )
{
- m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").tqarg(destName);
+ m_pFileAccess->m_statusText = i18n("Error during file copy operation: Writing failed. Filename: %1").arg(destName);
return false;
}
readSize -= writeSize;
@@ -1344,7 +1344,7 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
//connect( pListJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pListJob,
- i18n("Listing directory: %1").tqarg(m_pFileAccess->prettyAbsPath()) );
+ i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
}
}