summaryrefslogtreecommitdiffstats
path: root/src/knemod
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:08:37 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:08:37 -0600
commitb6f3912adcfbbeea3415c287426bd771cd9170b9 (patch)
tree14ae73178ff71950cd4c6452add8394a13b62afa /src/knemod
parented6b24997e06a9a14d0f47cfbfafdd2473cf856d (diff)
downloadknemo-b6f3912adcfbbeea3415c287426bd771cd9170b9.tar.gz
knemo-b6f3912adcfbbeea3415c287426bd771cd9170b9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/knemod')
-rw-r--r--src/knemod/backends/nettoolsbackend.cpp4
-rw-r--r--src/knemod/backends/sysbackend.cpp4
-rw-r--r--src/knemod/interfacestatisticsdialog.cpp36
-rw-r--r--src/knemod/interfacestatusdialog.cpp26
-rw-r--r--src/knemod/interfacetooltip.cpp4
-rw-r--r--src/knemod/knemodaemon.cpp6
-rw-r--r--src/knemod/signalplotter.cpp4
7 files changed, 42 insertions, 42 deletions
diff --git a/src/knemod/backends/nettoolsbackend.cpp b/src/knemod/backends/nettoolsbackend.cpp
index fbd6995..2b36c69 100644
--- a/src/knemod/backends/nettoolsbackend.cpp
+++ b/src/knemod/backends/nettoolsbackend.cpp
@@ -277,7 +277,7 @@ void NetToolsBackend::updateInterfaceData( TQString& config, InterfaceData& data
data.incomingBytes = currentRxBytes - data.prevRxBytes;
data.prevRxBytes = currentRxBytes;
- data.rxString = KIO::convertSize( data.rxBytes );
+ data.rxString = TDEIO::convertSize( data.rxBytes );
}
regExp.setPattern( "TX bytes:(\\d+)\\s*\\(\\d+\\.\\d+\\s*\\w+\\)" );
@@ -312,7 +312,7 @@ void NetToolsBackend::updateInterfaceData( TQString& config, InterfaceData& data
data.outgoingBytes = currentTxBytes - data.prevTxBytes;
data.prevTxBytes = currentTxBytes;
- data.txString = KIO::convertSize( data.txBytes );
+ data.txString = TDEIO::convertSize( data.txBytes );
}
regExp.setPattern( "inet\\s+\\w+:(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})" );
diff --git a/src/knemod/backends/sysbackend.cpp b/src/knemod/backends/sysbackend.cpp
index 14e4285..60eac96 100644
--- a/src/knemod/backends/sysbackend.cpp
+++ b/src/knemod/backends/sysbackend.cpp
@@ -208,7 +208,7 @@ void SysBackend::updateInterfaceData( const TQString& ifName, InterfaceData& dat
data.incomingBytes = rxBytes - data.prevRxBytes;
data.prevRxBytes = rxBytes;
- data.rxString = KIO::convertSize( data.rxBytes );
+ data.rxString = TDEIO::convertSize( data.rxBytes );
}
unsigned int txBytes = 0;
@@ -242,7 +242,7 @@ void SysBackend::updateInterfaceData( const TQString& ifName, InterfaceData& dat
data.outgoingBytes = txBytes - data.prevTxBytes;
data.prevTxBytes = txBytes;
- data.txString = KIO::convertSize( data.txBytes );
+ data.txString = TDEIO::convertSize( data.txBytes );
}
if ( type == Interface::ETHERNET )
diff --git a/src/knemod/interfacestatisticsdialog.cpp b/src/knemod/interfacestatisticsdialog.cpp
index 327bc0f..27e38c7 100644
--- a/src/knemod/interfacestatisticsdialog.cpp
+++ b/src/knemod/interfacestatisticsdialog.cpp
@@ -62,9 +62,9 @@ void InterfaceStatisticsDialog::updateDays()
{
TQDate date( iterator->year, iterator->month, iterator->day );
tableDaily->verticalHeader()->setLabel( row, TDEGlobal::locale()->formatDate( date, true ) );
- tableDaily->setText( row, 0, KIO::convertSize( iterator->txBytes ) );
- tableDaily->setText( row, 1, KIO::convertSize( iterator->rxBytes ) );
- tableDaily->setText( row, 2, KIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
+ tableDaily->setText( row, 0, TDEIO::convertSize( iterator->txBytes ) );
+ tableDaily->setText( row, 1, TDEIO::convertSize( iterator->rxBytes ) );
+ tableDaily->setText( row, 2, TDEIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
row++;
iterator = dayStatistics.next();
}
@@ -84,9 +84,9 @@ void InterfaceStatisticsDialog::updateMonths()
const KCalendarSystem* calendar = TDEGlobal::locale()->calendar();
TQString monthName = calendar->monthName( iterator->month, iterator->year ) + " " + TQString::number( iterator->year );
tableMonthly->verticalHeader()->setLabel( row, monthName );
- tableMonthly->setText( row, 0, KIO::convertSize( iterator->txBytes ) );
- tableMonthly->setText( row, 1, KIO::convertSize( iterator->rxBytes ) );
- tableMonthly->setText( row, 2, KIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
+ tableMonthly->setText( row, 0, TDEIO::convertSize( iterator->txBytes ) );
+ tableMonthly->setText( row, 1, TDEIO::convertSize( iterator->rxBytes ) );
+ tableMonthly->setText( row, 2, TDEIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
row++;
iterator = monthStatistics.next();
}
@@ -104,9 +104,9 @@ void InterfaceStatisticsDialog::updateYears()
while ( iterator )
{
tableYearly->verticalHeader()->setLabel( row, TQString::number( iterator->year ) );
- tableYearly->setText( row, 0, KIO::convertSize( iterator->txBytes ) );
- tableYearly->setText( row, 1, KIO::convertSize( iterator->rxBytes ) );
- tableYearly->setText( row, 2, KIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
+ tableYearly->setText( row, 0, TDEIO::convertSize( iterator->txBytes ) );
+ tableYearly->setText( row, 1, TDEIO::convertSize( iterator->rxBytes ) );
+ tableYearly->setText( row, 2, TDEIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
row++;
iterator = yearStatistics.next();
}
@@ -119,21 +119,21 @@ void InterfaceStatisticsDialog::updateCurrentEntry()
{
int lastRow = tableDaily->numRows() - 1;
const StatisticEntry* currentEntry = mInterface->getStatistics()->getCurrentDay();
- tableDaily->setText( lastRow, 0, KIO::convertSize( currentEntry->txBytes ) );
- tableDaily->setText( lastRow, 1, KIO::convertSize( currentEntry->rxBytes ) );
- tableDaily->setText( lastRow, 2, KIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
+ tableDaily->setText( lastRow, 0, TDEIO::convertSize( currentEntry->txBytes ) );
+ tableDaily->setText( lastRow, 1, TDEIO::convertSize( currentEntry->rxBytes ) );
+ tableDaily->setText( lastRow, 2, TDEIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
lastRow = tableMonthly->numRows() - 1;
currentEntry = mInterface->getStatistics()->getCurrentMonth();
- tableMonthly->setText( lastRow, 0, KIO::convertSize( currentEntry->txBytes ) );
- tableMonthly->setText( lastRow, 1, KIO::convertSize( currentEntry->rxBytes ) );
- tableMonthly->setText( lastRow, 2, KIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
+ tableMonthly->setText( lastRow, 0, TDEIO::convertSize( currentEntry->txBytes ) );
+ tableMonthly->setText( lastRow, 1, TDEIO::convertSize( currentEntry->rxBytes ) );
+ tableMonthly->setText( lastRow, 2, TDEIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
lastRow = tableYearly->numRows() - 1;
currentEntry = mInterface->getStatistics()->getCurrentYear();
- tableYearly->setText( lastRow, 0, KIO::convertSize( currentEntry->txBytes ) );
- tableYearly->setText( lastRow, 1, KIO::convertSize( currentEntry->rxBytes ) );
- tableYearly->setText( lastRow, 2, KIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
+ tableYearly->setText( lastRow, 0, TDEIO::convertSize( currentEntry->txBytes ) );
+ tableYearly->setText( lastRow, 1, TDEIO::convertSize( currentEntry->rxBytes ) );
+ tableYearly->setText( lastRow, 2, TDEIO::convertSize( currentEntry->rxBytes + currentEntry->txBytes ) );
}
#include "interfacestatisticsdialog.moc"
diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp
index d170b88..f0d132a 100644
--- a/src/knemod/interfacestatusdialog.cpp
+++ b/src/knemod/interfacestatusdialog.cpp
@@ -66,7 +66,7 @@ InterfaceStatusDialog::InterfaceStatusDialog( Interface* interface, TQWidget* pa
}
// Restore window size and position.
- KConfig* config = new KConfig( "knemorc", false );
+ TDEConfig* config = new TDEConfig( "knemorc", false );
if ( config->hasGroup( "Interface_" + mInterface->getName() ) )
{
config->setGroup( "Interface_" + mInterface->getName() );
@@ -95,7 +95,7 @@ InterfaceStatusDialog::~InterfaceStatusDialog()
delete mTimer;
// Store window size and position.
- KConfig* config = new KConfig( "knemorc", false );
+ TDEConfig* config = new TDEConfig( "knemorc", false );
if ( config->hasGroup( "Interface_" + mInterface->getName() ) )
{
config->setGroup( "Interface_" + mInterface->getName() );
@@ -212,9 +212,9 @@ void InterfaceStatusDialog::updateDialog()
textLabelBytesSend->setText( data.txString );
textLabelBytesReceived->setText( data.rxString );
unsigned long bytesPerSecond = data.outgoingBytes / mInterface->getGeneralData().pollInterval;
- textLabelSpeedSend->setText( KIO::convertSize( bytesPerSecond ) + i18n( "/s" ) );
+ textLabelSpeedSend->setText( TDEIO::convertSize( bytesPerSecond ) + i18n( "/s" ) );
bytesPerSecond = data.incomingBytes / mInterface->getGeneralData().pollInterval;
- textLabelSpeedReceived->setText( KIO::convertSize( bytesPerSecond ) + i18n( "/s" ) );
+ textLabelSpeedReceived->setText( TDEIO::convertSize( bytesPerSecond ) + i18n( "/s" ) );
if ( data.wirelessDevice )
{
@@ -290,19 +290,19 @@ void InterfaceStatusDialog::statisticsChanged()
}
const StatisticEntry* entry = statistics->getCurrentDay();
- textLabelTodaySent->setText( KIO::convertSize( entry->txBytes ) );
- textLabelTodayReceived->setText( KIO::convertSize( entry->rxBytes ) );
- textLabelTodayTotal->setText( KIO::convertSize( entry->txBytes + entry->rxBytes ) );
+ textLabelTodaySent->setText( TDEIO::convertSize( entry->txBytes ) );
+ textLabelTodayReceived->setText( TDEIO::convertSize( entry->rxBytes ) );
+ textLabelTodayTotal->setText( TDEIO::convertSize( entry->txBytes + entry->rxBytes ) );
entry = statistics->getCurrentMonth();
- textLabelMonthSent->setText( KIO::convertSize( entry->txBytes ) );
- textLabelMonthReceived->setText( KIO::convertSize( entry->rxBytes ) );
- textLabelMonthTotal->setText( KIO::convertSize( entry->txBytes + entry->rxBytes ) );
+ textLabelMonthSent->setText( TDEIO::convertSize( entry->txBytes ) );
+ textLabelMonthReceived->setText( TDEIO::convertSize( entry->rxBytes ) );
+ textLabelMonthTotal->setText( TDEIO::convertSize( entry->txBytes + entry->rxBytes ) );
entry = statistics->getCurrentYear();
- textLabelYearSent->setText( KIO::convertSize( entry->txBytes ) );
- textLabelYearReceived->setText( KIO::convertSize( entry->rxBytes ) );
- textLabelYearTotal->setText( KIO::convertSize( entry->txBytes + entry->rxBytes ) );
+ textLabelYearSent->setText( TDEIO::convertSize( entry->txBytes ) );
+ textLabelYearReceived->setText( TDEIO::convertSize( entry->rxBytes ) );
+ textLabelYearTotal->setText( TDEIO::convertSize( entry->txBytes + entry->rxBytes ) );
}
#include "interfacestatusdialog.moc"
diff --git a/src/knemod/interfacetooltip.cpp b/src/knemod/interfacetooltip.cpp
index 569df7c..6c84877 100644
--- a/src/knemod/interfacetooltip.cpp
+++ b/src/knemod/interfacetooltip.cpp
@@ -130,12 +130,12 @@ void InterfaceToolTip::setupText( TQString& text )
if ( toolTipContent & DOWNLOAD_SPEED )
{
unsigned long bytesPerSecond = data.incomingBytes / mInterface->getGeneralData().pollInterval;
- text += "<tr><td>" + mToolTips[20].first + "</td><td>" + KIO::convertSize( bytesPerSecond ) + i18n( "/s" ) + "</td></tr>";
+ text += "<tr><td>" + mToolTips[20].first + "</td><td>" + TDEIO::convertSize( bytesPerSecond ) + i18n( "/s" ) + "</td></tr>";
}
if ( toolTipContent & UPLOAD_SPEED )
{
unsigned long bytesPerSecond = data.outgoingBytes / mInterface->getGeneralData().pollInterval;
- text += "<tr><td>" + mToolTips[21].first + "</td><td>" + KIO::convertSize( bytesPerSecond ) + i18n( "/s" ) + "</td></tr>";
+ text += "<tr><td>" + mToolTips[21].first + "</td><td>" + TDEIO::convertSize( bytesPerSecond ) + i18n( "/s" ) + "</td></tr>";
}
}
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index 2957dc1..fba66c1 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -56,7 +56,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name )
readConfig();
// select the backend from the config file
- KConfig* config = new KConfig( "knemorc", true );
+ TDEConfig* config = new TDEConfig( "knemorc", true );
config->setGroup( "General" );
mBackendName = config->readEntry( "Backend", "Nettools" );
delete config;
@@ -103,7 +103,7 @@ KNemoDaemon::~KNemoDaemon()
void KNemoDaemon::readConfig()
{
- KConfig* config = new KConfig( "knemorc", true );
+ TDEConfig* config = new TDEConfig( "knemorc", true );
config->setGroup( "General" );
mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 );
@@ -183,7 +183,7 @@ void KNemoDaemon::reparseConfiguration()
{
// Read the settings from the config file.
TQDict<InterfaceSettings> settingsDict;
- KConfig* config = new KConfig( "knemorc", false );
+ TDEConfig* config = new TDEConfig( "knemorc", false );
config->setGroup( "General" );
mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 );
diff --git a/src/knemod/signalplotter.cpp b/src/knemod/signalplotter.cpp
index aa7c1f1..566c7f0 100644
--- a/src/knemod/signalplotter.cpp
+++ b/src/knemod/signalplotter.cpp
@@ -77,7 +77,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
mBackgroundColor = TQColor( 0x313031 );
// Restore window size and position.
- KConfig* config = new KConfig( "knemorc", false );
+ TDEConfig* config = new TDEConfig( "knemorc", false );
if ( config->hasGroup( "Interface_" + mName ) )
{
config->setGroup( "Interface_" + mName );
@@ -100,7 +100,7 @@ SignalPlotter::~SignalPlotter()
delete [] p;
// Store window size and position.
- KConfig* config = new KConfig( "knemorc", false );
+ TDEConfig* config = new TDEConfig( "knemorc", false );
if ( config->hasGroup( "Interface_" + mName ) )
{
config->setGroup( "Interface_" + mName );