From a0523230c43c0c894e924fca7fe775e47a7d86a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:03:49 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kmymoney2/widgets/kmymoneyaccounttree.cpp | 2 +- kmymoney2/widgets/kmymoneybriefschedule.cpp | 6 +++--- kmymoney2/widgets/kmymoneycalendar.cpp | 2 +- kmymoney2/widgets/kmymoneycategory.cpp | 4 ++-- kmymoney2/widgets/kmymoneydateinput.cpp | 2 +- kmymoney2/widgets/kmymoneyedit.cpp | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp | 8 ++++---- kmymoney2/widgets/kmymoneypriceview.cpp | 10 +++++----- kmymoney2/widgets/transaction.cpp | 2 +- kmymoney2/widgets/transactionsortoption.ui.h | 10 +++++----- 10 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index 1f7c2ae..c67c7b0 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp @@ -88,7 +88,7 @@ void KMyMoneyAccountTreeItem::fillColumns() if (!lv) return; KMyMoneyAccountTreeBaseItem::fillColumns(); - TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); + TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small)); MyMoneyMoney vatRate; if (!isInstitution()) setPixmap(lv->nameColumn(), m_account.accountPixmap(m_reconcileFlag, 22)); diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp index 404d2a9..3e9ab7b 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp @@ -46,7 +46,7 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name ) : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder) { - KIconLoader *ic = TDEGlobal::iconLoader(); + TDEIconLoader *ic = TDEGlobal::iconLoader(); m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); @@ -57,13 +57,13 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name connect(m_buttonEnter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterClicked())); KGuiItem skipGuiItem( i18n("&Skip"), - TQIconSet(ic->loadIcon("player_fwd", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(ic->loadIcon("player_fwd", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Skip this transaction"), i18n("Use this button to skip this transaction")); m_skipButton->setGuiItem(skipGuiItem); KGuiItem enterGuiItem( i18n("&Enter"), - TQIconSet(ic->loadIcon("key_enter", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(ic->loadIcon("key_enter", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Record this transaction into the register"), i18n("Use this button to record this transaction")); m_buttonEnter->setGuiItem(enterGuiItem); diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index c9772ab..15b0c14 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -118,7 +118,7 @@ void kMyMoneyCalendar::init( const TQDate &dt ) d->selectWeek = new TQToolButton( this ); -// KIconLoader *kiconloader = TDEGlobal::iconLoader(); +// TDEIconLoader *kiconloader = TDEGlobal::iconLoader(); TDEPopupMenu* tdepopupmenuNew = new TDEPopupMenu(this); tdepopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly())); tdepopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly())); diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index b4e2f83..99474f3 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -68,8 +68,8 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl // create button KGuiItem splitButtonItem("", - TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small, - KIcon::SizeSmall)), "", ""); + TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", TDEIcon::Small, + TDEIcon::SizeSmall)), "", ""); d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton"); layout->addWidget(this, 5); diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index ef4f4ee..eedd535 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -132,7 +132,7 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al #endif // the next line is a try to add an icon to the button - m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this); + m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -TDEIcon::SizeSmall))), TQString(""), this); m_dateButton->setMinimumWidth(30); connect(m_dateButton,TQT_SIGNAL(clicked()),TQT_SLOT(toggleDatePicker())); diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index 549b772..cb04111 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -222,7 +222,7 @@ void kMyMoneyEdit::init(void) m_calculatorFrame->setFixedSize(m_calculator->width()+3, m_calculator->height()+3); m_calculatorFrame->hide(); - m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); + m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -TDEIcon::SizeSmall))), TQString(""), this); m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() ); m_calcButton->setFixedHeight(m_edit->sizeHint().height()); m_calcButton->setFocusProxy(m_edit); diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp index 47f2077..6f04112 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp @@ -48,21 +48,21 @@ kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *parent, const cha m_updateButton->setEnabled(false); - KIconLoader* il = TDEGlobal::iconLoader(); + TDEIconLoader* il = TDEGlobal::iconLoader(); KGuiItem updateButtenItem( i18n("&Update" ), - TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("button_ok", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), i18n("Use this to accept the modified data.")); m_updateButton->setGuiItem(updateButtenItem); KGuiItem deleteButtenItem( i18n( "&Delete" ), - TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("editdelete", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Delete the selected source entry"), i18n("Use this to delete the selected online source entry")); m_deleteButton->setGuiItem(deleteButtenItem); KGuiItem newButtenItem( i18n( "&New..." ), - TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", TDEIcon::Small, TDEIcon::SizeSmall)), i18n("Create a new source entry for online quotes"), i18n("Use this to create a new entry for online quotes")); m_newButton->setGuiItem(newButtenItem); diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index a4714ac..83b9ba5 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -137,23 +137,23 @@ KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) : header()->setFont(KMyMoneyGlobalSettings::listHeaderFont()); - KIconLoader *kiconloader = TDEGlobal::iconLoader(); + TDEIconLoader *kiconloader = TDEGlobal::iconLoader(); m_contextMenu = new TDEPopupMenu(this); m_contextMenu->insertTitle(i18n("Price Options")); - m_contextMenu->insertItem(kiconloader->loadIcon("filenew", KIcon::Small), + m_contextMenu->insertItem(kiconloader->loadIcon("filenew", TDEIcon::Small), i18n("New..."), this, TQT_SIGNAL(newPrice())); - m_contextMenu->insertItem(kiconloader->loadIcon("edit", KIcon::Small), + m_contextMenu->insertItem(kiconloader->loadIcon("edit", TDEIcon::Small), i18n("Edit..."), this, TQT_SIGNAL(editPrice())); - m_contextMenu->insertItem(kiconloader->loadIcon("connect_creating", KIcon::Small), + m_contextMenu->insertItem(kiconloader->loadIcon("connect_creating", TDEIcon::Small), i18n("Online Price Update..."), this, TQT_SIGNAL(onlinePriceUpdate())); - m_contextMenu->insertItem(kiconloader->loadIcon("delete", KIcon::Small), + m_contextMenu->insertItem(kiconloader->loadIcon("delete", TDEIcon::Small), i18n("Delete..."), this, TQT_SIGNAL(deletePrice())); diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index ea5ea2c..2773258 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -212,7 +212,7 @@ void Transaction::markAttachment(TQPainter* painter, int /* row */, int /* col * painter->save(); if(clip.isNull()) { - clip = TDEGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState); + clip = TDEGlobal::iconLoader()->loadIcon("attach", TDEIcon::Small, TDEIcon::SizeSmall, TDEIcon::DefaultState); if(clip.height() > h) { clip.resize(h, h); } diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h index 2a1f2e2..2bf069f 100644 --- a/kmymoney2/widgets/transactionsortoption.ui.h +++ b/kmymoney2/widgets/transactionsortoption.ui.h @@ -26,11 +26,11 @@ void TransactionSortOption::init() { - KIconLoader* il = TDEGlobal::iconLoader(); - m_addButton->setIconSet(TQIconSet(il->loadIcon("1rightarrow", KIcon::Small, KIcon::SizeSmall))); - m_removeButton->setIconSet(TQIconSet(il->loadIcon("1leftarrow", KIcon::Small, KIcon::SizeSmall))); - m_upButton->setIconSet(TQIconSet(il->loadIcon("1uparrow", KIcon::Small, KIcon::SizeSmall))); - m_downButton->setIconSet(TQIconSet(il->loadIcon("1downarrow", KIcon::Small, KIcon::SizeSmall))); + TDEIconLoader* il = TDEGlobal::iconLoader(); + m_addButton->setIconSet(TQIconSet(il->loadIcon("1rightarrow", TDEIcon::Small, TDEIcon::SizeSmall))); + m_removeButton->setIconSet(TQIconSet(il->loadIcon("1leftarrow", TDEIcon::Small, TDEIcon::SizeSmall))); + m_upButton->setIconSet(TQIconSet(il->loadIcon("1uparrow", TDEIcon::Small, TDEIcon::SizeSmall))); + m_downButton->setIconSet(TQIconSet(il->loadIcon("1downarrow", TDEIcon::Small, TDEIcon::SizeSmall))); // don't allow sorting of the selected entries m_selectedList->setSortColumn(-1); -- cgit v1.2.1