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

List:       kde-core-devel
Subject:    [patch] remove exports from kjavaappletviewer
From:       Jarosław Staniek <js () iidea ! pl>
Date:       2007-12-28 17:24:20
Message-ID: 47753144.4070104 () iidea ! pl
[Download RAW message or body]

Hi;
kjavaappletviewer is a plugin, but apparently its classes are marked with 
KHTML_EXPORT. The patch removes KHTML_EXPORTs from kdelibs/khtml/java/.

For review.

Without this change, compilation for targets that define explicit symbols 
visibility (msvc) fails, e.g. static KJavaAppletContext::contextCount member 
cannot be initialized as import the class is marked as imported by KHTML_EXPORT.

Even if we need the classes to be exported (I cannot see it) - we may need 
separate libkjavaappletviewer and something like LINKJAVAAPPLETVIEWER_EXPORT 
macro.

-- 
regards / pozdrawiam, Jaroslaw Staniek
  Sponsored by OpenOffice Polska (http://www.openoffice.com.pl/en) to work on
  Kexi & KOffice (http://www.kexi.pl/en, http://www.koffice.org/kexi)
  KDE Libraries for MS Windows (http://windows.kde.org)

["khtml.patch" (text/plain)]

Index: khtml/java/kjavaappletserver.h
===================================================================
--- khtml/java/kjavaappletserver.h	(revision 753717)
+++ khtml/java/kjavaappletserver.h	(working copy)
@@ -24,7 +24,6 @@
 #ifndef KJAVAAPPLETSERVER_H
 #define KJAVAAPPLETSERVER_H
 
-#include <khtml_export.h>
 #include "kjavaprocess.h"
 #include <QtCore/QObject>
 #include <QtCore/QMap>
@@ -40,7 +39,7 @@
 class KJavaAppletServerPrivate;
 class JSStackFrame;
 
-class KHTML_EXPORT KJavaAppletServer : public QObject
+class KJavaAppletServer : public QObject
 {
 Q_OBJECT
 
@@ -163,7 +162,7 @@
 };
 
 
-class KHTML_EXPORT PermissionDialog : public QObject
+class PermissionDialog : public QObject
 {
     Q_OBJECT
 public:
Index: khtml/java/kjavaprocess.h
===================================================================
--- khtml/java/kjavaprocess.h	(revision 753717)
+++ khtml/java/kjavaprocess.h	(working copy)
@@ -24,7 +24,6 @@
 #ifndef KJAVAPROCESS_H
 #define KJAVAPROCESS_H
 
-#include <khtml_export.h>
 #include <kprocess.h>
 
 /**
@@ -39,7 +38,7 @@
  */
 
 class KJavaProcessPrivate;
-class KHTML_EXPORT KJavaProcess : public KProcess //QObject
+class KJavaProcess : public KProcess //QObject
 {
 Q_OBJECT
 
Index: khtml/java/kxeventutil.h
===================================================================
--- khtml/java/kxeventutil.h	(revision 753717)
+++ khtml/java/kxeventutil.h	(working copy)
@@ -21,12 +21,11 @@
 #ifndef KXEVENTUTIL_H
 #define KXEVENTUTIL_H
 
-#include <khtml_export.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <QtCore/QString>
 
-class KHTML_EXPORT KXEventUtil {
+class KXEventUtil {
     public:
         static QString getXEventName(XEvent *e);
         static QString getXAnyEventInfo(XEvent *xevent);
Index: khtml/java/kjavaapplet.h
===================================================================
--- khtml/java/kjavaapplet.h	(revision 753717)
+++ khtml/java/kjavaapplet.h	(working copy)
@@ -24,7 +24,6 @@
 #ifndef KJAVAAPPLET_H
 #define KJAVAAPPLET_H
 
-#include <khtml_export.h>
 #include <kurl.h>
 
 #include <QtCore/QObject>
@@ -48,7 +47,7 @@
 class KJavaAppletPrivate;
 
 
-class KHTML_EXPORT KJavaApplet : public QObject
+class KJavaApplet : public QObject
 {
 Q_OBJECT
 
Index: khtml/java/kjavaappletwidget.h
===================================================================
--- khtml/java/kjavaappletwidget.h	(revision 753717)
+++ khtml/java/kjavaappletwidget.h	(working copy)
@@ -24,7 +24,6 @@
 #ifndef KJAVAAPPLETWIDGET_H
 #define KJAVAAPPLETWIDGET_H
 
-#include <khtml_export.h>
 #include <QtGui/QImage>
 
 #include "java/kjavaappletcontext.h"
@@ -80,7 +79,7 @@
 
 class KJavaAppletWidgetPrivate;
 
-class KHTML_EXPORT KJavaAppletWidget : public QX11EmbedContainer
+class KJavaAppletWidget : public QX11EmbedContainer
 {
     Q_OBJECT
 public:
Index: khtml/java/kjavaappletcontext.h
===================================================================
--- khtml/java/kjavaappletcontext.h	(revision 753717)
+++ khtml/java/kjavaappletcontext.h	(working copy)
@@ -24,7 +24,6 @@
 #ifndef KJAVAAPPLETCONTEXT_H
 #define KJAVAAPPLETCONTEXT_H
 
-#include <khtml_export.h>
 #include <QtCore/QObject>
 
 /**
@@ -43,7 +42,7 @@
 class KJavaApplet;
 class KJavaAppletContextPrivate;
 
-class KHTML_EXPORT KJavaAppletContext : public QObject
+class KJavaAppletContext : public QObject
 {
 Q_OBJECT
 
Index: khtml/java/kjavadownloader.h
===================================================================
--- khtml/java/kjavadownloader.h	(revision 753717)
+++ khtml/java/kjavadownloader.h	(working copy)
@@ -22,7 +22,6 @@
 #ifndef KJAVADOWNLOADER_H
 #define KJAVADOWNLOADER_H
 
-#include <khtml_export.h>
 #include <QtCore/QObject>
 
 /**
@@ -42,7 +41,7 @@
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KHTML_EXPORT KJavaKIOJob : public QObject
+class KJavaKIOJob : public QObject
 {
 Q_OBJECT
 public:
@@ -51,7 +50,7 @@
     virtual void data( const QByteArray& qb );
 };
 
-class KHTML_EXPORT KJavaDownloader : public KJavaKIOJob
+class KJavaDownloader : public KJavaKIOJob
 {
 Q_OBJECT
 
@@ -71,7 +70,7 @@
 
 };
 
-class KHTML_EXPORT KJavaUploader : public KJavaKIOJob
+class KJavaUploader : public KJavaKIOJob
 {
 Q_OBJECT
 
Index: khtml/java/kqeventutil.h
===================================================================
--- khtml/java/kqeventutil.h	(revision 753717)
+++ khtml/java/kqeventutil.h	(working copy)
@@ -23,12 +23,11 @@
 #ifndef KQEVENTUTIL_H
 #define KQEVENTUTIL_H
 
-#include <khtml_export.h>
 #include <QtCore/QString>
 
 class QEvent;
 
-class KHTML_EXPORT KQEventUtil {
+class KQEventUtil {
     public:
         static QString getQtEventName(QEvent *e);
 };
Index: khtml/java/kjavaappletviewer.h
===================================================================
--- khtml/java/kjavaappletviewer.h	(revision 753717)
+++ khtml/java/kjavaappletviewer.h	(working copy)
@@ -23,7 +23,6 @@
 #ifndef KJAVAAPPLETVIEWER_H
 #define KJAVAAPPLETVIEWER_H
 
-#include <khtml_export.h>
 #include <kparts/part.h>
 #include <kparts/browserextension.h>
 #include <kparts/statusbarextension.h>
@@ -45,7 +44,7 @@
 class KConfig;
 class CoverWidget;
 
-class KHTML_EXPORT KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
+class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
     Q_OBJECT
 public:
     KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent);
@@ -59,7 +58,7 @@
     void showDocument (const QString & doc, const QString & frame);
 };
 
-class KHTML_EXPORT KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension {
+class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension {
     Q_OBJECT
 public:
     KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent);
@@ -80,7 +79,7 @@
     static int m_jssessions;
 };
 
-class KHTML_EXPORT KJavaAppletViewer : public KParts::ReadOnlyPart {
+class KJavaAppletViewer : public KParts::ReadOnlyPart {
     Q_OBJECT
 public:
     KJavaAppletViewer (QWidget * wparent, QObject * parent, const QStringList &args);
@@ -117,7 +116,7 @@
     bool m_closed;
 };
 
-class KHTML_EXPORT KJavaAppletViewerFactory : public KParts::Factory {
+class KJavaAppletViewerFactory : public KParts::Factory {
     Q_OBJECT
 public:
     KJavaAppletViewerFactory ();


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