From b1c5bea50ae48c54b476428a21dfe594916cb6ae Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:08:00 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- apps/ktorrent/fileselectdlg.cpp | 2 +- apps/ktorrent/groups/group.cpp | 2 +- apps/ktorrent/groups/groupview.cpp | 2 +- apps/ktorrent/groups/torrentdrag.cpp | 2 +- apps/ktorrent/ktorrent.cpp | 2 +- apps/ktorrent/ktorrentviewmenu.cpp | 22 +++++++++---------- apps/ktorrent/pref.cpp | 6 ++--- apps/ktorrent/queuedialog.cpp | 12 +++++----- libktorrent/interfaces/filetreediritem.cpp | 4 ++-- libktorrent/interfaces/filetreeitem.cpp | 2 +- libktorrent/pluginmanagerprefpage.cpp | 2 +- plugins/infowidget/fileview.cpp | 2 +- plugins/infowidget/infowidgetprefpage.cpp | 2 +- plugins/infowidget/peerview.cpp | 12 +++++----- plugins/infowidget/trackerview.cpp | 10 ++++----- plugins/ipfilter/ipblockingprefpage.cpp | 2 +- plugins/logviewer/logprefpage.cpp | 2 +- plugins/rssfeed/rssfeedplugin.cpp | 4 ++-- plugins/scanfolder/scanfolderprefpage.cpp | 2 +- plugins/scheduler/bwsprefpagewidget.cpp | 2 +- plugins/scheduler/schedulerprefpage.cpp | 2 +- plugins/search/searchplugin.cpp | 4 ++-- plugins/search/searchprefpage.cpp | 2 +- plugins/search/searchwidget.cpp | 10 ++++----- plugins/stats/StatsPluginPrefs.cc | 2 +- plugins/upnp/upnpplugin.cpp | 2 +- plugins/upnp/upnpprefpage.cpp | 2 +- plugins/webinterface/webinterfaceprefpage.cpp | 2 +- 28 files changed, 61 insertions(+), 61 deletions(-) diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp index 377cfd3..c483f94 100644 --- a/apps/ktorrent/fileselectdlg.cpp +++ b/apps/ktorrent/fileselectdlg.cpp @@ -252,7 +252,7 @@ void FileSelectDlg::setupSinglefileTorrent() single_root->setText(0,tc->getStats().torrent_name); single_root->setText(1,BytesToString(tc->getStats().total_bytes)); single_root->setText(2,i18n("Yes")); - single_root->setPixmap(0,KMimeType::findByPath(tc->getStats().torrent_name)->pixmap(KIcon::Small)); + single_root->setPixmap(0,KMimeType::findByPath(tc->getStats().torrent_name)->pixmap(TDEIcon::Small)); root = 0; updateSizeLabels(); m_select_all->setEnabled(false); diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp index 09de6db..31142df 100644 --- a/apps/ktorrent/groups/group.cpp +++ b/apps/ktorrent/groups/group.cpp @@ -42,7 +42,7 @@ namespace kt void Group::setIconByName(const TQString & in) { icon_name = in; - icon = TDEGlobal::iconLoader()->loadIcon(in,KIcon::Small); + icon = TDEGlobal::iconLoader()->loadIcon(in,TDEIcon::Small); } void Group::rename(const TQString & nn) diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp index dc1cc47..dd4204b 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/apps/ktorrent/groups/groupview.cpp @@ -105,7 +105,7 @@ namespace kt addGroup(gman->activeUploadsGroup(), active); custom_root = new TDEListViewItem(all,i18n("Custom Groups")); - custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); setOpen(custom_root,true); } diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp index 69aaf94..0860ab6 100644 --- a/apps/ktorrent/groups/torrentdrag.cpp +++ b/apps/ktorrent/groups/torrentdrag.cpp @@ -26,7 +26,7 @@ namespace kt TorrentDrag::TorrentDrag(TQWidget* src, const char *name) : TQStoredDrag("application/x-ktorrent-drag-object",src, name) { - setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",TDEIcon::Small)); } diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index dbdefbf..738ec2c 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -859,7 +859,7 @@ void KTorrent::addToolWidget(TQWidget* w,const TQString & icon,const TQString & if (!icon.isNull()) - w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,KIcon::Small)); + w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,TDEIcon::Small)); switch (dock) { diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp index 2b9578c..b31c310 100644 --- a/apps/ktorrent/ktorrentviewmenu.cpp +++ b/apps/ktorrent/ktorrentviewmenu.cpp @@ -31,32 +31,32 @@ using namespace kt; KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) : TDEPopupMenu ( parent, name ),view(parent) { - KIconLoader* iload = TDEGlobal::iconLoader(); + TDEIconLoader* iload = TDEGlobal::iconLoader(); stop_id = insertItem( - iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"), + iload->loadIconSet("ktstop",TDEIcon::Small),i18n("to stop", "Stop"), parent,TQT_SLOT(stopDownloads())); start_id = insertItem( - iload->loadIconSet("ktstart",KIcon::Small),i18n("to start", "Start"), + iload->loadIconSet("ktstart",TDEIcon::Small),i18n("to start", "Start"), parent,TQT_SLOT(startDownloads())); remove_id = insertItem( - iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent"), + iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent"), parent,TQT_SLOT(removeDownloads())); remove_all_id = insertItem( - iload->loadIconSet("ktremove",KIcon::Small),i18n("Remove Torrent and Data"), + iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent and Data"), parent,TQT_SLOT(removeDownloadsAndData())); queue_id = insertItem( - iload->loadIconSet("player_playlist",KIcon::Small),i18n("Enqueue/Dequeue"), + iload->loadIconSet("player_playlist",TDEIcon::Small),i18n("Enqueue/Dequeue"), parent,TQT_SLOT(queueSlot())); insertSeparator(); add_peer_id = insertItem( - iload->loadIconSet("add", KIcon::Small), i18n("Add Peers"), + iload->loadIconSet("add", TDEIcon::Small), i18n("Add Peers"), parent, TQT_SLOT(showAddPeersWidget())); peer_sources_menu = new TDEPopupMenu(this); @@ -69,19 +69,19 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) insertSeparator(); announce_id = insertItem( - iload->loadIconSet("apply",KIcon::Small),i18n("Manual Announce"), + iload->loadIconSet("apply",TDEIcon::Small),i18n("Manual Announce"), parent,TQT_SLOT(manualAnnounce())); preview_id = insertItem( - iload->loadIconSet("frame_image",KIcon::Small),i18n("Preview"), + iload->loadIconSet("frame_image",TDEIcon::Small),i18n("Preview"), parent, TQT_SLOT(previewFiles())); insertSeparator(); dirs_sub_menu = new TDEPopupMenu(this); dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu); - outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Data Directory"), + outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Data Directory"), parent, TQT_SLOT(openOutputDirectory())); - torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",KIcon::Small), i18n("Temporary Directory"), + torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Temporary Directory"), parent, TQT_SLOT(openTorXDirectory())); downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot())); diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp index e7461f0..12b8e31 100644 --- a/apps/ktorrent/pref.cpp +++ b/apps/ktorrent/pref.cpp @@ -144,7 +144,7 @@ void KTorrentPreferences::removePrefPage(kt::PrefPageInterface* pp) /////////////////////////////////////////////////////// -DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0) +DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", TDEIcon::NoGroup)), dp(0) {} DownloadPrefPage::~ DownloadPrefPage() @@ -214,7 +214,7 @@ void DownloadPrefPage::deleteWidget() ////////////////////////////////////// GeneralPrefPage::GeneralPrefPage() : kt::PrefPageInterface(i18n("General"), i18n("General Options"), - TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0) + TDEGlobal::iconLoader()->loadIcon("package_settings", TDEIcon::NoGroup)), gp(0) {} GeneralPrefPage::~GeneralPrefPage() @@ -409,7 +409,7 @@ void GeneralPrefPage::deleteWidget() AdvancedPrefPage::AdvancedPrefPage() : kt::PrefPageInterface(i18n("Advanced"), i18n("Advanced Options"), - TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0) + TDEGlobal::iconLoader()->loadIcon("package_settings", TDEIcon::NoGroup)), ap(0) {} AdvancedPrefPage::~AdvancedPrefPage() diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp index a828017..212c920 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/apps/ktorrent/queuedialog.cpp @@ -98,12 +98,12 @@ void QueueItem::paintCell(TQPainter* p,const TQColorGroup & cg,int column,int wi QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name) :QueueDlg(parent, name) { - KIconLoader* iload = TDEGlobal::iconLoader(); + TDEIconLoader* iload = TDEGlobal::iconLoader(); - m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", KIcon::Small)); - m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small)); + m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", TDEIcon::Small)); + m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", TDEIcon::Small)); - logo->setPixmap(iload->loadIcon("ktqueuemanager", KIcon::Desktop)); + logo->setPixmap(iload->loadIcon("ktqueuemanager", TDEIcon::Desktop)); connect(downloadList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(downloadList_currentChanged( TQListViewItem* ))); connect(seedList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(seedList_currentChanged( TQListViewItem* ))); @@ -114,8 +114,8 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam if(seedList->firstChild()) seedList->setCurrentItem(seedList->firstChild()); - btnMoveUp->setPixmap(iload->loadIcon("up", KIcon::Small)); - btnMoveDown->setPixmap(iload->loadIcon("down", KIcon::Small)); + btnMoveUp->setPixmap(iload->loadIcon("up", TDEIcon::Small)); + btnMoveDown->setPixmap(iload->loadIcon("down", TDEIcon::Small)); this->qman = qm; diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp index f1dbe43..0b37646 100644 --- a/libktorrent/interfaces/filetreediritem.cpp +++ b/libktorrent/interfaces/filetreediritem.cpp @@ -39,7 +39,7 @@ namespace kt { parent = 0; size = 0; - setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); @@ -53,7 +53,7 @@ namespace kt name(name),parent(parent) { size = 0; - setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); diff --git a/libktorrent/interfaces/filetreeitem.cpp b/libktorrent/interfaces/filetreeitem.cpp index 6431152..b864b72 100644 --- a/libktorrent/interfaces/filetreeitem.cpp +++ b/libktorrent/interfaces/filetreeitem.cpp @@ -102,7 +102,7 @@ namespace kt setText(0,name); setText(1,BytesToString(file.getSize())); updatePriorityText(); - setPixmap(0,KMimeType::findByPath(name)->pixmap(KIcon::Small)); + setPixmap(0,KMimeType::findByPath(name)->pixmap(TDEIcon::Small)); } void FileTreeItem::stateChange(bool on) diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp index 54f5aaa..497ea2e 100644 --- a/libktorrent/pluginmanagerprefpage.cpp +++ b/libktorrent/pluginmanagerprefpage.cpp @@ -60,7 +60,7 @@ namespace kt }; PluginManagerPrefPage::PluginManagerPrefPage(PluginManager* pman) - : PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),TDEGlobal::iconLoader()->loadIcon("ktplugins",KIcon::NoGroup)),pman(pman) + : PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),TDEGlobal::iconLoader()->loadIcon("ktplugins",TDEIcon::NoGroup)),pman(pman) { pmw = 0; } diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp index 7776ec7..1e4b87b 100644 --- a/plugins/infowidget/fileview.cpp +++ b/plugins/infowidget/fileview.cpp @@ -139,7 +139,7 @@ namespace kt s.torrent_name, BytesToString(s.total_bytes)); - item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(KIcon::Small)); + item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(TDEIcon::Small)); setEnabled(true); connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* ))); diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp index 2e94116..4ddd0dd 100644 --- a/plugins/infowidget/infowidgetprefpage.cpp +++ b/plugins/infowidget/infowidgetprefpage.cpp @@ -31,7 +31,7 @@ namespace kt { InfoWidgetPrefPage::InfoWidgetPrefPage(InfoWidgetPlugin* iw) - : PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),TDEGlobal::iconLoader()->loadIcon("ktinfowidget",KIcon::NoGroup)),iw(iw) + : PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),TDEGlobal::iconLoader()->loadIcon("ktinfowidget",TDEIcon::NoGroup)),iw(iw) { pref = 0; } diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp index 26628cd..4fccbc4 100644 --- a/plugins/infowidget/peerview.cpp +++ b/plugins/infowidget/peerview.cpp @@ -65,13 +65,13 @@ namespace kt { if (!yes_no_pix_loaded) { - KIconLoader* iload = TDEGlobal::iconLoader(); + TDEIconLoader* iload = TDEGlobal::iconLoader(); /* Prefer builtin flag images to the ones provided by KDE */ flagDB.addFlagSource("data", TQString("ktorrent/geoip/%1.png")); flagDB.addFlagSource("locale", TQString("l10n/%1/flag.png")); - yes_pix = iload->loadIcon("button_ok",KIcon::Small); - no_pix = iload->loadIcon("button_cancel",KIcon::Small); - lock_pix = iload->loadIcon("ktencrypted",KIcon::Small); + yes_pix = iload->loadIcon("button_ok",TDEIcon::Small); + no_pix = iload->loadIcon("button_cancel",TDEIcon::Small); + lock_pix = iload->loadIcon("ktencrypted",TDEIcon::Small); #ifdef USE_SYSTEM_GEOIP geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); geoip_db_exists = (geo_ip != NULL); @@ -246,8 +246,8 @@ namespace kt setShowSortIndicator(true); menu = new TDEPopupMenu(this); - kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", KIcon::NoGroup), i18n("to kick", "Kick peer")); - ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban peer")); + kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", TDEIcon::NoGroup), i18n("to kick", "Kick peer")); + ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup), i18n("to ban", "Ban peer")); connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp index 1e3d6e2..c689f26 100644 --- a/plugins/infowidget/trackerview.cpp +++ b/plugins/infowidget/trackerview.cpp @@ -46,11 +46,11 @@ namespace kt TrackerView::TrackerView(TQWidget *parent, const char *name) :TrackerViewBase(parent, name), tc(0) { - KIconLoader* iload = TDEGlobal::iconLoader(); - btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small)); - btnAdd->setIconSet(iload->loadIconSet("add", KIcon::Small)); - btnRemove->setIconSet(iload->loadIconSet("remove", KIcon::Small)); - btnRestore->setIconSet(iload->loadIconSet("undo", KIcon::Small)); + TDEIconLoader* iload = TDEGlobal::iconLoader(); + btnUpdate->setIconSet(iload->loadIconSet("apply", TDEIcon::Small)); + btnAdd->setIconSet(iload->loadIconSet("add", TDEIcon::Small)); + btnRemove->setIconSet(iload->loadIconSet("remove", TDEIcon::Small)); + btnRestore->setIconSet(iload->loadIconSet("undo", TDEIcon::Small)); TQPalette p = lblCurrent->palette(); p.setColor(TQPalette::Active,TQColorGroup::Base,p.color(TQPalette::Active,TQColorGroup::Background)); diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index 9bcbe3d..e9416ae 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -220,7 +220,7 @@ namespace kt //////////////////////////////////////////////////////////////////////////////////// IPBlockingPrefPage::IPBlockingPrefPage(CoreInterface* core, IPFilterPlugin* p) - : PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup)), m_core(core), m_plugin(p) + : PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup)), m_core(core), m_plugin(p) { widget = 0; } diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp index cd16e56..4a2ca9b 100644 --- a/plugins/logviewer/logprefpage.cpp +++ b/plugins/logviewer/logprefpage.cpp @@ -29,7 +29,7 @@ namespace kt LogPrefPage::LogPrefPage() : PrefPageInterface(i18n("LogViewer"), i18n("LogViewer Options"), - TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) + TDEGlobal::iconLoader()->loadIcon("toggle_log",TDEIcon::NoGroup)) { m_widget = 0; } diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp index 8025055..051c8e2 100644 --- a/plugins/rssfeed/rssfeedplugin.cpp +++ b/plugins/rssfeed/rssfeedplugin.cpp @@ -61,10 +61,10 @@ namespace kt void RssFeedPlugin::load() { //add the new tab to the gui - KIconLoader* iload = TDEGlobal::iconLoader(); + TDEIconLoader* iload = TDEGlobal::iconLoader(); m_rssFeedManager = new RssFeedManager(getCore()); getGUI()->addTabPage( - m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small), + m_rssFeedManager,iload->loadIconSet("player_playlist", TDEIcon::Small), i18n("RSS Feeds")); } diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp index 177cda5..b8dd406 100644 --- a/plugins/scanfolder/scanfolderprefpage.cpp +++ b/plugins/scanfolder/scanfolderprefpage.cpp @@ -32,7 +32,7 @@ namespace kt ScanFolderPrefPage::ScanFolderPrefPage(ScanFolderPlugin* plugin) : PrefPageInterface(i18n("ScanFolder"), i18n("ScanFolder Options"), - TDEGlobal::iconLoader()->loadIcon("view_sidetree",KIcon::NoGroup)), m_plugin(plugin) + TDEGlobal::iconLoader()->loadIcon("view_sidetree",TDEIcon::NoGroup)), m_plugin(plugin) {} diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp index f0e68e8..48d00e9 100644 --- a/plugins/scheduler/bwsprefpagewidget.cpp +++ b/plugins/scheduler/bwsprefpagewidget.cpp @@ -53,7 +53,7 @@ namespace kt lblStatus->clear(); - pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)); + pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",TDEIcon::NoGroup)); btnOk->setGuiItem(KStdGuiItem::ok()); btnCancel->setGuiItem(KStdGuiItem::cancel()); diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp index 9f561a4..f6219a8 100644 --- a/plugins/scheduler/schedulerprefpage.cpp +++ b/plugins/scheduler/schedulerprefpage.cpp @@ -32,7 +32,7 @@ namespace kt { SchedulerPrefPage::SchedulerPrefPage(SchedulerPlugin* plugin) - : PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)), m_plugin(plugin) + : PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), TDEGlobal::iconLoader()->loadIcon("clock",TDEIcon::NoGroup)), m_plugin(plugin) { widget = 0; } diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index bd4efca..d3172c6 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -113,10 +113,10 @@ namespace kt return; } - KIconLoader* iload = TDEGlobal::iconLoader(); + TDEIconLoader* iload = TDEGlobal::iconLoader(); SearchWidget* search = new SearchWidget(this); - getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this); + getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this); TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection()); copy_act->plug(search->rightClickMenu(),0); diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index cc39647..ba79b00 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -245,7 +245,7 @@ namespace kt SearchPrefPage::SearchPrefPage(SearchPlugin* plugin) : PrefPageInterface(i18n("a noun", "Search"), i18n("Search Engine Options"), - TDEGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin) + TDEGlobal::iconLoader()->loadIcon("viewmag",TDEIcon::NoGroup)), m_plugin(plugin) { widget = 0; } diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index ed5141e..f77af71 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -68,10 +68,10 @@ namespace kt right_click_menu->insertSeparator(); back_id = right_click_menu->insertItem( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() - ? "forward" : "back",KIcon::Small), + ? "forward" : "back",TDEIcon::Small), i18n("Back"),html_part,TQT_SLOT(back())); right_click_menu->insertItem( - TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small), + TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small), i18n("Reload"),html_part,TQT_SLOT(reload())); right_click_menu->setItemEnabled(back_id,false); @@ -84,12 +84,12 @@ namespace kt sbar->m_clear_button->setIconSet( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() - ? "clear_left" : "locationbar_erase",KIcon::Small)); + ? "clear_left" : "locationbar_erase",TDEIcon::Small)); sbar->m_back->setIconSet( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() - ? "forward" : "back", KIcon::Small)); + ? "forward" : "back", TDEIcon::Small)); sbar->m_reload->setIconSet( - TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small)); + TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small)); connect(html_part,TQT_SIGNAL(backAvailable(bool )), diff --git a/plugins/stats/StatsPluginPrefs.cc b/plugins/stats/StatsPluginPrefs.cc index 495e077..e9becd6 100644 --- a/plugins/stats/StatsPluginPrefs.cc +++ b/plugins/stats/StatsPluginPrefs.cc @@ -22,7 +22,7 @@ namespace kt { -StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), TDEGlobal::iconLoader()->loadIcon("ktimemon",KIcon::NoGroup)), pmUi(0) +StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), TDEGlobal::iconLoader()->loadIcon("ktimemon",TDEIcon::NoGroup)), pmUi(0) { } diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp index b2195d6..aa5773a 100644 --- a/plugins/upnp/upnpplugin.cpp +++ b/plugins/upnp/upnpplugin.cpp @@ -59,7 +59,7 @@ namespace kt void UPnPPlugin::load() { - //KIconLoader* iload = TDEGlobal::iconLoader(); + //TDEIconLoader* iload = TDEGlobal::iconLoader(); sock = new UPnPMCastSocket(); pref = new UPnPPrefPage(sock); this->getGUI()->addPrefPage(pref); diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp index 7e9e095..e360b3c 100644 --- a/plugins/upnp/upnpprefpage.cpp +++ b/plugins/upnp/upnpprefpage.cpp @@ -28,7 +28,7 @@ namespace kt { - UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),TDEGlobal::iconLoader()->loadIcon("ktupnp",KIcon::NoGroup)),sock(sock) + UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),TDEGlobal::iconLoader()->loadIcon("ktupnp",TDEIcon::NoGroup)),sock(sock) { widget = 0; } diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/plugins/webinterface/webinterfaceprefpage.cpp index 0821ab1..ecc7a62 100644 --- a/plugins/webinterface/webinterfaceprefpage.cpp +++ b/plugins/webinterface/webinterfaceprefpage.cpp @@ -25,7 +25,7 @@ namespace kt WebInterfacePrefPage::WebInterfacePrefPage(WebInterfacePlugin* plugin) : PrefPageInterface(i18n("WebInterface"), i18n("WebInterface Options"), - TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) + TDEGlobal::iconLoader()->loadIcon("toggle_log",TDEIcon::NoGroup)) { m_widget = 0; w_plugin=plugin;