diff options
169 files changed, 884 insertions, 1177 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 16e3f52..a9c7e38 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bf6219..0585edc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,16 @@ ############################################ -cmake_minimum_required( VERSION 3.1 ) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) #### general package setup project( ktechlab ) -set( VERSION R14.1.0 ) #### include essential cmake modules @@ -30,7 +33,6 @@ include( CheckCXXSourceCompiles ) #### include our cmake modules -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) diff --git a/doc/man/ktechlab.1 b/doc/man/ktechlab.1 index bb49c1d..f65d2c6 100644 --- a/doc/man/ktechlab.1 +++ b/doc/man/ktechlab.1 @@ -4,7 +4,7 @@ ktechlab \- An IDE for microcontrollers and electronics .SH SYNOPSIS -ktechlab [Qt\-options] [TDE\-options] [URL] +ktechlab [TQt\-options] [TDE\-options] [URL] .SH DESCRIPTION An IDE for microcontrollers and electronics .SH OPTIONS @@ -15,30 +15,30 @@ An IDE for microcontrollers and electronics Document to open. .SS Generic options: .TP -.B \-\-help +.B \-\-help Show help about options .TP -.B \-\-help\-qt -Show Qt specific options +.B \-\-help\-tqt +Show TQt specific options .TP -.B \-\-help\-tde +.B \-\-help\-tde Show TDE specific options .TP -.B \-\-help\-all +.B \-\-help\-all Show all options .TP -.B \-\-author +.B \-\-author Show author information .TP -.B \-v, \-\-version +.B \-v, \-\-version Show version information .TP -.B \-\-license +.B \-\-license Show license information .TP -.B \-\- +.B \-\- End of options -.SS +.SS .SS TDE options: .TP .B \-\-caption <caption> @@ -56,10 +56,10 @@ Use alternative configuration file .B \-\-dcopserver <server> Use the DCOP Server specified by 'server' .TP -.B \-\-nocrashhandler +.B \-\-nocrashhandler Disable crash handler, to get core dumps .TP -.B \-\-waitforwm +.B \-\-waitforwm Waits for a WM_NET compatible windowmanager .TP .B \-\-style <style> @@ -67,8 +67,8 @@ sets the application GUI style .TP .B \-\-geometry <geometry> sets the client geometry of the main widget - see man X for the argument format -.SS -.SS Qt options: +.SS +.SS TQt options: .TP .B \-\-display <displayname> Use the X-server display 'displayname' @@ -76,7 +76,7 @@ Use the X-server display 'displayname' .B \-\-session <sessionId> Restore the application for the given 'sessionId' .TP -.B \-\-cmap +.B \-\-cmap Causes the application to install a private color map on an 8-bit display .TP @@ -86,14 +86,14 @@ cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification .TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard +.B \-\-nograb +tells TQt to never grab the mouse or the keyboard .TP -.B \-\-dograb +.B \-\-dograb running under a debugger can cause an implicit -nograb, use -dograb to override .TP -.B \-\-sync +.B \-\-sync switches to synchronous mode for debugging .TP .B \-\-fn, \-\-font <fontname> @@ -128,17 +128,17 @@ root .B \-\-im <XIM server> set XIM server .TP -.B \-\-noxim +.B \-\-noxim disable XIM .TP -.B \-\-reverse +.B \-\-reverse mirrors the whole layout of widgets -.SS +.SS .SH SEE ALSO Full user documentation is available through the TDE Help Center. You can also enter the URL .BR help:/ktechlab/ -directly into konqueror or you can run +directly into konqueror or you can run .BR "`khelpcenter help:/ktechlab/'" from the command-line. .br diff --git a/doc/man/microbe.1 b/doc/man/microbe.1 index bbe54c3..69d298b 100644 --- a/doc/man/microbe.1 +++ b/doc/man/microbe.1 @@ -4,7 +4,7 @@ microbe \- The Microbe Compiler .SH SYNOPSIS -microbe [Qt\-options] [TDE\-options] [options] [Input URL] [Output URL] +microbe [TQt\-options] [TDE\-options] [options] [Input URL] [Output URL] .SH DESCRIPTION .SH OPTIONS @@ -18,38 +18,38 @@ URL Input filename URL Output filename .SS Options: .TP -.B \-\-show\-source +.B \-\-show\-source Show source code lines in assembly output .TP -.B \-\-nooptimize +.B \-\-nooptimize Do not attempt optimization of generated instructions. -.SS +.SS .SS Generic options: .TP -.B \-\-help +.B \-\-help Show help about options .TP -.B \-\-help\-qt -Show Qt specific options +.B \-\-help\-tqt +Show TQt specific options .TP -.B \-\-help\-tde +.B \-\-help\-tde Show TDE specific options .TP -.B \-\-help\-all +.B \-\-help\-all Show all options .TP -.B \-\-author +.B \-\-author Show author information .TP -.B \-v, \-\-version +.B \-v, \-\-version Show version information .TP -.B \-\-license +.B \-\-license Show license information .TP -.B \-\- +.B \-\- End of options -.SS +.SS .SS TDE options: .TP .B \-\-caption <caption> @@ -67,10 +67,10 @@ Use alternative configuration file .B \-\-dcopserver <server> Use the DCOP Server specified by 'server' .TP -.B \-\-nocrashhandler +.B \-\-nocrashhandler Disable crash handler, to get core dumps .TP -.B \-\-waitforwm +.B \-\-waitforwm Waits for a WM_NET compatible windowmanager .TP .B \-\-style <style> @@ -78,8 +78,8 @@ sets the application GUI style .TP .B \-\-geometry <geometry> sets the client geometry of the main widget - see man X for the argument format -.SS -.SS Qt options: +.SS +.SS TQt options: .TP .B \-\-display <displayname> Use the X-server display 'displayname' @@ -87,7 +87,7 @@ Use the X-server display 'displayname' .B \-\-session <sessionId> Restore the application for the given 'sessionId' .TP -.B \-\-cmap +.B \-\-cmap Causes the application to install a private color map on an 8-bit display .TP @@ -97,14 +97,14 @@ cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification .TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard +.B \-\-nograb +tells TQt to never grab the mouse or the keyboard .TP -.B \-\-dograb +.B \-\-dograb running under a debugger can cause an implicit -nograb, use -dograb to override .TP -.B \-\-sync +.B \-\-sync switches to synchronous mode for debugging .TP .B \-\-fn, \-\-font <fontname> @@ -139,17 +139,17 @@ root .B \-\-im <XIM server> set XIM server .TP -.B \-\-noxim +.B \-\-noxim disable XIM .TP -.B \-\-reverse +.B \-\-reverse mirrors the whole layout of widgets -.SS +.SS .SH SEE ALSO Full user documentation is available through the TDE Help Center. You can also enter the URL .BR help:/microbe/ -directly into konqueror or you can run +directly into konqueror or you can run .BR "`khelpcenter help:/microbe/'" from the command-line. .br diff --git a/src/canvasitemparts.cpp b/src/canvasitemparts.cpp index 67eb986..c8eca6b 100644 --- a/src/canvasitemparts.cpp +++ b/src/canvasitemparts.cpp @@ -25,7 +25,7 @@ GuiPart::GuiPart( CNItem *parent, const TQRect & r, TQCanvas * canvas ) b_pointsAdded(false), m_originalRect(r) { - connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveBy(double, double )) ); + connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveBy(double, double )) ); setZ( parent->z() + 0.5 ); } @@ -283,8 +283,8 @@ Button::Button( const TQString & id, CNItem * parent, bool isToggle, const TQRec m_button = new ToolButton(0l); m_button->setUsesTextLabel(false); m_button->setToggleButton(b_isToggle); - connect( m_button, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotStateChanged()) ); - connect( m_button, TQT_SIGNAL(released()), this, TQT_SLOT(slotStateChanged()) ); + connect( m_button, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotStateChanged()) ); + connect( m_button, TQ_SIGNAL(released()), this, TQ_SLOT(slotStateChanged()) ); posChanged(); } @@ -437,13 +437,13 @@ SliderWidget::SliderWidget( TQWidget *parent ) Slider::Slider( const TQString & id, CNItem * parent, const TQRect & r, TQCanvas * canvas ) : Widget( id, parent, r, canvas ) { - m_orientation = Qt::Vertical; + m_orientation = TQt::Vertical; m_slider = new SliderWidget(0l); m_slider->setPaletteBackgroundColor(TQt::white); m_slider->setPaletteForegroundColor(TQt::white); m_slider->setEraseColor(TQt::white); m_slider->setBackgroundMode( TQt::NoBackground ); - connect( m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)) ); + connect( m_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)) ); posChanged(); } @@ -531,7 +531,7 @@ void Slider::slotValueChanged( int value ) parent()->sliderValueChanged(id(),value); } -void Slider::setOrientation( Qt::Orientation o ) +void Slider::setOrientation( TQt::Orientation o ) { m_orientation = o; posChanged(); @@ -541,11 +541,11 @@ void Slider::posChanged() { Widget::posChanged(); - if ( m_orientation == Qt::Vertical ) - m_slider->setOrientation( (m_angleDegrees%180 == 0) ? Qt::Vertical : Qt::Horizontal ); + if ( m_orientation == TQt::Vertical ) + m_slider->setOrientation( (m_angleDegrees%180 == 0) ? TQt::Vertical : TQt::Horizontal ); else - m_slider->setOrientation( (m_angleDegrees%180 == 0) ? Qt::Horizontal : Qt::Vertical ); + m_slider->setOrientation( (m_angleDegrees%180 == 0) ? TQt::Horizontal : TQt::Vertical ); } //END Class Slider diff --git a/src/canvasitemparts.h b/src/canvasitemparts.h index 4f97869..d34f07c 100644 --- a/src/canvasitemparts.h +++ b/src/canvasitemparts.h @@ -25,7 +25,7 @@ class TQString; class GuiPart : public TQObject, public TQCanvasRectangle { - Q_OBJECT + TQ_OBJECT public: /** @@ -94,7 +94,7 @@ class GuiPart : public TQObject, public TQCanvasRectangle */ class Text : public GuiPart { - Q_OBJECT + TQ_OBJECT public: Text( const TQString &text, CNItem *parent, const TQRect & r, TQCanvas * canvas, int flags = TQt::AlignHCenter | TQt::AlignVCenter ); @@ -205,7 +205,7 @@ class ToolButton : public TQToolButton */ class Button : public Widget { - Q_OBJECT + TQ_OBJECT public: Button( const TQString & id, CNItem *parent, bool isToggle, const TQRect & r, TQCanvas * canvas ); @@ -261,7 +261,7 @@ class SliderWidget : public TQSlider */ class Slider : public Widget { - Q_OBJECT + TQ_OBJECT public: Slider( const TQString & id, CNItem *parent, const TQRect & r, TQCanvas * canvas ); @@ -278,7 +278,7 @@ class Slider : public Widget virtual TQWidget *widget() const; int value() const; void setValue( int value ); - void setOrientation( Qt::Orientation o ); + void setOrientation( TQt::Orientation o ); protected: virtual void posChanged(); @@ -288,7 +288,7 @@ class Slider : public Widget private: SliderWidget *m_slider; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; }; #endif diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp index 803ed6d..b501301 100644 --- a/src/canvasmanipulator.cpp +++ b/src/canvasmanipulator.cpp @@ -46,7 +46,7 @@ CMManager::CMManager( ItemDocument *itemDocument ) p_lastItemClicked = 0l; m_drawAction = -1; m_allowItemScrollTmr = new TQTimer(this); - connect( m_allowItemScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAllowItemScroll()) ); + connect( m_allowItemScrollTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAllowItemScroll()) ); TDEGlobal::config()->setGroup("General"); slotSetManualRoute( TDEGlobal::config()->readBoolEntry( "ManualRouting", false ) ); diff --git a/src/canvasmanipulator.h b/src/canvasmanipulator.h index 7ba3b8a..5199f39 100644 --- a/src/canvasmanipulator.h +++ b/src/canvasmanipulator.h @@ -68,7 +68,7 @@ Handles canvas manipulation, such as moving an item or resizing the canvas */ class CMManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: enum EventState diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp index 31aef66..6f51d2a 100644 --- a/src/circuitdocument.cpp +++ b/src/circuitdocument.cpp @@ -49,11 +49,11 @@ CircuitDocument::CircuitDocument( const TQString & caption, KTechlab *ktechlab, m_cmManager->addManipulatorInfo( CMItemResize::manipulatorInfo() ); m_cmManager->addManipulatorInfo( CMItemDrag::manipulatorInfo() ); - connect( this, TQT_SIGNAL(connectorAdded(Connector*)), this, TQT_SLOT(requestAssignCircuits()) ); - connect( this, TQT_SIGNAL(connectorAdded(Connector*)), this, TQT_SLOT(connectorAdded(Connector*)) ); + connect( this, TQ_SIGNAL(connectorAdded(Connector*)), this, TQ_SLOT(requestAssignCircuits()) ); + connect( this, TQ_SIGNAL(connectorAdded(Connector*)), this, TQ_SLOT(connectorAdded(Connector*)) ); m_updateCircuitsTmr = new TQTimer(); - connect( m_updateCircuitsTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(assignCircuits()) ); + connect( m_updateCircuitsTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(assignCircuits()) ); requestStateSave(); } @@ -267,8 +267,8 @@ void CircuitDocument::connectorAdded( Connector * connector ) { if (connector) { - connect( connector, TQT_SIGNAL(numWiresChanged(unsigned )), this, TQT_SLOT(requestAssignCircuits()) ); - connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(requestAssignCircuits()) ); + connect( connector, TQ_SIGNAL(numWiresChanged(unsigned )), this, TQ_SLOT(requestAssignCircuits()) ); + connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(requestAssignCircuits()) ); } } @@ -288,9 +288,9 @@ void CircuitDocument::componentAdded( Item * item ) requestAssignCircuits(); - connect( component, TQT_SIGNAL(elementCreated(Element*)), this, TQT_SLOT(requestAssignCircuits()) ); - connect( component, TQT_SIGNAL(elementDestroyed(Element*)), this, TQT_SLOT(requestAssignCircuits()) ); - connect( component, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(componentRemoved(Item*)) ); + connect( component, TQ_SIGNAL(elementCreated(Element*)), this, TQ_SLOT(requestAssignCircuits()) ); + connect( component, TQ_SIGNAL(elementDestroyed(Element*)), this, TQ_SLOT(requestAssignCircuits()) ); + connect( component, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(componentRemoved(Item*)) ); // We don't attach the component to the Simulator just yet, as the // Component's vtable is not yet fully constructed, and so Simulator can't diff --git a/src/circuitdocument.h b/src/circuitdocument.h index f9942c2..dceb1d7 100644 --- a/src/circuitdocument.h +++ b/src/circuitdocument.h @@ -61,7 +61,7 @@ information from those simulations back on the ICNDocument */ class CircuitDocument : public ICNDocument { - Q_OBJECT + TQ_OBJECT public: CircuitDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0L ); diff --git a/src/circuitview.cpp b/src/circuitview.cpp index 07a6408..f87e8d1 100644 --- a/src/circuitview.cpp +++ b/src/circuitview.cpp @@ -27,24 +27,24 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view { TDEActionCollection * ac = actionCollection(); - new TDEAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQT_SLOT(displayEquations()), ac, "dump_les" ); + new TDEAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQ_SLOT(displayEquations()), ac, "dump_les" ); //BEGIN Item Control Actions TDERadioAction * ra; - ra = new TDERadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation0()), ac, "edit_orientation_0" ); + ra = new TDERadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation0()), ac, "edit_orientation_0" ); ra->setExclusiveGroup("orientation"); ra->setChecked(true); - ra = new TDERadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation90()), ac, "edit_orientation_90" ); + ra = new TDERadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation90()), ac, "edit_orientation_90" ); ra->setExclusiveGroup("orientation"); - ra = new TDERadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation180()), ac, "edit_orientation_180" ); + ra = new TDERadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation180()), ac, "edit_orientation_180" ); ra->setExclusiveGroup("orientation"); - ra =new TDERadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation270()), ac, "edit_orientation_270" ); + ra =new TDERadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQ_SLOT(setOrientation270()), ac, "edit_orientation_270" ); ra->setExclusiveGroup("orientation"); - new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQT_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" ); - new TDEAction( i18n("Rotate Clockwise"), "object-rotate-right", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" ); - new TDEAction( i18n("Rotate Counter-Clockwise"), "object-rotate-left", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" ); - new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQT_SLOT(itemFlip()), ac, "edit_flip" ); + new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQ_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" ); + new TDEAction( i18n("Rotate Clockwise"), "object-rotate-right", "]", circuitDocument, TQ_SLOT(rotateClockwise()), ac, "edit_rotate_cw" ); + new TDEAction( i18n("Rotate Counter-Clockwise"), "object-rotate-left", "[", circuitDocument, TQ_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" ); + new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQ_SLOT(itemFlip()), ac, "edit_flip" ); //END Item Control Actions setXMLFile( "ktechlabcircuitui.rc", true ); @@ -65,7 +65,7 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view m_pViewIface = new CircuitViewIface(this); m_statusBar->insertItem( "", ViewStatusBar::SimulationState ); - connect( Simulator::self(), TQT_SIGNAL(simulatingStateChanged(bool )), this, TQT_SLOT(slotUpdateRunningStatus(bool )) ); + connect( Simulator::self(), TQ_SIGNAL(simulatingStateChanged(bool )), this, TQ_SLOT(slotUpdateRunningStatus(bool )) ); slotUpdateRunningStatus( Simulator::self()->isSimulating() ); } diff --git a/src/circuitview.h b/src/circuitview.h index e6056ca..9d6b51e 100644 --- a/src/circuitview.h +++ b/src/circuitview.h @@ -20,7 +20,7 @@ class CircuitDocument; */ class CircuitView : public ICNView { -Q_OBJECT +TQ_OBJECT public: CircuitView( CircuitDocument *circuitDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l ); diff --git a/src/ciwidgetmgr.cpp b/src/ciwidgetmgr.cpp index b159de6..293c5d4 100644 --- a/src/ciwidgetmgr.cpp +++ b/src/ciwidgetmgr.cpp @@ -156,7 +156,7 @@ Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, TQPixmap } -Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const TQRect & pos ) +Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, const TQRect & pos ) { Slider *slider = new Slider( id, p_cnItem, pos, p_canvas ); TQSlider *qslider = dynamic_cast<TQSlider*>(slider->widget()); diff --git a/src/ciwidgetmgr.h b/src/ciwidgetmgr.h index f92a877..923567c 100644 --- a/src/ciwidgetmgr.h +++ b/src/ciwidgetmgr.h @@ -50,7 +50,7 @@ public: /** * Adds a slider with the given id and values to the position */ - Slider* addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const TQRect & pos ); + Slider* addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, const TQRect & pos ); /** * Essentially the same as addDisplayText, but displays a button with * text on it. The virtual functions buttonPressed( const TQString &id ) and diff --git a/src/cnitem.h b/src/cnitem.h index bdcc299..3320aae 100644 --- a/src/cnitem.h +++ b/src/cnitem.h @@ -39,7 +39,7 @@ public: Node *node; //Pointer to the node double x; // X position relative to item double y; // Y position relative to item - int orientation; // Qt::Orientation relative to item + int orientation; // TQt::Orientation relative to item }; typedef TQMap<TQString, TQString> StringMap; @@ -57,7 +57,7 @@ saving and editing of associated data, cutting / copying, etc) */ class CNItem : public Item, public CIWidgetMgr { -Q_OBJECT +TQ_OBJECT public: CNItem( ICNDocument *_icnView, bool newItem, const TQString &id ); diff --git a/src/cnitemgroup.h b/src/cnitemgroup.h index ba89638..7406a9a 100644 --- a/src/cnitemgroup.h +++ b/src/cnitemgroup.h @@ -36,7 +36,7 @@ typedef TQValueList<TQGuardedPtr<Connector> > ConnectorList; */ class CNItemGroup : public ItemGroup { -Q_OBJECT +TQ_OBJECT public: CNItemGroup( ICNDocument *icnDocument, const char *name = 0 ); diff --git a/src/connector.cpp b/src/connector.cpp index 182a809..4be6b95 100644 --- a/src/connector.cpp +++ b/src/connector.cpp @@ -87,8 +87,8 @@ Connector::Connector( Node * startNode, Node * endNode, ICNDocument *icnDocument ECNode * endECNode = dynamic_cast<ECNode*>(endNode); if ( startECNode && endECNode ) { - connect( startECNode, TQT_SIGNAL(numPinsChanged(unsigned)), this, TQT_SLOT(syncWiresWithNodes()) ); - connect( endECNode, TQT_SIGNAL(numPinsChanged(unsigned)), this, TQT_SLOT(syncWiresWithNodes()) ); + connect( startECNode, TQ_SIGNAL(numPinsChanged(unsigned)), this, TQ_SLOT(syncWiresWithNodes()) ); + connect( endECNode, TQ_SIGNAL(numPinsChanged(unsigned)), this, TQ_SLOT(syncWiresWithNodes()) ); syncWiresWithNodes(); } } diff --git a/src/connector.h b/src/connector.h index 1af54a3..92426b7 100644 --- a/src/connector.h +++ b/src/connector.h @@ -36,7 +36,7 @@ typedef TQValueVector<TQGuardedPtr<Wire> > WireVector; */ class Connector : public TQObject, public TQCanvasPolygon { -Q_OBJECT +TQ_OBJECT public: Connector( Node * startNode, Node * endNode, ICNDocument *_ICNDocument, TQString *id = 0L ); diff --git a/src/debugmanager.h b/src/debugmanager.h index 00d6c5f..60a7aac 100644 --- a/src/debugmanager.h +++ b/src/debugmanager.h @@ -30,7 +30,7 @@ typedef TQValueList< TQGuardedPtr<GpsimProcessor> > GpsimProcessorList; */ class DebugManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static DebugManager * self(); diff --git a/src/docmanager.cpp b/src/docmanager.cpp index 71a5bea..f6f101d 100644 --- a/src/docmanager.cpp +++ b/src/docmanager.cpp @@ -260,12 +260,12 @@ void DocManager::handleNewDocument( Document *document, ViewArea *viewArea ) m_documentList.append(document); document->setDCOPID(m_nextDocumentID++); - connect( document, TQT_SIGNAL(modifiedStateChanged()), p_ktechlab, TQT_SLOT(slotDocModifiedChanged()) ); - connect( document, TQT_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQT_SLOT(slotDocModifiedChanged()) ); - connect( document, TQT_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQT_SLOT(addRecentFile(const KURL&)) ); - connect( document, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(documentDestroyed(TQObject* )) ); - connect( document, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) ); - connect( document, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(slotViewUnfocused()) ); + connect( document, TQ_SIGNAL(modifiedStateChanged()), p_ktechlab, TQ_SLOT(slotDocModifiedChanged()) ); + connect( document, TQ_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQ_SLOT(slotDocModifiedChanged()) ); + connect( document, TQ_SIGNAL(fileNameChanged(const KURL&)), p_ktechlab, TQ_SLOT(addRecentFile(const KURL&)) ); + connect( document, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(documentDestroyed(TQObject* )) ); + connect( document, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) ); + connect( document, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(slotViewUnfocused()) ); createNewView( document, viewArea ); } @@ -332,7 +332,7 @@ void DocManager::slotViewFocused( View *view ) Document *document = view->document(); - connect( document, TQT_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQT_SLOT(slotDocUndoRedoChanged()) ); + connect( document, TQ_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQ_SLOT(slotDocUndoRedoChanged()) ); p_connectedDocument = document; if ( document->type() == Document::dt_circuit || @@ -359,7 +359,7 @@ void DocManager::slotViewUnfocused() if (p_connectedDocument) { - disconnect( p_connectedDocument, TQT_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQT_SLOT(slotDocUndoRedoChanged()) ); + disconnect( p_connectedDocument, TQ_SIGNAL(undoRedoStateChanged()), p_ktechlab, TQ_SLOT(slotDocUndoRedoChanged()) ); p_connectedDocument = 0l; } diff --git a/src/docmanager.h b/src/docmanager.h index c6b28ec..1df3678 100644 --- a/src/docmanager.h +++ b/src/docmanager.h @@ -36,7 +36,7 @@ typedef TQValueList<TDEAction*> TDEActionList; */ class DocManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: static DocManager * self( KTechlab * ktechlab = 0l ); diff --git a/src/document.cpp b/src/document.cpp index 7a59c46..cad15f5 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -33,7 +33,7 @@ Document::Document( const TQString &caption, KTechlab *ktechlab, const char *nam m_bDeleted(false) { if (p_ktechlab) - connect( p_ktechlab, TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(slotUpdateConfiguration()) ); + connect( p_ktechlab, TQ_SIGNAL(configurationChanged()), this, TQ_SLOT(slotUpdateConfiguration()) ); } @@ -56,9 +56,9 @@ void Document::handleNewView( View *view ) m_viewList.append(view); view->setDCOPID(m_nextViewID++); view->setCaption(m_caption); - connect( view, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(slotViewDestroyed(TQObject* )) ); - connect( view, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) ); - connect( view, TQT_SIGNAL(viewUnfocused()), this, TQT_SIGNAL(viewUnfocused()) ); + connect( view, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(slotViewDestroyed(TQObject* )) ); + connect( view, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) ); + connect( view, TQ_SIGNAL(viewUnfocused()), this, TQ_SIGNAL(viewUnfocused()) ); view->show(); view->setFocused(); } @@ -66,7 +66,7 @@ void Document::handleNewView( View *view ) void Document::slotViewDestroyed( TQObject *obj ) { - View *view = static_cast<View*>(TQT_TQWIDGET(obj)); + View *view = static_cast<View*>(obj); m_viewList.remove(view); diff --git a/src/document.h b/src/document.h index 1dc7b59..2e1219e 100644 --- a/src/document.h +++ b/src/document.h @@ -28,7 +28,7 @@ typedef TQValueList<TQGuardedPtr<View> > ViewList; */ class Document : public TQObject { -Q_OBJECT +TQ_OBJECT public: enum DocumentType diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp index 5127a0e..0a9d019 100644 --- a/src/drawparts/dpline.cpp +++ b/src/drawparts/dpline.cpp @@ -56,12 +56,12 @@ DPLine::DPLine( ItemDocument *itemDocument, bool newItem, const char *id ) createProperty( "line-style", Variant::Type::PenStyle ); property("line-style")->setCaption( i18n("Line Style") ); property("line-style")->setAdvanced(true); - setDataPenStyle( "line-style", Qt::SolidLine ); + setDataPenStyle( "line-style", TQt::SolidLine ); createProperty( "cap-style", Variant::Type::PenCapStyle ); property("cap-style")->setCaption( i18n("Cap Style") ); property("cap-style")->setAdvanced(true); - setDataPenCapStyle( "cap-style", Qt::FlatCap ); + setDataPenCapStyle( "cap-style", TQt::FlatCap ); } DPLine::~DPLine() @@ -84,7 +84,7 @@ void DPLine::dataChanged() unsigned( dataInt("line-width") ), getDataPenStyle("line-style"), getDataPenCapStyle("cap-style"), - Qt::MiterJoin ) ); + TQt::MiterJoin ) ); postResize(); // in case the pen width has changed update(); @@ -171,7 +171,7 @@ DPArrow::DPArrow( ItemDocument *itemDocument, bool newItem, const char *id ) // We don't want to use the square cap style as it screws up drawing our arrow head TQStringList allowed = property("cap-style")->allowed(); - allowed.remove( DrawPart::penCapStyleToName( Qt::SquareCap ) ); + allowed.remove( DrawPart::penCapStyleToName( TQt::SquareCap ) ); property("cap-style")->setAllowed(allowed); } @@ -211,7 +211,7 @@ void DPArrow::drawShape( TQPainter & p ) // Draw arrowhead TQPen pen = p.pen(); - pen.setCapStyle( Qt::RoundCap ); + pen.setCapStyle( TQt::RoundCap ); p.setPen(pen); p.setBrush(pen.color()); TQPointArray pa(3); diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp index 1ac24cf..2a67a4f 100644 --- a/src/drawparts/drawpart.cpp +++ b/src/drawparts/drawpart.cpp @@ -39,9 +39,9 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty if ( type == Variant::Type::PenStyle ) { TQStringList penStyles; - penStyles << DrawPart::penStyleToName(Qt::SolidLine) << DrawPart::penStyleToName(Qt::DashLine) - << DrawPart::penStyleToName(Qt::DotLine) << DrawPart::penStyleToName(Qt::DashDotLine) - << DrawPart::penStyleToName(Qt::DashDotDotLine); + penStyles << DrawPart::penStyleToName(TQt::SolidLine) << DrawPart::penStyleToName(TQt::DashLine) + << DrawPart::penStyleToName(TQt::DotLine) << DrawPart::penStyleToName(TQt::DashDotLine) + << DrawPart::penStyleToName(TQt::DashDotDotLine); Variant * v = createProperty( id, Variant::Type::String ); v->setType( Variant::Type::PenStyle ); @@ -52,8 +52,8 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty if ( type == Variant::Type::PenCapStyle ) { TQStringList penCapStyles; - penCapStyles << DrawPart::penCapStyleToName(Qt::FlatCap) << DrawPart::penCapStyleToName(Qt::SquareCap) - << DrawPart::penCapStyleToName(Qt::RoundCap); + penCapStyles << DrawPart::penCapStyleToName(TQt::FlatCap) << DrawPart::penCapStyleToName(TQt::SquareCap) + << DrawPart::penCapStyleToName(TQt::RoundCap); Variant * v = createProperty( id, Variant::Type::String ); v->setType( Variant::Type::PenCapStyle ); @@ -65,19 +65,19 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty } -Qt::PenStyle DrawPart::getDataPenStyle( const TQString & id ) +TQt::PenStyle DrawPart::getDataPenStyle( const TQString & id ) { return nameToPenStyle( dataString(id) ); } -Qt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id ) +TQt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id ) { return nameToPenCapStyle( dataString(id) ); } -void DrawPart::setDataPenStyle( const TQString & id, Qt::PenStyle value ) +void DrawPart::setDataPenStyle( const TQString & id, TQt::PenStyle value ) { property(id)->setValue( penStyleToName(value) ); } -void DrawPart::setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value ) +void DrawPart::setDataPenCapStyle( const TQString & id, TQt::PenCapStyle value ) { property(id)->setValue( penCapStyleToName(value) ); } @@ -144,121 +144,121 @@ void DrawPart::restoreFromItemData( const ItemData &itemData ) -TQString DrawPart::penStyleToID( Qt::PenStyle style ) +TQString DrawPart::penStyleToID( TQt::PenStyle style ) { switch (style) { - case Qt::SolidLine: + case TQt::SolidLine: return "SolidLine"; - case Qt::NoPen: + case TQt::NoPen: return "NoPen"; - case Qt::DashLine: + case TQt::DashLine: return "DashLine"; - case Qt::DotLine: + case TQt::DotLine: return "DotLine"; - case Qt::DashDotLine: + case TQt::DashDotLine: return "DashDotLine"; - case Qt::DashDotDotLine: + case TQt::DashDotDotLine: return "DashDotDotLine"; - case Qt::MPenStyle: + case TQt::MPenStyle: default: return ""; // ?! } } -Qt::PenStyle DrawPart::idToPenStyle( const TQString & id ) +TQt::PenStyle DrawPart::idToPenStyle( const TQString & id ) { if ( id == "NoPen" ) - return Qt::NoPen; + return TQt::NoPen; if ( id == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; if ( id == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; if ( id == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; if ( id == "DashDotDotLine" ) - return Qt::DashDotDotLine; - return Qt::SolidLine; + return TQt::DashDotDotLine; + return TQt::SolidLine; } -TQString DrawPart::penCapStyleToID( Qt::PenCapStyle style ) +TQString DrawPart::penCapStyleToID( TQt::PenCapStyle style ) { switch (style) { - case Qt::FlatCap: + case TQt::FlatCap: return "FlatCap"; - case Qt::SquareCap: + case TQt::SquareCap: return "SquareCap"; - case Qt::RoundCap: + case TQt::RoundCap: return "RoundCap"; - case Qt::MPenCapStyle: + case TQt::MPenCapStyle: default: return ""; // ?! } } -Qt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id ) +TQt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id ) { if ( id == "SquareCap" ) - return Qt::SquareCap; + return TQt::SquareCap; if ( id == "RoundCap" ) - return Qt::RoundCap; - return Qt::FlatCap; + return TQt::RoundCap; + return TQt::FlatCap; } -TQString DrawPart::penStyleToName( Qt::PenStyle style ) +TQString DrawPart::penStyleToName( TQt::PenStyle style ) { switch (style) { - case Qt::SolidLine: + case TQt::SolidLine: return i18n("Solid"); - case Qt::NoPen: + case TQt::NoPen: return i18n("None"); - case Qt::DashLine: + case TQt::DashLine: return i18n("Dash"); - case Qt::DotLine: + case TQt::DotLine: return i18n("Dot"); - case Qt::DashDotLine: + case TQt::DashDotLine: return i18n("Dash Dot"); - case Qt::DashDotDotLine: + case TQt::DashDotDotLine: return i18n("Dash Dot Dot"); - case Qt::MPenStyle: + case TQt::MPenStyle: default: return ""; // ?! } } -Qt::PenStyle DrawPart::nameToPenStyle( const TQString & name ) +TQt::PenStyle DrawPart::nameToPenStyle( const TQString & name ) { if ( name == i18n("None") ) - return Qt::NoPen; + return TQt::NoPen; if ( name == i18n("Dash") ) - return Qt::DashLine; + return TQt::DashLine; if ( name == i18n("Dot") ) - return Qt::DotLine; + return TQt::DotLine; if ( name == i18n("Dash Dot") ) - return Qt::DashDotLine; + return TQt::DashDotLine; if ( name == i18n("Dash Dot Dot") ) - return Qt::DashDotDotLine; - return Qt::SolidLine; + return TQt::DashDotDotLine; + return TQt::SolidLine; } -TQString DrawPart::penCapStyleToName( Qt::PenCapStyle style ) +TQString DrawPart::penCapStyleToName( TQt::PenCapStyle style ) { switch (style) { - case Qt::FlatCap: + case TQt::FlatCap: return i18n("Flat"); - case Qt::SquareCap: + case TQt::SquareCap: return i18n("Square"); - case Qt::RoundCap: + case TQt::RoundCap: return i18n("Round"); - case Qt::MPenCapStyle: + case TQt::MPenCapStyle: default: return ""; // ?! } } -Qt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name ) +TQt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name ) { if ( name == i18n("Square") ) - return Qt::SquareCap; + return TQt::SquareCap; if ( name == i18n("Round") ) - return Qt::RoundCap; - return Qt::FlatCap; + return TQt::RoundCap; + return TQt::FlatCap; } diff --git a/src/drawparts/drawpart.h b/src/drawparts/drawpart.h index e2b046e..71042bb 100644 --- a/src/drawparts/drawpart.h +++ b/src/drawparts/drawpart.h @@ -43,26 +43,26 @@ class DrawPart : public Item virtual Variant * createProperty( const TQString & id, Variant::Type::Value type ); - Qt::PenStyle getDataPenStyle( const TQString & id ); - Qt::PenCapStyle getDataPenCapStyle( const TQString & id ); + TQt::PenStyle getDataPenStyle( const TQString & id ); + TQt::PenCapStyle getDataPenCapStyle( const TQString & id ); - void setDataPenStyle( const TQString & id, Qt::PenStyle value ); - void setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value ); + void setDataPenStyle( const TQString & id, TQt::PenStyle value ); + void setDataPenCapStyle( const TQString & id, TQt::PenCapStyle value ); virtual ItemData itemData() const; virtual void restoreFromItemData( const ItemData &itemData ); // Convention for following functions: name is i18n'd name of style, id is the english one - static TQString penStyleToID( Qt::PenStyle style ); - static Qt::PenStyle idToPenStyle( const TQString & id ); - static TQString penCapStyleToID( Qt::PenCapStyle style ); - static Qt::PenCapStyle idToPenCapStyle( const TQString & id ); + static TQString penStyleToID( TQt::PenStyle style ); + static TQt::PenStyle idToPenStyle( const TQString & id ); + static TQString penCapStyleToID( TQt::PenCapStyle style ); + static TQt::PenCapStyle idToPenCapStyle( const TQString & id ); - static TQString penStyleToName( Qt::PenStyle style ); - static Qt::PenStyle nameToPenStyle( const TQString & name ); - static TQString penCapStyleToName( Qt::PenCapStyle style ); - static Qt::PenCapStyle nameToPenCapStyle( const TQString & name ); + static TQString penStyleToName( TQt::PenStyle style ); + static TQt::PenStyle nameToPenStyle( const TQString & name ); + static TQString penCapStyleToName( TQt::PenCapStyle style ); + static TQt::PenCapStyle nameToPenCapStyle( const TQString & name ); }; #endif diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp index 419e0ad..51fafa8 100644 --- a/src/drawparts/solidshape.cpp +++ b/src/drawparts/solidshape.cpp @@ -65,7 +65,7 @@ DPRectangle::DPRectangle( ItemDocument *itemDocument, bool newItem, const char * createProperty( "line-style", Variant::Type::PenStyle ); property("line-style")->setAdvanced(true); - setDataPenStyle( "line-style", Qt::SolidLine ); + setDataPenStyle( "line-style", TQt::SolidLine ); } DPRectangle::~DPRectangle() @@ -87,14 +87,14 @@ void DPRectangle::dataChanged() bool displayBackground = dataBool("background"); TQColor line_color = dataColor("line-color"); unsigned width = unsigned( dataInt("line-width") ); - Qt::PenStyle style = getDataPenStyle("line-style"); + TQt::PenStyle style = getDataPenStyle("line-style"); setPen( TQPen( line_color, width, style ) ); if (displayBackground) setBrush( dataColor("background-color") ); else - setBrush( Qt::NoBrush ); + setBrush( TQt::NoBrush ); postResize(); update(); diff --git a/src/electronics/component.h b/src/electronics/component.h index 5217c7f..f1cdb2e 100644 --- a/src/electronics/component.h +++ b/src/electronics/component.h @@ -75,7 +75,7 @@ typedef TQValueList<ElementMap> ElementMapList; */ class Component : public CNItem { - Q_OBJECT + TQ_OBJECT public: Component( ICNDocument *icnDocument, bool newItem, const TQString &id ); diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp index d775634..0371088 100644 --- a/src/electronics/components/ecpotentiometer.cpp +++ b/src/electronics/components/ecpotentiometer.cpp @@ -48,7 +48,7 @@ ECPotentiometer::ECPotentiometer( ICNDocument *icnDocument, bool newItem, const m_r1 = createResistance( createPin( -8, -24, 90, "n1" ), m_p1, 1. ); m_r2 = createResistance( createPin( -8, 24, 270, "n2" ), m_p1, 1. ); - Slider * s = addSlider( "slider", 0, 100, 5, 50, Qt::Vertical, TQRect( 0, -16, 16, 32 ) ); + Slider * s = addSlider( "slider", 0, 100, 5, 50, TQt::Vertical, TQRect( 0, -16, 16, 32 ) ); m_pSlider = static_cast<TQSlider*>(s->widget()); createProperty( "resistance", Variant::Type::Double ); diff --git a/src/electronics/components/ecsubcircuit.h b/src/electronics/components/ecsubcircuit.h index 89f2a41..4c19e63 100644 --- a/src/electronics/components/ecsubcircuit.h +++ b/src/electronics/components/ecsubcircuit.h @@ -21,7 +21,7 @@ */ class ECSubcircuit : public Component { -Q_OBJECT +TQ_OBJECT public: ECSubcircuit( ICNDocument *icnDocument, bool newItem, const char *id = 0L ); diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp index 57ff164..6c45df1 100644 --- a/src/electronics/components/piccomponent.cpp +++ b/src/electronics/components/piccomponent.cpp @@ -90,14 +90,14 @@ PICComponent::PICComponent( ICNDocument *icnDocument, bool newItem, const char * addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) ); if ( icnDocument->ktechlab() ) - connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) ); + connect( icnDocument->ktechlab(), TQ_SIGNAL(recentFileAdded(const KURL &)), this, TQ_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(projectCreated()), this, TQT_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(subprojectCreated()), this, TQT_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(filesAdded()), this, TQT_SLOT(slotUpdateFileList()) ); - connect( ProjectManager::self(), TQT_SIGNAL(filesRemoved()), this, TQT_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(projectCreated()), this, TQ_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(subprojectCreated()), this, TQ_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(filesAdded()), this, TQ_SLOT(slotUpdateFileList()) ); + connect( ProjectManager::self(), TQ_SIGNAL(filesRemoved()), this, TQ_SLOT(slotUpdateFileList()) ); createProperty( "program", Variant::Type::FileName ); property("program")->setCaption( i18n("Program") ); @@ -366,7 +366,7 @@ TQString PICComponent::createSymbolFile() m_bLoadingProgram = true; slotUpdateBtns(); - return GpsimProcessor::generateSymbolFile( dataString("program"), this, TQT_SLOT(slotCODCreationSucceeded()), TQT_SLOT(slotCODCreationFailed()) ); + return GpsimProcessor::generateSymbolFile( dataString("program"), this, TQ_SLOT(slotCODCreationSucceeded()), TQ_SLOT(slotCODCreationFailed()) ); } @@ -383,7 +383,7 @@ void PICComponent::slotCODCreationSucceeded() property("lastPackage")->setValue( microInfo->id() ); initPackage( microInfo ); - connect( m_pGpsim, TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(slotUpdateBtns()) ); + connect( m_pGpsim, TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(slotUpdateBtns()) ); attachPICComponentPins(); } diff --git a/src/electronics/components/piccomponent.h b/src/electronics/components/piccomponent.h index 5bf4ac8..9625bfd 100644 --- a/src/electronics/components/piccomponent.h +++ b/src/electronics/components/piccomponent.h @@ -42,7 +42,7 @@ typedef TQMap< int, PICComponentPin * > PICComponentPinMap; */ class PICComponent : public Component { - Q_OBJECT + TQ_OBJECT public: PICComponent( ICNDocument * icnDocument, bool newItem, const char *id = 0L ); diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp index 77633a2..28af164 100644 --- a/src/electronics/ecnode.cpp +++ b/src/electronics/ecnode.cpp @@ -138,8 +138,8 @@ void ECNode::setParentItem( CNItem * parentItem ) if ( Component * component = dynamic_cast<Component*>(parentItem) ) { - connect( component, TQT_SIGNAL(elementDestroyed(Element* )), this, TQT_SLOT(removeElement(Element* )) ); - connect( component, TQT_SIGNAL(switchDestroyed( Switch* )), this, TQT_SLOT(removeSwitch( Switch* )) ); + connect( component, TQ_SIGNAL(elementDestroyed(Element* )), this, TQ_SLOT(removeElement(Element* )) ); + connect( component, TQ_SIGNAL(switchDestroyed( Switch* )), this, TQ_SLOT(removeSwitch( Switch* )) ); } } diff --git a/src/electronics/ecnode.h b/src/electronics/ecnode.h index 0306749..04665f5 100644 --- a/src/electronics/ecnode.h +++ b/src/electronics/ecnode.h @@ -31,7 +31,7 @@ typedef TQValueVector<Pin*> PinVector; */ class ECNode : public Node { - Q_OBJECT + TQ_OBJECT public: ECNode( ICNDocument *icnDocument, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L ); diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index 38e9c89..4d6229d 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -366,9 +366,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject if (receiver) { if (successMember) - connect( pc, TQT_SIGNAL(successful()), receiver, successMember ); + connect( pc, TQ_SIGNAL(successful()), receiver, successMember ); if (failMember) - connect( pc, TQT_SIGNAL(failed()), receiver, failMember ); + connect( pc, TQ_SIGNAL(failed()), receiver, failMember ); } return TQString(hexFile).replace( ".hex", ".cod" ); @@ -386,9 +386,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject if (receiver) { if (successMember) - connect( pc, TQT_SIGNAL(successful()), receiver, successMember ); + connect( pc, TQ_SIGNAL(successful()), receiver, successMember ); if (failMember) - connect( pc, TQT_SIGNAL(failed()), receiver, failMember ); + connect( pc, TQ_SIGNAL(failed()), receiver, failMember ); } return TQString(fileName).replace(".asm",".cod"); @@ -406,9 +406,9 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject if (receiver) { if (successMember) - connect( pc, TQT_SIGNAL(successful()), receiver, successMember ); + connect( pc, TQ_SIGNAL(successful()), receiver, successMember ); if (failMember) - connect( pc, TQT_SIGNAL(failed()), receiver, failMember ); + connect( pc, TQ_SIGNAL(failed()), receiver, failMember ); } return TQString(fileName).replace(".c",".cod"); @@ -432,9 +432,9 @@ void GpsimProcessor::compileMicrobe( const TQString &filename, TQObject *receive if (receiver) { if (successMember) - connect( pc, TQT_SIGNAL(successful()), receiver, successMember ); + connect( pc, TQ_SIGNAL(successful()), receiver, successMember ); if (failMember) - connect( pc, TQT_SIGNAL(failed()), receiver, failMember ); + connect( pc, TQ_SIGNAL(failed()), receiver, failMember ); } } //END class GpsimProcessor @@ -452,7 +452,7 @@ GpsimDebugger::GpsimDebugger( Type type, GpsimProcessor * gpsim ) m_stackLevelLowerBreak = -1; m_addressSize = 0; - connect( m_pGpsim, TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(gpsimRunningStatusChanged(bool )) ); + connect( m_pGpsim, TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(gpsimRunningStatusChanged(bool )) ); if ( type == HLLDebugger ) { diff --git a/src/electronics/gpsimprocessor.h b/src/electronics/gpsimprocessor.h index 6337300..0e42246 100644 --- a/src/electronics/gpsimprocessor.h +++ b/src/electronics/gpsimprocessor.h @@ -73,7 +73,7 @@ class DebugLine : public SourceLine */ class RegisterInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: RegisterInfo( Register * reg ); @@ -143,7 +143,7 @@ class RegisterSet class GpsimDebugger : public TQObject { friend class GpsimProcessor; - Q_OBJECT + TQ_OBJECT public: @@ -248,7 +248,7 @@ class GpsimDebugger : public TQObject class GpsimProcessor : public TQObject { friend class GpsimDebugger; - Q_OBJECT + TQ_OBJECT public: diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp index fcb8dec..2e4db84 100644 --- a/src/electronics/subcircuits.cpp +++ b/src/electronics/subcircuits.cpp @@ -26,7 +26,7 @@ Subcircuits::Subcircuits() : TQObject() { - connect( ComponentSelector::self(), TQT_SIGNAL(itemRemoved(const TQString& )), this, TQT_SLOT(slotItemRemoved(const TQString& )) ); + connect( ComponentSelector::self(), TQ_SIGNAL(itemRemoved(const TQString& )), this, TQ_SLOT(slotItemRemoved(const TQString& )) ); } diff --git a/src/electronics/subcircuits.h b/src/electronics/subcircuits.h index acbaf90..df2e991 100644 --- a/src/electronics/subcircuits.h +++ b/src/electronics/subcircuits.h @@ -24,7 +24,7 @@ Interface for dealing with loading / saving / etc of subcircuits */ class Subcircuits : public TQObject { -Q_OBJECT +TQ_OBJECT public: ~Subcircuits(); diff --git a/src/electronics/switch.cpp b/src/electronics/switch.cpp index 581b5b1..eb5d672 100644 --- a/src/electronics/switch.cpp +++ b/src/electronics/switch.cpp @@ -33,7 +33,7 @@ Switch::Switch( Component * parent, Pin * p1, Pin * p2, State state ) m_pP2 = p2; m_pComponent = parent; m_pStopBouncingTimer = new TQTimer( this ); - connect( m_pStopBouncingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopBouncing()) ); + connect( m_pStopBouncingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stopBouncing()) ); // Force update m_state = (state == Open) ? Closed : Open; diff --git a/src/electronics/switch.h b/src/electronics/switch.h index 4f5b542..b2e94e2 100644 --- a/src/electronics/switch.h +++ b/src/electronics/switch.h @@ -25,7 +25,7 @@ class TQTimer; */ class Switch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/eventinfo.cpp b/src/eventinfo.cpp index 3a63c30..39bf877 100644 --- a/src/eventinfo.cpp +++ b/src/eventinfo.cpp @@ -30,7 +30,7 @@ EventInfo::EventInfo( ItemView *itemView, TQMouseEvent *e ) { pos = e->pos()/itemView->zoomLevel(); globalPos = e->globalPos(); - isRightClick = e->button() == Qt::RightButton; + isRightClick = e->button() == TQt::RightButton; ctrlPressed = e->state() & TQt::ControlButton; shiftPressed = e->state() & TQt::ShiftButton; altPressed = e->state() & TQt::AltButton; @@ -38,7 +38,7 @@ EventInfo::EventInfo( ItemView *itemView, TQMouseEvent *e ) qcanvasItemClickedOn = id->itemAtTop(pos); itemRtti = qcanvasItemClickedOn ? qcanvasItemClickedOn->rtti() : ItemDocument::RTTI::None; scrollDelta = 0; - scrollOrientation = Qt::Vertical; + scrollOrientation = TQt::Vertical; } @@ -69,7 +69,7 @@ void EventInfo::reset() qcanvasItemClickedOn = 0l; itemRtti = ItemDocument::RTTI::None; scrollDelta = 0; - scrollOrientation = Qt::Vertical; + scrollOrientation = TQt::Vertical; } @@ -77,8 +77,8 @@ TQMouseEvent *EventInfo::mousePressEvent( int dx, int dy ) const { return new TQMouseEvent( TQEvent::MouseButtonPress, pos + TQPoint( dx, dy ), - (isRightClick ? Qt::RightButton : Qt::LeftButton), - (isRightClick ? Qt::RightButton : Qt::LeftButton) | + (isRightClick ? TQt::RightButton : TQt::LeftButton), + (isRightClick ? TQt::RightButton : TQt::LeftButton) | (ctrlPressed ? TQt::ControlButton : 0 ) | (shiftPressed ? TQt::ShiftButton : 0 ) | (altPressed ? TQt::AltButton : 0 ) ); @@ -89,8 +89,8 @@ TQMouseEvent *EventInfo::mouseReleaseEvent( int dx, int dy ) const { return new TQMouseEvent( TQEvent::MouseButtonRelease, pos + TQPoint( dx, dy ), - (isRightClick ? Qt::RightButton : Qt::LeftButton), - (isRightClick ? Qt::RightButton : Qt::LeftButton) | + (isRightClick ? TQt::RightButton : TQt::LeftButton), + (isRightClick ? TQt::RightButton : TQt::LeftButton) | (ctrlPressed ? TQt::ControlButton : 0 ) | (shiftPressed ? TQt::ShiftButton : 0 ) | (altPressed ? TQt::AltButton : 0 ) ); @@ -101,8 +101,8 @@ TQMouseEvent *EventInfo::mouseDoubleClickEvent( int dx, int dy ) const { return new TQMouseEvent( TQEvent::MouseButtonDblClick, pos + TQPoint( dx, dy ), - (isRightClick ? Qt::RightButton : Qt::LeftButton), - (isRightClick ? Qt::RightButton : Qt::LeftButton) | + (isRightClick ? TQt::RightButton : TQt::LeftButton), + (isRightClick ? TQt::RightButton : TQt::LeftButton) | (ctrlPressed ? TQt::ControlButton : 0 ) | (shiftPressed ? TQt::ShiftButton : 0 ) | (altPressed ? TQt::AltButton : 0 ) ); @@ -113,7 +113,7 @@ TQMouseEvent *EventInfo::mouseMoveEvent( int dx, int dy ) const { return new TQMouseEvent( TQEvent::MouseMove, pos + TQPoint( dx, dy ), - Qt::NoButton, + TQt::NoButton, (ctrlPressed ? TQt::ControlButton : 0 ) | (shiftPressed ? TQt::ShiftButton : 0 ) | (altPressed ? TQt::AltButton : 0 ) ); diff --git a/src/eventinfo.h b/src/eventinfo.h index 35d31d9..c7d56f1 100644 --- a/src/eventinfo.h +++ b/src/eventinfo.h @@ -45,7 +45,7 @@ public: TQCanvasItem *qcanvasItemClickedOn; int itemRtti; short scrollDelta; - Qt::Orientation scrollOrientation; + TQt::Orientation scrollOrientation; bool isRightClick:1; bool ctrlPressed:1; bool shiftPressed:1; diff --git a/src/filemetainfo.h b/src/filemetainfo.h index 6fed08b..194397e 100644 --- a/src/filemetainfo.h +++ b/src/filemetainfo.h @@ -81,7 +81,7 @@ Looks after per-file metainfo; e.g. bookmarks, breakpoints, compiling options, e */ class FileMetaInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: ~FileMetaInfo(); diff --git a/src/flowcodedocument.cpp b/src/flowcodedocument.cpp index 7bdc695..5d01cba 100644 --- a/src/flowcodedocument.cpp +++ b/src/flowcodedocument.cpp @@ -93,7 +93,7 @@ void FlowCodeDocument::setPicType( const TQString &id ) } m_microSettings = new MicroSettings(m_microInfo); - connect( m_microSettings, TQT_SIGNAL(pinMappingsChanged()), this, TQT_SIGNAL(pinMappingsChanged()) ); + connect( m_microSettings, TQ_SIGNAL(pinMappingsChanged()), this, TQ_SIGNAL(pinMappingsChanged()) ); //TODO restore pic settings from temporary location if appropriate delete m_picItem; @@ -191,7 +191,7 @@ void FlowCodeDocument::convertToMicrobe() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Microbe ); LanguageManager::self()->compile(o); @@ -213,7 +213,7 @@ void FlowCodeDocument::convertToAssembly() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_AssemblyAbsolute ); LanguageManager::self()->compile(o); @@ -235,7 +235,7 @@ void FlowCodeDocument::convertToHex() } ProcessOptions o( dlg->info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.p_flowCodeDocument = this; o.setProcessPath( ProcessOptions::ProcessPath::FlowCode_Program ); LanguageManager::self()->compile(o); diff --git a/src/flowcodedocument.h b/src/flowcodedocument.h index 0f89623..b29850c 100644 --- a/src/flowcodedocument.h +++ b/src/flowcodedocument.h @@ -33,7 +33,7 @@ typedef TQMap<TQString, int > StringIntMap; */ class FlowCodeDocument : public ICNDocument { - Q_OBJECT + TQ_OBJECT public: FlowCodeDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0L); diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp index 3690117..0e330e2 100644 --- a/src/flowcodeview.cpp +++ b/src/flowcodeview.cpp @@ -34,16 +34,16 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer * m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput ); - connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) ); + connect( m, TQ_SIGNAL(activated(int)), flowCodeDocument, TQ_SLOT(slotConvertTo(int)) ); //END Convert To * Actions -// new TDEAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQT_SLOT(convertToMicrobe()), ac, "tools_to_microbe" ); -// new TDEAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQT_SLOT(convertToAssembly()), ac, "tools_to_assembly" ); -// new TDEAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQT_SLOT(convertToHex()), ac, "tools_to_hex" ); -// new TDEAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQT_SLOT(convertToPIC()), ac, "tools_to_pic" ); +// new TDEAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQ_SLOT(convertToMicrobe()), ac, "tools_to_microbe" ); +// new TDEAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQ_SLOT(convertToAssembly()), ac, "tools_to_assembly" ); +// new TDEAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQ_SLOT(convertToHex()), ac, "tools_to_hex" ); +// new TDEAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQ_SLOT(convertToPIC()), ac, "tools_to_pic" ); diff --git a/src/flowcodeview.h b/src/flowcodeview.h index 26dfff1..913d7dc 100644 --- a/src/flowcodeview.h +++ b/src/flowcodeview.h @@ -20,7 +20,7 @@ class FlowCodeDocument; */ class FlowCodeView : public ICNView { - Q_OBJECT + TQ_OBJECT public: FlowCodeView( FlowCodeDocument *flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l ); diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp index 194b1f0..f264286 100644 --- a/src/flowcontainer.cpp +++ b/src/flowcontainer.cpp @@ -153,7 +153,7 @@ void FlowContainer::childAdded( Item *child ) FlowPart::childAdded(child); - connect( this, TQT_SIGNAL(movedBy(double, double )), child, TQT_SLOT(moveBy(double, double )) ); + connect( this, TQ_SIGNAL(movedBy(double, double )), child, TQ_SLOT(moveBy(double, double )) ); child->setZ( ICNDocument::Z::Item + child->level() ); updateContainedVisibility(); @@ -167,7 +167,7 @@ void FlowContainer::childRemoved( Item *child ) if (!b_expanded) child->setVisible(true); - disconnect( this, TQT_SIGNAL(movedBy(double, double )), child, TQT_SLOT(moveBy(double, double )) ); + disconnect( this, TQ_SIGNAL(movedBy(double, double )), child, TQ_SLOT(moveBy(double, double )) ); } diff --git a/src/flowcontainer.h b/src/flowcontainer.h index 6369ecf..a26afad 100644 --- a/src/flowcontainer.h +++ b/src/flowcontainer.h @@ -20,7 +20,7 @@ class RectangularOverlay; */ class FlowContainer : public FlowPart { -Q_OBJECT +TQ_OBJECT public: FlowContainer( ICNDocument *_icnView, bool newItem, const TQString &id ); diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp index d19ce45..e0f5f71 100644 --- a/src/flowparts/flowpart.cpp +++ b/src/flowparts/flowpart.cpp @@ -74,8 +74,8 @@ FlowPart::FlowPart( ICNDocument *icnDocument, bool newItem, const TQString &id ) m_stdOutput = 0l; m_altOutput = 0l; - connect( m_pFlowCodeDocument, TQT_SIGNAL(picTypeChanged()), this, TQT_SLOT(slotUpdateFlowPartVariables()) ); - connect( m_pFlowCodeDocument, TQT_SIGNAL(pinMappingsChanged()), this, TQT_SLOT(slotUpdateFlowPartVariables()) ); + connect( m_pFlowCodeDocument, TQ_SIGNAL(picTypeChanged()), this, TQ_SLOT(slotUpdateFlowPartVariables()) ); + connect( m_pFlowCodeDocument, TQ_SIGNAL(pinMappingsChanged()), this, TQ_SLOT(slotUpdateFlowPartVariables()) ); } @@ -529,7 +529,7 @@ Variant * FlowPart::createProperty( const TQString & id, Variant::Type::Value ty { if ( MicroSettings * settings = m_pFlowCodeDocument->microSettings() ) v->setAllowed( settings->variableNames() ); - connect( property(id), TQT_SIGNAL(valueChanged(TQVariant, TQVariant )), this, TQT_SLOT(varNameChanged(TQVariant, TQVariant )) ); + connect( property(id), TQ_SIGNAL(valueChanged(TQVariant, TQVariant )), this, TQ_SLOT(varNameChanged(TQVariant, TQVariant )) ); } else slotUpdateFlowPartVariables(); diff --git a/src/flowparts/flowpart.h b/src/flowparts/flowpart.h index 3523b4e..2b3be1d 100644 --- a/src/flowparts/flowpart.h +++ b/src/flowparts/flowpart.h @@ -33,7 +33,7 @@ that you should reinherit for generating the assembly code. */ class FlowPart : public CNItem { -Q_OBJECT +TQ_OBJECT public: enum FlowSymbol diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp index 84c8217..cfaf9e2 100644 --- a/src/flowparts/pinmapping.cpp +++ b/src/flowparts/pinmapping.cpp @@ -60,19 +60,19 @@ PinMapEditor::PinMapEditor( PinMapping * pinMapping, MicroInfo * picInfo, TQWidg TQAccel * accel = new TQAccel( this ); accel->connectItem( accel->insertItem( Key_Delete ), m_pPinMapDocument, - TQT_SLOT(deleteSelection()) ); + TQ_SLOT(deleteSelection()) ); accel->connectItem( accel->insertItem( TDEStdAccel::selectAll().keyCodeQt() ), m_pPinMapDocument, - TQT_SLOT(selectAll()) ); + TQ_SLOT(selectAll()) ); accel->connectItem( accel->insertItem( TDEStdAccel::undo().keyCodeQt() ), m_pPinMapDocument, - TQT_SLOT(undo()) ); + TQ_SLOT(undo()) ); accel->connectItem( accel->insertItem( TDEStdAccel::redo().keyCodeQt() ), m_pPinMapDocument, - TQT_SLOT(redo()) ); + TQ_SLOT(redo()) ); TQFrame * f = new TQFrame(this); diff --git a/src/flowparts/pinmapping.h b/src/flowparts/pinmapping.h index c1f278c..3ba3f51 100644 --- a/src/flowparts/pinmapping.h +++ b/src/flowparts/pinmapping.h @@ -70,7 +70,7 @@ Dialog for editing a Pin Mapping */ class PinMapEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PinMapEditor( PinMapping * PinMapping, MicroInfo * Info, TQWidget * parent, const char * name ); @@ -93,7 +93,7 @@ For use with FlowParts that require a pin map (e.g. Keypad and Seven Segment). */ class PinMapDocument : public ICNDocument { - Q_OBJECT + TQ_OBJECT public: PinMapDocument(); @@ -121,7 +121,7 @@ class PinMapDocument : public ICNDocument */ class PinMapView : public ICNView { - Q_OBJECT + TQ_OBJECT public: PinMapView( PinMapDocument * pinMapDocument, ViewContainer * viewContainer, uint viewAreaId, const char * name = 0l ); diff --git a/src/fpnode.h b/src/fpnode.h index 43b670c..bbf3b9a 100644 --- a/src/fpnode.h +++ b/src/fpnode.h @@ -25,7 +25,7 @@ always valid (eg not more than two outputs from one node, which makes no sense) */ class FPNode : public Node { -Q_OBJECT +TQ_OBJECT public: FPNode( ICNDocument *_icnView, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L ); 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..1c97769 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -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..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/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..abc0b89 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; @@ -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/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..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/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..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/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 ); diff --git a/src/icndocument.cpp b/src/icndocument.cpp index 0df2e96..a623abb 100644 --- a/src/icndocument.cpp +++ b/src/icndocument.cpp @@ -963,7 +963,7 @@ bool ICNDocument::registerItem( TQCanvasItem *qcanvasItem ) { Node *node = (Node*)qcanvasItem; m_nodeList.append(node); - connect( node, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) ); + connect( node, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) ); emit nodeAdded(node); break; } @@ -971,7 +971,7 @@ bool ICNDocument::registerItem( TQCanvasItem *qcanvasItem ) { Connector *connector = dynamic_cast<Connector*>(qcanvasItem); m_connectorList.append(connector); - connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) ); + connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) ); emit connectorAdded(connector); break; } diff --git a/src/icndocument.h b/src/icndocument.h index 3ad3ac0..faa2ce2 100644 --- a/src/icndocument.h +++ b/src/icndocument.h @@ -33,7 +33,7 @@ typedef TQValueList<TQGuardedPtr<NodeGroup> > GuardedNodeGroupList; */ class ICNDocument : public ItemDocument { -Q_OBJECT +TQ_OBJECT public: ICNDocument( const TQString &caption, KTechlab *ktechlab, const char *name ); diff --git a/src/icnview.cpp b/src/icnview.cpp index 43e5a9d..2977daa 100644 --- a/src/icnview.cpp +++ b/src/icnview.cpp @@ -28,12 +28,12 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v //BEGIN Routing Actions // These actions get inserted into the main menu - m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" ); + m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, this, TQ_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" ); m_pAutoRoutingAction->setExclusiveGroup("routing_mode"); if ( !manualRouting ) m_pAutoRoutingAction->setChecked( true ); - m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" ); + m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, this, TQ_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" ); m_pManualRoutingAction->setExclusiveGroup("routing_mode"); if ( manualRouting ) m_pManualRoutingAction->setChecked( true ); @@ -52,10 +52,10 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v m->setCheckable(true); m->setItemChecked( manualRouting ? 1 : 0, true ); - connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetRoutingMode(int)) ); + connect( m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetRoutingMode(int)) ); //END Routing Actions - connect( icnDocument->m_cmManager, TQT_SIGNAL(manualRoutingChanged(bool )), this, TQT_SLOT(slotUpdateRoutingToggles(bool )) ); + connect( icnDocument->m_cmManager, TQ_SIGNAL(manualRoutingChanged(bool )), this, TQ_SLOT(slotUpdateRoutingToggles(bool )) ); } diff --git a/src/icnview.h b/src/icnview.h index 206d10b..1c4bfe4 100644 --- a/src/icnview.h +++ b/src/icnview.h @@ -22,7 +22,7 @@ class TDEToolBarPopupAction; */ class ICNView : public ItemView { - Q_OBJECT + TQ_OBJECT public: ICNView( ICNDocument * icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char * name = 0l ); diff --git a/src/item.cpp b/src/item.cpp index 2e6ca76..320b99a 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -319,7 +319,7 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo ) textEdit->setText( v->value().toString() ); layout->addWidget( textEdit, 10 ); textEdit->setFocus(); - connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) ); + connect( dlg, TQ_SIGNAL( user1Clicked() ), textEdit, TQ_SLOT( clear() ) ); dlg->setMinimumWidth( 600 ); if ( dlg->exec() == KDialogBase::Accepted ) { @@ -353,7 +353,7 @@ void Item::setParentItem( Item *newParentItem ) if (oldParentItem) { - disconnect( oldParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) ); + disconnect( oldParentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeItem()) ); oldParentItem->removeChild(this); } @@ -363,7 +363,7 @@ void Item::setParentItem( Item *newParentItem ) // kdError() << k_funcinfo << "Already a child of " << newParentItem << endl; else { - connect( newParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) ); + connect( newParentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeItem()) ); newParentItem->addChild(this); } } @@ -418,7 +418,7 @@ void Item::addChild( Item *child ) } m_children.append(child); - connect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) ); + connect( child, TQ_SIGNAL(removed(Item* )), this, TQ_SLOT(removeChild(Item* )) ); child->setParentItem(this); childAdded(child); @@ -432,7 +432,7 @@ void Item::removeChild( Item *child ) return; m_children.remove(child); - disconnect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) ); + disconnect( child, TQ_SIGNAL(removed(Item* )), this, TQ_SLOT(removeChild(Item* )) ); childRemoved(child); p_itemDocument->slotUpdateZOrdering(); @@ -563,7 +563,7 @@ Variant * Item::createProperty( const TQString & id, Variant::Type::Value type ) { m_variantData[id] = new Variant(type); if (m_bDoneCreation) - connect( m_variantData[id], TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) ); + connect( m_variantData[id], TQ_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQ_SLOT(dataChanged()) ); } return m_variantData[id]; @@ -591,7 +591,7 @@ void Item::finishedCreation( ) m_bDoneCreation = true; const VariantDataMap::iterator end = m_variantData.end(); for ( VariantDataMap::iterator it = m_variantData.begin(); it != end; ++it ) - connect( it.data(), TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) ); + connect( it.data(), TQ_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQ_SLOT(dataChanged()) ); dataChanged(); } //END Data stuff @@ -40,7 +40,7 @@ typedef TQValueList<GuardedItem> ItemList; */ class Item : public TQObject, public TQCanvasPolygon { -Q_OBJECT +TQ_OBJECT public: Item( ItemDocument *itemDocument, bool newItem, const TQString &id ); diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp index 7ed27dd..a1da229 100644 --- a/src/itemdocument.cpp +++ b/src/itemdocument.cpp @@ -74,15 +74,15 @@ ItemDocument::ItemDocument( const TQString &caption, KTechlab *ktechlab, const c m_canvas->setDoubleBuffering(true); m_pEventTimer = new TQTimer(this); - connect( m_pEventTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processItemDocumentEvents()) ); + connect( m_pEventTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processItemDocumentEvents()) ); - connect( this, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotInitItemActions(Item*)) ); - connect( this, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotInitItemActions(Item*)) ); + connect( this, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotInitItemActions(Item*)) ); + connect( this, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotInitItemActions(Item*)) ); - connect( ComponentSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) ); - connect( FlowPartSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) ); + connect( ComponentSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) ); + connect( FlowPartSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) ); #ifdef MECHANICS - connect( MechanicsSelector::self(), TQT_SIGNAL(itemClicked(const TQString& )), this, TQT_SLOT(slotUnsetRepeatedItemId()) ); + connect( MechanicsSelector::self(), TQ_SIGNAL(itemClicked(const TQString& )), this, TQ_SLOT(slotUnsetRepeatedItemId()) ); #endif m_pAlignmentAction = new TDEActionMenu( i18n("Alignment"), "format-justify-right", this ); @@ -130,9 +130,9 @@ bool ItemDocument::registerItem( TQCanvasItem *qcanvasItem ) { Item *item = dynamic_cast<Item*>(qcanvasItem); m_itemList.append(item); - connect( item, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(requestRerouteInvalidatedConnectors()) ); - connect( item, TQT_SIGNAL(selected(Item*,bool)), this, TQT_SIGNAL(itemSelected(Item*)) ); - connect( item, TQT_SIGNAL(unselected(Item*,bool)), this, TQT_SIGNAL(itemUnselected(Item*)) ); + connect( item, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(requestRerouteInvalidatedConnectors()) ); + connect( item, TQ_SIGNAL(selected(Item*,bool)), this, TQ_SIGNAL(itemSelected(Item*)) ); + connect( item, TQ_SIGNAL(unselected(Item*,bool)), this, TQ_SIGNAL(itemUnselected(Item*)) ); itemAdded(item); return true; } @@ -881,12 +881,12 @@ void ItemDocument::exportToImage() saveArea = m_canvas->rect(); if ( type == "PNG" || type == "BMP" ) - outputImage = TQT_TQPAINTDEVICE(new TQPixmap( saveArea.size() )); + outputImage = new TQPixmap( saveArea.size() ); else if ( type == "SVG" ) { setSVGExport(true); - outputImage = TQT_TQPAINTDEVICE(new TQPicture()); + outputImage = new TQPicture(); // svg can't be cropped using the qimage method. saveArea = cropArea; } @@ -1219,7 +1219,7 @@ Canvas::Canvas( ItemDocument *itemDocument, const char * name ) { p_itemDocument = itemDocument; m_pMessageTimeout = new TQTimer(this); - connect( m_pMessageTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetAllChanged()) ); + connect( m_pMessageTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetAllChanged()) ); } diff --git a/src/itemdocument.h b/src/itemdocument.h index 1194ee3..1ee6a71 100644 --- a/src/itemdocument.h +++ b/src/itemdocument.h @@ -41,7 +41,7 @@ typedef TQValueList<TQPoint> TQPointList; */ class ItemDocument : public Document { - Q_OBJECT + TQ_OBJECT public: ItemDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0 ); @@ -396,7 +396,7 @@ class ItemDocument : public Document */ class Canvas : public TQCanvas { - Q_OBJECT + TQ_OBJECT public: Canvas( ItemDocument *itemDocument, const char * name = 0 ); diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp index 669d1c8..bc9c052 100644 --- a/src/itemdocumentdata.cpp +++ b/src/itemdocumentdata.cpp @@ -1310,7 +1310,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit ) component->updateConnectorPoints(false); component->setVisible(false); component->setCanvas(0l); - ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), component, TQT_SLOT(removeItem()) ); + ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), component, TQ_SLOT(removeItem()) ); } } for ( ConnectorDataMap::iterator it = m_connectorDataMap.begin(); it != connectorEnd; ++it ) @@ -1321,7 +1321,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit ) connector->updateConnectorPoints(false); connector->setVisible(false); connector->setCanvas(0l); - ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), connector, TQT_SLOT(removeConnector()) ); + ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), connector, TQ_SLOT(removeConnector()) ); } } const NodeDataMap::iterator nodeEnd = m_nodeDataMap.end(); @@ -1332,7 +1332,7 @@ void SubcircuitData::initECSubcircuit( ECSubcircuit * ecSubcircuit ) { node->setVisible(false); node->setCanvas(0l); - ecSubcircuit->connect( ecSubcircuit, TQT_SIGNAL(subcircuitDeleted()), node, TQT_SLOT(removeNode()) ); + ecSubcircuit->connect( ecSubcircuit, TQ_SIGNAL(subcircuitDeleted()), node, TQ_SLOT(removeNode()) ); } } diff --git a/src/itemgroup.cpp b/src/itemgroup.cpp index 1268550..9ff4a23 100644 --- a/src/itemgroup.cpp +++ b/src/itemgroup.cpp @@ -25,7 +25,7 @@ ItemGroup::ItemGroup( ItemDocument *view, const char *name ) p_view = view; p_icnDocument = dynamic_cast<ICNDocument*>(p_view); p_mechanicsDocument = dynamic_cast<MechanicsDocument*>(p_view); - TQTimer::singleShot( 0, this, TQT_SLOT(getViewPtrs()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(getViewPtrs()) ); } diff --git a/src/itemgroup.h b/src/itemgroup.h index fe30b28..c2846c3 100644 --- a/src/itemgroup.h +++ b/src/itemgroup.h @@ -33,7 +33,7 @@ some functionality such as for dealing with item data */ class ItemGroup : public TQObject { -Q_OBJECT +TQ_OBJECT public: ItemGroup( ItemDocument *view, const char *name = 0 ); diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp index 3e94b1a..3fcac4b 100644 --- a/src/iteminterface.cpp +++ b/src/iteminterface.cpp @@ -74,8 +74,8 @@ void ItemInterface::slotItemDocumentChanged( ItemDocument * doc ) slotClearAll(); if ( ItemDocument * itemDocument = dynamic_cast<ItemDocument*>((Document*)p_cvb) ) { - disconnect( itemDocument, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) ); - disconnect( itemDocument, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) ); + disconnect( itemDocument, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) ); + disconnect( itemDocument, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) ); } p_itemGroup = 0l; @@ -86,8 +86,8 @@ void ItemInterface::slotItemDocumentChanged( ItemDocument * doc ) if (!p_cvb) return; - connect( p_cvb, TQT_SIGNAL(itemSelected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) ); - connect( p_cvb, TQT_SIGNAL(itemUnselected(Item*)), this, TQT_SLOT(slotUpdateItemInterface()) ); + connect( p_cvb, TQ_SIGNAL(itemSelected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) ); + connect( p_cvb, TQ_SIGNAL(itemUnselected(Item*)), this, TQ_SLOT(slotUpdateItemInterface()) ); p_itemGroup = p_cvb->selectList(); @@ -285,8 +285,8 @@ TQWidget * ItemInterface::configWidget() box->setEditable( true ); m_stringComboBoxMap[vait.key()] = box; - connectMapWidget( box, TQT_SIGNAL(textChanged(const TQString &))); - connectMapWidget( box, TQT_SIGNAL(activated(const TQString &))); + connectMapWidget( box, TQ_SIGNAL(textChanged(const TQString &))); + connectMapWidget( box, TQ_SIGNAL(activated(const TQString &))); editWidget = box; break; @@ -301,7 +301,7 @@ TQWidget * ItemInterface::configWidget() KURLComboRequester * urlreq = new KURLComboRequester( configWidget ); urlreq->setFilter( vait.data()->filter() ); - connectMapWidget( urlreq, TQT_SIGNAL(urlSelected(const TQString &)) ); + connectMapWidget( urlreq, TQ_SIGNAL(urlSelected(const TQString &)) ); m_stringURLReqMap[vait.key()] = urlreq; KComboBox * box = urlreq->comboBox(); @@ -312,8 +312,8 @@ TQWidget * ItemInterface::configWidget() urlreq->setURL( vait.data()->value().toString() ); // Generally we only want a file name once the user has finished typing out the full file name. - connectMapWidget( box, TQT_SIGNAL(returnPressed(const TQString &))); - connectMapWidget( box, TQT_SIGNAL(activated(const TQString &))); + connectMapWidget( box, TQ_SIGNAL(returnPressed(const TQString &))); + connectMapWidget( box, TQ_SIGNAL(activated(const TQString &))); editWidget = urlreq; break; @@ -323,7 +323,7 @@ TQWidget * ItemInterface::configWidget() KLineEdit * edit = new KLineEdit( configWidget ); edit->setText( vait.data()->value().toString() ); - connectMapWidget(edit,TQT_SIGNAL(textChanged(const TQString &))); + connectMapWidget(edit,TQ_SIGNAL(textChanged(const TQString &))); m_stringLineEditMap[vait.key()] = edit; editWidget = edit; break; @@ -332,7 +332,7 @@ TQWidget * ItemInterface::configWidget() { KIntSpinBox *spin = new KIntSpinBox( (int)vait.data()->minValue(), (int)vait.data()->maxValue(), 1, vait.data()->value().toInt(), 10, configWidget ); - connectMapWidget( spin, TQT_SIGNAL(valueChanged(int)) ); + connectMapWidget( spin, TQ_SIGNAL(valueChanged(int)) ); m_intSpinBoxMap[vait.key()] = spin; editWidget = spin; break; @@ -341,7 +341,7 @@ TQWidget * ItemInterface::configWidget() { DoubleSpinBox *spin = new DoubleSpinBox( vait.data()->minValue(), vait.data()->maxValue(), vait.data()->minAbsValue(), vait.data()->value().toDouble(), vait.data()->unit(), configWidget ); - connectMapWidget( spin, TQT_SIGNAL(valueChanged(double))); + connectMapWidget( spin, TQ_SIGNAL(valueChanged(double))); m_doubleSpinBoxMap[vait.key()] = spin; editWidget = spin; break; @@ -353,7 +353,7 @@ TQWidget * ItemInterface::configWidget() ColorCombo * colorBox = new ColorCombo( (ColorCombo::ColorScheme)vait.data()->colorScheme(), configWidget ); colorBox->setColor( value ); - connectMapWidget( colorBox, TQT_SIGNAL(activated(const TQColor &))); + connectMapWidget( colorBox, TQ_SIGNAL(activated(const TQColor &))); m_colorComboMap[vait.key()] = colorBox; editWidget = colorBox; @@ -365,7 +365,7 @@ TQWidget * ItemInterface::configWidget() TQCheckBox * box = new TQCheckBox( vait.data()->toolbarCaption(), configWidget ); box->setChecked(value); - connectMapWidget( box, TQT_SIGNAL(toggled(bool))); + connectMapWidget( box, TQ_SIGNAL(toggled(bool))); m_boolCheckMap[vait.key()] = box; editWidget = box; break; @@ -430,7 +430,7 @@ TQWidget * ItemInterface::configWidget() void ItemInterface::connectMapWidget( TQWidget *widget, const char *_signal ) { - connect( widget, _signal, this, TQT_SLOT(tbDataChanged()) ); + connect( widget, _signal, this, TQ_SLOT(tbDataChanged()) ); } diff --git a/src/iteminterface.h b/src/iteminterface.h index 6592597..fedb27d 100644 --- a/src/iteminterface.h +++ b/src/iteminterface.h @@ -49,7 +49,7 @@ Items's, and the various objects that like to know about them */ class ItemInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: ~ItemInterface(); diff --git a/src/itemlibrary.cpp b/src/itemlibrary.cpp index bbf144e..6b215cf 100644 --- a/src/itemlibrary.cpp +++ b/src/itemlibrary.cpp @@ -456,7 +456,7 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) // Now, rotate the image so that it's the right way up, and scale it to size TQImage im = pm.convertToImage(); im = im.xForm(transMatrix); - im = im.smoothScale( 50, 50, TQ_ScaleMin ); + im = im.smoothScale( 50, 50, TQImage::ScaleMin ); if (cache) m_imageMap[item->type()] = im; diff --git a/src/itemview.cpp b/src/itemview.cpp index 5361131..5b84954 100644 --- a/src/itemview.cpp +++ b/src/itemview.cpp @@ -37,24 +37,24 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u { TDEActionCollection * ac = actionCollection(); - KStdAction::selectAll( itemDocument, TQT_SLOT(selectAll()), ac ); - KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), ac ); - KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), ac ); - KStdAction::actualSize( TQT_TQOBJECT(this), TQT_SLOT(actualSize()), ac )->setEnabled(false); + KStdAction::selectAll( itemDocument, TQ_SLOT(selectAll()), ac ); + KStdAction::zoomIn( this, TQ_SLOT(zoomIn()), ac ); + KStdAction::zoomOut( this, TQ_SLOT(zoomOut()), ac ); + KStdAction::actualSize( this, TQ_SLOT(actualSize()), ac )->setEnabled(false); TDEAccel *pAccel = new TDEAccel(this); - pAccel->insert( "Cancel", i18n("Cancel"), i18n("Cancel the current operation"), TQt::Key_Escape, itemDocument, TQT_SLOT(cancelCurrentOperation()) ); + pAccel->insert( "Cancel", i18n("Cancel"), i18n("Cancel the current operation"), TQt::Key_Escape, itemDocument, TQ_SLOT(cancelCurrentOperation()) ); pAccel->readSettings(); - new TDEAction( i18n("Delete"), "edit-delete", TQt::Key_Delete, itemDocument, TQT_SLOT(deleteSelection()), ac, "edit_delete" ); - new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQT_SLOT(exportToImage()), ac, "file_export_image"); + new TDEAction( i18n("Delete"), "edit-delete", TQt::Key_Delete, itemDocument, TQ_SLOT(deleteSelection()), ac, "edit_delete" ); + new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQ_SLOT(exportToImage()), ac, "file_export_image"); //BEGIN Item Alignment actions - new TDEAction( i18n("Align Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" ); - new TDEAction( i18n("Align Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" ); - new TDEAction( i18n("Distribute Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" ); - new TDEAction( i18n("Distribute Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" ); + new TDEAction( i18n("Align Horizontally"), 0, 0, itemDocument, TQ_SLOT(alignHorizontally()), ac, "align_horizontally" ); + new TDEAction( i18n("Align Vertically"), 0, 0, itemDocument, TQ_SLOT(alignVertically()), ac, "align_vertically" ); + new TDEAction( i18n("Distribute Horizontally"), 0, 0, itemDocument, TQ_SLOT(distributeHorizontally()), ac, "distribute_horizontally" ); + new TDEAction( i18n("Distribute Vertically"), 0, 0, itemDocument, TQ_SLOT(distributeVertically()), ac, "distribute_vertically" ); //END Item Alignment actions @@ -70,13 +70,13 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_arrow", TDEIcon::Small ), i18n("Arrow"), DrawPart::da_arrow ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_ellipse", TDEIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_rectangle", TDEIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle ); - connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) ); + connect( m, TQ_SIGNAL(activated(int)), itemDocument, TQ_SLOT(slotSetDrawAction(int)) ); //END Draw actions //BEGIN Item Control actions - new TDEAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQT_SLOT(raiseZ()), ac, "edit_raise" ); - new TDEAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQT_SLOT(lowerZ()), ac, "edit_lower" ); + new TDEAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQ_SLOT(raiseZ()), ac, "edit_raise" ); + new TDEAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQ_SLOT(lowerZ()), ac, "edit_lower" ); //END Item Control actions @@ -86,8 +86,8 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u setXMLFile( "ktechlabitemviewui.rc" ); m_pUpdateStatusTmr = new TQTimer(this); - connect( m_pUpdateStatusTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()) ); - connect( this, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(stopUpdatingStatus()) ); + connect( m_pUpdateStatusTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus()) ); + connect( this, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(stopUpdatingStatus()) ); p_itemDocument = itemDocument; m_zoomLevel = 1.; diff --git a/src/itemview.h b/src/itemview.h index 55dc420..cd70f66 100644 --- a/src/itemview.h +++ b/src/itemview.h @@ -25,7 +25,7 @@ class TQTimer; */ class ItemView : public View { - Q_OBJECT + TQ_OBJECT public: ItemView( ItemDocument *itemDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 ); @@ -86,7 +86,7 @@ class ItemView : public View */ class CVBEditor : public TQCanvasView { -Q_OBJECT +TQ_OBJECT public: CVBEditor( TQCanvas *canvas, ItemView *itemView, const char *name ); diff --git a/src/katemdi.cpp b/src/katemdi.cpp index 6fa7781..9dd3451 100644 --- a/src/katemdi.cpp +++ b/src/katemdi.cpp @@ -35,7 +35,7 @@ namespace KateMDI { //BEGIN SPLITTER -Splitter::Splitter(Qt::Orientation o, TQWidget* parent, const char* name) +Splitter::Splitter(TQt::Orientation o, TQWidget* parent, const char* name) : TQSplitter(o, parent, name) { } @@ -64,8 +64,8 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor : TDEToggleAction(text,cut,parent,name) , m_tv(tv) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool))); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_tv,TQ_SIGNAL(visibleChanged(bool)),this,TQ_SLOT(visibleChanged(bool))); setChecked(m_tv->visible()); } @@ -105,8 +105,8 @@ GUIClient::GUIClient ( MainWindow *mw ) , KXMLGUIClient ( mw ) , m_mw (mw) { - connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mw->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); if (actionCollection()->tdeaccel()==0) actionCollection()->setWidget(m_mw); @@ -181,8 +181,8 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) - setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqt_cast(TQWIDGET_OBJECT_NAME_STRING))); + if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget")) + setFocusProxy ((TQWidget *)(ev->child()->tqt_cast("TQWidget"))); TQVBox::childEvent (ev); } @@ -222,7 +222,7 @@ void Sidebar::setSidebarStyle( KMultiTabBarStyle style ) void Sidebar::setSplitter (Splitter *sp) { m_splitter = sp; - m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter); + m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? TQt::Horizontal : TQt::Vertical, m_splitter); m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_ownSplit->setChildrenCollapsible( false ); m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize ); @@ -268,7 +268,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi show (); - connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); return widget; @@ -416,8 +416,8 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) if (sidebarPosition() != 3) p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3); - connect(p, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(p, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); p->exec(e->globalPos()); delete p; @@ -524,7 +524,7 @@ void Sidebar::restoreSession (TDEConfig *config) // readd the button int newId = m_widgetToId[tv]; appendTab (tv->icon, newId, tv->text); - connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); // reshuffle in splitter @@ -599,7 +599,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb); - m_hSplitter = new Splitter (Qt::Horizontal, hb); + m_hSplitter = new Splitter (TQt::Horizontal, hb); m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter); @@ -609,7 +609,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name) m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb); - m_vSplitter = new Splitter (Qt::Vertical, vb); + m_vSplitter = new Splitter (TQt::Vertical, vb); m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter); diff --git a/src/katemdi.h b/src/katemdi.h index 42df649..c9cf0d6 100644 --- a/src/katemdi.h +++ b/src/katemdi.h @@ -35,11 +35,11 @@ namespace KateMDI { /** This class is needed because TQSplitter cant return an index for a widget. */ class Splitter : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: - Splitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0); + Splitter(TQt::Orientation o, TQWidget* parent=0, const char* name=0); ~Splitter(); /** Since there is supposed to be only 2 childs of a katesplitter, @@ -55,7 +55,7 @@ class Splitter : public TQSplitter class ToggleToolViewAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: @@ -74,7 +74,7 @@ class ToggleToolViewAction : public TDEToggleAction class GUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ class GUIClient : public TQObject, public KXMLGUIClient class ToolView : public TQVBox { - Q_OBJECT + TQ_OBJECT friend class Sidebar; @@ -168,7 +168,7 @@ class ToolView : public TQVBox class Sidebar : public KMultiTabBar { - Q_OBJECT + TQ_OBJECT public: @@ -244,7 +244,7 @@ class Sidebar : public KMultiTabBar class MainWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT friend class ToolView; diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index ff35a0e..faeb7d4 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -72,7 +72,7 @@ KTechlab::KTechlab() m_pToolBarOverlayLabel = 0l; m_pUpdateCaptionsTimer = new TQTimer( this ); - connect( m_pUpdateCaptionsTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateCaptions()) ); + connect( m_pUpdateCaptionsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateCaptions()) ); setMinimumSize( 400, 400 ); @@ -233,7 +233,7 @@ void KTechlab::addWindow( ViewContainer * vc ) if ( vc && !m_viewContainerList.contains(vc) ) { m_viewContainerList << vc; - connect( vc, TQT_SIGNAL(destroyed(TQObject* )), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerDestroyed(TQObject* )) ); + connect( vc, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(slotViewContainerDestroyed(TQObject* )) ); } m_viewContainerList.remove((ViewContainer*)0); @@ -283,13 +283,13 @@ void KTechlab::overlayToolBarScreenshot() // TQWidget * toolsWidget = toolBar( "toolsToolBar" ); // TQWidget * debugWidget = toolBar( "debugTB" ); - TDEToolBar * toolsWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "toolsToolBar", "TDEToolBar" ))); - TDEToolBar * debugWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "debugTB", "TDEToolBar" ))); + TDEToolBar * toolsWidget = static_cast<TDEToolBar*>(child( "toolsToolBar", "TDEToolBar" )); + TDEToolBar * debugWidget = static_cast<TDEToolBar*>(child( "debugTB", "TDEToolBar" )); if ( !toolsWidget && !debugWidget ) return; - TQWidget * parent = TQT_TQWIDGET(toolsWidget ? toolsWidget->parent() : debugWidget->parent()); + TQWidget * parent = static_cast<TQWidget*>(toolsWidget ? toolsWidget->parent() : debugWidget->parent()); TQRect grabRect; @@ -310,7 +310,7 @@ void KTechlab::overlayToolBarScreenshot() m_pToolBarOverlayLabel->setPixmap( shot ); m_pToolBarOverlayLabel->show(); - TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT( hideToolBarOverlay() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( hideToolBarOverlay() ) ); } @@ -363,11 +363,11 @@ void KTechlab::removeGUIClients() void KTechlab::setupTabWidget() { m_pViewContainerTabWidget = new KTabWidget(centralWidget()); - connect( tabWidget(), TQT_SIGNAL(currentChanged(TQWidget* )), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerActivated(TQWidget* )) ); - connect( tabWidget(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), TQT_TQOBJECT(this), TQT_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) ); - connect( tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabDragInitiate(TQWidget* )) ); - connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQDropEvent* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) ); - connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) ); + connect( tabWidget(), TQ_SIGNAL(currentChanged(TQWidget* )), this, TQ_SLOT(slotViewContainerActivated(TQWidget* )) ); + connect( tabWidget(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQ_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) ); + connect( tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget* )), this, TQ_SLOT(slotTabDragInitiate(TQWidget* )) ); + connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) ); + connect( tabWidget(), TQ_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQ_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) ); TDEConfig *config = kapp->config(); config->setGroup("UI"); @@ -387,12 +387,12 @@ void KTechlab::setupTabWidget() but->setIconSet(SmallIcon("tab_remove")); but->adjustSize(); but->hide(); - connect( but, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerClose()) ); + connect( but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotViewContainerClose()) ); tabWidget()->setCornerWidget(but, TopRight); } // tabWidget()->setTabReorderingEnabled(true); -// connect(tabWidget(), TQT_SIGNAL(movedTab(int, int)), TQT_TQOBJECT(this), TQT_SLOT(tabMoved(int, int))); - connect(tabWidget(), TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotTabContext(TQWidget*,const TQPoint &))); +// connect(tabWidget(), TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(tabMoved(int, int))); + connect(tabWidget(), TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQ_SLOT(slotTabContext(TQWidget*,const TQPoint &))); //END Tab bar stuff } @@ -415,67 +415,67 @@ void KTechlab::setupActions() { TDEActionCollection *ac = actionCollection(); - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), ac ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), ac ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotViewClose()), ac ); - KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), ac ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), ac ); - KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), ac ); - KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), ac ); - KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), ac ); - KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), ac ); - KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), ac ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotOptionsConfigureKeys()), ac ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotOptionsConfigureToolbars()), ac ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotOptionsPreferences()), ac ); + KStdAction::openNew( this, TQ_SLOT(slotFileNew()), ac ); + KStdAction::open( this, TQ_SLOT(slotFileOpen()), ac ); + KStdAction::save( this, TQ_SLOT(slotFileSave()), ac ); + KStdAction::saveAs( this, TQ_SLOT(slotFileSaveAs()), ac ); + KStdAction::close( this, TQ_SLOT(slotViewClose()), ac ); + KStdAction::print( this, TQ_SLOT(slotFilePrint()), ac ); + KStdAction::quit( this, TQ_SLOT(slotFileQuit()), ac ); + KStdAction::undo( this, TQ_SLOT(slotEditUndo()), ac ); + KStdAction::redo( this, TQ_SLOT(slotEditRedo()), ac ); + KStdAction::cut( this, TQ_SLOT(slotEditCut()), ac ); + KStdAction::copy( this, TQ_SLOT(slotEditCopy()), ac ); + KStdAction::paste( this, TQ_SLOT(slotEditPaste()), ac ); + KStdAction::keyBindings( this, TQ_SLOT(slotOptionsConfigureKeys()), ac ); + KStdAction::configureToolbars( this, TQ_SLOT(slotOptionsConfigureToolbars()), ac ); + KStdAction::preferences( this, TQ_SLOT(slotOptionsPreferences()), ac ); //BEGIN New file popup - TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac, "newfile_popup" ); + TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT(slotFileNew()), ac, "newfile_popup" ); p->popupMenu()->insertTitle( i18n("New File") ); - (new TDEAction( i18n("Assembly"), "text-x-src", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("C source"), "text-x-csrc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() ); - (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQ_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQ_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQ_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQ_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() ); #ifdef MECHANICS - (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() ); + (new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQ_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() ); #endif - (new TDEAction( "Microbe", "ktechlab_microbe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() ); + (new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQ_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() ); //END New File popup -// m_recentFiles = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT(load(const KURL&)), ac ); - m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), TQT_TQOBJECT(this), TQT_SLOT(load(const KURL &)), ac, "file_open_recent" ); - m_statusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT(slotOptionsShowStatusbar()), ac ); +// m_recentFiles = KStdAction::openRecent( this, TQ_SLOT(load(const KURL&)), ac ); + m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQ_SLOT(load(const KURL &)), ac, "file_open_recent" ); + m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT(slotOptionsShowStatusbar()), ac ); //BEGIN Project Actions ProjectManager *pm = ProjectManager::self(this); - new TDEAction( i18n("New Project.."), "window-new", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()), ac, "project_new" ); - new TDEAction( i18n("Open Project..."), "project_open", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotOpenProject()), ac, "project_open" ); -// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); - m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), TQT_TQOBJECT(ProjectManager::self()), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); - new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotExportToMakefile()), ac, "project_export_makefile" ); - new TDEAction( i18n("Create Subproject..."), 0, 0, TQT_TQOBJECT(pm), TQT_SLOT(slotCreateSubproject()), ac, "project_create_subproject" ); - new TDEAction( i18n("Add Existing File..."), "document-open", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddFile()), ac, "project_add_existing_file" ); - new TDEAction( i18n("Add Current File..."), "fileimport", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" ); -// new TDEAction( i18n("Project Options"), "configure", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotProjectOptions()), ac, "project_options" ); - new TDEAction( i18n("Close Project"), "window-close", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotCloseProject()), ac, "project_close" ); - new TDEAction( i18n("Remove from Project"), "edit-delete", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotRemoveSelected()), ac, "project_remove_selected" ); - new TDEAction( i18n("Insert Existing File..."), "document-open", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" ); - new TDEAction( i18n("Insert Current File..."), "fileimport", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" ); - new TDEAction( i18n("Linker Options..."), "configure", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" ); - new TDEAction( i18n("Build..."), "launch", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemBuild()), ac, "project_item_build" ); - new TDEAction( i18n("Upload..."), "convert_to_pic", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemUpload()), ac, "project_item_upload" ); - new TDEAction( i18n("Processing Options..."), "configure", 0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" ); + new TDEAction( i18n("New Project.."), "window-new", 0, pm, TQ_SLOT(slotNewProject()), ac, "project_new" ); + new TDEAction( i18n("Open Project..."), "project_open", 0, pm, TQ_SLOT(slotOpenProject()), ac, "project_open" ); +// m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); + m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" ); + new TDEAction( i18n("Export to Makefile..."), "fileexport", 0, pm, TQ_SLOT(slotExportToMakefile()), ac, "project_export_makefile" ); + new TDEAction( i18n("Create Subproject..."), 0, 0, pm, TQ_SLOT(slotCreateSubproject()), ac, "project_create_subproject" ); + new TDEAction( i18n("Add Existing File..."), "document-open", 0, pm, TQ_SLOT(slotAddFile()), ac, "project_add_existing_file" ); + new TDEAction( i18n("Add Current File..."), "fileimport", 0, pm, TQ_SLOT(slotAddCurrentFile()), ac, "project_add_current_file" ); +// new TDEAction( i18n("Project Options"), "configure", 0, pm, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); + new TDEAction( i18n("Close Project"), "window-close", 0, pm, TQ_SLOT(slotCloseProject()), ac, "project_close" ); + new TDEAction( i18n("Remove from Project"), "edit-delete", 0, pm, TQ_SLOT(slotRemoveSelected()), ac, "project_remove_selected" ); + new TDEAction( i18n("Insert Existing File..."), "document-open", 0, pm, TQ_SLOT(slotSubprojectAddExistingFile()), ac, "subproject_add_existing_file" ); + new TDEAction( i18n("Insert Current File..."), "fileimport", 0, pm, TQ_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" ); + new TDEAction( i18n("Linker Options..."), "configure", 0, pm, TQ_SLOT(slotSubprojectLinkerOptions()), ac, "project_item_linker_options" ); + new TDEAction( i18n("Build..."), "launch", 0, pm, TQ_SLOT(slotItemBuild()), ac, "project_item_build" ); + new TDEAction( i18n("Upload..."), "convert_to_pic", 0, pm, TQ_SLOT(slotItemUpload()), ac, "project_item_upload" ); + new TDEAction( i18n("Processing Options..."), "configure", 0, pm, TQ_SLOT(slotItemProcessingOptions()), ac, "project_item_processing_options" ); //END Project Actions - new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" ); - new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" ); + new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQ_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" ); + new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQ_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" ); TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "media-playback-start", TQt::Key_F10, 0, 0, ac, "simulation_run" ); ta->setChecked(true); - connect( ta, TQT_SIGNAL(toggled(bool )), Simulator::self(), TQT_SLOT(slotSetSimulating(bool )) ); + connect( ta, TQ_SIGNAL(toggled(bool )), Simulator::self(), TQ_SLOT(slotSetSimulating(bool )) ); #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0) ta->setCheckedState( KGuiItem( i18n("Pause Simulation"), "media-playback-pause", 0 ) ); @@ -504,7 +504,7 @@ void KTechlab::slotViewContainerActivated( TQWidget * viewContainer ) void KTechlab::slotViewContainerDestroyed( TQObject * object ) { - m_viewContainerList.remove( static_cast<ViewContainer*>(TQT_TQWIDGET(object)) ); + m_viewContainerList.remove( static_cast<ViewContainer*>(object) ); m_viewContainerList.remove( (ViewContainer*)0 ); slotUpdateTabWidget(); } @@ -563,7 +563,7 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e ) dropMenu.insertSeparator(); dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ), i18n("C&ancel"), 2 ); - connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) ); + connect( &dropMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDragContextActivated(int)) ); // dropMenu.exec(e->pos() + widget->pos() ); dropMenu.exec( TQCursor::pos() ); } @@ -668,7 +668,7 @@ void KTechlab::readProperties( TDEConfig *conf ) if ( KTLConfig::restoreDocumentsOnStartup() ) { // If we have a lot of views open from last time, then opening them will take a long time. - // So we want to enter the qt event loop to finish drawing the window et al before adding the views. + // So we want to enter the tqt event loop to finish drawing the window et al before adding the views. tqApp->processEvents(); const TQStringList groupList = conf->groupList(); @@ -776,7 +776,7 @@ void KTechlab::slotOptionsPreferences() // User edited the configuration - update your local copies of the // configuration data - connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfiguration()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateConfiguration()) ); dialog->show(); } @@ -834,7 +834,7 @@ void KTechlab::slotTabContext( TQWidget* widget,const TQPoint & pos ) } } - connect( tabMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT(slotTabContextActivated(int)) ); + connect( tabMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT(slotTabContextActivated(int)) ); tabMenu->exec(pos); delete tabMenu; diff --git a/src/ktechlab.h b/src/ktechlab.h index 41dbf1a..7c39b8f 100644 --- a/src/ktechlab.h +++ b/src/ktechlab.h @@ -45,7 +45,7 @@ class TQLabel; */ class KTechlab : public KateMDI::MainWindow { - Q_OBJECT + TQ_OBJECT public: KTechlab(); diff --git a/src/languages/externallanguage.cpp b/src/languages/externallanguage.cpp index 553e597..36d1476 100644 --- a/src/languages/externallanguage.cpp +++ b/src/languages/externallanguage.cpp @@ -37,7 +37,7 @@ void ExternalLanguage::deleteLanguageProcess() // I'm not too sure if this combination of killing the process is the best way.... // m_languageProcess->tryTerminate(); -// TQTimer::singleShot( 5000, m_languageProcess, TQT_SLOT( kill() ) ); +// TQTimer::singleShot( 5000, m_languageProcess, TQ_SLOT( kill() ) ); // delete m_languageProcess; m_languageProcess->kill(); m_languageProcess->deleteLater(); @@ -126,14 +126,14 @@ void ExternalLanguage::resetLanguageProcess() m_languageProcess = new TDEProcess(this); - connect( m_languageProcess, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) ); + connect( m_languageProcess, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStdout( TDEProcess*, char*, int )) ); - connect( m_languageProcess, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )), - this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); + connect( m_languageProcess, TQ_SIGNAL(receivedStderr( TDEProcess*, char*, int )), + this, TQ_SLOT(receivedStderr( TDEProcess*, char*, int )) ); - connect( m_languageProcess, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(processExited( TDEProcess* )) ); + connect( m_languageProcess, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(processExited( TDEProcess* )) ); } diff --git a/src/languages/externallanguage.h b/src/languages/externallanguage.h index dc02e3a..a920d20 100644 --- a/src/languages/externallanguage.h +++ b/src/languages/externallanguage.h @@ -24,7 +24,7 @@ class provides functionality for dealing with external processes. */ class ExternalLanguage : public Language { -Q_OBJECT +TQ_OBJECT public: ExternalLanguage( ProcessChain *processChain, KTechlab *parent, const TQString &name ); diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp index 743fa54..16d8358 100644 --- a/src/languages/flowcode.cpp +++ b/src/languages/flowcode.cpp @@ -44,8 +44,8 @@ void FlowCode::processInput( ProcessOptions options ) options.p_flowCodeDocument = new FlowCodeDocument( TQString(), 0l ); options.p_flowCodeDocument->openURL( options.inputFiles().first() ); - connect( this, TQT_SIGNAL(processSucceeded( Language *)), options.p_flowCodeDocument, TQT_SLOT(deleteLater()) ); - connect( this, TQT_SIGNAL(processFailed( Language *)), options.p_flowCodeDocument, TQT_SLOT(deleteLater()) ); + connect( this, TQ_SIGNAL(processSucceeded( Language *)), options.p_flowCodeDocument, TQ_SLOT(deleteLater()) ); + connect( this, TQ_SIGNAL(processFailed( Language *)), options.p_flowCodeDocument, TQ_SLOT(deleteLater()) ); } if ( !options.p_flowCodeDocument->microSettings() ) diff --git a/src/languages/language.cpp b/src/languages/language.cpp index 2395ecb..5fdaa11 100644 --- a/src/languages/language.cpp +++ b/src/languages/language.cpp @@ -208,7 +208,7 @@ ProcessOptions::ProcessOptions( OutputMethodInfo info ) void ProcessOptions::setTextOutputTarget( TextDocument * target, TQObject * receiver, const char * slot ) { m_pTextOutputTarget = target; - TQObject::connect( m_pHelper, TQT_SIGNAL(textOutputtedTo( TextDocument* )), receiver, slot ); + TQObject::connect( m_pHelper, TQ_SIGNAL(textOutputtedTo( TextDocument* )), receiver, slot ); } diff --git a/src/languages/language.h b/src/languages/language.h index 5885779..063d035 100644 --- a/src/languages/language.h +++ b/src/languages/language.h @@ -53,7 +53,7 @@ class ProcessOptionsSpecial class ProcessOptionsHelper : public TQObject { - Q_OBJECT + TQ_OBJECT #define protected public signals: @@ -203,7 +203,7 @@ class ProcessOptions : public ProcessOptionsSpecial */ class Language : public TQObject { - Q_OBJECT + TQ_OBJECT public: Language( ProcessChain *processChain, KTechlab *parent, const TQString &name ); diff --git a/src/languages/languagemanager.cpp b/src/languages/languagemanager.cpp index 47bfaa2..a71ca5a 100644 --- a/src/languages/languagemanager.cpp +++ b/src/languages/languagemanager.cpp @@ -52,7 +52,7 @@ LanguageManager::LanguageManager( KateMDI::ToolView * parent, KTechlab * ktl ) m_logView = new LogView( parent, "LanguageManager LogView"); TQWhatsThis::add( m_logView, i18n("These messages show the output of language-related functionality such as compiling and assembling.<br><br>For error messages, clicking on the line will automatically open up the file at the position of the error.") ); - connect( m_logView, TQT_SIGNAL(paraClicked(const TQString&, MessageInfo )), this, TQT_SLOT(slotParaClicked(const TQString&, MessageInfo )) ); + connect( m_logView, TQ_SIGNAL(paraClicked(const TQString&, MessageInfo )), this, TQ_SLOT(slotParaClicked(const TQString&, MessageInfo )) ); reset(); } diff --git a/src/languages/languagemanager.h b/src/languages/languagemanager.h index 5d6d971..bf5d488 100644 --- a/src/languages/languagemanager.h +++ b/src/languages/languagemanager.h @@ -35,7 +35,7 @@ namespace KateMDI { class ToolView; } */ class LanguageManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: static LanguageManager * self( KateMDI::ToolView * parent = 0l, KTechlab * ktl = 0l ); diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp index 83757aa..a0d8e40 100644 --- a/src/languages/processchain.cpp +++ b/src/languages/processchain.cpp @@ -57,7 +57,7 @@ ProcessChain::ProcessChain( ProcessOptions options, KTechlab * ktechlab, const c target = options.targetFile(); LanguageManager::self()->logView()->addOutput( i18n("Building: %1").arg( target ), LogView::ot_important ); - TQTimer::singleShot( 0, this, TQT_SLOT(compile()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(compile()) ); } @@ -267,8 +267,8 @@ a * ProcessChain::b( ) \ if ( !c ) \ { \ c = new a( this, m_pKTechlab ); \ - connect( c, TQT_SIGNAL(processSucceeded(Language* )), this, TQT_SLOT(slotFinishedCompile(Language* )) ); \ - connect( c, TQT_SIGNAL(processFailed(Language* )), this, TQT_SIGNAL(failed()) ); \ + connect( c, TQ_SIGNAL(processSucceeded(Language* )), this, TQ_SLOT(slotFinishedCompile(Language* )) ); \ + connect( c, TQ_SIGNAL(processFailed(Language* )), this, TQ_SIGNAL(failed()) ); \ } \ return c; \ } @@ -311,8 +311,8 @@ void ProcessListChain::slotProcessChainSuccessful() ProcessChain * pc = LanguageManager::self()->compile(po); - connect( pc, TQT_SIGNAL(successful()), this, TQT_SLOT(slotProcessChainSuccessful()) ); - connect( pc, TQT_SIGNAL(failed()), this, TQT_SLOT(slotProcessChainFailed()) ); + connect( pc, TQ_SIGNAL(successful()), this, TQ_SLOT(slotProcessChainSuccessful()) ); + connect( pc, TQ_SIGNAL(failed()), this, TQ_SLOT(slotProcessChainFailed()) ); } diff --git a/src/languages/processchain.h b/src/languages/processchain.h index ab99a48..5ca466a 100644 --- a/src/languages/processchain.h +++ b/src/languages/processchain.h @@ -34,7 +34,7 @@ typedef TQValueList<ProcessOptions> ProcessOptionsList; */ class ProcessChain : public TQObject { - Q_OBJECT + TQ_OBJECT public: ProcessChain( ProcessOptions options, KTechlab *parent, const char *name = 0l ); @@ -101,7 +101,7 @@ class ProcessChain : public TQObject class ProcessListChain : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/libraryitem.cpp b/src/libraryitem.cpp index 09a4379..4aadd90 100644 --- a/src/libraryitem.cpp +++ b/src/libraryitem.cpp @@ -71,7 +71,7 @@ void LibraryItem::createIcon16() } TQImage im = m_icon_full.convertToImage(); - im = im.smoothScale( size, size, TQ_ScaleMin ); + im = im.smoothScale( size, size, TQImage::ScaleMin ); m_icon_16.convertFromImage(im); } diff --git a/src/mechanics/mechanicsdocument.cpp b/src/mechanics/mechanicsdocument.cpp index 1c197be..b261970 100644 --- a/src/mechanics/mechanicsdocument.cpp +++ b/src/mechanics/mechanicsdocument.cpp @@ -146,8 +146,8 @@ void MechanicsDocument::appendDeleteList( TQCanvasItem *qcanvasItem ) m_itemDeleteList.append(mechItem); m_itemList.remove(mechItem); - disconnect( mechItem, TQT_SIGNAL(selected(Item*,bool)), this, TQT_SIGNAL(itemSelected(Item*)) ); - disconnect( mechItem, TQT_SIGNAL(unselected(Item*,bool)), this, TQT_SIGNAL(itemUnselected(Item*)) ); + disconnect( mechItem, TQ_SIGNAL(selected(Item*,bool)), this, TQ_SIGNAL(itemSelected(Item*)) ); + disconnect( mechItem, TQ_SIGNAL(unselected(Item*,bool)), this, TQ_SIGNAL(itemUnselected(Item*)) ); mechItem->removeItem(); } diff --git a/src/mechanics/mechanicsdocument.h b/src/mechanics/mechanicsdocument.h index b2275d1..4058b18 100644 --- a/src/mechanics/mechanicsdocument.h +++ b/src/mechanics/mechanicsdocument.h @@ -26,7 +26,7 @@ typedef TQValueList<MechanicsItem*> MechanicsItemList; */ class MechanicsDocument : public ItemDocument { -Q_OBJECT +TQ_OBJECT public: MechanicsDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0 ); diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h index 368a234..a3433a8 100644 --- a/src/mechanics/mechanicsgroup.h +++ b/src/mechanics/mechanicsgroup.h @@ -23,7 +23,7 @@ typedef TQValueList<MechanicsItem*> MechanicsItemList; */ class MechanicsGroup : public ItemGroup { -Q_OBJECT +TQ_OBJECT public: MechanicsGroup( MechanicsDocument *mechanicsDocument, const char *name = 0); diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp index c02cfa4..d41e888 100644 --- a/src/mechanics/mechanicsitem.cpp +++ b/src/mechanics/mechanicsitem.cpp @@ -118,13 +118,13 @@ void MechanicsItem::reparented( Item *oldItem, Item *newItem ) if (oldMechItem) { m_relativePosition = oldMechItem->absolutePosition() + m_relativePosition; - disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); + disconnect( oldMechItem, TQ_SIGNAL(moved()), this, TQ_SLOT(parentMoved()) ); } if (newMechItem) { m_relativePosition = m_relativePosition - newMechItem->absolutePosition(); - connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); + connect( newMechItem, TQ_SIGNAL(moved()), this, TQ_SLOT(parentMoved()) ); } updateCanvasPoints(); @@ -137,7 +137,7 @@ void MechanicsItem::childAdded( Item *child ) if (!mechItem) return; - connect( mechItem, TQT_SIGNAL(updateMechanicsInfoCombined()), this, TQT_SLOT(childMoved()) ); + connect( mechItem, TQ_SIGNAL(updateMechanicsInfoCombined()), this, TQ_SLOT(childMoved()) ); updateMechanicsInfoCombined(); } @@ -148,7 +148,7 @@ void MechanicsItem::childRemoved( Item *child ) if (!mechItem) return; - disconnect( mechItem, TQT_SIGNAL(updateMechanicsInfoCombined()), this, TQT_SLOT(childMoved()) ); + disconnect( mechItem, TQ_SIGNAL(updateMechanicsInfoCombined()), this, TQ_SLOT(childMoved()) ); updateMechanicsInfoCombined(); } diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 5ccb327..86d3edd 100644 --- a/src/mechanics/mechanicsitem.h +++ b/src/mechanics/mechanicsitem.h @@ -117,7 +117,7 @@ protected: */ class MechanicsItem : public Item { -Q_OBJECT +TQ_OBJECT public: MechanicsItem( MechanicsDocument *mechanicsDocument, bool newItem, const TQString &id ); diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp index 8ec5e2f..c657c77 100644 --- a/src/mechanics/mechanicssimulation.cpp +++ b/src/mechanics/mechanicssimulation.cpp @@ -20,7 +20,7 @@ MechanicsSimulation::MechanicsSimulation( MechanicsDocument *mechanicsDocument ) { p_mechanicsDocument = mechanicsDocument; m_advanceTmr = new TQTimer(this); - connect( m_advanceTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAdvance()) ); + connect( m_advanceTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvance()) ); m_advanceTmr->start(1); } diff --git a/src/mechanics/mechanicssimulation.h b/src/mechanics/mechanicssimulation.h index 920d911..74ebaee 100644 --- a/src/mechanics/mechanicssimulation.h +++ b/src/mechanics/mechanicssimulation.h @@ -57,7 +57,7 @@ public: */ class MechanicsSimulation : public TQObject { -Q_OBJECT +TQ_OBJECT public: MechanicsSimulation( MechanicsDocument *mechanicsDocument ); diff --git a/src/mechanics/mechanicsview.h b/src/mechanics/mechanicsview.h index 59ed484..3473591 100644 --- a/src/mechanics/mechanicsview.h +++ b/src/mechanics/mechanicsview.h @@ -20,7 +20,7 @@ class MechanicsDocument; */ class MechanicsView : public ItemView { - Q_OBJECT + TQ_OBJECT public: MechanicsView( MechanicsDocument *mechanicsDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l ); diff --git a/src/microsettings.h b/src/microsettings.h index 2b3f20a..b8b132d 100644 --- a/src/microsettings.h +++ b/src/microsettings.h @@ -55,7 +55,7 @@ typedef TQMap< TQString, VariableInfo > VariableMap; // Variable name, variable */ class PinSettings : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum pin_type @@ -109,7 +109,7 @@ This is different from PIC info, which includes stuff such as PIC pin names */ class MicroSettings : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum VariableType diff --git a/src/node.cpp b/src/node.cpp index 6155c06..d259c08 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -298,8 +298,8 @@ void Node::setParentItem( CNItem *parentItem ) setLevel(p_parentItem->level()); - connect( p_parentItem, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(moveBy(double, double)) ); - connect( p_parentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeNode(Item*)) ); + connect( p_parentItem, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(moveBy(double, double)) ); + connect( p_parentItem, TQ_SIGNAL(removed(Item*)), this, TQ_SLOT(removeNode(Item*)) ); } @@ -393,9 +393,9 @@ bool Node::handleNewConnector( Connector * connector ) return false; } - connect( this, TQT_SIGNAL(removed(Node*)), connector, TQT_SLOT(removeConnector(Node*)) ); - connect( connector, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(checkForRemoval(Connector*)) ); - connect( connector, TQT_SIGNAL(selected(bool)), this, TQT_SLOT(setNodeSelected(bool)) ); + connect( this, TQ_SIGNAL(removed(Node*)), connector, TQ_SLOT(removeConnector(Node*)) ); + connect( connector, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(checkForRemoval(Connector*)) ); + connect( connector, TQ_SIGNAL(selected(bool)), this, TQ_SLOT(setNodeSelected(bool)) ); if ( !isChildNode() ) p_icnDocument->slotRequestAssignNG(); @@ -33,7 +33,7 @@ typedef TQValueList<TQGuardedPtr<Node> > NodeList; */ class Node : public TQObject, public TQCanvasPolygon { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp index aaea114..3b23e23 100644 --- a/src/nodegroup.cpp +++ b/src/nodegroup.cpp @@ -480,7 +480,7 @@ void NodeGroup::clearConList() if (con) { con->setNodeGroup(0l); - disconnect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) ); + disconnect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) ); } } m_conList.clear(); @@ -515,7 +515,7 @@ void NodeGroup::init() m_conList += con; con->setNodeGroup(this); } - connect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) ); + connect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) ); } conEnd = outCon.end(); @@ -527,19 +527,19 @@ void NodeGroup::init() m_conList += con; con->setNodeGroup(this); } - connect( con, TQT_SIGNAL(removed(Connector*)), this, TQT_SLOT(connectorRemoved(Connector*)) ); + connect( con, TQ_SIGNAL(removed(Connector*)), this, TQ_SLOT(connectorRemoved(Connector*)) ); } // Connect the node up to us - connect( *nodeIt, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(nodeRemoved(Node*)) ); + connect( *nodeIt, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(nodeRemoved(Node*)) ); } // And connect up our external nodes xnEnd = m_extNodeList.end(); for ( NodeList::iterator it = m_extNodeList.begin(); it != xnEnd; ++it ) { -// connect( *it, TQT_SIGNAL(moved(Node*)), this, TQT_SLOT(extNodeMoved()) ); - connect( *it, TQT_SIGNAL(removed(Node*)), this, TQT_SLOT(nodeRemoved(Node*)) ); +// connect( *it, TQ_SIGNAL(moved(Node*)), this, TQ_SLOT(extNodeMoved()) ); + connect( *it, TQ_SIGNAL(removed(Node*)), this, TQ_SLOT(nodeRemoved(Node*)) ); } } diff --git a/src/nodegroup.h b/src/nodegroup.h index 54d0da4..9a7a4de 100644 --- a/src/nodegroup.h +++ b/src/nodegroup.h @@ -35,7 +35,7 @@ along with their associated connectors. */ class NodeGroup : public TQObject { -Q_OBJECT +TQ_OBJECT public: NodeGroup( ICNDocument *icnDocument, const char *name = 0); diff --git a/src/oscilloscopedata.h b/src/oscilloscopedata.h index b73eb4c..8860842 100644 --- a/src/oscilloscopedata.h +++ b/src/oscilloscopedata.h @@ -208,7 +208,7 @@ class StoredData */ class ProbeData : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/picitem.cpp b/src/picitem.cpp index a091e93..7c212a8 100644 --- a/src/picitem.cpp +++ b/src/picitem.cpp @@ -40,7 +40,7 @@ PinItem::PinItem( FlowCodeDocument* _view, TQPoint position, bool _onLeft, PinSe view = _view; onLeft = _onLeft; - connect( m_pinSettings, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateDrawing()) ); + connect( m_pinSettings, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateDrawing()) ); if ( TQFontInfo(m_font).pixelSize() > 11 ) // It has to be > 11, not > 12, as (I think) pixelSize() rounds off the actual size m_font.setPixelSize(12); @@ -357,8 +357,8 @@ void PicItem::buttonStateChanged( const TQString &id, bool state ) update(); MicroSettingsDlg *dlg = new MicroSettingsDlg( microSettings, 0L, "microSettingsDlg" ); - connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotMicroSettingsDlgAccepted()) ); - connect( dlg, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotMicroSettingsDlgAccepted()) ); + connect( dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotMicroSettingsDlgAccepted()) ); + connect( dlg, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotMicroSettingsDlgAccepted()) ); dlg->show(); // At this point the PIC is selected but this does not appear to the // user so we must deselect it when done. diff --git a/src/picitem.h b/src/picitem.h index 959311f..0f2bdc9 100644 --- a/src/picitem.h +++ b/src/picitem.h @@ -25,7 +25,7 @@ class PinSettings; */ class PinItem : public TQObject, public TQCanvasRectangle { - Q_OBJECT + TQ_OBJECT public: PinItem( FlowCodeDocument* _view, TQPoint position, bool _onLeft, PinSettings *_pinSettings ); @@ -66,7 +66,7 @@ Allows visual editing of inital PIC settings */ class PicItem : public CNItem { - Q_OBJECT + TQ_OBJECT public: PicItem( ICNDocument *icnDocument, bool newItem, const char *id, MicroSettings *_microSettings ); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 7acfa25..e768720 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -911,7 +911,7 @@ ProjectManager::ProjectManager( KTechlab * ktl, KateMDI::ToolView * parent ) setListCaption( i18n("File") ); setCaption( i18n("Project Manager") ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemClicked(TQListViewItem*)) ); } diff --git a/src/projectmanager.h b/src/projectmanager.h index 3adef41..4ea27dc 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -237,7 +237,7 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti */ class ProjectInfo : public ProjectItem { - Q_OBJECT + TQ_OBJECT public: @@ -266,7 +266,7 @@ class ProjectInfo : public ProjectItem */ class ProjectManager : public ItemSelector { - Q_OBJECT + TQ_OBJECT public: ~ProjectManager(); diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp index 8ed5e80..0786c28 100644 --- a/src/recentfilesaction.cpp +++ b/src/recentfilesaction.cpp @@ -22,15 +22,15 @@ RecentFilesAction::RecentFilesAction( const TQString & configGroupName, const TQ m_maxItems = 10; m_popup = new TDEPopupMenu; - connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( itemSelected( const TQString& ) ) ); + connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( itemSelected( const TQString& ) ) ); setMenuAccelsEnabled( false ); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL &)), receiver, slot ); + connect( this, TQ_SIGNAL(urlSelected(const KURL &)), receiver, slot ); } diff --git a/src/recentfilesaction.h b/src/recentfilesaction.h index 89bc5ed..1d38b20 100644 --- a/src/recentfilesaction.h +++ b/src/recentfilesaction.h @@ -19,7 +19,7 @@ Adapted to work around strange bug occuring. */ class RecentFilesAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT public: RecentFilesAction( const TQString & configGroupName, const TQString & text, const TQObject * receiver, const char* slot, TQObject* parent, const char * name ); diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp index 3082057..b2b19ef 100644 --- a/src/resizeoverlay.cpp +++ b/src/resizeoverlay.cpp @@ -69,7 +69,7 @@ ResizeHandle *ResizeOverlay::createResizeHandle( int id, ResizeHandle::DrawType ResizeHandle *newResizeHandle = new ResizeHandle( this, id, drawType, xsnap, ysnap ); m_resizeHandleMap[id] = newResizeHandle; - connect( newResizeHandle, TQT_SIGNAL(rhMovedBy(int, double, double )), this, TQT_SLOT(slotResizeHandleMoved(int, double, double )) ); + connect( newResizeHandle, TQ_SIGNAL(rhMovedBy(int, double, double )), this, TQ_SLOT(slotResizeHandleMoved(int, double, double )) ); return newResizeHandle; } @@ -81,7 +81,7 @@ void ResizeOverlay::removeResizeHandle( int id ) return; ResizeHandle *rh = it.data(); - disconnect( rh, TQT_SIGNAL(rhMovedBy(int, double, double )), this, TQT_SLOT(slotResizeHandleMoved(int, double, double )) ); + disconnect( rh, TQ_SIGNAL(rhMovedBy(int, double, double )), this, TQ_SLOT(slotResizeHandleMoved(int, double, double )) ); delete rh; m_resizeHandleMap.erase(it); } @@ -122,15 +122,15 @@ void ResizeOverlay::syncX( ResizeHandle *rh1, ResizeHandle *rh2 ) { if ( !rh1 || !rh2 ) return; - connect( rh1, TQT_SIGNAL(rhMovedByX(double )), rh2, TQT_SLOT(slotMoveByX(double )) ); - connect( rh2, TQT_SIGNAL(rhMovedByX(double )), rh1, TQT_SLOT(slotMoveByX(double )) ); + connect( rh1, TQ_SIGNAL(rhMovedByX(double )), rh2, TQ_SLOT(slotMoveByX(double )) ); + connect( rh2, TQ_SIGNAL(rhMovedByX(double )), rh1, TQ_SLOT(slotMoveByX(double )) ); } void ResizeOverlay::syncY( ResizeHandle *rh1, ResizeHandle *rh2 ) { if ( !rh1 || !rh2 ) return; - connect( rh1, TQT_SIGNAL(rhMovedByY(double )), rh2, TQT_SLOT(slotMoveByY(double )) ); - connect( rh2, TQT_SIGNAL(rhMovedByY(double )), rh1, TQT_SLOT(slotMoveByY(double )) ); + connect( rh1, TQ_SIGNAL(rhMovedByY(double )), rh2, TQ_SLOT(slotMoveByY(double )) ); + connect( rh2, TQ_SIGNAL(rhMovedByY(double )), rh1, TQ_SLOT(slotMoveByY(double )) ); } //END class ResizeOverlay @@ -141,8 +141,8 @@ MechanicsItemOverlay::MechanicsItemOverlay( MechanicsItem *parent ) : ResizeOverlay(parent) { p_mechanicsItem = parent; - connect( parent, TQT_SIGNAL(moved()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQ_SIGNAL(moved()), this, TQ_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) ); m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal ); m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical ); @@ -232,8 +232,8 @@ void MechanicsItemOverlay::slotResizeHandleMoved( int id, double dx, double dy ) RectangularOverlay::RectangularOverlay( Item *parent, int xsnap, int ysnap ) : ResizeOverlay(parent) { - connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); + connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveAllResizeHandles(double, double )) ); m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal, xsnap, ysnap ); m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical, xsnap, ysnap ); @@ -359,8 +359,8 @@ TQRect RectangularOverlay::getSizeRect( bool *ok, bool *widthOk, bool *heightOk LineOverlay::LineOverlay( Item * parent ) : ResizeOverlay(parent) { - connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); + connect( parent, TQ_SIGNAL(resized()), this, TQ_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQ_SIGNAL(movedBy(double, double )), this, TQ_SLOT(slotMoveAllResizeHandles(double, double )) ); m_pStart = createResizeHandle( ResizeHandle::rhp_start, ResizeHandle::dt_point_rect ); m_pEnd = createResizeHandle( ResizeHandle::rhp_end, ResizeHandle::dt_point_rect ); diff --git a/src/resizeoverlay.h b/src/resizeoverlay.h index a2a2f12..8a3f5c6 100644 --- a/src/resizeoverlay.h +++ b/src/resizeoverlay.h @@ -31,7 +31,7 @@ typedef TQMap< int, TQGuardedPtr<ResizeHandle> > ResizeHandleMap; */ class ResizeHandle : public TQObject, public TQCanvasRectangle { - Q_OBJECT + TQ_OBJECT public: /** @@ -116,7 +116,7 @@ typedef TQValueList<ResizeHandle*> ResizeHandleList; */ class ResizeOverlay : public TQObject { - Q_OBJECT + TQ_OBJECT public: ResizeOverlay( Item *parent ); @@ -190,7 +190,7 @@ protected: */ class MechanicsItemOverlay : public ResizeOverlay { -Q_OBJECT +TQ_OBJECT public: MechanicsItemOverlay( MechanicsItem *parent ); @@ -221,7 +221,7 @@ protected: */ class RectangularOverlay : public ResizeOverlay { -Q_OBJECT +TQ_OBJECT public: RectangularOverlay( Item *item, int xsnap = 1, int ysnap = 1 ); @@ -260,7 +260,7 @@ protected: */ class LineOverlay : public ResizeOverlay { - Q_OBJECT + TQ_OBJECT public: LineOverlay( Item * parent ); diff --git a/src/simulator.cpp b/src/simulator.cpp index fda2e3c..48c6681 100644 --- a/src/simulator.cpp +++ b/src/simulator.cpp @@ -57,7 +57,7 @@ Simulator::Simulator() m_pChangedCircuitLast = m_pChangedCircuitStart; TQTimer * stepTimer = new TQTimer(this); - connect( stepTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(step()) ); + connect( stepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(step()) ); stepTimer->start(1); } diff --git a/src/simulator.h b/src/simulator.h index fedf605..9686a2e 100644 --- a/src/simulator.h +++ b/src/simulator.h @@ -82,7 +82,7 @@ logic, external simulators (such as gpsim), mechanical simulation, etc). */ class Simulator : public TQObject { - Q_OBJECT + TQ_OBJECT public: static Simulator * self(); diff --git a/src/textdocument.cpp b/src/textdocument.cpp index 9de69e8..80381a4 100644 --- a/src/textdocument.cpp +++ b/src/textdocument.cpp @@ -73,11 +73,11 @@ TextDocument::TextDocument( const TQString &caption, KTechlab *ktechlab, const c guessScheme(); - connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) ); - connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); - connect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); - connect( m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotUpdateMarksInfo()) ); - connect( m_doc, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionmChanged()) ); + connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) ); + connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); + connect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); + connect( m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotUpdateMarksInfo()) ); + connect( m_doc, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionmChanged()) ); m_doc->setDescription((KTextEditor::MarkInterface::MarkTypes)Breakpoint, i18n("Breakpoint")); m_doc->setPixmap((KTextEditor::MarkInterface::MarkTypes)Breakpoint, *inactiveBreakpointPixmap()); @@ -170,9 +170,9 @@ void TextDocument::setText( const TQString & text, bool asInitial ) { if ( asInitial ) { - disconnect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) ); - disconnect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); - disconnect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); + disconnect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) ); + disconnect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); + disconnect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); } const ViewList::iterator end = m_viewList.end(); @@ -190,9 +190,9 @@ void TextDocument::setText( const TQString & text, bool asInitial ) m_doc->clearRedo(); setModified(false); - connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SIGNAL(undoRedoStateChanged()) ); - connect( m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); - connect( m_doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotSyncModifiedStates()) ); + connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SIGNAL(undoRedoStateChanged()) ); + connect( m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); + connect( m_doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotSyncModifiedStates()) ); } } @@ -447,7 +447,7 @@ void TextDocument::convertToAssembly() return; ProcessOptions o( dlg.info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.setInputFiles(filePath); o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(filePath), toType ) ); LanguageManager::self()->compile(o); @@ -489,7 +489,7 @@ void TextDocument::convertToHex() return; ProcessOptions o( dlg.info() ); - o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQT_SLOT(setLastTextOutputTarget( TextDocument* )) ); + o.setTextOutputTarget( m_pLastTextOutputTarget, this, TQ_SLOT(setLastTextOutputTarget( TextDocument* )) ); o.setInputFiles(filePath); o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(filePath), ProcessOptions::ProcessPath::Program ) ); LanguageManager::self()->compile(o); @@ -604,7 +604,7 @@ void TextDocument::slotUpdateMarksInfo() if ( mark->type & Bookmark ) { TDEAction * a = new TDEAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ), - 0, this, TQT_SLOT(slotBookmarkRequested()), this, + 0, this, TQ_SLOT(slotBookmarkRequested()), this, TQString("bookmark_%1").arg(TQString::number(mark->line)).latin1() ); m_bookmarkActions.append(a); } @@ -616,7 +616,7 @@ void TextDocument::slotUpdateMarksInfo() void TextDocument::slotBookmarkRequested() { - const TQObject * s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject * s = sender(); if (!s) return; TQString name = s->name(); @@ -752,7 +752,7 @@ void TextDocument::debugRun() break; } - m_symbolFile = GpsimProcessor::generateSymbolFile( m_debugFile, this, TQT_SLOT(slotCODCreationSucceeded()), TQT_SLOT(slotCODCreationFailed()) ); + m_symbolFile = GpsimProcessor::generateSymbolFile( m_debugFile, this, TQ_SLOT(slotCODCreationSucceeded()), TQ_SLOT(slotCODCreationFailed()) ); #endif // !NO_GPSIM } @@ -973,9 +973,9 @@ void TextDocument::setDebugger( GpsimDebugger * debugger, bool ownDebugger ) if ( m_debugFile.isEmpty() ) m_debugFile = url().path(); - connect( m_pDebugger, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDebuggerDestroyed()) ); - connect( m_pDebugger->gpsim(), TQT_SIGNAL(runningStatusChanged(bool )), this, TQT_SLOT(slotInitDebugActions()) ); - connect( m_pDebugger, TQT_SIGNAL(lineReached(const SourceLine &)), this, TQT_SLOT(slotDebugSetCurrentLine(const SourceLine &)) ); + connect( m_pDebugger, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDebuggerDestroyed()) ); + connect( m_pDebugger->gpsim(), TQ_SIGNAL(runningStatusChanged(bool )), this, TQ_SLOT(slotInitDebugActions()) ); + connect( m_pDebugger, TQ_SIGNAL(lineReached(const SourceLine &)), this, TQ_SLOT(slotDebugSetCurrentLine(const SourceLine &)) ); m_pDebugger->setBreakpoints( m_debugFile, breakpointList() ); slotInitDebugActions(); diff --git a/src/textdocument.h b/src/textdocument.h index ace26ab..1f1f0bf 100644 --- a/src/textdocument.h +++ b/src/textdocument.h @@ -32,7 +32,7 @@ typedef TQValueList<int> IntList; */ class TextDocument : public Document { -Q_OBJECT +TQ_OBJECT public: ~TextDocument(); diff --git a/src/textview.cpp b/src/textview.cpp index c06c3c3..2936d12 100644 --- a/src/textview.cpp +++ b/src/textview.cpp @@ -63,24 +63,24 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), TextDocument::HexOutput ); m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput ); - connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) ); + connect( m, TQ_SIGNAL(activated(int)), textDocument, TQ_SLOT(slotConvertTo(int)) ); m->setItemEnabled( TextDocument::MicrobeOutput, false ); //END Convert To * Actions - new TDEAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQT_SLOT(formatAssembly()), ac, "format_asm" ); + new TDEAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQ_SLOT(formatAssembly()), ac, "format_asm" ); #ifndef NO_GPSIM //BEGIN Debug Actions - new TDEAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" ); - new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" ); - new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" ); - new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" ); - new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" ); - new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" ); - new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQT_SLOT(debugStepOut()), ac, "debug_step_out" ); + new TDEAction( i18n("Set &Breakpoint"), 0, 0, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" ); + new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQ_SLOT(debugRun()), ac, "debug_run" ); + new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQ_SLOT(debugInterrupt()), ac, "debug_interrupt" ); + new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQ_SLOT(debugStop()), ac, "debug_stop" ); + new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQ_SLOT(debugStep()), ac, "debug_step" ); + new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQ_SLOT(debugStepOver()), ac, "debug_step_over" ); + new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQ_SLOT(debugStepOut()), ac, "debug_step_out" ); //END Debug Actions #endif @@ -98,8 +98,8 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "tdetexteditor_popup", p_ktechlab ) ) ); - connect( m_view, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorPositionChanged()) ); - connect( m_view, TQT_SIGNAL(gotFocus(Kate::View*)), this, TQT_SLOT(setFocused()) ); + connect( m_view, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorPositionChanged()) ); + connect( m_view, TQ_SIGNAL(gotFocus(Kate::View*)), this, TQ_SLOT(setFocused()) ); m_layout->insertWidget( 0, m_view ); @@ -112,8 +112,8 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u m_pTextViewLabel->hide(); TextViewEventFilter * eventFilter = new TextViewEventFilter( this ); - connect( eventFilter, TQT_SIGNAL(wordHoveredOver( const TQString&, int, int )), this, TQT_SLOT(slotWordHoveredOver( const TQString&, int, int )) ); - connect( eventFilter, TQT_SIGNAL(wordUnhovered()), this, TQT_SLOT(slotWordUnhovered()) ); + connect( eventFilter, TQ_SIGNAL(wordHoveredOver( const TQString&, int, int )), this, TQ_SLOT(slotWordHoveredOver( const TQString&, int, int )) ); + connect( eventFilter, TQ_SIGNAL(wordUnhovered()), this, TQ_SLOT(slotWordUnhovered()) ); TQObject * internalView = m_view->child( 0, "KateViewInternal" ); internalView->installEventFilter( eventFilter ); @@ -377,16 +377,16 @@ TextViewEventFilter::TextViewEventFilter( TextView * textView ) m_lastLine = m_lastCol = -1; ((KTextEditor::TextHintInterface*)textView->kateView()->tqt_cast("KTextEditor::TextHintInterface"))->enableTextHints(0); - connect( textView->kateView(), TQT_SIGNAL(needTextHint(int, int, TQString &)), this, TQT_SLOT(slotNeedTextHint( int, int, TQString& )) ); + connect( textView->kateView(), TQ_SIGNAL(needTextHint(int, int, TQString &)), this, TQ_SLOT(slotNeedTextHint( int, int, TQString& )) ); m_pHoverTimer = new TQTimer( this ); - connect( m_pHoverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hoverTimeout()) ); + connect( m_pHoverTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hoverTimeout()) ); m_pSleepTimer = new TQTimer( this ); - connect( m_pSleepTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(gotoSleep()) ); + connect( m_pSleepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(gotoSleep()) ); m_pNoWordTimer = new TQTimer( this ); - connect( m_pNoWordTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoWordTimeout()) ); + connect( m_pNoWordTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoWordTimeout()) ); } diff --git a/src/textview.h b/src/textview.h index cfb3158..320ebb3 100644 --- a/src/textview.h +++ b/src/textview.h @@ -33,7 +33,7 @@ class VariableLabel; */ class TextView : public View { - Q_OBJECT + TQ_OBJECT public: TextView( TextDocument *textDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 ); @@ -106,7 +106,7 @@ over (used in the debugger). */ class TextViewEventFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: TextViewEventFilter( TextView * textView ); diff --git a/src/variablelabel.cpp b/src/variablelabel.cpp index ee7686e..6277b5b 100644 --- a/src/variablelabel.cpp +++ b/src/variablelabel.cpp @@ -47,8 +47,8 @@ void VariableLabel::setRegister( RegisterInfo * info, const TQString & name ) m_pRegisterInfo = info; m_registerName = name; - connect( m_pRegisterInfo, TQT_SIGNAL(destroyed()), this, TQT_SLOT(hide()) ); - connect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(updateText()) ); + connect( m_pRegisterInfo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(hide()) ); + connect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(updateText()) ); updateText(); } @@ -59,8 +59,8 @@ void VariableLabel::disconnectRegisterInfo() if ( !m_pRegisterInfo ) return; - disconnect( m_pRegisterInfo, TQT_SIGNAL(destroyed()), this, TQT_SLOT(hide()) ); - disconnect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(updateText()) ); + disconnect( m_pRegisterInfo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(hide()) ); + disconnect( m_pRegisterInfo, TQ_SIGNAL(valueChanged(unsigned)), this, TQ_SLOT(updateText()) ); m_pRegisterInfo = 0l; m_registerName = TQString(); diff --git a/src/variablelabel.h b/src/variablelabel.h index 40ab293..0e4f372 100644 --- a/src/variablelabel.h +++ b/src/variablelabel.h @@ -30,7 +30,7 @@ a variable while debugging. */ class VariableLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: VariableLabel( TextView * parent ); diff --git a/src/variant.h b/src/variant.h index 52a9ca7..9fa7791 100644 --- a/src/variant.h +++ b/src/variant.h @@ -26,7 +26,7 @@ contained. e.g. returns TQVariant::Color or TQVariant::Rect */ class Variant : public TQObject { -Q_OBJECT +TQ_OBJECT public: class Type diff --git a/src/view.cpp b/src/view.cpp index 52d2417..31a5758 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -89,7 +89,7 @@ View::View( Document *document, ViewContainer *viewContainer, uint viewAreaId, c m_layout->addWidget( new KVSSBSep(this) ); m_layout->addWidget( m_statusBar ); - connect( p_ktechlab, TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(slotUpdateConfiguration()) ); + connect( p_ktechlab, TQ_SIGNAL(configurationChanged()), this, TQ_SLOT(slotUpdateConfiguration()) ); } } @@ -186,11 +186,11 @@ ViewStatusBar::ViewStatusBar( View *view ) m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::Small ); m_unmodifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "null", TDEIcon::Small ); - connect( view->document(), TQT_SIGNAL(modifiedStateChanged()), this, TQT_SLOT(slotModifiedStateChanged()) ); - connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) ); + connect( view->document(), TQ_SIGNAL(modifiedStateChanged()), this, TQ_SLOT(slotModifiedStateChanged()) ); + connect( view->document(), TQ_SIGNAL(fileNameChanged(const KURL& )), this, TQ_SLOT(slotFileNameChanged(const KURL& )) ); - connect( view, TQT_SIGNAL(viewFocused(View* )), this, TQT_SLOT(slotViewFocused(View* )) ); - connect( view, TQT_SIGNAL(viewUnfocused()), this, TQT_SLOT(slotViewUnfocused()) ); + connect( view, TQ_SIGNAL(viewFocused(View* )), this, TQ_SLOT(slotViewFocused(View* )) ); + connect( view, TQ_SIGNAL(viewUnfocused()), this, TQ_SLOT(slotViewUnfocused()) ); slotModifiedStateChanged(); slotFileNameChanged( view->document()->url() ); @@ -28,7 +28,7 @@ class TQVBoxLayout; class ViewStatusBar : public KStatusBar { -Q_OBJECT +TQ_OBJECT public: ViewStatusBar( View *view ); @@ -60,7 +60,7 @@ protected: */ class View : public TQWidget, public KXMLGUIClient { -Q_OBJECT +TQ_OBJECT public: View( Document *document, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 ); diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp index 594a473..a87a233 100644 --- a/src/viewcontainer.cpp +++ b/src/viewcontainer.cpp @@ -27,11 +27,11 @@ ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQW b_deleted = false; p_ktechlab = ktechlab; if (ktechlab) - connect( ktechlab, TQT_SIGNAL(needUpdateCaptions()), this, TQT_SLOT(updateCaption()) ); + connect( ktechlab, TQ_SIGNAL(needUpdateCaptions()), this, TQ_SLOT(updateCaption()) ); TQHBoxLayout *layout = new TQHBoxLayout(this); m_baseViewArea = new ViewArea( this, this, 0, "viewarea_0" ); - connect( m_baseViewArea, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(baseViewAreaDestroyed(TQObject* )) ); + connect( m_baseViewArea, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(baseViewAreaDestroyed(TQObject* )) ); layout->addWidget(m_baseViewArea); @@ -410,13 +410,13 @@ ViewArea *ViewArea::createViewArea( Position position, uint id ) return 0l; } - setOrientation( ( position == Right ) ? Qt::Horizontal : Qt::Vertical ); + setOrientation( ( position == Right ) ? TQt::Horizontal : TQt::Vertical ); p_viewArea1 = new ViewArea(this, p_viewContainer, m_id, TQString("viewarea_%1").arg(TQString::number(m_id)).latin1()); p_viewArea2 = new ViewArea(this, p_viewContainer, id, TQString("viewarea_%1").arg(TQString::number(id)).latin1()); - connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) ); - connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) ); + connect( p_viewArea1, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) ); + connect( p_viewArea2, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) ); p_view->reparent( p_viewArea1, TQPoint(), true ); p_viewArea1->setView(p_view); @@ -424,7 +424,7 @@ ViewArea *ViewArea::createViewArea( Position position, uint id ) m_id = p_viewContainer->uniqueParentId(); TQValueList<int> splitPos; - int pos = ((orientation() == Qt::Horizontal) ? width()/2 : height()/2); + int pos = ((orientation() == TQt::Horizontal) ? width()/2 : height()/2); splitPos << pos << pos; setSizes(splitPos); @@ -436,7 +436,7 @@ ViewArea *ViewArea::createViewArea( Position position, uint id ) void ViewArea::viewAreaDestroyed( TQObject *obj ) { - ViewArea *viewArea = static_cast<ViewArea*>(TQT_TQWIDGET(obj)); + ViewArea *viewArea = static_cast<ViewArea*>(obj); if ( viewArea == p_viewArea1 ) p_viewArea1 = 0l; @@ -459,7 +459,7 @@ void ViewArea::setView( View *view ) return; } p_view = view; - connect( view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(viewDestroyed()) ); + connect( view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(viewDestroyed()) ); } @@ -499,7 +499,7 @@ void ViewArea::saveState( TDEConfig *config ) if ( va1Ok || va2Ok ) { - config->writeEntry( orientationKey(m_id), (orientation() == Qt::Horizontal) ? "LeftRight" : "TopBottom" ); + config->writeEntry( orientationKey(m_id), (orientation() == TQt::Horizontal) ? "LeftRight" : "TopBottom" ); TQValueList<int> contains; if (va1Ok) @@ -542,7 +542,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam if ( config->hasKey( orientationKey(id) ) ) { TQString orientation = config->readEntry( orientationKey(m_id) ); - setOrientation( (orientation == "LeftRight") ? Qt::Horizontal : Qt::Vertical ); + setOrientation( (orientation == "LeftRight") ? TQt::Horizontal : TQt::Vertical ); } config->setGroup(groupName); @@ -560,7 +560,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam { int viewArea1Id = contains[0]; p_viewArea1 = new ViewArea(this, p_viewContainer, viewArea1Id, TQString("viewarea_%1").arg(TQString::number(viewArea1Id)).latin1()); - connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) ); + connect( p_viewArea1, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) ); p_viewArea1->restoreState( config, viewArea1Id, groupName ); p_viewArea1->show(); } @@ -569,7 +569,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam { int viewArea2Id = contains[1]; p_viewArea2 = new ViewArea(this, p_viewContainer, viewArea2Id, TQString("viewarea_%1").arg(TQString::number(viewArea2Id)).latin1()); - connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) ); + connect( p_viewArea2, TQ_SIGNAL(destroyed(TQObject* )), this, TQ_SLOT(viewAreaDestroyed(TQObject* )) ); p_viewArea2->restoreState( config, viewArea2Id, groupName ); p_viewArea2->show(); } diff --git a/src/viewcontainer.h b/src/viewcontainer.h index 6b28ffe..20f1523 100644 --- a/src/viewcontainer.h +++ b/src/viewcontainer.h @@ -49,7 +49,7 @@ If it contains two ViewAreas, then the value returned by id() is -1. */ class ViewArea : public TQSplitter { -Q_OBJECT +TQ_OBJECT public: enum Position @@ -112,7 +112,7 @@ protected: */ class ViewContainer : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/translations/messages/fr.po b/translations/messages/fr.po index 28008d2..3f7561c 100644 --- a/translations/messages/fr.po +++ b/translations/messages/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Ktechlab 0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2022-09-07 18:27+0000\n" "PO-Revision-Date: 2008-06-08 20:16+0200\n" "Last-Translator: Georges Khaznadar <georgesk@ofset.org>\n" "Language-Team: \n" @@ -2306,22 +2306,22 @@ msgstr "Nom de Configuration" msgid "Value radix:" msgstr "Base pour les valeurs :" -#: gui/gpasmsettingswidget.ui:144 gui/symbolviewer.cpp:86 +#: gui/gpasmsettingswidget.ui:138 gui/symbolviewer.cpp:86 #, no-c-format msgid "Binary" msgstr "Binaire" -#: gui/gpasmsettingswidget.ui:149 gui/symbolviewer.cpp:87 +#: gui/gpasmsettingswidget.ui:143 gui/symbolviewer.cpp:87 #, no-c-format msgid "Octal" msgstr "Octale" -#: gui/gpasmsettingswidget.ui:139 gui/symbolviewer.cpp:88 +#: gui/gpasmsettingswidget.ui:133 gui/symbolviewer.cpp:88 #, no-c-format msgid "Decimal" msgstr "Décimale" -#: gui/gpasmsettingswidget.ui:154 gui/symbolviewer.cpp:89 +#: gui/gpasmsettingswidget.ui:148 gui/symbolviewer.cpp:89 #, no-c-format msgid "Hexadecimal" msgstr "Hexadécimale" @@ -3284,13 +3284,6 @@ msgstr "Nom d'instruction" msgid "&Automatically format Microbe output" msgstr "Formatte &Automatiquement la sortie Microbe" -#: gui/asmformattingwidget.ui:175 gui/generaloptionswidget.ui:126 -#: gui/newfilewidget.ui:113 gui/picprogrammerconfigwidget.ui:61 -#: gui/sdccoptionswidget.ui:215 gui/sdccoptionswidget.ui:256 -#, no-c-format -msgid "Alt+A" -msgstr "Alt+A" - #: gui/createsubprojectwidget.ui:16 #, no-c-format msgid "Create Subproject" @@ -3311,7 +3304,7 @@ msgstr "Fichier cible :" msgid "Type:" msgstr "Type :" -#: gui/createsubprojectwidget.ui:62 gui/linkeroptionswidget.ui:128 +#: gui/createsubprojectwidget.ui:62 gui/linkeroptionswidget.ui:125 #, no-c-format msgid "Library" msgstr "Bibliothèque" @@ -3321,43 +3314,32 @@ msgstr "Bibliothèque" msgid "Reuse the same output view for code generation" msgstr "Réutiliser la même vue de sortie pour la génération de code" -#: gui/generaloptionswidget.ui:41 +#: gui/generaloptionswidget.ui:38 #, no-c-format msgid "Show voltage bars &on electronic components" msgstr "M&ontrer les barres de tension sur les composants électroniques" -#: gui/generaloptionswidget.ui:44 gui/gpasmsettingswidget.ui:60 -#: gui/linkeroptionswidget.ui:85 gui/sdccoptionswidget.ui:359 -#, no-c-format -msgid "Alt+O" -msgstr "Alt+O" - -#: gui/generaloptionswidget.ui:52 +#: gui/generaloptionswidget.ui:46 #, no-c-format msgid "Grid Colour" msgstr "Couleur de Grille" -#: gui/generaloptionswidget.ui:55 +#: gui/generaloptionswidget.ui:49 #, no-c-format msgid "The grid color in the work area." msgstr "La couleur de la grille dans la zone de travail." -#: gui/generaloptionswidget.ui:63 +#: gui/generaloptionswidget.ui:57 #, no-c-format msgid "Show &grid:" msgstr "Montrer la &grille :" -#: gui/generaloptionswidget.ui:66 -#, no-c-format -msgid "Alt+G" -msgstr "Alt+G" - -#: gui/generaloptionswidget.ui:90 +#: gui/generaloptionswidget.ui:81 #, no-c-format msgid "Maximum undo steps for work area:" msgstr "Nombre maximum d'étapes \"défaire\" dans la zone de travail :" -#: gui/generaloptionswidget.ui:93 +#: gui/generaloptionswidget.ui:84 #, no-c-format msgid "" "Maximum undo steps for work area. This doesn't apply to text documents - " @@ -3367,56 +3349,44 @@ msgstr "" "s'applique pas aux documents texte - on peut le configurer séparément sous " "l'éditeur de configuration." -#: gui/generaloptionswidget.ui:101 +#: gui/generaloptionswidget.ui:92 #, no-c-format msgid "Convenience" msgstr "Commodités" -#: gui/generaloptionswidget.ui:112 +#: gui/generaloptionswidget.ui:103 #, no-c-format msgid "Restore opened doc&uments on startup" msgstr "Restaurer les doc&uments ouverts au démarrage" -#: gui/generaloptionswidget.ui:115 -#, no-c-format -msgid "Alt+U" -msgstr "Alt+U" - -#: gui/generaloptionswidget.ui:123 +#: gui/generaloptionswidget.ui:111 #, no-c-format msgid "Raise the &appropriate item selector on creating a new document" msgstr "" "Faire &apparaître le sélecteur d'items approprié à la création d'un nouveau " "document" -#: gui/generaloptionswidget.ui:134 +#: gui/generaloptionswidget.ui:119 #, no-c-format msgid "Raise the &Messages log when compiling" msgstr "Faire apparaître le journal de &Messages en cours de compilation" -#: gui/generaloptionswidget.ui:137 gui/picprogrammerconfigwidget.ui:72 -#: gui/sdccoptionswidget.ui:142 gui/sdccoptionswidget.ui:345 -#: gui/sdccoptionswidget.ui:483 -#, no-c-format -msgid "Alt+M" -msgstr "Alt+M" - -#: gui/generaloptionswidget.ui:147 +#: gui/generaloptionswidget.ui:129 #, no-c-format msgid "Display Refresh Rate" msgstr "Vitesse de rafraîchissement de l'affichage" -#: gui/generaloptionswidget.ui:186 +#: gui/generaloptionswidget.ui:168 #, no-c-format msgid "Refresh rate:" msgstr "Vitesse de rafraîchissement :" -#: gui/generaloptionswidget.ui:194 +#: gui/generaloptionswidget.ui:176 #, no-c-format msgid "Medium (50 FPS)" msgstr "Moyenne (50 FPS)" -#: gui/generaloptionswidget.ui:212 +#: gui/generaloptionswidget.ui:194 #, no-c-format msgid "" "This is the number of times per second that the work area view is updated; a " @@ -3451,7 +3421,7 @@ msgstr "Format hexa (-a)" msgid "Ign&ore case (-i)" msgstr "Ig&norer la casse (-i)" -#: gui/gpasmsettingswidget.ui:63 +#: gui/gpasmsettingswidget.ui:60 #, no-c-format msgid "" "All user defined symbols and macros are case sensitive. This option makes " @@ -3460,17 +3430,12 @@ msgstr "" "Tous les symboles et macros définis par l'utilisateur sont sensibles à la " "casse. Cette option les rend insensibles à la casse." -#: gui/gpasmsettingswidget.ui:71 +#: gui/gpasmsettingswidget.ui:68 #, no-c-format msgid "Generate DOS-formated hex file (-&n)" msgstr "Génération de fichier hexa au format DOS (-&n)" -#: gui/gpasmsettingswidget.ui:74 gui/sdccoptionswidget.ui:317 -#, no-c-format -msgid "Alt+N" -msgstr "Alt+N" - -#: gui/gpasmsettingswidget.ui:77 +#: gui/gpasmsettingswidget.ui:71 #, no-c-format msgid "" "By default, gpasm generates hex files using ISO format. However, some device " @@ -3481,27 +3446,27 @@ msgstr "" "Cependant, quelques programmateurs nécessitent un fichier au format DOS. " "Cette option force gpasm à générer un fichier hexa au format DOS." -#: gui/gpasmsettingswidget.ui:100 gui/linkeroptionswidget.ui:28 +#: gui/gpasmsettingswidget.ui:94 gui/linkeroptionswidget.ui:28 #, no-c-format msgid "inhx32" msgstr "inhx32" -#: gui/gpasmsettingswidget.ui:105 gui/linkeroptionswidget.ui:33 +#: gui/gpasmsettingswidget.ui:99 gui/linkeroptionswidget.ui:33 #, no-c-format msgid "inhx8m" msgstr "inhx8m" -#: gui/gpasmsettingswidget.ui:110 gui/linkeroptionswidget.ui:38 +#: gui/gpasmsettingswidget.ui:104 gui/linkeroptionswidget.ui:38 #, no-c-format msgid "inhx8s" msgstr "inhx8s" -#: gui/gpasmsettingswidget.ui:115 gui/linkeroptionswidget.ui:43 +#: gui/gpasmsettingswidget.ui:109 gui/linkeroptionswidget.ui:43 #, no-c-format msgid "inhx16" msgstr "inhx16" -#: gui/gpasmsettingswidget.ui:133 gui/linkeroptionswidget.ui:53 +#: gui/gpasmsettingswidget.ui:127 gui/linkeroptionswidget.ui:53 #, no-c-format msgid "" "GPASM supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats. This " @@ -3510,22 +3475,22 @@ msgstr "" "GPASM supporte les formats de fichiers hexa inhx8m, inhx8s, inhx16, et " "inhx32. Cette option contrôle quel format de fichier hexa est utilisé." -#: gui/gpasmsettingswidget.ui:172 +#: gui/gpasmsettingswidget.ui:166 #, no-c-format msgid "All" msgstr "Tout" -#: gui/gpasmsettingswidget.ui:177 +#: gui/gpasmsettingswidget.ui:171 #, no-c-format msgid "Warnings" msgstr "Warnings" -#: gui/gpasmsettingswidget.ui:182 +#: gui/gpasmsettingswidget.ui:176 #, no-c-format msgid "Errors" msgstr "Erreurs" -#: gui/gpasmsettingswidget.ui:197 +#: gui/gpasmsettingswidget.ui:191 #, no-c-format msgid "" "This sets the threshold of messages displayed in the log view.<ul><li>\"All" @@ -3538,7 +3503,7 @@ msgstr "" "erreurs.<li>\"Warnings\" supprimera les messages. <li>\"Erreurs\" supprimera " "les messages et les warnings.</ul>" -#: gui/gpasmsettingswidget.ui:256 gui/sdccoptionswidget.ui:560 +#: gui/gpasmsettingswidget.ui:250 gui/sdccoptionswidget.ui:464 #, no-c-format msgid "Other options:" msgstr "Autres Options :" @@ -3558,17 +3523,17 @@ msgstr "Répertoire de Bibliothèques (-I) :" msgid "&Output a map file (-m)" msgstr "S&ortir un fichier map (-m)" -#: gui/linkeroptionswidget.ui:93 +#: gui/linkeroptionswidget.ui:90 #, no-c-format msgid "Linker Script (-s):" msgstr "Script de ligature (-s) :" -#: gui/linkeroptionswidget.ui:111 +#: gui/linkeroptionswidget.ui:108 #, no-c-format msgid "Other:" msgstr "Autre :" -#: gui/linkeroptionswidget.ui:119 +#: gui/linkeroptionswidget.ui:116 #, no-c-format msgid "Link libraries inside project" msgstr "Lier les bibliothèques à l'intérieur du projet" @@ -3686,13 +3651,7 @@ msgstr "Définitions de brochage" msgid "Modif&y" msgstr "Modifier" -#: gui/microsettingswidget.ui:171 gui/sdccoptionswidget.ui:48 -#: gui/sdccoptionswidget.ui:176 gui/sdccoptionswidget.ui:461 -#, no-c-format -msgid "Alt+Y" -msgstr "Alt+Y" - -#: gui/microsettingswidget.ui:179 +#: gui/microsettingswidget.ui:176 #, no-c-format msgid "Rename" msgstr "Renommer" @@ -3844,42 +3803,42 @@ msgstr "Configuration du programmateur" msgid "&Add ..." msgstr "&Ajout ..." -#: gui/picprogrammerconfigwidget.ui:69 +#: gui/picprogrammerconfigwidget.ui:66 #, no-c-format msgid "Re&move" msgstr "Retirer" -#: gui/picprogrammerconfigwidget.ui:80 gui/programmerwidget.ui:30 +#: gui/picprogrammerconfigwidget.ui:74 gui/programmerwidget.ui:30 #, no-c-format msgid "Program:" msgstr "Programme :" -#: gui/picprogrammerconfigwidget.ui:104 +#: gui/picprogrammerconfigwidget.ui:98 #, no-c-format msgid "(Program Description)" msgstr "(Description de programme)" -#: gui/picprogrammerconfigwidget.ui:114 +#: gui/picprogrammerconfigwidget.ui:108 #, no-c-format msgid "Commands" msgstr "Commandes" -#: gui/picprogrammerconfigwidget.ui:125 +#: gui/picprogrammerconfigwidget.ui:119 #, no-c-format msgid "Initialization:" msgstr "Initialisation :" -#: gui/picprogrammerconfigwidget.ui:153 +#: gui/picprogrammerconfigwidget.ui:147 #, no-c-format msgid "Read:" msgstr "Lire :" -#: gui/picprogrammerconfigwidget.ui:161 +#: gui/picprogrammerconfigwidget.ui:155 #, no-c-format msgid "Write:" msgstr "Écrire :" -#: gui/picprogrammerconfigwidget.ui:179 +#: gui/picprogrammerconfigwidget.ui:173 #, no-c-format msgid "" "The following strings will be replaced when the command is run:\n" @@ -3896,22 +3855,22 @@ msgstr "" "<li><b>%file</b> - Fichier à lire ou à écrire</li>\n" "</ul>" -#: gui/picprogrammerconfigwidget.ui:195 +#: gui/picprogrammerconfigwidget.ui:189 #, no-c-format msgid "Erase:" msgstr "Effacer :" -#: gui/picprogrammerconfigwidget.ui:203 +#: gui/picprogrammerconfigwidget.ui:197 #, no-c-format msgid "Verify:" msgstr "Vérifier :" -#: gui/picprogrammerconfigwidget.ui:211 +#: gui/picprogrammerconfigwidget.ui:205 #, no-c-format msgid "Blank Check:" msgstr "Vérification de virginté :" -#: gui/picprogrammerconfigwidget.ui:229 +#: gui/picprogrammerconfigwidget.ui:223 #, no-c-format msgid "Default port:" msgstr "Port par défaut :" @@ -3942,33 +3901,22 @@ msgid "Don't search in the standard librar&y directory (--nostdlib)" msgstr "" "Ne pas chercher dans le répertoire de bibliothèque statndard (--nostdlib)" -#: gui/sdccoptionswidget.ui:56 +#: gui/sdccoptionswidget.ui:53 #, no-c-format msgid "Don't search in the standard include directory (--nostdinc)" msgstr "Ne pas chercher dans le répertoire standard d'inclusion (--nostdinc)" -#: gui/sdccoptionswidget.ui:67 +#: gui/sdccoptionswidget.ui:61 #, no-c-format msgid "Disa&ble pedantic warnings (--less-pedantic)" msgstr "Dés&activer les avertissements pédants (--less-pedantic)" -#: gui/sdccoptionswidget.ui:70 gui/sdccoptionswidget.ui:159 -#: gui/sdccoptionswidget.ui:373 gui/sdccoptionswidget.ui:494 -#, no-c-format -msgid "Alt+B" -msgstr "Alt+B" - -#: gui/sdccoptionswidget.ui:78 +#: gui/sdccoptionswidget.ui:69 #, no-c-format msgid "Use C&89 standard only (--std-c89)" msgstr "Utiliser le standard C&89 seulement (--std-c89)" -#: gui/sdccoptionswidget.ui:81 -#, no-c-format -msgid "Alt+8" -msgstr "Alt+8" - -#: gui/sdccoptionswidget.ui:84 +#: gui/sdccoptionswidget.ui:72 #, no-c-format msgid "" "Follow the C89 standard and disable SDCC features that conflict with the " @@ -3977,17 +3925,12 @@ msgstr "" "Suivre le standard C89 et désactiver les particularités SDCC qui entrent en " "conflit avec celui-ci." -#: gui/sdccoptionswidget.ui:92 +#: gui/sdccoptionswidget.ui:80 #, no-c-format msgid "Use C&99 standard only (--std-c99)" msgstr "Utiliser le standard C&99 seulement (--std-c99)" -#: gui/sdccoptionswidget.ui:95 -#, no-c-format -msgid "Alt+9" -msgstr "Alt+9" - -#: gui/sdccoptionswidget.ui:101 +#: gui/sdccoptionswidget.ui:86 #, no-c-format msgid "" "Follow the C99 standard and disable SDCC features that conflict with the " @@ -3996,17 +3939,17 @@ msgstr "" "Suivre le standard C99 et désactiver les particularités SDCC qui entrent en " "conflit avec celui-ci." -#: gui/sdccoptionswidget.ui:128 +#: gui/sdccoptionswidget.ui:113 #, no-c-format msgid "Code Gener&ation" msgstr "Génér&ation de Code" -#: gui/sdccoptionswidget.ui:139 +#: gui/sdccoptionswidget.ui:124 #, no-c-format msgid "Stack auto&matic variables (--stack-auto)" msgstr "Empiler les variables auto&matiques (--stack-auto)" -#: gui/sdccoptionswidget.ui:148 +#: gui/sdccoptionswidget.ui:130 #, no-c-format msgid "" "All functions in the source file will be compiled as reentrant, i.e. the " @@ -4020,14 +3963,14 @@ msgstr "" "projet seront compilés avec cette option. Elle implique automatiquement -int-" "long-reent et -float-reent." -#: gui/sdccoptionswidget.ui:156 +#: gui/sdccoptionswidget.ui:138 #, no-c-format msgid "Integer li&braries were compiled as reentrant (--int-long-reent)" msgstr "" "Les &bibliothèques d'entiers ont été compilées comme réentrantes (--int-long-" "reent)" -#: gui/sdccoptionswidget.ui:165 +#: gui/sdccoptionswidget.ui:144 #, no-c-format msgid "" "Integer (16 bit) and long (32 bit) libraries have been compiled as " @@ -4037,34 +3980,29 @@ msgstr "" "compilées comme réentrantes. Notez que par défaut ces bibliothèques sont " "compilées comme non-réentrantes." -#: gui/sdccoptionswidget.ui:173 +#: gui/sdccoptionswidget.ui:152 #, no-c-format msgid "Floating point librar&y was compiled as reentrant (--float-reent)" msgstr "" "Les bibliothèques de nombres flottants ont été compilées comme réentrantes " "(--float-reent)" -#: gui/sdccoptionswidget.ui:179 +#: gui/sdccoptionswidget.ui:155 #, no-c-format msgid "Floating point library is compiled as reentrant." msgstr "La bibliothèque de nombres flottants est compilée comme réentrante." -#: gui/sdccoptionswidget.ui:187 +#: gui/sdccoptionswidget.ui:163 #, no-c-format msgid "Leave out the frame pointer (--fommit-frame-pointer)" msgstr "Laisse tomber le pointer de trame (--fommit-frame-pointer)" -#: gui/sdccoptionswidget.ui:198 +#: gui/sdccoptionswidget.ui:171 #, no-c-format msgid "Don't memcpy initialized &xram from code (--no-xinit-opt)" msgstr "Ne fait pas memcpy du code vers la &xram initialisée (--no-xinit-opt)" -#: gui/sdccoptionswidget.ui:201 gui/sdccoptionswidget.ui:472 -#, no-c-format -msgid "Alt+X" -msgstr "Alt+X" - -#: gui/sdccoptionswidget.ui:204 +#: gui/sdccoptionswidget.ui:174 #, no-c-format msgid "" "Will not memcpy initialized data from code space into xdata space. This " @@ -4074,24 +4012,24 @@ msgstr "" "un espace xdata. Ça économise quelques octets dans l'espace de code si vous " "n'avez pas de données initialisées." -#: gui/sdccoptionswidget.ui:212 +#: gui/sdccoptionswidget.ui:182 #, no-c-format msgid "Callee will &always save registers used (--all-callee-saves)" msgstr "L'&appelé sauvera toujours les registres utilisés (--all-callee-saves)" -#: gui/sdccoptionswidget.ui:242 +#: gui/sdccoptionswidget.ui:209 #, no-c-format msgid "&Optimization" msgstr "&Optimisation" -#: gui/sdccoptionswidget.ui:253 +#: gui/sdccoptionswidget.ui:220 #, no-c-format msgid "Disable overlaying leaf function &auto variables (--nooverlay)" msgstr "" "Inactive l'overlay pour les variables &automatiques feuilles d'une fonction " "(--nooverlay)" -#: gui/sdccoptionswidget.ui:259 +#: gui/sdccoptionswidget.ui:223 #, no-c-format msgid "" "The compiler will not overlay parameters and local variables of any " @@ -4101,62 +4039,57 @@ msgstr "" "locales d'aucune fonction, voyez le chapitre Paramètres et variables locales " "pour plus de détails." -#: gui/sdccoptionswidget.ui:267 +#: gui/sdccoptionswidget.ui:231 #, no-c-format msgid "Disable the GCSE optimization (--nogcse)" msgstr "Inactive l'optimisation GCSE (--nogcse)" -#: gui/sdccoptionswidget.ui:278 +#: gui/sdccoptionswidget.ui:239 #, no-c-format msgid "Disable label optimi&zation (--nolabelopt)" msgstr "Inactive l'optimi&zation de lable (--nolabelopt)" -#: gui/sdccoptionswidget.ui:281 gui/sdccoptionswidget.ui:505 -#, no-c-format -msgid "Alt+Z" -msgstr "Alt+Z" - -#: gui/sdccoptionswidget.ui:284 +#: gui/sdccoptionswidget.ui:242 #, no-c-format msgid "Will not optimize labels (makes the dumpfiles more readable)." msgstr "N'optimisera pas les labels (rend les fichiers de dump plus lisibles)." -#: gui/sdccoptionswidget.ui:292 +#: gui/sdccoptionswidget.ui:250 #, no-c-format msgid "Disable optimization of invariants (--noinvariant)" msgstr "Inactive l'optimisation des invariants (--noinvariant)" -#: gui/sdccoptionswidget.ui:303 +#: gui/sdccoptionswidget.ui:258 #, no-c-format msgid "Disable loop variable induction (--noinduction)" msgstr "Incative l'induction de variable de boucle (--noinduction)" -#: gui/sdccoptionswidget.ui:314 +#: gui/sdccoptionswidget.ui:266 #, no-c-format msgid "Disable peep-hole optimization (--&no-peep)" msgstr "Inactive l'optimisation peep-hole (--&no-peep)" -#: gui/sdccoptionswidget.ui:320 +#: gui/sdccoptionswidget.ui:269 #, no-c-format msgid "Disable peep-hole optimization." msgstr "Inactive l'optimisation peep-hole." -#: gui/sdccoptionswidget.ui:328 +#: gui/sdccoptionswidget.ui:277 #, no-c-format msgid "Disable loop reverse optimization (--noloopreverse)" msgstr "Désactive l'optimisation d'inversion de boucle (--noloopreverse)" -#: gui/sdccoptionswidget.ui:334 +#: gui/sdccoptionswidget.ui:280 #, no-c-format msgid "Will not do loop reversal optimization." msgstr "Ne fera pas d'optimisation d'inversion de boucle" -#: gui/sdccoptionswidget.ui:342 +#: gui/sdccoptionswidget.ui:288 #, no-c-format msgid "Opti&mize for compact code (--opt-code-size)" msgstr "Opti&mise pour un code compact (--opt-code-size)" -#: gui/sdccoptionswidget.ui:348 +#: gui/sdccoptionswidget.ui:291 #, no-c-format msgid "" "The compiler will optimize code generation towards compact code, possibly at " @@ -4165,12 +4098,12 @@ msgstr "" "Le compilateur optimisera la génération de code pour faire un code compact, " "éventuellement aux dépens de la vitesse." -#: gui/sdccoptionswidget.ui:356 +#: gui/sdccoptionswidget.ui:299 #, no-c-format msgid "&Optimize for fast code (--opt-code-speed)" msgstr "&Optimise pour la rapidité du code (--opt-code-speed)" -#: gui/sdccoptionswidget.ui:362 +#: gui/sdccoptionswidget.ui:302 #, no-c-format msgid "" "The compiler will optimize code generation towards fast code, possibly at " @@ -4179,12 +4112,12 @@ msgstr "" "Le compilateur optimisera la génération de code pour faire du code rapide, " "éventuellement aux dépens de la taille du code." -#: gui/sdccoptionswidget.ui:370 +#: gui/sdccoptionswidget.ui:310 #, no-c-format msgid "Ena&ble inline assembly peephole optimization (--peep-asm)" msgstr "Active l'optimisation peephole de l'assem&blage inline (--peep-asm)" -#: gui/sdccoptionswidget.ui:376 +#: gui/sdccoptionswidget.ui:313 #, no-c-format msgid "" "Pass the inline assembler code through the peep hole optimizer. This can " @@ -4197,77 +4130,67 @@ msgstr "" "veuillez paser par les règles de l'optimiseur peephole définies dans l'arbre " "des fichiers sources '<target>/peeph.def' avant d'utiliser cette option." -#: gui/sdccoptionswidget.ui:384 +#: gui/sdccoptionswidget.ui:321 #, no-c-format msgid "Don't generate boundary check for &jump tables (--nojtbound)" msgstr "" "Ne génère pas de vérification de limites pour les tables de sauts (--" "no&jtbound)" -#: gui/sdccoptionswidget.ui:387 -#, no-c-format -msgid "Alt+J" -msgstr "Alt+J" - -#: gui/sdccoptionswidget.ui:414 +#: gui/sdccoptionswidget.ui:348 #, no-c-format msgid "PIC&16 Specific" msgstr "Spécifique PIC&16" -#: gui/sdccoptionswidget.ui:425 +#: gui/sdccoptionswidget.ui:359 #, no-c-format msgid "Don't use default libraries (--nodefaultlibs)" msgstr "Ne pas utiliser les bibliothèques par défaut (--nodefaultlibs)" -#: gui/sdccoptionswidget.ui:436 +#: gui/sdccoptionswidget.ui:367 #, no-c-format msgid "Don't generate BANKSEL directives (--pno-banksel)" msgstr "Ne pas générer de directives BANKSEL (--pno-banksel)" -#: gui/sdccoptionswidget.ui:447 +#: gui/sdccoptionswidget.ui:375 #, no-c-format msgid "Use large stac&k model (--pstack-model=large)" msgstr "Utiliser le modèle de grande pile ((--pstac&k-model=large)" -#: gui/sdccoptionswidget.ui:450 -#, no-c-format -msgid "Alt+K" -msgstr "Alt+K" - -#: gui/sdccoptionswidget.ui:458 +#: gui/sdccoptionswidget.ui:383 #, no-c-format msgid "Show more debug info in assembl&y output (--debug-xtra)" msgstr "" "Montrer plus d'information de débogage dans la sortie de l'assembleur (--" "debug-xtra)" -#: gui/sdccoptionswidget.ui:469 +#: gui/sdccoptionswidget.ui:391 #, no-c-format msgid "E&xplicit enable of peepholes (--denable-peeps)" msgstr "Activation e&xplicite des peepholes (--denable-peeps)" -#: gui/sdccoptionswidget.ui:480 +#: gui/sdccoptionswidget.ui:399 #, no-c-format msgid "Du&mp call tree in .calltree file (--calltree)" msgstr "" "Faire un du&mp de l'arbre d'appel dans un fichier .calltree (--calltree)" -#: gui/sdccoptionswidget.ui:491 +#: gui/sdccoptionswidget.ui:407 #, no-c-format msgid "Ena&ble stack optimizations (--fstack)" msgstr "Activer les optimisations de pile (--fstack)" -#: gui/sdccoptionswidget.ui:502 +#: gui/sdccoptionswidget.ui:415 #, no-c-format msgid "Try to use conditional BRA instead of GOTO (--optimi&ze-goto)" msgstr "Essayer d'utiliser BRA conditionnel au lieu de GOTO (--optimi&ze-goto)" -#: gui/sdccoptionswidget.ui:513 +#: gui/sdccoptionswidget.ui:423 #, no-c-format msgid "Try to optimize some compares (--optimize-cmp)" msgstr "Essayer d'optimiser quelques comparaisons (--optimize-cmp)" -#: gui/sdccoptionswidget.ui:524 +#: gui/sdccoptionswidget.ui:431 #, no-c-format msgid "Thorough data flow analyis (resource intensive) (--optimize-df)" msgstr "Analyse détaillée du data flow (gourmand en ressource) (--optimize-df)" diff --git a/translations/messages/ktechlab.pot b/translations/messages/ktechlab.pot index 012d2cc..6d26ba7 100644 --- a/translations/messages/ktechlab.pot +++ b/translations/messages/ktechlab.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2022-09-07 18:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2096,22 +2096,22 @@ msgstr "" msgid "Value radix:" msgstr "" -#: gui/gpasmsettingswidget.ui:144 gui/symbolviewer.cpp:86 +#: gui/gpasmsettingswidget.ui:138 gui/symbolviewer.cpp:86 #, no-c-format msgid "Binary" msgstr "" -#: gui/gpasmsettingswidget.ui:149 gui/symbolviewer.cpp:87 +#: gui/gpasmsettingswidget.ui:143 gui/symbolviewer.cpp:87 #, no-c-format msgid "Octal" msgstr "" -#: gui/gpasmsettingswidget.ui:139 gui/symbolviewer.cpp:88 +#: gui/gpasmsettingswidget.ui:133 gui/symbolviewer.cpp:88 #, no-c-format msgid "Decimal" msgstr "" -#: gui/gpasmsettingswidget.ui:154 gui/symbolviewer.cpp:89 +#: gui/gpasmsettingswidget.ui:148 gui/symbolviewer.cpp:89 #, no-c-format msgid "Hexadecimal" msgstr "" @@ -3042,13 +3042,6 @@ msgstr "" msgid "&Automatically format Microbe output" msgstr "" -#: gui/asmformattingwidget.ui:175 gui/generaloptionswidget.ui:126 -#: gui/newfilewidget.ui:113 gui/picprogrammerconfigwidget.ui:61 -#: gui/sdccoptionswidget.ui:215 gui/sdccoptionswidget.ui:256 -#, no-c-format -msgid "Alt+A" -msgstr "" - #: gui/createsubprojectwidget.ui:16 #, no-c-format msgid "Create Subproject" @@ -3069,7 +3062,7 @@ msgstr "" msgid "Type:" msgstr "" -#: gui/createsubprojectwidget.ui:62 gui/linkeroptionswidget.ui:128 +#: gui/createsubprojectwidget.ui:62 gui/linkeroptionswidget.ui:125 #, no-c-format msgid "Library" msgstr "" @@ -3079,97 +3072,74 @@ msgstr "" msgid "Reuse the same output view for code generation" msgstr "" -#: gui/generaloptionswidget.ui:41 +#: gui/generaloptionswidget.ui:38 #, no-c-format msgid "Show voltage bars &on electronic components" msgstr "" -#: gui/generaloptionswidget.ui:44 gui/gpasmsettingswidget.ui:60 -#: gui/linkeroptionswidget.ui:85 gui/sdccoptionswidget.ui:359 -#, no-c-format -msgid "Alt+O" -msgstr "" - -#: gui/generaloptionswidget.ui:52 +#: gui/generaloptionswidget.ui:46 #, no-c-format msgid "Grid Colour" msgstr "" -#: gui/generaloptionswidget.ui:55 +#: gui/generaloptionswidget.ui:49 #, no-c-format msgid "The grid color in the work area." msgstr "" -#: gui/generaloptionswidget.ui:63 +#: gui/generaloptionswidget.ui:57 #, no-c-format msgid "Show &grid:" msgstr "" -#: gui/generaloptionswidget.ui:66 -#, no-c-format -msgid "Alt+G" -msgstr "" - -#: gui/generaloptionswidget.ui:90 +#: gui/generaloptionswidget.ui:81 #, no-c-format msgid "Maximum undo steps for work area:" msgstr "" -#: gui/generaloptionswidget.ui:93 +#: gui/generaloptionswidget.ui:84 #, no-c-format msgid "" "Maximum undo steps for work area. This doesn't apply to text documents - " "that is configurable seperately under Configure Editor." msgstr "" -#: gui/generaloptionswidget.ui:101 +#: gui/generaloptionswidget.ui:92 #, no-c-format msgid "Convenience" msgstr "" -#: gui/generaloptionswidget.ui:112 +#: gui/generaloptionswidget.ui:103 #, no-c-format msgid "Restore opened doc&uments on startup" msgstr "" -#: gui/generaloptionswidget.ui:115 -#, no-c-format -msgid "Alt+U" -msgstr "" - -#: gui/generaloptionswidget.ui:123 +#: gui/generaloptionswidget.ui:111 #, no-c-format msgid "Raise the &appropriate item selector on creating a new document" msgstr "" -#: gui/generaloptionswidget.ui:134 +#: gui/generaloptionswidget.ui:119 #, no-c-format msgid "Raise the &Messages log when compiling" msgstr "" -#: gui/generaloptionswidget.ui:137 gui/picprogrammerconfigwidget.ui:72 -#: gui/sdccoptionswidget.ui:142 gui/sdccoptionswidget.ui:345 -#: gui/sdccoptionswidget.ui:483 -#, no-c-format -msgid "Alt+M" -msgstr "" - -#: gui/generaloptionswidget.ui:147 +#: gui/generaloptionswidget.ui:129 #, no-c-format msgid "Display Refresh Rate" msgstr "" -#: gui/generaloptionswidget.ui:186 +#: gui/generaloptionswidget.ui:168 #, no-c-format msgid "Refresh rate:" msgstr "" -#: gui/generaloptionswidget.ui:194 +#: gui/generaloptionswidget.ui:176 #, no-c-format msgid "Medium (50 FPS)" msgstr "" -#: gui/generaloptionswidget.ui:212 +#: gui/generaloptionswidget.ui:194 #, no-c-format msgid "" "This is the number of times per second that the work area view is updated; a " @@ -3201,24 +3171,19 @@ msgstr "" msgid "Ign&ore case (-i)" msgstr "" -#: gui/gpasmsettingswidget.ui:63 +#: gui/gpasmsettingswidget.ui:60 #, no-c-format msgid "" "All user defined symbols and macros are case sensitive. This option makes " "them case insensitive." msgstr "" -#: gui/gpasmsettingswidget.ui:71 +#: gui/gpasmsettingswidget.ui:68 #, no-c-format msgid "Generate DOS-formated hex file (-&n)" msgstr "" -#: gui/gpasmsettingswidget.ui:74 gui/sdccoptionswidget.ui:317 -#, no-c-format -msgid "Alt+N" -msgstr "" - -#: gui/gpasmsettingswidget.ui:77 +#: gui/gpasmsettingswidget.ui:71 #, no-c-format msgid "" "By default, gpasm generates hex files using ISO format. However, some device " @@ -3226,49 +3191,49 @@ msgid "" "generate a DOS formatted hex file. " msgstr "" -#: gui/gpasmsettingswidget.ui:100 gui/linkeroptionswidget.ui:28 +#: gui/gpasmsettingswidget.ui:94 gui/linkeroptionswidget.ui:28 #, no-c-format msgid "inhx32" msgstr "" -#: gui/gpasmsettingswidget.ui:105 gui/linkeroptionswidget.ui:33 +#: gui/gpasmsettingswidget.ui:99 gui/linkeroptionswidget.ui:33 #, no-c-format msgid "inhx8m" msgstr "" -#: gui/gpasmsettingswidget.ui:110 gui/linkeroptionswidget.ui:38 +#: gui/gpasmsettingswidget.ui:104 gui/linkeroptionswidget.ui:38 #, no-c-format msgid "inhx8s" msgstr "" -#: gui/gpasmsettingswidget.ui:115 gui/linkeroptionswidget.ui:43 +#: gui/gpasmsettingswidget.ui:109 gui/linkeroptionswidget.ui:43 #, no-c-format msgid "inhx16" msgstr "" -#: gui/gpasmsettingswidget.ui:133 gui/linkeroptionswidget.ui:53 +#: gui/gpasmsettingswidget.ui:127 gui/linkeroptionswidget.ui:53 #, no-c-format msgid "" "GPASM supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats. This " "option controls which hex file format is used." msgstr "" -#: gui/gpasmsettingswidget.ui:172 +#: gui/gpasmsettingswidget.ui:166 #, no-c-format msgid "All" msgstr "" -#: gui/gpasmsettingswidget.ui:177 +#: gui/gpasmsettingswidget.ui:171 #, no-c-format msgid "Warnings" msgstr "" -#: gui/gpasmsettingswidget.ui:182 +#: gui/gpasmsettingswidget.ui:176 #, no-c-format msgid "Errors" msgstr "" -#: gui/gpasmsettingswidget.ui:197 +#: gui/gpasmsettingswidget.ui:191 #, no-c-format msgid "" "This sets the threshold of messages displayed in the log view.<ul><li>\"All" @@ -3277,7 +3242,7 @@ msgid "" "warnings.</ul>" msgstr "" -#: gui/gpasmsettingswidget.ui:256 gui/sdccoptionswidget.ui:560 +#: gui/gpasmsettingswidget.ui:250 gui/sdccoptionswidget.ui:464 #, no-c-format msgid "Other options:" msgstr "" @@ -3297,17 +3262,17 @@ msgstr "" msgid "&Output a map file (-m)" msgstr "" -#: gui/linkeroptionswidget.ui:93 +#: gui/linkeroptionswidget.ui:90 #, no-c-format msgid "Linker Script (-s):" msgstr "" -#: gui/linkeroptionswidget.ui:111 +#: gui/linkeroptionswidget.ui:108 #, no-c-format msgid "Other:" msgstr "" -#: gui/linkeroptionswidget.ui:119 +#: gui/linkeroptionswidget.ui:116 #, no-c-format msgid "Link libraries inside project" msgstr "" @@ -3418,13 +3383,7 @@ msgstr "" msgid "Modif&y" msgstr "" -#: gui/microsettingswidget.ui:171 gui/sdccoptionswidget.ui:48 -#: gui/sdccoptionswidget.ui:176 gui/sdccoptionswidget.ui:461 -#, no-c-format -msgid "Alt+Y" -msgstr "" - -#: gui/microsettingswidget.ui:179 +#: gui/microsettingswidget.ui:176 #, no-c-format msgid "Rename" msgstr "" @@ -3565,42 +3524,42 @@ msgstr "" msgid "&Add ..." msgstr "" -#: gui/picprogrammerconfigwidget.ui:69 +#: gui/picprogrammerconfigwidget.ui:66 #, no-c-format msgid "Re&move" msgstr "" -#: gui/picprogrammerconfigwidget.ui:80 gui/programmerwidget.ui:30 +#: gui/picprogrammerconfigwidget.ui:74 gui/programmerwidget.ui:30 #, no-c-format msgid "Program:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:104 +#: gui/picprogrammerconfigwidget.ui:98 #, no-c-format msgid "(Program Description)" msgstr "" -#: gui/picprogrammerconfigwidget.ui:114 +#: gui/picprogrammerconfigwidget.ui:108 #, no-c-format msgid "Commands" msgstr "" -#: gui/picprogrammerconfigwidget.ui:125 +#: gui/picprogrammerconfigwidget.ui:119 #, no-c-format msgid "Initialization:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:153 +#: gui/picprogrammerconfigwidget.ui:147 #, no-c-format msgid "Read:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:161 +#: gui/picprogrammerconfigwidget.ui:155 #, no-c-format msgid "Write:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:179 +#: gui/picprogrammerconfigwidget.ui:173 #, no-c-format msgid "" "The following strings will be replaced when the command is run:\n" @@ -3611,22 +3570,22 @@ msgid "" "</ul>" msgstr "" -#: gui/picprogrammerconfigwidget.ui:195 +#: gui/picprogrammerconfigwidget.ui:189 #, no-c-format msgid "Erase:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:203 +#: gui/picprogrammerconfigwidget.ui:197 #, no-c-format msgid "Verify:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:211 +#: gui/picprogrammerconfigwidget.ui:205 #, no-c-format msgid "Blank Check:" msgstr "" -#: gui/picprogrammerconfigwidget.ui:229 +#: gui/picprogrammerconfigwidget.ui:223 #, no-c-format msgid "Default port:" msgstr "" @@ -3656,67 +3615,51 @@ msgstr "" msgid "Don't search in the standard librar&y directory (--nostdlib)" msgstr "" -#: gui/sdccoptionswidget.ui:56 +#: gui/sdccoptionswidget.ui:53 #, no-c-format msgid "Don't search in the standard include directory (--nostdinc)" msgstr "" -#: gui/sdccoptionswidget.ui:67 +#: gui/sdccoptionswidget.ui:61 #, no-c-format msgid "Disa&ble pedantic warnings (--less-pedantic)" msgstr "" -#: gui/sdccoptionswidget.ui:70 gui/sdccoptionswidget.ui:159 -#: gui/sdccoptionswidget.ui:373 gui/sdccoptionswidget.ui:494 -#, no-c-format -msgid "Alt+B" -msgstr "" - -#: gui/sdccoptionswidget.ui:78 +#: gui/sdccoptionswidget.ui:69 #, no-c-format msgid "Use C&89 standard only (--std-c89)" msgstr "" -#: gui/sdccoptionswidget.ui:81 -#, no-c-format -msgid "Alt+8" -msgstr "" - -#: gui/sdccoptionswidget.ui:84 +#: gui/sdccoptionswidget.ui:72 #, no-c-format msgid "" "Follow the C89 standard and disable SDCC features that conflict with the " "standard." msgstr "" -#: gui/sdccoptionswidget.ui:92 +#: gui/sdccoptionswidget.ui:80 #, no-c-format msgid "Use C&99 standard only (--std-c99)" msgstr "" -#: gui/sdccoptionswidget.ui:95 -#, no-c-format -msgid "Alt+9" -msgstr "" - -#: gui/sdccoptionswidget.ui:101 +#: gui/sdccoptionswidget.ui:86 #, no-c-format msgid "" "Follow the C99 standard and disable SDCC features that conflict with the " "standard (incomplete support)." msgstr "" -#: gui/sdccoptionswidget.ui:128 +#: gui/sdccoptionswidget.ui:113 #, no-c-format msgid "Code Gener&ation" msgstr "" -#: gui/sdccoptionswidget.ui:139 +#: gui/sdccoptionswidget.ui:124 #, no-c-format msgid "Stack auto&matic variables (--stack-auto)" msgstr "" -#: gui/sdccoptionswidget.ui:148 +#: gui/sdccoptionswidget.ui:130 #, no-c-format msgid "" "All functions in the source file will be compiled as reentrant, i.e. the " @@ -3725,152 +3668,142 @@ msgid "" "option. It automatically implies -int-long-reent and -float-reent." msgstr "" -#: gui/sdccoptionswidget.ui:156 +#: gui/sdccoptionswidget.ui:138 #, no-c-format msgid "Integer li&braries were compiled as reentrant (--int-long-reent)" msgstr "" -#: gui/sdccoptionswidget.ui:165 +#: gui/sdccoptionswidget.ui:144 #, no-c-format msgid "" "Integer (16 bit) and long (32 bit) libraries have been compiled as " "reentrant. Note by default these libraries are compiled as non-reentrant." msgstr "" -#: gui/sdccoptionswidget.ui:173 +#: gui/sdccoptionswidget.ui:152 #, no-c-format msgid "Floating point librar&y was compiled as reentrant (--float-reent)" msgstr "" -#: gui/sdccoptionswidget.ui:179 +#: gui/sdccoptionswidget.ui:155 #, no-c-format msgid "Floating point library is compiled as reentrant." msgstr "" -#: gui/sdccoptionswidget.ui:187 +#: gui/sdccoptionswidget.ui:163 #, no-c-format msgid "Leave out the frame pointer (--fommit-frame-pointer)" msgstr "" -#: gui/sdccoptionswidget.ui:198 +#: gui/sdccoptionswidget.ui:171 #, no-c-format msgid "Don't memcpy initialized &xram from code (--no-xinit-opt)" msgstr "" -#: gui/sdccoptionswidget.ui:201 gui/sdccoptionswidget.ui:472 -#, no-c-format -msgid "Alt+X" -msgstr "" - -#: gui/sdccoptionswidget.ui:204 +#: gui/sdccoptionswidget.ui:174 #, no-c-format msgid "" "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." msgstr "" -#: gui/sdccoptionswidget.ui:212 +#: gui/sdccoptionswidget.ui:182 #, no-c-format msgid "Callee will &always save registers used (--all-callee-saves)" msgstr "" -#: gui/sdccoptionswidget.ui:242 +#: gui/sdccoptionswidget.ui:209 #, no-c-format msgid "&Optimization" msgstr "" -#: gui/sdccoptionswidget.ui:253 +#: gui/sdccoptionswidget.ui:220 #, no-c-format msgid "Disable overlaying leaf function &auto variables (--nooverlay)" msgstr "" -#: gui/sdccoptionswidget.ui:259 +#: gui/sdccoptionswidget.ui:223 #, no-c-format msgid "" "The compiler will not overlay parameters and local variables of any " "function, see section Parameters and local variables for more details." msgstr "" -#: gui/sdccoptionswidget.ui:267 +#: gui/sdccoptionswidget.ui:231 #, no-c-format msgid "Disable the GCSE optimization (--nogcse)" msgstr "" -#: gui/sdccoptionswidget.ui:278 +#: gui/sdccoptionswidget.ui:239 #, no-c-format msgid "Disable label optimi&zation (--nolabelopt)" msgstr "" -#: gui/sdccoptionswidget.ui:281 gui/sdccoptionswidget.ui:505 -#, no-c-format -msgid "Alt+Z" -msgstr "" - -#: gui/sdccoptionswidget.ui:284 +#: gui/sdccoptionswidget.ui:242 #, no-c-format msgid "Will not optimize labels (makes the dumpfiles more readable)." msgstr "" -#: gui/sdccoptionswidget.ui:292 +#: gui/sdccoptionswidget.ui:250 #, no-c-format msgid "Disable optimization of invariants (--noinvariant)" msgstr "" -#: gui/sdccoptionswidget.ui:303 +#: gui/sdccoptionswidget.ui:258 #, no-c-format msgid "Disable loop variable induction (--noinduction)" msgstr "" -#: gui/sdccoptionswidget.ui:314 +#: gui/sdccoptionswidget.ui:266 #, no-c-format msgid "Disable peep-hole optimization (--&no-peep)" msgstr "" -#: gui/sdccoptionswidget.ui:320 +#: gui/sdccoptionswidget.ui:269 #, no-c-format msgid "Disable peep-hole optimization." msgstr "" -#: gui/sdccoptionswidget.ui:328 +#: gui/sdccoptionswidget.ui:277 #, no-c-format msgid "Disable loop reverse optimization (--noloopreverse)" msgstr "" -#: gui/sdccoptionswidget.ui:334 +#: gui/sdccoptionswidget.ui:280 #, no-c-format msgid "Will not do loop reversal optimization." msgstr "" -#: gui/sdccoptionswidget.ui:342 +#: gui/sdccoptionswidget.ui:288 #, no-c-format msgid "Opti&mize for compact code (--opt-code-size)" msgstr "" -#: gui/sdccoptionswidget.ui:348 +#: gui/sdccoptionswidget.ui:291 #, no-c-format msgid "" "The compiler will optimize code generation towards compact code, possibly at " "the expense of code speed." msgstr "" -#: gui/sdccoptionswidget.ui:356 +#: gui/sdccoptionswidget.ui:299 #, no-c-format msgid "&Optimize for fast code (--opt-code-speed)" msgstr "" -#: gui/sdccoptionswidget.ui:362 +#: gui/sdccoptionswidget.ui:302 #, no-c-format msgid "" "The compiler will optimize code generation towards fast code, possibly at " "the expense of code size." msgstr "" -#: gui/sdccoptionswidget.ui:370 +#: gui/sdccoptionswidget.ui:310 #, no-c-format msgid "Ena&ble inline assembly peephole optimization (--peep-asm)" msgstr "" -#: gui/sdccoptionswidget.ui:376 +#: gui/sdccoptionswidget.ui:313 #, no-c-format msgid "" "Pass the inline assembler code through the peep hole optimizer. This can " @@ -3879,72 +3812,62 @@ msgid "" "def' before using this option." msgstr "" -#: gui/sdccoptionswidget.ui:384 +#: gui/sdccoptionswidget.ui:321 #, no-c-format msgid "Don't generate boundary check for &jump tables (--nojtbound)" msgstr "" -#: gui/sdccoptionswidget.ui:387 -#, no-c-format -msgid "Alt+J" -msgstr "" - -#: gui/sdccoptionswidget.ui:414 +#: gui/sdccoptionswidget.ui:348 #, no-c-format msgid "PIC&16 Specific" msgstr "" -#: gui/sdccoptionswidget.ui:425 +#: gui/sdccoptionswidget.ui:359 #, no-c-format msgid "Don't use default libraries (--nodefaultlibs)" msgstr "" -#: gui/sdccoptionswidget.ui:436 +#: gui/sdccoptionswidget.ui:367 #, no-c-format msgid "Don't generate BANKSEL directives (--pno-banksel)" msgstr "" -#: gui/sdccoptionswidget.ui:447 +#: gui/sdccoptionswidget.ui:375 #, no-c-format msgid "Use large stac&k model (--pstack-model=large)" msgstr "" -#: gui/sdccoptionswidget.ui:450 -#, no-c-format -msgid "Alt+K" -msgstr "" - -#: gui/sdccoptionswidget.ui:458 +#: gui/sdccoptionswidget.ui:383 #, no-c-format msgid "Show more debug info in assembl&y output (--debug-xtra)" msgstr "" -#: gui/sdccoptionswidget.ui:469 +#: gui/sdccoptionswidget.ui:391 #, no-c-format msgid "E&xplicit enable of peepholes (--denable-peeps)" msgstr "" -#: gui/sdccoptionswidget.ui:480 +#: gui/sdccoptionswidget.ui:399 #, no-c-format msgid "Du&mp call tree in .calltree file (--calltree)" msgstr "" -#: gui/sdccoptionswidget.ui:491 +#: gui/sdccoptionswidget.ui:407 #, no-c-format msgid "Ena&ble stack optimizations (--fstack)" msgstr "" -#: gui/sdccoptionswidget.ui:502 +#: gui/sdccoptionswidget.ui:415 #, no-c-format msgid "Try to use conditional BRA instead of GOTO (--optimi&ze-goto)" msgstr "" -#: gui/sdccoptionswidget.ui:513 +#: gui/sdccoptionswidget.ui:423 #, no-c-format msgid "Try to optimize some compares (--optimize-cmp)" msgstr "" -#: gui/sdccoptionswidget.ui:524 +#: gui/sdccoptionswidget.ui:431 #, no-c-format msgid "Thorough data flow analyis (resource intensive) (--optimize-df)" msgstr "" |