Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 22 insertions, 22 deletions

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/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/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/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/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;