diff --git a/ChangeLog b/ChangeLog index abcc09c..3bc7e68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22703,7 +22703,7 @@ v0.9.1-beta1 - 11-Feb-2007 Disable the use of the DImg raw loader when loading as DImg from digikamthumbnail ioslave. - We are using KProcess for the raw loader and make two + We are using TDEProcess for the raw loader and make two assumptions: - there is an event loop (not for ioslaves) - the loader is not called from the event loop thread (currently @@ -22711,7 +22711,7 @@ v0.9.1-beta1 - 11-Feb-2007 The DImg raw loader is not needed - DcrawIface is called before. So the problem of the loader entering an endless loop (because no - events from KProcess + events from TDEProcess are delivered) arises only if a file is identified as RAW, but dcraw does not support it. @@ -32079,10 +32079,10 @@ v0.9.0-beta1 - 20/07/2006 the app is closed while a raw image is being loaded in the histogram side bar. - The KProcess-based raw loader is waiting for the dcraw process + The TDEProcess-based raw loader is waiting for the dcraw process to finish, but the main thread is wait()ing for the thread to finish, - and no KProcess events are delivered. + and no TDEProcess events are delivered. This hack can be removed when we port to Qt4 and use the synchronous QProcess. @@ -35473,7 +35473,7 @@ v0.9.0-beta1 - 20/07/2006 - Fix broken loading with dcraw and all parameter witch require a value. - Since we use KProcess, implementation need to use QString at + Since we use TDEProcess, implementation need to use QString at all, especially to add space between option and value. The better way is to use QString::arg() method. - Add comments about dcraw Quality rules with digiKam. @@ -35512,12 +35512,12 @@ v0.9.0-beta1 - 20/07/2006 * trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.cpp, trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.h: digikam from trunk: - Use KProcess for RAW image loader. + Use TDEProcess for RAW image loader. Loading can now be cleanly aborted. - This is a good example that KProcess is not the perfect tool for + This is a good example that TDEProcess is not the perfect tool for use - with our shiny new multithreaded loader because KProcess is not + with our shiny new multithreaded loader because TDEProcess is not reentrant, but there are more advantages (wraps all system programming) so that diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 55307ac..244da54 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -162,7 +162,7 @@ void AlbumFileTip::reposition() // should the tooltip be shown to the left or to the right of the ivi ? #if KDE_IS_VERSION(3,2,0) - TQRect desk = KGlobalSettings::desktopGeometry(rect.center()); + TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center()); #else TQRect desk = TQApplication::desktop()->screenGeometry( TQApplication::desktop()->screenNumber(rect.center()) ); @@ -358,7 +358,7 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowFileDate()) { TQDateTime modifiedDate = fileInfo.lastModified(); - str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); + str = TDEGlobal::locale()->formatDateTime(modifiedDate, true, true); tip += cellBeg + i18n("Modified:") + cellMid + str + cellEnd; } @@ -366,7 +366,7 @@ void AlbumFileTip::updateText() { tip += cellBeg + i18n("Size:") + cellMid; str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); tip += str + cellEnd; } @@ -444,7 +444,7 @@ void AlbumFileTip::updateText() { if (photoInfo.dateTime.isValid()) { - str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); + str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; metaStr += cellBeg + i18n("Created:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index 44abf82..d758f4f 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -1490,7 +1490,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail TQDate date = album->date(); TQString timeString = TQString::number(date.year()) + ", " + - KGlobal::locale()->calendar()->monthName(date, false); + TDEGlobal::locale()->calendar()->monthName(date, false); AlbumFolderViewItem* parent = 0; diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp index da0be63..9ed1a14 100644 --- a/digikam/digikam/albumicongroupitem.cpp +++ b/digikam/digikam/albumicongroupitem.cpp @@ -101,8 +101,8 @@ void AlbumIconGroupItem::paintBanner() TQDate date = album->date(); dateAndComments = i18n("%1 %2 - 1 Item", "%1 %2 - %n Items", count()) - .arg(KGlobal::locale()->calendar()->monthName(date, false)) - .arg(KGlobal::locale()->calendar()->year(date)); + .arg(TDEGlobal::locale()->calendar()->monthName(date, false)) + .arg(TDEGlobal::locale()->calendar()->year(date)); if (!album->caption().isEmpty()) { diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 18f333e..7b8faf3 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -77,7 +77,7 @@ public: static void dateToString(const TQDateTime& datetime, TQString& str) { - str = KGlobal::locale()->formatDateTime(datetime, true, false); + str = TDEGlobal::locale()->formatDateTime(datetime, true, false); } AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info) diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index 7dcfa65..fad91b9 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -205,9 +205,9 @@ AlbumIconView::AlbumIconView(TQWidget* parent) // -- Load rating Pixmap ------------------------------------------ - KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; d->ratingPixmap = TQPixmap(ratingPixPath); diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 07f43bb..9402b74 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -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 = KGlobal::config(); + KConfig* 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 = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); if (config->readBoolEntry("Scan At Start", true) || d->db->getSetting("Scanned").isEmpty()) diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 48c47c5..f8067e7 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -103,9 +103,9 @@ DateFolderItem::DateFolderItem(TQListViewItem* parent, DAlbum* album) m_count = 0; m_album = album; #if KDE_IS_VERSION(3,2,0) - m_name = KGlobal::locale()->calendar()->monthName(m_album->date(), false); + m_name = TDEGlobal::locale()->calendar()->monthName(m_album->date(), false); #else - m_name = KGlobal::locale()->monthName(m_album->date(), false); + m_name = TDEGlobal::locale()->monthName(m_album->date(), false); #endif setText(0, m_name); } diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 8ef32b7..a2d9be8 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -1720,13 +1720,13 @@ void DigikamApp::slotEditKeys() void DigikamApp::slotConfToolbars() { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); KEditToolbar *dlg = new KEditToolbar(actionCollection(), "digikamui.rc"); if(dlg->exec()) { createGUI(TQString::fromLatin1( "digikamui.rc" ), false); - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); @@ -2073,7 +2073,7 @@ void DigikamApp::slotTogglePreview(bool t) void DigikamApp::slotAlbumAddImages() { - TQString path = KFileDialog::getExistingDirectory(KGlobalSettings::documentPath(), this, + TQString path = KFileDialog::getExistingDirectory(TDEGlobalSettings::documentPath(), this, i18n("Select folder to parse")); if(path.isEmpty()) diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index fbbd014..03466dc 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -105,7 +105,7 @@ KIO::Job* del(const KURL& src, bool useTrash) if (!KProtocolInfo::isKnownProtocol(dest)) { - dest = KGlobalSettings::trashPath(); + dest = TDEGlobalSettings::trashPath(); } job = KIO::move( src, dest ); @@ -129,7 +129,7 @@ KIO::Job* del(const KURL::List& srcList, bool useTrash) if (!KProtocolInfo::isKnownProtocol(dest)) { - dest = KGlobalSettings::trashPath(); + dest = TDEGlobalSettings::trashPath(); } job = KIO::move( srcList, dest ); diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index a4724e4..ad1f2f4 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -174,7 +174,7 @@ void FolderView::contentsMouseMoveEvent(TQMouseEvent *e) if(e->state() == NoButton) { - if(KGlobalSettings::changeCursorOverIcon()) + if(TDEGlobalSettings::changeCursorOverIcon()) { TQPoint vp = contentsToViewport(e->pos()); TQListViewItem *item = itemAt(vp); diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index 40552ce..1ce216f 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -1111,7 +1111,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) } } - if (KGlobalSettings::changeCursorOverIcon()) + if (TDEGlobalSettings::changeCursorOverIcon()) { if (item && item->clickToOpenRect().contains(e->pos())) setCursor(KCursor::handCursor()); @@ -1259,7 +1259,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) d->anchorItem = item; if (prevCurrItem) prevCurrItem->repaint(); - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) { if (item->clickToOpenRect().contains(e->pos())) { @@ -1282,7 +1282,7 @@ void IconView::contentsWheelEvent(TQWheelEvent* e) void IconView::contentsMouseDoubleClickEvent(TQMouseEvent *e) { - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) return; IconItem *item = findItem(e->pos()); diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index d48cf28..cab8832 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -62,7 +62,7 @@ class DateValidator : public TQValidator return Acceptable; bool ok = false; - KGlobal::locale()->readDate( str, &ok ); + TDEGlobal::locale()->readDate( str, &ok ); if ( ok ) return Acceptable; else @@ -82,7 +82,7 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) setMaxCount( 1 ); mDate = TQDate::currentDate(); - TQString today = KGlobal::locale()->formatDate( mDate, true ); + TQString today = TDEGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); @@ -143,7 +143,7 @@ void KDateEdit::popup() if ( mReadOnly ) return; - TQRect desk = KGlobalSettings::desktopGeometry( this ); + TQRect desk = TDEGlobalSettings::desktopGeometry( this ); TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); @@ -253,7 +253,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( replaced ) (*replaced) = true; } else { - result = KGlobal::locale()->readDate( text ); + result = TDEGlobal::locale()->readDate( text ); } return result; @@ -348,7 +348,7 @@ void KDateEdit::setupKeywords() TQString dayName; for ( int i = 1; i <= 7; ++i ) { - dayName = KGlobal::locale()->calendar()->weekDayName( i ).lower(); + dayName = TDEGlobal::locale()->calendar()->weekDayName( i ).lower(); mKeywordMap.insert( dayName, i + 100 ); } } @@ -364,7 +364,7 @@ void KDateEdit::updateView() { TQString dateString; if ( mDate.isValid() ) - dateString = KGlobal::locale()->formatDate( mDate, true ); + dateString = TDEGlobal::locale()->formatDate( mDate, true ); // We do not want to generate a signal here, // since we explicitly setting the date diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index 84c6521..c5590ac 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 = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("General Settings"); TQString version = config->readEntry("Version"); @@ -126,8 +126,8 @@ int main(int argc, char *argv[]) tipsFiles.append("digikam/tips"); tipsFiles.append("kipi/tips"); - KGlobal::locale()->insertCatalogue("kipiplugins"); - KGlobal::locale()->insertCatalogue("libkdcraw"); + TDEGlobal::locale()->insertCatalogue("kipiplugins"); + TDEGlobal::locale()->insertCatalogue("libkdcraw"); KTipDialog::showMultiTip(0, tipsFiles, false); #else diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index f9ff06b..6906629 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -214,7 +214,7 @@ void MonthWidget::drawContents(TQPainter *) if(!weekvisible) { - int weeknr = KGlobal::locale()->calendar()->weekNumber(TQDate(d->year, + int weeknr = TDEGlobal::locale()->calendar()->weekNumber(TQDate(d->year, d->month, d->days[index].day)); p.setPen(d->active ? TQt::black : TQt::gray); p.setFont(fnBold); @@ -244,11 +244,11 @@ void MonthWidget::drawContents(TQPainter *) rsmall.setHeight(r.height() - 2); #if KDE_IS_VERSION(3,2,0) p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, - KGlobal::locale()->calendar()->weekDayName(i, true) + TDEGlobal::locale()->calendar()->weekDayName(i, true) .remove(2,1)); #else p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, - KGlobal::locale()->weekDayName(i, true).remove(2,1)); + TDEGlobal::locale()->weekDayName(i, true).remove(2,1)); #endif index++; } @@ -261,12 +261,12 @@ void MonthWidget::drawContents(TQPainter *) #if KDE_IS_VERSION(3,2,0) p.drawText(r, TQt::AlignCenter, TQString("%1 %2") - .arg(KGlobal::locale()->calendar()->monthName(d->month, false)) - .arg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); + .arg(TDEGlobal::locale()->calendar()->monthName(d->month, false)) + .arg(TDEGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); #else p.drawText(r, TQt::AlignCenter, TQString("%1 %2") - .arg(KGlobal::locale()->monthName(d->month)) + .arg(TDEGlobal::locale()->monthName(d->month)) .arg(TQString::number(d->year))); #endif diff --git a/digikam/digikam/ratingpopupmenu.cpp b/digikam/digikam/ratingpopupmenu.cpp index 86261a4..b419b65 100644 --- a/digikam/digikam/ratingpopupmenu.cpp +++ b/digikam/digikam/ratingpopupmenu.cpp @@ -47,8 +47,8 @@ namespace Digikam RatingPopupMenu::RatingPopupMenu(TQWidget* parent) : TQPopupMenu(parent) { - KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; insertItem(i18n("None"), 0); diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index 0504652..0cfc605 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -66,9 +66,9 @@ RatingWidget::RatingWidget(TQWidget* parent) { d = new RatingWidgetPriv; - KGlobal::dirs()->addResourceType("digikam_rating", - KGlobal::dirs()->kde_default("data") + "digikam/data"); - d->ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TDEGlobal::dirs()->addResourceType("digikam_rating", + TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + d->ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); d->ratingPixPath.append("/rating.png"); slotThemeChanged(); diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index f45f3ae..bcb2e5c 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -119,7 +119,7 @@ bool SyncJob::trashPriv(const KURL::List& urls) if (!KProtocolInfo::isKnownProtocol(dest)) { - dest = KGlobalSettings::trashPath(); + dest = TDEGlobalSettings::trashPath(); } KIO::Job* job = KIO::move( urls, dest ); diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 47600c8..dfc91cc 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -155,16 +155,16 @@ TimeLineView::TimeLineView(TQWidget *parent) TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); d->scaleBG->insert(linHistoButton, TimeLineWidget::LinScale); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); d->scaleBG->insert(logHistoButton, TimeLineWidget::LogScale); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index ffd5d9a..eecc0c9 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -74,7 +74,7 @@ public: nbItems = 10; timeUnit = TimeLineWidget::Month; scaleMode = TimeLineWidget::LinScale; - calendar = KGlobal::locale()->calendar(); + calendar = TDEGlobal::locale()->calendar(); } bool validMouseEvent; // Current mouse enter event is valid to set cursor position or selection. @@ -274,7 +274,7 @@ int TimeLineWidget::cursorInfo(TQString& infoDate) { case Day: { - infoDate = KGlobal::locale()->formatDate(dt.date()); + infoDate = TDEGlobal::locale()->formatDate(dt.date()); break; } case Week: @@ -721,7 +721,7 @@ void TimeLineWidget::updatePixmap() p.setPen(dateColor); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQString txt = TDEGlobal::locale()->formatDate(ref.date(), true); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } @@ -748,7 +748,7 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQString txt = TDEGlobal::locale()->formatDate(ref.date(), true); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); if (week != 50) p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); @@ -905,7 +905,7 @@ void TimeLineWidget::updatePixmap() p.setPen(dateColor); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQString txt = TDEGlobal::locale()->formatDate(ref.date(), true); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } @@ -932,7 +932,7 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQString txt = TDEGlobal::locale()->formatDate(ref.date(), true); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); if (week != 50) p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); @@ -1611,7 +1611,7 @@ TQDateTime TimeLineWidget::dateTimeForPoint(const TQPoint& pt, bool &isOnSelecti TQDateTime ref = d->refDateTime; ref.setTime(TQTime(0, 0, 0, 0)); - TQRect deskRect = KGlobalSettings::desktopGeometry(this); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); int items = deskRect.width() / d->barWidth; for (int i = 0 ; i < items ; i++) diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index a39f8a7..57a601e 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -153,16 +153,16 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::CurvesWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::CurvesWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -222,18 +222,18 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) m_curveType = new TQHButtonGroup(gboxSettings); m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); - KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvefree", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQWhatsThis::add( m_curveFree, i18n("

With this button, you can draw your curve free-hand with the mouse.")); m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); - KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvemooth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); @@ -247,9 +247,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -257,9 +257,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -267,9 +267,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -635,7 +635,7 @@ void AdjustCurveDialog::slotUser3() { KURL loadCurvesFile; - loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) @@ -657,7 +657,7 @@ void AdjustCurveDialog::slotUser2() { KURL saveCurvesFile; - saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index cc92c83..5115723 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -144,16 +144,16 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, CurvesWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, CurvesWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -209,18 +209,18 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) m_curveType = new TQHButtonGroup(m_gboxSettings->plainPage()); m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); - KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvefree", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQWhatsThis::add( m_curveFree, i18n("

With this button, you can draw your curve free-hand with the mouse.")); m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); - KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvemooth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); @@ -234,9 +234,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -244,9 +244,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -254,9 +254,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -619,7 +619,7 @@ void AdjustCurvesTool::slotLoadSettings() { KURL loadCurvesFile; - loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) @@ -640,7 +640,7 @@ void AdjustCurvesTool::slotSaveAsSettings() { KURL saveCurvesFile; - saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 8ffd378..cca520c 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -155,16 +155,16 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -256,9 +256,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -266,9 +266,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-gray", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-gray", "color-picker-gray.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-gray", "color-picker-gray.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-gray.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -276,9 +276,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -768,7 +768,7 @@ void AdjustLevelDialog::slotUser3() { KURL loadLevelsFile; - loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) @@ -789,7 +789,7 @@ void AdjustLevelDialog::slotUser2() { KURL saveLevelsFile; - saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index aae7cc4..835ea94 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -148,16 +148,16 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -253,9 +253,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -263,9 +263,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-gray", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -273,9 +273,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -751,7 +751,7 @@ void AdjustLevelsTool::slotLoadSettings() { KURL loadLevelsFile; - loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) @@ -771,7 +771,7 @@ void AdjustLevelsTool::slotSaveAsSettings() { KURL saveLevelsFile; - saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index 42eeb1b..2aee7f0 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -646,9 +646,9 @@ TQString BorderTool::getBorderPath(int border) return TQString(); } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } void BorderTool::slotPreserveAspectRatioToggled(bool b) diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index e1e841c..7560806 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -644,9 +644,9 @@ TQString ImageEffect_Border::getBorderPath(int border) return TQString(); } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } void ImageEffect_Border::slotPreserveAspectRatioToggled(bool b) diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index cf4b55a..3a5ea7e 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -147,16 +147,16 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -626,7 +626,7 @@ void ChannelMixerDialog::slotUser3() int currentOutputChannel; bool monochrome; - loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) @@ -711,7 +711,7 @@ void ChannelMixerDialog::slotUser2() KURL saveGainsFileUrl; FILE *fp = 0L; - saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 0fe5cc5..86598f0 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -141,16 +141,16 @@ ChannelMixerTool::ChannelMixerTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -618,7 +618,7 @@ void ChannelMixerTool::slotLoadSettings() int currentOutputChannel; bool monochrome; - loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) @@ -702,7 +702,7 @@ void ChannelMixerTool::slotSaveAsSettings() KURL saveGainsFileUrl; FILE *fp = 0L; - saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index e4dc985..c720aa9 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -125,16 +125,16 @@ ColorFXTool::ColorFXTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 839cdc3..8b3a824 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -131,16 +131,16 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 1822f24..e59cfaa 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -125,16 +125,16 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index d696adb..947057a 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -124,16 +124,16 @@ BCGTool::BCGTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 0e00c07..5423571 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -215,16 +215,16 @@ BWSepiaTool::BWSepiaTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); @@ -1063,7 +1063,7 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in void BWSepiaTool::slotLoadSettings() { - KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) @@ -1139,7 +1139,7 @@ void BWSepiaTool::slotLoadSettings() void BWSepiaTool::slotSaveAsSettings() { - KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Black & White Settings File to Save"))); if( saveFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 6ab08bd..a5f6721 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -128,16 +128,16 @@ HSLTool::HSLTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index b33f96a..c1955f4 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -111,16 +111,16 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 58f88f5..421847e 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -153,16 +153,16 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); @@ -270,8 +270,8 @@ ICCProofTool::ICCProofTool(TQObject* parent) lcmsLogoLabel->setAlignment(AlignTop | AlignRight); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); - KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); lcmsLogoLabel->setPixmap(TQPixmap(directory + "logo-lcms.png")); TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); @@ -537,7 +537,7 @@ ICCProofTool::~ICCProofTool() void ICCProofTool::readSettings() { - TQString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = TDEGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -1186,7 +1186,7 @@ bool ICCProofTool::useDefaultProofProfile() void ICCProofTool::slotLoadSettings() { - KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString("*"), kapp->activeWindow(), TQString(i18n("Color Management Settings File to Load"))); if (loadColorManagementFile.isEmpty()) @@ -1263,7 +1263,7 @@ void ICCProofTool::slotLoadSettings() void ICCProofTool::slotSaveAsSettings() { - KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString(i18n("Color Management Settings File to Save"))); if (saveColorManagementFile.isEmpty()) diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index d6fd9b8..f69e22d 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -118,16 +118,16 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index 4e0d800..de5240d 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -111,16 +111,16 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 8202855..43064a8 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -213,16 +213,16 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -1069,7 +1069,7 @@ void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, boo void ImageEffect_BWSepia::slotUser3() { - KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) @@ -1144,7 +1144,7 @@ void ImageEffect_BWSepia::slotUser3() void ImageEffect_BWSepia::slotUser2() { - KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Black & White Settings File to Save")) ); if( saveFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index 366a3c6..29648a4 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -140,16 +140,16 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -256,8 +256,8 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) lcmsLogoLabel->setAlignment( AlignTop | AlignRight ); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); - KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) ); TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); @@ -527,7 +527,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof() void ImageEffect_ICCProof::readUserSettings() { - TQString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = TDEGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -1162,7 +1162,7 @@ bool ImageEffect_ICCProof::useDefaultProofProfile() void ImageEffect_ICCProof::slotUser3() { - KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Color Management Settings File to Load")) ); if( loadColorManagementFile.isEmpty() ) @@ -1238,7 +1238,7 @@ void ImageEffect_ICCProof::slotUser3() void ImageEffect_ICCProof::slotUser2() { - KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Color Management Settings File to Save")) ); if( saveColorManagementFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index a226c50..bc10ffa 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -110,16 +110,16 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index bac658d..39dca76 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -109,16 +109,16 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index e3cef1f..954f49a 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -168,8 +168,8 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) m_imageSelectionWidget->getWidthStep(), true); m_centerWidth = new TQPushButton(cropSelection); - KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + TDEGlobal::dirs()->addResourceType("centerwidth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); m_centerWidth->setPixmap( TQPixmap( directory + "centerwidth.png" ) ); TQWhatsThis::add( m_centerWidth, i18n("

Set width position to center.")); @@ -192,8 +192,8 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) m_imageSelectionWidget->getHeightStep(), true); m_centerHeight = new TQPushButton(cropSelection); - KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); + TDEGlobal::dirs()->addResourceType("centerheight", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); m_centerHeight->setPixmap( TQPixmap( directory + "centerheight.png" ) ); TQWhatsThis::add( m_centerHeight, i18n("

Set height position to center.")); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index 15c6789..8c660bd 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -189,8 +189,8 @@ RatioCropTool::RatioCropTool(TQObject* parent) TQWhatsThis::add( m_widthInput, i18n("

Set here the width selection for cropping.")); m_centerWidth = new TQToolButton(cropSelection); - KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + TDEGlobal::dirs()->addResourceType("centerwidth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png")); TQWhatsThis::add(m_centerWidth, i18n("

Set width position to center.")); @@ -211,8 +211,8 @@ RatioCropTool::RatioCropTool(TQObject* parent) TQWhatsThis::add( m_heightInput, i18n("

Set here the height selection for cropping.")); m_centerHeight = new TQToolButton(cropSelection); - KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); + TDEGlobal::dirs()->addResourceType("centerheight", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png")); TQWhatsThis::add(m_centerHeight, i18n("

Set height position to center.")); diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index 4dfa4b5..c5f59ed 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -125,16 +125,16 @@ RedEyeTool::RedEyeTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index bd3e616..32d5803 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -122,16 +122,16 @@ RGBTool::RGBTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("

Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(logHistoButton, i18n("

Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index a8d26c9..19e61a0 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -633,7 +633,7 @@ void ImageEffect_Sharpen::putFinalData(void) void ImageEffect_Sharpen::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -669,7 +669,7 @@ void ImageEffect_Sharpen::slotUser3() void ImageEffect_Sharpen::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index 63d571c..e50594e 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -678,7 +678,7 @@ void SharpenTool::putFinalData() void SharpenTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -714,7 +714,7 @@ void SharpenTool::slotLoadSettings() void SharpenTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index e508d85..99dee40 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -167,8 +167,8 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -415,7 +415,7 @@ void ImageEffect_InPainting_Dialog::putFinalData(void) void ImageEffect_InPainting_Dialog::slotUser3() { - KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) @@ -446,7 +446,7 @@ void ImageEffect_InPainting_Dialog::slotUser3() void ImageEffect_InPainting_Dialog::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index a9c2959..5eff348 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -115,8 +115,8 @@ InPaintingTool::InPaintingTool(TQObject* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -380,7 +380,7 @@ void InPaintingTool::putFinalData() void InPaintingTool::slotLoadSettings() { - KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) @@ -411,7 +411,7 @@ void InPaintingTool::slotLoadSettings() void InPaintingTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index bd6517f..99077e2 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -294,13 +294,13 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, vbox->addWidget( xlfdEdit ); // lets initialize the display if possible - setFont( KGlobalSettings::generalFont(), usingFixed ); + setFont( TDEGlobalSettings::generalFont(), usingFixed ); // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 92e6030..b2c1c57 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -477,7 +477,7 @@ void ImageEffect_NoiseReduction::putFinalData(void) void ImageEffect_NoiseReduction::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -519,7 +519,7 @@ void ImageEffect_NoiseReduction::slotUser3() void ImageEffect_NoiseReduction::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index 008483f..c2cea09 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -462,7 +462,7 @@ void NoiseReductionTool::putFinalData() void NoiseReductionTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -503,7 +503,7 @@ void NoiseReductionTool::slotLoadSettings() void NoiseReductionTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index fc21b24..20855ca 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -99,8 +99,8 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -296,7 +296,7 @@ void ImageEffect_Restoration::putFinalData(void) void ImageEffect_Restoration::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) @@ -329,7 +329,7 @@ void ImageEffect_Restoration::slotUser3() void ImageEffect_Restoration::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 0967a36..aca6e4a 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -90,8 +90,8 @@ RestorationTool::RestorationTool(TQObject* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -303,7 +303,7 @@ void RestorationTool::putFinalData() void RestorationTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) @@ -336,7 +336,7 @@ void RestorationTool::slotLoadSettings() void RestorationTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 24de4a6..99a485e 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -213,7 +213,7 @@ void ImageEffect_SuperImpose::readUserSettings() { KConfig* config = kapp->config(); config->setGroup("Album Settings"); - KURL albumDBUrl( config->readPathEntry("Album Path", KGlobalSettings::documentPath()) ); + KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool Dialog"); config->setGroup("Template Superimpose Tool Settings"); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 7e1f8a7..37c8a82 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -205,7 +205,7 @@ void SuperImposeTool::readSettings() { KConfig* config = kapp->config(); config->setGroup("Album Settings"); - KURL albumDBUrl( config->readPathEntry("Album Path", KGlobalSettings::documentPath()) ); + KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool"); config->setGroup("Template Superimpose Tool Settings"); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 19b582d..6e77e82 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -282,9 +282,9 @@ TQString ImageEffect_Texture::getTexturePath(int texture) break; } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } } // NameSpace DigikamTextureImagesPlugin diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 0548813..d2b1b87 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -287,8 +287,8 @@ TQString TextureTool::getTexturePath(int texture) break; } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } } // NameSpace DigikamTextureImagesPlugin diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index d4c759b..a335d98 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -148,16 +148,16 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -229,8 +229,8 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) "Daylight D65: overcast sky light (6500K).

" "None: no preset value.")); m_pickTemperature = new TQPushButton(gboxSettings); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); @@ -768,7 +768,7 @@ void ImageEffect_WhiteBalance::writeUserSettings() // Load all settings. void ImageEffect_WhiteBalance::slotUser3() { - KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) @@ -811,7 +811,7 @@ void ImageEffect_WhiteBalance::slotUser3() // Save all settings. void ImageEffect_WhiteBalance::slotUser2() { - KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 8cd70fa..91a1532 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -144,16 +144,16 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -228,8 +228,8 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) "Daylight D65: overcast sky light (6500K).

" "None: no preset value.")); m_pickTemperature = new TQPushButton(m_gboxSettings->plainPage()); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); @@ -778,7 +778,7 @@ void WhiteBalanceTool::writeSettings() void WhiteBalanceTool::slotLoadSettings() { - KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) @@ -820,7 +820,7 @@ void WhiteBalanceTool::slotLoadSettings() void WhiteBalanceTool::slotSaveAsSettings() { - KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 6c3b1d6..478ee17 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -1953,7 +1953,7 @@ extern "C" { KLocale::setMainCatalogue("digikam"); TDEInstance instance( "kio_digikamalbums" ); - KGlobal::locale(); + TDEGlobal::locale(); if (argc != 4) { kdDebug() << "Usage: kio_digikamalbums protocol domain-socket1 domain-socket2" diff --git a/digikam/kioslave/digikamdates.cpp b/digikam/kioslave/digikamdates.cpp index ae1c677..cef0477 100644 --- a/digikam/kioslave/digikamdates.cpp +++ b/digikam/kioslave/digikamdates.cpp @@ -296,7 +296,7 @@ extern "C" { KLocale::setMainCatalogue("digikam"); TDEInstance instance( "kio_digikamdates" ); - KGlobal::locale(); + TDEGlobal::locale(); if (argc != 4) { kdDebug() << "Usage: kio_digikamdates protocol domain-socket1 domain-socket2" diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index aeb6f7b..ed795ab 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -73,7 +73,7 @@ kio_digikamsearch::kio_digikamsearch(const TQCString &pool_socket, : SlaveBase("kio_digikamsearch", pool_socket, app_socket) { // build a lookup table for month names - const KCalendarSystem* cal = KGlobal::locale()->calendar(); + const KCalendarSystem* cal = TDEGlobal::locale()->calendar(); for (int i=1; i<=12; ++i) { m_shortMonths[i-1] = cal->monthName(i, 2000, true).lower(); @@ -676,7 +676,7 @@ extern "C" { KLocale::setMainCatalogue("digikam"); TDEInstance instance( "kio_digikamsearch" ); - KGlobal::locale(); + TDEGlobal::locale(); if (argc != 4) { diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp index 5f98505..e0f04ed 100644 --- a/digikam/kioslave/digikamtags.cpp +++ b/digikam/kioslave/digikamtags.cpp @@ -305,7 +305,7 @@ extern "C" { KLocale::setMainCatalogue("digikam"); TDEInstance instance( "kio_digikamtags" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); kdDebug() << "*** kio_digikamtag started ***" << endl; diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index d43c279..54427b8 100644 --- a/digikam/kioslave/digikamthumbnail.cpp +++ b/digikam/kioslave/digikamthumbnail.cpp @@ -616,7 +616,7 @@ extern "C" { KLocale::setMainCatalogue("digikam"); TDEInstance instance( "kio_digikamthumbnail" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); if (argc != 4) { diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index bac52bd..7976be0 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -114,13 +114,13 @@ void DeleteWidget::updateText() { ddDeleteText->setText(i18n("These items will be permanently " "deleted from your hard disk.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::Desktop, KIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("These items will be moved to Trash.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", KIcon::Desktop, KIcon::SizeLarge)); } ddNumFiles->setText(i18n("1 file selected.", "%n files selected.", ddFileList->count())); @@ -134,13 +134,13 @@ void DeleteWidget::updateText() { ddDeleteText->setText(i18n("These albums will be permanently " "deleted from your hard disk.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::Desktop, KIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("These albums will be moved to Trash.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", KIcon::Desktop, KIcon::SizeLarge)); } ddNumFiles->setText(i18n("1 album selected.", "%n albums selected.", ddFileList->count())); @@ -157,7 +157,7 @@ void DeleteWidget::updateText() "Note that all subalbums " "are included in this list and will " "be deleted permanently as well.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::Desktop, KIcon::SizeLarge)); } else @@ -166,7 +166,7 @@ void DeleteWidget::updateText() "Note that all subalbums " "are included in this list and will " "be moved to Trash as well.")); - ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", + ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", KIcon::Desktop, KIcon::SizeLarge)); } ddNumFiles->setText(i18n("1 album selected.", "%n albums selected.", ddFileList->count())); diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index 99297e4..d9ad528 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -140,7 +140,7 @@ void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text) if (pix.isNull()) { - TQString dir = KGlobal::dirs()->findResourceDir("digikam_imagebroken", + TQString dir = TDEGlobal::dirs()->findResourceDir("digikam_imagebroken", "image-broken.png"); dir = dir + "/image-broken.png"; TQPixmap pixbi(dir); diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 7b7e949..d25e01c 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -180,7 +180,7 @@ void ImageDialogPreview::showPreview(const KURL& url) else model = info.model; if (!info.dateTime.isValid()) dateTime = unavailable; - else dateTime = KGlobal::locale()->formatDateTime(info.dateTime, true, true); + else dateTime = TDEGlobal::locale()->formatDateTime(info.dateTime, true, true); if (info.aperture.isEmpty()) aperture = unavailable; else aperture = info.aperture; diff --git a/digikam/libs/dimg/ddebug.cpp b/digikam/libs/dimg/ddebug.cpp index 6f9d6da..3f8f07c 100644 --- a/digikam/libs/dimg/ddebug.cpp +++ b/digikam/libs/dimg/ddebug.cpp @@ -52,7 +52,7 @@ Ddbgstream::Ddbgstream(kdbgstream stream) // leak the mutex object for simplicity _ddebug_mutex_ = new TQMutex; //deleter.setObject(mutex, new TQMutex); - //KGlobal::unregisterStaticDeleter(&deleter); + //TDEGlobal::unregisterStaticDeleter(&deleter); } _ddebug_mutex_->lock(); } @@ -72,7 +72,7 @@ Dndbgstream::Dndbgstream(kndbgstream stream) // leak the mutex object for simplicity _ddebug_mutex_ = new TQMutex; //deleter.setObject(mutex, new TQMutex); - //KGlobal::unregisterStaticDeleter(&deleter); + //TDEGlobal::unregisterStaticDeleter(&deleter); } _ddebug_mutex_->lock(); } diff --git a/digikam/libs/dimg/loaders/dimgloader.cpp b/digikam/libs/dimg/loaders/dimgloader.cpp index 85efce3..615b11e 100644 --- a/digikam/libs/dimg/loaders/dimgloader.cpp +++ b/digikam/libs/dimg/loaders/dimgloader.cpp @@ -168,13 +168,13 @@ bool DImgLoader::checkExifWorkingColorSpace() } // Else check the Exif color-space tag and use a default profiles available in digiKam. - KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles"); + TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "digikam/profiles"); switch(metaData.getImageColorWorkSpace()) { case DMetadata::WORKSPACE_SRGB: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb-d65.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "srgb-d65.icm"); m_image->getICCProfilFromFile(directory + "srgb-d65.icm"); DDebug() << "Exif color-space tag is sRGB. Using default sRGB ICC profile." << endl; return true; @@ -183,7 +183,7 @@ bool DImgLoader::checkExifWorkingColorSpace() case DMetadata::WORKSPACE_ADOBERGB: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); m_image->getICCProfilFromFile(directory + "adobergb.icm"); DDebug() << "Exif color-space tag is AdobeRGB. Using default AdobeRGB ICC profile." << endl; return true; diff --git a/digikam/libs/dimg/loaders/dimgloaderobserver.h b/digikam/libs/dimg/loaders/dimgloaderobserver.h index ceeea2c..ea83bed 100644 --- a/digikam/libs/dimg/loaders/dimgloaderobserver.h +++ b/digikam/libs/dimg/loaders/dimgloaderobserver.h @@ -52,9 +52,9 @@ public: virtual float granularity() { return 1.0; }; - // This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) + // This is a hack needed to prevent hanging when a TDEProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting - // for the thread to finish and no KProcess events are delivered. + // for the thread to finish and no TDEProcess events are delivered. // Remove when porting to TQt4. virtual bool isShuttingDown() { return false; } diff --git a/digikam/libs/dimg/loaders/rawloader.cpp b/digikam/libs/dimg/loaders/rawloader.cpp index ff92aed..8ecaa1f 100644 --- a/digikam/libs/dimg/loaders/rawloader.cpp +++ b/digikam/libs/dimg/loaders/rawloader.cpp @@ -63,7 +63,7 @@ bool RAWLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { m_observer = observer; - // We are using KProcess here, and make two assumptions: + // We are using TDEProcess here, and make two assumptions: // - there is an event loop (not for ioslaves) // - we are not called from the event loop thread // These assumptions are currently true for all use cases in digikam, @@ -261,30 +261,30 @@ bool RAWLoader::loadedFromDcraw(TQByteArray data, int width, int height, int rgb //---------------------------------------------------------- // Assign the right color-space profile. - KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles"); + TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "digikam/profiles"); switch(m_rawDecodingSettings.outputColorSpace) { case DRawDecoding::SRGB: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); m_image->getICCProfilFromFile(directory + "srgb.icm"); break; } case DRawDecoding::ADOBERGB: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); m_image->getICCProfilFromFile(directory + "adobergb.icm"); break; } case DRawDecoding::WIDEGAMMUT: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); m_image->getICCProfilFromFile(directory + "widegamut.icm"); break; } case DRawDecoding::PROPHOTO: { - TQString directory = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); + TQString directory = TDEGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); m_image->getICCProfilFromFile(directory + "prophoto.icm"); break; } diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 5099a1b..6dbe231 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -397,10 +397,10 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, TQDateTime date; date.setTime_t(itemInfo->mtime); - d->labelFileDate->setText(KGlobal::locale()->formatDateTime(date, true, true)); + d->labelFileDate->setText(TDEGlobal::locale()->formatDateTime(date, true, true)); str = i18n("%1 (%2)").arg(KIO::convertSize(itemInfo->size)) - .arg(KGlobal::locale()->formatNumber(itemInfo->size, 0)); + .arg(TDEGlobal::locale()->formatNumber(itemInfo->size, 0)); d->labelFileSize->setText(str); // -- Image Properties -------------------------------------------------- @@ -517,7 +517,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, if (photoInfo.dateTime.isValid()) { - str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); + str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); d->labelPhotoDateTime->setText(str); } else diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 60430d7..36177bd 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -196,16 +196,16 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); @@ -234,16 +234,16 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar TQPushButton *fullImageButton = new TQPushButton( d->regionBG ); TQToolTip::add( fullImageButton, i18n( "

Full Image" ) ); d->regionBG->insert(fullImageButton, HistogramWidget::FullImageHistogram); - KGlobal::dirs()->addResourceType("image-full", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("image-full", "image-full.png"); + TDEGlobal::dirs()->addResourceType("image-full", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("image-full", "image-full.png"); fullImageButton->setPixmap( TQPixmap( directory + "image-full.png" ) ); fullImageButton->setToggleButton(true); TQPushButton *SelectionImageButton = new TQPushButton( d->regionBG ); TQToolTip::add( SelectionImageButton, i18n( "

Selection" ) ); d->regionBG->insert(SelectionImageButton, HistogramWidget::ImageSelectionHistogram); - KGlobal::dirs()->addResourceType("image-selection", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("image-selection", "image-selection.png"); + TDEGlobal::dirs()->addResourceType("image-selection", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("image-selection", "image-selection.png"); SelectionImageButton->setPixmap( TQPixmap( directory + "image-selection.png" ) ); SelectionImageButton->setToggleButton(true); diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 34b822f..3978775 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -422,11 +422,11 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) d->labelFolder->setText(url.directory()); TQDateTime modifiedDate = fileInfo.lastModified(); - str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); + str = TDEGlobal::locale()->formatDateTime(modifiedDate, true, true); d->labelFileModifiedDate->setText(str); str = TQString("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); d->labelFileSize->setText(str); d->labelFileOwner->setText( TQString("%1 - %2").arg(fi.user()).arg(fi.group()) ); @@ -563,7 +563,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) if (photoInfo.dateTime.isValid()) { - str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); + str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); d->labelPhotoDateTime->setText(str); } else diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index c1a03d9..ee9e4a6 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -88,8 +88,8 @@ ThemeEngine* ThemeEngine::instance() ThemeEngine::ThemeEngine() { m_instance = this; - KGlobal::dirs()->addResourceType("themes", - KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType("themes", + TDEGlobal::dirs()->kde_default("data") + "digikam/themes"); d = new ThemeEnginePriv; @@ -195,7 +195,7 @@ void ThemeEngine::scanThemes() d->themeDict.clear(); d->currTheme = 0; - TQStringList themes = KGlobal::dirs()->findAllResources( "themes", TQString(), false, true ); + TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", TQString(), false, true ); for (TQStringList::iterator it=themes.begin(); it != themes.end(); ++it) diff --git a/digikam/libs/threadimageio/loadsavetask.cpp b/digikam/libs/threadimageio/loadsavetask.cpp index 585c4d9..6879e53 100644 --- a/digikam/libs/threadimageio/loadsavetask.cpp +++ b/digikam/libs/threadimageio/loadsavetask.cpp @@ -110,9 +110,9 @@ void LoadingTask::setStatus(LoadingTaskStatus status) } -// This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) +// This is a hack needed to prevent hanging when a TDEProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting -// for the thread to finish and no KProcess events are delivered. +// for the thread to finish and no TDEProcess events are delivered. // Remove when porting to TQt4. bool LoadingTask::isShuttingDown() { diff --git a/digikam/libs/threadimageio/loadsavethread.cpp b/digikam/libs/threadimageio/loadsavethread.cpp index 3d2daea..188592e 100644 --- a/digikam/libs/threadimageio/loadsavethread.cpp +++ b/digikam/libs/threadimageio/loadsavethread.cpp @@ -192,9 +192,9 @@ bool LoadSaveThread::querySendNotifyEvent() } -// This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) +// This is a hack needed to prevent hanging when a TDEProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting -// for the thread to finish and no KProcess events are delivered. +// for the thread to finish and no TDEProcess events are delivered. // Remove when porting to TQt4. bool LoadSaveThread::isShuttingDown() { diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 2848d79..c35e957 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -952,7 +952,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showFileDate) { TQDateTime modifiedDate = fileInfo.lastModified(); - str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); + str = TDEGlobal::locale()->formatDateTime(modifiedDate, true, true); tipText += m_cellBeg + i18n("Modified:") + m_cellMid + str + m_cellEnd; } @@ -960,7 +960,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) { tipText += m_cellBeg + i18n("Size:") + m_cellMid; str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + .arg(TDEGlobal::locale()->formatNumber(fi.size(), 0)); tipText += str + m_cellEnd; } @@ -1037,7 +1037,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) { if (photoInfo.dateTime.isValid()) { - str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); + str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; metaStr += m_cellBeg + i18n("Created:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index 39dba95..64ea166 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -64,8 +64,8 @@ int DLogoAction::plug(TQWidget *widget, int index) pixmapLogo->setScaledContents(false); pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); - KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); + TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" )); pixmapLogo->setFocusPolicy(TQ_NoFocus); diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 5cc07c0..4a9d886 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -187,8 +187,8 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString KConfig *config = kapp->config(); config->setGroup(name + TQString(" Search Text Tool")); - d->searchEdit->setCompletionMode((KGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", - (int)KGlobalSettings::CompletionAuto)); + d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", + (int)TDEGlobalSettings::CompletionAuto)); } SearchTextBar::~SearchTextBar() diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 422f80f..6ce56c7 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -135,7 +135,7 @@ void SplashScreen::drawContents(TQPainter* painter) painter->setPen(d->color); - TQFont fnt(KGlobalSettings::generalFont()); + TQFont fnt(TDEGlobalSettings::generalFont()); int fntSize = fnt.pointSize(); if (fntSize > 0) { diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index 515762a..4e1e5f3 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -70,8 +70,8 @@ void StatusLed::setLedColor(LedColor color) break; } - KGlobal::dirs()->addResourceType(file.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png")); + TDEGlobal::dirs()->addResourceType(file.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png")); setPixmap(TQPixmap(directory + file + TQString(".png"))); } diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 48fee35..e74c682 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -112,8 +112,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti { TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); - KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setToggleButton(true); TQWhatsThis::add( duplicateHorButton, i18n("

If you enable this option, you will separate the preview area " @@ -123,8 +123,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti TQPushButton *duplicateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); - KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setToggleButton(true); TQWhatsThis::add( duplicateVerButton, i18n("

If you enable this option, you will separate the preview area " @@ -138,8 +138,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti { TQPushButton *separateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); - KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); + TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setToggleButton(true); TQWhatsThis::add( separateHorButton, i18n( "

If you enable this option, you will separate the preview area " @@ -149,8 +149,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti TQPushButton *separateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); - KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); + TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setToggleButton(true); TQWhatsThis::add( separateVerButton, i18n( "

If you enable this option, you will separate the preview area " @@ -161,8 +161,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti TQPushButton *noSeparateButton = new TQPushButton( d->separateView ); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); - KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("target", "target.png"); + TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("target", "target.png"); noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setToggleButton(true); TQWhatsThis::add( noSeparateButton, i18n( "

If you enable this option, the preview area will not " diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 3efe93c..cd13cff 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -152,8 +152,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec { TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); - KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setToggleButton(true); TQWhatsThis::add( duplicateHorButton, i18n("

If you enable this option, you will separate the preview area " @@ -163,8 +163,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec TQPushButton *duplicateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); - KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setToggleButton(true); TQWhatsThis::add( duplicateVerButton, i18n("

If you enable this option, you will separate the preview area " @@ -178,8 +178,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec { TQPushButton *separateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); - KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); + TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setToggleButton(true); TQWhatsThis::add( separateHorButton, i18n( "

If you enable this option, you will separate the preview area " @@ -189,8 +189,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec TQPushButton *separateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); - KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); + TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setToggleButton(true); TQWhatsThis::add( separateVerButton, i18n( "

If you enable this option, you will separate the preview area " @@ -201,8 +201,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec TQPushButton *noSeparateButton = new TQPushButton( d->separateView ); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); - KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("target", "target.png"); + TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("target", "target.png"); noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setToggleButton(true); TQWhatsThis::add( noSeparateButton, i18n( "

If you enable this option, the preview area will not " diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index f127621..3e45bf8 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -98,8 +98,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewOriginalButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewOriginalButton, ImageGuideWidget::PreviewOriginalImage); - KGlobal::dirs()->addResourceType("original", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("original", "original.png"); + TDEGlobal::dirs()->addResourceType("original", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("original", "original.png"); previewOriginalButton->setPixmap( TQPixmap( directory + "original.png" ) ); previewOriginalButton->setToggleButton(true); TQWhatsThis::add( previewOriginalButton, i18n( "

If you enable this option, you will see " @@ -107,8 +107,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewBothButtonVert = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewBothButtonVert, ImageGuideWidget::PreviewBothImagesVertCont); - KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); + TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); previewBothButtonVert->setPixmap( TQPixmap( directory + "bothvert.png" ) ); previewBothButtonVert->setToggleButton(true); TQWhatsThis::add( previewBothButtonVert, i18n( "

If you enable this option, the preview area will " @@ -119,8 +119,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewBothButtonHorz = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorzCont); - KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); + TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); previewBothButtonHorz->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); previewBothButtonHorz->setToggleButton(true); TQWhatsThis::add( previewBothButtonHorz, i18n( "

If you enable this option, the preview area will " @@ -131,8 +131,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewDuplicateBothButtonVert = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewDuplicateBothButtonVert, ImageGuideWidget::PreviewBothImagesVert); - KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); previewDuplicateBothButtonVert->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); previewDuplicateBothButtonVert->setToggleButton(true); TQWhatsThis::add( previewDuplicateBothButtonVert, i18n( "

If you enable this option, the preview area will " @@ -142,8 +142,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewDupplicateBothButtonHorz = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewDupplicateBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorz); - KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); + TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); previewDupplicateBothButtonHorz->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); previewDupplicateBothButtonHorz->setToggleButton(true); TQWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "

If you enable this option, the preview area will " @@ -153,8 +153,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewtargetButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewtargetButton, ImageGuideWidget::PreviewTargetImage); - KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("target", "target.png"); + TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("target", "target.png"); previewtargetButton->setPixmap( TQPixmap( directory + "target.png" ) ); previewtargetButton->setToggleButton(true); TQWhatsThis::add( previewtargetButton, i18n( "

If you enable this option, you will see " @@ -162,8 +162,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQPushButton *previewToggleMouseOverButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewToggleMouseOverButton, ImageGuideWidget::PreviewToggleOnMouseOver); - KGlobal::dirs()->addResourceType("togglemouseover", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png"); + TDEGlobal::dirs()->addResourceType("togglemouseover", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png"); previewToggleMouseOverButton->setPixmap( TQPixmap( directory + "togglemouseover.png" ) ); previewToggleMouseOverButton->setToggleButton(true); TQWhatsThis::add( previewToggleMouseOverButton, i18n( "

If you enable this option, you will see " diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 3b14942..9391deb 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -373,7 +373,7 @@ void MetadataWidget::slotPrintMetadata() KURL MetadataWidget::saveMetadataToFile(const TQString& caption, const TQString& fileFilter) { - KFileDialog fileSaveDialog(KGlobalSettings::documentPath(), + KFileDialog fileSaveDialog(TDEGlobalSettings::documentPath(), TQString(), this, "MetadataFileSaveDialog", diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 2d3d694..cd59df3 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -102,8 +102,8 @@ TQPixmap &WorldMapWidget::worldMapPixmap() { if (!d->worldMap) { - KGlobal::dirs()->addResourceType("worldmap", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg"); + TDEGlobal::dirs()->addResourceType("worldmap", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg"); pixmapDeleter.setObject(d->worldMap, new TQPixmap(directory + "worldmap.jpg")); } return *d->worldMap; diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp index 3795a52..02a7312 100644 --- a/digikam/showfoto/main.cpp +++ b/digikam/showfoto/main.cpp @@ -85,8 +85,8 @@ int main(int argc, char *argv[]) app.setMainWidget(w); w->show(); - KGlobal::locale()->setMainCatalogue("digikam"); - KGlobal::locale()->insertCatalogue("libkdcraw"); + TDEGlobal::locale()->setMainCatalogue("digikam"); + TDEGlobal::locale()->insertCatalogue("libkdcraw"); int ret = app.exec(); diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 137f6b6..5d2334d 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -164,8 +164,8 @@ ShowFoto::ShowFoto(const KURL::List& urlList) KConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); - KGlobal::dirs()->addResourceType("data", KGlobal::dirs()->kde_default("data") + "digikam"); - KGlobal::iconLoader()->addAppDir("digikam"); + TDEGlobal::dirs()->addResourceType("data", TDEGlobal::dirs()->kde_default("data") + "digikam"); + TDEGlobal::iconLoader()->addAppDir("digikam"); if(config->readBoolEntry("ShowSplash", true) && !kapp->isRestored()) { @@ -516,7 +516,7 @@ void ShowFoto::readSettings() slotToggleShowBar(); d->lastOpenedDirectory.setPath( config->readEntry("Last Opened Directory", - KGlobalSettings::documentPath()) ); + TDEGlobalSettings::documentPath()) ); TQSizePolicy szPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter) @@ -1124,7 +1124,7 @@ void ShowFoto::slotDeleteCurrentItem() if (!KProtocolInfo::isKnownProtocol(dest)) { - dest = KGlobalSettings::trashPath(); + dest = TDEGlobalSettings::trashPath(); } KIO::Job* job = KIO::move( urlCurrent, dest ); diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index ec7fd68..5b24097 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KGlobal::locale()->setMainCatalogue( "digikam" ); + TDEGlobal::locale()->setMainCatalogue( "digikam" ); TDEApplication app; Digikam::MainWindow *im = new Digikam::MainWindow(); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 14a1c25..814bc15 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -49,7 +49,7 @@ namespace Digikam static void dateToString(const TQDateTime& datetime, TQString& str) { - str = KGlobal::locale()->formatDateTime(datetime, true, false); + str = TDEGlobal::locale()->formatDateTime(datetime, true, false); } static TQString squeezedText(TQPainter* p, int width, const TQString& text) diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index ab867f9..b9dfb4f 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -372,8 +372,8 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, pixmapLogo->setScaledContents( false ); pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum)); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); - KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); + TDEGlobal::dirs()->addResourceType("logo-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) ); pixmapLogo->setFocusPolicy(TQ_NoFocus); diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index 4323fca..b772be2 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -66,7 +66,7 @@ UndoCache::UndoCache() TQString cacheDir; cacheDir = locateLocal("cache", - KGlobal::instance()->aboutData()->programName() + '/'); + TDEGlobal::instance()->aboutData()->programName() + '/'); d->cachePrefix = TQString("%1undocache-%2") .arg(cacheDir) diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index f46759d..47a6a83 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -254,7 +254,7 @@ TQSize EditorToolSettings::minimumSizeHint() const // Do not touch vertical size hint. // Limit to 40% of the desktop width. TQSize hint = TQScrollView::minimumSizeHint(); - TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox); + TQRect desktopRect = TDEGlobalSettings::desktopGeometry(d->mainVBox); hint.setWidth(TQMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5)); return hint; } diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index bfe6d90..8e90ec6 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -699,7 +699,7 @@ void EditorWindow::slotAboutToShowRedoMenu() void EditorWindow::slotConfToolbars() { - saveMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); + saveMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); KEditToolbar dlg(factory(), this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), @@ -710,7 +710,7 @@ void EditorWindow::slotConfToolbars() void EditorWindow::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); + applyMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); } void EditorWindow::slotIncreaseZoom() @@ -757,7 +757,7 @@ void EditorWindow::slotZoomSelected() void EditorWindow::slotZoomTextChanged(const TQString &txt) { bool r = false; - double zoom = KGlobal::locale()->readNumber(txt, &r) / 100.0; + double zoom = TDEGlobal::locale()->readNumber(txt, &r) / 100.0; if (r && zoom > 0.0) m_stackView->setZoomFactor(zoom); } diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 1981276..f2fb84a 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -197,16 +197,16 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index ce22813..4b0cba0 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -149,7 +149,7 @@ bool ImagePrint::printImageWithTQt() p.begin( &m_printer ); TQPaintDeviceMetrics metrics( &m_printer ); - p.setFont( KGlobalSettings::generalFont() ); + p.setFont( TDEGlobalSettings::generalFont() ); TQFontMetrics fm = p.fontMetrics(); int w, h; // will be set to the width and height of the printer diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 81b59ef..24ea5b6 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -212,9 +212,9 @@ ImageResize::ImageResize(TQWidget* parent) d->cimgLogoLabel = new KURLLabel(firstPage); d->cimgLogoLabel->setText(TQString()); d->cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); d->cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website")); @@ -603,7 +603,7 @@ void ImageResize::customEvent(TQCustomEvent *event) void ImageResize::slotUser3() { - KURL loadBlowupFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadBlowupFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Resizing Settings File to Load")) ); if( loadBlowupFile.isEmpty() ) @@ -630,7 +630,7 @@ void ImageResize::slotUser3() void ImageResize::slotUser2() { - KURL saveBlowupFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveBlowupFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Resizing Settings File to Save")) ); if( saveBlowupFile.isEmpty() ) diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index aab72dc..e271781 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -100,9 +100,9 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) // -- Load rating Pixmap ------------------------------------------ - KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; d->ratingPixmap = TQPixmap(ratingPixPath); @@ -766,9 +766,9 @@ void LightTableBar::contentsDropEvent(TQDropEvent *e) void LightTableBar::slotThemeChanged() { - KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; d->ratingPixmap = TQPixmap(ratingPixPath); diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index e7321fb..47f2abe 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -1508,7 +1508,7 @@ void LightTableWindow::slotEditKeys() void LightTableWindow::slotConfToolbars() { - saveMainWindowSettings(KGlobal::config(), "LightTable Settings"); + saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings"); KEditToolbar dlg(factory(), this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), @@ -1519,7 +1519,7 @@ void LightTableWindow::slotConfToolbars() void LightTableWindow::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "LightTable Settings"); + applyMainWindowSettings(TDEGlobal::config(), "LightTable Settings"); } void LightTableWindow::slotSetup() diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index bb4963d..d2bfa84 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -116,8 +116,8 @@ SetupCamera::SetupCamera( TQWidget* parent ) KURLLabel *gphotoLogoLabel = new KURLLabel(this); gphotoLogoLabel->setText(TQString()); gphotoLogoLabel->setURL("http://www.gphoto.org"); - KGlobal::dirs()->addResourceType("logo-gphoto", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png"); + TDEGlobal::dirs()->addResourceType("logo-gphoto", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png"); gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) ); TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website")); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 0cdc4b3..0ee6857 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -165,8 +165,8 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) KURLLabel *lcmsLogoLabel = new KURLLabel(colorPolicy); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); - KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) ); TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); @@ -493,8 +493,8 @@ void SetupICC::fillCombos(const TQString& path, bool report) } // Look the ICC color-space profile path include with digiKam dist. - KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles"); - TQString digiKamProfilesPath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); + TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "digikam/profiles"); + TQString digiKamProfilesPath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); TQDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", TQDir::Files); const TQFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList(); DDebug() << "Scanning ICC profiles included with digiKam: " << digiKamProfilesPath << endl; diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index fb1ba8c..251d72a 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -148,8 +148,8 @@ SetupMetadata::SetupMetadata(TQWidget* parent ) KURLLabel *exiv2LogoLabel = new KURLLabel(hbox); exiv2LogoLabel->setText(TQString()); exiv2LogoLabel->setURL("http://www.exiv2.org"); - KGlobal::dirs()->addResourceType("logo-exiv2", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png"); + TDEGlobal::dirs()->addResourceType("logo-exiv2", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png"); exiv2LogoLabel->setPixmap( TQPixmap( directory + "logo-exiv2.png" ) ); TQToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website")); diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index fe8cdce..19fa24b 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -104,7 +104,7 @@ SlideShow::SlideShow(const SlideShowSettings& settings) // --------------------------------------------------------------- #if KDE_IS_VERSION(3,2,0) - TQRect deskRect = KGlobalSettings::desktopGeometry(this); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); d->deskX = deskRect.x(); d->deskY = deskRect.y(); d->deskWidth = deskRect.width(); @@ -407,7 +407,7 @@ void SlideShow::updatePixmap() { if (photoInfo.dateTime.isValid()) { - str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); + str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); printInfoText(p, offset, str); } }