[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/pim/mailody/src
From: Tom Albers <tomalbers () kde ! nl>
Date: 2009-04-15 20:32:23
Message-ID: 1239827543.511404.10876.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 954506 by toma:
Use the KIO accessmanager from now on.
M +0 -1 CMakeLists.txt
M +3 -3 messagebodyview.cpp
M +2 -1 messagebodyview.h
M +3 -3 messageview.cpp
D networkaccessmanager.cpp
D networkaccessmanager.h
--- trunk/extragear/pim/mailody/src/CMakeLists.txt #954505:954506
@@ -29,7 +29,6 @@
messageview.cpp
messageheaderview.cpp
messagebodyview.cpp
-networkaccessmanager.cpp
global.cpp
datalistview.cpp
addresslineedit.cpp
--- trunk/extragear/pim/mailody/src/messagebodyview.cpp #954505:954506
@@ -19,7 +19,6 @@
// Own
#include "messagebodyview.h"
-#include "networkaccessmanager.h"
#include "addressbook.h"
// Qt
@@ -33,6 +32,7 @@
#include <KGlobalSettings>
#include <KMessageBox>
#include <KToolInvocation>
+#include <kio/accessmanager.h>
#include <kpimutils/email.h>
@@ -53,7 +53,7 @@
// view()->setLineWidth( 0 );
// view()->setMidLineWidth( 2 );
- m_accessManager = new NetworkAccessManager( this );
+ m_accessManager = new KIO::AccessManager( this );
page()->setNetworkAccessManager( m_accessManager );
page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
@@ -129,7 +129,7 @@
void MessageBodyView::setExternalImage( bool i, bool screenupdate )
{
m_externalImage = i;
- m_accessManager->setExternalAllowed( i );
+ m_accessManager->setExternalContentAllowed( i );
if ( m_currentMessage && screenupdate ) {
setHtml( m_currentMessage->body() );
--- trunk/extragear/pim/mailody/src/messagebodyview.h #954505:954506
@@ -23,6 +23,7 @@
#include "messagedata.h"
#include <QWebView>
#include <akonadi/collection.h>
+#include <kio/accessmanager.h>
namespace Mailody
{
@@ -178,7 +179,7 @@
bool m_fixedFont;
bool m_externalImage;
bool m_openDirectly;
- NetworkAccessManager* m_accessManager;
+ KIO::AccessManager* m_accessManager;
// @endcond
};
--- trunk/extragear/pim/mailody/src/messageview.cpp #954505:954506
@@ -22,7 +22,6 @@
#include "messagebodyview.h"
#include "messageheaderview.h"
#include "nepomukwidget.h"
-#include "networkaccessmanager.h"
// Qt
#include <QPrintPreviewDialog>
@@ -32,6 +31,7 @@
// KDE
#include <KDebug>
#include <KGlobalSettings>
+#include <kio/accessmanager.h>
using namespace Mailody;
@@ -117,8 +117,8 @@
msgheadersdata += "</tr></table>";
m_printPart = new QWebPage( this );
- NetworkAccessManager* accessManager = new NetworkAccessManager( this );
- accessManager->setExternalAllowed( body()->externalImage() );
+ KIO::AccessManager* accessManager = new KIO::AccessManager( this );
+ accessManager->setExternalContentAllowed( body()->externalImage() );
m_printPart->setNetworkAccessManager( accessManager );
m_printPart->settings()->setFontFamily( QWebSettings::StandardFont,
m_body->fixedfont() ? \
KGlobalSettings::fixedFont().family() : KGlobalSettings::generalFont().family() );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic