[kmobiletools] KDE/kdepim

[Allen Winter]

SVN commit 677093 by winterz:

follow the new way of doing the exports.


 M  +19 -25    kmobiletools/kmobiletools/engines/libkmobiletoolsengineui/engineui_export.h  
 M  +19 -25    kmobiletools/kmobiletools/libkmobiletools/kmobiletools_export.h  
 M  +9 -11     kpilot/lib/kpilot_export.h  


--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/libkmobiletoolsengineui/engineui_export.h #677092:677093
@@ -1,42 +1,36 @@
-/***************************************************************************
-   Copyright (C) 2007 Pino Toscano <pino at kde.org>
+/*  This file is part of the KDE project
+    Copyright (C) 2007 David Faure <faure at kde.org>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
- ***************************************************************************/
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
 
 #ifndef ENGINEUI_EXPORT_H
 #define ENGINEUI_EXPORT_H
 
-/* needed for KDE_EXPORT macros */
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-#if defined _WIN32 || defined _WIN64
 #ifndef ENGINEUI_EXPORT
-# ifdef MAKE_KMOBILETOOLSENGINEUI_LIB
+# if defined(MAKE_KMOBILETOOLSENGINEUI_LIB)
+   /* We are building this library */
 #  define ENGINEUI_EXPORT KDE_EXPORT
 # else
+   /* We are using this library */
 #  define ENGINEUI_EXPORT KDE_IMPORT
 # endif
 #endif
 
-#else /* UNIX*/
-
-/* export statements for unix */
-#define ENGINEUI_EXPORT KDE_EXPORT
-
 #endif
-
-#endif
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/kmobiletools_export.h #677092:677093
@@ -1,42 +1,36 @@
-/***************************************************************************
-   Copyright (C) 2007 Pino Toscano <pino at kde.org>
+/*  This file is part of the KDE project
+    Copyright (C) 2007 David Faure <faure at kde.org>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
- ***************************************************************************/
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
 
 #ifndef KMOBILETOOLS_EXPORT_H
 #define KMOBILETOOLS_EXPORT_H
 
-/* needed for KDE_EXPORT macros */
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-#if defined _WIN32 || defined _WIN64
 #ifndef KMOBILETOOLS_EXPORT
-# ifdef MAKE_KMOBILETOOLS_LIB
+# if defined(MAKE_KMOBILETOOLS_LIB)
+   /* We are building this library */
 #  define KMOBILETOOLS_EXPORT KDE_EXPORT
 # else
+   /* We are using this library */
 #  define KMOBILETOOLS_EXPORT KDE_IMPORT
 # endif
 #endif
 
-#else /* UNIX*/
-
-/* export statements for unix */
-#define KMOBILETOOLS_EXPORT KDE_EXPORT
-
 #endif
-
-#endif
--- trunk/KDE/kdepim/kpilot/lib/kpilot_export.h #677092:677093
@@ -1,6 +1,5 @@
-/*
-    This file is part of kpilot.
-    Copyright (c) 2007 Laurent Montel <montel at kde.org>
+/*  This file is part of the KDE project
+    Copyright (C) 2007 David Faure <faure at kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -21,22 +20,21 @@
 #ifndef KPILOT_EXPORT_H
 #define KPILOT_EXPORT_H
 
-/* needed for KPILOT_EXPORT macros */
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-#if defined Q_OS_WIN
-
 #ifndef KPILOT_EXPORT
-# ifdef MAKE_KPILOT_LIB
+# if defined(MAKE_KPILOT_LIB)
+   /* We are building this library */
 #  define KPILOT_EXPORT KDE_EXPORT
 # else
+   /* We are using this library */
 #  define KPILOT_EXPORT KDE_IMPORT
 # endif
 #endif
 
-#else /* UNIX*/
-/* export statements for unix */
-#define KPILOT_EXPORT KDE_EXPORT
-#endif
+# ifndef KPILOT_EXPORT_DEPRECATED
+#  define KPILOT_EXPORT_DEPRECATED KDE_DEPRECATED KPILOT_EXPORT
+# endif
 
 #endif