Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: use CMake export header generator

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-27 18:43:11 +00:00
parent 7829cff6c9
commit 1f34f5ad73
112 changed files with 190 additions and 1437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -34,6 +34,7 @@ set(KDE_NO_DEPRECATED TRUE CACHE BOOL "Whether deprecated functionality is desir
find_package(KDE4Internal REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
include(GenerateExportHeader)
if(UNIX AND Q_WS_X11)
#X11 Session Management (SM) is required
@ -174,6 +175,7 @@ set(KDE4_KDECORE_INCLUDES
${CMAKE_SOURCE_DIR}/kdecore/text
${CMAKE_SOURCE_DIR}/kdecore/util
${CMAKE_SOURCE_DIR}/kdecore/sonnet
${CMAKE_BINARY_DIR}/kdecore
${QT_INCLUDES}
${_KDE4_PLATFORM_INCLUDE_DIRS}
)
@ -200,6 +202,7 @@ set(KDE4_KDEUI_INCLUDES
${CMAKE_SOURCE_DIR}/kdeui/widgets
${CMAKE_SOURCE_DIR}/kdeui/windowmanagement
${CMAKE_SOURCE_DIR}/kdeui/xmlgui
${CMAKE_BINARY_DIR}/kdeui
${KDE4_KDECORE_INCLUDES}
)
@ -209,18 +212,21 @@ set(KDE4_KIO_INCLUDES
${CMAKE_SOURCE_DIR}/kio/bookmarks
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_BINARY_DIR}/kio
${KDE4_KDEUI_INCLUDES}
)
# kpty
set(KDE4_KPTY_INCLUDES
${CMAKE_SOURCE_DIR}/kpty
${CMAKE_BINARY_DIR}/kpty
${KDE4_KIO_INCLUDES}
)
# kparts depends on kio
set(KDE4_KPARTS_INCLUDES
${CMAKE_SOURCE_DIR}/kparts
${CMAKE_BINARY_DIR}/kparts
${KDE4_KIO_INCLUDES}
)

140
cmake/modules/FindKDE4Internal.cmake
View file

@ -141,8 +141,6 @@
#
# The following user adjustable options are provided:
#
# KDE4_ENABLE_FPIE - enable it to use gcc Position Independent Executables feature
#
# KDE4_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] [USE_RELATIVE_PATH] file1.kcfgc ... fileN.kcfgc)
# Use this to add KDE config compiler files to your application/library.
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
@ -644,7 +642,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
# As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common -Werror=return-type -fvisibility-inlines-hidden")
if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
# This should not be needed, as it is also part of _KDE4_PLATFORM_DEFINITIONS below.
@ -660,123 +658,22 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
endif()
check_cxx_compiler_flag(-fPIE HAVE_FPIE_SUPPORT)
if(KDE4_ENABLE_FPIE)
if(HAVE_FPIE_SUPPORT)
set (KDE4_CXX_FPIE_FLAGS "-fPIE")
set (KDE4_PIE_LDFLAGS "-pie")
else(HAVE_FPIE_SUPPORT)
message(STATUS "Your compiler doesn't support the PIE flag")
endif(HAVE_FPIE_SUPPORT)
endif()
check_cxx_compiler_flag(-Woverloaded-virtual __KDE_HAVE_W_OVERLOADED_VIRTUAL)
if(__KDE_HAVE_W_OVERLOADED_VIRTUAL)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
endif()
# visibility support
check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY)
set(__KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
# get the gcc version
execute_process(
COMMAND ${CMAKE_C_COMPILER} --version
ERROR_QUIET
OUTPUT_VARIABLE _gcc_version_info
)
string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version)
string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}")
if (gcc_on_macos)
string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
endif (gcc_on_macos)
endif (NOT _gcc_version)
if(_gcc_version)
if(NOT "${_gcc_version}" VERSION_LESS "4.1.0")
set(GCC_IS_NEWER_THAN_4_1 TRUE)
if(NOT "${_gcc_version}" VERSION_LESS "4.2.0")
set(GCC_IS_NEWER_THAN_4_2 TRUE)
if(NOT "${_gcc_version}" VERSION_LESS "4.3.0")
set(GCC_IS_NEWER_THAN_4_3 TRUE)
endif()
endif()
endif()
endif()
# save a little by making local statics not threadsafe
# ### do not enable it for older compilers, see
# ### http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31806
if (GCC_IS_NEWER_THAN_4_3)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics")
endif (GCC_IS_NEWER_THAN_4_3)
set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE)
if (GCC_IS_NEWER_THAN_4_1)
execute_process(
COMMAND ${CMAKE_C_COMPILER} -v
ERROR_QUIET
OUTPUT_VARIABLE _gcc_alloc_info
)
string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}")
endif()
if (__KDE_HAVE_GCC_VISIBILITY
AND GCC_IS_NEWER_THAN_4_1
AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR
AND NOT WIN32)
set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
# first check if we can compile a Qt application
set(_source "#include <QtCore/qglobal.h>\n int main() \n {\n return 0; \n } \n")
set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_application.cpp)
file(WRITE "${_source_file}" "${_source}")
try_compile(_basic_compile_result
${CMAKE_BINARY_DIR} ${_source_file}
CMAKE_FLAGS "${_include_dirs}"
OUTPUT_VARIABLE _compile_output_var
)
if(_basic_compile_result)
# now ready to check for visibility=hidden
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
set (KDE4_C_FLAGS "-fvisibility=hidden")
# check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default")))
# if it doesn't and KDE compiles with hidden default visibiltiy plugins will break
set(_source "#include <QtCore/qglobal.h>\n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n")
set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp)
file(WRITE "${_source_file}" "${_source}")
try_compile(_compile_result
${CMAKE_BINARY_DIR}
${_source_file}
CMAKE_FLAGS "${_include_dirs}"
OUTPUT_VARIABLE _compile_output_var
)
if(NOT _compile_result)
message("${_compile_output_var}")
message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).")
endif(NOT _compile_result)
else()
message("${_compile_output_var}")
message(FATAL_ERROR "Unable to compile a basic Qt application. Qt has not been found correctly.")
endif()
if(GCC_IS_NEWER_THAN_4_2)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden")
endif()
else(__KDE_HAVE_GCC_VISIBILITY
AND GCC_IS_NEWER_THAN_4_1
AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR
AND NOT WIN32)
set(__KDE_HAVE_GCC_VISIBILITY 0)
endif()
# check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default")))
# if it doesn't and KDE compiles with hidden default visibiltiy plugins will break
set(_source "#include <QtCore/QtGlobal>\n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n")
set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp)
file(WRITE "${_source_file}" "${_source}")
set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
if(NOT _compile_result)
message("${_compile_output_var}")
message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).")
endif(NOT _compile_result)
endif(CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@ -802,22 +699,16 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden")
set(KDE4_C_FLAGS "-fvisibility=hidden")
# At least kdepim exports one function with C linkage that returns a
# QString in a plugin, but clang does not like that.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
set(KDE4_CXX_FPIE_FLAGS "-fPIE")
set(KDE4_PIE_LDFLAGS "-pie")
if(CMAKE_SYSTEM_NAME STREQUAL GNU)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
endif (CMAKE_SYSTEM_NAME STREQUAL GNU)
set(__KDE_HAVE_GCC_VISIBILITY TRUE)
# check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default")))
# if it doesn't and KDE compiles with hidden default visibiltiy plugins will break
set(_source "#include <QtCore/QtGlobal>\n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n")
@ -844,13 +735,6 @@ if(CMAKE_C_COMPILER MATCHES "icc")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-common")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi -Wall -w1 -Wpointer-arith -fno-exceptions -fno-common")
# visibility support
set(__KDE_HAVE_ICC_VISIBILITY)
# check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_ICC_VISIBILITY)
# if (__KDE_HAVE_ICC_VISIBILITY)
# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
# endif (__KDE_HAVE_ICC_VISIBILITY)
endif()
########### end of platform specific stuff ##########################

