diff options
| m--------- | lib/libtqtrla/admin | 0 | ||||
| m--------- | lib/libtqtrla/cmake | 0 | ||||
| -rw-r--r-- | lib/libtqtrla/debian/compat | 2 | ||||
| -rw-r--r-- | lib/libtqtrla/src/tqtrla.cpp | 4 | ||||
| -rw-r--r-- | lib/libtqtrla/src/tqtrla.h | 40 |
5 files changed, 23 insertions, 23 deletions
diff --git a/lib/libtqtrla/admin b/lib/libtqtrla/admin -Subproject 2ba4c0d451dc234a89ea164ec10e4393008a7cc +Subproject 9e0d473a4d6a27fdd3b91e86e1a6358ac233290 diff --git a/lib/libtqtrla/cmake b/lib/libtqtrla/cmake -Subproject a2fbe3aa43f55981b951b373e2fd10dfde3b525 +Subproject e1b441631c31d8ab9269bd44d1a992af6424ccd diff --git a/lib/libtqtrla/debian/compat b/lib/libtqtrla/debian/compat index 7ed6ff8..7f8f011 100644 --- a/lib/libtqtrla/debian/compat +++ b/lib/libtqtrla/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/lib/libtqtrla/src/tqtrla.cpp b/lib/libtqtrla/src/tqtrla.cpp index 195871e..dfdb850 100644 --- a/lib/libtqtrla/src/tqtrla.cpp +++ b/lib/libtqtrla/src/tqtrla.cpp @@ -56,7 +56,7 @@ namespace KParts // Create timers m_connectionTimer = new TQTimer(this); - connect(m_connectionTimer, SIGNAL(timeout()), this, SLOT(finishConnectingToServer())); + connect(m_connectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finishConnectingToServer())); } RemoteInstrumentPart::~RemoteInstrumentPart() { @@ -183,7 +183,7 @@ namespace KParts } if (!m_socket) { m_socket = new TDEKerberosClientSocket(this); - connect(m_socket, TQT_SIGNAL(statusMessageUpdated(const TQString&)), this, TQT_SLOT(setStatusMessage(const TQString&) )); + connect(m_socket, TQ_SIGNAL(statusMessageUpdated(const TQString&)), this, TQ_SLOT(setStatusMessage(const TQString&) )); } m_hostName = server; m_socket->setServiceName("ulab"); diff --git a/lib/libtqtrla/src/tqtrla.h b/lib/libtqtrla/src/tqtrla.h index 21ce169..4904fa4 100644 --- a/lib/libtqtrla/src/tqtrla.h +++ b/lib/libtqtrla/src/tqtrla.h @@ -49,7 +49,7 @@ namespace KParts class TDEPARTS_EXPORT RemoteInstrumentPart : public Part { - Q_OBJECT + TQ_OBJECT public: RemoteInstrumentPart(TQObject *parent = 0, const char *name = 0); @@ -117,8 +117,8 @@ namespace KParts typedef TQMemArray<float> TQFloatArray; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const TQFloatArray &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, TQFloatArray &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const TQFloatArray &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, TQFloatArray &); #endif // ============================================================================= @@ -126,8 +126,8 @@ Q_EXPORT TQDataStream &operator>>(TQDataStream &, TQFloatArray &); typedef TQMemArray<double> TQDoubleArray; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const TQDoubleArray &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, TQDoubleArray &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const TQDoubleArray &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, TQDoubleArray &); #endif // ============================================================================= @@ -144,13 +144,13 @@ class ServiceType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const ServiceType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, ServiceType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const ServiceType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, ServiceType &); #endif typedef TQValueList<ServiceType> ServiceList; -Q_EXPORT bool operator==(const ServiceType &s1, const ServiceType &s2); +TQ_EXPORT bool operator==(const ServiceType &s1, const ServiceType &s2); // ============================================================================= @@ -165,8 +165,8 @@ class StationType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const StationType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, StationType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const StationType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, StationType &); #endif class StationList : public TQValueList<StationType> @@ -195,8 +195,8 @@ class SensorType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const SensorType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, SensorType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const SensorType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, SensorType &); #endif typedef TQValueList<SensorType> SensorList; @@ -219,8 +219,8 @@ class TerminalServiceStatusType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const TerminalServiceStatusType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, TerminalServiceStatusType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const TerminalServiceStatusType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, TerminalServiceStatusType &); #endif typedef TQValueList<TerminalServiceStatusType> TerminalServiceStatusList; @@ -243,8 +243,8 @@ class WorkspaceServiceStatusType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const WorkspaceServiceStatusType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, WorkspaceServiceStatusType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const WorkspaceServiceStatusType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, WorkspaceServiceStatusType &); #endif typedef TQValueList<WorkspaceServiceStatusType> WorkspaceServiceStatusList; @@ -261,8 +261,8 @@ class TerminalServiceAuthGroupType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const TerminalServiceAuthGroupType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, TerminalServiceAuthGroupType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const TerminalServiceAuthGroupType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, TerminalServiceAuthGroupType &); #endif class TerminalServiceAuthGroupList : public TQValueList<TerminalServiceAuthGroupType> @@ -286,8 +286,8 @@ class WorkspaceServiceAuthGroupType }; #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<(TQDataStream &, const WorkspaceServiceAuthGroupType &); -Q_EXPORT TQDataStream &operator>>(TQDataStream &, WorkspaceServiceAuthGroupType &); +TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const WorkspaceServiceAuthGroupType &); +TQ_EXPORT TQDataStream &operator>>(TQDataStream &, WorkspaceServiceAuthGroupType &); #endif class WorkspaceServiceAuthGroupList : public TQValueList<WorkspaceServiceAuthGroupType> |