diff options
36 files changed, 125 insertions, 125 deletions
@@ -4899,7 +4899,7 @@ * Added ability to configure reports to have days or weeks as the column. 2005-11-25 Thomas Baumgart <ipwizard@users.sourceforge.net> - * Reworked settings dialog to be based on KConfigDialog + * Reworked settings dialog to be based on TDEConfigDialog * Allow quit when trying to open the same file as already opened in another instance of KMyMoney * Install kgpgfile.h @@ -9312,7 +9312,7 @@ it doesn't always update the options properly. But you can hand edit $HOME/.kde/share/config/kmymoney2rc. * Removed KMyMoneySettings class and changed all references to - use the KConfig class. + use the TDEConfig class. 2001-07-06 Michael Edwardes <mte@users.sourceforge.net> * Improved the payee editor, adding a delete button and improving diff --git a/developer-doc/phb/settings.docbook b/developer-doc/phb/settings.docbook index 7bc592d..5c47bf9 100644 --- a/developer-doc/phb/settings.docbook +++ b/developer-doc/phb/settings.docbook @@ -96,7 +96,7 @@ That should be it. <title>References</title> <para> -A more complete - but generic version - can be found on <ulink url="http://techbase.kde.org/Development/Tutorials/Using_KConfig_XT">http://techbase.kde.org/Development/Tutorials/Using_KConfig_XT</ulink> . Currently, &app; does not use the <filename>CMakeLists.txt</filename> file but the above mentioned <filename>Makefile.am</filename> approach. You can safely skip the section about CMakeLists.txt. +A more complete - but generic version - can be found on <ulink url="http://techbase.kde.org/Development/Tutorials/Using_TDEConfig_XT">http://techbase.kde.org/Development/Tutorials/Using_TDEConfig_XT</ulink> . Currently, &app; does not use the <filename>CMakeLists.txt</filename> file but the above mentioned <filename>Makefile.am</filename> approach. You can safely skip the section about CMakeLists.txt. </para> </sect1> diff --git a/developer-doc/phb/src-examples.docbook b/developer-doc/phb/src-examples.docbook index 78c26fa..84db1ac 100644 --- a/developer-doc/phb/src-examples.docbook +++ b/developer-doc/phb/src-examples.docbook @@ -53,7 +53,7 @@ This appendix contains an example of a * * It uses KDialogBase to implement it's interface. * - * It uses the global KConfig object to read and write the application + * It uses the global TDEConfig object to read and write the application * settings. * * @see KDialogBase @@ -398,12 +398,12 @@ void KSettingsDlg::setPageList() qtabwidget->addTab(qvboxInsideTab2, i18n("Cell Font")); } -/** Read all the settings in from the global KConfig object and set all the +/** Read all the settings in from the global TDEConfig object and set all the * widgets appropriately. **/ void KSettingsDlg::configRead() { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Settings Dialog"); QSize *qsizeDefaultSize = new QSize(470,470); this->resize(kconfig->readSizeEntry("Geometry", qsizeDefaultSize)); @@ -445,11 +445,11 @@ void KSettingsDlg::configRead() m_qradiobuttonOtherRow->setChecked(!m_bTempColourPerTransaction); } -/** Write out all the settings to the global KConfig object. +/** Write out all the settings to the global TDEConfig object. **/ void KSettingsDlg::configWrite() { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 079716d..d65a384 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -186,7 +186,7 @@ void MyMoneyQifProfile::clear(void) void MyMoneyQifProfile::loadProfile(const TQString& name) { - KConfig* config = TDEGlobal::config(); + TDEConfig* 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup(m_profileName); config->writeEntry("Description", m_profileDescription); diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index bcb9091..2e7266b 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -402,10 +402,10 @@ bool MyMoneyQifReader::startImport(void) m_filename = TQString(); m_data.clear(); - if(!KIO::NetAccess::download(m_url, m_filename, NULL)) { + if(!TDEIO::NetAccess::download(m_url, m_filename, NULL)) { KMessageBox::detailedError(0, i18n("Error while loading file '%1'!").arg(m_url.prettyURL()), - KIO::NetAccess::lastErrorString(), + TDEIO::NetAccess::lastErrorString(), i18n("File access error")); return false; } @@ -459,7 +459,7 @@ bool MyMoneyQifReader::finishImport(void) m_file = 0; // remove the Don't ask again entries - KConfig* config = TDEGlobal::config(); + TDEConfig* 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; @@ -500,7 +500,7 @@ bool MyMoneyQifReader::finishImport(void) // if a temporary file was constructed by NetAccess::download, // then it will be removed with the next call. Otherwise, it // stays untouched on the local filesystem - KIO::NetAccess::removeTempFile(m_filename); + TDEIO::NetAccess::removeTempFile(m_filename); #if 0 // Add the transaction entries diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index a242f41..8bef60e 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp index 553e682..191474f 100644 --- a/kmymoney2/converter/mymoneytemplate.cpp +++ b/kmymoney2/converter/mymoneytemplate.cpp @@ -67,11 +67,11 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url) } else { bool rc; - rc = KIO::NetAccess::download(url, filename, tqApp->mainWidget()); + rc = TDEIO::NetAccess::download(url, filename, tqApp->mainWidget()); if(!rc) { KMessageBox::detailedError(tqApp->mainWidget(), i18n("Error while loading file '%1'!").arg(url.url()), - KIO::NetAccess::lastErrorString(), + TDEIO::NetAccess::lastErrorString(), i18n("File access error")); return false; } @@ -105,7 +105,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url) // if a temporary file was constructed by NetAccess::download, // then it will be removed with the next call. Otherwise, it // stays untouched on the local filesystem - KIO::NetAccess::removeTempFile(filename); + TDEIO::NetAccess::removeTempFile(filename); return rc; } @@ -403,7 +403,7 @@ bool MyMoneyTemplate::saveTemplate(const KURL& url) } else { KTempFile tmpfile; saveToLocalFile(tmpfile.file()); - if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL)) + if(!TDEIO::NetAccess::upload(tmpfile.name(), url, NULL)) throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url())); tmpfile.unlink(); } diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index ba9cdc4..b614dcc 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -122,7 +122,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id, url = KURL::fromPathOrURL(m_source.m_url.arg(m_symbol)); // If we're running a non-interactive session (with no UI), we can't - // use KIO::NetAccess, so we have to get our web data the old-fashioned + // use TDEIO::NetAccess, so we have to get our web data the old-fashioned // way... with 'wget'. // // Note that a 'non-interactive' session right now means only the test @@ -180,7 +180,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id, } else { - emit error(KIO::NetAccess::lastErrorString()); + emit error(TDEIO::NetAccess::lastErrorString()); slotParseQuote(TQString()); } } @@ -199,7 +199,7 @@ bool WebPriceQuote::download(const KURL& u, TQString & target, TQWidget* window) { m_tmpFile = TQString(); - // the following code taken and adapted from KIO::NetAccess::download() + // the following code taken and adapted from TDEIO::NetAccess::download() if (target.isEmpty()) { KTempFile tmpFile; @@ -211,22 +211,22 @@ bool WebPriceQuote::download(const KURL& u, TQString & target, TQWidget* window) dest.setPath( target ); - // the following code taken and adapted from KIO::NetAccess::filecopyInternal() + // the following code taken and adapted from TDEIO::NetAccess::filecopyInternal() bJobOK = true; // success unless further error occurs - KIO::Scheduler::checkSlaveOnHold(true); - KIO::Job * job = KIO::file_copy( u, dest, -1, true, false, false ); + TDEIO::Scheduler::checkSlaveOnHold(true); + TDEIO::Job * job = TDEIO::file_copy( u, dest, -1, true, false, false ); job->setWindow (window); job->addMetaData("cache", "reload"); // bypass cache - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } -// The following parts are copied and adjusted from KIO::NetAccess +// The following parts are copied and adjusted from TDEIO::NetAccess // If a troll sees this, he kills me void tqt_enter_modal( TQWidget *widget ); @@ -241,7 +241,7 @@ void WebPriceQuote::enter_loop(void) tqt_leave_modal(&dummy); } -void WebPriceQuote::slotResult( KIO::Job * job ) +void WebPriceQuote::slotResult( TDEIO::Job * job ) { lastErrorCode = job->error(); bJobOK = !job->error(); @@ -254,7 +254,7 @@ void WebPriceQuote::slotResult( KIO::Job * job ) tqApp->exit_loop(); } -// The above parts are copied and adjusted from KIO::NetAccess +// The above parts are copied and adjusted from TDEIO::NetAccess bool WebPriceQuote::launchFinanceQuote ( const TQString& _symbol, const TQString& _id, const TQString& _sourcename ) { @@ -598,7 +598,7 @@ TQStringList WebPriceQuote::quoteSources (const _quoteSystemE _system) { TQStringList WebPriceQuote::quoteSourcesNative() { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); TQStringList groups = kconfig->groupList(); TQStringList::Iterator it; @@ -683,7 +683,7 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name, const TQString& u WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name) { m_name = name; - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); kconfig->writeEntry("URL", m_url); kconfig->writeEntry("PriceRegex", m_price); @@ -717,7 +717,7 @@ void WebPriceQuoteSource::rename(const TQString& name) void WebPriceQuoteSource::remove(void) const { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name)); } diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h index a9ec149..411d100 100644 --- a/kmymoney2/converter/webpricequote.h +++ b/kmymoney2/converter/webpricequote.h @@ -30,7 +30,7 @@ // KDE Headers #include <kprocess.h> -namespace KIO { +namespace TDEIO { class Job; }; @@ -182,7 +182,7 @@ private: void removeTempFile(const TQString& tmpFile); private slots: - void slotResult( KIO::Job * job ); + void slotResult( TDEIO::Job * job ); private: @@ -204,7 +204,7 @@ private: /** - * Whether the download succeeded or not. Taken from KIO::NetAccess + * Whether the download succeeded or not. Taken from TDEIO::NetAccess */ bool bJobOK; static TQString* lastErrorMsg; diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp index b0ab43b..0dadbe6 100644 --- a/kmymoney2/dialogs/kbackupdlg.cpp +++ b/kmymoney2/dialogs/kbackupdlg.cpp @@ -79,7 +79,7 @@ void KBackupDlg::chooseButtonClicked() void KBackupDlg::readConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp index 9386e12..5674205 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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_lastType = config->readEntry("KChooseImportExportDlg_LastType"); } void KChooseImportExportDlg::writeConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 9128a3a..05d8f55 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 9855698..409c15e 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Notification Messages"); config->deleteEntry("KEquityPriceUpdateDlg::slotQuoteFailed::Price Update Failed"); } diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp index 1aef331..51ce250 100644 --- a/kmymoney2/dialogs/kexportdlg.cpp +++ b/kmymoney2/dialogs/kexportdlg.cpp @@ -130,7 +130,7 @@ void KExportDlg::loadProfiles(const bool selectLast) m_profileComboBox->clear(); TQStringList list; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); @@ -156,7 +156,7 @@ void KExportDlg::slotOkClicked() void KExportDlg::readConfig(void) { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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/kexportdlg.h b/kmymoney2/dialogs/kexportdlg.h index 6bf91ad..8b81a15 100644 --- a/kmymoney2/dialogs/kexportdlg.h +++ b/kmymoney2/dialogs/kexportdlg.h @@ -43,7 +43,7 @@ * It relies upon the QIF file handling routines in MyMoneyQifProfile and * MyMoneyQifWriter to do the actual writing of QIF files. * - * It uses the global KConfig object to read and write the application + * It uses the global TDEConfig object to read and write the application * settings. * * @see MyMoneyAccount, MyMoneyQifProfile, MyMoneyQifProfileEditor diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index d661455..bfa44be 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -130,14 +130,14 @@ void KImportDlg::slotOkClicked() void KImportDlg::readConfig(void) { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); m_qlineeditFile->setText(kconfig->readEntry("KImportDlg_LastFile")); } void KImportDlg::writeConfig(void) { - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("Last Use Settings"); kconfig->writeEntry("KImportDlg_LastFile", m_qlineeditFile->text()); kconfig->writeEntry("KImportDlg_LastProfile", m_profileComboBox->currentText()); @@ -147,7 +147,7 @@ void KImportDlg::writeConfig(void) /** Make sure the text input is ok */ void KImportDlg::slotFileTextChanged(const TQString& text) { - if (!text.isEmpty() && KIO::NetAccess::exists(text, true, tqApp->mainWidget())) { + if (!text.isEmpty() && TDEIO::NetAccess::exists(text, true, tqApp->mainWidget())) { // m_qcomboboxDateFormat->setEnabled(true); m_qbuttonOk->setEnabled(true); m_qlineeditFile->setText(text); @@ -188,7 +188,7 @@ void KImportDlg::loadProfiles(const bool selectLast) m_profileComboBox->clear(); TQStringList list; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); list = config->readListEntry("profiles"); diff --git a/kmymoney2/dialogs/kimportdlg.h b/kmymoney2/dialogs/kimportdlg.h index a2070fd..bd0dd5f 100644 --- a/kmymoney2/dialogs/kimportdlg.h +++ b/kmymoney2/dialogs/kimportdlg.h @@ -42,7 +42,7 @@ * It relies upon the QIF file handling routines in MyMoneyAccount to do * the actual writing of QIF files. * - * It uses the global KConfig object to read and write the application + * It uses the global TDEConfig object to read and write the application * settings. * * @see MyMoneyAccount diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index 0b28186..c4dc756 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -128,7 +128,7 @@ void KStartDlg::readConfig() TQString value; unsigned int i = 1; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); KIconLoader *il = TDEGlobal::iconLoader(); // read file list @@ -165,7 +165,7 @@ void KStartDlg::readConfig() /** Write config window */ void KStartDlg::writeConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Start Dialog"); config->writeEntry("Geometry", this->size() ); @@ -195,9 +195,9 @@ void KStartDlg::slotOk() bool KStartDlg::fileExists(KURL url) { #if KDE_IS_VERSION(3,2,0) - return KIO::NetAccess::exists(url, true, this); + return TDEIO::NetAccess::exists(url, true, this); #else - return KIO::NetAccess::exists(url); + return TDEIO::NetAccess::exists(url); #endif } diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index 2dc5b73..347a7f7 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); TQStringList list = config->readListEntry("profiles"); @@ -133,7 +133,7 @@ MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *pare MyMoneyQifProfileEditor::~MyMoneyQifProfileEditor() { if(m_inEdit && m_isDirty && m_isAccepted) { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->sync(); } else { slotReset(); @@ -227,7 +227,7 @@ void MyMoneyQifProfileEditor::loadProfileListFromConfig(void) m_profileListBox->clear(); TQStringList list; - KConfig* config = TDEGlobal::config(); + TDEConfig* 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 = TDEGlobal::config(); + TDEConfig* 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Profiles"); TQStringList list = config->readListEntry("profiles"); @@ -348,7 +348,7 @@ void MyMoneyQifProfileEditor::slotOk(void) m_profile.saveProfile(); - KConfig* config = TDEGlobal::config(); + TDEConfig* 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->rollback(); config->reparseConfiguration(); diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 0bd0d2a..4c0b456 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -951,9 +951,9 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url) if(!duplicate) { #if KDE_IS_VERSION(3,2,0) - if((url.protocol() == "sql") || (url.isValid() && KIO::NetAccess::exists(url, true, this))) { + if((url.protocol() == "sql") || (url.isValid() && TDEIO::NetAccess::exists(url, true, this))) { #else - if((url.protocol() == "sql") || (url.isValid() && KIO::NetAccess::exists(url))) { + if((url.protocol() == "sql") || (url.isValid() && TDEIO::NetAccess::exists(url))) { #endif KURL dburl = url; // check if a password is needed. it may be if the URL came from the last/recent file list @@ -1791,7 +1791,7 @@ bool KMyMoney2App::okToWriteFile(const KURL& url) // check if the file exists and warn the user bool reallySaveFile = true; - if(KIO::NetAccess::exists(url, true, this)) { + if(TDEIO::NetAccess::exists(url, true, this)) { if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").arg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes) reallySaveFile = false; } @@ -1801,11 +1801,11 @@ bool KMyMoney2App::okToWriteFile(const KURL& url) void KMyMoney2App::slotSettings(void) { // if we already have an instance of the settings dialog, then use it - if(KConfigDialog::showDialog("KMyMoney-Settings")) + if(TDEConfigDialog::showDialog("KMyMoney-Settings")) return; // otherwise, we have to create it - KConfigDialog* dlg = new KConfigDialog(this, "KMyMoney-Settings", KMyMoneyGlobalSettings::self(), + TDEConfigDialog* dlg = new TDEConfigDialog(this, "KMyMoney-Settings", KMyMoneyGlobalSettings::self(), KDialogBase::IconList, KDialogBase::Default | KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, true); // create the pages ... @@ -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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); @@ -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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5781,7 +5781,7 @@ TQString KMyMoney2App::readLastUsedDir(void) const TQString str; //get global config object for our app. - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); @@ -5801,7 +5801,7 @@ TQString KMyMoney2App::readLastUsedFile(void) const TQString str; // get global config object for our app. - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); if(kconfig) { kconfig->setGroup("General Options"); diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h index fa864d9..8f714a0 100644 --- a/kmymoney2/kmymoney2.h +++ b/kmymoney2/kmymoney2.h @@ -1194,7 +1194,7 @@ private: Private* d; /** the configuration object of the application */ - KConfig *config; + TDEConfig *config; TQMap<TQString,KMyMoneyPlugin::ImporterPlugin*> m_importerPlugins; diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp index ccaf6d3..4fb8ede 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp @@ -92,7 +92,7 @@ void KOfxDirectConnectDlg::init(void) d->m_fpTrace.open(IO_WriteOnly | IO_Append); } - m_job = KIO::http_post( + m_job = TDEIO::http_post( m_connector.url(), request, true @@ -109,9 +109,9 @@ void KOfxDirectConnectDlg::init(void) } m_job->addMetaData("content-type", "Content-type: application/x-ofx" ); - connect(m_job,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(slotOfxFinished(KIO::Job*))); - connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&))); - connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*))); + connect(m_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(slotOfxFinished(TDEIO::Job*))); + connect(m_job,TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(TDEIO::Job*,const TQByteArray&))); + connect(m_job,TQT_SIGNAL(connected(TDEIO::Job*)),this,TQT_SLOT(slotOfxConnected(TDEIO::Job*))); setStatus(TQString("Contacting %1...").arg(m_connector.url())); kProgress1->setTotalSteps(3); @@ -129,7 +129,7 @@ void KOfxDirectConnectDlg::setDetails(const TQString& _details) kdDebug(2) << "DETAILS: " << _details << endl; } -void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*) +void KOfxDirectConnectDlg::slotOfxConnected(TDEIO::Job*) { if ( m_tmpfile ) { @@ -143,7 +143,7 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*) kProgress1->advance(1); } -void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba) +void KOfxDirectConnectDlg::slotOfxData(TDEIO::Job*,const TQByteArray& _ba) { if ( !m_tmpfile ) // throw new MYMONEYEXCEPTION("Not currently connected!!"); @@ -157,7 +157,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba) setDetails(TQString("Got %1 bytes").arg(_ba.size())); } -void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */) +void KOfxDirectConnectDlg::slotOfxFinished(TDEIO::Job* /* e */) { kProgress1->advance(1); setStatus("Completed."); diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h index b0025e3..9caedc5 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h @@ -31,7 +31,7 @@ class KTempFile; class KOfxDirectConnectDlgPrivate; -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -64,9 +64,9 @@ signals: void statementReady(const TQString& fname); protected slots: - void slotOfxFinished(KIO::Job*); - void slotOfxData(KIO::Job*,const TQByteArray&); - void slotOfxConnected(KIO::Job*); + void slotOfxFinished(TDEIO::Job*); + void slotOfxData(TDEIO::Job*,const TQByteArray&); + void slotOfxConnected(TDEIO::Job*); virtual void reject(void); protected: @@ -75,7 +75,7 @@ protected: KTempFile* m_tmpfile; MyMoneyOfxConnector m_connector; - KIO::TransferJob* m_job; + TDEIO::TransferJob* m_job; private: /// \internal d-pointer class. diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp index 9bcb938..c91b2cc 100644 --- a/kmymoney2/plugins/ofximport/ofxpartner.cpp +++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp @@ -305,7 +305,7 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ d->m_fpTrace.open(IO_WriteOnly | IO_Append); } - m_job = KIO::http_post(url, postData, showProgressInfo); + m_job = TDEIO::http_post(url, postData, showProgressInfo); m_job->addMetaData("content-type", "Content-type: application/x-ofx" ); if(d->m_fpTrace.isOpen()) { @@ -314,9 +314,9 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ ts << "request:\n" << TQString(postData) << "\n" << "response:\n"; } - connect(m_job,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(slotOfxFinished(KIO::Job*))); - connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&))); - connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*))); + connect(m_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(slotOfxFinished(TDEIO::Job*))); + connect(m_job,TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(TDEIO::Job*,const TQByteArray&))); + connect(m_job,TQT_SIGNAL(connected(TDEIO::Job*)),this,TQT_SLOT(slotOfxConnected(TDEIO::Job*))); tqApp->enter_loop(); } @@ -328,13 +328,13 @@ OfxHttpsRequest::~OfxHttpsRequest() } } -void OfxHttpsRequest::slotOfxConnected(KIO::Job*) +void OfxHttpsRequest::slotOfxConnected(TDEIO::Job*) { m_file.setName(m_dst.path()); m_file.open(IO_WriteOnly); } -void OfxHttpsRequest::slotOfxData(KIO::Job*,const TQByteArray& _ba) +void OfxHttpsRequest::slotOfxData(TDEIO::Job*,const TQByteArray& _ba) { if(m_file.isOpen()) { TQTextStream ts(&m_file); @@ -348,7 +348,7 @@ void OfxHttpsRequest::slotOfxData(KIO::Job*,const TQByteArray& _ba) } } -void OfxHttpsRequest::slotOfxFinished(KIO::Job* /* e */) +void OfxHttpsRequest::slotOfxFinished(TDEIO::Job* /* e */) { if(m_file.isOpen()) { m_file.close(); diff --git a/kmymoney2/plugins/ofximport/ofxpartner.h b/kmymoney2/plugins/ofximport/ofxpartner.h index 6367884..2739d82 100644 --- a/kmymoney2/plugins/ofximport/ofxpartner.h +++ b/kmymoney2/plugins/ofximport/ofxpartner.h @@ -29,7 +29,7 @@ // KDE Includes #include <kurl.h> -namespace KIO +namespace TDEIO { class Job; class TransferJob; @@ -89,9 +89,9 @@ public: TQHttp::Error error(void) const { return m_error; } protected slots: - void slotOfxFinished(KIO::Job*); - void slotOfxData(KIO::Job*,const TQByteArray&); - void slotOfxConnected(KIO::Job*); + void slotOfxFinished(TDEIO::Job*); + void slotOfxData(TDEIO::Job*,const TQByteArray&); + void slotOfxConnected(TDEIO::Job*); private: class Private; @@ -99,6 +99,6 @@ private: KURL m_dst; TQFile m_file; TQHttp::Error m_error; - KIO::TransferJob* m_job; + TDEIO::TransferJob* m_job; }; #endif // OFXPARTNER_H diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index 0e472ae..cff2805 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -97,7 +97,7 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KAccountsView_LastType", tab); diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index 88e5afb..cd0f5f5 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KForecastView_LastType", tab); diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index a6c8f34..1a4136c 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -581,10 +581,10 @@ bool KMyMoneyView::readFile(const KURL& url) filename = url.path(); } else { - if(!KIO::NetAccess::download(url, filename, NULL)) { + if(!TDEIO::NetAccess::download(url, filename, NULL)) { KMessageBox::detailedError(this, i18n("Error while loading file '%1'!").arg(url.url()), - KIO::NetAccess::lastErrorString(), + TDEIO::NetAccess::lastErrorString(), i18n("File access error")); return false; } @@ -771,7 +771,7 @@ bool KMyMoneyView::readFile(const KURL& url) // if a temporary file was constructed by NetAccess::download, // then it will be removed with the next call. Otherwise, it // stays untouched on the local filesystem - KIO::NetAccess::removeTempFile(filename); + TDEIO::NetAccess::removeTempFile(filename); return initializeStorage(); } @@ -890,7 +890,7 @@ bool KMyMoneyView::initializeStorage() selectBaseCurrency(); } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); int page; config->setGroup("General Options"); if(KMyMoneyGlobalSettings::startLastViewSelected() != 0) { @@ -1154,7 +1154,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) } else { KTempFile tmpfile; saveToLocalFile(tmpfile.file(), pWriter, plaintext, keyList); - if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL)) + if(!TDEIO::NetAccess::upload(tmpfile.name(), url, NULL)) throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url())); tmpfile.unlink(); } @@ -1630,7 +1630,7 @@ void KMyMoneyView::progressCallback(int current, int total, const TQString& msg) void KMyMoneyView::slotRememberPage(TQWidget* w) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("LastViewSelected", pageIndex(w)); config->sync(); diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index 43404c0..e600c45 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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); TQValueList<int> sizes = config->readIntListEntry("KPayeesViewSplitterSize"); if(sizes.size() == 2) { @@ -409,7 +409,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : KPayeesView::~KPayeesView() { // remember the splitter settings for startup - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KPayeesViewSplitterSize", m_splitter->sizes()); } diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index 2635d7d..26df1ac 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -309,7 +309,7 @@ void KScheduledView::slotRearrange(void) void KScheduledView::readConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); m_openBills = config->readBoolEntry("KScheduleView_openBills", true); m_openDeposits = config->readBoolEntry("KScheduleView_openDeposits", true); @@ -324,7 +324,7 @@ void KScheduledView::readConfig(void) void KScheduledView::writeConfig(void) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Last Use Settings"); config->writeEntry("KScheduleView_openBills", m_openBills); config->writeEntry("KScheduleView_openDeposits", m_openDeposits); diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 761b537..d637808 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -172,7 +172,7 @@ void KMyMoneyCombo::mousePressEvent(TQMouseEvent *e) m_timer.stop(); m_completion->slotMakeCompletion(""); } else { - KConfig config( "kcminputrc", true ); + TDEConfig config( "kcminputrc", true ); config.setGroup("KDE"); m_timer.start(config.readNumEntry("DoubleClickInterval", 400), true); } diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index b79ebfb..fe086b9 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -235,7 +235,7 @@ void kMyMoneyEdit::init(void) m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); - KConfig *kconfig = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("General Options"); if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true) setCalculatorButtonVisible(false); diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp index 453ab7d..df67d27 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General Options"); config->writeEntry("WriteDataEncrypted", m_useEncryption->isChecked()); config->writeEntry("EncryptRecover", m_recover->isChecked()); diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index bc4285b..f9c922c 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 = TDEGlobal::config(); + TDEConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("General Options"); int prec = kconfig->readNumEntry("PricePrecision", 4); diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index 8c3960c..07aec6c 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -160,7 +160,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W hboxLayout->addWidget(m_stepFrame); // FIXME use the protected virtual method TQWidget::paletteChange() to update the palette - // information when the user selected a different color set using the KConfigCenter + // information when the user selected a different color set using the TDEConfigCenter m_stepPalette = m_stepLabel->palette(); TQColorGroup::ColorRole role = TQColorGroup::Foreground; TQColor color = TDEGlobalSettings::highlightedTextColor(); diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index 04daf5c..e9dd204 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -344,13 +344,13 @@ bool FilePage::isComplete(void) const // if a filename is present, check that // a) the file does not exist // b) the directory does exist - rc = !KIO::NetAccess::exists(m_dataFileEdit->url(), false, m_wizard); + rc = !TDEIO::NetAccess::exists(m_dataFileEdit->url(), false, m_wizard); if(rc) { TQRegExp exp("(.*)/(.*)"); rc = false; if(exp.search(m_dataFileEdit->url()) != -1) { if(exp.cap(2).length() > 0) { - rc = KIO::NetAccess::exists(exp.cap(1), true, m_wizard); + rc = TDEIO::NetAccess::exists(exp.cap(1), true, m_wizard); } } } |