Rename KIcon to enhance compatibility with KDE4

5 files changed, 18 insertions, 18 deletions

diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index b83c677f3..cda762eba 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -33,7 +33,7 @@
 
 #include "knotes/KNotesIface.h"
 
-class KIconView;
+class TDEIconView;
 class TQIconViewItem;
 class KNotesIconViewItem;
 class KNoteTip;
@@ -91,7 +91,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
     void printSelectedNotes();
 
   private:
-    KIconView *mNotesView;
+    TDEIconView *mNotesView;
     KNoteTip *mNoteTip;
     KNoteEditDlg *mNoteEditDlg;
 
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 8e11e4f15..ab386d1a9 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -57,19 +57,19 @@
 #include "knotes/knoteedit.h"
 
 
-class KNotesIconViewItem : public KIconViewItem
+class KNotesIconViewItem : public TDEIconViewItem
 {
   public:
-    KNotesIconViewItem( KIconView *parent, KCal::Journal *journal )
-      : KIconViewItem( parent ),
+    KNotesIconViewItem( TDEIconView *parent, KCal::Journal *journal )
+      : TDEIconViewItem( parent ),
         mJournal( journal )
     {
       setRenameEnabled( true );
 
-      KIconEffect effect;
+      TDEIconEffect effect;
       TQColor color( journal->customProperty( "KNotes", "BgColor" ) );
-      TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", KIcon::Desktop );
-      icon = effect.apply( icon, KIconEffect::Colorize, 1, color, false );
+      TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "knotes", TDEIcon::Desktop );
+      icon = effect.apply( icon, TDEIconEffect::Colorize, 1, color, false );
       setPixmap( icon );
       setText( journal->summary() );
     }
@@ -81,7 +81,7 @@ class KNotesIconViewItem : public KIconViewItem
 
     virtual void setText( const TQString& text )
     {
-      KIconViewItem::setText( text );
+      TDEIconViewItem::setText( text );
       mJournal->setSummary( text );
     }
 
@@ -90,7 +90,7 @@ class KNotesIconViewItem : public KIconViewItem
 };
 
 
-class KNotesIconView : public KIconView
+class KNotesIconView : public TDEIconView
 {
   protected:
     TQDragObject* dragObject()
@@ -101,7 +101,7 @@ class KNotesIconView : public KIconView
           selectedItems.append( static_cast<KNotesIconViewItem *>( it ) );
       }
       if ( selectedItems.count() != 1 )
-        return KIconView::dragObject();
+        return TDEIconView::dragObject();
 
       KCal::CalendarLocal cal( KPimPrefs::timezone() );
       KCal::Incidence *i = selectedItems.first()->journal()->clone();
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 0c6435341..054c0f91e 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -40,7 +40,7 @@
 #include "knotes_part_p.h"
 
 
-KNoteTip::KNoteTip( KIconView *parent )
+KNoteTip::KNoteTip( TDEIconView *parent )
   : TQFrame( 0, 0, WX11BypassWM |   // this will make Seli happy >:-P
             WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ),
     mFilter( false ),
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index 221720224..9a4e0fcc5 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -35,13 +35,13 @@
 #include <tqframe.h>
 
 class TQTextEdit;
-class KIconView;
+class TDEIconView;
 class KNotesIconViewItem;
 
 class KNoteTip : public TQFrame
 {
   public:
-    KNoteTip( KIconView *parent );
+    KNoteTip( TDEIconView *parent );
     ~KNoteTip();
 
     void setNote( KNotesIconViewItem *item );
@@ -59,7 +59,7 @@ class KNoteTip : public TQFrame
   private:
     bool mFilter;
 
-    KIconView *mView;
+    TDEIconView *mView;
     KNotesIconViewItem *mNoteIVI;
 
     TQTextEdit *mPreview;
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index dd5c78ebe..c0a92617c 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -51,7 +51,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
   TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kontact_notes",
-                   KIcon::Desktop, KIcon::SizeMedium );
+                   TDEIcon::Desktop, TDEIcon::SizeMedium );
   TQWidget* header = createHeader( this, icon, i18n( "Notes" ) );
   mainLayout->addWidget( header );
 
@@ -80,10 +80,10 @@ void KNotesSummaryWidget::updateView()
     label->deleteLater();
   mLabels.clear();
 
-  KIconLoader loader( "knotes" );
+  TDEIconLoader loader( "knotes" );
 
   int counter = 0;
-  TQPixmap pm = loader.loadIcon( "knotes", KIcon::Small );
+  TQPixmap pm = loader.loadIcon( "knotes", TDEIcon::Small );
 
   KCal::Journal::List::Iterator it;
   if ( mNotes.count() ) {