TDE
/
knemo
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knemo
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 70dd1b53b7
commit ed6b24997e
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

6
src/kcm/configdialog.cpp
Unescape View File

@ -75,7 +75,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const char *name, const TQStringLi
mColorOutgoing( 0xFF7F08 ), mColorOutgoing( 0xFF7F08 ),
mColorBackground( 0x313031 ) mColorBackground( 0x313031 )
{ {
KGlobal::locale()->insertCatalogue("kcm_knemo"); TDEGlobal::locale()->insertCatalogue("kcm_knemo");
setupToolTipArray(); setupToolTipArray();
// fill the backends combobox // fill the backends combobox
@ -264,7 +264,7 @@ void ConfigDialog::load()
mDlg->tabWidgetConfiguration->setEnabled( startKNemo ); mDlg->tabWidgetConfiguration->setEnabled( startKNemo );
mDlg->numInputPollInterval->setValue( config->readNumEntry( "PollInterval", 1 ) ); mDlg->numInputPollInterval->setValue( config->readNumEntry( "PollInterval", 1 ) );
mDlg->numInputSaveInterval->setValue( config->readNumEntry( "SaveInterval", 60 ) ); mDlg->numInputSaveInterval->setValue( config->readNumEntry( "SaveInterval", 60 ) );
mDlg->lineEditStatisticsDir->setText( config->readEntry( "StatisticsDir", KGlobal::dirs()->saveLocation( "data", "knemo/" ) ) ); mDlg->lineEditStatisticsDir->setText( config->readEntry( "StatisticsDir", TDEGlobal::dirs()->saveLocation( "data", "knemo/" ) ) );
mToolTipContent = config->readNumEntry( "ToolTipContent", 2 ); mToolTipContent = config->readNumEntry( "ToolTipContent", 2 );
// select the backend from the config file // select the backend from the config file
@ -493,7 +493,7 @@ void ConfigDialog::defaults()
// Default misc settings // Default misc settings
mDlg->numInputPollInterval->setValue( 1 ); mDlg->numInputPollInterval->setValue( 1 );
mDlg->numInputSaveInterval->setValue( 60 ); mDlg->numInputSaveInterval->setValue( 60 );
mDlg->lineEditStatisticsDir->setText( KGlobal::dirs()->saveLocation( "data", "knemo/" ) ); mDlg->lineEditStatisticsDir->setText( TDEGlobal::dirs()->saveLocation( "data", "knemo/" ) );
mDlg->comboBoxBackends->setCurrentItem( 0 ); mDlg->comboBoxBackends->setCurrentItem( 0 );
mDlg->textLabelBackendDescription->setText( KCMRegistry[0].description ); mDlg->textLabelBackendDescription->setText( KCMRegistry[0].description );

60
src/knemod/backends/nettoolsbackend.cpp
Unescape View File

@ -67,16 +67,16 @@ void NetToolsBackend::update()
if ( !mIfconfigProcess ) if ( !mIfconfigProcess )
{ {
mIfconfigStdout = TQString(); mIfconfigStdout = TQString();
mIfconfigProcess = new KProcess(); mIfconfigProcess = new TDEProcess();
mIfconfigProcess->setEnvironment( "LANG", "C" ); mIfconfigProcess->setEnvironment( "LANG", "C" );
mIfconfigProcess->setEnvironment( "LC_ALL", "C" ); mIfconfigProcess->setEnvironment( "LC_ALL", "C" );
*mIfconfigProcess << PATH_IFCONFIG << "-a"; *mIfconfigProcess << PATH_IFCONFIG << "-a";
connect( mIfconfigProcess, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), connect( mIfconfigProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT( ifconfigProcessStdout( KProcess*, char*, int ) ) ); this, TQT_SLOT( ifconfigProcessStdout( TDEProcess*, char*, int ) ) );
connect( mIfconfigProcess, TQT_SIGNAL( processExited( KProcess* ) ), connect( mIfconfigProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( ifconfigProcessExited( KProcess* ) ) ); this, TQT_SLOT( ifconfigProcessExited( TDEProcess* ) ) );
if ( !mIfconfigProcess->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) if ( !mIfconfigProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
{ {
delete mIfconfigProcess; delete mIfconfigProcess;
mIfconfigProcess = 0L; mIfconfigProcess = 0L;
@ -87,18 +87,18 @@ void NetToolsBackend::update()
if ( !mIwconfigProcess ) if ( !mIwconfigProcess )
{ {
mIwconfigStdout = TQString(); mIwconfigStdout = TQString();
mIwconfigProcess = new KProcess(); mIwconfigProcess = new TDEProcess();
mIwconfigProcess->setEnvironment( "LANG", "C" ); mIwconfigProcess->setEnvironment( "LANG", "C" );
mIwconfigProcess->setEnvironment( "LC_ALL", "C" ); mIwconfigProcess->setEnvironment( "LC_ALL", "C" );
*mIwconfigProcess << PATH_IWCONFIG; *mIwconfigProcess << PATH_IWCONFIG;
connect( mIwconfigProcess, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), connect( mIwconfigProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT( iwconfigProcessStdout( KProcess*, char*, int ) ) ); this, TQT_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
connect( mIwconfigProcess, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), connect( mIwconfigProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
this, TQT_SLOT( iwconfigProcessStdout( KProcess*, char*, int ) ) ); this, TQT_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
connect( mIwconfigProcess, TQT_SIGNAL( processExited( KProcess* ) ), connect( mIwconfigProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( iwconfigProcessExited( KProcess* ) ) ); this, TQT_SLOT( iwconfigProcessExited( TDEProcess* ) ) );
if ( !mIwconfigProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) if ( !mIwconfigProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{ {
delete mIwconfigProcess; delete mIwconfigProcess;
mIwconfigProcess = 0L; mIwconfigProcess = 0L;
@ -110,18 +110,18 @@ void NetToolsBackend::update()
if ( !mRouteProcess ) if ( !mRouteProcess )
{ {
mRouteStdout = TQString(); mRouteStdout = TQString();
mRouteProcess = new KProcess(); mRouteProcess = new TDEProcess();
mRouteProcess->setEnvironment( "LANG", "C" ); mRouteProcess->setEnvironment( "LANG", "C" );
mRouteProcess->setEnvironment( "LC_ALL", "C" ); mRouteProcess->setEnvironment( "LC_ALL", "C" );
*mRouteProcess << PATH_ROUTE << "-n"; *mRouteProcess << PATH_ROUTE << "-n";
connect( mRouteProcess, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), connect( mRouteProcess, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT( routeProcessStdout( KProcess*, char*, int ) ) ); this, TQT_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
connect( mRouteProcess, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), connect( mRouteProcess, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
this, TQT_SLOT( routeProcessStdout( KProcess*, char*, int ) ) ); this, TQT_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
connect( mRouteProcess, TQT_SIGNAL( processExited( KProcess* ) ), connect( mRouteProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( routeProcessExited( KProcess* ) ) ); this, TQT_SLOT( routeProcessExited( TDEProcess* ) ) );
if ( !mRouteProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) if ( !mRouteProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
{ {
delete mRouteProcess; delete mRouteProcess;
mRouteProcess = 0L; mRouteProcess = 0L;
@ -130,7 +130,7 @@ void NetToolsBackend::update()
#endif #endif
} }
void NetToolsBackend::routeProcessExited( KProcess* process ) void NetToolsBackend::routeProcessExited( TDEProcess* process )
{ {
if ( process == mRouteProcess ) if ( process == mRouteProcess )
{ {
@ -140,12 +140,12 @@ void NetToolsBackend::routeProcessExited( KProcess* process )
} }
} }
void NetToolsBackend::routeProcessStdout( KProcess*, char* buffer, int buflen ) void NetToolsBackend::routeProcessStdout( TDEProcess*, char* buffer, int buflen )
{ {
mRouteStdout += TQString::fromLatin1( buffer, buflen ); mRouteStdout += TQString::fromLatin1( buffer, buflen );
} }
void NetToolsBackend::ifconfigProcessExited( KProcess* process ) void NetToolsBackend::ifconfigProcessExited( TDEProcess* process )
{ {
if ( process == mIfconfigProcess ) if ( process == mIfconfigProcess )
{ {
@ -155,12 +155,12 @@ void NetToolsBackend::ifconfigProcessExited( KProcess* process )
} }
} }
void NetToolsBackend::ifconfigProcessStdout( KProcess*, char* buffer, int buflen ) void NetToolsBackend::ifconfigProcessStdout( TDEProcess*, char* buffer, int buflen )
{ {
mIfconfigStdout += TQString::fromLatin1( buffer, buflen ); mIfconfigStdout += TQString::fromLatin1( buffer, buflen );
} }
void NetToolsBackend::iwconfigProcessExited( KProcess* process ) void NetToolsBackend::iwconfigProcessExited( TDEProcess* process )
{ {
if ( process == mIwconfigProcess ) if ( process == mIwconfigProcess )
{ {
@ -170,7 +170,7 @@ void NetToolsBackend::iwconfigProcessExited( KProcess* process )
} }
} }
void NetToolsBackend::iwconfigProcessStdout( KProcess*, char* buffer, int buflen ) void NetToolsBackend::iwconfigProcessStdout( TDEProcess*, char* buffer, int buflen )
{ {
mIwconfigStdout += TQString::fromLatin1( buffer, buflen ); mIwconfigStdout += TQString::fromLatin1( buffer, buflen );
} }

20
src/knemod/backends/nettoolsbackend.h
Unescape View File

@ -24,7 +24,7 @@
#include "backendbase.h" #include "backendbase.h"
class KProcess; class TDEProcess;
/** /**
* The nettools backend runs 'ifconfig', 'iwconfig' and 'route' * The nettools backend runs 'ifconfig', 'iwconfig' and 'route'
@ -48,12 +48,12 @@ public:
void update(); void update();
private slots: private slots:
void routeProcessExited( KProcess* process ); void routeProcessExited( TDEProcess* process );
void routeProcessStdout( KProcess* process, char* buffer, int buflen ); void routeProcessStdout( TDEProcess* process, char* buffer, int buflen );
void ifconfigProcessExited( KProcess* process ); void ifconfigProcessExited( TDEProcess* process );
void ifconfigProcessStdout( KProcess* process, char* buffer, int buflen ); void ifconfigProcessStdout( TDEProcess* process, char* buffer, int buflen );
void iwconfigProcessExited( KProcess* process ); void iwconfigProcessExited( TDEProcess* process );
void iwconfigProcessStdout( KProcess* process, char* buffer, int buflen ); void iwconfigProcessStdout( TDEProcess* process, char* buffer, int buflen );
private: private:
void parseRouteOutput(); void parseRouteOutput();
@ -65,9 +65,9 @@ private:
TQString mRouteStdout; TQString mRouteStdout;
TQString mIfconfigStdout; TQString mIfconfigStdout;
TQString mIwconfigStdout; TQString mIwconfigStdout;
KProcess* mRouteProcess; TDEProcess* mRouteProcess;
KProcess* mIfconfigProcess; TDEProcess* mIfconfigProcess;
KProcess* mIwconfigProcess; TDEProcess* mIwconfigProcess;
}; };
#endif // NETTOOLSBACKEND_H #endif // NETTOOLSBACKEND_H

8
src/knemod/interfaceicon.cpp
Unescape View File

@ -285,9 +285,9 @@ void InterfaceIcon::showConfigDialog()
{ {
KNemoDaemon::sSelectedInterface = mInterface->getName(); KNemoDaemon::sSelectedInterface = mInterface->getName();
KProcess process; TDEProcess process;
process << "kcmshell" << "kcm_knemo"; process << "kcmshell" << "kcm_knemo";
process.start( KProcess::DontCare ); process.start( TDEProcess::DontCare );
} }
void InterfaceIcon::menuActivated( int id ) void InterfaceIcon::menuActivated( int id )
@ -298,7 +298,7 @@ void InterfaceIcon::menuActivated( int id )
{ {
if ( (*it).id == id ) if ( (*it).id == id )
{ {
KProcess process; TDEProcess process;
if ( (*it).runAsRoot ) if ( (*it).runAsRoot )
{ {
process << "tdesu"; process << "tdesu";
@ -307,7 +307,7 @@ void InterfaceIcon::menuActivated( int id )
else else
process << TQStringList::split( ' ', (*it).command ); process << TQStringList::split( ' ', (*it).command );
process.start( KProcess::DontCare ); process.start( TDEProcess::DontCare );
break; break;
} }
} }

4
src/knemod/interfacestatisticsdialog.cpp
Unescape View File

@ -61,7 +61,7 @@ void InterfaceStatisticsDialog::updateDays()
while ( iterator ) while ( iterator )
{ {
TQDate date( iterator->year, iterator->month, iterator->day ); TQDate date( iterator->year, iterator->month, iterator->day );
tableDaily->verticalHeader()->setLabel( row, KGlobal::locale()->formatDate( date, true ) ); tableDaily->verticalHeader()->setLabel( row, TDEGlobal::locale()->formatDate( date, true ) );
tableDaily->setText( row, 0, KIO::convertSize( iterator->txBytes ) ); tableDaily->setText( row, 0, KIO::convertSize( iterator->txBytes ) );
tableDaily->setText( row, 1, KIO::convertSize( iterator->rxBytes ) ); tableDaily->setText( row, 1, KIO::convertSize( iterator->rxBytes ) );
tableDaily->setText( row, 2, KIO::convertSize( iterator->rxBytes + iterator->txBytes ) ); tableDaily->setText( row, 2, KIO::convertSize( iterator->rxBytes + iterator->txBytes ) );
@ -81,7 +81,7 @@ void InterfaceStatisticsDialog::updateMonths()
int row = 0; int row = 0;
while ( iterator ) while ( iterator )
{ {
const KCalendarSystem* calendar = KGlobal::locale()->calendar(); const KCalendarSystem* calendar = TDEGlobal::locale()->calendar();
TQString monthName = calendar->monthName( iterator->month, iterator->year ) + " " + TQString::number( iterator->year ); TQString monthName = calendar->monthName( iterator->month, iterator->year ) + " " + TQString::number( iterator->year );
tableMonthly->verticalHeader()->setLabel( row, monthName ); tableMonthly->verticalHeader()->setLabel( row, monthName );
tableMonthly->setText( row, 0, KIO::convertSize( iterator->txBytes ) ); tableMonthly->setText( row, 0, KIO::convertSize( iterator->txBytes ) );

6
src/knemod/knemodaemon.cpp
Unescape View File

@ -52,7 +52,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name )
mInstance( new TDEInstance( "knemo" ) ), mInstance( new TDEInstance( "knemo" ) ),
mNotifyInstance( new KNotifyClient::Instance( mInstance ) ) mNotifyInstance( new KNotifyClient::Instance( mInstance ) )
{ {
KGlobal::locale()->insertCatalogue( "knemod" ); TDEGlobal::locale()->insertCatalogue( "knemod" );
readConfig(); readConfig();
// select the backend from the config file // select the backend from the config file
@ -108,7 +108,7 @@ void KNemoDaemon::readConfig()
config->setGroup( "General" ); config->setGroup( "General" );
mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 ); mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 );
mGeneralData.saveInterval = config->readNumEntry( "SaveInterval", 60 ); mGeneralData.saveInterval = config->readNumEntry( "SaveInterval", 60 );
mGeneralData.statisticsDir = config->readEntry( "StatisticsDir", KGlobal::dirs()->saveLocation( "data", "knemo/" ) ); mGeneralData.statisticsDir = config->readEntry( "StatisticsDir", TDEGlobal::dirs()->saveLocation( "data", "knemo/" ) );
mGeneralData.toolTipContent = config->readNumEntry( "ToolTipContent", 2 ); mGeneralData.toolTipContent = config->readNumEntry( "ToolTipContent", 2 );
TQStrList list; TQStrList list;
int numEntries = config->readListEntry( "Interfaces", list ); int numEntries = config->readListEntry( "Interfaces", list );
@ -188,7 +188,7 @@ void KNemoDaemon::reparseConfiguration()
config->setGroup( "General" ); config->setGroup( "General" );
mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 ); mGeneralData.pollInterval = config->readNumEntry( "PollInterval", 1 );
mGeneralData.saveInterval = config->readNumEntry( "SaveInterval", 60 ); mGeneralData.saveInterval = config->readNumEntry( "SaveInterval", 60 );
mGeneralData.statisticsDir = config->readEntry( "StatisticsDir", KGlobal::dirs()->saveLocation( "data", "knemo/" ) ); mGeneralData.statisticsDir = config->readEntry( "StatisticsDir", TDEGlobal::dirs()->saveLocation( "data", "knemo/" ) );
mGeneralData.toolTipContent = config->readNumEntry( "ToolTipContent", 2 ); mGeneralData.toolTipContent = config->readNumEntry( "ToolTipContent", 2 );
// restart the timer with the new interval // restart the timer with the new interval

Write Preview
Loading…
Cancel
Save