From 6c1d52c8248adb9189c944a28efde52330e99b66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:21:28 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmymoney2/dialogs/settings/ksettingshome.cpp | 4 ++-- kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kmymoney2/dialogs/settings') diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp index afdb28b..94d005e 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.cpp +++ b/kmymoney2/dialogs/settings/ksettingshome.cpp @@ -47,7 +47,7 @@ KSettingsHome::KSettingsHome(TQWidget* parent, const char* name) : m_homePageList->header()->hide(); m_homePageList->setAllColumnsShowFocus(true); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem upButtonItem( i18n( "&Up" ), TQIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)), i18n("Move selected item up"), @@ -91,7 +91,7 @@ void KSettingsHome::slotLoadItems(void) m_homePageList->clear(); TQCheckListItem *sel = 0; - TQFontMetrics fm( KGlobalSettings::generalFont()); + TQFontMetrics fm( TDEGlobalSettings::generalFont()); TQCheckListItem* last = 0; for(it = list.begin(); it != list.end(); ++it) { diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp index 8a774da..e3efec6 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp @@ -48,7 +48,7 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *parent, const char *name m_updateButton->setEnabled(false); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem updateButtenItem( i18n("&Update" ), TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), -- cgit v1.2.1