Branch: master

480f92da 2019-01-24 18:46:57 Timothy Pearson
Finish QT-->TQT conversion
M clients/tde/src/app/Makefile.am
M clients/tde/src/app/remotemdi.h
M clients/tde/src/app/views/instrumentview.h
M clients/tde/src/dialogs/selectserverdlg.h
M clients/tde/src/part/adminconsole/Makefile.am
M clients/tde/src/part/adminconsole/part.h
M clients/tde/src/part/adminconsole/terminatedlg.h
M clients/tde/src/part/adminusermgmt/Makefile.am
M clients/tde/src/part/adminusermgmt/groupauthdlg.h
M clients/tde/src/part/adminusermgmt/part.h
M clients/tde/src/part/commanalyzer/Makefile.am
M clients/tde/src/part/commanalyzer/part.h
M clients/tde/src/part/companalyzer/Makefile.am
M clients/tde/src/part/companalyzer/part.h
M clients/tde/src/part/fpgaprogram/Makefile.am
M clients/tde/src/part/fpgaprogram/part.h
M clients/tde/src/part/fpgaview/Makefile.am
M clients/tde/src/part/fpgaview/part.h
M clients/tde/src/part/logicanalyzer/Makefile.am
M clients/tde/src/part/logicanalyzer/part.h
M clients/tde/src/part/prototerminal/Makefile.am
M clients/tde/src/part/prototerminal/part.h
M clients/tde/src/part/scope/Makefile.am
M clients/tde/src/part/scope/part.h
M clients/tde/src/part/sensormonitor/Makefile.am
M clients/tde/src/part/sensormonitor/part.h
M clients/tde/src/part/serialconsole/Makefile.am
M clients/tde/src/part/serialconsole/part.h
M clients/tde/src/widgets/floatspinbox.h
M clients/tde/src/widgets/sevensegment.h
M clients/tde/src/widgets/tracewidget.h

clients/tde/src/app/Makefile.am

diff --git a/clients/tde/src/app/Makefile.am b/clients/tde/src/app/Makefile.am
index 01fa891..535f3a3 100644
--- a/clients/tde/src/app/Makefile.am
+++ b/clients/tde/src/app/Makefile.am
@@ -8,4 +8,4 @@
 bin_PROGRAMS = remote_laboratory_client
 remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
 remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_TDEPARTS) $(LIB_TDEUI)
-remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla -ltdeldap
+remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla -ltdeldap

clients/tde/src/app/remotemdi.h

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 RemoteMDI : public KMdiMainFrm
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**

clients/tde/src/app/views/instrumentview.h

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 @@
 
 class InstrumentView : public KMdiChildView
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		InstrumentView(const TQString &library, TQWidget *parentWidget=0L, const char *name=0L, WFlags f=0);

clients/tde/src/dialogs/selectserverdlg.h

diff --git a/clients/tde/src/dialogs/selectserverdlg.h b/clients/tde/src/dialogs/selectserverdlg.h
index 740f76b..8d52e02 100644
--- a/clients/tde/src/dialogs/selectserverdlg.h
+++ b/clients/tde/src/dialogs/selectserverdlg.h
@@ -30,7 +30,7 @@
 
 class SelectServerDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	SelectServerDialog(TQWidget* parent = 0, const char* name = 0, StationList sl = StationList());

clients/tde/src/part/adminconsole/Makefile.am

diff --git a/clients/tde/src/part/adminconsole/Makefile.am b/clients/tde/src/part/adminconsole/Makefile.am
index 3d2ebfd..eec8264 100644
--- a/clients/tde/src/part/adminconsole/Makefile.am
+++ b/clients/tde/src/part/adminconsole/Makefile.am
@@ -6,6 +6,6 @@
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_adminconsole.la
-libremotelab_adminconsole_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_adminconsole_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui

clients/tde/src/part/adminconsole/part.h

