← Back to branch summary

~ubuntu-branches/ubuntu/raring/konversation/raring-proposed

« back to all changes in this revision

Viewing changes to src/viewer/pasteeditor.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-05-24 11:33:21 UTC
  • mfrom: (2.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100524113321-b9txnlnyl0ojuy9u
Tags: 1.3~beta1-1ubuntu1
* Merge from Debian Unstable, remaining changes:
  - Add kubuntu_01_default_channels.diff, disable debian_channel.diff
  - Keep message indicator patches, libindicator-dev build-dep
  - Use the Kubuntu docpath (/usr/share/doc/kde)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/viewer/pasteeditor.cpp
34
34
    setMainWidget(widget);
35
35
 
36
36
    m_textEditor->enableFindReplace(true);
37
 
#if QT_VERSION >= 0x040500
 
37
 
38
38
    QTextOption options = m_textEditor->document()->defaultTextOption();
39
39
    options.setFlags(options.flags() | QTextOption::ShowTabsAndSpaces | QTextOption::ShowLineAndParagraphSeparators);
40
40
    m_textEditor->document()->setDefaultTextOption(options);
41
 
#endif
 
41
 
42
42
    connect(m_removeNewlinesButton, SIGNAL(clicked()), this, SLOT(removeNewlines()));
43
43
    connect(m_addQuotesButton, SIGNAL(clicked()), this, SLOT(addQuotationIndicators()));
44
44