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

List:       koffice-devel
Subject:    Re: kivio compile error
From:       Dag Andersen <danders () get2net ! dk>
Date:       2005-02-03 8:29:20
Message-ID: 200502030929.21347.danders () get2net ! dk
[Download RAW message or body]

Hi, seems to work for me when I replace *all* KDE_EXPORT with 
KIVIO_EXPORT (and include koffice_export.h, of course.)
I don't know if this is ok, so can someone in the know commit the att. 
patch if it *is* ok?

On Torsdag 03 februar 2005 09:17, Thorsten Zachmann wrote:
> Hello all,
>
> On Wednesday 02 February 2005 10:13, Raphael Langerhorst wrote:
> > On Wednesday 02 February 2005 10:06, Thorsten Zachmann wrote:
> > > On Monday 31 January 2005 09:44, Laurent Montel wrote:
> > > > On Monday 31 January 2005 08:02, Thorsten Zachmann wrote:
> > > > > Hello all,
> > > > >
> > > > > since around two weeks kivio does no longer kompile. Looks
> > > > > like a problem with KDE_EXPORT.
> > > >
> > > > Fixed.
> > > > Regards.
> > >
> > > The problem still exists for me. Do I have to somethink to make
> > > it work?
> > >
> > > Thorsten
> >
> > Hi,
> >
> > I don't experience compile problems with Kivio. I use gcc 3.4.2.
> > Are you sure you don't have any local modifications (by mistake)?
> > Did you try a completely fresh checkout, or a make -f
> > Makefile.cvs?
>
> I have removed kivio and did a new checkout and make -f ....., but
> still the problem exists.
>
> Thorsten
> _______________________________________________
> koffice-devel mailing list
> koffice-devel@kde.org
> https://mail.kde.org/mailman/listinfo/koffice-devel

-- 
Mvh,
Dag Andersen

["export.patch" (text/x-diff)]

? export.patch
? plugins/kivioconnectortool/polyline_connector/Makefile
? plugins/kivioconnectortool/polyline_connector/Makefile.in
Index: kiviopart/main.cpp
===================================================================
RCS file: /home/kde/koffice/kivio/kiviopart/main.cpp,v
retrieving revision 1.16
diff -u -3 -p -r1.16 main.cpp
--- kiviopart/main.cpp	23 Jan 2005 14:06:14 -0000	1.16
+++ kiviopart/main.cpp	3 Feb 2005 08:26:26 -0000
@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <koffice_export.h>
 #include <koApplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
@@ -30,7 +31,7 @@ static const KCmdLineOptions options[]=
   KCmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" KIVIO_EXPORT int kdemain( int argc, char **argv )
 {
   KCmdLineArgs::init( argc, argv, newKivioAboutData() );
   KCmdLineArgs::addCmdLineOptions( options );
Index: kiviopart/kiviosdk/kivio_1d_stencil.h
===================================================================
RCS file: /home/kde/koffice/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h,v
retrieving revision 1.11
diff -u -3 -p -r1.11 kivio_1d_stencil.h
--- kiviopart/kiviosdk/kivio_1d_stencil.h	23 Jan 2005 14:06:14 -0000	1.11
+++ kiviopart/kiviosdk/kivio_1d_stencil.h	3 Feb 2005 08:26:26 -0000
@@ -8,6 +8,8 @@
 #include <qdom.h>
 #include <qptrlist.h>
 
+#include <koffice_export.h>
+
 #include "kivio_stencil.h"
 #include "kivio_text_style.h"
 
@@ -20,7 +22,7 @@ class KivioIntraStencilData;
 class KivioStencil;
 
 
-class KDE_EXPORT Kivio1DStencil : public KivioStencil
+class KIVIO_EXPORT Kivio1DStencil : public KivioStencil
 {
 protected:
     QPtrList <KivioConnectorPoint> *m_pConnectorPoints;
Index: kiviopart/kiviosdk/kivio_arrowhead.h
===================================================================
RCS file: /home/kde/koffice/kivio/kiviopart/kiviosdk/kivio_arrowhead.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 kivio_arrowhead.h
--- kiviopart/kiviosdk/kivio_arrowhead.h	23 Jan 2005 14:06:14 -0000	1.10
+++ kiviopart/kiviosdk/kivio_arrowhead.h	3 Feb 2005 08:26:26 -0000
@@ -83,7 +83,7 @@ struct KivioArrowHeadData
 };
 
 
-class KDE_EXPORT KivioArrowHead
+class KIVIO_EXPORT KivioArrowHead
 {
   protected:
     /**
Index: kiviopart/kiviosdk/kivio_connector_point.h
===================================================================
RCS file: /home/kde/koffice/kivio/kiviopart/kiviosdk/kivio_connector_point.h,v
retrieving revision 1.8
diff -u -3 -p -r1.8 kivio_connector_point.h
--- kiviopart/kiviosdk/kivio_connector_point.h	31 Jan 2005 08:44:12 -0000	1.8
+++ kiviopart/kiviosdk/kivio_connector_point.h	3 Feb 2005 08:26:26 -0000
@@ -27,7 +27,7 @@ class KivioConnectorTarget;
 class KivioStencil;
 
 
-class KDE_EXPORT KivioConnectorPoint
+class KIVIO_EXPORT KivioConnectorPoint
 {
 protected:
     // The position of this connector point
Index: kiviopart/kiviosdk/kivio_stencil.h
===================================================================
RCS file: /home/kde/koffice/kivio/kiviopart/kiviosdk/kivio_stencil.h,v
retrieving revision 1.30
diff -u -3 -p -r1.30 kivio_stencil.h
--- kiviopart/kiviosdk/kivio_stencil.h	23 Jan 2005 14:06:14 -0000	1.30
+++ kiviopart/kiviosdk/kivio_stencil.h	3 Feb 2005 08:26:26 -0000
@@ -28,6 +28,7 @@
 #include <koPoint.h>
 #include <kglobalsettings.h>
 #include <koRect.h>
+#include <koffice_export.h>
 
 #include "kivio_line_style.h"
 
@@ -113,7 +114,7 @@ typedef enum
 
 
 
-class KDE_EXPORT KivioStencil
+class KIVIO_EXPORT KivioStencil
 {
   protected:
     // Dimensions, size


_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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