diff options
Diffstat (limited to 'src/gui')
48 files changed, 129 insertions, 273 deletions
diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui index 98e50d9..845f21e 100644 --- a/src/gui/asmformattingwidget.ui +++ b/src/gui/asmformattingwidget.ui @@ -171,9 +171,6 @@ <property name="text"> <string>&Automatically format Microbe output</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> </widget> <spacer> <property name="name"> 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/colorcombo.h b/src/gui/colorcombo.h index 40ce598..037d860 100644 --- a/src/gui/colorcombo.h +++ b/src/gui/colorcombo.h @@ -22,7 +22,7 @@ which colours are displayed to be changed. */ class ColorCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h index 452e39f..0b31db4 100644 --- a/src/gui/contexthelp.h +++ b/src/gui/contexthelp.h @@ -29,7 +29,7 @@ in a ICNDocument. */ class ContextHelp : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static ContextHelp * self( KateMDI::ToolView * parent = 0l ); 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/doublespinbox.h b/src/gui/doublespinbox.h index 079f2b5..4607ec8 100644 --- a/src/gui/doublespinbox.h +++ b/src/gui/doublespinbox.h @@ -22,7 +22,7 @@ spin box plus the SI magnitude symbol it is showing */ class DoubleSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * parent = 0 ); diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui index 1835a3a..03630d7 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -29,9 +29,6 @@ <property name="text"> <string>Reuse the same output view for code generation</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> @@ -40,9 +37,6 @@ <property name="text"> <string>Show voltage bars &on electronic components</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> </widget> <widget class="KColorButton" row="2" column="1"> <property name="name"> @@ -62,9 +56,6 @@ <property name="text"> <string>Show &grid:</string> </property> - <property name="accel"> - <string>Alt+G</string> - </property> </widget> <widget class="KIntSpinBox" row="3" column="1"> <property name="name"> @@ -111,9 +102,6 @@ <property name="text"> <string>Restore opened doc&uments on startup</string> </property> - <property name="accel"> - <string>Alt+U</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -122,9 +110,6 @@ <property name="text"> <string>Raise the &appropriate item selector on creating a new document</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -133,9 +118,6 @@ <property name="text"> <string>Raise the &Messages log when compiling</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> </widget> </vbox> </widget> diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui index 4beab8c..12722bc 100644 --- a/src/gui/gpasmsettingswidget.ui +++ b/src/gui/gpasmsettingswidget.ui @@ -56,9 +56,6 @@ <property name="text"> <string>Ign&ore case (-i)</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="toolTip" stdset="0"> <string>All user defined symbols and macros are case sensitive. This option makes them case insensitive.</string> </property> @@ -70,9 +67,6 @@ <property name="text"> <string>Generate DOS-formated hex file (-&n)</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="toolTip" stdset="0"> <string>By default, gpasm generates hex files using ISO format. However, some device programmers required a DOS formatted file. This option will cause gpasm to generate a DOS formatted hex file. </string> </property> diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp index fa37dfb..a6b21a2 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -15,7 +15,7 @@ #include "propertieslistview.h" #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlayout.h> #include <tqlabel.h> @@ -58,15 +58,15 @@ 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); - // Qt::Orientation widget stuff + // TQt::Orientation widget stuff TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 ); TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 ); h2Layout->addItem(spacer2); diff --git a/src/gui/itemeditor.h b/src/gui/itemeditor.h index 998a120..47fac35 100644 --- a/src/gui/itemeditor.h +++ b/src/gui/itemeditor.h @@ -35,7 +35,7 @@ namespace KateMDI { class ToolView; } */ class ItemEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static ItemEditor * self( KateMDI::ToolView * parent = 0l ); diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index d10cd52..e400f73 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -52,14 +52,14 @@ ItemSelector::ItemSelector( TQWidget *parent, const char *name ) { addColumn( i18n( "Component" ) ); setFullWidth(true); - setSorting( -1, FALSE ); + setSorting( -1, false ); 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() @@ -133,7 +133,7 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const void ItemSelector::writeOpenStates() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( name() ); const TQStringList::iterator end = m_categories.end(); @@ -149,7 +149,7 @@ void ItemSelector::writeOpenStates() bool ItemSelector::readOpenState( const TQString &id ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( name() ); return config->readBoolEntry( id+"IsOpen", true ); @@ -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/itemselector.h b/src/gui/itemselector.h index 18cf387..0d7e61f 100644 --- a/src/gui/itemselector.h +++ b/src/gui/itemselector.h @@ -57,7 +57,7 @@ class ILVItem : public TQObject, public TDEListViewItem */ class ItemSelector : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ItemSelector( TQWidget *parent, const char *name ); @@ -121,7 +121,7 @@ class ItemSelector : public TDEListView */ class ComponentSelector : public ItemSelector { - Q_OBJECT + TQ_OBJECT public: static ComponentSelector * self( KateMDI::ToolView * parent = 0l ); @@ -139,7 +139,7 @@ class ComponentSelector : public ItemSelector */ class FlowPartSelector : public ItemSelector { - Q_OBJECT + TQ_OBJECT public: static FlowPartSelector * self( KateMDI::ToolView * parent = 0l ); @@ -156,7 +156,7 @@ class FlowPartSelector : public ItemSelector */ class MechanicsSelector : public ItemSelector { - Q_OBJECT + TQ_OBJECT public: static MechanicsSelector * self( KateMDI::ToolView * parent = 0l ); diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui index 18e0559..45ee0e6 100644 --- a/src/gui/linkeroptionswidget.ui +++ b/src/gui/linkeroptionswidget.ui @@ -81,9 +81,6 @@ <property name="text"> <string>&Output a map file (-m)</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> </widget> <widget class="TQLabel" row="4" column="0"> <property name="name"> diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp index 9031f45..e8bab57 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,9 +102,9 @@ 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 + // "an empty textedit is always considered to have one paragraph" - tqt documentation // although this does not always seem to be the case, so I don't know... menu->setItemEnabled( id, paragraphs() > 1 ); diff --git a/src/gui/logview.h b/src/gui/logview.h index bdbef38..52a627b 100644 --- a/src/gui/logview.h +++ b/src/gui/logview.h @@ -41,7 +41,7 @@ Base class for logviews (eg GpasmInterface) which output information, warnings, */ class LogView : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: LogView( KateMDI::ToolView * parent, const char *name = 0 ); diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp index 0abb83d..c7429ea 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -23,7 +23,7 @@ #include <tqwhatsthis.h> MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags ) - : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), parent, name ) + : TQGroupBox( 4, TQt::Horizontal, i18n("Microprocessor"), parent, name ) { m_allowedAsmSet = AsmInfo::AsmSetAll; m_allowedGpsimSupport = m_allowedFlowCodeSupport = m_allowedMicrobeSupport = MicroInfo::AllSupport; @@ -34,19 +34,19 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags m_pMicroFamilyLabel = new TQLabel( this, "m_pMicroFamilyLabel" ); m_pMicroFamilyLabel->setText( i18n("Family") ); - m_pMicroFamily = new KComboBox( FALSE, this, "m_pMicroFamily" ); + m_pMicroFamily = new KComboBox( false, this, "m_pMicroFamily" ); m_pMicroFamily->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); m_pMicroLabel = new TQLabel( this, "m_pMicroLabel" ); m_pMicroLabel->setText( i18n("Micro") ); - m_pMicro = new KComboBox( FALSE, this, "m_pMicro" ); + m_pMicro = new KComboBox( false, this, "m_pMicro" ); m_pMicro->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); - m_pMicro->setEditable( TRUE ); + m_pMicro->setEditable( true ); 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/microselectwidget.h b/src/gui/microselectwidget.h index b5d7801..1fa49e9 100644 --- a/src/gui/microselectwidget.h +++ b/src/gui/microselectwidget.h @@ -26,7 +26,7 @@ class KComboBox; */ class MicroSelectWidget : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index 195aa3d..8478d66 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -68,7 +68,7 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox ); - groupBox->setColumnLayout(0, Qt::Vertical ); + groupBox->setColumnLayout(0, TQt::Vertical ); groupBox->layout()->setSpacing( 6 ); groupBox->layout()->setMargin( 11 ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() ); @@ -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/microsettingsdlg.h b/src/gui/microsettingsdlg.h index e12d9b5..e226f9a 100644 --- a/src/gui/microsettingsdlg.h +++ b/src/gui/microsettingsdlg.h @@ -30,7 +30,7 @@ typedef TQMap< TQString, PinMapping > PinMappingMap; */ class MicroSettingsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *parent = 0L, const char *name = 0L ); diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui index 1d43ea5..df11640 100644 --- a/src/gui/microsettingswidget.ui +++ b/src/gui/microsettingswidget.ui @@ -167,9 +167,6 @@ Drag it to set the type (input/output).</string> <property name="text"> <string>Modif&y</string> </property> - <property name="accel"> - <string>Alt+Y</string> - </property> </widget> <widget class="KPushButton" row="1" column="3"> <property name="name"> @@ -178,9 +175,6 @@ Drag it to set the type (input/output).</string> <property name="text"> <string>Rename</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> 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/newfiledlg.h b/src/gui/newfiledlg.h index 4f13fd6..679c66e 100644 --- a/src/gui/newfiledlg.h +++ b/src/gui/newfiledlg.h @@ -24,7 +24,7 @@ A standard dialog for getting file details from the user for a new project */ class NewFileDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewFileDlg( TQWidget *parent ); diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index 21d7afd..f207ec2 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -109,9 +109,6 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci <property name="text"> <string>&Add to project</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> <property name="checked"> <bool>true</bool> </property> diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp index 3fa9f9e..71cfbbf 100644 --- a/src/gui/orientationwidget.cpp +++ b/src/gui/orientationwidget.cpp @@ -17,7 +17,7 @@ #include "orientationwidget.h" #include "node.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqbitmap.h> #include <tqlayout.h> #include <tqimage.h> @@ -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/orientationwidget.h b/src/gui/orientationwidget.h index 73a39e4..b119ffc 100644 --- a/src/gui/orientationwidget.h +++ b/src/gui/orientationwidget.h @@ -24,7 +24,7 @@ class TQPushButton; */ class OrientationWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: OrientationWidget( TQWidget *parent = 0l, const char *name = 0l ); 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/oscilloscope.h b/src/gui/oscilloscope.h index b0f59ac..588c776 100644 --- a/src/gui/oscilloscope.h +++ b/src/gui/oscilloscope.h @@ -75,7 +75,7 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab ); */ class Oscilloscope : public OscilloscopeWidget { - Q_OBJECT + TQ_OBJECT public: static Oscilloscope * self( KateMDI::ToolView * parent = 0l ); diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index 5abcd3f..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()) ); } @@ -109,7 +109,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event ) { switch ( event->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: { event->accept(); m_clickOffsetPos = event->pos().x(); @@ -118,7 +118,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event ) return; } - case Qt::RightButton: + case TQt::RightButton: { event->accept(); @@ -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/oscilloscopeview.h b/src/gui/oscilloscopeview.h index 0332607..cf9adfe 100644 --- a/src/gui/oscilloscopeview.h +++ b/src/gui/oscilloscopeview.h @@ -25,7 +25,7 @@ class TQTimer; */ class OscilloscopeView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: OscilloscopeView( TQWidget *parent, const char *name = 0 ); diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui index 45f54da..610187e 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -200,9 +200,6 @@ <property name="text"> <string>Reset</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/src/gui/outputmethoddlg.h b/src/gui/outputmethoddlg.h index 6e7a914..1e14ffb 100644 --- a/src/gui/outputmethoddlg.h +++ b/src/gui/outputmethoddlg.h @@ -61,7 +61,7 @@ class OutputMethodInfo */ class OutputMethodDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui index 0b2b381..8f54270 100644 --- a/src/gui/picprogrammerconfigwidget.ui +++ b/src/gui/picprogrammerconfigwidget.ui @@ -57,9 +57,6 @@ <property name="text"> <string>&Add ...</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> </widget> <widget class="KPushButton" row="1" column="3"> <property name="name"> @@ -68,9 +65,6 @@ <property name="text"> <string>Re&move</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> </widget> <widget class="TQLabel" row="0" column="0"> <property name="name"> 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/pieditor.h b/src/gui/pieditor.h index 03fe2c1..f8102c3 100644 --- a/src/gui/pieditor.h +++ b/src/gui/pieditor.h @@ -29,7 +29,7 @@ class Variant; */ class PIEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PIEditor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -52,7 +52,7 @@ class PIEditor : public TQWidget */ class PIBool : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIBool( TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0 ); @@ -73,7 +73,7 @@ class PIBool : public PIEditor */ class PIColor : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIColor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -95,7 +95,7 @@ Allows the editing of double precision numerical values, using the DoubleNum wid */ class PIDouble : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIDouble(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -115,7 +115,7 @@ class PIDouble : public PIEditor */ class PIFilename : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIFilename(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -137,7 +137,7 @@ class PIFilename : public PIEditor */ class PIInt : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIInt( const TQString &id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -157,7 +157,7 @@ class PIInt : public PIEditor */ class PILineEdit : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PILineEdit(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); @@ -177,7 +177,7 @@ class PILineEdit : public PIEditor */ class PIStringCombo : public PIEditor { - Q_OBJECT + TQ_OBJECT public: PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name = 0); 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/plvitem.h b/src/gui/plvitem.h index 78afcb9..8b32fe4 100644 --- a/src/gui/plvitem.h +++ b/src/gui/plvitem.h @@ -26,7 +26,7 @@ Basic item, which holds the Variant data and Id for an item */ class PLVItem : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: PLVItem( TDEListView *listview, const TQString &id, Variant * data ); 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/probepositioner.h b/src/gui/probepositioner.h index daa1110..1be66dd 100644 --- a/src/gui/probepositioner.h +++ b/src/gui/probepositioner.h @@ -25,7 +25,7 @@ Widget for positioning the output of Probes in the OscilloscopeView */ class ProbePositioner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ProbePositioner(TQWidget *parent = 0, const char *name = 0); diff --git a/src/gui/programmerdlg.h b/src/gui/programmerdlg.h index 0464b91..1f0dcb4 100644 --- a/src/gui/programmerdlg.h +++ b/src/gui/programmerdlg.h @@ -24,7 +24,7 @@ class ProgrammerWidget; */ class ProgrammerDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** 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/projectdlgs.h b/src/gui/projectdlgs.h index 56fb58b..1d8078e 100644 --- a/src/gui/projectdlgs.h +++ b/src/gui/projectdlgs.h @@ -29,7 +29,7 @@ A standard dialog for getting project details from the user for a new project */ class NewProjectDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewProjectDlg( TQWidget * parent ); @@ -72,7 +72,7 @@ class NewProjectDlg : public KDialogBase */ class CreateSubprojectDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CreateSubprojectDlg( TQWidget *parent = 0 ); @@ -112,7 +112,7 @@ class CreateSubprojectDlg : public KDialogBase */ class LinkerOptionsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent = 0 ); 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/propertieslistview.h b/src/gui/propertieslistview.h index 70b2180..e7405aa 100644 --- a/src/gui/propertieslistview.h +++ b/src/gui/propertieslistview.h @@ -28,7 +28,7 @@ typedef TQMap< TQString, PLVItem * > PLVItemMap; */ class PropertiesListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: PropertiesListView( TQWidget *parent = 0l, const char *name = 0l ); diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui index 99505d3..dc1c19b 100644 --- a/src/gui/sdccoptionswidget.ui +++ b/src/gui/sdccoptionswidget.ui @@ -44,9 +44,6 @@ <property name="text"> <string>Don't search in the standard librar&y directory (--nostdlib)</string> </property> - <property name="accel"> - <string>Alt+Y</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -55,9 +52,6 @@ <property name="text"> <string>Don't search in the standard include directory (--nostdinc)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -66,9 +60,6 @@ <property name="text"> <string>Disa&ble pedantic warnings (--less-pedantic)</string> </property> - <property name="accel"> - <string>Alt+B</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -77,9 +68,6 @@ <property name="text"> <string>Use C&89 standard only (--std-c89)</string> </property> - <property name="accel"> - <string>Alt+8</string> - </property> <property name="whatsThis" stdset="0"> <string>Follow the C89 standard and disable SDCC features that conflict with the standard.</string> </property> @@ -91,9 +79,6 @@ <property name="text"> <string>Use C&99 standard only (--std-c99)</string> </property> - <property name="accel"> - <string>Alt+9</string> - </property> <property name="toolTip" stdset="0"> <string></string> </property> @@ -138,9 +123,6 @@ <property name="text"> <string>Stack auto&matic variables (--stack-auto)</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="toolTip" stdset="0"> <string></string> </property> @@ -155,9 +137,6 @@ <property name="text"> <string>Integer li&braries were compiled as reentrant (--int-long-reent)</string> </property> - <property name="accel"> - <string>Alt+B</string> - </property> <property name="toolTip" stdset="0"> <string></string> </property> @@ -172,9 +151,6 @@ <property name="text"> <string>Floating point librar&y was compiled as reentrant (--float-reent)</string> </property> - <property name="accel"> - <string>Alt+Y</string> - </property> <property name="whatsThis" stdset="0"> <string>Floating point library is compiled as reentrant.</string> </property> @@ -186,9 +162,6 @@ <property name="text"> <string>Leave out the frame pointer (--fommit-frame-pointer)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -197,9 +170,6 @@ <property name="text"> <string>Don't memcpy initialized &xram from code (--no-xinit-opt)</string> </property> - <property name="accel"> - <string>Alt+X</string> - </property> <property name="whatsThis" stdset="0"> <string>Will not memcpy initialized data from code space into xdata space. This saves a few bytes in code space if you don't have initialized data.</string> </property> @@ -211,9 +181,6 @@ <property name="text"> <string>Callee will &always save registers used (--all-callee-saves)</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> </widget> <spacer> <property name="name"> @@ -252,9 +219,6 @@ <property name="text"> <string>Disable overlaying leaf function &auto variables (--nooverlay)</string> </property> - <property name="accel"> - <string>Alt+A</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will not overlay parameters and local variables of any function, see section Parameters and local variables for more details.</string> </property> @@ -266,9 +230,6 @@ <property name="text"> <string>Disable the GCSE optimization (--nogcse)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -277,9 +238,6 @@ <property name="text"> <string>Disable label optimi&zation (--nolabelopt)</string> </property> - <property name="accel"> - <string>Alt+Z</string> - </property> <property name="whatsThis" stdset="0"> <string>Will not optimize labels (makes the dumpfiles more readable).</string> </property> @@ -291,9 +249,6 @@ <property name="text"> <string>Disable optimization of invariants (--noinvariant)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -302,9 +257,6 @@ <property name="text"> <string>Disable loop variable induction (--noinduction)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -313,9 +265,6 @@ <property name="text"> <string>Disable peep-hole optimization (--&no-peep)</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="whatsThis" stdset="0"> <string>Disable peep-hole optimization.</string> </property> @@ -327,9 +276,6 @@ <property name="text"> <string>Disable loop reverse optimization (--noloopreverse)</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>Will not do loop reversal optimization.</string> </property> @@ -341,9 +287,6 @@ <property name="text"> <string>Opti&mize for compact code (--opt-code-size)</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will optimize code generation towards compact code, possibly at the expense of code speed.</string> </property> @@ -355,9 +298,6 @@ <property name="text"> <string>&Optimize for fast code (--opt-code-speed)</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will optimize code generation towards fast code, possibly at the expense of code size.</string> </property> @@ -369,9 +309,6 @@ <property name="text"> <string>Ena&ble inline assembly peephole optimization (--peep-asm)</string> </property> - <property name="accel"> - <string>Alt+B</string> - </property> <property name="whatsThis" stdset="0"> <string>Pass the inline assembler code through the peep hole optimizer. This can cause unexpected changes to inline assembler code, please go through the peephole optimizer rules defined in the source file tree '<target>/peeph.def' before using this option.</string> </property> @@ -383,9 +320,6 @@ <property name="text"> <string>Don't generate boundary check for &jump tables (--nojtbound)</string> </property> - <property name="accel"> - <string>Alt+J</string> - </property> </widget> <spacer> <property name="name"> @@ -424,9 +358,6 @@ <property name="text"> <string>Don't use default libraries (--nodefaultlibs)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -435,9 +366,6 @@ <property name="text"> <string>Don't generate BANKSEL directives (--pno-banksel)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -446,9 +374,6 @@ <property name="text"> <string>Use large stac&k model (--pstack-model=large)</string> </property> - <property name="accel"> - <string>Alt+K</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -457,9 +382,6 @@ <property name="text"> <string>Show more debug info in assembl&y output (--debug-xtra)</string> </property> - <property name="accel"> - <string>Alt+Y</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -468,9 +390,6 @@ <property name="text"> <string>E&xplicit enable of peepholes (--denable-peeps)</string> </property> - <property name="accel"> - <string>Alt+X</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -479,9 +398,6 @@ <property name="text"> <string>Du&mp call tree in .calltree file (--calltree)</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -490,9 +406,6 @@ <property name="text"> <string>Ena&ble stack optimizations (--fstack)</string> </property> - <property name="accel"> - <string>Alt+B</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -501,9 +414,6 @@ <property name="text"> <string>Try to use conditional BRA instead of GOTO (--optimi&ze-goto)</string> </property> - <property name="accel"> - <string>Alt+Z</string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -512,9 +422,6 @@ <property name="text"> <string>Try to optimize some compares (--optimize-cmp)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -523,9 +430,6 @@ <property name="text"> <string>Thorough data flow analyis (resource intensive) (--optimize-df)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <spacer> <property name="name"> diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 6976f00..66aa9f2 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -29,7 +29,7 @@ #include <tdemessagebox.h> #include <knuminput.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqslider.h> @@ -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() ); @@ -280,7 +280,7 @@ int SettingsDlg::sliderValueToRefreshRate( int sliderValue ) void SettingsDlg::updateSettings() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); TDEConfigSkeleton::ItemInt *item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(KTLConfig::self()->findItem( "RefreshRate" )); if ( !item ) @@ -300,13 +300,13 @@ void SettingsDlg::updateSettings() emit settingsChanged(); } - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateSettings()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateSettings()) ); } void SettingsDlg::slotUpdateSettings() { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); TDEConfigSkeleton::ItemString * item = dynamic_cast<TDEConfigSkeleton::ItemString*>(KTLConfig::self()->findItem( "PicProgrammerProgram" )); if ( !item ) @@ -337,7 +337,7 @@ void SettingsDlg::updateWidgets() { m_generalOptionsWidget->refreshRateSlider->setValue( refreshRateToSliderValue( KTLConfig::refreshRate() ) ); - m_pPicProgrammerSettings->load( kapp->config() ); + m_pPicProgrammerSettings->load( tdeApp->config() ); TQStringList programmerNames = m_pPicProgrammerSettings->configNames( false ); @@ -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/settingsdlg.h b/src/gui/settingsdlg.h index 9d747cf..751c524 100644 --- a/src/gui/settingsdlg.h +++ b/src/gui/settingsdlg.h @@ -28,7 +28,7 @@ class SDCCOptionsWidget; */ class SettingsDlg : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: SettingsDlg( TQWidget *parent, const char *name, TDEConfigSkeleton *config ); 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 ) diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index a85253f..2953439 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -31,7 +31,7 @@ namespace KateMDI { class ToolView; } */ class SymbolViewer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: static SymbolViewer * self( KateMDI::ToolView * parent = 0l ); @@ -88,7 +88,7 @@ class SymbolViewer : public TQWidget class SymbolViewerItem : public TQObject, public TDEListViewItem { - Q_OBJECT + TQ_OBJECT public: SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo * registerInfo ); |