Rename KIcon to enhance compatibility with KDE4

4 files changed, 19 insertions, 19 deletions

diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp
index a78a29e..55bb0be 100644
--- a/src/svnfrontend/fronthelpers/propertyitem.cpp
+++ b/src/svnfrontend/fronthelpers/propertyitem.cpp
@@ -40,7 +40,7 @@ bool PropertyListViewItem::different()const
 void PropertyListViewItem::deleteIt()
 {
     m_deleted = true;
-    setPixmap(0,TDEGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16));
+    setPixmap(0,TDEGlobal::iconLoader()->loadIcon("cancel",TDEIcon::Desktop,16));
 }
 
 void PropertyListViewItem::unDeleteIt()
diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp
index 68aa496..a6f131c 100644
--- a/src/svnfrontend/opencontextmenu.cpp
+++ b/src/svnfrontend/opencontextmenu.cpp
@@ -46,7 +46,7 @@ void OpenContextmenu::setup()
         nam.setNum( id );
 
         TQString actionName( (*it)->name().replace("&", "&&") );
-        act = new TDEAction( actionName, (*it)->pixmap( KIcon::Small ), 0,
+        act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
                                     TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) );
         act->plug(this);
         m_mapPopup[ id++ ] = *it;
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index b207ca1..4fd207e 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -241,23 +241,23 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
         if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) {
             m_bgColor = CONFLICT;
             if (overlay)
-                p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size);
+                p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",TDEIcon::Desktop,size);
         } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) {
             m_bgColor = MISSING;
         } else if (isLocked()||wrap->checkReposLockCache(fullName())) {
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",TDEIcon::Desktop,size);
             m_bgColor = LOCKED;
         } else if (Kdesvnsettings::check_needslock() && !isRemoteAdded() && wrap->isLockNeeded(this,svn::Revision::UNDEFINED) ) {
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnneedlock",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnneedlock",TDEIcon::Desktop,size);
             m_bgColor = NEEDLOCK;
         } else if (wrap->isUpdated(p_Item->m_Stat->path())) {
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",TDEIcon::Desktop,size);
             m_bgColor = UPDATES;
         } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) {
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",TDEIcon::Desktop,size);
             m_bgColor = DELETED;
         } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) {
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",TDEIcon::Desktop,size);
             m_bgColor = ADDED;
         } else if (isModified()) {
             mod = true;
@@ -265,19 +265,19 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
             svn::StatusEntries dlist;
             svn::StatusEntries::const_iterator it;
             if (isRemoteAdded() || wrap->checkUpdateCache(fullName())) {
-                if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size);
+                if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",TDEIcon::Desktop,size);
                 m_bgColor = UPDATES;
             } else if (wrap->checkConflictedCache(fullName())) {
                 m_bgColor = CONFLICT;
                 if (overlay)
-                    p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size);
+                    p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",TDEIcon::Desktop,size);
             } else {
                 mod = wrap->checkModifiedCache(fullName());
             }
         }
         if (mod) {
             m_bgColor = MODIFIED;
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnmodified",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnmodified",TDEIcon::Desktop,size);
         }
         if (!p2.isNull()) {
             TQPixmap p;
@@ -290,7 +290,7 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
             TQImage i1; i1 = p;
             TQImage i2;i2 = p2;
 
-            KIconEffect::overlay(i1,i2);
+            TDEIconEffect::overlay(i1,i2);
             p = i1;
             return p;
         }
@@ -308,29 +308,29 @@ TQPixmap SvnItem::getPixmap(int size,bool overlay)
      */
     if (svn::Url::isValid(p_Item->m_Stat->path())) {
         /* remote access */
-        p = p_Item->mimeType(isDir())->pixmap(KIcon::Desktop,size,KIcon::DefaultState);
+        p = p_Item->mimeType(isDir())->pixmap(TDEIcon::Desktop,size,TDEIcon::DefaultState);
         if (isLocked()) {
             m_bgColor = LOCKED;
             TQPixmap p2;
-            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size);
+            if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",TDEIcon::Desktop,size);
             if (!p2.isNull()) {
                 TQImage i1; i1 = p;
                 TQImage i2; i2 = p2;
-                KIconEffect::overlay(i1,i2);
+                TDEIconEffect::overlay(i1,i2);
                 p = i1;
             }
         }
     } else {
         if (isRemoteAdded()) {
             if (isDir()) {
-                p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("folder",KIcon::Desktop,size);
+                p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("folder",TDEIcon::Desktop,size);
             } else {
-                p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("unknown",KIcon::Desktop,size);
+                p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("unknown",TDEIcon::Desktop,size);
             }
         } else {
             KURL uri;
             uri.setPath(fullName());
-            p = KMimeType::pixmapForURL(uri,0,KIcon::Desktop,size);
+            p = KMimeType::pixmapForURL(uri,0,TDEIcon::Desktop,size);
             p = getPixmap(p,size,overlay);
         }
     }
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 6251385..6af7c8f 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -1555,7 +1555,7 @@ TQDragObject* tdesvnfilelist::dragObject()
     bool pixmap0Invalid = !m_pressedItem->pixmap(0) || m_pressedItem->pixmap(0)->isNull();
     if (( urls.count() > 1 ) || (pixmap0Invalid)) {
       int iconSize = Kdesvnsettings::listview_icon_size();;
-      iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small
+      iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( TDEIcon::Small ); // Default = small
       pixmap2 = DesktopIcon( "tdemultiple", iconSize );
       if ( pixmap2.isNull() ) {
           kdWarning() << "Could not find multiple pixmap" << endl;