diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:07:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:07:22 -0600 |
commit | bfd3620cd83f108b5f82d034ffb250748755dfd5 (patch) | |
tree | d14f8bc2abaa71dc9216b85dcf323cc3df62f845 /src/kreplacements/kreplacements.cpp | |
parent | 672c9c39de40e4da2849acbacf0b943dd26a31ac (diff) | |
download | kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.tar.gz kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements/kreplacements.cpp')
-rw-r--r-- | src/kreplacements/kreplacements.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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;} |