[X2Go-Commits] [x2goclient] 02/47: onmainwindow.cpp: silence another compiler warning by not converting from string to int and back to string needlessly.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 4 01:46:25 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit f9bd74946f4ce1a025d824683567bcd07c4c1f31
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jun 4 00:43:49 2015 +0200
onmainwindow.cpp: silence another compiler warning by not converting from string to int and back to string needlessly.
Just use the string. No need for an OS X-specific variable anymore.
---
debian/changelog | 3 +++
src/onmainwindow.cpp | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 41f4450..f74f80f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,9 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
Kerberos/GSSApi.
- onmainwindow.cpp: silence compiler warning by casting an int value to
std::size_t.
+ - onmainwindow.cpp: silence another compiler warning by not converting
+ from string to int and back to string needlessly. Just use the string.
+ No need for an OS X-specific variable anymore.
-- X2Go Release Manager <git-admin at x2go.org> Tue, 26 May 2015 21:42:09 +0200
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index ddc9e40..e79e73a 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -11630,8 +11630,6 @@ void ONMainWindow::printSshDError_noHostPubKey()
if ( closeEventSent )
return;
- int port = clientSshPort.toInt ();
-
QString error_message = tr ("SSH daemon failed to open its public host key.");
QString detailed_error_message = tr ("You have enabled Remote Printing or File Sharing.\n"
@@ -11666,7 +11664,7 @@ void ONMainWindow::printSshDError_noHostPubKey()
"<ul>"
"<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>"
- "<li>Run this command: <b>ssh -p " + QString::number (port).toAscii ()
+ "<li>Run this command: <b>ssh -p " + clientSshPort
+ " localhost</b></li>"
"<li>You do not need to login. Just quit the Terminal application "
"via Cmd + Q</li>"
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list