diff options
Diffstat (limited to 'krdc')
-rw-r--r-- | krdc/keycapturedialog.cpp | 6 | ||||
-rw-r--r-- | krdc/krdc.h | 2 | ||||
-rw-r--r-- | krdc/preferencesdialog.cpp | 2 | ||||
-rw-r--r-- | krdc/rdp/krdpview.cpp | 4 | ||||
-rw-r--r-- | krdc/rdp/rdphostpref.cpp | 8 | ||||
-rw-r--r-- | krdc/rdp/rdphostpref.h | 20 | ||||
-rw-r--r-- | krdc/rdp/rdpprefs.ui | 4 | ||||
-rw-r--r-- | krdc/vnc/kvncview.cpp | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index fdbae624..47f93455 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -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 *tqlayout = new TQVBoxLayout( main, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( main, 0, KDialog::spacingHint() ); m_captureWidget = new KeyCaptureWidget( main, "m_captureWidget" ); - tqlayout->addWidget( m_captureWidget ); - tqlayout->addStretch(); + layout->addWidget( m_captureWidget ); + layout->addStretch(); } KeyCaptureDialog::~KeyCaptureDialog() { diff --git a/krdc/krdc.h b/krdc/krdc.h index a264e11e..9c8ed657 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -66,7 +66,7 @@ class KRDC : public TQWidget TQ_OBJECT private: SmartPtr<KProgressDialog> m_progressDialog; // dialog, displayed while connecting - TQVBoxLayout *m_layout; // the tqlayout for autosizing the scrollview + TQVBoxLayout *m_layout; // the layout 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) diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index ab302434..b244c6ff 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->tqlayout() )); + m_rdpPrefs->setKbLayout( keymap2int( m_rdpDefaults->layout() )); m_rdpPrefs->setResolution(); } diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index b91e42b1..14f5cabc 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -164,7 +164,7 @@ bool KRdpView::editPreferences( HostPrefPtr host ) int wv = hp->width(); int hv = hp->height(); int cd = hp->colorDepth(); - TQString kl = hp->tqlayout(); + TQString kl = hp->layout(); bool kwallet = hp->useKWallet(); // show preferences dialog @@ -243,7 +243,7 @@ bool KRdpView::start() *m_process << "-g" << (TQString::number(hp->width()) + "x" + TQString::number(hp->height())); } } - *m_process << "-k" << hp->tqlayout(); + *m_process << "-k" << hp->layout(); if(!m_user.isEmpty()) { *m_process << "-u" << m_user; } if(m_password.isEmpty() && useKWallet ) { diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp index 4f677aaf..ba876146 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+"tqlayout", m_layout); + m_config->writeEntry(p+"layout", 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+"tqlayout", "en-us"); + m_layout = m_config->readEntry(p+"layout", "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+"tqlayout"); + m_config->deleteEntry(p+"layout"); m_config->deleteEntry(p+"askOnConnect"); m_config->deleteEntry(p+"useKWallet"); } @@ -154,7 +154,7 @@ void RdpHostPref::setLayout(const TQString &l) save(); } -TQString RdpHostPref::tqlayout() const +TQString RdpHostPref::layout() const { return m_layout; } diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h index 11f490ec..7b7be704 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 tqlayout; - for(tqlayout = 0; tqlayout < rdpNumKeymaps; tqlayout++) + int layout; + for(layout = 0; layout < rdpNumKeymaps; layout++) { - if(keymap == rdpKeymaps[tqlayout]) + if(keymap == rdpKeymaps[layout]) { break; } } - if(tqlayout == rdpNumKeymaps) + if(layout == rdpNumKeymaps) { - tqlayout = rdpDefaultKeymap; + layout = rdpDefaultKeymap; } - return tqlayout; + return layout; } -inline TQString int2keymap(int tqlayout) +inline TQString int2keymap(int layout) { - if(tqlayout < 0 || tqlayout >= rdpNumKeymaps) + if(layout < 0 || layout >= rdpNumKeymaps) { return rdpKeymaps[rdpDefaultKeymap]; } - return rdpKeymaps[tqlayout]; + return rdpKeymaps[layout]; } 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 tqlayout() const; + TQString layout() const; void setAskOnConnect(bool ask); bool askOnConnect() const; bool useKWallet() const; diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index e22908c6..338dff73 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -338,7 +338,7 @@ <number>4</number> </property> <property name="whatsThis" stdset="0"> - <string>Use this to specify your keyboard tqlayout. This tqlayout setting is used to send the correct keyboard codes to the server.</string> + <string>Use this to specify your keyboard layout. This layout 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>&Keyboard tqlayout:</string> + <string>&Keyboard layout:</string> </property> <property name="buddy" stdset="0"> <cstring>cmbKbLayout</cstring> diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index a5e42061..889a5783 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -92,7 +92,7 @@ KVncView::KVncView(TQWidget *parent, setFixedSize(16,16); setFocusPolicy(TQ_StrongFocus); - m_cb = TQApplication::tqclipboard(); + m_cb = TQApplication::clipboard(); connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); |