summaryrefslogtreecommitdiffstats
path: root/krdc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
commit83677e35509b4dafac63b76995652bdf3b49f209 (patch)
tree591f1dc22278addb439726c42896376b17bb42bd /krdc
parent808e453c56036211f57482ed847d54aca01bba68 (diff)
downloadtdenetwork-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')
-rw-r--r--krdc/events.h10
-rw-r--r--krdc/hostpreferences.cpp2
-rw-r--r--krdc/hostprofiles.ui2
-rw-r--r--krdc/keycapturedialog.cpp8
-rw-r--r--krdc/keycapturewidget.ui10
-rw-r--r--krdc/kfullscreenpanel.cpp2
-rw-r--r--krdc/kfullscreenpanel.h2
-rw-r--r--krdc/krdc.cpp34
-rw-r--r--krdc/krdc.h8
-rw-r--r--krdc/kremoteview.cpp8
-rw-r--r--krdc/kremoteview.h18
-rw-r--r--krdc/main.cpp6
-rw-r--r--krdc/maindialogbase.ui8
-rw-r--r--krdc/maindialogwidget.cpp6
-rw-r--r--krdc/preferencesdialog.cpp2
-rw-r--r--krdc/rdp/krdpview.cpp22
-rw-r--r--krdc/rdp/krdpview.h2
-rw-r--r--krdc/rdp/rdphostpref.cpp12
-rw-r--r--krdc/rdp/rdphostpref.h20
-rw-r--r--krdc/rdp/rdpprefs.ui14
-rw-r--r--krdc/smartptr.h2
-rw-r--r--krdc/vnc/desktop.c2
-rw-r--r--krdc/vnc/kvncview.cpp18
-rw-r--r--krdc/vnc/kvncview.h2
-rw-r--r--krdc/vnc/rfbproto.c8
-rw-r--r--krdc/vnc/rfbproto.h12
-rw-r--r--krdc/vnc/threads.cpp22
-rw-r--r--krdc/vnc/threads.h6
-rw-r--r--krdc/vnc/vnchostpref.cpp2
-rw-r--r--krdc/vnc/vncprefs.ui4
-rw-r--r--krdc/vnc/vnctypes.h2
-rw-r--r--krdc/vnc/vncviewer.h2
32 files changed, 139 insertions, 139 deletions
diff --git a/krdc/events.h b/krdc/events.h
index 5100a23c..d9856449 100644
--- a/krdc/events.h
+++ b/krdc/events.h
@@ -33,10 +33,10 @@
* REMOTE_VIEW_DISCONNECTING
* @li You can move from REMOTE_VIEW_DISCONNECTED to REMOTE_VIEW_CONNECTING
*
- * @ref KRemoteView::setStatus() will follow this rules for you.
+ * @ref KRemoteView::settqStatus() will follow this rules for you.
* (If you add/remove a state here, you must adapt it)
*/
-enum RemoteViewStatus {
+enum RemoteViewtqStatus {
REMOTE_VIEW_CONNECTING = 0,
REMOTE_VIEW_AUTHENTICATING = 1,
REMOTE_VIEW_PREPARING = 2,
@@ -78,13 +78,13 @@ const int StatusChangeEventType = 41002;
class StatusChangeEvent : public TQCustomEvent
{
private:
- RemoteViewStatus m_status;
+ RemoteViewtqStatus m_status;
public:
- StatusChangeEvent(RemoteViewStatus s) :
+ StatusChangeEvent(RemoteViewtqStatus s) :
TQCustomEvent(StatusChangeEventType),
m_status(s)
{};
- RemoteViewStatus status() const { return m_status; };
+ RemoteViewtqStatus status() const { return m_status; };
};
const int PasswordRequiredEventType = 41003;
diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp
index 1c8ec573..1307bd5f 100644
--- a/krdc/hostpreferences.cpp
+++ b/krdc/hostpreferences.cpp
@@ -61,7 +61,7 @@ TQString HostPref::prefix() const {
}
TQString HostPref::prefix(const TQString &host, const TQString &type) {
- return TQString("PerHost-%1-%2-").arg(type).arg(host);
+ return TQString("PerHost-%1-%2-").tqarg(type).tqarg(host);
}
diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui
index 25f52e48..c67ab2ca 100644
--- a/krdc/hostprofiles.ui
+++ b/krdc/hostprofiles.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>117</width>
<height>21</height>
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp
index fa4378b8..087f7bd7 100644
--- a/krdc/keycapturedialog.cpp
+++ b/krdc/keycapturedialog.cpp
@@ -25,7 +25,7 @@
#include "keycapturewidget.h"
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
@@ -50,10 +50,10 @@ KeyCaptureDialog::KeyCaptureDialog(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n( "Enter Key Combination" ),
Cancel, Cancel, true), m_grabbed(false) {
TQFrame *main = makeMainWidget();
- TQVBoxLayout *layout = new TQVBoxLayout( main, 0, KDialog::spacingHint() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() );
m_captureWidget = new KeyCaptureWidget( main, "m_captureWidget" );
- layout->addWidget( m_captureWidget );
- layout->addStretch();
+ tqlayout->addWidget( m_captureWidget );
+ tqlayout->addStretch();
}
KeyCaptureDialog::~KeyCaptureDialog() {
diff --git a/krdc/keycapturewidget.ui b/krdc/keycapturewidget.ui
index 43af98f4..e90411b1 100644
--- a/krdc/keycapturewidget.ui
+++ b/krdc/keycapturewidget.ui
@@ -26,7 +26,7 @@
<property name="text">
<string>Enter a special key or key combination to send to the remote side:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>112</width>
<height>21</height>
@@ -51,7 +51,7 @@
<property name="name">
<cstring>keyLabel</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>111</width>
<height>21</height>
@@ -91,7 +91,7 @@
<property name="text">
<string>This function allows you to send a key combination like Ctrl+Alt+Del to the remote side. Press Esc to cancel.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/krdc/kfullscreenpanel.cpp b/krdc/kfullscreenpanel.cpp
index 0c85cfdd..81cd49e7 100644
--- a/krdc/kfullscreenpanel.cpp
+++ b/krdc/kfullscreenpanel.cpp
@@ -88,7 +88,7 @@ void KFullscreenPanel::setChild(TQWidget *child) {
}
void KFullscreenPanel::doLayout() {
- TQSize s = sizeHint();
+ TQSize s = tqsizeHint();
setFixedSize(s);
setGeometry((m_fsResolution.width() - s.width())/2, 0,
s.width(), s.height());
diff --git a/krdc/kfullscreenpanel.h b/krdc/kfullscreenpanel.h
index 27b43cae..d6e28927 100644
--- a/krdc/kfullscreenpanel.h
+++ b/krdc/kfullscreenpanel.h
@@ -19,7 +19,7 @@
#define KFULLSCREENPANEL_H
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqevent.h>
#include <tqtimer.h>
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());
}
diff --git a/krdc/krdc.h b/krdc/krdc.h
index a042e0e5..d78dc959 100644
--- a/krdc/krdc.h
+++ b/krdc/krdc.h
@@ -20,7 +20,7 @@
#include <kprogress.h>
#include <tqscrollview.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqsize.h>
#include <tqrect.h>
#include <tqtimer.h>
@@ -66,7 +66,7 @@ class KRDC : public TQWidget
TQ_OBJECT
private:
SmartPtr<KProgressDialog> m_progressDialog; // dialog, displayed while connecting
- TQVBoxLayout *m_layout; // the layout for autosizing the scrollview
+ TQVBoxLayout *m_layout; // the tqlayout for autosizing the scrollview
TQScrollView *m_scrollView; // scrollview that contains the remote widget
KProgress *m_progress; // progress bar for the dialog
KRemoteView *m_view; // the remote widget (e.g. KVncView)
@@ -127,7 +127,7 @@ protected:
virtual void mouseMoveEvent(TQMouseEvent *e);
virtual bool event(TQEvent *e);
virtual bool eventFilter(TQObject *watched, TQEvent *e);
- virtual TQSize sizeHint();
+ virtual TQSize tqsizeHint();
public:
KRDC(WindowMode wm = WINDOW_MODE_AUTO,
@@ -145,7 +145,7 @@ public:
static void setLastHost(const TQString &host);
private slots:
- void changeProgress(RemoteViewStatus s);
+ void changeProgress(RemoteViewtqStatus s);
void showingPasswordDialog(bool b);
void showProgressTimeout();
diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp
index 76ae6267..a3dbce40 100644
--- a/krdc/kremoteview.cpp
+++ b/krdc/kremoteview.cpp
@@ -24,11 +24,11 @@ KRemoteView::KRemoteView(TQWidget *parent,
m_status(REMOTE_VIEW_DISCONNECTED) {
}
-enum RemoteViewStatus KRemoteView::status() {
+enum RemoteViewtqStatus KRemoteView::status() {
return m_status;
}
-void KRemoteView::setStatus(RemoteViewStatus s) {
+void KRemoteView::settqStatus(RemoteViewtqStatus s) {
if (m_status == s)
return;
@@ -49,8 +49,8 @@ void KRemoteView::setStatus(RemoteViewStatus s) {
// smooth state transition
int origState = (int)m_status;
for (int i = origState; i < (int)s; i++) {
- m_status = (RemoteViewStatus) i;
- emit statusChanged((RemoteViewStatus) i);
+ m_status = (RemoteViewtqStatus) i;
+ emit statusChanged((RemoteViewtqStatus) i);
}
}
}
diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h
index af4fb0ef..0b0ae11c 100644
--- a/krdc/kremoteview.h
+++ b/krdc/kremoteview.h
@@ -152,7 +152,7 @@ public:
* Checks whether the view is currently quitting.
* @return true if it is quitting
* @see startQuitting()
- * @see setStatus()
+ * @see settqStatus()
*/
virtual bool isQuitting() = 0;
@@ -173,7 +173,7 @@ public:
* dialogs to the user) and start connecting. Should not block
* without running the event loop (so displaying a dialog is ok).
* When the view starts connecting the application must call
- * @ref setStatus() with the status REMOTE_VIEW_CONNECTING.
+ * @ref settqStatus() with the status REMOTE_VIEW_CONNECTING.
* @return true if successful (so far), false
* otherwise
* @see connected()
@@ -186,9 +186,9 @@ public:
/**
* Returns the current status of the connection.
* @return the status of the connection
- * @see setStatus()
+ * @see settqStatus()
*/
- enum RemoteViewStatus status();
+ enum RemoteViewtqStatus status();
public slots:
/**
@@ -253,7 +253,7 @@ signals:
* Emitted when the status of the view changed.
* @param s the new status
*/
- void statusChanged(RemoteViewStatus s);
+ void statusChanged(RemoteViewtqStatus s);
/**
* Emitted when the password dialog is shown or hidden.
@@ -275,21 +275,21 @@ protected:
/**
* The status of the remote view.
*/
- enum RemoteViewStatus m_status;
+ enum RemoteViewtqStatus m_status;
/**
* Set the status of the connection.
* Emits a statusChanged() signal.
* Note that the states need to be set in a certain order,
- * see @ref RemoteViewStatus. setStatus() will try to do this
+ * see @ref RemoteViewtqStatus. settqStatus() will try to do this
* transition automatically, so if you are in REMOTE_VIEW_CONNECTING
- * and call setStatus(REMOTE_VIEW_PREPARING), setStatus() will
+ * and call settqStatus(REMOTE_VIEW_PREPARING), settqStatus() will
* emit a REMOTE_VIEW_AUTHENTICATING and then REMOTE_VIEW_PREPARING.
* If you transition backwards, it will emit a
* REMOTE_VIEW_DISCONNECTED before doing the transition.
* @param s the new status
*/
- virtual void setStatus(RemoteViewStatus s);
+ virtual void settqStatus(RemoteViewtqStatus s);
};
#endif
diff --git a/krdc/main.cpp b/krdc/main.cpp
index ed59061a..95657483 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -27,7 +27,7 @@
#include <tqwindowdefs.h>
#include <tqtimer.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include "../config.h"
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
TQString passwordFile = args->getOption("password-file");
TQFile f(passwordFile);
if (!f.open(IO_ReadOnly)) {
- KMessageBox::error(0, i18n("The password file '%1' does not exist.").arg(passwordFile));
+ KMessageBox::error(0, i18n("The password file '%1' does not exist.").tqarg(passwordFile));
return 1;
}
password = TQTextStream(&f).readLine();
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
if (!is.isNull()) {
TQRegExp re("([0-9]+)[xX]([0-9]+)");
if (!re.exactMatch(is))
- args->usage(i18n("Wrong geometry format, must be widthXheight"));
+ args->usage(i18n("Wrong tqgeometry format, must be widthXheight"));
initialWindowSize = TQSize(re.cap(1).toInt(), re.cap(2).toInt());
}
diff --git a/krdc/maindialogbase.ui b/krdc/maindialogbase.ui
index c1757016..96f04ff0 100644
--- a/krdc/maindialogbase.ui
+++ b/krdc/maindialogbase.ui
@@ -48,7 +48,7 @@
<property name="name">
<cstring>m_serverInput</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -149,7 +149,7 @@ Remote Desktop Connection only supports systems that use VNC.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>34</width>
<height>16</height>
@@ -188,7 +188,7 @@ Remote Desktop Connection only supports systems that use VNC.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>34</width>
<height>16</height>
@@ -226,7 +226,7 @@ Remote Desktop Connection only supports systems that use VNC.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp
index 09b0de52..eed72b99 100644
--- a/krdc/maindialogwidget.cpp
+++ b/krdc/maindialogwidget.cpp
@@ -56,7 +56,7 @@ class UrlListViewItem : public KListViewItem
if ( !desc.isNull() )
setText( 0, desc );
if ( ( !userid.isEmpty() ) && ( !fullname.isEmpty() ) )
- setText( 0, TQString( "%1 (%2)" ).arg( fullname ).arg( userid ) );
+ setText( 0, TQString( "%1 (%2)" ).tqarg( fullname ).tqarg( userid ) );
else if ( !userid.isNull() )
setText( 0, userid );
else if ( !fullname.isNull() )
@@ -175,8 +175,8 @@ void MainDialogWidget::enableBrowsingArea( bool enable )
m_browsingPanel->setMaximumSize(0, 0);
m_browsingPanel->setEnabled(false);
m_browseButton->setText(m_browseButton->text().replace("<<", ">>"));
- int h = minimumSize().height()-hOffset;
- setMinimumSize(minimumSize().width(), (h > 0) ? h : 0);
+ int h = tqminimumSize().height()-hOffset;
+ setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0);
resize(width(), height()-hOffset);
TQTimer::singleShot( 0, parentWidget(), TQT_SLOT( adjustSize() ) );
diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp
index b244c6ff..ab302434 100644
--- a/krdc/preferencesdialog.cpp
+++ b/krdc/preferencesdialog.cpp
@@ -80,7 +80,7 @@ void PreferencesDialog::load()
m_rdpPrefs->setShowPrefs( m_rdpDefaults->askOnConnect() );
m_rdpPrefs->setUseKWallet( m_rdpDefaults->useKWallet() );
m_rdpPrefs->setColorDepth( m_rdpDefaults->colorDepth() );
- m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->layout() ));
+ m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->tqlayout() ));
m_rdpPrefs->setResolution();
}
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 14f5cabc..4e5bc632 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -120,13 +120,13 @@ KRdpView::~KRdpView()
// returns the size of the framebuffer
TQSize KRdpView::framebufferSize()
{
- return m_container->sizeHint();
+ return m_container->tqsizeHint();
}
// returns the suggested size
-TQSize KRdpView::sizeHint()
+TQSize KRdpView::tqsizeHint()
{
- return maximumSize();
+ return tqmaximumSize();
}
// start closing the connection
@@ -164,12 +164,12 @@ bool KRdpView::editPreferences( HostPrefPtr host )
int wv = hp->width();
int hv = hp->height();
int cd = hp->colorDepth();
- TQString kl = hp->layout();
+ TQString kl = hp->tqlayout();
bool kwallet = hp->useKWallet();
// show preferences dialog
KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
- i18n( "RDP Host Preferences for %1" ).arg( host->host() ),
+ i18n( "RDP Host Preferences for %1" ).tqarg( host->host() ),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
TQVBox *vbox = dlg->makeVBoxMainWidget();
@@ -243,7 +243,7 @@ bool KRdpView::start()
*m_process << "-g" << (TQString::number(hp->width()) + "x" + TQString::number(hp->height()));
}
}
- *m_process << "-k" << hp->layout();
+ *m_process << "-k" << hp->tqlayout();
if(!m_user.isEmpty()) { *m_process << "-u" << m_user; }
if(m_password.isEmpty() && useKWallet ) {
@@ -303,7 +303,7 @@ bool KRdpView::start()
return false;
}
- setStatus(REMOTE_VIEW_CONNECTING);
+ settqStatus(REMOTE_VIEW_CONNECTING);
return true;
}
@@ -340,9 +340,9 @@ void KRdpView::setViewOnly(bool s)
void KRdpView::connectionOpened(WId /*window*/)
{
- TQSize size = m_container->sizeHint();
+ TQSize size = m_container->tqsizeHint();
- setStatus(REMOTE_VIEW_CONNECTED);
+ settqStatus(REMOTE_VIEW_CONNECTED);
setFixedSize(size);
m_container->setFixedSize(size);
emit changeSize(size.width(), size.height());
@@ -353,7 +353,7 @@ void KRdpView::connectionOpened(WId /*window*/)
void KRdpView::connectionClosed()
{
emit disconnected();
- setStatus(REMOTE_VIEW_DISCONNECTED);
+ settqStatus(REMOTE_VIEW_DISCONNECTED);
m_quitFlag = true;
}
@@ -361,7 +361,7 @@ void KRdpView::processDied(KProcess */*proc*/)
{
if(m_status == REMOTE_VIEW_CONNECTING)
{
- setStatus(REMOTE_VIEW_DISCONNECTED);
+ settqStatus(REMOTE_VIEW_DISCONNECTED);
if(m_clientVersion.isEmpty())
{
KMessageBox::error(0, i18n("Connection attempt to host failed."),
diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h
index 7f6180b5..c34d3c27 100644
--- a/krdc/rdp/krdpview.h
+++ b/krdc/rdp/krdpview.h
@@ -69,7 +69,7 @@ class KRdpView : public KRemoteView
// functions regarding the window
virtual TQSize framebufferSize(); // returns the size of the remote view
- TQSize sizeHint(); // returns the suggested size
+ TQSize tqsizeHint(); // returns the suggested size
virtual bool viewOnly();
virtual bool startFullscreen();
diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp
index ba876146..00ce88d7 100644
--- a/krdc/rdp/rdphostpref.cpp
+++ b/krdc/rdp/rdphostpref.cpp
@@ -48,7 +48,7 @@ void RdpHostPref::save()
m_config->writeEntry(p+"width", m_width);
m_config->writeEntry(p+"height", m_height);
m_config->writeEntry(p+"colorDepth", m_colorDepth);
- m_config->writeEntry(p+"layout", m_layout);
+ m_config->writeEntry(p+"tqlayout", m_layout);
m_config->writeEntry(p+"askOnConnect", m_askOnConnect);
m_config->writeEntry(p+"useKWallet", m_useKWallet);
}
@@ -73,7 +73,7 @@ void RdpHostPref::load()
m_width = m_config->readNumEntry(p+"width", 0);
m_height = m_config->readNumEntry(p+"height", 0);
m_colorDepth = m_config->readNumEntry(p+"colorDepth", 24);
- m_layout = m_config->readEntry(p+"layout", "en-us");
+ m_layout = m_config->readEntry(p+"tqlayout", "en-us");
m_askOnConnect = m_config->readBoolEntry(p+"askOnConnect", true);
m_useKWallet = m_config->readBoolEntry(p+"useKWallet", true);
}
@@ -91,7 +91,7 @@ void RdpHostPref::remove()
m_config->deleteEntry(p+"width");
m_config->deleteEntry(p+"height");
m_config->deleteEntry(p+"colorDepth");
- m_config->deleteEntry(p+"layout");
+ m_config->deleteEntry(p+"tqlayout");
m_config->deleteEntry(p+"askOnConnect");
m_config->deleteEntry(p+"useKWallet");
}
@@ -110,8 +110,8 @@ void RdpHostPref::setDefaults()
TQString RdpHostPref::prefDescription() const
{
return i18n("Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, KWallet: %6")
- .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(m_width).arg(m_height)
- .arg(m_colorDepth).arg(m_layout).arg(m_useKWallet ? i18n("yes") : i18n("no"));
+ .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(m_width).tqarg(m_height)
+ .tqarg(m_colorDepth).tqarg(m_layout).tqarg(m_useKWallet ? i18n("yes") : i18n("no"));
}
void RdpHostPref::setWidth(int w)
@@ -154,7 +154,7 @@ void RdpHostPref::setLayout(const TQString &l)
save();
}
-TQString RdpHostPref::layout() const
+TQString RdpHostPref::tqlayout() const
{
return m_layout;
}
diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h
index 7b7be704..11f490ec 100644
--- a/krdc/rdp/rdphostpref.h
+++ b/krdc/rdp/rdphostpref.h
@@ -60,29 +60,29 @@ static const int rdpDefaultKeymap = 6; // en-us
inline int keymap2int(const TQString &keymap)
{
- int layout;
- for(layout = 0; layout < rdpNumKeymaps; layout++)
+ int tqlayout;
+ for(tqlayout = 0; tqlayout < rdpNumKeymaps; tqlayout++)
{
- if(keymap == rdpKeymaps[layout])
+ if(keymap == rdpKeymaps[tqlayout])
{
break;
}
}
- if(layout == rdpNumKeymaps)
+ if(tqlayout == rdpNumKeymaps)
{
- layout = rdpDefaultKeymap;
+ tqlayout = rdpDefaultKeymap;
}
- return layout;
+ return tqlayout;
}
-inline TQString int2keymap(int layout)
+inline TQString int2keymap(int tqlayout)
{
- if(layout < 0 || layout >= rdpNumKeymaps)
+ if(tqlayout < 0 || tqlayout >= rdpNumKeymaps)
{
return rdpKeymaps[rdpDefaultKeymap];
}
- return rdpKeymaps[layout];
+ return rdpKeymaps[tqlayout];
}
class RdpHostPref : public HostPref
@@ -117,7 +117,7 @@ class RdpHostPref : public HostPref
void setColorDepth(int depth);
int colorDepth() const;
void setLayout(const TQString &l);
- TQString layout() const;
+ TQString tqlayout() const;
void setAskOnConnect(bool ask);
bool askOnConnect() const;
bool useKWallet() const;
diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui
index 338dff73..0d37422a 100644
--- a/krdc/rdp/rdpprefs.ui
+++ b/krdc/rdp/rdpprefs.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -84,7 +84,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>280</width>
<height>0</height>
@@ -124,7 +124,7 @@
<property name="text">
<string>H&amp;eight:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -325,7 +325,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>280</width>
<height>0</height>
@@ -338,7 +338,7 @@
<number>4</number>
</property>
<property name="whatsThis" stdset="0">
- <string>Use this to specify your keyboard layout. This layout setting is used to send the correct keyboard codes to the server.</string>
+ <string>Use this to specify your keyboard tqlayout. This tqlayout setting is used to send the correct keyboard codes to the server.</string>
</property>
</widget>
<widget class="TQLabel" row="3" column="0">
@@ -354,7 +354,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>&amp;Keyboard layout:</string>
+ <string>&amp;Keyboard tqlayout:</string>
</property>
<property name="buddy" stdset="0">
<cstring>cmbKbLayout</cstring>
@@ -422,7 +422,7 @@
<property name="text">
<string>&amp;Width:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/krdc/smartptr.h b/krdc/smartptr.h
index 49fa25c2..53cbfeea 100644
--- a/krdc/smartptr.h
+++ b/krdc/smartptr.h
@@ -425,7 +425,7 @@ public:
rcrcount = rc->refsToThis;
}
return TQString("SmartPtr: ptr=%1, refcounts=%2, ptrnum=%3")
- .arg((int)ptr).arg(objrcount).arg(rcrcount);
+ .tqarg((int)ptr).tqarg(objrcount).tqarg(rcrcount);
}
};
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c
index 73b2e423..003a7160 100644
--- a/krdc/vnc/desktop.c
+++ b/krdc/vnc/desktop.c
@@ -626,7 +626,7 @@ void SyncScreenRegionX11Thread(int x, int y, int width, int height) {
}
/*
- * ToplevelInitBeforeRealization sets the title, geometry and other resources
+ * ToplevelInitBeforeRealization sets the title, tqgeometry and other resources
* on the toplevel window.
*/
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index b7a3b8bf..02cd3a78 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -30,7 +30,7 @@
#include <tqdatastream.h>
#include <dcopclient.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqbitmap.h>
#include <tqmutex.h>
#include <tqvbox.h>
@@ -92,7 +92,7 @@ KVncView::KVncView(TQWidget *parent,
setFixedSize(16,16);
setFocusPolicy(TQ_StrongFocus);
- m_cb = TQApplication::clipboard();
+ m_cb = TQApplication::tqclipboard();
connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
@@ -219,7 +219,7 @@ bool KVncView::checkLocalKRfb() {
if (m_port != portNum)
return true;
- setStatus(REMOTE_VIEW_DISCONNECTED);
+ settqStatus(REMOTE_VIEW_DISCONNECTED);
KMessageBox::error(0,
i18n("It is not possible to connect to a local desktop sharing service."),
i18n("Connection Failure"));
@@ -236,7 +236,7 @@ bool KVncView::editPreferences( HostPrefPtr host )
// show preferences dialog
KDialogBase *dlg = new KDialogBase( 0L, "dlg", true,
- i18n( "VNC Host Preferences for %1" ).arg( host->host() ),
+ i18n( "VNC Host Preferences for %1" ).tqarg( host->host() ),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
TQVBox *vbox = dlg->makeVBoxMainWidget();
@@ -295,7 +295,7 @@ bool KVncView::start() {
useKWallet = hp->useKWallet();
}
- setStatus(REMOTE_VIEW_CONNECTING);
+ settqStatus(REMOTE_VIEW_CONNECTING);
m_cthread.start();
setBackgroundMode(TQt::NoBackground);
@@ -390,7 +390,7 @@ void KVncView::customEvent(TQCustomEvent *e)
}
else if (e->type() == StatusChangeEventType) {
StatusChangeEvent *sce = (StatusChangeEvent*) e;
- setStatus(sce->status());
+ settqStatus(sce->status());
if (m_status == REMOTE_VIEW_CONNECTED) {
emit connected();
setFocus();
@@ -458,7 +458,7 @@ void KVncView::customEvent(TQCustomEvent *e)
}
else if (e->type() == FatalErrorEventType) {
FatalErrorEvent *fee = (FatalErrorEvent*) e;
- setStatus(REMOTE_VIEW_DISCONNECTED);
+ settqStatus(REMOTE_VIEW_DISCONNECTED);
switch (fee->errorCode()) {
case ERROR_CONNECTION:
KMessageBox::error(0,
@@ -683,8 +683,8 @@ void KVncView::focusOutEvent(TQFocusEvent *) {
unpressModifiers();
}
-TQSize KVncView::sizeHint() {
- return maximumSize();
+TQSize KVncView::tqsizeHint() {
+ return tqmaximumSize();
}
void KVncView::setRemoteMouseTracking(bool s) {
diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h
index 7a8c9a2c..7fdf402c 100644
--- a/krdc/vnc/kvncview.h
+++ b/krdc/vnc/kvncview.h
@@ -84,7 +84,7 @@ public:
DotCursorState dotCursorState = DOT_CURSOR_AUTO,
const TQString &encodings = TQString());
~KVncView();
- TQSize sizeHint();
+ TQSize tqsizeHint();
void drawRegion(int x, int y, int w, int h);
void lockFramebuffer();
void unlockFramebuffer();
diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c
index 8424e6ac..13676bb6 100644
--- a/krdc/vnc/rfbproto.c
+++ b/krdc/vnc/rfbproto.c
@@ -159,7 +159,7 @@ ConnectToRFBServer(const char *hostname, int port)
* InitialiseRFBConnection.
*/
-enum InitStatus
+enum InittqStatus
InitialiseRFBConnection()
{
rfbProtocolVersionMsg pv;
@@ -734,12 +734,12 @@ static void *MakeSoftCursor(int bpp, int cursorWidth, int cursorHeight,
/*********************************************************************
- * HandleCursorShape(). Support for XCursor and RichCursor shape
+ * HandletqCursorShape(). Support for XCursor and RichCursor tqshape
* updates. We emulate cursor operating on the frame buffer (that is
* why we call it "software cursor").
********************************************************************/
-static Bool HandleCursorShape(int xhot, int yhot, int width, int height, CARD32 enc)
+static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD32 enc)
{
int bytesPerPixel;
size_t bytesPerRow, bytesMaskData;
@@ -956,7 +956,7 @@ HandleRFBServerMessage()
if (rect.encoding == rfbEncodingXCursor ||
rect.encoding == rfbEncodingRichCursor) {
- if (!HandleCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h,
+ if (!HandletqCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h,
rect.encoding)) {
return False;
}
diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h
index f08fe66a..1b5fd839 100644
--- a/krdc/vnc/rfbproto.h
+++ b/krdc/vnc/rfbproto.h
@@ -27,7 +27,7 @@
*
* All multiple byte integers are in big endian (network) order (most
* significant byte first). Unless noted otherwise there is no special
- * alignment of protocol structures.
+ * tqalignment of protocol structures.
*
*
* Once the initial handshaking is done, all messages start with a type byte,
@@ -54,7 +54,7 @@
/*-----------------------------------------------------------------------------
* Structure used to specify a rectangle. This structure is a multiple of 4
* bytes so that it can be interspersed with 32-bit pixel data without
- * affecting alignment.
+ * affecting tqalignment.
*/
typedef struct {
@@ -299,7 +299,7 @@ typedef struct {
/*
* Special encoding numbers:
* 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels;
- * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data;
+ * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data;
* 0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions;
* 0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet;
* 0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor;
@@ -350,7 +350,7 @@ typedef struct {
* This message consists of a header giving the number of rectangles of pixel
* data followed by the rectangles themselves. The header is padded so that
* together with the type byte it is an exact multiple of 4 bytes (to help
- * with alignment of 32-bit pixels):
+ * with tqalignment of 32-bit pixels):
*/
typedef struct {
@@ -633,7 +633,7 @@ typedef struct {
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* XCursor encoding. This is a special encoding used to transmit X-style
- * cursor shapes from server to clients. Note that for this encoding,
+ * cursor tqshapes from server to clients. Note that for this encoding,
* coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot
* position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB
* samples are sent after header in the rfbXCursorColors structure. They
@@ -664,7 +664,7 @@ typedef struct {
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* RichCursor encoding. This is a special encoding used to transmit cursor
- * shapes from server to clients. It is similar to the XCursor encoding but
+ * tqshapes from server to clients. It is similar to the XCursor encoding but
* uses client pixel format instead of two RGB colors to represent cursor
* image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader
* structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h).
diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp
index 097e1367..f4e0eefe 100644
--- a/krdc/vnc/threads.cpp
+++ b/krdc/vnc/threads.cpp
@@ -47,7 +47,7 @@ ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool
{
}
-void ControllerThread::changeStatus(RemoteViewStatus s) {
+void ControllerThread::changetqStatus(RemoteViewtqStatus s) {
m_status = s;
TQApplication::postEvent(m_view, new StatusChangeEvent(s));
}
@@ -86,13 +86,13 @@ void ControllerThread::run() {
return;
}
if (m_quitFlag) {
- changeStatus(REMOTE_VIEW_DISCONNECTED);
+ changetqStatus(REMOTE_VIEW_DISCONNECTED);
return;
}
- changeStatus(REMOTE_VIEW_AUTHENTICATING);
+ changetqStatus(REMOTE_VIEW_AUTHENTICATING);
- enum InitStatus s = InitialiseRFBConnection();
+ enum InittqStatus s = InitialiseRFBConnection();
if (s != INIT_OK) {
if (s == INIT_CONNECTION_FAILED)
sendFatalError(ERROR_IO);
@@ -103,7 +103,7 @@ void ControllerThread::run() {
else if (s == INIT_AUTHENTICATION_FAILED)
sendFatalError(ERROR_AUTHENTICATION);
else if (s == INIT_ABORTED)
- changeStatus(REMOTE_VIEW_DISCONNECTED);
+ changetqStatus(REMOTE_VIEW_DISCONNECTED);
else
sendFatalError(ERROR_INTERNAL);
return;
@@ -120,18 +120,18 @@ void ControllerThread::run() {
m_waiter.wait(1000);
if (m_quitFlag) {
- changeStatus(REMOTE_VIEW_DISCONNECTED);
+ changetqStatus(REMOTE_VIEW_DISCONNECTED);
return;
}
- changeStatus(REMOTE_VIEW_PREPARING);
+ changetqStatus(REMOTE_VIEW_PREPARING);
if (!SetFormatAndEncodings()) {
sendFatalError(ERROR_INTERNAL);
return;
}
- changeStatus(REMOTE_VIEW_CONNECTED);
+ changetqStatus(REMOTE_VIEW_CONNECTED);
m_wthread.start();
@@ -143,11 +143,11 @@ void ControllerThread::run() {
}
m_quitFlag = true;
- changeStatus(REMOTE_VIEW_DISCONNECTED);
+ changetqStatus(REMOTE_VIEW_DISCONNECTED);
m_wthread.kick();
}
-enum RemoteViewStatus ControllerThread::status() {
+enum RemoteViewtqStatus ControllerThread::status() {
return m_status;
}
@@ -185,7 +185,7 @@ bool WriterThread::sendIncrementalUpdateRequest() {
}
bool WriterThread::sendUpdateRequest(const TQRegion &region) {
- TQMemArray<TQRect> r = region.rects();
+ TQMemArray<TQRect> r = region.tqrects();
for (unsigned int i = 0; i < r.size(); i++)
if (!SendFramebufferUpdateRequest(r[i].x(),
r[i].y(),
diff --git a/krdc/vnc/threads.h b/krdc/vnc/threads.h
index 08ca4c20..4bb77ef3 100644
--- a/krdc/vnc/threads.h
+++ b/krdc/vnc/threads.h
@@ -102,18 +102,18 @@ protected:
class ControllerThread : public TQThread {
private:
KVncView *m_view;
- enum RemoteViewStatus m_status;
+ enum RemoteViewtqStatus m_status;
WriterThread &m_wthread;
volatile bool &m_quitFlag;
volatile bool m_desktopInitialized;
TQWaitCondition m_waiter;
- void changeStatus(RemoteViewStatus s);
+ void changetqStatus(RemoteViewtqStatus s);
void sendFatalError(ErrorCode s);
public:
ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag);
- enum RemoteViewStatus status();
+ enum RemoteViewtqStatus status();
void desktopInit();
void kick();
diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp
index 7fea2889..3ae6ed92 100644
--- a/krdc/vnc/vnchostpref.cpp
+++ b/krdc/vnc/vnchostpref.cpp
@@ -96,7 +96,7 @@ TQString VncHostPref::prefDescription() const {
Q_ASSERT(true);
}
return i18n("Show Preferences: %1, Quality: %2, KWallet: %3")
- .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useKWallet ? i18n("yes") : i18n("no"));
+ .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(q).tqarg(m_useKWallet ? i18n("yes") : i18n("no"));
}
void VncHostPref::setQuality(int q) {
diff --git a/krdc/vnc/vncprefs.ui b/krdc/vnc/vncprefs.ui
index ad38431c..f569bb3f 100644
--- a/krdc/vnc/vncprefs.ui
+++ b/krdc/vnc/vncprefs.ui
@@ -104,7 +104,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>280</width>
<height>0</height>
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>84</width>
<height>16</height>
diff --git a/krdc/vnc/vnctypes.h b/krdc/vnc/vnctypes.h
index fae12549..4dba9a5c 100644
--- a/krdc/vnc/vnctypes.h
+++ b/krdc/vnc/vnctypes.h
@@ -54,7 +54,7 @@ typedef struct {
} AppData;
-enum InitStatus {
+enum InittqStatus {
INIT_OK = 0,
INIT_NAME_RESOLUTION_FAILURE = 1,
INIT_PROTOCOL_FAILURE = 2,
diff --git a/krdc/vnc/vncviewer.h b/krdc/vnc/vncviewer.h
index 285357b9..4b1f6cb9 100644
--- a/krdc/vnc/vncviewer.h
+++ b/krdc/vnc/vncviewer.h
@@ -155,7 +155,7 @@ typedef struct {
extern PointerImage pointerImages[];
extern int ConnectToRFBServer(const char *hostname, int port);
-extern enum InitStatus InitialiseRFBConnection(void);
+extern enum InittqStatus InitialiseRFBConnection(void);
extern Bool SetFormatAndEncodings(void);
extern Bool SendIncrementalFramebufferUpdateRequest(void);
extern Bool SendFramebufferUpdateRequest(int x, int y, int w, int h,