diff --git a/clients/tde/src/app/Makefile.am b/clients/tde/src/app/Makefile.am
index 01fa891..535f3a3 100644
--- a/clients/tde/src/app/Makefile.am
+++ b/clients/tde/src/app/Makefile.am
@@ -8,4 +8,4 @@ KDE_ICON = remote_laboratory_client
 bin_PROGRAMS = remote_laboratory_client
 remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
 remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_TDEPARTS) $(LIB_TDEUI)
-remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla -ltdeldap
+remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla -ltdeldap
diff --git a/clients/tde/src/app/remotemdi.h b/clients/tde/src/app/remotemdi.h
index 92e48c6..8f848ca 100644
--- a/clients/tde/src/app/remotemdi.h
+++ b/clients/tde/src/app/remotemdi.h
@@ -30,7 +30,7 @@ class TDEToggleAction;
  */
 class RemoteMDI : public KMdiMainFrm
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/clients/tde/src/app/views/instrumentview.h b/clients/tde/src/app/views/instrumentview.h
index 36b9aad..1f30444 100644
--- a/clients/tde/src/app/views/instrumentview.h
+++ b/clients/tde/src/app/views/instrumentview.h
@@ -18,7 +18,7 @@ typedef KParts::RemoteInstrumentPart InstrumentPart;
 
 class InstrumentView : public KMdiChildView
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		InstrumentView(const TQString &library, TQWidget *parentWidget=0L, const char *name=0L, WFlags f=0);
diff --git a/clients/tde/src/dialogs/selectserverdlg.h b/clients/tde/src/dialogs/selectserverdlg.h
index 740f76b..8d52e02 100644
--- a/clients/tde/src/dialogs/selectserverdlg.h
+++ b/clients/tde/src/dialogs/selectserverdlg.h
@@ -30,7 +30,7 @@ class SelectServerDlg;
 
 class SelectServerDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	SelectServerDialog(TQWidget* parent = 0, const char* name = 0, StationList sl = StationList());
