@ -306,8 +306,8 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
insertItem ( menunames [ i ] , mmenus [ i ] , i , index + + ) ;
else
{
K IconLoader* l = part . instance ( ) - > iconLoader ( ) ;
TQPixmap icon = l - > loadIcon ( menuicons [ i ] , KIcon: : Small , 22 , K Icon: : DefaultState , 0L , true ) ;
TDE IconLoader* l = part . instance ( ) - > iconLoader ( ) ;
TQPixmap icon = l - > loadIcon ( menuicons [ i ] , TDEIcon: : Small , 22 , TDE Icon: : DefaultState , 0L , true ) ;
insertItem ( TQIconSet ( icon ) , menunames [ i ] , mmenus [ i ] , i , index + + ) ;
}
} ;
@ -375,7 +375,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
{
if ( menu = = NormalModePopupObjects : : ToplevelMenu )
{
K IconLoader* l = popup . part ( ) . instance ( ) - > iconLoader ( ) ;
TDE IconLoader* l = popup . part ( ) . instance ( ) - > iconLoader ( ) ;
std : : vector < ObjectHolder * > os = popup . objects ( ) ;
/*
@ -397,9 +397,9 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
popup . addAction ( menu , i18n ( " &Show " ) , nextfree + 1 ) ;
}
nextfree + = 2 ;
TQPixmap p = l - > loadIcon ( " move " , K Icon: : Toolbar ) ;
TQPixmap p = l - > loadIcon ( " move " , TDE Icon: : Toolbar ) ;
popup . addAction ( menu , p , i18n ( " &Move " ) , nextfree + + ) ;
p = l - > loadIcon ( " editdelete " , K Icon: : Toolbar ) ;
p = l - > loadIcon ( " editdelete " , TDE Icon: : Toolbar ) ;
popup . addAction ( menu , p , i18n ( " &Delete " ) , nextfree + + ) ;
}
else if ( menu = = NormalModePopupObjects : : SetColorMenu )
@ -756,7 +756,7 @@ void ObjectConstructorActionsProvider::fillUpMenu( NormalModePopupObjects& popup
TQCString iconfile = ( * i ) - > iconFileName ( ) ;
if ( ! iconfile . isEmpty ( ) & & ! iconfile . isNull ( ) )
{
TQPixmap icon = popup . part ( ) . instance ( ) - > iconLoader ( ) - > loadIcon ( iconfile , KIcon: : Toolbar , 22 , K Icon: : DefaultState , 0L , true ) ;
TQPixmap icon = popup . part ( ) . instance ( ) - > iconLoader ( ) - > loadIcon ( iconfile , TDEIcon: : Toolbar , 22 , TDE Icon: : DefaultState , 0L , true ) ;
popup . addAction ( menu , icon , ( * i ) - > descriptiveName ( ) , nextfree + + ) ;
}
else
@ -881,7 +881,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup,
{
if ( iconfile & & * iconfile )
{
TQPixmap pix = popup . part ( ) . instance ( ) - > iconLoader ( ) - > loadIcon ( iconfile , KIcon: : Toolbar , 22 , K Icon: : DefaultState , 0L , true ) ;
TQPixmap pix = popup . part ( ) . instance ( ) - > iconLoader ( ) - > loadIcon ( iconfile , TDEIcon: : Toolbar , 22 , TDE Icon: : DefaultState , 0L , true ) ;
popup . addAction ( menu , pix , i18n ( o - > imp ( ) - > properties ( ) [ i ] ) , nextfree + + ) ;
}
else
@ -1052,8 +1052,8 @@ void ScriptActionsProvider::fillUpMenu( NormalModePopupObjects& popup, int menu,
{
if ( menu = = NormalModePopupObjects : : StartMenu )
{
K IconLoader* l = popup . part ( ) . instance ( ) - > iconLoader ( ) ;
TQPixmap p = l - > loadIcon ( ScriptType : : icon ( ScriptType : : Python ) , KIcon: : Toolbar , 22 , K Icon: : DefaultState , 0L , true ) ;
TDE IconLoader* l = popup . part ( ) . instance ( ) - > iconLoader ( ) ;
TQPixmap p = l - > loadIcon ( ScriptType : : icon ( ScriptType : : Python ) , TDEIcon: : Toolbar , 22 , TDE Icon: : DefaultState , 0L , true ) ;
popup . addAction ( menu , p , i18n ( " Python Script " ) , nextfree + + ) ;
mns + + ;
}