← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to knode/articlewidget.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
knode/articlewidget.cpp
58
58
#include <libkpgp/kpgpblock.h>
59
59
 
60
60
#include <messageviewer/kxface.h>
 
61
#include <messagecomposer/util.h>
61
62
#include <kpimutils/kfileio.h>
62
63
#include <kpimutils/linklocator.h>
63
64
#include <kpimutils/email.h>
941
942
  QString text = line;
942
943
  if ( flags & ArticleWidget::AllowROT13 ) {
943
944
    if ( mRot13 )
944
 
      text = Utils::rot13( line );
 
945
      text = Message::Util::rot13( line );
945
946
  }
946
947
  return KPIMUtils::LinkLocator::convertToHtml( text, llflags );
947
948
}