diff options
Diffstat (limited to 'ksysguard')
70 files changed, 310 insertions, 303 deletions
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp index ae31d4a60..d5ae18b46 100644 --- a/ksysguard/gui/KSysGuardApplet.cpp +++ b/ksysguard/gui/KSysGuardApplet.cpp @@ -120,9 +120,9 @@ void KSysGuardApplet::preferences() } mSettingsDlg = new KSGAppletSettings( this ); - connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) ); + connect( mSettingsDlg, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( finished() ), TQ_SLOT( preferencesFinished() ) ); mSettingsDlg->setNumDisplay( mDockCount ); mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) ); @@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings() resizeDocks( mSettingsDlg->numDisplay() ); for ( uint i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ i ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() ); save(); @@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified ) void KSysGuardApplet::layout() { - if ( orientation() == Qt::Horizontal ) { + if ( orientation() == TQt::Horizontal ) { int h = height(); int w = (int) ( h * mSizeRatio + 0.5 ); for ( uint i = 0; i < mDockCount; ++i ) @@ -173,7 +173,7 @@ void KSysGuardApplet::layout() int KSysGuardApplet::findDock( const TQPoint& point ) { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) ); else return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) ); @@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) return; int dock = findDock( e->pos() ); - if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + if ( mDockList[ dock ]->isA( "TQFrame" ) ) { if ( sensorType == "integer" || sensorType == "float" ) { TDEPopupMenu popup; TQWidget *wdg = 0; @@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) mDockList[ dock ] = wdg; layout(); - connect( wdg, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( wdg, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); mDockList[ dock ]->show(); } @@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) } } - if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ dock ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ dock ])-> addSensor( hostName, sensorName, sensorType, sensorDescr ); } @@ -405,8 +405,8 @@ bool KSysGuardApplet::load() delete mDockList[ dock ]; mDockList[ dock ] = newDisplay; - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); } return true; @@ -429,7 +429,7 @@ bool KSysGuardApplet::save() TQStringList hosts; uint i; for ( i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) + if ( !mDockList[ i ]->isA( "TQFrame" ) ) ((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts ); // save host information (name, shell, etc.) @@ -449,7 +449,7 @@ bool KSysGuardApplet::save() } for ( i = 0; i < mDockCount; ++i ) - if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { + if ( !mDockList[ i ]->isA( "TQFrame" ) ) { TQDomElement element = doc.createElement( "display" ); ws.appendChild( element ); element.setAttribute( "dock", i ); diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h index 43027b05c..06ab1d5ec 100644 --- a/ksysguard/gui/KSysGuardApplet.h +++ b/ksysguard/gui/KSysGuardApplet.h @@ -40,7 +40,7 @@ class KSGAppletSettings; class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard { - Q_OBJECT + TQ_OBJECT public: KSysGuardApplet( const TQString& configFile, Type type = Normal, diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp index 801091d98..575389bac 100644 --- a/ksysguard/gui/SensorBrowser.cpp +++ b/ksysguard/gui/SensorBrowser.cpp @@ -68,11 +68,11 @@ SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, { mHostInfoList.setAutoDelete(true); - connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( mSensorManager, TQ_SIGNAL( update() ), TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); addColumn( i18n( "Sensor Browser" ) ); addColumn( i18n( "Sensor Type" ) ); @@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e ) * mouse tracking cannot be turned off. So we have to check each event * whether the LMB is really pressed. */ - if ( !( e->state() & Qt::LeftButton ) ) + if ( !( e->state() & TQt::LeftButton ) ) return; TQListViewItem* item = itemAt( e->pos() ); diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h index aec4f343d..f2aa98302 100644 --- a/ksysguard/gui/SensorBrowser.h +++ b/ksysguard/gui/SensorBrowser.h @@ -45,7 +45,7 @@ class HostInfo; */ class SensorBrowser : public TDEListView, public KSGRD::SensorClient { - Q_OBJECT + TQ_OBJECT public: SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp index 8d2b5e302..1a1608b6c 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cpp +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp @@ -161,10 +161,10 @@ void BarGraph::paintEvent( TQPaintEvent* ) if ( showLabels ) { p.drawText( b * barWidth + 3, h - ( 2 * fm.lineSpacing() ) - 2, - barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter, + barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter, footers[ b ] ); p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2, - barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter, + barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter, TQString( "%1" ).arg( samples[ b ] ) ); } } diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h index 1a1262594..2c5e7ffad 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.h +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h @@ -30,7 +30,7 @@ class BarGraph : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class DancingBars; diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp index 5b09addc0..43fbe549f 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp @@ -104,7 +104,7 @@ void DancingBars::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); if ( mSettingsDialog->exec() ) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h index 3ccc03f86..4e917dabf 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h @@ -38,7 +38,7 @@ class DancingBarsSettings; class DancingBars : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: DancingBars( TQWidget *parent = 0, const char *name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp index ee03f9e94..b754791f8 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp @@ -47,7 +47,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQFrame *page = addPage( i18n( "Range" ) ); TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); - TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); + TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); @@ -56,7 +56,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Display Range" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); @@ -84,7 +84,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Alarms" ) ); pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Minimum Value" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); @@ -102,7 +102,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Maximum Value" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); @@ -181,15 +181,15 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) ); pageLayout->addWidget( mRemoveButton, 1, 1 ); - connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ), - mLowerLimit, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ), - mUpperLimit, TQT_SLOT( setEnabled( bool ) ) ); + connect( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ), + mLowerLimit, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ), + mUpperLimit, TQ_SLOT( setEnabled( bool ) ) ); - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); TDEAcceleratorManager::manage( this ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h index aa9d580bd..08c02d293 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h @@ -38,7 +38,7 @@ class TQPushButton; class DancingBarsSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DancingBarsSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp index 13696c502..a9b8d21c0 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp @@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* ) bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event ) { if ( event->type() == TQEvent::MouseButtonRelease && - ( (TQMouseEvent*)event)->button() == Qt::LeftButton ) + ( (TQMouseEvent*)event)->button() == TQt::LeftButton ) setFocus(); return TQWidget::eventFilter( object, event ); diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h index cd00a6fd6..b600205b3 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h @@ -28,7 +28,7 @@ class DummyDisplay : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: DummyDisplay( TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp index 22894afea..eccf470c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name, * SensorDisplay::eventFilter. */ mPlotter->installEventFilter( this ); - setPlotterWidget( TQT_TQWIDGET(mPlotter) ); + setPlotterWidget( mPlotter ); setModified( false ); } @@ -111,9 +111,9 @@ void FancyPlotter::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( finished() ), TQ_SLOT( killDialog() ) ); mSettingsDialog->show(); } @@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); - TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); + TQToolTip::remove( mPlotter ); + TQToolTip::add( mPlotter, tooltip ); return true; } @@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos ) .arg( sensors().at( mBeams - i - 1 )->name() ); } - TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); - TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip ); + TQToolTip::remove( mPlotter ); + TQToolTip::add( mPlotter, tooltip ); return true; } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h index 2f0e36c60..3ed63e3c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -48,7 +48,7 @@ class FPSensorProperties : public KSGRD::SensorProperties class FancyPlotter : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: FancyPlotter( TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index ef53bab75..7e7e15d7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -65,7 +65,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( mTitle, 0, 1 ); label->setBuddy( mTitle ); - TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup *buttonBox = new TQButtonGroup( 2, TQt::Vertical, i18n( "Graph Drawing Style" ), page ); mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox ); @@ -78,7 +78,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Scales" ) ); pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Vertical Scale" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); @@ -108,7 +108,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Horizontal Scale" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); @@ -126,7 +126,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) page = addPage( i18n( "Grid" ) ); pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Lines" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -165,7 +165,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Text" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -190,7 +190,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 1, 0 ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Colors" ), page ); boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); @@ -257,30 +257,30 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) mMoveDownButton->setEnabled( false ); pageLayout->addWidget( mMoveDownButton, 4, 1 ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); - connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) ); - connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) ); - connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor())); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMinValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMaxValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mShowLabels, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); + connect( mMoveUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveUpSensor() ) ); + connect( mMoveDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveDownSensor() ) ); + connect ( mSensorView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQ_SLOT(editSensor())); TDEAcceleratorManager::manage( this ); } @@ -531,7 +531,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const entry << it.current()->text( 2 ); entry << it.current()->text( 3 ); entry << it.current()->text( 4 ); - QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); + TQRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) ); entry << ( color.name() ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h index 010b4938b..d4e02a25d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h @@ -38,7 +38,7 @@ class TQRadioButton; class FancyPlotterSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FancyPlotterSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cpp b/ksysguard/gui/SensorDisplayLib/ListView.cpp index 5b748e9c0..828832668 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cpp +++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp @@ -329,7 +329,7 @@ ListView::configureSettings() { lvs = new ListViewSettings(this, "ListViewSettings"); TQ_CHECK_PTR(lvs); - connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(lvs, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); TQColorGroup colorGroup = monitor->colorGroup(); lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index 643df8747..d9bb1c828 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -37,7 +37,7 @@ class ListViewSettings; class PrivateListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: enum ColumnType { Text, Int, Float, Time, DiskStat }; @@ -74,7 +74,7 @@ private: class ListView : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: ListView(TQWidget* parent = 0, const char* name = 0, const TQString& = TQString::null, int min = 0, int max = 0); diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h index 7fe1f4884..0d2d007c9 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h @@ -30,7 +30,7 @@ class ListViewSettingsWidget; class ListViewSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp index a8b22569d..c92594fa6 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cpp +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp @@ -92,16 +92,16 @@ void LogFile::configureSettings(void) lfs->ruleList->insertStringList(filterRules); lfs->title->setText(title()); - connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept())); - connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings())); - connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject())); + connect(lfs->okButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(accept())); + connect(lfs->applyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySettings())); + connect(lfs->cancelButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(reject())); - connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection())); - connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule())); - connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule())); - connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule())); - connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int))); - connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule())); + connect(lfs->fontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsFontSelection())); + connect(lfs->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsAddRule())); + connect(lfs->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsDeleteRule())); + connect(lfs->changeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsChangeRule())); + connect(lfs->ruleList, TQ_SIGNAL(selected(int)), this, TQ_SLOT(settingsRuleListSelected(int))); + connect(lfs->ruleText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(settingsAddRule())); if (lfs->exec()) { applySettings(); @@ -181,8 +181,8 @@ LogFile::restoreSettings(TQDomElement& element) TQFont font; TQColorGroup cgroup = monitor->colorGroup(); - cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); - cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); + cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green)); + cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black)); monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title")); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h index 786cf7e60..1976fa717 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.h +++ b/ksysguard/gui/SensorDisplayLib/LogFile.h @@ -37,7 +37,7 @@ class TQListBox; class LogFile : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: LogFile(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0); ~LogFile(void); diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp index 111c4787b..382b6cb13 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp @@ -202,7 +202,7 @@ MultiMeter::configureSettings() mms->setAlarmDigitColor(alarmDigitColor); mms->setMeterBackgroundColor(lcd->backgroundColor()); - connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(mms, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); if (mms->exec()) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.h b/ksysguard/gui/SensorDisplayLib/MultiMeter.h index 49a97dbd7..9e0f8cdc5 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.h @@ -33,7 +33,7 @@ class MultiMeterSettings; class MultiMeter : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: MultiMeter(TQWidget* parent = 0, const char* name = 0, diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h index 9eebaf56a..65c633fc6 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h @@ -30,7 +30,7 @@ class MultiMeterSettingsWidget; class MultiMeterSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 4558e2374..c6c16eff7 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -440,13 +440,14 @@ </connection> </connections> <includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knumvalidator.h</include> - <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> + <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>setMeterBackgroundColor( const TQColor & c )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="TQString">title()</function> @@ -469,7 +470,4 @@ </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h index fe88f292f..e97fabffc 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h @@ -9,8 +9,8 @@ void MultiMeterSettingsWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); - m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); + m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); + m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); m_title->setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp index 91851d113..cb4579031 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp @@ -81,12 +81,12 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line"); gmSearch->addWidget(pListSearchLine, 1); - connect(pList, TQT_SIGNAL(killProcess(int, int)), - this, TQT_SLOT(killProcess(int, int))); - connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)), - this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int))); - connect(pList, TQT_SIGNAL(listModified(bool)), - this, TQT_SLOT(setModified(bool))); + connect(pList, TQ_SIGNAL(killProcess(int, int)), + this, TQ_SLOT(killProcess(int, int))); + connect(pList, TQ_SIGNAL(reniceProcess(const TQValueList<int> &, int)), + this, TQ_SLOT(reniceProcess(const TQValueList<int> &, int))); + connect(pList, TQ_SIGNAL(listModified(bool)), + this, TQ_SLOT(setModified(bool))); /* Create the combo box to configure the process filter. The * cbFilter must be created prior to constructing pList as the @@ -103,27 +103,27 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T xbTreeView = new TQCheckBox(i18n("&Tree View"), this, "xbTreeView"); TQ_CHECK_PTR(xbTreeView); xbTreeView->setMinimumSize(xbTreeView->sizeHint()); - connect(xbTreeView, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setTreeView(bool))); + connect(xbTreeView, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setTreeView(bool))); /* When the both cbFilter and pList are constructed we can connect the * missing link. */ - connect(cbFilter, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(filterModeChanged(int))); + connect(cbFilter, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(filterModeChanged(int))); // Create the 'Refresh' button. bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); TQ_CHECK_PTR(bRefresh); bRefresh->setMinimumSize(bRefresh->sizeHint()); - connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); + connect(bRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); TQ_CHECK_PTR(bKill); bKill->setMinimumSize(bKill->sizeHint()); - connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); + connect(bKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ bKill->setEnabled(false); @@ -154,7 +154,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T void ProcessController::setSearchFocus() { //stupid search line widget. See rant in fixTabOrder if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus())); + TQTimer::singleShot(100, this, TQ_SLOT(setSearchFocus())); else { pListSearchLine->searchLine()->setFocus(); } @@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() { // //Did i mention I hate this? if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder())); + TQTimer::singleShot(100, this, TQ_SLOT(fixTabOrder())); else { setTabOrder(pListSearchLine->searchLine(), cbFilter); setTabOrder(cbFilter, pList); @@ -224,7 +224,7 @@ ProcessController::killProcess(int pid, int sig) if ( !timerOn() ) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } @@ -274,7 +274,7 @@ ProcessController::killProcess() if ( !timerOn()) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index 848d77294..e9c81e6c3 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -51,7 +51,7 @@ extern TDEApplication* Kapp; */ class ProcessController : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: ProcessController(TQWidget* parent = 0, const char* name = 0, const TQString &title = TQString::null, bool nf = false); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp index 9293ef6a0..b7e8b0c72 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp @@ -221,19 +221,19 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) /* The filter mode is controlled by a combo box of the parent. If * the mode is changed we get a signal. */ - connect(parent, TQT_SIGNAL(setFilterMode(int)), - this, TQT_SLOT(setFilterMode(int))); + connect(parent, TQ_SIGNAL(setFilterMode(int)), + this, TQ_SLOT(setFilterMode(int))); /* We need to catch this signal to show various popup menues. */ connect(this, - TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), + TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), this, - TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); + TQ_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); /* Since Qt does not tell us the sorting details we have to do our * own bookkeping, so we can save and restore the sorting * settings. */ - connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int))); + connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortingChanged(int))); ctrlKeyDown = false; shiftKeyDown = false; @@ -260,10 +260,10 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) headerPM->insertItem(i18n("Add Column"), HEADER_ADD); headerPM->insertItem(i18n("Help on Column"), HEADER_HELP); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(sizeChanged(int, int, int))); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), - this, TQT_SLOT(indexChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(sizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), + this, TQ_SLOT(indexChanged(int, int, int))); killSupported = false; setModified(false); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index 51ac510e2..ccabce745 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -59,7 +59,7 @@ class TQPopupMenu; */ class ProcessList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: // possible values for the filter mode diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h index a9d506eb7..6ef09c175 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h @@ -40,7 +40,7 @@ class KIntNumInput; */ class ReniceDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, int pid); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp index 4dfff7957..ac029e5e2 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp @@ -64,9 +64,9 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name, TQWhatsThis::add( this, "dummy" ); if(!nf) { - mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); + mFrame = new TQGroupBox( 2, TQt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->setAlignment(Qt::AlignHCenter); + mFrame->setAlignment(TQt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); @@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* ) bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) { if ( event->type() == TQEvent::MouseButtonPress && - ( (TQMouseEvent*)event)->button() == Qt::RightButton ) { + ( (TQMouseEvent*)event)->button() == TQt::RightButton ) { TQPopupMenu pm; if ( mIsApplet ) { pm.insertItem( i18n( "Launch &System Guard"), 1 ); @@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event ) return true; } else if ( event->type() == TQEvent::MouseButtonRelease && - ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) { + ( ( TQMouseEvent*)event)->button() == TQt::LeftButton ) { setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h index c59f17468..27933dd6b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h @@ -50,7 +50,7 @@ class SensorProperties; */ class SensorDisplay : public TQWidget, public SensorClient { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp index 88083fca1..63cee160b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp @@ -117,8 +117,8 @@ LogSensor::answerReceived(int id, const TQString& answer) KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date()); - TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time()); + TQDate date = TQDateTime::currentDateTime().date(); + TQTime time = TQDateTime::currentDateTime().time(); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -146,7 +146,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); monitor->setSelectionMode(TQListView::NoSelection); - connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); + connect(monitor, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); setTitle(i18n("Sensor Logger")); @@ -237,7 +237,7 @@ SensorLogger::configureSettings() sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); TQ_CHECK_PTR(sls); - connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( sls, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); sls->setTitle(title()); sls->setForegroundColor(cgroup.text()); @@ -284,9 +284,9 @@ SensorLogger::restoreSettings(TQDomElement& element) { TQColorGroup cgroup = monitor->colorGroup(); - cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); - cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); - cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red)); + cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green)); + cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black)); + cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", TQt::red)); monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); logSensors.clear(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index 6630d57e1..354d9ed5b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -59,7 +59,7 @@ private: class LogSensor : public TQObject, public KSGRD::SensorClient { - Q_OBJECT + TQ_OBJECT public: LogSensor(TQListView *parent); ~LogSensor(void); @@ -141,7 +141,7 @@ private: class SensorLogger : public KSGRD::SensorDisplay { - Q_OBJECT + TQ_OBJECT public: SensorLogger(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0); ~SensorLogger(void); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h index fece0abc4..3a1d239ca 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h @@ -30,7 +30,7 @@ class SensorLoggerDlgWidget; class SensorLoggerDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h index 515cb13f6..ad1f2687b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h @@ -9,8 +9,8 @@ void SensorLoggerDlgWidget::init() { - m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit))); - m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit))); + m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit)); + m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit)); m_timerInterval->setRange(1, 99, 1, true); m_fileName->setFocus(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h index db90fbd83..38b19a8c4 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h @@ -30,7 +30,7 @@ class SensorLoggerSettingsWidget; class SensorLoggerSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp index bcb0b821b..1568eab17 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp @@ -445,7 +445,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) top = p.fontMetrics().height(); h -= top; int h0 = top - 2; // h0 is our new top. It's at least 5 pixels high - p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, mTitle ); + p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, mTitle ); p.drawLine( x0 - 1, 1, x0 - 1, h0 ); p.drawLine( 0, top - 1, w - 2, top - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h index cc632ac94..7f7bcdcb3 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h @@ -36,7 +36,7 @@ class TQColor; class SignalPlotter : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SignalPlotter( TQWidget *parent = 0, const char *name = 0 ); diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp index d465a998d..2b0bc76dd 100644 --- a/ksysguard/gui/WorkSheet.cpp +++ b/ksysguard/gui/WorkSheet.cpp @@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new mDisplayList[ row ][ column ] = newDisplay; if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() ) mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() ); - connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), - TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( setModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), + TQ_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( setModified( bool ) ) ); } diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h index 37bafbda3..e2293c243 100644 --- a/ksysguard/gui/WorkSheet.h +++ b/ksysguard/gui/WorkSheet.h @@ -44,7 +44,7 @@ class TQStringList; */ class WorkSheet : public TQWidget, public KSGRD::SensorBoard { - Q_OBJECT + TQ_OBJECT public: WorkSheet( TQWidget* parent, const char *name = 0 ); diff --git a/ksysguard/gui/WorkSheetSettings.cpp b/ksysguard/gui/WorkSheetSettings.cpp index 703be57d5..e985cfafa 100644 --- a/ksysguard/gui/WorkSheetSettings.cpp +++ b/ksysguard/gui/WorkSheetSettings.cpp @@ -45,24 +45,24 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); + TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page ); group->layout()->setMargin( marginHint() ); group->layout()->setSpacing( spacingHint() ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); topLayout->addWidget( group ); - group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); + group = new TQGroupBox( 0, TQt::Vertical, i18n( "Properties" ), page ); group->layout()->setMargin( marginHint() ); group->layout()->setSpacing( spacingHint() ); groupLayout = new TQGridLayout( group->layout(), 3, 2 ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); diff --git a/ksysguard/gui/WorkSheetSettings.h b/ksysguard/gui/WorkSheetSettings.h index 5f7d8da0c..9c58502cf 100644 --- a/ksysguard/gui/WorkSheetSettings.h +++ b/ksysguard/gui/WorkSheetSettings.h @@ -31,7 +31,7 @@ class KIntNumInput; class WorkSheetSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: WorkSheetSettings( TQWidget* parent = 0, const char* name = 0 ); diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp index c5e622248..9aa511884 100644 --- a/ksysguard/gui/Workspace.cpp +++ b/ksysguard/gui/Workspace.cpp @@ -47,8 +47,8 @@ Workspace::Workspace( TQWidget* parent, const char* name ) mSheetList.setAutoDelete( true ); mAutoSave = true; - connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need " "to create a new worksheet (Menu File->New) before " @@ -62,8 +62,8 @@ Workspace::~Workspace() * administration data is already deleted but slots are still * being triggered. TODO: I need to ask the Trolls about this. */ - disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, - TQT_SLOT( updateCaption( TQWidget* ) ) ); + disconnect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, + TQ_SLOT( updateCaption( TQWidget* ) ) ); } void Workspace::saveProperties( TDEConfig *cfg ) @@ -148,10 +148,10 @@ void Workspace::newWorkSheet() insertTab( sheet, dlg.sheetTitle() ); mSheetList.append( sheet ); showPage( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); - connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ), - TQT_SLOT( updateSheetTitle( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( titleChanged( TQWidget* ) ), + TQ_SLOT( updateSheetTitle( TQWidget* ) ) ); } } @@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString } mSheetList.append( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); /* Force the file name to be the new name. This also sets the modified * flag, so that the file will get saved on exit. */ diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h index 40302ac4a..64a522a65 100644 --- a/ksysguard/gui/Workspace.h +++ b/ksysguard/gui/Workspace.h @@ -34,7 +34,7 @@ class WorkSheet; class Workspace : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: Workspace( TQWidget* parent, const char* name = 0 ); diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp index b6e85b795..9ff979965 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cpp +++ b/ksysguard/gui/ksgrd/HostConnector.cpp @@ -57,11 +57,11 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) mHostNameLabel->hide(); layout->addWidget( mHostNameLabel, 0, 1 ); - TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, + TQButtonGroup *group = new TQButtonGroup( 0, TQt::Vertical, i18n( "Connection Type" ), page ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, spacingHint() ); - groupLayout->setAlignment( Qt::AlignTop ); + groupLayout->setAlignment( TQt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); @@ -111,12 +111,12 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) layout->addMultiCellWidget( group, 1, 1, 0, 1 ); - connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ), - mCommands, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ), - mPort, TQT_SLOT( setEnabled( bool ) ) ); - connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) ); + connect( mUseCustom, TQ_SIGNAL( toggled( bool ) ), + mCommands, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseDaemon, TQ_SIGNAL( toggled( bool ) ), + mPort, TQ_SLOT( setEnabled( bool ) ) ); + connect( mHostNames->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotHostNameChanged( const TQString & ) ) ); enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/HostConnector.h b/ksysguard/gui/ksgrd/HostConnector.h index dbf654b7e..c4d873ffe 100644 --- a/ksysguard/gui/ksgrd/HostConnector.h +++ b/ksysguard/gui/ksgrd/HostConnector.h @@ -31,7 +31,7 @@ class TQSpinBox; class HostConnector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HostConnector( TQWidget *parent, const char *name = 0 ); diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h index 36c44095c..14b9bc014 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.h +++ b/ksysguard/gui/ksgrd/SensorAgent.h @@ -43,9 +43,9 @@ class SensorRequest; ksysguardd. The current implementation only allowes one pending requests. Incoming requests are queued in an input FIFO. */ -class KDE_EXPORT SensorAgent : public QObject +class KDE_EXPORT SensorAgent : public TQObject { - Q_OBJECT + TQ_OBJECT public: SensorAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/SensorManager.cpp b/ksysguard/gui/ksgrd/SensorManager.cpp index 237e73b23..1412df7d7 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cpp +++ b/ksysguard/gui/ksgrd/SensorManager.cpp @@ -219,8 +219,8 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell, } mAgents.insert( hostName, agent ); - connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ), - TQT_SLOT( reconfigure( const SensorAgent* ) ) ); + connect( agent, TQ_SIGNAL( reconfigure( const SensorAgent* ) ), + TQ_SLOT( reconfigure( const SensorAgent* ) ) ); emit update(); return true; diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index 1e859c638..906358c0d 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -43,9 +43,9 @@ class SensorManagerIterator; connection yet or the hostname is empty, a dialog will be shown to enter the connections details. */ -class KDE_EXPORT SensorManager : public QObject +class KDE_EXPORT SensorManager : public TQObject { - Q_OBJECT + TQ_OBJECT friend class SensorManagerIterator; diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cpp b/ksysguard/gui/ksgrd/SensorShellAgent.cpp index 7e137ad56..c398be32f 100644 --- a/ksysguard/gui/ksgrd/SensorShellAgent.cpp +++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp @@ -55,14 +55,14 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell, mShell = shell; mCommand = command; - connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT( daemonExited( TDEProcess* ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), - TQT_SLOT( msgSent( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT( daemonExited( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQ_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQ_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( wroteStdin( TDEProcess* ) ), + TQ_SLOT( msgSent( TDEProcess* ) ) ); TQString cmd; if ( !command.isEmpty() ) diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.h b/ksysguard/gui/ksgrd/SensorShellAgent.h index 2befd346b..eaa932dfc 100644 --- a/ksysguard/gui/ksgrd/SensorShellAgent.h +++ b/ksysguard/gui/ksgrd/SensorShellAgent.h @@ -45,7 +45,7 @@ class SensorManager; */ class SensorShellAgent : public SensorAgent { - Q_OBJECT + TQ_OBJECT public: SensorShellAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp index 30c0cc7e9..ed52a5bd4 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp @@ -34,10 +34,10 @@ using namespace KSGRD; SensorSocketAgent::SensorSocketAgent( SensorManager *sm ) : SensorAgent( sm ) { - connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) ); - connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) ); - connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) ); - connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) ); + connect( &mSocket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( error( int ) ) ); + connect( &mSocket, TQ_SIGNAL( bytesWritten( int ) ), TQ_SLOT( msgSent( int ) ) ); + connect( &mSocket, TQ_SIGNAL( readyRead() ), TQ_SLOT( msgRcvd() ) ); + connect( &mSocket, TQ_SIGNAL( closed() ), TQ_SLOT( connectionClosed() ) ); } SensorSocketAgent::~SensorSocketAgent() diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.h b/ksysguard/gui/ksgrd/SensorSocketAgent.h index 7b9062f17..f937562ff 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.h +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.h @@ -41,7 +41,7 @@ class SensorClient; */ class SensorSocketAgent : public SensorAgent { - Q_OBJECT + TQ_OBJECT public: SensorSocketAgent( SensorManager *sm ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.cpp b/ksysguard/gui/ksgrd/StyleEngine.cpp index ce3e3bd6b..0e7330741 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cpp +++ b/ksysguard/gui/ksgrd/StyleEngine.cpp @@ -143,8 +143,8 @@ void StyleEngine::configure() mSettingsDialog->setFontSize( mFontSize ); mSettingsDialog->setSensorColors( mSensorColors ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( applyToWorksheet() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( applyToWorksheet() ) ); if ( mSettingsDialog->exec() ) apply(); diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 50ec06e0b..15a968eb6 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -38,9 +38,9 @@ class StyleSettings; namespace KSGRD { -class KDE_EXPORT StyleEngine : public QObject +class KDE_EXPORT StyleEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: StyleEngine(); diff --git a/ksysguard/gui/ksgrd/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp index b84d3e407..f70a387b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cpp +++ b/ksysguard/gui/ksgrd/StyleSettings.cpp @@ -90,14 +90,14 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page ); mEditColorButton->setEnabled( false ); - layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop ); - - connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); - connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - TQT_SLOT( editSensorColor() ) ); - connect( mEditColorButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editSensorColor() ) ); + layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop ); + + connect( mColorListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mColorListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + TQ_SLOT( editSensorColor() ) ); + connect( mEditColorButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editSensorColor() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/StyleSettings.h b/ksysguard/gui/ksgrd/StyleSettings.h index c3b3d362c..5868b9123 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.h +++ b/ksysguard/gui/ksgrd/StyleSettings.h @@ -35,7 +35,7 @@ class TQPushButton; class StyleSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: StyleSettings( TQWidget *parent = 0, const char *name = 0 ); diff --git a/ksysguard/gui/ksgrd/TimerSettings.cpp b/ksysguard/gui/ksgrd/TimerSettings.cpp index 43e73ab90..4fa165f99 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cpp +++ b/ksysguard/gui/ksgrd/TimerSettings.cpp @@ -53,8 +53,8 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) mLabel->setBuddy( mInterval ); TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); - connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( globalUpdateChanged( bool ) ) ); + connect( mUseGlobalUpdate, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( globalUpdateChanged( bool ) ) ); mUseGlobalUpdate->setChecked( true ); diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h index 64c49959b..8a2ba9588 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.h +++ b/ksysguard/gui/ksgrd/TimerSettings.h @@ -32,7 +32,7 @@ class TQSpinBox; class KDE_EXPORT TimerSettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TimerSettings( TQWidget *parent, const char *name = 0 ); diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 937c5fdd1..65326d826 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -76,23 +76,23 @@ TopLevel::TopLevel( const char *name ) mTimerId = -1; mSplitter = new TQSplitter( this ); - mSplitter->setOrientation( Qt::Horizontal ); + mSplitter->setOrientation( TQt::Horizontal ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget( mSplitter ); mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr ); mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true); - connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); mWorkSpace = new Workspace( mSplitter ); - connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ), - TQT_SLOT( registerRecentURL( const KURL& ) ) ); - connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ), - TQT_SLOT( setCaption( const TQString&, bool ) ) ); - connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, - TQT_SLOT( applyStyle() ) ); + connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ), + TQ_SLOT( registerRecentURL( const KURL& ) ) ); + connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ), + TQ_SLOT( setCaption( const TQString&, bool ) ) ); + connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, + TQ_SLOT( applyStyle() ) ); /* Create the status bar. It displays some information about the * number of processes and the memory consumption of the local @@ -105,40 +105,40 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); + new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, + TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); + new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace, + TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0, - TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); + mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); + new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace, + TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); + new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace, + TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); - new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), - TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); - new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), - TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); + new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, + TQ_SLOT( connectHost() ), actionCollection(), "connect_host" ); + new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, + TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); -// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); -// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); -// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); - new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); +// KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() ); +// KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() ); +// KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() ); + new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace, + TQ_SLOT( configure() ), actionCollection(), "configure_sheet" ); new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", - 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), + 0, this, TQ_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), - TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); + new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this, + TQ_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) @@ -293,7 +293,7 @@ void TopLevel::initStatusBar() TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar")); if (sb) - connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); + connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar())); } void TopLevel::updateStatusBar() @@ -319,8 +319,8 @@ void TopLevel::editToolbars() { saveMainWindowSettings( kapp->config() ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, - TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, + TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index df1c2e0c5..b1579bf65 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -43,7 +43,7 @@ class Workspace; class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index f90bdadb0..16019bdc1 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -21,6 +21,8 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" ) set( OS_SPECIFIC_DIR FreeBSD ) elseif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" ) set( OS_SPECIFIC_DIR NetBSD ) +elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) + set( OS_SPECIFIC_DIR Solaris ) else() tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." ) endif() diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c index f8d2c3ba6..dbb330efb 100644 --- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c +++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c @@ -98,18 +98,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -264,20 +258,20 @@ updateProcess(int pid) #if __FreeBSD_version >= 500015 ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale; ps->vmSize = p.ki_size; - ps->vmRss = p.ki_rssize * getpagesize(); + ps->vmRss = (size_t)(p.ki_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name)); strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????"); #elif defined (__DragonFly__) && __DragonFly_version >= 190000 ps->userLoad = 100.0 * (double) p.kp_lwp.kl_pctcpu / fscale; ps->vmSize = p.kp_vm_map_size; - ps->vmRss = p.kp_vm_rssize * getpagesize(); + ps->vmRss = (size_t)(p.kp_vm_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p.kp_comm ? p.kp_comm : "????", sizeof(ps->name)); strcpy(ps->status,(p.kp_stat>=1)&&(p.kp_stat<=5)? statuses[p.kp_stat-1]:"????"); #else ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale; ps->vmSize = p.kp_eproc.e_vm.vm_map.size; - ps->vmRss = p.kp_eproc.e_vm.vm_rssize * getpagesize(); + ps->vmRss = (size_t)(p.kp_eproc.e_vm.vm_rssize) * (size_t)(getpagesize()); #if defined (__DragonFly__) strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????", sizeof(ps->name)); @@ -417,7 +411,7 @@ printProcessList(const char* cmd) ps = first_ctnr(ProcessList); /* skip 'kernel' entry */ for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index 2708664bd..8582aae56 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -84,10 +84,10 @@ typedef struct { The total amount of memory the process uses. This includes shared and swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* The amount of physical memory the process currently uses. */ - unsigned int vmRss; + size_t vmRss; /** The number of 1/100 of a second the process has spend in user space. @@ -215,7 +215,7 @@ static int updateProcess( int pid ) return -1; if ( fscanf( fd, "%*d %*s %c %d %d %*d %d %*d %*u %*u %*u %*u %*u %d %d" - "%*d %*d %*d %d %*u %*u %*d %u %u", + "%*d %*d %*d %d %*u %*u %*d %zu %zu", &status, (int*)&ps->ppid, (int*)&ps->gid, &ps->ttyNo, &userTime, &sysTime, &ps->niceLevel, &ps->vmSize, &ps->vmRss) != 9 ) { @@ -419,7 +419,7 @@ void printProcessList( const char* cmd ) (void)cmd; for ( ps = first_ctnr( ProcessList ); ps; ps = next_ctnr( ProcessList ) ) { - fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d" + fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu" "\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, ps->vmSize / 1024, ps->vmRss / 1024, diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c index 13c65053d..a23af4cf3 100644 --- a/ksysguard/ksysguardd/NetBSD/ProcessList.c +++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c @@ -91,18 +91,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -200,10 +194,10 @@ updateProcess(int pid, struct kinfo_proc2 *p) ps->userName[sizeof(ps->userName)-1]='\0'; ps->userLoad = 100.0 * ((double)(p->p_pctcpu) /FSCALE); - ps->vmSize = (p->p_vm_tsize + - p->p_vm_dsize + - p->p_vm_ssize) * getpagesize(); - ps->vmRss = p->p_vm_rssize * getpagesize(); + ps->vmSize = ((size_t)(p->p_vm_tsize) + + (size_t)(p->p_vm_dsize) + + (size_t)(p->p_vm_ssize)) * (size_t)(getpagesize()); + ps->vmRss = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name)); strlcpy(ps->status,(p->p_stat<=7)? statuses[p->p_stat]:"????", sizeof(ps->status)); @@ -316,7 +310,7 @@ printProcessList(const char* cmd) ps = first_ctnr(ProcessList); /* skip 'kernel' entry */ for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->priority, ps->niceLevel, diff --git a/ksysguard/ksysguardd/OpenBSD/ProcessList.c b/ksysguard/ksysguardd/OpenBSD/ProcessList.c index ccdcc2313..f84ff0b2d 100644 --- a/ksysguard/ksysguardd/OpenBSD/ProcessList.c +++ b/ksysguard/ksysguardd/OpenBSD/ProcessList.c @@ -88,18 +88,12 @@ typedef struct * The total amount of memory the process uses. This includes shared and * swapped memory. */ - unsigned int vmSize; + size_t vmSize; /* * The amount of physical memory the process currently uses. */ - unsigned int vmRss; - - /* - * The amount of memory (shared/swapped/etc) the process shares with - * other processes. - */ - unsigned int vmLib; + size_t vmRss; /* * The number of 1/100 of a second the process has spend in user space. @@ -245,10 +239,10 @@ updateProcess(struct kinfo_proc *p) ps->userName[sizeof(ps->userName)-1]='\0'; ps->userLoad = p->p_pctcpu / 100; - ps->vmSize = (p->p_vm_tsize + - p->p_vm_dsize + - p->p_vm_ssize) * getpagesize(); - ps->vmRss = p->p_vm_rssize * getpagesize(); + ps->vmSize = ((size_t)(p->p_vm_tsize) + + (size_t)(p->p_vm_dsize) + + (size_t)(p->p_vm_ssize)) * (size_t)(getpagesize()); + ps->vmRss = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize()); strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name)); strlcpy(ps->status,(p->p_stat>=1)&&(p->p_stat<=5)? statuses[p->p_stat-1]:"????", sizeof(ps->status)); @@ -362,7 +356,7 @@ printProcessList(const char* cmd) for (ps = first_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList)) { - fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n", + fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid, (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad, ps->sysLoad, ps->niceLevel, diff --git a/ksysguard/ksysguardd/Solaris/CMakeLists.txt b/ksysguard/ksysguardd/Solaris/CMakeLists.txt new file mode 100644 index 000000000..aeeda9ac3 --- /dev/null +++ b/ksysguard/ksysguardd/Solaris/CMakeLists.txt @@ -0,0 +1,25 @@ +################################################# +# +# (C) 2023 Denis Kozadaev +# denis (AT) tambov (DOT) ru +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/ksysguard/CContLib + ${CMAKE_SOURCE_DIR}/ksysguard/ksysguardd +) + + +##### ksysguardd (static) ####################### + +tde_add_library( ksysguardd STATIC + SOURCES + Memory.c LoadAvg.c ProcessList.c NetDev.c +) diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h index fe66ad537..6130f2a83 100644 --- a/ksysguard/ksysguardd/modules.h +++ b/ksysguard/ksysguardd/modules.h @@ -68,7 +68,7 @@ #include "netdev.h" #endif /* OSTYPE_NetBSD */ -#ifdef OSTYPE_Solaris +#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS) #include "LoadAvg.h" #include "Memory.h" #include "NetDev.h" @@ -146,7 +146,7 @@ struct SensorModul SensorModulList[] = { { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME }, #endif /* OSTYPE_NetBSD */ -#ifdef OSTYPE_Solaris +#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS) { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME }, { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME }, { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME }, |