summaryrefslogtreecommitdiffstats
path: root/kig
diff options
context:
space:
mode:
Diffstat (limited to 'kig')
-rw-r--r--kig/filters/exporter.cc4
-rw-r--r--kig/kig/kig_part.cpp6
-rw-r--r--kig/misc/guiaction.cc2
-rw-r--r--kig/modes/edittypebase.ui2
-rw-r--r--kig/modes/label.cc2
-rw-r--r--kig/modes/popup.cc18
-rw-r--r--kig/modes/typesdialog.cpp10
-rw-r--r--kig/modes/typesdialog.h2
-rw-r--r--kig/scripting/script_mode.cc4
9 files changed, 25 insertions, 25 deletions
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 06babdfa..8b3799d0 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -77,8 +77,8 @@ ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
TQString iconstr = exp->menuIcon();
if ( iconstr.isEmpty() )
return;
- KIconLoader* l = doc->instance()->iconLoader();
- TQPixmap icon = l->loadIcon( iconstr, KIcon::Small, 16, KIcon::DefaultState, 0L, true );
+ TDEIconLoader* l = doc->instance()->iconLoader();
+ TQPixmap icon = l->loadIcon( iconstr, TDEIcon::Small, 16, TDEIcon::DefaultState, 0L, true );
if ( !icon.isNull() )
setIconSet( TQIconSet( icon ) );
}
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index b62d4685..022c50e0 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -224,7 +224,7 @@ void KigPart::setupActions()
"edit_invert_selection" );
// we need icons...
- KIconLoader* l = instance()->iconLoader();
+ TDEIconLoader* l = instance()->iconLoader();
TQPixmap tmp;
aDeleteObjects = new TDEAction(
@@ -271,7 +271,7 @@ void KigPart::setupActions()
a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ),
actionCollection() );
// grr.. why isn't there an icon for this..
- a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", KIcon::Toolbar ) ) );
+ a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) );
a->setToolTip( i18n( "Recenter the screen on the document" ) );
a->setWhatsThis( i18n( "Recenter the screen on the document" ) );
@@ -283,7 +283,7 @@ void KigPart::setupActions()
#ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
#else
- tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
+ tmp = l->loadIcon( "window_fullscreen", TDEIcon::Toolbar );
a = new TDEAction(
i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F,
m_widget, TQT_SLOT( toggleFullScreen() ),
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index a4fdb0c9..831a4b64 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -84,7 +84,7 @@ KigGUIAction::KigGUIAction( GUIAction* act,
TQObject* parent )
: TDEAction( act->descriptiveName(),
doc.instance()->iconLoader()->loadIcon(
- act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
+ act->iconFileName(), TDEIcon::Toolbar, 0, TDEIcon::DefaultState, 0L, true ),
act->shortcut(),
0, 0, // no slot connection
parent, act->actionName() ),
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e0af9850..8f9365c1 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -131,7 +131,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KIconButton">
+ <widget class="TDEIconButton">
<property name="name">
<cstring>typeIcon</cstring>
</property>
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index f8c82dfa..67509396 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -143,7 +143,7 @@ void TextLabelModeBase::leftReleased( TQMouseEvent* e, KigWidget* v )
int t;
if ( iconfile && *iconfile )
{
- TQPixmap pix = mdoc.instance()->iconLoader()->loadIcon( iconfile, KIcon::User );
+ TQPixmap pix = mdoc.instance()->iconLoader()->loadIcon( iconfile, TDEIcon::User );
t = p->insertItem( TQIconSet( pix ), s, i + 1 );
}
else
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++;
}
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index 917a46fc..82b280fa 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -68,10 +68,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
buttonOk->setGuiItem( KStdGuiItem::ok() );
buttonCancel->setGuiItem( KStdGuiItem::cancel() );
il = part.instance()->iconLoader();
- buttonEdit->setIconSet( TQIconSet( il->loadIcon( "edit", KIcon::Small ) ) );
- buttonRemove->setIconSet( TQIconSet( il->loadIcon( "editdelete", KIcon::Small ) ) );
- buttonExport->setIconSet( TQIconSet( il->loadIcon( "fileexport", KIcon::Small ) ) );
- buttonImport->setIconSet( TQIconSet( il->loadIcon( "fileimport", KIcon::Small ) ) );
+ buttonEdit->setIconSet( TQIconSet( il->loadIcon( "edit", TDEIcon::Small ) ) );
+ buttonRemove->setIconSet( TQIconSet( il->loadIcon( "editdelete", TDEIcon::Small ) ) );
+ buttonExport->setIconSet( TQIconSet( il->loadIcon( "fileexport", TDEIcon::Small ) ) );
+ buttonImport->setIconSet( TQIconSet( il->loadIcon( "fileimport", TDEIcon::Small ) ) );
typeList->setColumnWidth( 0, 22 );
typeList->setColumnWidth( 1, 140 );
@@ -96,7 +96,7 @@ TQListViewItem* TypesDialog::newListItem( Macro* m )
TQCString ifn = m->action->iconFileName();
if ( !ifn.isNull() )
{
- TQPixmap p = il->loadIcon( ifn, KIcon::Small );
+ TQPixmap p = il->loadIcon( ifn, TDEIcon::Small );
e->setPixmap( 0, p );
}
return e;
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index 6e06bb79..636999c5 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -43,7 +43,7 @@ class TypesDialog : public TypesDialogBase
// necessary because some MacroList functions need it..
KigPart& mpart;
- const KIconLoader* il;
+ const TDEIconLoader* il;
TQPopupMenu* popup;
public:
TypesDialog( TQWidget* parent, KigPart& );
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index d22fa40c..380189e6 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -239,8 +239,8 @@ void ScriptModeBase::setScriptType( ScriptType::Type type )
mwizard->setType( mtype );
if ( mtype != ScriptType::Unknown )
{
- KIconLoader* il = mpart.instance()->iconLoader();
- mwizard->setIcon( il->loadIcon( ScriptType::icon( mtype ), KIcon::Small ) );
+ TDEIconLoader* il = mpart.instance()->iconLoader();
+ mwizard->setIcon( il->loadIcon( ScriptType::icon( mtype ), TDEIcon::Small ) );
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-03 15:50:11 +0000