[Kde-bindings] KDE/kdebindings/smoke

[Richard Dale]

SVN commit 814448 by rdale:

* Split khtml off into its own smoke lib

CCMAIL: kde-bindings at kde.org

 M  +9 -3      CMakeLists.txt  
 M  +2 -4      kde/CMakeLists.txt  
 M  +0 -128    kde/classlist  
 M  +0 -34     kde/kde_header_list  
 A             khtml (directory)  
 A             khtml/CMakeLists.txt  
 A             khtml/classlist  
 A             khtml/generate.pl.cmake  
 A             khtml/header_list  
 A             khtml/hint_header_list.pl  
 A             khtml/kde_header_list  
 A             khtml/khtml_header_list  
 A             khtml/khtml_smoke.h   [License: UNKNOWN]


--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #814447:814448
@@ -5,10 +5,11 @@
 OPTION(ENABLE_SMOKESOPRANO "build SmokeSoprano" ON)
 OPTION(ENABLE_SMOKEPLASMA "build SmokePlasma" OFF)
 OPTION(ENABLE_SMOKEKDE "build SmokeKDE" ON)
-OPTION(ENABLE_SMOKEAKONADI "build SmokeAkonadi" OFF)
+OPTION(ENABLE_SMOKEAKONADI "build SmokeAkonadi" ON)
+OPTION(ENABLE_SMOKEKHTML "build SmokeKHTML" ON)
 
 set(SMOKE_ENABLED "no")
-if(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI)
+if(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI OR ENABLE_SMOKEKHTML)
     add_subdirectory(qt)
     set(SMOKE_ENABLED "yes - Qt")
 
@@ -46,8 +47,13 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Akonadi")
     endif(ENABLE_SMOKEAKONADI)
 
-endif(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI)
+    if(ENABLE_SMOKEKHTML)
+        add_subdirectory(khtml)
+        set(SMOKE_ENABLED "${SMOKE_ENABLED}, KHTML")
+    endif(ENABLE_SMOKEKHTML)
 
+endif(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEQWT OR ENABLE_SMOKESOPRANO OR ENABLE_SMOKEPLASMA OR ENABLE_SMOKEKDE OR ENABLE_SMOKEAKONADI OR ENABLE_SMOKEKHTML)
+
 # for qtguess.pl
 if (APPLE)
 set(qt_test_threshold 15)
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #814447:814448
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt ${INCLUDE_INSTALL_DIR}/khexedit/ )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke )
 
 set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -115,14 +115,12 @@
     ${QT_QTUITOOLS_LIBRARY} 
     ${QT_QTWEBKIT_LIBRARY} 
     ${QT_QT3SUPPORT_LIBRARY} 
-    ${SOPRANO_LIBRARIES}
     ${KDE4_KDECORE_LIBS} 
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS} 
     ${KDE4_KNOTIFYCONFIG_LIBS}
     ${KDE4_KNEWSTUFF2_LIBS}
     ${KDE4_KDNSSD_LIBS}
-    ${KDE4_KHTML_LIBS}
     ${KDE4_KDE3SUPPORT_LIBS}
     ${KDE4_KUTILS_LIBS}
     kmediaplayer
@@ -131,4 +129,4 @@
 
 set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokekde DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES kde_smoke.h DESTINATION include/smoke/kde)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kde_smoke.h DESTINATION include/smoke)
