alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use kurls

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=880625
This commit is contained in:
Aaron J. Seigo 2008-11-05 23:39:30 +00:00
parent c948455956
commit 6b1a604743
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/webview.cpp
View File

@ -17,7 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtCore/QUrl>
#include <QtGui/QGraphicsSceneContextMenuEvent>
#include <QtGui/QGraphicsSceneDragDropEvent>
#include <QtGui/QGraphicsSceneMouseEvent>
@ -65,7 +64,7 @@ WebView::~WebView()
delete d;
}
void WebView::setUrl(const QUrl &url)
void WebView::setUrl(const KUrl &url)
{
d->loaded = false;
if (d->page) {
@ -73,7 +72,7 @@ void WebView::setUrl(const QUrl &url)
}
}
void WebView::setHtml(const QByteArray &html, const QUrl &baseUrl)
void WebView::setHtml(const QByteArray &html, const KUrl &baseUrl)
{
d->loaded = false;
if (d->page) {
@ -81,7 +80,7 @@ void WebView::setHtml(const QByteArray &html, const QUrl &baseUrl)
}
}
void WebView::setHtml(const QString &html, const QUrl &baseUrl)
void WebView::setHtml(const QString &html, const KUrl &baseUrl)
{
d->loaded = false;
if (d->page) {

9
widgets/webview.h
View File

@ -21,9 +21,10 @@
#define PLASMA_WEBVIEW_H
#include <plasma/plasma_export.h>
#include <QtCore/QUrl>
#include <QtGui/QGraphicsWidget>
#include <kurl.h>
class QWebPage;
class QWebFrame;
class QKeyEvent;
@ -55,7 +56,7 @@ class PLASMA_EXPORT WebView : public QGraphicsWidget
*
* @param url the location of the content to load.
*/
void setUrl(const QUrl &url);
void setUrl(const KUrl &url);
/**
* Sets the html to be shown along with a base URL to be used
@ -64,7 +65,7 @@ class PLASMA_EXPORT WebView : public QGraphicsWidget
* @param html the html (in utf8) to display in the content area
* @param baseUrl the base url for relative references
*/
void setHtml(const QByteArray &html, const QUrl &baseUrl = QUrl());
void setHtml(const QByteArray &html, const KUrl &baseUrl = KUrl());
/**
* Sets the html to be shown along with a base URL to be used
@ -73,7 +74,7 @@ class PLASMA_EXPORT WebView : public QGraphicsWidget
* @param html the html (in utf8) to display in the content area
* @param baseUrl the base url for relative references
*/
void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
void setHtml(const QString &html, const KUrl &baseUrl = KUrl());
/**
* Reimplementation