From 6c1d52c8248adb9189c944a28efde52330e99b66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:21:28 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ChangeLog | 10 +-- developer-doc/phb/src-examples.docbook | 6 +- kmymoney2/converter/mymoneyqifprofile.cpp | 14 ++-- kmymoney2/converter/mymoneyqifreader.cpp | 18 ++--- kmymoney2/converter/mymoneyqifreader.h | 6 +- .../converter/mymoneystatementreader.cpp | 2 +- kmymoney2/converter/webpricequote.cpp | 52 ++++++------- kmymoney2/converter/webpricequote.h | 12 +-- kmymoney2/dialogs/kaccountselectdlg.cpp | 2 +- kmymoney2/dialogs/kbackupdlg.cpp | 8 +- kmymoney2/dialogs/kbalancechartdlg.cpp | 2 +- kmymoney2/dialogs/kchooseimportexportdlg.cpp | 4 +- kmymoney2/dialogs/kcsvprogressdlg.cpp | 4 +- kmymoney2/dialogs/kcurrencycalculator.cpp | 2 +- kmymoney2/dialogs/keditequityentrydlg.cpp | 2 +- kmymoney2/dialogs/keditloanwizard.cpp | 6 +- kmymoney2/dialogs/kendingbalancedlg.cpp | 6 +- kmymoney2/dialogs/kenterscheduledlg.cpp | 6 +- kmymoney2/dialogs/kequitypriceupdatedlg.cpp | 4 +- kmymoney2/dialogs/kexportdlg.cpp | 8 +- kmymoney2/dialogs/kimportdlg.cpp | 10 +-- kmymoney2/dialogs/kmymoneypricedlg.cpp | 2 +- kmymoney2/dialogs/kmymoneysplittable.cpp | 4 +- kmymoney2/dialogs/knewaccountdlg.cpp | 2 +- kmymoney2/dialogs/knewloanwizard.cpp | 6 +- kmymoney2/dialogs/kreconciledlg.cpp | 30 +++---- kmymoney2/dialogs/ksecuritylisteditor.cpp | 2 +- kmymoney2/dialogs/ksplittransactiondlg.cpp | 2 +- kmymoney2/dialogs/kstartdlg.cpp | 10 +-- kmymoney2/dialogs/mymoneyqifprofileeditor.cpp | 16 ++-- kmymoney2/dialogs/settings/ksettingshome.cpp | 4 +- .../settings/ksettingsonlinequotes.cpp | 2 +- kmymoney2/dialogs/transactioneditor.cpp | 2 +- kmymoney2/kmymoney2.cpp | 36 ++++----- kmymoney2/kmymoney2.h | 2 +- kmymoney2/kmymoneyglobalsettings.cpp | 8 +- kmymoney2/kmymoneytest.cpp | 2 +- kmymoney2/kmymoneyutils.cpp | 26 +++---- kmymoney2/kstartuplogo.cpp | 4 +- kmymoney2/main.cpp | 16 ++-- kmymoney2/mymoney/mymoneyinstitution.cpp | 2 +- kmymoney2/mymoney/mymoneymoney.cpp | 2 +- kmymoney2/reports/listtable.cpp | 8 +- kmymoney2/reports/pivottable.cpp | 16 ++-- kmymoney2/reports/pivottabletest.cpp | 6 +- kmymoney2/reports/querytabletest.cpp | 4 +- kmymoney2/views/kaccountsview.cpp | 6 +- kmymoney2/views/kbudgetview.cpp | 2 +- kmymoney2/views/kcategoriesview.cpp | 2 +- kmymoney2/views/kforecastview.cpp | 8 +- kmymoney2/views/kgloballedgerview.cpp | 78 +++++++++---------- kmymoney2/views/kgloballedgerview.h | 6 +- kmymoney2/views/khomeview.cpp | 12 +-- kmymoney2/views/kinvestmentview.cpp | 4 +- kmymoney2/views/kmymoneyview.cpp | 6 +- kmymoney2/views/kmymoneyview.h | 4 +- kmymoney2/views/kpayeesview.cpp | 8 +- kmymoney2/views/kreportsview.cpp | 12 +-- kmymoney2/views/kscheduledlistitem.cpp | 4 +- kmymoney2/views/kscheduledview.cpp | 10 +-- .../widgets/kaccounttemplateselector.cpp | 12 +-- kmymoney2/widgets/kbudgetvalues.cpp | 2 +- kmymoney2/widgets/kmymoneyaccounttree.cpp | 2 +- kmymoney2/widgets/kmymoneyaccounttreebase.cpp | 4 +- .../widgets/kmymoneyaccounttreeforecast.cpp | 2 +- kmymoney2/widgets/kmymoneybriefschedule.cpp | 6 +- kmymoney2/widgets/kmymoneycalculator.cpp | 6 +- kmymoney2/widgets/kmymoneycalendar.cpp | 6 +- kmymoney2/widgets/kmymoneycalendar.h | 4 +- kmymoney2/widgets/kmymoneycategory.cpp | 2 +- kmymoney2/widgets/kmymoneydateinput.cpp | 8 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 38 ++++----- kmymoney2/widgets/kmymoneydatetbl.h | 4 +- kmymoney2/widgets/kmymoneyedit.cpp | 12 +-- kmymoney2/widgets/kmymoneygpgconfig.cpp | 4 +- kmymoney2/widgets/kmymoneylineedit.cpp | 8 +- .../widgets/kmymoneyonlinequoteconfig.cpp | 2 +- kmymoney2/widgets/kmymoneypriceview.cpp | 6 +- .../widgets/kmymoneyscheduleddatetbl.cpp | 30 +++---- kmymoney2/widgets/kmymoneytitlelabel.cpp | 10 +-- kmymoney2/widgets/kmymoneywizard.cpp | 6 +- kmymoney2/widgets/register.cpp | 6 +- kmymoney2/widgets/transaction.cpp | 10 +-- kmymoney2/widgets/transactionsortoption.ui.h | 2 +- .../newaccountwizard/knewaccountwizard.cpp | 10 +-- libkgpgfile/kgpgfile.cpp | 30 +++---- libkgpgfile/kgpgfile.h | 10 +-- 87 files changed, 401 insertions(+), 401 deletions(-) diff --git a/ChangeLog b/ChangeLog index e007d22..ede6591 100644 --- a/ChangeLog +++ b/ChangeLog @@ -342,7 +342,7 @@ * Don't reverse operation when entering a scheduled transfer transaction 2009-08-01 Alvaro Soliverez - * 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 * 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 * 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 @@ -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 * 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(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 & Ace Jones */ -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 & Ace Jones , Tony B */ -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("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, 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(""),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, 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(""),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("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString(""))) == KMessageBox::Yes) { + if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").arg(schedule.name(), TDEGlobal::locale()->formatDate(next, true))+TQString(""))) == 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 += "