From 4bff0b57c61dcee5074d6dc0c02d7f61eeb7202d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 29 Dec 2023 16:35:31 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 671d0469ada4df2d833d41d065793a06f4d87a65) --- src/gui/colorcombo.cpp | 4 ++-- src/gui/doublespinbox.cpp | 4 ++-- src/gui/itemeditor.cpp | 4 ++-- src/gui/itemselector.cpp | 10 +++++----- src/gui/logview.cpp | 4 ++-- src/gui/microselectwidget.cpp | 2 +- src/gui/microsettingsdlg.cpp | 14 +++++++------- src/gui/newfiledlg.cpp | 4 ++-- src/gui/orientationwidget.cpp | 16 ++++++++-------- src/gui/oscilloscope.cpp | 14 +++++++------- src/gui/oscilloscopeview.cpp | 4 ++-- src/gui/pieditor.cpp | 22 +++++++++++----------- src/gui/plvitem.cpp | 2 +- src/gui/probepositioner.cpp | 4 ++-- src/gui/projectdlgs.cpp | 4 ++-- src/gui/propertieslistview.cpp | 10 +++++----- src/gui/settingsdlg.cpp | 24 ++++++++++++------------ src/gui/symbolviewer.cpp | 8 ++++---- 18 files changed, 77 insertions(+), 77 deletions(-) (limited to 'src/gui') diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp index e5d17dd..c57f89f 100644 --- a/src/gui/colorcombo.cpp +++ b/src/gui/colorcombo.cpp @@ -30,8 +30,8 @@ ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *n addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp index d513ebd..a0e7717 100644 --- a/src/gui/doublespinbox.cpp +++ b/src/gui/doublespinbox.cpp @@ -42,7 +42,7 @@ DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double editor()->setAlignment( TQt::AlignRight ); - connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(checkIfChanged()) ); + connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(checkIfChanged()) ); TQSpinBox::setMinValue( -(1<<30) ); TQSpinBox::setMaxValue( +(1<<30) ); setValue( value ); @@ -94,7 +94,7 @@ void DoubleSpinBox::updateSuffix( double value ) if ( m_queuedSuffix.stripWhiteSpace().isEmpty() ) m_queuedSuffix = ""; - TQTimer::singleShot( 0, this, TQT_SLOT(setQueuedSuffix()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(setQueuedSuffix()) ); } diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp index 9a05aee..1c97769 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -58,12 +58,12 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent ) m_defaultsBtn = new TQPushButton( i18n("Defaults"), this); m_defaultsBtn->setEnabled(false); - connect(m_defaultsBtn,TQT_SIGNAL(clicked()),propList,TQT_SLOT(slotSetDefaults())); + connect(m_defaultsBtn,TQ_SIGNAL(clicked()),propList,TQ_SLOT(slotSetDefaults())); h1Layout->addWidget(m_defaultsBtn); m_mergeBtn = new TQPushButton( i18n("Merge properties"), this ); m_mergeBtn->setEnabled(false); - connect(m_mergeBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(mergeProperties())); + connect(m_mergeBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(mergeProperties())); h1Layout->addWidget(m_mergeBtn); // TQt::Orientation widget stuff diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index d10cd52..f82fa6d 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -56,10 +56,10 @@ ItemSelector::ItemSelector( TQWidget *parent, const char *name ) setRootIsDecorated(true); setDragEnabled(true); -// connect( this, TQT_SIGNAL(executed(TQListViewItem*) ), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int )), this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int )) ); +// connect( this, TQ_SIGNAL(executed(TQListViewItem*) ), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int )), this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int )) ); } ItemSelector::~ItemSelector() @@ -163,7 +163,7 @@ void ItemSelector::slotContextMenuRequested( TQListViewItem* item, const TQPoint } TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete ); + menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQ_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete ); menu->popup(pos); } diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp index 9031f45..3be9290 100644 --- a/src/gui/logview.cpp +++ b/src/gui/logview.cpp @@ -27,7 +27,7 @@ LogView::LogView( KateMDI::ToolView * parent, const char *name ) setWordWrap( WidgetWidth ); // Connect up signal emitted when the user doubleclicks on a paragraph in the log view - connect( this, TQT_SIGNAL(clicked(int,int)), this, TQT_SLOT(slotParaClicked(int,int)) ); + connect( this, TQ_SIGNAL(clicked(int,int)), this, TQ_SLOT(slotParaClicked(int,int)) ); } @@ -102,7 +102,7 @@ TQPopupMenu * LogView::createPopupMenu( const TQPoint & pos ) TQPopupMenu * menu = KTextEdit::createPopupMenu( pos ); menu->insertSeparator(); - int id = menu->insertItem( i18n("Clear All"), this, TQT_SLOT(clear()) ); + int id = menu->insertItem( i18n("Clear All"), this, TQ_SLOT(clear()) ); // "an empty textedit is always considered to have one paragraph" - qt documentation // although this does not always seem to be the case, so I don't know... diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp index 432961d..abc0b89 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -46,7 +46,7 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags m_pMicro->setAutoCompletion(true); updateFromAllowed(); setMicro("P16F84"); - connect( m_pMicroFamily, TQT_SIGNAL(activated(const TQString & )), this, TQT_SLOT(microFamilyChanged(const TQString& )) ); + connect( m_pMicroFamily, TQ_SIGNAL(activated(const TQString & )), this, TQ_SLOT(microFamilyChanged(const TQString& )) ); } diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index 9195cfe..8478d66 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -115,16 +115,16 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par } m_pWidget->variables->insertRows( row, 1 ); - connect( m_pWidget->variables, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SLOT(checkAddVariableRow()) ); + connect( m_pWidget->variables, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SLOT(checkAddVariableRow()) ); //END Initialize initial variable settings //BEGIN Initialize pin maps - connect( m_pWidget->pinMapAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreatePinMap()) ); - connect( m_pWidget->pinMapModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyPinMap()) ); - connect( m_pWidget->pinMapRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenamePinMap()) ); - connect( m_pWidget->pinMapRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemovePinMap()) ); + connect( m_pWidget->pinMapAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreatePinMap()) ); + connect( m_pWidget->pinMapModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyPinMap()) ); + connect( m_pWidget->pinMapRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenamePinMap()) ); + connect( m_pWidget->pinMapRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemovePinMap()) ); m_pinMappings = microSettings->pinMappings(); m_pWidget->pinMapCombo->insertStringList( m_pinMappings.keys() ); @@ -138,7 +138,7 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par m_pWidget->adjustSize(); adjustSize(); - connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotSaveStuff()) ); + connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotSaveStuff()) ); } @@ -248,7 +248,7 @@ void MicroSettingsDlg::slotCreatePinMap() PinMappingNameValidator * validator = new PinMappingNameValidator( this ); m_pNewPinMappingWidget->nameEdit->setValidator( validator ); - connect( m_pNewPinMappingWidget->nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckNewPinMappingName(const TQString &)) ); + connect( m_pNewPinMappingWidget->nameEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckNewPinMappingName(const TQString &)) ); slotCheckNewPinMappingName( 0 ); int accepted = m_pNewPinMappingDlg->exec(); diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index e379976..39db03e 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -79,8 +79,8 @@ NewFileDlg::NewFileDlg( TQWidget *parent ) setMainWidget(m_pNewFileWidget); // Our behaviour is to have single click selects and double click accepts the dialog - connect( m_pNewFileWidget->typeIconView, TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(fileTypeChanged(TQIconViewItem*)) ); - connect( m_pNewFileWidget->typeIconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(accept())); + connect( m_pNewFileWidget->typeIconView, TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(fileTypeChanged(TQIconViewItem*)) ); + connect( m_pNewFileWidget->typeIconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQ_SLOT(accept())); setAcceptDrops(true); diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp index 3fa9f9e..f846f7a 100644 --- a/src/gui/orientationwidget.cpp +++ b/src/gui/orientationwidget.cpp @@ -46,14 +46,14 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) } } - connect( m_toolBtn[0][0], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_0()) ); - connect( m_toolBtn[0][1], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_90()) ); - connect( m_toolBtn[0][2], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_180()) ); - connect( m_toolBtn[0][3], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_noflip_270()) ); - connect( m_toolBtn[1][0], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_0()) ); - connect( m_toolBtn[1][1], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_90()) ); - connect( m_toolBtn[1][2], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_180()) ); - connect( m_toolBtn[1][3], TQT_SIGNAL(clicked()), this, TQT_SLOT(set_cio_flip_270()) ); + connect( m_toolBtn[0][0], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_0()) ); + connect( m_toolBtn[0][1], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_90()) ); + connect( m_toolBtn[0][2], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_180()) ); + connect( m_toolBtn[0][3], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_noflip_270()) ); + connect( m_toolBtn[1][0], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_0()) ); + connect( m_toolBtn[1][1], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_90()) ); + connect( m_toolBtn[1][2], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_180()) ); + connect( m_toolBtn[1][3], TQ_SIGNAL(clicked()), this, TQ_SLOT(set_cio_flip_270()) ); } diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 92c32bf..45042f6 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -72,21 +72,21 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent ) horizontalScroll->setLineStep(32); horizontalScroll->setPageStep( oscilloscopeView->width() ); - connect( resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) ); - connect( zoomSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotZoomSliderChanged(int)) ); - connect( horizontalScroll, TQT_SIGNAL(valueChanged(int )), this, TQT_SLOT(slotSliderValueChanged(int )) ); + connect( resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()) ); + connect( zoomSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotZoomSliderChanged(int)) ); + connect( horizontalScroll, TQ_SIGNAL(valueChanged(int )), this, TQ_SLOT(slotSliderValueChanged(int )) ); -// connect( pauseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTogglePause()) ); +// connect( pauseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTogglePause()) ); TQTimer * updateScrollTmr = new TQTimer(this); - connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) ); + connect( updateScrollTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollbars()) ); updateScrollTmr->start(20); TDEGlobal::config()->setGroup("Oscilloscope"); setZoomLevel( TDEGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) ); - connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) ); - connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) ); + connect( this, TQ_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQ_SLOT(slotProbeDataRegistered(int, ProbeData *)) ); + connect( this, TQ_SIGNAL(probeUnregistered(int )), probePositioner, TQ_SLOT(slotProbeDataUnregistered(int )) ); } diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index 8641c27..2852c16 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -54,7 +54,7 @@ OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name ) setMouseTracking(true); m_updateViewTmr = new TQTimer(this); - connect( m_updateViewTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateViewTimeout()) ); + connect( m_updateViewTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateViewTimeout()) ); } @@ -134,7 +134,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event ) fpsMenu.setItemChecked( num, num == m_fps ); } - connect( &fpsMenu, TQT_SIGNAL(activated(int )), this, TQT_SLOT(slotSetFrameRate(int )) ); + connect( &fpsMenu, TQ_SIGNAL(activated(int )), this, TQ_SLOT(slotSetFrameRate(int )) ); fpsMenu.exec( event->globalPos() ); return; } diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp index 941126f..ee27a14 100644 --- a/src/gui/pieditor.cpp +++ b/src/gui/pieditor.cpp @@ -26,7 +26,7 @@ PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *nam { m_id = id; m_data = data; - connect(m_data,TQT_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQT_SLOT(valueChanged(TQVariant))); + connect(m_data,TQ_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQ_SLOT(valueChanged(TQVariant))); setFocus(); update(); //show(); @@ -54,7 +54,7 @@ PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name ) m_comboBox->insertItem( i18n("False"), 1 ); m_comboBox->setCurrentItem( m_data->value().toBool() ? 0 : 1 ); - connect( m_comboBox, TQT_SIGNAL(activated(int )), this, TQT_SLOT(selectChanged(int )) ); + connect( m_comboBox, TQ_SIGNAL(activated(int )), this, TQ_SLOT(selectChanged(int )) ); } PIBool::~PIBool() @@ -88,8 +88,8 @@ PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this ); m_combo->setColor(m_data->value().toColor()); - connect(m_combo,TQT_SIGNAL(activated(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); -// connect(m_combo,TQT_SIGNAL(highlighted(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); + connect(m_combo,TQ_SIGNAL(activated(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); +// connect(m_combo,TQ_SIGNAL(highlighted(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); } PIColor::~PIColor() @@ -122,7 +122,7 @@ PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *nam spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this); - connect(spin,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(spinValueChanged(double))); + connect(spin,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(spinValueChanged(double))); } PIDouble::~PIDouble() @@ -160,8 +160,8 @@ PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char m_urlreq->setURL( m_data->value().toString() ); m_urlreq->setFilter( m_data->filter() ); - connect(m_urlreq,TQT_SIGNAL(urlSelected(const TQString&)),this,TQT_SLOT(slotURLChanged(const TQString&))); - //connect(m_urlreq,TQT_SIGNAL(openFileDialog(KURLRequester*)),this,TQT_SLOT(slotOpenFileDialog(KURLRequester* ))); + connect(m_urlreq,TQ_SIGNAL(urlSelected(const TQString&)),this,TQ_SLOT(slotURLChanged(const TQString&))); + //connect(m_urlreq,TQ_SIGNAL(openFileDialog(KURLRequester*)),this,TQ_SLOT(slotOpenFileDialog(KURLRequester* ))); } PIFilename::~PIFilename() @@ -201,7 +201,7 @@ PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *n spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this ); - connect( spin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spinValueChanged(int))); + connect( spin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spinValueChanged(int))); } PIInt::~PIInt() @@ -227,7 +227,7 @@ PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char TQHBoxLayout *layout = new TQHBoxLayout(this); layout->setAutoAdd(true); m_edit = new KLineEdit( m_data->value().toString() , this ); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged())); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotEditTextChanged())); } @@ -262,8 +262,8 @@ PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const type == Variant::Type::FileName || type == Variant::Type::VarName ); - connect(m_combo,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotComboChanged())); - connect(m_combo,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComboChanged())); + connect(m_combo,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotComboChanged())); + connect(m_combo,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComboChanged())); } diff --git a/src/gui/plvitem.cpp b/src/gui/plvitem.cpp index a94af4c..590e07b 100644 --- a/src/gui/plvitem.cpp +++ b/src/gui/plvitem.cpp @@ -23,7 +23,7 @@ PLVItem::PLVItem(TDEListView *listview, const TQString &id, Variant *data) m_id = id; setText(1,p_data->displayString() ); - connect(data,TQT_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQT_SLOT(updateData(TQVariant ))); + connect(data,TQ_SIGNAL(valueChanged(TQVariant, TQVariant )),this,TQ_SLOT(updateData(TQVariant ))); //setHeight(100); } diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp index 25f7119..51cd6e6 100644 --- a/src/gui/probepositioner.cpp +++ b/src/gui/probepositioner.cpp @@ -112,9 +112,9 @@ ProbeData* ProbePositioner::probeAtPosition( const TQPoint &pos ) void ProbePositioner::slotProbeDataRegistered( int id, ProbeData *probe ) { m_probeDataMap[id] = probe; - connect( probe, TQT_SIGNAL(displayAttributeChanged()), this, TQT_SLOT(forceRepaint()) ); + connect( probe, TQ_SIGNAL(displayAttributeChanged()), this, TQ_SLOT(forceRepaint()) ); // This connect doesn't really belong here, but it save a lot of code - connect( probe, TQT_SIGNAL(displayAttributeChanged()), Oscilloscope::self()->oscilloscopeView, TQT_SLOT(updateView()) ); + connect( probe, TQ_SIGNAL(displayAttributeChanged()), Oscilloscope::self()->oscilloscopeView, TQ_SLOT(updateView()) ); forceRepaint(); Oscilloscope::self()->oscilloscopeView->updateView(); } diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index 6ab051b..3b8dbaf 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -34,8 +34,8 @@ NewProjectDlg::NewProjectDlg( TQWidget * parent ) : KDialogBase( parent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pWidget = new NewProjectWidget(this); - connect( m_pWidget->projectNameEdit, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) ); - connect( m_pWidget->projectLocationURL, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) ); + connect( m_pWidget->projectNameEdit, TQ_SIGNAL(textChanged(const TQString & )), this, TQ_SLOT(locationChanged(const TQString& )) ); + connect( m_pWidget->projectLocationURL, TQ_SIGNAL(textChanged(const TQString & )), this, TQ_SLOT(locationChanged(const TQString& )) ); // Check if already valid dir locationChanged( TQString() ); diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp index 560dedd..59813ec 100644 --- a/src/gui/propertieslistview.cpp +++ b/src/gui/propertieslistview.cpp @@ -36,9 +36,9 @@ PropertiesListView::PropertiesListView(TQWidget *parent, const char *name) p_lastItem = 0l; m_diffBt = 0L; - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),this,TQ_SLOT(slotSelectionChanged(TQListViewItem*))); m_editor = 0L; - connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(headerSizeChanged(int,int,int))); + connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(headerSizeChanged(int,int,int))); } PropertiesListView::~PropertiesListView() @@ -185,10 +185,10 @@ void PropertiesListView::slotSelectionChanged(TQListViewItem *item) } } - connect(p_lastItem->data(),TQT_SIGNAL(destroyed()),this,TQT_SLOT(destroyEditor())); + connect(p_lastItem->data(),TQ_SIGNAL(destroyed()),this,TQ_SLOT(destroyEditor())); // Connect so that changes in the editor change the canvas item data. - connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),ItemInterface::self(),TQT_SLOT(slotSetData(const TQString&,TQVariant))); - connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQT_SLOT(slotDataChanged(const TQString&,TQVariant))); + connect(m_editor,TQ_SIGNAL(editorDataChanged(const TQString&,TQVariant)),ItemInterface::self(),TQ_SLOT(slotSetData(const TQString&,TQVariant))); + connect(m_editor,TQ_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQ_SLOT(slotDataChanged(const TQString&,TQVariant))); int x = columnWidth(0); int y = viewportToContents(TQPoint(0,itemRect(p_lastItem).y())).y(); diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 6976f00..1361bb2 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -62,18 +62,18 @@ SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, TDEConfigSkeleton addPage( m_gpasmSettingsWidget, "Gpasm", "convert_to_hex", "gpasm" ); addPage( m_sdccOptionsWidget, "SDCC", "text-x-csrc", "SDCC" ); - connect( m_generalOptionsWidget->refreshRateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateRefreshRateLabel(int)) ); - connect( m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotUpdatePicProgrammerDescription()) ); - connect( m_picProgrammerConfigWidget->removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddProgrammerConfig()) ); + connect( m_generalOptionsWidget->refreshRateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUpdateRefreshRateLabel(int)) ); + connect( m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotUpdatePicProgrammerDescription()) ); + connect( m_picProgrammerConfigWidget->removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->initCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->readCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->writeCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->verifyCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->blankCheckCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); - connect( m_picProgrammerConfigWidget->eraseCommand, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->initCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->readCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->writeCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->verifyCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->blankCheckCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); + connect( m_picProgrammerConfigWidget->eraseCommand, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSaveCurrentProgrammerConfig()) ); m_generalOptionsWidget->kcfg_GridColor->setEnabled( KTLConfig::showGrid() ); @@ -300,7 +300,7 @@ void SettingsDlg::updateSettings() emit settingsChanged(); } - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateSettings()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateSettings()) ); } @@ -346,7 +346,7 @@ void SettingsDlg::updateWidgets() combo->insertStringList( programmerNames ); combo->setSizeLimit( programmerNames.size() ); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateWidgets()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateWidgets()) ); } diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index 0e972e2..cb7033a 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -39,8 +39,8 @@ SymbolViewerItem::SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo * // setText( TYPE_COLUMN, RegisterInfo::toString( m_pRegisterInfo->type() ) ); radixChanged(); // force update of displayed string - connect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(valueChanged(unsigned)) ); - connect( m_pSymbolViewer, TQT_SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, TQT_SLOT(radixChanged()) ); + connect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(valueChanged(unsigned)) ); + connect( m_pSymbolViewer, TQ_SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, TQ_SLOT(radixChanged()) ); } @@ -89,7 +89,7 @@ SymbolViewer::SymbolViewer( KateMDI::ToolView * parent ) m_pRadixCombo->insertItem( i18n("Hexadecimal") ); m_valueRadix = Decimal; m_pRadixCombo->setCurrentItem(2); - connect( m_pRadixCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectRadix(int)) ); + connect( m_pRadixCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectRadix(int)) ); m_pGpsim = 0l; m_pCurrentContext = 0l; @@ -156,7 +156,7 @@ void SymbolViewer::setContext( GpsimProcessor * gpsim ) if (!m_pCurrentContext) return; - connect( gpsim, TQT_SIGNAL(destroyed()), m_pSymbolList, TQT_SLOT(clear()) ); + connect( gpsim, TQ_SIGNAL(destroyed()), m_pSymbolList, TQ_SLOT(clear()) ); unsigned count = m_pCurrentContext->size(); for ( unsigned i = 0; i < count; ++i ) -- cgit v1.2.1