This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 139e5afc3a89f0811c9c28296d194eeb7473dfa9 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 23:59:10 2015 +0100 x2goutils: rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). Update references in onmainwindow.cpp and sessionbutton.cpp. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 7 +++---- src/sessionbutton.cpp | 7 +++---- src/x2goutils.cpp | 6 +++--- src/x2goutils.h | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35b4bd0..5e6874f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -224,6 +224,9 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Add myself to copyright section in the x2goutils headers. - Change four spaces per indentation level to two spaces in x2goutils.cpp. - Add fixup_resources() to x2goutils to fix "broken" resource URI's. + - Rename fixup_resources() and wrap_legacy_resources() to + fixup_resource_URIs() and wrap_legacy_resource_URIs(). Update + references. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index bdf2a55..f571f89 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2537,10 +2537,9 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) - sessIcon = wrap_legacy_resources (st->setting()->value ( - sid+"/icon", - (QVariant) ":/img/icons/128x128/x2gosession.png" - ).toString ()); + sessIcon = wrap_legacy_resource_URIs (st->setting()->value (sid+"/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ()); sessIcon = expandHome(sessIcon); command=st->setting()->value ( diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 5690323..75d676f 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -310,10 +310,9 @@ void SessionButton::redraw() sessStatus->setText("("+tr("suspended")+")"); } - QString sessIcon = wrap_legacy_resources (st->setting()->value (sid+"/icon", - (QVariant) - ":/img/icons/128x128/x2gosession.png" - ).toString ()); + QString sessIcon = wrap_legacy_resource_URIs (st->setting()->value (sid+"/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ()); sessIcon = expandHome(sessIcon); QPixmap* pix; diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index a41fdf2..61d8d5c 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -30,7 +30,7 @@ QString expandHome( QString path ) return path; } -QString fixup_resources (const QString res_path) { +QString fixup_resource_URIs (const QString res_path) { QString ret (res_path); if (!(res_path.isEmpty ())) { @@ -42,7 +42,7 @@ QString fixup_resources (const QString res_path) { return (ret); } -QString wrap_legacy_resources (const QString res_path) { +QString wrap_legacy_resource_URIs (const QString res_path) { QString ret (res_path); if (!(res_path.isEmpty ())) { @@ -51,7 +51,7 @@ QString wrap_legacy_resources (const QString res_path) { legacy_locations.push_back (QString (":/png/")); legacy_locations.push_back (QString (":/svg/")); - ret = fixup_resources (ret); + ret = fixup_resource_URIs (ret); bool detected = false; diff --git a/src/x2goutils.h b/src/x2goutils.h index cc6bc38..912ce2d 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -22,7 +22,7 @@ #include <QString> QString expandHome( QString path ); -QString fixup_resources (const QString res_path); -QString wrap_legacy_resources (const QString res_path); +QString fixup_resource_URIs (const QString res_path); +QString wrap_legacy_resource_URIs (const QString res_path); #endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git