TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 5b8ab14946
commit 3fe437def8
115 changed files with 347 additions and 347 deletions
Show Stats Download Patch File Download Diff File

2
chalk/chalkcolor/kis_abstract_colorspace.cc
Unescape View File

@ -719,7 +719,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa
KisProfile * dstProfile, KisProfile * dstProfile,
TQ_INT32 renderingIntent) TQ_INT32 renderingIntent)
{ {
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
bool bpCompensation = cfg->readBoolEntry("useBlackPointCompensation", false); bool bpCompensation = cfg->readBoolEntry("useBlackPointCompensation", false);
int flags = 0; int flags = 0;

2
chalk/core/kis_thread_pool.cc
Unescape View File

@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool()
KisThreadPool::m_singleton = this; KisThreadPool::m_singleton = this;
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup(""); cfg->setGroup("");
m_maxThreads = cfg->readNumEntry("maxthreads", 10); m_maxThreads = cfg->readNumEntry("maxthreads", 10);
m_numberOfRunningThreads = 0; m_numberOfRunningThreads = 0;

4
chalk/core/tiles/kis_tilemanager.cc
Unescape View File

@ -64,7 +64,7 @@ KisTileManager::KisTileManager() {
} }
m_currentInMem = 0; m_currentInMem = 0;
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup(""); cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100); m_swappiness = cfg->readNumEntry("swappiness", 100);
@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) {
} }
void KisTileManager::configChanged() { void KisTileManager::configChanged() {
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup(""); cfg->setGroup("");
m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000); m_maxInMem = cfg->readNumEntry("maxtilesinmem", 4000);
m_swappiness = cfg->readNumEntry("swappiness", 100); m_swappiness = cfg->readNumEntry("swappiness", 100);

6
chalk/doc/chalk.xmi
Unescape View File

@ -1427,7 +1427,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="1098" type="TQ_INT32" name="maxLayerHeight" /> <UML:Operation visibility="public" xmi.id="1098" type="TQ_INT32" name="maxLayerHeight" />
<UML:Operation visibility="public" xmi.id="1099" type="TQ_INT32" name="maxLayerWidth" /> <UML:Operation visibility="public" xmi.id="1099" type="TQ_INT32" name="maxLayerWidth" />
<UML:Operation visibility="public" xmi.id="1100" type="" name="~KisConfig" /> <UML:Operation visibility="public" xmi.id="1100" type="" name="~KisConfig" />
<UML:Attribute visibility="private" xmi.id="1086" value="" type="mutable KConfig *" name="m_cfg" /> <UML:Attribute visibility="private" xmi.id="1086" value="" type="mutable TDEConfig *" name="m_cfg" />
</UML:Class> </UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="1101" name="KisCanvasObserver" > <UML:Class stereotype="class" visibility="public" xmi.id="1101" name="KisCanvasObserver" >
<UML:Operation visibility="protected" xmi.id="1102" type="KisCanvasObserver &amp;" name="=" > <UML:Operation visibility="protected" xmi.id="1102" type="KisCanvasObserver &amp;" name="=" >
@ -37897,7 +37897,7 @@ in the constructor, you have to call loadAsync.
<cppcodedocumentation tag="" indentLevel="1" text="Fields" /> <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
</header> </header>
<textblocks> <textblocks>
<ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" > <ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable TDEConfig * m_cfg;" >
<header> <header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -37973,7 +37973,7 @@ in the constructor, you have to call loadAsync.
<header> <header>
<cppcodedocumentation tag="" /> <cppcodedocumentation tag="" />
</header> </header>
<ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" > <ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable TDEConfig * m_cfg;" >
<header> <header>
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
</header> </header>

4
chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
Unescape View File

@ -48,7 +48,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
setMainWidget(m_page); setMainWidget(m_page);
resize(m_page->sizeHint()); resize(m_page->sizeHint());
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );
m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) ); m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) );
m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) ); m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) );
@ -103,7 +103,7 @@ bool DlgDropshadow::allowResizingChecked()
void DlgDropshadow::okClicked() void DlgDropshadow::okClicked()
{ {
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value()); cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value());
cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value()); cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value());
cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value()); cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value());

8
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
Unescape View File

@ -91,7 +91,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
grabber->releaseMouse(); grabber->releaseMouse();
grabber->hide(); grabber->hide();
KConfig *conf=TDEGlobal::config(); TDEConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL"); conf->setGroup("GENERAL");
mainWidget->setDelay(conf->readNumEntry("delay",0)); mainWidget->setDelay(conf->readNumEntry("delay",0));
mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
@ -142,7 +142,7 @@ bool KSnapshot::save( const KURL& url )
if ( tmpFile.status() == 0 ) { if ( tmpFile.status() == 0 ) {
if ( snapshot.save( tmpFile.file(), type.latin1() ) ) { if ( snapshot.save( tmpFile.file(), type.latin1() ) ) {
if ( tmpFile.close() ) 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() void KSnapshot::exit()
{ {
KConfig *conf=TDEGlobal::config(); TDEConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL"); conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("mode",mainWidget->mode());
@ -482,7 +482,7 @@ void KSnapshot::exit()
void KSnapshot::slotOk() void KSnapshot::slotOk()
{ {
KConfig *conf=TDEGlobal::config(); TDEConfig *conf=TDEGlobal::config();
conf->setGroup("GENERAL"); conf->setGroup("GENERAL");
conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("delay",mainWidget->delay());
conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("mode",mainWidget->mode());

2
chalk/ui/kis_config.cc
Unescape View File

@ -48,7 +48,7 @@ KisConfig::KisConfig()
if (!m_cfg) { if (!m_cfg) {
// Allow unit tests to test parts of the code without having to run the // Allow unit tests to test parts of the code without having to run the
// full application. // full application.
m_cfg = new KConfig(); m_cfg = new TDEConfig();
} }
m_cfg->setGroup(""); m_cfg->setGroup("");
} }

2
chalk/ui/kis_config.h
Unescape View File

@ -137,7 +137,7 @@ private:
KisConfig& operator=(const KisConfig&); KisConfig& operator=(const KisConfig&);
private: private:
mutable KConfig *m_cfg; mutable TDEConfig *m_cfg;
}; };
#endif // KIS_CONFIG_H_ #endif // KIS_CONFIG_H_

12
filters/chalk/gmagick/kis_image_magick_converter.cc
Unescape View File

@ -665,18 +665,18 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
if (uri.isEmpty()) if (uri.isEmpty())
return KisImageBuilder_RESULT_NO_URI; 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; return KisImageBuilder_RESULT_NOT_EXIST;
} }
KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE;
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) {
KURL uriTF; KURL uriTF;
uriTF.setPath( tmpFile ); uriTF.setPath( tmpFile );
result = decode(uriTF, false); result = decode(uriTF, false);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
return result; return result;
@ -921,7 +921,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
return KisImageBuilder_RESULT_OK; 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()) { if (data.isNull() || data.isEmpty()) {
emit notifyProgressStage(i18n("Loading..."), 0); emit notifyProgressStage(i18n("Loading..."), 0);
@ -960,7 +960,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
job -> kill(); job -> kill();
} }
void KisImageMagickConverter::ioResult(KIO::Job *job) void KisImageMagickConverter::ioResult(TDEIO::Job *job)
{ {
m_job = 0; m_job = 0;
@ -970,7 +970,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
decode(KURL(), true); 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_size = size;
m_data.reserve(size); m_data.reserve(size);

10
filters/chalk/gmagick/kis_image_magick_converter.h
Unescape View File

@ -80,9 +80,9 @@ public:
static TQString writeFilters(); static TQString writeFilters();
private slots: private slots:
void ioData(KIO::Job *job, const TQByteArray& data); void ioData(TDEIO::Job *job, const TQByteArray& data);
void ioResult(KIO::Job *job); void ioResult(TDEIO::Job *job);
void ioTotalSize(KIO::Job *job, KIO::filesize_t size); void ioTotalSize(TDEIO::Job *job, TDEIO::filesize_t size);
private: private:
KisImageMagickConverter(const KisImageMagickConverter&); KisImageMagickConverter(const KisImageMagickConverter&);
@ -95,8 +95,8 @@ private:
KisDoc *m_doc; KisDoc *m_doc;
KisUndoAdapter *m_adapter; KisUndoAdapter *m_adapter;
TQValueVector<TQ_UINT8> m_data; TQValueVector<TQ_UINT8> m_data;
KIO::TransferJob *m_job; TDEIO::TransferJob *m_job;
KIO::filesize_t m_size; TDEIO::filesize_t m_size;
bool m_stop; bool m_stop;
}; };

10
filters/chalk/jpeg/kis_jpeg_converter.cc
Unescape View File

@ -325,7 +325,7 @@ KisImageBuilder_Result KisJPEGConverter::buildImage(const KURL& uri)
if (uri.isEmpty()) if (uri.isEmpty())
return KisImageBuilder_RESULT_NO_URI; 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; return KisImageBuilder_RESULT_NOT_EXIST;
} }
@ -333,11 +333,11 @@ KisImageBuilder_Result KisJPEGConverter::buildImage(const KURL& uri)
KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE;
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) {
KURL uriTF; KURL uriTF;
uriTF.setPath( tmpFile ); uriTF.setPath( tmpFile );
result = decode(uriTF); result = decode(uriTF);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
return result; return result;
@ -387,7 +387,7 @@ KisImageBuilder_Result KisJPEGConverter::buildFile(const KURL& uri, KisPaintLaye
J_COLOR_SPACE color_type = getColorTypeforColorSpace(img->colorSpace()); J_COLOR_SPACE color_type = getColorTypeforColorSpace(img->colorSpace());
if(color_type == JCS_UNKNOWN) if(color_type == JCS_UNKNOWN)
{ {
KIO::del(uri); TDEIO::del(uri);
return KisImageBuilder_RESULT_UNSUPPORTED_COLORSPACE; return KisImageBuilder_RESULT_UNSUPPORTED_COLORSPACE;
} }
cinfo.in_color_space = color_type; // colorspace of input image cinfo.in_color_space = color_type; // colorspace of input image
@ -514,7 +514,7 @@ KisImageBuilder_Result KisJPEGConverter::buildFile(const KURL& uri, KisPaintLaye
} }
break; break;
default: default:
KIO::del(uri); TDEIO::del(uri);
return KisImageBuilder_RESULT_UNSUPPORTED; return KisImageBuilder_RESULT_UNSUPPORTED;
} }
jpeg_write_scanlines(&cinfo, &row_pointer, 1); jpeg_write_scanlines(&cinfo, &row_pointer, 1);

2
filters/chalk/jpeg/kis_jpeg_converter.h
Unescape View File

@ -85,7 +85,7 @@ class KisJPEGConverter : public KisProgressSubject {
KisDoc *m_doc; KisDoc *m_doc;
KisUndoAdapter *m_adapter; KisUndoAdapter *m_adapter;
bool m_stop; bool m_stop;
KIO::TransferJob *m_job; TDEIO::TransferJob *m_job;
}; };
#endif #endif

12
filters/chalk/magick/kis_image_magick_converter.cc
Unescape View File

@ -607,18 +607,18 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
if (uri.isEmpty()) if (uri.isEmpty())
return KisImageBuilder_RESULT_NO_URI; 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; return KisImageBuilder_RESULT_NOT_EXIST;
} }
KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE;
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) {
KURL uriTF; KURL uriTF;
uriTF.setPath( tmpFile ); uriTF.setPath( tmpFile );
result = decode(uriTF, false); result = decode(uriTF, false);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
return result; return result;
@ -864,7 +864,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
return KisImageBuilder_RESULT_OK; 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()) { if (data.isNull() || data.isEmpty()) {
emit notifyProgressStage(i18n("Loading..."), 0); emit notifyProgressStage(i18n("Loading..."), 0);
@ -903,7 +903,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
job -> kill(); job -> kill();
} }
void KisImageMagickConverter::ioResult(KIO::Job *job) void KisImageMagickConverter::ioResult(TDEIO::Job *job)
{ {
m_job = 0; m_job = 0;
@ -913,7 +913,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
decode(KURL(), true); 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_size = size;
m_data.reserve(size); m_data.reserve(size);

10
filters/chalk/magick/kis_image_magick_converter.h
Unescape View File

@ -80,9 +80,9 @@ public:
static TQString writeFilters(); static TQString writeFilters();
private slots: private slots:
void ioData(KIO::Job *job, const TQByteArray& data); void ioData(TDEIO::Job *job, const TQByteArray& data);
void ioResult(KIO::Job *job); void ioResult(TDEIO::Job *job);
void ioTotalSize(KIO::Job *job, KIO::filesize_t size); void ioTotalSize(TDEIO::Job *job, TDEIO::filesize_t size);
private: private:
KisImageMagickConverter(const KisImageMagickConverter&); KisImageMagickConverter(const KisImageMagickConverter&);
@ -95,8 +95,8 @@ private:
KisDoc *m_doc; KisDoc *m_doc;
KisUndoAdapter *m_adapter; KisUndoAdapter *m_adapter;
TQValueVector<TQ_UINT8> m_data; TQValueVector<TQ_UINT8> m_data;
KIO::TransferJob *m_job; TDEIO::TransferJob *m_job;
KIO::filesize_t m_size; TDEIO::filesize_t m_size;
bool m_stop; bool m_stop;
}; };

6
filters/chalk/pdf/kis_pdf_import.cpp
Unescape View File

@ -75,13 +75,13 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
KURL url; KURL url;
url.setPath(filename); url.setPath(filename);
if (!KIO::NetAccess::exists(url, false, tqApp -> mainWidget())) { if (!TDEIO::NetAccess::exists(url, false, tqApp -> mainWidget())) {
return KoFilter::FileNotFound; return KoFilter::FileNotFound;
} }
// We're not set up to handle asynchronous loading at the moment. // We're not set up to handle asynchronous loading at the moment.
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(url, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(url, tmpFile, tqApp -> mainWidget())) {
url.setPath( tmpFile ); url.setPath( tmpFile );
} }
@ -149,7 +149,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
img->blockSignals(false); img->blockSignals(false);
doc -> setCurrentImage( img); doc -> setCurrentImage( img);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
delete pdoc; delete pdoc;
delete kdb; delete kdb;

14
filters/chalk/png/kis_png_converter.cc
Unescape View File

@ -451,7 +451,7 @@ KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri)
if (uri.isEmpty()) if (uri.isEmpty())
return KisImageBuilder_RESULT_NO_URI; 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; return KisImageBuilder_RESULT_NOT_EXIST;
} }
@ -459,11 +459,11 @@ KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri)
KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE;
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) {
KURL uriTF; KURL uriTF;
uriTF.setPath( tmpFile ); uriTF.setPath( tmpFile );
result = decode(uriTF); result = decode(uriTF);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
return result; 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); 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) if (!png_ptr)
{ {
KIO::del(uri); TDEIO::del(uri);
return (KisImageBuilder_RESULT_FAILURE); return (KisImageBuilder_RESULT_FAILURE);
} }
png_infop info_ptr = png_create_info_struct(png_ptr); png_infop info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr) if (!info_ptr)
{ {
KIO::del(uri); TDEIO::del(uri);
png_destroy_write_struct(&png_ptr, (png_infopp)NULL); png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
return (KisImageBuilder_RESULT_FAILURE); 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 an error occurs during writing, libpng will jump here
if (setjmp(png_jmpbuf(png_ptr))) if (setjmp(png_jmpbuf(png_ptr)))
{ {
KIO::del(uri); TDEIO::del(uri);
png_destroy_write_struct(&png_ptr, &info_ptr); png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp); fclose(fp);
return (KisImageBuilder_RESULT_FAILURE); return (KisImageBuilder_RESULT_FAILURE);
@ -762,7 +762,7 @@ KisImageBuilder_Result KisPNGConverter::buildFile(const KURL& uri, KisPaintLayer
break; break;
default: default:
kdDebug(41008) << "Unsupported color type for writting : " << color_type << endl; kdDebug(41008) << "Unsupported color type for writting : " << color_type << endl;
KIO::del(uri); TDEIO::del(uri);
return KisImageBuilder_RESULT_UNSUPPORTED; return KisImageBuilder_RESULT_UNSUPPORTED;
} }
} }

