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/views/kaccountsview.cpp | 6 +-- kmymoney2/views/kbudgetview.cpp | 2 +- kmymoney2/views/kcategoriesview.cpp | 2 +- kmymoney2/views/kforecastview.cpp | 8 ++-- kmymoney2/views/kgloballedgerview.cpp | 78 +++++++++++++++++----------------- kmymoney2/views/kgloballedgerview.h | 6 +-- kmymoney2/views/khomeview.cpp | 12 +++--- kmymoney2/views/kinvestmentview.cpp | 4 +- kmymoney2/views/kmymoneyview.cpp | 6 +-- kmymoney2/views/kmymoneyview.h | 4 +- kmymoney2/views/kpayeesview.cpp | 8 ++-- kmymoney2/views/kreportsview.cpp | 12 +++--- kmymoney2/views/kscheduledlistitem.cpp | 4 +- kmymoney2/views/kscheduledview.cpp | 10 ++--- 14 files changed, 81 insertions(+), 81 deletions(-) (limited to 'kmymoney2/views') diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index 8d28fb0..0e472ae 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -82,7 +82,7 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : } // setup icons for collapse and expand button - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); KGuiItem collapseGuiItem("", TQIconSet(ic->loadIcon("viewmag-", KIcon::Small, KIcon::SizeSmall)), TQString(), @@ -97,7 +97,7 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_tab->setCurrentPage(config->readNumEntry("KAccountsView_LastType", 0)); @@ -142,7 +142,7 @@ void KAccountsView::slotTabChanged(TQWidget* _tab) AccountsViewTab tab = static_cast(m_tab->indexOf(_tab)); // remember this setting for startup - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KAccountsView_LastType", tab); diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp index 6cc6aa4..2fd5ec0 100644 --- a/kmymoney2/views/kbudgetview.cpp +++ b/kmymoney2/views/kbudgetview.cpp @@ -103,7 +103,7 @@ KBudgetView::KBudgetView(TQWidget *parent, const char *name ) : m_accountTree->setSorting(-1); m_budgetList->setSorting(0); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem newButtenItem( TQString(""), TQIconSet(il->loadIcon("file_new", KIcon::Small, KIcon::SizeSmall)), i18n("Creates a new budget"), diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp index 542cf7e..6be002a 100644 --- a/kmymoney2/views/kcategoriesview.cpp +++ b/kmymoney2/views/kcategoriesview.cpp @@ -61,7 +61,7 @@ KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) : } // setup icons for collapse and expand button - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); KGuiItem collapseGuiItem("", TQIconSet(ic->loadIcon("viewmag-", KIcon::Small, KIcon::SizeSmall)), TQString(), diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index bd8de0b..88e5afb 100644 --- a/kmymoney2/views/kforecastview.cpp +++ b/kmymoney2/views/kforecastview.cpp @@ -52,7 +52,7 @@ KForecastView::KForecastView(TQWidget *parent, const char *name) : for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_tab->setCurrentPage(config->readNumEntry("KForecastView_LastType", 0)); @@ -83,7 +83,7 @@ void KForecastView::slotTabChanged(TQWidget* _tab) ForecastViewTab tab = static_cast(m_tab->indexOf(_tab)); // remember this setting for startup - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KForecastView_LastType", tab); @@ -447,7 +447,7 @@ void KForecastView::loadAdvancedView(void) advancedItem->setText(it_c, amount, amountMM.isNegative()); it_c++; - TQString dateString = KGlobal::locale()->formatDate(minDate, true); + TQString dateString = TDEGlobal::locale()->formatDate(minDate, true); advancedItem->setText(it_c, dateString, amountMM.isNegative()); it_c++; } @@ -464,7 +464,7 @@ void KForecastView::loadAdvancedView(void) advancedItem->setText(it_c, amount, amountMM.isNegative()); it_c++; - TQString dateString = KGlobal::locale()->formatDate(maxDate, true); + TQString dateString = TDEGlobal::locale()->formatDate(maxDate, true); advancedItem->setText(it_c, dateString, amountMM.isNegative()); it_c++; } diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index 6806ea7..4eaa389 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -58,7 +58,7 @@ #include "../widgets/scheduledtransaction.h" -class KGlobalLedgerView::Private +class TDEGlobalLedgerView::Private { public: Private(); @@ -134,7 +134,7 @@ bool MousePressFilter::eventFilter(TQObject* o, TQEvent* e) } -KGlobalLedgerView::Private::Private() : +TDEGlobalLedgerView::Private::Private() : m_mousePressFilter(0), m_registerSearchLine(0), m_inLoading(false), @@ -143,9 +143,9 @@ KGlobalLedgerView::Private::Private() : { } -TQDate KGlobalLedgerView::m_lastPostDate; +TQDate TDEGlobalLedgerView::m_lastPostDate; -KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) +TDEGlobalLedgerView::TDEGlobalLedgerView(TQWidget *parent, const char *name ) : KMyMoneyViewBase(parent, name, i18n("Ledgers")), d(new Private), m_needReload(false), @@ -170,7 +170,7 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) // the account button at the right of the toolbar // I leave the code commented here for a while, so that I see // how I can add other widgets at this point - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); m_toolbar->insertButton(il->loadIcon("document", KIcon::Small, KIcon::SizeSmall), 1,true,i18n("Account")); //m_toolbar->setMaximumSize(50,20); @@ -257,18 +257,18 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) d->m_mousePressFilter->addWidget(m_registerFrame); } -KGlobalLedgerView::~KGlobalLedgerView() +TDEGlobalLedgerView::~TDEGlobalLedgerView() { delete d; } -void KGlobalLedgerView::slotAboutToSelectItem(KMyMoneyRegister::RegisterItem* item, bool& okToSelect) +void TDEGlobalLedgerView::slotAboutToSelectItem(KMyMoneyRegister::RegisterItem* item, bool& okToSelect) { Q_UNUSED(item); emit cancelOrEndEdit(okToSelect); } -void KGlobalLedgerView::slotLoadView(void) +void TDEGlobalLedgerView::slotLoadView(void) { m_needReload = true; if(isVisible()) { @@ -281,7 +281,7 @@ void KGlobalLedgerView::slotLoadView(void) } } -void KGlobalLedgerView::clear(void) +void TDEGlobalLedgerView::clear(void) { // clear current register contents m_register->clear(); @@ -311,7 +311,7 @@ void KGlobalLedgerView::clear(void) d->m_precision = 2; } -void KGlobalLedgerView::loadView(void) +void TDEGlobalLedgerView::loadView(void) { MYMONEYTRACER(tracer); @@ -720,7 +720,7 @@ void KGlobalLedgerView::loadView(void) emit accountSelected(m_account); } -void KGlobalLedgerView::updateSummaryLine(const TQMap& actBalance, const TQMap& clearedBalance) +void TDEGlobalLedgerView::updateSummaryLine(const TQMap& actBalance, const TQMap& clearedBalance) { MyMoneyFile* file = MyMoneyFile::instance(); m_leftSummaryLabel->show(); @@ -738,7 +738,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap& a TQDate reconcileDate = m_account.lastReconciliationDate(); if(reconcileDate.isValid()) { - m_leftSummaryLabel->setText(i18n("Last reconciled: %1").arg(KGlobal::locale()->formatDate(reconcileDate, true))); + m_leftSummaryLabel->setText(i18n("Last reconciled: %1").arg(TDEGlobal::locale()->formatDate(reconcileDate, true))); } else { m_leftSummaryLabel->setText(i18n("Never reconciled")); } @@ -785,7 +785,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap& a } } -void KGlobalLedgerView::slotUpdateViewPos(void) +void TDEGlobalLedgerView::slotUpdateViewPos(void) { m_register->setUpdatesEnabled(true); @@ -800,14 +800,14 @@ void KGlobalLedgerView::slotUpdateViewPos(void) } -void KGlobalLedgerView::resizeEvent(TQResizeEvent* ev) +void TDEGlobalLedgerView::resizeEvent(TQResizeEvent* ev) { m_register->resize(KMyMoneyRegister::DetailColumn); m_form->resize(KMyMoneyTransactionForm::ValueColumn1); KMyMoneyViewBase::resizeEvent(ev); } -void KGlobalLedgerView::loadAccounts(void) +void TDEGlobalLedgerView::loadAccounts(void) { MyMoneyFile* file = MyMoneyFile::instance(); @@ -854,7 +854,7 @@ void KGlobalLedgerView::loadAccounts(void) } } -void KGlobalLedgerView::selectTransaction(const TQString& id) +void TDEGlobalLedgerView::selectTransaction(const TQString& id) { if(!id.isEmpty()) { KMyMoneyRegister::RegisterItem* p = m_register->lastItem(); @@ -872,7 +872,7 @@ void KGlobalLedgerView::selectTransaction(const TQString& id) } } -void KGlobalLedgerView::slotSelectAllTransactions(void) +void TDEGlobalLedgerView::slotSelectAllTransactions(void) { KMyMoneyRegister::RegisterItem* p = m_register->firstItem(); while(p) { @@ -891,7 +891,7 @@ void KGlobalLedgerView::slotSelectAllTransactions(void) emit transactionsSelected(list); } -void KGlobalLedgerView::slotSetReconcileAccount(const MyMoneyAccount& acc, const TQDate& reconciliationDate, const MyMoneyMoney& endingBalance) +void TDEGlobalLedgerView::slotSetReconcileAccount(const MyMoneyAccount& acc, const TQDate& reconciliationDate, const MyMoneyMoney& endingBalance) { if(d->m_reconciliationAccount != acc.id()) { // make sure the account is selected @@ -920,12 +920,12 @@ void KGlobalLedgerView::slotSetReconcileAccount(const MyMoneyAccount& acc, const } } -bool KGlobalLedgerView::isReconciliationAccount(void) const +bool TDEGlobalLedgerView::isReconciliationAccount(void) const { return m_account.id() == d->m_reconciliationAccount; } -bool KGlobalLedgerView::slotSelectAccount(const MyMoneyObject& obj) +bool TDEGlobalLedgerView::slotSelectAccount(const MyMoneyObject& obj) { if(typeid(obj) != typeid(MyMoneyAccount)) return false; @@ -940,7 +940,7 @@ bool KGlobalLedgerView::slotSelectAccount(const MyMoneyObject& obj) return rc; } -bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& transactionId) +bool TDEGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& transactionId) { bool rc = true; @@ -970,7 +970,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr return rc; } -void KGlobalLedgerView::slotNewTransaction(KMyMoneyRegister::Action id) +void TDEGlobalLedgerView::slotNewTransaction(KMyMoneyRegister::Action id) { if(!m_inEditMode) { d->m_action = id; @@ -978,12 +978,12 @@ void KGlobalLedgerView::slotNewTransaction(KMyMoneyRegister::Action id) } } -void KGlobalLedgerView::slotNewTransaction(void) +void TDEGlobalLedgerView::slotNewTransaction(void) { slotNewTransaction(KMyMoneyRegister::ActionNone); } -void KGlobalLedgerView::setupDefaultAction(void) +void TDEGlobalLedgerView::setupDefaultAction(void) { switch(m_account.accountType()) { // TODO if we want a different action for different account types @@ -994,7 +994,7 @@ void KGlobalLedgerView::setupDefaultAction(void) } } -bool KGlobalLedgerView::selectEmptyTransaction(void) +bool TDEGlobalLedgerView::selectEmptyTransaction(void) { bool rc = false; @@ -1026,7 +1026,7 @@ bool KGlobalLedgerView::selectEmptyTransaction(void) return rc; } -TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::SelectedTransactions& list) +TransactionEditor* TDEGlobalLedgerView::startEdit(const KMyMoneyRegister::SelectedTransactions& list) { // we use the warnlevel to keep track, if we have to warn the // user that some or all splits have been reconciled or if the @@ -1168,7 +1168,7 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected return editor; } -void KGlobalLedgerView::slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions& list) +void TDEGlobalLedgerView::slotLeaveEditMode(const KMyMoneyRegister::SelectedTransactions& list) { m_inEditMode = false; tqApp->removeEventFilter(d->m_mousePressFilter); @@ -1203,11 +1203,11 @@ void KGlobalLedgerView::slotLeaveEditMode(const KMyMoneyRegister::SelectedTransa m_register->setFocus(); } -bool KGlobalLedgerView::focusNextPrevChild(bool next) +bool TDEGlobalLedgerView::focusNextPrevChild(bool next) { bool rc = false; - // tqDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); + // tqDebug("TDEGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); if(m_inEditMode) { TQWidget *w = 0; TQWidget *currentWidget; @@ -1244,7 +1244,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) } -void KGlobalLedgerView::show(void) +void TDEGlobalLedgerView::show(void) { if(m_needReload) { if(!m_inEditMode) { @@ -1263,7 +1263,7 @@ void KGlobalLedgerView::show(void) KMyMoneyViewBase::show(); } -bool KGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e) +bool TDEGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; @@ -1298,7 +1298,7 @@ bool KGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e) return rc; } -void KGlobalLedgerView::slotSortOptions(void) +void TDEGlobalLedgerView::slotSortOptions(void) { KSortOptionDlg* dlg = new KSortOptionDlg(this); @@ -1341,19 +1341,19 @@ void KGlobalLedgerView::slotSortOptions(void) delete dlg; } -void KGlobalLedgerView::slotToggleTransactionMark(KMyMoneyRegister::Transaction* /* t */) +void TDEGlobalLedgerView::slotToggleTransactionMark(KMyMoneyRegister::Transaction* /* t */) { if(!m_inEditMode) { emit toggleReconciliationFlag(); } } -void KGlobalLedgerView::slotKeepPostDate(const TQDate& date) +void TDEGlobalLedgerView::slotKeepPostDate(const TQDate& date) { m_lastPostDate = date; } -bool KGlobalLedgerView::canCreateTransactions(TQString& tooltip) const +bool TDEGlobalLedgerView::canCreateTransactions(TQString& tooltip) const { bool rc = true; if(m_account.id().isEmpty()) { @@ -1372,7 +1372,7 @@ bool KGlobalLedgerView::canCreateTransactions(TQString& tooltip) const return rc; } -bool KGlobalLedgerView::canProcessTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const +bool TDEGlobalLedgerView::canProcessTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const { if(m_register->focusItem() == 0) return false; @@ -1384,17 +1384,17 @@ bool KGlobalLedgerView::canProcessTransactions(const KMyMoneyRegister::SelectedT return list.count() > 0; } -bool KGlobalLedgerView::canModifyTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const +bool TDEGlobalLedgerView::canModifyTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const { return canProcessTransactions(list,tooltip) && list.canModify(); } -bool KGlobalLedgerView::canDuplicateTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const +bool TDEGlobalLedgerView::canDuplicateTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const { return canProcessTransactions(list,tooltip) && list.canDuplicate(); } -bool KGlobalLedgerView::canEditTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const +bool TDEGlobalLedgerView::canEditTransactions(const KMyMoneyRegister::SelectedTransactions& list, TQString& tooltip) const { // check if we can edit the list of transactions. We can edit, if // diff --git a/kmymoney2/views/kgloballedgerview.h b/kmymoney2/views/kgloballedgerview.h index 401ccf5..d6f83e0 100644 --- a/kmymoney2/views/kgloballedgerview.h +++ b/kmymoney2/views/kgloballedgerview.h @@ -128,13 +128,13 @@ private: /** * @author Thomas Baumgart */ -class KGlobalLedgerView : public KMyMoneyViewBase +class TDEGlobalLedgerView : public KMyMoneyViewBase { Q_OBJECT public: - KGlobalLedgerView(TQWidget *parent=0, const char *name=0); - ~KGlobalLedgerView(); + TDEGlobalLedgerView(TQWidget *parent=0, const char *name=0); + ~TDEGlobalLedgerView(); /** * This method returns the id of the currently selected account diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index 47bba63..3860c04 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -214,7 +214,7 @@ void KHomeView::loadView(void) //clear the forecast flag so it will be reloaded m_forecast.setForecastDone(false); - TQString filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); + TQString filename = TDEGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); TQString header = TQString("\n\n").arg(filename); header += KMyMoneyUtils::variableCSS(); @@ -322,7 +322,7 @@ void KHomeView::showNetWorthGraph(void) chartWidget->params()->setLineMarker(false); chartWidget->params()->setLegendPosition(KDChartParams::NoLegend); chartWidget->params()->setLineWidth(2); - chartWidget->params()->setDataColor(0, KGlobalSettings::textColor()); + chartWidget->params()->setDataColor(0, TDEGlobalSettings::textColor()); // draw future values in a different line style KDChartPropertySet propSetFutureValue("future value", KMM_KDCHART_PROPSET_NORMAL_DATA); @@ -350,7 +350,7 @@ void KHomeView::showNetWorthGraph(void) } TQPixmap pm(chartWidget->width(), chartWidget->height()); - pm.fill(KGlobalSettings::baseColor()); + pm.fill(TDEGlobalSettings::baseColor()); TQPainter p(&pm); chartWidget->paintTo(p); @@ -641,12 +641,12 @@ void KHomeView::showPaymentEntry(const MyMoneySchedule& sched, int cnt) MyMoneySplit sp = t.splitByAccount(acc.id(), true); TQString pathEnter, pathSkip; - KGlobal::iconLoader()->loadIcon("key_enter", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathEnter); - KGlobal::iconLoader()->loadIcon("player_fwd", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathSkip); + TDEGlobal::iconLoader()->loadIcon("key_enter", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathEnter); + TDEGlobal::iconLoader()->loadIcon("player_fwd", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, &pathSkip); //show payment date tmp = TQString("") + - KGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) + + TDEGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) + ""; if(pathEnter.length() > 0) tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").arg(sched.id()), i18n("Enter schedule")) + TQString("

