From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- ksysguard/gui/Workspace.cc | 8 ++++---- ksysguard/gui/Workspace.h | 6 +++--- ksysguard/gui/ksgrd/SensorManager.cc | 4 ++-- ksysguard/gui/ksgrd/SensorManager.h | 4 ++-- ksysguard/gui/ksgrd/SensorSocketAgent.cc | 8 ++++---- ksysguard/gui/ksgrd/StyleEngine.cc | 4 ++-- ksysguard/gui/ksgrd/StyleEngine.h | 6 +++--- ksysguard/gui/ksysguard.cc | 4 ++-- ksysguard/gui/ksysguard.h | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'ksysguard') diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 1fb1e1e62..7271bab8e 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -66,7 +66,7 @@ Workspace::~Workspace() TQT_SLOT( updateCaption( TQWidget* ) ) ); } -void Workspace::saveProperties( KConfig *cfg ) +void Workspace::saveProperties( TDEConfig *cfg ) { cfg->writePathEntry( "WorkDir", mWorkDir ); cfg->writeEntry( "CurrentSheet", tabLabel( currentPage() ) ); @@ -81,7 +81,7 @@ void Workspace::saveProperties( KConfig *cfg ) cfg->writePathEntry( "Sheets", list ); } -void Workspace::readProperties( KConfig *cfg ) +void Workspace::readProperties( TDEConfig *cfg ) { TQString currentSheet; @@ -195,7 +195,7 @@ void Workspace::loadWorkSheet( const KURL &url ) * transparent. Unless s/o beats me up I use this pseudo transparent * code. */ TQString tmpFile; - KIO::NetAccess::download( url, tmpFile, this ); + TDEIO::NetAccess::download( url, tmpFile, this ); mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) ); // Load sheet from file. @@ -208,7 +208,7 @@ void Workspace::loadWorkSheet( const KURL &url ) tmpFileUrl.setPath( tmpFile ); if ( tmpFileUrl != url.url() ) mSheetList.last()->setFileName( TQString::null ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); emit announceRecentURL( KURL( url ) ); } diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h index 924e2b732..40302ac4a 100644 --- a/ksysguard/gui/Workspace.h +++ b/ksysguard/gui/Workspace.h @@ -27,7 +27,7 @@ #include #include -class KConfig; +class TDEConfig; class KURL; class TQString; class WorkSheet; @@ -40,8 +40,8 @@ class Workspace : public TQTabWidget Workspace( TQWidget* parent, const char* name = 0 ); ~Workspace(); - void saveProperties( KConfig* ); - void readProperties( KConfig* ); + void saveProperties( TDEConfig* ); + void readProperties( TDEConfig* ); bool saveOnQuit(); diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc index 43f878cda..4cf69d516 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/ksysguard/gui/ksgrd/SensorManager.cc @@ -408,14 +408,14 @@ TQString SensorManager::translateSensor( const TQString &sensor ) const return out; } -void SensorManager::readProperties( KConfig *cfg ) +void SensorManager::readProperties( TDEConfig *cfg ) { mHostConnector->setHostNames( cfg->readListEntry( "HostList" ) ); mHostConnector->setCommands( cfg->readListEntry( "CommandList" ) ); } void -SensorManager::saveProperties( KConfig *cfg ) +SensorManager::saveProperties( TDEConfig *cfg ) { cfg->writeEntry( "HostList", mHostConnector->hostNames() ); cfg->writeEntry( "CommandList", mHostConnector->commands() ); diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index 7f4e85da7..a362de351 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -80,8 +80,8 @@ class KDE_EXPORT SensorManager : public QObject const TQString& translateSensorType( const TQString &type ) const; TQString translateSensor(const TQString& u) const; - void readProperties( KConfig *cfg ); - void saveProperties( KConfig *cfg ); + void readProperties( TDEConfig *cfg ); + void saveProperties( TDEConfig *cfg ); void disconnectClient( SensorClient *client ); diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cc index 0fee27c95..6289e4405 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cc @@ -100,19 +100,19 @@ void SensorSocketAgent::connectionClosed() void SensorSocketAgent::error( int id ) { switch ( id ) { - case KNetwork::KSocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionRefused: SensorMgr->notify( i18n( "Connection to %1 refused" ) .arg( hostName() ) ); break; - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: SensorMgr->notify( i18n( "Host %1 not found" ) .arg( hostName() ) ); break; - case KNetwork::KSocketBase::Timeout: + case KNetwork::TDESocketBase::Timeout: SensorMgr->notify( i18n( "Timeout at host %1") .arg( hostName() ) ); break; - case KNetwork::KSocketBase::NetFailure: + case KNetwork::TDESocketBase::NetFailure: SensorMgr->notify( i18n( "Network failure host %1") .arg( hostName() ) ); break; diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index d05af4ec8..8b0613cf9 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -59,7 +59,7 @@ StyleEngine::~StyleEngine() { } -void StyleEngine::readProperties( KConfig *cfg ) +void StyleEngine::readProperties( TDEConfig *cfg ) { mFirstForegroundColor = cfg->readColorEntry( "fgColor1", &mFirstForegroundColor ); mSecondForegroundColor = cfg->readColorEntry( "fgColor2", &mSecondForegroundColor ); @@ -76,7 +76,7 @@ void StyleEngine::readProperties( KConfig *cfg ) } } -void StyleEngine::saveProperties( KConfig *cfg ) +void StyleEngine::saveProperties( TDEConfig *cfg ) { cfg->writeEntry( "fgColor1", mFirstForegroundColor ); cfg->writeEntry( "fgColor2", mSecondForegroundColor ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 4263a85c8..50ec06e0b 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -30,7 +30,7 @@ #include -class KConfig; +class TDEConfig; class TQListBoxItem; @@ -46,8 +46,8 @@ class KDE_EXPORT StyleEngine : public QObject StyleEngine(); ~StyleEngine(); - void readProperties( KConfig* ); - void saveProperties( KConfig* ); + void readProperties( TDEConfig* ); + void saveProperties( TDEConfig* ); const TQColor& firstForegroundColor() const; const TQColor& secondForegroundColor() const; diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 00d3ac727..aeac861af 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -378,7 +378,7 @@ bool TopLevel::queryClose() return true; } -void TopLevel::readProperties( KConfig *cfg ) +void TopLevel::readProperties( TDEConfig *cfg ) { /* we can ignore 'isMaximized' because we can't set the window maximized, so we save the coordinates instead */ @@ -403,7 +403,7 @@ void TopLevel::readProperties( KConfig *cfg ) applyMainWindowSettings( cfg ); } -void TopLevel::saveProperties( KConfig *cfg ) +void TopLevel::saveProperties( TDEConfig *cfg ) { mActionOpenRecent->saveEntries( cfg ); diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index fe2e7fce1..674ff0851 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -49,8 +49,8 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje public: TopLevel( const char *name = 0 ); - virtual void saveProperties( KConfig* ); - virtual void readProperties( KConfig* ); + virtual void saveProperties( TDEConfig* ); + virtual void readProperties( TDEConfig* ); virtual void answerReceived( int id, const TQString& ); -- cgit v1.2.3