summaryrefslogtreecommitdiffstats
path: root/ksysguard/gui
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /ksysguard/gui
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksysguard/gui')
-rw-r--r--ksysguard/gui/KSGAppletSettings.cc2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc4
-rw-r--r--ksysguard/gui/SensorBrowser.cc8
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.cc6
-rw-r--r--ksysguard/gui/SensorDisplayLib/BarGraph.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/DancingBars.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/DummyDisplay.cc2
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.cc18
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.h2
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc8
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.cc48
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListView.h10
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui36
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFile.cc14
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFileSettings.ui58
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeter.cc6
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui88
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessController.cc12
-rw-r--r--ksysguard/gui/SensorDisplayLib/ProcessList.cc14
-rw-r--r--ksysguard/gui/SensorDisplayLib/ReniceDlg.cc2
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorDisplay.cc16
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.cc34
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLogger.h6
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui34
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui36
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.cc8
-rw-r--r--ksysguard/gui/SensorDisplayLib/SignalPlotter.h2
-rw-r--r--ksysguard/gui/WorkSheet.cc6
-rw-r--r--ksysguard/gui/WorkSheet.h2
-rw-r--r--ksysguard/gui/WorkSheetSettings.cc6
-rw-r--r--ksysguard/gui/Workspace.cc18
-rw-r--r--ksysguard/gui/Workspace.h2
-rw-r--r--ksysguard/gui/ksgrd/HostConnector.cc2
-rw-r--r--ksysguard/gui/ksgrd/SensorAgent.cc2
-rw-r--r--ksysguard/gui/ksgrd/SensorManager.cc16
-rw-r--r--ksysguard/gui/ksysguard.cc34
-rw-r--r--ksysguard/gui/ksysguard.h2
40 files changed, 294 insertions, 294 deletions
diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index 5160dbddb..5aef8a26f 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name )
topLayout->addWidget( mInterval, 2, 1 );
label->setBuddy( mInterval );
- resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) );
+ resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) );
KAcceleratorManager::manage( page );
}
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index 245600cb6..2dff511e3 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified )
void KSysGuardApplet::layout()
{
- if ( orientation() == Horizontal ) {
+ if ( orientation() == Qt::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() == Horizontal )
+ if ( orientation() == Qt::Horizontal )
return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) );
else
return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) );
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc
index 1e51a5631..90705af1c 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ b/ksysguard/gui/SensorBrowser.cc
@@ -33,7 +33,7 @@
#include "SensorBrowser.h"
-class HostItem : public QListViewItem
+class HostItem : public TQListViewItem
{
public:
HostItem( SensorBrowser *parent, const TQString &text, int id,
@@ -225,13 +225,13 @@ void SensorBrowser::answerReceived( int id, const TQString &answer )
parent = lvi;
// The child indicator might need to be updated.
- repaintItem( parent );
+ tqrepaintItem( parent );
} else
parent = sibling;
}
}
- repaintItem( (*it)->listViewItem() );
+ tqrepaintItem( (*it)->listViewItem() );
}
void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
@@ -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() & LeftButton ) )
+ if ( !( e->state() & Qt::LeftButton ) )
return;
TQListViewItem* item = itemAt( e->pos() );
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
index 8d2b5e302..79d8f5961 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
@@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name )
// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
- setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) );
}
@@ -103,7 +103,7 @@ void BarGraph::paintEvent( TQPaintEvent* )
TQPixmap pm( w, h );
TQPainter p;
- p.begin( &pm, this );
+ p.tqbegin( &pm, this );
p.setFont( TQFont( p.font().family(), fontSize ) );
TQFontMetrics fm( p.font() );
@@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* )
/* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */
- p.setPen( TQColor( colorGroup().light() ) );
+ p.setPen( TQColor( tqcolorGroup().light() ) );
p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 );
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h
index 744faf777..1a1262594 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.h
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h
@@ -28,7 +28,7 @@
#include <tqptrvector.h>
#include <tqwidget.h>
-class BarGraph : public QWidget
+class BarGraph : public TQWidget
{
Q_OBJECT
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
index 3917fc86b..e2b3917f5 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
@@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti
else
mPlotter = new BarGraph( frame() );
- setMinimumSize( sizeHint() );
+ setMinimumSize( tqsizeHint() );
/* All RMB clicks to the mPlotter widget will be handled by
* SensorDisplay::eventFilter. */
@@ -147,7 +147,7 @@ void DancingBars::applySettings()
removeSensor( i );
}
- repaint();
+ tqrepaint();
setModified( true );
}
@@ -158,7 +158,7 @@ void DancingBars::applyStyle()
mPlotter->backgroundColor = KSGRD::Style->backgroundColor();
mPlotter->fontSize = KSGRD::Style->fontSize();
- repaint();
+ tqrepaint();
setModified( true );
}
@@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() );
}
-TQSize DancingBars::sizeHint()
+TQSize DancingBars::tqsizeHint()
{
if ( noFrame() )
- return ( mPlotter->sizeHint() );
+ return ( mPlotter->tqsizeHint() );
else
- return ( frame()->sizeHint() );
+ return ( frame()->tqsizeHint() );
}
void DancingBars::answerReceived( int id, const TQString &answer )
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h
index 3ccc03f86..35feaa07f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h
@@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay
void updateSamples( const TQMemArray<double> &samples );
- virtual TQSize sizeHint();
+ virtual TQSize tqsizeHint();
virtual void answerReceived( int id, const TQString &answer );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
index 2e499e852..42267af42 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
@@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* )
bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event )
{
if ( event->type() == TQEvent::MouseButtonRelease &&
- ( (TQMouseEvent*)event)->button() == LeftButton )
+ ( (TQMouseEvent*)event)->button() == Qt::LeftButton )
setFocus();
return TQWidget::eventFilter( object, event );
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
index 0434877bb..65a9ec809 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
@@ -52,13 +52,13 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
mPlotter->setTitle( title );
mPlotter->setThinFrame(!isApplet); //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect
- setMinimumSize( sizeHint() );
+ setMinimumSize( tqsizeHint() );
/* All RMB clicks to the mPlotter widget will be handled by
* SensorDisplay::eventFilter. */
mPlotter->installEventFilter( this );
- setPlotterWidget( mPlotter );
+ setPlotterWidget( TQT_TQWIDGET(mPlotter) );
setModified( false );
}
@@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- TQToolTip::remove( mPlotter );
- TQToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
+ TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
return true;
}
@@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos )
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- TQToolTip::remove( mPlotter );
- TQToolTip::add( mPlotter, tooltip );
+ TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
+ TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
return true;
}
@@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() );
}
-TQSize FancyPlotter::sizeHint()
+TQSize FancyPlotter::tqsizeHint()
{
if ( noFrame() )
- return mPlotter->sizeHint();
+ return mPlotter->tqsizeHint();
else
- return frame()->sizeHint();
+ return frame()->tqsizeHint();
}
void FancyPlotter::answerReceived( int id, const TQString &answer )
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
index 2f0e36c60..00d88223a 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
@@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay
bool removeSensor( uint pos );
- virtual TQSize sizeHint(void);
+ virtual TQSize tqsizeHint(void);
virtual void answerReceived( int id, const TQString &answer );
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index de345e7b8..95587dde6 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
boxLayout->addWidget( label, 1, 0 );
mMinValue = new KLineEdit( groupBox );
- mMinValue->setAlignment( AlignRight );
+ mMinValue->tqsetAlignment( AlignRight );
mMinValue->setEnabled( false );
TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMinValue, 1, 1 );
@@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
boxLayout->addWidget( label, 1, 3 );
mMaxValue = new KLineEdit( groupBox );
- mMaxValue->setAlignment( AlignRight );
+ mMaxValue->tqsetAlignment( AlignRight );
mMaxValue->setEnabled( false );
TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
boxLayout->addWidget( mMaxValue, 1, 4 );
@@ -532,7 +532,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const
entry << it.current()->text( 3 );
entry << it.current()->text( 4 );
QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
- TQColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) );
+ TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) );
entry << ( color.name() );
list.prepend( entry );
@@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor()
return;
TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 );
- int result = KColorDialog::getColor( color, parentWidget() );
+ int result = KColorDialog::getColor( color, tqparentWidget() );
if ( result == KColorDialog::Accepted ) {
TQPixmap newPm( 12, 12 );
newPm.fill( color );
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index c980196e6..dbd11a7b5 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cc
@@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending
PrivateListView::PrivateListView(TQWidget *parent, const char *name)
: TQListView(parent, name)
{
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
@@ -290,12 +290,12 @@ ListView::restoreSettings(TQDomElement& element)
{
addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title"));
- TQColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
- colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
- colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
+ TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
+ tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
+ tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
+ tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
- monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
+ monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
SensorDisplay::restoreSettings(element);
@@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
element.setAttribute("sensorName", sensors().at(0)->name());
element.setAttribute("sensorType", sensors().at(0)->type());
- TQColorGroup colorGroup = monitor->colorGroup();
- saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link));
- saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text));
- saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base));
+ TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
+ saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link));
+ saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text));
+ saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base));
SensorDisplay::saveSettings(doc, element);
@@ -331,10 +331,10 @@ ListView::configureSettings()
Q_CHECK_PTR(lvs);
connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
- TQColorGroup colorGroup = monitor->colorGroup();
- lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
- lvs->setTextColor(colorGroup.color(TQColorGroup::Text));
- lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base));
+ TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
+ lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link));
+ lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text));
+ lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base));
lvs->setTitle(title());
if (lvs->exec())
@@ -347,11 +347,11 @@ ListView::configureSettings()
void
ListView::applySettings()
{
- TQColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
- colorGroup.setColor(TQColorGroup::Text, lvs->textColor());
- colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
- monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
+ TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
+ tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
+ tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor());
+ tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
+ monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
setTitle(lvs->title());
@@ -361,11 +361,11 @@ ListView::applySettings()
void
ListView::applyStyle()
{
- TQColorGroup colorGroup = monitor->colorGroup();
- colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
- colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
- colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
- monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
+ TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
+ tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
+ tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
+ tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+ monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
setModified(true);
}
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h
index 1c63d95cb..3a79a20b3 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -35,7 +35,7 @@ class TQLabel;
class QBoxGroup;
class ListViewSettings;
-class PrivateListView : public QListView
+class PrivateListView : public TQListView
{
Q_OBJECT
public:
@@ -52,14 +52,14 @@ private:
TQStringList mColumnTypes;
};
-class PrivateListViewItem : public QListViewItem
+class PrivateListViewItem : public TQListViewItem
{
public:
PrivateListViewItem(PrivateListView *parent = 0);
- void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) {
- TQColorGroup cgroup = _parent->colorGroup();
- TQListViewItem::paintCell(p, cgroup, column, width, alignment);
+ void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) {
+ TQColorGroup cgroup = _parent->tqcolorGroup();
+ TQListViewItem::paintCell(p, cgroup, column, width, tqalignment);
p->setPen(cgroup.color(TQColorGroup::Link));
p->drawLine(0, height() - 1, width - 1, height() - 1);
}
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
index f61f30dd7..53124ca65 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ListViewSettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ListViewSettingsWidget</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>titleFrame</cstring>
</property>
@@ -27,14 +27,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_title</cstring>
</property>
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>colorFrame</cstring>
</property>
@@ -55,7 +55,7 @@
<property name="title">
<string>Colors</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="vAlign" stdset="0">
@@ -66,7 +66,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -74,7 +74,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -82,7 +82,7 @@
<string>Text color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -90,7 +90,7 @@
<string>Grid color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -100,7 +100,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>layout1</cstring>
</property>
@@ -164,14 +164,14 @@
<include location="local" impldecl="in implementation">ListViewSettingsWidget.ui.h</include>
</includes>
<functions>
- <function specifier="non virtual" returnType="QString">title()</function>
- <function specifier="non virtual" returnType="QColor">gridColor()</function>
- <function specifier="non virtual" returnType="QColor">backgroundColor()</function>
- <function specifier="non virtual" returnType="QColor">textColor()</function>
- <function specifier="non virtual">setTitle( const QString &amp; t )</function>
- <function specifier="non virtual">setBackgroundColor( const QColor &amp; c )</function>
- <function specifier="non virtual">setTextColor( const QColor &amp; c )</function>
- <function specifier="non virtual">setGridColor( const QColor &amp; c )</function>
+ <function specifier="non virtual" returnType="TQString">title()</function>
+ <function specifier="non virtual" returnType="TQColor">gridColor()</function>
+ <function specifier="non virtual" returnType="TQColor">backgroundColor()</function>
+ <function specifier="non virtual" returnType="TQColor">textColor()</function>
+ <function specifier="non virtual">setTitle( const TQString &amp; t )</function>
+ <function specifier="non virtual">setBackgroundColor( const TQColor &amp; c )</function>
+ <function specifier="non virtual">setTextColor( const TQColor &amp; c )</function>
+ <function specifier="non virtual">setGridColor( const TQColor &amp; c )</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index 7de7899ab..575ca6919 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -62,7 +62,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
registerSensor(new KSGRD::SensorProperties(hostName, sensorName, sensorType, title));
- TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1));
+ TQString sensorID = sensorName.right(sensorName.length() - (sensorName.tqfindRev("/") + 1));
sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42);
@@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
void LogFile::configureSettings(void)
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
lfs = new LogFileSettings(this);
Q_CHECK_PTR(lfs);
@@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index)
void LogFile::applySettings(void)
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color());
cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color());
@@ -166,7 +166,7 @@ void LogFile::applySettings(void)
void
LogFile::applyStyle()
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@@ -179,7 +179,7 @@ bool
LogFile::restoreSettings(TQDomElement& element)
{
TQFont font;
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
@@ -212,8 +212,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
element.setAttribute("font", monitor->font().toString());
- saveColor(element, "textColor", monitor->colorGroup().text());
- saveColor(element, "backgroundColor", monitor->colorGroup().base());
+ saveColor(element, "textColor", monitor->tqcolorGroup().text());
+ saveColor(element, "backgroundColor", monitor->tqcolorGroup().base());
for (TQStringList::Iterator it = filterRules.begin();
it != filterRules.end(); it++)
diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
index b5dcff0ee..a1cc1572c 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
+++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>LogFileSettings</class>
<author>Tobias Koenig &lt;tokoe@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>LogFileSettings</cstring>
</property>
@@ -23,11 +23,11 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>TabWidget</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox8</cstring>
</property>
@@ -49,14 +49,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>title</cstring>
</property>
</widget>
</hbox>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>styleGroup</cstring>
</property>
@@ -70,7 +70,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
</property>
@@ -78,7 +78,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
</property>
@@ -86,7 +86,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -94,7 +94,7 @@
<string>Foreground color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -104,7 +104,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -151,7 +151,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox11</cstring>
</property>
@@ -172,14 +172,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>fontButton</cstring>
</property>
@@ -191,7 +191,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -202,7 +202,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout7</cstring>
</property>
@@ -210,19 +210,19 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>ruleText</cstring>
</property>
</widget>
- <widget class="QListBox">
+ <widget class="TQListBox">
<property name="name">
<cstring>ruleList</cstring>
</property>
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout9</cstring>
</property>
@@ -230,7 +230,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>addButton</cstring>
</property>
@@ -238,7 +238,7 @@
<string>&amp;Add</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>deleteButton</cstring>
</property>
@@ -246,7 +246,7 @@
<string>&amp;Delete</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>changeButton</cstring>
</property>
@@ -264,7 +264,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -276,7 +276,7 @@
</hbox>
</widget>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout5</cstring>
</property>
@@ -284,7 +284,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>okButton</cstring>
</property>
@@ -295,7 +295,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>applyButton</cstring>
</property>
@@ -313,14 +313,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelButton</cstring>
</property>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
index 8a9cc9b60..3a54aefd3 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
@@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name,
Q_CHECK_PTR(lcd);
lcd->setSegmentStyle(TQLCDNumber::Filled);
setDigitColor(KSGRD::Style->backgroundColor());
- lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false));
setBackgroundColor(KSGRD::Style->backgroundColor());
@@ -225,7 +225,7 @@ MultiMeter::applySettings()
alarmDigitColor = mms->alarmDigitColor();
setBackgroundColor(mms->meterBackgroundColor());
- repaint();
+ tqrepaint();
setModified(true);
}
@@ -234,7 +234,7 @@ MultiMeter::applyStyle()
{
normalDigitColor = KSGRD::Style->firstForegroundColor();
setBackgroundColor(KSGRD::Style->backgroundColor());
- repaint();
+ tqrepaint();
setModified(true);
}
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index 7ecdef88f..40209feac 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MultiMeterSettingsWidget</class>
<comment>MultiMeterSettingsWidget</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>MultiMeterSettingsWidget</cstring>
</property>
@@ -17,7 +17,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox7</cstring>
</property>
@@ -28,7 +28,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit" row="0" column="0">
+ <widget class="TQLineEdit" row="0" column="0">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -36,7 +36,7 @@
<string>Enter the title of the display here.</string>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="1">
+ <widget class="TQCheckBox" row="0" column="1">
<property name="name">
<cstring>m_showUnit</cstring>
</property>
@@ -49,11 +49,11 @@
</widget>
</grid>
</widget>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>TabWidget2</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -64,7 +64,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox" row="1" column="0">
+ <widget class="TQGroupBox" row="1" column="0">
<property name="name">
<cstring>GroupBox1_2</cstring>
</property>
@@ -75,7 +75,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="0" column="0">
+ <widget class="TQCheckBox" row="0" column="0">
<property name="name">
<cstring>m_upperLimitActive</cstring>
</property>
@@ -96,14 +96,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>m_lblUpperLimit</cstring>
</property>
@@ -114,14 +114,14 @@
<string>Upper limit:</string>
</property>
</widget>
- <widget class="QLineEdit" row="0" column="3">
+ <widget class="TQLineEdit" row="0" column="3">
<property name="name">
<cstring>m_upperLimit</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -130,7 +130,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox" row="0" column="0">
+ <widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@@ -141,7 +141,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="0" column="0">
+ <widget class="TQCheckBox" row="0" column="0">
<property name="name">
<cstring>m_lowerLimitActive</cstring>
</property>
@@ -162,14 +162,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>m_lblLowerLimit</cstring>
</property>
@@ -180,14 +180,14 @@
<string>Lower limit:</string>
</property>
</widget>
- <widget class="QLineEdit" row="0" column="3">
+ <widget class="TQLineEdit" row="0" column="3">
<property name="name">
<cstring>m_lowerLimit</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -198,7 +198,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -209,7 +209,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout1</cstring>
</property>
@@ -217,7 +217,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -225,7 +225,7 @@
<string>Normal digit color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -233,7 +233,7 @@
<string>Alarm digit color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -243,7 +243,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -334,14 +334,14 @@
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
- <slot access="public" specifier="">repaint()</slot>
- <slot access="public" specifier="">repaint(bool)</slot>
- <slot access="public" specifier="">repaint(int,int,int,int)</slot>
- <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
- <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
- <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
- <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
- <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
+ <slot access="public" specifier="">tqrepaint()</slot>
+ <slot access="public" specifier="">tqrepaint(bool)</slot>
+ <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
+ <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
+ <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
+ <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
+ <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
+ <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@@ -377,8 +377,8 @@
<property type="Bool">enabled</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">minimumSize</property>
- <property type="Size">maximumSize</property>
+ <property type="Size">tqminimumSize</property>
+ <property type="Size">tqmaximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
@@ -444,28 +444,28 @@
<include location="global" impldecl="in implementation">knumvalidator.h</include>
<include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include>
</includes>
-<slots>
- <slot>setMeterBackgroundColor( const QColor &amp; c )</slot>
-</slots>
+<Q_SLOTS>
+ <slot>setMeterBackgroundColor( const TQColor &amp; c )</slot>
+</Q_SLOTS>
<functions>
<function access="private" specifier="non virtual">init()</function>
- <function specifier="non virtual" returnType="QString">title()</function>
+ <function specifier="non virtual" returnType="TQString">title()</function>
<function specifier="non virtual" returnType="bool">showUnit()</function>
<function returnType="bool">lowerLimitActive()</function>
<function specifier="non virtual" returnType="double">lowerLimit()</function>
<function returnType="bool">upperLimitActive()</function>
<function returnType="double">upperLimit()</function>
- <function specifier="non virtual" returnType="QColor">normalDigitColor()</function>
- <function specifier="non virtual" returnType="QColor">alarmDigitColor()</function>
- <function returnType="QColor">meterBackgroundColor()</function>
- <function specifier="non virtual">setTitle( const QString &amp; s )</function>
+ <function specifier="non virtual" returnType="TQColor">normalDigitColor()</function>
+ <function specifier="non virtual" returnType="TQColor">alarmDigitColor()</function>
+ <function returnType="TQColor">meterBackgroundColor()</function>
+ <function specifier="non virtual">setTitle( const TQString &amp; s )</function>
<function specifier="non virtual">setShowUnit( bool b )</function>
<function specifier="non virtual">setLowerLimitActive( bool b )</function>
<function specifier="non virtual">setLowerLimit( double d )</function>
<function specifier="non virtual">setUpperLimitActive( bool b )</function>
<function specifier="non virtual">setUpperLimit( double d )</function>
- <function specifier="non virtual">setNormalDigitColor( const QColor &amp; c )</function>
- <function specifier="non virtual">setAlarmDigitColor( const QColor &amp; c )</function>
+ <function specifier="non virtual">setNormalDigitColor( const TQColor &amp; c )</function>
+ <function specifier="non virtual">setAlarmDigitColor( const TQColor &amp; c )</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index e97fabffc..fe88f292f 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(m_lowerLimit));
- m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
+ m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
+ m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
m_title->setFocus();
}
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index f02b02af9..90f86a0e8 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
cbFilter->insertItem(i18n("System Processes"), 1);
cbFilter->insertItem(i18n("User Processes"), 2);
cbFilter->insertItem(i18n("Own Processes"), 3);
- cbFilter->setMinimumSize(cbFilter->sizeHint());
+ cbFilter->setMinimumSize(cbFilter->tqsizeHint());
// Create the check box to switch between tree view and list view.
xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
Q_CHECK_PTR(xbTreeView);
- xbTreeView->setMinimumSize(xbTreeView->sizeHint());
+ xbTreeView->setMinimumSize(xbTreeView->tqsizeHint());
connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setTreeView(bool)));
@@ -116,13 +116,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ),
this, "bRefresh" );
Q_CHECK_PTR(bRefresh);
- bRefresh->setMinimumSize(bRefresh->sizeHint());
+ bRefresh->setMinimumSize(bRefresh->tqsizeHint());
connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
// Create the 'Kill' button.
bKill = new KPushButton(i18n("&Kill"), this, "bKill");
Q_CHECK_PTR(bKill);
- bKill->setMinimumSize(bKill->sizeHint());
+ bKill->setMinimumSize(bKill->tqsizeHint());
connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
/* Disable the kill button until we know that the daemon supports the
* kill command. */
@@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
setPlotterWidget(pList);
- setMinimumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
fixTabOrder();
}
@@ -247,7 +247,7 @@ ProcessController::killProcess()
KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"),
KDialogBase::Yes | KDialogBase::Cancel,
- KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(),
+ KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(),
"killconfirmation",
true, true, KGuiItem(i18n("Kill")));
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 2f5b3fe51..cc5ca3266 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -486,7 +486,7 @@ ProcessList::buildList()
addProcess(p, pli);
- if (selectedPIds.findIndex(p->pid()) != -1)
+ if (selectedPIds.tqfindIndex(p->pid()) != -1)
pli->setSelected(true);
}
pl.removeFirst();
@@ -513,7 +513,7 @@ ProcessList::buildTree()
int pid = ps->pid();
pl.remove();
- if (selectedPIds.findIndex(pid) != -1)
+ if (selectedPIds.tqfindIndex(pid) != -1)
pli->setSelected(true);
// insert all child processes of current process
@@ -569,10 +569,10 @@ ProcessList::extendTree(TQPtrList<KSGRD::SensorPSLine>* pl, ProcessLVI* parent,
addProcess(ps, pli);
- if (selectedPIds.findIndex(ps->pid()) != -1)
+ if (selectedPIds.tqfindIndex(ps->pid()) != -1)
pli->setSelected(true);
- if (ps->ppid() != INIT_PID && closedSubTrees.findIndex(ps->ppid()) != -1)
+ if (ps->ppid() != INIT_PID && closedSubTrees.tqfindIndex(ps->ppid()) != -1)
parent->setOpen(false);
else
parent->setOpen(true);
@@ -635,7 +635,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
icon.fill();
bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height());
TQBitmap mask(24, 16, true);
- bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height());
+ bitBlt(&mask, 4, 0, pix.tqmask(), 0, 0, pix.width(), pix.height());
icon.setMask(mask);
pix = icon;
}
@@ -909,7 +909,7 @@ ProcessList::selectAllItems(bool select)
for ( ; it.current(); ++it )
{
it.current()->setSelected(select);
- repaintItem(it.current());
+ tqrepaintItem(it.current());
if (select)
selectedPIds.append(it.current()->text(1).toInt());
}
@@ -928,7 +928,7 @@ ProcessList::selectAllChilds(int pid, bool select)
{
int currPId = it.current()->text(1).toInt();
it.current()->setSelected(select);
- repaintItem(it.current());
+ tqrepaintItem(it.current());
if (select)
selectedPIds.append(currPId);
else
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
index dfd535883..f5d13ed5c 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
@@ -43,7 +43,7 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio,
"the number is the higher the priority.\n\n"
"Please enter the desired nice level:").arg(pid);
message = new TQLabel(msg, page);
- message->setMinimumSize(message->sizeHint());
+ message->setMinimumSize(message->tqsizeHint());
vLay->addWidget(message);
/*
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index c80ad65ee..dca7163b8 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
if(!nf) {
mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
mFrame->setFlat(true);
- mFrame->setAlignment(Qt::AlignHCenter);
+ mFrame->tqsetAlignment(Qt::AlignHCenter);
mFrame->setInsideMargin(2);
setTitle( title );
@@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval()
if ( dlg.useGlobalUpdate() ) {
mUseGlobalUpdateInterval = true;
- SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
+ SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() );
if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 );
@@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* )
bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
{
if ( event->type() == TQEvent::MouseButtonPress &&
- ( (TQMouseEvent*)event)->button() == RightButton ) {
+ ( (TQMouseEvent*)event)->button() == Qt::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() == LeftButton ) {
+ ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) {
setFocus();
}
@@ -247,7 +247,7 @@ void SensorDisplay::updateWhatsThis()
void SensorDisplay::hosts( TQStringList& list )
{
for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() )
- if ( !list.contains( s->hostName() ) )
+ if ( !list.tqcontains( s->hostName() ) )
list.append( s->hostName() );
}
@@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element )
} else {
mUseGlobalUpdateInterval = true;
- SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
+ SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() );
if ( !sb ) {
kdDebug(1215) << "dynamic cast lacks" << endl;
setUpdateInterval( 2 );
@@ -447,8 +447,8 @@ void SensorDisplay::setSensorOk( bool ok )
mErrorIndicator = new TQWidget( mPlotterWdg );
mErrorIndicator->setErasePixmap( errorIcon );
mErrorIndicator->resize( errorIcon.size() );
- if ( errorIcon.mask() )
- mErrorIndicator->setMask( *errorIcon.mask() );
+ if ( errorIcon.tqmask() )
+ mErrorIndicator->setMask( *errorIcon.tqmask() );
mErrorIndicator->move( 0, 0 );
mErrorIndicator->show();
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index 383bf525e..383e7b53c 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
@@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent)
pixmap_waiting = UserIcon( "waiting" );
lvi->setPixmap(0, pixmap_waiting);
- lvi->setTextColor(monitor->colorGroup().text());
+ lvi->setTextColor(monitor->tqcolorGroup().text());
monitor->insertItem(lvi);
}
@@ -72,8 +72,8 @@ void
LogSensor::stopLogging(void)
{
lvi->setPixmap(0, pixmap_waiting);
- lvi->setTextColor(monitor->colorGroup().text());
- lvi->repaint();
+ lvi->setTextColor(monitor->tqcolorGroup().text());
+ lvi->tqrepaint();
timerOff();
}
@@ -104,21 +104,21 @@ LogSensor::answerReceived(int id, const TQString& answer)
{
timerOff();
lowerLimitActive = false;
- lvi->setTextColor(monitor->colorGroup().foreground());
- lvi->repaint();
+ lvi->setTextColor(monitor->tqcolorGroup().foreground());
+ lvi->tqrepaint();
KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName));
timerOn();
} else if (upperLimitActive && value > upperLimit)
{
timerOff();
upperLimitActive = false;
- lvi->setTextColor(monitor->colorGroup().foreground());
- lvi->repaint();
+ lvi->setTextColor(monitor->tqcolorGroup().foreground());
+ lvi->tqrepaint();
KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
timerOn();
}
- TQDate date = TQDateTime::currentDateTime().date();
- TQTime time = TQDateTime::currentDateTime().time();
+ TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date());
+ TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().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);
}
@@ -139,7 +139,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
monitor->addColumn(i18n("Host Name"));
monitor->addColumn(i18n("Log File"));
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor());
@@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor)
void
SensorLogger::configureSettings()
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
Q_CHECK_PTR(sls);
@@ -254,7 +254,7 @@ SensorLogger::configureSettings()
void
SensorLogger::applySettings()
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
setTitle(sls->title());
@@ -269,7 +269,7 @@ SensorLogger::applySettings()
void
SensorLogger::applyStyle(void)
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@@ -282,7 +282,7 @@ SensorLogger::applyStyle(void)
bool
SensorLogger::restoreSettings(TQDomElement& element)
{
- TQColorGroup cgroup = monitor->colorGroup();
+ TQColorGroup cgroup = monitor->tqcolorGroup();
cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
@@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
bool
SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{
- saveColor(element, "textColor", monitor->colorGroup().text());
- saveColor(element, "backgroundColor", monitor->colorGroup().base());
- saveColor(element, "alarmColor", monitor->colorGroup().foreground());
+ saveColor(element, "textColor", monitor->tqcolorGroup().text());
+ saveColor(element, "backgroundColor", monitor->tqcolorGroup().base());
+ saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground());
for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next())
{
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
index 018e36bf9..db247238b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
@@ -37,17 +37,17 @@
class SensorLoggerSettings;
-class SLListViewItem : public QListViewItem
+class SLListViewItem : public TQListViewItem
{
public:
SLListViewItem(TQListView *parent = 0);
void setTextColor(const TQColor& color) { textColor = color; }
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) {
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) {
TQColorGroup cgroup(cg);
cgroup.setColor(TQColorGroup::Text, textColor);
- TQListViewItem::paintCell(p, cgroup, column, width, alignment);
+ TQListViewItem::paintCell(p, cgroup, column, width, tqalignment);
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
index 26d3b2d49..78d99b953 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>SensorLoggerDlgWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SensorLoggerDlgWidget</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>fileFrame</cstring>
</property>
@@ -40,7 +40,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>timerFrame</cstring>
</property>
@@ -70,7 +70,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@@ -81,7 +81,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_lowerLimitActive</cstring>
</property>
@@ -102,14 +102,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_lblLowerLimit</cstring>
</property>
@@ -120,14 +120,14 @@
<string>Lower limit:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_lowerLimit</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -136,7 +136,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox1_2</cstring>
</property>
@@ -147,7 +147,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_upperLimitActive</cstring>
</property>
@@ -168,14 +168,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_lblUpperLimit</cstring>
</property>
@@ -186,14 +186,14 @@
<string>Upper limit:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_upperLimit</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -237,13 +237,13 @@
</includes>
<functions>
<function access="private" specifier="non virtual">init()</function>
- <function specifier="non virtual" returnType="QString">fileName()</function>
+ <function specifier="non virtual" returnType="TQString">fileName()</function>
<function specifier="non virtual" returnType="int">timerInterval()</function>
<function specifier="non virtual" returnType="bool">lowerLimitActive()</function>
<function specifier="non virtual" returnType="double">lowerLimit()</function>
<function returnType="bool">upperLimitActive()</function>
<function specifier="non virtual" returnType="double">upperLimit()</function>
- <function specifier="non virtual">setFileName( const QString &amp; url )</function>
+ <function specifier="non virtual">setFileName( const TQString &amp; url )</function>
<function specifier="non virtual">setTimerInterval( int i )</function>
<function specifier="non virtual">setLowerLimitActive( bool b )</function>
<function specifier="non virtual">setLowerLimit( double d )</function>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index ad1f2687b..515cb13f6 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(m_lowerLimit));
- m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
+ m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
+ m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
m_timerInterval->setRange(1, 99, 1, true);
m_fileName->setFocus();
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
index c86e671b2..f253e3ecc 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>SensorLoggerSettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>SensorLoggerSettingsWidget</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>titleFrame</cstring>
</property>
@@ -33,14 +33,14 @@
<property name="margin">
<number>11</number>
</property>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_title</cstring>
</property>
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>colorFrame</cstring>
</property>
@@ -61,7 +61,7 @@
<property name="title">
<string>Colors</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="vAlign" stdset="0">
@@ -75,7 +75,7 @@
<property name="margin">
<number>11</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -83,7 +83,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -91,7 +91,7 @@
<string>Text color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -99,7 +99,7 @@
<string>Background color:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -109,7 +109,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout1</cstring>
</property>
@@ -166,14 +166,14 @@
<include location="local" impldecl="in implementation">SensorLoggerSettingsWidget.ui.h</include>
</includes>
<functions>
- <function specifier="non virtual" returnType="QString">title()</function>
- <function specifier="non virtual" returnType="QColor">foregroundColor()</function>
- <function specifier="non virtual" returnType="QColor">backgroundColor()</function>
- <function specifier="non virtual" returnType="QColor">alarmColor()</function>
- <function specifier="non virtual">setTitle( const QString &amp; t )</function>
- <function specifier="non virtual">setForegroundColor( const QColor &amp; c )</function>
- <function specifier="non virtual">setBackgroundColor( const QColor &amp; c )</function>
- <function specifier="non virtual">setAlarmColor( const QColor &amp; c )</function>
+ <function specifier="non virtual" returnType="TQString">title()</function>
+ <function specifier="non virtual" returnType="TQColor">foregroundColor()</function>
+ <function specifier="non virtual" returnType="TQColor">backgroundColor()</function>
+ <function specifier="non virtual" returnType="TQColor">alarmColor()</function>
+ <function specifier="non virtual">setTitle( const TQString &amp; t )</function>
+ <function specifier="non virtual">setForegroundColor( const TQColor &amp; c )</function>
+ <function specifier="non virtual">setBackgroundColor( const TQColor &amp; c )</function>
+ <function specifier="non virtual">setAlarmColor( const TQColor &amp; c )</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
index 3d4d9c6f6..70d4d1900 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
@@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
- setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) );
mShowVerticalLines = true;
@@ -390,18 +390,18 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
uint w = width();
uint h = height();
- /* Do not do repaints when the widget is not yet setup properly. */
+ /* Do not do tqrepaints when the widget is not yet setup properly. */
if ( w <= 2 )
return;
TQPixmap pm( w, h );
TQPainter p;
- p.begin( &pm, this );
+ p.tqbegin( &pm, this );
pm.fill( mBackgroundColor );
/* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */
- p.setPen( TQColor( colorGroup().light() ) );
+ p.setPen( TQColor( tqcolorGroup().light() ) );
if(mShowThinFrame) {
p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 );
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
index 32231f359..cc632ac94 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
@@ -34,7 +34,7 @@
class TQColor;
-class SignalPlotter : public QWidget
+class SignalPlotter : public TQWidget
{
Q_OBJECT
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index 8d53edb6b..f3d9e240e 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -450,14 +450,14 @@ void WorkSheet::dropEvent( TQDropEvent *e )
* event and replace or add sensor. */
for ( uint r = 0; r < mRows; ++r )
for ( uint c = 0; c < mColumns; ++c )
- if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) {
+ if ( mDisplayList[ r ][ c ]->tqgeometry().tqcontains( e->pos() ) ) {
addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c );
return;
}
}
}
-TQSize WorkSheet::sizeHint() const
+TQSize WorkSheet::tqsizeHint() const
{
return TQSize( 200,150 );
}
@@ -531,7 +531,7 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
mDisplayList[ row ][ column ]->show();
}
- setMinimumSize(sizeHint());
+ setMinimumSize(tqsizeHint());
setModified( true );
}
diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index 37bafbda3..61ae0c46e 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard
void titleChanged( TQWidget *sheet );
protected:
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
void dragEnterEvent( TQDragEnterEvent* );
void dropEvent( TQDropEvent* );
void customEvent( TQCustomEvent* );
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index 3e4c28e50..f14e462a2 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -50,7 +50,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
group->layout()->setSpacing( spacingHint() );
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->tqsetAlignment( Qt::AlignTop );
mSheetTitle = new KLineEdit( group );
groupLayout->addWidget( mSheetTitle, 0, 0 );
@@ -62,7 +62,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
group->layout()->setSpacing( spacingHint() );
groupLayout = new TQGridLayout( group->layout(), 3, 2 );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->tqsetAlignment( Qt::AlignTop );
TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
groupLayout->addWidget( label, 0, 0 );
@@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
mSheetTitle->setFocus();
- resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) );
+ resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) );
}
WorkSheetSettings::~WorkSheetSettings()
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc
index 3c1a92a56..c39425919 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -196,7 +196,7 @@ void Workspace::loadWorkSheet( const KURL &url )
* code. */
TQString tmpFile;
KIO::NetAccess::download( url, tmpFile, this );
- mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) );
+ mWorkDir = tmpFile.left( tmpFile.tqfindRev( '/' ) );
// Load sheet from file.
if ( !restoreWorkSheet( tmpFile ) )
@@ -240,13 +240,13 @@ void Workspace::saveWorkSheet( WorkSheet *sheet )
if ( fileName.isEmpty() )
return;
- mWorkDir = fileName.left( fileName.findRev( '/' ) );
+ mWorkDir = fileName.left( fileName.tqfindRev( '/' ) );
// extract filename without path
- TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.findRev( '.' ) );
+ baseName = baseName.left( baseName.tqfindRev( '.' ) );
changeTab( sheet, baseName );
}
@@ -278,13 +278,13 @@ void Workspace::saveWorkSheetAs( WorkSheet *sheet )
if ( fileName.isEmpty() )
return;
- mWorkDir = fileName.left( fileName.findRev( '/' ) );
+ mWorkDir = fileName.left( fileName.tqfindRev( '/' ) );
// extract filename without path
- TQString baseName = fileName.right( fileName.length() - fileName.findRev( '/' ) - 1 );
+ TQString baseName = fileName.right( fileName.length() - fileName.tqfindRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.findRev( '.' ) );
+ baseName = baseName.left( baseName.tqfindRev( '.' ) );
changeTab( sheet, baseName );
} while ( !sheet->save( fileName ) );
@@ -354,10 +354,10 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString
tmpStr = newName;
// extract filename without path
- TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.findRev( '/' ) - 1 );
+ TQString baseName = tmpStr.right( tmpStr.length() - tmpStr.tqfindRev( '/' ) - 1 );
// chop off extension (usually '.sgrd')
- baseName = baseName.left( baseName.findRev( '.' ) );
+ baseName = baseName.left( baseName.tqfindRev( '.' ) );
WorkSheet *sheet = new WorkSheet( this );
sheet->setTitle( baseName );
diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h
index 78c4906bd..924e2b732 100644
--- a/ksysguard/gui/Workspace.h
+++ b/ksysguard/gui/Workspace.h
@@ -32,7 +32,7 @@ class KURL;
class TQString;
class WorkSheet;
-class Workspace : public QTabWidget
+class Workspace : public TQTabWidget
{
Q_OBJECT
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index 3885a9518..c5250a3cb 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -61,7 +61,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
i18n( "Connection Type" ), page );
TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
spacingHint() );
- groupLayout->setAlignment( Qt::AlignTop );
+ groupLayout->tqsetAlignment( Qt::AlignTop );
mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
mUseSsh->setEnabled( true );
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc
index 5fcb14a9c..363d66494 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cc
@@ -99,7 +99,7 @@ void SensorAgent::processAnswer( const TQString &buffer )
int end;
// And now the real information
- while ( ( end = mAnswerBuffer.find( "\nksysguardd> " ) ) >= 0 ) {
+ while ( ( end = mAnswerBuffer.tqfind( "\nksysguardd> " ) ) >= 0 ) {
#if SA_TRACE
kdDebug(1215) << "<= " << mAnswerBuffer.left( end )
<< "(" << mInputFIFO.count() << "/"
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc
index 43f878cda..30bf53c43 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ b/ksysguard/gui/ksgrd/SensorManager.cc
@@ -162,7 +162,7 @@ bool SensorManager::engageHost( const TQString &hostName )
{
bool retVal = true;
- if ( hostName.isEmpty() || mAgents.find( hostName ) == 0 ) {
+ if ( hostName.isEmpty() || mAgents.tqfind( hostName ) == 0 ) {
if(hostName == "localhost") {
//There was a bug where the xml file would end up not specifying to connect to localhost.
//This work around makes sure we always connect to localhost
@@ -202,7 +202,7 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell,
{
SensorAgent *agent;
- if ( ( agent = mAgents.find( hostName ) ) == 0 ) {
+ if ( ( agent = mAgents.tqfind( hostName ) ) == 0 ) {
if ( port == -1 )
agent = new SensorShellAgent( this );
else
@@ -253,7 +253,7 @@ bool SensorManager::disengage( const SensorAgent *agent )
bool SensorManager::disengage( const TQString &hostName )
{
SensorAgent *agent;
- if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
+ if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) {
mAgents.remove( hostName );
emit update();
return true;
@@ -266,7 +266,7 @@ bool SensorManager::resynchronize( const TQString &hostName )
{
SensorAgent *agent;
- if ( ( agent = mAgents.find( hostName ) ) == 0 )
+ if ( ( agent = mAgents.tqfind( hostName ) ) == 0 )
return false;
TQString shell, command;
@@ -327,11 +327,11 @@ bool SensorManager::event( TQEvent *event )
bool SensorManager::sendRequest( const TQString &hostName, const TQString &req,
SensorClient *client, int id )
{
- SensorAgent *agent = mAgents.find( hostName );
+ SensorAgent *agent = mAgents.tqfind( hostName );
if( !agent && hostName == "localhost") {
//we should always be able to reconnect to localhost
engage("localhost", "", "ksysguardd", -1);
- agent = mAgents.find( hostName );
+ agent = mAgents.tqfind( hostName );
}
if ( agent ) {
agent->sendRequest( req, client, id );
@@ -358,7 +358,7 @@ bool SensorManager::hostInfo( const TQString &hostName, TQString &shell,
TQString &command, int &port )
{
SensorAgent *agent;
- if ( ( agent = mAgents.find( hostName ) ) != 0 ) {
+ if ( ( agent = mAgents.tqfind( hostName ) ) != 0 ) {
agent->hostInfo( shell, command, port );
return true;
}
@@ -395,7 +395,7 @@ TQString SensorManager::translateSensor( const TQString &sensor ) const
TQString token, out;
int start = 0, end = 0;
for ( ; ; ) {
- end = sensor.find( '/', start );
+ end = sensor.tqfind( '/', start );
if ( end > 0 )
out += translateSensorPath( sensor.mid( start, end - start ) ) + "/";
else {
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 2be851232..19beba19d 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -76,7 +76,7 @@ TopLevel::TopLevel( const char *name )
mTimerId = -1;
mSplitter = new TQSplitter( this );
- mSplitter->setOrientation( Horizontal );
+ mSplitter->setOrientation( Qt::Horizontal );
mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
setCentralWidget( mSplitter );
@@ -105,42 +105,42 @@ TopLevel::TopLevel( const char *name )
statusBar()->hide();
// create actions for menue entries
- new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
+ new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
- new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, mWorkSpace,
+ new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
mActionOpenRecent = new KRecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0,
- mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
+ TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
- new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
+ new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
- new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, mWorkSpace,
+ new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
- new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
+ new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this),
TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
- new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
+ new KAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this),
TQT_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 KAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
+ new KAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace),
TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
new KAction( i18n( "Load Standard Sheets" ), "revert",
- 0, this, TQT_SLOT( resetWorkSheets() ),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ),
actionCollection(), "revert_all_worksheets" );
- new KAction( i18n( "Configure &Style..." ), "colorize", 0, this,
+ new KAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this),
TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
- // TODO remove resize and fix so sizeHints() determines default size.
+ // TODO remove resize and fix so tqsizeHints() determines default size.
if (!initialGeometrySet())
resize( 640, 480 );
setupGUI(ToolBar | Keys | StatusBar | Create);
@@ -212,9 +212,9 @@ TQStringList TopLevel::listHosts()
TQString TopLevel::readIntegerSensor( const TQString &sensorLocator )
{
- TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
+ TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) );
TQString sensor = sensorLocator.right( sensorLocator.length() -
- sensorLocator.find( ':' ) - 1 );
+ sensorLocator.tqfind( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
mDCopFIFO.prepend( dcopTransaction );
@@ -229,9 +229,9 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator )
{
TQStringList retval;
- TQString host = sensorLocator.left( sensorLocator.find( ':' ) );
+ TQString host = sensorLocator.left( sensorLocator.tqfind( ':' ) );
TQString sensor = sensorLocator.right( sensorLocator.length() -
- sensorLocator.find( ':' ) - 1 );
+ sensorLocator.tqfind( ':' ) - 1 );
DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
mDCopFIFO.prepend( dcopTransaction );
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index f41e6afb1..f8e8c15c6 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -116,7 +116,7 @@ typedef unsigned long CARD32;
class DCOPClientTransaction
{
public:
- Q_INT32 id;
+ TQ_INT32 id;
CARD32 key;
TQCString senderId;
};