Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 4 insertions, 4 deletions

diff --git a/pytquic3/form.cpp b/pytquic3/form.cpp
index 0d1255a..b0de614 100644
--- a/pytquic3/form.cpp
+++ b/pytquic3/form.cpp
@@ -598,14 +598,14 @@ void Uic::createFormImpl( const TQDomElement &e )
 		    receiver = "self." + receiver;
 
 		out << indent << "self.connect(" << sender
-		    << ",SIGNAL(\"" << signal << "\")," << receiver;
+		    << ",TQ_SIGNAL(\"" << signal << "\")," << receiver;
 
-		// Normally we never use the SLOT() macro in case the
+		// Normally we never use the TQ_SLOT() macro in case the
 		// connection is to a method of a Python custom widget.  The
 		// exception is if the receiver is a TQAxWidget where it must be
 		// used because the slots are dynamic.
 		if (isaxwidget)
-		    out << ",SLOT(\"" << slot << "\")";
+		    out << ",TQ_SLOT(\"" << slot << "\")";
 		else
 		{
 		    TQString mname = slot.left(slot.find('('));
diff --git a/pytquic3/main.cpp b/pytquic3/main.cpp
index 24fbbf3..826b1ef 100644
--- a/pytquic3/main.cpp
+++ b/pytquic3/main.cpp
@@ -228,7 +228,7 @@ int main( int argc, char * argv[] )
 	out << indent << "if __name__ == \"__main__\":" << endl;
 	++indent;
 	out << indent << "a = TQApplication(sys.argv)" << endl;
-	out << indent << "TQObject.connect(a,SIGNAL(\"lastWindowClosed()\"),a,SLOT(\"quit()\"))" << endl;
+	out << indent << "TQObject.connect(a,TQ_SIGNAL(\"lastWindowClosed()\"),a,TQ_SLOT(\"quit()\"))" << endl;
 	out << indent << "w = " << (subcl ? className : uicClass) << "()" << endl;
 	out << indent << "a.setMainWidget(w)" << endl;