1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
diff -up amarok-2.8.0/src/context/applets/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/CMakeLists.txt
diff -up amarok-2.8.0/src/context/applets/info/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/info/CMakeLists.txt
--- amarok-2.8.0/src/context/applets/info/CMakeLists.txt.webkit 2013-08-14 15:22:52.000000000 -0500
+++ amarok-2.8.0/src/context/applets/info/CMakeLists.txt 2014-06-18 13:35:31.496217418 -0500
@@ -16,7 +16,6 @@ target_link_libraries(amarok_context_app
amarokcore
amaroklib
${KDE4_PLASMA_LIBS}
- ${KDE4_KDEWEBKIT_LIBS}
${QT_QTWEBKIT_LIBRARY}
)
diff -up amarok-2.8.0/src/context/applets/info/InfoApplet.cpp.webkit amarok-2.8.0/src/context/applets/info/InfoApplet.cpp
--- amarok-2.8.0/src/context/applets/info/InfoApplet.cpp.webkit 2013-08-14 15:22:52.000000000 -0500
+++ amarok-2.8.0/src/context/applets/info/InfoApplet.cpp 2014-06-18 14:10:15.337284616 -0500
@@ -26,7 +26,7 @@
#include "PaletteHandler.h"
#include "playlist/PlaylistController.h"
-#include <KGraphicsWebView>
+#include <QGraphicsWebView>
#include <KStandardDirs>
#include <QPainter>
@@ -63,7 +63,7 @@ void InfoApplet::init()
dataEngine( "amarok-info" )->connectSource( "info", this );
- m_webView = new KGraphicsWebView( this );
+ m_webView = new QGraphicsWebView( this );
QPalette p = m_webView->palette();
p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0) );
diff -up amarok-2.8.0/src/context/applets/info/InfoApplet.h.webkit amarok-2.8.0/src/context/applets/info/InfoApplet.h
--- amarok-2.8.0/src/context/applets/info/InfoApplet.h.webkit 2013-08-14 15:22:52.000000000 -0500
+++ amarok-2.8.0/src/context/applets/info/InfoApplet.h 2014-06-18 13:35:31.496217418 -0500
@@ -27,7 +27,7 @@
#include <QGraphicsProxyWidget>
-class KGraphicsWebView;
+class QGraphicsWebView;
class InfoApplet : public Context::Applet
{
@@ -47,7 +47,7 @@ private slots:
void linkClicked( const QUrl & url );
private:
- KGraphicsWebView *m_webView;
+ QGraphicsWebView *m_webView;
bool m_initialized;
static QString s_defaultHtml;
diff -up amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt
--- amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt.webkit 2014-06-18 14:07:24.355163151 -0500
+++ amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt 2014-06-18 14:07:34.347695400 -0500
@@ -18,7 +18,6 @@ target_link_libraries(amarok_context_app
amaroklib
${KDE4_PLASMA_LIBS}
${KDE4_KIO_LIBS}
- ${KDE4_KDEWEBKIT_LIBS}
${QT_QTWEBKIT_LIBRARY}
)
diff -up amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h.webkit amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h
--- amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h.webkit 2013-08-14 15:22:52.000000000 -0500
+++ amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h 2014-06-18 13:56:15.446760436 -0500
@@ -23,7 +23,7 @@
#include "ui_wikipediaGeneralSettings.h"
#include "ui_wikipediaLanguageSettings.h"
-#include <KGraphicsWebView>
+#include <QGraphicsWebView>
#include <KLineEdit>
#include <KUrl>
@@ -180,13 +180,13 @@ protected:
}
};
-class WikipediaWebView : public KGraphicsWebView
+class WikipediaWebView : public QGraphicsWebView
{
Q_OBJECT
public:
WikipediaWebView( QGraphicsItem *parent = 0 )
- : KGraphicsWebView( parent )
+ : QGraphicsWebView( parent )
{
m_lineEdit = new WikipediaSearchLineEdit( this );
m_lineEdit->setContentsMargins( 0, 0, 0, 0 );
@@ -242,7 +242,7 @@ protected:
}
return false;
}
- return KGraphicsWebView::eventFilter( obj, event );
+ return QGraphicsWebView::eventFilter( obj, event );
}
void keyPressEvent( QKeyEvent *event )
@@ -258,12 +258,12 @@ protected:
event->accept();
}
else
- KGraphicsWebView::keyPressEvent( event );
+ QGraphicsWebView::keyPressEvent( event );
}
void resizeEvent( QGraphicsSceneResizeEvent *event )
{
- KGraphicsWebView::resizeEvent( event );
+ QGraphicsWebView::resizeEvent( event );
if( m_topBorder )
{
m_topBorder->resize( event->newSize().width(), m_topBorder->size().height() );
|