2
filters/chalk/raw/kis_raw_import.cpp
Unescape View File

@ -134,7 +134,7 @@ KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQ
m_dialog->setCursor(TQt::ArrowCursor); m_dialog->setCursor(TQt::ArrowCursor);
TQApplication::setOverrideCursor(TQt::ArrowCursor); TQApplication::setOverrideCursor(TQt::ArrowCursor);
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup("rawimport"); cfg->setGroup("rawimport");
m_page->radioGray->setChecked(cfg->readBoolEntry("gray", false)); m_page->radioGray->setChecked(cfg->readBoolEntry("gray", false));

10
filters/chalk/tiff/kis_tiff_converter.cc
Unescape View File

@ -584,7 +584,7 @@ KisImageBuilder_Result KisTIFFConverter::buildImage(const KURL& uri)
if (uri.isEmpty()) if (uri.isEmpty())
return KisImageBuilder_RESULT_NO_URI; 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; return KisImageBuilder_RESULT_NOT_EXIST;
} }
@ -592,11 +592,11 @@ KisImageBuilder_Result KisTIFFConverter::buildImage(const KURL& uri)
KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE; KisImageBuilder_Result result = KisImageBuilder_RESULT_FAILURE;
TQString tmpFile; TQString tmpFile;
if (KIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) { if (TDEIO::NetAccess::download(uri, tmpFile, tqApp -> mainWidget())) {
KURL uriTF; KURL uriTF;
uriTF.setPath( tmpFile ); uriTF.setPath( tmpFile );
result = decode(uriTF); result = decode(uriTF);
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
return result; return result;
@ -653,13 +653,13 @@ KisImageBuilder_Result KisTIFFConverter::buildFile(const KURL& uri, KisImageSP i
KisGroupLayer* root = dynamic_cast<KisGroupLayer*>(img->rootLayer().data()); KisGroupLayer* root = dynamic_cast<KisGroupLayer*>(img->rootLayer().data());
if(root == 0) if(root == 0)
{ {
KIO::del(uri); TDEIO::del(uri);
TIFFClose(image); TIFFClose(image);
return KisImageBuilder_RESULT_FAILURE; return KisImageBuilder_RESULT_FAILURE;
} }
if(!visitor->visit( root )) if(!visitor->visit( root ))
{ {
KIO::del(uri); TDEIO::del(uri);
TIFFClose(image); TIFFClose(image);
return KisImageBuilder_RESULT_FAILURE; return KisImageBuilder_RESULT_FAILURE;
} }

2
filters/chalk/tiff/kis_tiff_converter.h
Unescape View File

@ -88,7 +88,7 @@ class KisTIFFConverter : public KisProgressSubject {
KisDoc *m_doc; KisDoc *m_doc;
KisUndoAdapter *m_adapter; KisUndoAdapter *m_adapter;
bool m_stop; bool m_stop;
KIO::TransferJob *m_job; TDEIO::TransferJob *m_job;
}; };
#endif #endif

4
filters/kspread/csv/csvdialog.cpp
Unescape View File

@ -118,7 +118,7 @@ CSVDialog::~CSVDialog()
void CSVDialog::loadSettings() void CSVDialog::loadSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("CSVDialog Settings"); config->setGroup("CSVDialog Settings");
m_textquote = config->readEntry("textquote", "\"")[0]; m_textquote = config->readEntry("textquote", "\"")[0];
m_delimiter = config->readEntry("delimiter", ","); m_delimiter = config->readEntry("delimiter", ",");
@ -145,7 +145,7 @@ void CSVDialog::loadSettings()
void CSVDialog::saveSettings() void CSVDialog::saveSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("CSVDialog Settings"); config->setGroup("CSVDialog Settings");
TQString q = m_textquote; TQString q = m_textquote;
config->writeEntry("textquote", q); config->writeEntry("textquote", q);

4
filters/kspread/csv/csvexportdialog.cpp
Unescape View File

@ -102,7 +102,7 @@ CSVExportDialog::~CSVExportDialog()
void CSVExportDialog::loadSettings() void CSVExportDialog::loadSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("CSVDialog Settings"); config->setGroup("CSVDialog Settings");
m_textquote = config->readEntry("textquote", "\"")[0]; m_textquote = config->readEntry("textquote", "\"")[0];
m_delimiter = config->readEntry("delimiter", ","); m_delimiter = config->readEntry("delimiter", ",");
@ -136,7 +136,7 @@ void CSVExportDialog::loadSettings()
void CSVExportDialog::saveSettings() void CSVExportDialog::saveSettings()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("CSVDialog Settings"); config->setGroup("CSVDialog Settings");
TQString q = m_textquote; TQString q = m_textquote;
config->writeEntry("textquote", q); config->writeEntry("textquote", q);

2
filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
Unescape View File

@ -64,7 +64,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
kapp->restoreOverrideCursor(); kapp->restoreOverrideCursor();
/* Recent files */ /* Recent files */
_config = new KConfig("kspreadlatexexportdialog"); _config = new TDEConfig("kspreadlatexexportdialog");
_config->setGroup( "KSpread latex export filter" ); _config->setGroup( "KSpread latex export filter" );
TQString value; TQString value;
while(i < 10) while(i < 10)

4
filters/kspread/latex/export/kspreadlatexexportdiaImpl.h
Unescape View File

@ -27,7 +27,7 @@
#include "latexexportIface.h" #include "latexexportIface.h"
class KoStore; class KoStore;
class KConfig; class TDEConfig;
class KSpreadLatexExportDiaImpl : public LatexExportDia class KSpreadLatexExportDiaImpl : public LatexExportDia
{ {
@ -37,7 +37,7 @@ class KSpreadLatexExportDiaImpl : public LatexExportDia
private: private:
TQString _fileOut; TQString _fileOut;
KoStore* _in; KoStore* _in;
KConfig* _config; TDEConfig* _config;
LatexExportIface* _iface; LatexExportIface* _iface;
public: public:

2
filters/kword/latex/export/kwordlatexexportdia.cc
Unescape View File

@ -66,7 +66,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
pathPictures->setMode(KFile::Directory); pathPictures->setMode(KFile::Directory);
/* Recent files */ /* Recent files */
_config = new KConfig("kwordlatexexportdialog"); _config = new TDEConfig("kwordlatexexportdialog");
_config->setGroup( "KWord latex export filter" ); _config->setGroup( "KWord latex export filter" );
TQString value; TQString value;
while(i < 10) while(i < 10)

4
filters/kword/latex/export/kwordlatexexportdia.h
Unescape View File

@ -25,7 +25,7 @@
#include <kurl.h> #include <kurl.h>
class KoStore; class KoStore;
class KConfig; class TDEConfig;
class LatexExportIface; class LatexExportIface;
class KWordLatexExportDia : public LatexExportDia class KWordLatexExportDia : public LatexExportDia
@ -36,7 +36,7 @@ class KWordLatexExportDia : public LatexExportDia
private: private:
TQString _fileOut; TQString _fileOut;
KoStore* _in; KoStore* _in;
KConfig* _config; TDEConfig* _config;
LatexExportIface* _iface; LatexExportIface* _iface;
public: public:

2
filters/xsltfilter/export/xsltexportdia.cc
Unescape View File

@ -59,7 +59,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
kapp->restoreOverrideCursor(); kapp->restoreOverrideCursor();
/* Recent files */ /* Recent files */
_config = new KConfig("xsltdialog"); _config = new TDEConfig("xsltdialog");
_config->setGroup( "XSLT export filter" ); _config->setGroup( "XSLT export filter" );
TQString value; TQString value;
while(i < 10) while(i < 10)

4
filters/xsltfilter/export/xsltexportdia.h
Unescape View File

@ -25,7 +25,7 @@
#include <kurl.h> #include <kurl.h>
class KoStoreDevice; class KoStoreDevice;
class KConfig; class TDEConfig;
class XSLTExportDia : public XSLTDialog class XSLTExportDia : public XSLTDialog
{ {
@ -37,7 +37,7 @@ class XSLTExportDia : public XSLTDialog
/** xslt file current */ /** xslt file current */
KURL _currentFile; KURL _currentFile;
TQCString _format; TQCString _format;
KConfig* _config; TDEConfig* _config;
/** List of the most recent xslt file used. */ /** List of the most recent xslt file used. */
TQStringList _recentList; TQStringList _recentList;

2
filters/xsltfilter/import/xsltimportdia.cc
Unescape View File

@ -54,7 +54,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa
setCaption(i18n("Import XSLT Configuration")); setCaption(i18n("Import XSLT Configuration"));
/* Recent files */ /* Recent files */
_config = new KConfig("xsltdialog"); _config = new TDEConfig("xsltdialog");
_config->setGroup( "XSLT import filter" ); _config->setGroup( "XSLT import filter" );
TQString value; TQString value;
while(i < 10) while(i < 10)

2
filters/xsltfilter/import/xsltimportdia.h
Unescape View File

@ -37,7 +37,7 @@ class XSLTImportDia : public XSLTDialog
/** xslt file current */ /** xslt file current */
KURL _currentFile; KURL _currentFile;
TQCString _format; TQCString _format;
KConfig* _config; TDEConfig* _config;
/** List of the most recent xslt file used. */ /** List of the most recent xslt file used. */
TQStringList _recentList; TQStringList _recentList;

8
karbon/dialogs/vconfiguredlg.h
Unescape View File

@ -24,7 +24,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
class KarbonView; class KarbonView;
class KConfig; class TDEConfig;
class KIntNumInput; class KIntNumInput;
class KColorButton; class KColorButton;
class KoUnitDoubleSpinBox; class KoUnitDoubleSpinBox;
@ -47,7 +47,7 @@ public slots:
private: private:
KarbonView* m_view; KarbonView* m_view;
KConfig* m_config; TDEConfig* m_config;
KIntNumInput* m_recentFiles; KIntNumInput* m_recentFiles;
int m_oldRecentFiles; int m_oldRecentFiles;
@ -81,7 +81,7 @@ public slots:
private: private:
KarbonView* m_view; KarbonView* m_view;
KConfig* m_config; TDEConfig* m_config;
KIntNumInput* m_undoRedo; KIntNumInput* m_undoRedo;
int m_oldUndoRedo; int m_oldUndoRedo;
@ -105,7 +105,7 @@ public slots:
private: private:
KarbonView* m_view; KarbonView* m_view;
KConfig* m_config; TDEConfig* m_config;
KIntNumInput* m_autoSave; KIntNumInput* m_autoSave;
int m_oldAutoSave; int m_oldAutoSave;

2
karbon/karbon_part.cc
Unescape View File

@ -617,7 +617,7 @@ KarbonPart::setUndoRedoLimit( int undos )
void void
KarbonPart::initConfig() KarbonPart::initConfig()
{ {
KConfig* config = KarbonPart::instance()->config(); TDEConfig* config = KarbonPart::instance()->config();
if( config->hasGroup( "Interface" ) ) if( config->hasGroup( "Interface" ) )
{ {

4
kchart/kchart_part.cc
Unescape View File

@ -760,7 +760,7 @@ void KChartPart::setChartDefaults()
void KChartPart::loadConfig( KConfig *conf ) void KChartPart::loadConfig( TDEConfig *conf )
{ {
conf->setGroup("ChartParameters"); conf->setGroup("ChartParameters");
@ -871,7 +871,7 @@ void KChartPart::defaultConfig( )
} }
void KChartPart::saveConfig( KConfig *conf ) void KChartPart::saveConfig( TDEConfig *conf )
{ {
conf->setGroup("ChartParameters"); conf->setGroup("ChartParameters");

4
kchart/kchart_part.h
Unescape View File

@ -56,8 +56,8 @@ public:
bool showWizard( TQString &dataArea ); bool showWizard( TQString &dataArea );
void initLabelAndLegend(); void initLabelAndLegend();
void loadConfig(KConfig *conf); void loadConfig(TDEConfig *conf);
void saveConfig(KConfig *conf); void saveConfig(TDEConfig *conf);
void defaultConfig(); void defaultConfig();
KChartParams::ChartType chartType() const { return (KChartParams::ChartType) params()->chartType(); } KChartParams::ChartType chartType() const { return (KChartParams::ChartType) params()->chartType(); }

6
kexi/3rdparty/kolibs/koGlobal.cc vendored
Unescape View File

@ -108,7 +108,7 @@ TQStringList KoGlobal::_listOfLanguages()
void KoGlobal::createListOfLanguages() 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 // Note that we could also use KLocale::allLanguagesTwoAlpha
TQMap<TQString, bool> seenLanguages; TQMap<TQString, bool> seenLanguages;
@ -185,10 +185,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag )
return langTag; return langTag;
} }
KConfig* KoGlobal::_kofficeConfig() TDEConfig* KoGlobal::_kofficeConfig()
{ {
if ( !m_kofficeConfig ) { if ( !m_kofficeConfig ) {
m_kofficeConfig = new KConfig( "kofficerc" ); m_kofficeConfig = new TDEConfig( "kofficerc" );
} }
return m_kofficeConfig; return m_kofficeConfig;
} }

12
kexi/3rdparty/kolibs/koGlobal.h vendored
Unescape View File

@ -25,7 +25,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqfont.h> #include <tqfont.h>
#include <tqmap.h> #include <tqmap.h>
class KConfig; class TDEConfig;
#include <koffice_export.h> #include <koffice_export.h>
class KOFFICECORE_EXPORT KoGlobal 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, * 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 * parsed only once
*/ */
static KConfig* kofficeConfig() { static TDEConfig* kofficeConfig() {
return self()->_kofficeConfig(); return self()->_kofficeConfig();
} }
@ -87,13 +87,13 @@ private:
TQFont _defaultFont(); TQFont _defaultFont();
TQStringList _listOfLanguages(); TQStringList _listOfLanguages();
TQStringList _listOfLanguageTags(); TQStringList _listOfLanguageTags();
KConfig* _kofficeConfig(); TDEConfig* _kofficeConfig();
void createListOfLanguages(); void createListOfLanguages();
int m_pointSize; int m_pointSize;
typedef TQMap<TQString, TQString> LanguageMap; typedef TQMap<TQString, TQString> LanguageMap;
LanguageMap m_langMap; // display-name -> language tag LanguageMap m_langMap; // display-name -> language tag
KConfig* m_kofficeConfig; TDEConfig* m_kofficeConfig;
int m_dpiX; int m_dpiX;
int m_dpiY; int m_dpiY;
// No BC problem here, constructor is private, feel free to add members // No BC problem here, constructor is private, feel free to add members

4
kexi/core/kexidbshortcutfile.cpp
Unescape View File

@ -62,7 +62,7 @@ KexiDBShortcutFile::~KexiDBShortcutFile()
bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _groupKey) 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"); config.setGroup("File Information");
data.formatVersion = config.readNumEntry("version", KexiDBShortcutFile_version); 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 KexiDBShortcutFile::saveProjectData(const KexiProjectData& data,
bool savePassword, TQString* _groupKey, bool overwriteFirstGroup) 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"); config.setGroup("File Information");
uint realFormatVersion = data.formatVersion; uint realFormatVersion = data.formatVersion;

2
kexi/core/kexipartmanager.cpp
Unescape View File

@ -58,7 +58,7 @@ Manager::lookup()
KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler", KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler",
"[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION)); "[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION));
KConfig conf("kexirc", true); TDEConfig conf("kexirc", true);
conf.setGroup("Parts"); conf.setGroup("Parts");
TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order
const int size = TQMAX( tlist.count(), sl_order.count() ); const int size = TQMAX( tlist.count(), sl_order.count() );

2
kexi/core/kexitemplateloader.cpp
Unescape View File

@ -74,7 +74,7 @@ KexiTemplateInfo KexiTemplateLoader::loadInfo(const TQString& directory)
} }
if (!TQFileInfo(directory+"/info.txt").isReadable()) if (!TQFileInfo(directory+"/info.txt").isReadable())
return KexiTemplateInfo(); return KexiTemplateInfo();
KConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/); TDEConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/);
KexiTemplateInfo info; KexiTemplateInfo info;
info.name = infoTxt.readEntry("Name"); info.name = infoTxt.readEntry("Name");
if (info.name.isEmpty()) { if (info.name.isEmpty()) {

2
kexi/doc/dev/TODO-Kexi-js
Unescape View File

@ -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 - 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) - not convenient as user is forced to enlarge the window by hand (settings are stored though)
- add "File->Save All" action - 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/ + about:config-like using kconfigeditor http://extragear.kde.org/apps/kconfigeditor/
(possible reuse of koproperty) (possible reuse of koproperty)

2
kexi/doc/dev/auto_update_service.txt
Unescape View File

@ -23,7 +23,7 @@ Notes:
- First: qt-only that is used to initialize the process and check the system, independently - First: qt-only that is used to initialize the process and check the system, independently
from existing KDE sybsystem. from existing KDE sybsystem.
- Second: used when we already know we already have a working KDE subsystem. This part can use - 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 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 - 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". (maybe on top of tgz/rpm/deb/win32/mac?), "Meta Packaging".

2
kexi/kexidb/dbproperties.h
Unescape View File

@ -24,7 +24,7 @@
namespace KexiDB { namespace KexiDB {
//! @todo implement KConfigBase interface here? //! @todo implement TDEConfigBase interface here?
//! A set of storable database properties. //! A set of storable database properties.
/*! This is a convenience class that allows to store global dabatase properties without a need /*! This is a convenience class that allows to store global dabatase properties without a need

2
kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
Unescape View File

@ -98,7 +98,7 @@ tristate SQLiteVacuum::run()
const uint newSize = TQFileInfo(m_filePath).size(); const uint newSize = TQFileInfo(m_filePath).size();
const uint decrease = 100-100*newSize/origSize; const uint decrease = 100-100*newSize/origSize;
KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.") 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; return m_result;
} }

10
kexi/main/keximainwindowimpl.cpp
Unescape View File

@ -2166,7 +2166,7 @@ KexiMainWindowImpl::storeSettings()
} }
void void
KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config) KexiMainWindowImpl::restoreWindowConfiguration(TDEConfig *config)
{ {
kdDebug()<<"preparing session restoring"<<endl; kdDebug()<<"preparing session restoring"<<endl;
@ -2184,7 +2184,7 @@ KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config)
} }
void void
KexiMainWindowImpl::storeWindowConfiguration(KConfig *config) KexiMainWindowImpl::storeWindowConfiguration(TDEConfig *config)
{ {
kdDebug()<<"preparing session saving"<<endl; kdDebug()<<"preparing session saving"<<endl;
config->setGroup("MainWindow"); config->setGroup("MainWindow");
@ -2203,12 +2203,12 @@ KexiMainWindowImpl::storeWindowConfiguration(KConfig *config)
} }
void void
KexiMainWindowImpl::readProperties(KConfig *config) { KexiMainWindowImpl::readProperties(TDEConfig *config) {
restoreWindowConfiguration(config); restoreWindowConfiguration(config);
} }
void void
KexiMainWindowImpl::saveProperties(KConfig *config) KexiMainWindowImpl::saveProperties(TDEConfig *config)
{ {
storeWindowConfiguration(config); storeWindowConfiguration(config);
// m_docManager->saveDocumentList (config); // m_docManager->saveDocumentList (config);
@ -2216,7 +2216,7 @@ KexiMainWindowImpl::saveProperties(KConfig *config)
} }
void void
KexiMainWindowImpl::saveGlobalProperties( KConfig* sessionConfig ) { KexiMainWindowImpl::saveGlobalProperties( TDEConfig* sessionConfig ) {
storeWindowConfiguration(sessionConfig); storeWindowConfiguration(sessionConfig);
} }

10
kexi/main/keximainwindowimpl.h
Unescape View File

@ -106,9 +106,9 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
virtual int generatePrivateID(); virtual int generatePrivateID();
/*! Reimplemented */ /*! Reimplemented */
virtual void readProperties(KConfig *config); virtual void readProperties(TDEConfig *config);
virtual void saveProperties(KConfig *config); virtual void saveProperties(TDEConfig *config);
virtual void saveGlobalProperties( KConfig* sessionConfig ); virtual void saveGlobalProperties( TDEConfig* sessionConfig );
public slots: public slots:
/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed. /*! 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. */ /*! Updates application's caption - also shows project's name. */
void updateAppCaption(); void updateAppCaption();
void restoreWindowConfiguration(KConfig *config); void restoreWindowConfiguration(TDEConfig *config);
void storeWindowConfiguration(KConfig *config); void storeWindowConfiguration(TDEConfig *config);
virtual bool queryClose(); virtual bool queryClose();
virtual bool queryExit(); virtual bool queryExit();

2
kexi/main/keximainwindowimpl_p.h
Unescape View File

@ -413,7 +413,7 @@ void updatePropEditorDockWidthInfo() {
KexiMainWindowImpl *wnd; KexiMainWindowImpl *wnd;
KexitStatusBar *statusBar; KexitStatusBar *statusBar;
KexiProject *prj; KexiProject *prj;
KConfig *config; TDEConfig *config;
#ifndef KEXI_NO_CTXT_HELP #ifndef KEXI_NO_CTXT_HELP
KexiContextHelp *ctxHelp; KexiContextHelp *ctxHelp;
#endif #endif

4
kexi/main/printing/kexisimpleprintingengine.cpp
Unescape View File

@ -63,7 +63,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
{ {
KexiSimplePrintingSettings settings; //this will set defaults KexiSimplePrintingSettings settings; //this will set defaults
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("Simple Printing"); config->setGroup("Simple Printing");
if (config->hasKey("pageTitleFont")) if (config->hasKey("pageTitleFont"))
settings.pageTitleFont = config->readFontEntry("pageTitleFont"); settings.pageTitleFont = config->readFontEntry("pageTitleFont");
@ -95,7 +95,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
void KexiSimplePrintingSettings::save() void KexiSimplePrintingSettings::save()
{ {
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("Simple Printing"); config->setGroup("Simple Printing");
config->writeEntry( "pageTitleFont", pageTitleFont ); config->writeEntry( "pageTitleFont", pageTitleFont );
config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) ); config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) );

4
kexi/main/startup/KexiStartupFileDialog_win.cpp
Unescape View File

@ -99,8 +99,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//(js) d->autoSelectExtCheckBox = 0; // delayed loading //(js) d->autoSelectExtCheckBox = 0; // delayed loading
//TODO d->autoSelectExtChecked = false; //TODO d->autoSelectExtChecked = false;
//(js) d->urlBar = 0; // delayed loading //(js) d->urlBar = 0; // delayed loading
//TODO KConfig *config = TDEGlobal::config(); //TODO TDEConfig *config = TDEGlobal::config();
//TODO KConfigGroupSaver cs( config, ConfigGroup ); //TODO TDEConfigGroupSaver cs( config, ConfigGroup );
//TODO d->initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", //TODO d->initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
//TODO true ); //TODO true );
//TODO d->completionLock = false; //TODO d->completionLock = false;

2
kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
Unescape View File

@ -104,7 +104,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
mimename = KMimeType::findByURL(filename)->name(); mimename = KMimeType::findByURL(filename)->name();
if(mimename == "application/x-kexiproject-shortcut" || mimename == "application/x-kexi-connectiondata") { if(mimename == "application/x-kexiproject-shortcut" || mimename == "application/x-kexi-connectiondata") {
KConfig config(filename, true, false); TDEConfig config(filename, true, false);
TQString groupkey; TQString groupkey;
TQStringList groups(config.groupList()); TQStringList groups(config.groupList());
TQStringList::ConstIterator it, end( groups.constEnd() ); TQStringList::ConstIterator it, end( groups.constEnd() );

2
kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
Unescape View File

@ -89,7 +89,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender)
if(scriptaction) { if(scriptaction) {
const TQString dontAskAgainName = "askExecuteScript"; const TQString dontAskAgainName = "askExecuteScript";
KConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
TQString dontask = config->readEntry(dontAskAgainName).lower(); TQString dontask = config->readEntry(dontAskAgainName).lower();
bool exec = (dontask == "yes"); bool exec = (dontask == "yes");

2
kexi/widget/kexibrowser.cpp
Unescape View File

@ -108,7 +108,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
TQT_SLOT(slotSelectionChanged(TQListViewItem*))); TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
KConfig *config = kapp->config(); TDEConfig *config = kapp->config();
config->setGroup("MainWindow"); config->setGroup("MainWindow");
if ((m_features & SingleClickOpensItemOptionEnabled) if ((m_features & SingleClickOpensItemOptionEnabled)
&& config->readBoolEntry("SingleClickOpensItem", false)) && config->readBoolEntry("SingleClickOpensItem", false))

6
kivio/kiviopart/kiviostencilsetinstaller.cpp
Unescape View File

@ -73,7 +73,7 @@ namespace Kivio {
TQString tmpFile; 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())); KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL()));
return; return;
} }
@ -87,7 +87,7 @@ namespace Kivio {
if(dirs.isEmpty()) { if(dirs.isEmpty()) {
KMessageBox::error(this, i18n("The file is not a valid stencil set archive.")); KMessageBox::error(this, i18n("The file is not a valid stencil set archive."));
archive.close(); archive.close();
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
return; return;
} }
@ -98,7 +98,7 @@ namespace Kivio {
} }
archive.close(); archive.close();
KIO::NetAccess::removeTempFile(tmpFile); TDEIO::NetAccess::removeTempFile(tmpFile);
} }
TQStringList StencilSetInstaller::checkDirs(const KArchiveDirectory* rootDir) TQStringList StencilSetInstaller::checkDirs(const KArchiveDirectory* rootDir)

2
koshell/koshell_shell.cc
Unescape View File

@ -156,7 +156,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* )
// filter manager, ask it to convert the file to the "closest" available // filter manager, ask it to convert the file to the "closest" available
// KOffice part and open the temporary file. // 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()) ); 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 recentAction()->removeURL(url); //remove the file from the recent-opened-file-list

4
kplato/kptconfig.cc
Unescape View File

@ -38,7 +38,7 @@ Config::~Config()
void Config::load() { void Config::load() {
//kdDebug()<<k_funcinfo<<endl; //kdDebug()<<k_funcinfo<<endl;
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
/* if( config->hasGroup("Behavior")) /* if( config->hasGroup("Behavior"))
{ {
@ -66,7 +66,7 @@ void Config::save() {
if (!m_readWrite) if (!m_readWrite)
return; return;
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
// config->setGroup( "Behavior" ); // config->setGroup( "Behavior" );
// config->writeEntry("CalculationMode",m_behavior.calculationMode); // config->writeEntry("CalculationMode",m_behavior.calculationMode);

4
kplato/kptreportview.cc
Unescape View File

@ -662,7 +662,7 @@ void ReportView::getTemplateFile(const TQString &tpl) {
} }
else else
{ {
if (KIO::NetAccess::download(url,localtpl,this)) if (TDEIO::NetAccess::download(url,localtpl,this))
isTemp = true; isTemp = true;
else else
KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL())); 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); openTemplateFile(localtpl);
if (isTemp) if (isTemp)
KIO::NetAccess::removeTempFile(localtpl); TDEIO::NetAccess::removeTempFile(localtpl);
} }
} }

8
kpresenter/KPrCanvas.cpp
Unescape View File

@ -2384,7 +2384,7 @@ bool KPrCanvas::exportPage( int nPage,
} }
if( !bLocalFile ){ if( !bLocalFile ){
if( res ){ 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<int>( MM_TO_POINT( top_margin ) ) );*/ - static_cast<int>( MM_TO_POINT( top_margin ) ) );*/
} }
KConfig *config=KPrFactory::global()->config(); TDEConfig *config=KPrFactory::global()->config();
config->setGroup("Misc"); config->setGroup("Misc");
bool printNotes = config->readBoolEntry("PrintNotes", true); bool printNotes = config->readBoolEntry("PrintNotes", true);
@ -4020,7 +4020,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
TQString filename; TQString filename;
if ( !url.isLocalFile() ) { if ( !url.isLocalFile() ) {
if ( !KIO::NetAccess::download( url, filename, this ) ) if ( !TDEIO::NetAccess::download( url, filename, this ) )
continue; continue;
} else { } else {
filename = url.path(); filename = url.path();
@ -4057,7 +4057,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
setCursor( c ); setCursor( c );
} }
} }
KIO::NetAccess::removeTempFile( filename ); TDEIO::NetAccess::removeTempFile( filename );
} }
} }
else if (m_currentTextObjectView) else if (m_currentTextObjectView)

