diff options
| author | Matthew Woehlke <[email protected]> | 2007-09-27 04:11:28 +0000 |
|---|---|---|
| committer | Matthew Woehlke <[email protected]> | 2007-09-27 04:11:28 +0000 |
| commit | 341c16eba689331c472455c61f08ff0f0261c49e (patch) | |
| tree | 450107e394216b7546e10600b4f99b278721d63a | |
| parent | 093efca22dfd247f06e2a669ad968300e71ef08d (diff) | |
use blitz instead of deprecated kdefx, remove kdefx headers where unused
svn path=/trunk/KDE/kdebase/apps/; revision=717537
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dolphincategorydrawer.cpp | 6 | ||||
| -rw-r--r-- | src/dolphinmodel.cpp | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4583ca297..1c3c41cd9 100644 --- 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 4bb408bab..5012369ce 100644 --- 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 03bdb16b4..ccf7d8e1c 100644 --- 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> |