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

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 672c9c39de
commit bfd3620cd8
8 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File

126
src/fileaccess.cpp
Unescape View File

@ -239,27 +239,27 @@ void FileAccess::addPath( const TQString& txt )
*/ */
#ifdef KREPLACEMENTS_H #ifdef KREPLACEMENTS_H
void FileAccess::setUdsEntry( const KIO::UDSEntry& ){} // not needed if KDE is not available void FileAccess::setUdsEntry( const TDEIO::UDSEntry& ){} // not needed if KDE is not available
#else #else
void FileAccess::setUdsEntry( const KIO::UDSEntry& e ) void FileAccess::setUdsEntry( const TDEIO::UDSEntry& e )
{ {
KIO::UDSEntry::const_iterator ei; TDEIO::UDSEntry::const_iterator ei;
long acc = 0; long acc = 0;
long fileType = 0; long fileType = 0;
for( ei=e.begin(); ei!=e.end(); ++ei ) for( ei=e.begin(); ei!=e.end(); ++ei )
{ {
const KIO::UDSAtom& a = *ei; const TDEIO::UDSAtom& a = *ei;
switch( a.m_uds ) switch( a.m_uds )
{ {
case KIO::UDS_SIZE : m_size = a.m_long; break; case TDEIO::UDS_SIZE : m_size = a.m_long; break;
case KIO::UDS_USER : m_user = a.m_str; break; case TDEIO::UDS_USER : m_user = a.m_str; break;
case KIO::UDS_GROUP : m_group = a.m_str; break; case TDEIO::UDS_GROUP : m_group = a.m_str; break;
case KIO::UDS_NAME : m_path = a.m_str; break; // During listDir the relative path is given here. case TDEIO::UDS_NAME : m_path = a.m_str; break; // During listDir the relative path is given here.
case KIO::UDS_MODIFICATION_TIME : m_modificationTime.setTime_t( a.m_long ); break; case TDEIO::UDS_MODIFICATION_TIME : m_modificationTime.setTime_t( a.m_long ); break;
case KIO::UDS_ACCESS_TIME : m_accessTime.setTime_t( a.m_long ); break; case TDEIO::UDS_ACCESS_TIME : m_accessTime.setTime_t( a.m_long ); break;
case KIO::UDS_CREATION_TIME : m_creationTime.setTime_t( a.m_long ); break; case TDEIO::UDS_CREATION_TIME : m_creationTime.setTime_t( a.m_long ); break;
case KIO::UDS_LINK_DEST : m_linkTarget = a.m_str; break; case TDEIO::UDS_LINK_DEST : m_linkTarget = a.m_str; break;
case KIO::UDS_ACCESS : case TDEIO::UDS_ACCESS :
{ {
acc = a.m_long; acc = a.m_long;
m_bReadable = (acc & S_IRUSR)!=0; m_bReadable = (acc & S_IRUSR)!=0;
@ -267,7 +267,7 @@ void FileAccess::setUdsEntry( const KIO::UDSEntry& e )
m_bExecutable = (acc & S_IXUSR)!=0; m_bExecutable = (acc & S_IXUSR)!=0;
break; break;
} }
case KIO::UDS_FILE_TYPE : case TDEIO::UDS_FILE_TYPE :
{ {
fileType = a.m_long; fileType = a.m_long;
m_bDir = ( fileType & S_IFMT ) == S_IFDIR; m_bDir = ( fileType & S_IFMT ) == S_IFDIR;
@ -278,11 +278,11 @@ void FileAccess::setUdsEntry( const KIO::UDSEntry& e )
break; break;
} }
case KIO::UDS_URL : // m_url = KURL( a.str ); case TDEIO::UDS_URL : // m_url = KURL( a.str );
break; break;
case KIO::UDS_MIME_TYPE : break; case TDEIO::UDS_MIME_TYPE : break;
case KIO::UDS_GUESSED_MIME_TYPE : break; case TDEIO::UDS_GUESSED_MIME_TYPE : break;
case KIO::UDS_XML_PROPERTIES : break; case TDEIO::UDS_XML_PROPERTIES : break;
default: break; default: break;
} }
} }
@ -621,16 +621,16 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
{ {
m_bSuccess = false; m_bSuccess = false;
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
KIO::StatJob* pStatJob = KIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false ); TDEIO::StatJob* pStatJob = TDEIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false );
connect( pStatJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*))); connect( pStatJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotStatResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess; return m_bSuccess;
} }
void FileAccessJobHandler::slotStatResult(KIO::Job* pJob) void FileAccessJobHandler::slotStatResult(TDEIO::Job* pJob)
{ {
if ( pJob->error() ) if ( pJob->error() )
{ {
@ -643,7 +643,7 @@ void FileAccessJobHandler::slotStatResult(KIO::Job* pJob)
m_bSuccess = true; m_bSuccess = true;
m_pFileAccess->m_bValidData = true; m_pFileAccess->m_bValidData = true;
const KIO::UDSEntry e = static_cast<KIO::StatJob*>(pJob)->statResult(); const TDEIO::UDSEntry e = static_cast<TDEIO::StatJob*>(pJob)->statResult();
m_pFileAccess->setUdsEntry( e ); m_pFileAccess->setUdsEntry( e );
} }
@ -657,16 +657,16 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
ProgressProxy pp; // Implicitly used in slotPercent() ProgressProxy pp; // Implicitly used in slotPercent()
if ( maxLength>0 && !pp.wasCancelled() ) if ( maxLength>0 && !pp.wasCancelled() )
{ {
KIO::TransferJob* pJob = KIO::get( m_pFileAccess->m_url, false /*reload*/, false ); TDEIO::TransferJob* pJob = TDEIO::get( m_pFileAccess->m_url, false /*reload*/, false );
m_transferredBytes = 0; m_transferredBytes = 0;
m_pTransferBuffer = (char*)pDestBuffer; m_pTransferBuffer = (char*)pDestBuffer;
m_maxLength = maxLength; m_maxLength = maxLength;
m_bSuccess = false; m_bSuccess = false;
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(KIO::Job*, const TQByteArray&))); connect( pJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess; return m_bSuccess;
@ -675,7 +675,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
return true; return true;
} }
void FileAccessJobHandler::slotGetData( KIO::Job* pJob, const TQByteArray& newData ) void FileAccessJobHandler::slotGetData( TDEIO::Job* pJob, const TQByteArray& newData )
{ {
if ( pJob->error() ) if ( pJob->error() )
{ {
@ -693,16 +693,16 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
{ {
if ( maxLength>0 ) if ( maxLength>0 )
{ {
KIO::TransferJob* pJob = KIO::put( m_pFileAccess->m_url, permissions, bOverwrite, bResume, false ); TDEIO::TransferJob* pJob = TDEIO::put( m_pFileAccess->m_url, permissions, bOverwrite, bResume, false );
m_transferredBytes = 0; m_transferredBytes = 0;
m_pTransferBuffer = (char*)pSrcBuffer; m_pTransferBuffer = (char*)pSrcBuffer;
m_maxLength = maxLength; m_maxLength = maxLength;
m_bSuccess = false; m_bSuccess = false;
m_pFileAccess->m_statusText = TQString(); m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotPutJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotPutJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(KIO::Job*, TQByteArray&))); connect( pJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(TDEIO::Job*, TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess; return m_bSuccess;
@ -711,7 +711,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
return true; return true;
} }
void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data ) void FileAccessJobHandler::slotPutData( TDEIO::Job* pJob, TQByteArray& data )
{ {
if ( pJob->error() ) if ( pJob->error() )
{ {
@ -739,7 +739,7 @@ void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data )
} }
} }
void FileAccessJobHandler::slotPutJobResult(KIO::Job* pJob) void FileAccessJobHandler::slotPutJobResult(TDEIO::Job* pJob)
{ {
if ( pJob->error() ) if ( pJob->error() )
{ {
@ -764,8 +764,8 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
else else
{ {
m_bSuccess = false; m_bSuccess = false;
KIO::SimpleJob* pJob = KIO::mkdir( dirURL ); TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
return m_bSuccess; return m_bSuccess;
@ -784,8 +784,8 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
else else
{ {
m_bSuccess = false; m_bSuccess = false;
KIO::SimpleJob* pJob = KIO::rmdir( dirURL ); TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName)); g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
return m_bSuccess; return m_bSuccess;
@ -799,8 +799,8 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
else else
{ {
m_bSuccess = false; m_bSuccess = false;
KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false ); TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) ); g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
return m_bSuccess; return m_bSuccess;
@ -814,8 +814,8 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
else else
{ {
m_bSuccess = false; m_bSuccess = false;
KIO::CopyJob* pJob = KIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false ); TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) ); i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
@ -843,9 +843,9 @@ bool FileAccessJobHandler::rename( const TQString& dest )
bool bShowProgress = false; bool bShowProgress = false;
int permissions=-1; int permissions=-1;
m_bSuccess = false; m_bSuccess = false;
KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress ); TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -853,7 +853,7 @@ bool FileAccessJobHandler::rename( const TQString& dest )
} }
} }
void FileAccessJobHandler::slotSimpleJobResult(KIO::Job* pJob) void FileAccessJobHandler::slotSimpleJobResult(TDEIO::Job* pJob)
{ {
if ( pJob->error() ) if ( pJob->error() )
{ {
@ -880,9 +880,9 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
bool bShowProgress = false; bool bShowProgress = false;
int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0);
m_bSuccess = false; m_bSuccess = false;
KIO::FileCopyJob* pJob = KIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress ); TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, g_pProgressDialog->enterEventLoop( pJob,
i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -1326,22 +1326,22 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
{ {
bool bShowProgress = false; bool bShowProgress = false;
KIO::ListJob* pListJob=0; TDEIO::ListJob* pListJob=0;
pListJob = KIO::listDir( m_pFileAccess->m_url, bShowProgress, true /*bFindHidden*/ ); pListJob = TDEIO::listDir( m_pFileAccess->m_url, bShowProgress, true /*bFindHidden*/ );
m_bSuccess = false; m_bSuccess = false;
if ( pListJob!=0 ) if ( pListJob!=0 )
{ {
connect( pListJob, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), connect( pListJob, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
this, TQT_SLOT( slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& )) ); this, TQT_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) );
connect( pListJob, TQT_SIGNAL( result( KIO::Job* )), connect( pListJob, TQT_SIGNAL( result( TDEIO::Job* )),
this, TQT_SLOT( slotSimpleJobResult(KIO::Job*) ) ); this, TQT_SLOT( slotSimpleJobResult(TDEIO::Job*) ) );
connect( pListJob, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&)), connect( pListJob, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)),
this, TQT_SLOT( slotListDirInfoMessage(KIO::Job*, const TQString&) )); this, TQT_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) ));
// This line makes the transfer via fish unreliable.:-( // This line makes the transfer via fish unreliable.:-(
//connect( pListJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); //connect( pListJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pListJob, g_pProgressDialog->enterEventLoop( pListJob,
i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) ); i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
@ -1418,14 +1418,14 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
} }
void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ) void FileAccessJobHandler::slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& l )
{ {
KURL parentUrl( m_pFileAccess->m_absFilePath ); KURL parentUrl( m_pFileAccess->m_absFilePath );
KIO::UDSEntryList::ConstIterator i; TDEIO::UDSEntryList::ConstIterator i;
for ( i=l.begin(); i!=l.end(); ++i ) for ( i=l.begin(); i!=l.end(); ++i )
{ {
const KIO::UDSEntry& e = *i; const TDEIO::UDSEntry& e = *i;
FileAccess fa; FileAccess fa;
fa.setUdsEntry( e ); fa.setUdsEntry( e );
@ -1439,12 +1439,12 @@ void FileAccessJobHandler::slotListDirProcessNewEntries( KIO::Job *, const KIO::
} }
} }
void FileAccessJobHandler::slotListDirInfoMessage( KIO::Job*, const TQString& msg ) void FileAccessJobHandler::slotListDirInfoMessage( TDEIO::Job*, const TQString& msg )
{ {
g_pProgressDialog->setInformation( msg, 0.0 ); g_pProgressDialog->setInformation( msg, 0.0 );
} }
void FileAccessJobHandler::slotPercent( KIO::Job*, unsigned long percent ) void FileAccessJobHandler::slotPercent( TDEIO::Job*, unsigned long percent )
{ {
g_pProgressDialog->setCurrent( percent/100.0 ); g_pProgressDialog->setCurrent( percent/100.0 );
} }
@ -1612,7 +1612,7 @@ void ProgressDialog::setSubRangeTransformation( double dMin, double dMax )
void tqt_enter_modal(TQWidget*); void tqt_enter_modal(TQWidget*);
void tqt_leave_modal(TQWidget*); void tqt_leave_modal(TQWidget*);
void ProgressDialog::enterEventLoop( KIO::Job* pJob, const TQString& jobInfo ) void ProgressDialog::enterEventLoop( TDEIO::Job* pJob, const TQString& jobInfo )
{ {
m_pJob = pJob; m_pJob = pJob;
m_pSlowJobInfo->setText(""); m_pSlowJobInfo->setText("");

22
src/fileaccess.h
Unescape View File

@ -82,7 +82,7 @@ public:
void addPath( const TQString& txt ); void addPath( const TQString& txt );
TQString getStatusText(); TQString getStatusText();
private: private:
void setUdsEntry( const KIO::UDSEntry& e ); void setUdsEntry( const TDEIO::UDSEntry& e );
KURL m_url; KURL m_url;
bool m_bLocal; bool m_bLocal;
bool m_bValidData; bool m_bValidData;
@ -157,17 +157,17 @@ private:
bool scanLocalDirectory( const TQString& dirName, t_DirectoryList* dirList ); bool scanLocalDirectory( const TQString& dirName, t_DirectoryList* dirList );
private slots: private slots:
void slotStatResult( KIO::Job* ); void slotStatResult( TDEIO::Job* );
void slotSimpleJobResult( KIO::Job* pJob ); void slotSimpleJobResult( TDEIO::Job* pJob );
void slotPutJobResult( KIO::Job* pJob ); void slotPutJobResult( TDEIO::Job* pJob );
void slotGetData(KIO::Job*,const TQByteArray&); void slotGetData(TDEIO::Job*,const TQByteArray&);
void slotPutData(KIO::Job*, TQByteArray&); void slotPutData(TDEIO::Job*, TQByteArray&);
void slotListDirInfoMessage( KIO::Job*, const TQString& msg ); void slotListDirInfoMessage( TDEIO::Job*, const TQString& msg );
void slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ); void slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& l );
void slotPercent( KIO::Job* pJob, unsigned long percent ); void slotPercent( TDEIO::Job* pJob, unsigned long percent );
}; };
class ProgressDialog : public TQDialog class ProgressDialog : public TQDialog
@ -194,7 +194,7 @@ public:
void setSubRangeTransformation( double dMin, double dMax ); void setSubRangeTransformation( double dMin, double dMax );
void exitEventLoop(); void exitEventLoop();
void enterEventLoop( KIO::Job* pJob, const TQString& jobInfo ); void enterEventLoop( TDEIO::Job* pJob, const TQString& jobInfo );
bool wasCancelled(); bool wasCancelled();
void show(); void show();
@ -231,7 +231,7 @@ private:
TQTime m_t1; TQTime m_t1;
TQTime m_t2; TQTime m_t2;
bool m_bWasCancelled; bool m_bWasCancelled;
KIO::Job* m_pJob; TDEIO::Job* m_pJob;
TQString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. TQString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time.
bool m_bStayHidden; bool m_bStayHidden;
protected: protected:

