[X2Go-Commits] [x2goclient] 01/01: onmainwindow.h: revert const-qualifier for get_translator().
git-admin at x2go.org
git-admin at x2go.org
Mon May 11 07:10:34 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/translation
in repository x2goclient.
commit 181fc100999dd7756cf17f8d2ad741b9cb50055c
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon May 11 07:04:14 2015 +0200
onmainwindow.h: revert const-qualifier for get_translator().
It's static and can't have any cv-qualifier.
---
debian/changelog | 2 ++
src/onmainwindow.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 79e2eec..a5a1950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -393,6 +393,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
- onmainwindow.cpp: fix compile error triggered by a missing
parenthesis/typo.
- onmainwindow.cpp: workaround https://bugreports.qt.io/browse/QTBUG-25973.
+ - onmainwindow.h: revert const-qualifier for get_translator(). It's static
+ and can't have any cv-qualifier.
[ Fernando Pedemonte ]
* New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index ecf910b..69f1a57 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -983,7 +983,7 @@ private:
* Otherwise returns true and sets the translator object to loaded
* translation.
*/
- static bool get_translator (const QString file_name_start, QTranslator **translator) const;
+ static bool get_translator (const QString file_name_start, QTranslator **translator);
protected:
--
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