diff options
Diffstat (limited to 'src/electronics')
-rw-r--r-- | src/electronics/component.h | 2 | ||||
-rw-r--r-- | src/electronics/components/ecpotentiometer.cpp | 2 | ||||
-rw-r--r-- | src/electronics/components/ecsubcircuit.h | 2 | ||||
-rw-r--r-- | src/electronics/components/piccomponent.cpp | 18 | ||||
-rw-r--r-- | src/electronics/components/piccomponent.h | 2 | ||||
-rw-r--r-- | src/electronics/ecnode.cpp | 4 | ||||
-rw-r--r-- | src/electronics/ecnode.h | 2 | ||||
-rw-r--r-- | src/electronics/gpsimprocessor.cpp | 22 | ||||
-rw-r--r-- | src/electronics/gpsimprocessor.h | 6 | ||||
-rw-r--r-- | src/electronics/subcircuits.cpp | 2 | ||||
-rw-r--r-- | src/electronics/subcircuits.h | 2 | ||||
-rw-r--r-- | src/electronics/switch.cpp | 2 | ||||
-rw-r--r-- | src/electronics/switch.h | 2 |
13 files changed, 34 insertions, 34 deletions
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..2202be6 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -57,8 +57,8 @@ void initialize_ConsoleUI(); extern void initialize_readline(); extern void gui_main(void); extern void cli_main(); -KDE_EXPORT void gpsim_version() {}; -KDE_EXPORT void quit_gui() {}; +TDE_EXPORT void gpsim_version() {}; +TDE_EXPORT void quit_gui() {}; //BEGIN class GpsimProcessor @@ -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: |