Commit 0b6473e1 authored by Laurent Montel's avatar Laurent Montel 😁

kicon->QIcon, KPushButton->QPushButton etc.

parent 50adda3e
......@@ -21,7 +21,7 @@
#include "settings.h"
#include <KComboBox>
#include <KIcon>
#include <QIcon>
#include <KLineEdit>
#include <KLocale>
......@@ -192,7 +192,7 @@ QVariant AutoPasteModel::data(const QModelIndex &index, int role) const
switch (column) {
case Type: {
if (role == Qt::DecorationRole) {
return (m_data[row].type == Include ? KIcon("list-add") : KIcon("list-remove"));
return (m_data[row].type == Include ? QIcon::fromTheme("list-add") : QIcon::fromTheme("list-remove"));
} else if ((role == Qt::UserRole) || (role == Qt::EditRole)) {
return m_data[row].type;
}
......
......@@ -82,20 +82,20 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="KPushButton" name="add"/>
<widget class="QPushButton" name="add"/>
</item>
<item>
<widget class="KPushButton" name="remove"/>
<widget class="QPushButton" name="remove"/>
</item>
<item>
<widget class="KPushButton" name="increase">
<widget class="QPushButton" name="increase">
<property name="text">
<string>&amp;Increase Priority</string>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="decrease">
<widget class="QPushButton" name="decrease">
<property name="text">
<string>&amp;Decrease Priority</string>
</property>
......@@ -134,11 +134,6 @@
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -23,6 +23,8 @@
#include <KConfigDialog>
#include <KLocale>
#include <KGuiItem>
#include <KStandardGuiItem>
IntegrationPreferences::IntegrationPreferences(KConfigDialog *parent, Qt::WindowFlags f)
: QWidget(parent, f)
......@@ -36,8 +38,8 @@ IntegrationPreferences::IntegrationPreferences(KConfigDialog *parent, Qt::Window
ui.patternSyntax->addItem(i18n("Escape sequences"), AutoPasteModel::Wildcard);
ui.patternSyntax->addItem(i18n("Regular expression"), AutoPasteModel::RegExp);
ui.add->setGuiItem(KStandardGuiItem::add());
ui.remove->setGuiItem(KStandardGuiItem::remove());
KGuiItem::assign(ui.add, KStandardGuiItem::add());
KGuiItem::assign(ui.remove, KStandardGuiItem::remove());
ui.increase->setIcon(QIcon::fromTheme("arrow-up"));
ui.decrease->setIcon(QIcon::fromTheme("arrow-down"));
......@@ -58,10 +60,10 @@ IntegrationPreferences::IntegrationPreferences(KConfigDialog *parent, Qt::Window
connect(ui.list->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(slotUpdateButtons()));
connect(ui.pattern, &KLineEdit::textChanged, this, &IntegrationPreferences::slotUpdateButtons);
connect(ui.pattern, &KLineEdit::returnPressed, this, &IntegrationPreferences::slotAddItem);
connect(ui.add, &KPushButton::clicked, this, &IntegrationPreferences::slotAddItem);
connect(ui.remove, &KPushButton::clicked, this, &IntegrationPreferences::slotRemoveItem);
connect(ui.increase, &KPushButton::clicked, this, &IntegrationPreferences::slotIncreasePriority);
connect(ui.decrease, &KPushButton::clicked, this, &IntegrationPreferences::slotDecreasePriority);
connect(ui.add, &QPushButton::clicked, this, &IntegrationPreferences::slotAddItem);
connect(ui.remove, &QPushButton::clicked, this, &IntegrationPreferences::slotRemoveItem);
connect(ui.increase, &QPushButton::clicked, this, &IntegrationPreferences::slotIncreasePriority);
connect(ui.decrease, &QPushButton::clicked, this, &IntegrationPreferences::slotDecreasePriority);
connect(parent, SIGNAL(rejected()), m_model, SLOT(load()));
connect(parent, SIGNAL(applyClicked()), m_model, SLOT(save()));
connect(parent, SIGNAL(okClicked()), m_model, SLOT(save()));
......
......@@ -19,7 +19,7 @@
#include "core/transfertreemodel.h"
#include "core/transfertreeselectionmodel.h"
#include <KPushButton>
#include <QPushButton>
TransfersGroupWidget::TransfersGroupWidget(QWidget *parent)
: QWidget(parent)
......@@ -40,8 +40,8 @@ TransfersGroupWidget::TransfersGroupWidget(QWidget *parent)
ui.rename->setIcon(QIcon::fromTheme("edit-rename"));
ui.selectIcon->setIcon(QIcon::fromTheme("preferences-desktop-icons"));
connect(ui.add, &KPushButton::clicked, ui.treeView, &TransfersGroupTree::addGroup);
connect(ui.remove, &KPushButton::clicked, ui.treeView, &TransfersGroupTree::deleteSelectedGroup);
connect(ui.add, &QPushButton::clicked, ui.treeView, &TransfersGroupTree::addGroup);
connect(ui.remove, &QPushButton::clicked, ui.treeView, &TransfersGroupTree::deleteSelectedGroup);
connect(ui.rename, &QPushButton::clicked, ui.treeView, &TransfersGroupTree::renameSelectedGroup);
connect(ui.selectIcon, &KIconButton::iconChanged, ui.treeView, &TransfersGroupTree::changeIcon);
connect(ui.configure, SIGNAL(clicked()), KGet::actionCollection()->action("transfer_group_settings"), SLOT(trigger()));
......
......@@ -22,7 +22,7 @@
#include <QAction>
#include <kactioncollection.h>
#include <klocale.h>
#include <kicon.h>
#include <QIcon>
TransferGroupHandler::TransferGroupHandler(Scheduler * scheduler, TransferGroup * parent)
: Handler(scheduler, parent),
......@@ -167,13 +167,13 @@ void TransferGroupHandler::createActions()
QAction *startAction = KGet::actionCollection()->addAction("transfer_group_start");
startAction->setText(i18nc("start transfergroup downloads", "Start"));
startAction->setIcon(KIcon("media-playback-start"));
startAction->setIcon(QIcon::fromTheme("media-playback-start"));
QObject::connect(startAction, SIGNAL(triggered()), SLOT(start()));
m_actions.append(startAction);
QAction *stopAction = KGet::actionCollection()->addAction("transfer_group_stop");
stopAction->setText(i18nc("stop transfergroup downloads", "Stop"));
stopAction->setIcon(KIcon("media-playback-pause"));
stopAction->setIcon(QIcon::fromTheme("media-playback-pause"));
QObject::connect(stopAction, SIGNAL(triggered()), SLOT(stop()));
m_actions.append(stopAction);
......
......@@ -25,7 +25,7 @@
#include <KMessageBox>
#include <QMenu>
#include <KRun>
#include <KIcon>
#include <QIcon>
#include <KToolInvocation>
#include <KGenericFactory>
#include <KProtocolInfo>
......@@ -52,7 +52,7 @@ static QWidget* partWidget(QObject* obj)
KGetPlugin::KGetPlugin(QObject *parent, const QVariantList&)
:KParts::Plugin(parent)
{
KActionMenu *menu = new KActionMenu(KIcon("kget"), i18n("Download Manager"), actionCollection());
KActionMenu *menu = new KActionMenu(QIcon::fromTheme("kget"), i18n("Download Manager"), actionCollection());
actionCollection()->addAction("kget_menu", menu);
menu->setDelayed( false );
......
This diff is collapsed.
......@@ -37,7 +37,7 @@
#include <QDBusConnectionInterface>
#include <KUrl>
#include <KLocale>
#include <KIcon>
#include <QIcon>
const int ProxyWidget::MARGIN = 20;
const int ProxyWidget::TOP_MARGIN = 55;
......@@ -80,7 +80,7 @@ void ProxyWidget::paint(QPainter * p, const QStyleOptionGraphicsItem * option, Q
QRect iconRect(QPoint(rect.x() + SPACING + 10, rect.y() + SPACING + 10), QSize(m_textHeight, m_textHeight));
KIcon("kget").paint(p, iconRect);
QIcon::fromTheme("kget").paint(p, iconRect);
p->drawText(QRectF(rect.x() + SPACING * 2 + 10 + iconRect.width(), rect.y() + SPACING + 10,
m_textWidth, m_textHeight), i18n("KGet"));
p->drawLine(QPointF(rect.x() + SPACING + 10, rect.y() + SPACING * 2 + 10 + m_textHeight),
......
......@@ -37,9 +37,9 @@
#include <QPushButton>
#include <QTimer>
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <KPushButton>
#include <QPushButton>
const int KGetAppletUtils::SPACING = 4;
......@@ -57,8 +57,8 @@ void KGetAppletUtils::paintTitle(QPainter *p, Plasma::Svg *svg, const QRect &rec
p->setPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
QRect iconRect(QPoint(rect.x() + SPACING + 10, rect.y() + SPACING + 10), QSize(metrics.height(), metrics.height()));
KIcon("kget").paint(p, iconRect);
//p->drawPixmap(QPointF(rect.x() + SPACING + 10, rect.y() + SPACING + 10), KIcon("kget").pixmap(iconRect.width(), iconRect.height()), iconRect);
QIcon::fromTheme("kget").paint(p, iconRect);
//p->drawPixmap(QPointF(rect.x() + SPACING + 10, rect.y() + SPACING + 10), QIcon::fromTheme("kget").pixmap(iconRect.width(), iconRect.height()), iconRect);
//svg->paint(p, QRect(rect.x() + SPACING + 10,
// rect.y() + SPACING + 10, 111, 35), "title");
//p->setPen(Qt::black);
......@@ -91,11 +91,11 @@ ErrorWidget::ErrorWidget(const QString &message, QGraphicsWidget *parent)
m_errorLabel->setText(message);
m_errorLabel->nativeWidget()->setAlignment(Qt::AlignCenter);
m_icon = new Plasma::IconWidget(KIcon("dialog-warning"),"", this);
m_icon = new Plasma::IconWidget(QIcon::fromTheme("dialog-warning"),"", this);
m_launchButton = new Plasma::PushButton(this);
m_launchButton->setText(i18n("Launch KGet"));
m_launchButton->nativeWidget()->setIcon(KIcon("kget"));
m_launchButton->nativeWidget()->setIcon(QIcon::fromTheme("kget"));
m_layout->addItem(m_errorLabel);
m_layout->addItem(m_icon);
......
......@@ -30,7 +30,7 @@
#include <QProgressBar>
#include <KDebug>
#include <KIcon>
#include <QIcon>
#include <KIconLoader>
#include <KLocale>
#include <KTitleWidget>
......@@ -60,7 +60,7 @@ KGetPanelBar::Private::Private(QWidget *parent) : Plasma::Dialog(parent),
KTitleWidget *title = new KTitleWidget(this);
title->setText(i18n("KGet transfers"));
title->setPixmap(KIcon("kget").pixmap(22, 22), KTitleWidget::ImageRight);
title->setPixmap(QIcon::fromTheme("kget").pixmap(22, 22), KTitleWidget::ImageRight);
m_dialogLayout->addWidget(title, 0, 0, 1, 3);
}
......@@ -171,7 +171,7 @@ void KGetPanelBar::init()
//KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
//KLocale::global()->insertCatalog("plasma_applet_kget");
m_icon = new Plasma::IconWidget(KIcon("go-down"), QString(), this);
m_icon = new Plasma::IconWidget(QIcon::fromTheme("go-down"), QString(), this);
m_layout = new QGraphicsLinearLayout(Qt::Horizontal, this);
m_layout->addItem(m_icon);
......
......@@ -38,7 +38,7 @@
#include <QProgressBar>
#include <KDebug>
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <KGlobal>
......
......@@ -77,7 +77,7 @@ void KGetRunner::run(const Plasma::RunnerContext& /*context*/, const Plasma::Que
if(connection->lastError().type() != QDBusError::NoError) {
KNotification::event(KNotification::Error,
i18n("<p>KGet Runner could not communicate with KGet.</p><p style=\"font-size: small;\">Response from DBus:<br/>%1</p>", connection->lastError().message()),
KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
QIcon::fromTheme("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
return;
}
......@@ -105,7 +105,7 @@ void KGetRunner::callFinished(QDBusPendingCallWatcher* call)
// Send a notification about the error to the user.
KNotification::event(KNotification::Error,
i18n("<p>KGet Runner could not communicate with KGet.</p><p style=\"font-size: small;\">Response from DBus:<br/>%1</p>", reply.error().message()),
KIcon("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
QIcon::fromTheme("dialog-warning").pixmap(KIconLoader::SizeSmall)/*, 0, KNotification::Persistant*/);
}
}
......
......@@ -17,7 +17,7 @@
#include "kget_interface.h"
#include <Plasma/AbstractRunner>
#include <KIcon>
#include <QIcon>
class QDBusConnectionInterface;
class QDBusPendingCallWatcher;
......
......@@ -53,25 +53,25 @@ void BTAdvancedDetailsWidget::init()
QGridLayout *layout = new QGridLayout();
KTitleWidget *titleWidget = new KTitleWidget(this);
titleWidget->setText(i18n("Advanced Details for %1", m_transfer->source().fileName()));
titleWidget->setPixmap(KIcon("dialog-information"));
titleWidget->setPixmap(QIcon::fromTheme("dialog-information"));
layout->addWidget(titleWidget);
tabWidget = new KTabWidget(this);
layout->addWidget(tabWidget);
setLayout(layout);
file_view = new FileView(this);
file_view->changeTC(tc, KSharedConfig::openConfig());
tabWidget->insertTab(0, file_view, KIcon("inode-directory"), i18n("Files"));
tabWidget->insertTab(0, file_view, QIcon::fromTheme("inode-directory"), i18n("Files"));
//peer_view = new PeerView(this);
//tabWidget->insertTab(1, peer_view, KIcon("system-users"), i18n("Peers"));
//tabWidget->insertTab(1, peer_view, QIcon::fromTheme("system-users"), i18n("Peers"));
//cd_view = new ChunkDownloadView(this);
//cd_view->changeTC(tc);
//tabWidget->insertTab(2, cd_view, KIcon("preferences-plugin"), i18n("Chunks"));
//tabWidget->insertTab(2, cd_view, QIcon::fromTheme("preferences-plugin"), i18n("Chunks"));
tracker_view = new TrackerView(this);
tracker_view->changeTC(tc);
tabWidget->insertTab(1, tracker_view, KIcon("network-server"), i18n("Trackers"));
tabWidget->insertTab(1, tracker_view, QIcon::fromTheme("network-server"), i18n("Trackers"));
webseeds_tab = new WebSeedsTab(this);
webseeds_tab->changeTC(tc);
tabWidget->insertTab(2, webseeds_tab, KIcon("network-server"), i18n("Webseeds"));
tabWidget->insertTab(2, webseeds_tab, QIcon::fromTheme("network-server"), i18n("Webseeds"));
monitor = new Monitor(tc, 0, 0, file_view);
}
......
......@@ -63,7 +63,7 @@ namespace kt
setModel(proxy_model);
context_menu = new QMenu(this);
open_action = context_menu->addAction(KIcon("document-open"),i18nc("Open file", "Open"),this,SLOT(open()));
open_action = context_menu->addAction(QIcon::fromTheme("document-open"),i18nc("Open file", "Open"),this,SLOT(open()));
context_menu->addSeparator();
download_first_action = context_menu->addAction(i18n("Download first"),this,SLOT(downloadFirst()));
download_normal_action = context_menu->addAction(i18n("Download normally"),this,SLOT(downloadNormal()));
......
......@@ -22,7 +22,7 @@
#include <QHeaderView>
#include <klocale.h>
#include <kicon.h>
#include <QIcon>
#include <QMenu>
#include <kstandarddirs.h>
#include <kconfiggroup.h>
......@@ -49,8 +49,8 @@ namespace kt
setModel(model);
context_menu = new QMenu(this);
context_menu->addAction(KIcon("list-remove-user"),i18n("Kick Peer"),this,SLOT(kickPeer()));
context_menu->addAction(KIcon("view-filter"),i18n("Ban Peer"),this,SLOT(banPeer()));
context_menu->addAction(QIcon::fromTheme("list-remove-user"),i18n("Kick Peer"),this,SLOT(kickPeer()));
context_menu->addAction(QIcon::fromTheme("view-filter"),i18n("Ban Peer"),this,SLOT(banPeer()));
connect(this,SIGNAL(customContextMenuRequested(QPoint)),
this,SLOT(showContextMenu(QPoint)));
}
......
......@@ -20,7 +20,7 @@
***************************************************************************/
#include "peerviewmodel.h"
#include <klocale.h>
#include <kicon.h>
#include <QIcon>
#include <kstandarddirs.h>
#include <interfaces/torrentinterface.h>
#include <util/functions.h>
......@@ -38,8 +38,8 @@ namespace kt
stats = peer->getStats();
if (!icons_loaded)
{
yes = KIcon("dialog-ok");
no = KIcon("dialog-cancel");
yes = QIcon::fromTheme("dialog-ok");
no = QIcon::fromTheme("dialog-cancel");
}
}
/*
......@@ -196,11 +196,11 @@ namespace kt
{
case 0:
if (stats.encrypted)
return KIcon("kt-encrypted");
return QIcon::fromTheme("kt-encrypted");
break;
case 1: return flag;
case 8: return stats.dht_support ? yes : no;
case 10: return stats.has_upload_slot ? yes : KIcon();
case 10: return stats.has_upload_slot ? yes : QIcon::fromTheme();
}
return QVariant();
......
......@@ -21,7 +21,7 @@
#ifndef KTPEERVIEWMODEL_H
#define KTPEERVIEWMODEL_H
#include <kicon.h>
#include <QIcon>
#include <QList>
#include <QAbstractTableModel>
#include <interfaces/peerinterface.h>
......
......@@ -21,7 +21,7 @@
#include "torrentfilelistmodel.h"
#include <klocale.h>
#include <kicon.h>
#include <QIcon>
#include <kmimetype.h>
#include <QTreeView>
#include <interfaces/torrentinterface.h>
......@@ -124,9 +124,9 @@ namespace kt
{
// if this is an empty folder then we are in the single file case
if (multi)
return KIcon(KMimeType::findByPath(tc->getTorrentFile(r).getPath())->iconName());
return QIcon::fromTheme(KMimeType::findByPath(tc->getTorrentFile(r).getPath())->iconName());
else
return KIcon(KMimeType::findByPath(s.torrent_name)->iconName());
return QIcon::fromTheme(KMimeType::findByPath(s.torrent_name)->iconName());
}
else if (role == Qt::CheckStateRole && index.column() == 0)
{
......
......@@ -21,7 +21,7 @@
#include "torrentfiletreemodel.h"
#include <klocale.h>
#include <kicon.h>
#include <QIcon>
#include <kmimetype.h>
#include <QTreeView>
#include <QSortFilterProxyModel>
......@@ -420,9 +420,9 @@ namespace kt
// if this is an empty folder then we are in the single file case
if (!n->file)
return n->children.count() > 0 ?
KIcon("folder") : KIcon(KMimeType::findByPath(tc->getStats().torrent_name)->iconName());
QIcon::fromTheme("folder") : QIcon::fromTheme(KMimeType::findByPath(tc->getStats().torrent_name)->iconName());
else
return KIcon(KMimeType::findByPath(n->file->getPath())->iconName());
return QIcon::fromTheme(KMimeType::findByPath(n->file->getPath())->iconName());
}
else if (role == Qt::CheckStateRole && index.column() == 0)
{
......
......@@ -62,10 +62,10 @@ namespace kt
this,SLOT(currentChanged(QModelIndex,QModelIndex)));
connect(m_scrape,SIGNAL(clicked()),this,SLOT(scrapeClicked()));
m_add_tracker->setIcon(KIcon("list-add"));
m_remove_tracker->setIcon(KIcon("list-remove"));
m_restore_defaults->setIcon(KIcon("kt-restore-defaults"));
m_change_tracker->setIcon(KIcon("kt-change-tracker"));
m_add_tracker->setIcon(QIcon::fromTheme("list-add"));
m_remove_tracker->setIcon(QIcon::fromTheme("list-remove"));
m_restore_defaults->setIcon(QIcon::fromTheme("kt-restore-defaults"));
m_change_tracker->setIcon(QIcon::fromTheme("kt-change-tracker"));
setEnabled(false);
torrentChanged(0);
......
......@@ -16,21 +16,21 @@
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="KPushButton" name="m_add_tracker" >
<widget class="QPushButton" name="m_add_tracker" >
<property name="text" >
<string>Add Tracker</string>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_remove_tracker" >
<widget class="QPushButton" name="m_remove_tracker" >
<property name="text" >
<string>Remove Tracker</string>
</property>
</widget>
</item>
<item>
<widget class="KPushButton" name="m_change_tracker" >
<widget class="QPushButton" name="m_change_tracker" >
<property name="text" >
<string>Change Tracker</string>
</property>
......@@ -57,7 +57,7 @@
</spacer>
</item>
<item>
<widget class="KPushButton" name="m_restore_defaults" >
<widget class="QPushButton" name="m_restore_defaults" >
<property name="text" >
<string>Restore Defaults</string>
</property>
......@@ -68,11 +68,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -36,8 +36,8 @@ namespace kt
setupUi(this);
connect(m_add,SIGNAL(clicked()),this,SLOT(addWebSeed()));
connect(m_remove,SIGNAL(clicked()),this,SLOT(removeWebSeed()));
m_add->setIcon(KIcon("list-add"));
m_remove->setIcon(KIcon("list-remove"));
m_add->setIcon(QIcon::fromTheme("list-add"));
m_remove->setIcon(QIcon::fromTheme("list-remove"));
m_add->setEnabled(false);
m_remove->setEnabled(false);
m_webseed_list->setEnabled(false);
......
......@@ -81,13 +81,13 @@ const QList<QAction *> BTTransferFactory::actions(TransferHandler *handler)
QList<QAction *> actions;
if (bttransfer && bttransfer->torrentControl())
{
QAction *openAdvancedDetailsAction = new QAction(KIcon("document-open"), i18n("&Advanced Details"), this);
QAction *openAdvancedDetailsAction = new QAction(QIcon::fromTheme("document-open"), i18n("&Advanced Details"), this);
connect(openAdvancedDetailsAction, SIGNAL(triggered()), bttransfer, SLOT(createAdvancedDetails()));
actions.append(openAdvancedDetailsAction);
QAction *openScanDlg = new QAction(KIcon("document-open"), i18n("&Scan Files"), this);
QAction *openScanDlg = new QAction(QIcon::fromTheme("document-open"), i18n("&Scan Files"), this);
connect(openScanDlg, SIGNAL(triggered()), bttransfer, SLOT(createScanDlg()));
......
......@@ -65,7 +65,7 @@ namespace kt
private:
bt::Job * m_job;
QProgressBar *m_progress;
KPushButton *m_cancel;
QPushButton *m_cancel;
QLabel *m_torrent_label;
QLabel *m_chunks_failed;
QLabel *m_chunks_found;
......@@ -121,7 +121,7 @@ namespace kt
int qm_priority;
bool scanning;
QProgressBar *m_progress;
KPushButton *m_cancel;
QPushButton *m_cancel;
QLabel *m_torrent_label;
QLabel *m_chunks_failed;
QLabel *m_chunks_found;
......
......@@ -178,7 +178,7 @@
</spacer>
</item>
<item>
<widget class="KPushButton" name="cancel" >
<widget class="QPushButton" name="cancel" >
<property name="text" >
<string>Cancel</string>
</property>
......@@ -189,11 +189,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -31,10 +31,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KPushButton" name="add"/>
<widget class="QPushButton" name="add"/>
</item>
<item row="1" column="1">
<widget class="KPushButton" name="remove"/>
<widget class="QPushButton" name="remove"/>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer">
......@@ -52,11 +52,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
......
......@@ -25,8 +25,8 @@ DlgContentFetchSettingWidget::DlgContentFetchSettingWidget(QWidget * parent = 0,
m_p_action(0)
{
ui.setupUi(this);
ui.newScriptButton->setIcon(KIcon("list-add"));
ui.removeScriptButton->setIcon(KIcon("list-remove"));
ui.newScriptButton->setIcon(QIcon::fromTheme("list-add"));
ui.removeScriptButton->setIcon(QIcon::fromTheme("list-remove"));
loadContentFetchSetting();
......
......@@ -73,7 +73,7 @@ QMenu * ContextMenu::createTransferContextMenu(QList<TransferHandler*> transfers
}
QMenu *nepomukMenu = new QMenu(i18n("Semantic Desktop"), parent);
nepomukMenu->setIcon(KIcon("nepomuk"));
nepomukMenu->setIcon(QIcon::fromTheme("nepomuk"));
QWidgetAction *nepomukWidgetAction = new QWidgetAction(parent);
Nepomuk2::FileMetaDataWidget *nepomukWidget = new Nepomuk2::FileMetaDataWidget(parent);
nepomukWidget->setItems(items);
......
......@@ -11,7 +11,7 @@
#include "rangetreewidget.h"
#include "settings.h"
#include <KIcon>
#include <QIcon>
#include <KDebug>
#include <QApplication>
......
......@@ -36,8 +36,8 @@
#include <KRun>
#include <KGlobalSettings>
#include <kio/global.h>
#include <KPushButton>
#include <KIcon>
#include <QPushButton>
#include <QIcon>
#include <KLocale>
#include <QFontDatabase>
......@@ -62,8 +62,8 @@ TransferHistory::TransferHistory(QWidget *parent)
m_iconView = widget.bt_iconview;
m_listView = widget.bt_listview;
m_listView->setIcon(KIcon("view-list-details"));
m_iconView->setIcon(KIcon("view-list-icons"));
m_listView->setIcon(QIcon::fromTheme("view-list-details"));
m_iconView->setIcon(QIcon::fromTheme("view-list-icons"));
connect(m_listView, SIGNAL(clicked()), SLOT(slotSetListMode()));
connect(m_iconView, SIGNAL(clicked()), SLOT(slotSetIconMode()));
......@@ -76,12 +76,12 @@ TransferHistory::TransferHistory(QWidget *parent)
m_searchBar = widget.searchBar;
//m_searchBar->setTreeWidget(m_treeWidget);
m_clearButton = widget.clearButton;
m_clearButton->setIcon(KIcon("edit-clear-history"));
m_clearButton->setIcon(QIcon::fromTheme("edit-clear-history"));
m_actionDelete_Selected = widget.actionDelete_Selected;
m_actionDelete_Selected->setIcon(KIcon("edit-delete"));
m_actionDelete_Selected->setIcon(QIcon::fromTheme("edit-delete"));
m_actionDownload = widget.actionDownload;
m_actionDownload->setIcon(KIcon("document-new"));
m_openFile = new QAction(KIcon("document-open"), i18n("&Open File"), this);
m_actionDownload->setIcon(QIcon::fromTheme("document-new"));