diff --git a/clients/tde/src/part/adminconsole/part.h b/clients/tde/src/part/adminconsole/part.h
index ef2a9c4..1edc260 100644
--- a/clients/tde/src/part/adminconsole/part.h
+++ b/clients/tde/src/part/adminconsole/part.h
@@ -50,7 +50,7 @@
 {
 	class AdminConsolePart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			AdminConsolePart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/adminconsole/terminatedlg.h

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 TerminateDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TerminateDialog(TQWidget* parent = 0, const char* name = 0);

clients/tde/src/part/adminusermgmt/Makefile.am

diff --git a/clients/tde/src/part/adminusermgmt/Makefile.am b/clients/tde/src/part/adminusermgmt/Makefile.am
index fd9b013..1b0b032 100644
--- a/clients/tde/src/part/adminusermgmt/Makefile.am
+++ b/clients/tde/src/part/adminusermgmt/Makefile.am
@@ -6,6 +6,6 @@
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la
-libremotelab_adminusermgmt_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_adminusermgmt_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui

clients/tde/src/part/adminusermgmt/groupauthdlg.h

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 GroupPermissionsDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		GroupPermissionsDialog(TQWidget* parent = 0, const char* name = 0);

clients/tde/src/part/adminusermgmt/part.h

diff --git a/clients/tde/src/part/adminusermgmt/part.h b/clients/tde/src/part/adminusermgmt/part.h
index f5dae85..98e861d 100644
--- a/clients/tde/src/part/adminusermgmt/part.h
+++ b/clients/tde/src/part/adminusermgmt/part.h
@@ -50,7 +50,7 @@
 {
 	class UserManagementPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			UserManagementPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/commanalyzer/Makefile.am

diff --git a/clients/tde/src/part/commanalyzer/Makefile.am b/clients/tde/src/part/commanalyzer/Makefile.am
index eacd326..d37e4fd 100644
--- a/clients/tde/src/part/commanalyzer/Makefile.am
+++ b/clients/tde/src/part/commanalyzer/Makefile.am
@@ -6,7 +6,7 @@
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_commanalyzer.la
-libremotelab_commanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_commanalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_commanalyzer_la_SOURCES = \
    part.cpp layout.ui

clients/tde/src/part/commanalyzer/part.h

diff --git a/clients/tde/src/part/commanalyzer/part.h b/clients/tde/src/part/commanalyzer/part.h
index c1a30f4..4b59d21 100644
--- a/clients/tde/src/part/commanalyzer/part.h
+++ b/clients/tde/src/part/commanalyzer/part.h
@@ -43,7 +43,7 @@
 {
 	class CommAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			CommAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/companalyzer/Makefile.am

diff --git a/clients/tde/src/part/companalyzer/Makefile.am b/clients/tde/src/part/companalyzer/Makefile.am
index 67e4865..82af60e 100644
--- a/clients/tde/src/part/companalyzer/Makefile.am
+++ b/clients/tde/src/part/companalyzer/Makefile.am
@@ -6,7 +6,7 @@
 
 #Part
 kde_module_LTLIBRARIES  =  libremotelab_companalyzer.la
-libremotelab_companalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT)
+libremotelab_companalyzer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT)
 libremotelab_companalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
 libremotelab_companalyzer_la_SOURCES = \
    part.cpp layout.ui

clients/tde/src/part/companalyzer/part.h

diff --git a/clients/tde/src/part/companalyzer/part.h b/clients/tde/src/part/companalyzer/part.h
index 6795eb9..5d6e1ad 100644
--- a/clients/tde/src/part/companalyzer/part.h
+++ b/clients/tde/src/part/companalyzer/part.h
@@ -183,7 +183,7 @@
 
 	class CompAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/fpgaprogram/Makefile.am

diff --git a/clients/tde/src/part/fpgaprogram/Makefile.am b/clients/tde/src/part/fpgaprogram/Makefile.am
index d891582..c3a5eb8 100644
--- a/clients/tde/src/part/fpgaprogram/Makefile.am
+++ b/clients/tde/src/part/fpgaprogram/Makefile.am
@@ -6,6 +6,6 @@
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la
-libremotelab_fpgaprogrammer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_fpgaprogrammer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
 libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui

clients/tde/src/part/fpgaprogram/part.h

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 @@
 {
 	class FPGAProgramPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
+		TQ_OBJECT
 	
 		public:
 			FPGAProgramPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/fpgaview/Makefile.am

diff --git a/clients/tde/src/part/fpgaview/Makefile.am b/clients/tde/src/part/fpgaview/Makefile.am
index 2b23465..4d99257 100644
--- a/clients/tde/src/part/fpgaview/Makefile.am
+++ b/clients/tde/src/part/fpgaview/Makefile.am
@@ -6,6 +6,6 @@
 
 # Part
 kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la
-libremotelab_fpgaviewer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
+libremotelab_fpgaviewer_la_LIBADD  = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la ../../widgets/libsevensegment.la $(LIB_KFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) -ltdekrbsocket -ltqtrla
 libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi
 libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui

clients/tde/src/part/fpgaview/part.h

diff --git a/clients/tde/src/part/fpgaview/part.h b/clients/tde/src/part/fpgaview/part.h
index 57e1971..78a5cf2 100644
--- a/clients/tde/src/part/fpgaview/part.h
+++ b/clients/tde/src/part/fpgaview/part.h
@@ -53,7 +53,7 @@
 
 class FPGALed : public KLed
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		FPGALed(TQWidget *parent=0, const char *name=0);
@@ -71,7 +71,7 @@
 
 class FPGAPushButton : public KLed
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		FPGAPushButton(TQWidget *parent=0, const char *name=0);
@@ -93,7 +93,7 @@
 
 class ImageViewerWindow : public KMdiChildView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ImageViewerWindow(TQString caption, TQWidget* parent=0, const char* name=0);
@@ -115,7 +115,7 @@
 {
 	class FPGAViewPart : public KParts::RemoteInstrumentPart
 	{
-		Q_OBJECT
** Diff limit reached (max: 250 lines) **