[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs
From: Allen Winter <winter () kde ! org>
Date: 2007-03-31 20:56:50
Message-ID: 1175374610.023760.15806.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 648618 by winterz:
khtml_export.h
M +0 -2 kdelibs_export.h
M +0 -16 kdelibs_export_win.h
M +1 -1 khtml/CMakeLists.txt
M +2 -2 khtml/dom/css_stylesheet.h
M +2 -2 khtml/dom/dom2_traversal.h
M +1 -1 khtml/dom/dom2_views.h
M +1 -2 khtml/dom/dom_element.h
M +1 -1 khtml/dom/dom_misc.h
M +1 -1 khtml/dom/dom_node.h
M +1 -2 khtml/dom/dom_string.h
M +1 -2 khtml/dom/html_base.h
M +1 -2 khtml/dom/html_block.h
M +2 -2 khtml/dom/html_document.h
M +1 -1 khtml/dom/html_element.h
M +1 -2 khtml/dom/html_inline.h
M +1 -1 khtml/dom/html_list.h
M +1 -1 khtml/dom/html_misc.h
M +1 -1 khtml/dom/html_table.h
M +2 -2 khtml/ecma/domparser.h
M +1 -1 khtml/ecma/kjs_binding.h
M +1 -1 khtml/java/kjavaapplet.h
M +1 -1 khtml/java/kjavaappletcontext.h
M +1 -1 khtml/java/kjavaappletserver.h
M +1 -1 khtml/java/kjavaappletviewer.h
M +1 -1 khtml/java/kjavaappletwidget.h
M +1 -1 khtml/java/kjavadownloader.h
M +1 -1 khtml/java/kjavaprocess.h
M +1 -1 khtml/java/kqeventutil.h
M +1 -1 khtml/java/kxeventutil.h
A khtml/khtml_export.h [License: LGPL (v2+)]
M +1 -1 khtml/khtml_factory.h
M +1 -1 khtml/khtml_settings.h
M +1 -1 khtml/khtmlimage_init.cpp
M +2 -2 khtml/khtmlview.h
--- trunk/KDE/kdelibs/kdelibs_export.h #648617:648618
@@ -35,8 +35,6 @@
/* export statements for unix */
#define KNTLM_EXPORT KDE_EXPORT
-#define KHTML_EXPORT KDE_EXPORT
-#define KHTML_JAVA_EXPORT KDE_EXPORT
#define KUNITTEST_EXPORT KDE_EXPORT
#define KROSSCORE_EXPORT KDE_EXPORT
--- trunk/KDE/kdelibs/kdelibs_export_win.h #648617:648618
@@ -27,22 +27,6 @@
# endif
#endif
-#ifndef KHTML_EXPORT
-# ifdef MAKE_KHTML_LIB
-# define KHTML_EXPORT KDE_EXPORT
-# else
-# define KHTML_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifndef KHTML_JAVA_EXPORT
-# ifdef MAKE_KHTML_JAVA_LIB
-# define KHTML_JAVA_EXPORT KDE_EXPORT
-# else
-# define KHTML_JAVA_EXPORT KDE_IMPORT
-# endif
-#endif
-
#ifndef KJS_EXPORT
# ifdef MAKE_KJS_LIB
# define KJS_EXPORT KDE_EXPORT
--- trunk/KDE/kdelibs/khtml/CMakeLists.txt #648617:648618
@@ -436,7 +436,7 @@
install( FILES khtml.desktop khtmlimage.desktop DESTINATION \
${SERVICES_INSTALL_DIR} ) install( FILES khtml.rc khtml_browser.rc \
khtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/khtml )
-install( FILES khtmlview.h khtml_part.h khtml_events.h khtml_settings.h \
khtmldefaults.h DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( FILES khtml_export.h \
khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h DESTINATION \
${INCLUDE_INSTALL_DIR} ) install( FILES dom/dom_exception.h dom/html_base.h \
dom/html_inline.h dom/css_rule.h dom/dom_html.h dom/html_block.h \
dom/html_list.h dom/css_stylesheet.h dom/dom_misc.h dom/html_document.h \
dom/html_misc.h dom/css_value.h dom/dom_node.h dom/html_element.h \
dom/html_object.h dom/dom_core.h dom/dom_string.h dom/html_form.h \
dom/html_table.h dom/dom_doc.h dom/dom_text.h dom/html_head.h \
dom/dom_element.h dom/dom_xml.h dom/html_image.h dom/dom2_range.h \
dom/dom2_traversal.h dom/dom2_events.h dom/dom2_views.h DESTINATION \
${INCLUDE_INSTALL_DIR}/dom )
install( FILES org.kde.KHTMLPart.xml DESTINATION ${DBUS_INTERFACES_DIR} )
--- trunk/KDE/kdelibs/khtml/dom/css_stylesheet.h #648617:648618
@@ -27,12 +27,12 @@
#ifndef _CSS_css_stylesheet_h_
#define _CSS_css_stylesheet_h_
+#include <khtml_export.h>
+
#include <dom/dom_string.h>
#include <dom/dom_node.h>
#include <dom/dom_misc.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class StyleSheetImpl;
--- trunk/KDE/kdelibs/khtml/dom/dom2_traversal.h #648617:648618
@@ -26,11 +26,11 @@
*/
#ifndef _dom2_traversal_h_
#define _dom2_traversal_h_
+
+#include <khtml_export.h>
#include <dom/dom_node.h>
#include <dom/dom_misc.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class Node;
class NodeFilter;
--- trunk/KDE/kdelibs/khtml/dom/dom2_views.h #648617:648618
@@ -23,7 +23,7 @@
#ifndef _DOM_Views_h_
#define _DOM_Views_h_
-#include <kdelibs_export.h>
+#include <khtml_export.h>
namespace DOM {
class Document;
--- trunk/KDE/kdelibs/khtml/dom/dom_element.h #648617:648618
@@ -29,11 +29,10 @@
#ifndef _DOM_ELEMENT_h_
#define _DOM_ELEMENT_h_
+#include <khtml_export.h>
#include <dom/dom_node.h>
#include <dom/css_value.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class DOMString;
--- trunk/KDE/kdelibs/khtml/dom/dom_misc.h #648617:648618
@@ -22,7 +22,7 @@
#ifndef _DOM_RefCountImpl_h_
#define _DOM_RefCountImpl_h_
-#include <kdelibs_export.h>
+#include <khtml_export.h>
namespace DOM {
--- trunk/KDE/kdelibs/khtml/dom/dom_node.h #648617:648618
@@ -29,8 +29,8 @@
#ifndef _DOM_Node_h_
#define _DOM_Node_h_
+#include <khtml_export.h>
#include <qstring.h>
-#include <kdelibs_export.h>
class QRect;
--- trunk/KDE/kdelibs/khtml/dom/dom_string.h #648617:648618
@@ -22,11 +22,10 @@
#ifndef _DOM_DOMString_h_
#define _DOM_DOMString_h_
+#include <khtml_export.h>
#include <kdebug.h>
#include <qstring.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class DOMStringImpl;
--- trunk/KDE/kdelibs/khtml/dom/html_base.h #648617:648618
@@ -30,10 +30,9 @@
#ifndef HTML_BASE_H
#define HTML_BASE_H
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class HTMLBodyElementImpl;
--- trunk/KDE/kdelibs/khtml/dom/html_block.h #648617:648618
@@ -32,10 +32,9 @@
#ifndef HTML_BLOCK_H
#define HTML_BLOCK_H
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class HTMLElementImpl;
--- trunk/KDE/kdelibs/khtml/dom/html_document.h #648617:648618
@@ -30,11 +30,11 @@
#ifndef HTML_DOCUMENT_H
#define HTML_DOCUMENT_H
+#include <khtml_export.h>
+
#include <dom/dom_doc.h>
#include <dom/dom_string.h>
-#include <kdelibs_export.h>
-
class KHTMLView;
class KHTMLPart;
--- trunk/KDE/kdelibs/khtml/dom/html_element.h #648617:648618
@@ -29,8 +29,8 @@
#ifndef HTML_ELEMENT_H
#define HTML_ELEMENT_H
+#include <khtml_export.h>
#include <dom/dom_element.h>
-#include <kdelibs_export.h>
class KHTMLView;
--- trunk/KDE/kdelibs/khtml/dom/html_inline.h #648617:648618
@@ -29,10 +29,9 @@
#ifndef HTML_INLINE_H
#define HTML_INLINE_H
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
-
namespace DOM {
class HTMLGenericElementImpl;
class HTMLAnchorElementImpl;
--- trunk/KDE/kdelibs/khtml/dom/html_list.h #648617:648618
@@ -29,8 +29,8 @@
#ifndef HTML_LIST_H
#define HTML_LIST_H
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
namespace DOM {
--- trunk/KDE/kdelibs/khtml/dom/html_misc.h #648617:648618
@@ -29,8 +29,8 @@
#ifndef HTML_MISC_H
#define HTML_MISC_H
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
namespace DOM {
--- trunk/KDE/kdelibs/khtml/dom/html_table.h #648617:648618
@@ -30,8 +30,8 @@
#define HTML_TABLE_H
// --------------------------------------------------------------------------
+#include <khtml_export.h>
#include <dom/html_element.h>
-#include <kdelibs_export.h>
namespace DOM {
--- trunk/KDE/kdelibs/khtml/ecma/domparser.h #648617:648618
@@ -21,11 +21,11 @@
#ifndef DOMPARSER_H
#define DOMPARSER_H
-#include <qpointer.h>
-#include "kdelibs_export.h"
+#include <khtml_export.h>
#include <kjs/object.h>
#include <kjs/interpreter.h>
#include <misc/shared.h>
+#include <qpointer.h>
#include "kjs_dom.h"
--- trunk/KDE/kdelibs/khtml/ecma/kjs_binding.h #648617:648618
@@ -22,7 +22,7 @@
#ifndef _KJS_BINDING_H_
#define _KJS_BINDING_H_
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <kjs/interpreter.h>
#include <wtf/HashMap.h>
--- trunk/KDE/kdelibs/khtml/java/kjavaapplet.h #648617:648618
@@ -24,7 +24,7 @@
#ifndef KJAVAAPPLET_H
#define KJAVAAPPLET_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <kurl.h>
#include <QtCore/QObject>
--- trunk/KDE/kdelibs/khtml/java/kjavaappletcontext.h #648617:648618
@@ -24,8 +24,8 @@
#ifndef KJAVAAPPLETCONTEXT_H
#define KJAVAAPPLETCONTEXT_H
+#include <khtml_export.h>
#include <QtCore/QObject>
-#include <kdelibs_export.h>
/**
* @short Provides a context for KJavaAppletWidgets
--- trunk/KDE/kdelibs/khtml/java/kjavaappletserver.h #648617:648618
@@ -24,7 +24,7 @@
#ifndef KJAVAAPPLETSERVER_H
#define KJAVAAPPLETSERVER_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include "kjavaprocess.h"
#include <QtCore/QObject>
#include <qmap.h>
--- trunk/KDE/kdelibs/khtml/java/kjavaappletviewer.h #648617:648618
@@ -23,7 +23,7 @@
#ifndef KJAVAAPPLETVIEWER_H
#define KJAVAAPPLETVIEWER_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kparts/statusbarextension.h>
--- trunk/KDE/kdelibs/khtml/java/kjavaappletwidget.h #648617:648618
@@ -24,7 +24,7 @@
#ifndef KJAVAAPPLETWIDGET_H
#define KJAVAAPPLETWIDGET_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <QtGui/QImage>
#include "java/kjavaappletcontext.h"
--- trunk/KDE/kdelibs/khtml/java/kjavadownloader.h #648617:648618
@@ -22,7 +22,7 @@
#ifndef KJAVADOWNLOADER_H
#define KJAVADOWNLOADER_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <QtCore/QObject>
/**
--- trunk/KDE/kdelibs/khtml/java/kjavaprocess.h #648617:648618
@@ -24,7 +24,7 @@
#ifndef KJAVAPROCESS_H
#define KJAVAPROCESS_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <k3process.h>
/**
--- trunk/KDE/kdelibs/khtml/java/kqeventutil.h #648617:648618
@@ -23,8 +23,8 @@
#ifndef KQEVENTUTIL_H
#define KQEVENTUTIL_H
+#include <khtml_export.h>
#include <QtCore/QString>
-#include <kdelibs_export.h>
class QEvent;
--- trunk/KDE/kdelibs/khtml/java/kxeventutil.h #648617:648618
@@ -21,7 +21,7 @@
#ifndef KXEVENTUTIL_H
#define KXEVENTUTIL_H
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <QtCore/QString>
--- trunk/KDE/kdelibs/khtml/khtml_factory.h #648617:648618
@@ -20,7 +20,7 @@
#ifndef __khtml_factory_h__
#define __khtml_factory_h__
-#include <kdelibs_export.h>
+#include <khtml_export.h>
#include <kparts/factory.h>
#include <kparts/historyprovider.h>
--- trunk/KDE/kdelibs/khtml/khtml_settings.h #648617:648618
@@ -22,6 +22,7 @@
class KConfig;
class KConfigGroup;
+#include <khtml_export.h>
#include <qcolor.h>
#include <QtCore/QString>
#include <QtCore/QStringList>
@@ -29,7 +30,6 @@
#include <qmap.h>
#include <qpair.h>
-#include <kdelibs_export.h>
struct KPerDomainSettings;
class KHTMLSettingsPrivate;
--- trunk/KDE/kdelibs/khtml/khtmlimage_init.cpp #648617:648618
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kdelibs_export.h>
+#include <khtml_export.h>
// Defined in libkhtml
extern "C" KDE_EXPORT void* init_khtmlimagefactory();
--- trunk/KDE/kdelibs/khtml/khtmlview.h #648617:648618
@@ -26,11 +26,11 @@
#ifndef KHTMLVIEW_H
#define KHTMLVIEW_H
+#include <khtml_export.h>
+
// qt includes and classes
#include <QScrollArea>
-#include <kdelibs_export.h>
-
class QPainter;
class QRect;
template< typename T > class QVector;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic