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

List:       kde-commits
Subject:    extragear/base/konq-plugins/babelfish
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-02-12 8:45:09
Message-ID: 1265964309.989979.25930.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089030 by adawit:

- Restored broken KWebKitPart support.
- Minor clean up of the code.


 M  +12 -36    CMakeLists.txt  
 M  +12 -9     plugin_babelfish.cpp  


--- trunk/extragear/base/konq-plugins/babelfish/CMakeLists.txt #1089029:1089030
@@ -6,36 +6,19 @@
 if(DEPEND_PACKAGE_KWebKitPart)
         macro_optional_find_package(KWebKitPart QUIET)
 else(DEPEND_PACKAGE_KWebKitPart)
-        set(WEBKITPART_FOUND FALSE)
+        set(KWEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_KWebKitPart)
 
+if(KWEBKITPART_FOUND)
+    add_definitions(-DHAVE_KWEBKITPART)
+    include_directories(${KWEBKITPART_INCLUDE_DIR})
+    set(KWEBKITPART_FOUND true)
+endif(KWEBKITPART_FOUND)
 
-if(${KDE_VERSION} VERSION_LESS 4.3.74) # newer kdelibs versions include webkitkde
-    MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
-    if(DEPEND_PACKAGE_KdeWebKit)
-            macro_optional_find_package(KdeWebKit QUIET)
-    else(DEPEND_PACKAGE_KdeWebKit)
-            set(WEBKITPART_FOUND FALSE)
-    endif(DEPEND_PACKAGE_KdeWebKit)
-endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
+macro_log_feature(KWEBKITPART_FOUND "KWebKitPart" "KWebKitPart libraries and header \
files" "https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart" FALSE "" \
"KWebKitPart is necessary to compile KGet support for KWebKitPart.")  
-macro_log_feature(WEBKITPART_FOUND "WebKitKde" "Webkitkde libraries and header \
files" "https://svn.kde.org/home/kde/trunk/playground/libs/webkitkde" FALSE "" \
"Webkitkde is necessary to compile Babelfish support for WebKitKde.")  
-macro_bool_to_01(WEBKITPART_FOUND HAVE_WEBKITPART)
-
-
-if( WEBKITPART_FOUND )
-    if(${KDE_VERSION} VERSION_LESS 4.3.74)
-        include_directories(kwebkit ${KDEWEBKIT_INCLUDE_DIR})
-    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
-
-    include_directories(${WEBKITPART_INCLUDE_DIR})
-endif(WEBKITPART_FOUND)
-
-
-
-
 configure_file(config-babelfish.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-babelfish.h )  
 ########### next target ###############
@@ -47,17 +30,10 @@
 
 
 target_link_libraries(babelfishplugin  ${KDE4_KHTML_LIBS} )
-if( WEBKITPART_FOUND)
-    if(${KDE_VERSION} VERSION_LESS 4.3.74)
-        target_link_libraries(babelfishplugin ${KDEWEBKIT_LIBRARIES})
-    else(${KDE_VERSION} VERSION_LESS 4.3.74)
-        target_link_libraries(babelfishplugin ${KDE4_KDEWEBKIT_LIBS})
-    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
+if(KWEBKITPART_FOUND)
+    target_link_libraries(babelfishplugin ${KWEBKITPART_LIBRARIES} \
${KDE4_KDEUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) +endif(KWEBKITPART_FOUND)
 
-    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} \
                ${QT_QTWEBKIT_LIBRARY})
-endif(WEBKITPART_FOUND)
-
-
 install(TARGETS babelfishplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
@@ -65,7 +41,7 @@
 
 install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  \
${DATA_INSTALL_DIR}/khtml/kpartplugins )  install( FILES translaterc  DESTINATION  \
                ${CONFIG_INSTALL_DIR} )
-if(WEBKITPART_FOUND)
+if(KWEBKITPART_FOUND)
    install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/kwebkitpart/kpartplugins )
-endif(WEBKITPART_FOUND)
+endif(KWEBKITPART_FOUND)
 kde4_install_icons(${ICON_INSTALL_DIR})
--- trunk/extragear/base/konq-plugins/babelfish/plugin_babelfish.cpp #1089029:1089030
@@ -41,7 +41,7 @@
 #include <KConfigGroup>
 #include <KHTMLPart>
 
-#ifdef HAVE_WEBKITPART
+#ifdef HAVE_KWEBKITPART
 #include <KWebKitPart>
 #include <QWebView>
 #endif
@@ -175,9 +175,9 @@
   m_menu->setEnabled( true );
 
   // TODO: we could also support plain text viewers...
-  if ( parent  )
+  KParts::ReadOnlyPart* part = qobject_cast<KParts::ReadOnlyPart *>(parent);  
+  if ( part )
   {
-    KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent);
     connect( part, SIGNAL(started(KIO::Job*)), this,
              SLOT(slotStarted(KIO::Job*)) );
   }
@@ -190,9 +190,12 @@
 
 void PluginBabelFish::slotStarted( KIO::Job* )
 {
-  if ( ( parent()->inherits("KHTMLPart")||parent()->inherits("KWebKitPart") ) &&
-  // Babelfish wants http URLs only. No https.
-       static_cast<KParts::ReadOnlyPart *>(parent())->url().protocol().toLower() == \
"http" ) +  KParts::ReadOnlyPart* part = qobject_cast<KParts::ReadOnlyPart \
*>(parent());   +
+    // Babelfish wants http URLs only. No https.
+  if ( part && 
+       part->url().protocol().compare (QLatin1String("http"), Qt::CaseInsensitive) \
== 0 &&  +       ( part->inherits("KHTMLPart")|| part->inherits("KWebKitPart") ) )
   {
       m_menu->setEnabled( true );
   }
@@ -234,7 +237,7 @@
   QString totrans;
 
 
-  KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
+  KHTMLPart *part = qobject_cast<KHTMLPart *>(parent());
   bool hasSelection = false;
   QString selection;
   KUrl url;
@@ -246,8 +249,8 @@
   }
   else
   {
-#ifdef HAVE_WEBKITPART
-      KWebKitPart *part = dynamic_cast<KWebKitPart *>(parent());
+#ifdef HAVE_KWEBKITPART
+      KWebKitPart *part = qobject_cast<KWebKitPart *>(parent());
       hasSelection = !part->view()->selectedText().isEmpty();
       selection = part->view()->selectedText();
       url = KUrl( part->view()->url() );


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