diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:15:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:15:51 -0600 |
| commit | 8cb8ba0f957e8a164cdcfbc2685b14d8d0a5c9a5 (patch) | |
| tree | 896beb3aed9d9d27eb560459a9ab05d1230c018a /kig/modes/popup.cc | |
| parent | c44bd981877cabab2b021987eb29ef00fbba9e82 (diff) | |
| download | tdeedu-8cb8ba0f957e8a164cdcfbc2685b14d8d0a5c9a5.tar.gz tdeedu-8cb8ba0f957e8a164cdcfbc2685b14d8d0a5c9a5.zip | |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'kig/modes/popup.cc')
| -rw-r--r-- | kig/modes/popup.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 042e379a..5c2528a6 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -306,8 +306,8 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, insertItem( menunames[i], mmenus[i], i, index++ ); else { - KIconLoader* l = part.instance()->iconLoader(); - TQPixmap icon = l->loadIcon( menuicons[i], KIcon::Small, 22, KIcon::DefaultState, 0L, true ); + TDEIconLoader* l = part.instance()->iconLoader(); + TQPixmap icon = l->loadIcon( menuicons[i], TDEIcon::Small, 22, TDEIcon::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 ) { - KIconLoader* l = popup.part().instance()->iconLoader(); + TDEIconLoader* 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", KIcon::Toolbar ); + TQPixmap p = l->loadIcon( "move", TDEIcon::Toolbar ); popup.addAction( menu, p, i18n( "&Move" ), nextfree++ ); - p = l->loadIcon( "editdelete", KIcon::Toolbar ); + p = l->loadIcon( "editdelete", TDEIcon::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, KIcon::DefaultState, 0L, true ); + TQPixmap icon = popup.part().instance()->iconLoader()->loadIcon( iconfile, TDEIcon::Toolbar, 22, TDEIcon::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, KIcon::DefaultState, 0L, true ); + TQPixmap pix = popup.part().instance()->iconLoader()->loadIcon( iconfile, TDEIcon::Toolbar, 22, TDEIcon::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 ) { - KIconLoader* l = popup.part().instance()->iconLoader(); - TQPixmap p = l->loadIcon( ScriptType::icon( ScriptType::Python ), KIcon::Toolbar, 22, KIcon::DefaultState, 0L, true ); + TDEIconLoader* l = popup.part().instance()->iconLoader(); + TQPixmap p = l->loadIcon( ScriptType::icon( ScriptType::Python ), TDEIcon::Toolbar, 22, TDEIcon::DefaultState, 0L, true ); popup.addAction( menu, p, i18n( "Python Script" ), nextfree++ ); mns++; } |