generic: misc cleanups

diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt
index b1e2426..7d9d674 100644 (file)
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@@ -58,7 +58,6 @@ target_link_libraries(akregatorprivate
   akregatorinterfaces
   syndication
 )
-target_link_libraries(akregatorprivate LINK_INTERFACE_LIBRARIES ${KDE4_KHTML_LIBS})
 
 set_target_properties(akregatorprivate
   PROPERTIES VERSION ${GENERIC_LIB_VERSION}

diff --git a/gwenview/CMakeLists.txt b/gwenview/CMakeLists.txt
index e37cbf7..ce7254c 100644 (file)
--- a/gwenview/CMakeLists.txt
+++ b/gwenview/CMakeLists.txt
@@ -47,13 +47,6 @@ include_directories(
     ${KDCRAW_INCLUDE_DIR}
     )
 
-if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
-    include_directories(
-        ${BALOO_INCLUDE_DIR}
-        ${KFILEMETADATA_INCLUDE_DIR}
-        )
-endif()
-
 ## dirs to build
 add_subdirectory(lib)
 add_subdirectory(app)

diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt
index eacd0e9..62664f4 100644 (file)
--- a/gwenview/app/CMakeLists.txt
+++ b/gwenview/app/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${EXIV2_INCLUDE_DIR}
     ${LIBKONQ_INCLUDE_DIR}
-    ${KACTIVITIES_INCLUDE_DIRS}
     )
 
 if (KIPI_FOUND)
@@ -62,23 +61,18 @@ kde4_add_app_icon(gwenview_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-g
 
 kde4_add_executable(gwenview ${gwenview_SRCS})
 
-target_link_libraries(gwenview
+target_link_libraries(gwenview PRIVATE
     ${KDE4_KFILE_LIBS}
     gwenviewlib
     ${KDE4_KIO_LIBS}
     ${LIBKONQ_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    ${KACTIVITIES_LIBRARIES}
     )
 
-target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY})
+target_link_libraries(gwenview PUBLIC ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY})
 
 if (KIPI_FOUND)
-    target_link_libraries(gwenview ${KIPI_LIBRARIES})
-endif()
-
-if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
-    target_link_libraries(gwenview ${BALOO_LIBRARIES})
+    target_link_libraries(gwenview PRIVATE ${KIPI_LIBRARIES})
 endif()
 
 install(TARGETS gwenview

diff --git a/gwenview/importer/CMakeLists.txt b/gwenview/importer/CMakeLists.txt
index 1f079ef..a15d757 100644 (file)
--- a/gwenview/importer/CMakeLists.txt
+++ b/gwenview/importer/CMakeLists.txt
@@ -35,7 +35,7 @@ kde4_add_kcfg_files(importer_SRCS
 
 kde4_add_executable(gwenview_importer ${importer_SRCS})
 
-target_link_libraries(gwenview_importer
+target_link_libraries(gwenview_importer PRIVATE
     ${KDE4_KFILE_LIBS}
     gwenviewlib
     ${KDE4_KIO_LIBS}
@@ -43,8 +43,7 @@ target_link_libraries(gwenview_importer
     ${QT_QTCORE_LIBRARY}
     )
 
-target_link_libraries(gwenview_importer
-    LINK_INTERFACE_LIBRARIES
+target_link_libraries(gwenview_importer PUBLIC
     ${KDE4_KIO_LIBS}
     ${KDE4_SOLID_LIBS}
     ${QT_QTCORE_LIBRARY}

diff --git a/gwenview/tests/auto/CMakeLists.txt b/gwenview/tests/auto/CMakeLists.txt
index 7600591..9d6dbef 100644 (file)
--- a/gwenview/tests/auto/CMakeLists.txt
+++ b/gwenview/tests/auto/CMakeLists.txt
@@ -3,7 +3,6 @@ macro(gv_add_unit_test _test)
     qt4_automoc(${_src})
     kde4_add_unit_test(${_test} ${_src})
     target_link_libraries(${_test}
-        ${BALOO_LIBRARIES}
         ${KDE4_KIO_LIBS}
         ${KDE4_KDEUI_LIBS}
         ${KDE4_KDECORE_LIBS}

diff --git a/kdeplasma-addons/dataengines/comic/CMakeLists.txt b/kdeplasma-addons/dataengines/comic/CMakeLists.txt
index 8e382e6..bd1e531 100644 (file)
--- a/kdeplasma-addons/dataengines/comic/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/comic/CMakeLists.txt
@@ -17,8 +17,8 @@ set(comic_provider_core_SRCS
 )
 
 kde4_add_library( plasmacomicprovidercore SHARED ${comic_provider_core_SRCS} )
-target_link_libraries( plasmacomicprovidercore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KROSSCORE_LIBS} )
-target_link_libraries( plasmacomicprovidercore LINK_INTERFACE_LIBRARIES ${KDE4_KDECORE_LIBS})
+target_link_libraries( plasmacomicprovidercore PRIVATE ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KROSSCORE_LIBS} )
+target_link_libraries( plasmacomicprovidercore PUBLIC ${KDE4_KDECORE_LIBS})
 set_target_properties(
    plasmacomicprovidercore PROPERTIES VERSION 1.0.0 SOVERSION 1
 )

diff --git a/kmix/gui/mdwenum.h b/kmix/gui/mdwenum.h
index d0c3bf4..c5f59cd 100644 (file)
--- a/kmix/gui/mdwenum.h
+++ b/kmix/gui/mdwenum.h
@@ -67,7 +67,7 @@ public slots:
     virtual void showContextMenu(const QPoint& pos = QCursor::pos());
 
 signals:
-    virtual void guiVisibilityChange(MixDeviceWidget* source, bool enable);
+    void guiVisibilityChange(MixDeviceWidget* source, bool enable);
 
 private:
     void createWidgets();

diff --git a/libktorrent/src/CMakeLists.txt b/libktorrent/src/CMakeLists.txt
index df80701..45c3588 100644 (file)
--- a/libktorrent/src/CMakeLists.txt
+++ b/libktorrent/src/CMakeLists.txt
@@ -219,9 +219,9 @@ set(libktorrent_SRC
 # kde4_add_kcfg_files(libktorrent_SRC settings.kcfgc)
 kde4_add_library(ktorrent SHARED ${libktorrent_SRC})
 
-target_link_libraries(ktorrent ${KDE4_KIO_LIBS} ${GMP_LIBRARIES} ${KDE4_SOLID_LIBS} ${LIBGCRYPT_LIBRARIES} ${QCA2_LIBRARIES})
+target_link_libraries(ktorrent PRIVATE ${KDE4_KIO_LIBS} ${GMP_LIBRARIES} ${KDE4_SOLID_LIBS} ${LIBGCRYPT_LIBRARIES} ${QCA2_LIBRARIES})
+target_link_libraries(ktorrent PUBLIC ${KDE4_KDEUI_LIBS})
 set_target_properties(ktorrent PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-set_target_properties(ktorrent PROPERTIES LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
 install(TARGETS ktorrent  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 

diff --git a/okular/part.h b/okular/part.h
index b303f65..3c90335 100644 (file)
--- a/okular/part.h
+++ b/okular/part.h
@@ -81,7 +81,7 @@ enum EmbedMode
     UnknownEmbedMode,
     NativeShellMode,         // embedded in the native Okular' shell
     PrintPreviewMode,        // embedded to show the print preview of a document
-    KWebKitPartMode,           // embedded in KHTML
+    KWebKitPartMode,           // embedded in KWebKit
     ViewerWidgetMode         // the part acts as a widget that can display all kinds of documents
 };