From af5cb1cb32dfecee1b81ae3fbaa09b07aa1ae8a3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:05:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- ChangeLog | 18 +- digikam/digikam/albumfiletip.cpp | 2 +- digikam/digikam/albumfolderview.cpp | 44 ++--- digikam/digikam/albumfolderview.h | 2 +- digikam/digikam/albumiconitem.cpp | 2 +- digikam/digikam/albumiconview.cpp | 56 +++--- digikam/digikam/albumiconview.h | 6 +- digikam/digikam/albumlister.cpp | 26 +-- digikam/digikam/albumlister.h | 6 +- digikam/digikam/albummanager.cpp | 54 +++--- digikam/digikam/albummanager.h | 16 +- digikam/digikam/albumsettings.cpp | 6 +- digikam/digikam/datefolderview.cpp | 4 +- digikam/digikam/digikamapp.cpp | 38 ++--- digikam/digikam/digikamapp.h | 2 +- digikam/digikam/digikamappprivate.h | 2 +- digikam/digikam/digikamfirstrun.cpp | 2 +- digikam/digikam/digikamfirstrun.h | 6 +- digikam/digikam/digikamview.cpp | 6 +- digikam/digikam/dio.cpp | 62 +++---- digikam/digikam/dio.h | 16 +- digikam/digikam/dio_p.h | 6 +- digikam/digikam/folderview.cpp | 4 +- digikam/digikam/main.cpp | 2 +- digikam/digikam/searchresultsview.cpp | 16 +- digikam/digikam/searchresultsview.h | 6 +- digikam/digikam/syncjob.cpp | 20 +-- digikam/digikam/syncjob.h | 4 +- digikam/digikam/tagfilterview.cpp | 8 +- digikam/digikam/timelineview.cpp | 4 +- digikam/digikam/upgradedb_sqlite2tosqlite3.cpp | 4 +- digikam/imageplugins/adjustcurves/adjustcurves.cpp | 4 +- .../imageplugins/adjustcurves/adjustcurvestool.cpp | 4 +- digikam/imageplugins/adjustlevels/adjustlevels.cpp | 4 +- .../imageplugins/adjustlevels/adjustlevelstool.cpp | 4 +- .../antivignetting/antivignettingtool.cpp | 4 +- .../antivignetting/imageeffect_antivignetting.cpp | 4 +- digikam/imageplugins/blurfx/blurfxtool.cpp | 4 +- digikam/imageplugins/blurfx/imageeffect_blurfx.cpp | 4 +- digikam/imageplugins/border/bordertool.cpp | 4 +- digikam/imageplugins/border/imageeffect_border.cpp | 4 +- digikam/imageplugins/channelmixer/channelmixer.cpp | 4 +- .../imageplugins/channelmixer/channelmixertool.cpp | 4 +- digikam/imageplugins/charcoal/charcoaltool.cpp | 4 +- .../imageplugins/charcoal/imageeffect_charcoal.cpp | 4 +- digikam/imageplugins/colorfx/colorfxtool.cpp | 4 +- .../imageplugins/colorfx/imageeffect_colorfx.cpp | 4 +- .../imageplugins/coreplugin/autocorrectiontool.cpp | 4 +- digikam/imageplugins/coreplugin/bcgtool.cpp | 4 +- digikam/imageplugins/coreplugin/blurtool.cpp | 4 +- digikam/imageplugins/coreplugin/bwsepiatool.cpp | 4 +- digikam/imageplugins/coreplugin/hsl/hsltool.cpp | 4 +- .../coreplugin/hsl/imageeffect_hsl.cpp | 4 +- digikam/imageplugins/coreplugin/iccprooftool.cpp | 4 +- .../coreplugin/imageeffect_autocorrection.cpp | 4 +- .../imageplugins/coreplugin/imageeffect_bcg.cpp | 4 +- .../imageplugins/coreplugin/imageeffect_blur.cpp | 4 +- .../coreplugin/imageeffect_bwsepia.cpp | 4 +- .../coreplugin/imageeffect_iccproof.cpp | 4 +- .../imageplugins/coreplugin/imageeffect_redeye.cpp | 4 +- .../imageplugins/coreplugin/imageeffect_rgb.cpp | 4 +- .../coreplugin/ratiocrop/imageeffect_ratiocrop.cpp | 4 +- .../coreplugin/ratiocrop/ratiocroptool.cpp | 4 +- digikam/imageplugins/coreplugin/redeyetool.cpp | 4 +- digikam/imageplugins/coreplugin/rgbtool.cpp | 4 +- .../sharpnesseditor/imageeffect_sharpen.cpp | 4 +- .../coreplugin/sharpnesseditor/sharpentool.cpp | 4 +- .../imageplugins/distortionfx/distortionfxtool.cpp | 4 +- .../distortionfx/imageeffect_distortionfx.cpp | 4 +- digikam/imageplugins/emboss/embosstool.cpp | 4 +- digikam/imageplugins/emboss/imageeffect_emboss.cpp | 4 +- digikam/imageplugins/filmgrain/filmgraintool.cpp | 4 +- .../filmgrain/imageeffect_filmgrain.cpp | 4 +- .../imageplugins/freerotation/freerotationtool.cpp | 4 +- .../freerotation/imageeffect_freerotation.cpp | 4 +- .../imageplugins/hotpixels/blackframeparser.cpp | 4 +- digikam/imageplugins/hotpixels/hotpixelstool.cpp | 4 +- .../hotpixels/imageeffect_hotpixels.cpp | 4 +- .../imageplugins/infrared/imageeffect_infrared.cpp | 4 +- digikam/imageplugins/infrared/infraredtool.cpp | 4 +- .../inpainting/imageeffect_inpainting.cpp | 4 +- digikam/imageplugins/inpainting/inpaintingtool.cpp | 4 +- .../imageplugins/inserttext/fontchooserwidget.cpp | 4 +- .../inserttext/imageeffect_inserttext.cpp | 4 +- digikam/imageplugins/inserttext/inserttexttool.cpp | 4 +- .../lensdistortion/imageeffect_lensdistortion.cpp | 4 +- .../lensdistortion/lensdistortiontool.cpp | 4 +- .../noisereduction/imageeffect_noisereduction.cpp | 4 +- .../noisereduction/noisereductiontool.cpp | 4 +- .../imageplugins/oilpaint/imageeffect_oilpaint.cpp | 4 +- digikam/imageplugins/oilpaint/oilpainttool.cpp | 4 +- .../perspective/imageeffect_perspective.cpp | 4 +- .../imageplugins/perspective/perspectivetool.cpp | 4 +- .../imageplugins/raindrop/imageeffect_raindrop.cpp | 4 +- digikam/imageplugins/raindrop/raindroptool.cpp | 4 +- .../restoration/imageeffect_restoration.cpp | 4 +- .../imageplugins/restoration/restorationtool.cpp | 4 +- .../sheartool/imageeffect_sheartool.cpp | 4 +- digikam/imageplugins/sheartool/sheartool.cpp | 4 +- .../superimpose/imageeffect_superimpose.cpp | 4 +- .../imageplugins/superimpose/superimposetool.cpp | 4 +- .../imageplugins/texture/imageeffect_texture.cpp | 4 +- digikam/imageplugins/texture/texturetool.cpp | 4 +- .../whitebalance/imageeffect_whitebalance.cpp | 4 +- .../imageplugins/whitebalance/whitebalancetool.cpp | 4 +- digikam/kioslave/digikamalbums.cpp | 190 ++++++++++----------- digikam/kioslave/digikamalbums.h | 6 +- digikam/kioslave/digikamdates.h | 2 +- digikam/kioslave/digikamsearch.cpp | 4 +- digikam/kioslave/digikamsearch.h | 2 +- digikam/kioslave/digikamtags.h | 2 +- digikam/kioslave/digikamthumbnail.cpp | 14 +- digikam/kioslave/digikamthumbnail.h | 2 +- digikam/kioslave/sqlitedb.cpp | 2 +- digikam/libs/dialogs/imagedlgbase.cpp | 4 +- digikam/libs/dialogs/imageguidedlg.cpp | 6 +- digikam/libs/dimg/filters/icctransform.cpp | 4 +- .../imageproperties/cameraitempropertiestab.cpp | 2 +- digikam/libs/imageproperties/imagedescedittab.cpp | 4 +- .../imageproperties/imagepropertiescolorstab.cpp | 4 +- .../imageproperties/imagepropertiesmetadatatab.cpp | 4 +- .../libs/imageproperties/imagepropertiestab.cpp | 2 +- digikam/libs/imageproperties/talbumlistview.cpp | 4 +- digikam/libs/thumbbar/thumbbar.cpp | 2 +- digikam/libs/thumbbar/thumbnailjob.cpp | 14 +- digikam/libs/thumbbar/thumbnailjob.h | 6 +- digikam/libs/widgets/common/filesaveoptionsbox.cpp | 4 +- digikam/libs/widgets/common/searchtextbar.cpp | 4 +- digikam/libs/widgets/common/sidebar.cpp | 4 +- .../libs/widgets/imageplugins/imagepanelwidget.cpp | 4 +- .../widgets/imageplugins/imagepannelwidget.cpp | 4 +- digikam/libs/widgets/imageplugins/imagewidget.cpp | 4 +- digikam/showfoto/setup/setup.cpp | 4 +- digikam/showfoto/setup/setupeditor.cpp | 4 +- digikam/showfoto/setup/setuptooltip.cpp | 4 +- digikam/showfoto/showfoto.cpp | 34 ++-- digikam/showfoto/showfoto.h | 4 +- digikam/utilities/batch/imageinfoalbumsjob.h | 2 +- digikam/utilities/batch/imageinfojob.cpp | 16 +- digikam/utilities/batch/imageinfojob.h | 6 +- digikam/utilities/cameragui/cameracontroller.cpp | 14 +- digikam/utilities/cameragui/cameraui.cpp | 8 +- digikam/utilities/cameragui/freespacewidget.cpp | 12 +- digikam/utilities/cameragui/renamecustomizer.cpp | 4 +- .../utilities/imageeditor/editor/editorwindow.cpp | 14 +- .../imageeditor/rawimport/rawsettingsbox.cpp | 4 +- digikam/utilities/imageeditor/tools/imageprint.cpp | 4 +- .../utilities/imageeditor/tools/imageresize.cpp | 4 +- digikam/utilities/lighttable/lighttablewindow.cpp | 8 +- digikam/utilities/setup/setup.cpp | 4 +- digikam/utilities/setup/setupdcraw.cpp | 4 +- digikam/utilities/setup/setupeditor.cpp | 4 +- digikam/utilities/setup/setupicc.cpp | 6 +- digikam/utilities/setup/setupiofiles.cpp | 4 +- digikam/utilities/setup/setuplighttable.cpp | 4 +- digikam/utilities/setup/setupslideshow.cpp | 4 +- 156 files changed, 613 insertions(+), 613 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3bc7e680..2cf3b1d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11038,7 +11038,7 @@ v0.9.3-beta1 - 2007-010-08 (gphoto2 include). Important remarks : The Remane dialog is provided by KDE api - (KIO::RenameDlg class). + (TDEIO::RenameDlg class). - With KDE 3.4.x, this dialog is not able to display preview of pictures properlly. - With KDE 3.5, the dialog have been revisted, work better, @@ -11049,7 +11049,7 @@ v0.9.3-beta1 - 2007-010-08 I have not yet tested with KDE4. Possible solution of this problem is to use digiKam core to - render preview. But we must fork KIO::RenameDlg + render preview. But we must fork TDEIO::RenameDlg for that, which is a wrong way. I recommend to post a new report in KDElibs to improve @@ -21049,7 +21049,7 @@ v0.9.2-beta1 - 2007-05-04 * trunk/extragear/graphics/digikam/digikam/albumiconview.cpp, trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp: - - Provide digikamalbums:// URLs to KIO::del + - Provide digikamalbums:// URLs to TDEIO::del This reliably removes the entries from the database. It usually worked before because the KDirWatch would trigger a rescan, @@ -21514,13 +21514,13 @@ v0.9.1-rc2 - 27-Feb-2007 trunk/extragear/graphics/digikam/digikam/dio.h, trunk/extragear/graphics/digikam/digikam/imageinfo.cpp, trunk/extragear/graphics/digikam/digikam/imageinfo.h: Use - KIO::rename to rename files + TDEIO::rename to rename files - The AlbumLister would ignore changes to the already listed items. Force it to recreate the ImageInfo object by a list of invalidated items. - The thumbnail needs to be invalidated as well. - This is done by listening to a signal from the KIO::CopyJob + This is done by listening to a signal from the TDEIO::CopyJob - Remove low-level code from DIO::rename - Remove actual renaming from ImageInfo::setName @@ -52038,9 +52038,9 @@ v0.8.0-rc1 11/03/05 save/saveas. - improve thumnails computation speed, especially with PNG and JPEG files. - digikamthumbnail protocol will render properly PNG, TIFF, and JPEG files preview in all case - (KIO::filePreview can't do it). If showfoto is installed without + (TDEIO::filePreview can't do it). If showfoto is installed without digikam (digikamthumbnail protocol unavialable), showfoto - thumbar use KIO::filePreview protocol instead to rendering + thumbar use TDEIO::filePreview protocol instead to rendering thumbnails. CCBUG: 111873 2005-09-05 07:00 cgilles @@ -53503,7 +53503,7 @@ v0.8.0-beta1 08/19/05 * trunk/extragear/graphics/digikam/digikam/albumsettings.cpp, trunk/extragear/graphics/digikam/digikam/digikamapp.cpp: - creating a separate instance of KConfig can cause race + creating a separate instance of TDEConfig can cause race condition, resulting in some of the settings not being saved correctly. use the global config. @@ -58898,7 +58898,7 @@ v0.7-beta1 10/13/04 * pahlibar (2004-09-01): use digikamio for copying/moving files/albums. * pahlibar (2004-09-01): - app interface for digikamio kioslave: uses digikamio kioslave for - file/folder copy/move within the album library and KIO::copyjob for + file/folder copy/move within the album library and TDEIO::copyjob for external file/folder copy/move. - busyprogressbar: a progressbar which shows a busy indicator when the total and current progress is not (the progress bar shuttles from diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 244da54c..dcbadd07 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -365,7 +365,7 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowFileSize()) { tip += cellBeg + i18n("Size:") + cellMid; - str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) + str = i18n("%1 (%2)").arg(TDEIO::convertSize(fi.size())) .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); tip += str + cellEnd; } diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index d758f4f2..a0de6fce 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -824,9 +824,9 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) KURL u; u.setProtocol("file"); u.setPath(album->folderPath()); - KIO::Job* job = DIO::del(u, useTrash); - connect(job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotDIOResult(KIO::Job *))); + TDEIO::Job* job = DIO::del(u, useTrash); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::addAlbumChildrenToList(KURL::List &list, Album *album) @@ -844,7 +844,7 @@ void AlbumFolderView::addAlbumChildrenToList(KURL::List &list, Album *album) } } -void AlbumFolderView::slotDIOResult(KIO::Job* job) +void AlbumFolderView::slotDIOResult(TDEIO::Job* job) { if (job->error()) job->showErrorDialog(this); @@ -1081,9 +1081,9 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) // move dragItem below dropItem destAlbum = itemDrop->album(); } - KIO::Job* job = DIO::move(album->kurl(), destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::move(album->kurl(), destAlbum->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); } } else if (AlbumSettings::instance()->getAlbumSortOrder() @@ -1207,9 +1207,9 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) { case 10: { - KIO::Job* job = DIO::move(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::move(extUrls, destAlbum->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); // In recurssive album contents mode, we need to force AlbumLister to take a care about // moved items. This will have no incidence in normal mode. @@ -1222,9 +1222,9 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) } case 11: { - KIO::Job* job = DIO::copy(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::copy(extUrls, destAlbum->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 12: @@ -1333,16 +1333,16 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) { case 10: { - KIO::Job* job = DIO::move(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::move(srcURLs, destAlbum->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { - KIO::Job* job = DIO::copy(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::copy(srcURLs, destAlbum->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1392,9 +1392,9 @@ void AlbumFolderView::albumImportFolder() if(urls.empty()) return; - KIO::Job* job = DIO::copy(urls, parent->kurl()); - connect(job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotDIOResult(KIO::Job *))); + TDEIO::Job* job = DIO::copy(urls, parent->kurl()); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::selectItem(int id) diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index 0a9a47d4..dfbdf9a6 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -93,7 +93,7 @@ private slots: void slotContextMenu(TQListViewItem*, const TQPoint&, int); - void slotDIOResult(KIO::Job* job); + void slotDIOResult(TDEIO::Job* job); void slotRefresh(const TQMap&); diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 7b8faf33..8f64d325 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -331,7 +331,7 @@ void AlbumIconItem::paintItem() r = d->view->itemSizeRect(); p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), - KIO::convertSize(d->info->fileSize()))); + TDEIO::convertSize(d->info->fileSize()))); } p.setFont(d->view->itemFontCom()); diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index fad91b94..aa1f70fb 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -887,9 +887,9 @@ void AlbumIconView::slotPaste() KURL::List srcURLs; KURLDrag::decode(data, srcURLs); - KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::copy(srcURLs, destURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); } else if(d->currentAlbum->type() == Album::TAG && ItemDrag::canDecode(data)) { @@ -981,11 +981,11 @@ void AlbumIconView::slotRename(AlbumIconItem* item) KURL newURL = oldURL; newURL.setFileName(newName + ext); - KIO::CopyJob* job = DIO::rename(oldURL, newURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); - connect(job, TQT_SIGNAL(copyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)), - this, TQT_SLOT(slotRenamed(KIO::Job*, const KURL &, const KURL&))); + TDEIO::CopyJob* job = DIO::rename(oldURL, newURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), + this, TQT_SLOT(slotRenamed(TDEIO::Job*, const KURL &, const KURL&))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -994,7 +994,7 @@ void AlbumIconView::slotRename(AlbumIconItem* item) d->imageLister->invalidateItem(&renameInfo); } -void AlbumIconView::slotRenamed(KIO::Job*, const KURL &, const KURL&newURL) +void AlbumIconView::slotRenamed(TDEIO::Job*, const KURL &, const KURL&newURL) { // reconstruct file path from digikamalbums:// URL KURL fileURL; @@ -1037,9 +1037,9 @@ void AlbumIconView::slotDeleteSelectedItems(bool deletePermanently) bool useTrash = !dialog.shouldDelete(); // trash does not like non-local URLs, put is not implemented - KIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList, useTrash); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList, useTrash); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1067,10 +1067,10 @@ void AlbumIconView::slotDeleteSelectedItemsDirectly(bool useTrash) return; // trash does not like non-local URLs, put is not implemented - KIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList , useTrash); + TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList , useTrash); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); } void AlbumIconView::slotFilesModified() @@ -1413,16 +1413,16 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) { case 10: { - KIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::move(srcURLs, destURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { - KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::copy(srcURLs, destURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1451,16 +1451,16 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) { case 10: { - KIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::move(srcURLs, destURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { - KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDIOResult(KIO::Job*))); + TDEIO::Job* job = DIO::copy(srcURLs, destURL); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -2310,7 +2310,7 @@ void AlbumIconView::slotAssignRatingFiveStar() slotAssignRating(5); } -void AlbumIconView::slotDIOResult(KIO::Job* job) +void AlbumIconView::slotDIOResult(TDEIO::Job* job) { if (job->error()) job->showErrorDialog(this); diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index d29cd490..612d5457 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -44,7 +44,7 @@ class TQPoint; class TQString; class TQPixmap; -namespace KIO +namespace TDEIO { class Job; } @@ -195,8 +195,8 @@ private slots: void slotAssignTag(int tagID); void slotRemoveTag(int tagID); - void slotDIOResult(KIO::Job* job); - void slotRenamed(KIO::Job*, const KURL &, const KURL&); + void slotDIOResult(TDEIO::Job* job); + void slotRenamed(TDEIO::Job*, const KURL &, const KURL&); void slotImageAttributesChanged(TQ_LLONG imageId); void slotAlbumImagesChanged(int albumId); diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp index 59d82344..a5ac55d3 100644 --- a/digikam/digikam/albumlister.cpp +++ b/digikam/digikam/albumlister.cpp @@ -103,7 +103,7 @@ public: TQTimer *filterTimer; - KIO::TransferJob *job; + TDEIO::TransferJob *job; ImageInfoList itemList; @@ -172,14 +172,14 @@ void AlbumLister::openAlbum(Album *album) ds << d->recurseTags; // Protocol = digikamalbums -> kio_digikamalbums - d->job = new KIO::TransferJob(album->kurl(), KIO::CMD_SPECIAL, + d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::refresh() @@ -211,14 +211,14 @@ void AlbumLister::refresh() ds << d->recurseAlbums; ds << d->recurseTags; - d->job = new KIO::TransferJob(d->currAlbum->kurl(), KIO::CMD_SPECIAL, + d->job = new TDEIO::TransferJob(d->currAlbum->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::setDayFilter(const TQValueList& days) @@ -540,7 +540,7 @@ void AlbumLister::slotFilterItems() kapp->restoreOverrideCursor(); } -void AlbumLister::slotResult(KIO::Job* job) +void AlbumLister::slotResult(TDEIO::Job* job) { d->job = 0; @@ -568,7 +568,7 @@ void AlbumLister::slotResult(KIO::Job* job) emit signalCompleted(); } -void AlbumLister::slotData(KIO::Job*, const TQByteArray& data) +void AlbumLister::slotData(TDEIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; diff --git a/digikam/digikam/albumlister.h b/digikam/digikam/albumlister.h index c345a756..3792382d 100644 --- a/digikam/digikam/albumlister.h +++ b/digikam/digikam/albumlister.h @@ -37,7 +37,7 @@ #include "imageinfo.h" -namespace KIO +namespace TDEIO { class Job; } @@ -138,8 +138,8 @@ private slots: void slotFilterItems(); - void slotResult(KIO::Job* job); - void slotData(KIO::Job* job, const TQByteArray& data); + void slotResult(TDEIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); private: diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 9402b743..644aec99 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -113,9 +113,9 @@ public: KDirWatch *dirWatch; - KIO::TransferJob *albumListJob; - KIO::TransferJob *dateListJob; - KIO::TransferJob *tagListJob; + TDEIO::TransferJob *albumListJob; + TDEIO::TransferJob *dateListJob; + TDEIO::TransferJob *tagListJob; PAlbum *rootPAlbum; TAlbum *rootTAlbum; @@ -258,7 +258,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) TQString dbPath = cleanPath + "/digikam3.db"; #ifdef NFS_HACK - dbPath = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(dbPath))); + dbPath = locateLocal("appdata", TDEIO::encodeFileName(TQDir::cleanDirPath(dbPath))); #endif d->db->setDBPath(dbPath); @@ -277,7 +277,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) // Copy an existing locale from the settings file (used < 0.8) // to the database. - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); if (config->hasKey("Locale")) { @@ -352,7 +352,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) // -- Check if we need to do scanning ------------------------------------- - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); if (config->readBoolEntry("Scan At Start", true) || d->db->getSetting("Scanned").isEmpty()) @@ -541,15 +541,15 @@ void AlbumManager::scanPAlbums() ds << 0; // recursive sub-album (not needed here) ds << 0; // recursive sub-tags (not needed here) - d->albumListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, + d->albumListJob = new TDEIO::TransferJob(u, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); d->albumListJob->addMetaData("folders", "yes"); - connect(d->albumListJob, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotAlbumsJobResult(KIO::Job*))); + connect(d->albumListJob, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotAlbumsJobResult(TDEIO::Job*))); - connect(d->albumListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotAlbumsJobData(KIO::Job*, const TQByteArray&))); + connect(d->albumListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotAlbumsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanTAlbums() @@ -690,15 +690,15 @@ void AlbumManager::scanTAlbums() ds << 0; // recursive sub-album (not needed here) ds << 0; // recursive sub-tags (not needed here) - d->tagListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, + d->tagListJob = new TDEIO::TransferJob(u, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); d->tagListJob->addMetaData("folders", "yes"); - connect(d->tagListJob, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotTagsJobResult(KIO::Job*))); + connect(d->tagListJob, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotTagsJobResult(TDEIO::Job*))); - connect(d->tagListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotTagsJobData(KIO::Job*, const TQByteArray&))); + connect(d->tagListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotTagsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanSAlbums() @@ -760,15 +760,15 @@ void AlbumManager::scanDAlbums() ds << 0; // recursive sub-album (not needed here) ds << 0; // recursive sub-tags (not needed here) - d->dateListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, + d->dateListJob = new TDEIO::TransferJob(u, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); d->dateListJob->addMetaData("folders", "yes"); - connect(d->dateListJob, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDatesJobResult(KIO::Job*))); + connect(d->dateListJob, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDatesJobResult(TDEIO::Job*))); - connect(d->dateListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotDatesJobData(KIO::Job*, const TQByteArray&))); + connect(d->dateListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotDatesJobData(TDEIO::Job*, const TQByteArray&))); } AlbumList AlbumManager::allPAlbums() const @@ -1455,7 +1455,7 @@ void AlbumManager::refreshItemHandler(const KURL::List& itemList) d->itemHandler->refreshItems(itemList); } -void AlbumManager::slotAlbumsJobResult(KIO::Job* job) +void AlbumManager::slotAlbumsJobResult(TDEIO::Job* job) { d->albumListJob = 0; @@ -1466,7 +1466,7 @@ void AlbumManager::slotAlbumsJobResult(KIO::Job* job) } } -void AlbumManager::slotAlbumsJobData(KIO::Job*, const TQByteArray& data) +void AlbumManager::slotAlbumsJobData(TDEIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; @@ -1478,7 +1478,7 @@ void AlbumManager::slotAlbumsJobData(KIO::Job*, const TQByteArray& data) emit signalPAlbumsDirty(albumsStatMap); } -void AlbumManager::slotTagsJobResult(KIO::Job* job) +void AlbumManager::slotTagsJobResult(TDEIO::Job* job) { d->tagListJob = 0; @@ -1489,7 +1489,7 @@ void AlbumManager::slotTagsJobResult(KIO::Job* job) } } -void AlbumManager::slotTagsJobData(KIO::Job*, const TQByteArray& data) +void AlbumManager::slotTagsJobData(TDEIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; @@ -1501,7 +1501,7 @@ void AlbumManager::slotTagsJobData(KIO::Job*, const TQByteArray& data) emit signalTAlbumsDirty(tagsStatMap); } -void AlbumManager::slotDatesJobResult(KIO::Job* job) +void AlbumManager::slotDatesJobResult(TDEIO::Job* job) { d->dateListJob = 0; @@ -1514,7 +1514,7 @@ void AlbumManager::slotDatesJobResult(KIO::Job* job) emit signalAllDAlbumsLoaded(); } -void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data) +void AlbumManager::slotDatesJobData(TDEIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index e85e216c..4998d767 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -46,7 +46,7 @@ class TQDate; -namespace KIO +namespace TDEIO { class Job; } @@ -417,12 +417,12 @@ signals: private slots: - void slotDatesJobResult(KIO::Job* job); - void slotDatesJobData(KIO::Job* job, const TQByteArray& data); - void slotAlbumsJobResult(KIO::Job* job); - void slotAlbumsJobData(KIO::Job* job, const TQByteArray& data); - void slotTagsJobResult(KIO::Job* job); - void slotTagsJobData(KIO::Job* job, const TQByteArray& data); + void slotDatesJobResult(TDEIO::Job* job); + void slotDatesJobData(TDEIO::Job* job, const TQByteArray& data); + void slotAlbumsJobResult(TDEIO::Job* job); + void slotAlbumsJobData(TDEIO::Job* job, const TQByteArray& data); + void slotTagsJobResult(TDEIO::Job* job); + void slotTagsJobData(TDEIO::Job* job, const TQByteArray& data); void slotDirty(const TQString& path); private: @@ -454,7 +454,7 @@ private: void scanSAlbums(); /** - * Makes use of a KIO::Job to list dates from the database + * Makes use of a TDEIO::Job to list dates from the database * @see slotResult * @see slotData */ diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp index 4ce7a11a..d6cc3342 100644 --- a/digikam/digikam/albumsettings.cpp +++ b/digikam/digikam/albumsettings.cpp @@ -131,7 +131,7 @@ public: TQStringList albumCollectionNames; - KConfig *config; + TDEConfig *config; AlbumSettings::AlbumSortOrder albumSortOrder; AlbumSettings::ImageSortOrder imageSortOrder; @@ -258,7 +258,7 @@ void AlbumSettings::init() void AlbumSettings::readSettings() { - KConfig* config = d->config; + TDEConfig* config = d->config; // --------------------------------------------------------------------- @@ -366,7 +366,7 @@ void AlbumSettings::readSettings() void AlbumSettings::saveSettings() { - KConfig* config = d->config; + TDEConfig* config = d->config; // --------------------------------------------------------------------- diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index f8067e7b..8c8ff0e7 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -329,7 +329,7 @@ void DateFolderView::slotSelectionChanged() void DateFolderView::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); TQString selected; @@ -363,7 +363,7 @@ void DateFolderView::loadViewState() void DateFolderView::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); DateFolderItem *item = dynamic_cast(d->listview->selectedItem()); diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index a2d9be81..a8244b22 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -99,9 +99,9 @@ #include "digikamapp.h" #include "digikamapp.moc" -using KIO::Job; -using KIO::UDSEntryList; -using KIO::UDSEntry; +using TDEIO::Job; +using TDEIO::UDSEntryList; +using TDEIO::UDSEntry; namespace Digikam { @@ -1365,7 +1365,7 @@ TQString DigikamApp::convertToLocalUrl( const TQString& folder ) { #if KDE_IS_VERSION(3,4,91) // Support for system:/ and media:/ (c) Stephan Kulow - KURL mlu = KIO::NetAccess::mostLocalURL( url, 0 ); + KURL mlu = TDEIO::NetAccess::mostLocalURL( url, 0 ); if (mlu.isLocalFile()) return mlu.path(); @@ -1399,15 +1399,15 @@ TQString DigikamApp::convertToLocalUrl( const TQString& folder ) return path; #else #ifndef UDS_LOCAL_PATH -#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING) +#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING) #else - using namespace KIO; + using namespace TDEIO; #endif - KIO::UDSEntry e; - if( KIO::NetAccess::stat( url, e, 0 ) ) + TDEIO::UDSEntry e; + if( TDEIO::NetAccess::stat( url, e, 0 ) ) { - const KIO::UDSEntry::ConstIterator end = e.end(); - for( KIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) + const TDEIO::UDSEntry::ConstIterator end = e.end(); + for( TDEIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) { if( (*it).m_uds == UDS_LOCAL_PATH && !(*it).m_str.isEmpty() ) return KURL::fromPathOrURL( (*it).m_str ).path(); @@ -1459,8 +1459,8 @@ void DigikamApp::slotDownloadImages() // Fetch the contents of the device. This is needed to make sure that the // media:/device gets mounted. - KIO::ListJob *job = KIO::listDir(KURL(d->cameraGuiPath), false, false); - KIO::NetAccess::synchronousRun(job,0); + TDEIO::ListJob *job = TDEIO::listDir(KURL(d->cameraGuiPath), false, false); + TDEIO::NetAccess::synchronousRun(job,0); TQString localUrl = convertToLocalUrl(d->cameraGuiPath); DDebug() << "slotDownloadImages: convertToLocalUrl " << d->cameraGuiPath << " to " << localUrl << endl; @@ -1557,26 +1557,26 @@ void DigikamApp::slotCameraMediaMenu() d->cameraMediaList->setItemEnabled(0, false); KURL kurl("media:/"); - KIO::ListJob *job = KIO::listDir(kurl, false, false); + TDEIO::ListJob *job = TDEIO::listDir(kurl, false, false); - connect( job, TQT_SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(KIO::Job*,const KIO::UDSEntryList&)) ); + connect( job, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); } void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) { int i = 0; - for(KIO::UDSEntryList::ConstIterator it = list.begin() ; it != list.end() ; ++it) + for(TDEIO::UDSEntryList::ConstIterator it = list.begin() ; it != list.end() ; ++it) { TQString name; TQString path; for ( UDSEntry::const_iterator et = (*it).begin() ; et != (*it).end() ; ++et ) { - if ( (*et).m_uds == KIO::UDS_NAME) + if ( (*et).m_uds == TDEIO::UDS_NAME) name = ( *et ).m_str; - if ( (*et).m_uds == KIO::UDS_URL) + if ( (*et).m_uds == TDEIO::UDS_URL) path = ( *et ).m_str; //DDebug() << ( *et ).m_str << endl; @@ -1755,7 +1755,7 @@ void DigikamApp::slotToggleFullScreen() } else { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); bool fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false); diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h index 6774f914..984f9535 100644 --- a/digikam/digikam/digikamapp.h +++ b/digikam/digikam/digikamapp.h @@ -98,7 +98,7 @@ protected: protected slots: - void slotCameraMediaMenuEntries( KIO::Job *, const KIO::UDSEntryList & ); + void slotCameraMediaMenuEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ); private: diff --git a/digikam/digikam/digikamappprivate.h b/digikam/digikam/digikamappprivate.h index 04391325..832d2fee 100644 --- a/digikam/digikam/digikamappprivate.h +++ b/digikam/digikam/digikamappprivate.h @@ -173,7 +173,7 @@ public: KAccel *accelerators; - KConfig *config; + TDEConfig *config; // Album Actions KAction *newAction; diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index 5a2a8528..b9832d68 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -72,7 +72,7 @@ namespace Digikam using namespace std; -DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent, +DigikamFirstRun::DigikamFirstRun(TDEConfig* config, TQWidget* parent, const char* name, bool modal, WFlags fl) : KDialogBase(parent, name, modal, i18n( "Album Library Path" ), Help|Ok|Cancel, Ok, true ) diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index cabb0a54..83899610 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -33,7 +33,7 @@ #include "digikam_export.h" -class KConfig; +class TDEConfig; class KURLRequester; namespace Digikam @@ -47,7 +47,7 @@ class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase public: - DigikamFirstRun(KConfig* config, TQWidget* parent = 0, const char* name = 0, + DigikamFirstRun(TDEConfig* config, TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = WDestructiveClose); ~DigikamFirstRun(); @@ -57,7 +57,7 @@ protected slots: private: - KConfig *m_config; + TDEConfig *m_config; FirstRunWidget *m_ui; }; diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 69c8d918..c3f91364 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -465,7 +465,7 @@ void DigikamView::setupConnections() void DigikamView::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("MainWindow"); if(config->hasKey("SplitterSizes")) @@ -476,7 +476,7 @@ void DigikamView::loadViewState() void DigikamView::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("MainWindow"); config->writeEntry("SplitterSizes", d->splitter->sizes()); @@ -1499,7 +1499,7 @@ void DigikamView::slotItemsInfoFromAlbums(const ImageInfoList& infoList) void DigikamView::slideShow(ImageInfoList &infoList) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index 03466dc8..3f4ae233 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -63,41 +63,41 @@ extern "C" namespace DIO { -KIO::Job* copy(const KURL& src, const KURL& dest) +TDEIO::Job* copy(const KURL& src, const KURL& dest) { - KIO::Job* job = KIO::copy(src, dest, true); + TDEIO::Job* job = TDEIO::copy(src, dest, true); new Watch(job); return job; } -KIO::Job* copy(const KURL::List& srcList, const KURL& dest) +TDEIO::Job* copy(const KURL::List& srcList, const KURL& dest) { - KIO::Job* job = KIO::copy(srcList, dest, true); + TDEIO::Job* job = TDEIO::copy(srcList, dest, true); new Watch(job); return job; } -KIO::Job* move(const KURL& src, const KURL& dest) +TDEIO::Job* move(const KURL& src, const KURL& dest) { - KIO::Job* job = KIO::move(src, dest, true); + TDEIO::Job* job = TDEIO::move(src, dest, true); new Watch(job); return job; } -KIO::Job* move(const KURL::List& srcList, const KURL& dest) +TDEIO::Job* move(const KURL::List& srcList, const KURL& dest) { - KIO::Job* job = KIO::move(srcList, dest, true); + TDEIO::Job* job = TDEIO::move(srcList, dest, true); new Watch(job); return job; } -KIO::Job* del(const KURL& src, bool useTrash) +TDEIO::Job* del(const KURL& src, bool useTrash) { - KIO::Job* job = 0; + TDEIO::Job* job = 0; if (useTrash) { @@ -108,20 +108,20 @@ KIO::Job* del(const KURL& src, bool useTrash) dest = TDEGlobalSettings::trashPath(); } - job = KIO::move( src, dest ); + job = TDEIO::move( src, dest ); } else { - job = KIO::del(src); + job = TDEIO::del(src); } new Watch(job); return job; } -KIO::Job* del(const KURL::List& srcList, bool useTrash) +TDEIO::Job* del(const KURL::List& srcList, bool useTrash) { - KIO::Job* job = 0; + TDEIO::Job* job = 0; if (useTrash) { @@ -132,20 +132,20 @@ KIO::Job* del(const KURL::List& srcList, bool useTrash) dest = TDEGlobalSettings::trashPath(); } - job = KIO::move( srcList, dest ); + job = TDEIO::move( srcList, dest ); } else { - job = KIO::del(srcList); + job = TDEIO::del(srcList); } new Watch(job); return job; } -KIO::CopyJob *rename(const KURL& src, const KURL& dest) +TDEIO::CopyJob *rename(const KURL& src, const KURL& dest) { - KIO::CopyJob * job = KIO::move(src, dest, false); + TDEIO::CopyJob * job = TDEIO::move(src, dest, false); new Watch(job); return job; @@ -172,21 +172,21 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) struct stat stbuf; while (::stat(TQFile::encodeName(dstPath), &stbuf) == 0) { - KIO::RenameDlg_Result result = - KIO::open_RenameDlg(i18n("Rename File"), srcPath, dstPath, - KIO::RenameDlg_Mode(KIO::M_SINGLE | - KIO::M_OVERWRITE), + TDEIO::RenameDlg_Result result = + TDEIO::open_RenameDlg(i18n("Rename File"), srcPath, dstPath, + TDEIO::RenameDlg_Mode(TDEIO::M_SINGLE | + TDEIO::M_OVERWRITE), newDstPath); dstPath = newDstPath; switch (result) { - case KIO::R_CANCEL: + case TDEIO::R_CANCEL: { return false; } - case KIO::R_OVERWRITE: + case TDEIO::R_OVERWRITE: { overwrite = true; break; @@ -213,7 +213,7 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) */ } -KIO::Job* scan(const KURL& albumURL) +TDEIO::Job* scan(const KURL& albumURL) { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -227,8 +227,8 @@ KIO::Job* scan(const KURL& albumURL) // extra parameter: trigger scan ds << 1; - KIO::Job* job = new KIO::TransferJob(albumURL, - KIO::CMD_SPECIAL, + TDEIO::Job* job = new TDEIO::TransferJob(albumURL, + TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); new Watch(job); @@ -241,14 +241,14 @@ bool running() return (Watch::m_runCount != 0); } -Watch::Watch(KIO::Job* job) +Watch::Watch(TDEIO::Job* job) { m_runCount++; - connect(job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotDone(KIO::Job*))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotDone(TDEIO::Job*))); } -void Watch::slotDone(KIO::Job*) +void Watch::slotDone(TDEIO::Job*) { Digikam::AlbumManager::instance()->refresh(); Digikam::AlbumLister::instance()->refresh(); diff --git a/digikam/digikam/dio.h b/digikam/digikam/dio.h index 23791179..0d033979 100644 --- a/digikam/digikam/dio.h +++ b/digikam/digikam/dio.h @@ -31,21 +31,21 @@ namespace DIO { - KIO::Job* copy(const KURL& src, const KURL& dest); + TDEIO::Job* copy(const KURL& src, const KURL& dest); - KIO::Job* copy(const KURL::List& srcList, const KURL& dest); + TDEIO::Job* copy(const KURL::List& srcList, const KURL& dest); - KIO::Job* move(const KURL& src, const KURL& dest); + TDEIO::Job* move(const KURL& src, const KURL& dest); - KIO::Job* move(const KURL::List& srcList, const KURL& dest); + TDEIO::Job* move(const KURL::List& srcList, const KURL& dest); - KIO::Job* del(const KURL& src, bool useTrash = true); + TDEIO::Job* del(const KURL& src, bool useTrash = true); - KIO::Job* del(const KURL::List& srcList, bool useTrash = true); + TDEIO::Job* del(const KURL::List& srcList, bool useTrash = true); - KIO::CopyJob* rename(const KURL& src, const KURL& dest); + TDEIO::CopyJob* rename(const KURL& src, const KURL& dest); - KIO::Job* scan(const KURL& albumURL); + TDEIO::Job* scan(const KURL& albumURL); bool running(); diff --git a/digikam/digikam/dio_p.h b/digikam/digikam/dio_p.h index 61f881e5..8ce3c108 100644 --- a/digikam/digikam/dio_p.h +++ b/digikam/digikam/dio_p.h @@ -28,7 +28,7 @@ #include -namespace KIO +namespace TDEIO { class Job; } @@ -42,13 +42,13 @@ class Watch : public TQObject public: - Watch(KIO::Job* job); + Watch(TDEIO::Job* job); static uint m_runCount; private slots: - void slotDone(KIO::Job* job); + void slotDone(TDEIO::Job* job); }; } // namespace DIO diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index ad1f2f46..c59f7c4d 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -383,7 +383,7 @@ void FolderView::slotAllAlbumsLoaded() void FolderView::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -430,7 +430,7 @@ void FolderView::loadViewState() void FolderView::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); FolderItem *item = dynamic_cast(selectedItem()); diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index c5590acb..d9617b25 100644 --- a/digikam/digikam/main.cpp +++ b/digikam/digikam/main.cpp @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) TDEApplication app; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); TQString version = config->readEntry("Version"); diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index b0edda2d..ee57bf99 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -63,7 +63,7 @@ public: TQGuardedPtr thumbJob; - KIO::TransferJob* listJob; + TDEIO::TransferJob* listJob; }; SearchResultsView::SearchResultsView(TQWidget* parent) @@ -107,14 +107,14 @@ void SearchResultsView::openURL(const KURL& url) ds << 0; // recursive sub-tags (not needed here) ds << 2; // miniListing (Use 1 for full listing) - d->listJob = new KIO::TransferJob(url, KIO::CMD_SPECIAL, + d->listJob = new TDEIO::TransferJob(url, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->listJob, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*))); + connect(d->listJob, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*))); - connect(d->listJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(d->listJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void SearchResultsView::clear() @@ -131,7 +131,7 @@ void SearchResultsView::clear() TQIconView::clear(); } -void SearchResultsView::slotData(KIO::Job*, const TQByteArray &data) +void SearchResultsView::slotData(TDEIO::Job*, const TQByteArray &data) { for (TQIconViewItem* item = firstItem(); item; item = item->nextItem()) ((SearchResultsItem*)item)->m_marked = false; @@ -187,7 +187,7 @@ void SearchResultsView::slotData(KIO::Job*, const TQByteArray &data) } } -void SearchResultsView::slotResult(KIO::Job *job) +void SearchResultsView::slotResult(TDEIO::Job *job) { if (job->error()) job->showErrorDialog(this); diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index 1c5d8a78..b8c48a73 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -38,7 +38,7 @@ class TQPixmap; class KFileItem; -namespace KIO +namespace TDEIO { class TransferJob; class Job; @@ -67,8 +67,8 @@ signals: private slots: - void slotData(KIO::Job *job, const TQByteArray &data); - void slotResult(KIO::Job *job); + void slotData(TDEIO::Job *job, const TQByteArray &data); + void slotResult(TDEIO::Job *job); void slotGotThumbnail(const KURL& url, const TQPixmap& pix); void slotFailedThumbnail(const KURL& url); diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index bcb2e5cf..871e7bee 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -104,9 +104,9 @@ bool SyncJob::delPriv(const KURL::List& urls) { success_ = true; - KIO::Job* job = KIO::del( urls ); - connect( job, TQT_SIGNAL(result( KIO::Job* )), - TQT_SLOT(slotResult( KIO::Job*)) ); + TDEIO::Job* job = TDEIO::del( urls ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), + TQT_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -122,9 +122,9 @@ bool SyncJob::trashPriv(const KURL::List& urls) dest = TDEGlobalSettings::trashPath(); } - KIO::Job* job = KIO::move( urls, dest ); - connect( job, TQT_SIGNAL(result( KIO::Job* )), - TQT_SLOT(slotResult( KIO::Job*)) ); + TDEIO::Job* job = TDEIO::move( urls, dest ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), + TQT_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -134,10 +134,10 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) { success_ = true; - KIO::FileCopyJob* job = KIO::file_move(src, dest, -1, + TDEIO::FileCopyJob* job = TDEIO::file_move(src, dest, -1, true, false, false); - connect( job, TQT_SIGNAL(result( KIO::Job* )), - TQT_SLOT(slotResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), + TQT_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -152,7 +152,7 @@ void SyncJob::enter_loop() tqt_leave_modal(&dummy); } -void SyncJob::slotResult( KIO::Job * job ) +void SyncJob::slotResult( TDEIO::Job * job ) { lastErrorCode_ = job->error(); success_ = !(lastErrorCode_); diff --git a/digikam/digikam/syncjob.h b/digikam/digikam/syncjob.h index 546a2d59..0143b216 100644 --- a/digikam/digikam/syncjob.h +++ b/digikam/digikam/syncjob.h @@ -41,7 +41,7 @@ class TQString; -namespace KIO +namespace TDEIO { class Job; } @@ -96,7 +96,7 @@ private: private slots: - void slotResult( KIO::Job * job ); + void slotResult( TDEIO::Job * job ); void slotGotThumbnailFromIcon(Album *album, const TQPixmap& pix); void slotLoadThumbnailFailed(Album *album); void slotGotThumbnailFromIcon(const KURL& url, const TQPixmap& pix); diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index de16a17e..babed3c0 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -330,7 +330,7 @@ TagFilterView::TagFilterView(TQWidget* parent) // ------------------------------------------------------------------------ - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Tag Filters View"); d->matchingCond = (AlbumLister::MatchingCondition)(config->readNumEntry("Matching Condition", AlbumLister::OrCondition)); @@ -340,7 +340,7 @@ TagFilterView::TagFilterView(TQWidget* parent) TagFilterView::~TagFilterView() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Tag Filters View"); config->writeEntry("Matching Condition", (int)(d->matchingCond)); config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags)); @@ -1359,7 +1359,7 @@ void TagFilterView::slotResetTagFilters() void TagFilterView::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -1406,7 +1406,7 @@ void TagFilterView::loadViewState() void TagFilterView::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); TagFilterViewItem *item = dynamic_cast(selectedItem()); diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index dfc91cc4..20d70d37 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -325,7 +325,7 @@ void TimeLineView::slotInit() void TimeLineView::readConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("TimeLine SideBar"); d->timeUnitCB->setCurrentItem(config->readNumEntry("Histogram TimeUnit", TimeLineWidget::Month)); @@ -341,7 +341,7 @@ void TimeLineView::readConfig() void TimeLineView::writeConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("TimeLine SideBar"); config->writeEntry("Histogram TimeUnit", d->timeUnitCB->currentItem()); config->writeEntry("Histogram Scale", d->scaleBG->selectedId()); diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp index 4696d28e..18a9adfc 100644 --- a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp +++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp @@ -100,7 +100,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQString newDB= libraryPath + "/digikam3.db"; #ifdef NFS_HACK - newDB = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(newDB))); + newDB = locateLocal("appdata", TDEIO::encodeFileName(TQDir::cleanDirPath(newDB))); DDebug() << "NFS: " << newDB << endl; #endif @@ -119,7 +119,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQString dbPath = libraryPath + "/digikam.db"; #ifdef NFS_HACK - dbPath = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(dbPath))); + dbPath = locateLocal("appdata", TDEIO::encodeFileName(TQDir::cleanDirPath(dbPath))); DDebug() << "From NFS: " << dbPath << endl; #endif diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 57a601ee..f7ac65c7 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -558,7 +558,7 @@ void AdjustCurveDialog::slotCurveTypeChanged(int type) void AdjustCurveDialog::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustcurves Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -595,7 +595,7 @@ void AdjustCurveDialog::readUserSettings() void AdjustCurveDialog::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustcurves Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index 51157233..718dc1ad 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -539,7 +539,7 @@ void AdjustCurvesTool::slotCurveTypeChanged(int type) void AdjustCurvesTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustcurves Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -578,7 +578,7 @@ void AdjustCurvesTool::readSettings() void AdjustCurvesTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustcurves Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index cca520c8..d7962269 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -690,7 +690,7 @@ void AdjustLevelDialog::slotScaleChanged(int scale) void AdjustLevelDialog::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustlevels Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -728,7 +728,7 @@ void AdjustLevelDialog::readUserSettings() void AdjustLevelDialog::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustlevels Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index 835ea942..83f50371 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -672,7 +672,7 @@ void AdjustLevelsTool::slotScaleChanged(int scale) void AdjustLevelsTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustlevels Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -710,7 +710,7 @@ void AdjustLevelsTool::readSettings() void AdjustLevelsTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("adjustlevels Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index 8b38ea91..e07400b1 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -212,7 +212,7 @@ void AntiVignettingTool::renderingFinished() void AntiVignettingTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("antivignettings Tool"); m_densityInput->blockSignals(true); @@ -241,7 +241,7 @@ void AntiVignettingTool::readSettings() void AntiVignettingTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("antivignettings Tool"); config->writeEntry("DensityAjustment", m_densityInput->value()); config->writeEntry("PowerAjustment", m_powerInput->value()); diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 9d54663f..ffd31141 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -211,7 +211,7 @@ void ImageEffect_AntiVignetting::renderingFinished() void ImageEffect_AntiVignetting::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("antivignettings Tool Dialog"); m_densityInput->blockSignals(true); @@ -240,7 +240,7 @@ void ImageEffect_AntiVignetting::readUserSettings() void ImageEffect_AntiVignetting::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("antivignettings Tool Dialog"); config->writeEntry("DensityAjustment", m_densityInput->value()); config->writeEntry("PowerAjustment", m_powerInput->value()); diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp index 0f6aa41c..771b2836 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.cpp +++ b/digikam/imageplugins/blurfx/blurfxtool.cpp @@ -196,7 +196,7 @@ void BlurFXTool::renderingFinished(void) void BlurFXTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("blurfx Tool"); m_effectType->blockSignals(true); m_distanceInput->blockSignals(true); @@ -213,7 +213,7 @@ void BlurFXTool::readSettings() void BlurFXTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("blurfx Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("DistanceAjustment", m_distanceInput->value()); diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp index f1d7ccaf..4ecd98a4 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -194,7 +194,7 @@ void ImageEffect_BlurFX::renderingFinished(void) void ImageEffect_BlurFX::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("blurfx Tool Dialog"); m_effectType->blockSignals(true); m_distanceInput->blockSignals(true); @@ -209,7 +209,7 @@ void ImageEffect_BlurFX::readUserSettings() void ImageEffect_BlurFX::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("blurfx Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("DistanceAjustment", m_distanceInput->value()); diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index 2aee7f0e..1056221d 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -204,7 +204,7 @@ void BorderTool::readSettings() m_secondColorButton->blockSignals(true); m_preserveAspectRatio->blockSignals(true); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("border Tool"); m_borderType->setCurrentItem(config->readNumEntry("Border Type", m_borderType->defaultItem())); @@ -237,7 +237,7 @@ void BorderTool::readSettings() void BorderTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("border Tool"); config->writeEntry("Border Type", m_borderType->currentItem()); diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index 75608065..027718dc 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -204,7 +204,7 @@ void ImageEffect_Border::readUserSettings(void) m_secondColorButton->blockSignals(true); m_preserveAspectRatio->blockSignals(true); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("border Tool Dialog"); m_borderType->setCurrentItem(config->readNumEntry("Border Type", Border::SolidBorder)); @@ -237,7 +237,7 @@ void ImageEffect_Border::readUserSettings(void) void ImageEffect_Border::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("border Tool Dialog"); config->writeEntry("Border Type", m_borderType->currentItem()); diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index 3a5ea7e4..ea047aff 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -525,7 +525,7 @@ void ChannelMixerDialog::slotScaleChanged(int scale) void ChannelMixerDialog::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("channelmixer Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -559,7 +559,7 @@ void ChannelMixerDialog::readUserSettings() void ChannelMixerDialog::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("channelmixer Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 86598f07..353ca006 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -517,7 +517,7 @@ void ChannelMixerTool::slotScaleChanged(int scale) void ChannelMixerTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("channelmixer Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. @@ -550,7 +550,7 @@ void ChannelMixerTool::readSettings() void ChannelMixerTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("channelmixer Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp index 712c252f..29108987 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.cpp +++ b/digikam/imageplugins/charcoal/charcoaltool.cpp @@ -129,7 +129,7 @@ void CharcoalTool::renderingFinished() void CharcoalTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("charcoal Tool"); m_pencilInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -143,7 +143,7 @@ void CharcoalTool::readSettings() void CharcoalTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("charcoal Tool"); config->writeEntry("PencilAjustment", m_pencilInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp index 8d2199fd..2faa191a 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -123,7 +123,7 @@ void ImageEffect_Charcoal::renderingFinished() void ImageEffect_Charcoal::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("charcoal Tool Dialog"); m_pencilInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -135,7 +135,7 @@ void ImageEffect_Charcoal::readUserSettings() void ImageEffect_Charcoal::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("charcoal Tool Dialog"); config->writeEntry("PencilAjustment", m_pencilInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index c720aa9c..f8fae2bf 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -235,7 +235,7 @@ ColorFXTool::~ColorFXTool() void ColorFXTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("coloreffect Tool"); m_effectType->setCurrentItem(config->readNumEntry("EffectType", m_effectType->defaultItem())); m_levelInput->setValue(config->readNumEntry("LevelAjustment", m_levelInput->defaultValue())); @@ -249,7 +249,7 @@ void ColorFXTool::readSettings() void ColorFXTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("coloreffect Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("LevelAjustment", m_levelInput->value()); diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 8b3a824c..7b9102da 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -242,7 +242,7 @@ ImageEffect_ColorFX::~ImageEffect_ColorFX() void ImageEffect_ColorFX::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("coloreffect Tool Dialog"); m_effectType->setCurrentItem(config->readNumEntry("EffectType", ColorFX)); m_levelInput->setValue(config->readNumEntry("LevelAjustment", 0)); @@ -252,7 +252,7 @@ void ImageEffect_ColorFX::readUserSettings() void ImageEffect_ColorFX::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("coloreffect Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("LevelAjustment", m_levelInput->value()); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index e59cfaa9..25fbbfb4 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -292,7 +292,7 @@ void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color) void AutoCorrectionTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("autocorrection Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -304,7 +304,7 @@ void AutoCorrectionTool::readSettings() void AutoCorrectionTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("autocorrection Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index 947057a6..62256926 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -266,7 +266,7 @@ void BCGTool::slotColorSelectedFromTarget(const DColor &color) void BCGTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("bcgadjust Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -280,7 +280,7 @@ void BCGTool::readSettings() void BCGTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("bcgadjust Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp index d9a9d446..3d6b191b 100644 --- a/digikam/imageplugins/coreplugin/blurtool.cpp +++ b/digikam/imageplugins/coreplugin/blurtool.cpp @@ -104,14 +104,14 @@ BlurTool::~BlurTool() void BlurTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("gaussianblur Tool"); m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", m_radiusInput->defaultValue())); } void BlurTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("gaussianblur Tool"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->sync(); diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 54235710..821307d2 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -630,7 +630,7 @@ void BWSepiaTool::slotColorSelectedFromTarget(const DColor &color) void BWSepiaTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("convertbw Tool"); m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab)); @@ -673,7 +673,7 @@ void BWSepiaTool::readSettings() void BWSepiaTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("convertbw Tool"); config->writeEntry("Settings Tab", m_tab->currentPageIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index a5f67217..a212ebe9 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -331,7 +331,7 @@ void HSLTool::slotSChanged(double s) void HSLTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("hsladjust Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -349,7 +349,7 @@ void HSLTool::readSettings() void HSLTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("hsladjust Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index c1955f46..05b3ba77 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -315,7 +315,7 @@ void ImageEffect_HSL::slotSChanged(double s) void ImageEffect_HSL::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("hsladjust Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -330,7 +330,7 @@ void ImageEffect_HSL::readUserSettings() void ImageEffect_HSL::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("hsladjust Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 421847e9..716fa83b 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -538,7 +538,7 @@ ICCProofTool::~ICCProofTool() void ICCProofTool::readSettings() { TQString defaultICCPath = TDEGlobalSettings::documentPath(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); // General settings of digiKam Color Management config->setGroup("Color Management"); @@ -615,7 +615,7 @@ void ICCProofTool::readSettings() void ICCProofTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colormanagement Tool"); config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index f69e22d7..9b617dd1 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -288,7 +288,7 @@ void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DCo void ImageEffect_AutoCorrection::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("autocorrection Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -299,7 +299,7 @@ void ImageEffect_AutoCorrection::readUserSettings() void ImageEffect_AutoCorrection::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("autocorrection Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index de5240d8..867d13b5 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -256,7 +256,7 @@ void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color void ImageEffect_BCG::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("bcgadjust Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -269,7 +269,7 @@ void ImageEffect_BCG::readUserSettings() void ImageEffect_BCG::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("bcgadjust Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp index 233dc46e..feffdade 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp @@ -79,14 +79,14 @@ ImageEffect_Blur::~ImageEffect_Blur() void ImageEffect_Blur::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("gaussianblur Tool Dialog"); m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", 0)); } void ImageEffect_Blur::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("gaussianblur Tool Dialog"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->sync(); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 43064a8a..148856d6 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -634,7 +634,7 @@ void ImageEffect_BWSepia::slotColorSelectedFromTarget( const Digikam::DColor &co void ImageEffect_BWSepia::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("convertbw Tool Dialog"); m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab)); @@ -676,7 +676,7 @@ void ImageEffect_BWSepia::readUserSettings() void ImageEffect_BWSepia::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("convertbw Tool Dialog"); config->writeEntry("Settings Tab", m_tab->currentPageIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index 29648a43..2b27de8e 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -528,7 +528,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof() void ImageEffect_ICCProof::readUserSettings() { TQString defaultICCPath = TDEGlobalSettings::documentPath(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); // General settings of digiKam Color Management config->setGroup("Color Management"); @@ -604,7 +604,7 @@ void ImageEffect_ICCProof::readUserSettings() void ImageEffect_ICCProof::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colormanagement Tool Dialog"); config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex()); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index bc10ffac..6011c18f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -282,7 +282,7 @@ void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& colo void ImageEffect_RedEye::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("redeye Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -300,7 +300,7 @@ void ImageEffect_RedEye::readUserSettings() void ImageEffect_RedEye::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("redeye Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index 39dca76f..cbd72938 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -294,7 +294,7 @@ void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color void ImageEffect_RGB::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colorbalance Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -308,7 +308,7 @@ void ImageEffect_RGB::readUserSettings() void ImageEffect_RGB::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colorbalance Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 954f49ad..bdcbdd43 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -349,7 +349,7 @@ ImageEffect_RatioCrop::~ImageEffect_RatioCrop() void ImageEffect_RatioCrop::readSettings() { TQColor defaultGuideColor(250, 250, 255); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool Dialog"); // No guide lines per default. @@ -424,7 +424,7 @@ void ImageEffect_RatioCrop::readSettings() void ImageEffect_RatioCrop::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool Dialog"); if (m_originalIsLandscape) diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index 8c660bd6..8a71ec10 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -398,7 +398,7 @@ RatioCropTool::~RatioCropTool() void RatioCropTool::readSettings() { TQColor defaultGuideColor(250, 250, 255); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool"); // No guide lines per default. @@ -462,7 +462,7 @@ void RatioCropTool::readSettings() void RatioCropTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool"); if (m_originalIsLandscape) diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index c5f59ed3..1214f7ad 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -294,7 +294,7 @@ void RedEyeTool::slotColorSelectedFromTarget(const DColor& color) void RedEyeTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("redeye Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -313,7 +313,7 @@ void RedEyeTool::readSettings() void RedEyeTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("redeye Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index 32d5803e..516044f9 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -309,7 +309,7 @@ void RGBTool::slotColorSelectedFromTarget(const DColor &color) void RGBTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colorbalance Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -324,7 +324,7 @@ void RGBTool::readSettings() void RGBTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("colorbalance Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 19e61a06..40e09c04 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -332,7 +332,7 @@ void ImageEffect_Sharpen::slotSharpMethodActived(int w) void ImageEffect_Sharpen::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("sharpen Tool Dialog"); m_radiusInput->blockSignals(true); m_radiusInput2->blockSignals(true); @@ -369,7 +369,7 @@ void ImageEffect_Sharpen::readUserSettings() void ImageEffect_Sharpen::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("sharpen Tool Dialog"); config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value()); config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value()); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index e50594e4..57962c62 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -375,7 +375,7 @@ void SharpenTool::slotSharpMethodActived(int w) void SharpenTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("sharpen Tool"); m_radiusInput->blockSignals(true); m_radiusInput2->blockSignals(true); @@ -415,7 +415,7 @@ void SharpenTool::readSettings() void SharpenTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("sharpen Tool"); config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value()); config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value()); diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index c95d8d0a..4fdcc6fb 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -228,7 +228,7 @@ void DistortionFXTool::renderingFinished() void DistortionFXTool::readSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("distortionfx Tool"); m_effectType->blockSignals(true); @@ -251,7 +251,7 @@ void DistortionFXTool::readSettings(void) void DistortionFXTool::writeSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("distortionfx Tool"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("IterationAjustment", m_iterationInput->value()); diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index 1bc6e383..0000dc53 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -219,7 +219,7 @@ void ImageEffect_DistortionFX::renderingFinished() void ImageEffect_DistortionFX::readUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("distortionfx Tool Dialog"); m_effectType->blockSignals(true); @@ -239,7 +239,7 @@ void ImageEffect_DistortionFX::readUserSettings(void) void ImageEffect_DistortionFX::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("distortionfx Tool Dialog"); config->writeEntry("EffectType", m_effectType->currentItem()); config->writeEntry("IterationAjustment", m_iterationInput->value()); diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp index a73176c3..d1946c6d 100644 --- a/digikam/imageplugins/emboss/embosstool.cpp +++ b/digikam/imageplugins/emboss/embosstool.cpp @@ -111,7 +111,7 @@ void EmbossTool::renderingFinished() void EmbossTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("emboss Tool"); m_depthInput->blockSignals(true); m_depthInput->setValue(config->readNumEntry("DepthAjustment", m_depthInput->defaultValue())); @@ -120,7 +120,7 @@ void EmbossTool::readSettings() void EmbossTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("emboss Tool"); config->writeEntry("DepthAjustment", m_depthInput->value()); m_previewWidget->writeSettings(); diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp index 41ba183d..3069d6d4 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp +++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp @@ -110,7 +110,7 @@ void ImageEffect_Emboss::renderingFinished() void ImageEffect_Emboss::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("emboss Tool Dialog"); m_depthInput->blockSignals(true); m_depthInput->setValue(config->readNumEntry("DepthAjustment", 30)); @@ -119,7 +119,7 @@ void ImageEffect_Emboss::readUserSettings() void ImageEffect_Emboss::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("emboss Tool Dialog"); config->writeEntry("DepthAjustment", m_depthInput->value()); config->sync(); diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp index 46ebea44..cd1c55e6 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.cpp +++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp @@ -131,7 +131,7 @@ void FilmGrainTool::renderingFinished() void FilmGrainTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("filmgrain Tool"); m_sensibilitySlider->blockSignals(true); m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12)); @@ -141,7 +141,7 @@ void FilmGrainTool::readSettings() void FilmGrainTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("filmgrain Tool"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); m_previewWidget->writeSettings(); diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp index b496ccf1..d4827a38 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -131,7 +131,7 @@ void ImageEffect_FilmGrain::renderingFinished() void ImageEffect_FilmGrain::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("filmgrain Tool Dialog"); m_sensibilitySlider->blockSignals(true); m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12)); @@ -141,7 +141,7 @@ void ImageEffect_FilmGrain::readUserSettings() void ImageEffect_FilmGrain::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("filmgrain Tool Dialog"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->sync(); diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index ca384f43..f852ac59 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -181,7 +181,7 @@ void FreeRotationTool::slotColorGuideChanged() void FreeRotationTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("freerotation Tool"); m_angleInput->setValue(config->readNumEntry("Main Angle", m_angleInput->defaultValue())); m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", m_fineAngleInput->defaultValue())); @@ -196,7 +196,7 @@ void FreeRotationTool::readSettings() void FreeRotationTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("freerotation Tool"); config->writeEntry("Main Angle", m_angleInput->value()); config->writeEntry("Fine Angle", m_fineAngleInput->value()); diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index 0a012aee..dceedd1e 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -175,7 +175,7 @@ ImageEffect_FreeRotation::~ImageEffect_FreeRotation() void ImageEffect_FreeRotation::readUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("freerotation Tool Dialog"); m_angleInput->setValue(config->readNumEntry("Main Angle", 0)); m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", 0.0)); @@ -186,7 +186,7 @@ void ImageEffect_FreeRotation::readUserSettings(void) void ImageEffect_FreeRotation::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("freerotation Tool Dialog"); config->writeEntry("Main Angle", m_angleInput->value()); config->writeEntry("Fine Angle", m_fineAngleInput->value()); diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp index e3450e9b..a12cc0aa 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.cpp +++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp @@ -75,9 +75,9 @@ void BlackFrameParser::parseHotPixels(const TQString &file) void BlackFrameParser::parseBlackFrame(const KURL &url) { #if KDE_IS_VERSION(3,2,0) - KIO::NetAccess::download(url, m_localFile, kapp->activeWindow()); + TDEIO::NetAccess::download(url, m_localFile, kapp->activeWindow()); #else - KIO::NetAccess::download(url, m_localFile); + TDEIO::NetAccess::download(url, m_localFile); #endif if (!m_imageLoaderThread) diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 84b5ce7b..a0bd18b8 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -135,7 +135,7 @@ HotPixelsTool::~HotPixelsTool() void HotPixelsTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("hotpixels Tool"); m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", @@ -166,7 +166,7 @@ void HotPixelsTool::slotLoadingComplete() void HotPixelsTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("hotpixels Tool"); config->writeEntry("Last Black Frame File", m_blackFrameURL.url()); config->writeEntry("Filter Method", m_filterMethodCombo->currentItem()); diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index fb95e0f6..6f816155 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -133,7 +133,7 @@ ImageEffect_HotPixels::~ImageEffect_HotPixels() void ImageEffect_HotPixels::readUserSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("hotpixels Tool Dialog"); m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", @@ -153,7 +153,7 @@ void ImageEffect_HotPixels::readUserSettings() void ImageEffect_HotPixels::writeUserSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("hotpixels Tool Dialog"); config->writeEntry("Last Black Frame File", m_blackFrameURL.url()); config->writeEntry("Filter Method", m_filterMethodCombo->currentItem()); diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp index 414e205f..70e4fa54 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp +++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp @@ -150,7 +150,7 @@ void ImageEffect_Infrared::renderingFinished() void ImageEffect_Infrared::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("infrared Tool Dialog"); m_sensibilitySlider->blockSignals(true); m_addFilmGrain->blockSignals(true); @@ -163,7 +163,7 @@ void ImageEffect_Infrared::readUserSettings() void ImageEffect_Infrared::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("infrared Tool Dialog"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked()); diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp index 0e9de024..124e9f81 100644 --- a/digikam/imageplugins/infrared/infraredtool.cpp +++ b/digikam/imageplugins/infrared/infraredtool.cpp @@ -150,7 +150,7 @@ void InfraredTool::renderingFinished() void InfraredTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("infrared Tool"); m_sensibilitySlider->blockSignals(true); m_addFilmGrain->blockSignals(true); @@ -163,7 +163,7 @@ void InfraredTool::readSettings() void InfraredTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("infrared Tool"); config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value()); config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked()); diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index 99dee40a..38ebe162 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -218,7 +218,7 @@ void ImageEffect_InPainting_Dialog::renderingFinished() void ImageEffect_InPainting_Dialog::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("inpainting Tool Dialog"); Digikam::GreycstorationSettings settings; @@ -249,7 +249,7 @@ void ImageEffect_InPainting_Dialog::readUserSettings() void ImageEffect_InPainting_Dialog::writeUserSettings() { Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("inpainting Tool Dialog"); config->writeEntry("Preset", m_inpaintingTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index 5eff3482..efd2b6d8 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -179,7 +179,7 @@ void InPaintingTool::renderingFinished() void InPaintingTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("inpainting Tool"); GreycstorationSettings settings; @@ -212,7 +212,7 @@ void InPaintingTool::readSettings() void InPaintingTool::writeSettings() { GreycstorationSettings settings = m_settingsWidget->getSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("inpainting Tool"); config->writeEntry("Preset", m_inpaintingTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index 99077e28..fd7d091b 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -300,8 +300,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index 03d4db98..df419bbd 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -225,7 +225,7 @@ ImageEffect_InsertText::~ImageEffect_InsertText() void ImageEffect_InsertText::readUserSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("inserttext Tool Dialog"); TQColor black(0, 0, 0); TQFont defaultFont; @@ -253,7 +253,7 @@ void ImageEffect_InsertText::readUserSettings() void ImageEffect_InsertText::writeUserSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("inserttext Tool Dialog"); config->writeEntry( "Text Rotation", m_textRotation->currentItem() ); diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index 57819ff2..14bb83fe 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -215,7 +215,7 @@ InsertTextTool::~InsertTextTool() void InsertTextTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("inserttext Tool"); TQColor black(0, 0, 0); TQFont defaultFont; @@ -243,7 +243,7 @@ void InsertTextTool::readSettings() void InsertTextTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("inserttext Tool"); config->writeEntry("Text Rotation", m_textRotation->currentItem()); diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index ec7e09cc..3c768a0a 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -197,7 +197,7 @@ ImageEffect_LensDistortion::~ImageEffect_LensDistortion() void ImageEffect_LensDistortion::readUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("lensdistortion Tool Dialog"); m_mainInput->blockSignals(true); @@ -220,7 +220,7 @@ void ImageEffect_LensDistortion::readUserSettings(void) void ImageEffect_LensDistortion::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("lensdistortion Tool Dialog"); config->writeEntry("2nd Order Distortion", m_mainInput->value()); config->writeEntry("4th Order Distortion", m_edgeInput->value()); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index 4cdaffaa..3ee006d5 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -205,7 +205,7 @@ void LensDistortionTool::slotColorGuideChanged() void LensDistortionTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("lensdistortion Tool"); m_mainInput->blockSignals(true); @@ -231,7 +231,7 @@ void LensDistortionTool::readSettings() void LensDistortionTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("lensdistortion Tool"); config->writeEntry("2nd Order Distortion", m_mainInput->value()); config->writeEntry("4th Order Distortion", m_edgeInput->value()); diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index b2c1c57d..acbbf676 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -316,7 +316,7 @@ void ImageEffect_NoiseReduction::renderingFinished() void ImageEffect_NoiseReduction::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("noisereduction Tool Dialog"); m_radiusInput->setEnabled(true); m_lumToleranceInput->setEnabled(true); @@ -354,7 +354,7 @@ void ImageEffect_NoiseReduction::readUserSettings() void ImageEffect_NoiseReduction::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("noisereduction Tool Dialog"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value()); diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index c2cea094..6b36581d 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -301,7 +301,7 @@ void NoiseReductionTool::renderingFinished() void NoiseReductionTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("noisereduction Tool"); m_radiusInput->setEnabled(false); @@ -340,7 +340,7 @@ void NoiseReductionTool::readSettings() void NoiseReductionTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("noisereduction Tool"); config->writeEntry("RadiusAjustment", m_radiusInput->value()); config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value()); diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp index bf7c47e8..40b1afb8 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -130,7 +130,7 @@ void ImageEffect_OilPaint::renderingFinished() void ImageEffect_OilPaint::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("oilpaint Tool Dialog"); m_brushSizeInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -142,7 +142,7 @@ void ImageEffect_OilPaint::readUserSettings() void ImageEffect_OilPaint::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("oilpaint Tool Dialog"); config->writeEntry("BrushSize", m_brushSizeInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp index 0a280ed9..4d903b0d 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.cpp +++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp @@ -134,7 +134,7 @@ void OilPaintTool::renderingFinished() void OilPaintTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("oilpaint Tool"); m_brushSizeInput->blockSignals(true); m_smoothInput->blockSignals(true); @@ -148,7 +148,7 @@ void OilPaintTool::readSettings() void OilPaintTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("oilpaint Tool"); config->writeEntry("BrushSize", m_brushSizeInput->value()); config->writeEntry("SmoothAjustment", m_smoothInput->value()); diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index 827ca9cf..ff9c6ae7 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -199,7 +199,7 @@ ImageEffect_Perspective::~ImageEffect_Perspective() void ImageEffect_Perspective::readUserSettings(void) { TQColor defaultGuideColor(TQt::red); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("perspective Tool Dialog"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false)); @@ -213,7 +213,7 @@ void ImageEffect_Perspective::readUserSettings(void) void ImageEffect_Perspective::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("perspective Tool Dialog"); config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked()); config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked()); diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index 99670b45..71c79be1 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -193,7 +193,7 @@ PerspectiveTool::~PerspectiveTool() void PerspectiveTool::readSettings() { TQColor defaultGuideColor(TQt::red); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("perspective Tool"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false)); @@ -207,7 +207,7 @@ void PerspectiveTool::readSettings() void PerspectiveTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("perspective Tool"); config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked()); config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked()); diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp index 99e88b87..607f615b 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -153,7 +153,7 @@ void ImageEffect_RainDrop::renderingFinished() void ImageEffect_RainDrop::readUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("raindrops Tool Dialog"); m_dropInput->blockSignals(true); @@ -173,7 +173,7 @@ void ImageEffect_RainDrop::readUserSettings(void) void ImageEffect_RainDrop::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("raindrops Tool Dialog"); config->writeEntry("DropAdjustment", m_dropInput->value()); config->writeEntry("AmountAdjustment", m_amountInput->value()); diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp index cd89bd12..7af18abe 100644 --- a/digikam/imageplugins/raindrop/raindroptool.cpp +++ b/digikam/imageplugins/raindrop/raindroptool.cpp @@ -146,7 +146,7 @@ void RainDropTool::renderingFinished() void RainDropTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("raindrops Tool"); m_dropInput->blockSignals(true); @@ -166,7 +166,7 @@ void RainDropTool::readSettings() void RainDropTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("raindrops Tool"); config->writeEntry("DropAdjustment", m_dropInput->value()); config->writeEntry("AmountAdjustment", m_amountInput->value()); diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index 20855ca2..69206373 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -149,7 +149,7 @@ void ImageEffect_Restoration::renderingFinished() void ImageEffect_Restoration::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("restoration Tool Dialog"); Digikam::GreycstorationSettings settings; @@ -180,7 +180,7 @@ void ImageEffect_Restoration::readUserSettings() void ImageEffect_Restoration::writeUserSettings() { Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("restoration Tool Dialog"); config->writeEntry("Preset", m_restorationTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index aca6e4a0..9074872a 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -159,7 +159,7 @@ void RestorationTool::renderingFinished() void RestorationTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("restoration Tool"); GreycstorationSettings settings; @@ -192,7 +192,7 @@ void RestorationTool::readSettings() void RestorationTool::writeSettings() { GreycstorationSettings settings = m_settingsWidget->getSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("restoration Tool"); config->writeEntry("Preset", m_restorationTypeCB->currentItem()); config->writeEntry("FastApprox", settings.fastApprox); diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index 25ed0d2c..28054c7f 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -181,7 +181,7 @@ ImageEffect_ShearTool::~ImageEffect_ShearTool() void ImageEffect_ShearTool::readUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("sheartool Tool Dialog"); m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", 0)); m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", 0)); @@ -193,7 +193,7 @@ void ImageEffect_ShearTool::readUserSettings(void) void ImageEffect_ShearTool::writeUserSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("sheartool Tool Dialog"); config->writeEntry("Main HAngle", m_mainHAngleInput->value()); config->writeEntry("Main VAngle", m_mainVAngleInput->value()); diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index a37818a5..13b9aef9 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -186,7 +186,7 @@ void ShearTool::slotColorGuideChanged() void ShearTool::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("sheartool Tool"); m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", m_mainHAngleInput->defaultValue())); m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", m_mainVAngleInput->defaultValue())); @@ -202,7 +202,7 @@ void ShearTool::readSettings() void ShearTool::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("sheartool Tool"); config->writeEntry("Main HAngle", m_mainHAngleInput->value()); config->writeEntry("Main VAngle", m_mainVAngleInput->value()); diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 99a485ed..a68b8634 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -211,7 +211,7 @@ void ImageEffect_SuperImpose::populateTemplates(void) void ImageEffect_SuperImpose::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Album Settings"); KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool Dialog"); @@ -223,7 +223,7 @@ void ImageEffect_SuperImpose::readUserSettings() void ImageEffect_SuperImpose::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("superimpose Tool Dialog"); config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() ); config->writeEntry( "Templates URL", m_templatesUrl.path() ); diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 37c8a82a..0ce86aaf 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -203,7 +203,7 @@ void SuperImposeTool::populateTemplates() void SuperImposeTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Album Settings"); KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool"); @@ -215,7 +215,7 @@ void SuperImposeTool::readSettings() void SuperImposeTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("superimpose Tool"); config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() ); config->writeEntry( "Templates URL", m_templatesUrl.path() ); diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 6e77e822..42161e57 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -143,7 +143,7 @@ void ImageEffect_Texture::renderingFinished() void ImageEffect_Texture::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("texture Tool Dialog"); m_textureType->blockSignals(true); m_blendGain->blockSignals(true); @@ -155,7 +155,7 @@ void ImageEffect_Texture::readUserSettings() void ImageEffect_Texture::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("texture Tool Dialog"); config->writeEntry("TextureType", m_textureType->currentItem()); config->writeEntry("BlendGain", m_blendGain->value()); diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index d2b1b87a..b402c92f 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -144,7 +144,7 @@ void TextureTool::renderingFinished() void TextureTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("texture Tool"); m_textureType->blockSignals(true); @@ -159,7 +159,7 @@ void TextureTool::readSettings() void TextureTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("texture Tool"); config->writeEntry("TextureType", m_textureType->currentItem()); config->writeEntry("BlendGain", m_blendGain->value()); diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index a335d982..d08c8677 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -729,7 +729,7 @@ void ImageEffect_WhiteBalance::resetValues() void ImageEffect_WhiteBalance::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("whitebalance Tool Dialog"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram)); @@ -749,7 +749,7 @@ void ImageEffect_WhiteBalance::readUserSettings() void ImageEffect_WhiteBalance::writeUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("whitebalance Tool Dialog"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 91a15320..c6c101e4 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -737,7 +737,7 @@ void WhiteBalanceTool::slotResetSettings() void WhiteBalanceTool::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("whitebalance Tool"); m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -759,7 +759,7 @@ void WhiteBalanceTool::readSettings() void WhiteBalanceTool::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("whitebalance Tool"); config->writeEntry("Histogram Channel", m_channelCB->currentItem()); config->writeEntry("Histogram Scale", m_scaleBG->selectedId()); diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 478ee17c..f5b58e40 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -378,7 +378,7 @@ void kio_digikamalbums::get( const KURL& url ) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } @@ -389,28 +389,28 @@ void kio_digikamalbums::get( const KURL& url ) if ( KDE_stat( path.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.url() ); + error( TDEIO::ERR_ACCESS_DENIED, url.url() ); else - error( KIO::ERR_DOES_NOT_EXIST, url.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); return; } if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.url() ); + error( TDEIO::ERR_IS_DIRECTORY, url.url() ); return; } if ( !S_ISREG( buff.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.url() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.url() ); return; } int fd = KDE_open( path.data(), O_RDONLY); if ( fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.url() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.url() ); return; } @@ -424,7 +424,7 @@ void kio_digikamalbums::get( const KURL& url ) char buffer[ MAX_IPC_SIZE ]; TQByteArray array; - KIO::filesize_t processed_size = 0; + TDEIO::filesize_t processed_size = 0; while (1) { @@ -433,7 +433,7 @@ void kio_digikamalbums::get( const KURL& url ) { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, url.url()); + error( TDEIO::ERR_COULD_NOT_READ, url.url()); close(fd); return; } @@ -464,7 +464,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } @@ -483,7 +483,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo AlbumInfo album = findAlbum(url.directory()); if (album.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") .arg(url.directory())); return; } @@ -498,9 +498,9 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo if ( origExists && !overwrite) { if (S_ISDIR(buff.st_mode)) - error( KIO::ERR_DIR_ALREADY_EXIST, url.url() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, url.url() ); else - error( KIO::ERR_FILE_ALREADY_EXIST, url.url() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, url.url() ); return; } @@ -517,9 +517,9 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo { kdWarning() << "####################### COULD NOT OPEN " << dest << endl; if ( errno == EACCES ) - error( KIO::ERR_WRITE_ACCESS_DENIED, url.url() ); + error( TDEIO::ERR_WRITE_ACCESS_DENIED, url.url() ); else - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, url.url() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, url.url() ); return; } @@ -538,13 +538,13 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo { if ( errno == ENOSPC ) // disk full { - error( KIO::ERR_DISK_FULL, url.url()); + error( TDEIO::ERR_DISK_FULL, url.url()); result = -1; } else { kdWarning() << "Couldn't write. Error:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, url.url()); + error( TDEIO::ERR_COULD_NOT_WRITE, url.url()); result = -1; } } @@ -566,7 +566,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo if ( close(fd) ) { kdWarning() << "Error when closing file descriptor:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, url.url()); + error( TDEIO::ERR_COULD_NOT_WRITE, url.url()); return; } @@ -576,7 +576,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo if (::chmod(_dest.data(), permissions) != 0) { // couldn't chmod. Eat the error if the filesystem apparently doesn't support it. - if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) ) + if ( TDEIO::testFileSystemFlag( _dest, TDEIO::SupportsChmod ) ) warning( i18n( "Could not change permissions for\n%1" ).arg( url.url() ) ); } } @@ -618,7 +618,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o TQString libraryPath = src.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } @@ -626,7 +626,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o TQString dstLibraryPath = dst.user(); if (libraryPath != dstLibraryPath) { - error(KIO::ERR_UNKNOWN, + error(TDEIO::ERR_UNKNOWN, TQString("Source and Destination have different Album Library Paths. ") + TQString("Src: ") + src.user() + TQString(", Dest: ") + dst.user()); @@ -648,7 +648,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o AlbumInfo srcAlbum = findAlbum(src.directory()); if (srcAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, TQString("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, TQString("Source album %1 not found in database") .arg(src.directory())); return; } @@ -657,7 +657,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o AlbumInfo dstAlbum = findAlbum(dst.directory()); if (dstAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, TQString("Destination album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, TQString("Destination album %1 not found in database") .arg(dst.directory())); return; } @@ -688,23 +688,23 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if ( KDE_stat( _src.data(), &buff_src ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, src.url() ); + error( TDEIO::ERR_ACCESS_DENIED, src.url() ); else - error( KIO::ERR_DOES_NOT_EXIST, src.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, src.url() ); return; } // bail out if its a directory if ( S_ISDIR( buff_src.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, src.url() ); + error( TDEIO::ERR_IS_DIRECTORY, src.url() ); return; } // bail out if its a socket or fifo if ( S_ISFIFO( buff_src.st_mode ) || S_ISSOCK ( buff_src.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.url() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.url() ); return; } @@ -716,14 +716,14 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o // bail out if its a directory if (S_ISDIR(buff_dest.st_mode)) { - error( KIO::ERR_DIR_ALREADY_EXIST, dst.url() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.url() ); return; } // if !overwrite bail out if (!overwrite) { - error( KIO::ERR_FILE_ALREADY_EXIST, dst.url() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.url() ); return; } @@ -740,7 +740,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o int src_fd = KDE_open( _src.data(), O_RDONLY); if ( src_fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.path() ); return; } @@ -758,11 +758,11 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o kdDebug() << "###### COULD NOT WRITE " << dst.url() << endl; if ( errno == EACCES ) { - error( KIO::ERR_WRITE_ACCESS_DENIED, dst.url() ); + error( TDEIO::ERR_WRITE_ACCESS_DENIED, dst.url() ); } else { - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dst.url() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dst.url() ); } close(src_fd); return; @@ -771,7 +771,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o // emit the total size for copying totalSize( buff_src.st_size ); - KIO::filesize_t processed_size = 0; + TDEIO::filesize_t processed_size = 0; char buffer[ MAX_IPC_SIZE ]; int n; @@ -784,7 +784,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, src.path()); + error( TDEIO::ERR_COULD_NOT_READ, src.path()); close(src_fd); close(dest_fd); return; @@ -802,13 +802,13 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if ( errno == ENOSPC ) // disk full { - error( KIO::ERR_DISK_FULL, dst.url()); + error( TDEIO::ERR_DISK_FULL, dst.url()); remove( _dst.data() ); } else { kdWarning() << "Couldn't write[2]. Error:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dst.url()); + error( TDEIO::ERR_COULD_NOT_WRITE, dst.url()); } return; } @@ -822,7 +822,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if (close( dest_fd)) { kdWarning() << "Error when closing file descriptor[2]:" << strerror(errno) << endl; - error( KIO::ERR_COULD_NOT_WRITE, dst.url()); + error( TDEIO::ERR_COULD_NOT_WRITE, dst.url()); return; } @@ -832,7 +832,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if (::chmod(_dst.data(), mode) != 0) { // Eat the error if the filesystem apparently doesn't support chmod. - if ( KIO::testFileSystemFlag( _dst, KIO::SupportsChmod ) ) + if ( TDEIO::testFileSystemFlag( _dst, TDEIO::SupportsChmod ) ) warning( i18n( "Could not change permissions for\n%1" ).arg( dst.url() ) ); } } @@ -869,14 +869,14 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite TQString libraryPath = src.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } TQString dstLibraryPath = dst.user(); if (libraryPath != dstLibraryPath) { - error(KIO::ERR_UNKNOWN, + error(TDEIO::ERR_UNKNOWN, i18n("Source and Destination have different Album Library Paths.\n" "Source: %1\n" "Destination: %2") @@ -901,9 +901,9 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite if ( KDE_stat( csrc.data(), &buff_src ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, src.url() ); + error( TDEIO::ERR_ACCESS_DENIED, src.url() ); else - error( KIO::ERR_DOES_NOT_EXIST, src.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, src.url() ); return; } @@ -914,13 +914,13 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite { if (S_ISDIR(buff_dest.st_mode)) { - error( KIO::ERR_DIR_ALREADY_EXIST, dst.url() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.url() ); return; } if (!overwrite) { - error( KIO::ERR_FILE_ALREADY_EXIST, dst.url() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.url() ); return; } } @@ -939,7 +939,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite srcAlbum = findAlbum(src.path()); if (srcAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") .arg(src.url())); return; } @@ -949,7 +949,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite srcAlbum = findAlbum(src.directory()); if (srcAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") .arg(src.directory())); return; } @@ -957,7 +957,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite dstAlbum = findAlbum(dst.directory()); if (dstAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Destination album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Destination album %1 not found in database") .arg(dst.directory())); return; } @@ -970,23 +970,23 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite { TQFileInfo toCheck(libraryPath + src.path()); if (!toCheck.isWritable()) - error( KIO::ERR_CANNOT_RENAME_ORIGINAL, src.path() ); + error( TDEIO::ERR_CANNOT_RENAME_ORIGINAL, src.path() ); else - error( KIO::ERR_ACCESS_DENIED, dst.path() ); + error( TDEIO::ERR_ACCESS_DENIED, dst.path() ); } else if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, i18n("This file/folder is on a different " + error( TDEIO::ERR_UNSUPPORTED_ACTION, i18n("This file/folder is on a different " "filesystem through symlinks. " "Moving/Renaming files between " "them is currently unsupported ")); } else if (errno == EROFS) { // The file is on a read-only filesystem - error( KIO::ERR_CANNOT_DELETE, src.url() ); + error( TDEIO::ERR_CANNOT_DELETE, src.url() ); } else { - error( KIO::ERR_CANNOT_RENAME, src.url() ); + error( TDEIO::ERR_CANNOT_RENAME, src.url() ); } return; } @@ -1010,14 +1010,14 @@ void kio_digikamalbums::stat( const KURL& url ) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (!createUDSEntry(libraryPath + url.path(), entry)) { - error(KIO::ERR_DOES_NOT_EXIST, url.path(-1)); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path(-1)); return; } @@ -1033,7 +1033,7 @@ void kio_digikamalbums::listDir( const KURL& url ) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); kdWarning() << "Album Library Path not supplied to kioslave" << endl; return; } @@ -1042,14 +1042,14 @@ void kio_digikamalbums::listDir( const KURL& url ) TQString path = libraryPath + url.path(); if (KDE_stat(TQFile::encodeName(path), &stbuf) != 0) { - error(KIO::ERR_DOES_NOT_EXIST, url.path(-1)); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path(-1)); return; } TQDir dir(path); if (!dir.isReadable()) { - error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path()); + error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path()); return; } @@ -1057,7 +1057,7 @@ void kio_digikamalbums::listDir( const KURL& url ) TQFileInfoListIterator it( *list ); TQFileInfo *fi; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; createDigikamPropsUDSEntry(entry); listEntry(entry, false); while ((fi = it.current()) != 0) @@ -1083,7 +1083,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } @@ -1104,17 +1104,17 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) { if ( errno == EACCES ) { - error( KIO::ERR_ACCESS_DENIED, path ); + error( TDEIO::ERR_ACCESS_DENIED, path ); return; } else if ( errno == ENOSPC ) { - error( KIO::ERR_DISK_FULL, path ); + error( TDEIO::ERR_DISK_FULL, path ); return; } else { - error( KIO::ERR_COULD_NOT_MKDIR, path ); + error( TDEIO::ERR_COULD_NOT_MKDIR, path ); return; } } @@ -1129,7 +1129,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) if ( permissions != -1 ) { if ( ::chmod( _path.data(), permissions ) == -1 ) - error( KIO::ERR_CANNOT_CHMOD, path ); + error( TDEIO::ERR_CANNOT_CHMOD, path ); else finished(); } @@ -1141,11 +1141,11 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_DIR_ALREADY_EXIST, path ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, path ); return; } - error( KIO::ERR_FILE_ALREADY_EXIST, path ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, path ); } void kio_digikamalbums::chmod( const KURL& url, int permissions ) @@ -1157,13 +1157,13 @@ void kio_digikamalbums::chmod( const KURL& url, int permissions ) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } TQCString path( TQFile::encodeName(libraryPath + url.path())); if ( ::chmod( path.data(), permissions ) == -1 ) - error( KIO::ERR_CANNOT_CHMOD, url.url() ); + error( TDEIO::ERR_CANNOT_CHMOD, url.url() ); else finished(); } @@ -1177,7 +1177,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { - error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); + error(TDEIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } @@ -1209,7 +1209,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) AlbumInfo album = findAlbum(url.directory()); if (album.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") .arg(url.directory())); return; } @@ -1218,11 +1218,11 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) if ( unlink( path.data() ) == -1 ) { if ((errno == EACCES) || (errno == EPERM)) - error( KIO::ERR_ACCESS_DENIED, url.url()); + error( TDEIO::ERR_ACCESS_DENIED, url.url()); else if (errno == EISDIR) - error( KIO::ERR_IS_DIRECTORY, url.url()); + error( TDEIO::ERR_IS_DIRECTORY, url.url()); else - error( KIO::ERR_CANNOT_DELETE, url.url() ); + error( TDEIO::ERR_CANNOT_DELETE, url.url() ); return; } @@ -1237,7 +1237,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) AlbumInfo album = findAlbum(url.path()); if (album.id == -1) { - error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") .arg(url.path())); return; } @@ -1248,13 +1248,13 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) if ((errno == EACCES) || (errno == EPERM)) { - error( KIO::ERR_ACCESS_DENIED, url.url()); + error( TDEIO::ERR_ACCESS_DENIED, url.url()); return; } else { kdDebug() << "could not rmdir " << perror << endl; - error( KIO::ERR_COULD_NOT_RMDIR, url.url() ); + error( TDEIO::ERR_COULD_NOT_RMDIR, url.url() ); return; } } @@ -1267,7 +1267,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) } -bool kio_digikamalbums::createUDSEntry(const TQString& path, KIO::UDSEntry& entry) +bool kio_digikamalbums::createUDSEntry(const TQString& path, TDEIO::UDSEntry& entry) { entry.clear(); @@ -1275,40 +1275,40 @@ bool kio_digikamalbums::createUDSEntry(const TQString& path, KIO::UDSEntry& entr if (KDE_stat(TQFile::encodeName(path), &stbuf) != 0) return false; - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = stbuf.st_mode & S_IFMT; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = stbuf.st_mode & 07777; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = stbuf.st_size; entry.append( atom ); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = stbuf.st_mtime; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS_TIME; + atom.m_uds = TDEIO::UDS_ACCESS_TIME; atom.m_long = stbuf.st_atime; entry.append( atom ); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = TQFileInfo(path).fileName(); entry.append(atom); /* - // If we provide the local path, a KIO::CopyJob will optimize away + // If we provide the local path, a TDEIO::CopyJob will optimize away // the use of our custom digikamalbums:/ ioslave, which breaks // copying the database entry: // Disabling this as a temporary solution for bug #137282 // This code is intended as a fix for bug #122653. #if KDE_IS_VERSION(3,4,0) - atom.m_uds = KIO::UDS_LOCAL_PATH; + atom.m_uds = TDEIO::UDS_LOCAL_PATH; atom.m_str = path; entry.append(atom); #endif @@ -1317,33 +1317,33 @@ bool kio_digikamalbums::createUDSEntry(const TQString& path, KIO::UDSEntry& entr return true; } -void kio_digikamalbums::createDigikamPropsUDSEntry(KIO::UDSEntry& entry) +void kio_digikamalbums::createDigikamPropsUDSEntry(TDEIO::UDSEntry& entry) { entry.clear(); - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = 00666; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 0; entry.append( atom ); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = TQDateTime::currentDateTime().toTime_t(); entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS_TIME; + atom.m_uds = TDEIO::UDS_ACCESS_TIME; atom.m_long = TQDateTime::currentDateTime().toTime_t(); entry.append( atom ); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = ".digikam_properties"; entry.append(atom); } @@ -1749,7 +1749,7 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, // check for src == dest if (srcAlbumID == dstAlbumID && srcName == dstName) { - error( KIO::ERR_FILE_ALREADY_EXIST, dstName ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dstName ); return; } @@ -1762,7 +1762,7 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, if (values.isEmpty()) { - error(KIO::ERR_UNKNOWN, i18n("Source image %1 not found in database") + error(TDEIO::ERR_UNKNOWN, i18n("Source image %1 not found in database") .arg(srcName)); return; } diff --git a/digikam/kioslave/digikamalbums.h b/digikam/kioslave/digikamalbums.h index 04497909..9ff4befa 100644 --- a/digikam/kioslave/digikamalbums.h +++ b/digikam/kioslave/digikamalbums.h @@ -54,7 +54,7 @@ public: TQDate date; }; -class kio_digikamalbums : public KIO::SlaveBase +class kio_digikamalbums : public TDEIO::SlaveBase { public: @@ -78,8 +78,8 @@ public: private: - bool createUDSEntry(const TQString& path, KIO::UDSEntry& entry); - void createDigikamPropsUDSEntry(KIO::UDSEntry& entry); + bool createUDSEntry(const TQString& path, TDEIO::UDSEntry& entry); + void createDigikamPropsUDSEntry(TDEIO::UDSEntry& entry); void buildAlbumList(); AlbumInfo findAlbum(const TQString& url, bool addIfNotExists=true); diff --git a/digikam/kioslave/digikamdates.h b/digikam/kioslave/digikamdates.h index 7cb147e3..5977bf41 100644 --- a/digikam/kioslave/digikamdates.h +++ b/digikam/kioslave/digikamdates.h @@ -34,7 +34,7 @@ class TQStringList; -class kio_digikamdates : public KIO::SlaveBase +class kio_digikamdates : public TDEIO::SlaveBase { public: diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index ed795ab8..5bc18cba 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -170,7 +170,7 @@ void kio_digikamsearch::special(const TQByteArray& data) TQString errMsg; if (!m_db.execSql(sqlQuery, &values)) { - error(KIO::ERR_INTERNAL, errMsg); + error(TDEIO::ERR_INTERNAL, errMsg); return; } @@ -275,7 +275,7 @@ void kio_digikamsearch::special(const TQByteArray& data) TQString errMsg; if (!m_db.execSql(sqlQuery, &values, &errMsg)) { - error(KIO::ERR_INTERNAL, errMsg); + error(TDEIO::ERR_INTERNAL, errMsg); return; } diff --git a/digikam/kioslave/digikamsearch.h b/digikam/kioslave/digikamsearch.h index 67939fc2..d7c26766 100644 --- a/digikam/kioslave/digikamsearch.h +++ b/digikam/kioslave/digikamsearch.h @@ -33,7 +33,7 @@ class TQStringList; -class kio_digikamsearch : public KIO::SlaveBase +class kio_digikamsearch : public TDEIO::SlaveBase { public: diff --git a/digikam/kioslave/digikamtags.h b/digikam/kioslave/digikamtags.h index b76035eb..390b8569 100644 --- a/digikam/kioslave/digikamtags.h +++ b/digikam/kioslave/digikamtags.h @@ -40,7 +40,7 @@ class KURL; class TQCString; -class kio_digikamtagsProtocol : public KIO::SlaveBase +class kio_digikamtagsProtocol : public TDEIO::SlaveBase { public: diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index 54427b8b..00b3ab6b 100644 --- a/digikam/kioslave/digikamthumbnail.cpp +++ b/digikam/kioslave/digikamthumbnail.cpp @@ -96,7 +96,7 @@ extern "C" #include } -using namespace KIO; +using namespace TDEIO; using namespace Digikam; kio_digikamthumbnailProtocol::kio_digikamthumbnailProtocol(int argc, char** argv) @@ -122,7 +122,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (cachedSize_ <= 0) { - error(KIO::ERR_INTERNAL, i18n("No or invalid size specified")); + error(TDEIO::ERR_INTERNAL, i18n("No or invalid size specified")); kdWarning() << "No or invalid size specified" << endl; return; } @@ -140,7 +140,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) struct stat st; if (::stat(TQFile::encodeName(url.path(-1)), &st) != 0) { - error(KIO::ERR_INTERNAL, i18n("File does not exist")); + error(TDEIO::ERR_INTERNAL, i18n("File does not exist")); return; } @@ -178,7 +178,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (img.isNull()) { - error(KIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1") + error(TDEIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1") .arg(url.prettyURL())); kdWarning() << "Cannot create thumbnail for " << url.path() << endl; return; @@ -210,7 +210,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (img.isNull()) { - error(KIO::ERR_INTERNAL, "Thumbnail is null"); + error(TDEIO::ERR_INTERNAL, "Thumbnail is null"); return; } @@ -228,14 +228,14 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (shmaddr == (void *)-1) { - error(KIO::ERR_INTERNAL, "Failed to attach to shared memory segment " + shmid); + error(TDEIO::ERR_INTERNAL, "Failed to attach to shared memory segment " + shmid); kdWarning() << "Failed to attach to shared memory segment " << shmid << endl; return; } if (img.width() * img.height() > cachedSize_ * cachedSize_) { - error(KIO::ERR_INTERNAL, "Image is too big for the shared memory segment"); + error(TDEIO::ERR_INTERNAL, "Image is too big for the shared memory segment"); kdWarning() << "Image is too big for the shared memory segment" << endl; shmdt((char*)shmaddr); return; diff --git a/digikam/kioslave/digikamthumbnail.h b/digikam/kioslave/digikamthumbnail.h index 8e6ef5a1..1864b6b8 100644 --- a/digikam/kioslave/digikamthumbnail.h +++ b/digikam/kioslave/digikamthumbnail.h @@ -35,7 +35,7 @@ class TQApplication; class KURL; -class kio_digikamthumbnailProtocol : public KIO::SlaveBase +class kio_digikamthumbnailProtocol : public TDEIO::SlaveBase { public: diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp index 61eda063..e51d585d 100644 --- a/digikam/kioslave/sqlitedb.cpp +++ b/digikam/kioslave/sqlitedb.cpp @@ -65,7 +65,7 @@ void SqliteDB::openDB(const TQString& directory) #ifdef NFS_HACK dbPath = TQDir::homeDirPath() + "/.trinity/share/apps/digikam/" + - KIO::encodeFileName(TQDir::cleanDirPath(dbPath)); + TDEIO::encodeFileName(TQDir::cleanDirPath(dbPath)); #endif sqlite3_open(TQFile::encodeName(dbPath), &m_db); diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index 1a659942..c2e9ee21 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -160,7 +160,7 @@ ImageDlgBase::~ImageDlgBase() void ImageDlgBase::readSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); @@ -170,7 +170,7 @@ void ImageDlgBase::readSettings(void) void ImageDlgBase::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry("SplitterSizes", d->splitter->sizes()); config->sync(); diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 9caedefa..9cdd9de1 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -253,7 +253,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, d->settingsSideBar->loadViewState(); // Reading splitter sizes here prevent flicker effect in dialog. - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); @@ -282,7 +282,7 @@ ImageGuideDlg::~ImageGuideDlg() void ImageGuideDlg::readSettings(void) { TQColor defaultGuideColor(TQt::red); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); d->guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); d->guideSize->setValue(config->readNumEntry("Guide Width", 1)); @@ -292,7 +292,7 @@ void ImageGuideDlg::readSettings(void) void ImageGuideDlg::writeSettings(void) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry( "Guide Color", d->guideColorBt->color() ); config->writeEntry( "Guide Width", d->guideSize->value() ); diff --git a/digikam/libs/dimg/filters/icctransform.cpp b/digikam/libs/dimg/filters/icctransform.cpp index baefc2bf..ee9b3727 100644 --- a/digikam/libs/dimg/filters/icctransform.cpp +++ b/digikam/libs/dimg/filters/icctransform.cpp @@ -141,14 +141,14 @@ TQString IccTransform::getProfileDescription(const TQString& profile) int IccTransform::getRenderingIntent() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); return config->readNumEntry("RenderingIntent", 0); } bool IccTransform::getUseBPC() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); return config->readBoolEntry("BPCAlgorithm", false); } diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 6dbe2318..a12dac88 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -399,7 +399,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, date.setTime_t(itemInfo->mtime); d->labelFileDate->setText(TDEGlobal::locale()->formatDateTime(date, true, true)); - str = i18n("%1 (%2)").arg(KIO::convertSize(itemInfo->size)) + str = i18n("%1 (%2)").arg(TDEIO::convertSize(itemInfo->size)) .arg(TDEGlobal::locale()->formatNumber(itemInfo->size, 0)); d->labelFileSize->setText(str); diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 24394793..469a59ed 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -343,7 +343,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar) // -- read config --------------------------------------------------------- - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Tag List View"); d->toggleAutoTags = (TagFilterView::ToggleAutoTags)(config->readNumEntry("Toggle Auto Tags", TagFilterView::NoToggleAuto)); @@ -361,7 +361,7 @@ ImageDescEditTab::~ImageDescEditTab() } */ - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Tag List View"); config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags)); config->sync(); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 36177bd4..417da79b 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -381,7 +381,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar // -- read config --------------------------------------------------------- - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Image Properties SideBar"); d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesColors Tab", ImagePropertiesColorsTabPriv::HISTOGRAM)); @@ -400,7 +400,7 @@ ImagePropertiesColorsTab::~ImagePropertiesColorsTab() // stop it before the d->image data are deleted automatically! d->histogramWidget->stopHistogramComputation(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Image Properties SideBar"); config->writeEntry("ImagePropertiesColors Tab", d->tab->currentPageIndex()); config->writeEntry("Histogram Channel", d->channelCB->currentItem()); diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp index 43734c47..db8fbf7d 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -117,7 +117,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na // -- read config --------------------------------------------------------- - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Image Properties SideBar"); d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesMetaData Tab", ImagePropertiesMetadataTabPriv::EXIF)); @@ -134,7 +134,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na ImagePropertiesMetaDataTab::~ImagePropertiesMetaDataTab() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Image Properties SideBar"); config->writeEntry("ImagePropertiesMetaData Tab", d->tab->currentPageIndex()); config->writeEntry("EXIF Level", d->exifWidget->getMode()); diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 3978775c..672cfb9f 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -425,7 +425,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) str = TDEGlobal::locale()->formatDateTime(modifiedDate, true, true); d->labelFileModifiedDate->setText(str); - str = TQString("%1 (%2)").arg(KIO::convertSize(fi.size())) + str = TQString("%1 (%2)").arg(TDEIO::convertSize(fi.size())) .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); d->labelFileSize->setText(str); diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 2ca4a776..3cea1265 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -458,7 +458,7 @@ void TAlbumListView::slotRefresh(const TQMap& tagsStatMap) void TAlbumListView::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); int selectedItem = config->readNumEntry("LastSelectedItem", 0); @@ -505,7 +505,7 @@ void TAlbumListView::loadViewState() void TAlbumListView::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name()); TAlbumCheckListItem *item = dynamic_cast(selectedItem()); diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index c35e9574..ae159b98 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -959,7 +959,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showFileSize) { tipText += m_cellBeg + i18n("Size:") + m_cellMid; - str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) + str = i18n("%1 (%2)").arg(TDEIO::convertSize(fi.size())) .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); tipText += str + m_cellEnd; } diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 2226828e..9ad8f144 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -81,7 +81,7 @@ public: ThumbnailJob::ThumbnailJob(const KURL& url, int size, bool highlight, bool exifRotate) - : KIO::Job(false) + : TDEIO::Job(false) { d = new ThumbnailJobPriv; @@ -101,7 +101,7 @@ ThumbnailJob::ThumbnailJob(const KURL& url, int size, ThumbnailJob::ThumbnailJob(const KURL::List& urlList, int size, bool highlight, bool exifRotate) - : KIO::Job(false) + : TDEIO::Job(false) { d = new ThumbnailJobPriv; @@ -195,7 +195,7 @@ void ThumbnailJob::processNext() KURL url(d->curr_url); url.setProtocol("digikamthumbnail"); - KIO::TransferJob *job = KIO::get(url, false, false); + TDEIO::TransferJob *job = TDEIO::get(url, false, false); job->addMetaData("size", TQString::number(d->size)); createShmSeg(); @@ -206,14 +206,14 @@ void ThumbnailJob::processNext() if (d->exifRotate) job->addMetaData("exif", "yes"); - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotThumbData(KIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); addSubjob(job); d->running = true; } -void ThumbnailJob::slotResult(KIO::Job *job) +void ThumbnailJob::slotResult(TDEIO::Job *job) { subjobs.remove(job); Q_ASSERT( subjobs.isEmpty() ); @@ -253,7 +253,7 @@ void ThumbnailJob::createShmSeg() } } -void ThumbnailJob::slotThumbData(KIO::Job*, const TQByteArray &data) +void ThumbnailJob::slotThumbData(TDEIO::Job*, const TQByteArray &data) { if (data.isEmpty()) return; diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/digikam/libs/thumbbar/thumbnailjob.h index b4d8d86f..1d190c9f 100644 --- a/digikam/libs/thumbbar/thumbnailjob.h +++ b/digikam/libs/thumbbar/thumbnailjob.h @@ -42,7 +42,7 @@ namespace Digikam class ThumbnailJobPriv; -class ThumbnailJob : public KIO::Job +class ThumbnailJob : public TDEIO::Job { Q_OBJECT @@ -75,8 +75,8 @@ private: protected slots: - void slotResult(KIO::Job *job); - void slotThumbData(KIO::Job *job, const TQByteArray &data); + void slotResult(TDEIO::Job *job); + void slotThumbData(TDEIO::Job *job, const TQByteArray &data); private: diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp index 8059bbd9..946515cf 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp +++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp @@ -156,7 +156,7 @@ void FileSaveOptionsBox::toggleFormatOptions(const TQString& format) void FileSaveOptionsBox::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue()); config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue()); @@ -169,7 +169,7 @@ void FileSaveOptionsBox::applySettings() void FileSaveOptionsBox::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) ); d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) ); // Medium subsampling diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 4a9d8865..678aed22 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -185,7 +185,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString&))); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name + TQString(" Search Text Tool")); d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", (int)TDEGlobalSettings::CompletionAuto)); @@ -193,7 +193,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString SearchTextBar::~SearchTextBar() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(name() + TQString(" Search Text Tool")); config->writeEntry("AutoCompletionMode", (int)d->searchEdit->completionMode()); config->sync(); diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index e76c1f73..d0c606f0 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -140,7 +140,7 @@ TQSplitter* Sidebar::splitter() const void Sidebar::loadViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(TQString("%1").arg(name())); int tab = config->readNumEntry("ActiveTab", 0); @@ -167,7 +167,7 @@ void Sidebar::loadViewState() void Sidebar::saveViewState() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(TQString("%1").arg(name())); config->writeEntry("ActiveTab", d->activeTab); config->writeEntry("Minimized", d->minimized); diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index e74c682a..ad065ac9 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -212,7 +212,7 @@ ImageRegionWidget *ImagePanelWidget::previewWidget() const void ImagePanelWidget::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); @@ -231,7 +231,7 @@ void ImagePanelWidget::readSettings() void ImagePanelWidget::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); config->writeEntry( "Separate View", d->separateView->selectedId() ); config->sync(); diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index cd13cff2..1359147a 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -291,7 +291,7 @@ ImagePannelWidget::~ImagePannelWidget() void ImagePannelWidget::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); @@ -310,7 +310,7 @@ void ImagePannelWidget::readSettings() void ImagePannelWidget::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); config->writeEntry( "Separate View", d->separateView->selectedId() ); config->sync(); diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 3e45bf86..ad3cb1bb 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -322,7 +322,7 @@ void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint & void ImageWidget::readSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); d->underExposureButton->setOn(config->readBoolEntry("Under Exposure Indicator", false)); @@ -336,7 +336,7 @@ void ImageWidget::readSettings() void ImageWidget::writeSettings() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup(d->settingsSection); config->writeEntry("Separate View", getRenderingPreviewMode()); config->writeEntry("Under Exposure Indicator", d->underExposureButton->isOn()); diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index b854621b..1827e991 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -122,7 +122,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) showPage((int) page); else { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Settings"); showPage(config->readNumEntry("Setup Page", EditorPage)); } @@ -132,7 +132,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) Setup::~Setup() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Settings"); config->writeEntry("Setup Page", activePageIndex()); config->sync(); diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index e5ebd6fd..ff7af0f3 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -202,7 +202,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e) void SetupEditor::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); TQColor Black(TQt::black); TQColor White(TQt::white); config->setGroup("ImageViewer Settings"); @@ -224,7 +224,7 @@ void SetupEditor::readSettings() void SetupEditor::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked()); config->writeEntry("BackgroundColor", d->backgroundColor->color()); diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp index 1a61fe12..1eb1bbb6 100644 --- a/digikam/showfoto/setup/setuptooltip.cpp +++ b/digikam/showfoto/setup/setuptooltip.cpp @@ -177,7 +177,7 @@ SetupToolTip::~SetupToolTip() void SetupToolTip::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->showToolTipsBox->setChecked(config->readBoolEntry("Show ToolTips", true)); @@ -202,7 +202,7 @@ void SetupToolTip::readSettings() void SetupToolTip::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("Show ToolTips", d->showToolTipsBox->isChecked()); diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 5d2334d5..3d57f920 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -162,7 +162,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList) // -- Show splash at start ---------------------------- - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); TDEGlobal::dirs()->addResourceType("data", TDEGlobal::dirs()->kde_default("data") + "digikam"); TDEGlobal::iconLoader()->addAppDir("digikam"); @@ -356,7 +356,7 @@ void ShowFoto::show() // Report errors from ICC repository path. - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); if(!d->validIccPath) { TQString message = i18n("

