summaryrefslogtreecommitdiffstats
path: root/krdc/rdp/rdphostpref.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /krdc/rdp/rdphostpref.h
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krdc/rdp/rdphostpref.h')
-rw-r--r--krdc/rdp/rdphostpref.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/krdc/rdp/rdphostpref.h b/krdc/rdp/rdphostpref.h
index 6044f261..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
@@ -105,8 +105,8 @@ class RdpHostPref : public HostPref
public:
static const TQString RdpType;
- RdpHostPref(KConfig *conf, const TQString &host=TQString::null,
- const TQString &type=TQString::null);
+ RdpHostPref(KConfig *conf, const TQString &host=TQString(),
+ const TQString &type=TQString());
virtual ~RdpHostPref();
virtual TQString prefDescription() const;
@@ -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;