diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:33:36 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:33:36 -0600 |
commit | 3c5631f74d1c75204f950140331e10f739082ee9 (patch) | |
tree | a2811ff6c81d3c771745cde47734e65b1da3d806 /kmrml/kmrml/lib | |
parent | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (diff) | |
download | tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.tar.gz tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/lib')
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 8 | ||||
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index 63bc5e8a..be408bc2 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -54,13 +54,13 @@ const int DEFAULT_PORT = 12789; Config::Config() { - m_ownConfig = new KConfig( "kio_mrmlrc", false, false ); + m_ownConfig = new TDEConfig( "kio_mrmlrc", false, false ); m_config = m_ownConfig; init(); } -Config::Config( KConfig *config ) +Config::Config( TDEConfig *config ) : m_config( config ), m_ownConfig( 0L ) { @@ -98,7 +98,7 @@ bool Config::sync() // mrmlsearch binary can also use this class) // tell the ioslaves about the new configuration // if ( notifySlaves ) -// KIO::SlaveConfig::self()->reset(); +// TDEIO::SlaveConfig::self()->reset(); } void Config::setDefaultHost( const TQString& host ) @@ -117,7 +117,7 @@ ServerSettings Config::settingsForLocalHost() const ServerSettings Config::settingsForHost( const TQString& host ) const { - KConfigGroup config( m_config, settingsGroup( host ) ); + TDEConfigGroup config( m_config, settingsGroup( host ) ); ServerSettings settings; settings.host = host; diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h index 2208030a..5a423360 100644 --- a/kmrml/kmrml/lib/kmrml_config.h +++ b/kmrml/kmrml/lib/kmrml_config.h @@ -19,7 +19,7 @@ #ifndef KMRML_CONFIG_H #define KMRML_CONFIG_H -class KConfig; +class TDEConfig; #include <tqstringlist.h> #include <kurl.h> @@ -57,7 +57,7 @@ namespace KMrml { public: Config(); - Config( KConfig *config ); // does not take ownership of KConfig + Config( TDEConfig *config ); // does not take ownership of TDEConfig ~Config(); bool sync(); @@ -115,8 +115,8 @@ namespace KMrml TQString m_defaultHost; TQStringList m_hostList; - KConfig *m_config; - KConfig *m_ownConfig; + TDEConfig *m_config; + TDEConfig *m_ownConfig; }; } |