18
kpresenter/KPrConfig.h
Unescape View File

@ -28,7 +28,7 @@ class KPrView;
class KPrDocument; class KPrDocument;
class KIntNumInput; class KIntNumInput;
class KColorButton; class KColorButton;
class KConfig; class TDEConfig;
class TQCheckBox; class TQCheckBox;
class KLineEdit; class KLineEdit;
class KDoubleNumInput; class KDoubleNumInput;
@ -56,7 +56,7 @@ public:
void slotDefault(); void slotDefault();
private: private:
KPrView* m_pView; KPrView* m_pView;
KConfig* config; TDEConfig* config;
int oldNbRecentFiles; int oldNbRecentFiles;
KDoubleNumInput* indent; KDoubleNumInput* indent;
KIntNumInput* recentFiles; KIntNumInput* recentFiles;
@ -75,7 +75,7 @@ protected:
KPrView* m_pView; KPrView* m_pView;
KColorButton* bgColor; KColorButton* bgColor;
KColorButton* gridColor; KColorButton* gridColor;
KConfig* config; TDEConfig* config;
TQColor oldBgColor; TQColor oldBgColor;
TQColor oldGridColor; TQColor oldGridColor;
} ; } ;
@ -91,7 +91,7 @@ public:
private: private:
KPrView* m_pView; KPrView* m_pView;
KSpell2::ConfigWidget *m_spellConfigWidget; KSpell2::ConfigWidget *m_spellConfigWidget;
KConfig* config; TDEConfig* config;
}; };
class KPrConfigureMiscPage : public TQWidget class KPrConfigureMiscPage : public TQWidget
@ -104,7 +104,7 @@ public:
void slotDefault(); void slotDefault();
private: private:
KPrView* m_pView; KPrView* m_pView;
KConfig* config; TDEConfig* config;
KIntNumInput* m_undoRedoLimit; KIntNumInput* m_undoRedoLimit;
int m_oldNbRedo; int m_oldNbRedo;
bool m_printNotes; bool m_printNotes;
@ -131,7 +131,7 @@ private:
bool m_oldBackupFile; bool m_oldBackupFile;
TQString m_oldLanguage; TQString m_oldLanguage;
KPrView* m_pView; KPrView* m_pView;
KConfig* config; TDEConfig* config;
TQFont *font; TQFont *font;
TQLabel *fontName; TQLabel *fontName;
KIntNumInput* autoSave; KIntNumInput* autoSave;
@ -158,7 +158,7 @@ public slots:
private: private:
KPrView* m_pView; KPrView* m_pView;
KConfig* config; TDEConfig* config;
KPrPenStyleWidget *m_confPenDia; KPrPenStyleWidget *m_confPenDia;
KPrBrushProperty *m_brushProperty; KPrBrushProperty *m_brushProperty;
@ -180,7 +180,7 @@ private slots:
void slotSelectionChanged(TQListViewItem *); void slotSelectionChanged(TQListViewItem *);
private: private:
KPrView* m_pView; KPrView* m_pView;
KConfig* config; TDEConfig* config;
KListView* m_pPathView; KListView* m_pPathView;
TQPushButton *m_modifyPath; TQPushButton *m_modifyPath;
}; };
@ -196,7 +196,7 @@ public:
private slots: private slots:
void screenReaderOptionChanged(); void screenReaderOptionChanged();
private: private:
KConfig* config; TDEConfig* config;
TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakPointerWidget;
TQCheckBox* m_cbSpeakFocusWidget; TQCheckBox* m_cbSpeakFocusWidget;
TQVGroupBox* m_gbScreenReaderOptions; TQVGroupBox* m_gbScreenReaderOptions;

