Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 02:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-06 13:16:57 +00:00
parent 6d98fd63b6
commit 25f371ade9
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ark/CMakeLists.txt
View file

@ -7,7 +7,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif() endif()
include( MacroLibrary ) include(MacroLibrary)
macro_optional_find_package(LibArchive 3.0.3) macro_optional_find_package(LibArchive 3.0.3)
macro_log_feature(LibArchive_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") macro_log_feature(LibArchive_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.")
@ -18,14 +18,7 @@ configure_file(
) )
add_definitions(-DQT_NO_CAST_FROM_ASCII) add_definitions(-DQT_NO_CAST_FROM_ASCII)
include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
option(WITH_TEST_COVERAGE "Build with test coverage support" OFF)
if (WITH_TEST_COVERAGE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
endif (WITH_TEST_COVERAGE)
set(SUPPORTED_ARK_MIMETYPES "") set(SUPPORTED_ARK_MIMETYPES "")

5
ark/part/CMakeLists.txt
View file

@ -5,7 +5,6 @@ set(arkpart_PART_SRCS
archivemodel.cpp archivemodel.cpp
archiveview.cpp archiveview.cpp
jobtracker.cpp jobtracker.cpp
infopanel.ui jobtracker.ui
) )
qt4_add_dbus_adaptor(arkpart_PART_SRCS dnddbusinterface.xml part.h Ark::Part) qt4_add_dbus_adaptor(arkpart_PART_SRCS dnddbusinterface.xml part.h Ark::Part)
@ -15,8 +14,8 @@ kde4_add_plugin(arkpart ${arkpart_PART_SRCS})
target_link_libraries(arkpart kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS}) target_link_libraries(arkpart kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/ark_part.desktop.cmake ${CMAKE_CURRENT_SOURCE_DIR}/ark_part.desktop.cmake
${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop
) )
install(TARGETS arkpart DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS arkpart DESTINATION ${PLUGIN_INSTALL_DIR})

6
kuassel/src/common/signalproxy.cpp
View file

@ -895,11 +895,13 @@ const QHash<int, int> &SignalProxy::ExtendedMetaObject::receiveMap()
methodName = methodName.replace("request", "receive"); methodName = methodName.replace("request", "receive");
params = params.left(params.count() - 1) + ", " + returnTypeName + ")"; params = params.left(params.count() - 1) + ", " + returnTypeName + ")";
signature = QMetaObject::normalizedSignature(methodName + params); QByteArray signaturename = methodName + params;
signature = QMetaObject::normalizedSignature(signaturename.data());
receiverId = _meta->indexOfSlot(signature); receiverId = _meta->indexOfSlot(signature);
if (receiverId == -1) { if (receiverId == -1) {
signature = QMetaObject::normalizedSignature(methodName + "(" + returnTypeName + ")"); signaturename = methodName + "(" + returnTypeName + ")";
signature = QMetaObject::normalizedSignature(signaturename.data());
receiverId = _meta->indexOfSlot(signature); receiverId = _meta->indexOfSlot(signature);
} }