diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2019-01-24 13:01:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2019-01-24 13:01:43 -0600 |
commit | 28bb9c7919152a8970dfc23661fb1e86cf9302ef (patch) | |
tree | a228f24f2f8054ceb6e453169837147e7196563b | |
parent | 46155f46b1fcc0063d74ae46c86ded7aeefae115 (diff) | |
download | ulab-28bb9c7919152a8970dfc23661fb1e86cf9302ef.tar.gz ulab-28bb9c7919152a8970dfc23661fb1e86cf9302ef.zip |
Fix FTBFS from TQT conversion commit
-rw-r--r-- | clients/tde/src/app/remotemdi.h | 2 | ||||
-rw-r--r-- | clients/tde/src/app/views/instrumentview.h | 2 | ||||
-rw-r--r-- | clients/tde/src/dialogs/selectserverdlg.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/adminconsole/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/adminconsole/terminatedlg.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/adminusermgmt/groupauthdlg.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/adminusermgmt/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/commanalyzer/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/companalyzer/part.h | 4 | ||||
-rw-r--r-- | clients/tde/src/part/fpgaprogram/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/fpgaview/part.h | 8 | ||||
-rw-r--r-- | clients/tde/src/part/logicanalyzer/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/part/prototerminal/part.h | 4 | ||||
-rw-r--r-- | clients/tde/src/part/scope/part.h | 8 | ||||
-rw-r--r-- | clients/tde/src/part/sensormonitor/part.h | 6 | ||||
-rw-r--r-- | clients/tde/src/part/serialconsole/part.h | 2 | ||||
-rw-r--r-- | clients/tde/src/widgets/floatspinbox.h | 2 | ||||
-rw-r--r-- | clients/tde/src/widgets/sevensegment.h | 4 | ||||
-rw-r--r-- | clients/tde/src/widgets/tracewidget.h | 14 |
19 files changed, 36 insertions, 36 deletions
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 TDEToggleAction; */ class RemoteMDI : public KMdiMainFrm { - TQ_OBJECT + Q_OBJECT public: /** 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 @@ typedef KParts::RemoteInstrumentPart InstrumentPart; class InstrumentView : public KMdiChildView { - TQ_OBJECT + Q_OBJECT public: InstrumentView(const TQString &library, TQWidget *parentWidget=0L, const char *name=0L, WFlags f=0); diff --git a/clients/tde/src/dialogs/selectserverdlg.h b/clients/tde/src/dialogs/selectserverdlg.h index 8d52e02..740f76b 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 { - TQ_OBJECT + Q_OBJECT public: SelectServerDialog(TQWidget* parent = 0, const char* name = 0, StationList sl = StationList()); 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 @@ namespace RemoteLab { class AdminConsolePart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: AdminConsolePart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&); diff --git a/clients/tde/src/part/adminconsole/terminatedlg.h b/clients/tde/src/part/adminconsole/terminatedlg.h index cb95b35..eff6080 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 { - TQ_OBJECT + Q_OBJECT public: TerminateDialog(TQWidget* parent = 0, const char* name = 0); 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 TQListBoxKeyedText : public TQListBoxText class GroupPermissionsDialog : public KDialogBase { - TQ_OBJECT + Q_OBJECT public: GroupPermissionsDialog(TQWidget* parent = 0, const char* name = 0); diff --git a/clients/tde/src/part/adminusermgmt/part.h b/clients/tde/src/part/adminusermgmt/part.h index 1dcc68c..1a039e4 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 { - TQ_OBJECT + Q_OBJECT public: UserManagementPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 @@ namespace RemoteLab { class CommAnalyzerPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: CommAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 @@ namespace RemoteLab class CompAnalyzerWorker : public TQObject { - TQ_OBJECT + Q_OBJECT public: CompAnalyzerWorker(); @@ -183,7 +183,7 @@ namespace RemoteLab class CompAnalyzerPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 @@ namespace RemoteLab { class FPGAProgramPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: FPGAProgramPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 FPGAViewBase; class FPGALed : public KLed { - TQ_OBJECT + Q_OBJECT public: FPGALed(TQWidget *parent=0, const char *name=0); @@ -71,7 +71,7 @@ class FPGALed : public KLed class FPGAPushButton : public KLed { - TQ_OBJECT + Q_OBJECT public: FPGAPushButton(TQWidget *parent=0, const char *name=0); @@ -93,7 +93,7 @@ class FPGAPushButton : public KLed class ImageViewerWindow : public KMdiChildView { - TQ_OBJECT + Q_OBJECT public: ImageViewerWindow(TQString caption, TQWidget* parent=0, const char* name=0); @@ -115,7 +115,7 @@ namespace RemoteLab { class FPGAViewPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: enum InterfaceMode { 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 @@ namespace RemoteLab { class LogicAnalyzerPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: LogicAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 @@ namespace RemoteLab class ProtoTerminalWorker : public TQObject { - TQ_OBJECT + Q_OBJECT public: ProtoTerminalWorker(); @@ -94,7 +94,7 @@ namespace RemoteLab class ProtoTerminalPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: ProtoTerminalPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); 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 @@ namespace RemoteLab { class TraceControlWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: TraceControlWidget(TQWidget *parent=0, const char *name=0); @@ -89,7 +89,7 @@ namespace RemoteLab class MathTraceControlWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: MathTraceControlWidget(TQWidget *parent=0, const char *name=0); @@ -143,7 +143,7 @@ namespace RemoteLab class TimebaseControlWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: TimebaseControlWidget(TQWidget *parent=0, const char *name=0); @@ -169,7 +169,7 @@ namespace RemoteLab class ScopePart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: ScopePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); diff --git a/clients/tde/src/part/sensormonitor/part.h b/clients/tde/src/part/sensormonitor/part.h index cde2bd0..94e3fb9 100644 --- a/clients/tde/src/part/sensormonitor/part.h +++ b/clients/tde/src/part/sensormonitor/part.h @@ -60,7 +60,7 @@ namespace RemoteLab { class Q_EXPORT TQValueTimer : public TQTimer { - TQ_OBJECT + Q_OBJECT public: TQValueTimer(TQObject *parent=0, const char *name=0); @@ -80,7 +80,7 @@ namespace RemoteLab class TraceControlWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: TraceControlWidget(TQWidget *parent=0, const char *name=0); @@ -125,7 +125,7 @@ namespace RemoteLab class SensorMonitorPart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: SensorMonitorPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&); diff --git a/clients/tde/src/part/serialconsole/part.h b/clients/tde/src/part/serialconsole/part.h index 32bbb66..7bf41f3 100644 --- a/clients/tde/src/part/serialconsole/part.h +++ b/clients/tde/src/part/serialconsole/part.h @@ -43,7 +43,7 @@ namespace RemoteLab { class SerialConsolePart : public KParts::RemoteInstrumentPart { - TQ_OBJECT + Q_OBJECT public: SerialConsolePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); diff --git a/clients/tde/src/widgets/floatspinbox.h b/clients/tde/src/widgets/floatspinbox.h index 9524dbb..102584f 100644 --- a/clients/tde/src/widgets/floatspinbox.h +++ b/clients/tde/src/widgets/floatspinbox.h @@ -32,7 +32,7 @@ class FloatSpinBox : public TQSpinBox { - TQ_OBJECT + Q_OBJECT public: FloatSpinBox(TQWidget *parent = 0, const char* name = 0); diff --git a/clients/tde/src/widgets/sevensegment.h b/clients/tde/src/widgets/sevensegment.h index 3ba5dde..a14e3c5 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 { - TQ_OBJECT + Q_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 { - TQ_OBJECT + Q_OBJECT TQ_ENUMS(SegmentStyle) TQ_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle) diff --git a/clients/tde/src/widgets/tracewidget.h b/clients/tde/src/widgets/tracewidget.h index 17502aa..e4cf255 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 { - TQ_OBJECT + Q_OBJECT public: TraceWidgetPushButton(TQWidget *parent, const char* name=0); @@ -87,7 +87,7 @@ typedef TQValueList<int> TraceNumberList; class TraceData : public TQObject { - TQ_OBJECT + Q_OBJECT public: TraceData(TraceWidget* parent, TQWidget* labelParent=0); @@ -149,7 +149,7 @@ typedef TQMemArray<TraceData*> TraceList; class CursorData : public TQObject { - TQ_OBJECT + Q_OBJECT public: CursorData(TraceWidget* parent, TQWidget* labelParent=0); @@ -192,7 +192,7 @@ typedef TQMemArray<CursorData*> CursorList; class GraticuleWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: GraticuleWidget(TraceWidget*, const char* = 0); @@ -241,7 +241,7 @@ class GraticuleWidget : public TQWidget class TraceWidget : public TQWidget { - TQ_OBJECT + Q_OBJECT public: enum TextDisplayType { @@ -392,7 +392,7 @@ class TraceWidget : public TQWidget class TraceScrollView : public TQScrollView { - TQ_OBJECT + Q_OBJECT public: TraceScrollView(TQWidget* = 0, const char* = 0); @@ -411,7 +411,7 @@ class TraceScrollView : public TQScrollView class TraceScrollWidget : public TQVBox { - TQ_OBJECT + Q_OBJECT public: TraceScrollWidget(TQWidget* = 0, const char* = 0); |