From 25f371ade99a9ce3f7683142879d8ce731f75fc5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 6 Apr 2016 13:16:57 +0000 Subject: [PATCH] generic: misc cleanups Signed-off-by: Ivailo Monev --- ark/CMakeLists.txt | 11 ++--------- ark/part/CMakeLists.txt | 5 ++--- kuassel/src/common/signalproxy.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index 810f8a24..96d5888c 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -7,7 +7,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) endif() -include( MacroLibrary ) +include(MacroLibrary) 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.") @@ -18,14 +18,7 @@ configure_file( ) add_definitions(-DQT_NO_CAST_FROM_ASCII) -include_directories(${PROJECT_SOURCE_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) +include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) set(SUPPORTED_ARK_MIMETYPES "") diff --git a/ark/part/CMakeLists.txt b/ark/part/CMakeLists.txt index a92f49a1..9fbfc0cb 100644 --- a/ark/part/CMakeLists.txt +++ b/ark/part/CMakeLists.txt @@ -5,7 +5,6 @@ set(arkpart_PART_SRCS archivemodel.cpp archiveview.cpp jobtracker.cpp - infopanel.ui jobtracker.ui ) 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}) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/ark_part.desktop.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop + ${CMAKE_CURRENT_SOURCE_DIR}/ark_part.desktop.cmake + ${CMAKE_CURRENT_BINARY_DIR}/ark_part.desktop ) install(TARGETS arkpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kuassel/src/common/signalproxy.cpp b/kuassel/src/common/signalproxy.cpp index 2185fd41..b5dfb7ae 100644 --- a/kuassel/src/common/signalproxy.cpp +++ b/kuassel/src/common/signalproxy.cpp @@ -895,11 +895,13 @@ const QHash &SignalProxy::ExtendedMetaObject::receiveMap() methodName = methodName.replace("request", "receive"); 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); if (receiverId == -1) { - signature = QMetaObject::normalizedSignature(methodName + "(" + returnTypeName + ")"); + signaturename = methodName + "(" + returnTypeName + ")"; + signature = QMetaObject::normalizedSignature(signaturename.data()); receiverId = _meta->indexOfSlot(signature); }