diff options
| -rw-r--r-- | src/fileaccess.cpp | 126 | ||||
| -rw-r--r-- | src/fileaccess.h | 22 | ||||
| -rw-r--r-- | src/kdiff3.cpp | 2 | ||||
| -rw-r--r-- | src/kdiff3.h | 6 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.cpp | 12 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.h | 18 | ||||
| -rw-r--r-- | src/optiondialog.cpp | 8 | ||||
| -rw-r--r-- | src/optiondialog.h | 6 |
8 files changed, 100 insertions, 100 deletions
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index 0e1b599..eaf1732 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -239,27 +239,27 @@ void FileAccess::addPath( const TQString& txt ) */ #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 -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 fileType = 0; for( ei=e.begin(); ei!=e.end(); ++ei ) { - const KIO::UDSAtom& a = *ei; + const TDEIO::UDSAtom& a = *ei; switch( a.m_uds ) { - case KIO::UDS_SIZE : m_size = a.m_long; break; - case KIO::UDS_USER : m_user = a.m_str; break; - case KIO::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 KIO::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 KIO::UDS_CREATION_TIME : m_creationTime.setTime_t( a.m_long ); break; - case KIO::UDS_LINK_DEST : m_linkTarget = a.m_str; break; - case KIO::UDS_ACCESS : + case TDEIO::UDS_SIZE : m_size = a.m_long; break; + case TDEIO::UDS_USER : m_user = a.m_str; break; + case TDEIO::UDS_GROUP : m_group = a.m_str; break; + case TDEIO::UDS_NAME : m_path = a.m_str; break; // During listDir the relative path is given here. + case TDEIO::UDS_MODIFICATION_TIME : m_modificationTime.setTime_t( a.m_long ); break; + case TDEIO::UDS_ACCESS_TIME : m_accessTime.setTime_t( a.m_long ); break; + case TDEIO::UDS_CREATION_TIME : m_creationTime.setTime_t( a.m_long ); break; + case TDEIO::UDS_LINK_DEST : m_linkTarget = a.m_str; break; + case TDEIO::UDS_ACCESS : { acc = a.m_long; m_bReadable = (acc & S_IRUSR)!=0; @@ -267,7 +267,7 @@ void FileAccess::setUdsEntry( const KIO::UDSEntry& e ) m_bExecutable = (acc & S_IXUSR)!=0; break; } - case KIO::UDS_FILE_TYPE : + case TDEIO::UDS_FILE_TYPE : { fileType = a.m_long; m_bDir = ( fileType & S_IFMT ) == S_IFDIR; @@ -278,11 +278,11 @@ void FileAccess::setUdsEntry( const KIO::UDSEntry& e ) break; } - case KIO::UDS_URL : // m_url = KURL( a.str ); + case TDEIO::UDS_URL : // m_url = KURL( a.str ); break; - case KIO::UDS_MIME_TYPE : break; - case KIO::UDS_GUESSED_MIME_TYPE : break; - case KIO::UDS_XML_PROPERTIES : break; + case TDEIO::UDS_MIME_TYPE : break; + case TDEIO::UDS_GUESSED_MIME_TYPE : break; + case TDEIO::UDS_XML_PROPERTIES : break; default: break; } } @@ -621,16 +621,16 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite ) { m_bSuccess = false; 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()) ); return m_bSuccess; } -void FileAccessJobHandler::slotStatResult(KIO::Job* pJob) +void FileAccessJobHandler::slotStatResult(TDEIO::Job* pJob) { if ( pJob->error() ) { @@ -643,7 +643,7 @@ void FileAccessJobHandler::slotStatResult(KIO::Job* pJob) m_bSuccess = 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 ); } @@ -657,16 +657,16 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength ) ProgressProxy pp; // Implicitly used in slotPercent() 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_pTransferBuffer = (char*)pDestBuffer; m_maxLength = maxLength; m_bSuccess = false; m_pFileAccess->m_statusText = TQString(); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); - 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))); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&))); + 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()) ); return m_bSuccess; @@ -675,7 +675,7 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength ) return true; } -void FileAccessJobHandler::slotGetData( KIO::Job* pJob, const TQByteArray& newData ) +void FileAccessJobHandler::slotGetData( TDEIO::Job* pJob, const TQByteArray& newData ) { if ( pJob->error() ) { @@ -693,16 +693,16 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve { 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_pTransferBuffer = (char*)pSrcBuffer; m_maxLength = maxLength; m_bSuccess = false; m_pFileAccess->m_statusText = TQString(); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotPutJobResult(KIO::Job*))); - 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))); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotPutJobResult(TDEIO::Job*))); + connect( pJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(TDEIO::Job*, TQByteArray&))); + 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()) ); return m_bSuccess; @@ -711,7 +711,7 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve return true; } -void FileAccessJobHandler::slotPutData( KIO::Job* pJob, TQByteArray& data ) +void FileAccessJobHandler::slotPutData( TDEIO::Job* pJob, TQByteArray& data ) { 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() ) { @@ -764,8 +764,8 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName ) else { m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::mkdir( dirURL ); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) ); return m_bSuccess; @@ -784,8 +784,8 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName ) else { m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::rmdir( dirURL ); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName)); return m_bSuccess; @@ -799,8 +799,8 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName ) else { m_bSuccess = false; - KIO::SimpleJob* pJob = KIO::file_delete( KURL::fromPathOrURL(fileName), false ); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) ); return m_bSuccess; @@ -814,8 +814,8 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString& else { m_bSuccess = false; - KIO::CopyJob* pJob = KIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false ); - connect( pJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(KIO::Job*))); + TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) ); @@ -843,9 +843,9 @@ bool FileAccessJobHandler::rename( const TQString& dest ) bool bShowProgress = false; int permissions=-1; m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::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(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, 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() ) { @@ -880,9 +880,9 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) bool bShowProgress = false; int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); m_bSuccess = false; - KIO::FileCopyJob* pJob = KIO::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(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(KIO::Job*, unsigned long))); + TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress ); + connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, 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; - KIO::ListJob* pListJob=0; - pListJob = KIO::listDir( m_pFileAccess->m_url, bShowProgress, true /*bFindHidden*/ ); + TDEIO::ListJob* pListJob=0; + pListJob = TDEIO::listDir( m_pFileAccess->m_url, bShowProgress, true /*bFindHidden*/ ); m_bSuccess = false; if ( pListJob!=0 ) { - connect( pListJob, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), - this, TQT_SLOT( slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& )) ); - connect( pListJob, TQT_SIGNAL( result( KIO::Job* )), - this, TQT_SLOT( slotSimpleJobResult(KIO::Job*) ) ); + connect( pListJob, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + this, TQT_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) ); + connect( pListJob, TQT_SIGNAL( result( TDEIO::Job* )), + this, TQT_SLOT( slotSimpleJobResult(TDEIO::Job*) ) ); - connect( pListJob, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&)), - this, TQT_SLOT( slotListDirInfoMessage(KIO::Job*, const TQString&) )); + connect( pListJob, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)), + this, TQT_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) )); // 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, 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 ); - KIO::UDSEntryList::ConstIterator i; + TDEIO::UDSEntryList::ConstIterator i; for ( i=l.begin(); i!=l.end(); ++i ) { - const KIO::UDSEntry& e = *i; + const TDEIO::UDSEntry& e = *i; FileAccess fa; 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 ); } -void FileAccessJobHandler::slotPercent( KIO::Job*, unsigned long percent ) +void FileAccessJobHandler::slotPercent( TDEIO::Job*, unsigned long percent ) { g_pProgressDialog->setCurrent( percent/100.0 ); } @@ -1612,7 +1612,7 @@ void ProgressDialog::setSubRangeTransformation( double dMin, double dMax ) void tqt_enter_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_pSlowJobInfo->setText(""); diff --git a/src/fileaccess.h b/src/fileaccess.h index 2a5deeb..1103f46 100644 --- a/src/fileaccess.h +++ b/src/fileaccess.h @@ -82,7 +82,7 @@ public: void addPath( const TQString& txt ); TQString getStatusText(); private: - void setUdsEntry( const KIO::UDSEntry& e ); + void setUdsEntry( const TDEIO::UDSEntry& e ); KURL m_url; bool m_bLocal; bool m_bValidData; @@ -157,17 +157,17 @@ private: bool scanLocalDirectory( const TQString& dirName, t_DirectoryList* dirList ); private slots: - void slotStatResult( KIO::Job* ); - void slotSimpleJobResult( KIO::Job* pJob ); - void slotPutJobResult( KIO::Job* pJob ); + void slotStatResult( TDEIO::Job* ); + void slotSimpleJobResult( TDEIO::Job* pJob ); + void slotPutJobResult( TDEIO::Job* pJob ); - void slotGetData(KIO::Job*,const TQByteArray&); - void slotPutData(KIO::Job*, TQByteArray&); + void slotGetData(TDEIO::Job*,const TQByteArray&); + void slotPutData(TDEIO::Job*, TQByteArray&); - void slotListDirInfoMessage( KIO::Job*, const TQString& msg ); - void slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l ); + void slotListDirInfoMessage( TDEIO::Job*, const TQString& msg ); + 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 @@ -194,7 +194,7 @@ public: void setSubRangeTransformation( double dMin, double dMax ); void exitEventLoop(); - void enterEventLoop( KIO::Job* pJob, const TQString& jobInfo ); + void enterEventLoop( TDEIO::Job* pJob, const TQString& jobInfo ); bool wasCancelled(); void show(); @@ -231,7 +231,7 @@ private: TQTime m_t1; TQTime m_t2; 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. bool m_bStayHidden; protected: diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index f971081..377257b 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -568,7 +568,7 @@ void KDiff3App::initStatusBar() statusBar()->message( i18n("Ready.") ); } -void KDiff3App::saveOptions( KConfig* config ) +void KDiff3App::saveOptions( TDEConfig* config ) { if ( !m_bAutoMode ) { diff --git a/src/kdiff3.h b/src/kdiff3.h index 00cca9e..4ce8db2 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -112,10 +112,10 @@ class KDiff3App : public TQSplitter /** save general Options like all bar positions and status as well as the geometry 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 */ - void readOptions( KConfig* ); + void readOptions( TDEConfig* ); // 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=""); @@ -182,7 +182,7 @@ class KDiff3App : public TQSplitter private: /** the configuration object of the application */ - //KConfig *config; + //TDEConfig *config; // KAction pointers to enable/disable actions KAction* fileOpen; diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index 93954da..3aad865 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -433,11 +433,11 @@ TQString KStandardDirs::findResource(const TQString& resource, const TQString& / return TQString(); } -KConfig::KConfig() +TDEConfig::TDEConfig() { } -void KConfig::readConfigFile( const TQString& configFileName ) +void TDEConfig::readConfigFile( const TQString& configFileName ) { if ( !configFileName.isEmpty() ) { @@ -457,7 +457,7 @@ void KConfig::readConfigFile( const TQString& configFileName ) } } -KConfig::~KConfig() +TDEConfig::~TDEConfig() { TQFile f(m_fileName); 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; } @@ -1130,7 +1130,7 @@ KIconLoader* TDEApplication::iconLoader() } -namespace KIO +namespace TDEIO { SimpleJob* mkdir( KURL ){return 0;} SimpleJob* rmdir( KURL ){return 0;} diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index bebe96c..dae652f 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -206,12 +206,12 @@ public slots: void slotAbout(); }; -class KConfig : public ValueMap +class TDEConfig : public ValueMap { TQString m_fileName; public: - KConfig(); - ~KConfig(); + TDEConfig(); + ~TDEConfig(); void readConfigFile(const TQString& configFileName); void setGroup(const TQString&); @@ -377,13 +377,13 @@ public: class TDEApplication : public TQApplication { - KConfig m_config; + TDEConfig m_config; KIconLoader m_iconLoader; public: TDEApplication(); static TDEApplication* kApplication(); KIconLoader* iconLoader(); - KConfig* config(); + TDEConfig* config(); bool isRestored(); }; @@ -413,10 +413,10 @@ public: class TDEGlobal { public: - static KConfig* config() { return 0; } + static TDEConfig* config() { return 0; } }; -namespace KIO +namespace TDEIO { enum UDSEntry {}; typedef TQValueList<UDSEntry> UDSEntryList; @@ -464,8 +464,8 @@ namespace KParts MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {} void setXMLFile(const TQString&){} void setAutoSaveSettings(){} - void saveMainWindowSettings(KConfig*){} - void applyMainWindowSettings(KConfig*){} + void saveMainWindowSettings(TDEConfig*){} + void applyMainWindowSettings(TDEConfig*){} int factory(){return 0;} }; diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 7c70004..a67c665 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -1627,9 +1627,9 @@ void OptionDialog::setState() class ConfigValueMap : public ValueMap { private: - KConfig* m_pConfig; + TDEConfig* m_pConfig; 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 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); } }; -void OptionDialog::saveOptions( KConfig* config ) +void OptionDialog::saveOptions( TDEConfig* config ) { // 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! diff --git a/src/optiondialog.h b/src/optiondialog.h index 3fd6cf7..03803c0 100644 --- a/src/optiondialog.h +++ b/src/optiondialog.h @@ -27,7 +27,7 @@ class TQLabel; class TQLineEdit; class KColorButton; class KFontChooser; -class KConfig; +class TDEConfig; #include <kdialogbase.h> #include <tqstringlist.h> @@ -165,8 +165,8 @@ public: TQString m_ignorableCmdLineOptions; bool m_bIntegrateWithClearCase; - void saveOptions(KConfig* config); - void readOptions(KConfig* config); + void saveOptions(TDEConfig* config); + void readOptions(TDEConfig* config); void setState(); // Must be called before calling exec(); |