Branch: master

28bb9c79 2019-01-24 19:01:43 Timothy Pearson 
Fix FTBFS from TQT conversion commit
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/part.h
M clients/tde/src/part/adminconsole/terminatedlg.h
M clients/tde/src/part/adminusermgmt/groupauthdlg.h
M clients/tde/src/part/adminusermgmt/part.h
M clients/tde/src/part/commanalyzer/part.h
M clients/tde/src/part/companalyzer/part.h
M clients/tde/src/part/fpgaprogram/part.h
M clients/tde/src/part/fpgaview/part.h
M clients/tde/src/part/logicanalyzer/part.h
M clients/tde/src/part/prototerminal/part.h
M clients/tde/src/part/scope/part.h
M clients/tde/src/part/sensormonitor/part.h
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/remotemdi.h

diff --git a/clients/tde/src/app/remotemdi.h b/clients/tde/src/app/remotemdi.h
index 8f848ca..92e48c6 100644
--- a/clients/tde/src/app/remotemdi.h
+++ b/clients/tde/src/app/remotemdi.h
@@ -30,7 +30,7 @@
  */
 class RemoteMDI : public KMdiMainFrm
 {
-	TQ_OBJECT
+	Q_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 1f30444..36b9aad 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
 {
-	TQ_OBJECT
+	Q_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 8d52e02..740f76b 100644
--- a/clients/tde/src/dialogs/selectserverdlg.h
+++ b/clients/tde/src/dialogs/selectserverdlg.h
@@ -30,7 +30,7 @@
 
 class SelectServerDialog : public KDialogBase
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 public:
 	SelectServerDialog(TQWidget* parent = 0, const char* name = 0, StationList sl = StationList());

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 5b5f2be..5fe125e 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
 	{
-		TQ_OBJECT
+		Q_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 cb95b35..eff6080 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
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 public:
 	TerminateDialog(TQWidget* parent = 0, const char* name = 0);

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 c1e70c0..1c3498d 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
 {
-	TQ_OBJECT
+	Q_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 1dcc68c..1a039e4 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
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			UserManagementPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);

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 75d9f9b..65d56d0 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
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			CommAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

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 5d6e1ad..532dd0f 100644
--- a/clients/tde/src/part/companalyzer/part.h
+++ b/clients/tde/src/part/companalyzer/part.h
@@ -114,7 +114,7 @@
 
 	class CompAnalyzerWorker : public TQObject
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			CompAnalyzerWorker();
@@ -183,7 +183,7 @@
 
 	class CompAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

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 8c79ea9..95ea66c 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
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			FPGAProgramPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);

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 6e730db..4eb8a35 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
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 	public:
 		FPGALed(TQWidget *parent=0, const char *name=0);
@@ -71,7 +71,7 @@
 
 class FPGAPushButton : public KLed
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 	public:
 		FPGAPushButton(TQWidget *parent=0, const char *name=0);
@@ -93,7 +93,7 @@
 
 class ImageViewerWindow : public KMdiChildView
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 	public:
 		ImageViewerWindow(TQString caption, TQWidget* parent=0, const char* name=0);
@@ -115,7 +115,7 @@
 {
 	class FPGAViewPart : public KParts::RemoteInstrumentPart
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			enum InterfaceMode {

clients/tde/src/part/logicanalyzer/part.h

diff --git a/clients/tde/src/part/logicanalyzer/part.h b/clients/tde/src/part/logicanalyzer/part.h
index 31441d5..b787c10 100644
--- a/clients/tde/src/part/logicanalyzer/part.h
+++ b/clients/tde/src/part/logicanalyzer/part.h
@@ -48,7 +48,7 @@
 {
 	class LogicAnalyzerPart : public KParts::RemoteInstrumentPart
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			LogicAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/prototerminal/part.h

diff --git a/clients/tde/src/part/prototerminal/part.h b/clients/tde/src/part/prototerminal/part.h
index 3ec676d..1a268a2 100644
--- a/clients/tde/src/part/prototerminal/part.h
+++ b/clients/tde/src/part/prototerminal/part.h
@@ -58,7 +58,7 @@
 
 	class ProtoTerminalWorker : public TQObject
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			ProtoTerminalWorker();
@@ -94,7 +94,7 @@
 
 	class ProtoTerminalPart : public KParts::RemoteInstrumentPart
 	{
-		TQ_OBJECT
+		Q_OBJECT
 	
 		public:
 			ProtoTerminalPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);

clients/tde/src/part/scope/part.h

diff --git a/clients/tde/src/part/scope/part.h b/clients/tde/src/part/scope/part.h
index e98911f..c802ebf 100644
--- a/clients/tde/src/part/scope/part.h
+++ b/clients/tde/src/part/scope/part.h
@@ -54,7 +54,7 @@
 {
 	class TraceControlWidget : public TQWidget
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -89,7 +89,7 @@
 
 	class MathTraceControlWidget : public TQWidget
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			MathTraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -143,7 +143,7 @@
 
 	class TimebaseControlWidget : public TQWidget
 	{
-		TQ_OBJECT
+		Q_OBJECT
 
 		public:
 			TimebaseControlWidget(TQWidget *parent=0, const char *name=0);
@@ -169,7 +169,7 @@
 
 	class ScopePart : public KParts::RemoteInstrumentPart
 	{
-		TQ_OBJECT
** Diff limit reached (max: 250 lines) **