Rename KIcon to enhance compatibility with KDE4

4 files changed, 13 insertions, 13 deletions

diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index f25b9c115..b7aff0a28 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -70,11 +70,11 @@
 #include <cassert>
 #include <cstdlib>
 
-class AttachmentListItem : public KIconViewItem
+class AttachmentListItem : public TDEIconViewItem
 {
   public:
     AttachmentListItem( KCal::Attachment*att, TQIconView *parent ) :
-        KIconViewItem( parent )
+        TDEIconViewItem( parent )
     {
       if ( att ) {
         mAttachment = new KCal::Attachment( *att );
@@ -132,7 +132,7 @@ class AttachmentListItem : public KIconViewItem
     static TQPixmap icon( KMimeType::Ptr mimeType, const TQString &uri )
     {
       TQString iconStr = mimeType->icon( uri, false );
-      return TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Small );
+      return TDEGlobal::iconLoader()->loadIcon( iconStr, TDEIcon::Small );
     }
     void readAttachment()
     {
@@ -314,11 +314,11 @@ void AttachmentEditDialog::urlSelected( const TQString &url )
 }
 
 AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
-  : KIconView( parent ),
+  : TDEIconView( parent ),
     mParent( parent )
 {
   setSelectionMode( TQIconView::Extended );
-  setMode( KIconView::Select );
+  setMode( TDEIconView::Select );
   setItemTextPos( TQIconView::Right );
   setArrangement( TQIconView::LeftToRight );
   setMaxItemWidth( TQMAX(maxItemWidth(), 250) );
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index 7d5b89d5a..b89dd0b33 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -149,7 +149,7 @@ class KOEditorAttachments : public TQWidget
 };
 
 
-class AttachmentIconView : public KIconView
+class AttachmentIconView : public TDEIconView
 {
   Q_OBJECT
   
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 14bae60c1..b2a3b402d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -88,9 +88,9 @@ int KOWhatsNextView::currentDateCount()
 
 void KOWhatsNextView::updateView()
 {
-  KIconLoader kil("tdepim");
+  TDEIconLoader kil("tdepim");
   TQString *ipath = new TQString();
-  kil.loadIcon("tdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath);
+  kil.loadIcon("tdepim",TDEIcon::NoGroup,32,TDEIcon::DefaultState,ipath);
 
   mText = "<table width=\"100%\">\n";
   mText += "<tr bgcolor=\"#3679AD\"><td><h1>";
@@ -117,7 +117,7 @@ void KOWhatsNextView::updateView()
 
   if (events.count() > 0) {
     mText += "<p></p>";
-    kil.loadIcon("appointment",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+    kil.loadIcon("appointment",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
     mText += "<h2><img src=\"";
     mText += *ipath;
     mText += "\">";
@@ -153,7 +153,7 @@ void KOWhatsNextView::updateView()
   mTodos.clear();
   Todo::List todos = calendar()->todos( TodoSortDueDate, SortDirectionAscending );
   if ( todos.count() > 0 ) {
-    kil.loadIcon("todo",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+    kil.loadIcon("todo",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
     mText += "<h2><img src=\"";
     mText += *ipath;
     mText += "\">";
@@ -192,7 +192,7 @@ void KOWhatsNextView::updateView()
       if (me->status()==Attendee::NeedsAction && me->RSVP()) {
         if (replies == 0) {
           mText += "<p></p>";
-          kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+          kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
           mText += "<h2><img src=\"";
           mText += *ipath;
           mText += "\">";
@@ -213,7 +213,7 @@ void KOWhatsNextView::updateView()
       if (me->status()==Attendee::NeedsAction && me->RSVP()) {
         if (replies == 0) {
           mText += "<p></p>";
-          kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,ipath);
+          kil.loadIcon("reply",TDEIcon::NoGroup,22,TDEIcon::DefaultState,ipath);
           mText += "<h2><img src=\"";
           mText += *ipath;
           mText += "\">";
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 09edb36c3..f5b91e781 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -117,7 +117,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri )
       // KaddressBook is not already running.
       // Pass it the UID of the contact via the command line while starting it - its neater.
       // We start it without its main interface
-      TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", KIcon::Small );
+      TQString iconPath = TDEGlobal::iconLoader()->iconPath( "go", TDEIcon::Small );
       TQString tmpStr = "kaddressbook --editor-only --uid ";
       tmpStr += TDEProcess::quote( uid );
       KRun::runCommand( tmpStr, "KAddressBook", iconPath );