From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- ksysguard/gui/KSGAppletSettings.cc | 2 +- ksysguard/gui/KSysGuardApplet.cc | 2 +- ksysguard/gui/SensorBrowser.cc | 2 +- ksysguard/gui/SensorBrowser.h | 2 +- .../gui/SensorDisplayLib/DancingBarsSettings.cc | 4 ++-- .../gui/SensorDisplayLib/DancingBarsSettings.h | 4 ++-- .../gui/SensorDisplayLib/FancyPlotterSettings.cc | 4 ++-- .../gui/SensorDisplayLib/FancyPlotterSettings.h | 4 ++-- ksysguard/gui/SensorDisplayLib/LogFile.cc | 2 +- .../gui/SensorDisplayLib/ProcessController.cc | 2 +- ksysguard/gui/SensorDisplayLib/ProcessController.h | 4 ++-- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 6 +++--- ksysguard/gui/SensorDisplayLib/ProcessList.h | 8 ++++---- ksysguard/gui/WorkSheet.cc | 2 +- ksysguard/gui/WorkSheetSettings.cc | 2 +- ksysguard/gui/Workspace.cc | 2 +- ksysguard/gui/ksgrd/HostConnector.cc | 2 +- ksysguard/gui/ksgrd/StyleSettings.cc | 2 +- ksysguard/gui/ksgrd/TimerSettings.cc | 2 +- ksysguard/gui/ksysguard.cc | 24 +++++++++++----------- ksysguard/gui/ksysguard.h | 8 ++++---- 21 files changed, 45 insertions(+), 45 deletions(-) (limited to 'ksysguard') diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 5160dbddb..b11416866 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -67,7 +67,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name ) resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); - KAcceleratorManager::manage( page ); + TDEAcceleratorManager::manage( page ); } KSGAppletSettings::~KSGAppletSettings() diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 6295ef652..eba27669d 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -203,7 +203,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) int dock = findDock( e->pos() ); if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) { if ( sensorType == "integer" || sensorType == "float" ) { - KPopupMenu popup; + TDEPopupMenu popup; TQWidget *wdg = 0; popup.insertTitle( i18n( "Select Display Type" ) ); diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index 06cbc7507..c3c8bcb10 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -64,7 +64,7 @@ class HostItem : public TQListViewItem SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name) - : KListView( parent, name ), mSensorManager( sm ) + : TDEListView( parent, name ), mSensorManager( sm ) { mHostInfoList.setAutoDelete(true); diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h index 8794c4635..7545391ac 100644 --- a/ksysguard/gui/SensorBrowser.h +++ b/ksysguard/gui/SensorBrowser.h @@ -43,7 +43,7 @@ class HostInfo; * The SensorBrowser is the graphical front-end of the SensorManager. It * displays the currently available hosts and their sensors. */ -class SensorBrowser : public KListView, public KSGRD::SensorClient +class SensorBrowser : public TDEListView, public KSGRD::SensorClient { Q_OBJECT diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index 1b97cc25f..c6ad058b3 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -162,7 +162,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); pageLayout->setRowStretch( 2, 1 ); - mSensorView = new KListView( page ); + mSensorView = new TDEListView( page ); mSensorView->addColumn( i18n( "Host" ) ); mSensorView->addColumn( i18n( "Sensor" ) ); mSensorView->addColumn( i18n( "Label" ) ); @@ -191,7 +191,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); mTitle->setFocus(); } diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h index 5b268ad7f..aa9d580bd 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h @@ -30,7 +30,7 @@ class KColorButton; class KDoubleSpinBox; class KIntNumInput; class KLineEdit; -class KListView; +class TDEListView; class TQCheckBox; class TQListViewItem; @@ -94,7 +94,7 @@ class DancingBarsSettings : public KDialogBase KDoubleSpinBox *mLowerLimit; KDoubleSpinBox *mUpperLimit; KLineEdit *mTitle; - KListView *mSensorView; + TDEListView *mSensorView; KIntNumInput *mFontSize; TQCheckBox *mUseLowerLimit; diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 559d309c7..0c0ee3b7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -226,7 +226,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->setRowStretch( 2, 1 ); pageLayout->setRowStretch( 5, 1 ); - mSensorView = new KListView( page ); + mSensorView = new TDEListView( page ); mSensorView->addColumn("" , 0); mSensorView->addColumn( i18n( "Host" ) ); mSensorView->addColumn( i18n( "Sensor" ) ); @@ -282,7 +282,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) ); connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor())); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } FancyPlotterSettings::~FancyPlotterSettings() diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h index 8b10abd8d..010b4938b 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h @@ -29,7 +29,7 @@ class KColorButton; class KIntNumInput; class KLineEdit; -class KListView; +class TDEListView; class TQCheckBox; class TQListViewItem; @@ -121,7 +121,7 @@ class FancyPlotterSettings : public KDialogBase KIntNumInput *mVerticalLinesDistance; KIntNumInput *mHorizontalLinesCount; KIntNumInput *mFontSize; - KListView *mSensorView; + TDEListView *mSensorView; TQCheckBox *mShowVerticalLines; TQCheckBox *mShowHorizontalLines; diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index bb29af7a9..bae2d0e7c 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -115,7 +115,7 @@ void LogFile::settingsFontSelection() { TQFont tmpFont = lfs->fontButton->font(); - if (KFontDialog::getFont(tmpFont) == KFontDialog::Accepted) { + if (TDEFontDialog::getFont(tmpFont) == TDEFontDialog::Accepted) { lfs->fontButton->setFont(tmpFont); } } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 664870374..c7cfa0ca7 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -78,7 +78,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T pList = new ProcessList(this, "pList"); TQ_CHECK_PTR(pList); pList->setShowSortIndicator(true); - pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line"); + pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line"); gmSearch->addWidget(pListSearchLine, 1); connect(pList, TQT_SIGNAL(killProcess(int, int)), diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index 69445b91e..9df70cc3b 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -38,7 +38,7 @@ class TQHBoxLayout; class TQCheckBox; class TQComboBox; class KPushButton; -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; extern TDEApplication* Kapp; @@ -133,7 +133,7 @@ private: ProcessList* pList; ///Layout for the search line and process filter combo box TQHBoxLayout* gmSearch; - KListViewSearchLineWidget *pListSearchLine; + TDEListViewSearchLineWidget *pListSearchLine; TQHBoxLayout* gm1; diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 4fd3e766e..507e57927 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -101,7 +101,7 @@ int ProcessLVI::compare( TQListViewItem *item, int col, bool ascending ) const } ProcessList::ProcessList(TQWidget *parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { iconCache.setAutoDelete(true); @@ -952,7 +952,7 @@ ProcessList::keyPressEvent(TQKeyEvent *e) if (e->key() == Key_Control) { ctrlKeyDown = true; } - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } void @@ -964,7 +964,7 @@ ProcessList::keyReleaseEvent(TQKeyEvent *e) if (e->key() == Key_Control) { ctrlKeyDown = false; } - KListView::keyReleaseEvent(e); + TDEListView::keyReleaseEvent(e); } #include "ProcessList.moc" diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index fc668cf15..db3f7637b 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -42,11 +42,11 @@ typedef const char* (*KeyFunc)(const char*); * To support bi-directional sorting, and sorting of text, integers etc. we * need a specialized version of TQListViewItem. */ -class ProcessLVI : public KListViewItem +class ProcessLVI : public TDEListViewItem { public: - ProcessLVI(TQListView* lv) : KListViewItem(lv) { } - ProcessLVI(TQListViewItem* lvi) : KListViewItem(lvi) { } + ProcessLVI(TQListView* lv) : TDEListViewItem(lv) { } + ProcessLVI(TQListViewItem* lvi) : TDEListViewItem(lvi) { } virtual int compare( TQListViewItem *item, int column, bool ) const; }; @@ -57,7 +57,7 @@ class TQPopupMenu; * This class implementes a table filled with information about the running * processes. The table is derived from TQListView. */ -class ProcessList : public KListView +class ProcessList : public TDEListView { Q_OBJECT diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 92ed96657..4ec416620 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -327,7 +327,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName, * type we popup a menu so the user can select what display is * wanted. */ if ( sensorType == "integer" || sensorType == "float" ) { - KPopupMenu pm; + TDEPopupMenu pm; pm.insertTitle( i18n( "Select Display Type" ) ); pm.insertItem( i18n( "&Signal Plotter" ), 1 ); pm.insertItem( i18n( "&Multimeter" ), 2 ); diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index 3e4c28e50..e2ba052ed 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -99,7 +99,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); TQToolTip::add( mSheetTitle, i18n( "Enter the title of the worksheet here." ) ); - KAcceleratorManager::manage( page ); + TDEAcceleratorManager::manage( page ); mSheetTitle->setFocus(); diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index e13f2620a..22b46269d 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -42,7 +42,7 @@ Workspace::Workspace( TQWidget* parent, const char* name ) : TQTabWidget( parent, name ) { - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); mSheetList.setAutoDelete( true ); mAutoSave = true; diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 3885a9518..a4aba76c7 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -118,7 +118,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) ); enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } HostConnector::~HostConnector() diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 6c7faf771..a13e385b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -99,7 +99,7 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) connect( mEditColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensorColor() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } StyleSettings::~StyleSettings() diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc index 5e1d8d8b2..2a5e0d471 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cc +++ b/ksysguard/gui/ksgrd/TimerSettings.cc @@ -58,7 +58,7 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) mUseGlobalUpdate->setChecked( true ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } TimerSettings::~TimerSettings() diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index bd0f6290a..0d138917a 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -69,7 +69,7 @@ TopLevel* topLevel; TaskMan widget. */ TopLevel::TopLevel( const char *name ) - : KMainWindow( 0, name ), DCOPObject( "KSysGuardIface" ) + : TDEMainWindow( 0, name ), DCOPObject( "KSysGuardIface" ) { setPlainCaption( i18n( "TDE System Guard" ) ); mDontSaveSession = false; @@ -105,39 +105,39 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new KAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new KAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "Import Worksheet..." ), "fileopen", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); - mActionOpenRecent = new KRecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0, + mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"fileopen", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new KAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new KAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Export Worksheet..." ), "filesaveas", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - new KAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), + new TDEAction( 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, TQT_TQOBJECT(this), + new TDEAction( 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, TQT_TQOBJECT(mWorkSpace), + new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); - new KAction( i18n( "Load Standard Sheets" ), "revert", + new TDEAction( i18n( "Load Standard Sheets" ), "revert", 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new KAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), + new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. @@ -291,7 +291,7 @@ void TopLevel::initStatusBar() updateStatusBar(); mServiceBrowser->startBrowse(); - KToggleAction *sb = dynamic_cast(action("options_show_statusbar")); + TDEToggleAction *sb = dynamic_cast(action("options_show_statusbar")); if (sb) connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); } diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index 674ff0851..50a4212e5 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -34,14 +34,14 @@ #include -class KRecentFilesAction; -class KToggleAction; +class TDERecentFilesAction; +class TDEToggleAction; class TQSplitter; class SensorBrowser; class Workspace; -class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObject +class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject { Q_OBJECT K_DCOP @@ -93,7 +93,7 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje TQPtrList mDCopFIFO; TQSplitter* mSplitter; - KRecentFilesAction* mActionOpenRecent; + TDERecentFilesAction* mActionOpenRecent; SensorBrowser* mSensorBrowser; Workspace* mWorkSpace; -- cgit v1.2.3