Ignore:
Timestamp:
Apr 21, 2006, 7:33:22 PM (13 years ago)
Author:
takanori
Message:

Synced with Fink, Version 1.5.0-1021
Bug: 8513
Submitted by: takanori@
Reviewed by: ben@

Location:
trunk/dports/kde/koffice
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/koffice/Portfile

    r16915 r17612  
    1 # $Id: Portfile,v 1.6 2006/03/13 09:46:40 takanori Exp $
     1# $Id: Portfile,v 1.7 2006/04/21 19:33:21 takanori Exp $
    22
    3 #Synced with Fink, revision 1027
    4 
    5 set kdeadmin kde-admindir-3.4.3-2
     3#Synced with Fink, Version 1.5.0-1021
    64
    75PortSystem 1.0
    86name            koffice
    9 version         1.4.2
    10 revision        3
     7version         1.5.0
     8set kdeadmin    kde-admindir-full-3.5.2
    119categories      kde
    1210maintainers     ben@opendarwin.org takanori@opendarwin.org
     
    1412                NB KDE sound does not work.
    1513platforms       darwin
    16 master_sites    kde:stable/${name}-${version}/src \
     14master_sites    kde:unstable/${name}-1.5-rc1/src \
    1715                http://ranger.befunk.com/fink/:admin
    1816extract.suffix  .tar.bz2
    1917use_bzip2       yes
    20 distname        ${name}-${version}
     18distname        ${name}-${version}-rc1
    2119distfiles       ${distname}.tar.bz2 ${kdeadmin}.tar.bz2:admin
    2220depends_build   port:autoconf \
    23                 port:automake
     21                port:unsermake
    2422depends_lib     port:kdebase3 \
    2523                port:ImageMagick \
     
    3028#               port:postgresql8 \ can't be found. looking for .so
    3129
    32 checksums       ${distname}.tar.bz2 md5 6b456fb7d54c84b11396b27a96ae0cf8 \
    33                 ${kdeadmin}.tar.bz2 md5 1dcacf64a5a196786f49b6c34f5a33d0
     30checksums       ${distname}.tar.bz2 md5 e9346977d18c67185d5b50f49ee8225b \
     31                ${kdeadmin}.tar.bz2 md5 f75aad639083649076dde163520f9071
    3432
    3533extract.only ${distname}.tar.bz2
    3634post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3735
    38 patchfiles      koffice.patch dp-01.patch dp-02.patch
     36patchfiles      koffice.patch
    3937patch           {
    4038                cd ${worksrcpath}
     
    4543post-patch      {
    4644                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
     45                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     46                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    4747                foreach file [glob ${worksrcpath}/admin/*] {
    4848                    reinplace "s|-O2|-Os|g" $file
    4949                    reinplace "s|doc/HTML|doc/kde|g" $file
    5050                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    51                     reinplace "s|HAVE_GCC_VISIBILITY=1|HAVE_GCC_VISIBILITY=0|g" $file
    52                     reinplace "s|-fvisibility=hidden -fvisibility-inlines-hidden||g" $file
    5351                }
    5452                foreach file {CompileScript.sh InstallScript.sh} {
     
    6563}
    6664
    67 configure.args --includedir=${prefix}/include --libdir=${prefix}/lib --prefix=${prefix} --with-qt-dir=${prefix} --with-qt-includes=${prefix}/include/qt3 --with-extra-libs=${prefix}/lib --with-extra-includes=${prefix}/include --enable-mt --with-pic --enable-rpath --enable-shared=yes --enable-static=no --mandir=${destroot}${prefix}/share/man --with-xinerama --with-pam --disable-final --enable-mysql --with-mysql-includes=${prefix}/include/mysql --with-mysql-libraries=${prefix}/lib --with-distribution='DarwinPorts/Mac OS X' --disable-dependency-tracking --without-arts
     65configure.args --enable-mysql --with-distribution='DarwinPorts/Mac OS X' --without-arts
    6866# (libpqxx is missing.)
    69 # --enable-pgsql --with-pgsqlincdir=${prefix}/include/pgsql8 --with-pgsqllibdir=${prefix}/lib/pgsql8 --with-pqxxincdir=${prefix}/include --with-pqxxlibdir=${prefix}/lib
     67# --enable-pgsql --with-pgsqlincdir=${prefix}/include/pgsql8 --with-pgsqllibdir=${prefix}/lib/pgsql8 --with-pqxx-includes=${prefix}/include --with-pqxx-libraries=${prefix}/lib
    7068
    7169configure       {}
     
    7876}
    7977
    80 platform i386 {
    81                 ui_msg "${name} is not supported on this platform yet"
    82                 exit 1
    83 }
    84 
    8578platform darwin 6 {
    8679                depends_lib-append      lib:libdl:dlcompat
  • trunk/dports/kde/koffice/files/CompileScript.sh

    r16644 r17612  
    66  export lt_cv_sys_max_cmd_len=65536
    77
    8   export CC=gcc-3.3 CXX=g++-3.3
     8  export CC=gcc CXX=g++
     9
     10  CONFIGURE_PARAMS=`echo $CONFIGURE_PARAMS | sed -e 's,--disable-dependency-tracking,,'`
    911
    1012  ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    11   ./build-helper.sh configure %N %v %r ./configure %c
    12   ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES" PQXX_INCDIR="%p/include/postgresql"
     13  ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
     14
     15  # why does this work??
     16  find . -name \*.h | xargs touch
     17
     18  MAKEFLAGS="-j1" ./build-helper.sh make-drivers %N %v %r unsermake kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.la kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.la
     19  ./build-helper.sh make      %N %v %r unsermake
  • trunk/dports/kde/koffice/files/InstallScript.sh

    r16644 r17612  
    44  . ./environment-helper.sh
    55
    6   ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d all_libraries="$ALL_LIBRARIES" PQXX_INCDIR="%p/include/postgresql"
     6  ./build-helper.sh install %N %v %r unsermake install DESTDIR="%d"
    77
    88  mkdir -p %i/share/doc/installed-packages
  • trunk/dports/kde/koffice/files/koffice.patch

    r16644 r17612  
    1 --- koffice-1.4.2/karbon/Makefile.am    2005-09-21 08:27:54.000000000 -0400
    2 +++ koffice-1.4.2-new/karbon/Makefile.am        2005-09-29 20:37:21.000000000 -0400
    3 @@ -18,17 +18,10 @@
    4  # (e.g. VTranslateCmd), and commands (e.g. VCommandHistory) need KarbonPart,
    5  # so even moving more stuff to libkarbonbase isn't enough.
    6  # -> I think the whole 'base' stuff can be removed (DF)
    7 -lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la
    8 +lib_LTLIBRARIES = libkarboncommon.la
    9  kde_module_LTLIBRARIES = libkarbonpart.la
    10  
    11 -libkarboncommon_la_SOURCES = karbon_factory.cc         karbon_resourceserver.cc        karbon_part.cc  karbon_part_iface.cc    karbon_part_iface.skel  karbon_view.cc  karbon_view_iface.cc    karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp
     1
     2--- koffice-1.5.0-rc1/configure.in.in   2006-03-23 15:09:50.000000000 -0500
     3+++ koffice-1.5.0-rc1-new/configure.in.in       2006-03-25 13:35:45.000000000 -0500
     4@@ -11,6 +11,7 @@
     5 
     6 KDE_INIT_DOXYGEN([The KOffice API Reference], [Version $VERSION])
     7 
     8+KDE_ENABLE_HIDDEN_VISIBILITY
     9 
     10 # Check for ImageMagick...
     11 
     12--- koffice-1.5.0-rc1/filters/kchart/libimageexport/imageexport.h       2006-03-23 15:03:42.000000000 -0500
     13+++ koffice-1.5.0-rc1-new/filters/kchart/libimageexport/imageexport.h   2006-03-25 13:35:45.000000000 -0500
     14@@ -21,9 +21,10 @@
     15 #define __IMAGEEXPORT_H__
     16 
     17 #include <KoFilter.h>
     18+#include <koffice_export.h>
     19 
     20 class QPixmap;
     21-class ImageExport : public KoFilter
     22+class KOFFICEFILTER_EXPORT ImageExport : public KoFilter
     23 {
     24     Q_OBJECT
     25 
     26--- koffice-1.5.0-rc1/filters/kpresenter/libimageexport/imageexport.h   2006-03-23 15:02:58.000000000 -0500
     27+++ koffice-1.5.0-rc1-new/filters/kpresenter/libimageexport/imageexport.h       2006-03-25 13:35:45.000000000 -0500
     28@@ -21,9 +21,10 @@
     29 #define __IMAGEEXPORT_H__
     30 
     31 #include <KoFilter.h>
     32+#include <koffice_export.h>
     33 
     34 class QPixmap;
     35-class ImageExport : public KoFilter
     36+class KOFFICEFILTER_EXPORT ImageExport : public KoFilter
     37 {
     38     Q_OBJECT
     39 
     40--- koffice-1.5.0-rc1/karbon/core/vgradient.h   2006-03-23 15:09:17.000000000 -0500
     41+++ koffice-1.5.0-rc1-new/karbon/core/vgradient.h       2006-03-25 13:35:45.000000000 -0500
     42@@ -74,7 +74,7 @@
     43                repeat  = 2
     44        };
     45 
     46-       class VColorStopList : public QPtrList<VColorStop>
     47+       class KARBONBASE_EXPORT VColorStopList : public QPtrList<VColorStop>
     48        {
     49                protected:
     50                        virtual int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 );
     51--- koffice-1.5.0-rc1/karbon/visitors/vselectobjects.h  2006-03-23 15:09:28.000000000 -0500
     52+++ koffice-1.5.0-rc1-new/karbon/visitors/vselectobjects.h      2006-03-25 13:35:45.000000000 -0500
     53@@ -29,13 +29,15 @@
     54 #include "vimage.h"
     55 #include "vvisitor.h"
     56 
     57+#include <koffice_export.h>
     58+
     59 /**
     60  * This visitor visits a selection and selects objects that are contained
     61  * in a paramater selection rectangle. For composites it makes a more accurate test, if the
     62  * selection rectangle intersects with any part of the composite, it is selected.
     63  * Also this visitor can be used to deselect objects.
     64  */
     65-class VSelectObjects : public VVisitor
     66+class KARBONBASE_EXPORT VSelectObjects : public VVisitor
     67 {
     68 public:
     69        VSelectObjects( VObjectList& selection, bool select = true )
     70--- koffice-1.5.0-rc1/kchart/kchart_factory.h   2006-03-23 15:06:32.000000000 -0500
     71+++ koffice-1.5.0-rc1-new/kchart/kchart_factory.h       2006-03-25 13:35:45.000000000 -0500
     72@@ -9,7 +9,7 @@
     73 
     74 
     75 #include <KoFactory.h>
    1276-
    13 -libkarbonbase_la_SOURCES = \
    14 -       karbon_view_base.cc \
    15 -       karbon_part_base.cc
     77+#include <koffice_export.h>
     78 
     79 class KInstance;
     80 class KAboutData;
     81@@ -17,7 +17,7 @@
     82 namespace KChart
     83 {
     84 
     85-class KChartFactory : public KoFactory
     86+class KCHART_EXPORT KChartFactory : public KoFactory
     87 {
     88     Q_OBJECT
     89 public:
     90--- koffice-1.5.0-rc1/kchart/kdchart/KDChartVectorTable.h       2006-03-23 15:06:17.000000000 -0500
     91+++ koffice-1.5.0-rc1-new/kchart/kdchart/KDChartVectorTable.h   2006-03-25 13:35:45.000000000 -0500
     92@@ -36,6 +36,8 @@
     93 #include <KDChartDataIntern.h>
     94 #include <KDChartTableBase.h>
     95 
     96+#include <koffice_export.h>
     97+
     98 class KDCHART_EXPORT KDChartVectorTablePrivate : public QShared
     99 {
     100 public:
     101@@ -179,42 +181,50 @@
     102     }
     103 
     104 public slots:
     105-    Iterator begin() {
     106+
     107+    /*
     108+       we have to add KDCHART_EXPORT to each of these slots
     109+       because -fvisibility-inlines-hidden will hide them; since
     110+       they're public, this would be considered by some to be
     111+       undesireable.  ;)
     112+    */
     113+
     114+    Iterator begin() KDCHART_EXPORT {
     115         return sh->matrix.begin();
     116     }
     117 
     118-    ConstIterator begin() const {
     119+    ConstIterator begin() const KDCHART_EXPORT {
     120         return sh->matrix.begin();
     121     }
     122 
     123-    Iterator end() {
     124+    Iterator end() KDCHART_EXPORT {
     125         return sh->matrix.end();
     126     }
     127 
     128-    ConstIterator end() const {
     129+    ConstIterator end() const KDCHART_EXPORT {
     130         return sh->matrix.end();
     131     }
     132 
     133-    bool isEmpty() const {
     134+    bool isEmpty() const KDCHART_EXPORT {
     135         return ( sh->col_count == 0 && sh->row_count == 0 );
     136     }
     137 
     138-    uint cols() const {
     139+    uint cols() const KDCHART_EXPORT {
     140         return sh->col_count;
     141     }
     142 
     143-    uint rows() const {
     144+    uint rows() const KDCHART_EXPORT {
     145         return sh->row_count;
     146     }
     147 /*
     148-    KDChartData& cell( uint _row, uint _col ) {
     149+    KDChartData& cell( uint _row, uint _col ) KDCHART_EXPORT {
     150         detach();
     151         return sh->cell( _row, _col );
     152     }
     153 */
     154     virtual bool cellCoord( uint _row, uint _col,
     155                             QVariant& _value,
     156-                            int coordinate=1 ) const
     157+                            int coordinate=1 ) const KDCHART_EXPORT
     158     {
     159         if( _row >= sh->row_count || _col >= sh->col_count )
     160             return false;
     161@@ -223,7 +233,7 @@
     162     }
     163 
     164     virtual bool cellProp( uint _row, uint _col,
     165-                           int& _prop ) const
     166+                           int& _prop ) const KDCHART_EXPORT
     167     {
     168         if( _row >= sh->row_count || _col >= sh->col_count )
     169             return false;
     170@@ -233,36 +243,41 @@
     171 
     172     virtual void setCell( uint _row, uint _col,
     173                           const QVariant& _value1,
     174-                          const QVariant& _value2=QVariant() ) {
     175+                          const QVariant& _value2=QVariant() ) KDCHART_EXPORT
     176+    {
     177         detach();
     178         const KDChartData element( _value1, _value2 );
     179         sh->setCell( _row, _col, element );
     180     }
     181 
     182     virtual void setProp( uint _row, uint _col,
     183-                          int _propSet=0 )
     184+                          int _propSet=0 ) KDCHART_EXPORT
     185     {
     186         sh->cell( _row, _col ).setPropertySet( _propSet );
     187     }
     188     
     189-    void clearCell( uint _row, uint _col ) {
     190+    void clearCell( uint _row, uint _col ) KDCHART_EXPORT
     191+    {
     192         detach();
     193         sh->clearCell( _row, _col );
     194     }
     195 
     196-    void clearAllCells() {
     197+    void clearAllCells() KDCHART_EXPORT
     198+    {
     199         detach();
     200         sh->clearAllCells();
     201     }
     202 
     203-    void expand( uint _rows, uint _cols ) {
     204+    void expand( uint _rows, uint _cols ) KDCHART_EXPORT
     205+    {
     206         detach();
     207         sh->expand( _rows, _cols );
     208         _usedRows = _rows;
     209         _usedCols = _cols;
     210     }
     211 
     212-    void setUsedRows( uint _rows ) {
     213+    void setUsedRows( uint _rows ) KDCHART_EXPORT
     214+    {
     215         Q_ASSERT( _rows <= rows() );
     216         if( _usedRows < _rows )
     217             setSorted( false );
     218@@ -270,11 +285,13 @@
     219         _useUsedRows = true;
     220     }
     221 
     222-    uint usedRows() const {
     223+    uint usedRows() const KDCHART_EXPORT
     224+    {
     225         return _useUsedRows ? _usedRows : rows();
     226     }
     227 
     228-    void setUsedCols( uint _cols ) {
     229+    void setUsedCols( uint _cols ) KDCHART_EXPORT
     230+    {
     231         Q_ASSERT( _cols <= cols() );
     232         if( _usedCols < _cols )
     233             setSorted( false );
     234@@ -282,7 +299,8 @@
     235         _useUsedCols = true;
     236     }
     237 
     238-    uint usedCols() const {
     239+    uint usedCols() const KDCHART_EXPORT
     240+    {
     241         return _useUsedCols ? _usedCols : cols();
     242     }
     243 
     244--- koffice-1.5.0-rc1/kexi/Makefile.global      2006-03-23 15:00:56.000000000 -0500
     245+++ koffice-1.5.0-rc1-new/kexi/Makefile.global  2006-03-25 13:35:45.000000000 -0500
     246@@ -9,7 +9,7 @@
     247 KDE_CXXFLAGS = \
     248 $(USE_EXCEPTIONS) $(KEXI_OPTIONS)
     249 
     250-KDE_CXXFLAGS += -include $(top_srcdir)/kexi/kexi_global.h
     251+KDE_CXXFLAGS += $(KOFFICECORE_INCLUDES) -include $(top_srcdir)/kexi/kexi_global.h
     252 
     253 # temporary:
     254 KDE_CXXFLAGS += -DKEXI_NO_AUTOFIELD_WIDGET
     255--- koffice-1.5.0-rc1/kexi/kexi_export.h        2006-03-23 15:00:56.000000000 -0500
     256+++ koffice-1.5.0-rc1-new/kexi/kexi_export.h    2006-03-25 13:35:45.000000000 -0500
     257@@ -22,6 +22,25 @@
     258 
     259 #include <kexidb/kexidb_export.h>
     260 
     261+#ifdef __KDE_HAVE_GCC_VISIBILITY
     262+#define MAKE_KEXICORE_LIB
     263+#define MAKE_KEXIMAIN_LIB
     264+#define MAKE_KEXITABLEFILTERS_LIB
     265+#define MAKE_KEXIDATATABLE_LIB
     266+#define MAKE_KEXIEXTWIDGETS_LIB
     267+#define MAKE_KFORMEDITOR_LIB
     268+#define MAKE_KEXIPRJWIZARD_LIB
     269+#define MAKE_KEXIFILTER_LIB
     270+#define MAKE_KEXIWIDGETS_LIB
     271+#define MAKE_KEXIUUID_LIB
     272+#define MAKE_KEXIRELATIONSVIEW_LIB
     273+#define MAKE_KEXIGUIUTILS_LIB
     274+#define MAKE_KROSS_MAIN_LIB
     275+#define MAKE_KEXIFORMUTILS_LIB
     276+#define MAKE_KEXIREPORTUTILS_LIB
     277+#define MAKE_KOPROPERTY_LIB
     278+#endif
     279+
     280 #ifdef MAKE_KEXICORE_LIB
     281 # define KEXICORE_EXPORT KDE_EXPORT
     282 #elif defined(KDE_MAKE_LIB)
     283--- koffice-1.5.0-rc1/kexi/kexidb/drivers/configure.in.bot      2006-03-23 15:00:41.000000000 -0500
     284+++ koffice-1.5.0-rc1-new/kexi/kexidb/drivers/configure.in.bot  2006-03-25 13:35:46.000000000 -0500
     285@@ -15,7 +15,7 @@
     286 fi
     287 
     288 if test -z "$PG_INCDIR" -o -z "$PG_LIBDIR" -o \
     289-        -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR"; then
     290+        -z "$PQXX_CFLAGS" -o -z "$PQXX_LIBS"; then
     291 
     292   echo "----------------------------------------------------------------------"
     293 
     294@@ -50,28 +50,28 @@
     295   fi
     296 
     297 # LIBPQXX messages
     298-  if test -z "$PQXX_INCDIR"; then
     299+  if test -z "$PQXX_CFLAGS"; then
     300     echo "  + The PostgreSQL C++ API (libpqxx) headers were not found."
     301   fi
     302 
     303-  if test -z "$PQXX_LIBDIR"; then
     304+  if test -z "$PQXX_LIBS"; then
     305     echo "  + The PostgreSQL C++ API (libpqxx) shared libraries were not found."
     306   fi
     307 
     308-  if test -z "$PQXX_INCDIR" -a -z "$PQXX_LIBDIR" ; then
     309+  if test -z "$PQXX_INCLUDES" -a -z "$PQXX_LIBS" ; then
     310       pqxx_parts_missing="HEADER or the libpqxx LIBRARY"
     311-  elif test -z "$PQXX_INCDIR" ; then
     312+  elif test -z "$PQXX_INCLUDES" ; then
     313       pqxx_parts_missing="HEADER"
     314-  elif test -z "$PQXX_LIBDIR" ; then
     315+  elif test -z "$PQXX_LIBS" ; then
     316       pqxx_parts_missing="LIBRARY"
     317   fi
     318 
     319-  if test -z "$PQXX_INCDIR" -o -z "$PQXX_LIBDIR" ; then
     320+  if test -z "$PQXX_INCLUDES" -o -z "$PQXX_LIBS" ; then
     321   cat <<EOS
     322     Could not find the libpqxx $pqxx_parts_missing files.
     323     These are required by Kexi's PostgreSQL drivers.
     324 
     325-    Note: Kexi requires the SHARED libpqxx.so library files.
     326+    Note: Kexi requires the SHARED libpqxx library files.
     327           If you build pqxx library on your own, don't forget to use the
     328           --enable-shared option when you run libpqxx's configure script.
     329           This is necessary to compile the SHARED .so library, and
     330--- koffice-1.5.0-rc1/kexi/kexidb/drivers/configure.in.in       2006-03-23 15:00:41.000000000 -0500
     331+++ koffice-1.5.0-rc1-new/kexi/kexidb/drivers/configure.in.in   2006-03-25 13:35:46.000000000 -0500
     332@@ -206,39 +206,11 @@
     333 ], ac_pqxx_libdir=
     334 )
     335 
    16336-
    17 -libkarbonbase_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined
    18 -libkarbonbase_la_LIBADD = $(LIB_KOFFICEUI)
    19 +libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc        karbon_part.cc  karbon_part_iface.cc    karbon_part_iface.skel  karbon_view.cc  karbon_view_iface.cc    karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_view_base.cc karbon_part_base.cc
    20  
    21  libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH)
    22  libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
    23 @@ -42,26 +35,26 @@
    24         commands/libkarboncommands.la \
    25         visitors/libkarbonvisitors.la \
    26         dialogs/libkarbondialogs.la \
    27 -       libkarbonbase.la \
    28         $(LIBART_LIBS) \
    29         $(LIBFONTCONFIG_LIBS) \
    30         $(LIBMAGICK_LIBS) \
    31         $(LIBFREETYPE_LIBS)
    32  
    33 -libkarbonpart_la_SOURCES = dummy.cpp
    34 +libkarbonpart_la_SOURCES = karbon_factory_dummy.cc
    35  libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
    36  libkarbonpart_la_LIBADD = libkarboncommon.la
    37  libkarbonpart_la_METASOURCES = AUTO
    38  
    39 +karbon_factory_dummy.cc: karbon_factory.cc karbon_factory.moc
    40 +       echo '#include "karbon_factory.h"' > karbon_factory_dummy.cc && \
    41 +       echo 'K_EXPORT_COMPONENT_FACTORY( libkarbonpart, KarbonFactory() )' >> karbon_factory_dummy.cc
    42 +
    43  bin_PROGRAMS =
    44  kdeinit_LTLIBRARIES = karbon.la
    45  karbon_la_SOURCES = main.cc
    46  karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version
    47  karbon_la_LIBADD = libkarboncommon.la
    48  
    49 -dummy.cpp:
    50 -       echo > dummy.cpp
     337-dnl ========================================
     338-dnl   libpqxx headers
     339-dnl ========================================
     340-if test "$compile_pgsql_plugin" = "yes"; then
     341-  AC_MSG_CHECKING([for PostgreSQL C++ includes])
     342-  pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
     343-  AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir)
     344-  if test -r $pqxx_incdir/pqxx/pqxx; then
     345-    PQXX_INCDIR=$pqxx_incdir
     346-    AC_MSG_RESULT([$PQXX_INCDIR])
     347-    AC_SUBST(PQXX_INCDIR)
     348-  else
     349-    compile_pgsql_plugin="no"
     350-    AC_MSG_RESULT([not found])
     351-  fi
     352-fi
    51353-
    52  noinst_HEADERS = \
    53         karbon_factory.h \
    54         karbon_part_base.h \
    55 --- koffice-1.4.2/karbon/main.cc        2005-09-21 08:27:54.000000000 -0400
    56 +++ koffice-1.4.2-new/karbon/main.cc    2005-09-29 20:37:21.000000000 -0400
    57 @@ -27,7 +27,6 @@
    58  
    59  #include "karbon_aboutdata.h"
    60  
    61 -
    62  static const KCmdLineOptions options[] =
    63         {
    64                 { "+[file]", I18N_NOOP( "File to open" ), 0 } ,
    65 --- koffice-1.4.2/kexi/formeditor/Makefile.am   2005-09-21 08:22:43.000000000 -0400
    66 +++ koffice-1.4.2-new/kexi/formeditor/Makefile.am       2005-09-29 20:37:21.000000000 -0400
    67 @@ -1,4 +1,5 @@
    68  include $(top_srcdir)/kexi/Makefile.global
    69 +USE_EXCEPTIONS = -fexceptions -fno-coalesce
    70  
    71  INCLUDES = -I$(top_srcdir)/kexi/widget \
    72    -I$(top_srcdir)/kexi/widget/propertyeditor \
    73 --- koffice-1.4.2/kexi/kexidb/drivers/configure.in.in   2005-09-21 08:22:32.000000000 -0400
    74 +++ koffice-1.4.2-new/kexi/kexidb/drivers/configure.in.in       2005-09-29 20:37:21.000000000 -0400
    75 @@ -142,8 +142,12 @@
     354-dnl ========================================
     355-dnl   libpqxx libraries
     356-dnl ========================================
    76357 if test "$compile_pgsql_plugin" = "yes"; then
    77    AC_MSG_CHECKING([for PostgreSQL... Step 2 of 4])
    78    pgsql_libdirs="$ac_pgsql_libdir /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
    79 -  AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
    80 -  if test ! -r $pgsql_libdir/libpq.so; then
    81 +  pgsql_libdir=NO
    82 +  for dir in $pgsql_libdirs; do
    83 +    try="ls -1 $dir/libpq.*"
    84 +    if test=`eval $try 2> /dev/null`; then pgsql_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
    85 +  done
    86 +  if test "x$pgsql_libdir" = "xNO"; then
    87      compile_pgsql_plugin="no"
    88      AC_MSG_RESULT([not found])
    89    else
    90 @@ -160,8 +164,8 @@
    91  if test "$compile_pgsql_plugin" = "yes"; then
    92    AC_MSG_CHECKING([for PostgreSQL... Step 3 of 4])
    93    pqxx_incdirs="$ac_pqxx_incdir /usr/include /usr/local/pqxx/include /usr/local/include"
    94 -  AC_FIND_FILE(pqxx/pqxx, $pqxx_incdirs, pqxx_incdir)
    95 -  if test ! -r $pqxx_incdir/pqxx/pqxx; then
    96 +  AC_FIND_FILE(pqxx, $pqxx_incdirs, pqxx_incdir)
    97 +  if test ! -r $pqxx_incdir/pqxx; then
    98      compile_pgsql_plugin="no"
    99      AC_MSG_RESULT([not found])
    100    else
    101 @@ -177,8 +181,12 @@
    102  if test "$compile_pgsql_plugin" = "yes"; then
    103    AC_MSG_CHECKING([for PostgreSQL... Step 4 of 4])
    104    pqxx_libdirs="$ac_pqxx_libdir /usr/lib /usr/local/lib /usr/local/pqxx/lib"
     358-  AC_MSG_CHECKING([for PostgreSQL C++ libraries])
     359-  pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
    105360-  AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
    106 -  if test ! -r $pqxx_libdir/libpqxx.so; then
    107 +  pqxx_libdir=NO
    108 +  for dir in $pqxx_libdirs; do
    109 +    try="ls -1 $dir/libpqxx.*"
    110 +    if test=`eval $try 2> /dev/null`; then pqxx_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
    111 +  done
    112 +  if test "x$pqxx_libdir" = "xNO"; then
    113      compile_pgsql_plugin="no"
    114      AC_MSG_RESULT([not found])
    115    else
    116 --- koffice-1.4.2/kexi/kexidb/drivers/mySQL/Makefile.am 2005-09-21 08:22:32.000000000 -0400
    117 +++ koffice-1.4.2-new/kexi/kexidb/drivers/mySQL/Makefile.am     2005-09-29 20:37:21.000000000 -0400
     361-  if test -r $pqxx_libdir/libpqxx.so; then
     362-    PQXX_LIBDIR=$pqxx_libdir
     363-    AC_MSG_RESULT([$PQXX_LIBDIR])
     364-    AC_SUBST(PQXX_LIBDIR)
     365-  else
     366-    compile_pgsql_plugin="no"
     367-    AC_MSG_RESULT([not found])
     368-  fi
     369+       ac_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     370+       PKG_CONFIG_PATH="$ac_pqxx_libdir/pkgconfig:$PKG_CONFIG_PATH"
     371+       PKG_CHECK_MODULES([PQXX], [libpqxx >= 2.4.0], [], [compile_pgsql_plugin=no])
     372+       PKG_CONFIG_PATH="$ac_save_PKG_CONFIG_PATH"
     373 fi
     374 
     375 AM_CONDITIONAL(compile_pgsql_plugin, test "$compile_pgsql_plugin" = "yes")
     376--- koffice-1.5.0-rc1/kexi/kexidb/drivers/mySQL/Makefile.am     2006-03-23 15:00:41.000000000 -0500
     377+++ koffice-1.5.0-rc1-new/kexi/kexidb/drivers/mySQL/Makefile.am 2006-03-25 13:35:46.000000000 -0500
    118378@@ -20,7 +20,8 @@
    119379   $(LIB_QT) \
     
    126386 kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined
    127387 
    128 --- koffice-1.4.2/kexi/kexidb/drivers/pqxx/Makefile.am  2005-09-21 08:22:30.000000000 -0400
    129 +++ koffice-1.4.2-new/kexi/kexidb/drivers/pqxx/Makefile.am      2005-09-29 20:37:21.000000000 -0400
    130 @@ -2,13 +2,13 @@
     388--- koffice-1.5.0-rc1/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.h        2006-03-23 15:00:41.000000000 -0500
     389+++ koffice-1.5.0-rc1-new/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.h    2006-03-25 13:35:46.000000000 -0500
     390@@ -30,7 +30,7 @@
     391 {
     392 
     393 /*! Implementation of prepared statements for MySQL driver. */
     394-class MySqlPreparedStatement : public PreparedStatement, public MySqlConnectionInternal
     395+class KEXI_DB_EXPORT MySqlPreparedStatement : public PreparedStatement, public MySqlConnectionInternal
     396 {
     397        public:
     398                MySqlPreparedStatement(StatementType type, ConnectionInternal& conn, FieldList& fields);
     399--- koffice-1.5.0-rc1/kexi/kexidb/drivers/pqxx/Makefile.am      2006-03-23 15:00:39.000000000 -0500
     400+++ koffice-1.5.0-rc1-new/kexi/kexidb/drivers/pqxx/Makefile.am  2006-03-25 13:35:46.000000000 -0500
     401@@ -2,17 +2,17 @@
    131402 
    132403 kde_module_LTLIBRARIES = kexidb_pqxxsqldriver.la
    133404 
    134405-INCLUDES = -I$(srcdir)/../../.. $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR)
    135 +INCLUDES = -I$(srcdir)/../../.. $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR)/pqxx -I$(PQXX_INCDIR)
     406+INCLUDES = -I$(srcdir)/../../.. $(all_includes) -I$(PG_INCDIR) $(PQXX_CFLAGS)
    136407 
    137408 kexidb_pqxxsqldriver_la_METASOURCES = AUTO
    138409 
    139  kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp pqxxkeywords.cpp
     410 kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
     411        pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp
    140412 
    141413-kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
    142 +kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx.2 ../../libkexidb.la
    143  
    144  kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
    145  
    146 --- koffice-1.4.2/kexi/main/Makefile.am 2005-09-21 08:22:11.000000000 -0400
    147 +++ koffice-1.4.2-new/kexi/main/Makefile.am     2005-09-29 20:37:21.000000000 -0400
    148 @@ -1,4 +1,5 @@
    149  include $(top_srcdir)/kexi/Makefile.global
    150 +USE_EXCEPTIONS = -fexceptions -fno-coalesce
    151  
    152  lib_LTLIBRARIES = libkeximain.la
    153  libkeximain_la_SOURCES = \
    154 --- koffice-1.4.2/kexi/main/configure.in.in     2005-09-21 08:22:11.000000000 -0400
    155 +++ koffice-1.4.2-new/kexi/main/configure.in.in 2005-09-29 20:37:21.000000000 -0400
     414+kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx.2 ../../libkexidb.la ../../parser/libkexidbparser.la
     415 
     416 kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
     417-       -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
     418+       $(PQXX_LIBS) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
     419 
     420 kde_services_DATA = kexidb_pqxxsqldriver.desktop
     421 
     422--- koffice-1.5.0-rc1/kexi/kexidb/kexidb_export.h       2006-03-23 15:00:41.000000000 -0500
     423+++ koffice-1.5.0-rc1-new/kexi/kexidb/kexidb_export.h   2006-03-25 13:35:45.000000000 -0500
     424@@ -26,6 +26,12 @@
     425 /* KDE_EXPORT will be defined multiple times without this on kdelibs 3.3 (tested on 3.3.1) */
     426 #include <kdemacros.h>
     427 
     428+#ifdef __KDE_HAVE_GCC_VISIBILITY
     429+#define MAKE_KEXI_DB_LIB
     430+#define MAKE_KEXIMIGR_LIB
     431+#define MAKE_KEXI_SERVER_SUPPORT
     432+#endif
     433+
     434 /* workaround for KDElibs < 3.2 on !win32 */
     435 #ifndef KDE_EXPORT
     436 # define KDE_EXPORT
     437@@ -51,6 +57,10 @@
     438 /* -- compile-time settings -- */
     439 #if defined(Q_WS_WIN) || defined(KEXI_OPTIONS)
     440 /* defined in a .pro file or 'KEXI_OPTIONS' env. variable */
     441+#elif defined(MAKE_KEXI_SERVER_SUPPORT)
     442+# define KEXI_SERVER_SUPPORT KDE_EXPORT
     443+#elif defined(KDE_MAKE_LIB)
     444+# define KEXI_SERVER_SUPPORT KDE_IMPORT
     445 #else
     446 # define KEXI_SERVER_SUPPORT
     447 /* # define KEXI_NO_MIGRATION */
     448--- koffice-1.5.0-rc1/kexi/kexidb/parser/Makefile.am    2006-03-23 15:00:37.000000000 -0500
     449+++ koffice-1.5.0-rc1-new/kexi/kexidb/parser/Makefile.am        2006-03-25 13:35:45.000000000 -0500
     450@@ -3,7 +3,7 @@
     451 lib_LTLIBRARIES = libkexidbparser.la
     452 libkexidbparser_la_SOURCES = sqlscanner.cpp sqlparser.cpp parser.cpp parser_p.cpp
     453 libkexidbparser_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) ../libkexidb.la
     454-libkexidbparser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)
     455+libkexidbparser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) -no-undefined
     456 
     457 noinst_HEADERS = parser_p.h
     458 
     459@@ -24,7 +24,7 @@
     460        cat sqlparser.tab.h >> sqlparser.h; \
     461        echo '#endif' >> sqlparser.h; \
     462        cat sqlparser.tab.c > sqlparser.cpp; \
     463-       echo "const char * const tname(int offset) { return yytname[offset]; }" >> sqlparser.cpp; \
     464+       echo "KDE_EXPORT const char * const tname(int offset) { return yytname[offset]; }" >> sqlparser.cpp; \
     465        ./extract_tokens.sh > tokens.cpp; \
     466        rm -f sqlparser.tab.h sqlparser.tab.c
     467 
     468--- koffice-1.5.0-rc1/kexi/kexidb/parser/sqlparser.cpp  2006-03-23 15:00:37.000000000 -0500
     469+++ koffice-1.5.0-rc1-new/kexi/kexidb/parser/sqlparser.cpp      2006-03-25 13:35:45.000000000 -0500
     470@@ -393,6 +393,8 @@
     471 #include "parser_p.h"
     472 #include "sqltypes.h"
     473 
     474+#include <koffice_export.h>
     475+
     476 int yylex();
     477 
     478 //     using namespace std;
     479@@ -2206,4 +2208,4 @@
     480 #line 1263 "sqlparser.y"
     481 
     482 
     483-const char * const tname(int offset) { return yytname[offset]; }
     484+KDE_EXPORT const char * const tname(int offset) { return yytname[offset]; }
     485--- koffice-1.5.0-rc1/kexi/kexiutils/kexiutils_export.h 2006-03-23 14:59:54.000000000 -0500
     486+++ koffice-1.5.0-rc1-new/kexi/kexiutils/kexiutils_export.h     2006-03-25 13:35:45.000000000 -0500
     487@@ -20,6 +20,12 @@
     488 #ifndef _KEXIUTILS_EXPORT_H_
     489 #define _KEXIUTILS_EXPORT_H_
     490 
     491+#include <koffice_export.h>
     492+
     493+#ifdef __KDE_HAVE_GCC_VISIBILITY
     494+#define MAKE_KEXIUTILS_LIB
     495+#endif
     496+
     497 #ifdef MAKE_KEXIUTILS_LIB
     498 # define KEXIUTILS_EXPORT KDE_EXPORT
     499 #elif defined(KDE_MAKE_LIB)
     500--- koffice-1.5.0-rc1/kexi/main/configure.in.in 2006-03-23 15:00:16.000000000 -0500
     501+++ koffice-1.5.0-rc1-new/kexi/main/configure.in.in     2006-03-25 13:35:45.000000000 -0500
    156502@@ -20,7 +20,7 @@
    157503 AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
     
    163509 
    164510 if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
    165 --- koffice-1.4.2/kexi/main/startup/Makefile.am 2005-09-21 08:22:10.000000000 -0400
    166 +++ koffice-1.4.2-new/kexi/main/startup/Makefile.am     2005-09-29 20:37:21.000000000 -0400
    167 @@ -1,4 +1,5 @@
    168  include $(top_srcdir)/kexi/Makefile.global
    169 +USE_EXCEPTIONS = -fexceptions -fno-coalesce
    170  
    171  noinst_LTLIBRARIES = libkeximainstartup.la
    172  
    173 --- koffice-1.4.2/kexi/migration/pqxx/Makefile.am       2005-09-21 08:22:14.000000000 -0400
    174 +++ koffice-1.4.2-new/kexi/migration/pqxx/Makefile.am   2005-09-29 20:37:21.000000000 -0400
    175 @@ -2,7 +2,7 @@
    176  
    177  kde_module_LTLIBRARIES = keximigrate_pqxx.la
    178  
    179 -INCLUDES = -I$(srcdir)/../../.. -I$(top_srcdir)/kexi $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR)
    180 +INCLUDES = -I$(srcdir)/../../.. -I$(top_srcdir)/kexi $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR)/pqxx -I$(PQXX_INCDIR)
    181  
    182  keximigrate_pqxx_la_METASOURCES = AUTO
    183  
    184 --- koffice-1.4.2/kexi/widget/relations/Makefile.am     2005-09-21 08:22:07.000000000 -0400
    185 +++ koffice-1.4.2-new/kexi/widget/relations/Makefile.am 2005-09-29 20:37:21.000000000 -0400
    186 @@ -1,4 +1,5 @@
    187  include $(top_srcdir)/kexi/Makefile.global
    188 +USE_EXCEPTIONS = -fexceptions -fno-coalesce
    189  
    190  lib_LTLIBRARIES = libkexirelationsview.la
    191  
    192 --- koffice-1.4.2/kivio/plugins/kivioconnectortool/Makefile.am  2005-09-21 08:25:54.000000000 -0400
    193 +++ koffice-1.4.2-new/kivio/plugins/kivioconnectortool/Makefile.am      2005-09-29 20:37:21.000000000 -0400
    194 @@ -1,5 +1,5 @@
    195  SUBDIRS = straight_connector .
    196 -lib_LTLIBRARIES =libkivioconnectortool.la
    197 +kde_module_LTLIBRARIES =libkivioconnectortool.la
    198  
    199  
    200  INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
    201 --- koffice-1.4.2/kivio/plugins/kivioselecttool/Makefile.am     2005-09-21 08:25:53.000000000 -0400
    202 +++ koffice-1.4.2-new/kivio/plugins/kivioselecttool/Makefile.am 2005-09-29 20:37:21.000000000 -0400
    203 @@ -1,5 +1,5 @@
    204  SUBDIRS = select_pics
    205 -lib_LTLIBRARIES =libkivioselecttool.la
    206 +kde_module_LTLIBRARIES =libkivioselecttool.la
    207  
    208  
    209  INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
    210 --- koffice-1.4.2/kivio/plugins/kiviosmlconnector/Makefile.am   2005-09-21 08:25:54.000000000 -0400
    211 +++ koffice-1.4.2-new/kivio/plugins/kiviosmlconnector/Makefile.am       2005-09-29 20:37:21.000000000 -0400
    212 @@ -1,5 +1,5 @@
    213  SUBDIRS=. sml_connector
    214 -lib_LTLIBRARIES =libkiviosmlconnector.la
    215 +kde_module_LTLIBRARIES =libkiviosmlconnector.la
    216  
    217  INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
    218         -I$(top_builddir)/kivio/kiviopart/config \
    219 --- koffice-1.4.2/kivio/plugins/kiviotargettool/Makefile.am     2005-09-21 08:25:53.000000000 -0400
    220 +++ koffice-1.4.2-new/kivio/plugins/kiviotargettool/Makefile.am 2005-09-29 20:37:21.000000000 -0400
    221 @@ -7,7 +7,7 @@
    222  
     511--- koffice-1.5.0-rc1/kexi/main.cpp     2006-03-23 15:00:56.000000000 -0500
     512+++ koffice-1.5.0-rc1-new/kexi/main.cpp 2006-03-25 13:35:45.000000000 -0500
     513@@ -37,7 +37,7 @@
     514 #include "main/keximainwindowimpl.h"
     515 #include "main/startup/KexiStartup.h"
     516 
     517-extern "C" int kdemain(int argc, char *argv[])
     518+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
     519 {
     520        Kexi::initCmdLineArgs( argc, argv );
     521 
     522--- koffice-1.5.0-rc1/kexi/widget/relations/Makefile.am 2006-03-23 15:00:11.000000000 -0500
     523+++ koffice-1.5.0-rc1-new/kexi/widget/relations/Makefile.am     2006-03-25 13:35:45.000000000 -0500
     524@@ -6,7 +6,7 @@
     525                                kexirelationviewtable.cpp kexirelationwidget.cpp
     526 
     527 libkexirelationsview_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
     528-libkexirelationsview_la_LIBADD = ../../core/libkexicore.la
     529+libkexirelationsview_la_LIBADD = ../../core/libkexicore.la ../libkexiextendedwidgets.la
     530 
     531 libkexirelationsview_la_METASOURCES = AUTO
     532 
     533--- koffice-1.5.0-rc1/kivio/kiviopart/kivio_command.h   2006-03-23 15:07:59.000000000 -0500
     534+++ koffice-1.5.0-rc1-new/kivio/kiviopart/kivio_command.h       2006-03-25 13:35:45.000000000 -0500
     535@@ -226,7 +226,7 @@
     536 };
     537 
     538 
     539-class KivioChangeStencilHAlignmentCommand : public KNamedCommand
     540+class KIVIO_EXPORT KivioChangeStencilHAlignmentCommand : public KNamedCommand
     541 {
     542   public:
     543     KivioChangeStencilHAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
     544@@ -244,7 +244,7 @@
     545     QString m_textBoxName;
     546 };
     547 
     548-class KivioChangeStencilVAlignmentCommand : public KNamedCommand
     549+class KIVIO_EXPORT KivioChangeStencilVAlignmentCommand : public KNamedCommand
     550 {
     551   public:
     552     KivioChangeStencilVAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
     553@@ -263,7 +263,7 @@
     554 };
     555 
     556 
     557-class KivioChangeStencilFontCommand : public KNamedCommand
     558+class KIVIO_EXPORT KivioChangeStencilFontCommand : public KNamedCommand
     559 {
     560   public:
     561     KivioChangeStencilFontCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil,
     562@@ -282,7 +282,7 @@
     563     QString m_textBoxName;
     564 };
     565 
     566-class KivioChangeStencilColorCommand : public KNamedCommand
     567+class KIVIO_EXPORT KivioChangeStencilColorCommand : public KNamedCommand
     568 {
     569   public:
     570     enum ColorType { CT_TEXTCOLOR, CT_FGCOLOR, CT_BGCOLOR };
     571@@ -410,7 +410,7 @@
     572     bool m_bValue;
     573 };
     574 
     575-class KivioAddConnectorTargetCommand : public KNamedCommand
     576+class KIVIO_EXPORT KivioAddConnectorTargetCommand : public KNamedCommand
     577 {
     578   public:
     579     KivioAddConnectorTargetCommand(const QString& name, KivioPage* page,
     580@@ -425,7 +425,7 @@
     581     KoPoint m_targetPoint;
     582 };
     583 
     584-class KivioCustomDragCommand : public KNamedCommand
     585+class KIVIO_EXPORT KivioCustomDragCommand : public KNamedCommand
     586 {
     587   public:
     588     KivioCustomDragCommand(const QString& name, KivioPage* page, KivioStencil* stencil,
     589--- koffice-1.5.0-rc1/kivio/kiviopart/kivio_map.h       2006-03-23 15:07:59.000000000 -0500
     590+++ koffice-1.5.0-rc1-new/kivio/kiviopart/kivio_map.h   2006-03-25 13:35:45.000000000 -0500
     591@@ -36,11 +36,13 @@
     592 #include <qptrlist.h>
     593 #include <qstringlist.h>
     594 
     595+#include <koffice_export.h>
     596+
     597 /*
     598  * A map is a simple container for all pages. Usually a complete map is saved in one file.
     599  */
     600 
     601-class KivioMap : public QObject
     602+class KIVIO_EXPORT KivioMap : public QObject
     603 {
     604   public:
     605     /**
     606--- koffice-1.5.0-rc1/kivio/kiviopart/kiviosdk/kivio_layer.h    2006-03-23 15:07:57.000000000 -0500
     607+++ koffice-1.5.0-rc1-new/kivio/kiviopart/kiviosdk/kivio_layer.h        2006-03-25 13:35:45.000000000 -0500
     608@@ -36,12 +36,14 @@
     609 
     610 #include "kivio_stencil.h"
     611 
     612+#include <koffice_export.h>
     613+
     614 #define FLOW_LAYER_VISIBLE 0x0001
     615 #define FLOW_LAYER_CONNECTABLE 0x0002
     616 #define FLOW_LAYER_NOT_EDITABLE 0x0004
     617 #define FLOW_LAYER_NOT_PRINTABLE 0x0008
     618 
     619-class KivioLayer
     620+class KIVIO_EXPORT KivioLayer
     621 {
     622 protected:
     623     friend class KivioGroupStencil;
     624--- koffice-1.5.0-rc1/kivio/kiviopart/kiviosdk/kivio_screen_painter.h   2006-03-23 15:07:57.000000000 -0500
     625+++ koffice-1.5.0-rc1-new/kivio/kiviopart/kiviosdk/kivio_screen_painter.h       2006-03-25 13:35:45.000000000 -0500
     626@@ -25,10 +25,12 @@
     627 #include <qpainter.h>
     628 #include <qpixmap.h>
     629 
     630+#include <koffice_export.h>
     631+
     632 class KivioPoint;
     633 
     634 
     635-class KivioScreenPainter : public KivioPainter
     636+class KIVIO_EXPORT KivioScreenPainter : public KivioPainter
     637 {
     638 protected:
     639     QPainter *m_pPainter;
     640--- koffice-1.5.0-rc1/kpresenter/KPrCanvas.h    2006-03-23 15:08:30.000000000 -0500
     641+++ koffice-1.5.0-rc1-new/kpresenter/KPrCanvas.h        2006-03-25 13:35:45.000000000 -0500
     642@@ -41,6 +41,8 @@
     643 #include <KoTextFormat.h>
     644 #include "presstep.h"
     645 
     646+#include <koffice_export.h>
     647+
     648 class KURL;
     649 class KoTextFormatInterface;
     650 class KPrView;
     651@@ -79,7 +81,7 @@
     652  *
     653  * It manages the graphical representation of all the objects.
     654  */
     655-class KPrCanvas : public QWidget
     656+class KPRESENTER_EXPORT KPrCanvas : public QWidget
     657 {
     658     Q_OBJECT
     659 
     660--- koffice-1.5.0-rc1/kpresenter/KPrFactory.h   2006-03-23 15:08:30.000000000 -0500
     661+++ koffice-1.5.0-rc1-new/kpresenter/KPrFactory.h       2006-03-25 13:35:45.000000000 -0500
     662@@ -22,9 +22,11 @@
     663 #define KPRESENTER_FACTORY_H
     664 
     665 #include <KoFactory.h>
     666+#include <koffice_export.h>
     667+
     668 class KAboutData;
     669 
     670-class KPrFactory : public KoFactory
     671+class KPRESENTER_EXPORT KPrFactory : public KoFactory
     672 {
     673     Q_OBJECT
     674 public:
     675--- koffice-1.5.0-rc1/kpresenter/KPrView.h      2006-03-23 15:08:30.000000000 -0500
     676+++ koffice-1.5.0-rc1-new/kpresenter/KPrView.h  2006-03-25 13:35:45.000000000 -0500
     677@@ -35,6 +35,8 @@
     678 #include <KoPen.h>
     679 #include <KoRuler.h>
     680 
     681+#include <koffice_export.h>
     682+
     683 class QPopupMenu;
     684 class QSplitter;
     685 class QLabel;
     686@@ -114,7 +116,7 @@
     687 };
     688 
     689 
     690-class KPrView : public KoView
     691+class KPRESENTER_EXPORT KPrView : public KoView
     692 {
     693     friend class PageBase;
     694     Q_OBJECT
     695--- koffice-1.5.0-rc1/krita/core/kis_alpha_mask.h       2006-03-23 15:04:51.000000000 -0500
     696+++ koffice-1.5.0-rc1-new/krita/core/kis_alpha_mask.h   2006-03-25 13:35:45.000000000 -0500
     697@@ -26,12 +26,14 @@
     698 #include "kis_global.h"
     699 #include "kis_types.h"
     700 
     701+#include <koffice_export.h>
     702+
     703 /**
     704  * KisAlphaMask is intended to create alpha values from a QImage for use
     705  * in brush creation. It is not a generic alpha mask that can be used with
     706  * KisPaintDevices: use a KisSelection for that.
     707  */
     708-class KisAlphaMask : public KShared {
     709+class KRITACORE_EXPORT KisAlphaMask : public KShared {
     710     
     711  public:
     712     /**
     713--- koffice-1.5.0-rc1/krita/core/kis_autobrush_resource.h       2006-03-23 15:04:51.000000000 -0500
     714+++ koffice-1.5.0-rc1-new/krita/core/kis_autobrush_resource.h   2006-03-25 13:35:45.000000000 -0500
     715@@ -21,7 +21,9 @@
     716 
     717 #include "kis_brush.h"
     718 
     719-class KisAutobrushShape {
     720+#include <koffice_export.h>
     721+
     722+class KRITACORE_EXPORT KisAutobrushShape {
     723     public:
     724         KisAutobrushShape(Q_INT32 w, Q_INT32 h, double fh, double fv) : m_w(w), m_h(h), m_fh(fh), m_fv(fv)
     725         { };
     726@@ -32,7 +34,7 @@
     727         double m_fh, m_fv;
     728 };
     729 
     730-class KisAutobrushCircleShape : public KisAutobrushShape {
     731+class KRITACORE_EXPORT KisAutobrushCircleShape : public KisAutobrushShape {
     732     public:
     733         KisAutobrushCircleShape(Q_INT32 w, Q_INT32 h, double fh, double fv);
     734     public:
     735@@ -48,7 +50,7 @@
     736         double m_xfadecoef, m_yfadecoef;
     737 };
     738 
     739-class KisAutobrushRectShape : public KisAutobrushShape {
     740+class KRITACORE_EXPORT KisAutobrushRectShape : public KisAutobrushShape {
     741     public:
     742         KisAutobrushRectShape(Q_INT32 w, Q_INT32 h, double fh, double fv);
     743     protected:
     744@@ -57,7 +59,7 @@
     745         double m_xcentre, m_ycentre, m_c;
     746 };
     747 
     748-class KisAutobrushResource : public KisBrush
     749+class KRITACORE_EXPORT KisAutobrushResource : public KisBrush
     750 {
     751     public:
     752         KisAutobrushResource(QImage& img) : KisBrush("")
     753--- koffice-1.5.0-rc1/krita/core/kis_autogradient_resource.h    2006-03-23 15:04:51.000000000 -0500
     754+++ koffice-1.5.0-rc1-new/krita/core/kis_autogradient_resource.h        2006-03-25 13:35:45.000000000 -0500
     755@@ -22,7 +22,9 @@
     756 
     757 #include "kis_gradient.h"
     758 
     759-class KisAutogradientResource : public KisGradient
     760+#include <koffice_export.h>
     761+
     762+class KRITACORE_EXPORT KisAutogradientResource : public KisGradient
     763 {
     764 
     765 public:
     766--- koffice-1.5.0-rc1/krita/core/kis_background.h       2006-03-23 15:04:51.000000000 -0500
     767+++ koffice-1.5.0-rc1-new/krita/core/kis_background.h   2006-03-25 13:35:45.000000000 -0500
     768@@ -21,8 +21,9 @@
     769 #include <qimage.h>
     770 
     771 #include <ksharedptr.h>
     772+#include <koffice_export.h>
     773 
     774-class KisBackground : public KShared {
     775+class KRITACORE_EXPORT KisBackground : public KShared {
     776 
     777 public:
     778     KisBackground();
     779--- koffice-1.5.0-rc1/krita/core/kis_command.h  2006-03-23 15:04:51.000000000 -0500
     780+++ koffice-1.5.0-rc1-new/krita/core/kis_command.h      2006-03-25 13:35:45.000000000 -0500
     781@@ -22,10 +22,11 @@
     782 
     783 #include <qstring.h>
     784 #include <kcommand.h>
     785+#include <koffice_export.h>
     786 
     787 class KisUndoAdapter;
     788 
     789-class KisCommand : public KCommand {
     790+class KRITACORE_EXPORT KisCommand : public KCommand {
     791     typedef KCommand super;
     792 
     793 public:
     794--- koffice-1.5.0-rc1/krita/core/kis_exif_value.h       2006-03-23 15:04:51.000000000 -0500
     795+++ koffice-1.5.0-rc1-new/krita/core/kis_exif_value.h   2006-03-25 13:35:46.000000000 -0500
     796@@ -25,6 +25,8 @@
     797 #include <qcstring.h>
     798 #include <qstring.h>
     799 
     800+#include <koffice_export.h>
     801+
     802 typedef QMemArray<Q_UINT8> UByteArray;
     803 
     804 struct KisExifRational {
     805@@ -37,7 +39,7 @@
     806     Q_INT32 denominator;
     807 };
     808 
     809-class ExifValue {
     810+class KRITACORE_EXPORT ExifValue {
     811     typedef union {
     812         Q_UINT8 m_byte;
     813         Q_UINT16 m_short;
     814--- koffice-1.5.0-rc1/krita/core/kis_filter_config_widget.h     2006-03-23 15:04:51.000000000 -0500
     815+++ koffice-1.5.0-rc1-new/krita/core/kis_filter_config_widget.h 2006-03-25 13:35:45.000000000 -0500
     816@@ -20,13 +20,14 @@
     817 
     818 #include <qwidget.h>
     819 #include "kis_filter_configuration.h"
     820+#include <koffice_export.h>
     821 
     822 /**
     823  * Empty base class. Filters can build their own configuration widgets that
     824  * inherit this class. The configuration widget can emit sigPleaseUpdatePreview
     825  * when it wants the preview in the filter dialog to be updated.
     826  */
     827-class KisFilterConfigWidget : public QWidget {
     828+class KRITACORE_EXPORT KisFilterConfigWidget : public QWidget {
     829 
     830     Q_OBJECT
     831 
     832--- koffice-1.5.0-rc1/krita/core/kis_filter_strategy.h  2006-03-23 15:04:51.000000000 -0500
     833+++ koffice-1.5.0-rc1-new/krita/core/kis_filter_strategy.h      2006-03-25 13:35:45.000000000 -0500
     834@@ -25,8 +25,9 @@
     835 #include "kis_types.h"
     836 #include "kis_generic_registry.h"
     837 #include "kis_id.h"
     838+#include <koffice_export.h>
     839 
     840-class KisFilterStrategy
     841+class KRITACORE_EXPORT KisFilterStrategy
     842 {
     843     public:
     844         KisFilterStrategy(KisID id) : m_id(id) {}
     845@@ -44,7 +45,7 @@
     846         KisID m_id;
     847 };
     848 
     849-class KisHermiteFilterStrategy : public KisFilterStrategy
     850+class KRITACORE_EXPORT KisHermiteFilterStrategy : public KisFilterStrategy
     851 {
     852     public:
     853         KisHermiteFilterStrategy() : KisFilterStrategy(KisID("Hermite", i18n("Hermite")))
     854@@ -55,7 +56,7 @@
     855         virtual double valueAt(double t) const;
     856 };
     857 
     858-class KisBoxFilterStrategy : public KisFilterStrategy
     859+class KRITACORE_EXPORT KisBoxFilterStrategy : public KisFilterStrategy
     860 {
     861     public:
     862         KisBoxFilterStrategy() : KisFilterStrategy(KisID("Box", i18n("Box")))
     863@@ -67,7 +68,7 @@
     864         virtual bool boxSpecial() { return true;};
     865 };
     866 
     867-class KisTriangleFilterStrategy : public KisFilterStrategy
     868+class KRITACORE_EXPORT KisTriangleFilterStrategy : public KisFilterStrategy
     869 {
     870     public:
     871         KisTriangleFilterStrategy() : KisFilterStrategy(KisID("Triangle", i18n("Triangle aka (bi)linear")))
     872@@ -78,7 +79,7 @@
     873         virtual double valueAt(double t) const;
     874 };
     875 
     876-class KisBellFilterStrategy : public KisFilterStrategy
     877+class KRITACORE_EXPORT KisBellFilterStrategy : public KisFilterStrategy
     878 {
     879     public:
     880         KisBellFilterStrategy() : KisFilterStrategy(KisID("Bell", i18n("Bell")))
     881@@ -88,7 +89,7 @@
     882         virtual double valueAt(double t) const;
     883 };
     884 
     885-class KisBSplineFilterStrategy : public KisFilterStrategy
     886+class KRITACORE_EXPORT KisBSplineFilterStrategy : public KisFilterStrategy
     887 {
     888     public:
     889         KisBSplineFilterStrategy() : KisFilterStrategy(KisID("BSpline", i18n("BSpline")))
     890@@ -98,7 +99,7 @@
     891         virtual double valueAt(double t) const;
     892 };
     893 
     894-class KisLanczos3FilterStrategy : public KisFilterStrategy
     895+class KRITACORE_EXPORT KisLanczos3FilterStrategy : public KisFilterStrategy
     896 {
     897     public:
     898         KisLanczos3FilterStrategy() : KisFilterStrategy(KisID("Lanczos3", i18n("Lanczos3")))
     899@@ -110,7 +111,7 @@
     900         double sinc(double x) const;
     901 };
     902 
     903-class KisMitchellFilterStrategy : public KisFilterStrategy
     904+class KRITACORE_EXPORT KisMitchellFilterStrategy : public KisFilterStrategy
     905 {
     906     public:
     907         KisMitchellFilterStrategy() : KisFilterStrategy(KisID("Mitchell", i18n("Mitchell")))
     908@@ -120,7 +121,7 @@
     909         virtual double valueAt(double t) const;
     910 };
     911 
     912-class KisFilterStrategyRegistry : public KisGenericRegistry<KisFilterStrategy *>
     913+class KRITACORE_EXPORT KisFilterStrategyRegistry : public KisGenericRegistry<KisFilterStrategy *>
     914 {
     915 public:
     916     virtual ~KisFilterStrategyRegistry();
     917--- koffice-1.5.0-rc1/krita/core/kis_gradient.h 2006-03-23 15:04:51.000000000 -0500
     918+++ koffice-1.5.0-rc1-new/krita/core/kis_gradient.h     2006-03-25 13:35:45.000000000 -0500
     919@@ -32,6 +32,8 @@
     920 #include "kis_resource.h"
     921 #include "kis_global.h"
     922 
     923+#include <koffice_export.h>
     924+
     925 class QImage;
     926 
     927 enum {
     928@@ -62,7 +64,7 @@
     929         double m_alpha;
     930 };
     931 
     932-class KisGradientSegment {
     933+class KRITACORE_EXPORT KisGradientSegment {
     934     public:
     935         KisGradientSegment(int interpolationType, int colorInterpolationType, double startOffset, double middleOffset, double endOffset, const Color& startColor, const Color& endColor);
     936 
     937@@ -229,7 +231,7 @@
     938         Color m_endColor;
     939 };
     940 
     941-class KisGradient : public KisResource {
     942+class KRITACORE_EXPORT KisGradient : public KisResource {
     943     typedef KisResource super;
     944     Q_OBJECT
     945 
     946--- koffice-1.5.0-rc1/krita/core/kis_group_layer.h      2006-03-23 15:04:51.000000000 -0500
     947+++ koffice-1.5.0-rc1-new/krita/core/kis_group_layer.h  2006-03-25 13:35:46.000000000 -0500
     948@@ -25,6 +25,8 @@
     949 
     950 #include "kis_paint_layer.h"
     951 
     952+#include <koffice_export.h>
     953+
     954 class KisMergeVisitor;
     955 
     956 /**
     957@@ -33,7 +35,7 @@
     958  * KisLayer::nextSibling() moves towards higher indices, from the top to the bottom layer; prevSibling() the reverse.
     959  * (Implementation detail: internally, the indices are reversed, for speed.)
     960  **/
     961-class KisGroupLayer : public KisLayer {
     962+class KRITACORE_EXPORT KisGroupLayer : public KisLayer {
     963     typedef KisLayer super;
     964 
     965     Q_OBJECT
     966--- koffice-1.5.0-rc1/krita/core/kis_histogram.h        2006-03-23 15:04:51.000000000 -0500
     967+++ koffice-1.5.0-rc1-new/krita/core/kis_histogram.h    2006-03-25 13:35:46.000000000 -0500
     968@@ -22,6 +22,7 @@
     969 #include "kis_types.h"
     970 #include "kis_colorspace.h"
     971 #include "kis_histogram_producer.h"
     972+#include <koffice_export.h>
     973 
     974 enum enumHistogramType {
     975     LINEAR,
     976@@ -40,7 +41,7 @@
     977  * The calculations are done in the range 0 - 1, instead of the native range that a pixel
     978  * might have, so it's not always as precise as it could be. But you can't have it all...
     979  */
     980-class KisHistogram : public KShared {
     981+class KRITACORE_EXPORT KisHistogram : public KShared {
     982 
     983 public:
     984     /**
     985--- koffice-1.5.0-rc1/krita/core/kis_imagepipe_brush.h  2006-03-23 15:04:51.000000000 -0500
     986+++ koffice-1.5.0-rc1-new/krita/core/kis_imagepipe_brush.h      2006-03-25 13:35:46.000000000 -0500
     987@@ -31,6 +31,8 @@
     988 #include "kis_brush.h"
     989 #include "kis_global.h"
     990 
     991+#include <koffice_export.h>
     992+
     993 class QCString;
     994 class QImage;
     995 class QPoint;
     996@@ -98,7 +100,7 @@
     997 };
     998 
     999 
     1000-class KisImagePipeBrush : public KisBrush {
     1001+class KRITACORE_EXPORT KisImagePipeBrush : public KisBrush {
     1002     typedef KisBrush super;
     1003     Q_OBJECT
     1004 
     1005--- koffice-1.5.0-rc1/krita/core/kis_iterator.h 2006-03-23 15:04:51.000000000 -0500
     1006+++ koffice-1.5.0-rc1-new/krita/core/kis_iterator.h     2006-03-25 13:35:46.000000000 -0500
     1007@@ -21,6 +21,7 @@
     1008 
     1009 #include <qglobal.h>
     1010 #include <ksharedptr.h>
     1011+#include <koffice_export.h>
     1012 
     1013 class KisTiledRectIterator;
     1014 typedef KSharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;
     1015@@ -37,7 +38,7 @@
     1016  * The KisRectIterator iterators over a rectangular area in the most efficient order. That is,
     1017  * there is no guarantee that the iterator will work scanline by scanline.
     1018  */
     1019-class KisRectIterator
     1020+class KRITACORE_EXPORT KisRectIterator
     1021 {
     1022 
     1023 
     1024@@ -81,7 +82,7 @@
     1025     KisTiledRectIteratorSP m_iter;
     1026 };
     1027 
     1028-class KisHLineIterator
     1029+class KRITACORE_EXPORT KisHLineIterator
     1030 {
     1031 
     1032 public:
     1033@@ -132,7 +133,7 @@
     1034     KisTiledHLineIteratorSP m_iter;
     1035 };
     1036 
     1037-class KisVLineIterator
     1038+class KRITACORE_EXPORT KisVLineIterator
     1039 {
     1040 
     1041 public:
     1042--- koffice-1.5.0-rc1/krita/core/kis_meta_registry.h    2006-03-23 15:04:51.000000000 -0500
     1043+++ koffice-1.5.0-rc1-new/krita/core/kis_meta_registry.h        2006-03-25 13:35:46.000000000 -0500
     1044@@ -18,6 +18,8 @@
     1045 #ifndef _KIS_META_REGISTRY_
     1046 #define _KIS_META_REGISTRY_
     1047 
     1048+#include <koffice_export.h>
     1049+
     1050 class KisColorSpaceFactoryRegistry;
     1051 class KisMathToolboxFactoryRegistry;
     1052 
     1053@@ -26,7 +28,7 @@
     1054  *
     1055  * XXX: Maybe this should go into the SDK
     1056  */
     1057-class KisMetaRegistry {
     1058+class KRITACORE_EXPORT KisMetaRegistry {
     1059 
     1060 public:
     1061 
     1062--- koffice-1.5.0-rc1/krita/core/kis_nameserver.h       2006-03-23 15:04:51.000000000 -0500
     1063+++ koffice-1.5.0-rc1-new/krita/core/kis_nameserver.h   2006-03-25 13:35:46.000000000 -0500
     1064@@ -20,8 +20,9 @@
     1065 
     1066 #include <qstring.h>
     1067 #include "kis_global.h"
     1068+#include <koffice_export.h>
     1069 
     1070-class KisNameServer {
     1071+class KRITACORE_EXPORT KisNameServer {
     1072 public:
     1073     KisNameServer(const QString& prefix, Q_INT32 seed = 1);
     1074     ~KisNameServer();
     1075--- koffice-1.5.0-rc1/krita/core/kis_paint_layer.h      2006-03-23 15:04:51.000000000 -0500
     1076+++ koffice-1.5.0-rc1-new/krita/core/kis_paint_layer.h  2006-03-25 13:35:46.000000000 -0500
     1077@@ -22,10 +22,12 @@
     1078 #include "kis_layer.h"
     1079 #include "kis_paint_device.h"
     1080 #include "kis_colorspace.h"
     1081+#include <koffice_export.h>
     1082+
     1083 /**
     1084  * This layer is of a type that can be painted on.
     1085  */
     1086-class KisPaintLayer : public KisLayer {
     1087+class KRITACORE_EXPORT KisPaintLayer : public KisLayer {
     1088     typedef KisLayer super;
     1089 
     1090     Q_OBJECT
     1091--- koffice-1.5.0-rc1/krita/core/kis_paintop.h  2006-03-23 15:04:51.000000000 -0500
     1092+++ koffice-1.5.0-rc1-new/krita/core/kis_paintop.h      2006-03-25 13:35:46.000000000 -0500
     1093@@ -105,7 +105,7 @@
     1094  * If there is an optionWidget, the derived paintop itself must support settings,
     1095  * and it's up to the factory to do that.
     1096  */
     1097-class KisPaintOpFactory  : public KShared
     1098+class KRITACORE_EXPORT KisPaintOpFactory  : public KShared
     1099 {
     1100 
     1101 public:
     1102--- koffice-1.5.0-rc1/krita/core/kis_palette.h  2006-03-23 15:04:51.000000000 -0500
     1103+++ koffice-1.5.0-rc1-new/krita/core/kis_palette.h      2006-03-25 13:35:46.000000000 -0500
     1104@@ -31,6 +31,8 @@
     1105 #include "kis_gradient.h"
     1106 #include "kis_alpha_mask.h"
     1107 
     1108+#include <koffice_export.h>
     1109+
     1110 class QPoint;
     1111 class QPixmap;
     1112 class KisPaintDevice;
     1113@@ -47,7 +49,7 @@
     1114  * Open Gimp, Photoshop or RIFF palette files. This is a straight port
     1115  * from the Gimp.
     1116  */
     1117-class KisPalette : public KisResource {
     1118+class KRITACORE_EXPORT KisPalette : public KisResource {
     1119     typedef KisResource super;
     1120 
     1121     Q_OBJECT
     1122--- koffice-1.5.0-rc1/krita/core/kis_pattern.h  2006-03-23 15:04:51.000000000 -0500
     1123+++ koffice-1.5.0-rc1-new/krita/core/kis_pattern.h      2006-03-25 13:35:46.000000000 -0500
     1124@@ -26,13 +26,14 @@
     1125 #include "kis_debug_areas.h"
     1126 #include "kis_resource.h"
     1127 #include "kis_types.h"
     1128+#include <koffice_export.h>
     1129 
     1130 class QPoint;
     1131 class QImage;
     1132 class KisColorSpace;
     1133 class KisPaintDevice;
     1134 
     1135-class KisPattern : public KisResource {
     1136+class KRITACORE_EXPORT KisPattern : public KisResource {
     1137     typedef KisResource super;
     1138     Q_OBJECT
     1139 
     1140--- koffice-1.5.0-rc1/krita/core/kis_resource.h 2006-03-23 15:04:51.000000000 -0500
     1141+++ koffice-1.5.0-rc1-new/krita/core/kis_resource.h     2006-03-25 13:35:46.000000000 -0500
     1142@@ -21,7 +21,7 @@
     1143 #include <qimage.h>
     1144 #include <qobject.h>
     1145 #include <qstring.h>
     1146-
     1147+#include <koffice_export.h>
     1148 
     1149 /**
     1150  * The KisResource class provides a representation of Krita image resources.  This
     1151@@ -29,7 +29,7 @@
     1152  *
     1153  * This replaces the KisKrayon facility that used to be present in Krayon.
     1154  */
     1155-class KisResource : public QObject {
     1156+class KRITACORE_EXPORT KisResource : public QObject {
     1157     typedef QObject super;
     1158     Q_OBJECT
     1159 
     1160--- koffice-1.5.0-rc1/krita/core/kis_rotate_visitor.h   2006-03-23 15:04:51.000000000 -0500
     1161+++ koffice-1.5.0-rc1-new/krita/core/kis_rotate_visitor.h       2006-03-25 13:35:46.000000000 -0500
     1162@@ -20,12 +20,13 @@
     1163 
     1164 #include "kis_types.h"
     1165 #include "kis_progress_subject.h"
     1166+#include <koffice_export.h>
     1167 
     1168 class QRect;
     1169 class KisPaintDevice;
     1170 class KisProgressDisplayInterface;
     1171 
     1172-class KisRotateVisitor : public KisProgressSubject {
     1173+class KRITACORE_EXPORT KisRotateVisitor : public KisProgressSubject {
     1174         typedef KisProgressSubject super; 
     1175         
     1176         /* Structs for the image rescaling routine */
     1177--- koffice-1.5.0-rc1/krita/core/kis_thread_pool.h      2006-03-23 15:04:51.000000000 -0500
     1178+++ koffice-1.5.0-rc1-new/krita/core/kis_thread_pool.h  2006-03-25 13:35:46.000000000 -0500
     1179@@ -24,6 +24,7 @@
     1180 #include <qmutex.h>
     1181 
     1182 #include "kis_thread.h"
     1183+#include <koffice_export.h>
     1184 
     1185 /**
     1186  * A thread pool starts executing threads some time after they are added,
     1187@@ -33,7 +34,7 @@
     1188  * have run. This means that you cannot add getters for important data to
     1189  * threads you feed the threadpool. Instead, post the data using a customevent.
     1190  */
     1191-class KisThreadPool : public KisThread {
     1192+class KRITACORE_EXPORT KisThreadPool : public KisThread {
     1193 
     1194 public:
     1195 
     1196--- koffice-1.5.0-rc1/krita/core/kis_transaction.h      2006-03-23 15:04:51.000000000 -0500
     1197+++ koffice-1.5.0-rc1-new/krita/core/kis_transaction.h  2006-03-25 13:35:46.000000000 -0500
     1198@@ -25,10 +25,12 @@
     1199 
     1200 #include "kis_types.h"
     1201 
     1202+#include <koffice_export.h>
     1203+
     1204 class QRect;
     1205 class KisTransactionPrivate;
     1206 
     1207-class KisTransaction : public KCommand {
     1208+class KRITACORE_EXPORT KisTransaction : public KCommand {
     1209 public:
     1210     KisTransaction(const QString& name, KisPaintDeviceSP device);
     1211     virtual ~KisTransaction();
     1212--- koffice-1.5.0-rc1/krita/core/kis_transform_worker.h 2006-03-23 15:04:51.000000000 -0500
     1213+++ koffice-1.5.0-rc1-new/krita/core/kis_transform_worker.h     2006-03-25 13:35:46.000000000 -0500
     1214@@ -22,6 +22,7 @@
     1215 
     1216 #include "kis_types.h"
     1217 #include "kis_progress_subject.h"
     1218+#include <koffice_export.h>
     1219 
     1220 class KisPaintDevice;
     1221 class KisProgressDisplayInterface;
     1222@@ -29,7 +30,7 @@
     1223 class KisVLineIteratorPixel;
     1224 class KisFilterStrategy;
     1225 
     1226-class KisTransformWorker : public KisProgressSubject {
     1227+class KRITACORE_EXPORT KisTransformWorker : public KisProgressSubject {
     1228     typedef KisProgressSubject super;
     1229 
     1230 public:
     1231--- koffice-1.5.0-rc1/krita/core/kis_vec.h      2006-03-23 15:04:51.000000000 -0500
     1232+++ koffice-1.5.0-rc1-new/krita/core/kis_vec.h  2006-03-25 13:35:46.000000000 -0500
     1233@@ -26,12 +26,14 @@
     1234 #include <qpoint.h>
     1235 #include "kis_point.h"
     1236 
     1237+#include <koffice_export.h>
     1238+
     1239 /*
     1240  * vector classes
     1241  */
     1242 const double epsilon = DBL_EPSILON;
     1243 
     1244-class KisVector2D
     1245+class KRITACORE_EXPORT KisVector2D
     1246 {
     1247 public:
     1248     KisVector2D();
     1249@@ -229,7 +231,7 @@
     1250     return KisPoint(m_x, m_y);
     1251 }
     1252 
     1253-class KisVector3D
     1254+class KRITACORE_EXPORT KisVector3D
     1255 {
     1256 public:
     1257     KisVector3D();
     1258--- koffice-1.5.0-rc1/krita/core/tiles/kis_tile.h       2006-03-23 15:04:43.000000000 -0500
     1259+++ koffice-1.5.0-rc1-new/krita/core/tiles/kis_tile.h   2006-03-25 13:35:46.000000000 -0500
     1260@@ -21,6 +21,8 @@
     1261 #include <qglobal.h>
     1262 #include <qrect.h>
     1263 
     1264+#include <koffice_export.h>
     1265+
     1266 class KisTiledDataManager;
     1267 class KisTiledIterator;
     1268 
     1269@@ -29,7 +31,7 @@
     1270  * a part of a PaintDevice, but only the individual pixels
     1271  * are accesable and that only via iterators.
     1272  */
     1273-class KisTile  {
     1274+class KRITACORE_EXPORT KisTile  {
     1275 public:
     1276     KisTile(Q_INT32 pixelSize, Q_INT32 col, Q_INT32 row, const Q_UINT8 *defPixel);
     1277     KisTile(const KisTile& rhs, Q_INT32 col, Q_INT32 row);
     1278--- koffice-1.5.0-rc1/krita/core/tiles/kis_tilemanager.h        2006-03-23 15:04:43.000000000 -0500
     1279+++ koffice-1.5.0-rc1-new/krita/core/tiles/kis_tilemanager.h    2006-03-25 13:35:46.000000000 -0500
     1280@@ -25,6 +25,8 @@
     1281 
     1282 #include <ktempfile.h>
     1283 
     1284+#include <koffice_export.h>
     1285+
     1286 class KisTile;
     1287 class KisTiledDataManager;
     1288 
     1289@@ -39,7 +41,7 @@
     1290  *  * tries to preallocate and recycle some tiles to make future allocations faster
     1291  *    (not done yet)
     1292  */
     1293-class KisTileManager  {
     1294+class KRITACORE_EXPORT KisTileManager  {
     1295 public:
     1296     ~KisTileManager();
     1297     static KisTileManager* instance();
     1298--- koffice-1.5.0-rc1/krita/kritacolor/kis_abstract_colorspace.h        2006-03-23 15:05:44.000000000 -0500
     1299+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_abstract_colorspace.h    2006-03-25 13:35:46.000000000 -0500
     1300@@ -31,6 +31,8 @@
     1301 #include "kis_composite_op.h"
     1302 #include "kis_colorspace.h"
     1303 
     1304+#include <koffice_export.h>
     1305+
     1306 class QPainter;
     1307 class KisPixelRO;
     1308 class KisColorSpaceFactoryRegistry;
     1309@@ -40,7 +42,7 @@
     1310  * A colorspace strategy is the definition of a certain color model
     1311  * in Krita.
     1312  */
     1313-class KisAbstractColorSpace : public KisColorSpace {
     1314+class KRITA_EXPORT KisAbstractColorSpace : public KisColorSpace {
     1315 
     1316 
     1317 public:
     1318--- koffice-1.5.0-rc1/krita/kritacolor/kis_basic_histogram_producers.h  2006-03-23 15:05:44.000000000 -0500
     1319+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_basic_histogram_producers.h      2006-03-26 16:12:34.000000000 -0500
     1320@@ -28,9 +28,11 @@
     1321 #include "kis_colorspace.h"
     1322 #include "kis_id.h"
     1323 
     1324+#include <koffice_export.h>
     1325+
     1326 class KisLabColorSpace;
     1327 
     1328-class KisBasicHistogramProducer : public KisHistogramProducer {
     1329+class KRITA_EXPORT KisBasicHistogramProducer : public KisHistogramProducer {
     1330 public:
     1331     KisBasicHistogramProducer(const KisID& id, int channels, int nrOfBins, KisColorSpace *colorSpace);
     1332     virtual ~KisBasicHistogramProducer() {}
     1333@@ -82,7 +84,7 @@
     1334     QValueVector<Q_INT32> m_external;
     1335 };
     1336 
     1337-class KisBasicU8HistogramProducer : public KisBasicHistogramProducer {
     1338+class KRITA_EXPORT KisBasicU8HistogramProducer : public KisBasicHistogramProducer {
     1339 public:
     1340     KisBasicU8HistogramProducer(const KisID& id, KisColorSpace *colorSpace);
     1341     virtual void addRegionToBin(Q_UINT8 * pixels, Q_UINT8 * selectionMask, Q_UINT32 nPixels, KisColorSpace *colorSpace);
     1342@@ -90,7 +92,7 @@
     1343     virtual double maximalZoom() const { return 1.0; }
     1344 };
     1345 
     1346-class KisBasicU16HistogramProducer : public KisBasicHistogramProducer {
     1347+class KRITA_EXPORT KisBasicU16HistogramProducer : public KisBasicHistogramProducer {
     1348 public:
     1349     KisBasicU16HistogramProducer(const KisID& id, KisColorSpace *colorSpace);
     1350     virtual void addRegionToBin(Q_UINT8 * pixels, Q_UINT8 * selectionMask, Q_UINT32 nPixels, KisColorSpace *colorSpace);
     1351@@ -98,7 +100,7 @@
     1352     virtual double maximalZoom() const;
     1353 };
     1354 
     1355-class KisBasicF32HistogramProducer : public KisBasicHistogramProducer {
     1356+class KRITA_EXPORT KisBasicF32HistogramProducer : public KisBasicHistogramProducer {
     1357 public:
     1358     KisBasicF32HistogramProducer(const KisID& id, KisColorSpace *colorSpace);
     1359     virtual void addRegionToBin(Q_UINT8 * pixels, Q_UINT8 * selectionMask, Q_UINT32 nPixels, KisColorSpace *colorSpace);
     1360@@ -107,7 +109,7 @@
     1361 };
     1362 
     1363 #ifdef HAVE_OPENEXR
     1364-class KisBasicF16HalfHistogramProducer : public KisBasicHistogramProducer {
     1365+class KRITA_EXPORT KisBasicF16HalfHistogramProducer : public KisBasicHistogramProducer {
     1366 public:
     1367     KisBasicF16HalfHistogramProducer(const KisID& id, KisColorSpace *colorSpace);
     1368     virtual void addRegionToBin(Q_UINT8 * pixels, Q_UINT8 * selectionMask, Q_UINT32 nPixels, KisColorSpace *colorSpace);
     1369@@ -122,7 +124,7 @@
     1370  * Factories with Producers in the code because they are incompatible types, and
     1371  * in the GUI we actually only need a producer's name, not a factory's.
     1372  */
     1373-template<class T> class KisBasicHistogramProducerFactory : public KisHistogramProducerFactory {
     1374+template<class T> class KRITA_EXPORT KisBasicHistogramProducerFactory : public KisHistogramProducerFactory {
     1375 public:
     1376     KisBasicHistogramProducerFactory(const KisID& id, KisColorSpace *colorSpace)
     1377         : KisHistogramProducerFactory(id), m_cs(colorSpace) {}
     1378@@ -140,7 +142,7 @@
     1379  * Registry, because it isCompatibleWith all colorspaces, and should only be used in extreme
     1380  * cases (like no other producer being available
     1381  **/
     1382-class KisGenericRGBHistogramProducer : public KisBasicHistogramProducer {
     1383+class KRITA_EXPORT KisGenericRGBHistogramProducer : public KisBasicHistogramProducer {
     1384 public:
     1385     KisGenericRGBHistogramProducer();
     1386     virtual void addRegionToBin(Q_UINT8 * pixels, Q_UINT8 * selectionMask, Q_UINT32 nPixels, KisColorSpace *colorSpace);
     1387@@ -152,7 +154,7 @@
     1388 };
     1389 
     1390 /** KisGenericRGBHistogramProducer his special Factory that isCompatibleWith everything. */
     1391-class KisGenericRGBHistogramProducerFactory : public KisHistogramProducerFactory {
     1392+class KRITA_EXPORT KisGenericRGBHistogramProducerFactory : public KisHistogramProducerFactory {
     1393 public:
     1394     KisGenericRGBHistogramProducerFactory()
     1395         : KisHistogramProducerFactory(KisID("GENRGBHISTO", i18n("Generic RGB Histogram"))) {}
     1396@@ -168,7 +170,7 @@
     1397  * to L*a*b*, and then does its counting.
     1398  * It isCompatibleWith all colorspaces
     1399  **/
     1400-class KisGenericLabHistogramProducer : public KisBasicHistogramProducer {
     1401+class KRITA_EXPORT KisGenericLabHistogramProducer : public KisBasicHistogramProducer {
     1402     public:
     1403         KisGenericLabHistogramProducer();
     1404         virtual ~KisGenericLabHistogramProducer();
     1405@@ -183,7 +185,7 @@
     1406 };
     1407 
     1408 /** KisGenericLabHistogramProducer his special Factory that isCompatibleWith everything. */
     1409-class KisGenericLabHistogramProducerFactory : public KisHistogramProducerFactory {
     1410+class KRITA_EXPORT KisGenericLabHistogramProducerFactory : public KisHistogramProducerFactory {
     1411     public:
     1412         KisGenericLabHistogramProducerFactory()
     1413     : KisHistogramProducerFactory(KisID("GENLABHISTO", i18n("Generic L*a*b* Histogram"))) {}
     1414--- koffice-1.5.0-rc1/krita/kritacolor/kis_color.h      2006-03-23 15:05:44.000000000 -0500
     1415+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_color.h  2006-03-25 13:35:46.000000000 -0500
     1416@@ -25,12 +25,14 @@
     1417 #include "kis_profile.h"
     1418 #include "kis_colorspace.h"
     1419 
     1420+#include <koffice_export.h>
     1421+
     1422 
     1423 /**
     1424  * A KisColor describes a color in a certain colorspace.
     1425  *
     1426  */
     1427-class KisColor {
     1428+class KRITA_EXPORT KisColor {
     1429 
     1430 public:
     1431     /// Create an empty KisColor. It will be valid, but also black and transparent
     1432--- koffice-1.5.0-rc1/krita/kritacolor/kis_color_conversions.h  2006-03-23 15:05:44.000000000 -0500
     1433+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_color_conversions.h      2006-03-25 13:35:46.000000000 -0500
     1434@@ -21,29 +21,31 @@
     1435 
     1436 #include <qglobal.h>
     1437 
     1438+#include <koffice_export.h>
     1439+
     1440 /**
     1441  * A number of often-used conversions between color models
     1442  */
     1443 
     1444 // 8-bit integer versions. RGBSL are 0-255, H is 0-360.
     1445- void rgb_to_hsv(int R, int G, int B, int *H, int *S, int *V);
     1446- void hsv_to_rgb(int H, int S, int V, int *R, int *G, int *B);
     1447+ void KRITA_EXPORT rgb_to_hsv(int R, int G, int B, int *H, int *S, int *V);
     1448+ void KRITA_EXPORT hsv_to_rgb(int H, int S, int V, int *R, int *G, int *B);
     1449 
     1450 // Floating point versions. RGBSL are 0-1, H is 0-360.
     1451- void RGBToHSV(float r, float g, float b, float *h, float *s, float *v);
     1452- void HSVToRGB(float h, float s, float v, float *r, float *g, float *b);
     1453+ void KRITA_EXPORT RGBToHSV(float r, float g, float b, float *h, float *s, float *v);
     1454+ void KRITA_EXPORT HSVToRGB(float h, float s, float v, float *r, float *g, float *b);
     1455 
     1456- void RGBToHSL(float r, float g, float b, float *h, float *s, float *l);
     1457- void HSLToRGB(float h, float sl, float l, float *r, float *g, float *b);
     1458+ void KRITA_EXPORT RGBToHSL(float r, float g, float b, float *h, float *s, float *l);
     1459+ void KRITA_EXPORT HSLToRGB(float h, float sl, float l, float *r, float *g, float *b);
     1460 
     1461- void rgb_to_hls(Q_UINT8 r, Q_UINT8 g, Q_UINT8 b, float * h, float * l, float * s);
     1462+ void KRITA_EXPORT rgb_to_hls(Q_UINT8 r, Q_UINT8 g, Q_UINT8 b, float * h, float * l, float * s);
     1463 
     1464- float hue_value(float n1, float n2, float hue);
     1465+ float KRITA_EXPORT hue_value(float n1, float n2, float hue);
     1466 
     1467- void hls_to_rgb(float h, float l, float s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b);
     1468+ void KRITA_EXPORT hls_to_rgb(float h, float l, float s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b);
     1469 
     1470- void rgb_to_hls(Q_UINT8 r, Q_UINT8 g, Q_UINT8 b, int * h, int * l, int * s);
     1471- void hls_to_rgb(int h, int l, int s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b);
     1472+ void KRITA_EXPORT rgb_to_hls(Q_UINT8 r, Q_UINT8 g, Q_UINT8 b, int * h, int * l, int * s);
     1473+ void KRITA_EXPORT hls_to_rgb(int h, int l, int s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b);
     1474 
     1475 #endif // _KIS_CONVERSIONS_H_
     1476 
     1477--- koffice-1.5.0-rc1/krita/kritacolor/kis_colorspace.h 2006-03-23 15:05:44.000000000 -0500
     1478+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_colorspace.h     2006-03-25 13:35:46.000000000 -0500
     1479@@ -27,6 +27,8 @@
     1480 #include "kis_composite_op.h"
     1481 #include "kis_channelinfo.h"
     1482 
     1483+#include <koffice_export.h>
     1484+
     1485 class DCOPObject;
     1486 
     1487 class KisProfile;
     1488@@ -54,7 +56,7 @@
     1489  * in Krita. This is the definition of the public API for
     1490  * colormodels.
     1491  */
     1492-class KisColorSpace {
     1493+class KRITA_EXPORT KisColorSpace {
     1494 
     1495 
     1496 public:
     1497@@ -401,7 +403,7 @@
     1498 
     1499 };
     1500 
     1501-class KisColorSpaceFactory {
     1502+class KRITA_EXPORT KisColorSpaceFactory {
     1503 public:
     1504     /**
     1505      * Krita definition for use in .kra files and internally: unchanging name +
     1506--- koffice-1.5.0-rc1/krita/kritacolor/kis_colorspace_factory_registry.h        2006-03-23 15:05:44.000000000 -0500
     1507+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_colorspace_factory_registry.h    2006-03-25 13:35:46.000000000 -0500
     1508@@ -22,6 +22,7 @@
     1509 #include "qobject.h"
     1510 #include "kis_generic_registry.h"
     1511 #include "kis_colorspace.h"
     1512+#include <koffice_export.h>
     1513 
     1514 class QStringList;
     1515 class KisPaintDeviceAction;
     1516@@ -32,7 +33,7 @@
     1517  *      - a registry of singleton colorspace factories.
     1518  *      - a registry of icc profiles
     1519  */
     1520-class KisColorSpaceFactoryRegistry : public QObject,  public KisGenericRegistry<KisColorSpaceFactory *> {
     1521+class KRITA_EXPORT KisColorSpaceFactoryRegistry : public QObject,  public KisGenericRegistry<KisColorSpaceFactory *> {
     1522 
     1523 
     1524     Q_OBJECT
     1525--- koffice-1.5.0-rc1/krita/kritacolor/kis_composite_op.h       2006-03-23 15:05:44.000000000 -0500
     1526+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_composite_op.h   2006-03-25 13:35:46.000000000 -0500
     1527@@ -24,6 +24,8 @@
     1528 //#include "kis_global.h"
     1529 #include "kis_id.h"
     1530 
     1531+#include <koffice_export.h>
     1532+
     1533 enum CompositeOp {
     1534     COMPOSITE_OVER,
     1535     COMPOSITE_IN,
     1536@@ -71,7 +73,7 @@
     1537     COMPOSITE_UNDEF
     1538 };
     1539 
     1540-class KisCompositeOp {
     1541+class KRITA_EXPORT KisCompositeOp {
     1542 public:
     1543     KisCompositeOp();
     1544     KisCompositeOp(const QString& id);
     1545--- koffice-1.5.0-rc1/krita/kritacolor/kis_f16half_base_colorspace.h    2006-03-23 15:05:44.000000000 -0500
     1546+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_f16half_base_colorspace.h        2006-03-25 13:35:46.000000000 -0500
     1547@@ -26,6 +26,8 @@
     1548 #include "kis_abstract_colorspace.h"
     1549 #include "kis_integer_maths.h"
     1550 
     1551+#include <koffice_export.h>
     1552+
     1553 /**
     1554  * This class is the base for all 16-bit float colorspaces using the
     1555  * OpenEXR half format. This format can be used with the OpenGL
     1556@@ -58,7 +60,7 @@
     1557 #define F16HALF_OPACITY_OPAQUE ((half)1.0f)
     1558 #define F16HALF_OPACITY_TRANSPARENT ((half)0.0f)
     1559 
     1560-class KisF16HalfBaseColorSpace : public KisAbstractColorSpace {
     1561+class KRITA_EXPORT KisF16HalfBaseColorSpace : public KisAbstractColorSpace {
     1562 
     1563 public:
     1564 
     1565--- koffice-1.5.0-rc1/krita/kritacolor/kis_f32_base_colorspace.h        2006-03-23 15:05:44.000000000 -0500
     1566+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_f32_base_colorspace.h    2006-03-25 13:35:46.000000000 -0500
     1567@@ -24,6 +24,8 @@
     1568 #include "kis_abstract_colorspace.h"
     1569 #include "kis_integer_maths.h"
     1570 
     1571+#include <koffice_export.h>
     1572+
     1573 /**
     1574  * This class is the base for all 32-bit float colorspaces.
     1575  */
     1576@@ -54,7 +56,7 @@
     1577 #define F32_OPACITY_OPAQUE 1.0f
     1578 #define F32_OPACITY_TRANSPARENT 0.0f
     1579 
     1580-class KisF32BaseColorSpace : public KisAbstractColorSpace {
     1581+class KRITA_EXPORT KisF32BaseColorSpace : public KisAbstractColorSpace {
     1582 
     1583 public:
     1584 
     1585--- koffice-1.5.0-rc1/krita/kritacolor/kis_histogram_producer.h 2006-03-23 15:05:44.000000000 -0500
     1586+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_histogram_producer.h     2006-03-25 13:35:46.000000000 -0500
     1587@@ -26,6 +26,8 @@
     1588 
     1589 #include "kis_generic_registry.h"
     1590 
     1591+#include <koffice_export.h>
     1592+
     1593 class KisRectIteratorPixel;
     1594 class QString;
     1595 class KisChannelInfo;
     1596@@ -110,7 +112,7 @@
     1597     KisID m_id;
     1598 };
     1599 
     1600-class KisHistogramProducerFactoryRegistry
     1601+class KRITA_EXPORT KisHistogramProducerFactoryRegistry
     1602     : public KisGenericRegistry<KisHistogramProducerFactory*> {
     1603 public:
     1604     virtual ~KisHistogramProducerFactoryRegistry();
     1605--- koffice-1.5.0-rc1/krita/kritacolor/kis_profile.h    2006-03-23 15:05:44.000000000 -0500
     1606+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_profile.h        2006-03-25 13:35:46.000000000 -0500
     1607@@ -33,10 +33,12 @@
     1608 
     1609 #include <kis_annotation.h>
     1610 
     1611+#include <koffice_export.h>
     1612+
     1613 //XXX: Profiles should be loaded by the color strategies
     1614 //     and be available only through the color strategy
     1615 //     that matches the profile's color model
     1616-class KisProfile {
     1617+class KRITA_EXPORT KisProfile {
     1618 
     1619 public:
     1620     KisProfile(QByteArray rawData);
     1621--- koffice-1.5.0-rc1/krita/kritacolor/kis_u16_base_colorspace.h        2006-03-23 15:05:44.000000000 -0500
     1622+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_u16_base_colorspace.h    2006-03-25 13:35:46.000000000 -0500
     1623@@ -22,12 +22,14 @@
     1624 #include "kis_abstract_colorspace.h"
     1625 #include "kis_integer_maths.h"
     1626 
     1627+#include <koffice_export.h>
     1628+
     1629 /**
     1630  * This is the base class for 16-bit/channel colorspaces with 16-bit alpha
     1631  * channels. It defines a number of common methods, like handling 16-bit alpha
     1632  * and up- and down-scaling of channels.
     1633  */
     1634-class KisU16BaseColorSpace : public KisAbstractColorSpace {
     1635+class KRITA_EXPORT KisU16BaseColorSpace : public KisAbstractColorSpace {
     1636 
     1637 public:
     1638 
     1639--- koffice-1.5.0-rc1/krita/kritacolor/kis_u8_base_colorspace.h 2006-03-23 15:05:44.000000000 -0500
     1640+++ koffice-1.5.0-rc1-new/krita/kritacolor/kis_u8_base_colorspace.h     2006-03-25 13:35:46.000000000 -0500
     1641@@ -25,10 +25,12 @@
     1642 #include "kis_global.h"
     1643 #include "kis_abstract_colorspace.h"
     1644 
     1645+#include <koffice_export.h>
     1646+
     1647 /**
     1648  * This class is the base for all homogenous 8-bit/channel colorspaces with 8-bit alpha channels
     1649  */
     1650-class KisU8BaseColorSpace : public KisAbstractColorSpace {
     1651+class KRITA_EXPORT KisU8BaseColorSpace : public KisAbstractColorSpace {
     1652 
     1653 public:
     1654 
     1655--- koffice-1.5.0-rc1/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h   2006-03-23 15:04:34.000000000 -0500
     1656+++ koffice-1.5.0-rc1-new/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h       2006-03-25 13:35:46.000000000 -0500
     1657@@ -21,6 +21,8 @@
     1658 
     1659 #include <qobject.h>
     1660 
     1661+#include <koffice_export.h>
     1662+
     1663 namespace Kross {
     1664     namespace Api {
     1665         class ScriptGUIClient;
     1666@@ -31,7 +33,7 @@
     1667 /**
     1668        @author Cyrille Berger <cberger@cberger.net>
     1669 */
     1670-class KisScriptMonitor : public QObject {
     1671+class KRITA_EXPORT KisScriptMonitor : public QObject {
     1672     Q_OBJECT
     1673     private:
     1674         KisScriptMonitor();
     1675--- koffice-1.5.0-rc1/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h  2006-03-23 15:04:34.000000000 -0500
     1676+++ koffice-1.5.0-rc1-new/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h      2006-03-25 13:35:46.000000000 -0500
     1677@@ -21,13 +21,15 @@
     1678 
     1679 #include <kis_progress_subject.h>
     1680 
     1681+#include <koffice_export.h>
     1682+
     1683 class KisView;
     1684 
     1685 /**
     1686  * TODO: clarify the situation, while, in the future, multiple scripts could be running at a same time,
     1687  * some of the functions are global to all script and some aren't.
     1688  */
     1689-class KisScriptProgress : public KisProgressSubject
     1690+class KRITA_EXPORT KisScriptProgress : public KisProgressSubject
     1691 {
     1692     public:
     1693         KisScriptProgress(KisView* view) : m_view(view) {};
     1694--- koffice-1.5.0-rc1/krita/ui/imageviewer.h    2006-03-23 15:06:09.000000000 -0500
     1695+++ koffice-1.5.0-rc1-new/krita/ui/imageviewer.h        2006-03-25 13:35:46.000000000 -0500
     1696@@ -22,6 +22,8 @@
     1697 #include <qscrollview.h>
     1698 #include <qimage.h>
     1699 
     1700+#include <koffice_export.h>
     1701+
     1702 class QLabel;
     1703 
     1704 /**
     1705@@ -30,7 +32,7 @@
     1706  * XXX: We should add a signal that emits newly eposed rects so the filters
     1707  *      don't have to filter everything, but just the the new bits.
     1708  */
     1709-class ImageViewer : public QScrollView {
     1710+class KRITAUI_EXPORT ImageViewer : public QScrollView {
     1711     Q_OBJECT
     1712 
     1713 public:
     1714--- koffice-1.5.0-rc1/krita/ui/kis_canvas.h     2006-03-23 15:06:09.000000000 -0500
     1715+++ koffice-1.5.0-rc1-new/krita/ui/kis_canvas.h 2006-03-25 13:35:46.000000000 -0500
     1716@@ -35,6 +35,8 @@
     1717 #include "kis_vec.h"
     1718 #include "kis_input_device.h"
     1719 
     1720+#include <koffice_export.h>
     1721+
     1722 #ifdef Q_WS_X11
     1723 
     1724 // Irix has a different (and better) XInput tablet driver to
     1725@@ -276,7 +278,7 @@
     1726 #endif // Q_WS_X11
     1727 };
     1728 
     1729-class KisCanvas : public QObject {
     1730+class KRITAUI_EXPORT KisCanvas : public QObject {
     1731     Q_OBJECT
     1732 
     1733 public:
     1734--- koffice-1.5.0-rc1/krita/ui/kis_canvas_painter.h     2006-03-23 15:06:09.000000000 -0500
     1735+++ koffice-1.5.0-rc1-new/krita/ui/kis_canvas_painter.h 2006-03-25 13:35:46.000000000 -0500
     1736@@ -27,6 +27,8 @@
     1737 
     1738 #include "kis_global.h"
     1739 
     1740+#include <koffice_export.h>
     1741+
     1742 class KisCanvasWidget;
     1743 
     1744 class KisCanvasWidgetPainter {
     1745@@ -187,7 +189,7 @@
     1746     QWMatrix m_defaultWorldMatrix;
     1747 };
     1748 
     1749-class KisCanvasPainter {
     1750+class KRITAUI_EXPORT KisCanvasPainter {
     1751 public:
     1752     KisCanvasPainter();
     1753     KisCanvasPainter(KisCanvas *canvas);
     1754--- koffice-1.5.0-rc1/krita/ui/kis_cmb_idlist.h 2006-03-23 15:06:09.000000000 -0500
     1755+++ koffice-1.5.0-rc1-new/krita/ui/kis_cmb_idlist.h     2006-03-25 13:35:46.000000000 -0500
     1756@@ -25,12 +25,14 @@
     1757 
     1758 #include "kis_id.h"
     1759 
     1760+#include <koffice_export.h>
     1761+
     1762 /**
     1763  * A combobox that is associated with a list of KisID's. The
     1764  * descriptive (i18n'ed) text is displayed, but the various
     1765  * signals return a KisID.
     1766  */
     1767-class KisCmbIDList : public QComboBox
     1768+class KRITAUI_EXPORT KisCmbIDList : public QComboBox
     1769 {
     1770     typedef QComboBox super;
     1771 
     1772--- koffice-1.5.0-rc1/krita/ui/kis_filters_listview.h   2006-03-23 15:06:09.000000000 -0500
     1773+++ koffice-1.5.0-rc1-new/krita/ui/kis_filters_listview.h       2006-03-25 13:35:46.000000000 -0500
     1774@@ -31,6 +31,8 @@
     1775 #include "kis_paint_device.h"
     1776 #include "kis_thread.h"
     1777 
     1778+#include <koffice_export.h>
     1779+
     1780 class KisView;
     1781 class KisFilter;
     1782 class KisFilterConfiguration;
     1783@@ -103,7 +105,7 @@
     1784     KisFiltersThumbnailThread * m_thread;
     1785 };
     1786 
     1787-class KisFiltersListView : public KIconView {
     1788+class KRITAUI_EXPORT KisFiltersListView : public KIconView {
     1789 
     1790 public:
     1791     
     1792--- koffice-1.5.0-rc1/krita/ui/kis_histogram_view.h     2006-03-23 15:06:09.000000000 -0500
     1793+++ koffice-1.5.0-rc1-new/krita/ui/kis_histogram_view.h 2006-03-25 13:35:46.000000000 -0500
     1794@@ -28,6 +28,8 @@
     1795 #include "kis_histogram_producer.h"
     1796 #include "kis_histogram.h"
     1797 
     1798+#include <koffice_export.h>
     1799+
     1800 class KisChannelInfo;
     1801 
     1802 /**
     1803@@ -45,7 +47,7 @@
     1804  * some functionality will disappear, like listProducers(). Setting a histogram will discard
     1805  * info on the layer, and setting a layer will discard info on the histogram.
     1806  **/
     1807-class KisHistogramView : public QLabel {
     1808+class KRITAUI_EXPORT KisHistogramView : public QLabel {
     1809     Q_OBJECT
     1810 public:
     1811     KisHistogramView(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
     1812--- koffice-1.5.0-rc1/krita/ui/kis_input_device.h       2006-03-23 15:06:09.000000000 -0500
     1813+++ koffice-1.5.0-rc1-new/krita/ui/kis_input_device.h   2006-03-25 13:35:46.000000000 -0500
     1814@@ -20,8 +20,9 @@
     1815 #define KIS_INPUT_DEVICE_H_
     1816 
     1817 #include <qvaluevector.h>
     1818+#include <koffice_export.h>
     1819 
     1820-class KisInputDevice {
     1821+class KRITAUI_EXPORT KisInputDevice {
     1822 public:
     1823     KisInputDevice();
     1824 
     1825--- koffice-1.5.0-rc1/krita/ui/kis_int_spinbox.h        2006-03-23 15:06:09.000000000 -0500
     1826+++ koffice-1.5.0-rc1-new/krita/ui/kis_int_spinbox.h    2006-03-26 09:48:29.000000000 -0500
     1827@@ -27,12 +27,14 @@
     1828 
     1829 #include <knumvalidator.h>
     1830 
     1831+#include <koffice_export.h>
     1832+
     1833 class QLabel;
     1834 class QLineEdit;
     1835 class QLayout;
     1836 class QValidator;
     1837 
     1838-class KisPopupSlider : public QPopupMenu {
     1839+class KRITAUI_EXPORT KisPopupSlider : public QPopupMenu {
     1840     Q_OBJECT
     1841 
     1842 public:
     1843@@ -70,7 +72,7 @@
     1844  *
     1845  *
     1846  */
     1847-class KisIntSpinbox : public QWidget
     1848+class KRITAUI_EXPORT KisIntSpinbox : public QWidget
     1849 {
     1850 
     1851     Q_OBJECT
     1852--- koffice-1.5.0-rc1/krita/ui/kis_matrix_widget.ui     2006-03-23 15:06:09.000000000 -0500
     1853+++ koffice-1.5.0-rc1-new/krita/ui/kis_matrix_widget.ui 2006-03-25 13:35:46.000000000 -0500
     1854@@ -4,6 +4,7 @@
     1855     <property name="name">
     1856         <cstring>KisMatrixWidget</cstring>
     1857     </property>
     1858+    <exportmacro>KRITAUI_EXPORT</exportmacro>
     1859     <property name="geometry">
     1860         <rect>
     1861             <x>0</x>
     1862@@ -199,6 +200,7 @@
     1863 </tabstops>
     1864 <includes>
     1865     <include location="local" impldecl="in implementation">kis_matrix_widget.ui.h</include>
     1866+    <include location="local" impldecl="in declaration">koffice_export.h</include>
     1867 </includes>
     1868 <signals>
     1869     <signal>valueChanged()</signal>
     1870--- koffice-1.5.0-rc1/krita/ui/kis_previewwidget.h      2006-03-23 15:06:09.000000000 -0500
     1871+++ koffice-1.5.0-rc1-new/krita/ui/kis_previewwidget.h  2006-03-25 13:35:46.000000000 -0500
     1872@@ -29,6 +29,8 @@
     1873 
     1874 #include "kis_previewwidgetbase.h"
     1875 
     1876+#include <koffice_export.h>
     1877+
     1878 class QWidget;
     1879 class KisProfile;
     1880 /**
     1881@@ -39,7 +41,7 @@
     1882  * (maybe not those that create a new image) would use this. This can prevent the distracting
     1883  * effect the GIMP has with a different preview for almost every filter.
     1884  */
     1885-class KisPreviewWidget : public PreviewWidgetBase
     1886+class KRITAUI_EXPORT KisPreviewWidget : public PreviewWidgetBase
     1887 {
     1888     Q_OBJECT
     1889 
     1890--- koffice-1.5.0-rc1/krita/ui/kis_resourceserver.h     2006-03-23 15:06:09.000000000 -0500
     1891+++ koffice-1.5.0-rc1-new/krita/ui/kis_resourceserver.h 2006-03-25 13:35:46.000000000 -0500
     1892@@ -27,9 +27,11 @@
     1893 
     1894 #include "kis_generic_registry.h"
     1895 
     1896+#include <koffice_export.h>
     1897+
     1898 class KisResource;
     1899 
     1900-class KisResourceServerBase : public QObject {
     1901+class KRITAUI_EXPORT KisResourceServerBase : public QObject {
     1902     Q_OBJECT
     1903 public:
     1904     KisResourceServerBase(QString type);
     1905@@ -56,7 +58,7 @@
     1906 };
     1907 
     1908 
     1909-template <class T> class KisResourceServer : public KisResourceServerBase {
     1910+template <class T> class KRITAUI_EXPORT KisResourceServer : public KisResourceServerBase {
     1911     typedef KisResourceServerBase super;
     1912 
     1913 public:
     1914@@ -70,7 +72,7 @@
     1915 
     1916 
     1917 
     1918-class KisResourceServerRegistry : public KisGenericRegistry<KisResourceServerBase*>
     1919+class KRITAUI_EXPORT KisResourceServerRegistry : public KisGenericRegistry<KisResourceServerBase*>
     1920 {
     1921 
     1922 public:
     1923--- koffice-1.5.0-rc1/krita/ui/kis_tool.h       2006-03-23 15:06:09.000000000 -0500
     1924+++ koffice-1.5.0-rc1-new/krita/ui/kis_tool.h   2006-03-25 13:35:46.000000000 -0500
     1925@@ -29,6 +29,8 @@
     1926 #include "kis_shared_ptr_vector.h"
     1927 #include "kis_canvas_observer.h"
     1928 
     1929+#include <koffice_export.h>
     1930+
     1931 class QCursor;
     1932 class QEvent;
     1933 class QKeyEvent;
     1934@@ -58,7 +60,7 @@
     1935 
     1936 const Q_UINT8 NUMBER_OF_TOOLTYPES = 6;
     1937 
     1938-class KisTool : public QObject, public KisCanvasObserver, public KShared {
     1939+class KRITAUI_EXPORT KisTool : public QObject, public KisCanvasObserver, public KShared {
     1940     Q_OBJECT
     1941 
     1942 public:
     1943--- koffice-1.5.0-rc1/krita/ui/squeezedcombobox.h       2006-03-23 15:06:09.000000000 -0500
     1944+++ koffice-1.5.0-rc1-new/krita/ui/squeezedcombobox.h   2006-03-26 15:53:59.000000000 -0500
     1945@@ -30,6 +30,8 @@
     1946 #include <qcombobox.h>
     1947 #include <qtooltip.h>
     1948 
     1949+#include <koffice_export.h>
     1950+
     1951 class SqueezedComboBox;
     1952 
     1953 /** @class SqueezedComboBoxTip
     1954@@ -79,7 +81,7 @@
     1955  * @image html squeezedcombobox.png "This is how it looks"
     1956  * @author Tom Albers
     1957  */
     1958-class SqueezedComboBox : public QComboBox
     1959+class KRITAUI_EXPORT SqueezedComboBox : public QComboBox
     1960 {
     1961     Q_OBJECT
     1962 
     1963--- koffice-1.5.0-rc1/kspread/kspread_factory.h 2006-03-23 15:09:02.000000000 -0500
     1964+++ koffice-1.5.0-rc1-new/kspread/kspread_factory.h     2006-03-25 13:35:46.000000000 -0500
     1965@@ -28,7 +28,7 @@
     1966 namespace KSpread
     1967 {
     1968 
     1969-class Factory : public KoFactory
     1970+class KSPREAD_EXPORT Factory : public KoFactory
     1971 {
     1972     Q_OBJECT
     1973 public:
     1974--- koffice-1.5.0-rc1/kspread/kspread_util.h    2006-03-23 15:09:02.000000000 -0500
     1975+++ koffice-1.5.0-rc1-new/kspread/kspread_util.h        2006-03-25 13:35:46.000000000 -0500
     1976@@ -318,11 +318,11 @@
     1977 QPen        util_toPen( QDomElement & element );
     1978 int         util_penCompare( QPen const & pen1, QPen const & pen2 );
     1979 
     1980-QString convertRefToRange( const QString & sheet, const QRect & rect );
     1981-QString convertRefToBase( const QString & sheet, const QRect & rect );
     1982-QString convertRangeToRef( const QString & sheetName, const QRect & _area );
     1983+KSPREAD_EXPORT QString convertRefToRange( const QString & sheet, const QRect & rect );
     1984+KSPREAD_EXPORT QString convertRefToBase( const QString & sheet, const QRect & rect );
     1985+KSPREAD_EXPORT QString convertRangeToRef( const QString & sheetName, const QRect & _area );
     1986 
     1987-void insertBracket( QString & s );
     1988+KSPREAD_EXPORT void insertBracket( QString & s );
     1989 QString convertOasisPenToString( const QPen & pen );
     1990 QPen convertOasisStringToPen( const QString &str );
     1991 
     1992--- koffice-1.5.0-rc1/kspread/selection.h       2006-03-23 15:09:02.000000000 -0500
     1993+++ koffice-1.5.0-rc1-new/kspread/selection.h   2006-03-25 13:35:46.000000000 -0500
     1994@@ -31,7 +31,7 @@
     1995 {
     1996 class View;
     1997 
     1998-class Selection : public QObject, public Region
     1999+class KSPREAD_EXPORT Selection : public QObject, public Region
     2000 {
     2001   Q_OBJECT
     2002 public:
     2003--- koffice-1.5.0-rc1/kword/KWFactory.h 2006-03-23 14:59:46.000000000 -0500
     2004+++ koffice-1.5.0-rc1-new/kword/KWFactory.h     2006-03-25 13:35:46.000000000 -0500
     2005@@ -21,10 +21,11 @@
     2006 #define KWORD_FACTORY_H
     2007 
     2008 #include <KoFactory.h>
     2009+#include <koffice_export.h>
     2010 
     2011 class KAboutData;
     2012 
     2013-class KWFactory : public KoFactory
     2014+class KWORD_EXPORT KWFactory : public KoFactory
     2015 {
     2016     Q_OBJECT
     2017 public:
     2018--- koffice-1.5.0-rc1/lib/configure.in.in       2006-03-23 15:02:52.000000000 -0500
     2019+++ koffice-1.5.0-rc1-new/lib/configure.in.in   2006-03-25 13:35:46.000000000 -0500
     2020@@ -8,7 +8,7 @@
     2021 AC_SUBST(KFORMULA_INCLUDES, '-I$(top_srcdir)/lib/kformula -I$(top_builddir)/lib/kformula')
     2022 dnl those are included with e.g. <koproperty/set.h>
     2023 AC_SUBST(KOPROPERTY_INCLUDES, '-I$(top_srcdir)/lib -I$(top_builddir)/lib')
     2024-AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross')
     2025+AC_SUBST(KROSS_INCLUDES, '-I$(top_srcdir)/lib/kross -I$(top_builddir)/lib/kross $(KOFFICECORE_INCLUDES)')
     2026 AC_SUBST(LIB_KOFFICEUI, '$(top_builddir)/lib/kofficeui/libkofficeui.la')
     2027 AC_SUBST(LIB_KOFFICECORE, '$(top_builddir)/lib/kofficecore/libkofficecore.la')
     2028 AC_SUBST(LIB_KSTORE, '$(top_builddir)/lib/store/libkstore.la')
     2029--- koffice-1.5.0-rc1/lib/kofficecore/KoTemplates.h     2006-03-23 15:02:03.000000000 -0500
     2030+++ koffice-1.5.0-rc1-new/lib/kofficecore/KoTemplates.h 2006-03-25 13:35:46.000000000 -0500
     2031@@ -105,7 +105,7 @@
     2032 };
     2033 
     2034 
     2035-class KoTemplateTree {
     2036+class KOFFICECORE_EXPORT KoTemplateTree {
     2037 
     2038 public:
     2039     KoTemplateTree(const QCString &templateType, KInstance *instance,
     2040@@ -144,7 +144,7 @@
     2041 
     2042 
     2043 namespace KoTemplates {
     2044-QString stripWhiteSpace(const QString &string);
     2045+KOFFICECORE_EXPORT QString stripWhiteSpace(const QString &string);
     2046 }
     2047 
     2048 #endif
     2049--- koffice-1.5.0-rc1/lib/kofficecore/koffice_export.h  2006-03-23 15:02:03.000000000 -0500
     2050+++ koffice-1.5.0-rc1-new/lib/kofficecore/koffice_export.h      2006-03-25 13:35:46.000000000 -0500
     2051@@ -134,6 +134,7 @@
     2052 # endif
     2053 #endif
     2054 
     2055+#define KROSS_EXPORT KDE_EXPORT
     2056 #define KPRESENTER_EXPORT KDE_EXPORT
     2057 #define KCHART_EXPORT KDE_EXPORT
     2058 #define KDCHART_EXPORT KDE_EXPORT
     2059@@ -168,6 +169,7 @@
     2060 /* kdemacros is OK, we can use gcc visibility macros */
     2061 #define KOFFICECORE_EXPORT KOFFICE_EXPORT
     2062 #define KOFFICEUI_EXPORT KOFFICE_EXPORT
     2063+#define KROSS_EXPORT KOFFICE_EXPORT
     2064 #define KOPALETTE_EXPORT KOFFICE_EXPORT
     2065 #define KOTEXT_EXPORT KOFFICE_EXPORT
     2066 #define KOFORMULA_EXPORT KOFFICE_EXPORT
     2067--- koffice-1.5.0-rc1/lib/kofficeui/KoBrush.h   2006-03-23 15:02:32.000000000 -0500
     2068+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoBrush.h       2006-03-25 13:35:46.000000000 -0500
     2069@@ -22,6 +22,7 @@
     2070 #define KOBRUSH_H
     2071 
     2072 #include <qbrush.h>
     2073+#include <koffice_export.h>
     2074 
     2075 class KoGenStyle;
     2076 class KoGenStyles;
     2077@@ -47,7 +48,7 @@
     2078     FT_GRADIENT = 1
     2079 };
     2080 
     2081-class KoBrush
     2082+class KOFFICEUI_EXPORT KoBrush
     2083 {
     2084 public:
     2085     KoBrush();
     2086--- koffice-1.5.0-rc1/lib/kofficeui/KoGeneralPropertyUi.ui      2006-03-23 15:02:32.000000000 -0500
     2087+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoGeneralPropertyUi.ui  2006-03-25 13:35:46.000000000 -0500
     2088@@ -4,6 +4,7 @@
     2089     <property name="name">
     2090         <cstring>KoGeneralPropertyUI</cstring>
     2091     </property>
     2092+    <exportmacro>KOFFICEUI_EXPORT</exportmacro>
     2093     <property name="geometry">
     2094         <rect>
     2095             <x>0</x>
     2096@@ -190,4 +191,7 @@
     2097     </image>
     2098 </images>
     2099 <layoutdefaults spacing="6" margin="11"/>
     2100+<includes>
     2101+    <include location="global" impldecl="in declaration">koffice_export.h</include>
     2102+</includes>
     2103 </UI>
     2104--- koffice-1.5.0-rc1/lib/kofficeui/KoGuideLineDia.h    2006-03-23 15:02:32.000000000 -0500
     2105+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoGuideLineDia.h        2006-03-25 13:35:46.000000000 -0500
     2106@@ -27,6 +27,7 @@
     2107 #include "KoRect.h"
     2108 #include "KoPoint.h"
     2109 
     2110+#include <koffice_export.h>
     2111 
     2112 class KoUnitDoubleSpinBox;
     2113 class QRadioButton;
     2114@@ -34,7 +35,7 @@
     2115 /**
     2116  * @brief Class for setting a guide line position.
     2117  */
     2118-class KoGuideLineDia : public KDialogBase
     2119+class KOFFICEUI_EXPORT KoGuideLineDia : public KDialogBase
     2120 {
     2121     Q_OBJECT
     2122 public:
     2123--- koffice-1.5.0-rc1/lib/kofficeui/KoPageLayoutColumns.h       2006-03-23 15:02:32.000000000 -0500
     2124+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoPageLayoutColumns.h   2006-03-25 13:35:46.000000000 -0500
     2125@@ -25,6 +25,7 @@
     2126 #include <KoUnit.h>
     2127 #include <KoPageLayout.h>
     2128 #include <KoPageLayoutColumnsBase.h>
     2129+#include <koffice_export.h>
     2130 
     2131 class QWidget;
     2132 class KoUnitDoubleSpinBox;
     2133@@ -33,7 +34,7 @@
     2134 /**
     2135  * This class is a widget that shows the KoColumns data structure and allows the user to change it.
     2136  */
     2137-class KoPageLayoutColumns : public KoPageLayoutColumnsBase {
     2138+class KOFFICEUI_EXPORT KoPageLayoutColumns : public KoPageLayoutColumnsBase {
     2139     Q_OBJECT
     2140 
     2141 public:
     2142--- koffice-1.5.0-rc1/lib/kofficeui/KoPageLayoutSize.h  2006-03-23 15:02:32.000000000 -0500
     2143+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoPageLayoutSize.h      2006-03-25 13:35:46.000000000 -0500
     2144@@ -26,6 +26,7 @@
     2145 #include <kdialogbase.h>
     2146 #include <KoPageLayout.h>
     2147 #include <KoPageLayoutDia.h>
     2148+#include <koffice_export.h>
     2149 
     2150 class QComboBox;
     2151 class KoUnitDoubleSpinBox;
     2152@@ -34,7 +35,7 @@
     2153 /**
     2154  * This class is a widget that shows the KoPageLayout data structure and allows the user to change it.
     2155  */
     2156-class KoPageLayoutSize : public QWidget {
     2157+class KOFFICEUI_EXPORT KoPageLayoutSize : public QWidget {
     2158     Q_OBJECT
     2159 
     2160 public:
     2161--- koffice-1.5.0-rc1/lib/kofficeui/KoPen.h     2006-03-23 15:02:32.000000000 -0500
     2162+++ koffice-1.5.0-rc1-new/lib/kofficeui/KoPen.h 2006-03-25 13:35:46.000000000 -0500
     2163@@ -21,13 +21,14 @@
     2164 #define KOPEN_H
     2165 
     2166 #include <qpen.h>
     2167+#include <koffice_export.h>
     2168 
     2169 class KoZoomHandler;
     2170 
     2171 /**
     2172  * Pen that handles line widths in points
     2173  */
     2174-class KoPen : public QPen
     2175+class KOFFICEUI_EXPORT KoPen : public QPen
     2176 {
     2177   public:
     2178     KoPen();
     2179--- koffice-1.5.0-rc1/lib/kopainter/ko_gray_widget.h    2006-03-23 15:02:19.000000000 -0500
     2180+++ koffice-1.5.0-rc1-new/lib/kopainter/ko_gray_widget.h        2006-03-25 13:35:46.000000000 -0500
     2181@@ -32,7 +32,7 @@
     2182 class QSpinBox;
     2183 class KDualColorButton;
     2184 
     2185-class KoGrayWidget
     2186+class KOPAINTER_EXPORT KoGrayWidget
     2187      : public QWidget
     2188 {
     2189     Q_OBJECT
     2190--- koffice-1.5.0-rc1/lib/kopainter/ko_hsv_widget.h     2006-03-23 15:02:19.000000000 -0500
     2191+++ koffice-1.5.0-rc1-new/lib/kopainter/ko_hsv_widget.h 2006-03-25 13:35:46.000000000 -0500
     2192@@ -35,7 +35,7 @@
     2193 class QLabel;
     2194 class QSpinBox;
     2195 
     2196-class KoHSVWidget
     2197+class KOPAINTER_EXPORT KoHSVWidget
     2198      : public QWidget
     2199 {
     2200     Q_OBJECT
     2201--- koffice-1.5.0-rc1/lib/kopainter/ko_rgb_widget.h     2006-03-23 15:02:19.000000000 -0500
     2202+++ koffice-1.5.0-rc1-new/lib/kopainter/ko_rgb_widget.h 2006-03-25 13:35:46.000000000 -0500
     2203@@ -34,7 +34,7 @@
     2204 class KoColorSlider;
     2205 class QColor;
     2206 
     2207-class KoRGBWidget
     2208+class KOPAINTER_EXPORT KoRGBWidget
     2209      : public QWidget
     2210 {
     2211     Q_OBJECT
     2212--- koffice-1.5.0-rc1/lib/kotext/KoParagDia_p.h 2006-03-23 15:02:50.000000000 -0500
     2213+++ koffice-1.5.0-rc1-new/lib/kotext/KoParagDia_p.h     2006-03-25 13:35:46.000000000 -0500
     2214@@ -26,6 +26,8 @@
     2215 #include <qgroupbox.h>
     2216 #include <KoParagCounter.h>
     2217 #include <qspinbox.h>
     2218+#include <koffice_export.h>
     2219+
     2220 class QWidget;
     2221 class QPainter;
     2222 
     2223@@ -110,7 +112,7 @@
     2224 /* class KoBorderPreview                                          */
     2225 /******************************************************************/
     2226 
     2227-class KoBorderPreview : public QFrame/*QGroupBox*/
     2228+class KOTEXT_EXPORT KoBorderPreview : public QFrame/*QGroupBox*/
     2229 {
     2230     Q_OBJECT
     2231 
     2232--- koffice-1.5.0-rc1/lib/kross/api/argument.h  2006-03-23 15:02:26.000000000 -0500
     2233+++ koffice-1.5.0-rc1-new/lib/kross/api/argument.h      2006-03-25 13:35:46.000000000 -0500
     2234@@ -25,6 +25,8 @@
     2235 
     2236 #include "object.h"
     2237 
     2238+#include <koffice_export.h>
     2239+
     2240 namespace Kross { namespace Api {
     2241 
     2242     // Forward declaration.
     2243@@ -35,7 +37,7 @@
     2244      * the function supports. The Argument-class represents
     2245      * such a single argument in a \a ArgumentList collection.
     2246      */
     2247-    class Argument
     2248+    class KROSS_EXPORT Argument
     2249     {
     2250         public:
     2251 
     2252@@ -100,7 +102,7 @@
     2253      * An ArgumentList is a collection of \a Argument
     2254      * objects used in a \a Class::Function.
     2255      */
     2256-    class ArgumentList
     2257+    class KROSS_EXPORT ArgumentList
     2258     {
     2259         public:
     2260 
     2261--- koffice-1.5.0-rc1/lib/kross/api/callable.h  2006-03-23 15:02:26.000000000 -0500
     2262+++ koffice-1.5.0-rc1-new/lib/kross/api/callable.h      2006-03-25 13:35:46.000000000 -0500
     2263@@ -38,7 +38,7 @@
     2264      * and implement the \a Object::call() method to handle
     2265      * the call.
     2266      */
     2267-    class Callable : public Object
     2268+    class KDE_EXPORT Callable : public Object
     2269     {
     2270         public:
     2271 
     2272--- koffice-1.5.0-rc1/lib/kross/api/dict.h      2006-03-23 15:02:26.000000000 -0500
     2273+++ koffice-1.5.0-rc1-new/lib/kross/api/dict.h  2006-03-25 13:35:46.000000000 -0500
     2274@@ -32,7 +32,7 @@
     2275      * The Dict class implementates \a Value to handle
     2276      * key=value base dictonaries/maps.
     2277      */
     2278-    class Dict : public Value< List, QMap<QString, Object::Ptr> >
     2279+    class KDE_EXPORT Dict : public Value< List, QMap<QString, Object::Ptr> >
     2280     {
     2281             friend class Value< List, QMap<QString, Object::Ptr> >;
     2282         public:
     2283--- koffice-1.5.0-rc1/lib/kross/api/eventaction.h       2006-03-23 15:02:26.000000000 -0500
     2284+++ koffice-1.5.0-rc1-new/lib/kross/api/eventaction.h   2006-03-25 13:35:46.000000000 -0500
     2285@@ -37,7 +37,7 @@
     2286      * into the Kross object hierachy and provide access to
     2287      * them.
     2288      */
     2289-    class EventAction : public Event<EventAction>
     2290+    class KDE_EXPORT EventAction : public Event<EventAction>
     2291     {
     2292 
     2293         public:
     2294--- koffice-1.5.0-rc1/lib/kross/api/eventsignal.h       2006-03-23 15:02:26.000000000 -0500
     2295+++ koffice-1.5.0-rc1-new/lib/kross/api/eventsignal.h   2006-03-25 13:35:46.000000000 -0500
     2296@@ -39,7 +39,7 @@
     2297      * instance and a functionname is represented with
     2298      * a EventSignal and handled by \a EventManager.
     2299      */
     2300-    class EventSignal : public Event<EventSignal>
     2301+    class KDE_EXPORT EventSignal : public Event<EventSignal>
     2302     {
     2303         public:
     2304 
     2305--- koffice-1.5.0-rc1/lib/kross/api/eventslot.h 2006-03-23 15:02:26.000000000 -0500
     2306+++ koffice-1.5.0-rc1-new/lib/kross/api/eventslot.h     2006-03-25 13:35:46.000000000 -0500
     2307@@ -33,7 +33,7 @@
     2308      * instance and a functionname is represented with
     2309      * a EventSlot and handled by the \a EventManager.
     2310      */
     2311-    class EventSlot : public Event<EventSlot>
     2312+    class KDE_EXPORT EventSlot : public Event<EventSlot>
     2313     {
     2314         public:
     2315 
     2316--- koffice-1.5.0-rc1/lib/kross/api/exception.h 2006-03-23 15:02:26.000000000 -0500
     2317+++ koffice-1.5.0-rc1-new/lib/kross/api/exception.h     2006-03-25 13:35:46.000000000 -0500
     2318@@ -35,7 +35,7 @@
     2319      * exceptions. Those exceptions are inherited from \a Object
     2320      * and therefore they are first class citizens in Kross.
     2321      */
     2322-    class Exception : public Object
     2323+    class KDE_EXPORT Exception : public Object
     2324     {
     2325         private:
     2326 
     2327--- koffice-1.5.0-rc1/lib/kross/api/interpreter.h       2006-03-23 15:02:26.000000000 -0500
     2328+++ koffice-1.5.0-rc1-new/lib/kross/api/interpreter.h   2006-03-25 13:35:46.000000000 -0500
     2329@@ -39,7 +39,7 @@
     2330      * is used to provide some abstract informations about each interpreter
     2331      * we are able to use within the \a Manager singelton.
     2332      */
     2333-    class InterpreterInfo
     2334+    class KDE_EXPORT InterpreterInfo
     2335     {
     2336         public:
     2337 
     2338@@ -160,7 +160,7 @@
     2339      * The Interpreter will be managed by the \a Kross::Manager
     2340      * class.
     2341      */
     2342-    class Interpreter
     2343+    class KDE_EXPORT Interpreter
     2344     {
     2345         public:
     2346 
     2347--- koffice-1.5.0-rc1/lib/kross/api/list.h      2006-03-23 15:02:26.000000000 -0500
     2348+++ koffice-1.5.0-rc1-new/lib/kross/api/list.h  2006-03-25 13:35:46.000000000 -0500
     2349@@ -33,7 +33,7 @@
     2350      * The List class implementates \a Value to handle
     2351      * lists and collections.
     2352      */
     2353-    class List : public Value< List, QValueList<Object::Ptr> >
     2354+    class KDE_EXPORT List : public Value< List, QValueList<Object::Ptr> >
     2355     {
     2356             friend class Value< List, QValueList<Object::Ptr> >;
     2357         public:
     2358--- koffice-1.5.0-rc1/lib/kross/api/object.h    2006-03-23 15:02:26.000000000 -0500
     2359+++ koffice-1.5.0-rc1-new/lib/kross/api/object.h        2006-03-25 13:35:46.000000000 -0500
     2360@@ -53,7 +53,7 @@
     2361      * This class implementates reference counting for shared
     2362      * objects. So, no need to take care of freeing objects.
     2363      */
     2364-    class Object : public KShared
     2365+    class KDE_EXPORT Object : public KShared
     2366     {
     2367         public:
     2368 
     2369--- koffice-1.5.0-rc1/lib/kross/api/qtobject.h  2006-03-23 15:02:26.000000000 -0500
     2370+++ koffice-1.5.0-rc1-new/lib/kross/api/qtobject.h      2006-03-25 13:35:46.000000000 -0500
     2371@@ -42,7 +42,7 @@
     2372      * This class publishs all SIGNAL's, SLOT's and Q_PROPERTY's
     2373      * the QObject has.
     2374      */
     2375-    class QtObject : public Kross::Api::Class<QtObject>
     2376+    class KDE_EXPORT QtObject : public Kross::Api::Class<QtObject>
     2377     {
     2378         public:
     2379 
     2380--- koffice-1.5.0-rc1/lib/kross/api/script.h    2006-03-23 15:02:26.000000000 -0500
     2381+++ koffice-1.5.0-rc1-new/lib/kross/api/script.h        2006-03-25 13:35:46.000000000 -0500
     2382@@ -42,7 +42,7 @@
     2383      * that implements the \a Script functionality for the
     2384      * defined \a Interpreter .
     2385      */
     2386-    class Script
     2387+    class KDE_EXPORT Script
     2388     {
     2389         public:
     2390 
     2391--- koffice-1.5.0-rc1/lib/kross/api/variant.h   2006-03-23 15:02:26.000000000 -0500
     2392+++ koffice-1.5.0-rc1-new/lib/kross/api/variant.h       2006-03-25 13:35:46.000000000 -0500
     2393@@ -34,7 +34,7 @@
     2394      * Variant value to wrap a QVariant into a \a Kross::Api::Value
     2395      * to enable primitive types like strings or numerics.
     2396      */
     2397-    class Variant : public Value<Variant, QVariant>
     2398+    class KDE_EXPORT Variant : public Value<Variant, QVariant>
     2399     {
     2400             friend class Value<Variant, QVariant>;
     2401         public:
     2402--- koffice-1.5.0-rc1/lib/kross/main/mainmodule.h       2006-03-23 15:02:25.000000000 -0500
     2403+++ koffice-1.5.0-rc1-new/lib/kross/main/mainmodule.h   2006-03-25 13:35:46.000000000 -0500
     2404@@ -50,7 +50,7 @@
     2405      * for a root node in a tree of \a Kross::Api::Object
     2406      * instances.
     2407      */
     2408-    class MainModule : public Module
     2409+    class KDE_EXPORT MainModule : public Module
     2410     {
     2411         public:
     2412 
     2413--- koffice-1.5.0-rc1/lib/kross/main/scriptaction.h     2006-03-23 15:02:25.000000000 -0500
     2414+++ koffice-1.5.0-rc1-new/lib/kross/main/scriptaction.h 2006-03-25 13:35:46.000000000 -0500
     2415@@ -25,6 +25,8 @@
     2416 
     2417 #include "scriptcontainer.h"
     2418 
     2419+#include <koffice_export.h>
     2420+
     2421 namespace Kross { namespace Api {
     2422 
     2423     // Forward declarations.
     2424@@ -36,7 +38,7 @@
     2425      * A ScriptAction extends a KAction by providing a wrapper around
     2426      * a \a ScriptContainer to execute scripting code on activation.
     2427      */
     2428-    class ScriptAction
     2429+    class KROSS_EXPORT ScriptAction
     2430         : public KAction
     2431         , public Kross::Api::ScriptContainer
     2432     {
     2433--- koffice-1.5.0-rc1/lib/kross/main/scriptcontainer.h  2006-03-23 15:02:25.000000000 -0500
     2434+++ koffice-1.5.0-rc1-new/lib/kross/main/scriptcontainer.h      2006-03-25 13:35:46.000000000 -0500
     2435@@ -48,7 +48,7 @@
     2436      * The class \a ScriptAction provides a higher level class
     2437      * to work with a \a ScriptContainer instances.
     2438      */
     2439-    class ScriptContainer : public MainModule
     2440+    class KDE_EXPORT ScriptContainer : public MainModule
     2441     {
     2442             // We protected the constructor cause ScriptContainer
     2443             // instances should be created only within the
     2444--- koffice-1.5.0-rc1/lib/kross/main/wdgscriptsmanager.h        2006-03-23 15:02:25.000000000 -0500
     2445+++ koffice-1.5.0-rc1-new/lib/kross/main/wdgscriptsmanager.h    2006-03-25 13:35:46.000000000 -0500
     2446@@ -22,6 +22,8 @@
     2447 #include "main/scriptaction.h"
     2448 #include "main/wdgscriptsmanagerbase.h"
     2449 
     2450+#include <koffice_export.h>
     2451+
     2452 class Scripting;
     2453 
     2454 namespace Kross { namespace Api {
     2455@@ -32,7 +34,7 @@
     2456 /**
     2457 @author Cyrille Berger
     2458 */
     2459-class WdgScriptsManager : public WdgScriptsManagerBase
     2460+class KROSS_EXPORT WdgScriptsManager : public WdgScriptsManagerBase
     2461 {
     2462     Q_OBJECT
     2463     public:
     2464--- koffice-1.5.0-rc1/lib/kross/ruby/Makefile.am        2006-03-23 15:02:23.000000000 -0500
     2465+++ koffice-1.5.0-rc1-new/lib/kross/ruby/Makefile.am    2006-03-25 13:35:46.000000000 -0500
     2466@@ -1,6 +1,6 @@
     2467 include $(top_srcdir)/lib/kross/Makefile.global
     2468 
     2469-INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_ARCHDIR) $(all_includes)
     2470+INCLUDES = $(KROSS_INCLUDES) -I$(RUBY_ARCHDIR) $(all_includes)
    2232471 METASOURCES = AUTO
    224  
    225 -lib_LTLIBRARIES =  libkiviotargettool.la
    226 +kde_module_LTLIBRARIES =  libkiviotargettool.la
    227  libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
    228  libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
    229  libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp
    230 --- koffice-1.4.2/kivio/plugins/kiviotexttool/Makefile.am       2005-09-21 08:25:53.000000000 -0400
    231 +++ koffice-1.4.2-new/kivio/plugins/kiviotexttool/Makefile.am   2005-09-29 20:37:21.000000000 -0400
    232 @@ -1,4 +1,4 @@
    233 -lib_LTLIBRARIES =libkiviotexttool.la
    234 +kde_module_LTLIBRARIES =libkiviotexttool.la
    235  
    236  
    237  INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
    238 --- koffice-1.4.2/kivio/plugins/kiviozoomtool/Makefile.am       2005-09-21 08:25:53.000000000 -0400
    239 +++ koffice-1.4.2-new/kivio/plugins/kiviozoomtool/Makefile.am   2005-09-29 20:37:21.000000000 -0400
    240 @@ -1,5 +1,5 @@
    241  SUBDIRS = zoom_pics
    242 -lib_LTLIBRARIES =libkiviozoomtool.la
    243 +kde_module_LTLIBRARIES =libkiviozoomtool.la
    244  
    245  INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
    246         -I$(top_builddir)/kivio/kiviopart/config \
    247 --- koffice-1.4.2/krita/core/kis_generic_registry.h     2005-09-21 08:25:12.000000000 -0400
    248 +++ koffice-1.4.2-new/krita/core/kis_generic_registry.h 2005-09-29 20:37:21.000000000 -0400
    249 @@ -28,27 +28,27 @@
    250  #include "kis_global.h"
    251  #include "kis_id.h"
    252  
    253 -template<typename _T>
    254 +template<typename _T_GENERIC>
    255  class KisGenericRegistry {
    256 -       typedef std::map<KisID, _T> storageMap;
    257 +       typedef std::map<KisID, _T_GENERIC> storageMap;
    258  public:
    259         KisGenericRegistry() { };
    260         virtual ~KisGenericRegistry() { };
    261  public:
    262 -       void add(_T item)
    263 +       void add(_T_GENERIC item)
    264         {
    265                 m_storage.insert( typename storageMap::value_type( item->id(), item) );
    266         }
    267  
    268 -       void add(KisID id, _T item)
    269 +       void add(KisID id, _T_GENERIC item)
    270         {
    271                 m_storage.insert(typename storageMap::value_type(id, item));
    272                 kdDebug(DBG_AREA_REGISTRY ) << "Added ID: " << id.id() << ", " << id.name() << "\n";
    273         }
    274        
    275 -       _T get(const KisID& name) const
    276 +       _T_GENERIC get(const KisID& name) const
    277         {
    278 -               _T p;
    279 +               _T_GENERIC p;
    280                 typename storageMap::const_iterator it = m_storage.find(name);
    281                 if (it != m_storage.end()) {
    282                         p = it -> second;
    283 @@ -64,7 +64,7 @@
    284          * Get a single entry based on the identifying part of KisID, not the
    285          * the descriptive part.
    286          */
    287 -       _T get(const QString& id) const
    288 +       _T_GENERIC get(const QString& id) const
    289         {
    290                 return get(KisID(id, ""));
    291         }
     2472 kde_module_LTLIBRARIES = krossruby.la
     2473 
Note: See TracChangeset for help on using the changeset viewer.