--- trunk/KDE/kdebindings/smoke/kde/classlist #814447:814448
@@ -1,120 +1,3 @@
-DOM
-DOM::AbstractView
-DOM::Attr
-DOM::CDATASection
-DOM::CSSCharsetRule
-DOM::CSSException
-DOM::CSSFontFaceRule
-DOM::CSSImportRule
-DOM::CSSMediaRule
-DOM::CSSPageRule
-DOM::CSSPrimitiveValue
-DOM::CSSRule
-DOM::CSSRuleList
-DOM::CSSStyleDeclaration
-DOM::CSSStyleRule
-DOM::CSSStyleSheet
-DOM::CSSUnknownRule
-DOM::CSSValue
-DOM::CSSValueList
-DOM::CharacterData
-DOM::Comment
-DOM::Counter
-DOM::CustomNodeFilter
-DOM::DOMException
-DOM::DOMImplementation
-DOM::DOMString
-DOM::Document
-DOM::DocumentFragment
-DOM::DocumentStyle
-DOM::DocumentType
-DOM::DomShared
-DOM::Element
-DOM::Entity
-DOM::EntityReference
-DOM::Event
-DOM::EventException
-DOM::EventListener
-DOM::HTMLAnchorElement
-DOM::HTMLAppletElement
-DOM::HTMLAreaElement
-DOM::HTMLBRElement
-DOM::HTMLBaseElement
-DOM::HTMLBaseFontElement
-DOM::HTMLBlockquoteElement
-DOM::HTMLBodyElement
-DOM::HTMLButtonElement
-DOM::HTMLCollection
-DOM::HTMLDListElement
-DOM::HTMLDirectoryElement
-DOM::HTMLDivElement
-DOM::HTMLDocument
-DOM::HTMLElement
-DOM::HTMLFieldSetElement
-DOM::HTMLFontElement
-DOM::HTMLFormCollection
-DOM::HTMLFormElement
-DOM::HTMLFrameElement
-DOM::HTMLFrameSetElement
-DOM::HTMLHRElement
-DOM::HTMLHeadElement
-DOM::HTMLHeadingElement
-DOM::HTMLHtmlElement
-DOM::HTMLIFrameElement
-DOM::HTMLImageElement
-DOM::HTMLInputElement
-DOM::HTMLIsIndexElement
-DOM::HTMLLIElement
-DOM::HTMLLabelElement
-DOM::HTMLLayerElement
-DOM::HTMLLegendElement
-DOM::HTMLLinkElement
-DOM::HTMLMapElement
-DOM::HTMLMenuElement
-DOM::HTMLMetaElement
-DOM::HTMLModElement
-DOM::HTMLOListElement
-DOM::HTMLObjectElement
-DOM::HTMLOptGroupElement
-DOM::HTMLOptionElement
-DOM::HTMLParagraphElement
-DOM::HTMLParamElement
-DOM::HTMLPreElement
-DOM::HTMLQuoteElement
-DOM::HTMLScriptElement
-DOM::HTMLSelectElement
-DOM::HTMLStyleElement
-DOM::HTMLTableCaptionElement
-DOM::HTMLTableCellElement
-DOM::HTMLTableColElement
-DOM::HTMLTableElement
-DOM::HTMLTableRowElement
-DOM::HTMLTableSectionElement
-DOM::HTMLTextAreaElement
-DOM::HTMLTitleElement
-DOM::HTMLUListElement
-DOM::KeyboardEvent
-DOM::LinkStyle
-DOM::MediaList
-DOM::MouseEvent
-DOM::MutationEvent
-DOM::NamedNodeMap
-DOM::Node
-DOM::NodeFilter
-DOM::NodeIterator
-DOM::NodeList
-DOM::Notation
-DOM::ProcessingInstruction
-DOM::RGBColor
-DOM::Range
-DOM::RangeException
-DOM::Rect
-DOM::StyleSheet
-DOM::StyleSheetList
-DOM::Text
-DOM::TextEvent
-DOM::TreeWalker
-DOM::UIEvent
 I18nTypeCheck
 K3ProcIO
 KACL
@@ -281,9 +164,6 @@
 KGradientSelector
 KGuiItem
 KHBox
-KHTMLPart
-KHTMLSettings
-KHTMLView
 KHelpMenu
 KHistoryComboBox
 KHueSaturationSelector
@@ -576,14 +456,6 @@
 Sonnet::Highlighter
 Sonnet::Speller
 WebCore
-khtml
-khtml::DrawContentsEvent
-khtml::KHTMLWidget
-khtml::MouseDoubleClickEvent
-khtml::MouseEvent
-khtml::MouseMoveEvent
-khtml::MousePressEvent
-khtml::MouseReleaseEvent
 org
 org::kde
 std
--- trunk/KDE/kdebindings/smoke/kde/kde_header_list #814447:814448
@@ -1,32 +1,3 @@
-dom/css_rule.h
-dom/css_stylesheet.h
-dom/css_value.h
-dom/dom2_events.h
-dom/dom2_range.h
-dom/dom2_traversal.h
-dom/dom2_views.h
-dom/dom_core.h
-dom/dom_doc.h
-dom/dom_element.h
-dom/dom_exception.h
-dom/dom_html.h
-dom/dom_misc.h
-dom/dom_node.h
-dom/dom_string.h
-dom/dom_text.h
-dom/dom_xml.h
-dom/html_base.h
-dom/html_block.h
-dom/html_document.h
-dom/html_element.h
-dom/html_form.h
-dom/html_head.h
-dom/html_image.h
-dom/html_inline.h
-dom/html_list.h
-dom/html_misc.h
-dom/html_object.h
-dom/html_table.h
 fixx11h.h
 k3procio.h
 kaboutapplicationdialog.h
@@ -153,11 +124,6 @@
 khbox.h
 khelpmenu.h
 khistorycombobox.h
-khtmldefaults.h
-khtml_events.h
-khtml_part.h
-khtml_settings.h
-khtmlview.h
 khuesaturationselect.h
 kiconeffect.h
 kicon.h