use blitz instead of deprecated kdefx, remove kdefx headers where unused

svn path=/trunk/KDE/kdebase/apps/; revision=717537

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4583ca2974482caa047a1f550073bef50fd5bb2d..1c3c41cd9306b619f9ed52c5c5d6f2a12f543394 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory( pics )
 add_subdirectory( servicemenus )
 add_subdirectory( tests )
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${BLITZ_INCLUDES} )
 
 ########### next target ###############
 
@@ -39,7 +39,7 @@ macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
 
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq)
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES})
 if (Nepomuk_FOUND)
   target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES})
 endif (Nepomuk_FOUND)

diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp
index 4bb408babffaf54add1d0b7999f91a3cc6a3401f..5012369ce0ecb7edb0d2e053a93d83680bb4399f 100644 (file)
--- a/src/dolphincategorydrawer.cpp
+++ b/src/dolphincategorydrawer.cpp
@@ -26,7 +26,7 @@
 
 #include <kiconloader.h>
 #include <kcategorizedsortfilterproxymodel.h>
-#include <kpixmapeffect.h>
+#include <qimageblitz.h>
 #include <kuser.h>
 
 #include <config-nepomuk.h>
@@ -218,7 +218,9 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
             QPixmap smallPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::NoGroup, iconSize / 2);
             QPixmap disabledPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::Small);
 
-            KPixmapEffect::toGray(disabledPixmap, false);
+            QImage img = disabledPixmap.toImage();
+            Blitz::grayscale(img);
+            disabledPixmap = QPixmap::fromImage(img);
 
             int rating = category.toInt();
 

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 03bdb16b43d5042b058d92765765c7adfb66129b..ccf7d8e1cfe9b1916aa812cb266793632098f232 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -40,7 +40,6 @@
 #include <kuser.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
-#include <kpixmapeffect.h>
 
 #include <QList>
 #include <QSortFilterProxyModel>