Fix client FTBFS on newer TDE versionHEADmaster

37 files changed, 298 insertions, 298 deletions

diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index adcbab2..d14d0cc 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -41,19 +41,19 @@ RemoteMDI::RemoteMDI()
 	setIcon(SmallIcon("remote_laboratory_client"));
 
 	masterPollTimer = new TQTimer();
-	connect(masterPollTimer, SIGNAL(timeout()), this, SLOT(masterPoll()));
+	connect(masterPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(masterPoll()));
 
 	// Create some actions
-	KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
-	KStdAction::quit(this, SLOT(close()), actionCollection());
+	KStdAction::close(this, TQ_SLOT(closeCurrent()), actionCollection());
+	KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
 	TDEActionCollection *const ac = actionCollection();
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
-	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
-	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
-	connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
-	disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
+	KStdAction::quit(this, TQ_SLOT(close()), ac);
+	KStdAction::configureToolbars(this, TQ_SLOT(configToolbars()), ac);
+	KStdAction::keyBindings(this, TQ_SLOT(configKeys()), ac);
+	connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), this, TQ_SLOT(connectToServer()), ac, "connect_server");
+	disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), this, TQ_SLOT(disconnectFromServer()), ac, "disconnect_server");
 
 	setMenuForSDIModeSysButtons(menuBar());
 
@@ -67,11 +67,11 @@ RemoteMDI::RemoteMDI()
 	hideViewTaskBar();
 
 	// When we change view, change the status bar text
-	connect(this, SIGNAL(viewActivated(KMdiChildView*)), this, SLOT(currentChanged(KMdiChildView*)));
+	connect(this, TQ_SIGNAL(viewActivated(KMdiChildView*)), this, TQ_SLOT(currentChanged(KMdiChildView*)));
 
 	ac->setHighlightingEnabled(true);
-	connect(ac, TQT_SIGNAL(actionStatusText(const TQString&)), this, TQT_SLOT(updateStatusBarMainMessage(const TQString&) ));
-	connect(ac, TQT_SIGNAL(clearStatusText()), statusBar(), TQT_SLOT(clear()));
+	connect(ac, TQ_SIGNAL(actionStatusText(const TQString&)), this, TQ_SLOT(updateStatusBarMainMessage(const TQString&) ));
+	connect(ac, TQ_SIGNAL(clearStatusText()), statusBar(), TQ_SLOT(clear()));
 
 	// Create the status bar
 	updateStatusBarMainMessage(i18n("No active instruments"));
@@ -109,7 +109,7 @@ RemoteMDI::~RemoteMDI()
 void RemoteMDI::updateStatusBarMessage() {
 	TQString windowStatusBarMessage;
 	if (m_pCurrentWindow) {
-		windowStatusBarMessage = m_windowStatusBarMapping[TQT_TQOBJECT(m_pCurrentWindow)];
+		windowStatusBarMessage = m_windowStatusBarMapping[m_pCurrentWindow];
 	}
 
 	KStatusBar* sb = statusBar();
@@ -149,7 +149,7 @@ void RemoteMDI::processActions() {
 	ServiceType st;
 	for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
 		st = *it;
-		action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
+		action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), this, TQ_SLOT(startModule()), ac, st.clientLibrary.ascii());
 		m_instrumentActionList.append(action);
 	}
 	plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
@@ -176,7 +176,7 @@ void RemoteMDI::startModule() {
 
 		RemoteLab::InstrumentView* view = new RemoteLab::InstrumentView(st.clientLibrary, st.name, (mdiMode() == KMdi::ToplevelMode) ? 0 : this);
 		view->setName(st.clientLibrary.ascii());
-		connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
+		connect(view, TQ_SIGNAL(statusMessageSet(const TQString&)), this, TQ_SLOT(updateStatusBarWindowMessage(const TQString&)));
 		if (st.singleInstance) {
 			const_cast<TDEAction*>(sendingAction)->setEnabled(false);
 		}
@@ -274,7 +274,7 @@ void RemoteMDI::finishConnectingToServer() {
 						// Try to get a valid ticket
 						if (getNewTicket() == 0) {
 							// Retry connection if no obvious errors were detected
-							TQTimer::singleShot(0, this, SLOT(connectToServer()));
+							TQTimer::singleShot(0, this, TQ_SLOT(connectToServer()));
 							return;
 						}
 						else {
@@ -283,7 +283,7 @@ void RemoteMDI::finishConnectingToServer() {
 						}
 					}
 					else {
-						connect(m_rsvSvrSocket, SIGNAL(readyRead()), m_rsvSvrSocket, SLOT(processPendingData()));
+						connect(m_rsvSvrSocket, TQ_SIGNAL(readyRead()), m_rsvSvrSocket, TQ_SLOT(processPendingData()));
 						m_rsvSvrSocket->processPendingData();
 						connToServerState = 2;
 					}
@@ -341,7 +341,7 @@ void RemoteMDI::finishConnectingToServer() {
 				break;
 		}
 
-		TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+		TQTimer::singleShot(0, this, TQ_SLOT(finishConnectingToServer()));
 	}
 }
 
@@ -420,8 +420,8 @@ void RemoteMDI::connectToServer() {
 	// Connect to the central reservation/control server
 	if (!m_rsvSvrSocket) {
 		m_rsvSvrSocket = new TDEKerberosClientSocket(this);
-		connect(m_rsvSvrSocket, SIGNAL(connectionClosed()), this, SLOT(connectionClosedHandler()));
-		connect(m_rsvSvrSocket, TQT_SIGNAL(statusMessageUpdated(const TQString&)), this, TQT_SLOT(updateStatusBarMainMessage(const TQString&) ));
+		connect(m_rsvSvrSocket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(connectionClosedHandler()));
+		connect(m_rsvSvrSocket, TQ_SIGNAL(statusMessageUpdated(const TQString&)), this, TQ_SLOT(updateStatusBarMainMessage(const TQString&) ));
 	}
 	m_rsvSvrSocket->setServiceName("ulab");
 	TQStringList disallowedMechList;
@@ -434,7 +434,7 @@ void RemoteMDI::connectToServer() {
 		// Finish connecting when appropriate
 		connToServerState = 0;
 		connToServerConnecting = true;
-		TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+		TQTimer::singleShot(0, this, TQ_SLOT(finishConnectingToServer()));
 	}
 }
 
