[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/apps/konqueror/kttsplugin
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2009-10-16 15:24:34
Message-ID: 1255706674.779403.15904.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1036097 by adawit:

Make it compile. webview.h is no longer installed. Use QWebView instead.

 M  +0 -2      CMakeLists.txt  
 M  +8 -10     khtmlkttsd.cpp  


--- branches/KDE/4.3/kdebase/apps/konqueror/kttsplugin/CMakeLists.txt #1036096:1036097
@@ -23,8 +23,6 @@
     set( HAVE_WEBKITKDE true)
     include_directories(${KDEWEBKIT_INCLUDE_DIR})
     include_directories(${WEBKITPART_INCLUDE_DIR})
-    FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${KDEWEBKIT_INCLUDE_DIR})
-    macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW )
 endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
 
 
--- branches/KDE/4.3/kdebase/apps/konqueror/kttsplugin/khtmlkttsd.cpp #1036096:1036097
@@ -15,6 +15,9 @@
 // Own
 #include "khtmlkttsd.h"
 
+// Local
+#include "kspeechinterface.h"
+
 // KDE
 #include <dom/dom_string.h>
 #include <dom/html_document.h>
@@ -24,15 +27,6 @@
 #include <kdebug.h>
 #include <khtml_part.h> // this plugin applies to a khtml part
 #include <config-kttsplugin.h>
-#ifdef HAVE_WEBKITKDE
-#include <webkitpart.h>
-#ifdef HAVE_WEBVIEW
-#include <webview.h>
-#else
-#include <webkitview.h>
-#endif
-#include <QWebFrame>
-#endif
 #include <kicon.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -41,8 +35,12 @@
 #include <kspeech.h>
 #include <ktoolinvocation.h>
 
+#ifdef HAVE_WEBKITKDE
+#include <webkitpart.h>
+#include <QWebFrame>
+#include <QWebView>
+#endif
 
-#include "kspeechinterface.h"
 
 KHTMLPluginKTTSD::KHTMLPluginKTTSD( QObject* parent, const QVariantList& )
     : Plugin( parent )
[prev in list] [next in list] [prev in thread] [next in thread]