16
kpresenter/KPrDocument.cpp
Unescape View File

@ -158,7 +158,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
KoParagStyle* m_standardStyle = new KoParagStyle( "Standard" ); KoParagStyle* m_standardStyle = new KoParagStyle( "Standard" );
m_styleColl->addStyle( m_standardStyle ); m_styleColl->addStyle( m_standardStyle );
KConfig *config = KPrFactory::global()->config(); TDEConfig *config = KPrFactory::global()->config();
config->setGroup("Document defaults" ); config->setGroup("Document defaults" );
TQString defaultFontname=config->readEntry("DefaultFont"); TQString defaultFontname=config->readEntry("DefaultFont");
if ( !defaultFontname.isEmpty() ) if ( !defaultFontname.isEmpty() )
@ -303,11 +303,11 @@ void KPrDocument::saveConfig()
{ {
if ( !isReadWrite()) if ( !isReadWrite())
return; return;
KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
group.writeEntry( "PersonalDict", m_spellCheckPersonalDict ); group.writeEntry( "PersonalDict", m_spellCheckPersonalDict );
if ( !isEmbedded() ) if ( !isEmbedded() )
{ {
KConfig *config = KPrFactory::global()->config(); TDEConfig *config = KPrFactory::global()->config();
config->setGroup( "Interface" ); config->setGroup( "Interface" );
config->writeEntry( "Zoom", m_zoomHandler->zoom() ); config->writeEntry( "Zoom", m_zoomHandler->zoom() );
config->writeEntry( "AllowAutoFormat" , m_bAllowAutoFormat ); config->writeEntry( "AllowAutoFormat" , m_bAllowAutoFormat );
@ -322,7 +322,7 @@ void KPrDocument::saveConfig()
void KPrDocument::initConfig() void KPrDocument::initConfig()
{ {
int zoom; int zoom;
KConfig* config = KPrFactory::global()->config(); TDEConfig* config = KPrFactory::global()->config();
if( config->hasGroup("Interface") ) { if( config->hasGroup("Interface") ) {
config->setGroup( "Interface" ); config->setGroup( "Interface" );
setAutoSave( config->readNumEntry( "AutoSave", defaultAutoSave()/60 ) * 60 ); setAutoSave( config->readNumEntry( "AutoSave", defaultAutoSave()/60 ) * 60 );
@ -387,7 +387,7 @@ void KPrDocument::initConfig()
} }
// Load personal dict // Load personal dict
KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" ); m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" );
// Apply configuration, without creating an undo/redo command // 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 kdDebug(33001) << "Copying template (in KPrDocument::templateFileName)" << endl
<< " from: " << src.prettyURL() << endl << " from: " << src.prettyURL() << endl
<< " to: " << dest.prettyURL() << endl; << " to: " << dest.prettyURL() << endl;
KIO::NetAccess::file_copy( src, TDEIO::NetAccess::file_copy( src,
dest, dest,
-1, /* default permissions */ -1, /* default permissions */
true /* overwrite */ ); true /* overwrite */ );
@ -4634,7 +4634,7 @@ void KPrDocument::changeBgSpellCheckingState( bool b )
{ {
enableBackgroundSpellCheck( b ); enableBackgroundSpellCheck( b );
reactivateBgSpellChecking(); reactivateBgSpellChecking();
KConfig *config = KPrFactory::global()->config(); TDEConfig *config = KPrFactory::global()->config();
config->setGroup("KSpell kpresenter" ); config->setGroup("KSpell kpresenter" );
config->writeEntry( "SpellCheck", (int)b ); config->writeEntry( "SpellCheck", (int)b );
} }
@ -4759,7 +4759,7 @@ void KPrDocument::updateDirectCursorButton()
void KPrDocument::setInsertDirectCursor(bool _b) void KPrDocument::setInsertDirectCursor(bool _b)
{ {
m_bInsertDirectCursor=_b; m_bInsertDirectCursor=_b;
KConfig *config = KPrFactory::global()->config(); TDEConfig *config = KPrFactory::global()->config();
config->setGroup( "Interface" ); config->setGroup( "Interface" );
config->writeEntry( "InsertDirectCursor", _b ); config->writeEntry( "InsertDirectCursor", _b );
updateDirectCursorButton(); updateDirectCursorButton();

24
kpresenter/KPrMSPresentationSetup.cpp
Unescape View File

@ -84,7 +84,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
// we create the DCIM file, and then iterate through looking // we create the DCIM file, and then iterate through looking
// for the next "available" directory slot // for the next "available" directory slot
KURL str( path + "/DCIM" ); KURL str( path + "/DCIM" );
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -92,7 +92,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
for (int dirNum = 101; dirNum < 999; dirNum++) { for (int dirNum = 101; dirNum < 999; dirNum++) {
slidePath = TQString("/DCIM/%1MSPJP").arg(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; break;
} }
@ -101,20 +101,20 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
kapp->processEvents(); kapp->processEvents();
str = ( path + slidePath ); str = ( path + slidePath );
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
kapp->processEvents(); kapp->processEvents();
// now do the SPP file directory // now do the SPP file directory
str = ( path + "/MSSONY" ); str = ( path + "/MSSONY" );
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
kapp->processEvents(); kapp->processEvents();
str = ( path + "/MSSONY/PJ" ); str = ( path + "/MSSONY/PJ" );
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
@ -130,7 +130,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
KTempFile tmp; KTempFile tmp;
TQString filename = path + slidePath + "/SPJT0002.JPG"; TQString filename = path + slidePath + "/SPJT0002.JPG";
titleSlide.save( tmp.name(), "JPEG" ); 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(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -145,7 +145,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
KTempFile tmp2; KTempFile tmp2;
titleSlide.save( tmp2.name(), "JPEG" ); 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(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -168,7 +168,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar )
view->getCanvas()->exportPage( pgNum, 1023, 767, view->getCanvas()->exportPage( pgNum, 1023, 767,
tmp.name(), "JPEG" ); 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(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -266,7 +266,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
kapp->processEvents(); kapp->processEvents();
sppFile.close(); 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() void KPrMSPresentation::init()
@ -441,7 +441,7 @@ void KPrMSPresentationSetup::finish()
TQString pathname = path->lineEdit()->text(); TQString pathname = path->lineEdit()->text();
// path doesn't exist. ask user if it should be created. // 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( "<qt>The directory <b>%1</b> does not exist.<br>" TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
"Do you want create it?</qt>" ); "Do you want create it?</qt>" );
if( KMessageBox::questionYesNo( this, msg.arg( pathname ), if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
@ -450,7 +450,7 @@ void KPrMSPresentationSetup::finish()
{ {
// we are trying to create the directory // we are trying to create the directory
TQDir dir; TQDir dir;
bool ok = KIO::NetAccess::mkdir( pathname,this ); bool ok = TDEIO::NetAccess::mkdir( pathname,this );
if( !ok ) { if( !ok ) {
// then directory couldn't be created // then directory couldn't be created
KMessageBox::sorry( this, KMessageBox::sorry( this,
@ -467,7 +467,7 @@ void KPrMSPresentationSetup::finish()
} }
TQString sppFile( pathname + "/MSSONY/PJ/" + title->text() + ".SPP" ); 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, if ( KMessageBox::warningYesNo( 0,
i18n( "You are about to overwrite an existing index " i18n( "You are about to overwrite an existing index "
"file : %1.\n " "file : %1.\n "

14
kpresenter/KPrView.cpp
Unescape View File

@ -457,12 +457,12 @@ KPrView::~KPrView()
delete m_findReplace; delete m_findReplace;
m_findReplace = 0L; m_findReplace = 0L;
if(sidebar) { if(sidebar) {
KConfig *config=TDEGlobal::config(); TDEConfig *config=TDEGlobal::config();
config->setGroup("Global"); config->setGroup("Global");
config->writeEntry("Sidebar", sidebar->isVisible()); config->writeEntry("Sidebar", sidebar->isVisible());
} }
if(notebar) { if(notebar) {
KConfig *config=TDEGlobal::config(); TDEConfig *config=TDEGlobal::config();
config->setGroup("Global"); config->setGroup("Global");
config->writeEntry("Notebar", notebar->isVisible()); config->writeEntry("Notebar", notebar->isVisible());
} }
@ -771,7 +771,7 @@ void KPrView::insertPicture()
return; return;
} }
TQString file; TQString file;
if ( !KIO::NetAccess::download( url, file, this ) ) if ( !TDEIO::NetAccess::download( url, file, this ) )
{ {
m_canvas->setToolEditMode( TEM_MOUSE, false ); m_canvas->setToolEditMode( TEM_MOUSE, false );
return; return;
@ -843,10 +843,10 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
{ {
picture.save( TQT_TQIODEVICE(&file) ); picture.save( TQT_TQIODEVICE(&file) );
file.close(); file.close();
if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
{ {
KMessageBox::sorry( this, i18n( 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") ); i18n("Save Failed") );
} }
} }
@ -2231,7 +2231,7 @@ void KPrView::createGUI()
{ {
sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() ); sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() );
sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE ); sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE );
KConfig *config=TDEGlobal::config(); TDEConfig *config=TDEGlobal::config();
config->setGroup("Global"); config->setGroup("Global");
if(!config->readBoolEntry("Sidebar", true)) { if(!config->readBoolEntry("Sidebar", true)) {
sidebar->hide(); sidebar->hide();
@ -2242,7 +2242,7 @@ void KPrView::createGUI()
if ( notebar ) if ( notebar )
{ {
KConfig *config=TDEGlobal::config(); TDEConfig *config=TDEGlobal::config();
config->setGroup("Global"); config->setGroup("Global");
if(!config->readBoolEntry("Notebar", true)) { if(!config->readBoolEntry("Notebar", true)) {
notebar->hide(); notebar->hide();

16
kpresenter/KPrWebPresentation.cpp
Unescape View File

@ -269,14 +269,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
TQString cmd; TQString cmd;
int p; int p;
KURL str( path + "/html" ); KURL str( path + "/html" );
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
kapp->processEvents(); kapp->processEvents();
str = path + "/pics"; str = path + "/pics";
KIO::NetAccess::mkdir( str,( TQWidget* )0L ); TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
p = progressBar->progress(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -293,7 +293,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
srcurl.setPath( locate( "slideshow", filename, KPrFactory::global() ) ); srcurl.setPath( locate( "slideshow", filename, KPrFactory::global() ) );
desturl = path; desturl = path;
desturl.addPath( "/pics/" + filename ); 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(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
kapp->processEvents(); kapp->processEvents();
@ -315,7 +315,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
KTempFile tmp; KTempFile tmp;
pix.save( tmp.name(), "PNG" ); 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(); p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -520,7 +520,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
file.close(); 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(); int p = progressBar->progress();
progressBar->setProgress( ++p ); progressBar->setProgress( ++p );
@ -567,7 +567,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
streamOut << "</body>\n</html>\n"; streamOut << "</body>\n</html>\n";
file.close(); 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() ); progressBar->setProgress( progressBar->totalSteps() );
@ -1077,7 +1077,7 @@ void KPrWebPresentationWizard::pageChanged()
TQString pathname = path->lineEdit()->text(); TQString pathname = path->lineEdit()->text();
// path doesn't exist. ask user if it should be created. // 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( "<qt>The directory <b>%1</b> does not exist.<br>" TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
"Do you want create it?</qt>" ); "Do you want create it?</qt>" );
@ -1085,7 +1085,7 @@ void KPrWebPresentationWizard::pageChanged()
i18n( "Directory Not Found" ) ) i18n( "Directory Not Found" ) )
== KMessageBox::Yes) == KMessageBox::Yes)
{ {
bool ok = KIO::NetAccess::mkdir( pathname, this ); bool ok = TDEIO::NetAccess::mkdir( pathname, this );
if( !ok ) if( !ok )
{ {
KMessageBox::sorry( this, KMessageBox::sorry( this,

4
kspread/dialogs/kspread_dlg_list.h
Unescape View File

@ -30,7 +30,7 @@ class TQLineEdit;
class TQMultiLineEdit; class TQMultiLineEdit;
class TQPushButton; class TQPushButton;
class KConfig; class TDEConfig;
namespace KSpread namespace KSpread
{ {
@ -55,7 +55,7 @@ public slots:
void slotCopy(); void slotCopy();
protected: protected:
KConfig *config; TDEConfig *config;
TQListBox * list; TQListBox * list;
TQMultiLineEdit *entryList; TQMultiLineEdit *entryList;

14
kspread/dialogs/kspread_dlg_preference.h
Unescape View File

@ -29,7 +29,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
class KConfig; class TDEConfig;
class KIntNumInput; class KIntNumInput;
class KDoubleNumInput; class KDoubleNumInput;
class KSpellConfig; class KSpellConfig;
@ -88,7 +88,7 @@ protected:
TQCheckBox *m_createBackupFile; TQCheckBox *m_createBackupFile;
bool m_oldBackupFile; bool m_oldBackupFile;
KConfig* config; TDEConfig* config;
int oldRecent; int oldRecent;
int oldAutoSaveValue; int oldAutoSaveValue;
} ; } ;
@ -116,7 +116,7 @@ protected:
* Needed to ensure the same unit for loading and saving. * Needed to ensure the same unit for loading and saving.
*/ */
KoUnit::Unit indentUnit; KoUnit::Unit indentUnit;
KConfig* config; TDEConfig* config;
TQComboBox *typeCompletion; TQComboBox *typeCompletion;
TQComboBox *typeCalc; TQComboBox *typeCalc;
TQComboBox *typeOfMove; TQComboBox *typeOfMove;
@ -138,7 +138,7 @@ protected:
View* m_pView; View* m_pView;
KColorButton* gridColor; KColorButton* gridColor;
KColorButton* pageBorderColor; KColorButton* pageBorderColor;
KConfig* config; TDEConfig* config;
} ; } ;
class configureLayoutPage : public TQObject class configureLayoutPage : public TQObject
@ -160,7 +160,7 @@ protected:
int orientation; int orientation;
int unit; int unit;
KConfig* config; TDEConfig* config;
} ; } ;
class configureSpellPage : public TQObject class configureSpellPage : public TQObject
@ -173,7 +173,7 @@ public:
void slotDefault(); void slotDefault();
protected: protected:
View * m_pView; View * m_pView;
KConfig * config; TDEConfig * config;
KSpellConfig *m_spellConfigWidget; KSpellConfig *m_spellConfigWidget;
TQCheckBox *dontCheckUpperWord; TQCheckBox *dontCheckUpperWord;
TQCheckBox *dontCheckTitleCase; TQCheckBox *dontCheckTitleCase;
@ -190,7 +190,7 @@ public:
private slots: private slots:
void screenReaderOptionChanged(); void screenReaderOptionChanged();
private: private:
KConfig* config; TDEConfig* config;
TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakPointerWidget;
TQCheckBox* m_cbSpeakFocusWidget; TQCheckBox* m_cbSpeakFocusWidget;
TQVGroupBox* m_gbScreenReaderOptions; TQVGroupBox* m_gbScreenReaderOptions;

2
kspread/dialogs/kspread_dlg_sort.cc
Unescape View File

@ -303,7 +303,7 @@ void SortDialog::init()
lst<<i18n("Saturday"); lst<<i18n("Saturday");
lst<<i18n("Sunday"); lst<<i18n("Sunday");
KConfig * config = Factory::global()->config(); TDEConfig * config = Factory::global()->config();
config->setGroup( "Parameters" ); config->setGroup( "Parameters" );
TQStringList other = config->readListEntry("Other list"); TQStringList other = config->readListEntry("Other list");
TQString tmp; TQString tmp;

2
kspread/kspread_autofill.cc
Unescape View File

@ -201,7 +201,7 @@ AutoFillSequenceItem::AutoFillSequenceItem( const TQString &_str )
if( other==0L) if( other==0L)
{ {
// other=new TQStringList(); // other=new TQStringList();
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
config->setGroup( "Parameters" ); config->setGroup( "Parameters" );
other=new TQStringList(config->readListEntry("Other list")); other=new TQStringList(config->readListEntry("Other list"));
} }

12
kspread/kspread_doc.cc
Unescape View File

@ -284,7 +284,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
if (flags==KoDocument::InitDocEmpty) if (flags==KoDocument::InitDocEmpty)
{ {
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
int _page=1; int _page=1;
if( config->hasGroup("Parameters" )) if( config->hasGroup("Parameters" ))
{ {
@ -329,7 +329,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
if ( ret == KoTemplateChooseDia::Empty ) if ( ret == KoTemplateChooseDia::Empty )
{ {
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
int _page=1; int _page=1;
if( config->hasGroup("Parameters" )) if( config->hasGroup("Parameters" ))
{ {
@ -377,7 +377,7 @@ void Doc::openTemplate (const TQString& file)
void Doc::initEmpty() void Doc::initEmpty()
{ {
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
int _page=1; int _page=1;
if( config->hasGroup("Parameters" )) if( config->hasGroup("Parameters" ))
{ {
@ -434,7 +434,7 @@ void Doc::saveConfig()
{ {
if ( isEmbedded() ||!isReadWrite()) if ( isEmbedded() ||!isReadWrite())
return; return;
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
config->setGroup( "Parameters" ); config->setGroup( "Parameters" );
config->writeEntry( "Zoom", m_zoom ); config->writeEntry( "Zoom", m_zoom );
@ -442,7 +442,7 @@ void Doc::saveConfig()
void Doc::initConfig() void Doc::initConfig()
{ {
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
if( config->hasGroup("KSpread Page Layout" )) if( config->hasGroup("KSpread Page Layout" ))
{ {
@ -1478,7 +1478,7 @@ KSpellConfig * Doc::getKSpellConfig()
{ {
KSpellConfig ksconfig; KSpellConfig ksconfig;
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
if( config->hasGroup("KSpell kspread" ) ) if( config->hasGroup("KSpell kspread" ) )
{ {
config->setGroup( "KSpell kspread" ); config->setGroup( "KSpell kspread" );

2
kspread/kspread_view.cc
Unescape View File

@ -2099,7 +2099,7 @@ Sheet* View::activeSheet()
void View::initConfig() void View::initConfig()
{ {
KConfig *config = Factory::global()->config(); TDEConfig *config = Factory::global()->config();
if ( config->hasGroup("Parameters" )) if ( config->hasGroup("Parameters" ))
{ {
config->setGroup( "Parameters" ); config->setGroup( "Parameters" );

4
kspread/plugins/calculator/kcalc.cpp
Unescape View File

@ -1587,7 +1587,7 @@ void TQtCalculator::readSettings()
TQColor tmpC(189, 255, 180); TQColor tmpC(189, 255, 180);
TQColor blackC(0,0,0); TQColor blackC(0,0,0);
KConfig *config = TDEGlobal::config(); TDEConfig *config = TDEGlobal::config();
config->setGroup("CalcPlugin"); config->setGroup("CalcPlugin");
kcalcdefaults.forecolor = config->readColorEntry("ForeColor", &blackC); kcalcdefaults.forecolor = config->readColorEntry("ForeColor", &blackC);
kcalcdefaults.backcolor = config->readColorEntry("BackColor", &tmpC); kcalcdefaults.backcolor = config->readColorEntry("BackColor", &tmpC);
@ -1606,7 +1606,7 @@ void TQtCalculator::readSettings()
void TQtCalculator::writeSettings() void TQtCalculator::writeSettings()
{ {
KConfig *config = TDEGlobal::config(); TDEConfig *config = TDEGlobal::config();
config->setGroup("CalcPlugin"); config->setGroup("CalcPlugin");
config->writeEntry("ForeColor",kcalcdefaults.forecolor); config->writeEntry("ForeColor",kcalcdefaults.forecolor);

8
kugar/part/kugar_part.cpp
Unescape View File

@ -163,7 +163,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
KURL tmpURL( m_docURL ); KURL tmpURL( m_docURL );
tmpURL.setFileName( "" ); tmpURL.setFileName( "" );
tmpURL.addPath( tpl ); tmpURL.addPath( tpl );
if ( KIO::NetAccess::download( tmpURL, localtpl ) ) if ( TDEIO::NetAccess::download( tmpURL, localtpl ) )
isTemp = true; isTemp = true;
else else
KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); 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 ); KURL tmpURL( m_docURL );
tmpURL.setFileName( "" ); tmpURL.setFileName( "" );
tmpURL.addPath( tpl ); tmpURL.addPath( tpl );
if ( KIO::NetAccess::download( tmpURL, localtpl ) ) if ( TDEIO::NetAccess::download( tmpURL, localtpl ) )
isTemp = true; isTemp = true;
else else
KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
@ -189,7 +189,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
} }
else else
{ {
if ( KIO::NetAccess::download( url, localtpl ) ) if ( TDEIO::NetAccess::download( url, localtpl ) )
isTemp = true; isTemp = true;
else else
KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); 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 ) ); KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) );
if ( isTemp ) if ( isTemp )
KIO::NetAccess::removeTempFile( localtpl ); TDEIO::NetAccess::removeTempFile( localtpl );
} }
} }

4
kword/KWCanvas.cpp
Unescape View File

@ -1526,7 +1526,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e )
const KURL &url( *it ); const KURL &url( *it );
TQString filename; TQString filename;
if ( !KIO::NetAccess::download( url, filename, this ) ) if ( !TDEIO::NetAccess::download( url, filename, this ) )
continue; continue;
KMimeType::Ptr res = KMimeType::findByFileContent( filename ); KMimeType::Ptr res = KMimeType::findByFileContent( filename );
@ -1542,7 +1542,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e )
insertPictureDirect( newKoPicture, docPoint ); insertPictureDirect( newKoPicture, docPoint );
} }
} }
KIO::NetAccess::removeTempFile( filename ); TDEIO::NetAccess::removeTempFile( filename );
} }
} }
else else

14
kword/KWConfig.h
Unescape View File

@ -30,7 +30,7 @@ class KWView;
class TQCheckBox; class TQCheckBox;
class KIntNumInput; class KIntNumInput;
class KoUnitDoubleSpinBox; class KoUnitDoubleSpinBox;
class KConfig; class TDEConfig;
class TQComboBox; class TQComboBox;
class KIntNumInput; class KIntNumInput;
class KCommand; class KCommand;
@ -53,7 +53,7 @@ public:
void slotDefault(); void slotDefault();
private: private:
KWView* m_pView; KWView* m_pView;
KConfig* config; TDEConfig* config;
KSpell2::ConfigWidget *m_spellConfigWidget; KSpell2::ConfigWidget *m_spellConfigWidget;
}; };
@ -72,7 +72,7 @@ signals:
void unitChanged( int ); void unitChanged( int );
private: private:
KWView* m_pView; KWView* m_pView;
KConfig* config; TDEConfig* config;
TQComboBox *m_unitCombo; TQComboBox *m_unitCombo;
KoUnitDoubleSpinBox* gridX,*gridY; KoUnitDoubleSpinBox* gridX,*gridY;
KoUnitDoubleSpinBox* indent; KoUnitDoubleSpinBox* indent;
@ -93,7 +93,7 @@ public:
void setUnit( KoUnit::Unit unit ); void setUnit( KoUnit::Unit unit );
private: private:
KWView* m_pView; KWView* m_pView;
KConfig* config; TDEConfig* config;
KIntNumInput* m_undoRedoLimit; KIntNumInput* m_undoRedoLimit;
int m_oldNbRedo; int m_oldNbRedo;
bool m_oldFormattingEndParag, m_oldFormattingSpace, m_oldFormattingTabs, m_oldFormattingBreak; bool m_oldFormattingEndParag, m_oldFormattingSpace, m_oldFormattingTabs, m_oldFormattingBreak;
@ -116,7 +116,7 @@ public slots:
void selectNewDefaultFont(); void selectNewDefaultFont();
private: private:
KWView* m_pView; KWView* m_pView;
KConfig* config; TDEConfig* config;
TQFont *font; TQFont *font;
TQLabel *fontName; TQLabel *fontName;
TQLabel *tabStop; TQLabel *tabStop;
@ -153,7 +153,7 @@ private slots:
void slotSelectionChanged(TQListViewItem *); void slotSelectionChanged(TQListViewItem *);
private: private:
KWView* m_pView; KWView* m_pView;
KConfig* config; TDEConfig* config;
KListView* m_pPathView; KListView* m_pPathView;
TQPushButton *m_modifyPath; TQPushButton *m_modifyPath;
}; };
@ -169,7 +169,7 @@ public:
private slots: private slots:
void screenReaderOptionChanged(); void screenReaderOptionChanged();
private: private:
KConfig* config; TDEConfig* config;
TQCheckBox* m_cbSpeakPointerWidget; TQCheckBox* m_cbSpeakPointerWidget;
TQCheckBox* m_cbSpeakFocusWidget; TQCheckBox* m_cbSpeakFocusWidget;
TQVGroupBox* m_gbScreenReaderOptions; TQVGroupBox* m_gbScreenReaderOptions;

14
kword/KWDocument.cpp
Unescape View File

@ -257,7 +257,7 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa
initConfig(); initConfig();
// Get default font from the KWord config file // Get default font from the KWord config file
KConfig *config = KWFactory::instance()->config(); TDEConfig *config = KWFactory::instance()->config();
config->setGroup("Document defaults" ); config->setGroup("Document defaults" );
TQString defaultFontname=config->readEntry("DefaultFont"); TQString defaultFontname=config->readEntry("DefaultFont");
if ( !defaultFontname.isEmpty() ) if ( !defaultFontname.isEmpty() )
@ -314,7 +314,7 @@ KWDocument::~KWDocument()
void KWDocument::initConfig() void KWDocument::initConfig()
{ {
KConfig *config = KWFactory::instance()->config(); TDEConfig *config = KWFactory::instance()->config();
if( config->hasGroup("KSpell kword" ) ) if( config->hasGroup("KSpell kword" ) )
{ {
config->setGroup( "KSpell kword" ); config->setGroup( "KSpell kword" );
@ -411,7 +411,7 @@ void KWDocument::initConfig()
} }
// Load personal dict // Load personal dict
KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" ); m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" );
} }
@ -419,14 +419,14 @@ void KWDocument::saveConfig()
{ {
if ( !isReadWrite() ) if ( !isReadWrite() )
return; return;
KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" ); TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
group.writeEntry( "PersonalDict", m_spellCheckPersonalDict ); group.writeEntry( "PersonalDict", m_spellCheckPersonalDict );
if ( !isEmbedded() ) if ( !isEmbedded() )
{ {
// Only save the config that is manipulated by the UI directly. // Only save the config that is manipulated by the UI directly.
// The config from the config dialog is saved by the dialog itself. // 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->setGroup( "Interface" );
config->writeEntry( "ViewFormattingChars", m_viewFormattingChars ); config->writeEntry( "ViewFormattingChars", m_viewFormattingChars );
config->writeEntry( "ViewFormattingBreaks", m_viewFormattingBreak ); config->writeEntry( "ViewFormattingBreaks", m_viewFormattingBreak );
@ -5135,7 +5135,7 @@ void KWDocument::changeBgSpellCheckingState( bool b )
{ {
enableBackgroundSpellCheck( b ); enableBackgroundSpellCheck( b );
reactivateBgSpellChecking(); reactivateBgSpellChecking();
KConfig *config = KWFactory::instance()->config(); TDEConfig *config = KWFactory::instance()->config();
config->setGroup("KSpell kword" ); config->setGroup("KSpell kword" );
config->writeEntry( "SpellCheck", (int)b ); config->writeEntry( "SpellCheck", (int)b );
} }
@ -5340,7 +5340,7 @@ void KWDocument::updateDirectCursorButton()
void KWDocument::setInsertDirectCursor(bool b) void KWDocument::setInsertDirectCursor(bool b)
{ {
m_bInsertDirectCursor=b; m_bInsertDirectCursor=b;
KConfig *config = KWFactory::instance()->config(); TDEConfig *config = KWFactory::instance()->config();
config->setGroup( "Interface" ); config->setGroup( "Interface" );
config->writeEntry( "InsertDirectCursor", b ); config->writeEntry( "InsertDirectCursor", b );
updateDirectCursorButton(); updateDirectCursorButton();

4
kword/KWView.cpp
Unescape View File

@ -6141,10 +6141,10 @@ void KWView::savePicture()
{ {
picture.save( TQT_TQIODEVICE(&file) ); picture.save( TQT_TQIODEVICE(&file) );
file.close(); file.close();
if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
{ {
KMessageBox::sorry( this, i18n( 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") ); i18n("Save Failed") );
} }
} }

6
kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
Unescape View File

@ -60,7 +60,7 @@ void KWQtSqlMailMergeOpen::savedPropertiesChanged(const TQString& name)
{ {
if (name!=i18n("<not saved>")) if (name!=i18n("<not saved>"))
{ {
KConfig conf("kwmailmergerc"); TDEConfig conf("kwmailmergerc");
conf.setGroup("KWSLTQTDB:"+name); conf.setGroup("KWSLTQTDB:"+name);
widget->hostname->setText(conf.readEntry("hostname","")); widget->hostname->setText(conf.readEntry("hostname",""));
widget->username->setText(conf.readEntry("username","")); widget->username->setText(conf.readEntry("username",""));
@ -82,7 +82,7 @@ void KWQtSqlMailMergeOpen::fillSavedProperties()
widget->savedProperties->clear(); widget->savedProperties->clear();
widget->savedProperties->insertItem(i18n("<not saved>")); widget->savedProperties->insertItem(i18n("<not saved>"));
//Read data from configuration file and add entries //Read data from configuration file and add entries
KConfig conf("kwmailmergerc"); TDEConfig conf("kwmailmergerc");
TQStringList list=conf.groupList(); TQStringList list=conf.groupList();
for (TQStringList::Iterator it=list.begin();it!=list.end();++it) 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"<<endl; if (value.isEmpty()) kdDebug()<<"Name value was empty"<<endl;
if ((ok) && (!value.isEmpty())) if ((ok) && (!value.isEmpty()))
{ {
KConfig conf("kwmailmergerc"); TDEConfig conf("kwmailmergerc");
conf.setGroup("KWSLTQTDB:"+value); conf.setGroup("KWSLTQTDB:"+value);
conf.writeEntry("hostname",widget->hostname->text()); conf.writeEntry("hostname",widget->hostname->text());
conf.writeEntry("username",widget->username->text()); conf.writeEntry("username",widget->username->text());

2
lib/kformula/contextstyle.cc
Unescape View File

@ -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" ); config->setGroup( "kformula Font" );
TQString fontName = config->readEntry( "defaultFont", "Times,12,-1,5,50,1,0,0,0,0" ); TQString fontName = config->readEntry( "defaultFont", "Times,12,-1,5,50,1,0,0,0,0" );

2
lib/kformula/contextstyle.h
Unescape View File

@ -93,7 +93,7 @@ public:
* installation. Mark as false when this is not intended (i. e. creating * installation. Mark as false when this is not intended (i. e. creating
* configuration dialog from another component) * 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; } bool edit() const { return m_edit; }
void setEdit( bool e ) { m_edit = e; } void setEdit( bool e ) { m_edit = e; }

12
lib/kformula/fontstyle.cc
Unescape View File

@ -118,21 +118,21 @@ void FontStyle::installFonts()
for (TQStringList::iterator it = missing.begin(); it != missing.end(); ++it) for (TQStringList::iterator it = missing.begin(); it != missing.end(); ++it)
{ {
if ( *it == "arev sans" ) { 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")); 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")); 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")); 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")); urlList.append(locate("data", "kformula/fonts/ArevBI.ttf"));
} }
else { 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")); urlList.append(locate("data", "kformula/fonts/" + *it + ".ttf"));
} }
} }
KIO::copy(urlList, "fonts:/Personal/", false); TDEIO::copy(urlList, "fonts:/Personal/", false);
KMessageBox::information(tqApp->mainWidget(), 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")); 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"));
} }

4
lib/kformula/kformulaconfigpage.cc
Unescape View File

@ -53,7 +53,7 @@
KFORMULA_NAMESPACE_BEGIN 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 ) : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false )
{ {
const ContextStyle& contextStyle = document->getContextStyle( true ); const ContextStyle& contextStyle = document->getContextStyle( true );
@ -342,7 +342,7 @@ void ConfigurePage::slotChanged()
// } // }
// MathFontsConfigurePage::MathFontsConfigurePage( Document* document, TQWidget* view, // 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 ) // : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config )
// { // {
// TQWidget* fontWidget = new TQWidget( box ); // TQWidget* fontWidget = new TQWidget( box );

10
lib/kformula/kformulaconfigpage.h
Unescape View File

@ -39,7 +39,7 @@ class TQStringList;
class TQWidget; class TQWidget;
class KColorButton; class KColorButton;
class KConfig; class TDEConfig;
class KListView; class KListView;
class KPushButton; class KPushButton;
class KIntNumInput; class KIntNumInput;
@ -55,7 +55,7 @@ class KOFORMULA_EXPORT ConfigurePage : public TQObject
public: 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 apply();
void slotDefault(); void slotDefault();
@ -83,7 +83,7 @@ private:
Document* m_document; Document* m_document;
TQWidget* m_view; TQWidget* m_view;
KConfig* m_config; TDEConfig* m_config;
TQFont defaultFont; TQFont defaultFont;
TQFont nameFont; TQFont nameFont;
@ -114,7 +114,7 @@ private:
// //
// public: // 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 apply();
// void slotDefault(); // void slotDefault();
@ -133,7 +133,7 @@ private:
// Document* m_document; // Document* m_document;
// TQWidget* m_view; // TQWidget* m_view;
// KConfig* m_config; // TDEConfig* m_config;
// KListView* availableFonts; // KListView* availableFonts;
// KListView* requestedFonts; // KListView* requestedFonts;

2
lib/kformula/kformuladocument.cc
Unescape View File

@ -368,7 +368,7 @@ void Document::introduceWrapper( DocumentWrapper* wrapper, bool init )
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
DocumentWrapper::DocumentWrapper( KConfig* config, DocumentWrapper::DocumentWrapper( TDEConfig* config,
KActionCollection* collection, KActionCollection* collection,
KoCommandHistory* history ) KoCommandHistory* history )
: m_document( 0 ), : m_document( 0 ),

6
lib/kformula/kformuladocument.h
Unescape View File

@ -295,12 +295,12 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject {
public: public:
DocumentWrapper( KConfig* config, DocumentWrapper( TDEConfig* config,
KActionCollection* collection, KActionCollection* collection,
KoCommandHistory* history = 0 ); KoCommandHistory* history = 0 );
~DocumentWrapper(); ~DocumentWrapper();
KConfig* config() { return m_config; } TDEConfig* config() { return m_config; }
KoCommandHistory* history() { return m_history; } KoCommandHistory* history() { return m_history; }
/** /**
@ -495,7 +495,7 @@ private:
SymbolType m_rightBracketChar; SymbolType m_rightBracketChar;
TQString m_selectedName; TQString m_selectedName;
KConfig* m_config; TDEConfig* m_config;
KoCommandHistory* m_history; KoCommandHistory* m_history;
/** /**

2
lib/kformula/symboltable.h
Unescape View File

@ -30,7 +30,7 @@
#include "kformuladefs.h" #include "kformuladefs.h"
class KConfig; class TDEConfig;
KFORMULA_NAMESPACE_BEGIN KFORMULA_NAMESPACE_BEGIN

20
lib/kofficecore/KoDetailsPane.cpp
Unescape View File

@ -97,7 +97,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
KGuiItem openGItem(i18n("Use This Template")); KGuiItem openGItem(i18n("Use This Template"));
m_openButton->setGuiItem(openGItem); m_openButton->setGuiItem(openGItem);
m_documentList->header()->hide(); m_documentList->header()->hide();
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName"); TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName");
d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate"); d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate");
connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked())); connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked()));
@ -173,7 +173,7 @@ void KoTemplatesPane::openTemplate()
void KoTemplatesPane::openTemplate(TQListViewItem* item) void KoTemplatesPane::openTemplate(TQListViewItem* item)
{ {
if(item) { if(item) {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writePathEntry("FullTemplateName", item->text(2)); cfgGrp.writePathEntry("FullTemplateName", item->text(2));
cfgGrp.writeEntry("LastReturnType", "Template"); cfgGrp.writeEntry("LastReturnType", "Template");
cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate); cfgGrp.writeEntry("AlwaysUseTemplate", d->m_alwaysUseTemplate);
@ -199,7 +199,7 @@ void KoTemplatesPane::alwaysUseClicked()
TQListViewItem* item = m_documentList->selectedItem(); TQListViewItem* item = m_documentList->selectedItem();
if(!m_alwaysUseCheckBox->isChecked()) { if(!m_alwaysUseCheckBox->isChecked()) {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writeEntry("AlwaysUseTemplate", TQString()); cfgGrp.writeEntry("AlwaysUseTemplate", TQString());
d->m_alwaysUseTemplate = TQString(); d->m_alwaysUseTemplate = TQString();
} else { } else {
@ -264,7 +264,7 @@ class KoRecentDocumentsPanePrivate
m_previewJob->kill(); m_previewJob->kill();
} }
KIO::PreviewJob* m_previewJob; TDEIO::PreviewJob* m_previewJob;
TDEInstance* m_instance; TDEInstance* m_instance;
}; };
@ -346,9 +346,9 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst
m_documentList->setSelected(m_documentList->firstChild(), true); 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&)), connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
this, TQT_SLOT(updatePreview(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<KoFileListItem*>(item)->fileItem(); KFileItem* fileItem = static_cast<KoFileListItem*>(item)->fileItem();
TQString details = "<center><table border=\"0\">"; TQString details = "<center><table border=\"0\">";
details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>") details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>")
.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", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>") details += i18n("File access date and time. %1 is date time", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>")
.arg(fileItem->timeString(KIO::UDS_ACCESS_TIME)); .arg(fileItem->timeString(TDEIO::UDS_ACCESS_TIME));
details += "</table></center>"; details += "</table></center>";
m_detailsLabel->setText(details); m_detailsLabel->setText(details);
} else { } else {
@ -393,14 +393,14 @@ void KoRecentDocumentsPane::openFile()
void KoRecentDocumentsPane::openFile(TQListViewItem* item) void KoRecentDocumentsPane::openFile(TQListViewItem* item)
{ {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writeEntry("LastReturnType", "File"); cfgGrp.writeEntry("LastReturnType", "File");
if(item) if(item)
emit openFile(item->text(1)); emit openFile(item->text(1));
} }
void KoRecentDocumentsPane::previewResult(KIO::Job* job) void KoRecentDocumentsPane::previewResult(TDEIO::Job* job)
{ {
if(d->m_previewJob == job) if(d->m_previewJob == job)
d->m_previewJob = 0; d->m_previewJob = 0;

4
lib/kofficecore/KoDetailsPane.h
Unescape View File

@ -32,7 +32,7 @@ class KoRichTextListItemPrivate;
class KFileItem; class KFileItem;
class TQPixmap; class TQPixmap;
namespace KIO { namespace TDEIO {
class Job; class Job;
} }
@ -122,7 +122,7 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase
void openFile(); void openFile();
void openFile(TQListViewItem* item); void openFile(TQListViewItem* item);
void previewResult(KIO::Job* job); void previewResult(TDEIO::Job* job);
void updatePreview(const KFileItem* fileItem, const TQPixmap& preview); void updatePreview(const KFileItem* fileItem, const TQPixmap& preview);
void changePalette(); void changePalette();

12
lib/kofficecore/KoDocument.cpp
Unescape View File

@ -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 // A way to 'fix' the job's window, since we have no widget known to KParts
if ( !singleViewMode ) 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() KoDocument::~KoDocument()
@ -393,8 +393,8 @@ bool KoDocument::saveFile()
if ( url().isLocalFile() ) if ( url().isLocalFile() )
KSaveFile::backupFile( url().path(), d->m_backupPath ); KSaveFile::backupFile( url().path(), d->m_backupPath );
else { else {
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
if ( KIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup if ( TDEIO::NetAccess::stat( url(), entry, shells().current() ) ) { // this file exists => backup
emit sigStatusBarMessage( i18n("Making backup...") ); emit sigStatusBarMessage( i18n("Making backup...") );
KURL backup; KURL backup;
if ( d->m_backupPath.isEmpty()) if ( d->m_backupPath.isEmpty())
@ -404,7 +404,7 @@ bool KoDocument::saveFile()
backup.setPath( backup.path() + TQString::fromLatin1("~") ); backup.setPath( backup.path() + TQString::fromLatin1("~") );
KFileItem item( entry, url() ); KFileItem item( entry, url() );
Q_ASSERT( item.name() == url().fileName() ); 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; 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 ) if ( job )
{ {
@ -2545,7 +2545,7 @@ TQString KoDocument::unitName() const
void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow ) void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow )
{ {
if(!alwaysShow) { if(!alwaysShow) {
KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" ); TDEConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" );
TQString fullTemplateName = cfgGrp.readPathEntry( "AlwaysUseTemplate" ); TQString fullTemplateName = cfgGrp.readPathEntry( "AlwaysUseTemplate" );
if( !fullTemplateName.isEmpty() ) { if( !fullTemplateName.isEmpty() ) {

4
lib/kofficecore/KoDocument.h
Unescape View File

@ -1123,7 +1123,7 @@ protected:
/** /**
* Creates the open widget showed at application start up. * Creates the open widget showed at application start up.
* @param parent the parent widget * @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. * @param templateType the template-type (group) that should be selected on creation.
* @since 1.5 * @since 1.5
*/ */
@ -1134,7 +1134,7 @@ private slots:
void slotChildChanged( KoChild *c ); void slotChildChanged( KoChild *c );
void slotChildDestroyed(); void slotChildDestroyed();
void slotAutoSave(); void slotAutoSave();
void slotStarted( KIO::Job* ); void slotStarted( TDEIO::Job* );
void startCustomDocument(); void startCustomDocument();
/** /**
* Removes the open widget showed at application start up. * Removes the open widget showed at application start up.

6
lib/kofficecore/KoDocumentInfo.cpp
Unescape View File

@ -217,9 +217,9 @@ KoDocumentInfoAuthor::~KoDocumentInfoAuthor()
} }
void KoDocumentInfoAuthor::initParameters() void KoDocumentInfoAuthor::initParameters()
{ {
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
if ( config->hasGroup( "Author" ) ) { if ( config->hasGroup( "Author" ) ) {
KConfigGroupSaver cgs( config, "Author" ); TDEConfigGroupSaver cgs( config, "Author" );
m_telephoneHome=config->readEntry( "telephone" ); m_telephoneHome=config->readEntry( "telephone" );
m_telephoneWork=config->readEntry( "telephone-work" ); m_telephoneWork=config->readEntry( "telephone-work" );
m_fax=config->readEntry( "fax" ); m_fax=config->readEntry( "fax" );
@ -229,7 +229,7 @@ void KoDocumentInfoAuthor::initParameters()
m_street=config->readEntry( "street" ); m_street=config->readEntry( "street" );
} }
m_emailCfg = new KConfig( "emaildefaults", true ); m_emailCfg = new TDEConfig( "emaildefaults", true );
m_emailCfg->setGroup( "Defaults" ); m_emailCfg->setGroup( "Defaults" );
TQString group = m_emailCfg->readEntry("Profile","Default"); TQString group = m_emailCfg->readEntry("Profile","Default");
m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group)); m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group));

2
lib/kofficecore/KoDocumentInfo.h
Unescape View File

@ -131,7 +131,7 @@ private:
TQString m_street; TQString m_street;
TQString m_initial; TQString m_initial;
TQString m_position; TQString m_position;
KConfig *m_emailCfg; TDEConfig *m_emailCfg;
}; };
class KOFFICECORE_EXPORT KoDocumentInfoAbout : public KoDocumentInfoPage class KOFFICECORE_EXPORT KoDocumentInfoAbout : public KoDocumentInfoPage

4
lib/kofficecore/KoDocumentInfoDlg.cpp
Unescape View File

@ -346,8 +346,8 @@ void KoDocumentInfoDlg::save( KoDocumentInfoAuthor *authorInfo )
authorInfo->setStreet( d->m_authorWidget->leStreet->text() ); authorInfo->setStreet( d->m_authorWidget->leStreet->text() );
authorInfo->setPosition( d->m_authorWidget->leAuthorPosition->text() ); authorInfo->setPosition( d->m_authorWidget->leAuthorPosition->text() );
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
KConfigGroupSaver cgs( config, "Author" ); TDEConfigGroupSaver cgs( config, "Author" );
config->writeEntry("telephone", d->m_authorWidget->leTelephoneHome->text()); config->writeEntry("telephone", d->m_authorWidget->leTelephoneHome->text());
config->writeEntry("telephone-work", d->m_authorWidget->leTelephoneWork->text()); config->writeEntry("telephone-work", d->m_authorWidget->leTelephoneWork->text());
config->writeEntry("fax", d->m_authorWidget->leFax->text()); config->writeEntry("fax", d->m_authorWidget->leFax->text());

6
lib/kofficecore/KoGlobal.cpp
Unescape View File

@ -111,7 +111,7 @@ TQStringList KoGlobal::_listOfLanguages()
void KoGlobal::createListOfLanguages() 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 // Note that we could also use KLocale::allLanguagesTwoAlpha
TQMap<TQString, bool> seenLanguages; TQMap<TQString, bool> seenLanguages;
@ -188,10 +188,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag )
return langTag; return langTag;
} }
KConfig* KoGlobal::_kofficeConfig() TDEConfig* KoGlobal::_kofficeConfig()
{ {
if ( !m_kofficeConfig ) { if ( !m_kofficeConfig ) {
m_kofficeConfig = new KConfig( "kofficerc" ); m_kofficeConfig = new TDEConfig( "kofficerc" );
} }
return m_kofficeConfig; return m_kofficeConfig;
} }

12
lib/kofficecore/KoGlobal.h
Unescape View File

@ -25,7 +25,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqfont.h> #include <tqfont.h>
#include <tqmap.h> #include <tqmap.h>
class KConfig; class TDEConfig;
#include <koffice_export.h> #include <koffice_export.h>
class KOFFICECORE_EXPORT KoGlobal 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, * 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 * parsed only once
*/ */
static KConfig* kofficeConfig() { static TDEConfig* kofficeConfig() {
return self()->_kofficeConfig(); return self()->_kofficeConfig();
} }
@ -87,13 +87,13 @@ private:
TQFont _defaultFont(); TQFont _defaultFont();
TQStringList _listOfLanguages(); TQStringList _listOfLanguages();
TQStringList _listOfLanguageTags(); TQStringList _listOfLanguageTags();
KConfig* _kofficeConfig(); TDEConfig* _kofficeConfig();
void createListOfLanguages(); void createListOfLanguages();
int m_pointSize; int m_pointSize;
typedef TQMap<TQString, TQString> LanguageMap; typedef TQMap<TQString, TQString> LanguageMap;
LanguageMap m_langMap; // display-name -> language tag LanguageMap m_langMap; // display-name -> language tag
KConfig* m_kofficeConfig; TDEConfig* m_kofficeConfig;
int m_dpiX; int m_dpiX;
int m_dpiY; int m_dpiY;
// No BC problem here, constructor is private, feel free to add members // No BC problem here, constructor is private, feel free to add members

12
lib/kofficecore/KoMainWindow.cpp
Unescape View File

@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this))); d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this)));
// Load list of recent files // Load list of recent files
KConfig * config = instance ? instance->config() : TDEGlobal::config(); TDEConfig * config = instance ? instance->config() : TDEGlobal::config();
m_recent->loadEntries( config ); m_recent->loadEntries( config );
createShellGUI(); createShellGUI();
@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
void KoMainWindow::saveRecentFiles() void KoMainWindow::saveRecentFiles()
{ {
// Save list of recent files // 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; kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl;
m_recent->saveEntries( config ); m_recent->saveEntries( config );
config->sync(); config->sync();
@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles()
void KoMainWindow::reloadRecentFileList() void KoMainWindow::reloadRecentFileList()
{ {
KConfig * config = instance() ? instance()->config() : TDEGlobal::config(); TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config();
m_recent->loadEntries( config ); m_recent->loadEntries( config );
} }
@ -542,7 +542,7 @@ KParts::PartManager *KoMainWindow::partManager()
bool KoMainWindow::openDocument( const KURL & url ) 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()) ); 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 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) // (not virtual)
bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url ) 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()) 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 // this file exists and we are not just clicking "Save As" to change filter options
// => ask for confirmation // => 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, bOk = KMessageBox::questionYesNo( this,
i18n("A document with this name already exists.\n"\ i18n("A document with this name already exists.\n"\

12
lib/kofficecore/KoOpenPane.cpp
Unescape View File

@ -132,7 +132,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString&
m_splitter->setSizes(sizes); m_splitter->setSizes(sizes);
// Set the sizes of the details pane splitters // 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"); sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes");
emit splitterResized(0, sizes); emit splitterResized(0, sizes);
@ -146,7 +146,7 @@ KoOpenPane::~KoOpenPane()
if(item) { if(item) {
if(!dynamic_cast<KoDetailsPaneBase*>(m_widgetStack->widget(item->widgetIndex()))) { if(!dynamic_cast<KoDetailsPaneBase*>(m_widgetStack->widget(item->widgetIndex()))) {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writeEntry("LastReturnType", "Custom"); cfgGrp.writeEntry("LastReturnType", "Custom");
} }
} }
@ -162,7 +162,7 @@ void KoOpenPane::showOpenFileDialog()
KURL url = KFileDialog::getOpenURL(":OpenDialog", mimeFilter.join(" "), this); KURL url = KFileDialog::getOpenURL(":OpenDialog", mimeFilter.join(" "), this);
if(!url.isEmpty()) { if(!url.isEmpty()) {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writeEntry("LastReturnType", "File"); cfgGrp.writeEntry("LastReturnType", "File");
emit openExistingFile(url.url()); emit openExistingFile(url.url());
} }
@ -231,7 +231,7 @@ void KoOpenPane::initTemplates(const TQString& templateType)
firstItem = m_sectionList->firstChild(); firstItem = m_sectionList->firstChild();
} }
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
if(selectItem && (cfgGrp.readEntry("LastReturnType") == "Template")) { if(selectItem && (cfgGrp.readEntry("LastReturnType") == "Template")) {
m_sectionList->setSelected(selectItem, true); m_sectionList->setSelected(selectItem, true);
@ -247,7 +247,7 @@ void KoOpenPane::setCustomDocumentWidget(TQWidget *widget) {
TQListViewItem* item = addPane(i18n("Custom Document"), TQString(), widget, INT_MAX); 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") { if(cfgGrp.readEntry("LastReturnType") == "Custom") {
m_sectionList->setSelected(item, true); m_sectionList->setSelected(item, true);
@ -299,7 +299,7 @@ void KoOpenPane::selectionChanged(TQListViewItem* item)
void KoOpenPane::saveSplitterSizes(KoDetailsPaneBase* /*sender*/, const TQValueList<int>& sizes) void KoOpenPane::saveSplitterSizes(KoDetailsPaneBase* /*sender*/, const TQValueList<int>& sizes)
{ {
KConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog");
cfgGrp.writeEntry("DetailsPaneSplitterSizes", sizes); cfgGrp.writeEntry("DetailsPaneSplitterSizes", sizes);
} }

4
lib/kofficecore/KoOpenPane.h
Unescape View File

@ -24,7 +24,7 @@
#include <koOpenPaneBase.h> #include <koOpenPaneBase.h>
class KoCustomDocumentCreator; class KoCustomDocumentCreator;
class KConfig; class TDEConfig;
class KoTemplateGroup; class KoTemplateGroup;
class KoOpenPanePrivate; class KoOpenPanePrivate;
class TDEInstance; class TDEInstance;
@ -42,7 +42,7 @@ class KoOpenPane : public KoOpenPaneBase
/** /**
* Constructor * Constructor
* @param parent the parent widget * @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. * @param templateType the template-type (group) that should be selected on creation.
*/ */
KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString()); KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString());

4
lib/kofficecore/KoPicture.cpp
Unescape View File

@ -237,13 +237,13 @@ bool KoPicture::setKeyAndDownloadPicture(const KURL& url, TQWidget *window)
bool result=false; bool result=false;
TQString tmpFileName; TQString tmpFileName;
if ( KIO::NetAccess::download(url, tmpFileName, window) ) if ( TDEIO::NetAccess::download(url, tmpFileName, window) )
{ {
KoPictureKey key; KoPictureKey key;
key.setKeyFromFile( tmpFileName ); key.setKeyFromFile( tmpFileName );
setKey( key ); setKey( key );
result=loadFromFile( tmpFileName ); result=loadFromFile( tmpFileName );
KIO::NetAccess::removeTempFile( tmpFileName ); TDEIO::NetAccess::removeTempFile( tmpFileName );
} }
return result; return result;

2
lib/kofficecore/KoPictureBase.cpp
Unescape View File

@ -39,7 +39,7 @@ KoPictureBase::KoPictureBase(void)
// Slow mode can be very slow, especially at high zoom levels -> configurable // Slow mode can be very slow, especially at high zoom levels -> configurable
if ( s_useSlowResizeMode == -1 ) if ( s_useSlowResizeMode == -1 )
{ {
KConfigGroup group( TDEGlobal::config(), "KOfficeImage" ); TDEConfigGroup group( TDEGlobal::config(), "KOfficeImage" );
s_useSlowResizeMode = group.readNumEntry( "HighResolution", 1 ); s_useSlowResizeMode = group.readNumEntry( "HighResolution", 1 );
kdDebug(30003) << "HighResolution = " << s_useSlowResizeMode << endl; kdDebug(30003) << "HighResolution = " << s_useSlowResizeMode << endl;
} }

2
lib/kofficecore/KoSpeaker.cpp
Unescape View File

@ -193,7 +193,7 @@ void KoSpeaker::startSpeech()
startText(d->m_jobNums[i]); startText(d->m_jobNums[i]);
} }
void KoSpeaker::readConfig(KConfig* config) void KoSpeaker::readConfig(TDEConfig* config)
{ {
delete d->m_timer; delete d->m_timer;
d->m_timer = 0; d->m_timer = 0;

4
lib/kofficecore/KoSpeaker.h
Unescape View File

@ -36,7 +36,7 @@
class TQWidget; class TQWidget;
class TQPoint; class TQPoint;
class KConfig; class TDEConfig;
class KoSpeakerPrivate; class KoSpeakerPrivate;
#define kospeaker KoSpeaker::koSpeaker() #define kospeaker KoSpeaker::koSpeaker()
@ -92,7 +92,7 @@ public:
* If KTTSD daemon is not installed, @ref isEnabled will return false. * 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. * 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 * Given a widget @p w and its @p pos screen coordinates, tries to extract the text of the widget

4
lib/kofficecore/KoTemplates.cpp
Unescape View File

@ -166,7 +166,7 @@ void KoTemplateTree::writeTemplateTree() {
//kdDebug() << "hidden" << endl; //kdDebug() << "hidden" << endl;
if(group->dirs().count()==1 && !group->dirs().grep(localDir).isEmpty()) { if(group->dirs().count()==1 && !group->dirs().grep(localDir).isEmpty()) {
//kdDebug() << "local only" << endl; //kdDebug() << "local only" << endl;
KIO::NetAccess::del(group->dirs().first(), 0); TDEIO::NetAccess::del(group->dirs().first(), 0);
//kdDebug() << "removing: " << group->dirs().first() << endl; //kdDebug() << "removing: " << group->dirs().first() << endl;
} }
else { else {
@ -350,7 +350,7 @@ void KoTemplateTree::writeTemplate(KoTemplate *t, KoTemplateGroup *group,
if ( t->isHidden() && TQFile::exists(fileName) ) if ( t->isHidden() && TQFile::exists(fileName) )
return; return;
TQString fill; TQString fill;
while ( KIO::NetAccess::exists( fileName, true, 0 ) ) while ( TDEIO::NetAccess::exists( fileName, true, 0 ) )
{ {
fill += '_'; fill += '_';
fileName = path + fill + name + ".desktop"; fileName = path + fill + name + ".desktop";

6
lib/kofficeui/KoTemplateChooseDia.cpp
Unescape View File

@ -403,7 +403,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
layout->addWidget(d->boxdescription, 1, 0 ); layout->addWidget(d->boxdescription, 1, 0 );
// config // config
KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
int templateNum = grp.readNumEntry( "TemplateTab", -1 ); int templateNum = grp.readNumEntry( "TemplateTab", -1 );
TQString templateName = grp.readPathEntry( "TemplateName" ); TQString templateName = grp.readPathEntry( "TemplateName" );
if ( templateName.isEmpty() && d->tree->defaultTemplate() ) if ( templateName.isEmpty() && d->tree->defaultTemplate() )
@ -504,7 +504,7 @@ void KoTemplateChooseDia::setupDialog()
{ {
TQGridLayout *maingrid=new TQGridLayout( d->m_mainwidget, 1, 1, 2, 6); 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) if (d->m_dialogType == Everything)
{ {
@ -638,7 +638,7 @@ void KoTemplateChooseDia::slotOk()
if (collectInfo()) if (collectInfo())
{ {
// Save it for the next time // 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" }; static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" };
if ( d->m_returnType <= Empty ) if ( d->m_returnType <= Empty )
{ {

10
lib/kofficeui/KoTemplateCreateDia.cpp
Unescape View File

@ -272,7 +272,7 @@ void KoTemplateCreateDia::slotOk() {
tmpIcon=".icon/"+file+".png"; tmpIcon=".icon/"+file+".png";
icon=iconDir+file+".png"; icon=iconDir+file+".png";
} }
while ( KIO::NetAccess::exists( dest, true, this ) ); while ( TDEIO::NetAccess::exists( dest, true, this ) );
} }
bool ignore = false; bool ignore = false;
kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl; 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 ) if ( !ignore )
{ {
// copy the template file // 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 // save the picture
if(d->m_default->isChecked() && !m_pixmap.isNull()) if(d->m_default->isChecked() && !m_pixmap.isNull())
@ -324,10 +324,10 @@ void KoTemplateCreateDia::slotOk() {
if((*it).contains(dir)==0) { if((*it).contains(dir)==0) {
orig.setPath( (*it)+".directory" ); orig.setPath( (*it)+".directory" );
// Check if we can read the file // 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" ); dest.setPath( dir+"/.directory" );
// We copy the file with overwrite // 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; ready=true;
} }
} }
@ -337,7 +337,7 @@ void KoTemplateCreateDia::slotOk() {
if ( d->m_defaultTemplate->isChecked() ) if ( d->m_defaultTemplate->isChecked() )
{ {
KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); TDEConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
grp.writeEntry( "LastReturnType", "Template" ); grp.writeEntry( "LastReturnType", "Template" );
grp.writePathEntry( "FullTemplateName", dir + "/" + t->file() ); grp.writePathEntry( "FullTemplateName", dir + "/" + t->file() );
grp.writePathEntry( "AlwaysUseTemplate", dir + "/" + t->file() ); grp.writePathEntry( "AlwaysUseTemplate", dir + "/" + t->file() );

2
lib/kopalette/kopalette.cc
Unescape View File

@ -63,7 +63,7 @@ KoPalette::KoPalette(TQWidget * parent, const char * name)
void KoPalette::resetFont() void KoPalette::resetFont()
{ {
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
Q_ASSERT(cfg); Q_ASSERT(cfg);
cfg->setGroup(""); cfg->setGroup("");
m_font = TDEGlobalSettings::generalFont(); m_font = TDEGlobalSettings::generalFont();

8
lib/kopalette/kopalettemanager.cc
Unescape View File

@ -65,7 +65,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int)));
m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); m_viewActionMenu = new KActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu");
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
cfg->setGroup("palettes"); cfg->setGroup("palettes");
bool palettesShown = cfg->readBoolEntry("palettesshown", true); bool palettesShown = cfg->readBoolEntry("palettesshown", true);
@ -149,7 +149,7 @@ void KoPaletteManager::addWidget(TQWidget * widget,
bool visible = true; bool visible = true;
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
if (cfg->hasGroup("palettetab-" + name)) { if (cfg->hasGroup("palettetab-" + name)) {
cfg->setGroup("palettetab-" + name); cfg->setGroup("palettetab-" + name);
@ -367,7 +367,7 @@ void KoPaletteManager::placePalette(const TQString & name, TQt::Dock location)
if (!palette) return; if (!palette) return;
//XXX: Check whether this name occurs in the config list, retrieve the location, set the location //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)) { if (cfg->hasGroup("palette-" + name)) {
cfg->setGroup("palette-" + name); cfg->setGroup("palette-" + name);
@ -529,7 +529,7 @@ void KoPaletteManager::save()
if (!m_view) return; if (!m_view) return;
if (!m_view->mainWindow()) return; if (!m_view->mainWindow()) return;
KConfig * cfg = TDEGlobal::config(); TDEConfig * cfg = TDEGlobal::config();
Q_ASSERT(cfg); Q_ASSERT(cfg);
cfg->setGroup(""); cfg->setGroup("");

4
lib/kotext/KFontDialog_local.cpp
Unescape View File

@ -332,8 +332,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
if( sizeIsRelativeState && sizeIsRelativeCheckBox ) if( sizeIsRelativeState && sizeIsRelativeCheckBox )
setSizeIsRelative( *sizeIsRelativeState ); setSizeIsRelative( *sizeIsRelativeState );
KConfig *config = TDEGlobal::config(); TDEConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, TQString::fromLatin1("General")); TDEConfigGroupSaver saver(config, TQString::fromLatin1("General"));
showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
} }

12
lib/kotext/KoAutoFormat.cpp
Unescape View File

@ -251,8 +251,8 @@ void KoAutoFormat::updateMaxWords()
void KoAutoFormat::loadListOfWordCompletion() void KoAutoFormat::loadListOfWordCompletion()
{ {
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
KConfigGroupSaver cgs( config, "Completion Word" ); TDEConfigGroupSaver cgs( config, "Completion Word" );
m_listCompletion->insertItems(config->readListEntry( "list" )); 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. // so that loading is faster and to avoid doing it for readonly documents.
if ( m_configRead && !force ) if ( m_configRead && !force )
return; return;
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
KConfigGroupSaver cgs( config, "AutoFormat" ); TDEConfigGroupSaver cgs( config, "AutoFormat" );
//when we force don't load format language. //when we force don't load format language.
if ( !force) if ( !force)
m_autoFormatLanguage = config->readEntry("formatLanguage", TQString()); m_autoFormatLanguage = config->readEntry("formatLanguage", TQString());
@ -615,10 +615,10 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages)
void KoAutoFormat::saveConfig() void KoAutoFormat::saveConfig()
{ {
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
KLocale klocale(m_doc->instance()->instanceName()); KLocale klocale(m_doc->instance()->instanceName());
KConfigGroupSaver cgs( config, "AutoFormat" ); TDEConfigGroupSaver cgs( config, "AutoFormat" );
config->writeEntry( "ConvertUpperCase", m_convertUpperCase ); config->writeEntry( "ConvertUpperCase", m_convertUpperCase );
config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage); config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage);

4
lib/kotext/KoCompletionDia.cpp
Unescape View File

@ -189,8 +189,8 @@ void KoCompletion::saveSettings() {
} }
void KoCompletion::slotSaveCompletionEntry() { void KoCompletion::slotSaveCompletionEntry() {
KConfig config("kofficerc"); TDEConfig config("kofficerc");
KConfigGroupSaver cgs( &config, "Completion Word" ); TDEConfigGroupSaver cgs( &config, "Completion Word" );
config.writeEntry( "list", m_listCompletion ); config.writeEntry( "list", m_listCompletion );
config.sync(); config.sync();
KMessageBox::information( this, i18n( KMessageBox::information( this, i18n(

8
lib/kotext/KoVariable.cpp
Unescape View File

@ -1390,10 +1390,10 @@ TQCString KoDateVariable::formatStr(int & correct)
DateFormatWidget* widget=new DateFormatWidget(dialog); DateFormatWidget* widget=new DateFormatWidget(dialog);
int count=0; int count=0;
dialog->setMainWidget(widget); dialog->setMainWidget(widget);
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
if( config->hasGroup("Date format history") ) 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); const int noe=config->readNumEntry("Number Of Entries", 5);
for(int i=0;i<noe;i++) for(int i=0;i<noe;i++)
{ {
@ -1601,11 +1601,11 @@ TQCString KoTimeVariable::formatStr(int & _correct)
KDialogBase* dialog=new KDialogBase(0, 0, true, i18n("Time Format"), KDialogBase::Ok|KDialogBase::Cancel); KDialogBase* dialog=new KDialogBase(0, 0, true, i18n("Time Format"), KDialogBase::Ok|KDialogBase::Cancel);
TimeFormatWidget* widget=new TimeFormatWidget(dialog); TimeFormatWidget* widget=new TimeFormatWidget(dialog);
dialog->setMainWidget(widget); dialog->setMainWidget(widget);
KConfig* config = KoGlobal::kofficeConfig(); TDEConfig* config = KoGlobal::kofficeConfig();
int count=0; int count=0;
if( config->hasGroup("Time format history") ) 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); const int noe=config->readNumEntry("Number Of Entries", 5);
for(int i=0;i<noe;i++) for(int i=0;i<noe;i++)
{ {

4
lib/kross/main/scriptguiclient.cpp
Unescape View File

@ -171,7 +171,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
i18n("Replace")) != KMessageBox::Continue ) i18n("Replace")) != KMessageBox::Continue )
return false; return false;
if(! KIO::NetAccess::del(destination, 0) ) { if(! TDEIO::NetAccess::del(destination, 0) ) {
KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(destination)); KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(destination));
return false; return false;
} }
@ -187,7 +187,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath) bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath)
{ {
if(! KIO::NetAccess::del(scriptpackagepath, 0) ) { if(! TDEIO::NetAccess::del(scriptpackagepath, 0) ) {
KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(scriptpackagepath)); KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(scriptpackagepath));
return false; return false;
} }

12
lib/store/KoStore.cpp
Unescape View File

@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
else else
{ {
const bool downloaded = const bool downloaded =
KIO::NetAccess::download( url, tmpFile, window ); TDEIO::NetAccess::download( url, tmpFile, window );
if (!downloaded) if (!downloaded)
{ {
@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name )
if ( m_bIsOpen ) if ( m_bIsOpen )
{ {
kdWarning(s_area) << "KoStore: File is already opened" << endl; kdWarning(s_area) << "KoStore: File is already opened" << endl;
//return KIO::ERR_INTERNAL; //return TDEIO::ERR_INTERNAL;
return false; return false;
} }
if ( m_sName.length() > 512 ) if ( m_sName.length() > 512 )
{ {
kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl; kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl;
//return KIO::ERR_MALFORMED_URL; //return TDEIO::ERR_MALFORMED_URL;
return false; 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 if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there
{ {
kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl;
//return KIO::ERR_FILE_ALREADY_EXIST; //return TDEIO::ERR_FILE_ALREADY_EXIST;
return false; return false;
} }
@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name )
return false; return false;
} }
else else
//return KIO::ERR_UNSUPPORTED_ACTION; //return TDEIO::ERR_UNSUPPORTED_ACTION;
return false; return false;
m_bIsOpen = true; m_bIsOpen = true;
@ -247,7 +247,7 @@ bool KoStore::close()
if ( !m_bIsOpen ) if ( !m_bIsOpen )
{ {
kdWarning(s_area) << "KoStore: You must open before closing" << endl; kdWarning(s_area) << "KoStore: You must open before closing" << endl;
//return KIO::ERR_INTERNAL; //return TDEIO::ERR_INTERNAL;
return false; return false;
} }

8
lib/store/KoTarStore.cpp
Unescape View File

@ -87,11 +87,11 @@ KoTarStore::~KoTarStore()
// Now we have still some job to do for remote files. // Now we have still some job to do for remote files.
if ( m_fileMode == KoStoreBase::RemoteRead ) if ( m_fileMode == KoStoreBase::RemoteRead )
{ {
KIO::NetAccess::removeTempFile( m_localFileName ); TDEIO::NetAccess::removeTempFile( m_localFileName );
} }
else if ( m_fileMode == KoStoreBase::RemoteWrite ) 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 // ### FIXME: delete temp file
} }
} }
@ -137,13 +137,13 @@ bool KoTarStore::openRead( const TQString& name )
if ( entry == 0L ) if ( entry == 0L )
{ {
//kdWarning(s_area) << "Unknown filename " << name << endl; //kdWarning(s_area) << "Unknown filename " << name << endl;
//return KIO::ERR_DOES_NOT_EXIST; //return TDEIO::ERR_DOES_NOT_EXIST;
return false; return false;
} }
if ( entry->isDirectory() ) if ( entry->isDirectory() )
{ {
kdWarning(s_area) << name << " is a directory !" << endl; kdWarning(s_area) << name << " is a directory !" << endl;
//return KIO::ERR_IS_DIRECTORY; //return TDEIO::ERR_IS_DIRECTORY;
return false; return false;
} }
KTarFile * f = (KTarFile *) entry; KTarFile * f = (KTarFile *) entry;

8
lib/store/KoZipStore.cpp
Unescape View File

@ -98,11 +98,11 @@ KoZipStore::~KoZipStore()
// Now we have still some job to do for remote files. // Now we have still some job to do for remote files.
if ( m_fileMode == KoStoreBase::RemoteRead ) if ( m_fileMode == KoStoreBase::RemoteRead )
{ {
KIO::NetAccess::removeTempFile( m_localFileName ); TDEIO::NetAccess::removeTempFile( m_localFileName );
} }
else if ( m_fileMode == KoStoreBase::RemoteWrite ) 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 // ### FIXME: delete temp file
} }
} }
@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name )
if ( entry == 0L ) if ( entry == 0L )
{ {
//kdWarning(s_area) << "Unknown filename " << name << endl; //kdWarning(s_area) << "Unknown filename " << name << endl;
//return KIO::ERR_DOES_NOT_EXIST; //return TDEIO::ERR_DOES_NOT_EXIST;
return false; return false;
} }
if ( entry->isDirectory() ) if ( entry->isDirectory() )
{ {
kdWarning(s_area) << name << " is a directory !" << endl; kdWarning(s_area) << name << " is a directory !" << endl;
//return KIO::ERR_IS_DIRECTORY; //return TDEIO::ERR_IS_DIRECTORY;
return false; return false;
} }
// Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual! // Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual!

6
tools/converter/koconverter.cpp
Unescape View File

@ -103,13 +103,13 @@ int main( int argc, char **argv )
if ( args->isSet("backup") ) if ( args->isSet("backup") )
{ {
// Code form koDocument.cc // Code form koDocument.cc
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
if ( KIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup if ( TDEIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup
{ {
kdDebug() << "Making backup..." << endl;; kdDebug() << "Making backup..." << endl;;
KURL backup( uOut ); KURL backup( uOut );
backup.setPath( uOut.path() + '~' ); 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 );
} }
} }

2
tools/kfile-plugins/ooo/kfile_ooo.cpp
Unescape View File

@ -523,7 +523,7 @@ bool KOfficePlugin::writeMetaData(const TQString & path,
delete m_zip; delete m_zip;
// NULL as third parameter is not good, but I don't know the Window ID // 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 // 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; kdDebug(7034) << "Error while saving " << tmp_file.name() << " as " << path << endl;
return false; return false;
} }

2
tools/spell/main.cc
Unescape View File

@ -78,7 +78,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
if ( instance() ) if ( instance() )
{ {
KConfig * config = instance()->config(); TDEConfig * config = instance()->config();
TQCString gn( "KSpell " ); TQCString gn( "KSpell " );
gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...) gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...)
TQString groupName = TQString::fromLatin1( gn ); TQString groupName = TQString::fromLatin1( gn );

2
tools/thesaurus/main.cc
Unescape View File

@ -71,7 +71,7 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
m_dialog->setHelp(TQString(), "thesaurus"); m_dialog->setHelp(TQString(), "thesaurus");
m_dialog->resize(600, 400); m_dialog->resize(600, 400);
m_config = new KConfig("kthesaurusrc"); m_config = new TDEConfig("kthesaurusrc");
m_data_file = m_config->readPathEntry("datafile"); m_data_file = m_config->readPathEntry("datafile");
if( ! m_data_file ) { if( ! m_data_file ) {
m_data_file = TDEGlobal::dirs()->findResourceDir("data", "thesaurus/") m_data_file = TDEGlobal::dirs()->findResourceDir("data", "thesaurus/")

2
tools/thesaurus/main.h
Unescape View File

@ -115,7 +115,7 @@ protected:
bool m_replacement; // does this dialog offer a replace button etc.? bool m_replacement; // does this dialog offer a replace button etc.?
KConfig *m_config; TDEConfig *m_config;
TDEProcess *m_thesproc; TDEProcess *m_thesproc;
TQString m_thesproc_stdout; TQString m_thesproc_stdout;

Write Preview
Loading…
Cancel
Save