[Gnash-commit] gnash ChangeLog Makefile.am plugin/klash/klash_...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/02/01 18:46:58

Modified files:
        .              : ChangeLog Makefile.am 
        plugin/klash   : klash_part.cpp 

Log message:
                * Makefile.am: Add the plugin directory to our SUBDIRS when we 
don't
                have GTK but when we do want Klash.
                * plugin/klash/klash_part.cpp: Move visibility annotations to 
from
                the class implementation into the declaration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2220&r2=1.2221
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2220
retrieving revision 1.2221
diff -u -b -r1.2220 -r1.2221
--- ChangeLog   1 Feb 2007 18:08:15 -0000       1.2220
+++ ChangeLog   1 Feb 2007 18:46:57 -0000       1.2221
@@ -1,3 +1,10 @@
+2007-02-01 Bernhard Rosenkraenzer <address@hidden>
+
+       * Makefile.am: Add the plugin directory to our SUBDIRS when we don't
+       have GTK but when we do want Klash.
+       * plugin/klash/klash_part.cpp: Move visibility annotations to from 
+       the class implementation into the declaration.
+
 2007-02-01 Martin Guy <address@hidden>
 
        * server/asobj/Global.cpp: Rewrite lame code in string conversions:

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- Makefile.am 24 Jan 2007 20:03:43 -0000      1.60
+++ Makefile.am 1 Feb 2007 18:46:57 -0000       1.61
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.60 2007/01/24 20:03:43 martinwguy Exp $
+# $Id: Makefile.am,v 1.61 2007/02/01 18:46:57 bjacques Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -37,6 +37,10 @@
 if PLUGIN
 if HAVE_GTK2
 PLUGIN_DIRS = plugin
+else
+if KLASH
+PLUGIN_DIRS = plugin
+endif
 endif
 endif
 

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- plugin/klash/klash_part.cpp 17 Jan 2007 12:16:28 -0000      1.9
+++ plugin/klash/klash_part.cpp 1 Feb 2007 18:46:58 -0000       1.10
@@ -47,9 +47,9 @@
 
 class KlashFactory : public KParts::Factory {
 public:
-    KlashFactory ();
-    virtual ~KlashFactory ();
-    virtual KParts::Part *createPartObject
+    KDE_NO_CDTOR_EXPORT KlashFactory ();
+    KDE_NO_CDTOR_EXPORT virtual ~KlashFactory ();
+    KDE_NO_CDTOR_EXPORT virtual KParts::Part *createPartObject
         (QWidget *wparent, const char *wname,
          QObject *parent, const char *name,
          const char *className, const QStringList &args);
@@ -62,15 +62,15 @@
 
 KInstance *KlashFactory::s_instance = 0;
 
-KDE_NO_CDTOR_EXPORT KlashFactory::KlashFactory () {
+KlashFactory::KlashFactory () {
     s_instance = new KInstance ("klash");
 }
 
-KDE_NO_CDTOR_EXPORT KlashFactory::~KlashFactory () {
+KlashFactory::~KlashFactory () {
     delete s_instance;
 }
 
-KDE_NO_EXPORT KParts::Part *KlashFactory::createPartObject
+KParts::Part *KlashFactory::createPartObject
   (QWidget *wparent, const char *wname,
    QObject *parent, const char * name,
    const char * cls, const QStringList & args) {