Rename KIcon to enhance compatibility with KDE4

konversation/src/channel.cpp

@@ -232,7 +232,7 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
     awayLabel->hide();
     blowfishLabel = new TQLabel(commandLineBox);
     blowfishLabel->hide();
-    blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
+    blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Toolbar));
     channelInput = new IRCInput(commandLineBox);
 
     getTextView()->installEventFilter(channelInput);

konversation/src/dcctransferpanel.cpp

@@ -110,7 +110,7 @@ void DccTransferPanel::initGUI()
     buttonsBox->setSpacing(spacing());
 
     // convenience, undeffed below again to avoid name clashes
-    #define icon(s) TDEGlobal::iconLoader()->loadIconSet( s, KIcon::Small )
+    #define icon(s) TDEGlobal::iconLoader()->loadIconSet( s, TDEIcon::Small )
 
     m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc");
     m_buttonAbort  = new TQPushButton(icon("stop"),        i18n("Abort"),  buttonsBox, "abort_dcc");

konversation/src/dcctransferpanelitem.cpp

@@ -270,9 +270,9 @@ TQString DccTransferPanelItem::getTypeText() const
 TQPixmap DccTransferPanelItem::getTypeIcon() const
 {
     if ( m_transfer->getType() == DccTransfer::Send )
-        return TDEGlobal::iconLoader()->loadIcon( "up", KIcon::Small );
+        return TDEGlobal::iconLoader()->loadIcon( "up", TDEIcon::Small );
     else
-        return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
+        return TDEGlobal::iconLoader()->loadIcon( "down", TDEIcon::Small );
 }
 
 TQPixmap DccTransferPanelItem::getStatusIcon() const
@@ -301,7 +301,7 @@ TQPixmap DccTransferPanelItem::getStatusIcon() const
         default:
 	    break;
     }
-    return TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Small );
+    return TDEGlobal::iconLoader()->loadIcon( icon, TDEIcon::Small );
 }
 
 TQString DccTransferPanelItem::getStatusText() const

konversation/src/dcctransferrecv.cpp

@@ -83,7 +83,7 @@ TQString DccTransferRecv::getTypeText() const
 
 TQPixmap DccTransferRecv::getTypeIcon() const
 {
-    return TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small );
+    return TDEGlobal::iconLoader()->loadIcon( "down", TDEIcon::Small );
 }
 
 void DccTransferRecv::cleanUp()

konversation/src/images.cpp

@@ -31,8 +31,8 @@ Images::Images()
     initializeNickIcons();
     initializeKimifaceIcons();
 
-    m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
-    m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
+    m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small);
+    m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false);
 }
 
 Images::~Images()
@@ -73,9 +73,9 @@ void Images::initializeLeds()
 
 void Images::initializeKimifaceIcons()
 {
-    tdeimproxyAway = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyaway",KIcon::Small);
-    tdeimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyonline",KIcon::Small);
-    tdeimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyoffline",KIcon::Small);
+    tdeimproxyAway = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyaway",TDEIcon::Small);
+    tdeimproxyOnline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyonline",TDEIcon::Small);
+    tdeimproxyOffline = TDEGlobal::iconLoader()->loadIconSet("tdeimproxyoffline",TDEIcon::Small);
 }
 
 // NickIcons
@@ -137,8 +137,8 @@ void Images::initializeNickIcons()
 
 void Images::updateIcons()
 {
-    m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",KIcon::Small);
-    m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",KIcon::Small).pixmap(TQIconSet::Small, false);
+    m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small);
+    m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false);
 }
 
 TQIconSet Images::getLed(TQColor col,bool state)

konversation/src/ircviewbox.cpp

@@ -21,8 +21,8 @@
 
 static TQPixmap getIcon(const TQString& name)
 {
-    KIconLoader* iconLoader = kapp->iconLoader();
-    return iconLoader->loadIcon(name, KIcon::Toolbar, 16);
+    TDEIconLoader* iconLoader = kapp->iconLoader();
+    return iconLoader->loadIcon(name, TDEIcon::Toolbar, 16);
 }
 
 IRCViewBox::IRCViewBox(TQWidget* parent, Server* newServer)

konversation/src/nicksonline.cpp

@@ -59,7 +59,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
     m_whoisRequested = true;
 
     m_nickListView->addColumn(i18n("Network/Nickname/Channel"));
-    m_kabcIconSet = TDEGlobal::iconLoader()->loadIconSet("kaddressbook",KIcon::Small);
+    m_kabcIconSet = TDEGlobal::iconLoader()->loadIconSet("kaddressbook",TDEIcon::Small);
     m_nickListView->addColumn(i18n("Additional Information"));
     m_nickListView->setFullWidth(true);
     m_nickListView->setRootIsDecorated(true);

konversation/src/query.cpp

@@ -102,7 +102,7 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
     awayLabel->hide();
     blowfishLabel = new TQLabel(inputBox);
     blowfishLabel->hide();
-    blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar));
+    blowfishLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Toolbar));
     queryInput=new IRCInput(inputBox);
 
     getTextView()->installEventFilter(queryInput);

konversation/src/queuetuner.cpp

@@ -35,7 +35,7 @@ QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)
 : QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"),
     m_vis(Preferences::self()->showQueueTunerItem()->value())
 {
-    m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, 16));
+    m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, 16));
     connect(m_closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
     connect(container, TQT_SIGNAL(frontServerChanging(Server*)), TQT_SLOT(setServer(Server*)));
     connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerFired()));

konversation/src/searchbar.cpp

@@ -45,10 +45,10 @@ SearchBar::SearchBar(TQWidget* parent)
     m_fromCursor = false;
 
     setFocusProxy(m_searchEdit);
-    KIconLoader* iconLoader = kapp->iconLoader();
-    m_closeButton->setIconSet(iconLoader->loadIconSet("fileclose", KIcon::Toolbar, 16));
-    m_findNextButton->setIconSet(iconLoader->loadIconSet("up", KIcon::Toolbar, 16));
-    m_findPreviousButton->setIconSet(iconLoader->loadIconSet("down", KIcon::Toolbar, 16));
+    TDEIconLoader* iconLoader = kapp->iconLoader();
+    m_closeButton->setIconSet(iconLoader->loadIconSet("fileclose", TDEIcon::Toolbar, 16));
+    m_findNextButton->setIconSet(iconLoader->loadIconSet("up", TDEIcon::Toolbar, 16));
+    m_findPreviousButton->setIconSet(iconLoader->loadIconSet("down", TDEIcon::Toolbar, 16));
     m_statusPixLabel->hide();
     m_statusTextLabel->hide();
 

konversation/src/viewcontainer.cpp

@@ -155,7 +155,7 @@ void ViewContainer::setupTabWidget()
     m_vbox->hide();    //m_tabWidget->hide();
 
     KPushButton* closeBtn = new KPushButton(m_tabWidget);
-    closeBtn->setPixmap(TDEGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small));
+    closeBtn->setPixmap(TDEGlobal::iconLoader()->loadIcon("tab_remove", TDEIcon::Small));
     closeBtn->resize(22, 22);
     closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     m_tabWidget->setCornerWidget(closeBtn);