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/kaccountselectdlg.cpp | 2 +- kmymoney2/dialogs/kbackupdlg.cpp | 8 +++--- kmymoney2/dialogs/kbalancechartdlg.cpp | 2 +- kmymoney2/dialogs/kchooseimportexportdlg.cpp | 4 +-- kmymoney2/dialogs/kcsvprogressdlg.cpp | 4 +-- kmymoney2/dialogs/kcurrencycalculator.cpp | 2 +- kmymoney2/dialogs/keditequityentrydlg.cpp | 2 +- kmymoney2/dialogs/keditloanwizard.cpp | 6 ++--- kmymoney2/dialogs/kendingbalancedlg.cpp | 6 ++--- kmymoney2/dialogs/kenterscheduledlg.cpp | 6 ++--- kmymoney2/dialogs/kequitypriceupdatedlg.cpp | 4 +-- kmymoney2/dialogs/kexportdlg.cpp | 8 +++--- kmymoney2/dialogs/kimportdlg.cpp | 10 ++++---- kmymoney2/dialogs/kmymoneypricedlg.cpp | 2 +- kmymoney2/dialogs/kmymoneysplittable.cpp | 4 +-- kmymoney2/dialogs/knewaccountdlg.cpp | 2 +- kmymoney2/dialogs/knewloanwizard.cpp | 6 ++--- kmymoney2/dialogs/kreconciledlg.cpp | 30 +++++++++++----------- kmymoney2/dialogs/ksecuritylisteditor.cpp | 2 +- kmymoney2/dialogs/ksplittransactiondlg.cpp | 2 +- kmymoney2/dialogs/kstartdlg.cpp | 10 ++++---- kmymoney2/dialogs/mymoneyqifprofileeditor.cpp | 16 ++++++------ kmymoney2/dialogs/settings/ksettingshome.cpp | 4 +-- .../dialogs/settings/ksettingsonlinequotes.cpp | 2 +- kmymoney2/dialogs/transactioneditor.cpp | 2 +- 25 files changed, 73 insertions(+), 73 deletions(-) (limited to 'kmymoney2/dialogs') diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp index d572655..4b04752 100644 --- a/kmymoney2/dialogs/kaccountselectdlg.cpp +++ b/kmymoney2/dialogs/kaccountselectdlg.cpp @@ -60,7 +60,7 @@ KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountT slotReloadWidget(); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem skipButtonItem( i18n( "&Skip" ), TQIconSet(il->loadIcon("redo", KIcon::Small, KIcon::SizeSmall)), i18n("Skip this transaction"), diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp index 08e0cef..b0ab43b 100644 --- a/kmymoney2/dialogs/kbackupdlg.cpp +++ b/kmymoney2/dialogs/kbackupdlg.cpp @@ -50,7 +50,7 @@ KBackupDlg::KBackupDlg( TQWidget* parent, const char* name/*, bool modal*/) readConfig(); // add icons to buttons - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); btnOK->setGuiItem(KStdGuiItem::ok()); btnCancel->setGuiItem(KStdGuiItem::cancel()); @@ -72,14 +72,14 @@ KBackupDlg::~KBackupDlg() void KBackupDlg::chooseButtonClicked() { - KURL newDir = KDirSelectDialog::selectDirectory(KGlobalSettings::documentPath()); + KURL newDir = KDirSelectDialog::selectDirectory(TDEGlobalSettings::documentPath()); if (newDir.hasPath()) txtMountPoint->setText(newDir.path()); } void KBackupDlg::readConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); mountCheckBox->setChecked(config->readBoolEntry("KBackupDlg_mountDevice", false)); txtMountPoint->setText(config->readEntry("KBackupDlg_BackupMountPoint", "/mnt/floppy")); @@ -87,7 +87,7 @@ void KBackupDlg::readConfig(void) void KBackupDlg::writeConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KBackupDlg_mountDevice", mountCheckBox->isChecked()); config->writeEntry("KBackupDlg_BackupMountPoint", txtMountPoint->text()); diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp index 45ca032..4d52af5 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.cpp +++ b/kmymoney2/dialogs/kbalancechartdlg.cpp @@ -94,7 +94,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare 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); diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp index 79c19e8..9386e12 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp +++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp @@ -88,14 +88,14 @@ TQString KChooseImportExportDlg::importExportType(void) void KChooseImportExportDlg::readConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_lastType = config->readEntry("KChooseImportExportDlg_LastType"); } void KChooseImportExportDlg::writeConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KChooseImportExportDlg_LastType", typeCombo->currentText()); config->sync(); diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp index 2330a8a..9128a3a 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.cpp +++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp @@ -214,7 +214,7 @@ void KCsvProgressDlg::slotFileTextChanged(const TQString& text) void KCsvProgressDlg::readConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); m_kmymoneydateStart->setDate(kconfig->readDateTimeEntry("KCsvProgressDlg_StartDate").date()); m_kmymoneydateEnd->setDate(kconfig->readDateTimeEntry("KCsvProgressDlg_EndDate").date()); @@ -227,7 +227,7 @@ void KCsvProgressDlg::readConfig(void) void KCsvProgressDlg::writeConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); kconfig->writeEntry("KCsvProgressDlg_LastFile", m_qlineeditFile->text()); kconfig->writeEntry("KCsvProgressDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 54e6f6e..63ad18c 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.cpp +++ b/kmymoney2/dialogs/kcurrencycalculator.cpp @@ -132,7 +132,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo m_fromAmount->setText(m_value.formatMoney("", MyMoneyMoney::denomToPrec(m_fromCurrency.smallestAccountFraction()))); - m_dateText->setText(KGlobal::locale()->formatDate(date, true)); + m_dateText->setText(TDEGlobal::locale()->formatDate(date, true)); m_fromType->setText(KMyMoneyUtils::securityTypeToString(m_fromCurrency.securityType())); m_toType->setText(KMyMoneyUtils::securityTypeToString(m_toCurrency.securityType())); diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp index b5919b5..cb32a64 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.cpp +++ b/kmymoney2/dialogs/keditequityentrydlg.cpp @@ -66,7 +66,7 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity // kpvPriceHistory->setHistory(m_selectedSecurity.priceHistory()); // add icons to buttons - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); btnOK->setGuiItem(KStdGuiItem::ok()); btnCancel->setGuiItem(KStdGuiItem::cancel()); btnRemoveEntry->setGuiItem(KStdGuiItem::remove()); diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index b9a2fcc..4ad5362 100644 --- a/kmymoney2/dialogs/keditloanwizard.cpp +++ b/kmymoney2/dialogs/keditloanwizard.cpp @@ -57,7 +57,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent m_effectiveDateLabel->setText(TQString("\n") + i18n( "Please enter the date from which on the following changes will be effective. " "The date entered must be later than the opening date of this account (%1), but must " - "not be in the future. The default will be today.").arg(KGlobal::locale()->formatDate(account.openingDate(), true))); + "not be in the future. The default will be today.").arg(TDEGlobal::locale()->formatDate(account.openingDate(), true))); m_account = account; try { TQString id = m_account.value("schedule"); @@ -75,7 +75,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent m_effectiveDateNoteLabel->setText(TQString("\n") + i18n( "Note: you will not be able to modify this account today, because the opening date \"%1\" is in the future. " "Please revisit this dialog when the time has come." - ).arg(KGlobal::locale()->formatDate(m_account.openingDate(), true))); + ).arg(TDEGlobal::locale()->formatDate(m_account.openingDate(), true))); } else { m_effectiveDateNoteLabel->hide(); } @@ -434,7 +434,7 @@ void KEditLoanWizard::updateEditSummary(void) m_additionalFees7->setText(m_summaryAdditionalFees->text()); m_totalPayment7->setText(m_summaryTotalPeriodicPayment->text()); m_interestRate7->setText(m_summaryInterestRate->text()); - m_startDateChanges->setText(KGlobal::locale()->formatDate(m_effectiveChangeDateEdit->date(), true)); + m_startDateChanges->setText(TDEGlobal::locale()->formatDate(m_effectiveChangeDateEdit->date(), true)); // calculate the number of affected transactions MyMoneyTransactionFilter filter(m_account.id()); diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 5361613..1b10202 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -122,7 +122,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa m_lastStatementDate->setText(TQString()); if(account.lastReconciliationDate().isValid()) { m_lastStatementDate->setText(i18n("Last reconciled statement: %1") - .arg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); + .arg(TDEGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); } // remove all unwanted pages @@ -510,8 +510,8 @@ void KEndingBalanceLoanDlg::next(void) m_loanOverview->setText(i18n("KMyMoney has calculated the following amounts for " "interest and amortization according to recorded payments " "between %1 and %2.") - .arg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true)) - .arg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true))); + .arg(TDEGlobal::locale()->formatDate(m_startDateEdit->date(), true)) + .arg(TDEGlobal::locale()->formatDate(m_endDateEdit->date(), true))); // preload widgets with calculated values if they are empty if(m_amortizationTotalEdit->value().isZero() && !amortization.isZero()) diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index 596ba6d..c0f9d7b 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -68,8 +68,8 @@ KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *parent, const MyMoneySchedule& sc { d->m_schedule = schedule; d->m_extendedReturnCode = KMyMoneyUtils::Enter; - buttonOk->setIconSet(KGlobal::iconLoader()->loadIconSet("key_enter", KIcon::NoGroup, KIcon::SizeSmall, true)); - buttonSkip->setIconSet(KGlobal::iconLoader()->loadIconSet("player_fwd", KIcon::NoGroup, KIcon::SizeSmall, true)); + buttonOk->setIconSet(TDEGlobal::iconLoader()->loadIconSet("key_enter", KIcon::NoGroup, KIcon::SizeSmall, true)); + buttonSkip->setIconSet(TDEGlobal::iconLoader()->loadIconSet("player_fwd", KIcon::NoGroup, KIcon::SizeSmall, true)); buttonCancel->setGuiItem(KStdGuiItem::cancel()); buttonHelp->setGuiItem(KStdGuiItem::help()); buttonIgnore->setHidden(true); @@ -285,7 +285,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) { bool rc = false; - // tqDebug("KGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); + // tqDebug("TDEGlobalLedgerView::focusNextPrevChild(editmode=%s)", m_inEditMode ? "true" : "false"); TQWidget *w = 0; TQWidget *currentWidget; diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index de48ec7..9855698 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -169,7 +169,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s // previous versions of this dialog allowed to store a "Don't ask again" switch. // Since we don't support it anymore, we just get rid of it - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Notification Messages"); config->deleteEntry("KEquityPriceUpdateDlg::slotQuoteFailed::Price Update Failed"); } @@ -523,7 +523,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin } } } - item->setText(PRICE_COL, KGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); + item->setText(PRICE_COL, TDEGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); item->setText(DATE_COL, date.toString(Qt::ISODate)); logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id)); // make sure to make OK button available diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp index ac94c5f..1aef331 100644 --- a/kmymoney2/dialogs/kexportdlg.cpp +++ b/kmymoney2/dialogs/kexportdlg.cpp @@ -55,7 +55,7 @@ KExportDlg::KExportDlg(TQWidget *parent) loadAccounts(); // load button icons - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); m_qbuttonCancel->setGuiItem(KStdGuiItem::cancel()); KGuiItem okButtenItem( i18n( "&Export" ), @@ -130,7 +130,7 @@ void KExportDlg::loadProfiles(const bool selectLast) m_profileComboBox->clear(); TQStringList list; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); @@ -156,7 +156,7 @@ void KExportDlg::slotOkClicked() void KExportDlg::readConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); m_qlineeditFile->setText(kconfig->readEntry("KExportDlg_LastFile")); m_qcheckboxAccount->setChecked(kconfig->readBoolEntry("KExportDlg_AccountOpt", true)); @@ -169,7 +169,7 @@ void KExportDlg::readConfig(void) void KExportDlg::writeConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); kconfig->writeEntry("KExportDlg_LastFile", m_qlineeditFile->text()); kconfig->writeEntry("KExportDlg_AccountOpt", m_qcheckboxAccount->isChecked()); diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index 65865a5..d661455 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -62,7 +62,7 @@ KImportDlg::KImportDlg(TQWidget *parent, const char * name) // load button icons m_qbuttonCancel->setGuiItem(KStdGuiItem::cancel()); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem okButtenItem( i18n( "&Import" ), TQIconSet(il->loadIcon("fileimport", KIcon::Small, KIcon::SizeSmall)), i18n("Start operation"), @@ -106,7 +106,7 @@ void KImportDlg::slotBrowse() MyMoneyQifProfile tmpprofile; tmpprofile.loadProfile("Profile-" + profile()); - KFileDialog dialog(KGlobalSettings::documentPath(), + KFileDialog dialog(TDEGlobalSettings::documentPath(), i18n("%1|Import files\n%2|All files (*.*)").arg(tmpprofile.filterFileType()).arg("*"), this, i18n("Import File..."), true); dialog.setMode(KFile::File | KFile::ExistingOnly); @@ -130,14 +130,14 @@ void KImportDlg::slotOkClicked() void KImportDlg::readConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); m_qlineeditFile->setText(kconfig->readEntry("KImportDlg_LastFile")); } void KImportDlg::writeConfig(void) { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); kconfig->writeEntry("KImportDlg_LastFile", m_qlineeditFile->text()); kconfig->writeEntry("KImportDlg_LastProfile", m_profileComboBox->currentText()); @@ -188,7 +188,7 @@ void KImportDlg::loadProfiles(const bool selectLast) m_profileComboBox->clear(); TQStringList list; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp index c77028a..13c9ec6 100644 --- a/kmymoney2/dialogs/kmymoneypricedlg.cpp +++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp @@ -56,7 +56,7 @@ KMyMoneyPriceDlg::KMyMoneyPriceDlg(TQWidget* parent, const char *name) : KMyMoneyPriceDlgDecl(parent, name) { - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); KGuiItem removeButtenItem( i18n( "&Delete" ), TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete this entry"), diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index 405a8f7..bd37775 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -94,7 +94,7 @@ kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *parent, const char *name ) : // setup the context menu m_contextMenu = new KPopupMenu(this); - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); m_contextMenu->insertTitle(il->loadIcon("transaction", KIcon::MainToolbar), i18n("Split Options")); m_contextMenu->insertItem(il->loadIcon("edit", KIcon::Small), i18n("Edit..."), this, TQT_SLOT(slotStartEdit())); m_contextMenuDuplicate = m_contextMenu->insertItem(il->loadIcon("editcopy", KIcon::Small), i18n("Duplicate"), this, TQT_SLOT(slotDuplicateSplit())); @@ -851,7 +851,7 @@ TQWidget* kMyMoneySplitTable::createEditWidgets(void) m_editMemo->setFont(cellFont); // create buttons for the mouse users - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); m_registerButtonFrame = new TQFrame(this, "buttonFrame"); TQPalette palette = m_registerButtonFrame->palette(); palette.setColor(TQColorGroup::Background, rowBackgroundColor(m_currentRow+1) ); diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index 0f54394..a9b404e 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -362,7 +362,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo setCaption(title); // load button icons - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); cancelButton->setGuiItem(KStdGuiItem::cancel()); createButton->setGuiItem(KStdGuiItem::ok()); diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index 1bd2767..e5b16c0 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -118,7 +118,7 @@ KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) : m_interestAccountEdit->removeButtons(); // load button icons - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem createCategoryButtenItem( i18n( "&Create..." ), TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new category"), @@ -418,7 +418,7 @@ void KNewLoanWizard::updateSummary(void) else m_summaryLoanType->setText(i18n("lend")); - m_summaryFirstPayment->setText(KGlobal::locale()->formatDate(m_firstDueDateEdit->date(), true)); + m_summaryFirstPayment->setText(TDEGlobal::locale()->formatDate(m_firstDueDateEdit->date(), true)); if(m_payeeEdit->selectedItem().isEmpty()) { m_summaryPayee->setText(i18n("not assigned")); } else { @@ -450,7 +450,7 @@ void KNewLoanWizard::updateSummary(void) } m_summaryAdditionalFees->setText(m_additionalCost->text()); m_summaryTotalPeriodicPayment->setText(m_periodicPayment->text()); - m_summaryNextPayment->setText(KGlobal::locale()->formatDate(m_nextDueDateEdit->date(), true)); + m_summaryNextPayment->setText(TDEGlobal::locale()->formatDate(m_nextDueDateEdit->date(), true)); try { TQStringList sel = m_paymentAccountEdit->selectedItems(); diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp index a3d0553..ca78ee9 100644 --- a/kmymoney2/dialogs/kreconciledlg.cpp +++ b/kmymoney2/dialogs/kreconciledlg.cpp @@ -72,15 +72,15 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney // never show a horizontal scroll bar creditListView->setHScrollBarMode(TQScrollView::AlwaysOff); - endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); + endingLabel->setText(TDEGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); - previousLabel->setText(KGlobal::locale()->formatMoney(m_endingBalance.amount(),"")); + previousLabel->setText(TDEGlobal::locale()->formatMoney(m_endingBalance.amount(),"")); - broughtForwardLabel->setText(KGlobal::locale()->formatMoney(m_previousBalance.amount(),"")); + broughtForwardLabel->setText(TDEGlobal::locale()->formatMoney(m_previousBalance.amount(),"")); - totalCreditsLabel->setText(i18n("Deposits: ") + KGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); + totalCreditsLabel->setText(i18n("Deposits: ") + TDEGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); - totalDebitsLabel->setText(i18n("Withdrawals: ") + KGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); + totalDebitsLabel->setText(i18n("Withdrawals: ") + TDEGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); loadLists(); @@ -198,9 +198,9 @@ void KReconcileDlg::slotDebitSelected(TQListViewItem* /* item */, const TQPoint& reconcileItem->setReconciled(false); m_reconciledTransactions.remove(reconcileItem->transaction()); } - totalDebitsLabel->setText(i18n("Withdrawals: ") + KGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); + totalDebitsLabel->setText(i18n("Withdrawals: ") + TDEGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); - endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); + endingLabel->setText(TDEGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); doDifference(); */ @@ -232,9 +232,9 @@ void KReconcileDlg::slotCreditSelected(TQListViewItem* /* item */, const TQPoint m_reconciledTransactions.remove(reconcileItem->transaction()); } - totalCreditsLabel->setText(i18n("Deposits: ") + KGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); + totalCreditsLabel->setText(i18n("Deposits: ") + TDEGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); - endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); + endingLabel->setText(TDEGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); doDifference(); */ @@ -245,7 +245,7 @@ void KReconcileDlg::doDifference(void) /* MyMoneyMoney difference((m_previousBalance + m_clearedBalance)- m_endingBalance); - differenceLabel->setText(KGlobal::locale()->formatMoney(difference.amount(),"")); + differenceLabel->setText(TDEGlobal::locale()->formatMoney(difference.amount(),"")); if (difference.isZero()) m_balanced = true; else @@ -320,15 +320,15 @@ void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMone //differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); + endingLabel->setText(TDEGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); - previousLabel->setText(KGlobal::locale()->formatMoney(m_endingBalance.amount(),"")); + previousLabel->setText(TDEGlobal::locale()->formatMoney(m_endingBalance.amount(),"")); - broughtForwardLabel->setText(KGlobal::locale()->formatMoney(m_previousBalance.amount(),"")); + broughtForwardLabel->setText(TDEGlobal::locale()->formatMoney(m_previousBalance.amount(),"")); - totalCreditsLabel->setText(i18n("Deposits: ") + KGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); + totalCreditsLabel->setText(i18n("Deposits: ") + TDEGlobal::locale()->formatMoney(m_creditBalance.amount(),"")); - totalDebitsLabel->setText(i18n("Withdrawals: ") + KGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); + totalDebitsLabel->setText(i18n("Withdrawals: ") + TDEGlobal::locale()->formatMoney(m_debitBalance.amount(),"")); loadLists(); insertTransactions(); diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp index 2feac68..e0642a0 100644 --- a/kmymoney2/dialogs/ksecuritylisteditor.cpp +++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp @@ -63,7 +63,7 @@ KSecurityListEditor::KSecurityListEditor(TQWidget *parent, const char *name) : m_listView->setMultiSelection(false); m_listView->setAllColumnsShowFocus(true); - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); KGuiItem removeButtenItem( i18n( "&Delete" ), TQIconSet(il->loadIcon("delete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete this entry"), diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index a31693a..d8c4f67 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -72,7 +72,7 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, m_calculatedValue(calculatedValue) { // add icons to buttons - KIconLoader *il = KGlobal::iconLoader(); + KIconLoader *il = TDEGlobal::iconLoader(); KGuiItem clearButtenItem( i18n( "Clear &All" ), TQIconSet(il->loadIcon("edittrash", KIcon::Small, KIcon::SizeSmall)), diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index 470806c..0b28186 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -70,7 +70,7 @@ KStartDlg::~KStartDlg() /** Set the font Page of the preferences dialog */ void KStartDlg::setPage_Template() { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); templateMainFrame = addVBoxPage( i18n("Templates"), i18n("Select templates"), DesktopIcon("wizard")); view_wizard = new KIconView( templateMainFrame, "view_options" ); (void)new TQIconViewItem( view_wizard, i18n("New KMyMoney document"), ic->loadIcon("mime_empty.png", KIcon::Desktop, KIcon::SizeLarge)/*TQPixmap( locate("icon","hicolor/48x48/mimetypes/mime_empty.png") )*/ ); @@ -91,7 +91,7 @@ void KStartDlg::setPage_Documents() //allow user to select either a .kmy file, or any generic file. kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").arg("*.kmy").arg("*.*") ); kurlrequest->fileDialog()->setMode(KFile::File || KFile::ExistingOnly); - kurlrequest->fileDialog()->setURL(KURL(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KURL(KGlobalSettings::documentPath())); + kurlrequest->fileDialog()->setURL(KURL(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KURL(TDEGlobalSettings::documentPath())); mainLayout->addWidget( kurlrequest ); TQLabel *label1 = new TQLabel( recentMainFrame, "label1" ); @@ -128,8 +128,8 @@ void KStartDlg::readConfig() TQString value; unsigned int i = 1; - KConfig *config = KGlobal::config(); - KIconLoader *il = KGlobal::iconLoader(); + KConfig *config = TDEGlobal::config(); + KIconLoader *il = TDEGlobal::iconLoader(); // read file list do { @@ -165,7 +165,7 @@ void KStartDlg::readConfig() /** Write config window */ void KStartDlg::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Start Dialog"); config->writeEntry("Geometry", this->size() ); diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index d187ce0..2dc5b73 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp @@ -59,7 +59,7 @@ MyMoneyQifProfileNameValidator::~MyMoneyQifProfileNameValidator() TQValidator::State MyMoneyQifProfileNameValidator::validate(TQString& name, int&) const { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); TQStringList list = config->readListEntry("profiles"); @@ -90,7 +90,7 @@ MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *pare loadProfileListFromConfig(); // load button icons - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem newButtenItem( i18n( "&New" ), TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new profile"), @@ -133,7 +133,7 @@ MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *pare MyMoneyQifProfileEditor::~MyMoneyQifProfileEditor() { if(m_inEdit && m_isDirty && m_isAccepted) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->sync(); } else { slotReset(); @@ -227,7 +227,7 @@ void MyMoneyQifProfileEditor::loadProfileListFromConfig(void) m_profileListBox->clear(); TQStringList list; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); @@ -313,7 +313,7 @@ void MyMoneyQifProfileEditor::showProfile(void) void MyMoneyQifProfileEditor::deleteProfile(const TQString& name) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->deleteGroup("Profile-" + name); @@ -327,7 +327,7 @@ void MyMoneyQifProfileEditor::deleteProfile(const TQString& name) void MyMoneyQifProfileEditor::addProfile(const TQString& name) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); TQStringList list = config->readListEntry("profiles"); @@ -348,7 +348,7 @@ void MyMoneyQifProfileEditor::slotOk(void) m_profile.saveProfile(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->sync(); m_isAccepted = true; @@ -360,7 +360,7 @@ void MyMoneyQifProfileEditor::slotReset(void) // first flush any changes m_profile.saveProfile(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->rollback(); config->reparseConfiguration(); 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"), diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index bffcbe8..a6f83dc 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -601,7 +601,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, bool enter = true; if(askForSchedule && (*it_ts).postDate() > TQDate::currentDate()) { KGuiItem enterItem; - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem enterButton( i18n("&Enter" ), TQIconSet(il->loadIcon("kontact_journal", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), -- cgit v1.2.1