From 44962b4ea082ecdcfd7ce0ac1a22376ffbac9d12 Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Mon, 2 Jul 2007 15:51:07 +0000 Subject: [PATCH] adapt to KPalette->KColorCollection rename and API cleanup svn path=/trunk/KDE/kdebase/apps/konsole/; revision=682401 --- src/ViewContainer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp index 1d101af1e..da900da2f 100644 --- a/src/ViewContainer.cpp +++ b/src/ViewContainer.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include // Konsole @@ -217,23 +217,23 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject* //Create a colour selection palette and fill it with a range of suitable colours QString paletteName; - QStringList availablePalettes = KPalette::getPaletteList(); + QStringList availablePalettes = KColorCollection::installedCollections(); if (availablePalettes.contains("40.colors")) paletteName = "40.colors"; - KPalette palette(paletteName); + KColorCollection palette(paletteName); //If the palette of colours was found, create a palette menu displaying those colors //which the user chooses from when they activate the "Select Tab Color" sub-menu. // //If the palette is empty, default back to the old behaviour where the user is shown //a color dialog when they click the "Select Tab Color" menu item. - if ( palette.nrColors() > 0 ) + if ( palette.count() > 0 ) { - _tabColorCells = new KColorCells(_tabWidget,palette.nrColors()/8,8); + _tabColorCells = new KColorCells(_tabWidget,palette.count()/8,8); - for (int i=0;isetColor(i,palette.color(i));