Rename KIcon to enhance compatibility with KDE4

7 files changed, 17 insertions, 17 deletions

diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index ca81d1b1..3e353484 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -51,19 +51,19 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
 {
 	TQVBox * page = addVBoxPage(
 					   i18n( "Interface" ), i18n( "Interface" ),
-					   BarIcon( "misc", KIcon::SizeMedium ) );
+					   BarIcon( "misc", TDEIcon::SizeMedium ) );
 
 	m_interfacePage = new VConfigInterfacePage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Misc" ), i18n( "Misc" ),
-			   BarIcon( "misc", KIcon::SizeMedium ) );
+			   BarIcon( "misc", TDEIcon::SizeMedium ) );
 
 	m_miscPage = new VConfigMiscPage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Grid" ), i18n( "Grid" ),
-			   BarIcon( "grid", KIcon::SizeMedium ) );
+			   BarIcon( "grid", TDEIcon::SizeMedium ) );
 
 	m_gridPage = new VConfigGridPage( parent, page );
 
@@ -71,7 +71,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
 
 	page = addVBoxPage(
 			   i18n( "Document" ), i18n( "Document Settings" ),
-			   BarIcon( "document", KIcon::SizeMedium ) );
+			   BarIcon( "document", TDEIcon::SizeMedium ) );
 
 	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 56857f04..6272cc2b 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -357,9 +357,9 @@ VObjectListViewItem::update()
 	// set thumb preview, lock and visible pixmaps
 	setPixmap( 0, preview );
 	TQString s = ( m_object->state() == VObject::normal_locked || m_object->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
-	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 	s = ( m_object->state() == VObject::hidden || m_object->state() == VObject::hidden_locked ) ? "14_layer_novisible" : "14_layer_visible";
-	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 }
 
 int 
@@ -414,9 +414,9 @@ VLayerListViewItem::update()
 	// set thumb preview, lock and visible pixmaps
 	setPixmap( 0, preview );
 	TQString s = ( m_layer->state() == VObject::normal_locked || m_layer->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
-	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 	s = ( m_layer->state() == VObject::normal || m_layer->state() == VObject::normal_locked ) ? "14_layer_visible" : "14_layer_novisible";
-	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 } // VLayerListViewItem::update
 
 void
@@ -1164,7 +1164,7 @@ VHistoryItem::init()
 	char buffer[70];
 	sprintf( buffer, "%064ld", ++g_lastKey );
 	m_key = buffer;
-	setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
+	setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), TDEIcon::Small ) ) );
 	setText( 0, m_command->name() );
 } // VHistoryITem::init
 
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index ff17fdfd..5bf60993 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -126,7 +126,7 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
 ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
 	: TQWidget( parent ), m_part( part )
 {
-	KIconLoader il;
+	TDEIconLoader il;
 
 	TQVBoxLayout* layout = new TQVBoxLayout( this );
 	layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc
index 342fd031..503b2e57 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cc
@@ -625,7 +625,7 @@ VKoPainter::applyPattern( ArtSVP *svp, bool fill )
 
 	VPattern pat = fill ? m_fill->pattern() : m_stroke->pattern();
 	if( !pat.isValid() ) {
-		pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -KIcon::SizeMedium ) ); }
+		pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -TDEIcon::SizeMedium ) ); }
 		if( !pat.isValid() ) {
 			pat = *(dynamic_cast<VPattern *>(KarbonFactory::rServer()->patterns().getFirst() )) ;}
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 50a81e15..13e037a1 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -116,8 +116,8 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 	VColor color( VColor::rgb );
 
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 
 	p.newPath();
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index 8f0c4fc3..d24e6956 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -130,8 +130,8 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 		gradient.setVector( KoPoint( 2 * ( width() / 3 ), height() / 3 ) );
 	}
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 	gp.setBrush( fill );
 	gp.fillPath();
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 7e9ecd75..d4ea8e75 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -104,8 +104,8 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	gradient.setFocalPoint( KoPoint( 2, 2 ) );
 	gradient.setVector( KoPoint( 2 + w, 2 ) );
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 	gp.setBrush( fill );
 	gp.drawRect( KoRect( 2, 2, w, gh ) );