diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:59:34 -0600 |
commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
tree | 591f1dc22278addb439726c42896376b17bb42bd /krdc/krdc.cpp | |
parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'krdc/krdc.cpp')
-rw-r--r-- | krdc/krdc.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 68c2d333..41d96a70 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -161,11 +161,11 @@ bool KRDC::start() } } - setCaption(i18n("%1 - Remote Desktop Connection").arg(serverHost)); + setCaption(i18n("%1 - Remote Desktop Connection").tqarg(serverHost)); m_scrollView = new TQScrollView2(this, "remote scrollview"); m_scrollView->setFrameStyle(TQFrame::NoFrame); - m_scrollView->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_scrollView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); switch(m_protocol) @@ -198,8 +198,8 @@ bool KRDC::start() // note that the disconnectedError() will be disconnected when kremoteview // is completely initialized connect(m_view, TQT_SIGNAL(disconnectedError()), TQT_SIGNAL(disconnectedError())); - connect(m_view, TQT_SIGNAL(statusChanged(RemoteViewStatus)), - TQT_SLOT(changeProgress(RemoteViewStatus))); + connect(m_view, TQT_SIGNAL(statusChanged(RemoteViewtqStatus)), + TQT_SLOT(changeProgress(RemoteViewtqStatus))); connect(m_view, TQT_SIGNAL(showingPasswordDialog(bool)), TQT_SLOT(showingPasswordDialog(bool))); connect(m_keyCaptureDialog, TQT_SIGNAL(keyPressed(XEvent*)), @@ -210,7 +210,7 @@ bool KRDC::start() return ret_status; } -void KRDC::changeProgress(RemoteViewStatus s) { +void KRDC::changeProgress(RemoteViewtqStatus s) { if (!m_progressDialog) { m_progressDialog = new KProgressDialog(0, 0, TQString(), "1234567890", false); @@ -340,15 +340,15 @@ bool KRDC::parseHost(TQString &str, Protocol &prot, TQString &serverHost, int &s if (url.port()) { if (url.hasUser()) - str = TQString("%1@%2:%3").arg(userName).arg(serverHost).arg(url.port()); + str = TQString("%1@%2:%3").tqarg(userName).tqarg(serverHost).tqarg(url.port()); else - str = TQString("%1:%2").arg(serverHost).arg(url.port()); + str = TQString("%1:%2").tqarg(serverHost).tqarg(url.port()); } else { if (url.hasUser()) - str = TQString("%1@%2").arg(userName).arg(serverHost); + str = TQString("%1@%2").tqarg(userName).tqarg(serverHost); else - str = TQString("%1").arg(serverHost); + str = TQString("%1").tqarg(serverHost); } return true; } @@ -373,10 +373,10 @@ void KRDC::enableFullscreen(bool on) m_view->switchFullscreen(on); } -TQSize KRDC::sizeHint() +TQSize KRDC::tqsizeHint() { if ((m_isFullscreen != WINDOW_MODE_FULLSCREEN) && m_toolbar) { - int dockHint = m_dockArea->sizeHint().height(); + int dockHint = m_dockArea->tqsizeHint().height(); dockHint = dockHint < 1 ? 1 : dockHint; // fix wrong size hint return TQSize(m_view->framebufferSize().width(), dockHint + m_view->framebufferSize().height()); @@ -495,7 +495,7 @@ void KRDC::switchToFullscreen(bool scaling) TQLabel *hostLabel = new TQLabel(t); hostLabel->setName("kde toolbar widget"); - hostLabel->setAlignment(TQt::AlignCenter); + hostLabel->tqsetAlignment(TQt::AlignCenter); hostLabel->setText(" "+m_host+" "); t->insertWidget(FS_HOSTLABEL_ID, 150, hostLabel); t->setItemAutoSized(FS_HOSTLABEL_ID, true); @@ -575,7 +575,7 @@ void KRDC::switchToNormal(bool scaling) if (!m_toolbar) { m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this); - m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + m_dockArea->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); KToolBar *t = new KToolBar(m_dockArea); m_toolbar = t; @@ -633,7 +633,7 @@ void KRDC::switchToNormal(bool scaling) m_view->resize(m_view->framebufferSize()); } - setMaximumSize(sizeHint()); + setMaximumSize(tqsizeHint()); repositionView(false); @@ -644,7 +644,7 @@ void KRDC::switchToNormal(bool scaling) m_initialWindowSize = TQSize(); } else if (!scalingChanged) - resize(sizeHint()); + resize(tqsizeHint()); show(); if (scalingChanged) m_view->update(); @@ -681,14 +681,14 @@ void KRDC::iconify() } void KRDC::toolbarChanged() { - setMaximumSize(sizeHint()); + setMaximumSize(tqsizeHint()); // resize window when toolbar is docked and it was maximized TQSize fs = m_view->framebufferSize(); TQSize cs = size(); TQSize cs1(cs.width(), cs.height()-1); // adjusted for TQDockArea.height()==1 if ((fs == cs) || (fs == cs1)) - resize(sizeHint()); + resize(tqsizeHint()); } |