5
dnssd/CMakeLists.txt
View file

@ -116,9 +116,12 @@ install(
)
########### install files ###############
generate_export_header(kdnssd)
install(
FILES
dnssd_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdnssd_export.h
domainbrowser.h
remoteservice.h
servicetypebrowser.h

2
dnssd/CreateKcfgFiles.cmake
View file

@ -16,7 +16,7 @@ NameSpace=DNSSD
SetUserTexts=false
Singleton=true
Visibility=KDNSSD_EXPORT
IncludeFiles=dnssd/dnssd_export.h
IncludeFiles=dnssd/kdnssd_export.h
")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/kcm_kdnssd.kcfg

36
dnssd/dnssd_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2006 David Faure <faure@kde.org>
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 DNSSD_EXPORT_H
#define DNSSD_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDNSSD_EXPORT
# if defined(MAKE_KDNSSD_LIB)
/* We are building this library */
# define KDNSSD_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDNSSD_EXPORT KDE_IMPORT
# endif
#endif
#endif

2
dnssd/domainmodel.h
View file

@ -22,7 +22,7 @@
#define DNSSDDOMAINMODEL_H
#include <QtCore/QAbstractItemModel>
#include <dnssd/dnssd_export.h>
#include <dnssd/kdnssd_export.h>
namespace DNSSD
{

2
dnssd/servicebase.h
View file

@ -24,7 +24,7 @@
#include <QtCore/QMap>
#include <QtCore/QString>
#include <ksharedptr.h>
#include <dnssd/dnssd_export.h>
#include <dnssd/kdnssd_export.h>
namespace DNSSD
{

2
dnssd/servicemodel.h
View file

@ -22,7 +22,7 @@
#define DNSSDSERVICEMODEL_H
#include <QtCore/QAbstractItemModel>
#include <dnssd/dnssd_export.h>
#include <dnssd/kdnssd_export.h>
#include <dnssd/remoteservice.h>
namespace DNSSD

4
interfaces/kimproxy/CMakeLists.txt
View file

@ -25,6 +25,8 @@ set_target_properties(
########### install files ###############
generate_export_header(kimproxy)
install(
TARGETS kimproxy
EXPORT kdelibsLibraryTargets
@ -33,7 +35,7 @@ install(
install(
FILES
kimproxy_export.h
${CMAKE_CURRENT_BINARY_DIR}/kimproxy_export.h
kimproxy.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel

36
interfaces/kimproxy/kimproxy_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KIMPROXY_EXPORT_H
#define KIMPROXY_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KIMPROXY_EXPORT
# if defined(MAKE_KIMPROXY_LIB)
/* We are building this library */
# define KIMPROXY_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KIMPROXY_EXPORT KDE_IMPORT
# endif
#endif
#endif

8
interfaces/kspeech/CMakeLists.txt
View file

@ -1,3 +1,9 @@
# dummy library for generate_export_header()
include_directories(${QT_INCLUDES})
add_library(kspeech kspeech.h)
generate_export_header(kspeech)
install(
FILES
dbustexttospeech.desktop
@ -6,7 +12,7 @@ install(
install(
FILES
kspeech_export.h
${CMAKE_CURRENT_BINARY_DIR}/kspeech_export.h
kspeech.h
DESTINATION ${INCLUDE_INSTALL_DIR}
)

36
interfaces/kspeech/kspeech_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KSPEECH_EXPORT_H
#define KSPEECH_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KSPEECH_EXPORT
# if defined(MAKE_KSPEECH_LIB)
/* We are building this library */
# define KSPEECH_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KSPEECH_EXPORT KDE_IMPORT
# endif
#endif
#endif

6
interfaces/ktexteditor/CMakeLists.txt
View file

@ -26,7 +26,6 @@ set(ktexteditor_LIB_SRCS
movingrange.cpp
movingrangefeedback.cpp
messageinterface.cpp
editorchooser_ui.ui
)
add_library(ktexteditor ${LIBRARY_TYPE} ${ktexteditor_LIB_SRCS})
@ -48,9 +47,12 @@ install(
)
########### install files ###############
generate_export_header(ktexteditor)
install(
FILES
ktexteditor_export.h
${CMAKE_CURRENT_BINARY_DIR}/ktexteditor_export.h
factory.h
editor.h
document.h

41
interfaces/ktexteditor/ktexteditor_export.h
View file

@ -1,41 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KTEXTEDITOR_EXPORT_H
#define KTEXTEDITOR_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KTEXTEDITOR_EXPORT
# if defined(MAKE_KTEXTEDITOR_LIB)
/* We are building this library */
# define KTEXTEDITOR_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KTEXTEDITOR_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KTEXTEDITOR_EXPORT_DEPRECATED
# define KTEXTEDITOR_EXPORT_DEPRECATED KDE_DEPRECATED KTEXTEDITOR_EXPORT
# endif
#endif

2
kcddb/kcmcddb/cddbconfigwidget.cpp
View file

@ -22,8 +22,6 @@
#include "config-musicbrainz.h"
#include <kdemacros.h> // KDE_NO_DEPRECATED
#include "libkcddb/sites.h"
#include "libkcddb/lookup.h"

6
kcddb/libkcddb/CMakeLists.txt
View file

@ -26,8 +26,6 @@ set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
genres.cpp
cdinfodialog.cpp
cdinfoencodingwidget.cpp
cdinfodialog.ui
cdinfoencodingwidget.ui
)
kde4_add_kcfg_files(kcddb_LIB_SRCS configbase.kcfgc)
@ -46,6 +44,8 @@ set_target_properties(kcddb PROPERTIES
########### install files ###############
generate_export_header(kcddb)
install(
FILES
cdinfo.h
@ -54,7 +54,7 @@ install(
genres.h
kcddbconfig.h
kcddb.h
kcddb_export.h
${CMAKE_CURRENT_BINARY_DIR}/kcddb_export.h
${CMAKE_CURRENT_BINARY_DIR}/configbase.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkcddb
COMPONENT Devel

3
kcddb/libkcddb/cache.h
View file

@ -22,12 +22,11 @@
#ifndef KCDDB_CACHE_H
#define KCDDB_CACHE_H
#include <qpair.h>
#include <QPair>
#include <QString>
#include "kcddb.h"
#include "cdinfo.h"
#include <kdemacros.h>
namespace KCDDB
{

1
kcddb/libkcddb/client.h
View file

@ -25,7 +25,6 @@
#include "cdinfo.h"
#include <QtCore/QObject>
#include "kcddb.h"
#include <kdemacros.h>
namespace KCDDB
{

40
kcddb/libkcddb/kcddb_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KCDDB_EXPORT_H
#define KCDDB_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KCDDB_EXPORT
# if defined(MAKE_KCDDB_LIB)
/* We are building this library */
# define KCDDB_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KCDDB_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KCDDB_EXPORT_DEPRECATED
# define KCDDB_EXPORT_DEPRECATED KDE_DEPRECATED KCDDB_EXPORT
# endif
#endif

4
kdcraw/libkdcraw/CMakeLists.txt
View file

@ -66,6 +66,8 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(kdcraw)
install(
FILES
rawdecodingsettings.h
@ -77,7 +79,7 @@ install(
squeezedcombobox.h
dcrawinfocontainer.h
rawfiles.h
libkdcraw_export.h
${CMAKE_CURRENT_BINARY_DIR}/libkdcraw_export.h
${CMAKE_CURRENT_BINARY_DIR}/version.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkdcraw
COMPONENT Devel

6
kdcraw/libkdcraw/dcrawinfocontainer.h
View file

@ -35,12 +35,12 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT DcrawInfoContainer
class KDCRAW_EXPORT DcrawInfoContainer
{
public:
@ -151,7 +151,7 @@ public:
};
//! kDebug() stream operator. Writes container @a c to the debug output in a nicely formatted way.
LIBKDCRAW_EXPORT QDebug operator<<(QDebug dbg, const DcrawInfoContainer& c);
KDCRAW_EXPORT QDebug operator<<(QDebug dbg, const DcrawInfoContainer& c);
} // namespace KDcrawIface

4
kdcraw/libkdcraw/dcrawsettingswidget.h
View file

@ -41,14 +41,14 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
#include "rawdecodingsettings.h"
#include "rexpanderbox.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT DcrawSettingsWidget : public RExpanderBox
class KDCRAW_EXPORT DcrawSettingsWidget : public RExpanderBox
{
Q_OBJECT

4
kdcraw/libkdcraw/kdcraw.h
View file

@ -43,7 +43,7 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
#include "rawdecodingsettings.h"
#include "dcrawinfocontainer.h"
@ -52,7 +52,7 @@
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT KDcraw : public QObject
class KDCRAW_EXPORT KDcraw : public QObject
{
Q_OBJECT

47
kdcraw/libkdcraw/libkdcraw_export.h
View file

@ -1,47 +0,0 @@
/** ===========================================================
* @file
*
* This file is part of the KDE project
*
* @brief Helper for exporting functions/classes from the shared library
*
* @author Copyright (C) 2007 David Faure <faure@kde.org>
*
* 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 LIBKDCRAW_EXPORT_H
#define LIBKDCRAW_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef LIBKDCRAW_EXPORT
# if defined(MAKE_KDCRAW_LIB)
/* We are building this library */
# define LIBKDCRAW_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define LIBKDCRAW_EXPORT KDE_IMPORT
# endif
#endif
# ifndef LIBKDCRAW_EXPORT_DEPRECATED
# define LIBKDCRAW_EXPORT_DEPRECATED KDE_DEPRECATED LIBKDCRAW_EXPORT
# endif
#endif

6
kdcraw/libkdcraw/rawdecodingsettings.h
View file

@ -42,12 +42,12 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT RawDecodingSettings
class KDCRAW_EXPORT RawDecodingSettings
{
public:
@ -365,7 +365,7 @@ public:
};
//! kDebug() stream operator. Writes settings @a s to the debug output in a nicely formatted way.
LIBKDCRAW_EXPORT QDebug operator<<(QDebug dbg, const RawDecodingSettings& s);
KDCRAW_EXPORT QDebug operator<<(QDebug dbg, const RawDecodingSettings& s);
} // namespace KDcrawIface

4
kdcraw/libkdcraw/rcombobox.h
View file

@ -34,12 +34,12 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT RComboBox : public KHBox
class KDCRAW_EXPORT RComboBox : public KHBox
{
Q_OBJECT

14
kdcraw/libkdcraw/rexpanderbox.h
View file

@ -45,12 +45,12 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT RClickLabel : public QLabel
class KDCRAW_EXPORT RClickLabel : public QLabel
{
Q_OBJECT
@ -76,7 +76,7 @@ protected:
// -------------------------------------------------------------------------
class LIBKDCRAW_EXPORT RSqueezedClickLabel : public KSqueezedTextLabel
class KDCRAW_EXPORT RSqueezedClickLabel : public KSqueezedTextLabel
{
Q_OBJECT
@ -100,7 +100,7 @@ protected:
// -------------------------------------------------------------------------
class LIBKDCRAW_EXPORT RArrowClickLabel : public QWidget
class KDCRAW_EXPORT RArrowClickLabel : public QWidget
{
Q_OBJECT
@ -133,7 +133,7 @@ protected:
// -------------------------------------------------------------------------
class LIBKDCRAW_EXPORT RLabelExpander : public QWidget
class KDCRAW_EXPORT RLabelExpander : public QWidget
{
Q_OBJECT
@ -187,7 +187,7 @@ private:
// -------------------------------------------------------------------------
class LIBKDCRAW_EXPORT RExpanderBox : public QScrollArea
class KDCRAW_EXPORT RExpanderBox : public QScrollArea
{
Q_OBJECT
@ -272,7 +272,7 @@ private:
// -------------------------------------------------------------------------
class LIBKDCRAW_EXPORT RExpanderBoxExclusive : public RExpanderBox
class KDCRAW_EXPORT RExpanderBoxExclusive : public RExpanderBox
{
Q_OBJECT

6
kdcraw/libkdcraw/rnuminput.h
View file

@ -35,12 +35,12 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
class LIBKDCRAW_EXPORT RIntNumInput : public KHBox
class KDCRAW_EXPORT RIntNumInput : public KHBox
{
Q_OBJECT
@ -81,7 +81,7 @@ private:
// ---------------------------------------------------------
class LIBKDCRAW_EXPORT RDoubleNumInput : public KHBox
class KDCRAW_EXPORT RDoubleNumInput : public KHBox
{
Q_OBJECT

4
kdcraw/libkdcraw/squeezedcombobox.h
View file

@ -37,7 +37,7 @@
// Local includes
#include "libkdcraw_export.h"
#include "kdcraw_export.h"
namespace KDcrawIface
{
@ -50,7 +50,7 @@ namespace KDcrawIface
* possible to show the complete item, it will be shortened
* and "..." will be prepended.
*/
class LIBKDCRAW_EXPORT SqueezedComboBox : public QComboBox
class KDCRAW_EXPORT SqueezedComboBox : public QComboBox
{
Q_OBJECT

4
kdeclarative/CMakeLists.txt
View file

@ -49,10 +49,12 @@ if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
generate_export_header(kdeclarative)
install(
FILES
kdeclarative.h
kdeclarative_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdeclarative_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel
)

40
kdeclarative/kdeclarative_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright 2007 Aaron Seigo <aseigo@kde.org>
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 KDECLARATIVE_EXPORT_H
#define KDECLARATIVE_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDECLARATIVE_EXPORT
# if defined(MAKE_KDECLARATIVE_LIB)
/* We are building this library */
# define KDECLARATIVE_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDECLARATIVE_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KDECLARATIVE_EXPORT_DEPRECATED
# define KDECLARATIVE_EXPORT_DEPRECATED KDE_DEPRECATED KDECLARATIVE_EXPORT
# endif
#endif

4
kdecore/CMakeLists.txt
View file

@ -368,6 +368,8 @@ install(TARGETS kde4-config ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
generate_export_header(kdecore)
install(
FILES
localization/entry.desktop
@ -384,7 +386,7 @@ install(
install(
FILES
kdecore_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdecore_export.h
compression/kfilterbase.h
compression/kfilterdev.h
config/kconfig.h

2
kdecore/io/kdebug.h
View file

@ -83,7 +83,7 @@ KDECORE_EXPORT QString kRealBacktrace(int);
* \relates KGlobal
* Returns a backtrace.
* Note: Hidden symbol visibility may negatively affect the information provided
* by kBacktrace - you may want to pass -D__KDE_HAVE_GCC_VISIBILITY=0 to cmake
* by kBacktrace - you may want to pass -DCXX_VISIBILITY_PRESET=FALSE to CMake
* to turn hidden symbol visibility off.
* @param levels the number of levels of the backtrace
* @return a backtrace

40
kdecore/kdecore_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KDECORE_EXPORT_H
#define KDECORE_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDECORE_EXPORT
# if defined(MAKE_KDECORE_LIB)
/* We are building this library */
# define KDECORE_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDECORE_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KDECORE_EXPORT_DEPRECATED
# define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT
# endif
#endif

12
kdecore/kernel/kauthorized.h
View file

@ -38,7 +38,7 @@ namespace KAuthorized
* @return true if the action is authorized
* @todo what are the generic actions?
*/
KDE_EXPORT bool authorize(const QString& genericAction);
KDECORE_EXPORT bool authorize(const QString& genericAction);
/**
* Returns whether a certain KAction is authorized.
@ -47,7 +47,7 @@ namespace KAuthorized
* with "action/" before being passed to authorize()
* @return true if the KAction is authorized
*/
KDE_EXPORT bool authorizeKAction(const QString& action);
KDECORE_EXPORT bool authorizeKAction(const QString& action);
/**
* Returns whether a certain URL related action is authorized.
@ -61,7 +61,7 @@ namespace KAuthorized
* @param destUrl The object of the action
* @return true when the action is authorized, false otherwise.
*/
KDE_EXPORT bool authorizeUrlAction(const QString& action, const KUrl& baseUrl, const KUrl& destUrl);
KDECORE_EXPORT bool authorizeUrlAction(const QString& action, const KUrl& baseUrl, const KUrl& destUrl);
/**
* Allow a certain URL action. This can be useful if your application
@ -71,7 +71,7 @@ namespace KAuthorized
* @param baseUrl The url where the action originates from
* @param _destUrl The object of the action
*/
KDE_EXPORT void allowUrlAction(const QString& action, const KUrl& baseUrl, const KUrl& _destUrl);
KDECORE_EXPORT void allowUrlAction(const QString& action, const KUrl& baseUrl, const KUrl& _destUrl);
/**
* Returns whether access to a certain control module is authorized.
@ -79,7 +79,7 @@ namespace KAuthorized
* @param menuId identifying the control module, e.g. kde-mouse.desktop
* @return true if access to the module is authorized, false otherwise.
*/
KDE_EXPORT bool authorizeControlModule(const QString& menuId);
KDECORE_EXPORT bool authorizeControlModule(const QString& menuId);
/**
* Returns which control modules from a given list are authorized for access.
@ -88,7 +88,7 @@ namespace KAuthorized
* an example of a menu-id is kde-mouse.desktop.
* @return Those control modules for which access has been authorized.
*/
KDE_EXPORT QStringList authorizeControlModules(const QStringList& menuIds);
KDECORE_EXPORT QStringList authorizeControlModules(const QStringList& menuIds);
}

6
kdecore/localization/klocale.h
View file

@ -753,7 +753,7 @@ public:
*
* @return If nouns are declined
*/
KDE_DEPRECATED bool nounDeclension() const;
KDECORE_DEPRECATED bool nounDeclension() const;
//KDE5 move to KDateTime namespace
/**
@ -1113,7 +1113,7 @@ public:
* @see calendarSystem()
* @return the name of the calendar system
*/
KDE_DEPRECATED QString calendarType() const;
KDECORE_DEPRECATED QString calendarType() const;
/**
* @since 4.6
@ -1136,7 +1136,7 @@ public:
* @see setCalendarSystem()
* @param calendarType the name of the calendar type
*/
KDE_DEPRECATED void setCalendar(const QString & calendarType);
KDECORE_DEPRECATED void setCalendar(const QString & calendarType);
/**
* @since 4.6

4
kdecore/util/kexportplugin.h
View file

@ -50,7 +50,7 @@ struct KDEPluginVerificationData
* \see KDEPluginVerificationData
*/
#define K_PLUGIN_VERIFICATION_DATA \
Q_EXTERN_C KDE_EXPORT const KDEPluginVerificationData kde_plugin_verification_data = \
Q_EXTERN_C Q_DECL_EXPORT const KDEPluginVerificationData kde_plugin_verification_data = \
{ KDEPluginVerificationData::PluginVerificationDataVersion, KDE_VERSION, KDE_VERSION_STRING };
/**
@ -59,7 +59,7 @@ Q_EXTERN_C KDE_EXPORT const KDEPluginVerificationData kde_plugin_verification_da
* You can later access the version number with KPluginLoader::pluginVersion()
*/
#define K_EXPORT_PLUGIN_VERSION(version) \
Q_EXTERN_C KDE_EXPORT const quint32 kde_plugin_version = version;
Q_EXTERN_C Q_DECL_EXPORT const quint32 kde_plugin_version = version;
/**

1
kdecore/util/ksharedptr.h
View file

@ -29,7 +29,6 @@
#include <QtCore/qsharedpointer.h>
#include <QtCore/qatomic.h>
#include <kdemacros.h>
/**
* \class KSharedPtr ksharedptr.h <KSharedPtr>

1
kdecore/util/kshell.h
View file

@ -22,6 +22,7 @@
#define KSHELL_H
#include <kdecore_export.h>
#include <qglobal.h>
class QStringList;
class QString;

20
kdemacros.h.cmake
View file

@ -30,8 +30,6 @@
#include <QtCore/qglobal.h>
#cmakedefine __KDE_HAVE_GCC_VISIBILITY
/**
* @def KDE_NO_EXPORT
* @ingroup KDEMacros
@ -71,14 +69,16 @@
* @ingroup KDEMacros
*/
#ifdef __KDE_HAVE_GCC_VISIBILITY
#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
#define KDE_EXPORT __attribute__ ((visibility("default")))
#define KDE_IMPORT __attribute__ ((visibility("default")))
#else
#define KDE_NO_EXPORT
#define KDE_EXPORT
#define KDE_IMPORT
#ifndef KDE_NO_EXPORT
# define KDE_NO_EXPORT Q_DECL_HIDDEN
#endif
#ifndef KDE_EXPORT
#define KDE_EXPORT Q_DECL_EXPORT
#endif
#ifndef KDE_IMPORT
#define KDE_IMPORT Q_DECL_IMPORT
#endif
/**

4
kdesu/CMakeLists.txt
View file

@ -64,9 +64,11 @@ install(TARGETS kdesu_stub DESTINATION ${LIBEXEC_INSTALL_DIR})
########### install files ###############
generate_export_header(kdesu)
install(
FILES
kdesu_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdesu_export.h
client.h
process.h
su.h

36
kdesu/kdesu_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KDESU_EXPORT_H
#define KDESU_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDESU_EXPORT
# if defined(MAKE_KDESU_LIB)
/* We are building this library */
# define KDESU_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDESU_EXPORT KDE_IMPORT
# endif
#endif
#endif

4
kdeui/CMakeLists.txt
View file

@ -415,6 +415,8 @@ set_target_properties(kdeui PROPERTIES
########### install files ###############
generate_export_header(kdeui)
install(
TARGETS kdeui
EXPORT kdelibsLibraryTargets
@ -447,7 +449,7 @@ install(
install(
FILES
kdeui_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdeui_export.h
actions/kactioncollection.h
actions/kactioncategory.h
actions/kaction.h

1
kdeui/fonts/kfontutils.h
View file

@ -24,6 +24,7 @@
#define KFONTMETRICS_H
#include "kdeui_export.h"
#include <qglobal.h>
class QPainter;
class QSizeF;

40
kdeui/kdeui_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KDEUI_EXPORT_H
#define KDEUI_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDEUI_EXPORT
# if defined(MAKE_KDEUI_LIB)
/* We are building this library */
# define KDEUI_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDEUI_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KDEUI_EXPORT_DEPRECATED
# define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT
# endif
#endif

10
kdeui/kernel/kapplication.cpp
View file

@ -397,15 +397,12 @@ void KApplicationPrivate::preqapplicationhack()
KGlobal::config(); // initialize qt plugin path (see KComponentDataPrivate::lazyInit)
}
#ifdef Q_WS_X11
int KApplication::xioErrhandler( Display* dpy )
{
if(kapp)
{
#ifdef Q_WS_X11
d->oldXIOErrorHandler( dpy );
#else
Q_UNUSED(dpy);
#endif
}
exit( 1 );
return 0;
@ -413,7 +410,6 @@ int KApplication::xioErrhandler( Display* dpy )
int KApplication::xErrhandler( Display* dpy, void* err_ )
{ // no idea how to make forward decl. for XErrorEvent
#ifdef Q_WS_X11
XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
if(kapp)
{
@ -424,7 +420,6 @@ int KApplication::xErrhandler( Display* dpy, void* err_ )
if (!fatalXError.isEmpty()) {
abort();
}
#endif
return 0;
}
@ -432,12 +427,11 @@ void KApplication::iceIOErrorHandler( _IceConn *conn )
{
emit aboutToQuit();
#ifdef Q_WS_X11
if ( d->oldIceIOErrorHandler != NULL )
(*d->oldIceIOErrorHandler)( conn );
#endif
exit( 1 );
}
#endif // Q_WS_X11
void KApplicationPrivate::init(bool GUIenabled)
{

9
kdeui/kernel/kapplication.h
View file

@ -25,12 +25,6 @@
class KConfig;
typedef unsigned long Atom;
#if !defined(Q_WS_X11)
typedef void Display;
#endif
#include <QtGui/QApplication>
#include <kcomponentdata.h>
#include <kglobal.h>
@ -275,7 +269,7 @@ public:
*/
void updateRemoteUserTimestamp( const QString& service, int time = 0 );
#ifdef Q_WS_X11
/**
@internal
*/
@ -295,6 +289,7 @@ public:
* @internal
*/
void iceIOErrorHandler( _IceConn *conn );
#endif // Q_WS_X11
/**
* @internal

1
kdeui/sonnet/highlighter.h
View file

@ -23,7 +23,6 @@
#include <QtGui/QSyntaxHighlighter>
#include <QtCore/QStringList>
#include <kdemacros.h>
#include <kdeui_export.h>
class QTextEdit;

1
kdeui/util/kcrash.h
View file

@ -23,6 +23,7 @@
#define KCRASH_H
#include <kdeui_export.h>
#include <qglobal.h>
class QString;

1
kdeui/util/kkeyserver.h
View file

@ -24,6 +24,7 @@
#define KKEYSERVER_H
#include <kdeui_export.h>
#include <qglobal.h>
#if defined Q_WS_X11 /*or defined Q_WS_WIN*/
#include "kkeyserver_x11.h"

2
kdeui/widgets/kstringvalidator.h
View file

@ -151,7 +151,7 @@ class KDEUI_EXPORT KStringListValidator : public QValidator
* @deprecated
* @author Marc Mutz <mutz@kde.org>
**/
class KDEUI_EXPORT_DEPRECATED KMimeTypeValidator : public QValidator
class KDEUI_DEPRECATED_EXPORT KMimeTypeValidator : public QValidator
{
Q_OBJECT

14
kdewebkit/CMakeLists.txt
View file

@ -24,18 +24,12 @@ set(kdewebkit_LIB_SRCS
add_library(kdewebkit ${LIBRARY_TYPE} ${kdewebkit_LIB_SRCS})
target_link_libraries(kdewebkit PRIVATE
target_link_libraries(kdewebkit
${KDE4_KPARTS_LIBS}
${KDE4_KDEUI_LIBS}
)
target_link_libraries(kdewebkit PUBLIC
kparts
kio
kdecore
${KDE4_KIO_LIBS}
${QT_QTWEBKIT_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
)
set_target_properties(kdewebkit PROPERTIES
@ -43,6 +37,8 @@ set_target_properties(kdewebkit PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)
generate_export_header(kdewebkit)
install(
TARGETS kdewebkit
EXPORT kdelibsLibraryTargets
@ -51,7 +47,7 @@ install(
install(
FILES
kdewebkit_export.h
${CMAKE_CURRENT_BINARY_DIR}/kdewebkit_export.h
kwebwallet.h
kgraphicswebview.h
kwebpluginfactory.h

43
kdewebkit/kdewebkit_export.h
View file

@ -1,43 +0,0 @@
/*
* This file is part of the KDE project.
*
* Copyright (C) 2009 Urs Wolfer <uwolfer @ kde.org>
*
* 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 KDEWEBKIT_EXPORT_H
#define KDEWEBKIT_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KDEWEBKIT_EXPORT
# if defined(MAKE_KDEWEBKIT_LIB)
/* We are building this library */
# define KDEWEBKIT_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KDEWEBKIT_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KDEWEBKIT_EXPORT_DEPRECATED
# define KDEWEBKIT_EXPORT_DEPRECATED KDE_DEPRECATED KDEWEBKIT_EXPORT
# endif
#endif // KDEWEBKIT_EXPORT_H

1
kdewebkit/kwebkitpart/src/sslinfodialog_p.h
View file

@ -21,7 +21,6 @@
#ifndef SSLINFODIALOG_P_H
#define SSLINFODIALOG_P_H
#include <kdemacros.h>
#include <kdialog.h>
#include <ktcpsocket.h>

2
kdewebkit/kwebkitpart/src/websslinfo.h
View file

@ -20,8 +20,6 @@
#ifndef WEBSSLINFO_H
#define WEBSSLINFO_H
#include <kdemacros.h>
#include <QUrl>
#include <QHostAddress>
#include <QSslCertificate>

4
kexiv2/libkexiv2/CMakeLists.txt
View file

@ -79,17 +79,19 @@ install(
DESTINATION ${DATA_INSTALL_DIR}/libkexiv2/data
)
generate_export_header(kexiv2)
install(
FILES
kexiv2.h
kexiv2data.h
kexiv2previews.h
libkexiv2_export.h
msgtextedit.h
subjectwidget.h
altlangstredit.h
countryselector.h
rotationmatrix.h
${CMAKE_CURRENT_BINARY_DIR}/kexiv2_export.h
${CMAKE_CURRENT_BINARY_DIR}/version.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkexiv2
COMPONENT Devel

2
kexiv2/libkexiv2/altlangstredit.h
View file

@ -33,7 +33,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
#include "kexiv2.h"
namespace KExiv2Iface

2
kexiv2/libkexiv2/countryselector.h
View file

@ -37,7 +37,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
namespace KExiv2Iface
{

1
kexiv2/libkexiv2/kexiv2.h
View file

@ -52,7 +52,6 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2data.h"
namespace KExiv2Iface

2
kexiv2/libkexiv2/kexiv2data.h
View file

@ -34,7 +34,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
namespace KExiv2Iface
{

2
kexiv2/libkexiv2/kexiv2previews.h
View file

@ -36,7 +36,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
class QImage;

47
kexiv2/libkexiv2/libkexiv2_export.h
View file

@ -1,47 +0,0 @@
/** ===========================================================
* @file
*
* This file is part of the KDE project
*
* @brief Helper for exporting functions/classes from the shared library
*
* @author Copyright (C) 2007 David Faure <faure@kde.org>
*
* 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 LIBKEXIV2_EXPORT_H
#define LIBKEXIV2_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KEXIV2_EXPORT
# if defined(MAKE_KEXIV2_LIB)
/* We are building this library */
# define KEXIV2_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KEXIV2_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KEXIV2_EXPORT_DEPRECATED
# define KEXIV2_EXPORT_DEPRECATED KDE_DEPRECATED KEXIV2_EXPORT
# endif
#endif

2
kexiv2/libkexiv2/msgtextedit.h
View file

@ -37,7 +37,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
namespace KExiv2Iface
{

1
kexiv2/libkexiv2/rotationmatrix.h
View file

@ -35,7 +35,6 @@
// Local includes
#include "kexiv2.h"
#include "libkexiv2_export.h"
namespace KExiv2Iface
{

2
kexiv2/libkexiv2/subjectwidget.h
View file

@ -45,7 +45,7 @@
// Local includes
#include "libkexiv2_export.h"
#include "kexiv2_export.h"
namespace KExiv2Iface
{

4
kfile/CMakeLists.txt
View file

@ -64,6 +64,8 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(kfile)
install(
FILES
kdiroperator.h
@ -78,7 +80,7 @@ install(
kurlnavigator.h
knewfilemenu.h
knameandurlinputdialog.h
kfile_export.h
${CMAKE_CURRENT_BINARY_DIR}/kfile_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel
)

40
kfile/kfile_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KFILE_EXPORT_H
#define KFILE_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KFILE_EXPORT
# if defined(MAKE_KFILE_LIB)
/* We are building this library */
# define KFILE_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KFILE_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KFILE_EXPORT_DEPRECATED
# define KFILE_EXPORT_DEPRECATED KDE_DEPRECATED KFILE_EXPORT
# endif
#endif

2
kimgio/pcx.h
View file

@ -10,8 +10,6 @@
#ifndef PCX_H
#define PCX_H
#include <kdemacros.h>
#include <QtGui/qimageiohandler.h>
#include <QtCore/QDataStream>
#include <QtGui/QColor>

2
kinit/CMakeLists.txt
View file

@ -76,7 +76,7 @@ install(TARGETS kshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
add_executable(lnusertemp lnusertemp.c)
target_link_libraries(lnusertemp kdefakes)
target_link_libraries(lnusertemp ${KDE4_KDECORE_LIBS})
install(TARGETS lnusertemp DESTINATION ${LIBEXEC_INSTALL_DIR})

1
kinit/kinit.cpp
View file

@ -55,7 +55,6 @@
#include <QtCore/QRegExp>
#include <QtGui/QFont>
#include <kcomponentdata.h>
#include <kdemacros.h>
#include <kstandarddirs.h>
#include <kglobal.h>
#include <kconfig.h>

4
kio/CMakeLists.txt
View file

@ -306,9 +306,11 @@ install(
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
generate_export_header(kio)
install(
FILES
kio/kio_export.h
${CMAKE_CURRENT_BINARY_DIR}/kio_export.h
kio/accessmanager.h
kio/connection.h
kio/slaveinterface.h

1
kio/bookmarks/kbookmarkimporter_ie.h
View file

@ -23,7 +23,6 @@
#include <QtCore/QStringList>
#include <kconfig.h>
#include <kdemacros.h>
#include <kbookmarkimporter.h>
#include <kbookmarkexporter.h>

1
kio/bookmarks/kbookmarkimporter_ns.h
View file

@ -23,7 +23,6 @@
#include <QtCore/QStringList>
#include <kconfig.h>
#include <kdemacros.h>
#include "kbookmarkimporter.h"
#include "kbookmarkexporter.h"

1
kio/kfile/kpropertiesdialog.h
View file

@ -26,7 +26,6 @@
#include <QtCore/QString>
#include <kdemacros.h>
#include <kurl.h>
#include <kfileitem.h>
#include <kpagedialog.h>

4
kio/kio/connection.h
View file

@ -22,10 +22,10 @@
#ifndef KIO_CONNECTION_H
#define KIO_CONNECTION_H
#if defined(MAKE_KIO_LIB) || defined(MAKE_KLAUNCHER)
#if defined(kio_EXPORTS) || defined(MAKE_KLAUNCHER)
# define KIO_CONNECTION_EXPORT KIO_EXPORT
#else
# define KIO_CONNECTION_EXPORT KIO_EXPORT_DEPRECATED
# define KIO_CONNECTION_EXPORT KIO_DEPRECATED_EXPORT
#endif
#include "kio_export.h"

40
kio/kio/kio_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KIO_EXPORT_H
#define KIO_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KIO_EXPORT
# if defined(MAKE_KIO_LIB)
/* We are building this library */
# define KIO_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KIO_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KIO_EXPORT_DEPRECATED
# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
# endif
#endif

2
kio/kio/ksambashare.h
View file

@ -112,7 +112,7 @@ public:
*
* @deprecated
*/
KDE_DEPRECATED QString smbConfPath() const;
KIO_DEPRECATED QString smbConfPath() const;
Q_SIGNALS:
/**

4
kio/kio/metainfojob.h
View file

@ -112,7 +112,7 @@ namespace KIO {
* @return the MetaInfoJob to retrieve the items
* @deprecated use strigi or KFileMetaInfo
*/
KIO_EXPORT_DEPRECATED MetaInfoJob* fileMetaInfo(const KFileItemList& items);
KIO_DEPRECATED_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);
/**
* Retrieves meta information for the given items.
@ -121,7 +121,7 @@ namespace KIO {
* @return the MetaInfoJob to retrieve the items
* @deprecated use strigi or KFileMetaInfo
*/
KIO_EXPORT_DEPRECATED MetaInfoJob* fileMetaInfo(const KUrl::List& items);
KIO_DEPRECATED_EXPORT MetaInfoJob* fileMetaInfo(const KUrl::List& items);
}
#endif

2
kio/kio/paste.h
View file

@ -102,7 +102,7 @@ namespace KIO {
* Note that you'll have to tell the user in case of an error (no data to paste),
* while pasteMimeSource did that.
*/
KIO_EXPORT_DEPRECATED CopyJob* pasteMimeSource( const QMimeData* data, const KUrl& destURL,
KIO_DEPRECATED_EXPORT CopyJob* pasteMimeSource( const QMimeData* data, const KUrl& destURL,
const QString& dialogText, QWidget* widget,
bool clipboard = false );

4
kio/kio/slaveinterface.h
View file

@ -130,7 +130,7 @@ public:
* @since 4.8.2
* @deprecated
*/
KDE_DEPRECATED QWidget* window() const;
KIO_DEPRECATED QWidget* window() const;
/**
* Sets the top level window used as a parent when displaying
@ -139,7 +139,7 @@ public:
* @since 4.8.2
* @deprecated
*/
KDE_DEPRECATED void setWindow(QWidget* window);
KIO_DEPRECATED void setWindow(QWidget* window);
Q_SIGNALS:
///////////

2
kio/kio/thumbcreator.cpp
View file

@ -19,6 +19,8 @@
#include "thumbcreator.h"
#include <qglobal.h>
ThumbCreator::~ThumbCreator()
{
}

2
kio/kio/thumbsequencecreator.h
View file

@ -22,6 +22,8 @@
#include "thumbcreator.h"
#include <qglobal.h>
/**
* @see ThumbCreator
*

4
kio/misc/kntlm/CMakeLists.txt
View file

@ -15,9 +15,11 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(kntlm)
install(
FILES
kntlm_export.h
${CMAKE_CURRENT_BINARY_DIR}/kntlm_export.h
kntlm.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kio
COMPONENT Devel

40
kio/misc/kntlm/kntlm_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KNTLM_EXPORT_H
#define KNTLM_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KNTLM_EXPORT
# if defined(MAKE_KNTLM_LIB)
/* We are building this library */
# define KNTLM_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KNTLM_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KNTLM_EXPORT_DEPRECATED
# define KNTLM_EXPORT_DEPRECATED KDE_DEPRECATED KNTLM_EXPORT
# endif
#endif

2
kioslave/file/CMakeLists.txt
View file

@ -30,3 +30,5 @@ install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ###############
install(FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR})
generate_export_header(kio_file)

2
kioslave/file/file.h
View file

@ -23,7 +23,7 @@
#ifndef __file_h__
#define __file_h__
#include "kioslave_file_export.h"
#include "kio_file_export.h"
#include <kio/global.h>
#include <kio/slavebase.h>

40
kioslave/file/kioslave_file_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KIOSLAVE_FILE_EXPORT_H
#define KIOSLAVE_FILE_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KIOSLAVE_FILE_EXPORT
# if defined(MAKE_KIOSLAVE_FILE_LIB) || defined(MAKE_KIO_FILE_LIB)
/* We are building this library */
# define KIOSLAVE_FILE_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KIOSLAVE_FILE_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KIOSLAVE_FILE_EXPORT_DEPRECATED
# define KIOSLAVE_FILE_EXPORT_DEPRECATED KDE_DEPRECATED KIOSLAVE_FILE_EXPORT
# endif
#endif

4
knotify/CMakeLists.txt
View file

@ -40,9 +40,11 @@ install(
########### install files ###############
generate_export_header(knotifyconfig)
install(
FILES
knotifyconfig_export.h
${CMAKE_CURRENT_BINARY_DIR}/knotifyconfig_export.h
knotifyconfigwidget.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel

36
knotify/knotifyconfig_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KNOTIFYCONFIG_EXPORT_H
#define KNOTIFYCONFIG_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KNOTIFYCONFIG_EXPORT
# if defined(MAKE_KNOTIFYCONFIG_LIB)
/* We are building this library */
# define KNOTIFYCONFIG_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KNOTIFYCONFIG_EXPORT KDE_IMPORT
# endif
#endif
#endif

4
kparts/CMakeLists.txt
View file

@ -60,9 +60,11 @@ install(
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
generate_export_header(kparts)
install(
FILES
kparts_export.h
${CMAKE_CURRENT_BINARY_DIR}/kparts_export.h
part.h
plugin.h
partmanager.h

36
kparts/kparts_export.h
View file

@ -1,36 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2006 David Faure <faure@kde.org>
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 KPARTS_EXPORT_H
#define KPARTS_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KPARTS_EXPORT
# if defined(MAKE_KPARTS_LIB)
/* We are building this library */
# define KPARTS_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KPARTS_EXPORT KDE_IMPORT
# endif
#endif
#endif

4
kpty/CMakeLists.txt
View file

@ -26,9 +26,11 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(kpty)
install(
FILES
kpty_export.h
${CMAKE_CURRENT_BINARY_DIR}/kpty_export.h
kpty.h
kptydevice.h
kptyprocess.h

2
kpty/kpty.h
View file

@ -23,6 +23,8 @@
#include "kpty_export.h"
#include <qglobal.h>
class KPtyPrivate;
struct termios;

40
kpty/kpty_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KPTY_EXPORT_H
#define KPTY_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KPTY_EXPORT
# if defined(MAKE_KDECORE_LIB)
/* We are building this library */
# define KPTY_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KPTY_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KPTY_EXPORT_DEPRECATED
# define KPTY_EXPORT_DEPRECATED KDE_DEPRECATED KPTY_EXPORT
# endif
#endif

4
kross/core/CMakeLists.txt
View file

@ -34,9 +34,11 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(krosscore BASE_NAME KROSS)
install(
FILES
kross_export.h
${CMAKE_CURRENT_BINARY_DIR}/kross_export.h
krossconfig.h
errorinterface.h
childreninterface.h

64
kross/core/kross_export.h
View file

@ -1,64 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
Copyright (C) 2007 Sebastian Sauer <mail@dipe.org>
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 KROSS_EXPORT_H
#define KROSS_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KROSS_EXPORT
# if defined(MAKE_KROSS_LIB)
/* We are building this library */
# define KROSS_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KROSS_EXPORT KDE_IMPORT
# endif
#endif
#ifndef KROSSCORE_EXPORT
# if defined(MAKE_KROSSCORE_LIB)
/* We are building this library */
# define KROSSCORE_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KROSSCORE_EXPORT KDE_IMPORT
# endif
#endif
#ifndef KROSSUI_EXPORT
# if defined(MAKE_KROSSUI_LIB)
/* We are building this library */
# define KROSSUI_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KROSSUI_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KROSS_EXPORT_DEPRECATED
# define KROSS_EXPORT_DEPRECATED KDE_DEPRECATED KROSS_EXPORT
# endif
# ifndef KROSSCORE_EXPORT_DEPRECATED
# define KROSSCORE_EXPORT_DEPRECATED KDE_DEPRECATED KROSSCORE_EXPORT
# endif
#endif

5
kross/qts/plugin.h
View file

@ -29,11 +29,12 @@
//#include <QtGui/QAction>
//#include <QtCore/QUrl>
#include <kdemacros.h>
//#include "errorinterface.h"
//#include "childreninterface.h"
#define KROSSQTSPLUGIN_EXPORT KDE_EXPORT
#include <kross_export.h>
#define KROSSQTSPLUGIN_EXPORT KROSS_EXPORT
namespace Kross {

4
kunitconversion/CMakeLists.txt
View file

@ -89,13 +89,15 @@ install(
${INSTALL_TARGETS_DEFAULT_ARGS}
)
generate_export_header(kunitconversion)
install(
FILES
converter.h
value.h
unit.h
unitcategory.h
kunitconversion_export.h
${CMAKE_CURRENT_BINARY_DIR}/kunitconversion_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion
COMPONENT Devel
)

40
kunitconversion/kunitconversion_export.h
View file

@ -1,40 +0,0 @@
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
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 KUNITCONVERSION_EXPORT_H
#define KUNITCONVERSION_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KUNITCONVERSION_EXPORT
# if defined(MAKE_KUNITCONVERSION_LIB)
/* We are building this library */
# define KUNITCONVERSION_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KUNITCONVERSION_EXPORT KDE_IMPORT
# endif
#endif
# ifndef KUNITCONVERSION_EXPORT_DEPRECATED
# define KUNITCONVERSION_EXPORT_DEPRECATED KDE_DEPRECATED KUNITCONVERSION_EXPORT
# endif
#endif

8
kutils/CMakeLists.txt
View file

@ -34,9 +34,11 @@ install(
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
generate_export_header(kemoticons)
install(
FILES
kemoticons_export.h
${CMAKE_CURRENT_BINARY_DIR}/kemoticons_export.h
kemoticons/kemoticons.h
kemoticons/kemoticonstheme.h
kemoticons/kemoticonsprovider.h
@ -106,9 +108,11 @@ set_target_properties(kidletime PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)
generate_export_header(kidletime)
install(
FILES
kidletime_export.h
${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
kidletime/kidletime.h
DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel

Some files were not shown because too many files have changed in this diff Show more