Port to new kdelibs snapshot. Most major changes are in konqueror due to
its reasonably heavy use of custom actions. My kdelibs was a day old when i compiled, so if there is non-action related porting still to do... it's probably still not done... will check svn path=/trunk/KDE/kdebase/workspace/; revision=521386
This commit is contained in:
parent
5d3cc2b311
commit
023fa86718
3 changed files with 4 additions and 4 deletions
|
@ -1055,11 +1055,11 @@ static void redraw_pixmaps()
|
|||
for (i = 0; i < P_NUM_BUTTON_TYPES; i++) {
|
||||
int offset = i * NumStates;
|
||||
hilighted = ie.apply(*pixmap[offset + Norm],
|
||||
KIcon::Small, KIcon::ActiveState);
|
||||
K3Icon::Small, K3Icon::ActiveState);
|
||||
*pixmap[offset + Hover] = hilighted;
|
||||
|
||||
hilighted = ie.apply(*pixmap[offset + INorm],
|
||||
KIcon::Small, KIcon::ActiveState);
|
||||
K3Icon::Small, K3Icon::ActiveState);
|
||||
*pixmap[offset + IHover] = hilighted;
|
||||
}
|
||||
|
||||
|
|
|
@ -326,7 +326,7 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
|
|||
|
||||
QIcon KDecorationPreviewBridge::icon() const
|
||||
{
|
||||
return QIcon( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
|
||||
return QIcon( KGlobal::iconLoader()->loadIcon( "xapp", K3Icon::NoGroup, 32 ));
|
||||
}
|
||||
|
||||
QString KDecorationPreviewBridge::caption() const
|
||||
|
|
|
@ -279,7 +279,7 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
|
|||
|
||||
QIcon KDecorationPreviewBridge::icon() const
|
||||
{
|
||||
return QIcon( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
|
||||
return QIcon( KGlobal::iconLoader()->loadIcon( "xapp", K3Icon::NoGroup, 32 ));
|
||||
}
|
||||
|
||||
QString KDecorationPreviewBridge::caption() const
|
||||
|
|
Loading…
Reference in a new issue