uLab
/
remotelaboratory
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/remotelaboratory
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix libtqtrla FTBFS on newer TDE version

Browse Source
master
Timothy Pearson 8 months ago
parent f04fc7aa71
commit 35529a2fb0
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
lib/libtqtrla/admin

@ -1 +1 @@
Subproject commit 2ba4c0d451dc234a89ea164ec10e4393008a7cc1
Subproject commit 9e0d473a4d6a27fdd3b91e86e1a6358ac233290a

2
lib/libtqtrla/cmake

@ -1 +1 @@
Subproject commit a2fbe3aa43f55981b951b373e2fd10dfde3b5258
Subproject commit e1b441631c31d8ab9269bd44d1a992af6424ccdd

2
lib/libtqtrla/debian/compat
Unescape Escape View File

@ -1 +1 @@
5
7

4
lib/libtqtrla/src/tqtrla.cpp
Unescape Escape View File

@ -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");

40
lib/libtqtrla/src/tqtrla.h
Unescape Escape View File

@ -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>

Write Preview
Loading…
Cancel
Save