The ICC profile path seems to be invalid.

" @@ -407,7 +407,7 @@ void ShowFoto::setupConnections() void ShowFoto::setupUserArea() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); TQWidget* widget = new TQWidget(this); @@ -509,7 +509,7 @@ void ShowFoto::readSettings() { readStandardSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->showBarAction->setChecked(config->readBoolEntry("Show Thumbnails", true)); @@ -531,7 +531,7 @@ void ShowFoto::saveSettings() { saveStandardSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("Last Opened Directory", d->lastOpenedDirectory.path() ); @@ -549,7 +549,7 @@ void ShowFoto::applySettings() { applyStandardSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); // Current image deleted go to trash ? @@ -629,9 +629,9 @@ void ShowFoto::slotOpenURL(const KURL& url) TQString localFile; #if KDE_IS_VERSION(3,2,0) - KIO::NetAccess::download(url, localFile, this); + TDEIO::NetAccess::download(url, localFile, this); #else - KIO::NetAccess::download(url, localFile); + TDEIO::NetAccess::download(url, localFile); #endif m_canvas->load(localFile, m_IOFileSettings); @@ -873,7 +873,7 @@ void ShowFoto::openFolder(const KURL& url) // Determine sort ordering for the entries from configuration setting: - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); int flag; @@ -1113,9 +1113,9 @@ void ShowFoto::slotDeleteCurrentItem() } else { - KIO::Job* job = KIO::del( urlCurrent ); - connect( job, TQT_SIGNAL(result( KIO::Job* )), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); + TDEIO::Job* job = TDEIO::del( urlCurrent ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); } } else @@ -1127,13 +1127,13 @@ void ShowFoto::slotDeleteCurrentItem() dest = TDEGlobalSettings::trashPath(); } - KIO::Job* job = KIO::move( urlCurrent, dest ); - connect( job, TQT_SIGNAL(result( KIO::Job* )), - TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); + TDEIO::Job* job = TDEIO::move( urlCurrent, dest ); + connect( job, TQT_SIGNAL(result( TDEIO::Job* )), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( TDEIO::Job*)) ); } } -void ShowFoto::slotDeleteCurrentItemResult( KIO::Job * job ) +void ShowFoto::slotDeleteCurrentItemResult( TDEIO::Job * job ) { if (job->error() != 0) { @@ -1190,7 +1190,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett { if (!d->thumbBar->countItems()) return; - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); settings.exifRotate = config->readBoolEntry("EXIF Rotate", true); diff --git a/digikam/showfoto/showfoto.h b/digikam/showfoto/showfoto.h index 4f56d8ea..142d2701 100644 --- a/digikam/showfoto/showfoto.h +++ b/digikam/showfoto/showfoto.h @@ -35,7 +35,7 @@ #include "editorwindow.h" -namespace KIO +namespace TDEIO { class Job; } @@ -116,7 +116,7 @@ private slots: void slotUndoStateChanged(bool, bool, bool); void slotUpdateItemInfo(); - void slotDeleteCurrentItemResult( KIO::Job * job ); + void slotDeleteCurrentItemResult( TDEIO::Job * job ); void slotLoadingStarted(const TQString &filename); void slotLoadingFinished(const TQString &filename, bool success); diff --git a/digikam/utilities/batch/imageinfoalbumsjob.h b/digikam/utilities/batch/imageinfoalbumsjob.h index e353f930..c54af43f 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.h +++ b/digikam/utilities/batch/imageinfoalbumsjob.h @@ -34,7 +34,7 @@ #include "albummanager.h" #include "imageinfo.h" -namespace KIO +namespace TDEIO { class Job; } diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index e58d375b..6c6d1fe1 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -61,7 +61,7 @@ public: TQString imagefilter; - KIO::TransferJob *job; + TDEIO::TransferJob *job; }; ImageInfoJob::ImageInfoJob() @@ -95,14 +95,14 @@ void ImageInfoJob::allItemsFromAlbum(Album *album) ds << 0; // recursive sub-tags (not needed here) // Protocol = digikamalbums -> kio_digikamalbums - d->job = new KIO::TransferJob(album->kurl(), KIO::CMD_SPECIAL, + d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void ImageInfoJob::stop() @@ -114,7 +114,7 @@ void ImageInfoJob::stop() } } -void ImageInfoJob::slotResult(KIO::Job* job) +void ImageInfoJob::slotResult(TDEIO::Job* job) { d->job = 0; @@ -127,7 +127,7 @@ void ImageInfoJob::slotResult(KIO::Job* job) emit signalCompleted(); } -void ImageInfoJob::slotData(KIO::Job*, const TQByteArray& data) +void ImageInfoJob::slotData(TDEIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; diff --git a/digikam/utilities/batch/imageinfojob.h b/digikam/utilities/batch/imageinfojob.h index d616b726..5023c566 100644 --- a/digikam/utilities/batch/imageinfojob.h +++ b/digikam/utilities/batch/imageinfojob.h @@ -34,7 +34,7 @@ #include "imageinfo.h" -namespace KIO +namespace TDEIO { class Job; } @@ -65,8 +65,8 @@ signals: private slots: - void slotResult(KIO::Job* job); - void slotData(KIO::Job* job, const TQByteArray& data); + void slotResult(TDEIO::Job* job); + void slotData(TDEIO::Job* job, const TQByteArray& data); private: diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index ebdd18ca..4a98ad6d 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -938,9 +938,9 @@ void CameraController::customEvent(TQCustomEvent* e) break; } - KIO::RenameDlg dlg(d->parent, i18n("Rename File"), + TDEIO::RenameDlg dlg(d->parent, i18n("Rename File"), folder + TQString("/") + file, dest, - KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); + TDEIO::RenameDlg_Mode(TDEIO::M_MULTI | TDEIO::M_OVERWRITE | TDEIO::M_SKIP)); int result = dlg.exec(); dest = dlg.newDestURL().path(); @@ -948,28 +948,28 @@ void CameraController::customEvent(TQCustomEvent* e) switch (result) { - case KIO::R_CANCEL: + case TDEIO::R_CANCEL: { cancel = true; break; } - case KIO::R_SKIP: + case TDEIO::R_SKIP: { skip = true; break; } - case KIO::R_AUTO_SKIP: + case TDEIO::R_AUTO_SKIP: { d->skipAll = true; skip = true; break; } - case KIO::R_OVERWRITE: + case TDEIO::R_OVERWRITE: { overwrite = true; break; } - case KIO::R_OVERWRITE_ALL: + case TDEIO::R_OVERWRITE_ALL: { d->overwriteAll = true; overwrite = true; diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index b9dfb4f3..a9fed457 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -591,7 +591,7 @@ CameraUI::~CameraUI() void CameraUI::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Camera Settings"); d->advBox->setCurrentIndex(config->readNumEntry("Settings Tab", CameraUIPriv::RENAMEFILEPAGE)); d->autoRotateCheck->setChecked(config->readBoolEntry("AutoRotate", true)); @@ -623,7 +623,7 @@ void CameraUI::saveSettings() { saveDialogSize("Camera Settings"); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Camera Settings"); config->writeEntry("Settings Tab", d->advBox->currentIndex()); config->writeEntry("AutoRotate", d->autoRotateCheck->isChecked()); @@ -1125,8 +1125,8 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) "to download and process selected pictures from camera.\n\n" "Estimated space require: %1\n" "Available free space: %2") - .arg(KIO::convertSizeFromKB(dSize)) - .arg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); + .arg(TDEIO::convertSizeFromKB(dSize)) + .arg(TDEIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); return; } diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index fe80e052..0e27b726 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -194,21 +194,21 @@ void FreeSpaceWidget::updatePixmap() if (d->dSizeKb > 0) { tipText += cellBeg + i18n("Capacity:") + cellMid; - tipText += KIO::convertSizeFromKB(d->kBSize) + cellEnd; + tipText += TDEIO::convertSizeFromKB(d->kBSize) + cellEnd; tipText += cellBeg + i18n("Available:") + cellMid; - tipText += KIO::convertSizeFromKB(d->kBAvail) + cellEnd; + tipText += TDEIO::convertSizeFromKB(d->kBAvail) + cellEnd; tipText += cellBeg + i18n("Require:") + cellMid; - tipText += KIO::convertSizeFromKB(d->dSizeKb) + cellEnd; + tipText += TDEIO::convertSizeFromKB(d->dSizeKb) + cellEnd; } else { tipText += cellBeg + i18n("Capacity:") + cellMid; - tipText += KIO::convertSizeFromKB(d->kBSize) + cellEnd; + tipText += TDEIO::convertSizeFromKB(d->kBSize) + cellEnd; tipText += cellBeg + i18n("Available:") + cellMid; - tipText += KIO::convertSizeFromKB(d->kBAvail) + cellEnd; + tipText += TDEIO::convertSizeFromKB(d->kBAvail) + cellEnd; } tipText += ""; @@ -227,7 +227,7 @@ void FreeSpaceWidget::paintEvent(TQPaintEvent*) void FreeSpaceWidget::slotTimeout() { - TQString mountPoint = KIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); + TQString mountPoint = TDEIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); KDiskFreeSp *job = new KDiskFreeSp; connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, const unsigned long&, const TQString&)), diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index e4ac7f11..b2e74cc8 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -464,7 +464,7 @@ void RenameCustomizer::slotDateTimeButtonClicked() void RenameCustomizer::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Camera Settings"); bool def = config->readBoolEntry("Rename Use Default", true); @@ -507,7 +507,7 @@ void RenameCustomizer::readSettings() void RenameCustomizer::saveSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Camera Settings"); config->writeEntry("Rename Use Default", d->renameDefault->isChecked()); diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index 8e90ec6c..decf028d 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -837,7 +837,7 @@ void EditorWindow::unLoadImagePlugins() void EditorWindow::readStandardSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); // Restore full screen Mode ? @@ -856,7 +856,7 @@ void EditorWindow::readStandardSettings() void EditorWindow::applyStandardSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); // -- Settings for Color Management stuff ---------------------------------------------- @@ -966,7 +966,7 @@ void EditorWindow::applyStandardSettings() void EditorWindow::saveStandardSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("AutoZoom", d->zoomFitToWindowAction->isChecked()); @@ -1557,7 +1557,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) imageFileSaveDialog.setFilter(mimetypes); TQFileInfo info(m_savingContext->srcURL.fileName()); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); TQString ext = config->readEntry("LastSavedImageTypeMime", "png"); TQString fileName = info.baseName(false) + TQString(".") + ext; @@ -1763,7 +1763,7 @@ void EditorWindow::slotToggleColorManagedView() // Save Color Managed View setting in config file. For performance // reason, no need to flush file, it cached in memory and will be flushed // to disk at end of session. - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); config->writeEntry("ManagedView", cmv); } @@ -1849,7 +1849,7 @@ void EditorWindow::slotContribute() void EditorWindow::slotToggleSlideShow() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); @@ -1886,7 +1886,7 @@ void EditorWindow::slotThemeChanged() m_themeMenuAction->setCurrentItem(index); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); if (!config->readBoolEntry("UseThemeBackgroundColor", true)) diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index f2fb84a3..d106ceab 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -507,7 +507,7 @@ CurvesWidget* RawSettingsBox::curve() const void RawSettingsBox::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("RAW Import Settings"); d->channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", RawSettingsBoxPriv::LuminosityChannel)); @@ -582,7 +582,7 @@ void RawSettingsBox::readSettings() void RawSettingsBox::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("RAW Import Settings"); config->writeEntry("Histogram Channel", d->channelCB->currentItem()); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 4b0cba02..38e59b97 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -300,7 +300,7 @@ TQString ImagePrint::minimizeString( TQString text, const TQFontMetrics& metrics void ImagePrint::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); @@ -740,7 +740,7 @@ void ImageEditorPrintDialogPage::slotUnitChanged(const TQString& string) void ImageEditorPrintDialogPage::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); d->cmEnabled = config->readBoolEntry("EnableCM", false); } diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 24ea5b60..b090b3cd 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -303,7 +303,7 @@ void ImageResize::slotRestorationToggled(bool b) void ImageResize::readUserSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("resize Tool Dialog"); GreycstorationSettings settings; @@ -350,7 +350,7 @@ void ImageResize::readUserSettings() void ImageResize::writeUserSettings() { GreycstorationSettings settings = d->settingsWidget->getSettings(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("resize Tool Dialog"); config->writeEntry("FastApprox", settings.fastApprox); config->writeEntry("Interpolation", settings.interp); diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 47f2abea..338d818e 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -129,7 +129,7 @@ LightTableWindow::~LightTableWindow() void LightTableWindow::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("LightTable Settings"); if(config->hasKey("Vertical Splitter Sizes")) @@ -144,7 +144,7 @@ void LightTableWindow::readSettings() void LightTableWindow::writeSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("LightTable Settings"); config->writeEntry("Vertical Splitter Sizes", d->vSplitter->sizes()); config->writeEntry("Horizontal Splitter Sizes", d->hSplitter->sizes()); @@ -154,7 +154,7 @@ void LightTableWindow::writeSettings() void LightTableWindow::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("LightTable Settings"); d->autoLoadOnRightPanel = config->readBoolEntry("Auto Load Right Panel", true); @@ -1261,7 +1261,7 @@ void LightTableWindow::slotFitToWindow() void LightTableWindow::slotToggleSlideShow() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false); diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index bdfe3d03..55d843a6 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -206,7 +206,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) showPage((int) page); else { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Settings"); showPage(config->readNumEntry("Setup Page", General)); } @@ -216,7 +216,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) Setup::~Setup() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General Settings"); config->writeEntry("Setup Page", activePageIndex()); config->sync(); diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index a391bd54..09a3cb6f 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -102,7 +102,7 @@ void SetupDcraw::slotSixteenBitsImageToggled(bool) void SetupDcraw::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits()); config->writeEntry("WhiteBalance", d->dcrawSettings->whiteBalance()); @@ -124,7 +124,7 @@ void SetupDcraw::applySettings() void SetupDcraw::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->dcrawSettings->setSixteenBits(config->readBoolEntry("SixteenBitsImage", false)); d->dcrawSettings->setNoiseReduction(config->readBoolEntry("EnableNoiseReduction", false)); diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index 7c4e1d3e..1ee738be 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -148,7 +148,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e) void SetupEditor::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); TQColor Black(TQt::black); TQColor White(TQt::white); config->setGroup("ImageViewer Settings"); @@ -162,7 +162,7 @@ void SetupEditor::readSettings() void SetupEditor::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked()); config->writeEntry("BackgroundColor", d->backgroundColor->color()); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 0ee68577..6e821324 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -383,7 +383,7 @@ void SetupICC::processLCMSURL(const TQString& url) void SetupICC::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); config->writeEntry("EnableCM", d->enableColorManagement->isChecked()); @@ -417,7 +417,7 @@ void SetupICC::applySettings() void SetupICC::readSettings(bool restore) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); if (!restore) @@ -706,7 +706,7 @@ void SetupICC::slotToggleManagedView(bool b) bool SetupICC::iccRepositoryIsValid() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Color Management"); // If color management is disable, no need to check anymore. diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index 69a9b528..d3564435 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -111,7 +111,7 @@ SetupIOFiles::~SetupIOFiles() void SetupIOFiles::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue()); config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue()); @@ -124,7 +124,7 @@ void SetupIOFiles::applySettings() void SetupIOFiles::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) ); d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) ); // Medium subsampling diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp index 24cef4ef..db8ce9c7 100644 --- a/digikam/utilities/setup/setuplighttable.cpp +++ b/digikam/utilities/setup/setuplighttable.cpp @@ -108,7 +108,7 @@ SetupLightTable::~SetupLightTable() void SetupLightTable::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); TQColor Black(TQt::black); TQColor White(TQt::white); config->setGroup("LightTable Settings"); @@ -120,7 +120,7 @@ void SetupLightTable::readSettings() void SetupLightTable::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("LightTable Settings"); config->writeEntry("FullScreen Hide ToolBar", d->hideToolBar->isChecked()); config->writeEntry("Auto Sync Preview", d->autoSyncPreview->isChecked()); diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp index 28ccdde8..fc1eb6ff 100644 --- a/digikam/utilities/setup/setupslideshow.cpp +++ b/digikam/utilities/setup/setupslideshow.cpp @@ -130,7 +130,7 @@ SetupSlideShow::~SetupSlideShow() void SetupSlideShow::applySettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); config->writeEntry("SlideShowDelay", d->delayInput->value()); @@ -147,7 +147,7 @@ void SetupSlideShow::applySettings() void SetupSlideShow::readSettings() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); d->delayInput->setValue(config->readNumEntry("SlideShowDelay", 5)); -- cgit v1.2.3