diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-03-18 13:22:56 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2014-03-18 13:44:58 +0100 |
commit | 7872981d6298d43d688385e57fc5e2186a60347f (patch) | |
tree | e31cfa6b1918c24bf0abc0297dc57d2a682c0519 /src/plugins/git/gitsubmiteditor.cpp | |
parent | a5a42c3f67570809fca3970d40b0ddf71269c74d (diff) | |
download | qt-creator-7872981d6298d43d688385e57fc5e2186a60347f.tar.gz |
Git: Simplify commit message codec handling
Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.cpp')
-rw-r--r-- | src/plugins/git/gitsubmiteditor.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index ebe6a0b6a7..7857171768 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -88,6 +88,7 @@ private: GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent) : VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget(parent)), m_model(0), + m_commitEncoding(0), m_commitType(SimpleCommit), m_forceClose(false) { @@ -202,13 +203,10 @@ QByteArray GitSubmitEditor::fileContents() const { const QString &text = submitEditorWidget()->descriptionText(); - if (!m_commitEncoding.isEmpty()) { - // Do the encoding convert, When use user-defined encoding - // e.g. git config --global i18n.commitencoding utf-8 - QTextCodec *codec = QTextCodec::codecForName(m_commitEncoding.toLocal8Bit()); - if (codec) - return codec->fromUnicode(text); - } + // Do the encoding convert, When use user-defined encoding + // e.g. git config --global i18n.commitencoding utf-8 + if (m_commitEncoding) + return m_commitEncoding->fromUnicode(text); // Using utf-8 as the default encoding return text.toUtf8(); |