summaryrefslogtreecommitdiffstats
path: root/ksysguard/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /ksysguard/gui
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksysguard/gui')
-rw-r--r--ksysguard/gui/Workspace.cc8
-rw-r--r--ksysguard/gui/Workspace.h6
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.cc4
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.h4
-rw-r--r--ksysguard/gui/ksgrd/SensorSocketAgent.cc8
-rw-r--r--ksysguard/gui/ksgrd/StyleEngine.cc4
-rw-r--r--ksysguard/gui/ksgrd/StyleEngine.h6
-rw-r--r--ksysguard/gui/ksysguard.cc4
-rw-r--r--ksysguard/gui/ksysguard.h4
9 files changed, 24 insertions, 24 deletions
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 1fb1e1e6..7271bab8 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 924e2b73..40302ac4 100644
--- a/ksysguard/gui/Workspace.h
+++ b/ksysguard/gui/Workspace.h
@@ -27,7 +27,7 @@
#include <tqptrlist.h>
#include <tqtabwidget.h>
-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 43f878cd..4cf69d51 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 7f4e85da..a362de35 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 0fee27c9..6289e440 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 d05af4ec..8b0613cf 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 4263a85c..50ec06e0 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -30,7 +30,7 @@
#include <kdemacros.h>
-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 00d3ac72..aeac861a 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 fe2e7fce..674ff085 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& );