summaryrefslogtreecommitdiffstats
path: root/clients/tde/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tde/src/app')
-rw-r--r--clients/tde/src/app/remotemdi.cpp48
-rw-r--r--clients/tde/src/app/remotemdi.h2
-rw-r--r--clients/tde/src/app/views/instrumentview.cpp10
-rw-r--r--clients/tde/src/app/views/instrumentview.h2
4 files changed, 31 insertions, 31 deletions
diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index adcbab2..d14d0cc 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -41,19 +41,19 @@ RemoteMDI::RemoteMDI()
setIcon(SmallIcon("remote_laboratory_client"));
masterPollTimer = new TQTimer();
- connect(masterPollTimer, SIGNAL(timeout()), this, SLOT(masterPoll()));
+ connect(masterPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(masterPoll()));
// Create some actions
- KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
- KStdAction::quit(this, SLOT(close()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(closeCurrent()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
TDEActionCollection *const ac = actionCollection();
setStandardToolBarMenuEnabled(true);
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
- connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
- disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
+ KStdAction::quit(this, TQ_SLOT(close()), ac);
+ KStdAction::configureToolbars(this, TQ_SLOT(configToolbars()), ac);
+ KStdAction::keyBindings(this, TQ_SLOT(configKeys()), ac);
+ connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), this, TQ_SLOT(connectToServer()), ac, "connect_server");
+ disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), this, TQ_SLOT(disconnectFromServer()), ac, "disconnect_server");
setMenuForSDIModeSysButtons(menuBar());
@@ -67,11 +67,11 @@ RemoteMDI::RemoteMDI()
hideViewTaskBar();
// When we change view, change the status bar text
- connect(this, SIGNAL(viewActivated(KMdiChildView*)), this, SLOT(currentChanged(KMdiChildView*)));
+ connect(this, TQ_SIGNAL(viewActivated(KMdiChildView*)), this, TQ_SLOT(currentChanged(KMdiChildView*)));
ac->setHighlightingEnabled(true);
- connect(ac, TQT_SIGNAL(actionStatusText(const TQString&)), this, TQT_SLOT(updateStatusBarMainMessage(const TQString&) ));
- connect(ac, TQT_SIGNAL(clearStatusText()), statusBar(), TQT_SLOT(clear()));
+ connect(ac, TQ_SIGNAL(actionStatusText(const TQString&)), this, TQ_SLOT(updateStatusBarMainMessage(const TQString&) ));
+ connect(ac, TQ_SIGNAL(clearStatusText()), statusBar(), TQ_SLOT(clear()));
// Create the status bar
updateStatusBarMainMessage(i18n("No active instruments"));
@@ -109,7 +109,7 @@ RemoteMDI::~RemoteMDI()
void RemoteMDI::updateStatusBarMessage() {
TQString windowStatusBarMessage;
if (m_pCurrentWindow) {
- windowStatusBarMessage = m_windowStatusBarMapping[TQT_TQOBJECT(m_pCurrentWindow)];
+ windowStatusBarMessage = m_windowStatusBarMapping[m_pCurrentWindow];
}
KStatusBar* sb = statusBar();
@@ -149,7 +149,7 @@ void RemoteMDI::processActions() {
ServiceType st;
for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
st = *it;
- action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
+ action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), this, TQ_SLOT(startModule()), ac, st.clientLibrary.ascii());
m_instrumentActionList.append(action);
}
plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
@@ -176,7 +176,7 @@ void RemoteMDI::startModule() {
RemoteLab::InstrumentView* view = new RemoteLab::InstrumentView(st.clientLibrary, st.name, (mdiMode() == KMdi::ToplevelMode) ? 0 : this);
view->setName(st.clientLibrary.ascii());
- connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
+ connect(view, TQ_SIGNAL(statusMessageSet(const TQString&)), this, TQ_SLOT(updateStatusBarWindowMessage(const TQString&)));
if (st.singleInstance) {
const_cast<TDEAction*>(sendingAction)->setEnabled(false);
}
@@ -274,7 +274,7 @@ void RemoteMDI::finishConnectingToServer() {
// Try to get a valid ticket
if (getNewTicket() == 0) {
// Retry connection if no obvious errors were detected
- TQTimer::singleShot(0, this, SLOT(connectToServer()));
+ TQTimer::singleShot(0, this, TQ_SLOT(connectToServer()));
return;
}
else {
@@ -283,7 +283,7 @@ void RemoteMDI::finishConnectingToServer() {
}
}
else {
- connect(m_rsvSvrSocket, SIGNAL(readyRead()), m_rsvSvrSocket, SLOT(processPendingData()));
+ connect(m_rsvSvrSocket, TQ_SIGNAL(readyRead()), m_rsvSvrSocket, TQ_SLOT(processPendingData()));
m_rsvSvrSocket->processPendingData();
connToServerState = 2;
}
@@ -341,7 +341,7 @@ void RemoteMDI::finishConnectingToServer() {
break;
}
- TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+ TQTimer::singleShot(0, this, TQ_SLOT(finishConnectingToServer()));
}
}
@@ -420,8 +420,8 @@ void RemoteMDI::connectToServer() {
// Connect to the central reservation/control server
if (!m_rsvSvrSocket) {
m_rsvSvrSocket = new TDEKerberosClientSocket(this);
- connect(m_rsvSvrSocket, SIGNAL(connectionClosed()), this, SLOT(connectionClosedHandler()));
- connect(m_rsvSvrSocket, TQT_SIGNAL(statusMessageUpdated(const TQString&)), this, TQT_SLOT(updateStatusBarMainMessage(const TQString&) ));
+ connect(m_rsvSvrSocket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(connectionClosedHandler()));
+ connect(m_rsvSvrSocket, TQ_SIGNAL(statusMessageUpdated(const TQString&)), this, TQ_SLOT(updateStatusBarMainMessage(const TQString&) ));
}
m_rsvSvrSocket->setServiceName("ulab");
TQStringList disallowedMechList;
@@ -434,7 +434,7 @@ void RemoteMDI::connectToServer() {
// Finish connecting when appropriate
connToServerState = 0;
connToServerConnecting = true;
- TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+ TQTimer::singleShot(0, this, TQ_SLOT(finishConnectingToServer()));
}
}
@@ -587,7 +587,7 @@ void RemoteMDI::openNewWindow(KMdiChildView *view) {
currentChanged(view);
// Handle termination
- connect(view, SIGNAL(childWindowCloseRequest(KMdiChildView*)), this, SLOT(childClosed(KMdiChildView*)));
+ connect(view, TQ_SIGNAL(childWindowCloseRequest(KMdiChildView*)), this, TQ_SLOT(childClosed(KMdiChildView*)));
}
void RemoteMDI::childWindowCloseRequest(KMdiChildView *pWnd) {
@@ -624,7 +624,7 @@ void RemoteMDI::closeCurrent() {
void RemoteMDI::closeSpecifiedWindow(KMdiChildView *window) {
if (window) {
// Notify the status bar of the removal of the window
- updateStatusBarWindowMessage(TQString::null, TQT_TQOBJECT(window));
+ updateStatusBarWindowMessage(TQString::null, window);
updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(window->tabCaption()));
// Unplug menus
@@ -652,7 +652,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
unplugActionList("selectedInstrument_actionlist");
// Notify the status bar of the removal of the window
- updateStatusBarWindowMessage(TQString::null, TQT_TQOBJECT(w));
+ updateStatusBarWindowMessage(TQString::null, w);
updateStatusBarMainMessage(i18n("Instrument %1 removed").arg(w->tabCaption()));
// Re-enable associated action
@@ -667,7 +667,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
}
// Remove status bar text
- m_windowStatusBarMapping.remove(TQT_TQOBJECT(w));
+ m_windowStatusBarMapping.remove(w);
// Remove the view from MDI, BUT DO NOT DELETE IT! It is automatically deleted by TQt since it was closed.
removeWindowFromMdi(w);
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 TDEToggleAction;
*/
class RemoteMDI : public KMdiMainFrm
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index 88f2329..b0ca660 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -46,14 +46,14 @@ void InstrumentView::init() {
if (!factory) {
KMessageBox::error( this, i18n("TDE could not find the %1 part, or the %2 part could not be started.").arg(m_libraryName).arg(m_libraryName) );
- TQTimer::singleShot(0, this, SLOT(close()));
+ TQTimer::singleShot(0, this, TQ_SLOT(close()));
}
else {
- m_instrumentPart = (InstrumentPart *)factory->create(TQT_TQOBJECT(this), "part", "KParts::RemoteInstrumentPart");
+ m_instrumentPart = (InstrumentPart *)factory->create(this, "part", "KParts::RemoteInstrumentPart");
m_instrumentPart->setMDIMainForm(m_mainForm);
setIcon(SmallIcon(m_libraryName));
- connect(m_instrumentPart, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(setStatusMessage(const TQString&)));
- connect(m_instrumentPart, SIGNAL(usingFixedSizeChanged(bool)), this, SLOT(setUsingFixedSize(bool)));
+ connect(m_instrumentPart, TQ_SIGNAL(statusMessageSet(const TQString&)), this, TQ_SLOT(setStatusMessage(const TQString&)));
+ connect(m_instrumentPart, TQ_SIGNAL(usingFixedSizeChanged(bool)), this, TQ_SLOT(setUsingFixedSize(bool)));
TQWidget *childPartWidget = m_instrumentPart->widget();
if (childPartWidget) {
childPartWidget->installEventFilter(this);
@@ -151,7 +151,7 @@ void InstrumentView::connectServer(TQString server) {
delete canary;
return;
}
- TQTimer::singleShot(0, this, SLOT(close()));
+ TQTimer::singleShot(0, this, TQ_SLOT(close()));
}
}
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 @@ typedef KParts::RemoteInstrumentPart InstrumentPart;
class InstrumentView : public KMdiChildView
{
- Q_OBJECT
+ TQ_OBJECT
public:
InstrumentView(const TQString &library, TQWidget *parentWidget=0L, const char *name=0L, WFlags f=0);
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-23 18:18:09 +0000