diff --git a/clients/tde/src/part/adminconsole/Makefile.am b/clients/tde/src/part/adminconsole/Makefile.am
index 3d2ebfd..eec8264 100644
--- a/clients/tde/src/part/adminconsole/Makefile.am
+++ b/clients/tde/src/part/adminconsole/Makefile.am
@@ -6,6 +6,6 @@ KDE_ICON = libremotelab_adminconsole
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_adminconsole.la
-libremotelab_adminconsole_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_adminconsole_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui
diff --git a/clients/tde/src/part/adminconsole/part.h b/clients/tde/src/part/adminconsole/part.h
index ef2a9c4..1edc260 100644
--- a/clients/tde/src/part/adminconsole/part.h
+++ b/clients/tde/src/part/adminconsole/part.h
@@ -50,7 +50,7 @@ namespace RemoteLab
 {
 	class AdminConsolePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			AdminConsolePart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/adminconsole/terminatedlg.h b/clients/tde/src/part/adminconsole/terminatedlg.h
index eff6080..cb95b35 100644
--- a/clients/tde/src/part/adminconsole/terminatedlg.h
+++ b/clients/tde/src/part/adminconsole/terminatedlg.h
@@ -29,7 +29,7 @@ class TopLevel;
 
 class TerminateDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TerminateDialog(TQWidget* parent = 0, const char* name = 0);
diff --git a/clients/tde/src/part/adminusermgmt/Makefile.am b/clients/tde/src/part/adminusermgmt/Makefile.am
index fd9b013..1b0b032 100644
--- a/clients/tde/src/part/adminusermgmt/Makefile.am
+++ b/clients/tde/src/part/adminusermgmt/Makefile.am
@@ -6,6 +6,6 @@ KDE_ICON = libremotelab_adminusermgmt
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la
-libremotelab_adminusermgmt_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_adminusermgmt_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui
diff --git a/clients/tde/src/part/adminusermgmt/groupauthdlg.h b/clients/tde/src/part/adminusermgmt/groupauthdlg.h
index 1c3498d..c1e70c0 100644
--- a/clients/tde/src/part/adminusermgmt/groupauthdlg.h
+++ b/clients/tde/src/part/adminusermgmt/groupauthdlg.h
@@ -47,7 +47,7 @@ class TQListBoxKeyedText : public TQListBoxText
 
 class GroupPermissionsDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		GroupPermissionsDialog(TQWidget* parent = 0, const char* name = 0);
diff --git a/clients/tde/src/part/adminusermgmt/part.h b/clients/tde/src/part/adminusermgmt/part.h
index f5dae85..98e861d 100644
--- a/clients/tde/src/part/adminusermgmt/part.h
+++ b/clients/tde/src/part/adminusermgmt/part.h
@@ -50,7 +50,7 @@ namespace RemoteLab
 {
 	class UserManagementPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			UserManagementPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/commanalyzer/Makefile.am b/clients/tde/src/part/commanalyzer/Makefile.am
index eacd326..d37e4fd 100644
--- a/clients/tde/src/part/commanalyzer/Makefile.am
+++ b/clients/tde/src/part/commanalyzer/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_commanalyzer
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_commanalyzer.la
-libremotelab_commanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_commanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_commanalyzer_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/commanalyzer/part.h b/clients/tde/src/part/commanalyzer/part.h
index c1a30f4..4b59d21 100644
--- a/clients/tde/src/part/commanalyzer/part.h
+++ b/clients/tde/src/part/commanalyzer/part.h
@@ -43,7 +43,7 @@ namespace RemoteLab
 {
 	class CommAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			CommAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/companalyzer/Makefile.am b/clients/tde/src/part/companalyzer/Makefile.am
index 67e4865..82af60e 100644
--- a/clients/tde/src/part/companalyzer/Makefile.am
+++ b/clients/tde/src/part/companalyzer/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_companalyzer
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_companalyzer.la
-libremotelab_companalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_companalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_companalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_companalyzer_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/companalyzer/part.h b/clients/tde/src/part/companalyzer/part.h
index 6795eb9..5d6e1ad 100644
--- a/clients/tde/src/part/companalyzer/part.h
+++ b/clients/tde/src/part/companalyzer/part.h
@@ -183,7 +183,7 @@ namespace RemoteLab
 
 	class CompAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/fpgaprogram/Makefile.am b/clients/tde/src/part/fpgaprogram/Makefile.am
index d891582..c3a5eb8 100644
--- a/clients/tde/src/part/fpgaprogram/Makefile.am
+++ b/clients/tde/src/part/fpgaprogram/Makefile.am
@@ -6,6 +6,6 @@ KDE_ICON = libremotelab_fpgaprogrammer
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la
-libremotelab_fpgaprogrammer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_fpgaprogrammer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/fpgaprogram/part.h b/clients/tde/src/part/fpgaprogram/part.h
index 95ea66c..8c79ea9 100644
--- a/clients/tde/src/part/fpgaprogram/part.h
+++ b/clients/tde/src/part/fpgaprogram/part.h
@@ -52,7 +52,7 @@ namespace RemoteLab
 {
 	class FPGAProgramPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			FPGAProgramPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/fpgaview/Makefile.am b/clients/tde/src/part/fpgaview/Makefile.am
index 2b23465..4d99257 100644
--- a/clients/tde/src/part/fpgaview/Makefile.am
+++ b/clients/tde/src/part/fpgaview/Makefile.am
@@ -6,6 +6,6 @@ KDE_ICON = libremotelab_fpgaviewer
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la
-libremotelab_fpgaviewer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_fpgaviewer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi
 libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/fpgaview/part.h b/clients/tde/src/part/fpgaview/part.h
index 57e1971..78a5cf2 100644
--- a/clients/tde/src/part/fpgaview/part.h
+++ b/clients/tde/src/part/fpgaview/part.h
@@ -53,7 +53,7 @@ class FPGAViewBase;
 
 class FPGALed : public KLed
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		FPGALed(TQWidget *parent=0, const char *name=0);
@@ -71,7 +71,7 @@ class FPGALed : public KLed
 
 class FPGAPushButton : public KLed
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		FPGAPushButton(TQWidget *parent=0, const char *name=0);
@@ -93,7 +93,7 @@ class FPGAPushButton : public KLed
 
 class ImageViewerWindow : public KMdiChildView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ImageViewerWindow(TQString caption, TQWidget* parent=0, const char* name=0);
@@ -115,7 +115,7 @@ namespace RemoteLab
 {
 	class FPGAViewPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			enum InterfaceMode {
diff --git a/clients/tde/src/part/logicanalyzer/Makefile.am b/clients/tde/src/part/logicanalyzer/Makefile.am
index 5489f9e..e0a87d2 100644
--- a/clients/tde/src/part/logicanalyzer/Makefile.am
+++ b/clients/tde/src/part/logicanalyzer/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_logicanalyzer
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_logicanalyzer.la
-libremotelab_logicanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_logicanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_logicanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_logicanalyzer_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/logicanalyzer/part.h b/clients/tde/src/part/logicanalyzer/part.h
index b787c10..31441d5 100644
--- a/clients/tde/src/part/logicanalyzer/part.h
+++ b/clients/tde/src/part/logicanalyzer/part.h
@@ -48,7 +48,7 @@ namespace RemoteLab
 {
 	class LogicAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			LogicAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/prototerminal/Makefile.am b/clients/tde/src/part/prototerminal/Makefile.am
index 9e6af41..1363cb8 100644
--- a/clients/tde/src/part/prototerminal/Makefile.am
+++ b/clients/tde/src/part/prototerminal/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_prototerminal
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_prototerminal.la
-libremotelab_prototerminal_la_LIBADD  = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_prototerminal_la_LIBADD  = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_prototerminal_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_prototerminal_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/prototerminal/part.h b/clients/tde/src/part/prototerminal/part.h
index a7ad658..3ec676d 100644
--- a/clients/tde/src/part/prototerminal/part.h
+++ b/clients/tde/src/part/prototerminal/part.h
@@ -94,7 +94,7 @@ namespace RemoteLab
 
 	class ProtoTerminalPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			ProtoTerminalPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/scope/Makefile.am b/clients/tde/src/part/scope/Makefile.am
index 1abe8e4..cd98191 100644
--- a/clients/tde/src/part/scope/Makefile.am
+++ b/clients/tde/src/part/scope/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_scope
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_scope.la
-libremotelab_scope_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_scope_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla $(FFTS_LIBS)
 libremotelab_scope_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/scope/part.h b/clients/tde/src/part/scope/part.h
index f483a6b..26e41de 100644
--- a/clients/tde/src/part/scope/part.h
+++ b/clients/tde/src/part/scope/part.h
@@ -54,7 +54,7 @@ namespace RemoteLab
 {
 	class TraceControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -89,7 +89,7 @@ namespace RemoteLab
 
 	class MathTraceControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			MathTraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -143,7 +143,7 @@ namespace RemoteLab
 
 	class TimebaseControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TimebaseControlWidget(TQWidget *parent=0, const char *name=0);
@@ -169,7 +169,7 @@ namespace RemoteLab
 
 	class ScopePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			ScopePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/sensormonitor/Makefile.am b/clients/tde/src/part/sensormonitor/Makefile.am
index 62329e0..ad7a0d0 100644
--- a/clients/tde/src/part/sensormonitor/Makefile.am
+++ b/clients/tde/src/part/sensormonitor/Makefile.am
@@ -6,6 +6,6 @@ KDE_ICON = libremotelab_sensormonitor
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_sensormonitor.la
-libremotelab_sensormonitor_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_sensormonitor_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui
diff --git a/clients/tde/src/part/sensormonitor/part.h b/clients/tde/src/part/sensormonitor/part.h
index 94e3fb9..cde2bd0 100644
--- a/clients/tde/src/part/sensormonitor/part.h
+++ b/clients/tde/src/part/sensormonitor/part.h
@@ -60,7 +60,7 @@ namespace RemoteLab
 {
 	class Q_EXPORT TQValueTimer : public TQTimer
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TQValueTimer(TQObject *parent=0, const char *name=0);
@@ -80,7 +80,7 @@ namespace RemoteLab
 
 	class TraceControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -125,7 +125,7 @@ namespace RemoteLab
 
 	class SensorMonitorPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			SensorMonitorPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/part/serialconsole/Makefile.am b/clients/tde/src/part/serialconsole/Makefile.am
index e67b7b1..c92eafb 100644
--- a/clients/tde/src/part/serialconsole/Makefile.am
+++ b/clients/tde/src/part/serialconsole/Makefile.am
@@ -6,7 +6,7 @@ KDE_ICON = libremotelab_serialconsole
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_serialconsole.la
-libremotelab_serialconsole_la_LIBADD  = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_serialconsole_la_LIBADD  = $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_serialconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_serialconsole_la_SOURCES = \
    part.cpp layout.ui
diff --git a/clients/tde/src/part/serialconsole/part.h b/clients/tde/src/part/serialconsole/part.h
index 7bf41f3..32bbb66 100644
--- a/clients/tde/src/part/serialconsole/part.h
+++ b/clients/tde/src/part/serialconsole/part.h
@@ -43,7 +43,7 @@ namespace RemoteLab
 {
 	class SerialConsolePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			SerialConsolePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
diff --git a/clients/tde/src/widgets/floatspinbox.h b/clients/tde/src/widgets/floatspinbox.h
index 102584f..9524dbb 100644
--- a/clients/tde/src/widgets/floatspinbox.h
+++ b/clients/tde/src/widgets/floatspinbox.h
@@ -32,7 +32,7 @@
 
 class FloatSpinBox : public TQSpinBox
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		FloatSpinBox(TQWidget *parent = 0, const char* name = 0);
diff --git a/clients/tde/src/widgets/sevensegment.h b/clients/tde/src/widgets/sevensegment.h
index a14e3c5..3ba5dde 100644
--- a/clients/tde/src/widgets/sevensegment.h
+++ b/clients/tde/src/widgets/sevensegment.h
@@ -30,7 +30,7 @@ class Display7SegmentPrivate;
 
 class TQ_EXPORT Display7Segment : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 	TQ_ENUMS(SegmentStyle)
 	TQ_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle)
 
@@ -69,7 +69,7 @@ class TQ_EXPORT Display7Segment : public TQFrame
 
 class TQ_EXPORT Display7SegmentArray : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 	TQ_ENUMS(SegmentStyle)
 	TQ_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle)
 
diff --git a/clients/tde/src/widgets/tracewidget.h b/clients/tde/src/widgets/tracewidget.h
index e4cf255..17502aa 100644
--- a/clients/tde/src/widgets/tracewidget.h
+++ b/clients/tde/src/widgets/tracewidget.h
@@ -71,7 +71,7 @@ class TQRectF
 
 class TraceWidgetPushButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceWidgetPushButton(TQWidget *parent, const char* name=0);
@@ -87,7 +87,7 @@ typedef TQValueList<int> TraceNumberList;
 
 class TraceData : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceData(TraceWidget* parent, TQWidget* labelParent=0);
@@ -149,7 +149,7 @@ typedef TQMemArray<TraceData*> TraceList;
 
 class CursorData : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		CursorData(TraceWidget* parent, TQWidget* labelParent=0);
@@ -192,7 +192,7 @@ typedef TQMemArray<CursorData*> CursorList;
 
 class GraticuleWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		GraticuleWidget(TraceWidget*, const char* = 0);
@@ -241,7 +241,7 @@ class GraticuleWidget : public TQWidget
 
 class TraceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum TextDisplayType {
@@ -392,7 +392,7 @@ class TraceWidget : public TQWidget
 
 class TraceScrollView : public TQScrollView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceScrollView(TQWidget* = 0, const char* = 0);
@@ -411,7 +411,7 @@ class TraceScrollView : public TQScrollView
 
 class TraceScrollWidget : public TQVBox
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceScrollWidget(TQWidget* = 0, const char* = 0);