From dca4b260f029db8fbb9a33bfb2b0a2aa9a28edf1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:08:40 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- src/common/gui/editlistbox.cpp | 4 ++-- src/common/gui/misc_gui.cpp | 4 ++-- src/common/gui/purl_gui.cpp | 6 +++--- src/devices/pic/gui/pic_register_view.cpp | 6 +++--- src/libgui/config_center.cpp | 8 ++++---- src/libgui/device_gui.cpp | 4 ++-- src/libgui/editor_manager.cpp | 18 +++++++++--------- src/libgui/likeback.cpp | 28 ++++++++++++++-------------- src/libgui/log_view.cpp | 6 +++--- src/libgui/new_dialogs.cpp | 4 ++-- src/libgui/project_manager_ui.cpp | 8 ++++---- src/libgui/project_wizard.cpp | 4 ++-- src/libgui/toplevel.cpp | 12 ++++++------ src/libgui/toplevel_ui.cpp | 4 ++-- src/libgui/watch_view.cpp | 22 +++++++++++----------- src/progs/gui/debug_config_center.cpp | 4 ++-- src/progs/gui/prog_config_center.cpp | 16 ++++++++-------- src/progs/gui/prog_group_ui.cpp | 6 +++--- 18 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index 8601399..432aacd 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -61,8 +61,8 @@ void EditListBox::init(uint nbColumns, TQWidget *view) TQHBoxLayout *hbox = new TQHBoxLayout(KDialog::spacingHint()); grid->addMultiCellLayout(hbox, row,row, 0,1); if (m_lineEdit) { - KIconLoader loader; - TQIconSet iconset = loader.loadIcon("locationbar_erase", KIcon::Toolbar); + TDEIconLoader loader; + TQIconSet iconset = loader.loadIcon("locationbar_erase", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), this); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(clearEdit())); hbox->addWidget(button); diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 607156e..9808492 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -145,8 +145,8 @@ void PopupButton::appendAction(const TQString &label, const TQString &icon, int PopupButton::appendItem(const TQString &label, const TQString &icon, int id) { - KIconLoader loader; - TQPixmap pixmap = loader.loadIcon(icon, KIcon::Small); + TDEIconLoader loader; + TQPixmap pixmap = loader.loadIcon(icon, TDEIcon::Small); return appendItem(label, pixmap, id); } diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index 614ef76..3f5a742 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -61,7 +61,7 @@ PURL::Directory PURL::getExistingDirectory(const TQString &startDir, TQWidget *w TQPixmap PURL::icon(FileType type) { if (type.data().xpm_icon) return TQPixmap(type.data().xpm_icon); - if ( hasMimetype(type) ) return KMimeType::mimeType(type.data().mimetype)->pixmap(KIcon::Small); + if ( hasMimetype(type) ) return KMimeType::mimeType(type.data().mimetype)->pixmap(TDEIcon::Small); return TQPixmap(); } @@ -105,8 +105,8 @@ void PURL::BaseWidget::init() _edit = new KLineEdit(this); connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); top->addWidget(_edit); - KIconLoader loader; - TQIconSet iconset = loader.loadIcon("fileopen", KIcon::Toolbar); + TDEIconLoader loader; + TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar); TQPushButton *button = new KPushButton(iconset, TQString(), this); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(buttonClicked())); top->addWidget(button); diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp index 420a0fc..d5467fd 100644 --- a/src/devices/pic/gui/pic_register_view.cpp +++ b/src/devices/pic/gui/pic_register_view.cpp @@ -67,9 +67,9 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent) row++; } - KIconLoader loader; - TQPixmap readIcon = loader.loadIcon("viewmag", KIcon::Small); - TQPixmap editIcon = loader.loadIcon("edit", KIcon::Small); + TDEIconLoader loader; + TQPixmap readIcon = loader.loadIcon("viewmag", TDEIcon::Small); + TQPixmap editIcon = loader.loadIcon("edit", TDEIcon::Small); uint nb; if ( !data.is18Family() ) nb = rdata.nbRegistersPerBank(); else nb = kMax(rdata.accessBankSplit, rdata.nbRegistersPerBank() - rdata.accessBankSplit); diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp index 78a0f82..bf7afc0 100644 --- a/src/libgui/config_center.cpp +++ b/src/libgui/config_center.cpp @@ -50,8 +50,8 @@ void GlobalConfigWidget::saveConfig() TQPixmap GlobalConfigWidget::pixmap() const { - KIconLoader loader; - return loader.loadIcon("configure", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + return loader.loadIcon("configure", TDEIcon::Toolbar, TDEIcon::SizeMedium); } //---------------------------------------------------------------------------- @@ -87,8 +87,8 @@ void StandaloneConfigWidget::saveConfig() TQPixmap StandaloneConfigWidget::pixmap() const { - KIconLoader loader; - return loader.loadIcon("configure", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + return loader.loadIcon("configure", TDEIcon::Toolbar, TDEIcon::SizeMedium); } //---------------------------------------------------------------------------- diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index 550104a..a5e1a1a 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -345,8 +345,8 @@ DeviceChooser::Button::Button(bool withAuto, TQWidget *parent) _combo = new ComboBox(withAuto, this); connect(_combo, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); hbox->addWidget(_combo); - KIconLoader loader; - TQIconSet iconset = loader.loadIcon("fileopen", KIcon::Toolbar); + TDEIconLoader loader; + TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), this); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(chooseDevice())); hbox->addWidget(button); diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index 2656e39..be56c63 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -152,10 +152,10 @@ TQString EditorManager::title(const Editor &e) const void EditorManager::updateTitles() { - KIconLoader loader; - TQPixmap def = loader.loadIcon("piklab", KIcon::Small); - TQPixmap modified = loader.loadIcon("filesave", KIcon::Small); - TQPixmap chip = loader.loadIcon("piklab_chip", KIcon::Small); + TDEIconLoader loader; + TQPixmap def = loader.loadIcon("piklab", TDEIcon::Small); + TQPixmap modified = loader.loadIcon("filesave", TDEIcon::Small); + TQPixmap chip = loader.loadIcon("piklab_chip", TDEIcon::Small); TQValueList::iterator it = _editors.begin(); for (; it!=_editors.end(); ++it) { static_cast(tabBar())->setReadOnly(indexOf(*it), (*it)->isReadOnly()); @@ -392,11 +392,11 @@ void EditorManager::contextMenu(int i, const TQPoint &p) Editor *editor = static_cast(page(i)); if ( editor==0 ) return; - KIconLoader loader; - TQPixmap closeIcon = loader.loadIcon("fileclose", KIcon::Small); - TQPixmap saveIcon = loader.loadIcon("filesave", KIcon::Small); - TQPixmap saveAsIcon = loader.loadIcon("filesaveas", KIcon::Small); - TQPixmap reloadIcon = loader.loadIcon("reload", KIcon::Small); + TDEIconLoader loader; + TQPixmap closeIcon = loader.loadIcon("fileclose", TDEIcon::Small); + TQPixmap saveIcon = loader.loadIcon("filesave", TDEIcon::Small); + TQPixmap saveAsIcon = loader.loadIcon("filesaveas", TDEIcon::Small); + TQPixmap reloadIcon = loader.loadIcon("reload", TDEIcon::Small); TDEPopupMenu *popup = new TDEPopupMenu; popup->insertTitle(title(*editor)); popup->insertItem(closeIcon, i18n("Close"), 1); diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 27d0933..80519e2 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -57,10 +57,10 @@ LikeBack::LikeBack(Button buttons) { TQHBoxLayout *layout = new TQHBoxLayout(this); - TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", KIcon::Small); - TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", KIcon::Small); - TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", KIcon::Small); -// TQIconSet configureIconSet = kapp->iconLoader()->loadIconSet("configure", KIcon::Small); + TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like", TDEIcon::Small); + TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike", TDEIcon::Small); + TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug", TDEIcon::Small); +// TQIconSet configureIconSet = kapp->iconLoader()->loadIconSet("configure", TDEIcon::Small); TQToolButton *m_likeButton = new TQToolButton(this, "ilike"); m_likeButton->setIconSet(likeIconSet); @@ -84,7 +84,7 @@ LikeBack::LikeBack(Button buttons) layout->add(m_bugButton); m_configureButton = new TQToolButton(this, "configure"); - TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", KIcon::Small); + TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", TDEIcon::Small); m_configureButton->setIconSet(helpIconSet); m_configureButton->setTextLabel(i18n("Configure...")); m_configureButton->setAutoRaise(true); @@ -93,9 +93,9 @@ LikeBack::LikeBack(Button buttons) TQPopupMenu *configureMenu = new TQPopupMenu(this); configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) ); - TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", KIcon::Small); + TQIconSet changeEmailIconSet = kapp->iconLoader()->loadIconSet("mail_generic", TDEIcon::Small); configureMenu->insertItem(changeEmailIconSet, i18n("&Configure Email Address..."), this , TQT_SLOT(askEMail()) ); -// TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("stop", KIcon::Small); +// TQIconSet dontHelpIconSet = kapp->iconLoader()->loadIconSet("stop", TDEIcon::Small); // configureMenu->insertItem( dontHelpIconSet, i18n("&Do not Help Anymore"), this , TQT_SLOT(doNotHelpAnymore()) ); m_configureButton->setPopup(configureMenu); connect( m_configureButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(openConfigurePopup()) ); @@ -164,9 +164,9 @@ bool LikeBack::userWantToParticipate() void LikeBack::showInformationMessage() { - TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like", KIcon::Small); - TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::Small); - TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug", KIcon::Small); + TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small); + TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small); + TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug", TDEIcon::Small); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); @@ -526,21 +526,21 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS case LikeBack::ILike: color = TQColor("#DFFFDF"); lineColor = TQt::green; - icon = kapp->iconLoader()->loadIcon("likeback_like", KIcon::Small); + icon = kapp->iconLoader()->loadIcon("likeback_like", TDEIcon::Small); title = i18n("I like..."); please = i18n("Please briefly describe what you like."); break; case LikeBack::IDoNotLike: color = TQColor("#FFDFDF"); lineColor = TQt::red; - icon = kapp->iconLoader()->loadIcon("likeback_dislike", KIcon::Small); + icon = kapp->iconLoader()->loadIcon("likeback_dislike", TDEIcon::Small); title = i18n("I do not like..."); please = i18n("Please briefly describe what you do not like."); break; case LikeBack::IFoundABug: color = TQColor("#C0C0C0"); lineColor = TQt::black; - icon = kapp->iconLoader()->loadIcon("bug", KIcon::Small); + icon = kapp->iconLoader()->loadIcon("bug", TDEIcon::Small); title = i18n("I found a bug..."); please = i18n("Please briefly describe the bug you encountered."); break; @@ -578,7 +578,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS commentLayout->setMargin(0); commentLayout->setSpacing(KDialogBase::spacingHint()); m_comment = new TQTextEdit(coloredWidget); - TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", KIcon::Toolbar); + TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", TDEIcon::Toolbar); m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget); m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding); m_sendButton->setEnabled(false); diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp index cdb92f2..582f311 100644 --- a/src/libgui/log_view.cpp +++ b/src/libgui/log_view.cpp @@ -75,10 +75,10 @@ TQPopupMenu *Log::Widget::createPopupMenu(const TQPoint &pos) { updateDebugLevel(); _popup = TQTextEdit::createPopupMenu(pos); - KIconLoader loader; - TQIconSet iset = loader.loadIconSet("filesave", KIcon::Small, 0); + TDEIconLoader loader; + TQIconSet iset = loader.loadIconSet("filesave", TDEIcon::Small, 0); _popup->insertItem(iset, "Save As...", this, TQT_SLOT(saveAs())); - iset = loader.loadIconSet("fileclose", KIcon::Small, 0); + iset = loader.loadIconSet("fileclose", TDEIcon::Small, 0); _popup->insertItem(iset, "Clear", this, TQT_SLOT(clear())); _popup->insertSeparator(); FOR_EACH(DebugLevel, level) { diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp index 71b6de7..4f4cfe3 100644 --- a/src/libgui/new_dialogs.cpp +++ b/src/libgui/new_dialogs.cpp @@ -34,8 +34,8 @@ NewDialog::NewDialog(const TQString &caption, TQWidget *parent) _dir = new TQLineEdit(mainWidget()); connect(_dir, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(changed())); _top->addMultiCellWidget(_dir, 1,1, 1,2); - KIconLoader loader; - TQIconSet iconset = loader.loadIcon("fileopen", KIcon::Toolbar); + TDEIconLoader loader; + TQIconSet iconset = loader.loadIcon("fileopen", TDEIcon::Toolbar); KPushButton *button = new KPushButton(iconset, TQString(), mainWidget()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(browse())); _top->addWidget(button, 1, 3); diff --git a/src/libgui/project_manager_ui.cpp b/src/libgui/project_manager_ui.cpp index 2a230b9..f0c6178 100644 --- a/src/libgui/project_manager_ui.cpp +++ b/src/libgui/project_manager_ui.cpp @@ -21,8 +21,8 @@ //---------------------------------------------------------------------------- void PopupMenu::insertItem(const TQString &icon, const TQString &label, TQObject *receiver, const char *slot) { - KIconLoader loader; - TQPixmap pixmap = loader.loadIcon(icon, KIcon::Small); + TDEIconLoader loader; + TQPixmap pixmap = loader.loadIcon(icon, TDEIcon::Small); if (receiver) TDEPopupMenu::insertItem(pixmap, label, receiver, slot, 0, _index); else TDEPopupMenu::insertItem(pixmap, label, _index); _index++; @@ -121,8 +121,8 @@ void ProjectManager::FileItem::paintCell(TQPainter *p, const TQColorGroup &cg, ProjectManager::RegisterItem::RegisterItem(HeaderItem *item) : TDEListViewItem(item) { - KIconLoader loader; - TQPixmap chip = loader.loadIcon("piklab_chip", KIcon::Small); + TDEIconLoader loader; + TQPixmap chip = loader.loadIcon("piklab_chip", TDEIcon::Small); setPixmap(0, chip); setText(0, i18n("Registers")); } diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 292cf3b..3fd8732 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -29,8 +29,8 @@ FileListItem::FileListItem(TDEListView *view) : TDEListViewItem(view), _group(0), _copy(true) { - KIconLoader loader; - _pixmap = loader.loadIcon("button_ok", KIcon::Small); + TDEIconLoader loader; + _pixmap = loader.loadIcon("button_ok", TDEIcon::Small); } void FileListItem::toggle() diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index 632d3d8..32e56ff 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -116,14 +116,14 @@ MainWindow::MainWindow() setView(_mainDock); setMainDockWidget(_mainDock); - KIconLoader loader; + TDEIconLoader loader; KDockWidget *dock = createDock("project_manager_dock_widget", PURL::icon(PURL::Project), i18n("Project Manager"), DockPosition(KDockWidget::DockLeft, 20)); Main::_projectManager = new ProjectManager::View(dock); connect(TQT_TQOBJECT(Main::_projectManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI())); dock->setWidget(Main::_projectManager); - dock = createDock("watch_view_dock_widget", loader.loadIcon("viewmag", KIcon::Small), + dock = createDock("watch_view_dock_widget", loader.loadIcon("viewmag", TDEIcon::Small), i18n("Watch View"), DockPosition("project_manager_dock_widget")); Main::_watchView = new Register::WatchView(dock); dock->setWidget(Main::_watchView); @@ -134,25 +134,25 @@ MainWindow::MainWindow() connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(modified(const PURL::Url &)), TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(modified(const PURL::Url &))); connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &))); - dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", KIcon::Small), + dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", TDEIcon::Small), i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80)); Main::_compileLog = new Compile::LogWidget(dock); Main::_compileLog->setFocusPolicy(TQ_NoFocus); dock->setWidget(Main::_compileLog); - dock = createDock("program_log_dock_widget", loader.loadIcon("piklab_burnchip", KIcon::Small), + dock = createDock("program_log_dock_widget", loader.loadIcon("piklab_burnchip", TDEIcon::Small), i18n("Program Log"), DockPosition("compile_log_dock_widget")); _programLog = new Log::Widget(dock, "program_log"); _programLog->setFocusPolicy(TQ_NoFocus); dock->setWidget(_programLog); - dock = createDock("breakpoints_dock_widget", loader.loadIcon("piklab_breakpoint_active", KIcon::Small), + dock = createDock("breakpoints_dock_widget", loader.loadIcon("piklab_breakpoint_active", TDEIcon::Small), i18n("Breakpoints"), DockPosition("compile_log_dock_widget")); Main::_breakpointsView = new Breakpoint::View(dock); Main::_breakpointsView->setFocusPolicy(TQ_NoFocus); dock->setWidget(Main::_breakpointsView); - dock = createDock("console_dock_widget", loader.loadIcon("konsole", KIcon::Small), + dock = createDock("console_dock_widget", loader.loadIcon("konsole", TDEIcon::Small), i18n("Konsole"), DockPosition("compile_log_dock_widget")); Main::_consoleView = new ConsoleView(dock); dock->setWidget(Main::_consoleView); diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp index c4ac7c0..41f993c 100644 --- a/src/libgui/toplevel_ui.cpp +++ b/src/libgui/toplevel_ui.cpp @@ -67,8 +67,8 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent) TQFontMetrics fm(font()); int h = fm.height() + 2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this); setFixedHeight(h); - KIconLoader loader; - setIconSet(loader.loadIconSet(icon, KIcon::Small, fm.height()-2)); + TDEIconLoader loader; + setIconSet(loader.loadIconSet(icon, TDEIcon::Small, fm.height()-2)); setUsesTextLabel(false); setAutoRaise(true); } diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp index 097960d..7fd5e8d 100644 --- a/src/libgui/watch_view.cpp +++ b/src/libgui/watch_view.cpp @@ -46,8 +46,8 @@ void Register::RegisterListView::init(const Device::Data *data) { delete _root; _root = new ListViewItemContainer(i18n("Registers"), this); - KIconLoader loader; - _root->setPixmap(0, loader.loadIcon("piklab_chip", KIcon::Small)); + TDEIconLoader loader; + _root->setPixmap(0, loader.loadIcon("piklab_chip", TDEIcon::Small)); _root->setSelectable(false); _root->setOpen(true); if (data) Device::groupui(*data).fillWatchListContainer(_root, _ids); @@ -85,16 +85,16 @@ Register::WatchedListView::WatchedListView(TQWidget *parent) addColumn(TQString()); _root = new ListViewItemContainer(i18n("Watched"), this); - KIconLoader loader; - _root->setPixmap(0, loader.loadIcon("viewmag", KIcon::Small)); + TDEIconLoader loader; + _root->setPixmap(0, loader.loadIcon("viewmag", TDEIcon::Small)); _root->setSelectable(false); _root->setOpen(true); } TDEPopupMenu *Register::WatchedListView::appendFormatMenu(TDEPopupMenu *parent, uint offset) { - KIconLoader loader; - TQPixmap icon = loader.loadIcon("fonts", KIcon::Small); + TDEIconLoader loader; + TQPixmap icon = loader.loadIcon("fonts", TDEIcon::Small); TDEPopupMenu *popup = new TDEPopupMenu; popup->insertTitle(i18n("Format")); FOR_EACH(NumberBase, base) popup->insertItem(base.label(), offset + base.type()); @@ -111,8 +111,8 @@ void Register::WatchedListView::init(const Device::Data *data) Device::groupui(*data).fillWatchListContainer(_popup, _ids); _popup->insertSeparator(); _formatPopup = appendFormatMenu(_popup, _ids.count()); - KIconLoader loader; - TQPixmap icon = loader.loadIcon("cancel", KIcon::Small); + TDEIconLoader loader; + TQPixmap icon = loader.loadIcon("cancel", TDEIcon::Small); _popup->insertItem(icon, i18n("Clear"), Debugger::manager, TQT_SLOT(stopWatchAll())); } @@ -181,11 +181,11 @@ void Register::WatchedListView::contextMenu(TQListViewItem *item, const TQPoint TQPopupMenu *fpop = appendFormatMenu(pop, 0); FOR_EACH(NumberBase, base) fpop->setItemChecked(base.type(), ritem->base()==base); pop->insertSeparator(); - KIconLoader loader; - TQPixmap icon = loader.loadIcon("edit", KIcon::Small); + TDEIconLoader loader; + TQPixmap icon = loader.loadIcon("edit", TDEIcon::Small); int editId = pop->insertItem(icon, i18n("Edit")); pop->setItemEnabled(editId, Main::programmerState()==Programmer::Halted); - icon = loader.loadIcon("cancel", KIcon::Small); + icon = loader.loadIcon("cancel", TDEIcon::Small); int removeId = pop->insertItem(icon, i18n("Remove")); int res = pop->exec(p); if ( res==editId ) ritem->startRename(); diff --git a/src/progs/gui/debug_config_center.cpp b/src/progs/gui/debug_config_center.cpp index a35eeba..c5b1150 100644 --- a/src/progs/gui/debug_config_center.cpp +++ b/src/progs/gui/debug_config_center.cpp @@ -12,6 +12,6 @@ TQPixmap Debugger::OptionsConfigWidget::pixmap() const { - KIconLoader loader; - return loader.loadIcon("piklab_config_debugger", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + return loader.loadIcon("piklab_config_debugger", TDEIcon::Toolbar, TDEIcon::SizeMedium); } diff --git a/src/progs/gui/prog_config_center.cpp b/src/progs/gui/prog_config_center.cpp index 5e5ca96..bd876c2 100644 --- a/src/progs/gui/prog_config_center.cpp +++ b/src/progs/gui/prog_config_center.cpp @@ -27,8 +27,8 @@ //---------------------------------------------------------------------------- TQPixmap Programmer::OptionsConfigWidget::pixmap() const { - KIconLoader loader; - return loader.loadIcon("piklab_config_programmer", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + return loader.loadIcon("piklab_config_programmer", TDEIcon::Toolbar, TDEIcon::SizeMedium); } //---------------------------------------------------------------------------- @@ -59,8 +59,8 @@ Programmer::SelectConfigWidget::SelectConfigWidget() // specific programmer config _stack = new KeyWidgetStack(_tabWidget); static_cast(_stack->widget())->setMargin(10); - KIconLoader loader; - TQPixmap icon = loader.loadIcon("configure", KIcon::Small); + TDEIconLoader loader; + TQPixmap icon = loader.loadIcon("configure", TDEIcon::Small); _tabWidget->addTab(_stack->widget(), icon, i18n("Specific")); ::Programmer::Lister::ConstIterator it; for (it=::Programmer::lister().begin(); it!=::Programmer::lister().end(); ++it) { @@ -91,8 +91,8 @@ void Programmer::SelectConfigWidget::portChanged() TQPixmap Programmer::SelectConfigWidget::pixmap() const { - KIconLoader loader; - return loader.loadIcon("piklab_config_programmer", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + return loader.loadIcon("piklab_config_programmer", TDEIcon::Toolbar, TDEIcon::SizeMedium); } void Programmer::SelectConfigWidget::saveConfig() @@ -111,8 +111,8 @@ void Programmer::SelectConfigWidget::programmerChanged() bool hasTab = ( _tabWidget->indexOf(_portSelectorContainer)!=-1 ); if (isHardware) { if ( !hasTab ) { - KIconLoader loader; - TQPixmap icon = loader.loadIcon("connect_creating", KIcon::Small); + TDEIconLoader loader; + TQPixmap icon = loader.loadIcon("connect_creating", TDEIcon::Small); _tabWidget->insertTab(_portSelectorContainer, icon, i18n("Port Selection"), 0); } } else if (hasTab) _tabWidget->removePage(_portSelectorContainer); diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index b1ecc92..e22a4b0 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -51,8 +51,8 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c _base(base), _calEditor(0) { // programmer - KIconLoader loader; - TQPixmap pixmap = loader.loadIcon("piklab_burnchip", KIcon::Toolbar, KIcon::SizeMedium); + TDEIconLoader loader; + TQPixmap pixmap = loader.loadIcon("piklab_burnchip", TDEIcon::Toolbar, TDEIcon::SizeMedium); TQFrame *page = addPage(i18n("Programmer"), _base.group().label(), pixmap); TQVBoxLayout *vbox = new TQVBoxLayout(page); _programmerContainer = new Container(page); @@ -88,7 +88,7 @@ Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const c } else _selfTestContainer = 0; // calibration - pixmap = loader.loadIcon("configure", KIcon::Toolbar, KIcon::SizeMedium); + pixmap = loader.loadIcon("configure", TDEIcon::Toolbar, TDEIcon::SizeMedium); page = addPage(i18n("Calibration"), i18n("Calibration"), pixmap); vbox = new TQVBoxLayout(page); _calibrationContainer = new Container(page); -- cgit v1.2.1