").arg(pathEnter) + linkend(); diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp index 57d7aa8..74f9524 100644 --- a/kmymoney2/views/kinvestmentview.cpp +++ b/kmymoney2/views/kinvestmentview.cpp @@ -85,7 +85,7 @@ KInvestmentView::KInvestmentView(TQWidget *parent, const char *name) : m_table->header()->setResizeEnabled(true); m_table->setAllColumnsShowFocus(true); m_table->setShowSortIndicator(true); - m_table->restoreLayout(KGlobal::config(), "Investment Settings"); + m_table->restoreLayout(TDEGlobal::config(), "Investment Settings"); connect(m_table, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint&)), this, TQT_SLOT(slotListContextMenu(KListView*, TQListViewItem*, const TQPoint&))); @@ -101,7 +101,7 @@ KInvestmentView::KInvestmentView(TQWidget *parent, const char *name) : KInvestmentView::~KInvestmentView() { - m_table->saveLayout(KGlobal::config(), "Investment Settings"); + m_table->saveLayout(TDEGlobal::config(), "Investment Settings"); delete d; } diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index e622260..a6c8f34 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -210,7 +210,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *parent, const char *name) // Page 6 m_ledgerViewFrame = addVBoxPage( i18n("Ledgers"), i18n("Ledgers"), DesktopIcon("ledger", iconSize)); - m_ledgerView = new KGlobalLedgerView(m_ledgerViewFrame, "GlobalLedgerView"); + m_ledgerView = new TDEGlobalLedgerView(m_ledgerViewFrame, "GlobalLedgerView"); connect(m_ledgerView, TQT_SIGNAL(accountSelected(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotSelectAccount(const MyMoneyObject&))); connect(m_ledgerView, TQT_SIGNAL(openContextMenu()), kmymoney2, TQT_SLOT(slotShowTransactionContextMenu())); connect(m_ledgerView, TQT_SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&)), kmymoney2, TQT_SLOT(slotSelectTransactions(const KMyMoneyRegister::SelectedTransactions&))); @@ -890,7 +890,7 @@ bool KMyMoneyView::initializeStorage() selectBaseCurrency(); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); int page; config->setGroup("General Options"); if(KMyMoneyGlobalSettings::startLastViewSelected() != 0) { @@ -1630,7 +1630,7 @@ void KMyMoneyView::progressCallback(int current, int total, const TQString& msg) void KMyMoneyView::slotRememberPage(TQWidget* w) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("LastViewSelected", pageIndex(w)); config->sync(); diff --git a/kmymoney2/views/kmymoneyview.h b/kmymoney2/views/kmymoneyview.h index b023007..320abeb 100644 --- a/kmymoney2/views/kmymoneyview.h +++ b/kmymoney2/views/kmymoneyview.h @@ -54,7 +54,7 @@ class KInstitutionsView; class KPayeesView; class KBudgetView; class KScheduledView; -class KGlobalLedgerView; +class TDEGlobalLedgerView; class IMyMoneyStorageFormat; class MyMoneyTransaction; class KInvestmentView; @@ -123,7 +123,7 @@ private: KPayeesView *m_payeesView; KBudgetView *m_budgetView; KScheduledView *m_scheduledView; - KGlobalLedgerView *m_ledgerView; + TDEGlobalLedgerView *m_ledgerView; KInvestmentView *m_investmentView; KReportsView* m_reportsView; KForecastView* m_forecastView; diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index 4e21042..43404c0 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -336,7 +336,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : layout10->addWidget(m_splitter); // use the size settings of the last run (if any) - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); TQValueList sizes = config->readIntListEntry("KPayeesViewSplitterSize"); if(sizes.size() == 2) { @@ -364,7 +364,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : labelDefaultAccount->setEnabled(false); comboDefaultAccount->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"), @@ -409,7 +409,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : KPayeesView::~KPayeesView() { // remember the splitter settings for startup - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KPayeesViewSplitterSize", m_splitter->sizes()); } @@ -721,7 +721,7 @@ void KPayeesView::showTransactions(void) item = new KTransactionListItem(m_transactionView, item, s.accountId(), t->id()); item->setText(0, s.number()); - item->setText(1, KGlobal::locale()->formatDate(t->postDate(), true)); + item->setText(1, TDEGlobal::locale()->formatDate(t->postDate(), true)); TQString txt; if(s.action() == MyMoneySplit::ActionAmortization) { diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index c33ea08..965a502 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -112,10 +112,10 @@ KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& re m_layout->addWidget( m_chartView ); // I like this icon... - TQString icon = KGlobal::dirs()->findResource("icon", "default.tde/16x16/mimetypes/spreadsheet.png"); + TQString icon = TDEGlobal::dirs()->findResource("icon", "default.tde/16x16/mimetypes/spreadsheet.png"); // but if it's not there, we'll use ye ol' standard icon if ( icon == TQString() ) - icon = KGlobal::dirs()->findResource("icon", "hicolor/16x16/apps/kmymoney2.png"); + icon = TDEGlobal::dirs()->findResource("icon", "hicolor/16x16/apps/kmymoney2.png"); parent->insertTab( this, TQIconSet(TQPixmap(icon)), report.name() ); parent->setTabEnabled( this, true ); @@ -156,7 +156,7 @@ void KReportsView::KReportTab::saveAs( const TQString& filename, bool includeCSS else { TQTextStream stream(&file); - TQRegExp exp(TQString("(.*)(()(.*)").arg(KGlobal::locale()->encoding())); + TQRegExp exp(TQString("(.*)(()(.*)").arg(TDEGlobal::locale()->encoding())); TQString table = createTable(); if(exp.search(table) != -1 && includeCSS) { TQFile cssFile(exp.cap(3)); @@ -234,13 +234,13 @@ TQString KReportsView::KReportTab::createTable(const TQString& links) { TQString filename; if(!MyMoneyFile::instance()->value("reportstylesheet").isEmpty()) - filename = KGlobal::dirs()->findResource("appdata", TQString("html/%1").arg(MyMoneyFile::instance()->value("reportstylesheet"))); + filename = TDEGlobal::dirs()->findResource("appdata", TQString("html/%1").arg(MyMoneyFile::instance()->value("reportstylesheet"))); if(filename.isEmpty()) - filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); + filename = TDEGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); TQString header = TQString("\n") + TQString("").arg(filename); - header += TQString("").arg(KGlobal::locale()->encoding()); + header += TQString("").arg(TDEGlobal::locale()->encoding()); header += KMyMoneyUtils::variableCSS(); header += "\n"; diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp index 849b0c8..dc44b46 100644 --- a/kmymoney2/views/kscheduledlistitem.cpp +++ b/kmymoney2/views/kscheduledlistitem.cpp @@ -137,7 +137,7 @@ KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoney setText(4, i18n("Finished")); } else - setText(4, KGlobal::locale()->formatDate(schedule.adjustedNextDueDate(), true)); + setText(4, TDEGlobal::locale()->formatDate(schedule.adjustedNextDueDate(), true)); setText(5, i18n(schedule.occurenceToString())); setText(6, KMyMoneyUtils::paymentMethodToString(schedule.paymentType())); @@ -158,7 +158,7 @@ void KScheduledListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int col { TQColorGroup cg2(cg); - TQColor textColour = KGlobalSettings::textColor(); + TQColor textColour = TDEGlobalSettings::textColor(); TQFont cellFont = KMyMoneyGlobalSettings::listCellFont(); // avoid colorizing lines that do not contain a schedule diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index dcf8052..2635d7d 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -94,7 +94,7 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : m_qbuttonNew->setGuiItem(KMyMoneyUtils::scheduleNewGuiItem()); m_accountsCombo->setGuiItem(KMyMoneyUtils::accountsFilterGuiItem()); - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); m_tabWidget->setTabIconSet(m_listTab, TQIconSet(il->loadIcon("contents", KIcon::Small, KIcon::SizeSmall))); m_tabWidget->setTabIconSet(m_calendarTab, TQIconSet(il->loadIcon("calendartab", KIcon::User, KIcon::SizeSmall))); @@ -309,7 +309,7 @@ void KScheduledView::slotRearrange(void) void KScheduledView::readConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_openBills = config->readBoolEntry("KScheduleView_openBills", true); m_openDeposits = config->readBoolEntry("KScheduleView_openDeposits", true); @@ -318,13 +318,13 @@ void KScheduledView::readConfig(void) m_tabWidget->setCurrentPage(config->readNumEntry("KScheduleView_tab", 0)); m_qlistviewScheduled->header()->setFont(KMyMoneyGlobalSettings::listHeaderFont()); - m_qlistviewScheduled->restoreLayout(KGlobal::config(), "Schedule View Settings"); + m_qlistviewScheduled->restoreLayout(TDEGlobal::config(), "Schedule View Settings"); } void KScheduledView::writeConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KScheduleView_openBills", m_openBills); config->writeEntry("KScheduleView_openDeposits", m_openDeposits); @@ -333,7 +333,7 @@ void KScheduledView::writeConfig(void) config->writeEntry("KScheduleView_tab", m_tabWidget->currentPageIndex()); config->sync(); - m_qlistviewScheduled->saveLayout(KGlobal::config(), "Schedule View Settings"); + m_qlistviewScheduled->saveLayout(TDEGlobal::config(), "Schedule View Settings"); } void KScheduledView::slotListViewContextMenu(KListView* /* view */, TQListViewItem *item, const TQPoint& /* pos */) -- cgit v1.2.1