[X2Go-Commits] [x2goclient] 01/02: onmainwindow.cpp: whitespace changes to installTranslator() only.

git-admin at x2go.org git-admin at x2go.org
Mon May 4 19:39:10 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 21e18e80db7a9a23c9256c7ca7692f40b143f5e0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 4 18:45:26 2015 +0200

    onmainwindow.cpp: whitespace changes to installTranslator() only.
---
 debian/changelog     |    1 +
 src/onmainwindow.cpp |   39 +++++++++++++++++----------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1ea48d..13a9e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -348,6 +348,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       be explicitly marked as such in a free function.
     - {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no
       functional changes.
+    - onmainwindow.cpp: whitespace changes to installTranslator() only.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 9193d92..870f571 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -546,33 +546,28 @@ void ONMainWindow::slotSyncX()
 }
 
 
-void ONMainWindow::installTranslator()
-{
-    QTranslator* x2goclientTranslator=new QTranslator();
-    QString filename=QString ( ":/i18n/x2goclient_%1" ).arg (
-                         QLocale::system().name() );
-    filename=filename.toLower();
-    if ( !x2goclientTranslator->load ( filename ) )
-    {
-        x2goWarningf(1)<<tr("Can't load translator: ") + filename.toAscii();
+void ONMainWindow::installTranslator () {
+    QTranslator *x2goclientTranslator = new QTranslator ();
+    QString filename = QString (":/i18n/x2goclient_%1" ).arg (QLocale::system ().name ());
+    filename = filename.toLower ();
+
+    if (!x2goclientTranslator->load (filename)) {
+        x2goWarningf (1) << tr ("Can't load translator: ") + filename.toAscii ();
     }
-    else
-    {
-        QCoreApplication::installTranslator ( x2goclientTranslator );
-        x2goInfof(4)<<tr("Translator: ") + filename.toAscii() + tr(" installed.");
+    else {
+        QCoreApplication::installTranslator (x2goclientTranslator);
+        x2goInfof (4) << tr ("Translator: ") + filename.toAscii () + tr (" installed.");
     }
 
 
-    QTranslator* qtTranslator=new QTranslator;
-    filename=QString ( ":/i18n/qt_%1" ).arg ( QLocale::system().name() );
-    if ( !qtTranslator->load ( filename ) )
-    {
-        x2goWarningf(2)<<tr("Can't load translator: ") + filename.toAscii();
+    QTranslator *qtTranslator = new QTranslator;
+    filename = QString ( ":/i18n/qt_%1" ).arg (QLocale::system ().name ());
+    if (!qtTranslator->load (filename)) {
+        x2goWarningf (2) << tr ("Can't load translator: ") + filename.toAscii ();
     }
-    else
-    {
-        QCoreApplication::installTranslator ( qtTranslator );
-        x2goInfof(5)<<tr("Translator: ") + filename.toAscii() + tr(" installed.");
+    else {
+        QCoreApplication::installTranslator (qtTranslator);
+        x2goInfof (5) << tr ("Translator: ") + filename.toAscii () + tr (" installed.");
     }
 }
 

--
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