2
src/kdiff3.cpp
Unescape View File

@ -568,7 +568,7 @@ void KDiff3App::initStatusBar()
statusBar()->message( i18n("Ready.") ); statusBar()->message( i18n("Ready.") );
} }
void KDiff3App::saveOptions( KConfig* config ) void KDiff3App::saveOptions( TDEConfig* config )
{ {
if ( !m_bAutoMode ) if ( !m_bAutoMode )
{ {

6
src/kdiff3.h
Unescape View File

@ -112,10 +112,10 @@ class KDiff3App : public TQSplitter
/** save general Options like all bar positions and status as well as the geometry /** save general Options like all bar positions and status as well as the geometry
and the recent file list to the configuration file */ and the recent file list to the configuration file */
void saveOptions( KConfig* ); void saveOptions( TDEConfig* );
/** read general Options again and initialize all variables like the recent file list */ /** read general Options again and initialize all variables like the recent file list */
void readOptions( KConfig* ); void readOptions( TDEConfig* );
// Finish initialisation (virtual, so that it can be called from the shell too.) // Finish initialisation (virtual, so that it can be called from the shell too.)
virtual void completeInit(const TQString& fn1="", const TQString& fn2="", const TQString& fn3=""); virtual void completeInit(const TQString& fn1="", const TQString& fn2="", const TQString& fn3="");
@ -182,7 +182,7 @@ class KDiff3App : public TQSplitter
private: private:
/** the configuration object of the application */ /** the configuration object of the application */
//KConfig *config; //TDEConfig *config;
// KAction pointers to enable/disable actions // KAction pointers to enable/disable actions
KAction* fileOpen; KAction* fileOpen;

12
src/kreplacements/kreplacements.cpp
Unescape View File

@ -433,11 +433,11 @@ TQString KStandardDirs::findResource(const TQString& resource, const TQString& /
return TQString(); return TQString();
} }
KConfig::KConfig() TDEConfig::TDEConfig()
{ {
} }
void KConfig::readConfigFile( const TQString& configFileName ) void TDEConfig::readConfigFile( const TQString& configFileName )
{ {
if ( !configFileName.isEmpty() ) if ( !configFileName.isEmpty() )
{ {
@ -457,7 +457,7 @@ void KConfig::readConfigFile( const TQString& configFileName )
} }
} }
KConfig::~KConfig() TDEConfig::~TDEConfig()
{ {
TQFile f(m_fileName); TQFile f(m_fileName);
if ( f.open( IO_WriteOnly | IO_Translate ) ) if ( f.open( IO_WriteOnly | IO_Translate ) )
@ -468,7 +468,7 @@ KConfig::~KConfig()
} }
} }
void KConfig::setGroup(const TQString&) void TDEConfig::setGroup(const TQString&)
{ {
} }
@ -1109,7 +1109,7 @@ TDEApplication::TDEApplication()
} }
} }
KConfig* TDEApplication::config() TDEConfig* TDEApplication::config()
{ {
return &m_config; return &m_config;
} }
@ -1130,7 +1130,7 @@ KIconLoader* TDEApplication::iconLoader()
} }
namespace KIO namespace TDEIO
{ {
SimpleJob* mkdir( KURL ){return 0;} SimpleJob* mkdir( KURL ){return 0;}
SimpleJob* rmdir( KURL ){return 0;} SimpleJob* rmdir( KURL ){return 0;}

18
src/kreplacements/kreplacements.h
Unescape View File

@ -206,12 +206,12 @@ public slots:
void slotAbout(); void slotAbout();
}; };
class KConfig : public ValueMap class TDEConfig : public ValueMap
{ {
TQString m_fileName; TQString m_fileName;
public: public:
KConfig(); TDEConfig();
~KConfig(); ~TDEConfig();
void readConfigFile(const TQString& configFileName); void readConfigFile(const TQString& configFileName);
void setGroup(const TQString&); void setGroup(const TQString&);
@ -377,13 +377,13 @@ public:
class TDEApplication : public TQApplication class TDEApplication : public TQApplication
{ {
KConfig m_config; TDEConfig m_config;
KIconLoader m_iconLoader; KIconLoader m_iconLoader;
public: public:
TDEApplication(); TDEApplication();
static TDEApplication* kApplication(); static TDEApplication* kApplication();
KIconLoader* iconLoader(); KIconLoader* iconLoader();
KConfig* config(); TDEConfig* config();
bool isRestored(); bool isRestored();
}; };
@ -413,10 +413,10 @@ public:
class TDEGlobal class TDEGlobal
{ {
public: public:
static KConfig* config() { return 0; } static TDEConfig* config() { return 0; }
}; };
namespace KIO namespace TDEIO
{ {
enum UDSEntry {}; enum UDSEntry {};
typedef TQValueList<UDSEntry> UDSEntryList; typedef TQValueList<UDSEntry> UDSEntryList;
@ -464,8 +464,8 @@ namespace KParts
MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {} MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {}
void setXMLFile(const TQString&){} void setXMLFile(const TQString&){}
void setAutoSaveSettings(){} void setAutoSaveSettings(){}
void saveMainWindowSettings(KConfig*){} void saveMainWindowSettings(TDEConfig*){}
void applyMainWindowSettings(KConfig*){} void applyMainWindowSettings(TDEConfig*){}
int factory(){return 0;} int factory(){return 0;}
}; };

8
src/optiondialog.cpp
Unescape View File

@ -1627,9 +1627,9 @@ void OptionDialog::setState()
class ConfigValueMap : public ValueMap class ConfigValueMap : public ValueMap
{ {
private: private:
KConfig* m_pConfig; TDEConfig* m_pConfig;
public: public:
ConfigValueMap( KConfig* pConfig ) { m_pConfig = pConfig; } ConfigValueMap( TDEConfig* pConfig ) { m_pConfig = pConfig; }
void writeEntry(const TQString& s, const TQFont& v ){ m_pConfig->writeEntry(s,v); } void writeEntry(const TQString& s, const TQFont& v ){ m_pConfig->writeEntry(s,v); }
void writeEntry(const TQString& s, const TQColor& v ){ m_pConfig->writeEntry(s,v); } void writeEntry(const TQString& s, const TQColor& v ){ m_pConfig->writeEntry(s,v); }
@ -1651,7 +1651,7 @@ public:
TQString readEntry (const TQString& s, const TQString& defaultVal){ return m_pConfig->readEntry(s,defaultVal); } TQString readEntry (const TQString& s, const TQString& defaultVal){ return m_pConfig->readEntry(s,defaultVal); }
}; };
void OptionDialog::saveOptions( KConfig* config ) void OptionDialog::saveOptions( TDEConfig* config )
{ {
// No i18n()-Translations here! // No i18n()-Translations here!
@ -1665,7 +1665,7 @@ void OptionDialog::saveOptions( KConfig* config )
} }
} }
void OptionDialog::readOptions( KConfig* config ) void OptionDialog::readOptions( TDEConfig* config )
{ {
// No i18n()-Translations here! // No i18n()-Translations here!

6
src/optiondialog.h
Unescape View File

@ -27,7 +27,7 @@ class TQLabel;
class TQLineEdit; class TQLineEdit;
class KColorButton; class KColorButton;
class KFontChooser; class KFontChooser;
class KConfig; class TDEConfig;
#include <kdialogbase.h> #include <kdialogbase.h>
#include <tqstringlist.h> #include <tqstringlist.h>
@ -165,8 +165,8 @@ public:
TQString m_ignorableCmdLineOptions; TQString m_ignorableCmdLineOptions;
bool m_bIntegrateWithClearCase; bool m_bIntegrateWithClearCase;
void saveOptions(KConfig* config); void saveOptions(TDEConfig* config);
void readOptions(KConfig* config); void readOptions(TDEConfig* config);
void setState(); // Must be called before calling exec(); void setState(); // Must be called before calling exec();

Write Preview
Loading…
Cancel
Save