[X2Go-Commits] [x2goclient] 01/08: onmainwindow.{cpp, h}: make new get_translator() function static.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/translation
in repository x2goclient.

commit e6805669924ee92e50b0b354b11833f6533efa58
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 11 06:49:32 2015 +0200

    onmainwindow.{cpp,h}: make new get_translator() function static.
    
    Correct typo in implementation.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 src/onmainwindow.h   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71c6316..31f38ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -384,6 +384,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       case.
     - onmainwindow.cpp: follow-up to last translation fix. Actually handle
       English locales correctly and don't duplicate code too much.
+    - onmainwindow.{cpp,h}: make new get_translator() function static. Correct
+      typo in implementation.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index c6d6a2e..cda60d9 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -546,7 +546,7 @@ void ONMainWindow::slotSyncX()
 }
 
 
-bool get_translator (QString file_name_start, QTranslator **translator) {
+bool ONMainWindow::get_translator (QString file_name_start, QTranslator **translator) {
     QTranslator *tmp_translator = new QTranslator ();
 
     /* Qt 4.8.0 introduced a new overload for QTranslator::load(), taking a QLocale
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 10fb353..7709e50 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -981,7 +981,7 @@ private:
      * Otherwise returns true and sets the translator object to loaded
      * translation.
      */
-    bool get_translator (QString file_name_start, QTranslator **translator);
+    static bool get_translator (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