[X2Go-Commits] [x2goclient] 01/04: src/onmainwindow.{cpp, h}: let iconsPath () take a const-reference instead of an object and make it a const member function.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 18 07:54:00 CET 2017


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

x2go pushed a commit to branch master
in repository x2goclient.

commit cd36a7561c449ad2412eb5570ba448c733869e5d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 18 07:42:46 2017 +0100

    src/onmainwindow.{cpp,h}: let iconsPath () take a const-reference instead of an object and make it a const member function.
---
 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 b84b2f9..d12436a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/sessionbutton.cpp: we cannot use ".." in resource paths to move up
       one level, so use images_resource_path () instead and hope that we
       finally get a yummy hamburger.
+    - src/onmainwindow.{cpp,h}: let iconsPath () take a const-reference
+      instead of an object and make it a const member function.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 806f9f2..73f5a3d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -1662,7 +1662,7 @@ void ONMainWindow::loadSettings()
 
 }
 
-QString ONMainWindow::iconsPath ( QString fname )
+QString ONMainWindow::iconsPath ( const QString &fname ) const
 {
     /*    QFile fl(this->kdeIconsPath+fname);
     	if(fl.exists())
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index c8af781..bd3e31a 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -351,7 +351,7 @@ public:
     ONMainWindow ( QWidget *parent = 0 );
     ~ONMainWindow();
     static void installTranslator();
-    QString iconsPath ( QString fname );
+    QString iconsPath ( const QString &fname ) const;
     QString images_resource_path (const QString &filename) const;
     static bool isServerRunning ( int port );
     void startNewSession();

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