From 3fe437def8063926892bddf2dcc733861308836d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:10:32 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- chalk/chalkcolor/kis_abstract_colorspace.cc | 2 +- chalk/core/kis_thread_pool.cc | 2 +- chalk/core/tiles/kis_tilemanager.cc | 4 ++-- chalk/doc/chalk.xmi | 6 ++--- .../viewplugins/dropshadow/dlg_dropshadow.cc | 4 ++-- .../viewplugins/screenshot/ksnapshot.cpp | 8 +++---- chalk/ui/kis_config.cc | 2 +- chalk/ui/kis_config.h | 2 +- .../gmagick/kis_image_magick_converter.cc | 12 +++++----- .../gmagick/kis_image_magick_converter.h | 10 ++++---- filters/chalk/jpeg/kis_jpeg_converter.cc | 10 ++++---- filters/chalk/jpeg/kis_jpeg_converter.h | 2 +- .../magick/kis_image_magick_converter.cc | 12 +++++----- .../chalk/magick/kis_image_magick_converter.h | 10 ++++---- filters/chalk/pdf/kis_pdf_import.cpp | 6 ++--- filters/chalk/png/kis_png_converter.cc | 14 +++++------ filters/chalk/raw/kis_raw_import.cpp | 2 +- filters/chalk/tiff/kis_tiff_converter.cc | 10 ++++---- filters/chalk/tiff/kis_tiff_converter.h | 2 +- filters/kspread/csv/csvdialog.cpp | 4 ++-- filters/kspread/csv/csvexportdialog.cpp | 4 ++-- .../latex/export/kspreadlatexexportdiaImpl.cc | 2 +- .../latex/export/kspreadlatexexportdiaImpl.h | 4 ++-- .../kword/latex/export/kwordlatexexportdia.cc | 2 +- .../kword/latex/export/kwordlatexexportdia.h | 4 ++-- filters/xsltfilter/export/xsltexportdia.cc | 2 +- filters/xsltfilter/export/xsltexportdia.h | 4 ++-- filters/xsltfilter/import/xsltimportdia.cc | 2 +- filters/xsltfilter/import/xsltimportdia.h | 2 +- karbon/dialogs/vconfiguredlg.h | 8 +++---- karbon/karbon_part.cc | 2 +- kchart/kchart_part.cc | 4 ++-- kchart/kchart_part.h | 4 ++-- kexi/3rdparty/kolibs/koGlobal.cc | 6 ++--- kexi/3rdparty/kolibs/koGlobal.h | 12 +++++----- kexi/core/kexidbshortcutfile.cpp | 4 ++-- kexi/core/kexipartmanager.cpp | 2 +- kexi/core/kexitemplateloader.cpp | 2 +- kexi/doc/dev/TODO-Kexi-js | 2 +- kexi/doc/dev/auto_update_service.txt | 2 +- kexi/kexidb/dbproperties.h | 2 +- kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp | 2 +- kexi/main/keximainwindowimpl.cpp | 10 ++++---- kexi/main/keximainwindowimpl.h | 10 ++++---- kexi/main/keximainwindowimpl_p.h | 2 +- .../printing/kexisimpleprintingengine.cpp | 4 ++-- .../startup/KexiStartupFileDialog_win.cpp | 4 ++-- .../scripting/kexidb/kexidbdrivermanager.cpp | 2 +- .../kexiscripting/kexiscriptpart.cpp | 2 +- kexi/widget/kexibrowser.cpp | 2 +- kivio/kiviopart/kiviostencilsetinstaller.cpp | 6 ++--- koshell/koshell_shell.cc | 2 +- kplato/kptconfig.cc | 4 ++-- kplato/kptreportview.cc | 4 ++-- kpresenter/KPrCanvas.cpp | 8 +++---- kpresenter/KPrConfig.h | 18 +++++++------- kpresenter/KPrDocument.cpp | 16 ++++++------- kpresenter/KPrMSPresentationSetup.cpp | 24 +++++++++---------- kpresenter/KPrView.cpp | 14 +++++------ kpresenter/KPrWebPresentation.cpp | 16 ++++++------- kspread/dialogs/kspread_dlg_list.h | 4 ++-- kspread/dialogs/kspread_dlg_preference.h | 14 +++++------ kspread/dialogs/kspread_dlg_sort.cc | 2 +- kspread/kspread_autofill.cc | 2 +- kspread/kspread_doc.cc | 12 +++++----- kspread/kspread_view.cc | 2 +- kspread/plugins/calculator/kcalc.cpp | 4 ++-- kugar/part/kugar_part.cpp | 8 +++---- kword/KWCanvas.cpp | 4 ++-- kword/KWConfig.h | 14 +++++------ kword/KWDocument.cpp | 14 +++++------ kword/KWView.cpp | 4 ++-- kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp | 6 ++--- lib/kformula/contextstyle.cc | 2 +- lib/kformula/contextstyle.h | 2 +- lib/kformula/fontstyle.cc | 12 +++++----- lib/kformula/kformulaconfigpage.cc | 4 ++-- lib/kformula/kformulaconfigpage.h | 10 ++++---- lib/kformula/kformuladocument.cc | 2 +- lib/kformula/kformuladocument.h | 6 ++--- lib/kformula/symboltable.h | 2 +- lib/kofficecore/KoDetailsPane.cpp | 20 ++++++++-------- lib/kofficecore/KoDetailsPane.h | 4 ++-- lib/kofficecore/KoDocument.cpp | 12 +++++----- lib/kofficecore/KoDocument.h | 4 ++-- lib/kofficecore/KoDocumentInfo.cpp | 6 ++--- lib/kofficecore/KoDocumentInfo.h | 2 +- lib/kofficecore/KoDocumentInfoDlg.cpp | 4 ++-- lib/kofficecore/KoGlobal.cpp | 6 ++--- lib/kofficecore/KoGlobal.h | 12 +++++----- lib/kofficecore/KoMainWindow.cpp | 12 +++++----- lib/kofficecore/KoOpenPane.cpp | 12 +++++----- lib/kofficecore/KoOpenPane.h | 4 ++-- lib/kofficecore/KoPicture.cpp | 4 ++-- lib/kofficecore/KoPictureBase.cpp | 2 +- lib/kofficecore/KoSpeaker.cpp | 2 +- lib/kofficecore/KoSpeaker.h | 4 ++-- lib/kofficecore/KoTemplates.cpp | 4 ++-- lib/kofficeui/KoTemplateChooseDia.cpp | 6 ++--- lib/kofficeui/KoTemplateCreateDia.cpp | 10 ++++---- lib/kopalette/kopalette.cc | 2 +- lib/kopalette/kopalettemanager.cc | 8 +++---- lib/kotext/KFontDialog_local.cpp | 4 ++-- lib/kotext/KoAutoFormat.cpp | 12 +++++----- lib/kotext/KoCompletionDia.cpp | 4 ++-- lib/kotext/KoVariable.cpp | 8 +++---- lib/kross/main/scriptguiclient.cpp | 4 ++-- lib/store/KoStore.cpp | 12 +++++----- lib/store/KoTarStore.cpp | 8 +++---- lib/store/KoZipStore.cpp | 8 +++---- tools/converter/koconverter.cpp | 6 ++--- tools/kfile-plugins/ooo/kfile_ooo.cpp | 2 +- tools/spell/main.cc | 2 +- tools/thesaurus/main.cc | 2 +- tools/thesaurus/main.h | 2 +- 115 files changed, 347 insertions(+), 347 deletions(-) diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc index 444ac5a41..c0dbde97d 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.cc +++ b/chalk/chalkcolor/kis_abstract_colorspace.cc @@ -719,7 +719,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa KisProfile * dstProfile, TQ_INT32 renderingIntent) { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); bool bpCompensation = cfg->readBoolEntry("useBlackPointCompensation", false); int flags = 0; diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index cb537738c..9295915c8 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool() KisThreadPool::m_singleton = this; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxThreads = cfg->readNumEntry("maxthreads", 10); m_numberOfRunningThreads = 0; diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index f734f594d..8f793d4ae 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -64,7 +64,7 @@ KisTileManager::KisTileManager() { } m_currentInMem = 0; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_swappiness = cfg->readNumEntry("swappiness", 100); @@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) { } void KisTileManager::configChanged() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup(""); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_swappiness = cfg->readNumEntry("swappiness", 100); diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 87a6905e1..afb78fdd1 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -1427,7 +1427,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas - + @@ -37897,7 +37897,7 @@ in the constructor, you have to call loadAsync. - +
@@ -37973,7 +37973,7 @@ in the constructor, you have to call loadAsync.
- +
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 962a2ac68..f95fba85a 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -48,7 +48,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, setMainWidget(m_page); resize(m_page->sizeHint()); - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) ); m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) ); @@ -103,7 +103,7 @@ bool DlgDropshadow::allowResizingChecked() void DlgDropshadow::okClicked() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value()); cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value()); cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value()); diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index d4e4bf775..b10dc8737 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -91,7 +91,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name) grabber->releaseMouse(); grabber->hide(); - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); mainWidget->setDelay(conf->readNumEntry("delay",0)); mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); @@ -142,7 +142,7 @@ bool KSnapshot::save( const KURL& url ) if ( tmpFile.status() == 0 ) { if ( snapshot.save( tmpFile.file(), type.latin1() ) ) { if ( tmpFile.close() ) - ok = KIO::NetAccess::upload( tmpFile.name(), url, this ); + ok = TDEIO::NetAccess::upload( tmpFile.name(), url, this ); } } } @@ -467,7 +467,7 @@ void KSnapshot::slotMovePointer(int x, int y) void KSnapshot::exit() { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("mode",mainWidget->mode()); @@ -482,7 +482,7 @@ void KSnapshot::exit() void KSnapshot::slotOk() { - KConfig *conf=TDEGlobal::config(); + TDEConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("mode",mainWidget->mode()); diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc index 4c823ba55..91d31d5b7 100644 --- a/chalk/ui/kis_config.cc +++ b/chalk/ui/kis_config.cc @@ -48,7 +48,7 @@ KisConfig::KisConfig() if (!m_cfg) { // Allow unit tests to test parts of the code without having to run the // full application. - m_cfg = new KConfig(); + m_cfg = new TDEConfig(); } m_cfg->setGroup(""); } diff --git a/chalk/ui/kis_config.h b/chalk/ui/kis_config.h index 4fe971dfb..7d1425b1f 100644 --- a/chalk/ui/kis_config.h +++ b/chalk/ui/kis_config.h @@ -137,7 +137,7 @@ private: KisConfig& operator=(const KisConfig&); private: - mutable KConfig *m_cfg; + mutable TDEConfig *m_cfg; }; #endif // KIS_CONFIG_H_ diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 59f35ce36..0fe8cf55a 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -665,18 +665,18 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; - if (!KIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { return KisImageBuilder_RESULT_NOT_EXIST; } KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; TQString tmpFile; - if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { KURL uriTF; uriTF.setPath( tmpFile ); result = decode(uriTF, false); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } return result; @@ -921,7 +921,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB return KisImageBuilder_RESULT_OK; } - void KisImageMagickConverter::ioData(KIO::Job *job, const TQByteArray& data) + void KisImageMagickConverter::ioData(TDEIO::Job *job, const TQByteArray& data) { if (data.isNull() || data.isEmpty()) { emit notifyProgressStage(i18n("Loading..."), 0); @@ -960,7 +960,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB job -> kill(); } - void KisImageMagickConverter::ioResult(KIO::Job *job) + void KisImageMagickConverter::ioResult(TDEIO::Job *job) { m_job = 0; @@ -970,7 +970,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB decode(KURL(), true); } - void KisImageMagickConverter::ioTotalSize(KIO::Job * /*job*/, KIO::filesize_t size) + void KisImageMagickConverter::ioTotalSize(TDEIO::Job * /*job*/, TDEIO::filesize_t size) { m_size = size; m_data.reserve(size); diff --git a/filters/chalk/gmagick/kis_image_magick_converter.h b/filters/chalk/gmagick/kis_image_magick_converter.h index 9c1473cbb..1c193e8c9 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.h +++ b/filters/chalk/gmagick/kis_image_magick_converter.h @@ -80,9 +80,9 @@ public: static TQString writeFilters(); private slots: - void ioData(KIO::Job *job, const TQByteArray& data); - void ioResult(KIO::Job *job); - void ioTotalSize(KIO::Job *job, KIO::filesize_t size); + void ioData(TDEIO::Job *job, const TQByteArray& data); + void ioResult(TDEIO::Job *job); + void ioTotalSize(TDEIO::Job *job, TDEIO::filesize_t size); private: KisImageMagickConverter(const KisImageMagickConverter&); @@ -95,8 +95,8 @@ private: KisDoc *m_doc; KisUndoAdapter *m_adapter; TQValueVector m_data; - KIO::TransferJob *m_job; - KIO::filesize_t m_size; + TDEIO::TransferJob *m_job; + TDEIO::filesize_t m_size; bool m_stop; }; diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc index 190c939be..87289fbf9 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.cc +++ b/filters/chalk/jpeg/kis_jpeg_converter.cc @@ -325,7 +325,7 @@ KisImageBuilder_Result KisJPEGConverter::buildImage(const KURL& uri) if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; - if (!KIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { return KisImageBuilder_RESULT_NOT_EXIST; } @@ -333,11 +333,11 @@ KisImageBuilder_Result KisJPEGConverter::buildImage(const KURL& uri) KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; TQString tmpFile; - if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { KURL uriTF; uriTF.setPath( tmpFile ); result = decode(uriTF); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } return result; @@ -387,7 +387,7 @@ KisImageBuilder_Result KisJPEGConverter::buildFile(const KURL& uri, KisPaintLaye J_COLOR_SPACE color_type = getColorTypeforColorSpace(img->colorSpace()); if(color_type == JCS_UNKNOWN) { - KIO::del(uri); + TDEIO::del(uri); return KisImageBuilder_RESULT_UNSUPPORTED_COLORSPACE; } cinfo.in_color_space = color_type; // colorspace of input image @@ -514,7 +514,7 @@ KisImageBuilder_Result KisJPEGConverter::buildFile(const KURL& uri, KisPaintLaye } break; default: - KIO::del(uri); + TDEIO::del(uri); return KisImageBuilder_RESULT_UNSUPPORTED; } jpeg_write_scanlines(&cinfo, &row_pointer, 1); diff --git a/filters/chalk/jpeg/kis_jpeg_converter.h b/filters/chalk/jpeg/kis_jpeg_converter.h index 248e36535..567204eeb 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.h +++ b/filters/chalk/jpeg/kis_jpeg_converter.h @@ -85,7 +85,7 @@ class KisJPEGConverter : public KisProgressSubject { KisDoc *m_doc; KisUndoAdapter *m_adapter; bool m_stop; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; }; #endif diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index e83bbe568..52c662a94 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -607,18 +607,18 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; - if (!KIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { return KisImageBuilder_RESULT_NOT_EXIST; } KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; TQString tmpFile; - if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { KURL uriTF; uriTF.setPath( tmpFile ); result = decode(uriTF, false); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } return result; @@ -864,7 +864,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB return KisImageBuilder_RESULT_OK; } - void KisImageMagickConverter::ioData(KIO::Job *job, const TQByteArray& data) + void KisImageMagickConverter::ioData(TDEIO::Job *job, const TQByteArray& data) { if (data.isNull() || data.isEmpty()) { emit notifyProgressStage(i18n("Loading..."), 0); @@ -903,7 +903,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB job -> kill(); } - void KisImageMagickConverter::ioResult(KIO::Job *job) + void KisImageMagickConverter::ioResult(TDEIO::Job *job) { m_job = 0; @@ -913,7 +913,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB decode(KURL(), true); } - void KisImageMagickConverter::ioTotalSize(KIO::Job * /*job*/, KIO::filesize_t size) + void KisImageMagickConverter::ioTotalSize(TDEIO::Job * /*job*/, TDEIO::filesize_t size) { m_size = size; m_data.reserve(size); diff --git a/filters/chalk/magick/kis_image_magick_converter.h b/filters/chalk/magick/kis_image_magick_converter.h index 9c1473cbb..1c193e8c9 100644 --- a/filters/chalk/magick/kis_image_magick_converter.h +++ b/filters/chalk/magick/kis_image_magick_converter.h @@ -80,9 +80,9 @@ public: static TQString writeFilters(); private slots: - void ioData(KIO::Job *job, const TQByteArray& data); - void ioResult(KIO::Job *job); - void ioTotalSize(KIO::Job *job, KIO::filesize_t size); + void ioData(TDEIO::Job *job, const TQByteArray& data); + void ioResult(TDEIO::Job *job); + void ioTotalSize(TDEIO::Job *job, TDEIO::filesize_t size); private: KisImageMagickConverter(const KisImageMagickConverter&); @@ -95,8 +95,8 @@ private: KisDoc *m_doc; KisUndoAdapter *m_adapter; TQValueVector m_data; - KIO::TransferJob *m_job; - KIO::filesize_t m_size; + TDEIO::TransferJob *m_job; + TDEIO::filesize_t m_size; bool m_stop; }; diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp index ed504f679..7eac5ef46 100644 --- a/filters/chalk/pdf/kis_pdf_import.cpp +++ b/filters/chalk/pdf/kis_pdf_import.cpp @@ -75,13 +75,13 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ KURL url; url.setPath(filename); - if (!KIO::NetAccess::exists(url, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(url, false, tqApp -> mainWidget())) { return KoFilter::FileNotFound; } // We're not set up to handle asynchronous loading at the moment. TQString tmpFile; - if (KIO::NetAccess::download(url, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(url, tmpFile, tqApp -> mainWidget())) { url.setPath( tmpFile ); } @@ -149,7 +149,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ img->blockSignals(false); doc -> setCurrentImage( img); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); delete pdoc; delete kdb; diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index 75a5c6972..f8ccd92bf 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -451,7 +451,7 @@ KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri) if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; - if (!KIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { return KisImageBuilder_RESULT_NOT_EXIST; } @@ -459,11 +459,11 @@ KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri) KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; TQString tmpFile; - if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { KURL uriTF; uriTF.setPath( tmpFile ); result = decode(uriTF); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } return result; @@ -502,14 +502,14 @@ KisImageBuilder_Result KisPNGConverter::buildFile(const KURL& uri, KisPaintLayer png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, (png_error_ptr)NULL, (png_error_ptr)NULL); if (!png_ptr) { - KIO::del(uri); + TDEIO::del(uri); return (KisImageBuilder_RESULT_FAILURE); } png_infop info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { - KIO::del(uri); + TDEIO::del(uri); png_destroy_write_struct(&png_ptr, (png_infopp)NULL); return (KisImageBuilder_RESULT_FAILURE); } @@ -517,7 +517,7 @@ KisImageBuilder_Result KisPNGConverter::buildFile(const KURL& uri, KisPaintLayer // If an error occurs during writing, libpng will jump here if (setjmp(png_jmpbuf(png_ptr))) { - KIO::del(uri); + TDEIO::del(uri); png_destroy_write_struct(&png_ptr, &info_ptr); fclose(fp); return (KisImageBuilder_RESULT_FAILURE); @@ -762,7 +762,7 @@ KisImageBuilder_Result KisPNGConverter::buildFile(const KURL& uri, KisPaintLayer break; default: kdDebug(41008) << "Unsupported color type for writting : " << color_type << endl; - KIO::del(uri); + TDEIO::del(uri); return KisImageBuilder_RESULT_UNSUPPORTED; } } diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index 8bc6692dd..d030085ea 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -134,7 +134,7 @@ KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQ m_dialog->setCursor(TQt::ArrowCursor); TQApplication::setOverrideCursor(TQt::ArrowCursor); - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup("rawimport"); m_page->radioGray->setChecked(cfg->readBoolEntry("gray", false)); diff --git a/filters/chalk/tiff/kis_tiff_converter.cc b/filters/chalk/tiff/kis_tiff_converter.cc index 39e71c81e..7a0f5c5ea 100644 --- a/filters/chalk/tiff/kis_tiff_converter.cc +++ b/filters/chalk/tiff/kis_tiff_converter.cc @@ -584,7 +584,7 @@ KisImageBuilder_Result KisTIFFConverter::buildImage(const KURL& uri) if (uri.isEmpty()) return KisImageBuilder_RESULT_NO_URI; - if (!KIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { + if (!TDEIO::NetAccess::exists(uri, false, tqApp -> mainWidget())) { return KisImageBuilder_RESULT_NOT_EXIST; } @@ -592,11 +592,11 @@ KisImageBuilder_Result KisTIFFConverter::buildImage(const KURL& uri) KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; TQString tmpFile; - if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { + if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { KURL uriTF; uriTF.setPath( tmpFile ); result = decode(uriTF); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } return result; @@ -653,13 +653,13 @@ KisImageBuilder_Result KisTIFFConverter::buildFile(const KURL& uri, KisImageSP i KisGroupLayer* root = dynamic_cast(img->rootLayer().data()); if(root == 0) { - KIO::del(uri); + TDEIO::del(uri); TIFFClose(image); return KisImageBuilder_RESULT_FAILURE; } if(!visitor->visit( root )) { - KIO::del(uri); + TDEIO::del(uri); TIFFClose(image); return KisImageBuilder_RESULT_FAILURE; } diff --git a/filters/chalk/tiff/kis_tiff_converter.h b/filters/chalk/tiff/kis_tiff_converter.h index 36317591c..86b070fbd 100644 --- a/filters/chalk/tiff/kis_tiff_converter.h +++ b/filters/chalk/tiff/kis_tiff_converter.h @@ -88,7 +88,7 @@ class KisTIFFConverter : public KisProgressSubject { KisDoc *m_doc; KisUndoAdapter *m_adapter; bool m_stop; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; }; #endif diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 94470818f..cf9232077 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -118,7 +118,7 @@ CSVDialog::~CSVDialog() void CSVDialog::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("CSVDialog Settings"); m_textquote = config->readEntry("textquote", "\"")[0]; m_delimiter = config->readEntry("delimiter", ","); @@ -145,7 +145,7 @@ void CSVDialog::loadSettings() void CSVDialog::saveSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("CSVDialog Settings"); TQString q = m_textquote; config->writeEntry("textquote", q); diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index 372e2ddaf..e27aee7a2 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -102,7 +102,7 @@ CSVExportDialog::~CSVExportDialog() void CSVExportDialog::loadSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("CSVDialog Settings"); m_textquote = config->readEntry("textquote", "\"")[0]; m_delimiter = config->readEntry("delimiter", ","); @@ -136,7 +136,7 @@ void CSVExportDialog::loadSettings() void CSVExportDialog::saveSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("CSVDialog Settings"); TQString q = m_textquote; config->writeEntry("textquote", q); diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 7a0585500..00b097d6b 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -64,7 +64,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare kapp->restoreOverrideCursor(); /* Recent files */ - _config = new KConfig("kspreadlatexexportdialog"); + _config = new TDEConfig("kspreadlatexexportdialog"); _config->setGroup( "KSpread latex export filter" ); TQString value; while(i < 10) diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h index ec50dbf89..87fe7cbbb 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.h @@ -27,7 +27,7 @@ #include "latexexportIface.h" class KoStore; -class KConfig; +class TDEConfig; class KSpreadLatexExportDiaImpl : public LatexExportDia { @@ -37,7 +37,7 @@ class KSpreadLatexExportDiaImpl : public LatexExportDia private: TQString _fileOut; KoStore* _in; - KConfig* _config; + TDEConfig* _config; LatexExportIface* _iface; public: diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index 145b30ed2..5f33dfc0b 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -66,7 +66,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, pathPictures->setMode(KFile::Directory); /* Recent files */ - _config = new KConfig("kwordlatexexportdialog"); + _config = new TDEConfig("kwordlatexexportdialog"); _config->setGroup( "KWord latex export filter" ); TQString value; while(i < 10) diff --git a/filters/kword/latex/export/kwordlatexexportdia.h b/filters/kword/latex/export/kwordlatexexportdia.h index c032f8e98..45b1d853b 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.h +++ b/filters/kword/latex/export/kwordlatexexportdia.h @@ -25,7 +25,7 @@ #include class KoStore; -class KConfig; +class TDEConfig; class LatexExportIface; class KWordLatexExportDia : public LatexExportDia @@ -36,7 +36,7 @@ class KWordLatexExportDia : public LatexExportDia private: TQString _fileOut; KoStore* _in; - KConfig* _config; + TDEConfig* _config; LatexExportIface* _iface; public: diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 75c287955..76805f9b4 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -59,7 +59,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge kapp->restoreOverrideCursor(); /* Recent files */ - _config = new KConfig("xsltdialog"); + _config = new TDEConfig("xsltdialog"); _config->setGroup( "XSLT export filter" ); TQString value; while(i < 10) diff --git a/filters/xsltfilter/export/xsltexportdia.h b/filters/xsltfilter/export/xsltexportdia.h index a68b8cc22..9f7785a76 100644 --- a/filters/xsltfilter/export/xsltexportdia.h +++ b/filters/xsltfilter/export/xsltexportdia.h @@ -25,7 +25,7 @@ #include class KoStoreDevice; -class KConfig; +class TDEConfig; class XSLTExportDia : public XSLTDialog { @@ -37,7 +37,7 @@ class XSLTExportDia : public XSLTDialog /** xslt file current */ KURL _currentFile; TQCString _format; - KConfig* _config; + TDEConfig* _config; /** List of the most recent xslt file used. */ TQStringList _recentList; diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index 29b0ad7b0..b2e948cca 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -54,7 +54,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa setCaption(i18n("Import XSLT Configuration")); /* Recent files */ - _config = new KConfig("xsltdialog"); + _config = new TDEConfig("xsltdialog"); _config->setGroup( "XSLT import filter" ); TQString value; while(i < 10) diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h index 897cc10d6..763f41049 100644 --- a/filters/xsltfilter/import/xsltimportdia.h +++ b/filters/xsltfilter/import/xsltimportdia.h @@ -37,7 +37,7 @@ class XSLTImportDia : public XSLTDialog /** xslt file current */ KURL _currentFile; TQCString _format; - KConfig* _config; + TDEConfig* _config; /** List of the most recent xslt file used. */ TQStringList _recentList; diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h index 80c2114bf..8203c3f89 100644 --- a/karbon/dialogs/vconfiguredlg.h +++ b/karbon/dialogs/vconfiguredlg.h @@ -24,7 +24,7 @@ #include class KarbonView; -class KConfig; +class TDEConfig; class KIntNumInput; class KColorButton; class KoUnitDoubleSpinBox; @@ -47,7 +47,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_recentFiles; int m_oldRecentFiles; @@ -81,7 +81,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_undoRedo; int m_oldUndoRedo; @@ -105,7 +105,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_autoSave; int m_oldAutoSave; diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index c4dc20414..53cb44de0 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -617,7 +617,7 @@ KarbonPart::setUndoRedoLimit( int undos ) void KarbonPart::initConfig() { - KConfig* config = KarbonPart::instance()->config(); + TDEConfig* config = KarbonPart::instance()->config(); if( config->hasGroup( "Interface" ) ) { diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc index 477c4e416..67b0ab57b 100644 --- a/kchart/kchart_part.cc +++ b/kchart/kchart_part.cc @@ -760,7 +760,7 @@ void KChartPart::setChartDefaults() -void KChartPart::loadConfig( KConfig *conf ) +void KChartPart::loadConfig( TDEConfig *conf ) { conf->setGroup("ChartParameters"); @@ -871,7 +871,7 @@ void KChartPart::defaultConfig( ) } -void KChartPart::saveConfig( KConfig *conf ) +void KChartPart::saveConfig( TDEConfig *conf ) { conf->setGroup("ChartParameters"); diff --git a/kchart/kchart_part.h b/kchart/kchart_part.h index bd35c1510..8a50ad470 100644 --- a/kchart/kchart_part.h +++ b/kchart/kchart_part.h @@ -56,8 +56,8 @@ public: bool showWizard( TQString &dataArea ); void initLabelAndLegend(); - void loadConfig(KConfig *conf); - void saveConfig(KConfig *conf); + void loadConfig(TDEConfig *conf); + void saveConfig(TDEConfig *conf); void defaultConfig(); KChartParams::ChartType chartType() const { return (KChartParams::ChartType) params()->chartType(); } diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 1bdab489a..739c6126b 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -108,7 +108,7 @@ TQStringList KoGlobal::_listOfLanguages() void KoGlobal::createListOfLanguages() { - KConfig config( "all_languages", true, false, "locale" ); + TDEConfig config( "all_languages", true, false, "locale" ); // Note that we could also use KLocale::allLanguagesTwoAlpha TQMap seenLanguages; @@ -185,10 +185,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag ) return langTag; } -KConfig* KoGlobal::_kofficeConfig() +TDEConfig* KoGlobal::_kofficeConfig() { if ( !m_kofficeConfig ) { - m_kofficeConfig = new KConfig( "kofficerc" ); + m_kofficeConfig = new TDEConfig( "kofficerc" ); } return m_kofficeConfig; } diff --git a/kexi/3rdparty/kolibs/koGlobal.h b/kexi/3rdparty/kolibs/koGlobal.h index cad645b4f..15523b3e1 100644 --- a/kexi/3rdparty/kolibs/koGlobal.h +++ b/kexi/3rdparty/kolibs/koGlobal.h @@ -25,7 +25,7 @@ #include #include #include -class KConfig; +class TDEConfig; #include class KOFFICECORE_EXPORT KoGlobal @@ -46,12 +46,12 @@ public: } /** - * @return the global KConfig object around kofficerc. + * @return the global TDEConfig object around kofficerc. * kofficerc is used for KOffice-wide settings, from totally unrelated classes, - * so this is the centralization of the KConfig object so that the file is + * so this is the centralization of the TDEConfig object so that the file is * parsed only once */ - static KConfig* kofficeConfig() { + static TDEConfig* kofficeConfig() { return self()->_kofficeConfig(); } @@ -87,13 +87,13 @@ private: TQFont _defaultFont(); TQStringList _listOfLanguages(); TQStringList _listOfLanguageTags(); - KConfig* _kofficeConfig(); + TDEConfig* _kofficeConfig(); void createListOfLanguages(); int m_pointSize; typedef TQMap LanguageMap; LanguageMap m_langMap; // display-name -> language tag - KConfig* m_kofficeConfig; + TDEConfig* m_kofficeConfig; int m_dpiX; int m_dpiY; // No BC problem here, constructor is private, feel free to add members diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp index 1969caf53..dbea9737c 100644 --- a/kexi/core/kexidbshortcutfile.cpp +++ b/kexi/core/kexidbshortcutfile.cpp @@ -62,7 +62,7 @@ KexiDBShortcutFile::~KexiDBShortcutFile() bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _groupKey) { - KConfig config(d->fileName, true /* readOnly */, false /* local */ ); + TDEConfig config(d->fileName, true /* readOnly */, false /* local */ ); config.setGroup("File Information"); data.formatVersion = config.readNumEntry("version", KexiDBShortcutFile_version); @@ -158,7 +158,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data, bool savePassword, TQString* _groupKey, bool overwriteFirstGroup) { - KConfig config(d->fileName, false /*rw*/, false /* local */); + TDEConfig config(d->fileName, false /*rw*/, false /* local */); config.setGroup("File Information"); uint realFormatVersion = data.formatVersion; diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index d651f8d0e..1247c9c04 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -58,7 +58,7 @@ Manager::lookup() KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler", "[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION)); - KConfig conf("kexirc", true); + TDEConfig conf("kexirc", true); conf.setGroup("Parts"); TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order const int size = TQMAX( tlist.count(), sl_order.count() ); diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index 0defda8c0..f8708b33d 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -74,7 +74,7 @@ KexiTemplateInfo KexiTemplateLoader::loadInfo(const TQString& directory) } if (!TQFileInfo(directory+"/info.txt").isReadable()) return KexiTemplateInfo(); - KConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/); + TDEConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/); KexiTemplateInfo info; info.name = infoTxt.readEntry("Name"); if (info.name.isEmpty()) { diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index f66e4e08d..4a07191d0 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -449,7 +449,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem - enlarge the default main window size, currently it's ~50% ofthe desktop size - not convenient as user is forced to enlarge the window by hand (settings are stored though) - add "File->Save All" action -- add settings dialog, KConfigXT based simple version +- add settings dialog, TDEConfigXT based simple version + about:config-like using kconfigeditor http://extragear.kde.org/apps/kconfigeditor/ (possible reuse of koproperty) diff --git a/kexi/doc/dev/auto_update_service.txt b/kexi/doc/dev/auto_update_service.txt index d832a5cf8..eb3312184 100644 --- a/kexi/doc/dev/auto_update_service.txt +++ b/kexi/doc/dev/auto_update_service.txt @@ -23,7 +23,7 @@ Notes: - First: qt-only that is used to initialize the process and check the system, independently from existing KDE sybsystem. - Second: used when we already know we already have a working KDE subsystem. This part can use - KConfig, KLibLoader, etc. to change the KDE settings. + TDEConfig, KLibLoader, etc. to change the KDE settings. - To be able to do this, KDE needs get more guidelines for distributors of its binaries. - To be usable for commercial use, there should be one packaging system for KDE (maybe on top of tgz/rpm/deb/win32/mac?), "Meta Packaging". diff --git a/kexi/kexidb/dbproperties.h b/kexi/kexidb/dbproperties.h index d4b193fa0..d598ce12e 100644 --- a/kexi/kexidb/dbproperties.h +++ b/kexi/kexidb/dbproperties.h @@ -24,7 +24,7 @@ namespace KexiDB { -//! @todo implement KConfigBase interface here? +//! @todo implement TDEConfigBase interface here? //! A set of storable database properties. /*! This is a convenience class that allows to store global dabatase properties without a need diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index 968025965..ce6a3923c 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -98,7 +98,7 @@ tristate SQLiteVacuum::run() const uint newSize = TQFileInfo(m_filePath).size(); const uint decrease = 100-100*newSize/origSize; KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.") - .arg(decrease).arg(KIO::convertSize(newSize))); + .arg(decrease).arg(TDEIO::convertSize(newSize))); } return m_result; } diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index f924bc608..4135421d2 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -2166,7 +2166,7 @@ KexiMainWindowImpl::storeSettings() } void -KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config) +KexiMainWindowImpl::restoreWindowConfiguration(TDEConfig *config) { kdDebug()<<"preparing session restoring"<setGroup("MainWindow"); @@ -2203,12 +2203,12 @@ KexiMainWindowImpl::storeWindowConfiguration(KConfig *config) } void -KexiMainWindowImpl::readProperties(KConfig *config) { +KexiMainWindowImpl::readProperties(TDEConfig *config) { restoreWindowConfiguration(config); } void -KexiMainWindowImpl::saveProperties(KConfig *config) +KexiMainWindowImpl::saveProperties(TDEConfig *config) { storeWindowConfiguration(config); // m_docManager->saveDocumentList (config); @@ -2216,7 +2216,7 @@ KexiMainWindowImpl::saveProperties(KConfig *config) } void -KexiMainWindowImpl::saveGlobalProperties( KConfig* sessionConfig ) { +KexiMainWindowImpl::saveGlobalProperties( TDEConfig* sessionConfig ) { storeWindowConfiguration(sessionConfig); } diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 0e81a91bb..9721a558b 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -106,9 +106,9 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual int generatePrivateID(); /*! Reimplemented */ - virtual void readProperties(KConfig *config); - virtual void saveProperties(KConfig *config); - virtual void saveGlobalProperties( KConfig* sessionConfig ); + virtual void readProperties(TDEConfig *config); + virtual void saveProperties(TDEConfig *config); + virtual void saveGlobalProperties( TDEConfig* sessionConfig ); public slots: /*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed. @@ -303,8 +303,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI /*! Updates application's caption - also shows project's name. */ void updateAppCaption(); - void restoreWindowConfiguration(KConfig *config); - void storeWindowConfiguration(KConfig *config); + void restoreWindowConfiguration(TDEConfig *config); + void storeWindowConfiguration(TDEConfig *config); virtual bool queryClose(); virtual bool queryExit(); diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index d95107c02..c775b0875 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -413,7 +413,7 @@ void updatePropEditorDockWidthInfo() { KexiMainWindowImpl *wnd; KexitStatusBar *statusBar; KexiProject *prj; - KConfig *config; + TDEConfig *config; #ifndef KEXI_NO_CTXT_HELP KexiContextHelp *ctxHelp; #endif diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index b8ad5ebd8..66fe00280 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -63,7 +63,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load() { KexiSimplePrintingSettings settings; //this will set defaults - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Simple Printing"); if (config->hasKey("pageTitleFont")) settings.pageTitleFont = config->readFontEntry("pageTitleFont"); @@ -95,7 +95,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load() void KexiSimplePrintingSettings::save() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Simple Printing"); config->writeEntry( "pageTitleFont", pageTitleFont ); config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) ); diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index dfeaedd36..6b8ab9d41 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -99,8 +99,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //(js) d->autoSelectExtCheckBox = 0; // delayed loading //TODO d->autoSelectExtChecked = false; //(js) d->urlBar = 0; // delayed loading -//TODO KConfig *config = TDEGlobal::config(); -//TODO KConfigGroupSaver cs( config, ConfigGroup ); +//TODO TDEConfig *config = TDEGlobal::config(); +//TODO TDEConfigGroupSaver cs( config, ConfigGroup ); //TODO d->initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", //TODO true ); //TODO d->completionLock = false; diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp index 00b5a21dc..8918c37ca 100644 --- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp @@ -104,7 +104,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt mimename = KMimeType::findByURL(filename)->name(); if(mimename == "application/x-kexiproject-shortcut" || mimename == "application/x-kexi-connectiondata") { - KConfig config(filename, true, false); + TDEConfig config(filename, true, false); TQString groupkey; TQStringList groups(config.groupList()); TQStringList::ConstIterator it, end( groups.constEnd() ); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index bd6454de2..3dd90a68f 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -89,7 +89,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender) if(scriptaction) { const TQString dontAskAgainName = "askExecuteScript"; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQString dontask = config->readEntry(dontAskAgainName).lower(); bool exec = (dontask == "yes"); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index c81b967f6..96a503500 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -108,7 +108,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("MainWindow"); if ((m_features & SingleClickOpensItemOptionEnabled) && config->readBoolEntry("SingleClickOpensItem", false)) diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index ffa65cd62..52cbb4c42 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -73,7 +73,7 @@ namespace Kivio { TQString tmpFile; - if(!KIO::NetAccess::download(url, tmpFile, this)) { + if(!TDEIO::NetAccess::download(url, tmpFile, this)) { KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL())); return; } @@ -87,7 +87,7 @@ namespace Kivio { if(dirs.isEmpty()) { KMessageBox::error(this, i18n("The file is not a valid stencil set archive.")); archive.close(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); return; } @@ -98,7 +98,7 @@ namespace Kivio { } archive.close(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } TQStringList StencilSetInstaller::checkDirs(const KArchiveDirectory* rootDir) diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 44d95fe3d..0cd40399a 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -156,7 +156,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) // filter manager, ask it to convert the file to the "closest" available // KOffice part and open the temporary file. - /*if (!KIO::NetAccess::exists(url,true,0) ) + /*if (!TDEIO::NetAccess::exists(url,true,0) ) { KMessageBox::error(0L, i18n("The file %1 doesn't exist.").arg(url.url()) ); recentAction()->removeURL(url); //remove the file from the recent-opened-file-list diff --git a/kplato/kptconfig.cc b/kplato/kptconfig.cc index 442fc7e88..969f46ad7 100644 --- a/kplato/kptconfig.cc +++ b/kplato/kptconfig.cc @@ -38,7 +38,7 @@ Config::~Config() void Config::load() { //kdDebug()<config(); + TDEConfig *config = Factory::global()->config(); /* if( config->hasGroup("Behavior")) { @@ -66,7 +66,7 @@ void Config::save() { if (!m_readWrite) return; - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); // config->setGroup( "Behavior" ); // config->writeEntry("CalculationMode",m_behavior.calculationMode); diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index 97d15dd59..f88c0c20b 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -662,7 +662,7 @@ void ReportView::getTemplateFile(const TQString &tpl) { } else { - if (KIO::NetAccess::download(url,localtpl,this)) + if (TDEIO::NetAccess::download(url,localtpl,this)) isTemp = true; else KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL())); @@ -672,7 +672,7 @@ void ReportView::getTemplateFile(const TQString &tpl) { { openTemplateFile(localtpl); if (isTemp) - KIO::NetAccess::removeTempFile(localtpl); + TDEIO::NetAccess::removeTempFile(localtpl); } } diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index c72768a7f..f14cad8de 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -2384,7 +2384,7 @@ bool KPrCanvas::exportPage( int nPage, } if( !bLocalFile ){ if( res ){ - res = KIO::NetAccess::upload( tmpFile->name(), fileURL, this ); + res = TDEIO::NetAccess::upload( tmpFile->name(), fileURL, this ); } } } @@ -3610,7 +3610,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi - static_cast( MM_TO_POINT( top_margin ) ) );*/ } - KConfig *config=KPrFactory::global()->config(); + TDEConfig *config=KPrFactory::global()->config(); config->setGroup("Misc"); bool printNotes = config->readBoolEntry("PrintNotes", true); @@ -4020,7 +4020,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e ) TQString filename; if ( !url.isLocalFile() ) { - if ( !KIO::NetAccess::download( url, filename, this ) ) + if ( !TDEIO::NetAccess::download( url, filename, this ) ) continue; } else { filename = url.path(); @@ -4057,7 +4057,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e ) setCursor( c ); } } - KIO::NetAccess::removeTempFile( filename ); + TDEIO::NetAccess::removeTempFile( filename ); } } else if (m_currentTextObjectView) diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h index 65a55dfc0..2616298a8 100644 --- a/kpresenter/KPrConfig.h +++ b/kpresenter/KPrConfig.h @@ -28,7 +28,7 @@ class KPrView; class KPrDocument; class KIntNumInput; class KColorButton; -class KConfig; +class TDEConfig; class TQCheckBox; class KLineEdit; class KDoubleNumInput; @@ -56,7 +56,7 @@ public: void slotDefault(); private: KPrView* m_pView; - KConfig* config; + TDEConfig* config; int oldNbRecentFiles; KDoubleNumInput* indent; KIntNumInput* recentFiles; @@ -75,7 +75,7 @@ protected: KPrView* m_pView; KColorButton* bgColor; KColorButton* gridColor; - KConfig* config; + TDEConfig* config; TQColor oldBgColor; TQColor oldGridColor; } ; @@ -91,7 +91,7 @@ public: private: KPrView* m_pView; KSpell2::ConfigWidget *m_spellConfigWidget; - KConfig* config; + TDEConfig* config; }; class KPrConfigureMiscPage : public TQWidget @@ -104,7 +104,7 @@ public: void slotDefault(); private: KPrView* m_pView; - KConfig* config; + TDEConfig* config; KIntNumInput* m_undoRedoLimit; int m_oldNbRedo; bool m_printNotes; @@ -131,7 +131,7 @@ private: bool m_oldBackupFile; TQString m_oldLanguage; KPrView* m_pView; - KConfig* config; + TDEConfig* config; TQFont *font; TQLabel *fontName; KIntNumInput* autoSave; @@ -158,7 +158,7 @@ public slots: private: KPrView* m_pView; - KConfig* config; + TDEConfig* config; KPrPenStyleWidget *m_confPenDia; KPrBrushProperty *m_brushProperty; @@ -180,7 +180,7 @@ private slots: void slotSelectionChanged(TQListViewItem *); private: KPrView* m_pView; - KConfig* config; + TDEConfig* config; KListView* m_pPathView; TQPushButton *m_modifyPath; }; @@ -196,7 +196,7 @@ public: private slots: void screenReaderOptionChanged(); private: - KConfig* config; + TDEConfig* config; TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakFocusWidget; TQVGroupBox* m_gbScreenReaderOptions; diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index dad2baf60..c08ab6922 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -158,7 +158,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje KoParagStyle* m_standardStyle = new KoParagStyle( "Standard" ); m_styleColl->addStyle( m_standardStyle ); - KConfig *config = KPrFactory::global()->config(); + TDEConfig *config = KPrFactory::global()->config(); config->setGroup("Document defaults" ); TQString defaultFontname=config->readEntry("DefaultFont"); if ( !defaultFontname.isEmpty() ) @@ -303,11 +303,11 @@ void KPrDocument::saveConfig() { if ( !isReadWrite()) return; - KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); + TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); group.writeEntry( "PersonalDict", m_spellCheckPersonalDict ); if ( !isEmbedded() ) { - KConfig *config = KPrFactory::global()->config(); + TDEConfig *config = KPrFactory::global()->config(); config->setGroup( "Interface" ); config->writeEntry( "Zoom", m_zoomHandler->zoom() ); config->writeEntry( "AllowAutoFormat" , m_bAllowAutoFormat ); @@ -322,7 +322,7 @@ void KPrDocument::saveConfig() void KPrDocument::initConfig() { int zoom; - KConfig* config = KPrFactory::global()->config(); + TDEConfig* config = KPrFactory::global()->config(); if( config->hasGroup("Interface") ) { config->setGroup( "Interface" ); setAutoSave( config->readNumEntry( "AutoSave", defaultAutoSave()/60 ) * 60 ); @@ -387,7 +387,7 @@ void KPrDocument::initConfig() } // Load personal dict - KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); + TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" ); // Apply configuration, without creating an undo/redo command @@ -3621,7 +3621,7 @@ TQString KPrDocument::templateFileName( bool chooseTemplate, const TQString &the kdDebug(33001) << "Copying template (in KPrDocument::templateFileName)" << endl << " from: " << src.prettyURL() << endl << " to: " << dest.prettyURL() << endl; - KIO::NetAccess::file_copy( src, + TDEIO::NetAccess::file_copy( src, dest, -1, /* default permissions */ true /* overwrite */ ); @@ -4634,7 +4634,7 @@ void KPrDocument::changeBgSpellCheckingState( bool b ) { enableBackgroundSpellCheck( b ); reactivateBgSpellChecking(); - KConfig *config = KPrFactory::global()->config(); + TDEConfig *config = KPrFactory::global()->config(); config->setGroup("KSpell kpresenter" ); config->writeEntry( "SpellCheck", (int)b ); } @@ -4759,7 +4759,7 @@ void KPrDocument::updateDirectCursorButton() void KPrDocument::setInsertDirectCursor(bool _b) { m_bInsertDirectCursor=_b; - KConfig *config = KPrFactory::global()->config(); + TDEConfig *config = KPrFactory::global()->config(); config->setGroup( "Interface" ); config->writeEntry( "InsertDirectCursor", _b ); updateDirectCursorButton(); diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 8cb8861d0..7386bceba 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -84,7 +84,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) // we create the DCIM file, and then iterate through looking // for the next "available" directory slot KURL str( path + "/DCIM" ); - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -92,7 +92,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) for (int dirNum = 101; dirNum < 999; dirNum++) { slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum); - if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) ) + if (! TDEIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) ) break; } @@ -101,20 +101,20 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); str = ( path + slidePath ); - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); // now do the SPP file directory str = ( path + "/MSSONY" ); - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); str = ( path + "/MSSONY/PJ" ); - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); @@ -130,7 +130,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) KTempFile tmp; TQString filename = path + slidePath + "/SPJT0002.JPG"; titleSlide.save( tmp.name(), "JPEG" ); - KIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -145,7 +145,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) KTempFile tmp2; titleSlide.save( tmp2.name(), "JPEG" ); - KIO::NetAccess::file_move( tmp2.name(), filename, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp2.name(), filename, -1, true /*overwrite*/); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -168,7 +168,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar ) view->getCanvas()->exportPage( pgNum, 1023, 767, tmp.name(), "JPEG" ); - KIO::NetAccess::file_move( tmp.name(), ( path + slidePath + filename ), -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp.name(), ( path + slidePath + filename ), -1, true /*overwrite*/); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -266,7 +266,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) kapp->processEvents(); sppFile.close(); - KIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/); } void KPrMSPresentation::init() @@ -441,7 +441,7 @@ void KPrMSPresentationSetup::finish() TQString pathname = path->lineEdit()->text(); // path doesn't exist. ask user if it should be created. - if ( !KIO::NetAccess::exists(pathname, false, this) ) { + if ( !TDEIO::NetAccess::exists(pathname, false, this) ) { TQString msg = i18n( "The directory %1 does not exist.
" "Do you want create it?" ); if( KMessageBox::questionYesNo( this, msg.arg( pathname ), @@ -450,7 +450,7 @@ void KPrMSPresentationSetup::finish() { // we are trying to create the directory TQDir dir; - bool ok = KIO::NetAccess::mkdir( pathname,this ); + bool ok = TDEIO::NetAccess::mkdir( pathname,this ); if( !ok ) { // then directory couldn't be created KMessageBox::sorry( this, @@ -467,7 +467,7 @@ void KPrMSPresentationSetup::finish() } TQString sppFile( pathname + "/MSSONY/PJ/" + title->text() + ".SPP" ); - if (KIO::NetAccess::exists(sppFile, false, this ) ) { + if (TDEIO::NetAccess::exists(sppFile, false, this ) ) { if ( KMessageBox::warningYesNo( 0, i18n( "You are about to overwrite an existing index " "file : %1.\n " diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 37ce7db8c..907aaf438 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -457,12 +457,12 @@ KPrView::~KPrView() delete m_findReplace; m_findReplace = 0L; if(sidebar) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); config->writeEntry("Sidebar", sidebar->isVisible()); } if(notebar) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); config->writeEntry("Notebar", notebar->isVisible()); } @@ -771,7 +771,7 @@ void KPrView::insertPicture() return; } TQString file; - if ( !KIO::NetAccess::download( url, file, this ) ) + if ( !TDEIO::NetAccess::download( url, file, this ) ) { m_canvas->setToolEditMode( TEM_MOUSE, false ); return; @@ -843,10 +843,10 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) { picture.save( TQT_TQIODEVICE(&file) ); file.close(); - if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) + if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( TDEIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -2231,7 +2231,7 @@ void KPrView::createGUI() { sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() ); sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE ); - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Sidebar", true)) { sidebar->hide(); @@ -2242,7 +2242,7 @@ void KPrView::createGUI() if ( notebar ) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Notebar", true)) { notebar->hide(); diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index a8f56470c..2fbb73369 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -269,14 +269,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar ) TQString cmd; int p; KURL str( path + "/html" ); - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); str = path + "/pics"; - KIO::NetAccess::mkdir( str,( TQWidget* )0L ); + TDEIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -293,7 +293,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar ) srcurl.setPath( locate( "slideshow", filename, KPrFactory::global() ) ); desturl = path; desturl.addPath( "/pics/" + filename ); - KIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/); + TDEIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); @@ -315,7 +315,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar ) KTempFile tmp; pix.save( tmp.name(), "PNG" ); - KIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -520,7 +520,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) file.close(); - KIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/); int p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -567,7 +567,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) streamOut << "\n\n"; file.close(); - KIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/); + TDEIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/); progressBar->setProgress( progressBar->totalSteps() ); @@ -1077,7 +1077,7 @@ void KPrWebPresentationWizard::pageChanged() TQString pathname = path->lineEdit()->text(); // path doesn't exist. ask user if it should be created. - if ( !KIO::NetAccess::exists( pathname, true/*write*/,this ) ) + if ( !TDEIO::NetAccess::exists( pathname, true/*write*/,this ) ) { TQString msg = i18n( "The directory %1 does not exist.
" "Do you want create it?" ); @@ -1085,7 +1085,7 @@ void KPrWebPresentationWizard::pageChanged() i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { - bool ok = KIO::NetAccess::mkdir( pathname, this ); + bool ok = TDEIO::NetAccess::mkdir( pathname, this ); if( !ok ) { KMessageBox::sorry( this, diff --git a/kspread/dialogs/kspread_dlg_list.h b/kspread/dialogs/kspread_dlg_list.h index f9b3e0337..84f27d8d8 100644 --- a/kspread/dialogs/kspread_dlg_list.h +++ b/kspread/dialogs/kspread_dlg_list.h @@ -30,7 +30,7 @@ class TQLineEdit; class TQMultiLineEdit; class TQPushButton; -class KConfig; +class TDEConfig; namespace KSpread { @@ -55,7 +55,7 @@ public slots: void slotCopy(); protected: - KConfig *config; + TDEConfig *config; TQListBox * list; TQMultiLineEdit *entryList; diff --git a/kspread/dialogs/kspread_dlg_preference.h b/kspread/dialogs/kspread_dlg_preference.h index 971f13f4c..bdd2af096 100644 --- a/kspread/dialogs/kspread_dlg_preference.h +++ b/kspread/dialogs/kspread_dlg_preference.h @@ -29,7 +29,7 @@ #include -class KConfig; +class TDEConfig; class KIntNumInput; class KDoubleNumInput; class KSpellConfig; @@ -88,7 +88,7 @@ protected: TQCheckBox *m_createBackupFile; bool m_oldBackupFile; - KConfig* config; + TDEConfig* config; int oldRecent; int oldAutoSaveValue; } ; @@ -116,7 +116,7 @@ protected: * Needed to ensure the same unit for loading and saving. */ KoUnit::Unit indentUnit; - KConfig* config; + TDEConfig* config; TQComboBox *typeCompletion; TQComboBox *typeCalc; TQComboBox *typeOfMove; @@ -138,7 +138,7 @@ protected: View* m_pView; KColorButton* gridColor; KColorButton* pageBorderColor; - KConfig* config; + TDEConfig* config; } ; class configureLayoutPage : public TQObject @@ -160,7 +160,7 @@ protected: int orientation; int unit; - KConfig* config; + TDEConfig* config; } ; class configureSpellPage : public TQObject @@ -173,7 +173,7 @@ public: void slotDefault(); protected: View * m_pView; - KConfig * config; + TDEConfig * config; KSpellConfig *m_spellConfigWidget; TQCheckBox *dontCheckUpperWord; TQCheckBox *dontCheckTitleCase; @@ -190,7 +190,7 @@ public: private slots: void screenReaderOptionChanged(); private: - KConfig* config; + TDEConfig* config; TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakFocusWidget; TQVGroupBox* m_gbScreenReaderOptions; diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 9a7c6e33b..5ee35bb27 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -303,7 +303,7 @@ void SortDialog::init() lst<config(); + TDEConfig * config = Factory::global()->config(); config->setGroup( "Parameters" ); TQStringList other = config->readListEntry("Other list"); TQString tmp; diff --git a/kspread/kspread_autofill.cc b/kspread/kspread_autofill.cc index 38cca433f..8927d360f 100644 --- a/kspread/kspread_autofill.cc +++ b/kspread/kspread_autofill.cc @@ -201,7 +201,7 @@ AutoFillSequenceItem::AutoFillSequenceItem( const TQString &_str ) if( other==0L) { // other=new TQStringList(); - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); config->setGroup( "Parameters" ); other=new TQStringList(config->readListEntry("Other list")); } diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 983e75ef8..ad28bb78a 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -284,7 +284,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget) if (flags==KoDocument::InitDocEmpty) { - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); int _page=1; if( config->hasGroup("Parameters" )) { @@ -329,7 +329,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget) if ( ret == KoTemplateChooseDia::Empty ) { - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); int _page=1; if( config->hasGroup("Parameters" )) { @@ -377,7 +377,7 @@ void Doc::openTemplate (const TQString& file) void Doc::initEmpty() { - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); int _page=1; if( config->hasGroup("Parameters" )) { @@ -434,7 +434,7 @@ void Doc::saveConfig() { if ( isEmbedded() ||!isReadWrite()) return; - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); config->setGroup( "Parameters" ); config->writeEntry( "Zoom", m_zoom ); @@ -442,7 +442,7 @@ void Doc::saveConfig() void Doc::initConfig() { - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); if( config->hasGroup("KSpread Page Layout" )) { @@ -1478,7 +1478,7 @@ KSpellConfig * Doc::getKSpellConfig() { KSpellConfig ksconfig; - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); if( config->hasGroup("KSpell kspread" ) ) { config->setGroup( "KSpell kspread" ); diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index cb86e1a01..a76bd3d89 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -2099,7 +2099,7 @@ Sheet* View::activeSheet() void View::initConfig() { - KConfig *config = Factory::global()->config(); + TDEConfig *config = Factory::global()->config(); if ( config->hasGroup("Parameters" )) { config->setGroup( "Parameters" ); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index eb654706f..7733cedf2 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -1587,7 +1587,7 @@ void TQtCalculator::readSettings() TQColor tmpC(189, 255, 180); TQColor blackC(0,0,0); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("CalcPlugin"); kcalcdefaults.forecolor = config->readColorEntry("ForeColor", &blackC); kcalcdefaults.backcolor = config->readColorEntry("BackColor", &tmpC); @@ -1606,7 +1606,7 @@ void TQtCalculator::readSettings() void TQtCalculator::writeSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("CalcPlugin"); config->writeEntry("ForeColor",kcalcdefaults.forecolor); diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 5343916b0..807d62b15 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -163,7 +163,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) KURL tmpURL( m_docURL ); tmpURL.setFileName( "" ); tmpURL.addPath( tpl ); - if ( KIO::NetAccess::download( tmpURL, localtpl ) ) + if ( TDEIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); @@ -180,7 +180,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) KURL tmpURL( m_docURL ); tmpURL.setFileName( "" ); tmpURL.addPath( tpl ); - if ( KIO::NetAccess::download( tmpURL, localtpl ) ) + if ( TDEIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); @@ -189,7 +189,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) } else { - if ( KIO::NetAccess::download( url, localtpl ) ) + if ( TDEIO::NetAccess::download( url, localtpl ) ) isTemp = true; else KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); @@ -252,7 +252,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) ); if ( isTemp ) - KIO::NetAccess::removeTempFile( localtpl ); + TDEIO::NetAccess::removeTempFile( localtpl ); } } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 042715b34..7dc7b96a2 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1526,7 +1526,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e ) const KURL &url( *it ); TQString filename; - if ( !KIO::NetAccess::download( url, filename, this ) ) + if ( !TDEIO::NetAccess::download( url, filename, this ) ) continue; KMimeType::Ptr res = KMimeType::findByFileContent( filename ); @@ -1542,7 +1542,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e ) insertPictureDirect( newKoPicture, docPoint ); } } - KIO::NetAccess::removeTempFile( filename ); + TDEIO::NetAccess::removeTempFile( filename ); } } else diff --git a/kword/KWConfig.h b/kword/KWConfig.h index 7a57b7f65..ab6d373f9 100644 --- a/kword/KWConfig.h +++ b/kword/KWConfig.h @@ -30,7 +30,7 @@ class KWView; class TQCheckBox; class KIntNumInput; class KoUnitDoubleSpinBox; -class KConfig; +class TDEConfig; class TQComboBox; class KIntNumInput; class KCommand; @@ -53,7 +53,7 @@ public: void slotDefault(); private: KWView* m_pView; - KConfig* config; + TDEConfig* config; KSpell2::ConfigWidget *m_spellConfigWidget; }; @@ -72,7 +72,7 @@ signals: void unitChanged( int ); private: KWView* m_pView; - KConfig* config; + TDEConfig* config; TQComboBox *m_unitCombo; KoUnitDoubleSpinBox* gridX,*gridY; KoUnitDoubleSpinBox* indent; @@ -93,7 +93,7 @@ public: void setUnit( KoUnit::Unit unit ); private: KWView* m_pView; - KConfig* config; + TDEConfig* config; KIntNumInput* m_undoRedoLimit; int m_oldNbRedo; bool m_oldFormattingEndParag, m_oldFormattingSpace, m_oldFormattingTabs, m_oldFormattingBreak; @@ -116,7 +116,7 @@ public slots: void selectNewDefaultFont(); private: KWView* m_pView; - KConfig* config; + TDEConfig* config; TQFont *font; TQLabel *fontName; TQLabel *tabStop; @@ -153,7 +153,7 @@ private slots: void slotSelectionChanged(TQListViewItem *); private: KWView* m_pView; - KConfig* config; + TDEConfig* config; KListView* m_pPathView; TQPushButton *m_modifyPath; }; @@ -169,7 +169,7 @@ public: private slots: void screenReaderOptionChanged(); private: - KConfig* config; + TDEConfig* config; TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakFocusWidget; TQVGroupBox* m_gbScreenReaderOptions; diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 94651cf8f..01236753e 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -257,7 +257,7 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa initConfig(); // Get default font from the KWord config file - KConfig *config = KWFactory::instance()->config(); + TDEConfig *config = KWFactory::instance()->config(); config->setGroup("Document defaults" ); TQString defaultFontname=config->readEntry("DefaultFont"); if ( !defaultFontname.isEmpty() ) @@ -314,7 +314,7 @@ KWDocument::~KWDocument() void KWDocument::initConfig() { - KConfig *config = KWFactory::instance()->config(); + TDEConfig *config = KWFactory::instance()->config(); if( config->hasGroup("KSpell kword" ) ) { config->setGroup( "KSpell kword" ); @@ -411,7 +411,7 @@ void KWDocument::initConfig() } // Load personal dict - KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); + TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" ); } @@ -419,14 +419,14 @@ void KWDocument::saveConfig() { if ( !isReadWrite() ) return; - KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); + TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); group.writeEntry( "PersonalDict", m_spellCheckPersonalDict ); if ( !isEmbedded() ) { // Only save the config that is manipulated by the UI directly. // The config from the config dialog is saved by the dialog itself. - KConfig *config = KWFactory::instance()->config(); + TDEConfig *config = KWFactory::instance()->config(); config->setGroup( "Interface" ); config->writeEntry( "ViewFormattingChars", m_viewFormattingChars ); config->writeEntry( "ViewFormattingBreaks", m_viewFormattingBreak ); @@ -5135,7 +5135,7 @@ void KWDocument::changeBgSpellCheckingState( bool b ) { enableBackgroundSpellCheck( b ); reactivateBgSpellChecking(); - KConfig *config = KWFactory::instance()->config(); + TDEConfig *config = KWFactory::instance()->config(); config->setGroup("KSpell kword" ); config->writeEntry( "SpellCheck", (int)b ); } @@ -5340,7 +5340,7 @@ void KWDocument::updateDirectCursorButton() void KWDocument::setInsertDirectCursor(bool b) { m_bInsertDirectCursor=b; - KConfig *config = KWFactory::instance()->config(); + TDEConfig *config = KWFactory::instance()->config(); config->setGroup( "Interface" ); config->writeEntry( "InsertDirectCursor", b ); updateDirectCursorButton(); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index d28c3478c..4197b9039 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -6141,10 +6141,10 @@ void KWView::savePicture() { picture.save( TQT_TQIODEVICE(&file) ); file.close(); - if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) + if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( TDEIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index d3feca225..14222bf03 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -60,7 +60,7 @@ void KWQtSqlMailMergeOpen::savedPropertiesChanged(const TQString& name) { if (name!=i18n("")) { - KConfig conf("kwmailmergerc"); + TDEConfig conf("kwmailmergerc"); conf.setGroup("KWSLTQTDB:"+name); widget->hostname->setText(conf.readEntry("hostname","")); widget->username->setText(conf.readEntry("username","")); @@ -82,7 +82,7 @@ void KWQtSqlMailMergeOpen::fillSavedProperties() widget->savedProperties->clear(); widget->savedProperties->insertItem(i18n("")); //Read data from configuration file and add entries - KConfig conf("kwmailmergerc"); + TDEConfig conf("kwmailmergerc"); TQStringList list=conf.groupList(); for (TQStringList::Iterator it=list.begin();it!=list.end();++it) { @@ -101,7 +101,7 @@ void KWQtSqlMailMergeOpen::slotSave() if (value.isEmpty()) kdDebug()<<"Name value was empty"<hostname->text()); conf.writeEntry("username",widget->username->text()); diff --git a/lib/kformula/contextstyle.cc b/lib/kformula/contextstyle.cc index b6067e107..a744e02dd 100644 --- a/lib/kformula/contextstyle.cc +++ b/lib/kformula/contextstyle.cc @@ -89,7 +89,7 @@ const SymbolTable& ContextStyle::symbolTable() const } -void ContextStyle::readConfig( KConfig* config, bool init ) +void ContextStyle::readConfig( TDEConfig* config, bool init ) { config->setGroup( "kformula Font" ); TQString fontName = config->readEntry( "defaultFont", "Times,12,-1,5,50,1,0,0,0,0" ); diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h index 11a103dd4..edf9cefa2 100644 --- a/lib/kformula/contextstyle.h +++ b/lib/kformula/contextstyle.h @@ -93,7 +93,7 @@ public: * installation. Mark as false when this is not intended (i. e. creating * configuration dialog from another component) */ - void readConfig( KConfig* config, bool init = true ); + void readConfig( TDEConfig* config, bool init = true ); bool edit() const { return m_edit; } void setEdit( bool e ) { m_edit = e; } diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 0df68fcba..94f3c2414 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -118,21 +118,21 @@ void FontStyle::installFonts() for (TQStringList::iterator it = missing.begin(); it != missing.end(); ++it) { if ( *it == "arev sans" ) { - if (!KIO::NetAccess::exists("fonts:/Personal/Arev.ttf", true, NULL)) + if (!TDEIO::NetAccess::exists("fonts:/Personal/Arev.ttf", true, NULL)) urlList.append(locate("data", "kformula/fonts/Arev.ttf")); - if (!KIO::NetAccess::exists("fonts:/Personal/ArevIt.ttf", true, NULL)) + if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevIt.ttf", true, NULL)) urlList.append(locate("data", "kformula/fonts/ArevIt.ttf")); - if (!KIO::NetAccess::exists("fonts:/Personal/ArevBd.ttf", true, NULL)) + if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevBd.ttf", true, NULL)) urlList.append(locate("data", "kformula/fonts/ArevBd.ttf")); - if (!KIO::NetAccess::exists("fonts:/Personal/ArevBI.ttf", true, NULL)) + if (!TDEIO::NetAccess::exists("fonts:/Personal/ArevBI.ttf", true, NULL)) urlList.append(locate("data", "kformula/fonts/ArevBI.ttf")); } else { - if (!KIO::NetAccess::exists("fonts:/Personal/" + *it + ".ttf", true, NULL)) + if (!TDEIO::NetAccess::exists("fonts:/Personal/" + *it + ".ttf", true, NULL)) urlList.append(locate("data", "kformula/fonts/" + *it + ".ttf")); } } - KIO::copy(urlList, "fonts:/Personal/", false); + TDEIO::copy(urlList, "fonts:/Personal/", false); KMessageBox::information(tqApp->mainWidget(), i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect")); } diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 87160a983..a803dbc2b 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -53,7 +53,7 @@ KFORMULA_NAMESPACE_BEGIN -ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name ) +ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name ) : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false ) { const ContextStyle& contextStyle = document->getContextStyle( true ); @@ -342,7 +342,7 @@ void ConfigurePage::slotChanged() // } // MathFontsConfigurePage::MathFontsConfigurePage( Document* document, TQWidget* view, -// KConfig* config, TQVBox* box, char* name ) +// TDEConfig* config, TQVBox* box, char* name ) // : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ) // { // TQWidget* fontWidget = new TQWidget( box ); diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h index 54856a04f..37776f0fb 100644 --- a/lib/kformula/kformulaconfigpage.h +++ b/lib/kformula/kformulaconfigpage.h @@ -39,7 +39,7 @@ class TQStringList; class TQWidget; class KColorButton; -class KConfig; +class TDEConfig; class KListView; class KPushButton; class KIntNumInput; @@ -55,7 +55,7 @@ class KOFORMULA_EXPORT ConfigurePage : public TQObject public: - ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 ); + ConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name = 0 ); void apply(); void slotDefault(); @@ -83,7 +83,7 @@ private: Document* m_document; TQWidget* m_view; - KConfig* m_config; + TDEConfig* m_config; TQFont defaultFont; TQFont nameFont; @@ -114,7 +114,7 @@ private: // // public: -// MathFontsConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name = 0 ); +// MathFontsConfigurePage( Document* document, TQWidget* view, TDEConfig* config, TQVBox* box, char* name = 0 ); // void apply(); // void slotDefault(); @@ -133,7 +133,7 @@ private: // Document* m_document; // TQWidget* m_view; -// KConfig* m_config; +// TDEConfig* m_config; // KListView* availableFonts; // KListView* requestedFonts; diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 917d54c58..36b691de4 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -368,7 +368,7 @@ void Document::introduceWrapper( DocumentWrapper* wrapper, bool init ) ////////////////////////////////////////////////////////////////////////////// -DocumentWrapper::DocumentWrapper( KConfig* config, +DocumentWrapper::DocumentWrapper( TDEConfig* config, KActionCollection* collection, KoCommandHistory* history ) : m_document( 0 ), diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 61fdb7cc5..3cee9f0c2 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -295,12 +295,12 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject { public: - DocumentWrapper( KConfig* config, + DocumentWrapper( TDEConfig* config, KActionCollection* collection, KoCommandHistory* history = 0 ); ~DocumentWrapper(); - KConfig* config() { return m_config; } + TDEConfig* config() { return m_config; } KoCommandHistory* history() { return m_history; } /** @@ -495,7 +495,7 @@ private: SymbolType m_rightBracketChar; TQString m_selectedName; - KConfig* m_config; + TDEConfig* m_config; KoCommandHistory* m_history; /** diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h index 7820af81a..99cebe46b 100644 --- a/lib/kformula/symboltable.h +++ b/lib/kformula/symboltable.h @@ -30,7 +30,7 @@ #include "kformuladefs.h" -class KConfig; +class TDEConfig; KFORMULA_NAMESPACE_BEGIN diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 1e204af7c..8fb845892 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -97,7 +97,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, KGuiItem openGItem(i18n("Use This Template")); m_openButton->setGuiItem(openGItem); m_documentList->header()->hide(); - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName"); d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate"); connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked())); @@ -173,7 +173,7 @@ void KoTemplatesPane::openTemplate() void KoTemplatesPane::openTemplate(TQListViewItem* item) { if(item) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writePathEntry("FullTemplateName", item->text(2)); cfgGrp.writeEntry("LastReturnType", "Template"); cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate); @@ -199,7 +199,7 @@ void KoTemplatesPane::alwaysUseClicked() TQListViewItem* item = m_documentList->selectedItem(); if(!m_alwaysUseCheckBox->isChecked()) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writeEntry("AlwaysUseTemplate", TQString()); d->m_alwaysUseTemplate = TQString(); } else { @@ -264,7 +264,7 @@ class KoRecentDocumentsPanePrivate m_previewJob->kill(); } - KIO::PreviewJob* m_previewJob; + TDEIO::PreviewJob* m_previewJob; TDEInstance* m_instance; }; @@ -346,9 +346,9 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst m_documentList->setSelected(m_documentList->firstChild(), true); - d->m_previewJob = KIO::filePreview(fileList, 200, 200); + d->m_previewJob = TDEIO::filePreview(fileList, 200, 200); - connect(d->m_previewJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(previewResult(KIO::Job*))); + connect(d->m_previewJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(previewResult(TDEIO::Job*))); connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); } @@ -369,9 +369,9 @@ void KoRecentDocumentsPane::selectionChanged(TQListViewItem* item) KFileItem* fileItem = static_cast(item)->fileItem(); TQString details = "
"; details += i18n("File modification date and time. %1 is date time", "") - .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME)); + .arg(fileItem->timeString(TDEIO::UDS_MODIFICATION_TIME)); details += i18n("File access date and time. %1 is date time", "") - .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME)); + .arg(fileItem->timeString(TDEIO::UDS_ACCESS_TIME)); details += "
Modified:%1
Accessed:%1
"; m_detailsLabel->setText(details); } else { @@ -393,14 +393,14 @@ void KoRecentDocumentsPane::openFile() void KoRecentDocumentsPane::openFile(TQListViewItem* item) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writeEntry("LastReturnType", "File"); if(item) emit openFile(item->text(1)); } -void KoRecentDocumentsPane::previewResult(KIO::Job* job) +void KoRecentDocumentsPane::previewResult(TDEIO::Job* job) { if(d->m_previewJob == job) d->m_previewJob = 0; diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h index 86190edea..596c3c12a 100644 --- a/lib/kofficecore/KoDetailsPane.h +++ b/lib/kofficecore/KoDetailsPane.h @@ -32,7 +32,7 @@ class KoRichTextListItemPrivate; class KFileItem; class TQPixmap; -namespace KIO { +namespace TDEIO { class Job; } @@ -122,7 +122,7 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase void openFile(); void openFile(TQListViewItem* item); - void previewResult(KIO::Job* job); + void previewResult(TDEIO::Job* job); void updatePreview(const KFileItem* fileItem, const TQPixmap& preview); void changePalette(); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index beb0b266e..8bc8f88cb 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -264,7 +264,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec // A way to 'fix' the job's window, since we have no widget known to KParts if ( !singleViewMode ) - connect( this, TQT_SIGNAL( started( KIO::Job* ) ), TQT_SLOT( slotStarted( KIO::Job* ) ) ); + connect( this, TQT_SIGNAL( started( TDEIO::Job* ) ), TQT_SLOT( slotStarted( TDEIO::Job* ) ) ); } KoDocument::~KoDocument() @@ -393,8 +393,8 @@ bool KoDocument::saveFile() if ( url().isLocalFile() ) KSaveFile::backupFile( url().path(), d->m_backupPath ); else { - KIO::UDSEntry entry; - if ( KIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup + TDEIO::UDSEntry entry; + if ( TDEIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup emit sigStatusBarMessage( i18n("Making backup...") ); KURL backup; if ( d->m_backupPath.isEmpty()) @@ -404,7 +404,7 @@ bool KoDocument::saveFile() backup.setPath( backup.path() + TQString::fromLatin1("~") ); KFileItem item( entry, url() ); Q_ASSERT( item.name() == url().fileName() ); - KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() ); + TDEIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() ); } } } @@ -2485,7 +2485,7 @@ bool KoDocument::hasExternURL() const return !url().protocol().isEmpty() && url().protocol() != STORE_PROTOCOL && url().protocol() != INTERNAL_PROTOCOL; } -void KoDocument::slotStarted( KIO::Job* job ) +void KoDocument::slotStarted( TDEIO::Job* job ) { if ( job ) { @@ -2545,7 +2545,7 @@ TQString KoDocument::unitName() const void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow ) { if(!alwaysShow) { - KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" ); + TDEConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" ); TQString fullTemplateName = cfgGrp.readPathEntry( "AlwaysUseTemplate" ); if( !fullTemplateName.isEmpty() ) { diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 30b9ad977..4dc192b7d 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -1123,7 +1123,7 @@ protected: /** * Creates the open widget showed at application start up. * @param parent the parent widget - * @param instance the TDEInstance to be used for KConfig data + * @param instance the TDEInstance to be used for TDEConfig data * @param templateType the template-type (group) that should be selected on creation. * @since 1.5 */ @@ -1134,7 +1134,7 @@ private slots: void slotChildChanged( KoChild *c ); void slotChildDestroyed(); void slotAutoSave(); - void slotStarted( KIO::Job* ); + void slotStarted( TDEIO::Job* ); void startCustomDocument(); /** * Removes the open widget showed at application start up. diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index 871c81fde..eafda4b50 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -217,9 +217,9 @@ KoDocumentInfoAuthor::~KoDocumentInfoAuthor() } void KoDocumentInfoAuthor::initParameters() { - KConfig* config = KoGlobal::kofficeConfig(); + TDEConfig* config = KoGlobal::kofficeConfig(); if ( config->hasGroup( "Author" ) ) { - KConfigGroupSaver cgs( config, "Author" ); + TDEConfigGroupSaver cgs( config, "Author" ); m_telephoneHome=config->readEntry( "telephone" ); m_telephoneWork=config->readEntry( "telephone-work" ); m_fax=config->readEntry( "fax" ); @@ -229,7 +229,7 @@ void KoDocumentInfoAuthor::initParameters() m_street=config->readEntry( "street" ); } - m_emailCfg = new KConfig( "emaildefaults", true ); + m_emailCfg = new TDEConfig( "emaildefaults", true ); m_emailCfg->setGroup( "Defaults" ); TQString group = m_emailCfg->readEntry("Profile","Default"); m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group)); diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h index 4ecd2cef0..b113e75e6 100644 --- a/lib/kofficecore/KoDocumentInfo.h +++ b/lib/kofficecore/KoDocumentInfo.h @@ -131,7 +131,7 @@ private: TQString m_street; TQString m_initial; TQString m_position; - KConfig *m_emailCfg; + TDEConfig *m_emailCfg; }; class KOFFICECORE_EXPORT KoDocumentInfoAbout : public KoDocumentInfoPage diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 7918fab24..7e67c1486 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -346,8 +346,8 @@ void KoDocumentInfoDlg::save( KoDocumentInfoAuthor *authorInfo ) authorInfo->setStreet( d->m_authorWidget->leStreet->text() ); authorInfo->setPosition( d->m_authorWidget->leAuthorPosition->text() ); - KConfig* config = KoGlobal::kofficeConfig(); - KConfigGroupSaver cgs( config, "Author" ); + TDEConfig* config = KoGlobal::kofficeConfig(); + TDEConfigGroupSaver cgs( config, "Author" ); config->writeEntry("telephone", d->m_authorWidget->leTelephoneHome->text()); config->writeEntry("telephone-work", d->m_authorWidget->leTelephoneWork->text()); config->writeEntry("fax", d->m_authorWidget->leFax->text()); diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 10ee5bd92..566397978 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -111,7 +111,7 @@ TQStringList KoGlobal::_listOfLanguages() void KoGlobal::createListOfLanguages() { - KConfig config( "all_languages", true, false, "locale" ); + TDEConfig config( "all_languages", true, false, "locale" ); // Note that we could also use KLocale::allLanguagesTwoAlpha TQMap seenLanguages; @@ -188,10 +188,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag ) return langTag; } -KConfig* KoGlobal::_kofficeConfig() +TDEConfig* KoGlobal::_kofficeConfig() { if ( !m_kofficeConfig ) { - m_kofficeConfig = new KConfig( "kofficerc" ); + m_kofficeConfig = new TDEConfig( "kofficerc" ); } return m_kofficeConfig; } diff --git a/lib/kofficecore/KoGlobal.h b/lib/kofficecore/KoGlobal.h index cad645b4f..15523b3e1 100644 --- a/lib/kofficecore/KoGlobal.h +++ b/lib/kofficecore/KoGlobal.h @@ -25,7 +25,7 @@ #include #include #include -class KConfig; +class TDEConfig; #include class KOFFICECORE_EXPORT KoGlobal @@ -46,12 +46,12 @@ public: } /** - * @return the global KConfig object around kofficerc. + * @return the global TDEConfig object around kofficerc. * kofficerc is used for KOffice-wide settings, from totally unrelated classes, - * so this is the centralization of the KConfig object so that the file is + * so this is the centralization of the TDEConfig object so that the file is * parsed only once */ - static KConfig* kofficeConfig() { + static TDEConfig* kofficeConfig() { return self()->_kofficeConfig(); } @@ -87,13 +87,13 @@ private: TQFont _defaultFont(); TQStringList _listOfLanguages(); TQStringList _listOfLanguageTags(); - KConfig* _kofficeConfig(); + TDEConfig* _kofficeConfig(); void createListOfLanguages(); int m_pointSize; typedef TQMap LanguageMap; LanguageMap m_langMap; // display-name -> language tag - KConfig* m_kofficeConfig; + TDEConfig* m_kofficeConfig; int m_dpiX; int m_dpiY; // No BC problem here, constructor is private, feel free to add members diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 70275b6e3..f06d2c46a 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this))); // Load list of recent files - KConfig * config = instance ? instance->config() : TDEGlobal::config(); + TDEConfig * config = instance ? instance->config() : TDEGlobal::config(); m_recent->loadEntries( config ); createShellGUI(); @@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url ) void KoMainWindow::saveRecentFiles() { // Save list of recent files - KConfig * config = instance() ? instance()->config() : TDEGlobal::config(); + TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config(); kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl; m_recent->saveEntries( config ); config->sync(); @@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles() void KoMainWindow::reloadRecentFileList() { - KConfig * config = instance() ? instance()->config() : TDEGlobal::config(); + TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config(); m_recent->loadEntries( config ); } @@ -542,7 +542,7 @@ KParts::PartManager *KoMainWindow::partManager() bool KoMainWindow::openDocument( const KURL & url ) { - if ( !KIO::NetAccess::exists(url,true,0) ) + if ( !TDEIO::NetAccess::exists(url,true,0) ) { KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) ); m_recent->removeURL(url); //remove the file from the recent-opened-file-list @@ -555,7 +555,7 @@ bool KoMainWindow::openDocument( const KURL & url ) // (not virtual) bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url ) { - if (!KIO::NetAccess::exists(url,true,0) ) + if (!TDEIO::NetAccess::exists(url,true,0) ) { if (!newdoc->checkAutoSaveFile()) { @@ -847,7 +847,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) // this file exists and we are not just clicking "Save As" to change filter options // => ask for confirmation - if ( KIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions ) + if ( TDEIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions ) { bOk = KMessageBox::questionYesNo( this, i18n("A document with this name already exists.\n"\ diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 1079d5899..a8fa0f936 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -132,7 +132,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& m_splitter->setSizes(sizes); // Set the sizes of the details pane splitters - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes"); emit splitterResized(0, sizes); @@ -146,7 +146,7 @@ KoOpenPane::~KoOpenPane() if(item) { if(!dynamic_cast(m_widgetStack->widget(item->widgetIndex()))) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writeEntry("LastReturnType", "Custom"); } } @@ -162,7 +162,7 @@ void KoOpenPane::showOpenFileDialog() KURL url = KFileDialog::getOpenURL(":OpenDialog", mimeFilter.join(" "), this); if(!url.isEmpty()) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writeEntry("LastReturnType", "File"); emit openExistingFile(url.url()); } @@ -231,7 +231,7 @@ void KoOpenPane::initTemplates(const TQString& templateType) firstItem = m_sectionList->firstChild(); } - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); if(selectItem && (cfgGrp.readEntry("LastReturnType") == "Template")) { m_sectionList->setSelected(selectItem, true); @@ -247,7 +247,7 @@ void KoOpenPane::setCustomDocumentWidget(TQWidget *widget) { TQListViewItem* item = addPane(i18n("Custom Document"), TQString(), widget, INT_MAX); - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); if(cfgGrp.readEntry("LastReturnType") == "Custom") { m_sectionList->setSelected(item, true); @@ -299,7 +299,7 @@ void KoOpenPane::selectionChanged(TQListViewItem* item) void KoOpenPane::saveSplitterSizes(KoDetailsPaneBase* /*sender*/, const TQValueList& sizes) { - KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); + TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); cfgGrp.writeEntry("DetailsPaneSplitterSizes", sizes); } diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index d9abf832f..0efad8451 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -24,7 +24,7 @@ #include class KoCustomDocumentCreator; -class KConfig; +class TDEConfig; class KoTemplateGroup; class KoOpenPanePrivate; class TDEInstance; @@ -42,7 +42,7 @@ class KoOpenPane : public KoOpenPaneBase /** * Constructor * @param parent the parent widget - * @param instance the TDEInstance to be used for KConfig data + * @param instance the TDEInstance to be used for TDEConfig data * @param templateType the template-type (group) that should be selected on creation. */ KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString()); diff --git a/lib/kofficecore/KoPicture.cpp b/lib/kofficecore/KoPicture.cpp index 8e74c0b59..2dd6f730d 100644 --- a/lib/kofficecore/KoPicture.cpp +++ b/lib/kofficecore/KoPicture.cpp @@ -237,13 +237,13 @@ bool KoPicture::setKeyAndDownloadPicture(const KURL& url, TQWidget *window) bool result=false; TQString tmpFileName; - if ( KIO::NetAccess::download(url, tmpFileName, window) ) + if ( TDEIO::NetAccess::download(url, tmpFileName, window) ) { KoPictureKey key; key.setKeyFromFile( tmpFileName ); setKey( key ); result=loadFromFile( tmpFileName ); - KIO::NetAccess::removeTempFile( tmpFileName ); + TDEIO::NetAccess::removeTempFile( tmpFileName ); } return result; diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp index 5f81efde6..1d476f74e 100644 --- a/lib/kofficecore/KoPictureBase.cpp +++ b/lib/kofficecore/KoPictureBase.cpp @@ -39,7 +39,7 @@ KoPictureBase::KoPictureBase(void) // Slow mode can be very slow, especially at high zoom levels -> configurable if ( s_useSlowResizeMode == -1 ) { - KConfigGroup group( TDEGlobal::config(), "KOfficeImage" ); + TDEConfigGroup group( TDEGlobal::config(), "KOfficeImage" ); s_useSlowResizeMode = group.readNumEntry( "HighResolution", 1 ); kdDebug(30003) << "HighResolution = " << s_useSlowResizeMode << endl; } diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 0f0bea629..d81cffeca 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -193,7 +193,7 @@ void KoSpeaker::startSpeech() startText(d->m_jobNums[i]); } -void KoSpeaker::readConfig(KConfig* config) +void KoSpeaker::readConfig(TDEConfig* config) { delete d->m_timer; d->m_timer = 0; diff --git a/lib/kofficecore/KoSpeaker.h b/lib/kofficecore/KoSpeaker.h index c5acda32f..c4ab8786d 100644 --- a/lib/kofficecore/KoSpeaker.h +++ b/lib/kofficecore/KoSpeaker.h @@ -36,7 +36,7 @@ class TQWidget; class TQPoint; -class KConfig; +class TDEConfig; class KoSpeakerPrivate; #define kospeaker KoSpeaker::koSpeaker() @@ -92,7 +92,7 @@ public: * If KTTSD daemon is not installed, @ref isEnabled will return false. * If screen reader is requested and KTTSD is installed, but not running, it will be started. */ - void readConfig(KConfig* config); + void readConfig(TDEConfig* config); /** * Given a widget @p w and its @p pos screen coordinates, tries to extract the text of the widget diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 4b0cfe5b9..5acc72a71 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -166,7 +166,7 @@ void KoTemplateTree::writeTemplateTree() { //kdDebug() << "hidden" << endl; if(group->dirs().count()==1 && !group->dirs().grep(localDir).isEmpty()) { //kdDebug() << "local only" << endl; - KIO::NetAccess::del(group->dirs().first(), 0); + TDEIO::NetAccess::del(group->dirs().first(), 0); //kdDebug() << "removing: " << group->dirs().first() << endl; } else { @@ -350,7 +350,7 @@ void KoTemplateTree::writeTemplate(KoTemplate *t, KoTemplateGroup *group, if ( t->isHidden() && TQFile::exists(fileName) ) return; TQString fill; - while ( KIO::NetAccess::exists( fileName, true, 0 ) ) + while ( TDEIO::NetAccess::exists( fileName, true, 0 ) ) { fill += '_'; fileName = path + fill + name + ".desktop"; diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index d904fac03..991ffff82 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -403,7 +403,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou layout->addWidget(d->boxdescription, 1, 0 ); // config - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); int templateNum = grp.readNumEntry( "TemplateTab", -1 ); TQString templateName = grp.readPathEntry( "TemplateName" ); if ( templateName.isEmpty() && d->tree->defaultTemplate() ) @@ -504,7 +504,7 @@ void KoTemplateChooseDia::setupDialog() { TQGridLayout *maingrid=new TQGridLayout( d->m_mainwidget, 1, 1, 2, 6); - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); if (d->m_dialogType == Everything) { @@ -638,7 +638,7 @@ void KoTemplateChooseDia::slotOk() if (collectInfo()) { // Save it for the next time - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" }; if ( d->m_returnType <= Empty ) { diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index b82efbb6e..3b4975f06 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -272,7 +272,7 @@ void KoTemplateCreateDia::slotOk() { tmpIcon=".icon/"+file+".png"; icon=iconDir+file+".png"; } - while ( KIO::NetAccess::exists( dest, true, this ) ); + while ( TDEIO::NetAccess::exists( dest, true, this ) ); } bool ignore = false; kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl; @@ -306,7 +306,7 @@ void KoTemplateCreateDia::slotOk() { if ( !ignore ) { // copy the template file - KIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); + TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); // save the picture if(d->m_default->isChecked() && !m_pixmap.isNull()) @@ -324,10 +324,10 @@ void KoTemplateCreateDia::slotOk() { if((*it).contains(dir)==0) { orig.setPath( (*it)+".directory" ); // Check if we can read the file - if( KIO::NetAccess::exists(orig, true, this) ) { + if( TDEIO::NetAccess::exists(orig, true, this) ) { dest.setPath( dir+"/.directory" ); // We copy the file with overwrite - KIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); + TDEIO::NetAccess::file_copy( orig, dest, -1, true, false, this ); ready=true; } } @@ -337,7 +337,7 @@ void KoTemplateCreateDia::slotOk() { if ( d->m_defaultTemplate->isChecked() ) { - KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); + TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); grp.writeEntry( "LastReturnType", "Template" ); grp.writePathEntry( "FullTemplateName", dir + "/" + t->file() ); grp.writePathEntry( "AlwaysUseTemplate", dir + "/" + t->file() ); diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 430b972ad..8084068cd 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -63,7 +63,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) void KoPalette::resetFont() { - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); Q_ASSERT(cfg); cfg->setGroup(""); m_font = TDEGlobalSettings::generalFont(); diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 7d4a32d90..cf2151206 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -65,7 +65,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); cfg->setGroup("palettes"); bool palettesShown = cfg->readBoolEntry("palettesshown", true); @@ -149,7 +149,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, bool visible = true; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); if (cfg->hasGroup("palettetab-" + name)) { cfg->setGroup("palettetab-" + name); @@ -367,7 +367,7 @@ void KoPaletteManager::placePalette(const TQString & name, TQt::Dock location) if (!palette) return; //XXX: Check whether this name occurs in the config list, retrieve the location, set the location - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); if (cfg->hasGroup("palette-" + name)) { cfg->setGroup("palette-" + name); @@ -529,7 +529,7 @@ void KoPaletteManager::save() if (!m_view) return; if (!m_view->mainWindow()) return; - KConfig * cfg = TDEGlobal::config(); + TDEConfig * cfg = TDEGlobal::config(); Q_ASSERT(cfg); cfg->setGroup(""); diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 1dbed289c..32efad601 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -332,8 +332,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 7ca6f1a7f..84ec27d51 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -251,8 +251,8 @@ void KoAutoFormat::updateMaxWords() void KoAutoFormat::loadListOfWordCompletion() { - KConfig* config = KoGlobal::kofficeConfig(); - KConfigGroupSaver cgs( config, "Completion Word" ); + TDEConfig* config = KoGlobal::kofficeConfig(); + TDEConfigGroupSaver cgs( config, "Completion Word" ); m_listCompletion->insertItems(config->readListEntry( "list" )); } @@ -263,8 +263,8 @@ void KoAutoFormat::readConfig(bool force) // so that loading is faster and to avoid doing it for readonly documents. if ( m_configRead && !force ) return; - KConfig* config = KoGlobal::kofficeConfig(); - KConfigGroupSaver cgs( config, "AutoFormat" ); + TDEConfig* config = KoGlobal::kofficeConfig(); + TDEConfigGroupSaver cgs( config, "AutoFormat" ); //when we force don't load format language. if ( !force) m_autoFormatLanguage = config->readEntry("formatLanguage", TQString()); @@ -615,10 +615,10 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages) void KoAutoFormat::saveConfig() { - KConfig* config = KoGlobal::kofficeConfig(); + TDEConfig* config = KoGlobal::kofficeConfig(); KLocale klocale(m_doc->instance()->instanceName()); - KConfigGroupSaver cgs( config, "AutoFormat" ); + TDEConfigGroupSaver cgs( config, "AutoFormat" ); config->writeEntry( "ConvertUpperCase", m_convertUpperCase ); config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage); diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 09e12f0de..8464bf4d8 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -189,8 +189,8 @@ void KoCompletion::saveSettings() { } void KoCompletion::slotSaveCompletionEntry() { - KConfig config("kofficerc"); - KConfigGroupSaver cgs( &config, "Completion Word" ); + TDEConfig config("kofficerc"); + TDEConfigGroupSaver cgs( &config, "Completion Word" ); config.writeEntry( "list", m_listCompletion ); config.sync(); KMessageBox::information( this, i18n( diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 6b0409055..770c1da2d 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -1390,10 +1390,10 @@ TQCString KoDateVariable::formatStr(int & correct) DateFormatWidget* widget=new DateFormatWidget(dialog); int count=0; dialog->setMainWidget(widget); - KConfig* config = KoGlobal::kofficeConfig(); + TDEConfig* config = KoGlobal::kofficeConfig(); if( config->hasGroup("Date format history") ) { - KConfigGroupSaver cgs( config, "Date format history"); + TDEConfigGroupSaver cgs( config, "Date format history"); const int noe=config->readNumEntry("Number Of Entries", 5); for(int i=0;isetMainWidget(widget); - KConfig* config = KoGlobal::kofficeConfig(); + TDEConfig* config = KoGlobal::kofficeConfig(); int count=0; if( config->hasGroup("Time format history") ) { - KConfigGroupSaver cgs( config, "Time format history" ); + TDEConfigGroupSaver cgs( config, "Time format history" ); const int noe=config->readNumEntry("Number Of Entries", 5); for(int i=0;i 512 ) { kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl; - //return KIO::ERR_MALFORMED_URL; + //return TDEIO::ERR_MALFORMED_URL; return false; } @@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name ) if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; - //return KIO::ERR_FILE_ALREADY_EXIST; + //return TDEIO::ERR_FILE_ALREADY_EXIST; return false; } @@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name ) return false; } else - //return KIO::ERR_UNSUPPORTED_ACTION; + //return TDEIO::ERR_UNSUPPORTED_ACTION; return false; m_bIsOpen = true; @@ -247,7 +247,7 @@ bool KoStore::close() if ( !m_bIsOpen ) { kdWarning(s_area) << "KoStore: You must open before closing" << endl; - //return KIO::ERR_INTERNAL; + //return TDEIO::ERR_INTERNAL; return false; } diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp index db45d1553..5d131a905 100644 --- a/lib/store/KoTarStore.cpp +++ b/lib/store/KoTarStore.cpp @@ -87,11 +87,11 @@ KoTarStore::~KoTarStore() // Now we have still some job to do for remote files. if ( m_fileMode == KoStoreBase::RemoteRead ) { - KIO::NetAccess::removeTempFile( m_localFileName ); + TDEIO::NetAccess::removeTempFile( m_localFileName ); } else if ( m_fileMode == KoStoreBase::RemoteWrite ) { - KIO::NetAccess::upload( m_localFileName, m_url, m_window ); + TDEIO::NetAccess::upload( m_localFileName, m_url, m_window ); // ### FIXME: delete temp file } } @@ -137,13 +137,13 @@ bool KoTarStore::openRead( const TQString& name ) if ( entry == 0L ) { //kdWarning(s_area) << "Unknown filename " << name << endl; - //return KIO::ERR_DOES_NOT_EXIST; + //return TDEIO::ERR_DOES_NOT_EXIST; return false; } if ( entry->isDirectory() ) { kdWarning(s_area) << name << " is a directory !" << endl; - //return KIO::ERR_IS_DIRECTORY; + //return TDEIO::ERR_IS_DIRECTORY; return false; } KTarFile * f = (KTarFile *) entry; diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp index c1b7d01f0..635ad2483 100644 --- a/lib/store/KoZipStore.cpp +++ b/lib/store/KoZipStore.cpp @@ -98,11 +98,11 @@ KoZipStore::~KoZipStore() // Now we have still some job to do for remote files. if ( m_fileMode == KoStoreBase::RemoteRead ) { - KIO::NetAccess::removeTempFile( m_localFileName ); + TDEIO::NetAccess::removeTempFile( m_localFileName ); } else if ( m_fileMode == KoStoreBase::RemoteWrite ) { - KIO::NetAccess::upload( m_localFileName, m_url, m_window ); + TDEIO::NetAccess::upload( m_localFileName, m_url, m_window ); // ### FIXME: delete temp file } } @@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name ) if ( entry == 0L ) { //kdWarning(s_area) << "Unknown filename " << name << endl; - //return KIO::ERR_DOES_NOT_EXIST; + //return TDEIO::ERR_DOES_NOT_EXIST; return false; } if ( entry->isDirectory() ) { kdWarning(s_area) << name << " is a directory !" << endl; - //return KIO::ERR_IS_DIRECTORY; + //return TDEIO::ERR_IS_DIRECTORY; return false; } // Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual! diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 25b18e165..973b521b3 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -103,13 +103,13 @@ int main( int argc, char **argv ) if ( args->isSet("backup") ) { // Code form koDocument.cc - KIO::UDSEntry entry; - if ( KIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup + TDEIO::UDSEntry entry; + if ( TDEIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup { kdDebug() << "Making backup..." << endl;; KURL backup( uOut ); backup.setPath( uOut.path() + '~' ); - KIO::NetAccess::file_copy( uOut, backup, -1, true /*overwrite*/, false /*resume*/, 0L ); + TDEIO::NetAccess::file_copy( uOut, backup, -1, true /*overwrite*/, false /*resume*/, 0L ); } } diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp index b5c3d5d05..c66e36825 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.cpp +++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp @@ -523,7 +523,7 @@ bool KOfficePlugin::writeMetaData(const TQString & path, delete m_zip; // NULL as third parameter is not good, but I don't know the Window ID // That is only to avoid the deprecated warning at compile time - if (!KIO::NetAccess::upload( tmp_file.name(), KURL(path), NULL)){ + if (!TDEIO::NetAccess::upload( tmp_file.name(), KURL(path), NULL)){ kdDebug(7034) << "Error while saving " << tmp_file.name() << " as " << path << endl; return false; } diff --git a/tools/spell/main.cc b/tools/spell/main.cc index 4489aa4f5..290d63020 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -78,7 +78,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat if ( instance() ) { - KConfig * config = instance()->config(); + TDEConfig * config = instance()->config(); TQCString gn( "KSpell " ); gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...) TQString groupName = TQString::fromLatin1( gn ); diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index cca6f4953..273c5d208 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -71,7 +71,7 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) m_dialog->setHelp(TQString(), "thesaurus"); m_dialog->resize(600, 400); - m_config = new KConfig("kthesaurusrc"); + m_config = new TDEConfig("kthesaurusrc"); m_data_file = m_config->readPathEntry("datafile"); if( ! m_data_file ) { m_data_file = TDEGlobal::dirs()->findResourceDir("data", "thesaurus/") diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index 210be1956..c69824b1b 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -115,7 +115,7 @@ protected: bool m_replacement; // does this dialog offer a replace button etc.? - KConfig *m_config; + TDEConfig *m_config; TDEProcess *m_thesproc; TQString m_thesproc_stdout;