[kdelibs4support] /: Rename KDE4Support -> KDELibs4Support
Alex Merry
alex.merry at kde.org
Thu Apr 10 15:07:29 UTC 2014
Git commit cb01fc274d4c0e907d27a1cd7fc80bbca9c1dbcd by Alex Merry.
Committed on 09/04/2014 at 17:04.
Pushed by alexmerry into branch 'master'.
Rename KDE4Support -> KDELibs4Support
CCMAIL: kde-frameworks-devel at kde.org
M +1 -1 .reviewboardrc
M +31 -21 CMakeLists.txt
R +9 -9 KF5KDELibs4SupportConfig.cmake.in [from: KF5KDE4SupportConfig.cmake.in - 082% similarity]
M +4 -4 README.md
M +14 -14 autotests/CMakeLists.txt
M +2 -2 autotests/kdatetimetest.cpp
M +1 -1 autotests/kfilemetainfotest.cpp
M +13 -13 autotests/kstandarddirstest.cpp
M +1 -1 autotests/ktimezonestest.cpp
M +5 -5 cmake/modules/FindKF5Transitional.cmake
M +5 -14 cmake/modules/KDE4Macros.cmake
R +0 -0 kdelibs4support.yaml [from: kde4support.yaml - 100% similarity]
M +38 -37 src/CMakeLists.txt
R +0 -0 src/config-kdelibs4support.h.cmake [from: src/config-kde4support.h.cmake - 100% similarity]
M +30 -30 src/includes/CMakeLists.txt
M +1 -1 src/kdebugdialog/CMakeLists.txt
M +2 -2 src/kdecore/k3bufferedsocket.h
M +2 -2 src/kdecore/k3clientsocketbase.h
M +3 -3 src/kdecore/k3resolver.h
M +1 -1 src/kdecore/k3resolverstandardworkers_p.h
M +1 -1 src/kdecore/k3reverseresolver.h
M +1 -1 src/kdecore/k3serversocket.h
M +1 -1 src/kdecore/k3socketaddress.cpp
M +5 -5 src/kdecore/k3socketaddress.h
M +4 -4 src/kdecore/k3socketbase.h
M +1 -1 src/kdecore/k3socketdevice.cpp
M +1 -1 src/kdecore/k3socketdevice.h
M +1 -1 src/kdecore/k3streamsocket.h
M +5 -5 src/kdecore/k4aboutdata.h
M +4 -4 src/kdecore/kascii.h
M +18 -18 src/kdecore/kcalendarsystem.h
M +1 -1 src/kdecore/kcmdlineargs.cpp
M +4 -4 src/kdecore/kcmdlineargs.h
M +5 -5 src/kdecore/kcomponentdata.h
M +2 -2 src/kdecore/kdatetime.cpp
M +11 -11 src/kdecore/kdatetime.h
M +1 -1 src/kdecore/kdayperiod_p.h
D +0 -15 src/kdecore/kde4support_export.h
M +10 -10 src/kdecore/kde_file.h
M +1 -1 src/kdecore/kdebug.cpp
M +20 -20 src/kdecore/kdebug.h
A +15 -0 src/kdecore/kdelibs4support_export.h [License: UNKNOWN] *
M +11 -11 src/kdecore/kdeversion.h
M +1 -1 src/kdecore/kgenericfactory.h
M +1 -1 src/kdecore/kglobal.cpp
M +23 -23 src/kdecore/kglobal.h
M +4 -4 src/kdecore/kkernel_mac.h
M +5 -5 src/kdecore/kkernel_win.h
M +1 -1 src/kdecore/klibloader.cpp
M +5 -5 src/kdecore/klibloader.h
M +4 -4 src/kdecore/klibrary.h
M +7 -7 src/kdecore/klocale.h
M +8 -8 src/kdecore/klocalizeddate.h
M +2 -2 src/kdecore/klockfile.h
M +2 -2 src/kdecore/kmd5.h
M +3 -3 src/kdecore/kmimetype.h
M +1 -1 src/kdecore/kmimetyperepository_p.h
M +1 -1 src/kdecore/ksavefile.cpp
M +2 -2 src/kdecore/ksavefile.h
M +3 -3 src/kdecore/ksharedptr.h
M +14 -14 src/kdecore/ksocketfactory.h
M +2 -2 src/kdecore/kstandarddirs.cpp
M +13 -13 src/kdecore/kstandarddirs.h
M +2 -2 src/kdecore/kstringhandler_deprecated.h
M +1 -1 src/kdecore/ksystemtimezone.cpp
M +5 -5 src/kdecore/ksystemtimezone.h
M +1 -1 src/kdecore/ktempdir.cpp
M +2 -2 src/kdecore/ktempdir.h
M +2 -2 src/kdecore/ktemporaryfile.h
M +9 -9 src/kdecore/ktimezone.h
M +3 -3 src/kdecore/ktimezone_win.h
M +5 -5 src/kdecore/ktzfiletimezone.h
M +16 -16 src/kdecore/kurl.h
M +10 -10 src/kdecore/netsupp.h
M +2 -2 src/kdecore/qtest_kde.h
M +1 -1 src/kdecore/syssocket.h
M +1 -1 src/kdedeprecated.widgets
M +2 -2 src/kdeui/k3icon_p.h
M +10 -10 src/kdeui/k4style.h
M +2 -2 src/kdeui/k4timezonewidget.h
M +4 -4 src/kdeui/kaction.h
M +2 -2 src/kdeui/kapplication.cpp
M +10 -10 src/kdeui/kapplication.h
M +2 -2 src/kdeui/karrowbutton.h
M +2 -2 src/kdeui/kbuttongroup.h
M +1 -1 src/kdeui/kcolordialog.cpp
M +4 -4 src/kdeui/kcolordialog.h
M +2 -2 src/kdeui/kcolorhelpers_p.h
M +2 -2 src/kdeui/kcolorvalueselector.h
M +2 -2 src/kdeui/kdatetimewidget.h
M +2 -2 src/kdeui/kdatewidget.h
M +3 -3 src/kdeui/kdeprintdialog.h
M +2 -2 src/kdeui/kdeuiwidgetsproxystyle_p.h
M +1 -1 src/kdeui/kdialog.cpp
M +4 -4 src/kdeui/kdialog.h
M +2 -2 src/kdeui/kdialogbuttonbox.h
M +5 -5 src/kdeui/keditlistbox.h
M +2 -2 src/kdeui/kfadewidgeteffect.h
M +2 -2 src/kdeui/kfontcombobox.h
M +2 -2 src/kdeui/kfontdialog.h
M +1 -1 src/kdeui/kglobalsettings.cpp
M +24 -24 src/kdeui/kglobalsettings.h
M +2 -2 src/kdeui/khbox.h
M +2 -2 src/kdeui/khuesaturationselect.h
M +3 -3 src/kdeui/kicon.h
M +9 -9 src/kdeui/kinputdialog.h
M +2 -2 src/kdeui/klistwidget.h
M +2 -2 src/kdeui/kmenu.h
M +1 -1 src/kdeui/kmenubar.cpp
M +2 -2 src/kdeui/kmenubar.h
M +7 -7 src/kdeui/kmessagebox_queued.h
M +2 -2 src/kdeui/kmessageboxmessagehandler.h
M +1 -1 src/kdeui/knuminput.cpp
M +10 -10 src/kdeui/knuminput.h
M +3 -3 src/kdeui/knumvalidator.h
M +2 -2 src/kdeui/kpassivepopupmessagehandler.h
M +1 -1 src/kdeui/kpixmapcache.cpp
M +2 -2 src/kdeui/kpixmapcache.h
M +2 -2 src/kdeui/kprintpreview.h
M +2 -2 src/kdeui/kprogressdialog.h
M +2 -2 src/kdeui/kpushbutton.h
M +2 -2 src/kdeui/krestrictedline.h
M +2 -2 src/kdeui/ksessionmanager.h
M +2 -2 src/kdeui/kshortcut.h
M +2 -2 src/kdeui/ksplashscreen.h
M +2 -2 src/kdeui/kstatusbar.h
M +2 -2 src/kdeui/kstringvalidator.h
M +1 -1 src/kdeui/ksystemtrayicon.cpp
M +2 -2 src/kdeui/ksystemtrayicon.h
M +12 -12 src/kdeui/ktabbar.h
M +13 -13 src/kdeui/ktabwidget.h
M +2 -2 src/kdeui/ktextbrowser.h
M +2 -2 src/kdeui/kundostack.h
M +1 -1 src/kdeui/kuniqueapplication.cpp
M +3 -3 src/kdeui/kuniqueapplication.h
M +1 -1 src/kdeui/kvbox.h
M +3 -3 src/kdeui/kxerrorhandler.h
M +4 -4 src/kio/kdatatool.h
M +2 -2 src/kio/kdevicelistmodel.h
M +3 -3 src/kio/kdirselectdialog.h
M +2 -2 src/kio/kdiskfreespace.h
M +2 -2 src/kio/kfiledialog.h
M +2 -2 src/kio/kfileitemactionplugin.h
M +1 -1 src/kio/kfilemetadataconfigurationwidget.cpp
M +2 -2 src/kio/kfilemetadataconfigurationwidget.h
M +1 -1 src/kio/kfilemetadataprovider_p.h
M +1 -1 src/kio/kfilemetadatawidget.cpp
M +2 -2 src/kio/kfilemetadatawidget.h
M +1 -1 src/kio/kfilemetainfo.cpp
M +6 -6 src/kio/kfilemetainfo.h
M +1 -1 src/kio/kfilemetainfoitem.cpp
M +3 -3 src/kio/kfilemetainfoitem.h
M +1 -1 src/kio/kfilemetainfoitem_p.h
M +2 -2 src/kio/kfilemetainfowidget.h
M +12 -12 src/kio/kfileshare.h
M +2 -2 src/kio/kfiletreeview_p.h
M +2 -2 src/kio/kfilewriteplugin.h
M +6 -6 src/kio/kimageio.h
M +2 -2 src/kio/kmetaprops.h
M +1 -1 src/kio/knfotranslator.cpp
M +2 -2 src/kio/kpreviewprops.h
M +3 -3 src/kio/kscan.h
M +2 -2 src/kio/metainfojob.cpp
M +4 -4 src/kio/metainfojob.h
M +11 -11 src/kio/netaccess.h
M +2 -2 src/kio/passworddialog.h
M +3 -3 src/kio/predicateproperties.h
M +1 -1 src/kioslave/metainfo/CMakeLists.txt
M +2 -2 src/kparts/factory.h
M +1 -1 src/kparts/genericfactory.h
M +2 -2 src/kssl/kssl.h
M +1 -1 src/kssl/ksslcertchain.h
M +1 -1 src/kssl/ksslcertificate.cpp
M +8 -8 src/kssl/ksslcertificate.h
M +1 -1 src/kssl/ksslutils.h
M +2 -2 src/kssl/ksslx509v3.h
M +4 -4 tests/CMakeLists.txt
The files marked with a * at the end have a non valid license. Please read: http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.
http://commits.kde.org/kde4support/cb01fc274d4c0e907d27a1cd7fc80bbca9c1dbcd
diff --git a/.reviewboardrc b/.reviewboardrc
index 744c806..b28c838 100644
--- a/.reviewboardrc
+++ b/.reviewboardrc
@@ -1,4 +1,4 @@
REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
-REPOSITORY = 'git://anongit.kde.org/kde4support'
+REPOSITORY = 'git://anongit.kde.org/kdelibs4support'
BRANCH = 'master'
TARGET_GROUPS = 'kdeframeworks'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a9be1d..ad26ee4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
-project(KDE4Support)
+project(KDELibs4Support)
find_package(ECM 0.0.12 REQUIRED NO_MODULE)
@@ -52,9 +52,9 @@ endif ()
include(ECMSetupVersion)
include(ECMMarkNonGuiExecutable)
-ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDE4SUPPORT
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kde4support_version.h"
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KDE4SupportConfigVersion.cmake"
+ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDELIBS4SUPPORT
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdelibs4support_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KDELibs4SupportConfigVersion.cmake"
SOVERSION 5)
# QUrl
@@ -67,38 +67,44 @@ remove_definitions(-DQT_USE_QSTRINGBUILDER)
# This one won't be needed when CMake 2.8.13 is depended on.
add_definitions(
- -DKDE4SUPPORT_DEPRECATED= # if KDE4SUPPORT_DEPRECATED is already defined the other deprecated macros won't be defined
- -DKDE4SUPPORT_DEPRECATED_NO_EXPORT=KDE4SUPPORT_NO_EXPORT
- -DKDE4SUPPORT_DEPRECATED_EXPORT=KDE4SUPPORT_EXPORT
+ -DKDELIBS4SUPPORT_DEPRECATED= # if KDELIBS4SUPPORT_DEPRECATED is already defined the other deprecated macros won't be defined
+ -DKDELIBS4SUPPORT_DEPRECATED_NO_EXPORT=KDELIBS4SUPPORT_NO_EXPORT
+ -DKDELIBS4SUPPORT_DEPRECATED_EXPORT=KDELIBS4SUPPORT_EXPORT
)
add_executable(kf5-config kde-config.cpp )
ecm_mark_nongui_executable(kf5-config)
-target_link_libraries(kf5-config KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::KDE4Support)
+target_link_libraries(kf5-config KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::KDELibs4Support)
target_include_directories(kf5-config PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../..")
-install(TARGETS kf5-config EXPORT KF5KDE4SupportTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) # put this for now into the export set KDE4SupportTargets, so that it exists and is not empty
+install(TARGETS kf5-config EXPORT KF5KDELibs4SupportTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) # put this for now into the export set KDELibs4SupportTargets, so that it exists and is not empty
# create a Config.cmake and a ConfigVersion.cmake file and install them
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KDE4Support")
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KDELibs4Support")
include(ECMPackageConfigHelpers)
-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5KDE4SupportConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KDE4SupportConfig.cmake"
- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
- )
+ecm_configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KF5KDELibs4SupportConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KDELibs4SupportConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5KDE4SupportConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KDE4SupportConfigVersion.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel )
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5KDELibs4SupportConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KDELibs4SupportConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ COMPONENT Devel)
-install(EXPORT KF5KDE4SupportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5KDE4SupportTargets.cmake NAMESPACE KF5:: )
+install(EXPORT KF5KDELibs4SupportTargets
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ FILE KF5KDELibs4SupportTargets.cmake
+ NAMESPACE KF5::)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kde4support_version.h
- DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdelibs4support_version.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+ COMPONENT Devel)
add_subdirectory(cmake)
add_subdirectory(docs)
@@ -141,7 +147,11 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake
install(CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake)"
CODE "set(EXPORT_INSTALL_DIR \"${CMAKECONFIG_INSTALL_DIR}\")"
SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" )
-install( EXPORT KF5KDE4SupportTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR} NAMESPACE ${KDE4_TARGET_PREFIX} FILE KF5KDELibs4LibraryTargets.cmake COMPONENT Devel)
+install(EXPORT KF5KDELibs4SupportTargets
+ DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+ NAMESPACE ${KDE4_TARGET_PREFIX}
+ FILE KF5KDELibs4LibraryTargets.cmake
+ COMPONENT Devel)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/KF5KDE4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
similarity index 82%
rename from KF5KDE4SupportConfig.cmake.in
rename to KF5KDELibs4SupportConfig.cmake.in
index ac28a15..55ead33 100644
--- a/KF5KDE4SupportConfig.cmake.in
+++ b/KF5KDELibs4SupportConfig.cmake.in
@@ -21,7 +21,7 @@ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
find_dependency(Qt5PrintSupport @REQUIRED_QT_VERSION@)
-include("${CMAKE_CURRENT_LIST_DIR}/KF5KDE4SupportTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KF5KDELibs4SupportTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/ECMQt4To5Porting.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/KDE4Macros.cmake")
@@ -41,19 +41,19 @@ remove_definitions(
# This is not intended to be a list of what frameworks each of the kde libraries
# was broken into. KDE4_KDECORE_LIBS contains more than what used to be in
# the kdecore library. That is a feature. These things should be big ugly warts
-# in any project using them. The KDE4Support module is not for long term use and
+# in any project using them. The KDELibs4Support module is not for long term use and
# it is not for 'making code build with both Qt/KDE 4 and Qt/KF 5' for medium or
-# long term. In trivial cases, no use of KDE4Support will be pushed to the repo
+# long term. In trivial cases, no use of KDELibs4Support will be pushed to the repo
# of the code being ported.
#
# The use-sequence is this:
-# 1. When starting to port something to KF5, find and use KDE4Support.
+# 1. When starting to port something to KF5, find and use KDELibs4Support.
# 2. Port the C++ code to Qt5/KF5.
-# 3. Port the buildsystem away from KDE4Support.
-# 4. Remove the find_package for KDE4Support.
+# 3. Port the buildsystem away from KDELibs4Support.
+# 4. Remove the find_package for KDELibs4Support.
set(KDE4_KDECORE_LIBS
- KF5::KDE4Support
+ KF5::KDELibs4Support
Qt5::Network
Qt5::DBus
Qt5::Xml
@@ -78,9 +78,9 @@ set(KDE4_KPARTS_LIBS ${KDE4_KPARTS_LIBS})
set(KDE4_KUTILS_LIBS ${KDE4_KUTILS_LIBS})
set(KDE4_KFILE_LIBS ${KDE4_KFILE_LIBS})
set(KDE4_KHTML_LIBS ${KDE4_KHTML_LIBS})
-set(KDE4_KDE4SUPPORT_LIBS ${KDE4_KDECORE_LIBS})
+set(KDE4_KDELIBS4SUPPORT_LIBS ${KDE4_KDECORE_LIBS})
-set(KDE4_INCLUDES $<TARGET_PROPERTY:KF5::KDE4Support,INTERFACE_INCLUDE_DIRECTORIES>)
+set(KDE4_INCLUDES $<TARGET_PROPERTY:KF5::KDELibs4Support,INTERFACE_INCLUDE_DIRECTORIES>)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
set (KDE4_ENABLE_EXCEPTIONS -EHsc)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
diff --git a/README.md b/README.md
index 3b0a12f..645e54d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# KDE4 Support
+# KDELibs 4 Support
## Introduction
@@ -14,12 +14,12 @@ this.
Note that some of the classes in this framework, especially
KStandardDirs, may not work correctly unless any libraries and other
-software using the KDE4 Support framework are installed to the same
-location as KDE4Support, although it may be sufficient to set the
+software using the KDELibs 4 Support framework are installed to the same
+location as KDELibs4Support, although it may be sufficient to set the
KDEDIRS environment variable correctly.
## Links
- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel>
- IRC channel: #kde-devel on Freenode
-- Git repository: <https://projects.kde.org/projects/frameworks/kde4support/repository>
+- Git repository: <https://projects.kde.org/projects/frameworks/kdelibs4support/repository>
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 005a8b5..e9a0421 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -5,20 +5,20 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../../..")
-macro(KDE4SUPPORT_EXECUTABLE_TESTS)
+macro(KDELIBS4SUPPORT_EXECUTABLE_TESTS)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} KF5::KDE4Support Qt5::Core Qt5::Widgets KF5::ConfigCore)
+ target_link_libraries(${_testname} KF5::KDELibs4Support Qt5::Core Qt5::Widgets KF5::ConfigCore)
ecm_mark_as_test(${_testname})
endforeach()
endmacro()
-macro(KDE4SUPPORT_UNIT_TESTS)
+macro(KDELIBS4SUPPORT_UNIT_TESTS)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
- add_test(kde4support-${_testname} ${_testname})
+ add_test(kdelibs4support-${_testname} ${_testname})
target_link_libraries(${_testname}
- KF5::KDE4Support
+ KF5::KDELibs4Support
Qt5::DBus
Qt5::Widgets
Qt5::Test
@@ -32,9 +32,9 @@ macro(KDE4SUPPORT_UNIT_TESTS)
)
ecm_mark_as_test(${_testname})
endforeach(_testname)
-endmacro(KDE4SUPPORT_UNIT_TESTS)
+endmacro(KDELIBS4SUPPORT_UNIT_TESTS)
-kde4support_unit_tests(
+kdelibs4support_unit_tests(
globalcleanuptest
kaccelgentest
kcalendartest
@@ -73,7 +73,7 @@ kde4support_unit_tests(
naturalcomparetest
)
-kde4support_executable_tests(
+kdelibs4support_executable_tests(
klockfile_testlock # Helper for klockfiletest
kglobalsettingsclient # Helper for kglobalsettingstest
)
@@ -88,7 +88,7 @@ if(NOT KDE_NO_DEPRECATED)
add_library(klibloadertestmodule3 MODULE ${klibloadertestmodule3_PART_SRCS})
set_target_properties(klibloadertestmodule3 PROPERTIES PREFIX "") # remove lib prefix - missing from cmake
- target_link_libraries(klibloadertestmodule3 KF5::KDE4Support Qt5::Test KF5::I18n KF5::Service KF5::CoreAddons)
+ target_link_libraries(klibloadertestmodule3 KF5::KDELibs4Support Qt5::Test KF5::I18n KF5::Service KF5::CoreAddons)
set_target_properties(klibloadertestmodule3 PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE)
endif()
@@ -101,7 +101,7 @@ add_library(klibloadertestmodule5 MODULE ${klibloadertestmodule5_PART_SRCS})
ecm_mark_as_test(klibloadertestmodule5)
set_target_properties(klibloadertestmodule5 PROPERTIES PREFIX "") # remove lib prefix - missing from cmake
-target_link_libraries(klibloadertestmodule5 KF5::KDE4Support Qt5::Test KF5::I18n KF5::Service KF5::CoreAddons)
+target_link_libraries(klibloadertestmodule5 KF5::KDELibs4Support Qt5::Test KF5::I18n KF5::Service KF5::CoreAddons)
set_target_properties(klibloadertestmodule5 PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE)
@@ -110,17 +110,17 @@ set_target_properties(klibloadertestmodule5 PROPERTIES SKIP_BUILD_RPATH FALSE BU
# compile into the test since it's not exported
set(klocaletest_SRCS klocaletest.cpp ../src/kdecore/kdayperiod.cpp)
add_executable(klocaletest ${klocaletest_SRCS})
-add_test(kde4support-klocaletest klocaletest)
+add_test(kdelibs4support-klocaletest klocaletest)
ecm_mark_as_test(klocaletest)
-target_link_libraries(klocaletest Qt5::Test Qt5::DBus KF5::I18n KF5::KDE4Support KF5::ConfigCore)
+target_link_libraries(klocaletest Qt5::Test Qt5::DBus KF5::I18n KF5::KDELibs4Support KF5::ConfigCore)
########### kdatetimeformattertest ###############
# compile KDateTimeFormatter and KDayPeriod into the test since it's not exported
set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../src/kdecore/kdatetimeformatter.cpp ../src/kdecore/kdayperiod.cpp)
add_executable(kdatetimeformattertest ${kdatetimeformattertest_SRCS})
-add_test(kde4support-kdatetimeformattertest kdatetimeformattertest)
+add_test(kdelibs4support-kdatetimeformattertest kdatetimeformattertest)
ecm_mark_as_test(kdatetimeformattertest)
-target_link_libraries(kdatetimeformattertest Qt5::Test KF5::I18n KF5::KDE4Support KF5::ConfigCore)
+target_link_libraries(kdatetimeformattertest Qt5::Test KF5::I18n KF5::KDELibs4Support KF5::ConfigCore)
diff --git a/autotests/kdatetimetest.cpp b/autotests/kdatetimetest.cpp
index b475c5f..910d850 100644
--- a/autotests/kdatetimetest.cpp
+++ b/autotests/kdatetimetest.cpp
@@ -37,8 +37,8 @@
QTEST_MAIN(KDateTimeTest)
-extern KDE4SUPPORT_EXPORT int KDateTime_utcCacheHit;
-extern KDE4SUPPORT_EXPORT int KDateTime_zoneCacheHit;
+extern KDELIBS4SUPPORT_EXPORT int KDateTime_utcCacheHit;
+extern KDELIBS4SUPPORT_EXPORT int KDateTime_zoneCacheHit;
void KDateTimeTest::initTestCase()
{
diff --git a/autotests/kfilemetainfotest.cpp b/autotests/kfilemetainfotest.cpp
index bd7dbd6..d3df0f4 100644
--- a/autotests/kfilemetainfotest.cpp
+++ b/autotests/kfilemetainfotest.cpp
@@ -24,7 +24,7 @@
#include <kfilemetainfo.h>
#include <qtest.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <QtCore/QThread>
diff --git a/autotests/kstandarddirstest.cpp b/autotests/kstandarddirstest.cpp
index ae44528..2f4b5e4 100644
--- a/autotests/kstandarddirstest.cpp
+++ b/autotests/kstandarddirstest.cpp
@@ -133,7 +133,7 @@ void KStandarddirsTest::testChangeSaveLocation()
QCOMPARE_PATHS(KStandardDirs::realPath(cData.saveLocation("config")), newSaveLoc);
}
-static bool isKde4supportInstalled()
+static bool isKdeLibs4supportInstalled()
{
return QFile::exists(CMAKE_INSTALL_PREFIX "/bin/kf5-config");
}
@@ -171,8 +171,8 @@ static bool oneEndsWith(const QStringList &lst, const QString &str)
void KStandarddirsTest::testFindAllResources()
{
- if (!isKde4supportInstalled()) {
- QSKIP("KDE4Support is not installed yet");
+ if (!isKdeLibs4supportInstalled()) {
+ QSKIP("KDELibs4Support is not installed yet");
}
const QStringList dbusInterfaceFiles = KGlobal::dirs()->findAllResources("data", "dbus-1/interfaces/");
@@ -264,8 +264,8 @@ void KStandarddirsTest::testFindAllResourcesNewDir()
void KStandarddirsTest::testFindDirs()
{
- if (!isKde4supportInstalled()) {
- QSKIP("KDE4Support is not installed yet");
+ if (!isKdeLibs4supportInstalled()) {
+ QSKIP("KDELibs4Support is not installed yet");
}
const QString t = KStandardDirs::locateLocal("data", "locale/");
@@ -288,9 +288,9 @@ void KStandarddirsTest::testFindExeLibExec()
#ifndef Q_OS_UNIX
QSKIP("non-UNIX system");
#endif
- if (!isKde4supportInstalled()) {
+ if (!isKdeLibs4supportInstalled()) {
// KStandardDirs::findExe only finds libexec executables in the installed location
- QSKIP("KDE4Support is not installed yet");
+ QSKIP("KDELibs4Support is not installed yet");
}
// findExe with a result in libexec
@@ -382,8 +382,8 @@ void KStandarddirsTest::testLocate()
void KStandarddirsTest::testRelativeLocation()
{
- if (!isKde4supportInstalled()) {
- QSKIP("KDE4Support is not installed yet");
+ if (!isKdeLibs4supportInstalled()) {
+ QSKIP("KDELibs4Support is not installed yet");
}
const QString file = "kdebugrc";
@@ -393,8 +393,8 @@ void KStandarddirsTest::testRelativeLocation()
void KStandarddirsTest::testAddResourceType()
{
- if (!isKde4supportInstalled()) {
- QSKIP("KDE4Support is not installed yet");
+ if (!isKdeLibs4supportInstalled()) {
+ QSKIP("KDELibs4Support is not installed yet");
}
QString ret = KStandardDirs::locate("widgets", "pics/kdialog.png");
@@ -561,8 +561,8 @@ void KStandarddirsTest::testSymlinkResolution()
// To find multithreading bugs: valgrind --tool=helgrind ./kstandarddirstest testThreads
void KStandarddirsTest::testThreads()
{
- if (!isKde4supportInstalled()) {
- QSKIP("KDE4Support is not installed yet");
+ if (!isKdeLibs4supportInstalled()) {
+ QSKIP("KDELibs4Support is not installed yet");
}
if (!m_canFindKConfig) {
QSKIP("KDEDIRS does not contain the KConfig prefix");
diff --git a/autotests/ktimezonestest.cpp b/autotests/ktimezonestest.cpp
index ffa857c..9693287 100644
--- a/autotests/ktimezonestest.cpp
+++ b/autotests/ktimezonestest.cpp
@@ -120,7 +120,7 @@ void KTimeZonesTest::utc()
/////////////////////////
// Defined in ksystemtimezone.cpp for our benefit
-KDE4SUPPORT_EXPORT void k_system_time_zone_private_reset_config();
+KDELIBS4SUPPORT_EXPORT void k_system_time_zone_private_reset_config();
void KTimeZonesTest::invalidLocal()
{
diff --git a/cmake/modules/FindKF5Transitional.cmake b/cmake/modules/FindKF5Transitional.cmake
index b4246b9..d0435a5 100644
--- a/cmake/modules/FindKF5Transitional.cmake
+++ b/cmake/modules/FindKF5Transitional.cmake
@@ -5,14 +5,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_kf5_install_prefix}/share/cmake/m
find_package(KDE4Internal REQUIRED)
-set(KDE4_KDECORE_LIBRARY ${KDE4_KDECORE_LIBS} ${KDE4_KDE4SUPPORT_LIBS})
+set(KDE4_KDECORE_LIBRARY ${KDE4_KDECORE_LIBS} ${KDE4_KDELIBS4SUPPORT_LIBS})
-list(APPEND KDE4_KDEUI_LIBS ${KDE4_KDE4SUPPORT_LIBS} KDE4__kwidgetsaddons KDE4__ItemModels KDE4__sonnetcore KDE4__kguiaddons KDE4__kwidgets KDE4__KWindowSystem KDE4__KArchive)
+list(APPEND KDE4_KDEUI_LIBS ${KDE4_KDELIBS4SUPPORT_LIBS} KDE4__kwidgetsaddons KDE4__ItemModels KDE4__sonnetcore KDE4__kguiaddons KDE4__kwidgets KDE4__KWindowSystem KDE4__KArchive)
-list(APPEND KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDE4SUPPORT_LIBS} KDE4__kiocore KDE4__kwidgetsaddons)
-list(APPEND KDE4_KFILE_LIBS ${KDE4_KDE4SUPPORT_LIBS} KDE4__kguiaddons KDE4__KArchive KDE4__kwidgetsaddons)
-list(APPEND KDE4_KPARTS_LIBS ${KDE4_KDE4SUPPORT_LIBS} KDE4__kguiaddons KDE4__KArchive ${KDE4_KDEUI_LIBS} KDE4__kwidgetsaddons)
+list(APPEND KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDELIBS4SUPPORT_LIBS} KDE4__kiocore KDE4__kwidgetsaddons)
+list(APPEND KDE4_KFILE_LIBS ${KDE4_KDELIBS4SUPPORT_LIBS} KDE4__kguiaddons KDE4__KArchive KDE4__kwidgetsaddons)
+list(APPEND KDE4_KPARTS_LIBS ${KDE4_KDELIBS4SUPPORT_LIBS} KDE4__kguiaddons KDE4__KArchive ${KDE4_KDEUI_LIBS} KDE4__kwidgetsaddons)
list(APPEND KDE4_KHTML_LIBS KDE4__kguiaddons KDE4__KArchive ${KDE4_KDEUI_LIBS} KDE4__kwidgetsaddons)
set(KDE4_KIO_LIBRARY ${KDE4_KIO_LIBS})
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
index 192094b..94a630a 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -472,20 +472,11 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
-# TODO: Move this to kde4support
-if (_kdeBootStrapping)
- include("${CMAKE_SOURCE_DIR}/tier2/kauth/cmake/KF5AuthMacros.cmake")
- include("${CMAKE_SOURCE_DIR}/tier4/kde4support/src/KDECoreMacros.cmake")
- include("${CMAKE_SOURCE_DIR}/tier4/kde4support/src/KDEUIMacros.cmake")
- include("${CMAKE_SOURCE_DIR}/tier2/kdoctools/KF5DocToolsMacros.cmake")
- include("${CMAKE_SOURCE_DIR}/tier3/kf5designerplugin/KF5DesignerPluginMacros.cmake")
-else()
- include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
- include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
- include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
-endif()
+include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
+include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
+include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
# functions deprecated, they still should work
macro (KDE4_AUTH_INSTALL_ACTIONS)
diff --git a/kde4support.yaml b/kdelibs4support.yaml
similarity index 100%
rename from kde4support.yaml
rename to kdelibs4support.yaml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ea30d7..147d9ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,7 +36,7 @@ add_subdirectory( kssl/kssl )
add_subdirectory( kssl/kcm )
add_subdirectory( kio/imageformats )
-set(libkde4support_SRCS
+set(libkdelibs4support_SRCS
kdecore/k4aboutdata.cpp
kdecore/kcomponentdata.cpp
kdecore/kdebug.cpp
@@ -189,7 +189,7 @@ set(libkde4support_SRCS
)
if (NOT KIO_NO_NEPOMUK)
- set(libkde4support_SRCS ${libkde4support_SRCS}
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
kio/kfilemetadatareader.cpp
kio/kfilemetadatareaderprocess.cpp
kio/kfilemetadataprovider.cpp
@@ -197,30 +197,30 @@ if (NOT KIO_NO_NEPOMUK)
endif ()
if (X11_FOUND)
- set(libkde4support_SRCS ${libkde4support_SRCS} kdeui/kxerrorhandler.cpp )
- list(APPEND libkde4support_OPTIONAL_LIBS Qt5::X11Extras ${X11_LIBRARIES})
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdeui/kxerrorhandler.cpp )
+ list(APPEND libkdelibs4support_OPTIONAL_LIBS Qt5::X11Extras ${X11_LIBRARIES})
endif ()
if (WIN32)
- set(libkde4support_SRCS ${libkde4support_SRCS}
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
kdecore/klockfile_win.cpp
kdecore/kde_file_win.cpp
kdecore/ktimezone_win.cpp
kdecore/klocale_win.cpp
)
else()
- set(libkde4support_SRCS ${libkde4support_SRCS} kdecore/klockfile_unix.cpp)
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/klockfile_unix.cpp)
endif ()
if (APPLE)
- set(libkde4support_SRCS ${libkde4support_SRCS}
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
kdecore/klocale_mac.cpp
)
- set(libkde4support_OPTIONAL_LIBS ${CARBON_LIBRARY})
+ set(libkdelibs4support_OPTIONAL_LIBS ${CARBON_LIBRARY})
endif()
if (UNIX)
- set(libkde4support_SRCS ${libkde4support_SRCS}
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
kdecore/klocale_unix.cpp
)
endif()
@@ -242,7 +242,7 @@ configure_file(config-network.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-network
check_function_exists(mmap HAVE_MMAP)
check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE)
-configure_file(config-kde4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kde4support.h )
+configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h )
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
check_include_files(sys/time.h HAVE_SYS_TIME_H)
configure_file(kdecore/config-klockfile.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klockfile.h)
@@ -257,32 +257,32 @@ if (__KDE_HAVE_GCC_VISIBILITY)
endif()
configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h )
-add_library(KF5KDE4Support ${libkde4support_SRCS})
-generate_export_header(KF5KDE4Support BASE_NAME KDE4Support EXPORT_FILE_NAME kde4support_export_internal.h)
-add_library(KF5::KDE4Support ALIAS KF5KDE4Support)
+add_library(KF5KDELibs4Support ${libkdelibs4support_SRCS})
+generate_export_header(KF5KDELibs4Support BASE_NAME KDELibs4Support EXPORT_FILE_NAME kdelibs4support_export_internal.h)
+add_library(KF5::KDELibs4Support ALIAS KF5KDELibs4Support)
-target_include_directories(KF5KDE4Support PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../..")
+target_include_directories(KF5KDELibs4Support PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../..")
-set(kde4support_INCLUDES
+set(kdelibs4support_INCLUDES
"${CMAKE_CURRENT_SOURCE_DIR}/kdecore"
"${CMAKE_CURRENT_SOURCE_DIR}/kdeui"
"${CMAKE_CURRENT_SOURCE_DIR}/kio"
"${CMAKE_CURRENT_SOURCE_DIR}/kssl"
"${CMAKE_CURRENT_BINARY_DIR}/kssl" # ksslconfig.h
"${CMAKE_CURRENT_SOURCE_DIR}/kparts"
- "${CMAKE_CURRENT_BINARY_DIR}/.." # kde4support_version.h
+ "${CMAKE_CURRENT_BINARY_DIR}/.." # kdelibs4support_version.h
"${CMAKE_SOURCE_DIR}"
)
-target_include_directories(KF5KDE4Support PUBLIC "$<BUILD_INTERFACE:${kde4support_INCLUDES}>")
+target_include_directories(KF5KDELibs4Support PUBLIC "$<BUILD_INTERFACE:${kdelibs4support_INCLUDES}>")
-target_include_directories(KF5KDE4Support INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KDE4Support>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KDE4Support/KDE>")
+target_include_directories(KF5KDELibs4Support INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KDELibs4Support>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE>")
set(platformLinkLibraries)
if (APPLE)
set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv")
endif()
-target_link_libraries(KF5KDE4Support
+target_link_libraries(KF5KDELibs4Support
PUBLIC
Qt5::Widgets
Qt5::DBus
@@ -309,7 +309,7 @@ PRIVATE
Qt5::Svg
Qt5::Test # for qtest_kde.cpp
${KIO_EXTRA_LIBS}
- ${libkde4support_OPTIONAL_LIBS}
+ ${libkdelibs4support_OPTIONAL_LIBS}
${platformLinkLibraries}
)
@@ -330,23 +330,24 @@ int main() { return 0; }
" _OFFT_IS_64BIT)
if (NOT _OFFT_IS_64BIT)
- target_compile_definitions(KF5KDE4Support PUBLIC -D_FILE_OFFSET_BITS=64)
+ target_compile_definitions(KF5KDELibs4Support PUBLIC -D_FILE_OFFSET_BITS=64)
endif ()
if(NOT KIO_NO_NEPOMUK)
- target_link_libraries(KF5KDE4Support PRIVATE ${KDE4_NEPOMUK_LIBRARY} nepomukquery nepomukutils)
+ target_link_libraries(KF5KDELibs4Support PRIVATE ${KDE4_NEPOMUK_LIBRARY} nepomukquery nepomukutils)
endif()
if(NOT KIO_NO_NEPOMUK)
add_executable(kfilemetadatareader kio/kfilemetadatareaderprocess.cpp)
- target_link_libraries(kfilemetadatareader ${KDE4_NEPOMUK_LIBRARY} nepomukutils KF5::CoreAddons KF5::I18n KF5::KDE4Support)
+ target_link_libraries(kfilemetadatareader ${KDE4_NEPOMUK_LIBRARY} nepomukutils KF5::CoreAddons KF5::I18n KF5::KDELibs4Support)
install(TARGETS kfilemetadatareader ${INSTALL_TARGETS_DEFAULT_ARGS})
endif()
-set_target_properties(KF5KDE4Support PROPERTIES VERSION ${KDE4SUPPORT_VERSION_STRING}
- SOVERSION ${KDE4SUPPORT_SOVERSION}
- EXPORT_NAME KDE4Support
+set_target_properties(KF5KDELibs4Support PROPERTIES
+ VERSION ${KDELibs4SUPPORT_VERSION_STRING}
+ SOVERSION ${KDELibs4SUPPORT_SOVERSION}
+ EXPORT_NAME KDELibs4Support
)
@@ -370,7 +371,7 @@ qt5_add_resources(kdedeprecated_PART_SRCS kdedeprecated.qrc)
add_library(kdedeprecated MODULE ${kdedeprecated_PART_SRCS})
-target_link_libraries(kdedeprecated KF5::KDE4Support
+target_link_libraries(kdedeprecated KF5::KDELibs4Support
Qt5::Widgets
Qt5::Designer
KF5::ConfigCore
@@ -393,8 +394,8 @@ install(TARGETS kdedeprecated DESTINATION ${QT_PLUGIN_INSTALL_DIR}/designer )
add_subdirectory(pics)
-install(TARGETS KF5KDE4Support
- EXPORT KF5KDE4SupportTargets
+install(TARGETS KF5KDELibs4Support
+ EXPORT KF5KDELibs4SupportTargets
${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
@@ -515,11 +516,11 @@ install(FILES
kdeui/k4timezonewidget.h
kdeui/kdeprintdialog.h
kdeui/kprintpreview.h
- kdecore/kde4support_export.h
- ${CMAKE_CURRENT_BINARY_DIR}/kde4support_export_internal.h
+ kdecore/kdelibs4support_export.h
+ ${CMAKE_CURRENT_BINARY_DIR}/kdelibs4support_export_internal.h
${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
kdecore/kdeversion.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support COMPONENT Devel
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support COMPONENT Devel
)
configure_file(kssl/ksslconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h )
@@ -545,7 +546,7 @@ install(FILES
kio/metainfojob.h
kio/passworddialog.h
kio/netaccess.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/kio COMPONENT Devel
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/kio COMPONENT Devel
)
# kparts/*.h
@@ -553,7 +554,7 @@ install(FILES
kparts/genericfactory.h
kparts/factory.h
kparts/listingextension.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/kparts COMPONENT Devel
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/kparts COMPONENT Devel
)
# knewstuff3/*.h
@@ -565,7 +566,7 @@ install( FILES
knewstuff3/knewstuffaction.h
knewstuff3/knewstuffbutton.h
knewstuff3/uploaddialog.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/knewstuff3 COMPONENT Devel
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/knewstuff3 COMPONENT Devel
)
install( FILES
@@ -592,7 +593,7 @@ if (UNIX)
# write a cmake script file which creates the symlink
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink fileshareset \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/filesharelist\")\n")
# and add it as post-install script to any of the installed targets, so it will be executed during "make install"
- set_target_properties(KF5KDE4Support PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake)
+ set_target_properties(KF5KDELibs4Support PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake)
endif ()
########## DocBookXML 4.2 compatibility
@@ -609,7 +610,7 @@ mark_as_advanced (DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION)
set (_custom_dtd_kdex "customization/dtd/kdex.dtd")
# The path to KDocTools resources is set as absolute, allowing the
-# installation of KDocTools and KDE4Support in different prefixes.
+# installation of KDocTools and KDELibs4Support in different prefixes.
set (_KDocTools_customization_dir "${KDOCTOOLS_CUSTOMIZATION_DIR}")
configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} )
# WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable
diff --git a/src/config-kde4support.h.cmake b/src/config-kdelibs4support.h.cmake
similarity index 100%
rename from src/config-kde4support.h.cmake
rename to src/config-kdelibs4support.h.cmake
diff --git a/src/includes/CMakeLists.txt b/src/includes/CMakeLists.txt
index 79ef5c8..7bbb645 100644
--- a/src/includes/CMakeLists.txt
+++ b/src/includes/CMakeLists.txt
@@ -442,7 +442,7 @@ install( FILES
KWebView
KWebPluginFactory
KWebWallet
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE COMPONENT Devel)
if(NOT KDE_NO_DEPRECATED)
install( FILES
@@ -450,7 +450,7 @@ install( FILES
KEditListBox
KDiskFreeSpace
KMimeTypeResolver
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE COMPONENT Devel)
endif()
if (UNIX)
@@ -463,14 +463,14 @@ if (UNIX)
SshProcess
StubProcess
SuProcess
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE COMPONENT Devel)
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE COMPONENT Devel)
endif ()
install( FILES
ConversionCheck/QVconvertible
ConversionCheck/type_toQString
ConversionCheck/type_toQVariant
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/ConversionCheck COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/ConversionCheck COMPONENT Devel)
install( FILES
@@ -483,7 +483,7 @@ install( FILES
KDNSSD/ServiceBrowser
KDNSSD/ServiceModel
KDNSSD/ServiceTypeBrowser
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KDNSSD COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KDNSSD COMPONENT Devel)
install( FILES
@@ -603,13 +603,13 @@ install( FILES
DOM/TextEvent
DOM/TreeWalker
DOM/UIEvent
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/DOM COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/DOM COMPONENT Devel)
install( FILES
KAccelGen/Deref
KAccelGen/Deref_Key
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KAccelGen COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KAccelGen COMPONENT Devel)
install( FILES
KIO/AccessManager
@@ -648,19 +648,19 @@ install( FILES
KIO/TCPSlaveBase
KIO/Task
KIO/TransferJob
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KIO COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KIO COMPONENT Devel)
if(NOT KDE_NO_DEPRECATED)
install( FILES
KIO/PasswordDialog
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KIO COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KIO COMPONENT Devel)
endif()
install( FILES
KMediaPlayer/Player
KMediaPlayer/View
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KMediaPlayer COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KMediaPlayer COMPONENT Devel)
if(NOT KDE_NO_DEPRECATED)
@@ -671,7 +671,7 @@ install( FILES
KNS/Entry
KNS/Installation
KNS/KTranslatable
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KNS COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KNS COMPONENT Devel)
endif()
install( FILES
@@ -679,7 +679,7 @@ install( FILES
KNS3/Entry
KNS3/KNewStuffAction
KNS3/KNewStuffButton
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KNS3 COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KNS3 COMPONENT Devel)
install( FILES
KNetwork/KActiveSocketBase
@@ -699,7 +699,7 @@ install( FILES
KNetwork/KSocketDeviceFactory
KNetwork/KStreamSocket
KNetwork/KUnixSocketAddress
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KNetwork COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KNetwork COMPONENT Devel)
install( FILES
KParts/BrowserExtension
@@ -730,7 +730,7 @@ install( FILES
KParts/StatusBarExtension
KParts/TextExtension
KParts/WindowArgs
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KParts COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KParts COMPONENT Devel)
install( FILES
@@ -755,14 +755,14 @@ install( FILES
Kross/Script
Kross/ScriptingPlugin
Kross/WrapperInterface
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Kross COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Kross COMPONENT Devel)
install( FILES
KSettings/Dialog
KSettings/Dispatcher
KSettings/PluginPage
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KSettings COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KSettings COMPONENT Devel)
#install( FILES
@@ -770,7 +770,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KSettings COMPONENT Devel)
# Sonnet/UnicodeData
# Sonnet/TextBreaks
# Sonnet/Spell
-#DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Sonnet )
+#DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Sonnet )
install( FILES
@@ -778,12 +778,12 @@ install( FILES
KUnitTest/SlotTester
KUnitTest/TestResults
KUnitTest/Tester
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KUnitTest COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KUnitTest COMPONENT Devel)
install( FILES
KWallet/Wallet
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KWallet COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KWallet COMPONENT Devel)
install( FILES
@@ -810,7 +810,7 @@ install( FILES
Solid/StorageAccess
Solid/StorageDrive
Solid/StorageVolume
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Solid COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Solid COMPONENT Devel)
install( FILES
@@ -819,14 +819,14 @@ install( FILES
Sonnet/Dialog
Sonnet/DictionaryComboBox
Sonnet/Highlighter
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Sonnet COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Sonnet COMPONENT Devel)
install( FILES
KAuth/Action
KAuth/ActionReply
KAuth/ActionWatcher
KAuth/HelperSupport
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KAuth COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KAuth COMPONENT Devel)
install( FILES
ThreadWeaver/DependencyPolicy
@@ -840,7 +840,7 @@ install( FILES
ThreadWeaver/Weaver
ThreadWeaver/WeaverInterface
ThreadWeaver/WeaverObserver
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/ThreadWeaver COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/ThreadWeaver COMPONENT Devel)
install( FILES
@@ -850,7 +850,7 @@ install( FILES
khtml/MouseMoveEvent
khtml/MousePressEvent
khtml/MouseReleaseEvent
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/khtml COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/khtml COMPONENT Devel)
install(FILES
@@ -865,7 +865,7 @@ install(FILES
Nepomuk/TagWidget
Nepomuk/Thing
Nepomuk/Variant
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Nepomuk COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk COMPONENT Devel)
install(FILES
@@ -873,7 +873,7 @@ install(FILES
Nepomuk/Types/Literal
Nepomuk/Types/Ontology
Nepomuk/Types/Property
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Nepomuk/Types COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Types COMPONENT Devel)
install(FILES
@@ -894,7 +894,7 @@ install(FILES
Nepomuk/Query/SimpleTerm
Nepomuk/Query/StandardQuery
Nepomuk/Query/Term
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Nepomuk/Query COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Query COMPONENT Devel)
install(FILES
@@ -906,7 +906,7 @@ install(FILES
Nepomuk/Utils/SearchWidget
Nepomuk/Utils/SimpleFacet
Nepomuk/Utils/SimpleResourceModel
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Nepomuk/Utils COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Utils COMPONENT Devel)
install(FILES
@@ -921,7 +921,7 @@ install(FILES
Nepomuk/Vocabulary/NUAO
Nepomuk/Vocabulary/PIMO
Nepomuk/Vocabulary/TMO
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/Nepomuk/Vocabulary COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/Nepomuk/Vocabulary COMPONENT Devel)
install(FILES
@@ -929,4 +929,4 @@ install(FILES
KUnitConversion/Unit
KUnitConversion/UnitCategory
KUnitConversion/Value
-DESTINATION ${INCLUDE_INSTALL_DIR}/KDE4Support/KDE/KUnitConversion COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/KDELibs4Support/KDE/KUnitConversion COMPONENT Devel)
diff --git a/src/kdebugdialog/CMakeLists.txt b/src/kdebugdialog/CMakeLists.txt
index 0622a00..6bd4fc5 100644
--- a/src/kdebugdialog/CMakeLists.txt
+++ b/src/kdebugdialog/CMakeLists.txt
@@ -8,7 +8,7 @@ qt5_wrap_ui(kdebugdialog_SRCS kdebugdialog.ui)
add_executable(kdebugdialog5 ${kdebugdialog_SRCS})
-target_link_libraries(kdebugdialog5 Qt5::Widgets KF5::ItemViews KF5::KDE4Support)
+target_link_libraries(kdebugdialog5 Qt5::Widgets KF5::ItemViews KF5::KDELibs4Support)
install(TARGETS kdebugdialog5 ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/kdecore/k3bufferedsocket.h b/src/kdecore/k3bufferedsocket.h
index 864892d..926d3fd 100644
--- a/src/kdecore/k3bufferedsocket.h
+++ b/src/kdecore/k3bufferedsocket.h
@@ -25,7 +25,7 @@
#ifndef KBUFFEREDSOCKET_H
#define KBUFFEREDSOCKET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "k3streamsocket.h"
#include <QtCore/QObject>
@@ -56,7 +56,7 @@ class KBufferedSocketPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KBufferedSocket: public KStreamSocket
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KBufferedSocket: public KStreamSocket
{
Q_OBJECT
public:
diff --git a/src/kdecore/k3clientsocketbase.h b/src/kdecore/k3clientsocketbase.h
index 59fc6df..6b208cf 100644
--- a/src/kdecore/k3clientsocketbase.h
+++ b/src/kdecore/k3clientsocketbase.h
@@ -28,7 +28,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "k3socketbase.h"
#include "k3resolver.h"
@@ -48,7 +48,7 @@ class KClientSocketBasePrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KClientSocketBase : public KActiveSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KClientSocketBase : public KActiveSocketBase
{
Q_OBJECT
diff --git a/src/kdecore/k3resolver.h b/src/kdecore/k3resolver.h
index 675cc05..e956c6f 100644
--- a/src/kdecore/k3resolver.h
+++ b/src/kdecore/k3resolver.h
@@ -68,7 +68,7 @@ class KResolverEntryPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KResolverEntry
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KResolverEntry
{
public:
/**
@@ -212,7 +212,7 @@ class KResolverResultsPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KResolverResults: public QList<KResolverEntry>
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KResolverResults: public QList<KResolverEntry>
{
public:
/**
@@ -312,7 +312,7 @@ class KResolverPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KResolver: public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KResolver: public QObject
{
Q_OBJECT
diff --git a/src/kdecore/k3resolverstandardworkers_p.h b/src/kdecore/k3resolverstandardworkers_p.h
index 152d8b0..e90017e 100644
--- a/src/kdecore/k3resolverstandardworkers_p.h
+++ b/src/kdecore/k3resolverstandardworkers_p.h
@@ -41,7 +41,7 @@ namespace KNetwork
{
namespace Internal
{
-extern void initStandardWorkers() KDE4SUPPORT_NO_EXPORT;
+extern void initStandardWorkers() KDELIBS4SUPPORT_NO_EXPORT;
/**
* @internal
diff --git a/src/kdecore/k3reverseresolver.h b/src/kdecore/k3reverseresolver.h
index b3cced5..a0ee385 100644
--- a/src/kdecore/k3reverseresolver.h
+++ b/src/kdecore/k3reverseresolver.h
@@ -49,7 +49,7 @@ class KReverseResolverPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KReverseResolver: public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KReverseResolver: public QObject
{
Q_OBJECT
diff --git a/src/kdecore/k3serversocket.h b/src/kdecore/k3serversocket.h
index 564341e..0553ec5 100644
--- a/src/kdecore/k3serversocket.h
+++ b/src/kdecore/k3serversocket.h
@@ -106,7 +106,7 @@ class KServerSocketPrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KServerSocket: public QObject, public KPassiveSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KServerSocket: public QObject, public KPassiveSocketBase
{
Q_OBJECT
public:
diff --git a/src/kdecore/k3socketaddress.cpp b/src/kdecore/k3socketaddress.cpp
index 33ba072..05e277e 100644
--- a/src/kdecore/k3socketaddress.cpp
+++ b/src/kdecore/k3socketaddress.cpp
@@ -25,7 +25,7 @@
#include "k3socketaddress.h"
#include <config-network.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/src/kdecore/k3socketaddress.h b/src/kdecore/k3socketaddress.h
index cfb92ce..6f85568 100644
--- a/src/kdecore/k3socketaddress.h
+++ b/src/kdecore/k3socketaddress.h
@@ -26,7 +26,7 @@
#ifndef KSOCKETADDRESS_H
#define KSOCKETADDRESS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QByteArray>
struct sockaddr;
@@ -60,7 +60,7 @@ class KUnixSocketAddress;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KIpAddress
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KIpAddress
{
public:
/**
@@ -469,7 +469,7 @@ class KSocketAddressData;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSocketAddress //krazy:exclude=dpointer (we got one, just not called Private)
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSocketAddress //krazy:exclude=dpointer (we got one, just not called Private)
{
public:
/**
@@ -701,7 +701,7 @@ public: // static
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KInetSocketAddress: public KSocketAddress
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KInetSocketAddress: public KSocketAddress
{
friend class KSocketAddress;
public:
@@ -895,7 +895,7 @@ private:
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KUnixSocketAddress: public KSocketAddress
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KUnixSocketAddress: public KSocketAddress
{
friend class KSocketAddress;
public:
diff --git a/src/kdecore/k3socketbase.h b/src/kdecore/k3socketbase.h
index e5461e0..f057ef8 100644
--- a/src/kdecore/k3socketbase.h
+++ b/src/kdecore/k3socketbase.h
@@ -59,7 +59,7 @@
#include <QtCore/QIODevice>
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "k3socketaddress.h"
class QMutex;
@@ -83,7 +83,7 @@ class KSocketBasePrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSocketBase
{
public:
/**
@@ -457,7 +457,7 @@ private:
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KActiveSocketBase: public QIODevice, virtual public KSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KActiveSocketBase: public QIODevice, virtual public KSocketBase
{
Q_OBJECT
public:
@@ -770,7 +770,7 @@ protected:
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KPassiveSocketBase: virtual public KSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KPassiveSocketBase: virtual public KSocketBase
{
public:
/**
diff --git a/src/kdecore/k3socketdevice.cpp b/src/kdecore/k3socketdevice.cpp
index 1c25425..426bc2b 100644
--- a/src/kdecore/k3socketdevice.cpp
+++ b/src/kdecore/k3socketdevice.cpp
@@ -28,7 +28,7 @@
#include "k3socketdevice.h" //krazy:exclude=includes (KDE3 compat: not worth fixing)
#include <config-network.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <QMap>
diff --git a/src/kdecore/k3socketdevice.h b/src/kdecore/k3socketdevice.h
index ffbee94..c5adbae 100644
--- a/src/kdecore/k3socketdevice.h
+++ b/src/kdecore/k3socketdevice.h
@@ -49,7 +49,7 @@ class KSocketDevicePrivate;
* @author Thiago Macieira <thiago at kde.org>
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
{
public:
/**
diff --git a/src/kdecore/k3streamsocket.h b/src/kdecore/k3streamsocket.h
index b370e4e..cab3d4c 100644
--- a/src/kdecore/k3streamsocket.h
+++ b/src/kdecore/k3streamsocket.h
@@ -96,7 +96,7 @@ class KStreamSocketPrivate;
* @version 0.9
* @deprecated Use KSocketFactory or KLocalSocket instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KStreamSocket: public KClientSocketBase
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KStreamSocket: public KClientSocketBase
{
Q_OBJECT
diff --git a/src/kdecore/k4aboutdata.h b/src/kdecore/k4aboutdata.h
index 1fa2823..de90513 100644
--- a/src/kdecore/k4aboutdata.h
+++ b/src/kdecore/k4aboutdata.h
@@ -24,9 +24,9 @@
#ifndef K4ABOUTDATA_H
#define K4ABOUTDATA_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -71,7 +71,7 @@ class K4AboutData;
*
* @bc KDE4
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutPerson
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutPerson
{
friend class K4AboutData;
public:
@@ -194,7 +194,7 @@ class K4AboutLicense;
* classes.
* @author Espen Sand (espen at kde.org), David Faure (faure at kde.org)
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutData
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutData
{
public:
/**
@@ -895,7 +895,7 @@ private:
* lookup. This is necessary because the translation catalogs are usually not
* yet initialized at the point where K4AboutData is constructed.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutLicense
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE K4AboutLicense
{
friend class K4AboutData;
public:
diff --git a/src/kdecore/kascii.h b/src/kdecore/kascii.h
index 2d31acf..43bbc2a 100644
--- a/src/kdecore/kascii.h
+++ b/src/kdecore/kascii.h
@@ -20,7 +20,7 @@
#ifndef KASCII_H
#define KASCII_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* Locale-independent qstricmp. Use this for comparing ascii keywords
@@ -29,7 +29,7 @@
* This is fixed in Qt4/Qt5.
* @deprecated use qstricmp
*/
-KDE4SUPPORT_DEPRECATED_EXPORT int kasciistricmp(const char *str1, const char *str2);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int kasciistricmp(const char *str1, const char *str2);
/**
Locale-independent function to convert ASCII strings to lower case ASCII
@@ -39,7 +39,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT int kasciistricmp(const char *str1, const char *st
@return pointer to the converted string (same as @a str)
@deprecated use QChar::toLower or QByteArray::toLower
*/
-KDE4SUPPORT_DEPRECATED_EXPORT char *kAsciiToLower(char *str);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT char *kAsciiToLower(char *str);
/**
Locale-independent function to convert ASCII strings to upper case ASCII
@@ -49,6 +49,6 @@ KDE4SUPPORT_DEPRECATED_EXPORT char *kAsciiToLower(char *str);
@return pointer to the converted string (same as @a str)
@deprecated use QChar::toUpper or QByteArray::toUpper
*/
-KDE4SUPPORT_DEPRECATED_EXPORT char *kAsciiToUpper(char *str);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT char *kAsciiToUpper(char *str);
#endif
diff --git a/src/kdecore/kcalendarsystem.h b/src/kdecore/kcalendarsystem.h
index 0c69a4b..a769274 100644
--- a/src/kdecore/kcalendarsystem.h
+++ b/src/kdecore/kcalendarsystem.h
@@ -22,7 +22,7 @@
#ifndef KCALENDARSYSTEM_H
#define KCALENDARSYSTEM_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "klocale.h" // needed for enums
#include <QtCore/QStringList>
@@ -36,7 +36,7 @@ class KCalendarEra;
*
* Derived classes must be created through the create() static method
*/
-class KDE4SUPPORT_EXPORT KCalendarSystem
+class KDELIBS4SUPPORT_EXPORT KCalendarSystem
{
public:
@@ -132,7 +132,7 @@ public:
* @return type of calendar system
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED virtual QString calendarType() const = 0;
+ KDELIBS4SUPPORT_DEPRECATED virtual QString calendarType() const = 0;
#endif
/**
@@ -322,7 +322,7 @@ public:
* @return true if the date is valid; otherwise returns false.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED virtual bool setYMD(QDate &date, int y, int m, int d) const
+ KDELIBS4SUPPORT_DEPRECATED virtual bool setYMD(QDate &date, int y, int m, int d) const
{
return setDate(date, y, m, d);
}
@@ -630,7 +630,7 @@ public:
* @return ISO week number, -1 if input date invalid
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED inline int weekNumber(const QDate &date, int *yearNum = 0) const
+ KDELIBS4SUPPORT_DEPRECATED inline int weekNumber(const QDate &date, int *yearNum = 0) const
{
return week(date, KLocale::IsoWeekNumber, yearNum);
}
@@ -842,7 +842,7 @@ public:
* @see year()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED virtual QString yearString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED virtual QString yearString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::Year, KLocale::ShortNumber);
@@ -863,7 +863,7 @@ public:
* @see month()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED virtual QString monthString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED virtual QString monthString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::Month, KLocale::ShortNumber);
@@ -884,7 +884,7 @@ public:
* @see day()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED virtual QString dayString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED virtual QString dayString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::Day, KLocale::ShortNumber);
@@ -907,7 +907,7 @@ public:
* @return Year In Era literal of the date, empty string if any error
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString yearInEraString(const QDate &date, StringFormat format = ShortFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString yearInEraString(const QDate &date, StringFormat format = ShortFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::YearInEra, KLocale::ShortNumber);
@@ -931,7 +931,7 @@ public:
* @see dayOfYear()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString dayOfYearString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString dayOfYearString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::DayOfYear, KLocale::ShortNumber);
@@ -954,7 +954,7 @@ public:
* @see dayOfWeek()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString dayOfWeekString(const QDate &date) const
+ KDELIBS4SUPPORT_DEPRECATED QString dayOfWeekString(const QDate &date) const
{
return formatDate(date, KLocale::DayOfWeek, KLocale::ShortNumber);
}
@@ -974,7 +974,7 @@ public:
* @see weekNumber()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString weekNumberString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString weekNumberString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::Week, KLocale::ShortNumber);
@@ -998,7 +998,7 @@ public:
* @see monthsInYear()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString monthsInYearString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString monthsInYearString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::MonthsInYear, KLocale::ShortNumber);
@@ -1022,7 +1022,7 @@ public:
* @see weeksInYear()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString weeksInYearString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString weeksInYearString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::WeeksInYear, KLocale::ShortNumber);
@@ -1046,7 +1046,7 @@ public:
* @see daysInYear()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString daysInYearString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString daysInYearString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::DaysInYear, KLocale::ShortNumber);
@@ -1070,7 +1070,7 @@ public:
* @see daysInMonth()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString daysInMonthString(const QDate &date, StringFormat format = LongFormat) const
+ KDELIBS4SUPPORT_DEPRECATED QString daysInMonthString(const QDate &date, StringFormat format = LongFormat) const
{
if (format == ShortFormat) {
return formatDate(date, KLocale::DaysInMonth, KLocale::ShortNumber);
@@ -1093,7 +1093,7 @@ public:
* @see daysInWeek()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString daysInWeekString(const QDate &date) const
+ KDELIBS4SUPPORT_DEPRECATED QString daysInWeekString(const QDate &date) const
{
return formatDate(date, KLocale::DaysInWeek, KLocale::ShortNumber);
}
@@ -1511,7 +1511,7 @@ public:
*
* @return day number (None = 0, Monday = 1, ..., Sunday = 7)
*/
- KDE4SUPPORT_DEPRECATED inline int weekDayOfPray() const
+ KDELIBS4SUPPORT_DEPRECATED inline int weekDayOfPray() const
{
return locale()->weekDayOfPray();
}
diff --git a/src/kdecore/kcmdlineargs.cpp b/src/kdecore/kcmdlineargs.cpp
index 72248e7..de2f829 100644
--- a/src/kdecore/kcmdlineargs.cpp
+++ b/src/kdecore/kcmdlineargs.cpp
@@ -18,7 +18,7 @@
#include "kcmdlineargs.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <sys/param.h>
diff --git a/src/kdecore/kcmdlineargs.h b/src/kdecore/kcmdlineargs.h
index 9b6fe53..0b1e148 100644
--- a/src/kdecore/kcmdlineargs.h
+++ b/src/kdecore/kcmdlineargs.h
@@ -19,9 +19,9 @@
#ifndef KCMDLINEARGS_H
#define KCMDLINEARGS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -48,7 +48,7 @@ class KCmdLineOptionsPrivate;
*
* @see KCmdLineArgs for additional usage information
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KCmdLineOptions
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KCmdLineOptions
{
friend class KCmdLineArgs;
friend class KCmdLineArgsStatic;
@@ -281,7 +281,7 @@ class K4AboutData;
* @author Waldo Bastian
* @version 0.0.4
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KCmdLineArgs
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KCmdLineArgs
{
friend class KApplication;
friend class KCmdLineArgsList;
diff --git a/src/kdecore/kcomponentdata.h b/src/kdecore/kcomponentdata.h
index c69dcf9..a24a6b0 100644
--- a/src/kdecore/kcomponentdata.h
+++ b/src/kdecore/kcomponentdata.h
@@ -19,9 +19,9 @@
#ifndef KCOMPONENTDATA_H
#define KCOMPONENTDATA_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -48,7 +48,7 @@ class KComponentDataPrivate;
* @author Torben Weis
* @author Matthias Kretz <kretz at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KComponentData // krazy:exclude=dpointer (implicitly shared)
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KComponentData // krazy:exclude=dpointer (implicitly shared)
{
public:
/**
@@ -153,14 +153,14 @@ public:
* constructor but a component name was set, a default constructed
* K4AboutData object is returned.
*/
- KDE4SUPPORT_DEPRECATED const K4AboutData *aboutData() const;
+ KDELIBS4SUPPORT_DEPRECATED const K4AboutData *aboutData() const;
/**
* Sets the about data of this component.
*
* @since 4.5
*/
- KDE4SUPPORT_DEPRECATED void setAboutData(const K4AboutData &aboutData);
+ KDELIBS4SUPPORT_DEPRECATED void setAboutData(const K4AboutData &aboutData);
/**
* Returns the name of the component.
diff --git a/src/kdecore/kdatetime.cpp b/src/kdecore/kdatetime.cpp
index 2d0a833..6188da7 100644
--- a/src/kdecore/kdatetime.cpp
+++ b/src/kdecore/kdatetime.cpp
@@ -87,8 +87,8 @@ int findString(const QString &string, const char array[][disp], int count, int &
static const int NO_NUMBER = std::numeric_limits<int>::min(); // indicates that no number is present in string conversion functions
#ifdef COMPILING_TESTS
-KDE4SUPPORT_EXPORT int KDateTime_utcCacheHit = 0;
-KDE4SUPPORT_EXPORT int KDateTime_zoneCacheHit = 0;
+KDELIBS4SUPPORT_EXPORT int KDateTime_utcCacheHit = 0;
+KDELIBS4SUPPORT_EXPORT int KDateTime_zoneCacheHit = 0;
#endif
/*----------------------------------------------------------------------------*/
diff --git a/src/kdecore/kdatetime.h b/src/kdecore/kdatetime.h
index 5158bac..2e17308 100644
--- a/src/kdecore/kdatetime.h
+++ b/src/kdecore/kdatetime.h
@@ -26,7 +26,7 @@
#ifndef _KDATETIME_H_
#define _KDATETIME_H_
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QMetaType>
#include <QtCore/QSharedDataPointer>
@@ -145,7 +145,7 @@ class KTimeZones;
* @see <a href="http://www.w3.org/TR/timezone/">W3C: Working with Time Zones</a>
* @author David Jarvie \<djarvie at kde.org\>.
*/
-class KDE4SUPPORT_EXPORT KDateTime //krazy:exclude=dpointer (implicitly shared)
+class KDELIBS4SUPPORT_EXPORT KDateTime //krazy:exclude=dpointer (implicitly shared)
{
public:
/**
@@ -196,7 +196,7 @@ public:
* should be interpreted, i.e. which time zone (if any) the date/time is
* expressed in.
*/
- class KDE4SUPPORT_EXPORT Spec
+ class KDELIBS4SUPPORT_EXPORT Spec
{
public:
/**
@@ -1073,7 +1073,7 @@ public:
* @see secsTo(), addSecs(), daysTo()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED inline qint64 secsTo_long(const KDateTime &other) const
+ KDELIBS4SUPPORT_DEPRECATED inline qint64 secsTo_long(const KDateTime &other) const
{
return secsTo(other);
}
@@ -1442,7 +1442,7 @@ public:
* @deprecated Since 5.0, we now supports all valid dates.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED inline bool outOfRange() const
+ KDELIBS4SUPPORT_DEPRECATED inline bool outOfRange() const
{
return false;
}
@@ -1603,8 +1603,8 @@ public:
*/
static KDateTime realCurrentLocalDateTime();
- friend QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
- friend QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
+ friend QDataStream KDELIBS4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
+ friend QDataStream KDELIBS4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
private:
QSharedDataPointer<KDateTimePrivate> d;
@@ -1614,13 +1614,13 @@ Q_DECLARE_METATYPE(KDateTime)
Q_DECLARE_METATYPE(KDateTime::Spec)
/** Write @p spec to the datastream @p out, in binary format. */
-QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec);
/** Read a KDateTime::Spec object into @p spec from @p in, in binary format. */
-QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &spec);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &spec);
/** Write @p dateTime to the datastream @p out, in binary format. */
-QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
/** Read a KDateTime object into @p dateTime from @p in, in binary format. */
-QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
#endif
diff --git a/src/kdecore/kdayperiod_p.h b/src/kdecore/kdayperiod_p.h
index f025b43..8de4916 100644
--- a/src/kdecore/kdayperiod_p.h
+++ b/src/kdecore/kdayperiod_p.h
@@ -23,7 +23,7 @@
#include <QtCore/QSharedDataPointer>
#include "klocale.h"
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class QDate;
class QString;
diff --git a/src/kdecore/kde4support_export.h b/src/kdecore/kde4support_export.h
deleted file mode 100644
index 4a04672..0000000
--- a/src/kdecore/kde4support_export.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef KDE4SUPPORT_EXPORT_WRAPPER_H
-#define KDE4SUPPORT_EXPORT_WRAPPER_H
-
-#include "kde4support_export_internal.h"
-
-#ifndef KDE4SUPPORT_NO_DEPRECATED_NOISE
-#define KDE4SUPPORT_DEPRECATED_NOISE KDE4SUPPORT_DEPRECATED
-#define KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KDE4SUPPORT_DEPRECATED_EXPORT
-#else
-#define KDE4SUPPORT_DEPRECATED_NOISE
-#define KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KDE4SUPPORT_EXPORT
-#endif
-
-#endif
diff --git a/src/kdecore/kde_file.h b/src/kdecore/kde_file.h
index 8d4688e..b7b2841 100644
--- a/src/kdecore/kde_file.h
+++ b/src/kdecore/kde_file.h
@@ -37,7 +37,7 @@
#if defined _WIN32 || defined _WIN64
#include <kde_file_win.h>
#endif
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/* added not for Solaris and OpenSolaris platforms */
@@ -158,23 +158,23 @@ class QString;
namespace KDE
{
/** replacement for ::access() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int access(const QString &path, int mode);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int access(const QString &path, int mode);
/** replacement for ::chmod() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int chmod(const QString &path, mode_t mode);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int chmod(const QString &path, mode_t mode);
/** replacement for ::fopen()/::fopen64() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT FILE *fopen(const QString &pathname, const char *mode);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT FILE *fopen(const QString &pathname, const char *mode);
/** replacement for ::lstat()/::lstat64() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int lstat(const QString &path, KDE_struct_stat *buf);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int lstat(const QString &path, KDE_struct_stat *buf);
/** replacement for ::mkdir() to handle pathnames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int mkdir(const QString &pathname, mode_t mode);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int mkdir(const QString &pathname, mode_t mode);
/** replacement for ::open()/::open64() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int open(const QString &pathname, int flags, mode_t mode = 0);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int open(const QString &pathname, int flags, mode_t mode = 0);
/** replacement for ::rename() to handle pathnames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int rename(const QString &in, const QString &out);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int rename(const QString &in, const QString &out);
/** replacement for ::stat()/::stat64() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int stat(const QString &path, KDE_struct_stat *buf);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int stat(const QString &path, KDE_struct_stat *buf);
/** replacement for ::utime() to handle filenames in a platform independent way */
-KDE4SUPPORT_DEPRECATED_EXPORT int utime(const QString &filename, struct utimbuf *buf);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int utime(const QString &filename, struct utimbuf *buf);
#ifndef Q_OS_WIN
inline int access(const QString &path, int mode)
{
diff --git a/src/kdecore/kdebug.cpp b/src/kdecore/kdebug.cpp
index cb4244b..60fdca4 100644
--- a/src/kdecore/kdebug.cpp
+++ b/src/kdecore/kdebug.cpp
@@ -101,7 +101,7 @@
#include "kdebugdbusiface_p.h"
#include <QMutex>
-KDE4SUPPORT_DEPRECATED_EXPORT bool kde_kdebug_enable_dbus_interface = false;
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool kde_kdebug_enable_dbus_interface = false;
class KNoDebugStream: public QIODevice
{
diff --git a/src/kdecore/kdebug.h b/src/kdecore/kdebug.h
index 4d04f22..fe7aeec 100644
--- a/src/kdecore/kdebug.h
+++ b/src/kdecore/kdebug.h
@@ -22,9 +22,9 @@
#ifndef _KDEBUG_H_
#define _KDEBUG_H_
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -82,20 +82,20 @@
* @internal
* Returns a debug stream that may or may not output anything.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug kDebugStream(QtMsgType level, int area, const char *file = 0,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug kDebugStream(QtMsgType level, int area, const char *file = 0,
int line = -1, const char *funcinfo = 0);
/**
* @internal
* Returns a debug stream that goes the way of the blackhole.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug kDebugDevNull();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug kDebugDevNull();
/**
* @internal
* The actual backtrace.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QString kRealBacktrace(int);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QString kRealBacktrace(int);
/**
* \relates KGlobal
@@ -123,7 +123,7 @@ static inline QString kBacktrace(int = -1)
* Deletes the kdebugrc cache and therefore forces KDebug to reread the
* config file
*/
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE void kClearDebugConfig();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE void kClearDebugConfig();
#ifndef KDE_DEFAULT_DEBUG_AREA
# define KDE_DEFAULT_DEBUG_AREA 0
@@ -248,42 +248,42 @@ inline QDebug operator<<(QDebug s, KDebugStreamFunction f)
* @return the debug stream (@p s)
* @see perror(3)
*/
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug perror(QDebug, KDebugTag);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug perror(QDebug, KDebugTag);
// operators for KDE types
class QUrl;
//class KDateTime;
class QObject;
-KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const QUrl &url);
-//KDE4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const KDateTime &time);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const QUrl &url);
+//KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE QDebug operator<<(QDebug s, const KDateTime &time);
#if 1 || defined(KDE3_SUPPORT)
#ifndef KDE_NO_DEPRECATED
-class KDE4SUPPORT_DEPRECATED_NOISE kndbgstream { };
+class KDELIBS4SUPPORT_DEPRECATED_NOISE kndbgstream { };
typedef QDebug kdbgstream;
-static inline KDE4SUPPORT_DEPRECATED_NOISE QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AREA)
+static inline KDELIBS4SUPPORT_DEPRECATED_NOISE QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AREA)
{
return kDebug(area);
}
-static inline KDE4SUPPORT_DEPRECATED_NOISE QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_AREA)
+static inline KDELIBS4SUPPORT_DEPRECATED_NOISE QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_AREA)
{
return kWarning(area);
}
-static inline KDE4SUPPORT_DEPRECATED_NOISE QDebug kdError(int area = KDE_DEFAULT_DEBUG_AREA)
+static inline KDELIBS4SUPPORT_DEPRECATED_NOISE QDebug kdError(int area = KDE_DEFAULT_DEBUG_AREA)
{
return kError(area);
}
-static inline KDE4SUPPORT_DEPRECATED_NOISE QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AREA)
+static inline KDELIBS4SUPPORT_DEPRECATED_NOISE QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AREA)
{
return kFatal(area);
}
-inline KDE4SUPPORT_DEPRECATED_NOISE QString kdBacktrace(int levels = -1)
+inline KDELIBS4SUPPORT_DEPRECATED_NOISE QString kdBacktrace(int levels = -1)
{
return kBacktrace(levels);
}
-static inline KDE4SUPPORT_DEPRECATED_NOISE QDebug kndDebug()
+static inline KDELIBS4SUPPORT_DEPRECATED_NOISE QDebug kndDebug()
{
return kDebugDevNull();
}
@@ -324,7 +324,7 @@ public:
}
/// @internal
- static KDE4SUPPORT_DEPRECATED_EXPORT_NOISE bool hasNullOutput(QtMsgType type,
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE bool hasNullOutput(QtMsgType type,
bool condition,
int area,
bool enableByDefault);
@@ -365,7 +365,7 @@ public:
* declare it in one file without static, and use "extern int debugArea();"
* in other files (with a better name for the function of course).
*/
- static KDE4SUPPORT_DEPRECATED_EXPORT_NOISE int registerArea(const QByteArray &areaName, bool enabled = true);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE int registerArea(const QByteArray &areaName, bool enabled = true);
private:
WrongSyntax operator()(const char *)
@@ -419,7 +419,7 @@ private:
*
* Alternatively, use the KDEBUG_BLOCK macro, for automatic naming.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDebug::Block
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDebug::Block
{
public:
Block(const char *label, int area = KDE_DEFAULT_DEBUG_AREA);
@@ -439,7 +439,7 @@ private:
#else
-class KDE4SUPPORT_DEPRECATED_EXPORT KDebug::Block
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDebug::Block
{
public:
Block(const char *, int = KDE_DEFAULT_DEBUG_AREA) {}
diff --git a/src/kdecore/kdelibs4support_export.h b/src/kdecore/kdelibs4support_export.h
new file mode 100644
index 0000000..1fa38a6
--- /dev/null
+++ b/src/kdecore/kdelibs4support_export.h
@@ -0,0 +1,15 @@
+
+#ifndef KDELIBS4SUPPORT_EXPORT_WRAPPER_H
+#define KDELIBS4SUPPORT_EXPORT_WRAPPER_H
+
+#include "kdelibs4support_export_internal.h"
+
+#ifndef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
+#define KDELIBS4SUPPORT_DEPRECATED_NOISE KDELIBS4SUPPORT_DEPRECATED
+#define KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KDELIBS4SUPPORT_DEPRECATED_EXPORT
+#else
+#define KDELIBS4SUPPORT_DEPRECATED_NOISE
+#define KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KDELIBS4SUPPORT_EXPORT
+#endif
+
+#endif
diff --git a/src/kdecore/kdeversion.h b/src/kdecore/kdeversion.h
index c050c4a..efd8067 100644
--- a/src/kdecore/kdeversion.h
+++ b/src/kdecore/kdeversion.h
@@ -27,8 +27,8 @@
* @brief The file contains macros and functions related to the KDE version.
*/
-#include <kde4support_export.h>
-#include <kde4support_version.h>
+#include <kdelibs4support_export.h>
+#include <kdelibs4support_version.h>
/**
* @def KDE_VERSION_STRING
@@ -45,26 +45,26 @@
* or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)"
*/
-#define KDE_VERSION_STRING KDE4SUPPORT_VERSION_STRING
+#define KDE_VERSION_STRING KDELIBS4SUPPORT_VERSION_STRING
/**
* @def KDE_VERSION_MAJOR
* @ingroup KDEMacros
* @brief Major version of KDE, at compile time
*/
-#define KDE_VERSION_MAJOR KDE4SUPPORT_VERSION_MAJOR
+#define KDE_VERSION_MAJOR KDELIBS4SUPPORT_VERSION_MAJOR
/**
* @def KDE_VERSION_MINOR
* @ingroup KDEMacros
* @brief Minor version of KDE, at compile time
*/
-#define KDE_VERSION_MINOR KDE4SUPPORT_VERSION_MINOR
+#define KDE_VERSION_MINOR KDELIBS4SUPPORT_VERSION_MINOR
/**
* @def KDE_VERSION_RELEASE
* @ingroup KDEMacros
* @brief Release version of KDE, at compile time
*/
-#define KDE_VERSION_RELEASE KDE4SUPPORT_VERSION_PATCH
+#define KDE_VERSION_RELEASE KDELIBS4SUPPORT_VERSION_PATCH
/**
* @ingroup KDEMacros
@@ -123,25 +123,25 @@ namespace KDE
* installed when the program was compiled.
* @return the version number, encoded in a single uint
*/
-KDE4SUPPORT_DEPRECATED_EXPORT unsigned int version();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT unsigned int version();
/**
* @brief Returns the major number of KDE's version, e.g.
* 4 for KDE 4.1.2.
* @return the major version number
*/
-KDE4SUPPORT_DEPRECATED_EXPORT unsigned int versionMajor();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT unsigned int versionMajor();
/**
* @brief Returns the minor number of KDE's version, e.g.
* 1 for KDE 4.1.2.
* @return the minor version number
*/
-KDE4SUPPORT_DEPRECATED_EXPORT unsigned int versionMinor();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT unsigned int versionMinor();
/**
* @brief Returns the release of KDE's version, e.g.
* 2 for KDE 4.1.2.
* @return the release number
*/
-KDE4SUPPORT_DEPRECATED_EXPORT unsigned int versionRelease();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT unsigned int versionRelease();
/**
* @brief Returns the KDE version as string, e.g. "4.1.2".
*
@@ -149,7 +149,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT unsigned int versionRelease();
* the version number of KDE at runtime.
* @return the KDE version. You can keep the string forever
*/
-KDE4SUPPORT_DEPRECATED_EXPORT const char *versionString();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT const char *versionString();
}
#endif // KDELIBS_KDEVERSION_H
diff --git a/src/kdecore/kgenericfactory.h b/src/kdecore/kgenericfactory.h
index 13f7fba..e51d76d 100644
--- a/src/kdecore/kgenericfactory.h
+++ b/src/kdecore/kgenericfactory.h
@@ -150,7 +150,7 @@ bool KGenericFactoryBase<T>::s_createComponentDataCalled = false;
* @deprecated use KPluginFactory
*/
template <class Product, class ParentType = QObject>
-class KDE4SUPPORT_DEPRECATED KGenericFactory : public KGenericFactoryBase<Product>
+class KDELIBS4SUPPORT_DEPRECATED KGenericFactory : public KGenericFactoryBase<Product>
{
public:
explicit KGenericFactory(const char *componentName = 0)
diff --git a/src/kdecore/kglobal.cpp b/src/kdecore/kglobal.cpp
index 36160d5..d493314 100644
--- a/src/kdecore/kglobal.cpp
+++ b/src/kdecore/kglobal.cpp
@@ -29,7 +29,7 @@
#include "kglobal.h"
#include <QThread>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
diff --git a/src/kdecore/kglobal.h b/src/kdecore/kglobal.h
index 108387d..dc79519 100644
--- a/src/kdecore/kglobal.h
+++ b/src/kdecore/kglobal.h
@@ -19,9 +19,9 @@
#ifndef _KGLOBAL_H
#define _KGLOBAL_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -329,14 +329,14 @@ public:
namespace KGlobal
{
-struct KDE4SUPPORT_DEPRECATED_EXPORT_NOISE LocaleWrapper : public KLocale {
+struct KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE LocaleWrapper : public KLocale {
explicit LocaleWrapper(KLocale *locale)
: KLocale(*locale)
{
}
- KDE4SUPPORT_DEPRECATED static void insertCatalog(const QString &)
+ KDELIBS4SUPPORT_DEPRECATED static void insertCatalog(const QString &)
{
qWarning() << "Your code needs to be ported in KF5. See the Ki18n programmers guide.";
}
@@ -359,27 +359,27 @@ struct KDE4SUPPORT_DEPRECATED_EXPORT_NOISE LocaleWrapper : public KLocale {
* @return the global component data
* @deprecated since 5.0 use KComponentData::mainComponent() if you really need a KComponentData
*/
-KDE4SUPPORT_DEPRECATED_EXPORT const KComponentData &mainComponent(); //krazy:exclude=constref (don't mess up ref-counting)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT const KComponentData &mainComponent(); //krazy:exclude=constref (don't mess up ref-counting)
/**
* @internal
* Returns whether a main KComponentData is available.
* @deprecated since 5.0, use KComponentData::hasMainComponent() if you really need a KComponentData
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool hasMainComponent();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool hasMainComponent();
/**
* Returns the application standard dirs object.
* @return the global standard dir object
*/
-KDE4SUPPORT_DEPRECATED_EXPORT KStandardDirs *dirs();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT KStandardDirs *dirs();
/**
* Returns the general config object.
* @return the global configuration object.
* @deprecated since 5.0, use KSharedConfig::openConfig()
*/
-KDE4SUPPORT_DEPRECATED_EXPORT KSharedConfigPtr config();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT KSharedConfigPtr config();
/**
* Returns the global locale object.
@@ -393,26 +393,26 @@ KDE4SUPPORT_DEPRECATED_EXPORT KSharedConfigPtr config();
*
* @deprecated since 5.0, use KLocale::global()
*/
-KDE4SUPPORT_DEPRECATED_EXPORT LocaleWrapper locale();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT LocaleWrapper locale();
/**
* @internal
* Returns whether KGlobal has a valid KLocale object
* @deprecated since 5.0, port to if (qApp) because KLocale::global() can be called, as soon as a qApp exists.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool hasLocale();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool hasLocale();
/**
* The global charset manager.
* @return the global charset manager
* @deprecated since 5.0, use KCharsets::charsets()
*/
-KDE4SUPPORT_DEPRECATED_EXPORT KCharsets *charsets();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT KCharsets *charsets();
/**
* Returns the umask of the process.
* @return the umask of the process
*/
-KDE4SUPPORT_DEPRECATED_EXPORT mode_t umask();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT mode_t umask();
/**
* Creates a static QString.
@@ -432,7 +432,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT mode_t umask();
* @return the static string
* @deprecated since 5.0, use QLatin1Literal()
*/
-KDE4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const char *str); //krazy:exclude=constref (doesn't make sense otherwise)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const char *str); //krazy:exclude=constref (doesn't make sense otherwise)
/**
* Creates a static QString.
@@ -452,7 +452,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const char *str); //k
* @return the static string
* @deprecated since 5.0 don't make the string static
*/
-KDE4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const QString &str); //krazy:exclude=constref (doesn't make sense otherwise)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const QString &str); //krazy:exclude=constref (doesn't make sense otherwise)
/**
* Tells KGlobal about one more operations that should be finished
@@ -475,13 +475,13 @@ KDE4SUPPORT_DEPRECATED_EXPORT const QString &staticQString(const QString &str);
* Note that for this to happen you must call qApp->setQuitOnLastWindowClosed(false),
* in main() for instance.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void ref();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void ref();
/**
* Tells KGlobal that one operation such as those described in ref() just finished.
* This call makes the QApplication quit if the counter is back to 0.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void deref();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void deref();
/**
* If refcounting reaches 0 (or less), and @p allowQuit is true, the instance of the application
@@ -498,7 +498,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void deref();
*
* @since 4.1.1
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void setAllowQuit(bool allowQuit);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void setAllowQuit(bool allowQuit);
/**
* The component currently active (useful in a multi-component
@@ -507,7 +507,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void setAllowQuit(bool allowQuit);
* @internal
* @deprecated since 5.0 use KComponentData::activeComponent()
*/
-KDE4SUPPORT_DEPRECATED_EXPORT KComponentData activeComponent();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT KComponentData activeComponent();
/**
* Set the active component for use by KAboutDialog and KBugReport.
@@ -516,7 +516,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT KComponentData activeComponent();
* @see activeComponent()
* @deprecated since 5.0 use KComponentData::setActiveComponent
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void setActiveComponent(const KComponentData &d);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void setActiveComponent(const KComponentData &d);
/**
* Returns a text for the window caption.
@@ -528,10 +528,10 @@ KDE4SUPPORT_DEPRECATED_EXPORT void setActiveComponent(const KComponentData &d);
* @deprecated since 5.0. Don't use in window titles anymore, Qt takes care of it.
* If you really need this, use QGuiApplication::applicationDisplayName(), and if that's empty, QCoreApplication::applicationName().
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QString caption();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString caption();
/// @internal
-KDE4SUPPORT_DEPRECATED_EXPORT QObject *findDirectChild_helper(const QObject *parent, const QMetaObject &mo);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QObject *findDirectChild_helper(const QObject *parent, const QMetaObject &mo);
/**
* Returns the child of the given object that can be cast into type T, or 0 if there is no such object.
@@ -540,14 +540,14 @@ KDE4SUPPORT_DEPRECATED_EXPORT QObject *findDirectChild_helper(const QObject *par
* @deprecated since Qt 5, use QObject::findChild(FindDirectChildrenOnly)
*/
template<typename T>
-KDE4SUPPORT_DEPRECATED inline T findDirectChild(const QObject *object)
+KDELIBS4SUPPORT_DEPRECATED inline T findDirectChild(const QObject *object)
{
return static_cast<T>(findDirectChild_helper(object, (static_cast<T>(0))->staticMetaObject));
}
}
struct KCatalogLoader {
- KDE4SUPPORT_DEPRECATED KCatalogLoader(const QString &)
+ KDELIBS4SUPPORT_DEPRECATED KCatalogLoader(const QString &)
{
qWarning() << "Your code needs to be ported in KF5. See the Ki18n programmers guide.";
}
diff --git a/src/kdecore/kkernel_mac.h b/src/kdecore/kkernel_mac.h
index e9a2493..5e569f4 100644
--- a/src/kdecore/kkernel_mac.h
+++ b/src/kdecore/kkernel_mac.h
@@ -23,7 +23,7 @@
#ifdef Q_OS_MACX
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QString>
#include <CoreFoundation/CFString.h>
@@ -45,17 +45,17 @@ QString convert_CFString_to_QString(CFStringRef str);
/**
* Fork and reexec to work around CoreFoundation issues.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void mac_fork_and_reexec_self();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void mac_fork_and_reexec_self();
/**
* Initialize D-Bus Mac-specific stuff if necessary.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void mac_initialize_dbus();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void mac_initialize_dbus();
/**
* Get the application name.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QString mac_app_filename();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString mac_app_filename();
#endif // Q_OS_MACX
#endif // KKERNEL_MAC_H
diff --git a/src/kdecore/kkernel_win.h b/src/kdecore/kkernel_win.h
index b8d6d49..1d136cd 100644
--- a/src/kdecore/kkernel_win.h
+++ b/src/kdecore/kkernel_win.h
@@ -24,7 +24,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* @short Windows-specific functions needed in kdecore
@@ -37,26 +37,26 @@
/**
\return a value from MS Windows native registry for shell folder \a folder.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QString getWin32ShellFoldersPath(const QString &folder);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString getWin32ShellFoldersPath(const QString &folder);
/**
Shows native MS Windows file property dialog for a file \a fileName.
Return true on success. Only works for local absolute paths.
Used by KPropertiesDialog, if possible.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool showWin32FilePropertyDialog(const QString &fileName);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool showWin32FilePropertyDialog(const QString &fileName);
/**
\return two-letter locale name (like "en" or "pl") taken from MS Windows native registry.
Useful when we don't want to rely on KSyCoCa.
Used e.g. by kbuildsycoca application.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QByteArray getWin32LocaleName();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QByteArray getWin32LocaleName();
/**
\return true when the file is an executable on windows.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool isExecutable(const QString &filename);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool isExecutable(const QString &filename);
/**
\return a value from MS Windows native registry.
diff --git a/src/kdecore/klibloader.cpp b/src/kdecore/klibloader.cpp
index 5bc77b2..7fc7f21 100644
--- a/src/kdecore/klibloader.cpp
+++ b/src/kdecore/klibloader.cpp
@@ -59,7 +59,7 @@ KLibLoader::~KLibLoader()
extern QString makeLibName(const QString &libname);
-extern KDE4SUPPORT_DEPRECATED_EXPORT QString findLibrary(const QString &name);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT QString findLibrary(const QString &name);
#ifdef Q_OS_WIN
// removes "lib" prefix, if present
diff --git a/src/kdecore/klibloader.h b/src/kdecore/klibloader.h
index a1e70dd..16a2b09 100644
--- a/src/kdecore/klibloader.h
+++ b/src/kdecore/klibloader.h
@@ -18,7 +18,7 @@
#ifndef KLIBLOADER_H
#define KLIBLOADER_H
-#include "kde4support_export.h"
+#include "kdelibs4support_export.h"
#include "kglobal.h"
@@ -34,7 +34,7 @@
#ifndef KDE_NO_DEPRECATED
-class KDE4SUPPORT_DEPRECATED_EXPORT K_EXPORT_COMPONENT_FACTORY_is_deprecated_use_KPluginFactory
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT K_EXPORT_COMPONENT_FACTORY_is_deprecated_use_KPluginFactory
{
};
@@ -50,7 +50,7 @@ class KDE4SUPPORT_DEPRECATED_EXPORT K_EXPORT_COMPONENT_FACTORY_is_deprecated_use
* @see QLibrary, KPluginLoader
* @author Torben Weis <weis at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KLibLoader : public QObject //krazy:exclude=dpointer (private class is kept as a global static)
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KLibLoader : public QObject //krazy:exclude=dpointer (private class is kept as a global static)
{
friend class KLibLoaderPrivate;
@@ -99,14 +99,14 @@ public:
* @deprecated since 4.0, use KPluginLoader, KService::createInstance or
* QLibrary instead.
*/
- static KDE4SUPPORT_DEPRECATED KLibLoader *self();
+ static KDELIBS4SUPPORT_DEPRECATED KLibLoader *self();
/**
* @deprecated since 5.0, if the library is in a plugin directory, use
* KPluginLoader::findPlugin(); if it is in a library directory, pass the
* name directly to QLibrary.
*/
- static KDE4SUPPORT_DEPRECATED QString findLibrary(const QString &libname, const KComponentData &cData = KGlobal::mainComponent());
+ static KDELIBS4SUPPORT_DEPRECATED QString findLibrary(const QString &libname, const KComponentData &cData = KGlobal::mainComponent());
private:
~KLibLoader();
diff --git a/src/kdecore/klibrary.h b/src/kdecore/klibrary.h
index ed1c500..182367f 100644
--- a/src/kdecore/klibrary.h
+++ b/src/kdecore/klibrary.h
@@ -18,7 +18,7 @@
#ifndef KLIBRARY_H
#define KLIBRARY_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QLibrary>
@@ -34,7 +34,7 @@ class KPluginFactory;
*
* @deprecated since 5.0, use QLibrary and KPluginLoader::findPlugin() instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KLibrary : public QLibrary
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KLibrary : public QLibrary
{
Q_OBJECT
Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
@@ -53,7 +53,7 @@ public:
/**
* @deprecated since 4.0, use KPluginLoader::factory
*/
- KDE4SUPPORT_DEPRECATED KPluginFactory *factory(const char *factoryname = 0)
+ KDELIBS4SUPPORT_DEPRECATED KPluginFactory *factory(const char *factoryname = 0)
{
// there is nothing sensible we can do: kdelibs 4 plugins depended on
// support from Qt that no longer exists
@@ -63,7 +63,7 @@ public:
/**
* @deprecated since 5.0, use QLibrary::resolve
*/
- KDE4SUPPORT_DEPRECATED void_function_ptr resolveFunction(const char *name)
+ KDELIBS4SUPPORT_DEPRECATED void_function_ptr resolveFunction(const char *name)
{
return resolve(name);
}
diff --git a/src/kdecore/klocale.h b/src/kdecore/klocale.h
index 480782e..5a4d49b 100644
--- a/src/kdecore/klocale.h
+++ b/src/kdecore/klocale.h
@@ -21,7 +21,7 @@
#ifndef KLOCALE_H
#define KLOCALE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ksharedconfig.h>
// Include for providing source code compatibility
@@ -66,7 +66,7 @@ class KLocalePrivate;
* Hans Petter Bieker <bieker at kde.org>, Lukas Tinkl <lukas.tinkl at suse.cz>
* @short class for supporting locale settings
*/
-class KDE4SUPPORT_EXPORT KLocale
+class KDELIBS4SUPPORT_EXPORT KLocale
{
public:
/**
@@ -329,7 +329,7 @@ public:
*
* @return Default number of fractional digits used by locale.
*/
- KDE4SUPPORT_DEPRECATED int fracDigits() const;
+ KDELIBS4SUPPORT_DEPRECATED int fracDigits() const;
/**
* @since 4.4
@@ -627,7 +627,7 @@ public:
*
* @return If nouns are declined
*/
- KDE4SUPPORT_DEPRECATED bool nounDeclension() const;
+ KDELIBS4SUPPORT_DEPRECATED bool nounDeclension() const;
//KDE5 move to KDateTime namespace
/**
@@ -988,7 +988,7 @@ public:
* @see calendarSystem()
* @return the name of the calendar system
*/
- KDE4SUPPORT_DEPRECATED QString calendarType() const;
+ KDELIBS4SUPPORT_DEPRECATED QString calendarType() const;
/**
* @since 4.6
@@ -1011,7 +1011,7 @@ public:
* @see setCalendarSystem()
* @param calendarType the name of the calendar type
*/
- KDE4SUPPORT_DEPRECATED void setCalendar(const QString &calendarType);
+ KDELIBS4SUPPORT_DEPRECATED void setCalendar(const QString &calendarType);
/**
* @since 4.6
@@ -1555,7 +1555,7 @@ public:
*
* @param digits The default number of digits to use.
*/
- KDE4SUPPORT_DEPRECATED void setFracDigits(int digits);
+ KDELIBS4SUPPORT_DEPRECATED void setFracDigits(int digits);
/**
* @since 4.4
diff --git a/src/kdecore/klocalizeddate.h b/src/kdecore/klocalizeddate.h
index 491a77e..4f4cee3 100644
--- a/src/kdecore/klocalizeddate.h
+++ b/src/kdecore/klocalizeddate.h
@@ -23,7 +23,7 @@
#include <QtCore/QString>
#include <QtCore/QDate>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "klocale.h"
class KLocalizedDatePrivate;
@@ -134,7 +134,7 @@ class KLocalizedDatePrivate;
*
*/
-class KDE4SUPPORT_EXPORT KLocalizedDate
+class KDELIBS4SUPPORT_EXPORT KLocalizedDate
{
public:
@@ -1152,9 +1152,9 @@ public:
private:
- friend QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date);
- friend QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
- friend QDebug KDE4SUPPORT_EXPORT operator<<(QDebug, const KLocalizedDate &);
+ friend QDataStream KDELIBS4SUPPORT_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date);
+ friend QDataStream KDELIBS4SUPPORT_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
+ friend QDebug KDELIBS4SUPPORT_EXPORT operator<<(QDebug, const KLocalizedDate &);
QSharedDataPointer<KLocalizedDatePrivate> d;
};
@@ -1167,7 +1167,7 @@ Q_DECLARE_METATYPE(KLocalizedDate)
* @param out the datastream to write to
* @param date the date to write to the stream
*/
-QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date);
/**
* Data stream input operator
@@ -1175,7 +1175,7 @@ QDataStream KDE4SUPPORT_EXPORT &operator<<(QDataStream &out, const KLocalizedDat
* @param in the datastream to read from
* @param date the date to read from the stream
*/
-QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
+QDataStream KDELIBS4SUPPORT_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
/**
* Debug stream output operator
@@ -1183,6 +1183,6 @@ QDataStream KDE4SUPPORT_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date
* @param debug the debug datastream to write to
* @param date the date to write to the stream
*/
-QDebug KDE4SUPPORT_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
+QDebug KDELIBS4SUPPORT_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
#endif // KLOCALIZEDDATE_H
diff --git a/src/kdecore/klockfile.h b/src/kdecore/klockfile.h
index 55c28d0..83ccb15 100644
--- a/src/kdecore/klockfile.h
+++ b/src/kdecore/klockfile.h
@@ -20,7 +20,7 @@
#ifndef KLOCKFILE_H
#define KLOCKFILE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QString>
#include <QtCore/QFlags>
@@ -34,7 +34,7 @@ class QString;
* @author Waldo Bastian <bastian at kde.org>
* @deprecated since 5.0, please use QLockFile instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KLockFile
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KLockFile
{
public:
diff --git a/src/kdecore/kmd5.h b/src/kdecore/kmd5.h
index 631b8e5..e048e2e 100644
--- a/src/kdecore/kmd5.h
+++ b/src/kdecore/kmd5.h
@@ -34,7 +34,7 @@
#ifndef KMD5_H
#define KMD5_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <qglobal.h>
class QByteArray;
@@ -91,7 +91,7 @@ class KMD5Private;
* @see QCryptographicHash
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KMD5
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KMD5
{
public:
diff --git a/src/kdecore/kmimetype.h b/src/kdecore/kmimetype.h
index 2203710..45e6ec3 100644
--- a/src/kdecore/kmimetype.h
+++ b/src/kdecore/kmimetype.h
@@ -20,7 +20,7 @@
#ifndef __kmimetype_h__
#define __kmimetype_h__
-#include "kde4support_export.h"
+#include "kdelibs4support_export.h"
#include <QtCore/QStringList>
#include <QtCore/QList>
@@ -47,7 +47,7 @@ class KMimeTypePrivate;
* @see KServiceType
* @deprecated use QMimeType
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KMimeType : public QSharedData
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KMimeType : public QSharedData
{
Q_DECLARE_PRIVATE(KMimeType)
public:
@@ -348,7 +348,7 @@ public:
* Use is(), parentMimeTypes(), or allParentMimeTypes() instead of parentMimeType()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString parentMimeType() const;
+ KDELIBS4SUPPORT_DEPRECATED QString parentMimeType() const;
#endif
/**
diff --git a/src/kdecore/kmimetyperepository_p.h b/src/kdecore/kmimetyperepository_p.h
index c2b3649..c2f2b05 100644
--- a/src/kdecore/kmimetyperepository_p.h
+++ b/src/kdecore/kmimetyperepository_p.h
@@ -32,7 +32,7 @@
*
* Exported for kbuildsycoca, for now
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KMimeTypeRepository
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KMimeTypeRepository
{
public:
/**
diff --git a/src/kdecore/ksavefile.cpp b/src/kdecore/ksavefile.cpp
index 297940d..a13530f 100644
--- a/src/kdecore/ksavefile.cpp
+++ b/src/kdecore/ksavefile.cpp
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <errno.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
static int s_umask;
diff --git a/src/kdecore/ksavefile.h b/src/kdecore/ksavefile.h
index 453b65d..6139fe1 100644
--- a/src/kdecore/ksavefile.h
+++ b/src/kdecore/ksavefile.h
@@ -21,7 +21,7 @@
#ifndef KSAVEFILE_H
#define KSAVEFILE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "kbackup.h"
@@ -95,7 +95,7 @@
*
* @deprecated since 5.0, port to QSaveFile.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSaveFile : public QFile
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSaveFile : public QFile
{
public:
/**
diff --git a/src/kdecore/ksharedptr.h b/src/kdecore/ksharedptr.h
index 6cd57ca..9cbe1e1 100644
--- a/src/kdecore/ksharedptr.h
+++ b/src/kdecore/ksharedptr.h
@@ -27,7 +27,7 @@
#ifndef KSHAREDPTR_H
#define KSHAREDPTR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QSharedData>
@@ -35,7 +35,7 @@
* @deprecated
* Use QSharedData instead.
*/
-typedef KDE4SUPPORT_DEPRECATED QSharedData KShared;
+typedef KDELIBS4SUPPORT_DEPRECATED QSharedData KShared;
/**
* \class KSharedPtr ksharedptr.h <KSharedPtr>
@@ -63,7 +63,7 @@ typedef KDE4SUPPORT_DEPRECATED QSharedData KShared;
*
*/
template< class T >
-class KDE4SUPPORT_DEPRECATED KSharedPtr
+class KDELIBS4SUPPORT_DEPRECATED KSharedPtr
{
public:
/**
diff --git a/src/kdecore/ksocketfactory.h b/src/kdecore/ksocketfactory.h
index 45451c7..77efabe 100644
--- a/src/kdecore/ksocketfactory.h
+++ b/src/kdecore/ksocketfactory.h
@@ -21,7 +21,7 @@
#ifndef KSOCKETFACTORY_H
#define KSOCKETFACTORY_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QString>
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QHostAddress>
@@ -96,24 +96,24 @@ namespace KSocketFactory
* QTcpSocket constructor
* @threadsafe
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QTcpSocket *connectToHost(const QString &protocol, const QString &host,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QTcpSocket *connectToHost(const QString &protocol, const QString &host,
quint16 port, QObject *parent = 0);
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QTcpSocket *connectToHost(const QUrl &url, QObject *parent = 0);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QTcpSocket *connectToHost(const QUrl &url, QObject *parent = 0);
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void connectToHost(QTcpSocket *socket, const QString &protocol,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void connectToHost(QTcpSocket *socket, const QString &protocol,
const QString &host, quint16 port);
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void connectToHost(QTcpSocket *socket, const QUrl &url);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void connectToHost(QTcpSocket *socket, const QUrl &url);
/**
* This function behaves exactly like connectToHost() above, except
@@ -142,7 +142,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void connectToHost(QTcpSocket *socket, const QUrl
* QTcpSocket constructor
* @threadsafe
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QTcpSocket *synchronousConnectToHost(const QString &protocol,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QTcpSocket *synchronousConnectToHost(const QString &protocol,
const QString &host,
quint16 port, int msecs = 30000,
QObject *parent = 0);
@@ -150,20 +150,20 @@ KDE4SUPPORT_DEPRECATED_EXPORT QTcpSocket *synchronousConnectToHost(const QString
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QTcpSocket *synchronousConnectToHost(const QUrl &url, int msecs = 30000,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QTcpSocket *synchronousConnectToHost(const QUrl &url, int msecs = 30000,
QObject *parent = 0);
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void synchronousConnectToHost(QTcpSocket *socket, const QString &protocol,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void synchronousConnectToHost(QTcpSocket *socket, const QString &protocol,
const QString &host, quint16 port,
int msecs = 30000);
/**
* @overload
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void synchronousConnectToHost(QTcpSocket *socket, const QUrl &url,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void synchronousConnectToHost(QTcpSocket *socket, const QUrl &url,
int msecs = 30000);
/**
@@ -186,18 +186,18 @@ KDE4SUPPORT_DEPRECATED_EXPORT void synchronousConnectToHost(QTcpSocket *socket,
* @param parent the parent object to be passed to the
* QTcpServer constructor
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QTcpServer *listen(const QString &protocol, const QHostAddress &address = QHostAddress::Any,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QTcpServer *listen(const QString &protocol, const QHostAddress &address = QHostAddress::Any,
quint16 port = 0, QObject *parent = 0);
// These functions below aren't done yet
// Undocumented -> don't use!
-KDE4SUPPORT_DEPRECATED_EXPORT QUdpSocket *datagramSocket(const QString &protocol, const QString &host, QObject *parent = 0);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QUdpSocket *datagramSocket(const QString &protocol, const QString &host, QObject *parent = 0);
#ifndef QT_NO_NETWORKPROXY
-KDE4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForConnection(const QString &protocol, const QString &host);
-KDE4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForListening(const QString &protocol);
-KDE4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForDatagram(const QString &protocol, const QString &host);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForConnection(const QString &protocol, const QString &host);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForListening(const QString &protocol);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QNetworkProxy proxyForDatagram(const QString &protocol, const QString &host);
#endif
}
diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp
index 8b3f362..78c2319 100644
--- a/src/kdecore/kstandarddirs.cpp
+++ b/src/kdecore/kstandarddirs.cpp
@@ -38,7 +38,7 @@
#include <kservice_export.h>
#include <config-kstandarddirs.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <stdlib.h>
#include <assert.h>
#include <errno.h>
@@ -1991,7 +1991,7 @@ static QStringList lookupProfiles(const QString &mapFile)
return profiles;
}
-extern KDE4SUPPORT_DEPRECATED_EXPORT bool kde_kiosk_admin;
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT bool kde_kiosk_admin;
bool KStandardDirs::addCustomized(KConfig *config)
{
diff --git a/src/kdecore/kstandarddirs.h b/src/kdecore/kstandarddirs.h
index cfb5560..b0d809c 100644
--- a/src/kdecore/kstandarddirs.h
+++ b/src/kdecore/kstandarddirs.h
@@ -23,9 +23,9 @@
#ifndef KSTANDARDDIRS_H
#define KSTANDARDDIRS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -174,7 +174,7 @@ class KConfig;
*
* @deprecated since 5.0, use QStandardPaths, see KDE5PORTING.html for details
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KStandardDirs
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KStandardDirs
{
public:
/**
@@ -259,7 +259,7 @@ public:
* @deprecated, use addResourceType(type, 0, relativename, priority)
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool addResourceType(const char *type,
+ KDELIBS4SUPPORT_DEPRECATED bool addResourceType(const char *type,
const QString &relativename, bool priority = true);
#endif
@@ -377,7 +377,7 @@ public:
* In other apps, just use QFileInfo(fullPath).lastModified().toTime_t()
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED quint32 calcResourceHash(const char *type,
+ KDELIBS4SUPPORT_DEPRECATED quint32 calcResourceHash(const char *type,
const QString &filename,
SearchOptions options = NoSearchOptions) const;
#endif
@@ -623,7 +623,7 @@ public:
* See KDE5PORTING.html for how to port other resources.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString relativeLocation(const char *type, const QString &absPath) const;
+ KDELIBS4SUPPORT_DEPRECATED QString relativeLocation(const char *type, const QString &absPath) const;
#endif
/**
@@ -638,7 +638,7 @@ public:
* @deprecated since 5.0, use QDir().mkpath(dir).
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static bool makeDir(const QString &dir, int mode = 0755);
+ KDELIBS4SUPPORT_DEPRECATED static bool makeDir(const QString &dir, int mode = 0755);
#endif
/**
@@ -680,7 +680,7 @@ public:
* @deprecated now returns % + type + / ...
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED QString kde_default(const char *type);
+ static KDELIBS4SUPPORT_DEPRECATED QString kde_default(const char *type);
#endif
/**
@@ -689,7 +689,7 @@ public:
* QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).join(QString(':'))
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString kfsstnd_prefixes();
+ KDELIBS4SUPPORT_DEPRECATED QString kfsstnd_prefixes();
#endif
/**
@@ -702,7 +702,7 @@ public:
* QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString localkdedir() const;
+ KDELIBS4SUPPORT_DEPRECATED QString localkdedir() const;
#endif
/**
@@ -711,7 +711,7 @@ public:
* @deprecated since 5.0 use QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/'
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString localxdgdatadir() const;
+ KDELIBS4SUPPORT_DEPRECATED QString localxdgdatadir() const;
#endif
/**
@@ -720,7 +720,7 @@ public:
* @deprecated since 5.0 use QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + '/'
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED QString localxdgconfdir() const;
+ KDELIBS4SUPPORT_DEPRECATED QString localxdgconfdir() const;
#endif
/**
@@ -739,7 +739,7 @@ public:
* @deprecated since 5.0, use QFile::exists or QFileInfo::isFile()/isDir() to be more precise.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static bool exists(const QString &fullPath);
+ KDELIBS4SUPPORT_DEPRECATED static bool exists(const QString &fullPath);
#endif
/**
diff --git a/src/kdecore/kstringhandler_deprecated.h b/src/kdecore/kstringhandler_deprecated.h
index 076e40d..40d8bc6 100644
--- a/src/kdecore/kstringhandler_deprecated.h
+++ b/src/kdecore/kstringhandler_deprecated.h
@@ -23,7 +23,7 @@
#define KSTRINGHANDLER_DEPRECATED_H
#include <QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
namespace KStringHandler
{
@@ -40,7 +40,7 @@ namespace KStringHandler
@since 4.1
@deprecated Should use QCollator instead
*/
-KDE4SUPPORT_DEPRECATED_EXPORT int naturalCompare(const QString &a, const QString &b, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int naturalCompare(const QString &a, const QString &b, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive);
}
#endif
diff --git a/src/kdecore/ksystemtimezone.cpp b/src/kdecore/ksystemtimezone.cpp
index 9df287f..b117b15 100644
--- a/src/kdecore/ksystemtimezone.cpp
+++ b/src/kdecore/ksystemtimezone.cpp
@@ -171,7 +171,7 @@ KTzfileTimeZoneSource *KSystemTimeZonesPrivate::tzfileSource()
}
// for the benefit of KTimeZoneTest
-KDE4SUPPORT_EXPORT void k_system_time_zone_private_reset_config()
+KDELIBS4SUPPORT_EXPORT void k_system_time_zone_private_reset_config()
{
// Remove any old zones from the collection
const KTimeZones::ZoneMap oldZones = KSystemTimeZonesPrivate::instance()->zones();
diff --git a/src/kdecore/ksystemtimezone.h b/src/kdecore/ksystemtimezone.h
index 7e5b929..b0664c1 100644
--- a/src/kdecore/ksystemtimezone.h
+++ b/src/kdecore/ksystemtimezone.h
@@ -27,7 +27,7 @@
#ifndef _KSYSTEMTIMEZONE_H
#define _KSYSTEMTIMEZONE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "ktimezone.h"
#include <QtCore/QObject>
@@ -91,7 +91,7 @@ class KSystemTimeZoneDataPrivate;
* @author David Jarvie <djarvie at kde.org>.
* @author S.R.Haque <srhaque at iee.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZones : public QObject
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZones : public QObject
{
Q_OBJECT
public:
@@ -279,7 +279,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZone : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZone : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
{
public:
@@ -317,7 +317,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZoneBackend : public KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZoneBackend : public KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
{
public:
/** Implements KSystemTimeZone::KSystemTimeZone(). */
@@ -436,7 +436,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZoneSource : public KTimeZoneSource
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZoneSource : public KTimeZoneSource
{
public:
/**
diff --git a/src/kdecore/ktempdir.cpp b/src/kdecore/ktempdir.cpp
index 83af51c..775419b 100644
--- a/src/kdecore/ktempdir.cpp
+++ b/src/kdecore/ktempdir.cpp
@@ -18,7 +18,7 @@
**/
#include "ktempdir.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <sys/types.h>
#if HAVE_SYS_STAT_H
diff --git a/src/kdecore/ktempdir.h b/src/kdecore/ktempdir.h
index 83f14ed..379154f 100644
--- a/src/kdecore/ktempdir.h
+++ b/src/kdecore/ktempdir.h
@@ -20,7 +20,7 @@
#ifndef KTEMPDIR_H
#define KTEMPDIR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QString>
/**
@@ -47,7 +47,7 @@
*
* @see QTemporaryDir
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KTempDir
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KTempDir
{
public:
/**
diff --git a/src/kdecore/ktemporaryfile.h b/src/kdecore/ktemporaryfile.h
index 5f8fec2..4648476 100644
--- a/src/kdecore/ktemporaryfile.h
+++ b/src/kdecore/ktemporaryfile.h
@@ -20,7 +20,7 @@
#ifndef ktemporaryfile_h
#define ktemporaryfile_h
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "kglobal.h"
#include <QtCore/QTemporaryFile>
@@ -49,7 +49,7 @@ class KTemporaryFilePrivate;
*
* @see QTemporaryFile
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KTemporaryFile : public QTemporaryFile
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KTemporaryFile : public QTemporaryFile
{
public:
/**
diff --git a/src/kdecore/ktimezone.h b/src/kdecore/ktimezone.h
index d657347..fcf1f7e 100644
--- a/src/kdecore/ktimezone.h
+++ b/src/kdecore/ktimezone.h
@@ -28,7 +28,7 @@
#ifndef _KTIMEZONES_H
#define _KTIMEZONES_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <sys/time.h>
#include <ctime>
@@ -305,7 +305,7 @@ class KTimeZoneLeapSecondsPrivate;
* @author David Jarvie <djarvie at kde.org>.
* @author S.R.Haque <srhaque at iee.org>.
*/
-class KDE4SUPPORT_EXPORT KTimeZones
+class KDELIBS4SUPPORT_EXPORT KTimeZones
{
public:
KTimeZones();
@@ -412,7 +412,7 @@ private:
* @author David Jarvie <djarvie at kde.org>.
* @author S.R.Haque <srhaque at iee.org>.
*/
-class KDE4SUPPORT_EXPORT KTimeZone //krazy:exclude=dpointer (has non-const d-pointer to Backend class)
+class KDELIBS4SUPPORT_EXPORT KTimeZone //krazy:exclude=dpointer (has non-const d-pointer to Backend class)
{
public:
@@ -425,7 +425,7 @@ public:
* @short Time zone phase
* @author David Jarvie <djarvie at kde.org>.
*/
- class KDE4SUPPORT_EXPORT Phase
+ class KDELIBS4SUPPORT_EXPORT Phase
{
public:
/**
@@ -511,7 +511,7 @@ public:
* @short Time zone transition
* @author David Jarvie <djarvie at kde.org>.
*/
- class KDE4SUPPORT_EXPORT Transition
+ class KDELIBS4SUPPORT_EXPORT Transition
{
public:
Transition();
@@ -557,7 +557,7 @@ public:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
- class KDE4SUPPORT_EXPORT LeapSeconds
+ class KDELIBS4SUPPORT_EXPORT LeapSeconds
{
public:
LeapSeconds();
@@ -1118,7 +1118,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
+class KDELIBS4SUPPORT_EXPORT KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
{
public:
/** Implements KTimeZone::KTimeZone(). */
@@ -1228,7 +1228,7 @@ private:
* @author David Jarvie <djarvie at kde.org>.
* @author S.R.Haque <srhaque at iee.org>.
*/
-class KDE4SUPPORT_EXPORT KTimeZoneSource
+class KDELIBS4SUPPORT_EXPORT KTimeZoneSource
{
public:
KTimeZoneSource();
@@ -1299,7 +1299,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KTimeZoneData
+class KDELIBS4SUPPORT_EXPORT KTimeZoneData
{
friend class KTimeZone;
diff --git a/src/kdecore/ktimezone_win.h b/src/kdecore/ktimezone_win.h
index 09580fe..426d686 100644
--- a/src/kdecore/ktimezone_win.h
+++ b/src/kdecore/ktimezone_win.h
@@ -21,7 +21,7 @@
#ifndef _KTIMEZONE_WINDOWS_H
#define _KTIMEZONE_WINDOWS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ktimezone.h>
#include <ksystemtimezone.h>
@@ -40,7 +40,7 @@ class KSystemTimeZoneSourceWindowsPrivate;
* @ingroup timezones
* @author Marc Mutz <mutz at kde.org>, Till Adam <adam at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZoneSourceWindows : public KSystemTimeZoneSource
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZoneSourceWindows : public KSystemTimeZoneSource
{
public:
/**
@@ -73,7 +73,7 @@ private:
* @ingroup timezones
* @author Marc Mutz <mutz at kde.org>, Till Adam <adam at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KSystemTimeZoneWindows : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
+class KDELIBS4SUPPORT_EXPORT KSystemTimeZoneWindows : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
{
public:
/**
diff --git a/src/kdecore/ktzfiletimezone.h b/src/kdecore/ktzfiletimezone.h
index 0803c77..737e89a 100644
--- a/src/kdecore/ktzfiletimezone.h
+++ b/src/kdecore/ktzfiletimezone.h
@@ -26,7 +26,7 @@
#ifndef _KTZFILETIMEZONE_H
#define _KTZFILETIMEZONE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ktimezone.h>
#include <QtCore/QString>
@@ -47,7 +47,7 @@ class KTzfileTimeZoneSourcePrivate;
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KTzfileTimeZone : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
+class KDELIBS4SUPPORT_EXPORT KTzfileTimeZone : public KTimeZone //krazy:exclude=dpointer (no d-pointer for KTimeZone derived classes)
{
public:
/**
@@ -85,7 +85,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KTzfileTimeZoneBackend : public KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
+class KDELIBS4SUPPORT_EXPORT KTzfileTimeZoneBackend : public KTimeZoneBackend //krazy:exclude=dpointer (non-const d-pointer for KTimeZoneBackend-derived classes)
{
public:
/** Implements KTzfileTimeZone::KTzfileTimeZone(). */
@@ -133,7 +133,7 @@ private:
* @ingroup timezones
* @author David Jarvie <djarvie at kde.org>.
*/
-class KDE4SUPPORT_EXPORT KTzfileTimeZoneSource : public KTimeZoneSource
+class KDELIBS4SUPPORT_EXPORT KTzfileTimeZoneSource : public KTimeZoneSource
{
public:
/**
@@ -208,7 +208,7 @@ public:
virtual bool hasTransitions() const;
private:
- // Enable this if you add KDE4SUPPORT_EXPORT to this class
+ // Enable this if you add KDELIBS4SUPPORT_EXPORT to this class
//KTzfileTimeZoneDataPrivate * const d;
};
diff --git a/src/kdecore/kurl.h b/src/kdecore/kurl.h
index 2c3f466..8576ca8 100644
--- a/src/kdecore/kurl.h
+++ b/src/kdecore/kurl.h
@@ -21,9 +21,9 @@
#ifndef kurl_h
#define kurl_h
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -106,7 +106,7 @@ class KUrlPrivate;
*
* @deprecated since 5.0; use QUrl directly
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KUrl : public QUrl // krazy:exclude=dpointer,qclasses (krazy can't deal with embedded classes)
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KUrl : public QUrl // krazy:exclude=dpointer,qclasses (krazy can't deal with embedded classes)
{
public:
typedef QMap<QString, QString> MetaDataMap;
@@ -140,7 +140,7 @@ public:
* @see KUrl
* @see QList
*/
- class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE List : public QList<KUrl> //krazy:exclude=dpointer (just some convenience methods)
+ class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE List : public QList<KUrl> //krazy:exclude=dpointer (just some convenience methods)
{
public:
/**
@@ -218,7 +218,7 @@ public:
* @deprecated since 5.0, use QMimeData::setUrls, followed by KUrlMimeData::setMetaData if you have metadata.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void populateMimeData(QMimeData *mimeData,
+ KDELIBS4SUPPORT_DEPRECATED void populateMimeData(QMimeData *mimeData,
const KUrl::MetaDataMap &metaData = MetaDataMap(),
MimeDataFlags flags = DefaultMimeDataFlags) const;
#endif
@@ -258,7 +258,7 @@ public:
* @deprecated since 5.0, use KUrlMimeData::setUrls, followed by KUrlMimeData::setMetaData if you have metadata.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void populateMimeData(const KUrl::List &mostLocalUrls,
+ KDELIBS4SUPPORT_DEPRECATED void populateMimeData(const KUrl::List &mostLocalUrls,
QMimeData *mimeData,
const KUrl::MetaDataMap &metaData = MetaDataMap(),
MimeDataFlags flags = DefaultMimeDataFlags) const;
@@ -269,7 +269,7 @@ public:
* @deprecated since 5.0, use QMimeData::hasUrls
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static bool canDecode(const QMimeData *mimeData);
+ KDELIBS4SUPPORT_DEPRECATED static bool canDecode(const QMimeData *mimeData);
#endif
/**
@@ -277,7 +277,7 @@ public:
* @deprecated since 5.0, use KUrlMimeData::mimeDataTypes
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static QStringList mimeDataTypes();
+ KDELIBS4SUPPORT_DEPRECATED static QStringList mimeDataTypes();
#endif
/**
@@ -314,7 +314,7 @@ public:
* @deprecated since 5.0, use KUrlMimeData::urlsFromMimeData
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static KUrl::List fromMimeData(const QMimeData *mimeData,
+ KDELIBS4SUPPORT_DEPRECATED static KUrl::List fromMimeData(const QMimeData *mimeData,
DecodeOptions decodeOptions = PreferKdeUrls,
KUrl::MetaDataMap *metaData = 0);
#endif
@@ -456,7 +456,7 @@ public:
* @deprecated since 5.0, use QUrl::fromLocalFile instead, for the case of local paths.
* Do not port to QUrl u; u.setPath(...); since that would lead to a URL without a scheme!
*/
- KDE4SUPPORT_DEPRECATED void setPath(const QString &path);
+ KDELIBS4SUPPORT_DEPRECATED void setPath(const QString &path);
/**
* @deprecated since 5.0, use QUrl::path() and QString::isEmpty()
@@ -943,7 +943,7 @@ public:
* @deprecated since 4.0, use equals() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool cmp(const KUrl &u, bool ignore_trailing = false) const;
+ KDELIBS4SUPPORT_DEPRECATED bool cmp(const KUrl &u, bool ignore_trailing = false) const;
#endif
/**
@@ -1058,7 +1058,7 @@ public:
* @deprecated since 5.0, use QUrl::fromLocalFile
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED KUrl fromPath(const QString &text)
+ static KDELIBS4SUPPORT_DEPRECATED KUrl fromPath(const QString &text)
{
return fromLocalFile(text);
}
@@ -1068,7 +1068,7 @@ public:
* @deprecated since 4.0, use QUrl() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED KUrl fromPathOrUrl(const QString &text);
+ static KDELIBS4SUPPORT_DEPRECATED KUrl fromPathOrUrl(const QString &text);
#endif
/**
@@ -1090,7 +1090,7 @@ public:
* followed by KUrlMimeData::setMetaData if you have metadata.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void populateMimeData(QMimeData *mimeData,
+ KDELIBS4SUPPORT_DEPRECATED void populateMimeData(QMimeData *mimeData,
const MetaDataMap &metaData = MetaDataMap(),
MimeDataFlags flags = DefaultMimeDataFlags) const;
#endif
@@ -1168,7 +1168,7 @@ Q_DECLARE_METATYPE(KUrl::List)
* @deprecated since 4.5, use QUrl(_url1) == QUrl(_url2) instead.
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT bool urlcmp(const QString &_url1, const QString &_url2); // KDE5: remove, KUrl::equals is better API
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool urlcmp(const QString &_url1, const QString &_url2); // KDE5: remove, KUrl::equals is better API
#endif
/**
@@ -1184,7 +1184,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT bool urlcmp(const QString &_url1, const QString &_
* @deprecated since 4.5, use QUrl(_url1).adjusted(options) == QUrl(_url2).adjusted(options) instead.
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT bool urlcmp(const QString &_url1, const QString &_url2, const KUrl::EqualsOptions &options); // KDE5: remove, KUrl::equals is better API
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool urlcmp(const QString &_url1, const QString &_url2, const KUrl::EqualsOptions &options); // KDE5: remove, KUrl::equals is better API
#endif
#endif
diff --git a/src/kdecore/netsupp.h b/src/kdecore/netsupp.h
index ef3c3e8..1af71c1 100644
--- a/src/kdecore/netsupp.h
+++ b/src/kdecore/netsupp.h
@@ -21,8 +21,8 @@
#ifndef _NETSUPP_H_
#define _NETSUPP_H_
-#include <kde4support_export.h>
-#include <config-kde4support.h>
+#include <kdelibs4support_export.h>
+#include <config-kdelibs4support.h>
#include <config-network.h>
@@ -154,10 +154,10 @@ struct kde_addrinfo {
int origin;
};
-extern KDE4SUPPORT_DEPRECATED_EXPORT int kde_getaddrinfo(const char *name, const char *service,
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT int kde_getaddrinfo(const char *name, const char *service,
const struct addrinfo *hint,
struct kde_addrinfo **result);
-extern KDE4SUPPORT_DEPRECATED_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT void kde_freeaddrinfo(struct kde_addrinfo *p);
#if !HAVE_GETADDRINFO || HAVE_BROKEN_GETADDRINFO
@@ -278,13 +278,13 @@ struct addrinfo {
namespace KDE
{
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT int getaddrinfo(const char *name, const char *service,
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT int getaddrinfo(const char *name, const char *service,
const struct addrinfo *hint,
struct addrinfo **result);
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT void freeaddrinfo(struct addrinfo *ai);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT void freeaddrinfo(struct addrinfo *ai);
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT int getnameinfo(const struct sockaddr *sa,
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT int getnameinfo(const struct sockaddr *sa,
kde_socklen_t salen,
char *host, size_t hostlen,
char *serv, size_t servlen,
@@ -293,7 +293,7 @@ extern KDE4SUPPORT_DEPRECATED_EXPORT int getnameinfo(const struct sockaddr *sa,
# if !HAVE_GAI_STRERROR_PROTO
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT char *gai_strerror(int errorcode);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT char *gai_strerror(int errorcode);
# endif
# define getaddrinfo KDE::getaddrinfo
@@ -307,7 +307,7 @@ extern KDE4SUPPORT_DEPRECATED_EXPORT char *gai_strerror(int errorcode);
namespace KDE
{
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT int inet_pton(int af, const char *cp, void *buf);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT int inet_pton(int af, const char *cp, void *buf);
}
# define inet_pton KDE::inet_pton
@@ -318,7 +318,7 @@ extern KDE4SUPPORT_DEPRECATED_EXPORT int inet_pton(int af, const char *cp, void
namespace KDE
{
/** \internal */
-extern KDE4SUPPORT_DEPRECATED_EXPORT const char *inet_ntop(int af, const void *cp, char *buf, size_t len);
+extern KDELIBS4SUPPORT_DEPRECATED_EXPORT const char *inet_ntop(int af, const void *cp, char *buf, size_t len);
}
# define inet_ntop KDE::inet_ntop
diff --git a/src/kdecore/qtest_kde.h b/src/kdecore/qtest_kde.h
index 79d121c..0227d8a 100644
--- a/src/kdecore/qtest_kde.h
+++ b/src/kdecore/qtest_kde.h
@@ -19,7 +19,7 @@
#ifndef QTEST_KDE_H
#define QTEST_KDE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtTest/QtTest>
#include <stdlib.h>
#include <assert.h>
@@ -45,7 +45,7 @@ namespace QTest
* \p false on timeout
* \deprecated since 5.0, use QSignalSpy::wait(timeout)
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0);
} // namespace QTest
// By default, unit tests get no gui.
diff --git a/src/kdecore/syssocket.h b/src/kdecore/syssocket.h
index 10a6121..47e3a21 100644
--- a/src/kdecore/syssocket.h
+++ b/src/kdecore/syssocket.h
@@ -29,7 +29,7 @@
#error syssocket.h must be included before ksocketbase.h!
#endif
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
// needed for Solaris, but shouldn't hurt on other operating systems
// and to avoid ifdef mess, rather include them for all
diff --git a/src/kdedeprecated.widgets b/src/kdedeprecated.widgets
index 9fc0b5f..79cf726 100644
--- a/src/kdedeprecated.widgets
+++ b/src/kdedeprecated.widgets
@@ -1,5 +1,5 @@
[Global]
-PluginName=KDE4SupportWidgets
+PluginName=KDELibs4SupportWidgets
Includes=classpreviews.h,ktimezone.h
Init=
diff --git a/src/kdeui/k3icon_p.h b/src/kdeui/k3icon_p.h
index 2cad5e1..0e33239 100644
--- a/src/kdeui/k3icon_p.h
+++ b/src/kdeui/k3icon_p.h
@@ -24,7 +24,7 @@
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kiconloader.h>
/**
@@ -34,7 +34,7 @@
* @warning You should not use this class externally. This class is exported because
* the KCM needs it.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT K3Icon
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT K3Icon
{
public:
K3Icon();
diff --git a/src/kdeui/k4style.h b/src/kdeui/k4style.h
index dbfe109..6963845 100644
--- a/src/kdeui/k4style.h
+++ b/src/kdeui/k4style.h
@@ -35,7 +35,7 @@
#ifndef KDE_K4STYLE_H
#define KDE_K4STYLE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QCommonStyle>
#include <QPalette>
@@ -82,7 +82,7 @@ class K4StylePrivate;
// TODO: implement standardIcon().. and what about standardPalette()?
// TODO: maybe the arrow in CE_PushButtonLabel should be painted in CE_PushButtonBevel like QCommonStyle
-class KDE4SUPPORT_DEPRECATED_EXPORT K4Style: public QCommonStyle
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT K4Style: public QCommonStyle
{
Q_OBJECT
@@ -188,7 +188,7 @@ protected:
*
* This marshals to and from integers.
*/
- class KDE4SUPPORT_DEPRECATED_EXPORT ColorMode //krazy:exclude=dpointer (lightweight helper)
+ class KDELIBS4SUPPORT_DEPRECATED_EXPORT ColorMode //krazy:exclude=dpointer (lightweight helper)
{
public:
/**
@@ -234,7 +234,7 @@ protected:
When implementing the actual types, just implement the default ctor,
filling in defaults, and you're set.
*/
- struct KDE4SUPPORT_DEPRECATED_EXPORT Option {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT Option {
virtual ~Option() {} //So dynamic_cast works, and g++ shuts up
};
@@ -248,7 +248,7 @@ protected:
BaseType --- the type of option from which this should inherit
*/
template<typename EventualSubtype, typename BaseType>
- struct KDE4SUPPORT_DEPRECATED_EXPORT OptionBase: public BaseType {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT OptionBase: public BaseType {
/** Default value for this option. Uses the default constructor
of EventualSubtype to create the option.
*/
@@ -278,7 +278,7 @@ protected:
Option representing the color of the thing to draw. Used for arrows, and for text
(the latter actually uses TextOption)
*/
- struct KDE4SUPPORT_DEPRECATED_EXPORT ColorOption: public OptionBase<ColorOption, Option> {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT ColorOption: public OptionBase<ColorOption, Option> {
/** Color to use for the drawing. Public, modifiable. */
ColorMode color;
@@ -290,7 +290,7 @@ protected:
Option for drawing icons: represents whether the icon should be active or not.
The implementation is responsible for all other flags
*/
- struct KDE4SUPPORT_DEPRECATED_EXPORT IconOption: public OptionBase<IconOption, Option> {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT IconOption: public OptionBase<IconOption, Option> {
bool active; ///< Is the icon active?
QIcon icon; ///< Icon drawn by this option
QSize size;
@@ -304,7 +304,7 @@ protected:
* a button should be drawn active or not.
* @sa ScrollBar::Primitive
*/
- struct KDE4SUPPORT_DEPRECATED_EXPORT DoubleButtonOption: public OptionBase<DoubleButtonOption, Option> {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT DoubleButtonOption: public OptionBase<DoubleButtonOption, Option> {
/**
* List of active button possibilities.
*/
@@ -339,7 +339,7 @@ protected:
* the button is pressed, and containing the window icon
* @sa Window
*/
- struct KDE4SUPPORT_DEPRECATED_EXPORT TitleButtonOption: public OptionBase<TitleButtonOption, Option> {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT TitleButtonOption: public OptionBase<TitleButtonOption, Option> {
bool active; ///< whether the button is pressed
QIcon icon; ///< window Icon
// /// whether the button is hovered, this doesn't work at the moment (not even in any Qt style)...
@@ -358,7 +358,7 @@ protected:
};
///Option representing text drawing info. For Generic::Text.
- struct KDE4SUPPORT_DEPRECATED_EXPORT TextOption: public OptionBase<TextOption, ColorOption> {
+ struct KDELIBS4SUPPORT_DEPRECATED_EXPORT TextOption: public OptionBase<TextOption, ColorOption> {
Qt::Alignment hAlign; ///< The horizontal alignment, default is Qt::AlignLeft
QString text; ///< The text to draw
diff --git a/src/kdeui/k4timezonewidget.h b/src/kdeui/k4timezonewidget.h
index 166ead0..49f7f05 100644
--- a/src/kdeui/k4timezonewidget.h
+++ b/src/kdeui/k4timezonewidget.h
@@ -20,7 +20,7 @@
#ifndef KTIMEZONEWIDGET_H
#define KTIMEZONEWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QTreeWidget>
@@ -56,7 +56,7 @@ class KTimeZones;
*
* @author S.R.Haque <srhaque at iee.org>
*/
-class KDE4SUPPORT_EXPORT K4TimeZoneWidget : public QTreeWidget
+class KDELIBS4SUPPORT_EXPORT K4TimeZoneWidget : public QTreeWidget
{
Q_OBJECT
Q_PROPERTY(bool itemsCheckable READ itemsCheckable WRITE setItemsCheckable)
diff --git a/src/kdeui/kaction.h b/src/kdeui/kaction.h
index 2b54483..bfb50c6 100644
--- a/src/kdeui/kaction.h
+++ b/src/kdeui/kaction.h
@@ -26,7 +26,7 @@
#ifndef KACTION_H
#define KACTION_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kauthaction.h>
#include <QWidgetAction>
@@ -208,7 +208,7 @@ class KShortcut;
*
* @see KStandardAction
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KAction : public QWidgetAction
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KAction : public QWidgetAction
{
Q_OBJECT
@@ -423,7 +423,7 @@ public:
* Use isGlobalShortcutEnabled() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool globalShortcutAllowed() const;
+ KDELIBS4SUPPORT_DEPRECATED bool globalShortcutAllowed() const;
#endif
/**
@@ -435,7 +435,7 @@ public:
* if any.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setGlobalShortcutAllowed(bool allowed, GlobalShortcutLoading loading = Autoloading);
+ KDELIBS4SUPPORT_DEPRECATED void setGlobalShortcutAllowed(bool allowed, GlobalShortcutLoading loading = Autoloading);
#endif
/**
diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp
index 966f9e7..f9c3c2c 100644
--- a/src/kdeui/kapplication.cpp
+++ b/src/kdeui/kapplication.cpp
@@ -21,7 +21,7 @@
#include "kapplication.h"
#include "kdeversion.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <QtCore/QDir>
#include <QtCore/QFile>
@@ -374,7 +374,7 @@ void KApplicationPrivate::init(bool GUIenabled)
KApplication::KApp = q;
- extern KDE4SUPPORT_DEPRECATED_EXPORT bool kde_kdebug_enable_dbus_interface;
+ extern KDELIBS4SUPPORT_DEPRECATED_EXPORT bool kde_kdebug_enable_dbus_interface;
kde_kdebug_enable_dbus_interface = true;
parseCommandLine();
diff --git a/src/kdeui/kapplication.h b/src/kdeui/kapplication.h
index 8483017..451ad64 100644
--- a/src/kdeui/kapplication.h
+++ b/src/kdeui/kapplication.h
@@ -22,9 +22,9 @@
#define KAPP_H
// Version macros. Never put this further down.
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -73,7 +73,7 @@ class KApplicationPrivate;
* @short Controls and provides information to all KDE applications.
* @author Matthias Kalle Dalheimer <kalle at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT_NOISE KApplication : public QApplication
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT_NOISE KApplication : public QApplication
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.KApplication")
@@ -127,7 +127,7 @@ public:
* @see sessionConfig()
* @deprecated use qApp->isSessionRestored()
*/
- inline KDE4SUPPORT_DEPRECATED bool isRestored() const
+ inline KDELIBS4SUPPORT_DEPRECATED bool isRestored() const
{
return QApplication::isSessionRestored();
}
@@ -181,7 +181,7 @@ public:
* @return the application icon
* @deprecated Use QApplication::windowIcon()
*/
- inline KDE4SUPPORT_DEPRECATED QPixmap icon() const
+ inline KDELIBS4SUPPORT_DEPRECATED QPixmap icon() const
{
int size = IconSize(KIconLoader::Desktop);
return windowIcon().pixmap(size, size);
@@ -192,7 +192,7 @@ public:
* @return the application's mini icon
* @deprecated Use QApplication::windowIcon()
*/
- inline KDE4SUPPORT_DEPRECATED QPixmap miniIcon() const
+ inline KDELIBS4SUPPORT_DEPRECATED QPixmap miniIcon() const
{
int size = IconSize(KIconLoader::Small);
return windowIcon().pixmap(size, size);
@@ -224,7 +224,7 @@ public:
* @deprecated use QTemporaryFile, QSaveFile or KAutoSaveFile instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED QString tempSaveName(const QString &pFilename);
+ static KDELIBS4SUPPORT_DEPRECATED QString tempSaveName(const QString &pFilename);
#endif
/**
@@ -263,7 +263,7 @@ public:
* @return A truly unpredictable number in the range [0, RAND_MAX)
* @deprecated Use KRandom::random()
*/
- static inline KDE4SUPPORT_DEPRECATED int random()
+ static inline KDELIBS4SUPPORT_DEPRECATED int random()
{
return KRandom::random();
}
@@ -274,7 +274,7 @@ public:
* @return the random string
* @deprecated use KRandom::randomString() instead.
*/
- static inline KDE4SUPPORT_DEPRECATED QString randomString(int length)
+ static inline KDELIBS4SUPPORT_DEPRECATED QString randomString(int length)
{
return KRandom::randomString(length);
}
@@ -337,7 +337,7 @@ public:
*
* </code>
*/
- static inline KDE4SUPPORT_DEPRECATED QString geometryArgument()
+ static inline KDELIBS4SUPPORT_DEPRECATED QString geometryArgument()
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kde");
return args->isSet("geometry") ? args->getOption("geometry") : QString();
diff --git a/src/kdeui/karrowbutton.h b/src/kdeui/karrowbutton.h
index 473b642..55c5135 100644
--- a/src/kdeui/karrowbutton.h
+++ b/src/kdeui/karrowbutton.h
@@ -19,7 +19,7 @@
#ifndef karrowbutton_h
#define karrowbutton_h
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QPushButton>
class KArrowButtonPrivate;
@@ -38,7 +38,7 @@ class KArrowButtonPrivate;
*
* @author Frerich Raabe
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KArrowButton : public QPushButton
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KArrowButton : public QPushButton
{
Q_OBJECT
/**
diff --git a/src/kdeui/kbuttongroup.h b/src/kdeui/kbuttongroup.h
index 18a665b..cf09102 100644
--- a/src/kdeui/kbuttongroup.h
+++ b/src/kdeui/kbuttongroup.h
@@ -22,7 +22,7 @@
#ifndef KBUTTONGROUP_H
#define KBUTTONGROUP_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QGroupBox>
class QAbstractButton;
@@ -40,7 +40,7 @@ class QAbstractButton;
*
* @author Pino Toscano <toscano.pino at tiscali.it>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KButtonGroup : public QGroupBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KButtonGroup : public QGroupBox
{
Q_OBJECT
diff --git a/src/kdeui/kcolordialog.cpp b/src/kdeui/kcolordialog.cpp
index 6f2d7ae..4dee683 100644
--- a/src/kdeui/kcolordialog.cpp
+++ b/src/kdeui/kcolordialog.cpp
@@ -32,7 +32,7 @@
#include "kcolordialog.h"
#include "kcolordialog_p.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/kdeui/kcolordialog.h b/src/kdeui/kcolordialog.h
index 86052b5..6e4e053 100644
--- a/src/kdeui/kcolordialog.h
+++ b/src/kdeui/kcolordialog.h
@@ -31,14 +31,14 @@
#include <QTableWidget>
#include <kcolorchoosermode.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* A table of editable color cells.
*
* @author Martin Jones <mjones at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KColorCells : public QTableWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KColorCells : public QTableWidget
{
Q_OBJECT
Q_PROPERTY(bool acceptDrags READ acceptDrags WRITE setAcceptDrags)
@@ -114,7 +114,7 @@ private:
*
* \image html kcolorpatch.png "KDE Color Patch"
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KColorPatch : public QFrame
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KColorPatch : public QFrame
{
Q_OBJECT
Q_PROPERTY(QColor color READ color WRITE setColor)
@@ -208,7 +208,7 @@ private:
* the currently selected color is a KColorPatch.
*
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KColorDialog : public KDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KColorDialog : public KDialog
{
Q_OBJECT
Q_PROPERTY(bool isAlphaChannelEnabled READ isAlphaChannelEnabled WRITE setAlphaChannelEnabled)
diff --git a/src/kdeui/kcolorhelpers_p.h b/src/kdeui/kcolorhelpers_p.h
index 1cf3c4a..5b6605b 100644
--- a/src/kdeui/kcolorhelpers_p.h
+++ b/src/kdeui/kcolorhelpers_p.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KDE4SUPPORT_KCOLORHELPERS_P_H
-#define KDE4SUPPORT_KCOLORHELPERS_P_H
+#ifndef KDELIBS4SUPPORT_KCOLORHELPERS_P_H
+#define KDELIBS4SUPPORT_KCOLORHELPERS_P_H
class QPainter;
class QRect;
diff --git a/src/kdeui/kcolorvalueselector.h b/src/kdeui/kcolorvalueselector.h
index 521eda3..dbe098a 100644
--- a/src/kdeui/kcolorvalueselector.h
+++ b/src/kdeui/kcolorvalueselector.h
@@ -23,10 +23,10 @@
#include "kselector.h"
#include "kcolorchoosermode.h"
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QPixmap>
-class KDE4SUPPORT_DEPRECATED_EXPORT KColorValueSelector : public KSelector
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KColorValueSelector : public KSelector
{
Q_OBJECT
Q_PROPERTY(int hue READ hue WRITE setHue)
diff --git a/src/kdeui/kdatetimewidget.h b/src/kdeui/kdatetimewidget.h
index 88578fc..d787441 100644
--- a/src/kdeui/kdatetimewidget.h
+++ b/src/kdeui/kdatetimewidget.h
@@ -19,7 +19,7 @@
#ifndef KDATETIMEWIDGET
#define KDATETIMEWIDGET
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QWidget>
#include <QDateTime>
@@ -35,7 +35,7 @@
*
* @author Hans Petter Bieker <bieker at kde.org>
*/
-class KDE4SUPPORT_EXPORT KDateTimeWidget : public QWidget
+class KDELIBS4SUPPORT_EXPORT KDateTimeWidget : public QWidget
{
Q_OBJECT
Q_PROPERTY(QDateTime dateTime READ dateTime WRITE setDateTime NOTIFY valueChanged USER true)
diff --git a/src/kdeui/kdatewidget.h b/src/kdeui/kdatewidget.h
index d6e21d0..29094ca 100644
--- a/src/kdeui/kdatewidget.h
+++ b/src/kdeui/kdatewidget.h
@@ -20,7 +20,7 @@
#ifndef KDATEWIDGET_H
#define KDATEWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QWidget>
@@ -41,7 +41,7 @@ class QDate;
*
* @author Waldo Bastian <bastian at kde.org>, John Layt <john at layt.net>
*/
-class KDE4SUPPORT_EXPORT KDateWidget : public QWidget
+class KDELIBS4SUPPORT_EXPORT KDateWidget : public QWidget
{
Q_OBJECT
Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY changed USER true)
diff --git a/src/kdeui/kdeprintdialog.h b/src/kdeui/kdeprintdialog.h
index 7e18702..3f323cf 100644
--- a/src/kdeui/kdeprintdialog.h
+++ b/src/kdeui/kdeprintdialog.h
@@ -21,7 +21,7 @@
#ifndef KDEPRINTDIALOG_H
#define KDEPRINTDIALOG_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QList>
@@ -54,7 +54,7 @@ namespace KdePrint
* @param customTabs a list of custom widgets to show as tabs, the name printed on the tab will
* be taken from the widgets windowTitle().
*/
-KDE4SUPPORT_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer, const QList<QWidget *> &customTabs,
+KDELIBS4SUPPORT_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer, const QList<QWidget *> &customTabs,
QWidget *parent = 0);
/**
@@ -66,7 +66,7 @@ KDE4SUPPORT_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer, const QLis
* @param printer the QPrinter to apply settings to
* @param parent the parent for the dialog
*/
-KDE4SUPPORT_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer, QWidget *parent = 0);
+KDELIBS4SUPPORT_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer, QWidget *parent = 0);
}
#endif // KDEPRINTDIALOG_H
diff --git a/src/kdeui/kdeuiwidgetsproxystyle_p.h b/src/kdeui/kdeuiwidgetsproxystyle_p.h
index 43e7f12..b7141f2 100644
--- a/src/kdeui/kdeuiwidgetsproxystyle_p.h
+++ b/src/kdeui/kdeuiwidgetsproxystyle_p.h
@@ -21,11 +21,11 @@
#ifndef KDEUIWIDGETSPROXYSTYLE_P_H
#define KDEUIWIDGETSPROXYSTYLE_P_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QStyle>
-class KDE4SUPPORT_DEPRECATED_EXPORT KdeUiProxyStyle : public QStyle
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KdeUiProxyStyle : public QStyle
{
Q_OBJECT
public:
diff --git a/src/kdeui/kdialog.cpp b/src/kdeui/kdialog.cpp
index fc2931e..17253f8 100644
--- a/src/kdeui/kdialog.cpp
+++ b/src/kdeui/kdialog.cpp
@@ -45,7 +45,7 @@
#include <kurllabel.h>
#include <kwindowconfig.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if HAVE_X11
#include <qx11info_x11.h>
diff --git a/src/kdeui/kdialog.h b/src/kdeui/kdialog.h
index d4416f6..bc703fb 100644
--- a/src/kdeui/kdialog.h
+++ b/src/kdeui/kdialog.h
@@ -28,7 +28,7 @@ class QPushButton;
class QMenu;
class KDialogPrivate;
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kconfiggroup.h>
#include <kguiitem.h>
@@ -125,7 +125,7 @@ class KDialogPrivate;
* @author Olivier Goffart <ogoffart at kde.org>
* @author Tobias Koenig <tokoe at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDialog : public QDialog //krazy:exclude=qclasses
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDialog : public QDialog //krazy:exclude=qclasses
{
Q_OBJECT
Q_ENUMS(ButtonCode)
@@ -355,7 +355,7 @@ public:
* @deprecated use KWindowConfig::restoreDialogSize() instead
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void restoreDialogSize(const KConfigGroup &config);
+ KDELIBS4SUPPORT_DEPRECATED void restoreDialogSize(const KConfigGroup &config);
#endif
/**
@@ -369,7 +369,7 @@ public:
* @deprecated use KWindowConfig::saveDialogSize() instead
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void saveDialogSize(KConfigGroup &config, KConfigGroup::WriteConfigFlags options = KConfigGroup::Normal) const;
+ KDELIBS4SUPPORT_DEPRECATED void saveDialogSize(KConfigGroup &config, KConfigGroup::WriteConfigFlags options = KConfigGroup::Normal) const;
#endif
/**
diff --git a/src/kdeui/kdialogbuttonbox.h b/src/kdeui/kdialogbuttonbox.h
index 30f08d3..9cf97c4 100644
--- a/src/kdeui/kdialogbuttonbox.h
+++ b/src/kdeui/kdialogbuttonbox.h
@@ -21,7 +21,7 @@
#ifndef KDIALOGBUTTONBOX_H
#define KDIALOGBUTTONBOX_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QDialogButtonBox>
@@ -42,7 +42,7 @@ class KDialogButtonBoxPrivate;
* @author Olivier Goffart <ogoffart at kde.org>
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDialogButtonBox : public QDialogButtonBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDialogButtonBox : public QDialogButtonBox
{
Q_OBJECT
diff --git a/src/kdeui/keditlistbox.h b/src/kdeui/keditlistbox.h
index b7f2937..e19474b 100644
--- a/src/kdeui/keditlistbox.h
+++ b/src/kdeui/keditlistbox.h
@@ -20,7 +20,7 @@
#ifndef KEDITLISTBOX_H
#define KEDITLISTBOX_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QGroupBox>
#include <QStringListModel>
@@ -37,7 +37,7 @@ class KEditListBoxPrivate;
*
* @deprecated since 5.0 in favor of KEditListWidget embedded in a QGroupBox.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KEditListBox : public QGroupBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KEditListBox : public QGroupBox
{
Q_OBJECT
@@ -51,7 +51,7 @@ public:
/**
* Custom editor class
**/
- class KDE4SUPPORT_DEPRECATED CustomEditor
+ class KDELIBS4SUPPORT_DEPRECATED CustomEditor
{
public:
CustomEditor();
@@ -116,7 +116,7 @@ public:
* it will be checked if you press the Add-button. It is not
* possible to enter items twice into the listbox.
*/
- explicit KDE4SUPPORT_DEPRECATED KEditListBox(QWidget *parent, const char *name,
+ explicit KDELIBS4SUPPORT_DEPRECATED KEditListBox(QWidget *parent, const char *name,
bool checkAtEntering = false, Buttons buttons = All);
/**
* Create an editable listbox.
@@ -126,7 +126,7 @@ public:
* The same as the other constructor, additionally it takes
* @p title, which will be the title of the frame around the listbox.
*/
- explicit KDE4SUPPORT_DEPRECATED KEditListBox(const QString &title, QWidget *parent,
+ explicit KDELIBS4SUPPORT_DEPRECATED KEditListBox(const QString &title, QWidget *parent,
const char *name, bool checkAtEntering = false,
Buttons buttons = All);
diff --git a/src/kdeui/kfadewidgeteffect.h b/src/kdeui/kfadewidgeteffect.h
index 6507cc4..822b736 100644
--- a/src/kdeui/kfadewidgeteffect.h
+++ b/src/kdeui/kfadewidgeteffect.h
@@ -21,7 +21,7 @@
#ifndef KFADEWIDGETEFFECT_H
#define KFADEWIDGETEFFECT_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QWidget>
class KFadeWidgetEffectPrivate;
@@ -45,7 +45,7 @@ class KFadeWidgetEffectPrivate;
* \author Matthias Kretz <kretz at kde.org>
* \since 4.1
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFadeWidgetEffect : public QWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFadeWidgetEffect : public QWidget
{
Q_OBJECT
Q_DECLARE_PRIVATE(KFadeWidgetEffect)
diff --git a/src/kdeui/kfontcombobox.h b/src/kdeui/kfontcombobox.h
index a04b483..c5fd093 100644
--- a/src/kdeui/kfontcombobox.h
+++ b/src/kdeui/kfontcombobox.h
@@ -20,7 +20,7 @@
#ifndef KFONTCOMBOBOX_P_H
#define KFONTCOMBOBOX_P_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kcombobox.h>
@@ -48,7 +48,7 @@ class KFontComboBoxPrivate;
*
* @deprecated Since KF 5.0, use QFontComboBox instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFontComboBox : public KComboBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFontComboBox : public KComboBox
{
Q_OBJECT
diff --git a/src/kdeui/kfontdialog.h b/src/kdeui/kfontdialog.h
index af74eb1..0db1a8b 100644
--- a/src/kdeui/kfontdialog.h
+++ b/src/kdeui/kfontdialog.h
@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <kfontchooser.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class QFont;
class QStringList;
@@ -54,7 +54,7 @@ class QStringList;
*
* @author Preston Brown <pbrown at kde.org>, Bernd Wuebben <wuebben at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFontDialog : public KDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFontDialog : public KDialog
{
Q_OBJECT
diff --git a/src/kdeui/kglobalsettings.cpp b/src/kdeui/kglobalsettings.cpp
index ef45afc..55ad627 100644
--- a/src/kdeui/kglobalsettings.cpp
+++ b/src/kdeui/kglobalsettings.cpp
@@ -55,7 +55,7 @@ static QRgb qt_colorref2qrgb(COLORREF col)
return qRgb(GetRValue(col), GetGValue(col), GetBValue(col));
}
#endif
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if HAVE_X11
#include <X11/Xlib.h>
#ifdef HAVE_XCURSOR // TODO NOT DEFINED ANYMORE. Can we drop X cursor themes?
diff --git a/src/kdeui/kglobalsettings.h b/src/kdeui/kglobalsettings.h
index b396960..acfb302 100644
--- a/src/kdeui/kglobalsettings.h
+++ b/src/kdeui/kglobalsettings.h
@@ -18,7 +18,7 @@
#ifndef _KGLOBALSETTINGS_H
#define _KGLOBALSETTINGS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ksharedconfig.h>
#include <QtCore/QObject>
#include <QtCore/QString>
@@ -48,7 +48,7 @@ class QWidget;
*
* @author David Faure \<faure at kde.org\>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KGlobalSettings : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KGlobalSettings : public QObject
{
Q_OBJECT
@@ -99,7 +99,7 @@ public:
* @deprecated since 5.0, use QApplication::startDragDistance() instead.
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED int dndEventDelay();
+ static KDELIBS4SUPPORT_DEPRECATED int dndEventDelay();
#endif
/**
@@ -110,7 +110,7 @@ public:
* @deprecated since 5.0, use style->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, widget)
**/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED bool singleClick();
+ static KDELIBS4SUPPORT_DEPRECATED bool singleClick();
#endif
/**
@@ -196,7 +196,7 @@ public:
* @return the user's desktop directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString desktopPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString desktopPath();
/**
* The path to the autostart directory of the current user.
@@ -209,35 +209,35 @@ public:
* @return the path of the document directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString documentPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString documentPath();
/**
* The path where music are stored of the current user.
* @return the path of the music directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::MusicLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString musicPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString musicPath();
/**
* The path where videos are stored of the current user.
* @return the path of the video directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::MoviesLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString videosPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString videosPath();
/**
* The path where download are stored of the current user.
* @return the path of the download directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::DownloadLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString downloadPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString downloadPath();
/**
* The path where pictures are stored of the current user.
* @return the path of the pictures directory
* @deprecated since 5.0, use QStandardPaths::writableLocation(QStandardPaths::PicturesLocation).
*/
- static KDE4SUPPORT_DEPRECATED QString picturesPath();
+ static KDELIBS4SUPPORT_DEPRECATED QString picturesPath();
/**
* The default color to use for inactive titles.
@@ -247,7 +247,7 @@ public:
* KColorScheme(QPalette::Inactive, KColorScheme::Window).background().color(),
* otherwise please read the setting from kdeglobals/WM/inactiveBackground directly
*/
- static KDE4SUPPORT_DEPRECATED QColor inactiveTitleColor();
+ static KDELIBS4SUPPORT_DEPRECATED QColor inactiveTitleColor();
/**
* The default color to use for inactive texts.
@@ -257,7 +257,7 @@ public:
* KColorScheme(QPalette::Inactive, KColorScheme::Window).foreground().color()
* otherwise please read the setting from kdeglobals/WM/inactiveForeground directly
*/
- static KDE4SUPPORT_DEPRECATED QColor inactiveTextColor();
+ static KDELIBS4SUPPORT_DEPRECATED QColor inactiveTextColor();
/**
* The default color to use for active titles.
@@ -267,7 +267,7 @@ public:
* KColorScheme(QPalette::Active, KColorScheme::Window).background(KColorScheme::ActiveBackground).color(),
* otherwise please read the setting from kdeglobals/WM/activeBackground directly
*/
- static KDE4SUPPORT_DEPRECATED QColor activeTitleColor();
+ static KDELIBS4SUPPORT_DEPRECATED QColor activeTitleColor();
/**
* The default color to use for active texts.
@@ -277,7 +277,7 @@ public:
* KColorScheme(QPalette::Active, KColorScheme::Window).foreground(KColorScheme::ActiveText).color(),
* otherwise please read the setting from kdeglobals/WM/activeForeground directly
*/
- static KDE4SUPPORT_DEPRECATED QColor activeTextColor();
+ static KDELIBS4SUPPORT_DEPRECATED QColor activeTextColor();
/**
* Returns the contrast for borders.
@@ -285,7 +285,7 @@ public:
* contrast)
* @deprecated since 5.0, use KColorScheme::contrast()
*/
- static KDE4SUPPORT_DEPRECATED int contrast();
+ static KDELIBS4SUPPORT_DEPRECATED int contrast();
/**
* Returns the contrast for borders as a floating point value.
@@ -295,7 +295,7 @@ public:
* contrast)
* @deprecated since 5.0, use KColorScheme::contrastF(config)
*/
- static KDE4SUPPORT_DEPRECATED qreal contrastF(const KSharedConfigPtr &config = KSharedConfigPtr());
+ static KDELIBS4SUPPORT_DEPRECATED qreal contrastF(const KSharedConfigPtr &config = KSharedConfigPtr());
/**
* Returns if the sorted column in a K3ListView shall be drawn with a
@@ -393,7 +393,7 @@ public:
* start at (0,0).
* @deprecated use QApplication::desktop()->screenGeometry(QCursor::pos())
*/
- static KDE4SUPPORT_DEPRECATED QRect splashScreenDesktopGeometry();
+ static KDELIBS4SUPPORT_DEPRECATED QRect splashScreenDesktopGeometry();
/**
* This function returns the desktop geometry for an application that needs
@@ -411,7 +411,7 @@ public:
* start at (0,0).
* @deprecated use QApplication::desktop()->screenGeometry(point)
*/
- static KDE4SUPPORT_DEPRECATED QRect desktopGeometry(const QPoint &point);
+ static KDELIBS4SUPPORT_DEPRECATED QRect desktopGeometry(const QPoint &point);
/**
* This function returns the desktop geometry for an application that needs
@@ -426,7 +426,7 @@ public:
* start at (0,0).
* @deprecated use QApplication::desktop()->screenGeometry(w)
*/
- static KDE4SUPPORT_DEPRECATED QRect desktopGeometry(const QWidget *w);
+ static KDELIBS4SUPPORT_DEPRECATED QRect desktopGeometry(const QWidget *w);
/**
* This function determines if the user wishes to see icons on the
@@ -435,7 +435,7 @@ public:
* @return Returns true if user wants to show icons.
* @deprecated since 5.0, use style->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, 0, widget);
*/
- static KDE4SUPPORT_DEPRECATED bool showIconsOnPushButtons();
+ static KDELIBS4SUPPORT_DEPRECATED bool showIconsOnPushButtons();
/**
* Returns true, if user visible strings should be sorted in a natural way:
@@ -486,7 +486,7 @@ public:
* @deprecated since 5.0, use KProtocolInfo::showFilePreview
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED bool showFilePreview(const QUrl &);
+ static KDELIBS4SUPPORT_DEPRECATED bool showFilePreview(const QUrl &);
#endif
/**
@@ -516,7 +516,7 @@ public:
*
* @deprecated since 5.0, use KColorScheme::createApplicationPalette()
*/
- static KDE4SUPPORT_DEPRECATED QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());
+ static KDELIBS4SUPPORT_DEPRECATED QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());
/**
* Used to obtain the QPalette that will be used to set the application palette.
@@ -533,7 +533,7 @@ public:
*
* @deprecated since 5.0, use KColorScheme::createApplicationPalette()
*/
- static KDE4SUPPORT_DEPRECATED QPalette createNewApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());
+ static KDELIBS4SUPPORT_DEPRECATED QPalette createNewApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());
/**
* An identifier for change signals.
@@ -556,7 +556,7 @@ public:
* @li emitChange(IconChanged, group) is now KIconLoader::emitChange(group)
* TODO: complete this list
*/
- static KDE4SUPPORT_DEPRECATED void emitChange(ChangeType changeType, int arg = 0);
+ static KDELIBS4SUPPORT_DEPRECATED void emitChange(ChangeType changeType, int arg = 0);
/**
* Return the KGlobalSettings singleton.
diff --git a/src/kdeui/khbox.h b/src/kdeui/khbox.h
index d0484b3..08aa70b 100644
--- a/src/kdeui/khbox.h
+++ b/src/kdeui/khbox.h
@@ -19,7 +19,7 @@
#ifndef KHBOX_H
#define KHBOX_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QFrame>
@@ -37,7 +37,7 @@ class QChildEvent;
*
* @see KVBox
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KHBox : public QFrame
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KHBox : public QFrame
{
Q_OBJECT
diff --git a/src/kdeui/khuesaturationselect.h b/src/kdeui/khuesaturationselect.h
index ccec3cc..692d070 100644
--- a/src/kdeui/khuesaturationselect.h
+++ b/src/kdeui/khuesaturationselect.h
@@ -20,12 +20,12 @@
#ifndef KHUESATURATIONSELECT_H_
#define KHUESATURATIONSELECT_H_
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include "kxyselector.h"
#include "kcolorchoosermode.h"
-class KDE4SUPPORT_DEPRECATED_EXPORT KHueSaturationSelector : public KXYSelector
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KHueSaturationSelector : public KXYSelector
{
Q_OBJECT
public:
diff --git a/src/kdeui/kicon.h b/src/kdeui/kicon.h
index bc012d1..b9ef525 100644
--- a/src/kdeui/kicon.h
+++ b/src/kdeui/kicon.h
@@ -19,9 +19,9 @@
#ifndef KICON_H
#define KICON_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
-#ifdef KDE4SUPPORT_NO_DEPRECATED_NOISE
+#ifdef KDELIBS4SUPPORT_NO_DEPRECATED_NOISE
#warning "This file is deprecated."
#endif
@@ -43,7 +43,7 @@ class QStringList;
*
* @deprecated use QIcon::fromTheme
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KIcon : public QIcon
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KIcon : public QIcon
{
public:
/**
diff --git a/src/kdeui/kinputdialog.h b/src/kdeui/kinputdialog.h
index bd5f9d1..d6489f8 100644
--- a/src/kdeui/kinputdialog.h
+++ b/src/kdeui/kinputdialog.h
@@ -22,7 +22,7 @@
#include <QtCore/QStringList>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <limits.h>
#include <float.h>
@@ -69,7 +69,7 @@ namespace KInputDialog
* @deprecated since 5.0, use QInputDialog::getText() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT QString getText(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString getText(const QString &caption, const QString &label,
const QString &value = QString(), bool *ok = 0, QWidget *parent = 0,
QValidator *validator = 0,
const QString &mask = QString(),
@@ -95,7 +95,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QString getText(const QString &caption, const QStr
* @deprecated since 5.0, use QInputDialog::getMultiLineText() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT QString getMultiLineText(const QString &caption,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString getMultiLineText(const QString &caption,
const QString &label, const QString &value = QString(),
bool *ok = 0, QWidget *parent = 0);
#endif
@@ -124,7 +124,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QString getMultiLineText(const QString &caption,
* @deprecated since 5.0, use QInputDialog::getInt() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QString &label,
int value = 0, int minValue = INT_MIN, int maxValue = INT_MAX,
int step = 1, int base = 10, bool *ok = 0, QWidget *parent = 0);
#endif
@@ -135,7 +135,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QStri
* @deprecated since 5.0, use QInputDialog::getInt() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QString &label,
int value = 0, int minValue = INT_MIN, int maxValue = INT_MAX,
int step = 1, bool *ok = 0, QWidget *parent = 0);
#endif
@@ -164,7 +164,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT int getInteger(const QString &caption, const QStri
* @deprecated since 5.0, use QInputDialog::getDouble() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QString &label,
double value = 0, double minValue = -DBL_MAX,
double maxValue = DBL_MAX, double step = 0.1, int decimals = 1,
bool *ok = 0, QWidget *parent = 0);
@@ -176,7 +176,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QSt
* @deprecated since 5.0, use QInputDialog::getDouble() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QString &label,
double value = 0, double minValue = -DBL_MAX,
double maxValue = DBL_MAX, int decimals = 1, bool *ok = 0,
QWidget *parent = 0);
@@ -203,7 +203,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT double getDouble(const QString &caption, const QSt
* @deprecated since 5.0, use QInputDialog::getItem() instead
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT QString getItem(const QString &caption, const QString &label,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString getItem(const QString &caption, const QString &label,
const QStringList &list, int current = 0, bool editable = false,
bool *ok = 0, QWidget *parent = 0);
#endif
@@ -230,7 +230,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QString getItem(const QString &caption, const QStr
* (yet only one item allowed)
*/
#ifndef KDE_NO_DEPRECATED
-KDE4SUPPORT_DEPRECATED_EXPORT QStringList getItemList(const QString &caption,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList getItemList(const QString &caption,
const QString &label, const QStringList &list = QStringList(),
const QStringList &select = QStringList(), bool multiple = false,
bool *ok = 0, QWidget *parent = 0);
diff --git a/src/kdeui/klistwidget.h b/src/kdeui/klistwidget.h
index 9fa16ab..c64e61b 100644
--- a/src/kdeui/klistwidget.h
+++ b/src/kdeui/klistwidget.h
@@ -18,7 +18,7 @@
#ifndef KLISTWIDGET_H
#define KLISTWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QListWidget>
@@ -38,7 +38,7 @@
* settings. If you want to get informed when the user selects
* something connect to the QListWidget::itemSelectionChanged() signal.
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KListWidget : public QListWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KListWidget : public QListWidget
{
Q_OBJECT
diff --git a/src/kdeui/kmenu.h b/src/kdeui/kmenu.h
index 9d3ba78..416892e 100644
--- a/src/kdeui/kmenu.h
+++ b/src/kdeui/kmenu.h
@@ -20,7 +20,7 @@
#ifndef KMENU_H
#define KMENU_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QMenu>
@@ -39,7 +39,7 @@
* @author Daniel M. Duley <mosfet at kde.org>
* @author Hamish Rodda <rodda at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KMenu : public QMenu
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KMenu : public QMenu
{
Q_OBJECT
public:
diff --git a/src/kdeui/kmenubar.cpp b/src/kdeui/kmenubar.cpp
index 545ac14..b980749 100644
--- a/src/kdeui/kmenubar.cpp
+++ b/src/kdeui/kmenubar.cpp
@@ -21,7 +21,7 @@
#include "kmenubar.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <stdio.h>
diff --git a/src/kdeui/kmenubar.h b/src/kdeui/kmenubar.h
index c7d918e..63802ea 100644
--- a/src/kdeui/kmenubar.h
+++ b/src/kdeui/kmenubar.h
@@ -22,7 +22,7 @@
#ifndef KMENUBAR_H
#define KMENUBAR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QMenuBar>
@@ -35,7 +35,7 @@
* @author Daniel "Mosfet" Duley.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KMenuBar : public QMenuBar
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KMenuBar : public QMenuBar
{
Q_OBJECT
Q_PROPERTY(bool topLevelMenu READ isTopLevelMenu WRITE setTopLevelMenu)
diff --git a/src/kdeui/kmessagebox_queued.h b/src/kdeui/kmessagebox_queued.h
index ea8c295..8ebbfc6 100644
--- a/src/kdeui/kmessagebox_queued.h
+++ b/src/kdeui/kmessagebox_queued.h
@@ -24,7 +24,7 @@ class QWidget;
#include <kmessagebox.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
namespace KMessageBox
{
@@ -39,7 +39,7 @@ namespace KMessageBox
* Note that if the parent gets deleted, the messagebox will not be
* shown.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedDetailedError(QWidget *parent,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedDetailedError(QWidget *parent,
const QString &text,
const QString &details,
const QString &caption = QString());
@@ -48,7 +48,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void queuedDetailedError(QWidget *parent,
* This function accepts the window id of the parent window, instead
* of QWidget*. It should be used only when necessary.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedDetailedErrorWId(WId parent_id,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedDetailedErrorWId(WId parent_id,
const QString &text,
const QString &details,
const QString &caption = QString());
@@ -65,7 +65,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void queuedDetailedErrorWId(WId parent_id,
* Note that if the parent gets deleted, the messagebox will not be
* shown.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
DialogType type, const QString &text,
const QString &caption,
Options options);
@@ -74,7 +74,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
* This function accepts the window id of the parent window, instead
* of QWidget*. It should be used only when necessary.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBoxWId(WId parent_id,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedMessageBoxWId(WId parent_id,
DialogType type, const QString &text,
const QString &caption,
Options options);
@@ -85,7 +85,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBoxWId(WId parent_id,
* This is an overloaded member function, provided for convenience.
* It behaves essentially like the above function.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
DialogType type, const QString &text,
const QString &caption = QString());
@@ -93,7 +93,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBox(QWidget *parent,
* This function accepts the window id of the parent window, instead
* of QWidget*. It should be used only when necessary.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void queuedMessageBoxWId(WId parent_id,
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void queuedMessageBoxWId(WId parent_id,
DialogType type, const QString &text,
const QString &caption = QString());
diff --git a/src/kdeui/kmessageboxmessagehandler.h b/src/kdeui/kmessageboxmessagehandler.h
index b100695..cf63dfb 100644
--- a/src/kdeui/kmessageboxmessagehandler.h
+++ b/src/kdeui/kmessageboxmessagehandler.h
@@ -19,7 +19,7 @@
#ifndef KDEUI_KMESSAGEBOXMESSAGEHANDLER_H
#define KDEUI_KMESSAGEBOXMESSAGEHANDLER_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kmessage.h>
#include <QtCore/QObject>
@@ -31,7 +31,7 @@ class KMessageBoxMessageHandlerPrivate;
*
* @author Michaël Larouche <michael.larouche at kdemail.net>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KMessageBoxMessageHandler : public QObject, public KMessageHandler
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KMessageBoxMessageHandler : public QObject, public KMessageHandler
{
Q_OBJECT
public:
diff --git a/src/kdeui/knuminput.cpp b/src/kdeui/knuminput.cpp
index 6170bb1..ce27740 100644
--- a/src/kdeui/knuminput.cpp
+++ b/src/kdeui/knuminput.cpp
@@ -22,7 +22,7 @@
#include "knuminput.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if HAVE_LIMITS_H
#include <limits.h>
#endif
diff --git a/src/kdeui/knuminput.h b/src/kdeui/knuminput.h
index 8416b31..30f5bd5 100644
--- a/src/kdeui/knuminput.h
+++ b/src/kdeui/knuminput.h
@@ -22,7 +22,7 @@
#ifndef K_NUMINPUT_H
#define K_NUMINPUT_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QWidget>
#include <QSpinBox>
@@ -42,7 +42,7 @@ class KLocalizedString;
* for a different variable type
*
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KNumInput : public QWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KNumInput : public QWidget
{
Q_OBJECT
Q_PROPERTY(QString label READ label WRITE setLabel)
@@ -61,7 +61,7 @@ public:
* \deprecated - use the version without the below parameter instead
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED KNumInput(QWidget *parent, KNumInput *below);
+ KDELIBS4SUPPORT_DEPRECATED KNumInput(QWidget *parent, KNumInput *below);
#endif
/**
@@ -173,7 +173,7 @@ private:
* \image html kintnuminput.png "KDE Int Number Input Spinbox"
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KIntNumInput : public KNumInput
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KIntNumInput : public KNumInput
{
Q_OBJECT
Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged USER true)
@@ -225,7 +225,7 @@ public:
* \deprecated use the version without the below parameter instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED KIntNumInput(KNumInput *below, int value, QWidget *parent, int base = 10);
+ KDELIBS4SUPPORT_DEPRECATED KIntNumInput(KNumInput *below, int value, QWidget *parent, int base = 10);
#endif
/**
@@ -280,7 +280,7 @@ public:
* @deprecated Use the other setRange function and setSliderEnabled instead
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setRange(int min, int max, int singleStep, bool slider);
+ KDELIBS4SUPPORT_DEPRECATED void setRange(int min, int max, int singleStep, bool slider);
#endif
/**
@@ -452,7 +452,7 @@ class KDoubleLine;
* @see KIntNumInput
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDoubleNumInput : public KNumInput
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDoubleNumInput : public KNumInput
{
Q_OBJECT
Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged USER true)
@@ -515,7 +515,7 @@ public:
* \deprecated use the version without below instead
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED KDoubleNumInput(KNumInput *below,
+ KDELIBS4SUPPORT_DEPRECATED KDoubleNumInput(KNumInput *below,
double lower, double upper, double value, QWidget *parent = 0, double singleStep = 0.02,
int precision = 2);
#endif
@@ -596,7 +596,7 @@ public:
void setDecimals(int decimals);
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setPrecision(int precision)
+ KDELIBS4SUPPORT_DEPRECATED void setPrecision(int precision)
{
setDecimals(precision);
}
@@ -722,7 +722,7 @@ private:
*
* \image html kintspinbox.png "KDE Integer Input Spinboxes with hexadecimal and binary input"
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KIntSpinBox : public QSpinBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KIntSpinBox : public QSpinBox
{
Q_OBJECT
Q_PROPERTY(int base READ base WRITE setBase)
diff --git a/src/kdeui/knumvalidator.h b/src/kdeui/knumvalidator.h
index 9822554..c4ea87c 100644
--- a/src/kdeui/knumvalidator.h
+++ b/src/kdeui/knumvalidator.h
@@ -22,7 +22,7 @@
#ifndef KNUMVALIDATOR_H
#define KNUMVALIDATOR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QValidator>
@@ -39,7 +39,7 @@ class QString;
@author Glen Parker <glenebob at nwlink.com>
@deprecated use QIntValidator (or fix KIntValidator for non-decimal bases)
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KIntValidator : public QValidator
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KIntValidator : public QValidator
{
public:
@@ -103,7 +103,7 @@ private:
@deprecated use QDoubleValidator (and QLocale)
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDoubleValidator : public QDoubleValidator
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDoubleValidator : public QDoubleValidator
{
Q_OBJECT
Q_PROPERTY(bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers)
diff --git a/src/kdeui/kpassivepopupmessagehandler.h b/src/kdeui/kpassivepopupmessagehandler.h
index 357d375..ba2a2e1 100644
--- a/src/kdeui/kpassivepopupmessagehandler.h
+++ b/src/kdeui/kpassivepopupmessagehandler.h
@@ -19,7 +19,7 @@
#ifndef KDEUI_KPASSIVEPOPUPMESSAGEHANDLER_H
#define KDEUI_KPASSIVEPOPUPMESSAGEHANDLER_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kmessage.h>
#include <QtCore/QObject>
@@ -30,7 +30,7 @@ class QWidget;
*
* @author Michaël Larouche <michael.larouche at kdemail.net>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KPassivePopupMessageHandler : public QObject, public KMessageHandler
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KPassivePopupMessageHandler : public QObject, public KMessageHandler
{
Q_OBJECT
public:
diff --git a/src/kdeui/kpixmapcache.cpp b/src/kdeui/kpixmapcache.cpp
index 6288818..198a37e 100644
--- a/src/kdeui/kpixmapcache.cpp
+++ b/src/kdeui/kpixmapcache.cpp
@@ -44,7 +44,7 @@
#endif
#include <kdebug.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/kdeui/kpixmapcache.h b/src/kdeui/kpixmapcache.h
index afdddc0..f72f23b 100644
--- a/src/kdeui/kpixmapcache.h
+++ b/src/kdeui/kpixmapcache.h
@@ -21,7 +21,7 @@
#ifndef KPIXMAPCACHE_H
#define KPIXMAPCACHE_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QList>
#include <QtCore/QSet>
@@ -82,7 +82,7 @@ class QPixmap;
*
* @author Rivo Laks
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KPixmapCache
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KPixmapCache
{
public:
/**
diff --git a/src/kdeui/kprintpreview.h b/src/kdeui/kprintpreview.h
index 288effe..943a2ea 100644
--- a/src/kdeui/kprintpreview.h
+++ b/src/kdeui/kprintpreview.h
@@ -21,7 +21,7 @@
#ifndef KPRINTPREVIEW_H
#define KPRINTPREVIEW_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QDialog>
#include <QPrinter>
@@ -40,7 +40,7 @@ class KPrintPreviewPrivate;
* preview.exec();
* @endcode
*/
-class KDE4SUPPORT_EXPORT KPrintPreview : public QDialog
+class KDELIBS4SUPPORT_EXPORT KPrintPreview : public QDialog
{
Q_OBJECT
diff --git a/src/kdeui/kprogressdialog.h b/src/kdeui/kprogressdialog.h
index 42fd408..5fb88c2 100644
--- a/src/kdeui/kprogressdialog.h
+++ b/src/kdeui/kprogressdialog.h
@@ -23,7 +23,7 @@
#include <QProgressBar>
#include <kdialog.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* @short A dialog with a progress bar
@@ -45,7 +45,7 @@
* @author Aaron J. Seigo
* @author Urs Wolfer uwolfer @ kde.org
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KProgressDialog : public KDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KProgressDialog : public KDialog
{
Q_OBJECT
diff --git a/src/kdeui/kpushbutton.h b/src/kdeui/kpushbutton.h
index 0109508..4cbd42b 100644
--- a/src/kdeui/kpushbutton.h
+++ b/src/kdeui/kpushbutton.h
@@ -26,7 +26,7 @@
#include <kauthaction.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class QDrag;
class QMenu;
@@ -42,7 +42,7 @@ class QMenu;
*
* @author Carsten Pfeiffer <pfeiffer at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KPushButton : public QPushButton
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KPushButton : public QPushButton
{
Q_OBJECT
Q_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
diff --git a/src/kdeui/krestrictedline.h b/src/kdeui/krestrictedline.h
index c836686..d277f9c 100644
--- a/src/kdeui/krestrictedline.h
+++ b/src/kdeui/krestrictedline.h
@@ -23,7 +23,7 @@
#define KRESTRICTEDLINE_H
#include <klineedit.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class KRestrictedLinePrivate;
/**
@@ -47,7 +47,7 @@ class KRestrictedLinePrivate;
*
* @deprecated from KF 5.0. Use QLineEdit instead, with a QValidator
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KRestrictedLine : public KLineEdit
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KRestrictedLine : public KLineEdit
{
Q_OBJECT
Q_PROPERTY(QString validChars READ validChars WRITE setValidChars)
diff --git a/src/kdeui/ksessionmanager.h b/src/kdeui/ksessionmanager.h
index 6d2f190..349136f 100644
--- a/src/kdeui/ksessionmanager.h
+++ b/src/kdeui/ksessionmanager.h
@@ -21,7 +21,7 @@
#ifndef KSESSIONMANAGER_H
#define KSESSIONMANAGER_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QList>
#include <QSessionManager>
@@ -45,7 +45,7 @@
@see QApplication::saveStateRequest
@see QApplication::commitDataRequest
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSessionManager
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSessionManager
{
public:
KSessionManager();
diff --git a/src/kdeui/kshortcut.h b/src/kdeui/kshortcut.h
index 947569b..2b96489 100644
--- a/src/kdeui/kshortcut.h
+++ b/src/kdeui/kshortcut.h
@@ -27,7 +27,7 @@
#ifndef KSHORTCUT_H
#define KSHORTCUT_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QList>
#include <QtCore/QHash>
@@ -55,7 +55,7 @@ class KShortcutPrivate;
* closeAction->setShortcut(closeShortcut);
* \endcode
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KShortcut
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KShortcut
{
public:
/**
diff --git a/src/kdeui/ksplashscreen.h b/src/kdeui/ksplashscreen.h
index c8a08d3..2dc1b31 100644
--- a/src/kdeui/ksplashscreen.h
+++ b/src/kdeui/ksplashscreen.h
@@ -20,7 +20,7 @@
#ifndef KSPLASHSCREEN_H
#define KSPLASHSCREEN_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QSplashScreen>
@@ -39,7 +39,7 @@ class QPixmap;
*
* @author Chris Howells (howells at kde.org)
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qclasses
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qclasses
{
Q_OBJECT
diff --git a/src/kdeui/kstatusbar.h b/src/kdeui/kstatusbar.h
index 9efc2aa..e9de5c6 100644
--- a/src/kdeui/kstatusbar.h
+++ b/src/kdeui/kstatusbar.h
@@ -22,7 +22,7 @@
#ifndef KSTATUSBAR_H
#define KSTATUSBAR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QStatusBar>
class QObject;
@@ -56,7 +56,7 @@ class KStatusBarPrivate;
* @see KActionCollection
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KStatusBar : public QStatusBar
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KStatusBar : public QStatusBar
{
Q_OBJECT
diff --git a/src/kdeui/kstringvalidator.h b/src/kdeui/kstringvalidator.h
index 013b9d7..ea1bd16 100644
--- a/src/kdeui/kstringvalidator.h
+++ b/src/kdeui/kstringvalidator.h
@@ -22,7 +22,7 @@
#ifndef KSTRINGVALIDATOR_H
#define KSTRINGVALIDATOR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QStringList>
#include <QValidator>
@@ -58,7 +58,7 @@
*
* @author Marc Mutz <mutz at kde.org>
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KStringListValidator : public QValidator
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KStringListValidator : public QValidator
{
Q_OBJECT
Q_PROPERTY(QStringList stringList READ stringList WRITE setStringList)
diff --git a/src/kdeui/ksystemtrayicon.cpp b/src/kdeui/ksystemtrayicon.cpp
index 5916c21..8267e25 100644
--- a/src/kdeui/ksystemtrayicon.cpp
+++ b/src/kdeui/ksystemtrayicon.cpp
@@ -33,7 +33,7 @@
#include <kglobal.h>
#include <kwindowsystem.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
diff --git a/src/kdeui/ksystemtrayicon.h b/src/kdeui/ksystemtrayicon.h
index f652643..cc2ca2d 100644
--- a/src/kdeui/ksystemtrayicon.h
+++ b/src/kdeui/ksystemtrayicon.h
@@ -20,7 +20,7 @@
#ifndef KSYSTEMTRAY_H
#define KSYSTEMTRAY_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kcomponentdata.h>
#include <QSystemTrayIcon>
@@ -57,7 +57,7 @@ class QMovie;
*
* @author Matthias Ettrich <ettrich at kde.org>
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSystemTrayIcon : public QSystemTrayIcon //krazy:exclude=qclasses
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSystemTrayIcon : public QSystemTrayIcon //krazy:exclude=qclasses
{
Q_OBJECT
public:
diff --git a/src/kdeui/ktabbar.h b/src/kdeui/ktabbar.h
index 33001f6..5b65f8c 100644
--- a/src/kdeui/ktabbar.h
+++ b/src/kdeui/ktabbar.h
@@ -22,7 +22,7 @@
#ifndef KTABBAR_H
#define KTABBAR_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QTabBar>
@@ -31,7 +31,7 @@
*
* \image html ktabbar.png "KDE Tab Bar"
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KTabBar: public QTabBar //krazy:exclude=qclasses
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KTabBar: public QTabBar //krazy:exclude=qclasses
{
Q_OBJECT
@@ -60,7 +60,7 @@ public:
* URL from Konqueror to another application)!
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setTabReorderingEnabled(bool enable);
+ KDELIBS4SUPPORT_DEPRECATED void setTabReorderingEnabled(bool enable);
#endif
/**
@@ -69,7 +69,7 @@ public:
* @deprecated Use QTabBar::isMovable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool isTabReorderingEnabled() const;
+ KDELIBS4SUPPORT_DEPRECATED bool isTabReorderingEnabled() const;
#endif
/**
@@ -81,12 +81,12 @@ public:
* @deprecated Use QTabBar::setTabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setHoverCloseButton(bool);
+ KDELIBS4SUPPORT_DEPRECATED void setHoverCloseButton(bool);
#endif
/** @deprecated Use QTabBar::tabsClosable() instead. */
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool hoverCloseButton() const;
+ KDELIBS4SUPPORT_DEPRECATED bool hoverCloseButton() const;
#endif
/**
@@ -97,12 +97,12 @@ public:
* @deprecated Use QTabBar::setTabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setHoverCloseButtonDelayed(bool);
+ KDELIBS4SUPPORT_DEPRECATED void setHoverCloseButtonDelayed(bool);
#endif
/** @deprecated Use QTabBar::tabsClosable() instead. */
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool hoverCloseButtonDelayed() const;
+ KDELIBS4SUPPORT_DEPRECATED bool hoverCloseButtonDelayed() const;
#endif
/**
@@ -115,7 +115,7 @@ public:
* @deprecated Use QTabBar::setTabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setCloseButtonEnabled(bool);
+ KDELIBS4SUPPORT_DEPRECATED void setCloseButtonEnabled(bool);
#endif
/**
@@ -126,7 +126,7 @@ public:
* @deprecated Use QTabBar::tabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool isCloseButtonEnabled() const;
+ KDELIBS4SUPPORT_DEPRECATED bool isCloseButtonEnabled() const;
#endif
/**
@@ -137,7 +137,7 @@ public:
* @deprecated Use QTabBar::setSelectionBehaviorOnRemove() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setTabCloseActivatePrevious(bool);
+ KDELIBS4SUPPORT_DEPRECATED void setTabCloseActivatePrevious(bool);
#endif
/**
@@ -147,7 +147,7 @@ public:
* @deprecated Use QTabBar::selectionBehaviorOnRemove() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool tabCloseActivatePrevious() const;
+ KDELIBS4SUPPORT_DEPRECATED bool tabCloseActivatePrevious() const;
#endif
/**
diff --git a/src/kdeui/ktabwidget.h b/src/kdeui/ktabwidget.h
index 78431fc..7365d92 100644
--- a/src/kdeui/ktabwidget.h
+++ b/src/kdeui/ktabwidget.h
@@ -22,7 +22,7 @@
#ifndef KTABWIDGET_H
#define KTABWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QTabWidget>
@@ -41,7 +41,7 @@ class QTab;
*
* \image html ktabwidget.png "KDE Tab Widget"
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses
{
Q_OBJECT
#ifndef KDE_NO_DEPRECATED
@@ -87,7 +87,7 @@ public:
* @deprecated Use QTabWidget::isMovable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool isTabReorderingEnabled() const;
+ KDELIBS4SUPPORT_DEPRECATED bool isTabReorderingEnabled() const;
#endif
/**
@@ -97,7 +97,7 @@ public:
* @deprecated Use QTabWidget::tabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool hoverCloseButton() const;
+ KDELIBS4SUPPORT_DEPRECATED bool hoverCloseButton() const;
#endif
/**
@@ -107,7 +107,7 @@ public:
* @deprecated Use QTabWidget::setTabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool hoverCloseButtonDelayed() const;
+ KDELIBS4SUPPORT_DEPRECATED bool hoverCloseButtonDelayed() const;
#endif
/**
@@ -118,7 +118,7 @@ public:
* @deprecated Use QTabWidget::tabsClosable() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool isCloseButtonEnabled() const;
+ KDELIBS4SUPPORT_DEPRECATED bool isCloseButtonEnabled() const;
#endif
/**
@@ -128,7 +128,7 @@ public:
* @deprecated Use tabBar()->selectionBehaviorOnRemove() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool tabCloseActivatePrevious() const;
+ KDELIBS4SUPPORT_DEPRECATED bool tabCloseActivatePrevious() const;
#endif
/**
@@ -144,7 +144,7 @@ public:
* @deprecated since 5.0, use tabBar()->hide() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void setTabBarHidden(bool hide);
+ KDELIBS4SUPPORT_DEPRECATED void setTabBarHidden(bool hide);
#endif
/**
@@ -155,7 +155,7 @@ public:
* @deprecated since 5.0, use tabBar()->isHidden() instead.
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED bool isTabBarHidden() const;
+ KDELIBS4SUPPORT_DEPRECATED bool isTabBarHidden() const;
#endif
/**
@@ -183,7 +183,7 @@ public:
* @deprecated use tabText
*/
#ifndef KDE_NO_DEPRECATED
- inline KDE4SUPPORT_DEPRECATED QString label(int index) const
+ inline KDELIBS4SUPPORT_DEPRECATED QString label(int index) const
{
return tabText(index);
}
@@ -193,7 +193,7 @@ public:
* @deprecated use tabText
*/
#ifndef KDE_NO_DEPRECATED
- inline KDE4SUPPORT_DEPRECATED QString tabLabel(QWidget *w) const
+ inline KDELIBS4SUPPORT_DEPRECATED QString tabLabel(QWidget *w) const
{
return tabText(indexOf(w));
}
@@ -203,7 +203,7 @@ public:
* @deprecated use setTabText
*/
#ifndef KDE_NO_DEPRECATED
- inline KDE4SUPPORT_DEPRECATED void setTabLabel(QWidget *w, const QString &l)
+ inline KDELIBS4SUPPORT_DEPRECATED void setTabLabel(QWidget *w, const QString &l)
{
setTabText(indexOf(w), l);
}
@@ -398,7 +398,7 @@ protected:
* @deprecated This method has no effect and should not be called
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED void currentChanged(int);
+ KDELIBS4SUPPORT_DEPRECATED void currentChanged(int);
#endif
protected Q_SLOTS:
diff --git a/src/kdeui/ktextbrowser.h b/src/kdeui/ktextbrowser.h
index 0b94395..37722b5 100644
--- a/src/kdeui/ktextbrowser.h
+++ b/src/kdeui/ktextbrowser.h
@@ -21,7 +21,7 @@
#ifndef KTEXTBROWSER_H
#define KTEXTBROWSER_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QTextBrowser>
@@ -53,7 +53,7 @@
* @see QTextBrowser
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KTextBrowser : public QTextBrowser
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KTextBrowser : public QTextBrowser
{
Q_OBJECT
Q_PROPERTY(bool notifyClick READ isNotifyClick WRITE setNotifyClick)
diff --git a/src/kdeui/kundostack.h b/src/kdeui/kundostack.h
index 2d42493..907287a 100644
--- a/src/kdeui/kundostack.h
+++ b/src/kdeui/kundostack.h
@@ -20,7 +20,7 @@
#ifndef KUNDOSTACK_H
#define KUNDOSTACK_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QUndoStack>
@@ -30,7 +30,7 @@ class KActionCollection;
* Extends QUndoStack with functions that creates actions with KDE's default icons and shortcuts.
* See QUndoStack for more information.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KUndoStack : public QUndoStack
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KUndoStack : public QUndoStack
{
Q_OBJECT
public:
diff --git a/src/kdeui/kuniqueapplication.cpp b/src/kdeui/kuniqueapplication.cpp
index 5a9435d..5735721 100644
--- a/src/kdeui/kuniqueapplication.cpp
+++ b/src/kdeui/kuniqueapplication.cpp
@@ -43,7 +43,7 @@
#include <kconfiggroup.h>
#include <kwindowsystem.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if HAVE_X11
#include <kstartupinfo.h>
#include <netwm.h>
diff --git a/src/kdeui/kuniqueapplication.h b/src/kdeui/kuniqueapplication.h
index 3f842af..c154bdd 100644
--- a/src/kdeui/kuniqueapplication.h
+++ b/src/kdeui/kuniqueapplication.h
@@ -21,7 +21,7 @@
#ifndef KUNIQUEAPP_H
#define KUNIQUEAPP_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kapplication.h>
/**
@@ -53,7 +53,7 @@
* @see KApplication
* @author Preston Brown <pbrown at kde.org>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KUniqueApplication : public KApplication
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KUniqueApplication : public KApplication
{
Q_OBJECT
public:
@@ -193,7 +193,7 @@ public:
* @internal
*/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED static void setHandleAutoStarted();
+ KDELIBS4SUPPORT_DEPRECATED static void setHandleAutoStarted();
#endif
private:
diff --git a/src/kdeui/kvbox.h b/src/kdeui/kvbox.h
index d821575..d988449 100644
--- a/src/kdeui/kvbox.h
+++ b/src/kdeui/kvbox.h
@@ -33,7 +33,7 @@
*
* @see KHBox
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KVBox : public KHBox
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KVBox : public KHBox
{
Q_OBJECT
diff --git a/src/kdeui/kxerrorhandler.h b/src/kdeui/kxerrorhandler.h
index 9b4ad3f..6de2406 100644
--- a/src/kdeui/kxerrorhandler.h
+++ b/src/kdeui/kxerrorhandler.h
@@ -28,7 +28,7 @@
#include <QWidget>
#include <QWidgetList>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <X11/Xlib.h>
class KXErrorHandlerPrivate;
@@ -56,7 +56,7 @@ class KXErrorHandlerPrivate;
* @author Lubos Lunak <l.lunak at kde.org>
* @short Handler for X errors
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KXErrorHandler
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KXErrorHandler
{
public:
/** This function simply wraps QX11Info::display(), to make sure the public interface doesn't require QtX11Extras */
@@ -80,7 +80,7 @@ public:
* @deprecated Use the variant with XErrorEvent.
*/
#ifndef KDE_NO_DEPRECATED
- explicit KXErrorHandler(bool (*handler)(int request, int error_code, unsigned long resource_id), Display *dpy = display()) KDE4SUPPORT_DEPRECATED;
+ explicit KXErrorHandler(bool (*handler)(int request, int error_code, unsigned long resource_id), Display *dpy = display()) KDELIBS4SUPPORT_DEPRECATED;
#endif
/**
* This function returns true if the error flag is set (i.e. no custom handler
diff --git a/src/kio/kdatatool.h b/src/kio/kdatatool.h
index 2f99577..8ca8a97 100644
--- a/src/kio/kdatatool.h
+++ b/src/kio/kdatatool.h
@@ -21,7 +21,7 @@
#ifndef KDATATOOL_H
#define KDATATOOL_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QObject>
#include <QtCore/QString>
@@ -46,7 +46,7 @@ class KActionCollection;
* described by the service.
* @see KDataTool
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDataToolInfo
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDataToolInfo
{
public:
/**
@@ -181,7 +181,7 @@ private:
* The slot defined for step 2 is called when the action is activated, and
* that's where the tool should be created and run.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDataToolAction : public QAction
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDataToolAction : public QAction
{
Q_OBJECT
public:
@@ -242,7 +242,7 @@ private:
* @see KDataToolAction, and for activating a tool, passing it the data
* (and possibly getting modified data from it).
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDataTool : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDataTool : public QObject
{
Q_OBJECT
public:
diff --git a/src/kio/kdevicelistmodel.h b/src/kio/kdevicelistmodel.h
index 22170a9..afc0b99 100644
--- a/src/kio/kdevicelistmodel.h
+++ b/src/kio/kdevicelistmodel.h
@@ -20,7 +20,7 @@
#ifndef KDEVICELISTMODEL_H
#define KDEVICELISTMODEL_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QAbstractItemModel>
@@ -36,7 +36,7 @@
*
* @author Michaël Larouche <michael.larouche at kdemail.net>
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDeviceListModel : public QAbstractItemModel
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDeviceListModel : public QAbstractItemModel
{
Q_OBJECT
public:
diff --git a/src/kio/kdirselectdialog.h b/src/kio/kdirselectdialog.h
index f6e47f7..e684116 100644
--- a/src/kio/kdirselectdialog.h
+++ b/src/kio/kdirselectdialog.h
@@ -21,7 +21,7 @@
#ifndef KDIRSELECTDIALOG_H
#define KDIRSELECTDIALOG_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QDialog>
#include <QUrl>
@@ -33,7 +33,7 @@ class QAbstractItemView;
* @author Michael Jarrett <michaelj at corel.com>
* @deprecated since 5.0, use QFileDialog::getExistingDirectoryUrl instead.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDirSelectDialog : public QDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDirSelectDialog : public QDialog
{
Q_OBJECT
@@ -85,7 +85,7 @@ public:
* @deprecated since 5.0, use QFileDialog::getExistingDirectory (if localOnly was true)
* or QFileDialog::getExistingDirectoryUrl (if localOnly was false) instead.
*/
- static KDE4SUPPORT_DEPRECATED QUrl selectDirectory(const QUrl &startDir = QUrl(),
+ static KDELIBS4SUPPORT_DEPRECATED QUrl selectDirectory(const QUrl &startDir = QUrl(),
bool localOnly = false, QWidget *parent = 0L,
const QString &caption = QString());
diff --git a/src/kio/kdiskfreespace.h b/src/kio/kdiskfreespace.h
index 221d588..723cbd4 100644
--- a/src/kio/kdiskfreespace.h
+++ b/src/kio/kdiskfreespace.h
@@ -25,12 +25,12 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* \deprecated Use KDiskFreeSpaceInfo
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KDiskFreeSpace : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KDiskFreeSpace : public QObject
{
Q_OBJECT
diff --git a/src/kio/kfiledialog.h b/src/kio/kfiledialog.h
index ac4a994..00a6fa2 100644
--- a/src/kio/kfiledialog.h
+++ b/src/kio/kfiledialog.h
@@ -27,7 +27,7 @@
#ifndef KFILEDIALOG_H
#define KFILEDIALOG_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QDialog>
#include <kfile.h>
#include <qmimetype.h>
@@ -71,7 +71,7 @@ class KFileDialogPrivate;
* Note that when the KDE QPA theme plugin is installed, the KFileWidget will then
* be used automatically.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileDialog : public QDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileDialog : public QDialog
{
Q_OBJECT
diff --git a/src/kio/kfileitemactionplugin.h b/src/kio/kfileitemactionplugin.h
index aa1acde..93d12eb 100644
--- a/src/kio/kfileitemactionplugin.h
+++ b/src/kio/kfileitemactionplugin.h
@@ -22,7 +22,7 @@
#ifndef KFILEITEMACTION_PLUGIN_H
#define KFILEITEMACTION_PLUGIN_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QObject>
class QAction;
@@ -35,7 +35,7 @@ class KFileItemListProperties;
* (introduced in kdelibs-4.6.1 in order to remove the erroneous
* "const" in the actions method)
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileItemActionPlugin : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileItemActionPlugin : public QObject
{
Q_OBJECT
diff --git a/src/kio/kfilemetadataconfigurationwidget.cpp b/src/kio/kfilemetadataconfigurationwidget.cpp
index fc55157..259b205 100644
--- a/src/kio/kfilemetadataconfigurationwidget.cpp
+++ b/src/kio/kfilemetadataconfigurationwidget.cpp
@@ -26,7 +26,7 @@
#include "knfotranslator_p.h"
#include <klocalizedstring.h>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if ! KIO_NO_NEPOMUK
#define DISABLE_NEPOMUK_LEGACY
#include <resource.h>
diff --git a/src/kio/kfilemetadataconfigurationwidget.h b/src/kio/kfilemetadataconfigurationwidget.h
index ac68872..363aa6c 100644
--- a/src/kio/kfilemetadataconfigurationwidget.h
+++ b/src/kio/kfilemetadataconfigurationwidget.h
@@ -20,7 +20,7 @@
#ifndef KFILEMETADATACONFIGURATIONWIDGET_H
#define KFILEMETADATACONFIGURATIONWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kfileitem.h>
#include <QWidget>
@@ -42,7 +42,7 @@
// TODO: A signal is required which indicates configuration changes. Otherwise
// it would not be possible for an application developer to enable/disable an
// "Apply" button of a dialog.
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaDataConfigurationWidget : public QWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaDataConfigurationWidget : public QWidget
{
Q_OBJECT
diff --git a/src/kio/kfilemetadataprovider_p.h b/src/kio/kfilemetadataprovider_p.h
index 4115150..31137b2 100644
--- a/src/kio/kfilemetadataprovider_p.h
+++ b/src/kio/kfilemetadataprovider_p.h
@@ -24,7 +24,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if ! KIO_NO_NEPOMUK
#define DISABLE_NEPOMUK_LEGACY
#include <variant.h>
diff --git a/src/kio/kfilemetadatawidget.cpp b/src/kio/kfilemetadatawidget.cpp
index beea1f6..1edb069 100644
--- a/src/kio/kfilemetadatawidget.cpp
+++ b/src/kio/kfilemetadatawidget.cpp
@@ -32,7 +32,7 @@
#include <QString>
#include <QTimer>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if ! KIO_NO_NEPOMUK
#define DISABLE_NEPOMUK_LEGACY
diff --git a/src/kio/kfilemetadatawidget.h b/src/kio/kfilemetadatawidget.h
index ed441b4..e788ce5 100644
--- a/src/kio/kfilemetadatawidget.h
+++ b/src/kio/kfilemetadatawidget.h
@@ -21,7 +21,7 @@
#ifndef KFILEMETADATAWIDGET_H
#define KFILEMETADATAWIDGET_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kfileitem.h>
#include <QList>
@@ -41,7 +41,7 @@
*
* @since 4.5
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaDataWidget : public QWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaDataWidget : public QWidget
{
Q_OBJECT
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
diff --git a/src/kio/kfilemetainfo.cpp b/src/kio/kfilemetainfo.cpp
index 57a526e..c260f40 100644
--- a/src/kio/kfilemetainfo.cpp
+++ b/src/kio/kfilemetainfo.cpp
@@ -26,7 +26,7 @@
#include "kfilewriteplugin.h"
#include "kfilewriteplugin_p.h"
-#include "config-kde4support.h"
+#include "config-kdelibs4support.h"
#if ! KIO_NO_STRIGI
#include <strigi/bufferedstream.h>
diff --git a/src/kio/kfilemetainfo.h b/src/kio/kfilemetainfo.h
index d230227..dfc0731 100644
--- a/src/kio/kfilemetainfo.h
+++ b/src/kio/kfilemetainfo.h
@@ -31,7 +31,7 @@ class QUrl;
typedef QList<KFileMetaInfoItem> KFileMetaInfoItemList;
class KFileMetaInfoGroupPrivate;
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoGroup
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoGroup
{
public:
KFileMetaInfoGroup();
@@ -55,7 +55,7 @@ class KFileMetaInfoPrivate;
* will be retrieved and stored in the instance. The data can be inspected
* through KFileMetaInfoItem objects.
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaInfo
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaInfo
{
public:
/**
@@ -139,20 +139,20 @@ public:
* Deprecated
**/
QStringList supportedKeys() const;
- KDE4SUPPORT_DEPRECATED_EXPORT friend QDataStream &operator >>(QDataStream &s, KFileMetaInfo &)
+ KDELIBS4SUPPORT_DEPRECATED_EXPORT friend QDataStream &operator >>(QDataStream &s, KFileMetaInfo &)
;
- KDE4SUPPORT_DEPRECATED_EXPORT friend QDataStream &operator <<(QDataStream &s, const KFileMetaInfo &);
+ KDELIBS4SUPPORT_DEPRECATED_EXPORT friend QDataStream &operator <<(QDataStream &s, const KFileMetaInfo &);
/**
* Deprecated
**/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
+ KDELIBS4SUPPORT_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
#endif
/**
* Deprecated
**/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
+ KDELIBS4SUPPORT_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
#endif
KFileMetaInfoGroupList groups() const;
QStringList keys() const;
diff --git a/src/kio/kfilemetainfoitem.cpp b/src/kio/kfilemetainfoitem.cpp
index 566104d..3794612 100644
--- a/src/kio/kfilemetainfoitem.cpp
+++ b/src/kio/kfilemetainfoitem.cpp
@@ -21,7 +21,7 @@
#include "kfilemetainfoitem.h"
#include "kfilemetainfoitem_p.h"
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#ifdef HAVE_NEPOMUK
#include <config-nepomuk.h>
diff --git a/src/kio/kfilemetainfoitem.h b/src/kio/kfilemetainfoitem.h
index f560c04..38d82e2 100644
--- a/src/kio/kfilemetainfoitem.h
+++ b/src/kio/kfilemetainfoitem.h
@@ -22,7 +22,7 @@
#ifndef KFILEMETAINFOITEM_H
#define KFILEMETAINFOITEM_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QSharedData>
class KFileWritePlugin;
@@ -30,7 +30,7 @@ class QVariant;
class PredicateProperties;
class KFileMetaInfoItemPrivate;
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoItem
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoItem
{
friend class KFileMetaInfo;
friend class KFileMetaInfoPrivate;
@@ -90,7 +90,7 @@ public:
* @deprecated
**/
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED const PredicateProperties &properties() const;
+ KDELIBS4SUPPORT_DEPRECATED const PredicateProperties &properties() const;
#endif
/**
* Localized name of the predicate.
diff --git a/src/kio/kfilemetainfoitem_p.h b/src/kio/kfilemetainfoitem_p.h
index b0dccdb..4208806 100644
--- a/src/kio/kfilemetainfoitem_p.h
+++ b/src/kio/kfilemetainfoitem_p.h
@@ -21,7 +21,7 @@
#ifndef KFILEMETAINFOITEM_P_H
#define KFILEMETAINFOITEM_P_H
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#ifndef KDE_NO_DEPRECATED
#include <predicateproperties.h>
diff --git a/src/kio/kfilemetainfowidget.h b/src/kio/kfilemetainfowidget.h
index 26f4a74..7b3b900 100644
--- a/src/kio/kfilemetainfowidget.h
+++ b/src/kio/kfilemetainfowidget.h
@@ -23,7 +23,7 @@
#include <QWidget>
#include <QtCore/QVariant>
#include <kfilemetainfo.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class KFileMetaInfoWidgetPrivate;
@@ -31,7 +31,7 @@ class KFileMetaInfoWidgetPrivate;
* @deprecated since 5.0
* A widget to display file meta information (like id3 for mp3)
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoWidget: public QWidget
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaInfoWidget: public QWidget
{
Q_OBJECT
public:
diff --git a/src/kio/kfileshare.h b/src/kio/kfileshare.h
index efcaf40..106d903 100644
--- a/src/kio/kfileshare.h
+++ b/src/kio/kfileshare.h
@@ -20,7 +20,7 @@
#ifndef kfileshare_h
#define kfileshare_h
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class QString;
/**
@@ -33,23 +33,23 @@ namespace KFileShare
/**
* Reads the file share configuration file
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void readConfig();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void readConfig();
/**
* Reads the list of shared folders
*/
-KDE4SUPPORT_DEPRECATED_EXPORT void readShareList();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT void readShareList();
/**
* Call this to know if a directory is currently shared
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool isDirectoryShared(const QString &path);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool isDirectoryShared(const QString &path);
enum Authorization { NotInitialized, ErrorNotFound, Authorized, UserNotAllowed };
/**
* Call this to know if the current user is authorized to share directories
*/
-KDE4SUPPORT_DEPRECATED_EXPORT Authorization authorization();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT Authorization authorization();
/**
* Uses a suid perl script to share the given path
@@ -58,7 +58,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT Authorization authorization();
* @param shared whether the path should be shared or not
* @returns whether the perl script was successful
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool setShared(const QString &path, bool shared);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool setShared(const QString &path, bool shared);
/**
* The used share mode.
@@ -74,7 +74,7 @@ enum ShareMode { Simple, Advanced };
* If this is false, file sharing is disabled and
* nobody can share files.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool sharingEnabled();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool sharingEnabled();
/**
* Returns whether file sharing is restricted.
@@ -82,29 +82,29 @@ KDE4SUPPORT_DEPRECATED_EXPORT bool sharingEnabled();
* If it is restricted only users in the configured
* file share group can share files.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool isRestricted();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool isRestricted();
/**
* Returns the group that is used for file sharing.
* That is, all users in that group are allowed to
* share files if file sharing is restricted.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QString fileShareGroup();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString fileShareGroup();
/**
* Returns the configured share mode
*/
-KDE4SUPPORT_DEPRECATED_EXPORT ShareMode shareMode();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT ShareMode shareMode();
/**
* Returns whether Samba is enabled
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool sambaEnabled();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool sambaEnabled();
/**
* Returns whether NFS is enabled
*/
-KDE4SUPPORT_DEPRECATED_EXPORT bool nfsEnabled();
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool nfsEnabled();
}
#endif
diff --git a/src/kio/kfiletreeview_p.h b/src/kio/kfiletreeview_p.h
index ebb5fbc..b41f3c8 100644
--- a/src/kio/kfiletreeview_p.h
+++ b/src/kio/kfiletreeview_p.h
@@ -26,12 +26,12 @@
#include <QUrl>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* The file treeview offers a treeview on the filesystem.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileTreeView : public QTreeView // exported only for kfiletreeviewtest
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileTreeView : public QTreeView // exported only for kfiletreeviewtest
{
Q_OBJECT
diff --git a/src/kio/kfilewriteplugin.h b/src/kio/kfilewriteplugin.h
index 50ff5ed..b487d01 100644
--- a/src/kio/kfilewriteplugin.h
+++ b/src/kio/kfilewriteplugin.h
@@ -20,12 +20,12 @@
#ifndef KFILEWRITEPLUGIN_H
#define KFILEWRITEPLUGIN_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QVariant>
class QUrl;
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileWritePlugin : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileWritePlugin : public QObject
{
Q_OBJECT
friend class KFileWriterProvider;
diff --git a/src/kio/kimageio.h b/src/kio/kimageio.h
index a79b927..d6c56ba 100644
--- a/src/kio/kimageio.h
+++ b/src/kio/kimageio.h
@@ -11,7 +11,7 @@
#include <QtCore/QStringList>
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* Methods to get information about image format names and
@@ -65,7 +65,7 @@ enum Mode { Reading, Writing };
* @deprecated Use QIMageReader/QImageWriter::supportedMimeTypes() and
* QFileDialog::setMimeTypeFilters() instead.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QString pattern(Mode mode = Reading);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QString pattern(Mode mode = Reading);
#endif
#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
@@ -76,7 +76,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QString pattern(Mode mode = Reading);
* is not supported
* @deprecated Use QMimeType::name() instead().
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QStringList typeForMime(const QString &mimeType);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList typeForMime(const QString &mimeType);
#endif
#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
@@ -87,7 +87,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QStringList typeForMime(const QString &mimeType);
* @return a list of the type ids
* @deprecated Use QImageReader/QImageWriter::supportedImageFormats() instead.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QStringList types(Mode mode = Writing);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList types(Mode mode = Writing);
#endif
#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
@@ -98,7 +98,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QStringList types(Mode mode = Writing);
* @return a list if MIME types of the supported formats
* @deprecated Use QImageReader/QImageWriter::supportedMimeTypes() instead.
*/
-KDE4SUPPORT_DEPRECATED_EXPORT QStringList mimeTypes(Mode mode = Writing);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QStringList mimeTypes(Mode mode = Writing);
#endif
#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
@@ -109,7 +109,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT QStringList mimeTypes(Mode mode = Writing);
* @return true if the type is supported
* @deprecated Use QImageReader/QImageWriter::supportedMimeTypes() instead.
**/
-KDE4SUPPORT_DEPRECATED_EXPORT bool isSupported(const QString &mimeType, Mode mode = Writing);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT bool isSupported(const QString &mimeType, Mode mode = Writing);
#endif
}
diff --git a/src/kio/kmetaprops.h b/src/kio/kmetaprops.h
index 9acce84..ba3c274 100644
--- a/src/kio/kmetaprops.h
+++ b/src/kio/kmetaprops.h
@@ -20,7 +20,7 @@
#ifndef __KMETAPROPS_H__
#define __KMETAPROPS_H__
#include <kpropertiesdialog.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class KFileMetaInfoItem;
@@ -28,7 +28,7 @@ class KFileMetaInfoItem;
* 'MetaProps plugin
* In this plugin you can modify meta information like id3 tags of mp3 files
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KFileMetaPropsPlugin : public KPropertiesDialogPlugin
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KFileMetaPropsPlugin : public KPropertiesDialogPlugin
{
Q_OBJECT
public:
diff --git a/src/kio/knfotranslator.cpp b/src/kio/knfotranslator.cpp
index 83bed41..8eec6a1 100644
--- a/src/kio/knfotranslator.cpp
+++ b/src/kio/knfotranslator.cpp
@@ -22,7 +22,7 @@
#include <QUrl>
-#include <config-kde4support.h>
+#include <config-kdelibs4support.h>
#if ! KIO_NO_NEPOMUK
#define DISABLE_NEPOMUK_LEGACY
#include "property.h"
diff --git a/src/kio/kpreviewprops.h b/src/kio/kpreviewprops.h
index 6379297..8727b95 100644
--- a/src/kio/kpreviewprops.h
+++ b/src/kio/kpreviewprops.h
@@ -21,7 +21,7 @@
#define __KPREVIEWPROPS_H__
#include <kpropertiesdialog.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class KFileMetaPreview;
@@ -29,7 +29,7 @@ class KFileMetaPreview;
* PreviewProps plugin
* This plugin displays a preview of the given file
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KPreviewPropsPlugin : public KPropertiesDialogPlugin
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KPreviewPropsPlugin : public KPropertiesDialogPlugin
{
Q_OBJECT
diff --git a/src/kio/kscan.h b/src/kio/kscan.h
index c8e1364..4533673 100644
--- a/src/kio/kscan.h
+++ b/src/kio/kscan.h
@@ -20,7 +20,7 @@
#ifndef KSCAN_H
#define KSCAN_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kpagedialog.h>
#include <QDialogButtonBox>
@@ -59,7 +59,7 @@ class QImage;
* @author Carsten Pfeiffer <pfeiffer at kde.org>
* @deprecated since 5.0, use libksane instead
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KScanDialog : public KPageDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KScanDialog : public KPageDialog
{
Q_OBJECT
@@ -166,7 +166,7 @@ private:
/**
* Base class for OCR Dialogs.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KOCRDialog : public KPageDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KOCRDialog : public KPageDialog
{
Q_OBJECT
diff --git a/src/kio/metainfojob.cpp b/src/kio/metainfojob.cpp
index 14e77fa..b4e69df 100644
--- a/src/kio/metainfojob.cpp
+++ b/src/kio/metainfojob.cpp
@@ -154,12 +154,12 @@ void MetaInfoJob::slotMetaInfo(KIO::Job *, const QByteArray &data)
d->succeeded = true;
}
-KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *KIO::fileMetaInfo(const KFileItemList &items)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *KIO::fileMetaInfo(const KFileItemList &items)
{
return new MetaInfoJob(items);
}
-KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *KIO::fileMetaInfo(const QList<QUrl> &items)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *KIO::fileMetaInfo(const QList<QUrl> &items)
{
KFileItemList fileItems;
foreach (const QUrl &url, items) {
diff --git a/src/kio/metainfojob.h b/src/kio/metainfojob.h
index 1d8cd1a..8e9fe5e 100644
--- a/src/kio/metainfojob.h
+++ b/src/kio/metainfojob.h
@@ -21,7 +21,7 @@
#ifndef KIO_METAINFOJOB_H
#define KIO_METAINFOJOB_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kio/job.h>
#include <kfileitem.h>
#include <kfilemetainfo.h>
@@ -37,7 +37,7 @@ class MetaInfoJobPrivate;
* Note: this job doesn't even work as before, KFileItem::setMetaInfo
* doesn't exist anymore.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob : public KIO::Job
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT MetaInfoJob : public KIO::Job
{
Q_OBJECT
public:
@@ -118,7 +118,7 @@ private:
* @return the MetaInfoJob to retrieve the items
* @deprecated use strigi or KFileMetaInfo
*/
-KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *fileMetaInfo(const KFileItemList &items);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *fileMetaInfo(const KFileItemList &items);
/**
* Retrieves meta information for the given items.
@@ -127,7 +127,7 @@ KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *fileMetaInfo(const KFileItemList &ite
* @return the MetaInfoJob to retrieve the items
* @deprecated use strigi or KFileMetaInfo
*/
-KDE4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *fileMetaInfo(const QList<QUrl> &items);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT MetaInfoJob *fileMetaInfo(const QList<QUrl> &items);
}
#endif
diff --git a/src/kio/netaccess.h b/src/kio/netaccess.h
index 92916e4..567b7ed 100644
--- a/src/kio/netaccess.h
+++ b/src/kio/netaccess.h
@@ -25,7 +25,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kio/global.h>
#include <kio/udsentry.h>
#include <kio/jobclasses.h> // for KIO::JobFlags
@@ -65,7 +65,7 @@ class NetAccessPrivate;
*
* @short Provides a blocking interface to KIO file operations.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT NetAccess : public QObject
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT NetAccess : public QObject
{
Q_OBJECT
@@ -194,8 +194,8 @@ public:
* @deprecated since 5.0, use KIO::file_copy + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool file_copy(const QUrl &src, const QUrl &target, QWidget *window = 0);
- static KDE4SUPPORT_DEPRECATED_EXPORT bool copy(const QUrl &src, const QUrl &target,
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool file_copy(const QUrl &src, const QUrl &target, QWidget *window = 0);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool copy(const QUrl &src, const QUrl &target,
QWidget *window = 0);
#endif
@@ -221,7 +221,7 @@ public:
* @deprecated since 5.0, use KIO::copy + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool dircopy(const QUrl &src, const QUrl &target, QWidget *window);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool dircopy(const QUrl &src, const QUrl &target, QWidget *window);
#endif
/**
@@ -229,7 +229,7 @@ public:
* @deprecated since 5.0, use KIO::copy + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool dircopy(const QList<QUrl> &src, const QUrl &target, QWidget *window = 0L);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool dircopy(const QList<QUrl> &src, const QUrl &target, QWidget *window = 0L);
#endif
/**
* Full-fledged equivalent of KIO::move.
@@ -237,7 +237,7 @@ public:
* @deprecated since 5.0, use KIO::move + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool move(const QUrl &src, const QUrl &target, QWidget *window = 0L);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool move(const QUrl &src, const QUrl &target, QWidget *window = 0L);
#endif
/**
@@ -246,7 +246,7 @@ public:
* @deprecated since 5.0, use KIO::move + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool move(const QList<QUrl> &src, const QUrl &target, QWidget *window = 0L);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool move(const QList<QUrl> &src, const QUrl &target, QWidget *window = 0L);
#endif
/**
@@ -267,7 +267,7 @@ public:
* @deprecated use the StatSide enum instead of the bool source
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool exists(const QUrl &url, bool source, QWidget *window);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool exists(const QUrl &url, bool source, QWidget *window);
#endif
/**
@@ -340,7 +340,7 @@ public:
* @deprecated since 5.0, use KIO::del + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool del(const QUrl &url, QWidget *window);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool del(const QUrl &url, QWidget *window);
#endif
/**
@@ -360,7 +360,7 @@ public:
* @deprecated since 5.0, use KIO::mkdir + job->ui()->setWindow() + job->exec() instead
*/
#ifndef KDE_NO_DEPRECATED
- static KDE4SUPPORT_DEPRECATED_EXPORT bool mkdir(const QUrl &url, QWidget *window, int permissions = -1);
+ static KDELIBS4SUPPORT_DEPRECATED_EXPORT bool mkdir(const QUrl &url, QWidget *window, int permissions = -1);
#endif
/**
diff --git a/src/kio/passworddialog.h b/src/kio/passworddialog.h
index 757e183..29a09ef 100644
--- a/src/kio/passworddialog.h
+++ b/src/kio/passworddialog.h
@@ -20,7 +20,7 @@
#ifndef kio_pass_word_dialog_h
#define kio_pass_word_dialog_h
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kpassworddialog.h>
namespace KIO
@@ -34,7 +34,7 @@ namespace KIO
* instead of directly instantiating this dialog.
* @short dialog for requesting login and password from the end user
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT PasswordDialog : public KPasswordDialog
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT PasswordDialog : public KPasswordDialog
{
Q_OBJECT
diff --git a/src/kio/predicateproperties.h b/src/kio/predicateproperties.h
index 1fca954..dd10309 100644
--- a/src/kio/predicateproperties.h
+++ b/src/kio/predicateproperties.h
@@ -20,7 +20,7 @@
#ifndef PREDICATEPROPERTIES_H
#define PREDICATEPROPERTIES_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <QtCore/QSharedData>
#include <QtCore/QVariant>
class QValidator;
@@ -33,12 +33,12 @@ class QValidator;
*
* @deprecated use Nepomuk::Types::Property instead
**/
-class KDE4SUPPORT_DEPRECATED_EXPORT PredicateProperties
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT PredicateProperties
{
friend class PredicatePropertyProvider;
public:
#ifndef KDE_NO_DEPRECATED
- KDE4SUPPORT_DEPRECATED PredicateProperties(const QString &predicate = QString());
+ KDELIBS4SUPPORT_DEPRECATED PredicateProperties(const QString &predicate = QString());
#endif
PredicateProperties(const PredicateProperties &p);
~PredicateProperties();
diff --git a/src/kioslave/metainfo/CMakeLists.txt b/src/kioslave/metainfo/CMakeLists.txt
index e6bd274..bf8e754 100644
--- a/src/kioslave/metainfo/CMakeLists.txt
+++ b/src/kioslave/metainfo/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kio_metainfo MODULE ${kio_metainfo_PART_SRCS})
target_link_libraries(kio_metainfo
- KF5::KDE4Support
+ KF5::KDELibs4Support
KF5::CoreAddons
KF5::I18n
KF5::KIOCore
diff --git a/src/kparts/factory.h b/src/kparts/factory.h
index eed6172..368b16f 100644
--- a/src/kparts/factory.h
+++ b/src/kparts/factory.h
@@ -20,7 +20,7 @@
#ifndef __kparts_factory_h__
#define __kparts_factory_h__
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <kpluginfactory.h>
#include <kcomponentdata.h>
@@ -39,7 +39,7 @@ class Part;
*
* @see KPluginFactory.
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT Factory : public KPluginFactory
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT Factory : public KPluginFactory
{
Q_OBJECT
public:
diff --git a/src/kparts/genericfactory.h b/src/kparts/genericfactory.h
index c0a5e0d..f6fa4a7 100644
--- a/src/kparts/genericfactory.h
+++ b/src/kparts/genericfactory.h
@@ -104,7 +104,7 @@ private:
* yourlibrary is the library name that you compiled your KPart into.
*/
template <class T>
-class KDE4SUPPORT_DEPRECATED GenericFactory : public GenericFactoryBase<T>
+class KDELIBS4SUPPORT_DEPRECATED GenericFactory : public GenericFactoryBase<T>
{
public:
GenericFactory() { }
diff --git a/src/kssl/kssl.h b/src/kssl/kssl.h
index c01582f..ae00020 100644
--- a/src/kssl/kssl.h
+++ b/src/kssl/kssl.h
@@ -22,7 +22,7 @@
#define _KSSL_H
#include <ksslsettings.h>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
class QIODevice;
class KSSLPrivate;
@@ -37,7 +37,7 @@ class KSSLSession;
* @see KExtendedSocket, TCPSlaveBase
* @short KDE SSL Class
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSSL
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSSL
{
public:
/**
diff --git a/src/kssl/ksslcertchain.h b/src/kssl/ksslcertchain.h
index 034365b..608dc9d 100644
--- a/src/kssl/ksslcertchain.h
+++ b/src/kssl/ksslcertchain.h
@@ -39,7 +39,7 @@ class QStringList;
* @see KSSL, KSSLCertificate, KSSLPeerInfo
* @short KDE X.509 Certificate Chain
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSSLCertChain
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSSLCertChain
{
friend class KSSL;
friend class KSSLPeerInfo;
diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp
index 3e84ab4..51103f3 100644
--- a/src/kssl/ksslcertificate.cpp
+++ b/src/kssl/ksslcertificate.cpp
@@ -40,7 +40,7 @@
#include <sys/types.h>
-#include <config-kde4support.h> // HAVE_SYS_STAT_H
+#include <config-kdelibs4support.h> // HAVE_SYS_STAT_H
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
diff --git a/src/kssl/ksslcertificate.h b/src/kssl/ksslcertificate.h
index 60c0b36..72e2a5d 100644
--- a/src/kssl/ksslcertificate.h
+++ b/src/kssl/ksslcertificate.h
@@ -44,7 +44,7 @@ class QDateTime;
class KSSLCertChain;
class KSSLX509V3;
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ksslconfig.h>
#include <QtCore/QList>
@@ -71,7 +71,7 @@ class X509;
* @short KDE X.509 Certificate
* @deprecated since 5.0, use QSslCertificate
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSSLCertificate
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSSLCertificate
{
friend class KSSL;
friend class KSSLCertificateHome;
@@ -375,8 +375,8 @@ public:
static QString getMD5DigestFromKDEKey(const QString &k);
private:
- KDE4SUPPORT_DEPRECATED_EXPORT friend int operator!=(KSSLCertificate &x, KSSLCertificate &y);
- KDE4SUPPORT_DEPRECATED_EXPORT friend int operator==(KSSLCertificate &x, KSSLCertificate &y);
+ KDELIBS4SUPPORT_DEPRECATED_EXPORT friend int operator!=(KSSLCertificate &x, KSSLCertificate &y);
+ KDELIBS4SUPPORT_DEPRECATED_EXPORT friend int operator==(KSSLCertificate &x, KSSLCertificate &y);
KSSLCertificatePrivate *d;
int purposeToOpenSSL(KSSLPurpose p) const;
@@ -390,11 +390,11 @@ protected:
KSSLValidation processError(int ec);
};
-KDE4SUPPORT_DEPRECATED_EXPORT QDataStream &operator<<(QDataStream &s, const KSSLCertificate &r);
-KDE4SUPPORT_DEPRECATED_EXPORT QDataStream &operator>>(QDataStream &s, KSSLCertificate &r);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QDataStream &operator<<(QDataStream &s, const KSSLCertificate &r);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT QDataStream &operator>>(QDataStream &s, KSSLCertificate &r);
-KDE4SUPPORT_DEPRECATED_EXPORT int operator==(KSSLCertificate &x, KSSLCertificate &y);
-KDE4SUPPORT_DEPRECATED_EXPORT inline int operator!=(KSSLCertificate &x, KSSLCertificate &y)
+KDELIBS4SUPPORT_DEPRECATED_EXPORT int operator==(KSSLCertificate &x, KSSLCertificate &y);
+KDELIBS4SUPPORT_DEPRECATED_EXPORT inline int operator!=(KSSLCertificate &x, KSSLCertificate &y)
{
return !(x == y);
}
diff --git a/src/kssl/ksslutils.h b/src/kssl/ksslutils.h
index c6aa47a..5757bbc 100644
--- a/src/kssl/ksslutils.h
+++ b/src/kssl/ksslutils.h
@@ -20,7 +20,7 @@
#ifndef _INCLUDE_KSSLUTILS_H
#define _INCLUDE_KSSLUTILS_H
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
#include <ksslconfig.h>
#if KSSL_HAVE_SSL
diff --git a/src/kssl/ksslx509v3.h b/src/kssl/ksslx509v3.h
index 14a1de5..6bc1c2c 100644
--- a/src/kssl/ksslx509v3.h
+++ b/src/kssl/ksslx509v3.h
@@ -23,7 +23,7 @@
#include <QtCore/QString>
-#include <kde4support_export.h>
+#include <kdelibs4support_export.h>
/**
* KDE X509v3 Flag Class
@@ -34,7 +34,7 @@
* @see KExtendedSocket, TCPSlaveBase
* @short KDE SSL Class
*/
-class KDE4SUPPORT_DEPRECATED_EXPORT KSSLX509V3
+class KDELIBS4SUPPORT_DEPRECATED_EXPORT KSSLX509V3
{
friend class KSSLCertificate;
friend class KSSLCertificatePrivate;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c4c803f..94b6664 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,15 +1,15 @@
include(ECMMarkAsTest)
-macro(KDE4SUPPORT_EXAMPLES)
+macro(KDELIBS4SUPPORT_EXAMPLES)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} KF5::KDE4Support Qt5::Test Qt5::Network Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::I18n KF5::XmlGui KF5::Completion KF5::Notifications KF5::IconThemes KF5::KIOFileWidgets)
+ target_link_libraries(${_testname} KF5::KDELibs4Support Qt5::Test Qt5::Network Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::I18n KF5::XmlGui KF5::Completion KF5::Notifications KF5::IconThemes KF5::KIOFileWidgets)
ecm_mark_as_test(${_testname})
endforeach()
endmacro()
-kde4support_examples(
+kdelibs4support_examples(
kcolordlgtest
kdebugtest_gui
kdirselectdialogtest
@@ -44,7 +44,7 @@ kde4support_examples(
if (X11_FOUND)
find_package(Qt5X11Extras 5.2.0 REQUIRED NO_MODULE)
- kde4support_examples( kxerrorhandlertest )
+ kdelibs4support_examples( kxerrorhandlertest )
target_link_libraries(kxerrorhandlertest ${X11_X11_LIB} Qt5::X11Extras)
endif ()
More information about the Kde-frameworks-devel
mailing list