[X2Go-Commits] [x2goclient] 01/01: x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function.
git-admin at x2go.org
git-admin at x2go.org
Mon Apr 27 23:41:19 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit c11e69737f8abf092165bed6eda95099232a35d4
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Apr 27 23:40:39 2015 +0200
x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function.
---
debian/changelog | 2 ++
src/x2goutils.cpp | 53 +++++++++++++++++++++++++++--------------------------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2f34680..dd94177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -344,6 +344,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
Replace previous messages in configdialog.cpp and onmainwindow.cpp with
the helpers, because they are supposed to pop up a dialog showing almost
the same message.
+ - x2goutils.cpp: fix compile error. tr () is a member of QObject and must
+ be explicitly marked as such in a free function.
[ Fernando Pedemonte ]
* New upstream release (4.0.4.0):
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index c1d7b0b..533bfdd 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -23,6 +23,7 @@
#include <QMessageBox>
#include <QFont>
#include <QFontInfo>
+#include <QObject>
#include "x2goutils.h"
#include "onmainwindow.h"
@@ -150,40 +151,40 @@ bool font_is_monospaced (const QFont &font) {
#ifdef Q_OS_DARWIN
void show_XQuartz_not_found_error () {
- show_XQuartz_generic_error (tr ("X2Go Client could not find any suitable X11 server."),
+ show_XQuartz_generic_error (QObject::tr ("X2Go Client could not find any suitable X11 server."),
QString ());
}
void show_XQuartz_start_error () {
- show_XQuartz_generic_error (tr ("X2Go Client could not start X11 server."),
- tr ("X2Go Client requires XQuartz to be installed.\n\n"
- "If XQuartz is already installed on your system,\n"
- "please select the correct path in the now upcoming dialog.\n"
- "Refer to the end of this message for path examples,\n"
- "in case you do not know the exact location yourself.\n\n"
- "Should you have <b>not</b> installed XQuartz yet, please\n"
- "follow the outlined steps:\n\n"));
+ show_XQuartz_generic_error (QObject::tr ("X2Go Client could not start X11 server."),
+ QObject::tr ("X2Go Client requires XQuartz to be installed.\n\n"
+ "If XQuartz is already installed on your system,\n"
+ "please select the correct path in the now upcoming dialog.\n"
+ "Refer to the end of this message for path examples,\n"
+ "in case you do not know the exact location yourself.\n\n"
+ "Should you have <b>not</b> installed XQuartz yet, please\n"
+ "follow the outlined steps:\n\n"));
}
void show_XQuartz_generic_error (const QString &main_error, const QString &additional_info) {
show_RichText_WarningMsgBox (main_error,
additional_info +
- tr ("MacPorts users, please install either the port <b>xorg-server</b>\n"
- "or the port <b>xorg-server-devel</b>.\n"
- "Upon successful installation, please follow the instructions printed\n"
- "by the port utility to autostart/load the server.\n\n"
-
- "All other users, please obtain and install XQuartz from:\n"
-
- "<center><a href=\"https://xquartz.macosforge.org/\">"
- "https://xquartz.macosforge.org/"
- "</a></center>\n\n"
-
- "Afterwards, restart X2Go Client and select the correct path\n"
- "to the X11 application in the general X2Go Client settings.\n"
- "This will most likely be\n"
- "<center><b>/Applications/MacPorts/X11.app</b></center>\n"
- "or\n"
- "<center><b>/Applications/Utilities/XQuartz.app</b></center>"));
+ QObject::tr ("MacPorts users, please install either the port <b>xorg-server</b>\n"
+ "or the port <b>xorg-server-devel</b>.\n"
+ "Upon successful installation, please follow the instructions printed\n"
+ "by the port utility to autostart/load the server.\n\n"
+
+ "All other users, please obtain and install XQuartz from:\n"
+
+ "<center><a href=\"https://xquartz.macosforge.org/\">"
+ "https://xquartz.macosforge.org/"
+ "</a></center>\n\n"
+
+ "Afterwards, restart X2Go Client and select the correct path\n"
+ "to the X11 application in the general X2Go Client settings.\n"
+ "This will most likely be\n"
+ "<center><b>/Applications/MacPorts/X11.app</b></center>\n"
+ "or\n"
+ "<center><b>/Applications/Utilities/XQuartz.app</b></center>"));
}
#endif /* defined (Q_OS_DARWIN) */
--
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