From b63b93fb56b967427b1e3ac1b8adb6d16c7d245f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 16:06:07 -0600 Subject: Finish rename from prior commit --- tdecore/kdelibs_export.h | 86 ----------------------------------------------- tdecore/kdeversion.cpp | 46 ------------------------- tdecore/kdeversion.h | 87 ------------------------------------------------ tdecore/tdelibs_export.h | 86 +++++++++++++++++++++++++++++++++++++++++++++++ tdecore/tdeversion.cpp | 46 +++++++++++++++++++++++++ tdecore/tdeversion.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 219 insertions(+), 219 deletions(-) delete mode 100644 tdecore/kdelibs_export.h delete mode 100644 tdecore/kdeversion.cpp delete mode 100644 tdecore/kdeversion.h create mode 100644 tdecore/tdelibs_export.h create mode 100644 tdecore/tdeversion.cpp create mode 100644 tdecore/tdeversion.h (limited to 'tdecore') diff --git a/tdecore/kdelibs_export.h b/tdecore/kdelibs_export.h deleted file mode 100644 index b644985b5..000000000 --- a/tdecore/kdelibs_export.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - This file is part of the KDE libraries - Copyright (C) 2004 Jaroslaw Staniek - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - 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 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 _KDELIBS_EXPORT_H -#define _KDELIBS_EXPORT_H - -/* needed for KDE_EXPORT macros */ -#include - -/* needed, because e.g. Q_OS_UNIX is so frequently used */ -#include - -#ifdef Q_WS_WIN -#include - -#else /* Q_OS_UNIX */ - -/* export statements for unix */ -#define TDECORE_EXPORT KDE_EXPORT -#define TDEUI_EXPORT KDE_EXPORT -#define TDEFX_EXPORT KDE_EXPORT -#define TDEPRINT_EXPORT KDE_EXPORT -#define KDNSSD_EXPORT KDE_EXPORT -#define KIO_EXPORT KDE_EXPORT -#define DCOP_EXPORT KDE_EXPORT -#define KPARTS_EXPORT KDE_EXPORT -#define KTEXTEDITOR_EXPORT KDE_EXPORT -#define KABC_EXPORT KDE_EXPORT -#define TDESU_EXPORT KDE_EXPORT -#define KVCARD_EXPORT KDE_EXPORT -#define KRESOURCES_EXPORT KDE_EXPORT -#define KSTYLE_EXPORT KDE_EXPORT -#define KHTML_EXPORT KDE_EXPORT -#define KMDI_EXPORT KDE_EXPORT -#define KUTILS_EXPORT KDE_EXPORT -#define KATEPARTINTERFACES_EXPORT KDE_EXPORT -#define KATEPART_EXPORT KDE_EXPORT -#define KMID_EXPORT KDE_EXPORT -#define KRANDR_EXPORT KDE_EXPORT -#define KIMPROXY_EXPORT KDE_EXPORT -#define KDE_ARTS_EXPORT KDE_EXPORT -#define KUNITTEST_EXPORT KDE_EXPORT - -#define KPATH_SEPARATOR ':' - -#ifndef O_BINARY -#define O_BINARY 0 /* for open() */ -#endif - -#endif - -#endif /*_KDELIBS_EXPORT_H*/ - -/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros - between 'class' keyword and : */ -#ifdef KDE_DEPRECATED -# ifndef TDECORE_EXPORT_DEPRECATED -# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT -# endif -# ifndef KIO_EXPORT_DEPRECATED -# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT -# endif -# ifndef TDEUI_EXPORT_DEPRECATED -# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT -# endif -# ifndef KABC_EXPORT_DEPRECATED -# define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT -# endif -#endif -/* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */ diff --git a/tdecore/kdeversion.cpp b/tdecore/kdeversion.cpp deleted file mode 100644 index 4dfaec53c..000000000 --- a/tdecore/kdeversion.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) 2002 KDE Team - - 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 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 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. -*/ - -#include "tdeversion.h" - -unsigned int KDE::version() -{ - return TDE_VERSION; -} - -unsigned int KDE::versionMajor() -{ - return TDE_VERSION_MAJOR; -} - -unsigned int KDE::versionMinor() -{ - return TDE_VERSION_MINOR; -} - -unsigned int KDE::versionRelease() -{ - return TDE_VERSION_RELEASE; -} - -const char *KDE::versionString() -{ - return TDE_VERSION_STRING; -} - diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h deleted file mode 100644 index bde3b686e..000000000 --- a/tdecore/kdeversion.h +++ /dev/null @@ -1,87 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) 2002-2005 KDE Team - - 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 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 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 _TDE_VERSION_H_ -#define _TDE_VERSION_H_ - -#include "tdelibs_export.h" - -/* - R . . - Security patchlevel is not present on initial release - It is added on the first security release, starting with ".a" - ".a" would correspond to a TDE_VERSION_RELEASE of 1, ".b" would be 2, etc. - A new bugfix revision resets the security level - A new ABI version resets both the bugfix revision and the security level -*/ -#define TDE_VERSION_STRING "R14.0 [DEVELOPMENT]" -#define TDE_VERSION_MAJOR 14 -#define TDE_VERSION_MINOR 0 -#define TDE_VERSION_RELEASE 0 -#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) - -#define TDE_VERSION \ - KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE) - -#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) ) - -/** - * Namespace for general KDE functions. - */ -namespace KDE -{ - /** - * Returns the encoded number of KDE's version, see the TDE_VERSION macro. - * In contrary to that macro this function returns the number of the actully - * installed KDE version, not the number of the KDE version that was - * installed when the program was compiled. - * @return the version number, encoded in a single uint - * @since 3.2 - */ - TDECORE_EXPORT unsigned int version(); - /** - * Returns the major number of KDE's version, e.g. - * 3 for KDE 3.1.2. - * @return the major version number - * @since 3.1 - */ - TDECORE_EXPORT unsigned int versionMajor(); - /** - * Returns the minor number of KDE's version, e.g. - * 1 for KDE 3.1.2. - * @return the minor version number - * @since 3.1 - */ - TDECORE_EXPORT unsigned int versionMinor(); - /** - * Returns the release of KDE's version, e.g. - * 2 for KDE 3.1.2. - * @return the release number - * @since 3.1 - */ - TDECORE_EXPORT unsigned int versionRelease(); - /** - * Returns the KDE version as string, e.g. "3.1.2". - * @return the KDE version. You can keep the string forever - * @since 3.1 - */ - TDECORE_EXPORT const char *versionString(); -} - -#endif // _TDE_VERSION_H_ diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h new file mode 100644 index 000000000..b644985b5 --- /dev/null +++ b/tdecore/tdelibs_export.h @@ -0,0 +1,86 @@ +/* + This file is part of the KDE libraries + Copyright (C) 2004 Jaroslaw Staniek + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + 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 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 _KDELIBS_EXPORT_H +#define _KDELIBS_EXPORT_H + +/* needed for KDE_EXPORT macros */ +#include + +/* needed, because e.g. Q_OS_UNIX is so frequently used */ +#include + +#ifdef Q_WS_WIN +#include + +#else /* Q_OS_UNIX */ + +/* export statements for unix */ +#define TDECORE_EXPORT KDE_EXPORT +#define TDEUI_EXPORT KDE_EXPORT +#define TDEFX_EXPORT KDE_EXPORT +#define TDEPRINT_EXPORT KDE_EXPORT +#define KDNSSD_EXPORT KDE_EXPORT +#define KIO_EXPORT KDE_EXPORT +#define DCOP_EXPORT KDE_EXPORT +#define KPARTS_EXPORT KDE_EXPORT +#define KTEXTEDITOR_EXPORT KDE_EXPORT +#define KABC_EXPORT KDE_EXPORT +#define TDESU_EXPORT KDE_EXPORT +#define KVCARD_EXPORT KDE_EXPORT +#define KRESOURCES_EXPORT KDE_EXPORT +#define KSTYLE_EXPORT KDE_EXPORT +#define KHTML_EXPORT KDE_EXPORT +#define KMDI_EXPORT KDE_EXPORT +#define KUTILS_EXPORT KDE_EXPORT +#define KATEPARTINTERFACES_EXPORT KDE_EXPORT +#define KATEPART_EXPORT KDE_EXPORT +#define KMID_EXPORT KDE_EXPORT +#define KRANDR_EXPORT KDE_EXPORT +#define KIMPROXY_EXPORT KDE_EXPORT +#define KDE_ARTS_EXPORT KDE_EXPORT +#define KUNITTEST_EXPORT KDE_EXPORT + +#define KPATH_SEPARATOR ':' + +#ifndef O_BINARY +#define O_BINARY 0 /* for open() */ +#endif + +#endif + +#endif /*_KDELIBS_EXPORT_H*/ + +/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros + between 'class' keyword and : */ +#ifdef KDE_DEPRECATED +# ifndef TDECORE_EXPORT_DEPRECATED +# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT +# endif +# ifndef KIO_EXPORT_DEPRECATED +# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT +# endif +# ifndef TDEUI_EXPORT_DEPRECATED +# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT +# endif +# ifndef KABC_EXPORT_DEPRECATED +# define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT +# endif +#endif +/* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */ diff --git a/tdecore/tdeversion.cpp b/tdecore/tdeversion.cpp new file mode 100644 index 000000000..4dfaec53c --- /dev/null +++ b/tdecore/tdeversion.cpp @@ -0,0 +1,46 @@ +/* This file is part of the KDE libraries + Copyright (c) 2002 KDE Team + + 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 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 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. +*/ + +#include "tdeversion.h" + +unsigned int KDE::version() +{ + return TDE_VERSION; +} + +unsigned int KDE::versionMajor() +{ + return TDE_VERSION_MAJOR; +} + +unsigned int KDE::versionMinor() +{ + return TDE_VERSION_MINOR; +} + +unsigned int KDE::versionRelease() +{ + return TDE_VERSION_RELEASE; +} + +const char *KDE::versionString() +{ + return TDE_VERSION_STRING; +} + diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h new file mode 100644 index 000000000..bde3b686e --- /dev/null +++ b/tdecore/tdeversion.h @@ -0,0 +1,87 @@ +/* This file is part of the KDE libraries + Copyright (c) 2002-2005 KDE Team + + 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 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 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 _TDE_VERSION_H_ +#define _TDE_VERSION_H_ + +#include "tdelibs_export.h" + +/* + R . . + Security patchlevel is not present on initial release + It is added on the first security release, starting with ".a" + ".a" would correspond to a TDE_VERSION_RELEASE of 1, ".b" would be 2, etc. + A new bugfix revision resets the security level + A new ABI version resets both the bugfix revision and the security level +*/ +#define TDE_VERSION_STRING "R14.0 [DEVELOPMENT]" +#define TDE_VERSION_MAJOR 14 +#define TDE_VERSION_MINOR 0 +#define TDE_VERSION_RELEASE 0 +#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) + +#define TDE_VERSION \ + KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE) + +#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) ) + +/** + * Namespace for general KDE functions. + */ +namespace KDE +{ + /** + * Returns the encoded number of KDE's version, see the TDE_VERSION macro. + * In contrary to that macro this function returns the number of the actully + * installed KDE version, not the number of the KDE version that was + * installed when the program was compiled. + * @return the version number, encoded in a single uint + * @since 3.2 + */ + TDECORE_EXPORT unsigned int version(); + /** + * Returns the major number of KDE's version, e.g. + * 3 for KDE 3.1.2. + * @return the major version number + * @since 3.1 + */ + TDECORE_EXPORT unsigned int versionMajor(); + /** + * Returns the minor number of KDE's version, e.g. + * 1 for KDE 3.1.2. + * @return the minor version number + * @since 3.1 + */ + TDECORE_EXPORT unsigned int versionMinor(); + /** + * Returns the release of KDE's version, e.g. + * 2 for KDE 3.1.2. + * @return the release number + * @since 3.1 + */ + TDECORE_EXPORT unsigned int versionRelease(); + /** + * Returns the KDE version as string, e.g. "3.1.2". + * @return the KDE version. You can keep the string forever + * @since 3.1 + */ + TDECORE_EXPORT const char *versionString(); +} + +#endif // _TDE_VERSION_H_ -- cgit v1.2.1