From 80a4727453b0a881f743f5a8ad3a17275e882279 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 12 Nov 2019 09:43:43 -0300 Subject: [PATCH] Fixing API changes. --- client/src/include/lib3270/ipc.h | 8 ++++---- client/src/session/local/attribute.cc | 4 ++-- client/src/session/local/private.h | 2 +- client/src/session/remote/private.h | 2 +- client/src/session/remote/properties.cc | 4 ++-- client/src/testprogram/testprogram.cc | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/src/include/lib3270/ipc.h b/client/src/include/lib3270/ipc.h index 4c79eb4..a8c16f2 100644 --- a/client/src/include/lib3270/ipc.h +++ b/client/src/include/lib3270/ipc.h @@ -551,8 +551,8 @@ /// @brief Get the lib3270 revision string. virtual std::string getRevision() const = 0; - /// @brief Get the LU name. - virtual std::string getLUName() const = 0; + /// @brief Get the LU name associated with the session, if there is one. + virtual std::string getAssociatedLUName() const = 0; /// @brief Get the terminal lock state code. virtual LIB3270_KEYBOARD_LOCK_STATE getKeyboardLockState() const = 0; @@ -796,8 +796,8 @@ } /// @brief Get LU Name. - std::string getLUName() const { - return session->getLUName(); + std::string getAssociatedLUName() const { + return session->getAssociatedLUName(); } inline std::string getHostURL() const { diff --git a/client/src/session/local/attribute.cc b/client/src/session/local/attribute.cc index 94fb72a..c909c2a 100644 --- a/client/src/session/local/attribute.cc +++ b/client/src/session/local/attribute.cc @@ -536,10 +536,10 @@ } - std::string Local::Session::getLUName() const { + std::string Local::Session::getAssociatedLUName() const { std::lock_guard lock(const_cast(this)->sync); - return lib3270_get_luname(hSession); + return lib3270_get_associated_luname(hSession); } diff --git a/client/src/session/local/private.h b/client/src/session/local/private.h index 3fc632d..8953a67 100644 --- a/client/src/session/local/private.h +++ b/client/src/session/local/private.h @@ -140,7 +140,7 @@ std::string getVersion() const override; std::string getRevision() const override; - std::string getLUName() const override; + std::string getAssociatedLUName() const override; LIB3270_KEYBOARD_LOCK_STATE getKeyboardLockState() const override; std::string getHostURL() const override; diff --git a/client/src/session/remote/private.h b/client/src/session/remote/private.h index 82373b0..d66973d 100644 --- a/client/src/session/remote/private.h +++ b/client/src/session/remote/private.h @@ -149,7 +149,7 @@ std::string getVersion() const override; std::string getRevision() const override; - std::string getLUName() const override; + std::string getAssociatedLUName() const override; LIB3270_KEYBOARD_LOCK_STATE getKeyboardLockState() const override; std::string getHostURL() const override; diff --git a/client/src/session/remote/properties.cc b/client/src/session/remote/properties.cc index 874cc33..20f2701 100644 --- a/client/src/session/remote/properties.cc +++ b/client/src/session/remote/properties.cc @@ -197,10 +197,10 @@ } - std::string IPC::Session::getLUName() const { + std::string IPC::Session::getAssociatedLUName() const { string rc; - getAttribute("luname",rc); + getAttribute("associated_lu",rc); return rc; } diff --git a/client/src/testprogram/testprogram.cc b/client/src/testprogram/testprogram.cc index 3ee0e5c..61f0c2b 100644 --- a/client/src/testprogram/testprogram.cc +++ b/client/src/testprogram/testprogram.cc @@ -67,7 +67,7 @@ cout << "Connection state is " << toCharString(hSession->getConnectionState()) << std::endl << "Program message is " << toCharString(hSession->getProgramMessage()) << std::endl - << "Luname is " << hSession->getLUName() << std::endl + << "Luname is " << hSession->getAssociatedLUName() << std::endl << std::endl; cout @@ -131,7 +131,7 @@ << "Wait for unlock returns " << host.getKeyboardLockState() << std::endl << "Connection state is " << toCharString(host.getConnectionState()) << std::endl << "Program message is " << toCharString(host.getProgramMessage()) << std::endl - << "Luname is " << host.getLUName() << std::endl + << "Associated luname is " << host.getAssociatedLUName() << std::endl << "Screen size is " << host.getScreenWidth() << "x" << host.getScreenHeight() << " (" << host.getScreenLength() << ")" << std::endl; -- libgit2 0.21.2