diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2014-04-21 01:33:19 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2015-02-08 13:11:41 +0800 |
| commit | 121a986be20c0d18acb73d6f296e0a31e62828d0 (patch) | |
| tree | 2dc63cfe61e246e851e022690178e0a6e0772bac /src/protocol | |
| parent | a68d5b5eded5c214eb2e1f83c212a988965a38b3 (diff) | |
| download | fqterm-121a986be20c0d18acb73d6f296e0a31e62828d0.tar.xz | |
wip: Migrate to Qt5 -- API,name changes
toAscii -> toLatin1
WFlags -> WindowFlags
QCustomEvent -> QEvent
QItemDelegate::check -> QItemDelegate::toCheck
TRUE,FALSE -> true,false
Diffstat (limited to 'src/protocol')
| -rw-r--r-- | src/protocol/fqterm_ssh_socket.cpp | 4 | ||||
| -rw-r--r-- | src/protocol/internal/fqterm_ssh2_kex.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/protocol/fqterm_ssh_socket.cpp b/src/protocol/fqterm_ssh_socket.cpp index 4c1e77a..8c24f88 100644 --- a/src/protocol/fqterm_ssh_socket.cpp +++ b/src/protocol/fqterm_ssh_socket.cpp @@ -104,7 +104,7 @@ void FQTermSSHSocket::init(int ssh_version) { socket_buffer_ = new FQTermSSHBuffer(1024); packet_receiver_ = new FQTermSSH1PacketReceiver; packet_sender_ = new FQTermSSH1PacketSender; - key_exchanger_ = new FQTermSSH1Kex(SSH_V1_C, server_name_.toAscii().constData()); + key_exchanger_ = new FQTermSSH1Kex(SSH_V1_C, server_name_.toLatin1().constData()); authentication_ = new FQTermSSH1PasswdAuth(init_user_, init_passwd_); ssh_channel_ = new FQTermSSH1Channel; @@ -134,7 +134,7 @@ void FQTermSSHSocket::init(int ssh_version) { socket_buffer_ = new FQTermSSHBuffer(1024); packet_receiver_ = new FQTermSSH2PacketReceiver; packet_sender_ = new FQTermSSH2PacketSender; - key_exchanger_ = new FQTermSSH2Kex(SSH_V2_C, server_name_.toAscii().constData()); + key_exchanger_ = new FQTermSSH2Kex(SSH_V2_C, server_name_.toLatin1().constData()); authentication_ = new FQTermSSH2PasswdAuth(init_user_, init_passwd_); ssh_channel_ = new FQTermSSH2Channel; diff --git a/src/protocol/internal/fqterm_ssh2_kex.cpp b/src/protocol/internal/fqterm_ssh2_kex.cpp index acae08d..53026e9 100644 --- a/src/protocol/internal/fqterm_ssh2_kex.cpp +++ b/src/protocol/internal/fqterm_ssh2_kex.cpp @@ -156,7 +156,7 @@ void FQTermSSH2Kex::negotiateAlgorithms() { if (name_lists_len > 0) { name_lists.resize(name_lists_len); packet_receiver_->getRawData(&name_lists[0], name_lists_len); - FQ_TRACE("ssh2kex", 5) << "Algorithms: " << QString::fromAscii(&name_lists[0], name_lists_len); + FQ_TRACE("ssh2kex", 5) << "Algorithms: " << QString::fromLatin1(&name_lists[0], name_lists_len); } else { FQ_TRACE("ssh2kex", 5) << "None Algorithms"; } |