From 1c65be77cd84b454f3fe69f211849a712ad99ed0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 12 Jan 2024 10:51:50 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec) --- ksysguard/gui/KSysGuardApplet.cpp | 14 +++--- ksysguard/gui/SensorBrowser.cpp | 10 ++--- ksysguard/gui/SensorDisplayLib/DancingBars.cpp | 2 +- .../gui/SensorDisplayLib/DancingBarsSettings.cpp | 18 ++++---- ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp | 6 +-- .../gui/SensorDisplayLib/FancyPlotterSettings.cpp | 48 ++++++++++----------- ksysguard/gui/SensorDisplayLib/ListView.cpp | 2 +- ksysguard/gui/SensorDisplayLib/LogFile.cpp | 20 ++++----- ksysguard/gui/SensorDisplayLib/MultiMeter.cpp | 2 +- .../gui/SensorDisplayLib/ProcessController.cpp | 32 +++++++------- ksysguard/gui/SensorDisplayLib/ProcessList.cpp | 18 ++++---- ksysguard/gui/SensorDisplayLib/SensorLogger.cpp | 4 +- ksysguard/gui/WorkSheet.cpp | 8 ++-- ksysguard/gui/Workspace.cpp | 20 ++++----- ksysguard/gui/ksgrd/HostConnector.cpp | 12 +++--- ksysguard/gui/ksgrd/SensorManager.cpp | 4 +- ksysguard/gui/ksgrd/SensorShellAgent.cpp | 16 +++---- ksysguard/gui/ksgrd/SensorSocketAgent.cpp | 8 ++-- ksysguard/gui/ksgrd/StyleEngine.cpp | 4 +- ksysguard/gui/ksgrd/StyleSettings.cpp | 12 +++--- ksysguard/gui/ksgrd/TimerSettings.cpp | 4 +- ksysguard/gui/ksysguard.cpp | 50 +++++++++++----------- 22 files changed, 157 insertions(+), 157 deletions(-) (limited to 'ksysguard/gui') diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp index e1c8db73e..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 ) ); @@ -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(); } @@ -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; diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp index 32f290460..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" ) ); 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/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp index 9b05d6806..b754791f8 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp @@ -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( 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( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ), + mLowerLimit, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ), + mUpperLimit, 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() ) ); TDEAcceleratorManager::manage( this ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp index 4e32dc630..eccf470c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -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(); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index 447d9c718..7e7e15d7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -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 ); } 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/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp index 763953163..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->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->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, 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(); 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/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)), - this, TQT_SLOT(reniceProcess(const TQValueList &, 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)), + this, TQ_SLOT(reniceProcess(const TQValueList &, 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/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/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp index 9cdf1f507..63cee160b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp @@ -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()); 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/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/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp index da3974ce9..9ff979965 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cpp +++ b/ksysguard/gui/ksgrd/HostConnector.cpp @@ -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/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/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/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/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/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp index 71a18b713..f70a387b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cpp +++ b/ksysguard/gui/ksgrd/StyleSettings.cpp @@ -92,12 +92,12 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) mEditColorButton->setEnabled( false ); layout->addWidget( mEditColorButton, 0, 1, TQt::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() ) ); + 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/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/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 2375cf8ee..65326d826 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -83,16 +83,16 @@ TopLevel::TopLevel( const char *name ) 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 @@ -106,39 +106,39 @@ TopLevel::TopLevel( const char *name ) // create actions for menue entries new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, - TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); + TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace, - TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); + TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0, - 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, mWorkSpace, - TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); + TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace, - TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); + TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, - TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); + TQ_SLOT( connectHost() ), actionCollection(), "connect_host" ); new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, - TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); + 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() ); +// 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, - TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); + TQ_SLOT( configure() ), actionCollection(), "configure_sheet" ); new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", - 0, this, TQT_SLOT( resetWorkSheets() ), + 0, this, TQ_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this, - TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); + 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(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(); } -- cgit v1.2.1