diff options
87 files changed, 401 insertions, 401 deletions
@@ -342,7 +342,7 @@ * Don't reverse operation when entering a scheduled transfer transaction 2009-08-01 Alvaro Soliverez <[email protected]> - * Reverted a change in KGlobalLedgerView to fix an infinite loop + * Reverted a change in TDEGlobalLedgerView to fix an infinite loop 2009-07-31 Alvaro Soliverez <[email protected]> * Changed Schedule and GlobalLedgerView Views to use adjustedNextDate for @@ -3453,7 +3453,7 @@ * Fixed crash when reading an encrypted file that does not contain the "kmm-encryption-key" is missing in the file (could happen when reading rather old files) - * replaced QDate::shortMonthName() with KGlobal::locale()->monthName() + * replaced QDate::shortMonthName() with TDEGlobal::locale()->monthName() * Only assign check numbers for scheduled payments, if payment type is 'write check'. @@ -5946,7 +5946,7 @@ on missing conversion rates (default=blue) * Fixed values in the institution view when stock accounts are involved * Fixed sign of values in institution view - * Added KGlobalLedgerView::accountId() to return id of selected account + * Added TDEGlobalLedgerView::accountId() to return id of selected account 2005-04-21 Thomas Baumgart <[email protected]> * Fixed editing schedules with a single split @@ -7486,7 +7486,7 @@ * support i18n of action strings in ledger * added tip(s) * fixed action assignment during QIF import - * changed QIF import to use KProcess instead of QProcess. + * changed QIF import to use TDEProcess instead of QProcess. * added more automatic fixes after 'file open' 2003-12-26 Thomas Baumgart <[email protected]> @@ -8129,7 +8129,7 @@ * Added date import conversion to MyMoneyQifProfile * Added coloring for imported transactions to kMyMoneyRegister * Added parameter 'name' to kMyMoneyCombo constructor(s) - * Cleanup of KGlobalLedgerView member variables + * Cleanup of TDEGlobalLedgerView member variables 2003-03-06 Thomas Baumgart <[email protected]> * Moved categoryTypeE to KMyMoneyUtils diff --git a/developer-doc/phb/src-examples.docbook b/developer-doc/phb/src-examples.docbook index 4c2e3be..78c26fa 100644 --- a/developer-doc/phb/src-examples.docbook +++ b/developer-doc/phb/src-examples.docbook @@ -403,7 +403,7 @@ void KSettingsDlg::setPageList() **/ void KSettingsDlg::configRead() { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Settings Dialog"); QSize *qsizeDefaultSize = new QSize(470,470); this->resize(kconfig->readSizeEntry("Geometry", qsizeDefaultSize)); @@ -449,7 +449,7 @@ void KSettingsDlg::configRead() **/ void KSettingsDlg::configWrite() { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Settings Dialog"); kconfig->writeEntry("Geometry", this->size() ); @@ -505,7 +505,7 @@ and 3")); void KSettingsDlg::slotCancel() { // make sure the config object is the same as we left it - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("List Options"); kconfig->writeEntry("listColor", m_qcolorTempList); kconfig->writeEntry("listBGColor", m_qcolorTempListBG); diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp index 77bbe07..079716d 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -164,14 +164,14 @@ void MyMoneyQifProfile::clear(void) m_decimal['Q'] = m_decimal['T'] = m_decimal['O'] = - m_decimal['I'] = KGlobal::locale()->monetaryDecimalSymbol()[0]; + m_decimal['I'] = TDEGlobal::locale()->monetaryDecimalSymbol()[0]; m_thousands.clear(); m_thousands['$'] = m_thousands['Q'] = m_thousands['T'] = m_thousands['O'] = - m_thousands['I'] = KGlobal::locale()->monetaryThousandsSeparator()[0]; + m_thousands['I'] = TDEGlobal::locale()->monetaryThousandsSeparator()[0]; m_openingBalanceText = "Opening Balance"; m_voidMark = "VOID "; @@ -186,7 +186,7 @@ void MyMoneyQifProfile::clear(void) void MyMoneyQifProfile::loadProfile(const TQString& name) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(name); clear(); @@ -232,7 +232,7 @@ void MyMoneyQifProfile::loadProfile(const TQString& name) void MyMoneyQifProfile::saveProfile(void) { if(m_isDirty == true) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(m_profileName); config->writeEntry("Description", m_profileDescription); @@ -418,7 +418,7 @@ TQString MyMoneyQifProfile::date(const TQDate& datein) const if(delim) buffer += delim; if(maskLen == 3) - buffer += KGlobal::locale()->calendar()->monthName(datein.month(), datein.year(), true); + buffer += TDEGlobal::locale()->calendar()->monthName(datein.month(), datein.year(), true); else buffer += TQString::number(datein.month()).rightJustify(2, '0'); break; @@ -466,7 +466,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const TQStringList monthNames = TQStringList::split(",", "jan,feb,mar,apr,may,jun,jul,aug,sep,oct,nov,dec"); int j; for(j = 1; j <= 12; ++j) { - if((KGlobal::locale()->calendar()->monthName(j, 2000, true).lower() == scannedParts[d->m_partPos['m']].lower()) + if((TDEGlobal::locale()->calendar()->monthName(j, 2000, true).lower() == scannedParts[d->m_partPos['m']].lower()) || (monthNames[j-1] == scannedParts[d->m_partPos['m']].lower())) { mon = j; break; @@ -590,7 +590,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const msg = "Invalid numeric character in month string"; } else { for(j = 1; j <= 12; ++j) { - if(KGlobal::locale()->calendar()->monthName(j, 2000, true).lower() == formatParts[i].lower()) { + if(TDEGlobal::locale()->calendar()->monthName(j, 2000, true).lower() == formatParts[i].lower()) { mon = j; ok = true; break; diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index 8764e03..bcb9091 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -250,10 +250,10 @@ MyMoneyQifReader::MyMoneyQifReader() : m_warnedSecurity = false; m_warnedPrice = false; - connect(&m_filter, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SLOT(slotSendDataToFilter())); - connect(&m_filter, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(KProcess*, char*, int))); - connect(&m_filter, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotImportFinished())); - connect(&m_filter, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedErrorFromFilter(KProcess*, char*, int))); + connect(&m_filter, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(slotSendDataToFilter())); + connect(&m_filter, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(TDEProcess*, char*, int))); + connect(&m_filter, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotImportFinished())); + connect(&m_filter, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedErrorFromFilter(TDEProcess*, char*, int))); } MyMoneyQifReader::~MyMoneyQifReader() @@ -297,14 +297,14 @@ void MyMoneyQifReader::slotSendDataToFilter(void) } } -void MyMoneyQifReader::slotReceivedErrorFromFilter(KProcess* /* proc */, char *buff, int len) +void MyMoneyQifReader::slotReceivedErrorFromFilter(TDEProcess* /* proc */, char *buff, int len) { TQByteArray data; data.duplicate(buff, len); tqWarning("%s",static_cast<const char*>(data)); } -void MyMoneyQifReader::slotReceivedDataFromFilter(KProcess* /* proc */, char *buff, int len) +void MyMoneyQifReader::slotReceivedDataFromFilter(TDEProcess* /* proc */, char *buff, int len) { m_pos += len; // signalProgress(m_pos, 0); @@ -437,7 +437,7 @@ bool MyMoneyQifReader::startImport(void) } m_entryType = EntryUnknown; - if(m_filter.start(KProcess::NotifyOnExit, KProcess::All)) { + if(m_filter.start(TDEProcess::NotifyOnExit, TDEProcess::All)) { m_filter.resume(); signalProgress(0, m_file->size(), i18n("Reading QIF ...")); slotSendDataToFilter(); @@ -459,7 +459,7 @@ bool MyMoneyQifReader::finishImport(void) m_file = 0; // remove the Don't ask again entries - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; @@ -479,7 +479,7 @@ bool MyMoneyQifReader::finishImport(void) m_file = 0; // remove the Don't ask again entries - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; diff --git a/kmymoney2/converter/mymoneyqifreader.h b/kmymoney2/converter/mymoneyqifreader.h index dfde437..e2f6638 100644 --- a/kmymoney2/converter/mymoneyqifreader.h +++ b/kmymoney2/converter/mymoneyqifreader.h @@ -337,8 +337,8 @@ signals: private slots: void slotSendDataToFilter(void); - void slotReceivedDataFromFilter(KProcess* /* proc */, char *buff, int len); - void slotReceivedErrorFromFilter(KProcess* /* proc */, char *buff, int len); + void slotReceivedDataFromFilter(TDEProcess* /* proc */, char *buff, int len); + void slotReceivedErrorFromFilter(TDEProcess* /* proc */, char *buff, int len); // void slotReceivedDataFromFilter(void); // void slotReceivedErrorFromFilter(void); void slotProcessData(void); @@ -356,7 +356,7 @@ private: /// \internal d-pointer instance. Private* const d; - KProcess m_filter; + TDEProcess m_filter; TQString m_filename; KURL m_url; MyMoneyQifProfile m_qifProfile; diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index 8d26a1b..a242f41 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -401,7 +401,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes messages += TQString(); // remove the Don't ask again entries - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index a5a9087..ba9cdc4 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -56,7 +56,7 @@ WebPriceQuote::WebPriceQuote( TQObject* _parent, const char* _name ): TQObject( _parent, _name ) { m_financeQuoteScriptPath = - KGlobal::dirs()->findResource("appdata", TQString("misc/financequote.pl")); + TDEGlobal::dirs()->findResource("appdata", TQString("misc/financequote.pl")); connect(&m_filter,TQT_SIGNAL(processExited(const TQString&)),this,TQT_SLOT(slotParseQuote(const TQString&))); } @@ -141,11 +141,11 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id, // if we're running non-interactive, we'll need to block. // otherwise, just let us know when it's done. - KProcess::RunMode mode = KProcess::NotifyOnExit; + TDEProcess::RunMode mode = TDEProcess::NotifyOnExit; if ( ! kapp ) - mode = KProcess::Block; + mode = TDEProcess::Block; - if(m_filter.start(mode, KProcess::All)) + if(m_filter.start(mode, TDEProcess::All)) { result = true; m_filter.resume(); @@ -272,18 +272,18 @@ bool WebPriceQuote::launchFinanceQuote ( const TQString& _symbol, const TQString m_filter.clearArguments(); - m_filter << "perl" << m_financeQuoteScriptPath << FTQSource << KProcess::quote(_symbol); + m_filter << "perl" << m_financeQuoteScriptPath << FTQSource << TDEProcess::quote(_symbol); m_filter.setUseShell(true); m_filter.setSymbol(m_symbol); emit status(TQString("Executing %1 %2 %3...").arg(m_financeQuoteScriptPath).arg(FTQSource).arg(_symbol)); // if we're running non-interactive, we'll need to block. // otherwise, just let us know when it's done. - KProcess::RunMode mode = KProcess::NotifyOnExit; + TDEProcess::RunMode mode = TDEProcess::NotifyOnExit; if ( ! kapp ) - mode = KProcess::Block; + mode = TDEProcess::Block; - if(m_filter.start(mode, KProcess::All)) + if(m_filter.start(mode, TDEProcess::All)) { result = true; m_filter.resume(); @@ -598,7 +598,7 @@ TQStringList WebPriceQuote::quoteSources (const _quoteSystemE _system) { TQStringList WebPriceQuote::quoteSourcesNative() { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); TQStringList groups = kconfig->groupList(); TQStringList::Iterator it; @@ -656,7 +656,7 @@ TQStringList WebPriceQuote::quoteSourcesFinanceQuote() if (m_financeQuoteSources.empty()) { // run the process one time only FinanceQuoteProcess getList; m_financeQuoteScriptPath = - KGlobal::dirs()->findResource("appdata", TQString("misc/financequote.pl")); + TDEGlobal::dirs()->findResource("appdata", TQString("misc/financequote.pl")); getList.launch( m_financeQuoteScriptPath ); while (!getList.isFinished()) { tqApp->processEvents(); @@ -683,7 +683,7 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name, const TQString& u WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name) { m_name = name; - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); m_sym = kconfig->readEntry("SymbolRegex"); m_date = kconfig->readEntry("DateRegex"); @@ -695,7 +695,7 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name) void WebPriceQuoteSource::write(void) const { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); kconfig->writeEntry("URL", m_url); kconfig->writeEntry("PriceRegex", m_price); @@ -717,21 +717,21 @@ void WebPriceQuoteSource::rename(const TQString& name) void WebPriceQuoteSource::remove(void) const { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name)); } // -// Helper class to babysit the KProcess used for running the local script in that case +// Helper class to babysit the TDEProcess used for running the local script in that case // WebPriceQuoteProcess::WebPriceQuoteProcess(void) { - connect(this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(KProcess*, char*, int))); - connect(this, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(TDEProcess*, char*, int))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); } -void WebPriceQuoteProcess::slotReceivedDataFromFilter(KProcess* /*_process*/, char* _pcbuffer, int _nbufferlen) +void WebPriceQuoteProcess::slotReceivedDataFromFilter(TDEProcess* /*_process*/, char* _pcbuffer, int _nbufferlen) { TQByteArray data; data.duplicate(_pcbuffer, _nbufferlen); @@ -740,7 +740,7 @@ void WebPriceQuoteProcess::slotReceivedDataFromFilter(KProcess* /*_process*/, ch m_string += TQString(data); } -void WebPriceQuoteProcess::slotProcessExited(KProcess*) +void WebPriceQuoteProcess::slotProcessExited(TDEProcess*) { // kdDebug(2) << "WebPriceQuoteProcess::slotProcessExited()" << endl; emit processExited(m_string); @@ -748,7 +748,7 @@ void WebPriceQuoteProcess::slotProcessExited(KProcess*) } // -// Helper class to babysit the KProcess used for running the Finance Quote sources script +// Helper class to babysit the TDEProcess used for running the Finance Quote sources script // FinanceQuoteProcess::FinanceQuoteProcess(void) @@ -809,11 +809,11 @@ FinanceQuoteProcess::FinanceQuoteProcess(void) m_fqNames["yahoo_europe"] = "Yahoo Europe"; m_fqNames["yahoo_nz"] = "Yahoo New Zealand"; m_fqNames["zifunds"] = "Zuerich Investments"; - connect(this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(KProcess*, char*, int))); - connect(this, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedDataFromFilter(TDEProcess*, char*, int))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); } -void FinanceQuoteProcess::slotReceivedDataFromFilter(KProcess* /*_process*/, char* _pcbuffer, int _nbufferlen) +void FinanceQuoteProcess::slotReceivedDataFromFilter(TDEProcess* /*_process*/, char* _pcbuffer, int _nbufferlen) { TQByteArray data; data.duplicate(_pcbuffer, _nbufferlen); @@ -822,7 +822,7 @@ void FinanceQuoteProcess::slotReceivedDataFromFilter(KProcess* /*_process*/, cha m_string += TQString(data); } -void FinanceQuoteProcess::slotProcessExited(KProcess*) +void FinanceQuoteProcess::slotProcessExited(TDEProcess*) { // kdDebug(2) << "WebPriceQuoteProcess::slotProcessExited()" << endl; m_isDone = true; @@ -833,7 +833,7 @@ void FinanceQuoteProcess::launch (const TQString& scriptPath) { arguments.append(TQCString("perl")); arguments.append (TQCString(scriptPath)); arguments.append (TQCString("-l")); - if (!start(KProcess::NotifyOnExit, KProcess::Stdout)) tqFatal ("Unable to start FQ script"); + if (!start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) tqFatal ("Unable to start FQ script"); return; } @@ -950,8 +950,8 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig unsigned i = 1; while ( i <= 12 ) { - if(KGlobal::locale()->calendar()->monthName(i, 2000, true).lower() == *it_scanned - || KGlobal::locale()->calendar()->monthName(i, 2000, false).lower() == *it_scanned) + if(TDEGlobal::locale()->calendar()->monthName(i, 2000, true).lower() == *it_scanned + || TDEGlobal::locale()->calendar()->monthName(i, 2000, false).lower() == *it_scanned) month = i; ++i; } diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h index 08a1aec..a9ec149 100644 --- a/kmymoney2/converter/webpricequote.h +++ b/kmymoney2/converter/webpricequote.h @@ -45,7 +45,7 @@ of a local script being used to fetch the quote. @author Thomas Baumgart <[email protected]> & Ace Jones <[email protected]> */ -class WebPriceQuoteProcess: public KProcess +class WebPriceQuoteProcess: public TDEProcess { Q_OBJECT @@ -54,8 +54,8 @@ public: void setSymbol(const TQString& _symbol) { m_symbol = _symbol; m_string.truncate(0); } public slots: - void slotReceivedDataFromFilter(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedDataFromFilter(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); signals: void processExited(const TQString&); @@ -73,7 +73,7 @@ by the Finance::Quote package, and more user-friendly names. @author Thomas Baumgart <[email protected]> & Ace Jones <[email protected]>, Tony B<[email protected]> */ -class FinanceQuoteProcess: public KProcess +class FinanceQuoteProcess: public TDEProcess { Q_OBJECT @@ -86,8 +86,8 @@ class FinanceQuoteProcess: public KProcess const TQString niceName(const TQString& crypticName); public slots: - void slotReceivedDataFromFilter(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedDataFromFilter(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); private: bool m_isDone; 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"), diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index baf0db5..0bd0d2a 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -232,7 +232,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : ::timetrace("done"); - connect(&proc,TQT_SIGNAL(processExited(KProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotProcessExited())); + connect(&proc,TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotProcessExited())); // force to show the home page if the file is closed connect(action("view_show_transaction_detail"), TQT_SIGNAL(toggled(bool)), myMoneyView, TQT_SLOT(slotShowTransactionDetail(bool))); @@ -369,7 +369,7 @@ void KMyMoney2App::initActions(void) #endif new KAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); new KAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); - KActionMenu* menu = new KActionMenu(i18n("Update"), TQIconSet(KGlobal::iconLoader()->loadIcon("reload", KIcon::Small, + KActionMenu* menu = new KActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", KIcon::Small, KIcon::SizeSmall)), actionCollection(), "account_online_update_menu"); // activating the menu button is the same as selecting the current account connect( menu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline())); @@ -855,7 +855,7 @@ KURL KMyMoney2App::selectFile(const TQString& title, const TQString& _path, cons TQString path(_path); if(path.isEmpty()) - path = KGlobalSettings::documentPath(); + path = TDEGlobalSettings::documentPath(); KFileDialog* dialog = new KFileDialog(path, mask, this, title, true); dialog->setMode(mode); @@ -873,7 +873,7 @@ void KMyMoney2App::slotFileOpen(void) { KMSTATUS(i18n("Open a file.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|KMyMoney files\n%2|All files (*.*)").arg("*.kmy *.xml").arg("*"), this, i18n("Open File..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1477,7 +1477,7 @@ void KMyMoney2App::slotSaveAccountTemplates(void) { KMSTATUS(i18n("Exporting account templates.")); - TQString newName = KFileDialog::getSaveFileName(KGlobalSettings::documentPath(), + TQString newName = KFileDialog::getSaveFileName(TDEGlobalSettings::documentPath(), i18n("*.kmt|KMyMoney template files\n" "*.*|All files"), this, i18n("Save as...")); // @@ -1621,7 +1621,7 @@ void KMyMoney2App::slotGncImport(void) KMSTATUS(i18n("Importing a Gnucash file.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|Gnucash files\n%2|All files (*.*)").arg("*").arg("*"), this, i18n("Import Gnucash file..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1664,7 +1664,7 @@ void KMyMoney2App::slotStatementImport(void) bool result = false; KMSTATUS(i18n("Importing an XML Statement.")); - KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), + KFileDialog* dialog = new KFileDialog(TDEGlobalSettings::documentPath(), i18n("%1|XML files\n%2|All files (*.*)").arg("*.xml").arg("*.*"), this, i18n("Import XML Statement..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -2408,7 +2408,7 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories")); @@ -2582,7 +2582,7 @@ void KMyMoney2App::slotInvestmentDelete(void) } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); @@ -3515,7 +3515,7 @@ void KMyMoney2App::slotScheduleEdit(void) // than previous payment. Date would be // updated automatically so we probably // want to clear it. Let's ask the user. - if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(KGlobal::locale()->formatDate(next, true)).arg(KGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(TDEGlobal::locale()->formatDate(next, true)).arg(TDEGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { sched.setLastPayment( TQDate() ); } } @@ -3621,7 +3621,7 @@ void KMyMoney2App::slotScheduleSkip(void) if(!schedule.isFinished()) { if(schedule.occurence() != MyMoneySchedule::OCCUR_ONCE) { TQDate next = schedule.nextDueDate(); - if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) { + if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").arg(schedule.name(), TDEGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) { MyMoneyFileTransaction ft; schedule.setLastPayment(next); schedule.setNextDueDate(schedule.nextPayment(next)); @@ -3777,7 +3777,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) doit = false; // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(dontAskAgain); @@ -5751,7 +5751,7 @@ void KMyMoney2App::slotCheckSchedules(void) void KMyMoney2App::writeLastUsedDir(const TQString& directory) { //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5764,7 +5764,7 @@ void KMyMoney2App::writeLastUsedDir(const TQString& directory) void KMyMoney2App::writeLastUsedFile(const TQString& fileName) { //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5781,16 +5781,16 @@ TQString KMyMoney2App::readLastUsedDir(void) const TQString str; //get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); //read path entry. Second parameter is the default if the setting is not found, which will be the default document path. - str = kconfig->readPathEntry("LastUsedDirectory", KGlobalSettings::documentPath()); + str = kconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath()); // if the path stored is empty, we use the default nevertheless if(str.isEmpty()) - str = KGlobalSettings::documentPath(); + str = TDEGlobalSettings::documentPath(); } return str; @@ -5801,7 +5801,7 @@ TQString KMyMoney2App::readLastUsedFile(void) const TQString str; // get global config object for our app. - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h index 8062bdc..fa864d9 100644 --- a/kmymoney2/kmymoney2.h +++ b/kmymoney2/kmymoney2.h @@ -1228,7 +1228,7 @@ private: */ bool m_backupMount; - KProcess proc; + TDEProcess proc; /// A pointer to the view holding the tabs. KMyMoneyView *myMoneyView; diff --git a/kmymoney2/kmymoneyglobalsettings.cpp b/kmymoney2/kmymoneyglobalsettings.cpp index 32eb887..533e884 100644 --- a/kmymoney2/kmymoneyglobalsettings.cpp +++ b/kmymoney2/kmymoneyglobalsettings.cpp @@ -32,7 +32,7 @@ TQFont KMyMoneyGlobalSettings::listCellFont(void) { if(useSystemFont()) { - return KGlobalSettings::generalFont(); + return TDEGlobalSettings::generalFont(); } else { return KMyMoneySettings::listCellFont(); } @@ -41,7 +41,7 @@ TQFont KMyMoneyGlobalSettings::listCellFont(void) TQFont KMyMoneyGlobalSettings::listHeaderFont(void) { if(useSystemFont()) { - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); font.setBold(true); return font; } else { @@ -52,7 +52,7 @@ TQFont KMyMoneyGlobalSettings::listHeaderFont(void) TQColor KMyMoneyGlobalSettings::listColor(void) { if(useSystemColors()) - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); else return KMyMoneySettings::listColor(); } @@ -60,7 +60,7 @@ TQColor KMyMoneyGlobalSettings::listColor(void) TQColor KMyMoneyGlobalSettings::listBGColor(void) { if(useSystemColors()) - return KGlobalSettings::alternateBackgroundColor(); + return TDEGlobalSettings::alternateBackgroundColor(); else return KMyMoneySettings::listBGColor(); } diff --git a/kmymoney2/kmymoneytest.cpp b/kmymoney2/kmymoneytest.cpp index 46d54b7..74cfe1c 100644 --- a/kmymoney2/kmymoneytest.cpp +++ b/kmymoney2/kmymoneytest.cpp @@ -118,7 +118,7 @@ int main(int testargc, char** testargv) KCmdLineLastOption // End of options. }; - // we seem to need a TDEApplication object to use KGlobal::locale() + // we seem to need a TDEApplication object to use TDEGlobal::locale() TDECmdLineArgs::init(testargc, testargv, testargv[0], "UNIT TESTS", "", "0.1"); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication::disableAutoDcopRegistration(); diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp index c2e41ca..b9bac34 100644 --- a/kmymoney2/kmymoneyutils.cpp +++ b/kmymoney2/kmymoneyutils.cpp @@ -141,7 +141,7 @@ const TQString KMyMoneyUtils::scheduleTypeToString(MyMoneySchedule::typeE type) KGuiItem KMyMoneyUtils::scheduleNewGuiItem(void) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); KGuiItem splitGuiItem( i18n("&New Schedule..."), TQIconSet(ic->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), @@ -153,7 +153,7 @@ KGuiItem KMyMoneyUtils::scheduleNewGuiItem(void) KGuiItem KMyMoneyUtils::accountsFilterGuiItem(void) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); KGuiItem splitGuiItem( i18n("&Filter"), TQIconSet(ic->loadIcon("filter", KIcon::Small, KIcon::SizeSmall)), @@ -165,25 +165,25 @@ KGuiItem KMyMoneyUtils::accountsFilterGuiItem(void) TQPixmap KMyMoneyUtils::billScheduleIcon(int size) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); return ic->loadIcon("billschedule", KIcon::User, size); } TQPixmap KMyMoneyUtils::depositScheduleIcon(int size) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); return ic->loadIcon("depositschedule", KIcon::User, size); } TQPixmap KMyMoneyUtils::transferScheduleIcon(int size) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); return ic->loadIcon("transferschedule", KIcon::User, size); } TQPixmap KMyMoneyUtils::scheduleIcon(int size) { - KIconLoader *ic = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); return ic->loadIcon("schedule", KIcon::User, size); } @@ -261,7 +261,7 @@ void KMyMoneyUtils::checkConstants(void) TQString KMyMoneyUtils::variableCSS(void) { - TQColor tcolor = KGlobalSettings::textColor(); + TQColor tcolor = TDEGlobalSettings::textColor(); TQString css; css += "<style type=\"text/css\">\n<!--\n"; @@ -275,8 +275,8 @@ TQString KMyMoneyUtils::variableCSS(void) TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) { - TQString language = KGlobal::locale()->language(); - TQString country = KGlobal::locale()->country(); + TQString language = TDEGlobal::locale()->language(); + TQString country = TDEGlobal::locale()->country(); TQString rc, mask; // check that the placeholder is present @@ -287,17 +287,17 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) // search the given resource mask = filename.arg("_%1.%2"); - rc = KGlobal::dirs()->findResource(type, mask.arg(country).arg(language)); + rc = TDEGlobal::dirs()->findResource(type, mask.arg(country).arg(language)); if(rc.isEmpty()) { mask = filename.arg("_%1"); - rc = KGlobal::dirs()->findResource(type, mask.arg(language)); + rc = TDEGlobal::dirs()->findResource(type, mask.arg(language)); } if(rc.isEmpty()) { // tqDebug(TQString("html/home_%1.html not found").arg(country).latin1()); - rc = KGlobal::dirs()->findResource(type, mask.arg(country)); + rc = TDEGlobal::dirs()->findResource(type, mask.arg(country)); } if(rc.isEmpty()) { - rc = KGlobal::dirs()->findResource(type, filename.arg("")); + rc = TDEGlobal::dirs()->findResource(type, filename.arg("")); } if(rc.isEmpty()) { diff --git a/kmymoney2/kstartuplogo.cpp b/kmymoney2/kstartuplogo.cpp index b22f0e4..7b52bb5 100644 --- a/kmymoney2/kstartuplogo.cpp +++ b/kmymoney2/kstartuplogo.cpp @@ -83,12 +83,12 @@ KStartupLogo::KStartupLogo() : if(!KMyMoneyGlobalSettings::showSplash()) return; - TQString filename = KGlobal::dirs()->findResource("appdata", "pics/startlogo.png"); + TQString filename = TDEGlobal::dirs()->findResource("appdata", "pics/startlogo.png"); TQPixmap splashPixmap(filename); if(!splashPixmap.isNull()) { TQPixmap backGround(splashPixmap); - backGround.fill(KGlobalSettings::highlightColor()); + backGround.fill(TDEGlobalSettings::highlightColor()); bitBlt ( &backGround, 0, 0, &splashPixmap, 0, 0, splashPixmap.width(), splashPixmap.height(), TQt::CopyROP ); KStartupSplash* splash = new KStartupSplash(backGround); diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index 4896a57..7dde3b4 100644 --- a/kmymoney2/main.cpp +++ b/kmymoney2/main.cpp @@ -132,7 +132,7 @@ int main(int argc, char *argv[]) TDEApplication* a = new TDEApplication(); - if(KGlobal::locale()->monetaryDecimalSymbol().isEmpty()) { + if(TDEGlobal::locale()->monetaryDecimalSymbol().isEmpty()) { KMessageBox::error(0, i18n("The monetary decimal symbol is not correctly set in the TDE Control Center's Country/Region & Language settings. Please set it to a reasonable value and start KMyMoney again."), i18n("Invalid settings")); delete a; exit(1); @@ -145,16 +145,16 @@ int main(int argc, char *argv[]) args = TDECmdLineArgs::parsedArgs(); // setup the MyMoneyMoney locale settings according to the KDE settings - MyMoneyMoney::setThousandSeparator(*(KGlobal::locale()->monetaryThousandsSeparator().latin1())); - MyMoneyMoney::setDecimalSeparator(*(KGlobal::locale()->monetaryDecimalSymbol().latin1())); - MyMoneyMoney::setNegativeMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(KGlobal::locale()->negativeMonetarySignPosition())); - MyMoneyMoney::setPositiveMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(KGlobal::locale()->positiveMonetarySignPosition())); - MyMoneyMoney::setNegativePrefixCurrencySymbol(KGlobal::locale()->negativePrefixCurrencySymbol()); - MyMoneyMoney::setPositivePrefixCurrencySymbol(KGlobal::locale()->positivePrefixCurrencySymbol()); + MyMoneyMoney::setThousandSeparator(*(TDEGlobal::locale()->monetaryThousandsSeparator().latin1())); + MyMoneyMoney::setDecimalSeparator(*(TDEGlobal::locale()->monetaryDecimalSymbol().latin1())); + MyMoneyMoney::setNegativeMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(TDEGlobal::locale()->negativeMonetarySignPosition())); + MyMoneyMoney::setPositiveMonetarySignPosition(static_cast<MyMoneyMoney::signPosition>(TDEGlobal::locale()->positiveMonetarySignPosition())); + MyMoneyMoney::setNegativePrefixCurrencySymbol(TDEGlobal::locale()->negativePrefixCurrencySymbol()); + MyMoneyMoney::setPositivePrefixCurrencySymbol(TDEGlobal::locale()->positivePrefixCurrencySymbol()); TQCString language = args->getOption("lang"); if(!language.isEmpty()) { - if(!KGlobal::locale()->setLanguage(language)) { + if(!TDEGlobal::locale()->setLanguage(language)) { tqWarning("Unable to select language '%s'. This has one of two reasons:\n\ta) the standard TDE message catalogue is not installed\n\tb) the KMyMoney message catalogue is not installed", language.data()); } } diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp index 1576cf3..c604f18 100644 --- a/kmymoney2/mymoney/mymoneyinstitution.cpp +++ b/kmymoney2/mymoney/mymoneyinstitution.cpp @@ -177,6 +177,6 @@ bool MyMoneyInstitution::hasReferenceTo(const TQString& /* id */) const } TQPixmap MyMoneyInstitution::pixmap() const { - return TQPixmap(KGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").arg("bank"))); + return TQPixmap(TDEGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").arg("bank"))); } diff --git a/kmymoney2/mymoney/mymoneymoney.cpp b/kmymoney2/mymoney/mymoneymoney.cpp index 6bbe013..304a905 100644 --- a/kmymoney2/mymoney/mymoneymoney.cpp +++ b/kmymoney2/mymoney/mymoneymoney.cpp @@ -223,7 +223,7 @@ TQString MyMoneyMoney::formatMoney(const TQString& currency, const int prec, boo m_64Value = convert(denom).m_num; // Once we really support multiple currencies then this method will - // be much better than using KGlobal::locale()->formatMoney. + // be much better than using TDEGlobal::locale()->formatMoney. bool bNegative = false; signed64 left = m_64Value / denom; signed64 right = m_64Value % denom; diff --git a/kmymoney2/reports/listtable.cpp b/kmymoney2/reports/listtable.cpp index 1f2e400..504c865 100644 --- a/kmymoney2/reports/listtable.cpp +++ b/kmymoney2/reports/listtable.cpp @@ -157,11 +157,11 @@ namespace reports { //actual dates of the report result += TQString("<div class=\"subtitle\">"); if(!m_config.fromDate().isNull()) { - result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config.toDate(), true)); result += TQString("</div>\n"); result += TQString("<div class=\"gap\"> </div>\n"); - csv += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + csv += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config.toDate(), true)); csv += TQString("\n"); } @@ -514,9 +514,9 @@ namespace reports { csv += "\"" + data + "\","; // if we have a locale() then use its date formatter - if ( KGlobal::locale() && ! data.isEmpty() ) { + if ( TDEGlobal::locale() && ! data.isEmpty() ) { TQDate qd = TQDate::fromString ( data, Qt::ISODate ); - data = KGlobal::locale()->formatDate ( qd, true ); + data = TDEGlobal::locale()->formatDate ( qd, true ); } result += TQString ( "<td class=\"left\">%1</td>" ).arg ( data ); } diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index 7846d93..e41215b 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -436,7 +436,7 @@ void PivotTable::collapseColumns(void) { unsigned sourcemonth = (m_config_f.isColumnsAreDays()) // use the user's locale to determine the week's start - ? (m_beginDate.dayOfWeek() + 8 - KGlobal::locale()->weekStartDay()) % 7 + ? (m_beginDate.dayOfWeek() + 8 - TDEGlobal::locale()->weekStartDay()) % 7 : m_beginDate.month(); unsigned sourcecolumn = 1; unsigned destcolumn = 1; @@ -544,7 +544,7 @@ void PivotTable::calculateColumnHeadings(void) unsigned column = 1; while ( column++ < m_numColumns ) { - TQString heading = KGlobal::locale()->calendar()->monthName(columnDate.month(), columnDate.year(), true) + " " + TQString::number(columnDate.day()); + TQString heading = TDEGlobal::locale()->calendar()->monthName(columnDate.month(), columnDate.year(), true) + " " + TQString::number(columnDate.day()); columnDate = columnDate.addDays(1); m_columnHeadings.append( heading); } @@ -555,16 +555,16 @@ void PivotTable::calculateColumnHeadings(void) TQDate prv = m_beginDate; // use the user's locale to determine the week's start - unsigned dow = (day.dayOfWeek() +8 -KGlobal::locale()->weekStartDay())%7; + unsigned dow = (day.dayOfWeek() +8 -TDEGlobal::locale()->weekStartDay())%7; while (day <= m_endDate) { if (((dow % columnpitch) == 0) || (day == m_endDate)) { m_columnHeadings.append(TQString("%1 %2 - %3 %4") - .arg(KGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true)) + .arg(TDEGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true)) .arg(prv.day()) - .arg(KGlobal::locale()->calendar()->monthName(day.month(), day.year(), true)) + .arg(TDEGlobal::locale()->calendar()->monthName(day.month(), day.year(), true)) .arg(day.day())); prv = day.addDays(1); } @@ -592,9 +592,9 @@ void PivotTable::calculateColumnHeadings(void) unsigned column = 1; while ( column++ < m_numColumns ) { - TQString heading = KGlobal::locale()->calendar()->monthName(1+segment*columnpitch, 2000, true); + TQString heading = TDEGlobal::locale()->calendar()->monthName(1+segment*columnpitch, 2000, true); if ( columnpitch != 1 ) - heading += "-" + KGlobal::locale()->calendar()->monthName((1+segment)*columnpitch, 2000, true); + heading += "-" + TDEGlobal::locale()->calendar()->monthName((1+segment)*columnpitch, 2000, true); if ( includeyear ) heading += " " + TQString::number(year); m_columnHeadings.append( heading); @@ -1578,7 +1578,7 @@ TQString PivotTable::renderHTML( void ) const //actual dates of the report result += TQString("<div class=\"subtitle\">"); - result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config_f.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(TDEGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(TDEGlobal::locale()->formatDate(m_config_f.toDate(), true)); result += TQString("</div>\n"); result += TQString("<div class=\"gap\"> </div>\n"); diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp index e9fb8b2..b2962e1 100644 --- a/kmymoney2/reports/pivottabletest.cpp +++ b/kmymoney2/reports/pivottabletest.cpp @@ -834,8 +834,8 @@ void PivotTableTest::testColumnType() CPPUNIT_ASSERT(spending_days.m_grid.m_total[eActual][13] == -moSolo); CPPUNIT_ASSERT(spending_days.m_grid.m_total[eActual].m_total == -moSolo-moParent2); - unsigned save_dayweekstart = KGlobal::locale()->weekStartDay(); - KGlobal::locale()->setWeekStartDay(2); + unsigned save_dayweekstart = TDEGlobal::locale()->weekStartDay(); + TDEGlobal::locale()->setWeekStartDay(2); filter.setDateFilter(TQDate(2004,7,2),TQDate(2004,8,1)); filter.setRowType( MyMoneyReport::eExpenseIncome ); @@ -846,7 +846,7 @@ void PivotTableTest::testColumnType() PivotTable spending_weeks( filter ); writeTabletoHTML(spending_weeks,"Spending by Weeks.html"); - KGlobal::locale()->setWeekStartDay(save_dayweekstart); + TDEGlobal::locale()->setWeekStartDay(save_dayweekstart); CPPUNIT_ASSERT(spending_weeks.m_grid.m_total[eActual][0] == moZero); CPPUNIT_ASSERT(spending_weeks.m_grid.m_total[eActual][1] == -moParent2); diff --git a/kmymoney2/reports/querytabletest.cpp b/kmymoney2/reports/querytabletest.cpp index b763276..f19832e 100644 --- a/kmymoney2/reports/querytabletest.cpp +++ b/kmymoney2/reports/querytabletest.cpp @@ -646,8 +646,8 @@ void QueryTableTest::testInvestment(void) CPPUNIT_ASSERT(rows.count() == 16); //this is to make sure that the dates of closing and opening balances and the balance numbers are ok - TQString openingDate = KGlobal::locale()->formatDate(TQDate(2004,1,1), true); - TQString closingDate = KGlobal::locale()->formatDate(TQDate(2005,9,1), true); + TQString openingDate = TDEGlobal::locale()->formatDate(TQDate(2004,1,1), true); + TQString closingDate = TDEGlobal::locale()->formatDate(TQDate(2005,9,1), true); CPPUNIT_ASSERT( html.find(openingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Opening Balance")) > 0); CPPUNIT_ASSERT( html.find(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -702.36</td></tr>") > 0); CPPUNIT_ASSERT( html.find(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -705.69</td></tr>") > 0); 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<AccountsViewTab>(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<ForecastViewTab>(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<TQString, MyMoneyMoney>& actBalance, const TQMap<TQString, MyMoneyMoney>& clearedBalance) +void TDEGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& actBalance, const TQMap<TQString, MyMoneyMoney>& clearedBalance) { MyMoneyFile* file = MyMoneyFile::instance(); m_leftSummaryLabel->show(); @@ -738,7 +738,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& 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<TQString, MyMoneyMoney>& 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("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\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("<td>") + - KGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) + + TDEGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) + "</td><td>"; if(pathEnter.length() > 0) tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").arg(sched.id()), i18n("Enter schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").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<int> 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("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").arg(KGlobal::locale()->encoding())); + TQRegExp exp(TQString("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").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("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n") + TQString("<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">").arg(filename); - header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(KGlobal::locale()->encoding()); + header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(TDEGlobal::locale()->encoding()); header += KMyMoneyUtils::variableCSS(); header += "</head><body>\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 */) diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 430c2dc..badcdff 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -180,7 +180,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) #ifndef KMM_DESIGNER TQStringList dirs; // get list of template subdirs and scan them for the list of subdirs - d->dirlist = KGlobal::dirs()->findDirs("appdata", "templates"); + d->dirlist = TDEGlobal::dirs()->findDirs("appdata", "templates"); TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQDir dir(*it); @@ -193,16 +193,16 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) continue; TQRegExp exp("(..)_(..)"); if(exp.search(*it_d) != -1) { - TQString country = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); if(country.isEmpty()) country = exp.cap(2); - TQString lang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); + TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); if(d->countries.contains(country)) { if(d->countries[country] != *it_d) { TQString oName = d->countries[country]; exp.search(oName); - TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); - TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); + TQString oCountry = TDEGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); + TQString oLang = TDEGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); d->countries.remove(country); d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName; d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d; @@ -211,7 +211,7 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) d->countries[country] = *it_d; } } else if((*it_d).length() == 2) { - TQString country = KGlobal::locale()->twoAlphaToCountryName((*it_d).upper()); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName((*it_d).upper()); d->countries[country] = *it_d; } else { tqDebug("'%s/%s' not scanned", (*it).data(), (*it_d).data()); diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp index df665a8..1ee3520 100644 --- a/kmymoney2/widgets/kbudgetvalues.cpp +++ b/kmymoney2/widgets/kbudgetvalues.cpp @@ -253,7 +253,7 @@ void KBudgetValues::fillMonthLabels(void) { TQDate date(m_budgetDate); for(int i = 0; i < 12; ++i) { - m_label[i]->setText(KGlobal::locale()->calendar()->monthName(date, true)); + m_label[i]->setText(TDEGlobal::locale()->calendar()->monthName(date, true)); date = date.addMonths(1); } } diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index e89553b..c3a9895 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(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); + TQPixmap checkMark = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); MyMoneyMoney vatRate; if (!isInstitution()) setPixmap(lv->nameColumn(), m_account.accountPixmap(m_reconcileFlag, 22)); diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index fc08cdc..fa8b5ed 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -94,7 +94,7 @@ KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* parent, const char* n KMyMoneyAccountTreeBase::~KMyMoneyAccountTreeBase() { if (!m_configGroup.isEmpty()) - saveLayout(KGlobal::config(), m_configGroup); + saveLayout(TDEGlobal::config(), m_configGroup); } void KMyMoneyAccountTreeBase::restoreLayout(const TQString& group) @@ -105,7 +105,7 @@ void KMyMoneyAccountTreeBase::restoreLayout(const TQString& group) // we use equal distribution of all fields as an initial setting // TODO this only makes the first column invisible if settings exist setColumnWidth(0, 0); m_configGroup = group; - KListView::restoreLayout(KGlobal::config(), m_configGroup); + KListView::restoreLayout(TDEGlobal::config(), m_configGroup); } void KMyMoneyAccountTreeBase::showType(void) diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp index d7584c5..d0903d2 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -85,7 +85,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast) for(int i = 1; i <= forecast.forecastDays(); ++i) { TQDate forecastDate = TQDate::currentDate().addDays(i); - TQString columnName = KGlobal::locale()->formatDate(forecastDate, true); + TQString columnName = TDEGlobal::locale()->formatDate(forecastDate, true); addColumn(columnName, -1); } diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp index 5fa5917..404d2a9 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 = KGlobal::iconLoader(); + KIconLoader *ic = TDEGlobal::iconLoader(); m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); @@ -107,13 +107,13 @@ void KMyMoneyBriefSchedule::loadSchedule() { int transactions = sched.paymentDates(m_date, sched.endDate()).count()-1; text = i18n("Payment on %1 for %2 with %3 transactions remaining occuring %4.") - .arg(KGlobal::locale()->formatDate(m_date, true)) + .arg(TDEGlobal::locale()->formatDate(m_date, true)) .arg(amount.formatMoney(sched.account().fraction())) .arg(TQString::number(transactions)) .arg(i18n(sched.occurenceToString())); } else { text = i18n("Payment on %1 for %2 occuring %4.") - .arg(KGlobal::locale()->formatDate(m_date, true)) + .arg(TDEGlobal::locale()->formatDate(m_date, true)) .arg(amount.formatMoney(sched.account().fraction())) .arg(i18n(sched.occurenceToString())); } diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index e3b72a4..ea6f035 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -41,7 +41,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) : TQFrame(parent, name) { - m_comma = KGlobal::locale()->monetaryDecimalSymbol()[0]; + m_comma = TDEGlobal::locale()->monetaryDecimalSymbol()[0]; m_clearOperandOnDigit = false; TQGridLayout* grid = new TQGridLayout(this, 5, 5, 1, 2); @@ -322,7 +322,7 @@ const TQString kMyMoneyCalculator::result(void) const if(txt[0] == '-') { txt = txt.mid(1); // get rid of the minus sign TQString mask; - switch(KGlobal::locale()->negativeMonetarySignPosition()) { + switch(TDEGlobal::locale()->negativeMonetarySignPosition()) { case KLocale::ParensAround: mask = "(%1)"; break; @@ -419,7 +419,7 @@ void kMyMoneyCalculator::setInitialValues(const TQString& value, TQKeyEvent* ev) bool negative = false; // setup operand operand = value; - operand.replace(TQRegExp(TQString("\\")+KGlobal::locale()->thousandsSeparator()), TQString()); + operand.replace(TQRegExp(TQString("\\")+TDEGlobal::locale()->thousandsSeparator()), TQString()); operand.replace(TQRegExp(TQString("\\")+m_comma), "."); if(operand.contains('(')) { negative = true; diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 28ee506..35d4599 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 = KGlobal::iconLoader(); +// KIconLoader *kiconloader = TDEGlobal::iconLoader(); KPopupMenu* kpopupmenuNew = new KPopupMenu(this); kpopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly())); kpopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly())); @@ -260,7 +260,7 @@ void kMyMoneyCalendar::dateChangedSlot(TQDate date) { kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); selectYear->setText(date.toString("yyyy")); @@ -301,7 +301,7 @@ kMyMoneyCalendar::setDate(const TQDate& date) selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); temp.setNum(date.year()); selectYear->setText(temp); - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); return true; } else { kdDebug() << "kMyMoneyCalendar::setDate: refusing to set invalid date." << endl; diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h index 30128e2..3fd6892 100644 --- a/kmymoney2/widgets/kmymoneycalendar.h +++ b/kmymoney2/widgets/kmymoneycalendar.h @@ -254,9 +254,9 @@ private: int weekOfYear(TQDate); #if KDE_IS_VERSION(3,2,0) - #define MONTH_NAME(a,b,c) KGlobal::locale()->calendar()->monthName(a,b,c) + #define MONTH_NAME(a,b,c) TDEGlobal::locale()->calendar()->monthName(a,b,c) #else - #define MONTH_NAME(a,b,c) KGlobal::locale()->monthName(a,c) + #define MONTH_NAME(a,b,c) TDEGlobal::locale()->monthName(a,c) #endif }; diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index 39f4b63..b4e2f83 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -68,7 +68,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl // create button KGuiItem splitButtonItem("", - TQIconSet(KGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small, + TQIconSet(TDEGlobal::iconLoader()->loadIcon("split_transaction", KIcon::Small, KIcon::SizeSmall)), "", ""); d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton"); diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 9ae13ec..bf64859 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -82,14 +82,14 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al m_datePopup = new KPassivePopup(dateEdit, "datePopup"); m_datePopup->setTimeout(DATE_POPUP_TIMEOUT); - m_datePopup->setView(new TQLabel(KGlobal::locale()->formatDate(m_date), m_datePopup, "datePopupLabel")); + m_datePopup->setView(new TQLabel(TDEGlobal::locale()->formatDate(m_date), m_datePopup, "datePopupLabel")); m_dateFrame = new TQVBox(this, 0, WType_Popup); m_dateFrame->setFrameStyle(TQFrame::PopupPanel | TQFrame::Raised); m_dateFrame->setLineWidth(3); m_dateFrame->hide(); - TQString dateFormat = KGlobal::locale()->dateFormatShort().lower(); + TQString dateFormat = TDEGlobal::locale()->dateFormatShort().lower(); TQString order, separator; for(unsigned i = 0; i < dateFormat.length(); ++i) { // DD.MM.YYYY is %d.%m.%y @@ -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(KGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this); + m_dateButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("date", -KIcon::SizeSmall))), TQString(""), this); m_dateButton->setMinimumWidth(30); connect(m_dateButton,TQT_SIGNAL(clicked()),TQT_SLOT(toggleDatePicker())); @@ -297,7 +297,7 @@ void kMyMoneyDateInput::slotDateChosenRef(const TQDate& date) m_date = date; TQLabel *lbl = static_cast<TQLabel*>(m_datePopup->view()); - lbl->setText(KGlobal::locale()->formatDate(date)); + lbl->setText(TDEGlobal::locale()->formatDate(date)); lbl->adjustSize(); if(m_datePopup->isVisible() || hasFocus()) m_datePopup->show(); // Repaint diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 2a51307..21aab16 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -85,7 +85,7 @@ kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* nam setFocusPolicy( TQ_StrongFocus ); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth @@ -102,17 +102,17 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) TQPen pen; int w=cellWidth(); int h=cellHeight(); - TQBrush brushBlue(KGlobalSettings::activeTitleColor()); - TQBrush brushLightblue(KGlobalSettings::baseColor()); - TQFont font=KGlobalSettings::generalFont(); + TQBrush brushBlue(TDEGlobalSettings::activeTitleColor()); + TQBrush brushLightblue(TDEGlobalSettings::baseColor()); + TQFont font=TDEGlobalSettings::generalFont(); // ----- font.setPointSize(fontsize); #if TDE_VERSION < 310 - int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; + int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0; #else - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); #endif if (row==0) @@ -133,19 +133,19 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) if (!normalday) { - painter->setPen(KGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); painter->setBrush(brushLightblue); painter->drawRect(0, 0, w, h); - painter->setPen(KGlobalSettings::activeTitleColor()); + painter->setPen(TDEGlobalSettings::activeTitleColor()); } else { - painter->setPen(KGlobalSettings::activeTitleColor()); + painter->setPen(TDEGlobalSettings::activeTitleColor()); painter->setBrush(brushBlue); painter->drawRect(0, 0, w, h); - painter->setPen(KGlobalSettings::activeTextColor()); + painter->setPen(TDEGlobalSettings::activeTextColor()); } painter->drawText(0, 0, w, h-1, AlignCenter, daystr, -1, &rect); - painter->setPen(KGlobalSettings::textColor()); + painter->setPen(TDEGlobalSettings::textColor()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); @@ -157,10 +157,10 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) } else if (m_type == WEEKLY) { - painter->setPen(KGlobalSettings::activeTitleColor()); + painter->setPen(TDEGlobalSettings::activeTitleColor()); painter->setBrush(brushBlue); painter->drawRect(0, 0, w, h); - painter->setPen(KGlobalSettings::activeTextColor()); + painter->setPen(TDEGlobalSettings::activeTextColor()); int year=date.year(); TQString headerText; @@ -182,9 +182,9 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) { int athird = width()/3; - painter->setPen(KGlobalSettings::activeTitleColor()); + painter->setPen(TDEGlobalSettings::activeTitleColor()); painter->setBrush(brushBlue); - painter->setPen(/*KGlobalSettings::activeTextColor()*/black); + painter->setPen(/*TDEGlobalSettings::activeTextColor()*/black); if (col == 0) { @@ -379,9 +379,9 @@ kMyMoneyDateTbl::contentsMouseReleaseEvent(TQMouseEvent *e) } #if TDE_VERSION < 310 - int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; + int dayoff = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0; #else - int dayoff = KGlobal::locale()->weekStartDay(); + int dayoff = TDEGlobal::locale()->weekStartDay(); #endif // ----- @@ -572,9 +572,9 @@ void kMyMoneyDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) } #if TDE_VERSION < 310 - int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; + int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0; #else - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); #endif TQDate drawDate(date); diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 21da84d..7e26a09 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -178,9 +178,9 @@ protected: private: #if KDE_IS_VERSION(3,2,0) - #define WEEK_DAY_NAME(a,b) KGlobal::locale()->calendar()->weekDayName(a,b) + #define WEEK_DAY_NAME(a,b) TDEGlobal::locale()->calendar()->weekDayName(a,b) #else - #define WEEK_DAY_NAME(a,b) KGlobal::locale()->weekDayName(a,b) + #define WEEK_DAY_NAME(a,b) TDEGlobal::locale()->weekDayName(a,b) #endif }; diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index c3ad220..b79ebfb 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -60,7 +60,7 @@ kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int d TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const { TQString s = input; - KLocale * l = KGlobal::locale(); + KLocale * l = TDEGlobal::locale(); // ok, we have to re-format the number to have: // 1. decimalSymbol == '.' // 2. negativeSign == '-' @@ -159,7 +159,7 @@ kMyMoneyEdit::kMyMoneyEdit(TQWidget *parent, const char *name, const int prec) { m_prec = prec; if(prec < -1 || prec > 20) - m_prec = KGlobal::locale()->fracDigits(); + m_prec = TDEGlobal::locale()->fracDigits(); init(); } @@ -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(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); + m_calcButton = new KPushButton(TQIconSet(TQPixmap(TDEGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() ); m_calcButton->setFixedHeight(m_edit->sizeHint().height()); m_calcButton->setFocusProxy(m_edit); @@ -235,7 +235,7 @@ void kMyMoneyEdit::init(void) m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("General Options"); if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true) setCalculatorButtonVisible(false); @@ -319,7 +319,7 @@ void kMyMoneyEdit::resetText(void) void kMyMoneyEdit::theTextChanged(const TQString & theText) { - KLocale * l = KGlobal::locale(); + KLocale * l = TDEGlobal::locale(); TQString d = l->monetaryDecimalSymbol(); TQString l_text = theText; TQString nsign, psign; @@ -360,7 +360,7 @@ void kMyMoneyEdit::ensureFractionalPart(void) void kMyMoneyEdit::ensureFractionalPart(TQString& s) const { - KLocale* locale = KGlobal::locale(); + KLocale* locale = TDEGlobal::locale(); TQString decimalSymbol = locale->monetaryDecimalSymbol(); if(decimalSymbol.isEmpty()) decimalSymbol = "."; diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp index 5ca6991..453ab7d 100644 --- a/kmymoney2/widgets/kmymoneygpgconfig.cpp +++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp @@ -63,7 +63,7 @@ void kMyMoneyGPGConfig::resetConfig(void) void kMyMoneyGPGConfig::readConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General Options"); m_resetUseEncryption = config->readBoolEntry("WriteDataEncrypted", false); m_resetRecover = config->readBoolEntry("EncryptRecover", false); @@ -74,7 +74,7 @@ void kMyMoneyGPGConfig::readConfig(void) void kMyMoneyGPGConfig::writeConfig(void) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General Options"); config->writeEntry("WriteDataEncrypted", m_useEncryption->isChecked()); config->writeEntry("EncryptRecover", m_recover->isChecked()); diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp index c99ad02..b7c96ab 100644 --- a/kmymoney2/widgets/kmymoneylineedit.cpp +++ b/kmymoney2/widgets/kmymoneylineedit.cpp @@ -78,14 +78,14 @@ void kMyMoneyLineEdit::keyReleaseEvent(TQKeyEvent* k) if(k->state() & TQt::Keypad) { if(k->key() == TQt::Key_Comma || k->key() == TQt::Key_Period) { - if(KGlobal::locale()->monetaryDecimalSymbol() == ",") { + if(TDEGlobal::locale()->monetaryDecimalSymbol() == ",") { TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ",", k->isAutoRepeat(), k->count()); KLineEdit::keyReleaseEvent(&newk); k->ignore(); return; } - if(KGlobal::locale()->monetaryDecimalSymbol() == ".") { + if(TDEGlobal::locale()->monetaryDecimalSymbol() == ".") { TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ".", k->isAutoRepeat(), k->count()); KLineEdit::keyReleaseEvent(&newk); k->ignore(); @@ -103,14 +103,14 @@ void kMyMoneyLineEdit::keyPressEvent(TQKeyEvent* k) if(k->state() & TQt::Keypad) { if(k->key() == TQt::Key_Comma || k->key() == TQt::Key_Period) { - if(KGlobal::locale()->monetaryDecimalSymbol() == ",") { + if(TDEGlobal::locale()->monetaryDecimalSymbol() == ",") { TQKeyEvent newk(k->type(), TQt::Key_Comma, ',', k->state(), ",", k->isAutoRepeat(), k->count()); KLineEdit::keyPressEvent(&newk); k->ignore(); return; } - if(KGlobal::locale()->monetaryDecimalSymbol() == ".") { + if(TDEGlobal::locale()->monetaryDecimalSymbol() == ".") { TQKeyEvent newk(k->type(), TQt::Key_Period, '.', k->state(), ".", k->isAutoRepeat(), k->count()); KLineEdit::keyPressEvent(&newk); k->ignore(); diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp index e41d4b8..738749f 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp @@ -48,7 +48,7 @@ kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *parent, const cha 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/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index 851ca02..bc4285b 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -66,7 +66,7 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) : m_pr(pr) { MyMoneySecurity from, to; - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("General Options"); int prec = kconfig->readNumEntry("PricePrecision", 4); @@ -85,7 +85,7 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) : setText(COMMODITY_COL, (from.isCurrency()) ? from.id() : from.tradingSymbol()); setText(CURRENCY_COL, to.id()); - setText(DATE_COL, KGlobal::locale()->formatDate(m_pr.date(), true)); + setText(DATE_COL, TDEGlobal::locale()->formatDate(m_pr.date(), true)); setText(PRICE_COL, m_pr.rate(priceBase).formatMoney("", prec)); setText(SOURCE_COL, m_pr.source()); } @@ -137,7 +137,7 @@ KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) : header()->setFont(KMyMoneyGlobalSettings::listHeaderFont()); - KIconLoader *kiconloader = KGlobal::iconLoader(); + KIconLoader *kiconloader = TDEGlobal::iconLoader(); m_contextMenu = new KPopupMenu(this); m_contextMenu->insertTitle(i18n("Price Options")); diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index ad96947..964b0f6 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -81,9 +81,9 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, int w=cellWidth(); int h=cellHeight(); TQPen pen; - TQBrush brushBlue(KGlobalSettings::activeTitleColor()); - TQBrush brushLightblue(KGlobalSettings::baseColor()); - TQFont font=KGlobalSettings::generalFont(); + TQBrush brushBlue(TDEGlobalSettings::activeTitleColor()); + TQBrush brushLightblue(TDEGlobalSettings::baseColor()); + TQFont font=TDEGlobalSettings::generalFont(); MyMoneyFile *file = MyMoneyFile::instance(); // ----- @@ -112,17 +112,17 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, { if (hasFocus()) { // draw the currently selected date - painter->setPen(KGlobalSettings::highlightColor()); - painter->setBrush(KGlobalSettings::highlightColor()); + painter->setPen(TDEGlobalSettings::highlightColor()); + painter->setBrush(TDEGlobalSettings::highlightColor()); pen=TQPen(white); } else { - painter->setPen(KGlobalSettings::calculateAlternateBackgroundColor(KGlobalSettings::highlightColor())); - painter->setBrush(KGlobalSettings::calculateAlternateBackgroundColor(KGlobalSettings::highlightColor())); + painter->setPen(TDEGlobalSettings::calculateAlternateBackgroundColor(TDEGlobalSettings::highlightColor())); + painter->setBrush(TDEGlobalSettings::calculateAlternateBackgroundColor(TDEGlobalSettings::highlightColor())); pen=TQPen(white); } } else { - painter->setBrush(KGlobalSettings::baseColor()); - painter->setPen(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); } painter->drawRect(0, 0, w, h); painter->setPen(pen); @@ -205,12 +205,12 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, // TODO: Handle other start weekdays than Monday if (theDate == date) { - painter->setBrush(KGlobalSettings::highlightColor()); + painter->setBrush(TDEGlobalSettings::highlightColor()); } else { - painter->setBrush(KGlobalSettings::baseColor()); - painter->setPen(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); + painter->setPen(TDEGlobalSettings::baseColor()); } painter->setPen(lightGray); @@ -339,7 +339,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, } else if (m_type == QUARTERLY) { - painter->setBrush(KGlobalSettings::baseColor()); + painter->setBrush(TDEGlobalSettings::baseColor()); painter->setPen(lightGray); painter->drawRect(0, 0, w, h); @@ -378,9 +378,9 @@ void kMyMoneyScheduledDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) } #if TDE_VERSION < 310 - int firstWeekDay = KGlobal::locale()->weekStartsMonday() ? 1 : 0; + int firstWeekDay = TDEGlobal::locale()->weekStartsMonday() ? 1 : 0; #else - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); #endif TQDate drawDate(date); diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index f852c76..b73f458 100644 --- a/kmymoney2/widgets/kmymoneytitlelabel.cpp +++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp @@ -38,10 +38,10 @@ KMyMoneyTitleLabel::KMyMoneyTitleLabel(TQWidget *parent, const char *name) : TQLabel(parent, name), - m_bgColor( KGlobalSettings::highlightColor() ), - m_textColor( KGlobalSettings::highlightedTextColor() ) + m_bgColor( TDEGlobalSettings::highlightColor() ), + m_textColor( TDEGlobalSettings::highlightedTextColor() ) { - setFont(KGlobalSettings::windowTitleFont()); + setFont(TDEGlobalSettings::windowTitleFont()); } KMyMoneyTitleLabel::~KMyMoneyTitleLabel() @@ -51,7 +51,7 @@ KMyMoneyTitleLabel::~KMyMoneyTitleLabel() void KMyMoneyTitleLabel::setLeftImageFile(const TQString& _file) { m_leftImageFile = _file; - TQString lfullpath = KGlobal::dirs()->findResource("appdata", m_leftImageFile); + TQString lfullpath = TDEGlobal::dirs()->findResource("appdata", m_leftImageFile); m_leftImage.load(lfullpath); m_leftImage.setAlphaBuffer(true); } @@ -59,7 +59,7 @@ void KMyMoneyTitleLabel::setLeftImageFile(const TQString& _file) void KMyMoneyTitleLabel::setRightImageFile(const TQString& _file) { m_rightImageFile = _file; - TQString rfullpath = KGlobal::dirs()->findResource("appdata", m_rightImageFile); + TQString rfullpath = TDEGlobal::dirs()->findResource("appdata", m_rightImageFile); m_rightImage.load(rfullpath); m_rightImage.setAlphaBuffer(true); if(m_rightImage.height() < 30) diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index f446acf..8c3960c 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -123,7 +123,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_finishButton = new KPushButton(i18n("&Finish"), this); m_helpButton = new KPushButton(i18n("&Help"), this); - if ( KGlobalSettings::showIconsOnPushButtons() ) + if ( TDEGlobalSettings::showIconsOnPushButtons() ) { m_backButton->setIconSet( KStdGuiItem::back( KStdGuiItem::UseRTL ).iconSet() ); m_nextButton->setIconSet( KStdGuiItem::forward( KStdGuiItem::UseRTL ).iconSet() ); @@ -150,7 +150,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W // create stage layout and frame m_stepFrame = new TQFrame(this, "stepFrame"); - m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); + m_stepFrame->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); m_stepLayout = new TQVBoxLayout(m_stepFrame, 11, 6, "stepLayout"); m_stepLayout->addWidget(new TQLabel("", m_stepFrame)); m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); @@ -163,7 +163,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W // information when the user selected a different color set using the KConfigCenter m_stepPalette = m_stepLabel->palette(); TQColorGroup::ColorRole role = TQColorGroup::Foreground; - TQColor color = KGlobalSettings::highlightedTextColor(); + TQColor color = TDEGlobalSettings::highlightedTextColor(); m_stepPalette.setColor( TQPalette::Active, role, color ); m_stepPalette.setColor( TQPalette::Inactive, role, color ); m_stepPalette.setColor( TQPalette::Disabled, role, color ); diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index 5a0148c..e07cd42 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -340,7 +340,7 @@ void GroupMarker::paintRegisterCell(TQPainter* painter, int row, int /* col */, font.setBold(false); painter->setFont(font); - painter->drawText(cellRect, TQt::AlignVCenter | TQt::AlignCenter, KGlobal::locale()->formatDate(sortPostDate(), true)); + painter->drawText(cellRect, TQt::AlignVCenter | TQt::AlignCenter, TDEGlobal::locale()->formatDate(sortPostDate(), true)); } painter->restore(); @@ -1374,7 +1374,7 @@ void Register::adjustColumn(int col) // check for date column if(col == DateColumn) { - TQString txt = KGlobal::locale()->formatDate(TQDate(6999,12,29), true); + TQString txt = TDEGlobal::locale()->formatDate(TQDate(6999,12,29), true); int nw = cellFontMetrics.width(txt+" "); w = TQMAX( w, nw ); } else { @@ -2271,7 +2271,7 @@ void Register::addGroupMarkers(void) yesterday = today.addDays(-1); // a = TQDate::dayOfWeek() todays weekday (1 = Monday, 7 = Sunday) // b = KLocale::weekStartDay() first day of week (1 = Monday, 7 = Sunday) - weekStartOfs = today.dayOfWeek() - KGlobal::locale()->weekStartDay(); + weekStartOfs = today.dayOfWeek() - TDEGlobal::locale()->weekStartDay(); if(weekStartOfs < 0) { weekStartOfs = 7 + weekStartOfs; } diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index 00d0f56..ea5ea2c 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 = KGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState); + clip = TDEGlobal::iconLoader()->loadIcon("attach", KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState); if(clip.height() > h) { clip.resize(h, h); } @@ -1029,7 +1029,7 @@ bool StdTransaction::formCellText(TQString& txt, int& align, int row, int col, T case ValueColumn2: align |= TQt::AlignRight; if(m_transaction != MyMoneyTransaction()) - txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true); + txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true); break; } break; @@ -1096,7 +1096,7 @@ void StdTransaction::registerCellText(TQString& txt, int& align, int row, int co case DateColumn: align |= TQt::AlignLeft; - txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true); + txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true); break; case DetailColumn: @@ -1500,7 +1500,7 @@ bool InvestTransaction::formCellText(TQString& txt, int& align, int row, int col align |= TQt::AlignRight; fieldEditable = true; if(m_transaction != MyMoneyTransaction()) - txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true); + txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true); break; } break; @@ -1688,7 +1688,7 @@ void InvestTransaction::registerCellText(TQString& txt, int& align, int row, int switch(col) { case DateColumn: align |= TQt::AlignLeft; - txt = KGlobal::locale()->formatDate(m_transaction.postDate(), true); + txt = TDEGlobal::locale()->formatDate(m_transaction.postDate(), true); break; case DetailColumn: diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h index 636a6a7..cf87646 100644 --- a/kmymoney2/widgets/transactionsortoption.ui.h +++ b/kmymoney2/widgets/transactionsortoption.ui.h @@ -26,7 +26,7 @@ void TransactionSortOption::init() { - KIconLoader* il = KGlobal::iconLoader(); + 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))); diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index d15c001..c7eb6b5 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp @@ -1377,7 +1377,7 @@ LoanPayoutPage::LoanPayoutPage(Wizard* wizard, const char* name) : m_mandatoryGroup->add(m_assetAccount->lineEdit()); m_mandatoryGroup->add(m_loanAccount->lineEdit()); - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); KGuiItem createAssetButtenItem( i18n( "&Create..." ), TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new asset account"), @@ -1605,7 +1605,7 @@ void AccountSummaryPage::enterPage(void) else p = new KListViewItem(group, p, i18n("Type"), m_wizard->m_accountTypePage->m_typeSelection->currentText()); p = new KListViewItem(group, p, i18n("Currency"), m_wizard->currency().name()); - p = new KListViewItem(group, p, i18n("Opening date"), KGlobal::locale()->formatDate(acc.openingDate())); + p = new KListViewItem(group, p, i18n("Opening date"), TDEGlobal::locale()->formatDate(acc.openingDate())); if(m_wizard->currency().id() != MyMoneyFile::instance()->baseCurrency().id()) { p = new KListViewItem(group, p, i18n("Conversion rate"), m_wizard->conversionRate().rate(TQString()).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())); } @@ -1662,7 +1662,7 @@ void AccountSummaryPage::enterPage(void) else p = new KListViewItem(group, p, i18n("Transfer amount from"), m_wizard->m_loanPayoutPage->m_assetAccount->currentText()); } - p = new KListViewItem(group, p, i18n("Payment date"), KGlobal::locale()->formatDate(m_wizard->m_loanPayoutPage->m_payoutDate->date())); + p = new KListViewItem(group, p, i18n("Payment date"), TDEGlobal::locale()->formatDate(m_wizard->m_loanPayoutPage->m_payoutDate->date())); } } @@ -1677,13 +1677,13 @@ void AccountSummaryPage::enterPage(void) p = new KListViewItem(group, p, i18n("Paid from"), paymentAccount.name()); p = new KListViewItem(group, p, i18n("Pay to"), m_wizard->m_schedulePage->m_payee->currentText()); p = new KListViewItem(group, p, i18n("Amount"), m_wizard->m_schedulePage->m_amount->value().formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("First payment due"), KGlobal::locale()->formatDate(sch.nextDueDate())); + p = new KListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(sch.nextDueDate())); p = new KListViewItem(group, p, i18n("Payment method"), m_wizard->m_schedulePage->m_method->currentText()); } if(acc.isLoan()) { p = new KListViewItem(group, p, i18n("Occurence"), m_wizard->m_generalLoanInfoPage->m_paymentFrequency->currentText()); p = new KListViewItem(group, p, i18n("Amount"), (m_wizard->m_loanPaymentPage->basePayment() + m_wizard->m_loanPaymentPage->additionalFees()).formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("First payment due"), KGlobal::locale()->formatDate(m_wizard->m_loanSchedulePage->firstPaymentDueDate())); + p = new KListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(m_wizard->m_loanSchedulePage->firstPaymentDueDate())); } } } diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp index 0cf449f..50f65bd 100644 --- a/libkgpgfile/kgpgfile.cpp +++ b/libkgpgfile/kgpgfile.cpp @@ -225,7 +225,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) bool KGPGFile::startProcess(const TQStringList& args) { - // now start the KProcess with GPG + // now start the TDEProcess with GPG m_process = new KShellProcess(); *m_process << "gpg"; *m_process << args; @@ -233,19 +233,19 @@ bool KGPGFile::startProcess(const TQStringList& args) // TQString arglist = args.join(":"); // tqDebug("gpg '%s'", arglist.data()); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotGPGExited(KProcess *))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotGPGExited(TDEProcess *))); - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotDataFromGPG(KProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotDataFromGPG(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotErrorFromGPG(KProcess*, char*, int))); + connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotErrorFromGPG(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotSendDataToGPG(KProcess *))); + connect(m_process, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotSendDataToGPG(TDEProcess *))); - if(!m_process->start(KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdin|KProcess::Stdout|KProcess::Stderr))) { + if(!m_process->start(TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdin|TDEProcess::Stdout|TDEProcess::Stderr))) { // tqDebug("m_process->start failed"); delete m_process; m_process = 0; @@ -265,7 +265,7 @@ void KGPGFile::close(void) return; } - // finish the KProcess and clean up things + // finish the TDEProcess and clean up things if(m_process) { if(isWritable()) { // tqDebug("Finish writing"); @@ -437,7 +437,7 @@ TQByteArray KGPGFile::readAll(void) return ba; } -void KGPGFile::slotGPGExited(KProcess* ) +void KGPGFile::slotGPGExited(TDEProcess* ) { // tqDebug("GPG finished"); if(m_process) { @@ -458,7 +458,7 @@ void KGPGFile::slotGPGExited(KProcess* ) } } -void KGPGFile::slotDataFromGPG(KProcess* proc, char* buf, int len) +void KGPGFile::slotDataFromGPG(TDEProcess* proc, char* buf, int len) { // tqDebug("Received %d bytes on stdout", len); @@ -490,7 +490,7 @@ void KGPGFile::slotDataFromGPG(KProcess* proc, char* buf, int len) // tqDebug("end slotDataFromGPG"); } -void KGPGFile::slotErrorFromGPG(KProcess *, char *buf, int len) +void KGPGFile::slotErrorFromGPG(TDEProcess *, char *buf, int len) { // tqDebug("Received %d bytes on stderr", len); TQCString msg; @@ -499,7 +499,7 @@ void KGPGFile::slotErrorFromGPG(KProcess *, char *buf, int len) msg.resetRawData(buf, len); } -void KGPGFile::slotSendDataToGPG(KProcess *) +void KGPGFile::slotSendDataToGPG(TDEProcess *) { // tqDebug("wrote stdin"); if(m_needExitLoop) { diff --git a/libkgpgfile/kgpgfile.h b/libkgpgfile/kgpgfile.h index 55de7e0..ab28968 100644 --- a/libkgpgfile/kgpgfile.h +++ b/libkgpgfile/kgpgfile.h @@ -32,7 +32,7 @@ */ class KShellProcess; -class KProcess; +class TDEProcess; /** * A class for reading and writing data to/from an @@ -169,10 +169,10 @@ public: #endif protected slots: - void slotGPGExited(KProcess *); - void slotDataFromGPG(KProcess *, char *buf, int len); - void slotErrorFromGPG(KProcess *, char *buf, int len); - void slotSendDataToGPG(KProcess *); + void slotGPGExited(TDEProcess *); + void slotDataFromGPG(TDEProcess *, char *buf, int len); + void slotErrorFromGPG(TDEProcess *, char *buf, int len); + void slotSendDataToGPG(TDEProcess *); private: void init(void); |