This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0fe6b3a72faf0660df53256d91b4f22e57a1201e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 23:30:28 2015 +0200 {helpdialog.cpp,x2goutils.h}: whitespace only. --- src/helpdialog.cpp | 38 +++++++++++++++++++------------------- src/x2goutils.h | 4 ++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/helpdialog.cpp b/src/helpdialog.cpp index d8fe9ad..877ecc8 100644 --- a/src/helpdialog.cpp +++ b/src/helpdialog.cpp @@ -21,36 +21,36 @@ #include "x2goutils.h" HelpDialog::HelpDialog (QWidget *parent): QDialog (parent) { - setupUi (this); + setupUi (this); } void HelpDialog::setText (QString text) { - /* Try real hard to get a monospaced font. */ - QFont font ("monospace"); + /* Try real hard to get a monospaced font. */ + QFont font ("monospace"); - if (!font_is_monospaced (font)) { + if (!font_is_monospaced (font)) { #if QT_VERSION >= 0x040700 - font.setStyleHint (QFont::Monospace); + font.setStyleHint (QFont::Monospace); #else - font.setStyleHint (QFont::TypeWriter); + font.setStyleHint (QFont::TypeWriter); #endif - } + } - if (!font_is_monospaced (font)) { - font.setFamily ("Courier New"); - } + if (!font_is_monospaced (font)) { + font.setFamily ("Courier New"); + } - if (!font_is_monospaced (font)) { - font.setFamily ("Courier"); - } + if (!font_is_monospaced (font)) { + font.setFamily ("Courier"); + } - /* If the font is not monospaced by now, there's not much else we can do... */ - font.setPointSize (10); + /* If the font is not monospaced by now, there's not much else we can do... */ + font.setPointSize (10); - plainTextEdit->setFont (font); + plainTextEdit->setFont (font); - plainTextEdit->setTabStopWidth (30); - plainTextEdit->setWordWrapMode (QTextOption::NoWrap); - plainTextEdit->setPlainText (text); + plainTextEdit->setTabStopWidth (30); + plainTextEdit->setWordWrapMode (QTextOption::NoWrap); + plainTextEdit->setPlainText (text); } diff --git a/src/x2goutils.h b/src/x2goutils.h index e438d0f..2617b1b 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -24,10 +24,14 @@ #define UNUSED(x) do { (void) x; } while (0) QString expandHome (QString path); + QString fixup_resource_URIs (const QString &res_path); + QString wrap_legacy_resource_URIs (const QString &res_path); + QString convert_to_rich_text (const QString &text, bool force = false); void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text = ""); + QString git_changelog_extract_commit_sha (const QString &gitlog); bool font_is_monospaced (const QFont &font); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git