@@ -587,7 +587,7 @@ void RemoteMDI::openNewWindow(KMdiChildView *view) {
 	currentChanged(view);
 
 	// Handle termination
-	connect(view, SIGNAL(childWindowCloseRequest(KMdiChildView*)), this, SLOT(childClosed(KMdiChildView*)));
+	connect(view, TQ_SIGNAL(childWindowCloseRequest(KMdiChildView*)), this, TQ_SLOT(childClosed(KMdiChildView*)));
 }
 
 void RemoteMDI::childWindowCloseRequest(KMdiChildView *pWnd) {
@@ -624,7 +624,7 @@ void RemoteMDI::closeCurrent() {
 void RemoteMDI::closeSpecifiedWindow(KMdiChildView *window) {
 	if (window) {
 		// Notify the status bar of the removal of the window
-		updateStatusBarWindowMessage(TQString::null, TQT_TQOBJECT(window));
+		updateStatusBarWindowMessage(TQString::null, window);
 		updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(window->tabCaption()));
 
 		// Unplug menus
@@ -652,7 +652,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
 	unplugActionList("selectedInstrument_actionlist");
 
 	// Notify the status bar of the removal of the window
-	updateStatusBarWindowMessage(TQString::null, TQT_TQOBJECT(w));
+	updateStatusBarWindowMessage(TQString::null, w);
 	updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(w->tabCaption()));
 
 	// Re-enable associated action
@@ -667,7 +667,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
 	}
 
 	// Remove status bar text
-	m_windowStatusBarMapping.remove(TQT_TQOBJECT(w));
+	m_windowStatusBarMapping.remove(w);
 
 	// Remove the view from MDI, BUT DO NOT DELETE IT! It is automatically deleted by TQt since it was closed.
 	removeWindowFromMdi(w);
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.cpp b/clients/tde/src/app/views/instrumentview.cpp
index 88f2329..b0ca660 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -46,14 +46,14 @@ void InstrumentView::init() {
 	
 	if (!factory) {
 		KMessageBox::error( this, i18n("TDE could not find the %1 part, or the %2 part could not be started.").arg(m_libraryName).arg(m_libraryName) );
-		TQTimer::singleShot(0, this, SLOT(close()));
+		TQTimer::singleShot(0, this, TQ_SLOT(close()));
 	}
 	else {
-		m_instrumentPart = (InstrumentPart *)factory->create(TQT_TQOBJECT(this), "part", "KParts::RemoteInstrumentPart");
+		m_instrumentPart = (InstrumentPart *)factory->create(this, "part", "KParts::RemoteInstrumentPart");
 		m_instrumentPart->setMDIMainForm(m_mainForm);
 		setIcon(SmallIcon(m_libraryName));
-		connect(m_instrumentPart, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(setStatusMessage(const TQString&)));
-		connect(m_instrumentPart, SIGNAL(usingFixedSizeChanged(bool)), this, SLOT(setUsingFixedSize(bool)));
+		connect(m_instrumentPart, TQ_SIGNAL(statusMessageSet(const TQString&)), this, TQ_SLOT(setStatusMessage(const TQString&)));
+		connect(m_instrumentPart, TQ_SIGNAL(usingFixedSizeChanged(bool)), this, TQ_SLOT(setUsingFixedSize(bool)));
 		TQWidget *childPartWidget = m_instrumentPart->widget();
 		if (childPartWidget) {
 			childPartWidget->installEventFilter(this);
@@ -151,7 +151,7 @@ void InstrumentView::connectServer(TQString server) {
 				delete canary;
 				return;
 			}
-			TQTimer::singleShot(0, this, SLOT(close()));
+			TQTimer::singleShot(0, this, TQ_SLOT(close()));
 		}
 	}
 
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.cpp b/clients/tde/src/dialogs/selectserverdlg.cpp
index 86fea06..745a933 100644
--- a/clients/tde/src/dialogs/selectserverdlg.cpp
+++ b/clients/tde/src/dialogs/selectserverdlg.cpp
@@ -36,7 +36,7 @@
 #include "selectserverdlg.h"
 #include "selectserverdlgbase.h"
 
-class Q_EXPORT StationTypeListViewItem : public TQListViewItem
+class TQ_EXPORT StationTypeListViewItem : public TQListViewItem
 {
 	public:
 		StationTypeListViewItem(TQListView * parent) : TQListViewItem(parent) {}
@@ -69,7 +69,7 @@ SelectServerDialog::SelectServerDialog(TQWidget* parent, const char* name, Stati
 	m_base->serverList->setAllColumnsShowFocus(true);
 	m_base->serverList->setFullWidth(true);
 
-	connect(m_base->serverList, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotOk()));
+	connect(m_base->serverList, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotOk()));
 
 	for (i=0; i<m_stationList.count(); i++) {
 		StationType st = m_stationList[i];
diff --git a/clients/tde/src/dialogs/selectserverdlg.h b/clients/tde/src/dialogs/selectserverdlg.h
index 740f76b..8efdbf5 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());
@@ -44,4 +44,4 @@ public:
 	StationType m_selectedStation;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/clients/tde/src/part/adminconsole/part.cpp b/clients/tde/src/part/adminconsole/part.cpp
index 6dadca2..ac78c43 100644
--- a/clients/tde/src/part/adminconsole/part.cpp
+++ b/clients/tde/src/part/adminconsole/part.cpp
@@ -99,26 +99,26 @@ AdminConsolePart::AdminConsolePart(TQWidget *parentWidget, const char *widgetNam
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_pingDelayTimer = new TQTimer(this);
-	connect(m_pingDelayTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_pingDelayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Create widgets
 	m_base = new AdminConsoleBase(widget());
 
 	// Initialize widgets
-	connect(m_base->ts_buttonKill, SIGNAL(clicked()), this, SLOT(terminalServiceKillButtonClicked()));
-	connect(m_base->workspace_buttonTerminate, SIGNAL(clicked()), this, SLOT(workspaceTerminateButtonClicked()));
-	connect(m_base->workspace_buttonCancelTermination, SIGNAL(clicked()), this, SLOT(workspaceCancelTerminationButtonClicked()));
+	connect(m_base->ts_buttonKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(terminalServiceKillButtonClicked()));
+	connect(m_base->workspace_buttonTerminate, TQ_SIGNAL(clicked()), this, TQ_SLOT(workspaceTerminateButtonClicked()));
+	connect(m_base->workspace_buttonCancelTermination, TQ_SIGNAL(clicked()), this, TQ_SLOT(workspaceCancelTerminationButtonClicked()));
 
 	m_base->ts_list->setAllColumnsShowFocus(true);
-	connect(m_base->ts_list, SIGNAL(selectionChanged()), this, SLOT(terminalServiceListSelect()));
+	connect(m_base->ts_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(terminalServiceListSelect()));
 	m_base->workspace_list->setAllColumnsShowFocus(true);
-	connect(m_base->workspace_list, SIGNAL(selectionChanged()), this, SLOT(workspaceListSelect()));
+	connect(m_base->workspace_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(workspaceListSelect()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 AdminConsolePart::~AdminConsolePart() {
@@ -194,9 +194,9 @@ void AdminConsolePart::disconnectFromServerCallback() {
 }
 
 void AdminConsolePart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = ModeIdle_StateTerminalListRequest;
 	m_commHandlerMode = ModeIdle;
diff --git a/clients/tde/src/part/adminconsole/part.h b/clients/tde/src/part/adminconsole/part.h
index 5fe125e..5b5f2be 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.cpp b/clients/tde/src/part/adminconsole/terminatedlg.cpp
index 0ac4a4f..428f03b 100644
--- a/clients/tde/src/part/adminconsole/terminatedlg.cpp
+++ b/clients/tde/src/part/adminconsole/terminatedlg.cpp
@@ -42,8 +42,8 @@ TerminateDialog::TerminateDialog(TQWidget* parent, const char* name)
 
 	setMainWidget(m_base);
 
-	connect(m_base->m_btnImmediate, SIGNAL(clicked()), this, SLOT(processLockouts()));
-	connect(m_base->m_btnDelayed, SIGNAL(clicked()), this, SLOT(processLockouts()));
+	connect(m_base->m_btnImmediate, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->m_btnDelayed, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
 
 	m_base->m_btnDelayed->setChecked(false);
 	m_base->m_btnImmediate->setChecked(true);
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/groupauthdlg.cpp b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
index 35b9064..62633ce 100644
--- a/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
+++ b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
@@ -65,7 +65,7 @@ GroupPermissionsDialog::GroupPermissionsDialog(TQWidget* parent, const char* nam
 
 	setMainWidget(m_base);
 
-	connect(m_base->m_groupName, SIGNAL(textChanged(const TQString&)), this, SLOT(processLockouts()));
+	connect(m_base->m_groupName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts()));
 	m_base->m_groupName->setFocus();
 
 	processLockouts();
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.cpp b/clients/tde/src/part/adminusermgmt/part.cpp
index 8ef39df..103cf1c 100644
--- a/clients/tde/src/part/adminusermgmt/part.cpp
+++ b/clients/tde/src/part/adminusermgmt/part.cpp
@@ -106,31 +106,31 @@ UserManagementPart::UserManagementPart(TQWidget *parentWidget, const char *widge
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_pingDelayTimer = new TQTimer(this);
-	connect(m_pingDelayTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_pingDelayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Create widgets
 	m_base = new UserManagementBase(widget());
 
 	// Initialize widgets
-	connect(m_base->ts_buttonAddGroup, SIGNAL(clicked()), this, SLOT(terminalServiceAddGroupButtonClicked()));
-	connect(m_base->ts_buttonModifyGroup, SIGNAL(clicked()), this, SLOT(terminalServiceModifyGroupButtonClicked()));
-	connect(m_base->ts_buttonDeleteGroup, SIGNAL(clicked()), this, SLOT(terminalServiceDeleteGroupButtonClicked()));
-	connect(m_base->workspace_buttonAddGroup, SIGNAL(clicked()), this, SLOT(workspaceAddGroupButtonClicked()));
-	connect(m_base->workspace_buttonModifyGroup, SIGNAL(clicked()), this, SLOT(workspaceModifyGroupButtonClicked()));
-	connect(m_base->workspace_buttonDeleteGroup, SIGNAL(clicked()), this, SLOT(workspaceDeleteGroupButtonClicked()));
-	connect(m_base->ts_list, SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, SLOT(terminalServiceModifyGroupButtonClicked()));
-	connect(m_base->workspace_list, SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, SLOT(workspaceModifyGroupButtonClicked()));
+	connect(m_base->ts_buttonAddGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(terminalServiceAddGroupButtonClicked()));
+	connect(m_base->ts_buttonModifyGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(terminalServiceModifyGroupButtonClicked()));
+	connect(m_base->ts_buttonDeleteGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(terminalServiceDeleteGroupButtonClicked()));
+	connect(m_base->workspace_buttonAddGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(workspaceAddGroupButtonClicked()));
+	connect(m_base->workspace_buttonModifyGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(workspaceModifyGroupButtonClicked()));
+	connect(m_base->workspace_buttonDeleteGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(workspaceDeleteGroupButtonClicked()));
+	connect(m_base->ts_list, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(terminalServiceModifyGroupButtonClicked()));
+	connect(m_base->workspace_list, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(workspaceModifyGroupButtonClicked()));
 
 	m_base->ts_list->setAllColumnsShowFocus(true);
-	connect(m_base->ts_list, SIGNAL(selectionChanged()), this, SLOT(terminalServiceListSelect()));
+	connect(m_base->ts_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(terminalServiceListSelect()));
 	m_base->workspace_list->setAllColumnsShowFocus(true);
-	connect(m_base->workspace_list, SIGNAL(selectionChanged()), this, SLOT(workspaceListSelect()));
+	connect(m_base->workspace_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(workspaceListSelect()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 UserManagementPart::~UserManagementPart() {
@@ -212,9 +212,9 @@ void UserManagementPart::disconnectFromServerCallback() {
 }
 
 void UserManagementPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = ModeIdle_StateTerminalListRequest;
 	m_commHandlerMode = ModeIdle;
diff --git a/clients/tde/src/part/adminusermgmt/part.h b/clients/tde/src/part/adminusermgmt/part.h
index 1a039e4..1dcc68c 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/part.cpp b/clients/tde/src/part/commanalyzer/part.cpp
index 5c8fab3..774967b 100644
--- a/clients/tde/src/part/commanalyzer/part.cpp
+++ b/clients/tde/src/part/commanalyzer/part.cpp
@@ -76,9 +76,9 @@ CommAnalyzerPart::CommAnalyzerPart( TQWidget *parentWidget, const char *widgetNa
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Create widgets
 	m_base = new CommAnalyzerBase(widget());
@@ -112,17 +112,17 @@ CommAnalyzerPart::CommAnalyzerPart( TQWidget *parentWidget, const char *widgetNa
 	m_base->traceZoomWidget->setTraceName(0, "Trace 1");
 	m_base->traceZoomWidget->setTraceHorizontalUnits(0, "Hz");
 	m_base->traceZoomWidget->setTraceVerticalUnits(0, "dBm");
-	connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
-	connect(m_traceWidget, SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, SLOT(setTraceOffset(uint, double)));
+	connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
+	connect(m_traceWidget, TQ_SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, TQ_SLOT(setTraceOffset(uint, double)));
 
 	m_base->saRefLevel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	m_base->saRefLevel->setFloatMin(-128);
 	m_base->saRefLevel->setFloatMax(128);
 	m_base->saRefLevel->setLineStep(1);
 
-	connect(m_base->saRefLevel, SIGNAL(floatValueChanged(double)), this, SLOT(saRefLevelChanged(double)));
+	connect(m_base->saRefLevel, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(saRefLevelChanged(double)));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 CommAnalyzerPart::~CommAnalyzerPart() {
@@ -168,9 +168,9 @@ void CommAnalyzerPart::disconnectFromServerCallback() {
 }
 
 void CommAnalyzerPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
diff --git a/clients/tde/src/part/commanalyzer/part.h b/clients/tde/src/part/commanalyzer/part.h
index 65d56d0..3eb7542 100644
--- a/clients/tde/src/part/commanalyzer/part.h
+++ b/clients/tde/src/part/commanalyzer/part.h
@@ -43,10 +43,10 @@ namespace RemoteLab
 {
 	class CommAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
-			CommAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			CommAnalyzerPart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~CommAnalyzerPart();
 	
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/part/companalyzer/part.cpp b/clients/tde/src/part/companalyzer/part.cpp
index 9fb56bf..8bec821 100755
--- a/clients/tde/src/part/companalyzer/part.cpp
+++ b/clients/tde/src/part/companalyzer/part.cpp
@@ -435,7 +435,7 @@ void CompAnalyzerWorker::wake() {
 
 void CompAnalyzerWorker::dataReceived() {
 	if (!m_networkDataMutex->tryLock()) {
-		TQTimer::singleShot(0, this, TQT_SLOT(dataReceived()));
+		TQTimer::singleShot(0, this, TQ_SLOT(dataReceived()));
 	}
 	else {
 		m_newData = true;
@@ -579,12 +579,12 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa
 	m_worker = new CompAnalyzerWorker();
 	m_workerThread = new TQEventLoopThread();
 	m_worker->moveToThread(m_workerThread);
-	TQObject::connect(this, TQT_SIGNAL(wakeWorkerThread()), m_worker, TQT_SLOT(wake()));
-	TQObject::connect(m_worker, TQT_SIGNAL(outboundQueueUpdated()), this, TQT_SLOT(processOutboundQueue()));
+	TQObject::connect(this, TQ_SIGNAL(wakeWorkerThread()), m_worker, TQ_SLOT(wake()));
+	TQObject::connect(m_worker, TQ_SIGNAL(outboundQueueUpdated()), this, TQ_SLOT(processOutboundQueue()));
 
 	// Create timers
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(networkTimeout()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(networkTimeout()));
 
 	// Create widgets
 	m_base = new CompAnalyzerBase(widget());
@@ -626,22 +626,22 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa
 	m_traceWidget->setCursorActiveTraceList(3, activeTraces);
 	m_traceWidget->setZoomBoxEnabled(true);
 
-	connect(m_base->parameterASourceCombo, SIGNAL(activated(int)), this, SLOT(parameterASourceChanged(int)));
-	connect(m_base->parameterBSourceCombo, SIGNAL(activated(int)), this, SLOT(parameterBSourceChanged(int)));
-	connect(m_base->measurementFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(frequencyInputChanged(double)));
+	connect(m_base->parameterASourceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(parameterASourceChanged(int)));
+	connect(m_base->parameterBSourceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(parameterBSourceChanged(int)));
+	connect(m_base->measurementFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(frequencyInputChanged(double)));
 
-	connect(m_base->sweepStartFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts()));
-	connect(m_base->sweepEndFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts()));
-	connect(m_base->sweepStepFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts()));
+	connect(m_base->sweepStartFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->sweepEndFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->sweepStepFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts()));
 
 	m_base->traceZoomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
-	connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
+	connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
 
-	connect(m_base->sweepStartButton, SIGNAL(clicked()), this, SLOT(startSweepClicked()));
-	connect(m_base->sweepStopButton, SIGNAL(clicked()), this, SLOT(stopSweepClicked()));
-	connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
-	connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
-	connect(m_base->autoSave, SIGNAL(clicked()), this, SLOT(processLockouts()));
+	connect(m_base->sweepStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startSweepClicked()));
+	connect(m_base->sweepStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopSweepClicked()));
+	connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+	connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
+	connect(m_base->autoSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
 
 	// Initialize data
 	m_hdivs = 10;
@@ -654,7 +654,7 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa
 	}
 	updateGraticule();
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 CompAnalyzerPart::~CompAnalyzerPart() {
@@ -768,9 +768,9 @@ void CompAnalyzerPart::connectionFinishedCallback() {
 	m_socket->moveToThread(m_workerThread);
 	m_worker->appendItemToInboundQueue(CompAnalyzerEvent(Initialize, TQVariant()), true);
 
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), m_worker, SLOT(dataReceived()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), m_worker, TQ_SLOT(dataReceived()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
@@ -779,7 +779,7 @@ void CompAnalyzerPart::connectionFinishedCallback() {
 
 	// Start worker
 	m_workerThread->start();
-	TQTimer::singleShot(0, m_worker, SLOT(run()));
+	TQTimer::singleShot(0, m_worker, TQ_SLOT(run()));
 
 	processLockouts();
 	networkTick();
diff --git a/clients/tde/src/part/companalyzer/part.h b/clients/tde/src/part/companalyzer/part.h
index 89a03f8..5f6d77a 100644
--- a/clients/tde/src/part/companalyzer/part.h
+++ b/clients/tde/src/part/companalyzer/part.h
@@ -108,13 +108,13 @@ namespace RemoteLab
 	} CompAnalyzerInstrumentLimits;
 
 #ifndef QT_NO_DATASTREAM
-	Q_EXPORT TQDataStream &operator<<(TQDataStream &, const CompAnalyzerMeasurement &);
-	Q_EXPORT TQDataStream &operator>>(TQDataStream &, CompAnalyzerMeasurement &);
+	TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const CompAnalyzerMeasurement &);
+	TQ_EXPORT TQDataStream &operator>>(TQDataStream &, CompAnalyzerMeasurement &);
 #endif
 
 	class CompAnalyzerWorker : public TQObject
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			CompAnalyzerWorker();
@@ -183,10 +183,10 @@ namespace RemoteLab
 
 	class CompAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
-			CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			CompAnalyzerPart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~CompAnalyzerPart();
 	
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/part/fpgaprogram/part.cpp b/clients/tde/src/part/fpgaprogram/part.cpp
index ced624e..769fe99 100644
--- a/clients/tde/src/part/fpgaprogram/part.cpp
+++ b/clients/tde/src/part/fpgaprogram/part.cpp
@@ -94,11 +94,11 @@ FPGAProgramPart::FPGAProgramPart(TQWidget *parentWidget, const char *widgetName,
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_pingDelayTimer = new TQTimer(this);
-	connect(m_pingDelayTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_pingDelayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Create widgets
 	m_base = new FPGAProgramBase(widget());
@@ -111,12 +111,12 @@ FPGAProgramPart::FPGAProgramPart(TQWidget *parentWidget, const char *widgetName,
 	// Initialize widgets
 	m_base->setMinimumSize(500,350);
 	m_base->programmingLogBox->setReadOnly(true);
-	connect(m_base->programRunButton, SIGNAL(clicked()), this, SLOT(programRunButtonClicked()));
-	connect(m_base->clearProgrammingLogButton, SIGNAL(clicked()), this, SLOT(clearProgrammingLogBox()));
-	connect(m_base->saveProgrammingLogButton, SIGNAL(clicked()), this, SLOT(saveProgrammingLogBox()));
-	connect(m_base->programmingInputFile, SIGNAL(textChanged(const TQString &)), this, SLOT(processLockouts()));
+	connect(m_base->programRunButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(programRunButtonClicked()));
+	connect(m_base->clearProgrammingLogButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearProgrammingLogBox()));
+	connect(m_base->saveProgrammingLogButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveProgrammingLogBox()));
+	connect(m_base->programmingInputFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(processLockouts()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 FPGAProgramPart::~FPGAProgramPart() {
@@ -198,9 +198,9 @@ void FPGAProgramPart::disconnectFromServerCallback() {
 }
 
 void FPGAProgramPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = ModeIdle_StateStatusRequest;
 	m_commHandlerMode = ModeIdle;
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/part.cpp b/clients/tde/src/part/fpgaview/part.cpp
index e60fa4c..ad0bb2c 100644
--- a/clients/tde/src/part/fpgaview/part.cpp
+++ b/clients/tde/src/part/fpgaview/part.cpp
@@ -62,7 +62,7 @@
 FPGALed::FPGALed(TQWidget *parent, const char *name)
 	: KLed(parent, name), m_clickable(true)
 {
-	connect(this, SIGNAL(clicked()), this, SLOT(toggle()));
+	connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggle()));
 
 	setColor(green);
 	setOffColor(TQApplication::palette(this).active().base().dark(200));
@@ -70,10 +70,10 @@ FPGALed::FPGALed(TQWidget *parent, const char *name)
 
 void FPGALed::setClickable(bool clickable) {
 	if ((!clickable) && (m_clickable)) {
-		disconnect(this, SIGNAL(clicked()), this, SLOT(toggle()));
+		disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggle()));
 	}
 	else if ((clickable) && (!m_clickable)) {
-		connect(this, SIGNAL(clicked()), this, SLOT(toggle()));
+		connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggle()));
 	}
 	m_clickable = clickable;
 }
@@ -181,7 +181,7 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
 	m_updateTimer = new TQTimer(this);
 	m_timeoutTimer = new TQTimer(this);
 	m_connectionTimer = new TQTimer(this);
-	connect(m_connectionTimer, SIGNAL(timeout()), this, SLOT(finishConnectingToServer()));
+	connect(m_connectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finishConnectingToServer()));
 
 	// Create widgets
 	m_base = new FPGAViewBase(widget());
@@ -202,11 +202,11 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
 	m_modeSubMenu = new TDEActionMenu(i18n("Mode"), ac, "mode_submenu");
 	m_menuActionList.append(m_modeSubMenu);
 	// Menu items
-	m_modeBasicEnabled = new TDEToggleAction(i18n("Basic"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToBasicMode()), ac, "mode_basic_enabled");
+	m_modeBasicEnabled = new TDEToggleAction(i18n("Basic"), TDEShortcut(), this, TQ_SLOT(switchToBasicMode()), ac, "mode_basic_enabled");
 	m_modeSubMenu->insert(m_modeBasicEnabled);
-	m_modeIntermediateEnabled = new TDEToggleAction(i18n("Intermediate"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled");
+	m_modeIntermediateEnabled = new TDEToggleAction(i18n("Intermediate"), TDEShortcut(), this, TQ_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled");
 	m_modeSubMenu->insert(m_modeIntermediateEnabled);
-	m_modeAdvancedEnabled = new TDEToggleAction(i18n("Advanced"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled");
+	m_modeAdvancedEnabled = new TDEToggleAction(i18n("Advanced"), TDEShortcut(), this, TQ_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled");
 	m_modeSubMenu->insert(m_modeAdvancedEnabled);
 
 	// Initialize widgets
@@ -279,21 +279,21 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
 	m_base->group8BitOutputValueText->setFixedSize(group8BitTextMetrics.width("0000"), group8BitTextMetrics.height());
 #endif
 
-	connect(m_base->group4BitInputLED3, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
-	connect(m_base->group4BitInputLED2, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
-	connect(m_base->group4BitInputLED1, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
-	connect(m_base->group4BitInputLED0, SIGNAL(changed()), this, SLOT(process4BitInputChanges()));
+	connect(m_base->group4BitInputLED3, TQ_SIGNAL(changed()), this, TQ_SLOT(process4BitInputChanges()));
+	connect(m_base->group4BitInputLED2, TQ_SIGNAL(changed()), this, TQ_SLOT(process4BitInputChanges()));
+	connect(m_base->group4BitInputLED1, TQ_SIGNAL(changed()), this, TQ_SLOT(process4BitInputChanges()));
+	connect(m_base->group4BitInputLED0, TQ_SIGNAL(changed()), this, TQ_SLOT(process4BitInputChanges()));
 
-	connect(m_base->group8BitInputLED7, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED6, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED5, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED4, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED3, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED2, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED1, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
-	connect(m_base->group8BitInputLED0, SIGNAL(clicked()), this, SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED7, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED6, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED5, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED4, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED3, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED2, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED1, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
+	connect(m_base->group8BitInputLED0, TQ_SIGNAL(clicked()), this, TQ_SLOT(process8BitInputChanges()));
 
-	connect(m_base->group16BitInputValue, SIGNAL(valueChanged(int)), this, SLOT(process16BitInputChanges()));
+	connect(m_base->group16BitInputValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(process16BitInputChanges()));
 
 	m_base->LEDOutputDisplayDigit0->setBackgroundColor(TQt::black);
 	m_base->LEDOutputDisplayDigit1->setBackgroundColor(TQt::black);
@@ -330,16 +330,16 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
 	m_base->LCDOutputLabel->setFixedSize(lcdwidth, lcdheight);
 	m_base->frameLCDDisplay->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 
-	connect(m_base->groupGlobalControlResetButton, SIGNAL(clicked()), this, SLOT(groupGlobalControlResetButtonClicked()));
-	connect(m_base->batchTestRunButton, SIGNAL(clicked()), this, SLOT(batchTestRunButtonClicked()));
-	connect(m_base->dataProcessingRunButton, SIGNAL(clicked()), this, SLOT(dataProcessingRunButtonClicked()));
+	connect(m_base->groupGlobalControlResetButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(groupGlobalControlResetButtonClicked()));
+	connect(m_base->batchTestRunButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(batchTestRunButtonClicked()));
+	connect(m_base->dataProcessingRunButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(dataProcessingRunButtonClicked()));
 
-	connect(m_base->batchTestInputFile, SIGNAL(textChanged(const TQString &)), this, SLOT(processLockouts()));
-	connect(m_base->batchTestOutputFile, SIGNAL(textChanged(const TQString &)), this, SLOT(processLockouts()));
-	connect(m_base->dataProcessingInputFile, SIGNAL(textChanged(const TQString &)), this, SLOT(processLockouts()));
-	connect(m_base->dataProcessingOutputFile, SIGNAL(textChanged(const TQString &)), this, SLOT(processLockouts()));
+	connect(m_base->batchTestInputFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->batchTestOutputFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->dataProcessingInputFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->dataProcessingOutputFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(processLockouts()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 FPGAViewPart::~FPGAViewPart() {
@@ -653,19 +653,19 @@ void FPGAViewPart::resizeToHint() {
 void FPGAViewPart::switchToBasicMode() {
 	m_interfaceMode = BasicInterfaceMode;
 	processLockouts();
-	TQTimer::singleShot(0, this, SLOT(resizeToHint()));
+	TQTimer::singleShot(0, this, TQ_SLOT(resizeToHint()));
 }
 
 void FPGAViewPart::switchToIntermediateMode() {
 	m_interfaceMode = IntermediateInterfaceMode;
 	processLockouts();
-	TQTimer::singleShot(0, this, SLOT(resizeToHint()));
+	TQTimer::singleShot(0, this, TQ_SLOT(resizeToHint()));
 }
 
 void FPGAViewPart::switchToAdvancedMode() {
 	m_interfaceMode = AdvancedInterfaceMode;
 	processLockouts();
-	TQTimer::singleShot(0, this, SLOT(resizeToHint()));
+	TQTimer::singleShot(0, this, TQ_SLOT(resizeToHint()));
 }
 
 void FPGAViewPart::connectionClosed() {
@@ -676,8 +676,8 @@ void FPGAViewPart::postInit() {
 	processAllGraphicsUpdates();
 
 	setUsingFixedSize(true);
-	connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateDisplay()));
-	connect(m_timeoutTimer, SIGNAL(timeout()), this, SLOT(updateDisplay()));
+	connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDisplay()));
+	connect(m_timeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDisplay()));
 }
 
 bool FPGAViewPart::openURL(const KURL &url) {
@@ -699,9 +699,9 @@ void FPGAViewPart::disconnectFromServerCallback() {
 }
 
 void FPGAViewPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(updateDisplay()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(updateDisplay()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
diff --git a/clients/tde/src/part/fpgaview/part.h b/clients/tde/src/part/fpgaview/part.h
index 4eb8a35..6e730db 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/part.cpp b/clients/tde/src/part/logicanalyzer/part.cpp
index 6ee44cc..66e757a 100644
--- a/clients/tde/src/part/logicanalyzer/part.cpp
+++ b/clients/tde/src/part/logicanalyzer/part.cpp
@@ -98,9 +98,9 @@ LogicAnalyzerPart::LogicAnalyzerPart( TQWidget *parentWidget, const char *widget
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Initialize data
 	m_hdivs = 0;
@@ -160,15 +160,15 @@ LogicAnalyzerPart::LogicAnalyzerPart( TQWidget *parentWidget, const char *widget
 	m_traceWidget->setZoomBoxEnabled(false);
 	m_traceWidget->setHorizCursorDirectClickEnabled(true);
 
-	connect(m_base->acqStart, SIGNAL(clicked()), this, SLOT(startDAQ()));
-	connect(m_base->acqStop, SIGNAL(clicked()), this, SLOT(stopDAQ()));
-	connect(m_base->runControlStartButton, SIGNAL(clicked()), this, SLOT(startLogicAnalyzer()));
-	connect(m_base->runControlStopButton, SIGNAL(clicked()), this, SLOT(stopLogicAnalyzer()));
+	connect(m_base->acqStart, TQ_SIGNAL(clicked()), this, TQ_SLOT(startDAQ()));
+	connect(m_base->acqStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopDAQ()));
+	connect(m_base->runControlStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startLogicAnalyzer()));
+	connect(m_base->runControlStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopLogicAnalyzer()));
 
-	connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
-	connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
+	connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+	connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 LogicAnalyzerPart::~LogicAnalyzerPart() {
@@ -250,9 +250,9 @@ void LogicAnalyzerPart::disconnectFromServerCallback() {
 }
 
 void LogicAnalyzerPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
diff --git a/clients/tde/src/part/logicanalyzer/part.h b/clients/tde/src/part/logicanalyzer/part.h
index b787c10..257aaa0 100644
--- a/clients/tde/src/part/logicanalyzer/part.h
+++ b/clients/tde/src/part/logicanalyzer/part.h
@@ -48,10 +48,10 @@ namespace RemoteLab
 {
 	class LogicAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
-			LogicAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			LogicAnalyzerPart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~LogicAnalyzerPart();
 	
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/part/prototerminal/part.cpp b/clients/tde/src/part/prototerminal/part.cpp
index 8d90891..6d5adc2 100644
--- a/clients/tde/src/part/prototerminal/part.cpp
+++ b/clients/tde/src/part/prototerminal/part.cpp
@@ -227,12 +227,12 @@ ProtoTerminalPart::ProtoTerminalPart( TQWidget *parentWidget, const char *widget
 	m_worker = new ProtoTerminalWorker();
 	m_workerThread = new TQEventLoopThread();
 	m_worker->moveToThread(m_workerThread);
-	TQObject::connect(this, TQT_SIGNAL(wakeWorkerThread()), m_worker, TQT_SLOT(wake()));
-	TQObject::connect(m_worker, TQT_SIGNAL(outboundQueueUpdated()), this, TQT_SLOT(processOutboundQueue()));
+	TQObject::connect(this, TQ_SIGNAL(wakeWorkerThread()), m_worker, TQ_SLOT(wake()));
+	TQObject::connect(m_worker, TQ_SIGNAL(outboundQueueUpdated()), this, TQ_SLOT(processOutboundQueue()));
 
 	// Create timers
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(networkTimeout()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(networkTimeout()));
 
 	// Create widgets
 	m_base = new ProtoTerminalBase(widget());
@@ -240,10 +240,10 @@ ProtoTerminalPart::ProtoTerminalPart( TQWidget *parentWidget, const char *widget
 	// Initialize widgets
 	m_base->setMinimumSize(500,350);
 
-	connect(m_base->sendText, SIGNAL(clicked()), this, SLOT(sendTextClicked()));
-	connect(m_base->textInput, SIGNAL(returnPressed()), m_base->sendText, SIGNAL(clicked()));
+	connect(m_base->sendText, TQ_SIGNAL(clicked()), this, TQ_SLOT(sendTextClicked()));
+	connect(m_base->textInput, TQ_SIGNAL(returnPressed()), m_base->sendText, TQ_SIGNAL(clicked()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 ProtoTerminalPart::~ProtoTerminalPart() {
@@ -302,9 +302,9 @@ void ProtoTerminalPart::connectionFinishedCallback() {
 	m_worker->m_instrumentMutex = m_instrumentMutex;
 	m_socket->moveToThread(m_workerThread);
 
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), m_worker, SLOT(dataReceived()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), m_worker, TQ_SLOT(dataReceived()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
@@ -313,7 +313,7 @@ void ProtoTerminalPart::connectionFinishedCallback() {
 
 	// Start worker
 	m_workerThread->start();
-	TQTimer::singleShot(0, m_worker, SLOT(run()));
+	TQTimer::singleShot(0, m_worker, TQ_SLOT(run()));
 
 	processLockouts();
 	networkTick();
diff --git a/clients/tde/src/part/prototerminal/part.h b/clients/tde/src/part/prototerminal/part.h
index 1e3853f..373e4f3 100644
--- a/clients/tde/src/part/prototerminal/part.h
+++ b/clients/tde/src/part/prototerminal/part.h
@@ -58,7 +58,7 @@ namespace RemoteLab
 
 	class ProtoTerminalWorker : public TQObject
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			ProtoTerminalWorker();
@@ -94,10 +94,10 @@ namespace RemoteLab
 
 	class ProtoTerminalPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
-			ProtoTerminalPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			ProtoTerminalPart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~ProtoTerminalPart();
 	
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index efa05a0..e0aec7c 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -113,12 +113,12 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
 	m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
 
 	m_channelEnabledCheckBox = new TQCheckBox(m_groupBox);
-	connect(m_channelEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+	connect(m_channelEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
 	m_channelEnabledCheckBox->setText(i18n("Enable"));
 	m_primaryLayout->addMultiCellWidget(m_channelEnabledCheckBox, 0, 0, 0, 0);
 
 	m_voltsDivComboBox = new TQComboBox(m_groupBox);
-	connect(m_voltsDivComboBox, SIGNAL(activated(int)), this, SLOT(vdivChanged(int)));
+	connect(m_voltsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(vdivChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_voltsDivComboBox, 0, 0, 1, 1);
 
 	TQLabel* label = new TQLabel(m_groupBox);
@@ -127,7 +127,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
 
 	m_setTriggerChannelButton = new TQPushButton(m_groupBox);
 	m_setTriggerChannelButton->setText(i18n("TRIG"));
-	connect(m_setTriggerChannelButton, SIGNAL(clicked()), this, SLOT(triggerRequested()));
+	connect(m_setTriggerChannelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(triggerRequested()));
 	m_primaryLayout->addMultiCellWidget(m_setTriggerChannelButton, 0, 0, 3, 3);
 }
 
@@ -202,7 +202,7 @@ TracePostProcessControlWidget::TracePostProcessControlWidget(TQWidget *parent, c
 	m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
 
 	m_postProcessEnabledCheckBox = new TQCheckBox(m_groupBox);
-	connect(m_postProcessEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+	connect(m_postProcessEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
 	m_postProcessEnabledCheckBox->setText(i18n("Enable"));
 	m_primaryLayout->addMultiCellWidget(m_postProcessEnabledCheckBox, 0, 0, 0, 0);
 
@@ -210,7 +210,7 @@ TracePostProcessControlWidget::TracePostProcessControlWidget(TQWidget *parent, c
 	m_voltsMultiplierSpinBox->setFloatMax(1000);
 	m_voltsMultiplierSpinBox->setFloatMin(-1000);
 	m_voltsMultiplierSpinBox->setFloatValue(1.0);
-	connect(m_voltsMultiplierSpinBox, SIGNAL(floatValueChanged(double)), this, SLOT(vMultChanged(double)));
+	connect(m_voltsMultiplierSpinBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(vMultChanged(double)));
 	m_voltsMultiplierSpinBox->setEnabled(false);
 	m_primaryLayout->addMultiCellWidget(m_voltsMultiplierSpinBox, 0, 0, 1, 1);
 
@@ -259,12 +259,12 @@ MathTraceControlWidget::MathTraceControlWidget(TQWidget *parent, const char *nam
 	m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
 
 	m_channelEnabledCheckBox = new TQCheckBox(m_groupBox);
-	connect(m_channelEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+	connect(m_channelEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
 	m_channelEnabledCheckBox->setText(i18n("Enable"));
 	m_primaryLayout->addMultiCellWidget(m_channelEnabledCheckBox, 0, 0, 0, 0);
 
 	m_voltsDivComboBox = new TQComboBox(m_groupBox);
-	connect(m_voltsDivComboBox, SIGNAL(activated(int)), this, SLOT(vdivChanged(int)));
+	connect(m_voltsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(vdivChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_voltsDivComboBox, 0, 0, 1, 1);
 
 	m_verticalUnitsLabel = new TQLabel(m_groupBox);
@@ -272,15 +272,15 @@ MathTraceControlWidget::MathTraceControlWidget(TQWidget *parent, const char *nam
 	m_primaryLayout->addMultiCellWidget(m_verticalUnitsLabel, 0, 0, 2, 2);
 
 	m_operandFirstComboBox = new TQComboBox(m_groupBox);
-	connect(m_operandFirstComboBox, SIGNAL(activated(int)), this, SLOT(operandFirstChanged(int)));
+	connect(m_operandFirstComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operandFirstChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_operandFirstComboBox, 1, 1, 0, 0);
 
 	m_operandSecondComboBox = new TQComboBox(m_groupBox);
-	connect(m_operandSecondComboBox, SIGNAL(activated(int)), this, SLOT(operandSecondChanged(int)));
+	connect(m_operandSecondComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operandSecondChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_operandSecondComboBox, 1, 1, 2, 2);
 
 	m_operatorComboBox = new TQComboBox(m_groupBox);
-	connect(m_operatorComboBox, SIGNAL(activated(int)), this, SLOT(operatorChanged(int)));
+	connect(m_operatorComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operatorChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_operatorComboBox, 1, 1, 1, 1);
 }
 
@@ -466,7 +466,7 @@ TimebaseControlWidget::TimebaseControlWidget(TQWidget *parent, const char *name)
 	m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
 
 	m_secondsDivComboBox = new TQComboBox(m_groupBox);
-	connect(m_secondsDivComboBox, SIGNAL(activated(int)), this, SLOT(sdivChanged(int)));
+	connect(m_secondsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sdivChanged(int)));
 	m_primaryLayout->addMultiCellWidget(m_secondsDivComboBox, 0, 0, 0, 0);
 
 	TQLabel* label = new TQLabel(m_groupBox);
@@ -526,11 +526,11 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_controlWidgetViewFixupTimer = new TQTimer(this);
-	connect(m_controlWidgetViewFixupTimer, SIGNAL(timeout()), this, SLOT(controlWidgetViewSetWidth()));
+	connect(m_controlWidgetViewFixupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(controlWidgetViewSetWidth()));
 	m_controlWidgetViewFixupTimer->start(100, FALSE);
 
 	// Initialize data
@@ -591,10 +591,10 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
 	m_mathTraceControlWidgetGrid = new TQGridLayout(m_base->mathTraceControlLayoutWidget);
 	m_timebaseControlWidgetGrid = new TQGridLayout(m_base->timebaseControlLayoutWidget);
 	m_timebaseControlWidget = new TimebaseControlWidget(m_base->timebaseControlLayoutWidget);
-	connect(m_timebaseControlWidget, SIGNAL(secondsPerDivChanged(double)), this, SLOT(traceControlSDivChanged(double)));
+	connect(m_timebaseControlWidget, TQ_SIGNAL(secondsPerDivChanged(double)), this, TQ_SLOT(traceControlSDivChanged(double)));
 	m_timebaseControlWidgetGrid->addMultiCellWidget(m_timebaseControlWidget, 0, 0, 0, 0);
 	m_traceWidget = m_base->traceScrollWidget->traceWidget();
-	connect(m_traceWidget, SIGNAL(cursorDragged(uint, double)), this, SLOT(cursorLevelChanged(uint, double)));
+	connect(m_traceWidget, TQ_SIGNAL(cursorDragged(uint, double)), this, TQ_SLOT(cursorLevelChanged(uint, double)));
 	m_base->traceScrollWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 	m_base->traceScrollWidget->setResizePolicy(TQScrollView::AutoOneFit);
 	m_base->traceScrollWidget->setHScrollBarMode(TQScrollView::AlwaysOff);
@@ -635,19 +635,19 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
 
 	m_base->traceZoomWidget->setHorizontalRangeModeAbsolute(false);
 	m_base->traceZoomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
-	connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
-	connect(m_traceWidget, SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, SLOT(setTraceOffset(uint, double)));
+	connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
+	connect(m_traceWidget, TQ_SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, TQ_SLOT(setTraceOffset(uint, double)));
 
-	connect(m_base->dumpSamples, SIGNAL(clicked()), this, SLOT(dumpSamples()));
-	connect(m_base->acqStart, SIGNAL(clicked()), this, SLOT(startDAQ()));
-	connect(m_base->acqStop, SIGNAL(clicked()), this, SLOT(stopDAQ()));
-	connect(m_base->runControlStartButton, SIGNAL(clicked()), this, SLOT(startScope()));
-	connect(m_base->runControlStopButton, SIGNAL(clicked()), this, SLOT(stopScope()));
+	connect(m_base->dumpSamples, TQ_SIGNAL(clicked()), this, TQ_SLOT(dumpSamples()));
+	connect(m_base->acqStart, TQ_SIGNAL(clicked()), this, TQ_SLOT(startDAQ()));
+	connect(m_base->acqStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopDAQ()));
+	connect(m_base->runControlStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startScope()));
+	connect(m_base->runControlStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopScope()));
 
-	connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
-	connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
+	connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+	connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 ScopePart::~ScopePart() {
@@ -731,9 +731,9 @@ void ScopePart::disconnectFromServerCallback() {
 }
 
 void ScopePart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
@@ -2458,17 +2458,17 @@ void ScopePart::updateTraceControlWidgets() {
 	for (i=0; i<m_maxNumberOfTraces;i++) {
 		if (!m_traceControlWidgetList[i]) {
 			m_traceControlWidgetList[i] = new TraceControlWidget(m_base->traceControlLayoutWidget);
-			connect(m_traceControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(traceControlEnableChanged(bool)));
-			connect(m_traceControlWidgetList[i], SIGNAL(voltsPerDivChanged(double)), this, SLOT(traceControlVDivChanged(double)));
-			connect(m_traceControlWidgetList[i], SIGNAL(triggerChannelChangeRequested()), this, SLOT(processTriggerButtons()));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(traceControlEnableChanged(bool)));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(voltsPerDivChanged(double)), this, TQ_SLOT(traceControlVDivChanged(double)));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(triggerChannelChangeRequested()), this, TQ_SLOT(processTriggerButtons()));
 			m_traceControlWidgetGrid->addMultiCellWidget(m_traceControlWidgetList[i], i, i, 0, 0);
 			m_traceControlWidgetList[i]->setTraceName(i18n("Channel %1").arg(i+1));
 			m_traceControlWidgetList[i]->show();
 		}
 		if (!m_tracePostProcessControlWidgetList[i]) {
 			m_tracePostProcessControlWidgetList[i] = new TracePostProcessControlWidget(m_base->postProcessTraceControlLayoutWidget);
-			connect(m_tracePostProcessControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(tracePostProcessControlEnableChanged(bool)));
-			connect(m_tracePostProcessControlWidgetList[i], SIGNAL(voltsMultiplierChanged(double)), this, SLOT(tracePostProcessControlVMultChanged(double)));
+			connect(m_tracePostProcessControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(tracePostProcessControlEnableChanged(bool)));
+			connect(m_tracePostProcessControlWidgetList[i], TQ_SIGNAL(voltsMultiplierChanged(double)), this, TQ_SLOT(tracePostProcessControlVMultChanged(double)));
 			m_postProcessTraceControlWidgetGrid->addMultiCellWidget(m_tracePostProcessControlWidgetList[i], i, i, 0, 0);
 			m_tracePostProcessControlWidgetList[i]->setTraceName(i18n("Channel %1").arg(i+1));
 			m_tracePostProcessControlWidgetList[i]->show();
@@ -2487,11 +2487,11 @@ void ScopePart::updateTraceControlWidgets() {
 	for (i=0; i<m_maxNumberOfMathTraces;i++) {
 		if (!m_mathTraceControlWidgetList[i]) {
 			m_mathTraceControlWidgetList[i] = new MathTraceControlWidget(m_base->mathTraceControlLayoutWidget);
-			connect(m_mathTraceControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(mathTraceControlEnableChanged(bool)));
-			connect(m_mathTraceControlWidgetList[i], SIGNAL(voltsPerDivChanged(double)), this, SLOT(mathTraceControlVDivChanged(double)));
-			connect(m_mathTraceControlWidgetList[i], SIGNAL(firstMathOperandChanged(int)), this, SLOT(mathTraceControlFirstOperandChanged(int)));
-			connect(m_mathTraceControlWidgetList[i], SIGNAL(secondMathOperandChanged(int)), this, SLOT(mathTraceControlSecondOperandChanged(int)));
-			connect(m_mathTraceControlWidgetList[i], SIGNAL(mathOperatorChanged(TQString)), this, SLOT(mathTraceControlOperatorChanged(TQString)));
+			connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(mathTraceControlEnableChanged(bool)));
+			connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(voltsPerDivChanged(double)), this, TQ_SLOT(mathTraceControlVDivChanged(double)));
+			connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(firstMathOperandChanged(int)), this, TQ_SLOT(mathTraceControlFirstOperandChanged(int)));
+			connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(secondMathOperandChanged(int)), this, TQ_SLOT(mathTraceControlSecondOperandChanged(int)));
+			connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(mathOperatorChanged(TQString)), this, TQ_SLOT(mathTraceControlOperatorChanged(TQString)));
 			m_mathTraceControlWidgetGrid->addMultiCellWidget(m_mathTraceControlWidgetList[i], i+m_maxNumberOfTraces, i+m_maxNumberOfTraces, 0, 0);
 			m_mathTraceControlWidgetList[i]->setTraceName(i18n("Math %1").arg(i+1));
 			m_mathTraceControlWidgetList[i]->show();
diff --git a/clients/tde/src/part/scope/part.h b/clients/tde/src/part/scope/part.h
index dbe4066..f9f6790 100644
--- a/clients/tde/src/part/scope/part.h
+++ b/clients/tde/src/part/scope/part.h
@@ -56,7 +56,7 @@ namespace RemoteLab
 {
 	class TraceControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -91,7 +91,7 @@ namespace RemoteLab
 
 	class TracePostProcessControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TracePostProcessControlWidget(TQWidget *parent=0, const char *name=0);
@@ -119,7 +119,7 @@ namespace RemoteLab
 
 	class MathTraceControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			MathTraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -173,7 +173,7 @@ namespace RemoteLab
 
 	class TimebaseControlWidget : public TQWidget
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 			TimebaseControlWidget(TQWidget *parent=0, const char *name=0);
@@ -199,10 +199,10 @@ namespace RemoteLab
 
 	class ScopePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
-			ScopePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			ScopePart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~ScopePart();
 
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 48e23f3..13c952e 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -87,7 +87,7 @@ K_EXPORT_COMPONENT_FACTORY(libremotelab_sensormonitor, RemoteLab::Factory)
 TQValueTimer::TQValueTimer(TQObject *parent, const char *name)
 	: TQTimer(parent, name)
 {
-	connect(this, SIGNAL(timeout()), this, SLOT(timeoutHandler()));
+	connect(this, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutHandler()));
 }
 
 TQValueTimer::~TQValueTimer() {
@@ -117,7 +117,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
 	m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
 
 	m_channelEnabledCheckBox = new TQCheckBox(m_groupBox);
-	connect(m_channelEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+	connect(m_channelEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
 	m_channelEnabledCheckBox->setText(i18n("Enable"));
 	m_primaryLayout->addMultiCellWidget(m_channelEnabledCheckBox, 0, 0, 0, 2);
 
@@ -138,7 +138,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
 
 	m_timestepSpinBox = new FloatSpinBox(m_groupBox);
 	m_timestepSpinBox->setFloatMax(60*60*24);	// 1 day
-	connect(m_timestepSpinBox, SIGNAL(floatValueChanged(double)), this, SLOT(timestepChanged(double)));
+	connect(m_timestepSpinBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(timestepChanged(double)));
 	m_primaryLayout->addMultiCellWidget(m_timestepSpinBox, 3, 3, 1, 1);
 	m_timestepSpinBox->hide();
 
@@ -149,13 +149,13 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
 
 	m_clearPushButton = new TQPushButton(m_groupBox);
 	m_clearPushButton->setText(i18n("Erase Existing Data"));
-	connect(m_clearPushButton, SIGNAL(clicked()), this, SLOT(clearTraceDataClicked()));
+	connect(m_clearPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearTraceDataClicked()));
 	m_primaryLayout->addMultiCellWidget(m_clearPushButton, 5, 5, 0, 2);
 	m_clearPushButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
 	m_clearPushButton->hide();
 
 	m_sampleTimer = new TQTimer();
-	connect(m_sampleTimer, SIGNAL(timeout()), this, SIGNAL(newSampleDesired()));
+	connect(m_sampleTimer, TQ_SIGNAL(timeout()), this, TQ_SIGNAL(newSampleDesired()));
 }
 
 TraceControlWidget::~TraceControlWidget() {
@@ -266,11 +266,11 @@ SensorMonitorPart::SensorMonitorPart(TQWidget *parentWidget, const char *widgetN
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_pingDelayTimer = new TQTimer(this);
-	connect(m_pingDelayTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_pingDelayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Initialize data
 	m_hdivs = 10;
@@ -318,16 +318,16 @@ SensorMonitorPart::SensorMonitorPart(TQWidget *parentWidget, const char *widgetN
 	m_traceWidget->setZoomBoxEnabled(true);
 
 	m_base->traceZoomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
-	connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
+	connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
 
 	// Initialize widgets
-	connect(m_base->runControlStartButton, SIGNAL(clicked()), this, SLOT(acquisitionStartButtonClicked()));
-	connect(m_base->runControlStopButton, SIGNAL(clicked()), this, SLOT(acquisitionStopButtonClicked()));
-	connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
-	connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
-	connect(m_base->autoSave, SIGNAL(clicked()), this, SLOT(processLockouts()));
+	connect(m_base->runControlStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(acquisitionStartButtonClicked()));
+	connect(m_base->runControlStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(acquisitionStopButtonClicked()));
+	connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+	connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
+	connect(m_base->autoSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 SensorMonitorPart::~SensorMonitorPart() {
@@ -403,9 +403,9 @@ void SensorMonitorPart::disconnectFromServerCallback() {
 }
 
 void SensorMonitorPart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = ModeIdle_StateSensorListRequest;
 	m_commHandlerMode = ModeIdle;
@@ -622,7 +622,7 @@ void SensorMonitorPart::mainEventLoop() {
 						positionArray.resize(m_samplesInTrace[m_sampleRequestIndex]);
 						sampleArray[m_samplesInTrace[m_sampleRequestIndex]-1] = newValue;
 						positionArray[m_samplesInTrace[m_sampleRequestIndex]-1] = (timestamp.toTime_t()+(timestamp.time().msec()*1.0e-3));
-	
+
 						m_traceWidget->setSamples(m_sampleRequestIndex, sampleArray);
 						m_traceWidget->setPositions(m_sampleRequestIndex, positionArray);
 						m_base->traceZoomWidget->setSamples(m_sampleRequestIndex, sampleArray);
@@ -630,7 +630,7 @@ void SensorMonitorPart::mainEventLoop() {
 
 						m_traceControlWidgetList[m_sampleRequestIndex]->setCurrentSampleValue(newValue, m_sensorList[m_sampleRequestIndex].units);
 						m_traceControlWidgetList[m_sampleRequestIndex]->setCurrentSampleTimestamp(timestamp);
-	
+
 						updateGraticule();
 						m_traceWidget->repaint(false);
 						m_base->traceZoomWidget->repaint(false);
@@ -724,9 +724,9 @@ void SensorMonitorPart::updateTraceControlWidgets() {
 	for (i=0; i<m_maxNumberOfTraces;i++) {
 		if (!m_traceControlWidgetList[i]) {
 			m_traceControlWidgetList[i] = new TraceControlWidget(m_base->traceControlLayoutWidget);
-			connect(m_traceControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(traceControlEnableChanged(bool)));
-			connect(m_traceControlWidgetList[i], SIGNAL(newSampleDesired()), this, SLOT(processNewSampleRequest()));
-			connect(m_traceControlWidgetList[i], SIGNAL(clearTraceRequested()), this, SLOT(traceControlClearRequested()));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(traceControlEnableChanged(bool)));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(newSampleDesired()), this, TQ_SLOT(processNewSampleRequest()));
+			connect(m_traceControlWidgetList[i], TQ_SIGNAL(clearTraceRequested()), this, TQ_SLOT(traceControlClearRequested()));
 			m_traceControlWidgetGrid->addMultiCellWidget(m_traceControlWidgetList[i], i, i, 0, 0);
 			m_traceControlWidgetList[i]->setTraceName(i18n("Sensor %1").arg(m_sensorList[i].name));
 			m_traceControlWidgetList[i]->show();
@@ -845,7 +845,7 @@ void SensorMonitorPart::processNewSampleRequest(int channel) {
 		if ((!stopTraceUpdate) && (m_commHandlerState != ModeIdle_StateProcessReset) && (m_commHandlerState != ModeIdle_StateResetRequest)) {
 			TQValueTimer* timer = new TQValueTimer;
 			timer->setValue(channel);
-			connect(timer, SIGNAL(valueTimeout(int)), this, SLOT(processNewSampleRequest(int)));
+			connect(timer, TQ_SIGNAL(valueTimeout(int)), this, TQ_SLOT(processNewSampleRequest(int)));
 			timer->start(10, TRUE);
 		}
 	}
diff --git a/clients/tde/src/part/sensormonitor/part.h b/clients/tde/src/part/sensormonitor/part.h
index 94e3fb9..12fb128 100644
--- a/clients/tde/src/part/sensormonitor/part.h
+++ b/clients/tde/src/part/sensormonitor/part.h
@@ -58,9 +58,9 @@ class SensorMonitorBase;
 
 namespace RemoteLab
 {
-	class Q_EXPORT TQValueTimer : public TQTimer
+	class TQ_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/part.cpp b/clients/tde/src/part/serialconsole/part.cpp
index 84b5d0b..60d7340 100644
--- a/clients/tde/src/part/serialconsole/part.cpp
+++ b/clients/tde/src/part/serialconsole/part.cpp
@@ -76,9 +76,9 @@ SerialConsolePart::SerialConsolePart( TQWidget *parentWidget, const char *widget
 
 	// Create timers
 	m_forcedUpdateTimer = new TQTimer(this);
-	connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 	m_updateTimeoutTimer = new TQTimer(this);
-	connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+	connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
 
 	// Create widgets
 	m_base = new SerialConsoleBase(widget());
@@ -86,10 +86,10 @@ SerialConsolePart::SerialConsolePart( TQWidget *parentWidget, const char *widget
 	// Initialize widgets
 	m_base->setMinimumSize(500,350);
 
-	connect(m_base->sendText, SIGNAL(clicked()), this, SLOT(sendTextClicked()));
-	connect(m_base->textInput, SIGNAL(returnPressed()), m_base->sendText, SIGNAL(clicked()));
+	connect(m_base->sendText, TQ_SIGNAL(clicked()), this, TQ_SLOT(sendTextClicked()));
+	connect(m_base->textInput, TQ_SIGNAL(returnPressed()), m_base->sendText, TQ_SIGNAL(clicked()));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
 }
 
 SerialConsolePart::~SerialConsolePart() {
@@ -135,9 +135,9 @@ void SerialConsolePart::disconnectFromServerCallback() {
 }
 
 void SerialConsolePart::connectionFinishedCallback() {
-	connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
 	m_socket->processPendingData();
-	connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+	connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
 	m_tickerState = 0;
 	m_commHandlerState = 0;
 	m_commHandlerMode = 0;
diff --git a/clients/tde/src/part/serialconsole/part.h b/clients/tde/src/part/serialconsole/part.h
index 7bf41f3..f0c20a1 100644
--- a/clients/tde/src/part/serialconsole/part.h
+++ b/clients/tde/src/part/serialconsole/part.h
@@ -43,10 +43,10 @@ namespace RemoteLab
 {
 	class SerialConsolePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
-			SerialConsolePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+			SerialConsolePart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
 			~SerialConsolePart();
 	
 			virtual bool openFile() { return false; }	// pure virtual in the base class
diff --git a/clients/tde/src/widgets/floatspinbox.cpp b/clients/tde/src/widgets/floatspinbox.cpp
index 9bcff87..3dbf346 100644
--- a/clients/tde/src/widgets/floatspinbox.cpp
+++ b/clients/tde/src/widgets/floatspinbox.cpp
@@ -34,13 +34,13 @@
 FloatSpinBox::FloatSpinBox(double fmin, double fmax, double fvalue, TQWidget *parent) : TQSpinBox(parent) {
 	init(fmin, fmax, fvalue);
 
-	connect( this, SIGNAL(valueChanged(int)), SLOT(acceptValueChanged(int)) );
+	connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(acceptValueChanged(int)) );
 }
 
 FloatSpinBox::FloatSpinBox(TQWidget *parent , const char* name) : TQSpinBox(parent, name) {
 	init(0, 0, 0);
 
-	connect( this, SIGNAL(valueChanged(int)), SLOT(acceptValueChanged(int)) );
+	connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(acceptValueChanged(int)) );
 }
 
 void FloatSpinBox::init(double fmin, double fmax, double fvalue, int precision) {
@@ -120,4 +120,4 @@ FloatSpinBox::~FloatSpinBox()
 	//
 }
 
-#include "floatspinbox.moc"
\ No newline at end of file
+#include "floatspinbox.moc"
diff --git a/clients/tde/src/widgets/floatspinbox.h b/clients/tde/src/widgets/floatspinbox.h
index 102584f..deefe06 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);
@@ -67,4 +67,4 @@ class FloatSpinBox : public TQSpinBox
 		double value;
 };
 
-#endif // FLOATSPINBOX_H
\ No newline at end of file
+#endif // FLOATSPINBOX_H
diff --git a/clients/tde/src/widgets/sevensegment.h b/clients/tde/src/widgets/sevensegment.h
index 62b3b00..c568a72 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)
 
@@ -96,4 +96,4 @@ class TQ_EXPORT Display7SegmentArray : public TQFrame
 		void init();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/clients/tde/src/widgets/tracewidget.cpp b/clients/tde/src/widgets/tracewidget.cpp
index f4a7c7d..14d2df8 100644
--- a/clients/tde/src/widgets/tracewidget.cpp
+++ b/clients/tde/src/widgets/tracewidget.cpp
@@ -637,10 +637,10 @@ TraceData::TraceData(TraceWidget* parent, TQWidget* labelParent) : TQObject(), p
 		singleDecrBtn->hide();
 		posResetBtn->hide();
 		posSetBtn->hide();
-		connect(singleIncrBtn, SIGNAL(clicked()), this, SLOT(movePosOneTick()));
-		connect(singleDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegOneTick()));
-		connect(posResetBtn, SIGNAL(clicked()), this, SLOT(resetVPosition()));
-		connect(posSetBtn, SIGNAL(clicked()), this, SLOT(setVPosition()));
+		connect(singleIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosOneTick()));
+		connect(singleDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegOneTick()));
+		connect(posResetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetVPosition()));
+		connect(posSetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setVPosition()));
 	}
 	else {
 		paramLabel = NULL;
@@ -698,10 +698,10 @@ void TraceData::drawTrace(TQPainter* p, int graticule_width, int graticule_heigh
 		for (n=leftEdgeIndex; n<numberOfSamples-incr; n=n+incr) {
 			// Detect invalid samples and skip drawing of those samples
 			// This avoids ugly drawing artifacts when not all sample data is available
-			if (       isnan(positionArray[n])      || isinf(positionArray[n])
-				|| isnan(positionArray[n+incr]) || isinf(positionArray[n+incr])
-				|| isnan(sampleArray[n])        || isinf(sampleArray[n])
-				|| isnan(sampleArray[n+incr])   || isinf(sampleArray[n+incr])) {
+			if (       std::isnan(positionArray[n])      || std::isinf(positionArray[n])
+				|| std::isnan(positionArray[n+incr]) || std::isinf(positionArray[n+incr])
+				|| std::isnan(sampleArray[n])        || std::isinf(sampleArray[n])
+				|| std::isnan(sampleArray[n+incr])   || std::isinf(sampleArray[n+incr])) {
 				continue;
 			}
 
@@ -898,10 +898,10 @@ CursorData::CursorData(TraceWidget* parent, TQWidget* labelParent) : TQObject(),
 		singleDecrBtn->installEventFilter(this);
 		multiIncrBtn->installEventFilter(this);
 		multiDecrBtn->installEventFilter(this);
-		connect(singleIncrBtn, SIGNAL(clicked()), this, SLOT(movePosOneTick()));
-		connect(singleDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegOneTick()));
-		connect(multiIncrBtn, SIGNAL(clicked()), this, SLOT(movePosMultiTicks()));
-		connect(multiDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegMultiTicks()));
+		connect(singleIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosOneTick()));
+		connect(singleDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegOneTick()));
+		connect(multiIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosMultiTicks()));
+		connect(multiDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegMultiTicks()));
 	}
 	else {
 		paramLabel = NULL;
@@ -1066,7 +1066,7 @@ GraticuleWidget::GraticuleWidget(TraceWidget* parent, const char* name) : TQWidg
 	setPaletteBackgroundColor(TQt::black);
 	setPaletteForegroundColor(TQColor(0,128,0));
 	setMouseTracking(true);
-	setCursor(tqcrossCursor);
+	setCursor(crossCursor);
 }
 
 GraticuleWidget::~GraticuleWidget() {
@@ -1209,7 +1209,7 @@ void GraticuleWidget::mousePressEvent(TQMouseEvent *e) {
 		if (m_base->m_zoomBoxEnabled) {
 			m_middleMouseDown = true;
 			m_prevDownPos = e->pos();
-			setCursor(tqsizeAllCursor);
+			setCursor(sizeAllCursor);
 		}
 	}
 }
@@ -1288,7 +1288,7 @@ void GraticuleWidget::mouseReleaseEvent(TQMouseEvent *e) {
 				// Reset original zoom box
 				m_base->setZoomCursorBox(m_prevCursorRect);
 			}
-			setCursor(tqcrossCursor);
+			setCursor(crossCursor);
 		}
 	}
 
@@ -1339,10 +1339,10 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) {
 		if (m_closestCursor >= 0) {
 			if (m_closestCursorDistance <= CURSOR_MOVE_CAPTURE_DISTANCE) {
 				if (m_base->m_cursorArray[m_closestCursor]->orientation == TQt::Horizontal) {
-					setCursor(tqsizeVerCursor);
+					setCursor(sizeVerCursor);
 				}
 				else {
-					setCursor(tqsizeHorCursor);
+					setCursor(sizeHorCursor);
 				}
 				if (!m_base->m_cursorArray[m_closestCursor]->highlighted) {
 					cursorHighlightChanged = true;
@@ -1350,7 +1350,7 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) {
 				m_base->m_cursorArray[m_closestCursor]->highlighted = true;
 			}
 			else {
-				setCursor(tqcrossCursor);
+				setCursor(crossCursor);
 				if (m_base->m_cursorArray[m_closestCursor]->highlighted) {
 					cursorHighlightChanged = true;
 				}
@@ -1358,7 +1358,7 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) {
 			}
 		}
 		else {
-			setCursor(tqcrossCursor);
+			setCursor(crossCursor);
 		}
 	}
 
@@ -1502,7 +1502,7 @@ TraceWidget::TraceWidget(TQWidget* parent, const char* name) : TQWidget(parent,
 
 	m_primaryLayout = new TQGridLayout(this);
 	m_graticuleWidget = new GraticuleWidget(this);
-	connect(m_graticuleWidget, SIGNAL(cursorPositionChanged(uint, double)), this, SLOT(processChangedCursor(uint, double)));
+	connect(m_graticuleWidget, TQ_SIGNAL(cursorPositionChanged(uint, double)), this, TQ_SLOT(processChangedCursor(uint, double)));
 	m_primaryLayout->addMultiCellWidget(m_graticuleWidget, 0, 253, 1, 254);
 	m_primaryLayout->setAlignment(TQt::AlignTop);
 	m_rightPaneLayout = new TQGridLayout;
@@ -2560,7 +2560,7 @@ void TraceWidget::resizeTraceArray(uint newsize) {
 		m_traceArray.resize(newsize);
 		for (uint i=oldcount;i<newsize;i++) {
 			m_traceArray[i] = new TraceData(this, this);
-			connect(m_traceArray[i], SIGNAL(offsetChanged(double)), this, SLOT(processChangedOffset(double)));
+			connect(m_traceArray[i], TQ_SIGNAL(offsetChanged(double)), this, TQ_SLOT(processChangedOffset(double)));
 			if (m_traceArray[i]->paramLabel) {
 				m_traceLabelLayout->addMultiCellWidget(m_traceArray[i]->paramLabel, 0, 2, i*2, i*2);
 				m_traceLabelLayout->addWidget(m_traceArray[i]->singleIncrBtn, 0, (i*2)+1);
@@ -2601,7 +2601,7 @@ void TraceWidget::resizeCursorArray(uint newsize) {
 		m_cursorArray.resize(newsize);
 		for (uint i=oldcount;i<newsize;i++) {
 			m_cursorArray[i] = new CursorData(this, this);
-			connect(m_cursorArray[i], SIGNAL(positionChanged(double)), this, SLOT(processChangedCusorPosition(double)));
+			connect(m_cursorArray[i], TQ_SIGNAL(positionChanged(double)), this, TQ_SLOT(processChangedCusorPosition(double)));
 			if (m_cursorArray[i]->paramLabel) {
 				m_cursorLabelLayout->addMultiCellWidget(m_cursorArray[i]->paramLabel, i*2, i*2, 0, 3);
 				m_cursorLabelLayout->addMultiCellWidget(m_cursorArray[i]->multiIncrBtn, (i*2)+1, (i*2)+1, 0, 0, TQt::AlignHCenter);
@@ -2664,7 +2664,7 @@ TraceScrollWidget::TraceScrollWidget(TQWidget* parent, const char* name) : TQVBo
 	m_traceScrollView = new TraceScrollView(this);
 	m_horizScrollBar = new TQScrollBar(this);
 	m_traceScrollView->m_traceWidget->m_horizScrollBar = m_horizScrollBar;
-	connect(m_horizScrollBar, TQT_SIGNAL(valueChanged(int)), m_traceScrollView->m_traceWidget->m_graticuleWidget, TQT_SLOT(horizScrollValueChanged(int)));
+	connect(m_horizScrollBar, TQ_SIGNAL(valueChanged(int)), m_traceScrollView->m_traceWidget->m_graticuleWidget, TQ_SLOT(horizScrollValueChanged(int)));
 	m_traceScrollView->setHScrollBarMode(TQScrollView::AlwaysOff);
 	m_horizScrollBar->setOrientation(TQt::Horizontal);
 	m_horizScrollBarMode = TQScrollView::AlwaysOff;
diff --git a/clients/tde/src/widgets/tracewidget.h b/clients/tde/src/widgets/tracewidget.h
index aed6189..0e5befb 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);
@@ -150,7 +150,7 @@ typedef TQMemArray<TraceData*> TraceList;
 
 class CursorData : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		CursorData(TraceWidget* parent, TQWidget* labelParent=0);
@@ -193,7 +193,7 @@ typedef TQMemArray<CursorData*> CursorList;
 
 class GraticuleWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		GraticuleWidget(TraceWidget*, const char* = 0);
@@ -242,7 +242,7 @@ class GraticuleWidget : public TQWidget
 
 class TraceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum TextDisplayType {
@@ -400,7 +400,7 @@ class TraceWidget : public TQWidget
 
 class TraceScrollView : public TQScrollView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceScrollView(TQWidget* = 0, const char* = 0);
@@ -419,7 +419,7 @@ class TraceScrollView : public TQScrollView
 
 class TraceScrollWidget : public TQVBox
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TraceScrollWidget(TQWidget* = 0, const char* = 0);
@@ -439,4 +439,4 @@ class TraceScrollWidget : public TQVBox
 		TQScrollView::ScrollBarMode m_horizScrollBarMode;
 };
 
-#endif
\ No newline at end of file
+#endif