From a98eddaa3aa04c46b73dfedc3dee1e94abf3e502 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 11 Aug 2007 10:31:23 +0000 Subject: [PATCH] Update export file svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=698869 --- extdate/libkdeedu_extdate_export.h | 24 ++++++++++----------- kdeeduui/libkdeedu_ui_export.h | 24 ++++++++++----------- keduvocdocument/libkeduvocdocument_export.h | 22 +++++++++---------- libscience/libkdeedu_science_export.h | 24 ++++++++++----------- 4 files changed, 44 insertions(+), 50 deletions(-) diff --git a/extdate/libkdeedu_extdate_export.h b/extdate/libkdeedu_extdate_export.h index fa5f6ee..f0f8231 100644 --- a/extdate/libkdeedu_extdate_export.h +++ b/extdate/libkdeedu_extdate_export.h @@ -1,6 +1,5 @@ -/* - This file is part of libkdeedu. - Copyright (c) 2006 Pino Toscano +/* This file is part of the KDE project + Copyright (C) 2007 David Faure This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -18,25 +17,24 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDEEDU_EXTDATE_EXPORT_H -#define KDEEDU_EXTDATE_EXPORT_H +#ifndef LIBKDEEDU_EXTDATE_EXPORT_H +#define LIBKDEEDU_EXTDATE_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for KDE_EXPORT and KDE_IMPORT macros */ #include -#if defined Q_OS_WIN - #ifndef EXTDATE_EXPORT -# ifdef MAKE_EXTDATE_LIB +# if defined(MAKE_EXTDATE_LIB) + /* We are building this library */ # define EXTDATE_EXPORT KDE_EXPORT # else + /* We are using this library */ # define EXTDATE_EXPORT KDE_IMPORT # endif #endif -#else -/* export statements for unix */ -#define EXTDATE_EXPORT KDE_EXPORT -#endif +# ifndef EXTDATE_EXPORT_DEPRECATED +# define EXTDATE_EXPORT_DEPRECATED KDE_DEPRECATED EXTDATE_EXPORT +# endif #endif diff --git a/kdeeduui/libkdeedu_ui_export.h b/kdeeduui/libkdeedu_ui_export.h index d344665..cec0149 100644 --- a/kdeeduui/libkdeedu_ui_export.h +++ b/kdeeduui/libkdeedu_ui_export.h @@ -1,6 +1,5 @@ -/* - This file is part of libkdeedu. - Copyright (c) 2006 Pino Toscano +/* This file is part of the KDE project + Copyright (C) 2007 David Faure This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -18,25 +17,24 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDEEDU_UI_EXPORT_H -#define KDEEDU_UI_EXPORT_H +#ifndef LIBKDEEDU_UI_EXPORT_H +#define LIBKDEEDU_UI_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for KDE_EXPORT and KDE_IMPORT macros */ #include -#if defined Q_OS_WIN - #ifndef KDEEDUUI_EXPORT -# ifdef MAKE_KDEEDUUI_LIB +# if defined(MAKE_KDEEDUUI_LIB) + /* We are building this library */ # define KDEEDUUI_EXPORT KDE_EXPORT # else + /* We are using this library */ # define KDEEDUUI_EXPORT KDE_IMPORT # endif #endif -#else /* UNIX */ -/* export statements for unix */ -#define KDEEDUUI_EXPORT KDE_EXPORT -#endif +# ifndef KDEEDUUI_EXPORT_DEPRECATED +# define KDEEDUUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEEDUUI_EXPORT +# endif #endif diff --git a/keduvocdocument/libkeduvocdocument_export.h b/keduvocdocument/libkeduvocdocument_export.h index e95eead..2e000ed 100644 --- a/keduvocdocument/libkeduvocdocument_export.h +++ b/keduvocdocument/libkeduvocdocument_export.h @@ -1,6 +1,5 @@ -/* - This file is part of libkdeedu. - Copyright (c) 2006 Pino Toscano +/* This file is part of the KDE project + Copyright (C) 2007 David Faure This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -18,23 +17,24 @@ Boston, MA 02110-1301, USA. */ -#ifndef KEDUVOCDOCUMENT_EXPORT_H -#define KEDUVOCDOCUMENT_EXPORT_H +#ifndef LIBKEDUVOCDOCUMENT_EXPORT_H +#define LIBKEDUVOCDOCUMENT_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for KDE_EXPORT and KDE_IMPORT macros */ #include -#if defined Q_OS_WIN #ifndef KEDUVOCDOCUMENT_EXPORT -# ifdef MAKE_KEDUVOCDOCUMENT_LIB +# if defined(MAKE_KEDUVOCDOCUMENT_LIB) + /* We are building this library */ # define KEDUVOCDOCUMENT_EXPORT KDE_EXPORT # else + /* We are using this library */ # define KEDUVOCDOCUMENT_EXPORT KDE_IMPORT # endif #endif -#else /* UNIX */ -#define KEDUVOCDOCUMENT_EXPORT KDE_EXPORT -#endif +# ifndef KEDUVOCDOCUMENT_EXPORT_DEPRECATED +# define KEDUVOCDOCUMENT_EXPORT_DEPRECATED KDE_DEPRECATED KEDUVOCDOCUMENT_EXPORT +# endif #endif diff --git a/libscience/libkdeedu_science_export.h b/libscience/libkdeedu_science_export.h index f7d77f7..e9343e5 100644 --- a/libscience/libkdeedu_science_export.h +++ b/libscience/libkdeedu_science_export.h @@ -1,6 +1,5 @@ -/* - This file is part of libkdeedu. - Copyright (c) 2006 Pino Toscano +/* This file is part of the KDE project + Copyright (C) 2007 David Faure This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -18,25 +17,24 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDEEDU_SCIENCE_EXPORT_H -#define KDEEDU_SCIENCE_EXPORT_H +#ifndef LIBKDEEDU_SCIENCE_EXPORT_H +#define LIBKDEEDU_SCIENCE_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for KDE_EXPORT and KDE_IMPORT macros */ #include -#if defined Q_OS_WIN - #ifndef SCIENCE_EXPORT -# ifdef MAKE_SCIENCE_LIB +# if defined(MAKE_SCIENCE_LIB) + /* We are building this library */ # define SCIENCE_EXPORT KDE_EXPORT # else + /* We are using this library */ # define SCIENCE_EXPORT KDE_IMPORT # endif #endif -#else -/* export statements for unix */ -#define SCIENCE_EXPORT KDE_EXPORT -#endif +# ifndef SCIENCE_EXPORT_DEPRECATED +# define SCIENCE_EXPORT_DEPRECATED KDE_DEPRECATED SCIENCE_EXPORT +# endif #endif -- 2.47.3