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

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent a92eb96172
commit 85d50dfcd1
106 changed files with 404 additions and 404 deletions
Show Stats Download Patch File Download Diff File

16
ChangeLog
Unescape View File

@ -22703,7 +22703,7 @@ v0.9.1-beta1 - 11-Feb-2007
Disable the use of the DImg raw loader when loading as DImg from Disable the use of the DImg raw loader when loading as DImg from
digikamthumbnail ioslave. 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: assumptions:
- there is an event loop (not for ioslaves) - there is an event loop (not for ioslaves)
- the loader is not called from the event loop thread (currently - 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. The DImg raw loader is not needed - DcrawIface is called before.
So the problem of the loader entering an endless loop (because no 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 are delivered) arises only if a file is identified as RAW, but
dcraw does not dcraw does not
support it. support it.
@ -32079,10 +32079,10 @@ v0.9.0-beta1 - 20/07/2006
the app is closed the app is closed
while a raw image is being loaded in the histogram side bar. 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, to finish,
but the main thread is wait()ing for the thread 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 This hack can be removed when we port to Qt4 and use the
synchronous QProcess. synchronous QProcess.
@ -35473,7 +35473,7 @@ v0.9.0-beta1 - 20/07/2006
- Fix broken loading with dcraw and all parameter witch require - Fix broken loading with dcraw and all parameter witch require
a value. 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 all, especially to add space between option and value. The
better way is to use QString::arg() method. better way is to use QString::arg() method.
- Add comments about dcraw Quality rules with digiKam. - 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.cpp,
trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.h: trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.h:
digikam from trunk: digikam from trunk:
Use KProcess for RAW image loader. Use TDEProcess for RAW image loader.
Loading can now be cleanly aborted. 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 use
with our shiny new multithreaded loader because KProcess is not with our shiny new multithreaded loader because TDEProcess is not
reentrant, reentrant,
but there are more advantages (wraps all system programming) so but there are more advantages (wraps all system programming) so
that that

8
digikam/digikam/albumfiletip.cpp
Unescape View File

@ -162,7 +162,7 @@ void AlbumFileTip::reposition()
// should the tooltip be shown to the left or to the right of the ivi ? // should the tooltip be shown to the left or to the right of the ivi ?
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQRect desk = KGlobalSettings::desktopGeometry(rect.center()); TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center());
#else #else
TQRect desk = TQApplication::desktop()->screenGeometry( TQRect desk = TQApplication::desktop()->screenGeometry(
TQApplication::desktop()->screenNumber(rect.center()) ); TQApplication::desktop()->screenNumber(rect.center()) );
@ -358,7 +358,7 @@ void AlbumFileTip::updateText()
if (settings->getToolTipsShowFileDate()) if (settings->getToolTipsShowFileDate())
{ {
TQDateTime modifiedDate = fileInfo.lastModified(); 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; tip += cellBeg + i18n("Modified:") + cellMid + str + cellEnd;
} }
@ -366,7 +366,7 @@ void AlbumFileTip::updateText()
{ {
tip += cellBeg + i18n("Size:") + cellMid; tip += cellBeg + i18n("Size:") + cellMid;
str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) 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; tip += str + cellEnd;
} }
@ -444,7 +444,7 @@ void AlbumFileTip::updateText()
{ {
if (photoInfo.dateTime.isValid()) 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) + "..."; if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Created:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; metaStr += cellBeg + i18n("Created:") + cellMid + TQStyleSheet::escape( str ) + cellEnd;
} }

2
digikam/digikam/albumfolderview.cpp
Unescape View File

@ -1490,7 +1490,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail
TQDate date = album->date(); TQDate date = album->date();
TQString timeString = TQString::number(date.year()) + ", " + TQString timeString = TQString::number(date.year()) + ", " +
KGlobal::locale()->calendar()->monthName(date, false); TDEGlobal::locale()->calendar()->monthName(date, false);
AlbumFolderViewItem* parent = 0; AlbumFolderViewItem* parent = 0;

4
digikam/digikam/albumicongroupitem.cpp
Unescape View File

@ -101,8 +101,8 @@ void AlbumIconGroupItem::paintBanner()
TQDate date = album->date(); TQDate date = album->date();
dateAndComments = i18n("%1 %2 - 1 Item", "%1 %2 - %n Items", count()) dateAndComments = i18n("%1 %2 - 1 Item", "%1 %2 - %n Items", count())
.arg(KGlobal::locale()->calendar()->monthName(date, false)) .arg(TDEGlobal::locale()->calendar()->monthName(date, false))
.arg(KGlobal::locale()->calendar()->year(date)); .arg(TDEGlobal::locale()->calendar()->year(date));
if (!album->caption().isEmpty()) if (!album->caption().isEmpty())
{ {

2
digikam/digikam/albumiconitem.cpp
Unescape View File

@ -77,7 +77,7 @@ public:
static void dateToString(const TQDateTime& datetime, TQString& str) 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) AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info)

4
digikam/digikam/albumiconview.cpp
Unescape View File

@ -205,9 +205,9 @@ AlbumIconView::AlbumIconView(TQWidget* parent)
// -- Load rating Pixmap ------------------------------------------ // -- 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"); + "digikam/data");
TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
ratingPixPath += "/rating.png"; ratingPixPath += "/rating.png";
d->ratingPixmap = TQPixmap(ratingPixPath); d->ratingPixmap = TQPixmap(ratingPixPath);

4
digikam/digikam/albummanager.cpp
Unescape View File

@ -277,7 +277,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash)
// Copy an existing locale from the settings file (used < 0.8) // Copy an existing locale from the settings file (used < 0.8)
// to the database. // to the database.
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup("General Settings"); config->setGroup("General Settings");
if (config->hasKey("Locale")) if (config->hasKey("Locale"))
{ {
@ -352,7 +352,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash)
// -- Check if we need to do scanning ------------------------------------- // -- Check if we need to do scanning -------------------------------------
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup("General Settings"); config->setGroup("General Settings");
if (config->readBoolEntry("Scan At Start", true) || if (config->readBoolEntry("Scan At Start", true) ||
d->db->getSetting("Scanned").isEmpty()) d->db->getSetting("Scanned").isEmpty())

4
digikam/digikam/datefolderview.cpp
Unescape View File

@ -103,9 +103,9 @@ DateFolderItem::DateFolderItem(TQListViewItem* parent, DAlbum* album)
m_count = 0; m_count = 0;
m_album = album; m_album = album;
#if KDE_IS_VERSION(3,2,0) #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 #else
m_name = KGlobal::locale()->monthName(m_album->date(), false); m_name = TDEGlobal::locale()->monthName(m_album->date(), false);
#endif #endif
setText(0, m_name); setText(0, m_name);
} }

6
digikam/digikam/digikamapp.cpp
Unescape View File

@ -1720,13 +1720,13 @@ void DigikamApp::slotEditKeys()
void DigikamApp::slotConfToolbars() void DigikamApp::slotConfToolbars()
{ {
saveMainWindowSettings(KGlobal::config()); saveMainWindowSettings(TDEGlobal::config());
KEditToolbar *dlg = new KEditToolbar(actionCollection(), "digikamui.rc"); KEditToolbar *dlg = new KEditToolbar(actionCollection(), "digikamui.rc");
if(dlg->exec()) if(dlg->exec())
{ {
createGUI(TQString::fromLatin1( "digikamui.rc" ), false); createGUI(TQString::fromLatin1( "digikamui.rc" ), false);
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(TDEGlobal::config());
plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport );
plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions );
plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions );
@ -2073,7 +2073,7 @@ void DigikamApp::slotTogglePreview(bool t)
void DigikamApp::slotAlbumAddImages() void DigikamApp::slotAlbumAddImages()
{ {
TQString path = KFileDialog::getExistingDirectory(KGlobalSettings::documentPath(), this, TQString path = KFileDialog::getExistingDirectory(TDEGlobalSettings::documentPath(), this,
i18n("Select folder to parse")); i18n("Select folder to parse"));
if(path.isEmpty()) if(path.isEmpty())

4
digikam/digikam/dio.cpp
Unescape View File

@ -105,7 +105,7 @@ KIO::Job* del(const KURL& src, bool useTrash)
if (!KProtocolInfo::isKnownProtocol(dest)) if (!KProtocolInfo::isKnownProtocol(dest))
{ {
dest = KGlobalSettings::trashPath(); dest = TDEGlobalSettings::trashPath();
} }
job = KIO::move( src, dest ); job = KIO::move( src, dest );
@ -129,7 +129,7 @@ KIO::Job* del(const KURL::List& srcList, bool useTrash)
if (!KProtocolInfo::isKnownProtocol(dest)) if (!KProtocolInfo::isKnownProtocol(dest))
{ {
dest = KGlobalSettings::trashPath(); dest = TDEGlobalSettings::trashPath();
} }
job = KIO::move( srcList, dest ); job = KIO::move( srcList, dest );

2
digikam/digikam/folderview.cpp
Unescape View File

@ -174,7 +174,7 @@ void FolderView::contentsMouseMoveEvent(TQMouseEvent *e)
if(e->state() == NoButton) if(e->state() == NoButton)
{ {
if(KGlobalSettings::changeCursorOverIcon()) if(TDEGlobalSettings::changeCursorOverIcon())
{ {
TQPoint vp = contentsToViewport(e->pos()); TQPoint vp = contentsToViewport(e->pos());
TQListViewItem *item = itemAt(vp); TQListViewItem *item = itemAt(vp);

6
digikam/digikam/iconview.cpp
Unescape View File

@ -1111,7 +1111,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
} }
} }
if (KGlobalSettings::changeCursorOverIcon()) if (TDEGlobalSettings::changeCursorOverIcon())
{ {
if (item && item->clickToOpenRect().contains(e->pos())) if (item && item->clickToOpenRect().contains(e->pos()))
setCursor(KCursor::handCursor()); setCursor(KCursor::handCursor());
@ -1259,7 +1259,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e)
d->anchorItem = item; d->anchorItem = item;
if (prevCurrItem) if (prevCurrItem)
prevCurrItem->repaint(); prevCurrItem->repaint();
if (KGlobalSettings::singleClick()) if (TDEGlobalSettings::singleClick())
{ {
if (item->clickToOpenRect().contains(e->pos())) if (item->clickToOpenRect().contains(e->pos()))
{ {
@ -1282,7 +1282,7 @@ void IconView::contentsWheelEvent(TQWheelEvent* e)
void IconView::contentsMouseDoubleClickEvent(TQMouseEvent *e) void IconView::contentsMouseDoubleClickEvent(TQMouseEvent *e)
{ {
if (KGlobalSettings::singleClick()) if (TDEGlobalSettings::singleClick())
return; return;
IconItem *item = findItem(e->pos()); IconItem *item = findItem(e->pos());

12
digikam/digikam/kdateedit.cpp
Unescape View File

@ -62,7 +62,7 @@ class DateValidator : public TQValidator
return Acceptable; return Acceptable;
bool ok = false; bool ok = false;
KGlobal::locale()->readDate( str, &ok ); TDEGlobal::locale()->readDate( str, &ok );
if ( ok ) if ( ok )
return Acceptable; return Acceptable;
else else
@ -82,7 +82,7 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
setMaxCount( 1 ); setMaxCount( 1 );
mDate = TQDate::currentDate(); mDate = TQDate::currentDate();
TQString today = KGlobal::locale()->formatDate( mDate, true ); TQString today = TDEGlobal::locale()->formatDate( mDate, true );
insertItem( today ); insertItem( today );
setCurrentItem( 0 ); setCurrentItem( 0 );
@ -143,7 +143,7 @@ void KDateEdit::popup()
if ( mReadOnly ) if ( mReadOnly )
return; return;
TQRect desk = KGlobalSettings::desktopGeometry( this ); TQRect desk = TDEGlobalSettings::desktopGeometry( this );
TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) );
@ -253,7 +253,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
if ( replaced ) if ( replaced )
(*replaced) = true; (*replaced) = true;
} else { } else {
result = KGlobal::locale()->readDate( text ); result = TDEGlobal::locale()->readDate( text );
} }
return result; return result;
@ -348,7 +348,7 @@ void KDateEdit::setupKeywords()
TQString dayName; TQString dayName;
for ( int i = 1; i <= 7; ++i ) { 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 ); mKeywordMap.insert( dayName, i + 100 );
} }
} }
@ -364,7 +364,7 @@ void KDateEdit::updateView()
{ {
TQString dateString; TQString dateString;
if ( mDate.isValid() ) if ( mDate.isValid() )
dateString = KGlobal::locale()->formatDate( mDate, true ); dateString = TDEGlobal::locale()->formatDate( mDate, true );
// We do not want to generate a signal here, // We do not want to generate a signal here,
// since we explicitly setting the date // since we explicitly setting the date

6
digikam/digikam/main.cpp
Unescape View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
TDEApplication app; TDEApplication app;
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup("General Settings"); config->setGroup("General Settings");
TQString version = config->readEntry("Version"); TQString version = config->readEntry("Version");
@ -126,8 +126,8 @@ int main(int argc, char *argv[])
tipsFiles.append("digikam/tips"); tipsFiles.append("digikam/tips");
tipsFiles.append("kipi/tips"); tipsFiles.append("kipi/tips");
KGlobal::locale()->insertCatalogue("kipiplugins"); TDEGlobal::locale()->insertCatalogue("kipiplugins");
KGlobal::locale()->insertCatalogue("libkdcraw"); TDEGlobal::locale()->insertCatalogue("libkdcraw");
KTipDialog::showMultiTip(0, tipsFiles, false); KTipDialog::showMultiTip(0, tipsFiles, false);
#else #else

12
digikam/digikam/monthwidget.cpp
Unescape View File

@ -214,7 +214,7 @@ void MonthWidget::drawContents(TQPainter *)
if(!weekvisible) 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)); d->month, d->days[index].day));
p.setPen(d->active ? TQt::black : TQt::gray); p.setPen(d->active ? TQt::black : TQt::gray);
p.setFont(fnBold); p.setFont(fnBold);
@ -244,11 +244,11 @@ void MonthWidget::drawContents(TQPainter *)
rsmall.setHeight(r.height() - 2); rsmall.setHeight(r.height() - 2);
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter,
KGlobal::locale()->calendar()->weekDayName(i, true) TDEGlobal::locale()->calendar()->weekDayName(i, true)
.remove(2,1)); .remove(2,1));
#else #else
p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter,
KGlobal::locale()->weekDayName(i, true).remove(2,1)); TDEGlobal::locale()->weekDayName(i, true).remove(2,1));
#endif #endif
index++; index++;
} }
@ -261,12 +261,12 @@ void MonthWidget::drawContents(TQPainter *)
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
p.drawText(r, TQt::AlignCenter, p.drawText(r, TQt::AlignCenter,
TQString("%1 %2") TQString("%1 %2")
.arg(KGlobal::locale()->calendar()->monthName(d->month, false)) .arg(TDEGlobal::locale()->calendar()->monthName(d->month, false))
.arg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); .arg(TDEGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1))));
#else #else
p.drawText(r, TQt::AlignCenter, p.drawText(r, TQt::AlignCenter,
TQString("%1 %2") TQString("%1 %2")
.arg(KGlobal::locale()->monthName(d->month)) .arg(TDEGlobal::locale()->monthName(d->month))
.arg(TQString::number(d->year))); .arg(TQString::number(d->year)));
#endif #endif

4
digikam/digikam/ratingpopupmenu.cpp
Unescape View File

@ -47,8 +47,8 @@ namespace Digikam
RatingPopupMenu::RatingPopupMenu(TQWidget* parent) RatingPopupMenu::RatingPopupMenu(TQWidget* parent)
: TQPopupMenu(parent) : TQPopupMenu(parent)
{ {
KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/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"; ratingPixPath += "/rating.png";
insertItem(i18n("None"), 0); insertItem(i18n("None"), 0);

6
digikam/digikam/ratingwidget.cpp
Unescape View File

@ -66,9 +66,9 @@ RatingWidget::RatingWidget(TQWidget* parent)
{ {
d = new RatingWidgetPriv; d = new RatingWidgetPriv;
KGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->addResourceType("digikam_rating",
KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->kde_default("data") + "digikam/data");
d->ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); d->ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
d->ratingPixPath.append("/rating.png"); d->ratingPixPath.append("/rating.png");
slotThemeChanged(); slotThemeChanged();

2
digikam/digikam/syncjob.cpp
Unescape View File

@ -119,7 +119,7 @@ bool SyncJob::trashPriv(const KURL::List& urls)
if (!KProtocolInfo::isKnownProtocol(dest)) if (!KProtocolInfo::isKnownProtocol(dest))
{ {
dest = KGlobalSettings::trashPath(); dest = TDEGlobalSettings::trashPath();
} }
KIO::Job* job = KIO::move( urls, dest ); KIO::Job* job = KIO::move( urls, dest );

8
digikam/digikam/timelineview.cpp
Unescape View File

@ -155,16 +155,16 @@ TimeLineView::TimeLineView(TQWidget *parent)
TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *linHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
d->scaleBG->insert(linHistoButton, TimeLineWidget::LinScale); d->scaleBG->insert(linHistoButton, TimeLineWidget::LinScale);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
d->scaleBG->insert(logHistoButton, TimeLineWidget::LogScale); d->scaleBG->insert(logHistoButton, TimeLineWidget::LogScale);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

14
digikam/digikam/timelinewidget.cpp
Unescape View File

@ -74,7 +74,7 @@ public:
nbItems = 10; nbItems = 10;
timeUnit = TimeLineWidget::Month; timeUnit = TimeLineWidget::Month;
scaleMode = TimeLineWidget::LinScale; 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. 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: case Day:
{ {
infoDate = KGlobal::locale()->formatDate(dt.date()); infoDate = TDEGlobal::locale()->formatDate(dt.date());
break; break;
} }
case Week: case Week:
@ -721,7 +721,7 @@ void TimeLineWidget::updatePixmap()
p.setPen(dateColor); p.setPen(dateColor);
p.drawLine(barRect.left(), barRect.bottom(), p.drawLine(barRect.left(), barRect.bottom(),
barRect.left(), barRect.bottom()+d->bottomMargin/2); 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); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt);
p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, 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(), p.drawLine(barRect.left(), barRect.bottom(),
barRect.left(), barRect.bottom()+d->bottomMargin/2); 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); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt);
if (week != 50) if (week != 50)
p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt);
@ -905,7 +905,7 @@ void TimeLineWidget::updatePixmap()
p.setPen(dateColor); p.setPen(dateColor);
p.drawLine(barRect.left(), barRect.bottom(), p.drawLine(barRect.left(), barRect.bottom(),
barRect.left(), barRect.bottom()+d->bottomMargin/2); 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); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt);
p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, 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(), p.drawLine(barRect.left(), barRect.bottom(),
barRect.left(), barRect.bottom()+d->bottomMargin/2); 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); TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt);
if (week != 50) if (week != 50)
p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); 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; TQDateTime ref = d->refDateTime;
ref.setTime(TQTime(0, 0, 0, 0)); ref.setTime(TQTime(0, 0, 0, 0));
TQRect deskRect = KGlobalSettings::desktopGeometry(this); TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
int items = deskRect.width() / d->barWidth; int items = deskRect.width() / d->barWidth;
for (int i = 0 ; i < items ; i++) for (int i = 0 ; i < items ; i++)

32
digikam/imageplugins/adjustcurves/adjustcurves.cpp
Unescape View File

@ -153,16 +153,16 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::CurvesWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::CurvesWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::CurvesWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::CurvesWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -222,18 +222,18 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
m_curveType = new TQHButtonGroup(gboxSettings); m_curveType = new TQHButtonGroup(gboxSettings);
m_curveFree = new TQPushButton(m_curveType); m_curveFree = new TQPushButton(m_curveType);
m_curveType->insert(m_curveFree, FreeDrawing); 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"); "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->setPixmap( TQPixmap( directory + "curvefree.png" ) );
m_curveFree->setToggleButton(true); m_curveFree->setToggleButton(true);
TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) );
TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse."));
m_curveSmooth = new TQPushButton(m_curveType); m_curveSmooth = new TQPushButton(m_curveType);
m_curveType->insert(m_curveSmooth, SmoothDrawing); 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"); "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->setPixmap( TQPixmap( directory + "curvemooth.png" ) );
m_curveSmooth->setToggleButton(true); m_curveSmooth->setToggleButton(true);
TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) );
@ -247,9 +247,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings);
m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-black.png" ) );
m_pickBlack->setToggleButton(true); m_pickBlack->setToggleButton(true);
TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); 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.")); "smooth curves point on Red, Green, Blue, and Luminosity channels."));
m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickGray = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) );
m_pickGray->setToggleButton(true); m_pickGray->setToggleButton(true);
TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); 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.")); "smooth curves point on Red, Green, Blue, and Luminosity channels."));
m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-white.png" ) );
m_pickWhite->setToggleButton(true); m_pickWhite->setToggleButton(true);
TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) );
@ -635,7 +635,7 @@ void AdjustCurveDialog::slotUser3()
{ {
KURL loadCurvesFile; KURL loadCurvesFile;
loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Select Gimp Curves File to Load")) ); TQString( i18n("Select Gimp Curves File to Load")) );
if( loadCurvesFile.isEmpty() ) if( loadCurvesFile.isEmpty() )
@ -657,7 +657,7 @@ void AdjustCurveDialog::slotUser2()
{ {
KURL saveCurvesFile; KURL saveCurvesFile;
saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Gimp Curves File to Save")) ); TQString( i18n("Gimp Curves File to Save")) );
if( saveCurvesFile.isEmpty() ) if( saveCurvesFile.isEmpty() )

32
digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
Unescape View File

@ -144,16 +144,16 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, CurvesWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, CurvesWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, CurvesWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, CurvesWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -209,18 +209,18 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
m_curveType = new TQHButtonGroup(m_gboxSettings->plainPage()); m_curveType = new TQHButtonGroup(m_gboxSettings->plainPage());
m_curveFree = new TQPushButton(m_curveType); m_curveFree = new TQPushButton(m_curveType);
m_curveType->insert(m_curveFree, FreeDrawing); 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"); "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->setPixmap( TQPixmap( directory + "curvefree.png" ) );
m_curveFree->setToggleButton(true); m_curveFree->setToggleButton(true);
TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) );
TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse."));
m_curveSmooth = new TQPushButton(m_curveType); m_curveSmooth = new TQPushButton(m_curveType);
m_curveType->insert(m_curveSmooth, SmoothDrawing); 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"); "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->setPixmap( TQPixmap( directory + "curvemooth.png" ) );
m_curveSmooth->setToggleButton(true); m_curveSmooth->setToggleButton(true);
TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) );
@ -234,9 +234,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage());
m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-black.png" ) );
m_pickBlack->setToggleButton(true); m_pickBlack->setToggleButton(true);
TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); 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.")); "smooth curves point on Red, Green, Blue, and Luminosity channels."));
m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickGray = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) );
m_pickGray->setToggleButton(true); m_pickGray->setToggleButton(true);
TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); 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.")); "smooth curves point on Red, Green, Blue, and Luminosity channels."));
m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-white.png" ) );
m_pickWhite->setToggleButton(true); m_pickWhite->setToggleButton(true);
TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) );
@ -619,7 +619,7 @@ void AdjustCurvesTool::slotLoadSettings()
{ {
KURL loadCurvesFile; KURL loadCurvesFile;
loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Select Gimp Curves File to Load")) ); TQString( i18n("Select Gimp Curves File to Load")) );
if( loadCurvesFile.isEmpty() ) if( loadCurvesFile.isEmpty() )
@ -640,7 +640,7 @@ void AdjustCurvesTool::slotSaveAsSettings()
{ {
KURL saveCurvesFile; KURL saveCurvesFile;
saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Gimp Curves File to Save")) ); TQString( i18n("Gimp Curves File to Save")) );
if( saveCurvesFile.isEmpty() ) if( saveCurvesFile.isEmpty() )

24
digikam/imageplugins/adjustlevels/adjustlevels.cpp
Unescape View File

@ -155,16 +155,16 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -256,9 +256,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings);
m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-black.png" ) );
m_pickBlack->setToggleButton(true); m_pickBlack->setToggleButton(true);
TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); 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.")); "levels input on Red, Green, Blue, and Luminosity channels."));
m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickGray = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-gray.png" ) );
m_pickGray->setToggleButton(true); m_pickGray->setToggleButton(true);
TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); 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.")); "levels input on Red, Green, Blue, and Luminosity channels."));
m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-white.png" ) );
m_pickWhite->setToggleButton(true); m_pickWhite->setToggleButton(true);
TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) );
@ -768,7 +768,7 @@ void AdjustLevelDialog::slotUser3()
{ {
KURL loadLevelsFile; KURL loadLevelsFile;
loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Select Gimp Levels File to Load")) ); TQString( i18n("Select Gimp Levels File to Load")) );
if( loadLevelsFile.isEmpty() ) if( loadLevelsFile.isEmpty() )
@ -789,7 +789,7 @@ void AdjustLevelDialog::slotUser2()
{ {
KURL saveLevelsFile; KURL saveLevelsFile;
saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Gimp Levels File to Save")) ); TQString( i18n("Gimp Levels File to Save")) );
if( saveLevelsFile.isEmpty() ) if( saveLevelsFile.isEmpty() )

24
digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
Unescape View File

@ -148,16 +148,16 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -253,9 +253,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage());
m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-black.png" ) );
m_pickBlack->setToggleButton(true); m_pickBlack->setToggleButton(true);
TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); 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.")); "levels input on Red, Green, Blue, and Luminosity channels."));
m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickGray = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) );
m_pickGray->setToggleButton(true); m_pickGray->setToggleButton(true);
TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); 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.")); "levels input on Red, Green, Blue, and Luminosity channels."));
m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup);
m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); 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"); "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->setPixmap( TQPixmap( directory + "color-picker-white.png" ) );
m_pickWhite->setToggleButton(true); m_pickWhite->setToggleButton(true);
TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) );
@ -751,7 +751,7 @@ void AdjustLevelsTool::slotLoadSettings()
{ {
KURL loadLevelsFile; KURL loadLevelsFile;
loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Select Gimp Levels File to Load")) ); TQString( i18n("Select Gimp Levels File to Load")) );
if( loadLevelsFile.isEmpty() ) if( loadLevelsFile.isEmpty() )
@ -771,7 +771,7 @@ void AdjustLevelsTool::slotSaveAsSettings()
{ {
KURL saveLevelsFile; KURL saveLevelsFile;
saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Gimp Levels File to Save")) ); TQString( i18n("Gimp Levels File to Save")) );
if( saveLevelsFile.isEmpty() ) if( saveLevelsFile.isEmpty() )

4
digikam/imageplugins/border/bordertool.cpp
Unescape View File

@ -646,9 +646,9 @@ TQString BorderTool::getBorderPath(int border)
return TQString(); return TQString();
} }
KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") +
"digikam/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) void BorderTool::slotPreserveAspectRatioToggled(bool b)

4
digikam/imageplugins/border/imageeffect_border.cpp
Unescape View File

@ -644,9 +644,9 @@ TQString ImageEffect_Border::getBorderPath(int border)
return TQString(); return TQString();
} }
KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") +
"digikam/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) void ImageEffect_Border::slotPreserveAspectRatioToggled(bool b)

12
digikam/imageplugins/channelmixer/channelmixer.cpp
Unescape View File

@ -147,16 +147,16 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -626,7 +626,7 @@ void ChannelMixerDialog::slotUser3()
int currentOutputChannel; int currentOutputChannel;
bool monochrome; bool monochrome;
loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Select Gimp Gains Mixer File to Load")) ); TQString( i18n("Select Gimp Gains Mixer File to Load")) );
if( loadGainsFileUrl.isEmpty() ) if( loadGainsFileUrl.isEmpty() )
@ -711,7 +711,7 @@ void ChannelMixerDialog::slotUser2()
KURL saveGainsFileUrl; KURL saveGainsFileUrl;
FILE *fp = 0L; FILE *fp = 0L;
saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Gimp Gains Mixer File to Save")) ); TQString( i18n("Gimp Gains Mixer File to Save")) );
if( saveGainsFileUrl.isEmpty() ) if( saveGainsFileUrl.isEmpty() )

12
digikam/imageplugins/channelmixer/channelmixertool.cpp
Unescape View File

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

8
digikam/imageplugins/colorfx/colorfxtool.cpp
Unescape View File

@ -125,16 +125,16 @@ ColorFXTool::ColorFXTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
Unescape View File

@ -131,16 +131,16 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/autocorrectiontool.cpp
Unescape View File

@ -125,16 +125,16 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/bcgtool.cpp
Unescape View File

@ -124,16 +124,16 @@ BCGTool::BCGTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

12
digikam/imageplugins/coreplugin/bwsepiatool.cpp
Unescape View File

@ -215,16 +215,16 @@ BWSepiaTool::BWSepiaTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -1063,7 +1063,7 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in
void BWSepiaTool::slotLoadSettings() void BWSepiaTool::slotLoadSettings()
{ {
KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Black & White Settings File to Load")) ); TQString( i18n("Black & White Settings File to Load")) );
if( loadFile.isEmpty() ) if( loadFile.isEmpty() )
@ -1139,7 +1139,7 @@ void BWSepiaTool::slotLoadSettings()
void BWSepiaTool::slotSaveAsSettings() void BWSepiaTool::slotSaveAsSettings()
{ {
KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Black & White Settings File to Save"))); TQString( i18n("Black & White Settings File to Save")));
if( saveFile.isEmpty() ) if( saveFile.isEmpty() )

8
digikam/imageplugins/coreplugin/hsl/hsltool.cpp
Unescape View File

@ -128,16 +128,16 @@ HSLTool::HSLTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
Unescape View File

@ -111,16 +111,16 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

18
digikam/imageplugins/coreplugin/iccprooftool.cpp
Unescape View File

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

8
digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
Unescape View File

@ -118,16 +118,16 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
Unescape View File

@ -111,16 +111,16 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

12
digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
Unescape View File

@ -213,16 +213,16 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -1069,7 +1069,7 @@ void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, boo
void ImageEffect_BWSepia::slotUser3() void ImageEffect_BWSepia::slotUser3()
{ {
KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Black & White Settings File to Load")) ); TQString( i18n("Black & White Settings File to Load")) );
if( loadFile.isEmpty() ) if( loadFile.isEmpty() )
@ -1144,7 +1144,7 @@ void ImageEffect_BWSepia::slotUser3()
void ImageEffect_BWSepia::slotUser2() void ImageEffect_BWSepia::slotUser2()
{ {
KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Black & White Settings File to Save")) ); TQString( i18n("Black & White Settings File to Save")) );
if( saveFile.isEmpty() ) if( saveFile.isEmpty() )

18
digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
Unescape View File

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

8
digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
Unescape View File

@ -110,16 +110,16 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
Unescape View File

@ -109,16 +109,16 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
Unescape View File

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

8
digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
Unescape View File

@ -189,8 +189,8 @@ RatioCropTool::RatioCropTool(TQObject* parent)
TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping."));
m_centerWidth = new TQToolButton(cropSelection); m_centerWidth = new TQToolButton(cropSelection);
KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("centerwidth", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png");
m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png")); m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png"));
TQWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); TQWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center."));
@ -211,8 +211,8 @@ RatioCropTool::RatioCropTool(TQObject* parent)
TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping."));
m_centerHeight = new TQToolButton(cropSelection); m_centerHeight = new TQToolButton(cropSelection);
KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("centerheight", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); directory = TDEGlobal::dirs()->findResourceDir("centerheight", "centerheight.png");
m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png")); m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png"));
TQWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); TQWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center."));

8
digikam/imageplugins/coreplugin/redeyetool.cpp
Unescape View File

@ -125,16 +125,16 @@ RedEyeTool::RedEyeTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

8
digikam/imageplugins/coreplugin/rgbtool.cpp
Unescape View File

@ -122,16 +122,16 @@ RGBTool::RGBTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQPushButton *linHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(linHistoButton, i18n("<p>Linear")); TQToolTip::add(linHistoButton, i18n("<p>Linear"));
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png"));
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); TQPushButton *logHistoButton = new TQPushButton(m_scaleBG);
TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic"));
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png"));
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

4
digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
Unescape View File

@ -633,7 +633,7 @@ void ImageEffect_Sharpen::putFinalData(void)
void ImageEffect_Sharpen::slotUser3() void ImageEffect_Sharpen::slotUser3()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Refocus Settings File to Load")) ); TQString( i18n("Photograph Refocus Settings File to Load")) );
if ( loadRestorationFile.isEmpty() ) if ( loadRestorationFile.isEmpty() )
@ -669,7 +669,7 @@ void ImageEffect_Sharpen::slotUser3()
void ImageEffect_Sharpen::slotUser2() void ImageEffect_Sharpen::slotUser2()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Refocus Settings File to Save")) ); TQString( i18n("Photograph Refocus Settings File to Save")) );
if ( saveRestorationFile.isEmpty() ) if ( saveRestorationFile.isEmpty() )

4
digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
Unescape View File

@ -678,7 +678,7 @@ void SharpenTool::putFinalData()
void SharpenTool::slotLoadSettings() void SharpenTool::slotLoadSettings()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()),
TQString( i18n("Photograph Refocus Settings File to Load")) ); TQString( i18n("Photograph Refocus Settings File to Load")) );
if ( loadRestorationFile.isEmpty() ) if ( loadRestorationFile.isEmpty() )
@ -714,7 +714,7 @@ void SharpenTool::slotLoadSettings()
void SharpenTool::slotSaveAsSettings() void SharpenTool::slotSaveAsSettings()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()),
TQString( i18n("Photograph Refocus Settings File to Save")) ); TQString( i18n("Photograph Refocus Settings File to Save")) );
if ( saveRestorationFile.isEmpty() ) if ( saveRestorationFile.isEmpty() )

8
digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
Unescape View File

@ -167,8 +167,8 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent)
KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage);
cimgLogoLabel->setText(TQString()); cimgLogoLabel->setText(TQString());
cimgLogoLabel->setURL("http://cimg.sourceforge.net"); cimgLogoLabel->setURL("http://cimg.sourceforge.net");
KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/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");
cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) );
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
@ -415,7 +415,7 @@ void ImageEffect_InPainting_Dialog::putFinalData(void)
void ImageEffect_InPainting_Dialog::slotUser3() void ImageEffect_InPainting_Dialog::slotUser3()
{ {
KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Inpainting Settings File to Load")) ); TQString( i18n("Photograph Inpainting Settings File to Load")) );
if( loadInpaintingFile.isEmpty() ) if( loadInpaintingFile.isEmpty() )
@ -446,7 +446,7 @@ void ImageEffect_InPainting_Dialog::slotUser3()
void ImageEffect_InPainting_Dialog::slotUser2() void ImageEffect_InPainting_Dialog::slotUser2()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Inpainting Settings File to Save")) ); TQString( i18n("Photograph Inpainting Settings File to Save")) );
if( saveRestorationFile.isEmpty() ) if( saveRestorationFile.isEmpty() )

8
digikam/imageplugins/inpainting/inpaintingtool.cpp
Unescape View File

@ -115,8 +115,8 @@ InPaintingTool::InPaintingTool(TQObject* parent)
KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage);
cimgLogoLabel->setText(TQString()); cimgLogoLabel->setText(TQString());
cimgLogoLabel->setURL("http://cimg.sourceforge.net"); cimgLogoLabel->setURL("http://cimg.sourceforge.net");
KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/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");
cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) );
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
@ -380,7 +380,7 @@ void InPaintingTool::putFinalData()
void InPaintingTool::slotLoadSettings() void InPaintingTool::slotLoadSettings()
{ {
KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Inpainting Settings File to Load")) ); TQString( i18n("Photograph Inpainting Settings File to Load")) );
if( loadInpaintingFile.isEmpty() ) if( loadInpaintingFile.isEmpty() )
@ -411,7 +411,7 @@ void InPaintingTool::slotLoadSettings()
void InPaintingTool::slotSaveAsSettings() void InPaintingTool::slotSaveAsSettings()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Inpainting Settings File to Save")) ); TQString( i18n("Photograph Inpainting Settings File to Save")) );
if( saveRestorationFile.isEmpty() ) if( saveRestorationFile.isEmpty() )

4
digikam/imageplugins/inserttext/fontchooserwidget.cpp
Unescape View File

@ -294,13 +294,13 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
vbox->addWidget( xlfdEdit ); vbox->addWidget( xlfdEdit );
// lets initialize the display if possible // lets initialize the display if possible
setFont( KGlobalSettings::generalFont(), usingFixed ); setFont( TDEGlobalSettings::generalFont(), usingFixed );
// check or uncheck or gray out the "relative" checkbox // check or uncheck or gray out the "relative" checkbox
if( sizeIsRelativeState && sizeIsRelativeCheckBox ) if( sizeIsRelativeState && sizeIsRelativeCheckBox )
setSizeIsRelative( *sizeIsRelativeState ); setSizeIsRelative( *sizeIsRelativeState );
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, TQString::fromLatin1("General")); KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
} }

4
digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
Unescape View File

@ -477,7 +477,7 @@ void ImageEffect_NoiseReduction::putFinalData(void)
void ImageEffect_NoiseReduction::slotUser3() void ImageEffect_NoiseReduction::slotUser3()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); TQString( i18n("Photograph Noise Reduction Settings File to Load")) );
if ( loadRestorationFile.isEmpty() ) if ( loadRestorationFile.isEmpty() )
@ -519,7 +519,7 @@ void ImageEffect_NoiseReduction::slotUser3()
void ImageEffect_NoiseReduction::slotUser2() void ImageEffect_NoiseReduction::slotUser2()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); TQString( i18n("Photograph Noise Reduction Settings File to Save")) );
if ( saveRestorationFile.isEmpty() ) if ( saveRestorationFile.isEmpty() )

4
digikam/imageplugins/noisereduction/noisereductiontool.cpp
Unescape View File

@ -462,7 +462,7 @@ void NoiseReductionTool::putFinalData()
void NoiseReductionTool::slotLoadSettings() void NoiseReductionTool::slotLoadSettings()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); TQString( i18n("Photograph Noise Reduction Settings File to Load")) );
if ( loadRestorationFile.isEmpty() ) if ( loadRestorationFile.isEmpty() )
@ -503,7 +503,7 @@ void NoiseReductionTool::slotLoadSettings()
void NoiseReductionTool::slotSaveAsSettings() void NoiseReductionTool::slotSaveAsSettings()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); TQString( i18n("Photograph Noise Reduction Settings File to Save")) );
if ( saveRestorationFile.isEmpty() ) if ( saveRestorationFile.isEmpty() )

8
digikam/imageplugins/restoration/imageeffect_restoration.cpp
Unescape View File

@ -99,8 +99,8 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent)
KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage);
cimgLogoLabel->setText(TQString()); cimgLogoLabel->setText(TQString());
cimgLogoLabel->setURL("http://cimg.sourceforge.net"); cimgLogoLabel->setURL("http://cimg.sourceforge.net");
KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/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");
cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) );
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
@ -296,7 +296,7 @@ void ImageEffect_Restoration::putFinalData(void)
void ImageEffect_Restoration::slotUser3() void ImageEffect_Restoration::slotUser3()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Restoration Settings File to Load")) ); TQString( i18n("Photograph Restoration Settings File to Load")) );
if( loadRestorationFile.isEmpty() ) if( loadRestorationFile.isEmpty() )
@ -329,7 +329,7 @@ void ImageEffect_Restoration::slotUser3()
void ImageEffect_Restoration::slotUser2() void ImageEffect_Restoration::slotUser2()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Restoration Settings File to Save")) ); TQString( i18n("Photograph Restoration Settings File to Save")) );
if( saveRestorationFile.isEmpty() ) if( saveRestorationFile.isEmpty() )

8
digikam/imageplugins/restoration/restorationtool.cpp
Unescape View File

@ -90,8 +90,8 @@ RestorationTool::RestorationTool(TQObject* parent)
KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage);
cimgLogoLabel->setText(TQString()); cimgLogoLabel->setText(TQString());
cimgLogoLabel->setURL("http://cimg.sourceforge.net"); cimgLogoLabel->setURL("http://cimg.sourceforge.net");
KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/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");
cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) );
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
@ -303,7 +303,7 @@ void RestorationTool::putFinalData()
void RestorationTool::slotLoadSettings() void RestorationTool::slotLoadSettings()
{ {
KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Restoration Settings File to Load")) ); TQString( i18n("Photograph Restoration Settings File to Load")) );
if( loadRestorationFile.isEmpty() ) if( loadRestorationFile.isEmpty() )
@ -336,7 +336,7 @@ void RestorationTool::slotLoadSettings()
void RestorationTool::slotSaveAsSettings() void RestorationTool::slotSaveAsSettings()
{ {
KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("Photograph Restoration Settings File to Save")) ); TQString( i18n("Photograph Restoration Settings File to Save")) );
if( saveRestorationFile.isEmpty() ) if( saveRestorationFile.isEmpty() )

2
digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
Unescape View File

@ -213,7 +213,7 @@ void ImageEffect_SuperImpose::readUserSettings()
{ {
KConfig* config = kapp->config(); KConfig* config = kapp->config();
config->setGroup("Album Settings"); 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("superimpose Tool Dialog");
config->setGroup("Template Superimpose Tool Settings"); config->setGroup("Template Superimpose Tool Settings");
m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) );

2
digikam/imageplugins/superimpose/superimposetool.cpp
Unescape View File

@ -205,7 +205,7 @@ void SuperImposeTool::readSettings()
{ {
KConfig* config = kapp->config(); KConfig* config = kapp->config();
config->setGroup("Album Settings"); 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("superimpose Tool");
config->setGroup("Template Superimpose Tool Settings"); config->setGroup("Template Superimpose Tool Settings");
m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) );

4
digikam/imageplugins/texture/imageeffect_texture.cpp
Unescape View File

@ -282,9 +282,9 @@ TQString ImageEffect_Texture::getTexturePath(int texture)
break; break;
} }
KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") +
"digikam/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 } // NameSpace DigikamTextureImagesPlugin

4
digikam/imageplugins/texture/texturetool.cpp
Unescape View File

@ -287,8 +287,8 @@ TQString TextureTool::getTexturePath(int texture)
break; break;
} }
KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/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 } // NameSpace DigikamTextureImagesPlugin

16
digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
Unescape View File

@ -148,16 +148,16 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -229,8 +229,8 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
"<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>Daylight D65</b>: overcast sky light (6500K).<p>"
"<b>None</b>: no preset value.")); "<b>None</b>: no preset value."));
m_pickTemperature = new TQPushButton(gboxSettings); m_pickTemperature = new TQPushButton(gboxSettings);
KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/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_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) );
m_pickTemperature->setToggleButton(true); m_pickTemperature->setToggleButton(true);
TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) );
@ -768,7 +768,7 @@ void ImageEffect_WhiteBalance::writeUserSettings()
// Load all settings. // Load all settings.
void ImageEffect_WhiteBalance::slotUser3() void ImageEffect_WhiteBalance::slotUser3()
{ {
KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("White Color Balance Settings File to Load")) ); TQString( i18n("White Color Balance Settings File to Load")) );
if( loadWhiteBalanceFile.isEmpty() ) if( loadWhiteBalanceFile.isEmpty() )
@ -811,7 +811,7 @@ void ImageEffect_WhiteBalance::slotUser3()
// Save all settings. // Save all settings.
void ImageEffect_WhiteBalance::slotUser2() void ImageEffect_WhiteBalance::slotUser2()
{ {
KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("White Color Balance Settings File to Save")) ); TQString( i18n("White Color Balance Settings File to Save")) );
if( saveWhiteBalanceFile.isEmpty() ) if( saveWhiteBalanceFile.isEmpty() )

16
digikam/imageplugins/whitebalance/whitebalancetool.cpp
Unescape View File

@ -144,16 +144,16 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *linHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); TQPushButton *logHistoButton = new TQPushButton( m_scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -228,8 +228,8 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
"<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>Daylight D65</b>: overcast sky light (6500K).<p>"
"<b>None</b>: no preset value.")); "<b>None</b>: no preset value."));
m_pickTemperature = new TQPushButton(m_gboxSettings->plainPage()); m_pickTemperature = new TQPushButton(m_gboxSettings->plainPage());
KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/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_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) );
m_pickTemperature->setToggleButton(true); m_pickTemperature->setToggleButton(true);
TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) );
@ -778,7 +778,7 @@ void WhiteBalanceTool::writeSettings()
void WhiteBalanceTool::slotLoadSettings() void WhiteBalanceTool::slotLoadSettings()
{ {
KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("White Color Balance Settings File to Load")) ); TQString( i18n("White Color Balance Settings File to Load")) );
if( loadWhiteBalanceFile.isEmpty() ) if( loadWhiteBalanceFile.isEmpty() )
@ -820,7 +820,7 @@ void WhiteBalanceTool::slotLoadSettings()
void WhiteBalanceTool::slotSaveAsSettings() void WhiteBalanceTool::slotSaveAsSettings()
{ {
KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), kapp->activeWindow(), TQString( "*" ), kapp->activeWindow(),
TQString( i18n("White Color Balance Settings File to Save")) ); TQString( i18n("White Color Balance Settings File to Save")) );
if( saveWhiteBalanceFile.isEmpty() ) if( saveWhiteBalanceFile.isEmpty() )

2
digikam/kioslave/digikamalbums.cpp
Unescape View File

@ -1953,7 +1953,7 @@ extern "C"
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamalbums" ); TDEInstance instance( "kio_digikamalbums" );
KGlobal::locale(); TDEGlobal::locale();
if (argc != 4) { if (argc != 4) {
kdDebug() << "Usage: kio_digikamalbums protocol domain-socket1 domain-socket2" kdDebug() << "Usage: kio_digikamalbums protocol domain-socket1 domain-socket2"

2
digikam/kioslave/digikamdates.cpp
Unescape View File

@ -296,7 +296,7 @@ extern "C"
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamdates" ); TDEInstance instance( "kio_digikamdates" );
KGlobal::locale(); TDEGlobal::locale();
if (argc != 4) { if (argc != 4) {
kdDebug() << "Usage: kio_digikamdates protocol domain-socket1 domain-socket2" kdDebug() << "Usage: kio_digikamdates protocol domain-socket1 domain-socket2"

4
digikam/kioslave/digikamsearch.cpp
Unescape View File

@ -73,7 +73,7 @@ kio_digikamsearch::kio_digikamsearch(const TQCString &pool_socket,
: SlaveBase("kio_digikamsearch", pool_socket, app_socket) : SlaveBase("kio_digikamsearch", pool_socket, app_socket)
{ {
// build a lookup table for month names // 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) for (int i=1; i<=12; ++i)
{ {
m_shortMonths[i-1] = cal->monthName(i, 2000, true).lower(); m_shortMonths[i-1] = cal->monthName(i, 2000, true).lower();
@ -676,7 +676,7 @@ extern "C"
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamsearch" ); TDEInstance instance( "kio_digikamsearch" );
KGlobal::locale(); TDEGlobal::locale();
if (argc != 4) if (argc != 4)
{ {

2
digikam/kioslave/digikamtags.cpp
Unescape View File

@ -305,7 +305,7 @@ extern "C"
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamtags" ); TDEInstance instance( "kio_digikamtags" );
( void ) KGlobal::locale(); ( void ) TDEGlobal::locale();
kdDebug() << "*** kio_digikamtag started ***" << endl; kdDebug() << "*** kio_digikamtag started ***" << endl;

2
digikam/kioslave/digikamthumbnail.cpp
Unescape View File

@ -616,7 +616,7 @@ extern "C"
{ {
KLocale::setMainCatalogue("digikam"); KLocale::setMainCatalogue("digikam");
TDEInstance instance( "kio_digikamthumbnail" ); TDEInstance instance( "kio_digikamthumbnail" );
( void ) KGlobal::locale(); ( void ) TDEGlobal::locale();
if (argc != 4) if (argc != 4)
{ {

12
digikam/libs/dialogs/deletedialog.cpp
Unescape View File

@ -114,13 +114,13 @@ void DeleteWidget::updateText()
{ {
ddDeleteText->setText(i18n("<qt>These items will be <b>permanently " ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
"deleted</b> from your hard disk.</qt>")); "deleted</b> from your hard disk.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
else else
{ {
ddDeleteText->setText(i18n("<qt>These items will be moved to Trash.</qt>")); ddDeleteText->setText(i18n("<qt>These items will be moved to Trash.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
ddNumFiles->setText(i18n("<b>1</b> file selected.", "<b>%n</b> files selected.", ddFileList->count())); ddNumFiles->setText(i18n("<b>1</b> file selected.", "<b>%n</b> files selected.", ddFileList->count()));
@ -134,13 +134,13 @@ void DeleteWidget::updateText()
{ {
ddDeleteText->setText(i18n("<qt>These albums will be <b>permanently " ddDeleteText->setText(i18n("<qt>These albums will be <b>permanently "
"deleted</b> from your hard disk.</qt>")); "deleted</b> from your hard disk.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
else else
{ {
ddDeleteText->setText(i18n("<qt>These albums will be moved to Trash.</qt>")); ddDeleteText->setText(i18n("<qt>These albums will be moved to Trash.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count())); ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count()));
@ -157,7 +157,7 @@ void DeleteWidget::updateText()
"Note that <b>all subalbums</b> " "Note that <b>all subalbums</b> "
"are included in this list and will " "are included in this list and will "
"be deleted permanently as well.</qt>")); "be deleted permanently as well.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
else else
@ -166,7 +166,7 @@ void DeleteWidget::updateText()
"Note that <b>all subalbums</b> " "Note that <b>all subalbums</b> "
"are included in this list and will " "are included in this list and will "
"be moved to Trash as well.</qt>")); "be moved to Trash as well.</qt>"));
ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
KIcon::Desktop, KIcon::SizeLarge)); KIcon::Desktop, KIcon::SizeLarge));
} }
ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count())); ddNumFiles->setText(i18n("<b>1</b> album selected.", "<b>%n</b> albums selected.", ddFileList->count()));

2
digikam/libs/dialogs/dprogressdlg.cpp
Unescape View File

@ -140,7 +140,7 @@ void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text)
if (pix.isNull()) if (pix.isNull())
{ {
TQString dir = KGlobal::dirs()->findResourceDir("digikam_imagebroken", TQString dir = TDEGlobal::dirs()->findResourceDir("digikam_imagebroken",
"image-broken.png"); "image-broken.png");
dir = dir + "/image-broken.png"; dir = dir + "/image-broken.png";
TQPixmap pixbi(dir); TQPixmap pixbi(dir);

2
digikam/libs/dialogs/imagedialog.cpp
Unescape View File

@ -180,7 +180,7 @@ void ImageDialogPreview::showPreview(const KURL& url)
else model = info.model; else model = info.model;
if (!info.dateTime.isValid()) dateTime = unavailable; 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; if (info.aperture.isEmpty()) aperture = unavailable;
else aperture = info.aperture; else aperture = info.aperture;

4
digikam/libs/dimg/ddebug.cpp
Unescape View File

@ -52,7 +52,7 @@ Ddbgstream::Ddbgstream(kdbgstream stream)
// leak the mutex object for simplicity // leak the mutex object for simplicity
_ddebug_mutex_ = new TQMutex; _ddebug_mutex_ = new TQMutex;
//deleter.setObject(mutex, new TQMutex); //deleter.setObject(mutex, new TQMutex);
//KGlobal::unregisterStaticDeleter(&deleter); //TDEGlobal::unregisterStaticDeleter(&deleter);
} }
_ddebug_mutex_->lock(); _ddebug_mutex_->lock();
} }
@ -72,7 +72,7 @@ Dndbgstream::Dndbgstream(kndbgstream stream)
// leak the mutex object for simplicity // leak the mutex object for simplicity
_ddebug_mutex_ = new TQMutex; _ddebug_mutex_ = new TQMutex;
//deleter.setObject(mutex, new TQMutex); //deleter.setObject(mutex, new TQMutex);
//KGlobal::unregisterStaticDeleter(&deleter); //TDEGlobal::unregisterStaticDeleter(&deleter);
} }
_ddebug_mutex_->lock(); _ddebug_mutex_->lock();
} }

6
digikam/libs/dimg/loaders/dimgloader.cpp
Unescape View File

@ -168,13 +168,13 @@ bool DImgLoader::checkExifWorkingColorSpace()
} }
// Else check the Exif color-space tag and use a default profiles available in digiKam. // 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()) switch(metaData.getImageColorWorkSpace())
{ {
case DMetadata::WORKSPACE_SRGB: 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"); m_image->getICCProfilFromFile(directory + "srgb-d65.icm");
DDebug() << "Exif color-space tag is sRGB. Using default sRGB ICC profile." << endl; DDebug() << "Exif color-space tag is sRGB. Using default sRGB ICC profile." << endl;
return true; return true;
@ -183,7 +183,7 @@ bool DImgLoader::checkExifWorkingColorSpace()
case DMetadata::WORKSPACE_ADOBERGB: 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"); m_image->getICCProfilFromFile(directory + "adobergb.icm");
DDebug() << "Exif color-space tag is AdobeRGB. Using default AdobeRGB ICC profile." << endl; DDebug() << "Exif color-space tag is AdobeRGB. Using default AdobeRGB ICC profile." << endl;
return true; return true;

4
digikam/libs/dimg/loaders/dimgloaderobserver.h
Unescape View File

@ -52,9 +52,9 @@ public:
virtual float granularity() virtual float granularity()
{ return 1.0; }; { 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 // 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. // Remove when porting to TQt4.
virtual bool isShuttingDown() virtual bool isShuttingDown()
{ return false; } { return false; }

12
digikam/libs/dimg/loaders/rawloader.cpp
Unescape View File

@ -63,7 +63,7 @@ bool RAWLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
{ {
m_observer = 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) // - there is an event loop (not for ioslaves)
// - we are not called from the event loop thread // - we are not called from the event loop thread
// These assumptions are currently true for all use cases in digikam, // 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. // 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) switch(m_rawDecodingSettings.outputColorSpace)
{ {
case DRawDecoding::SRGB: 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"); m_image->getICCProfilFromFile(directory + "srgb.icm");
break; break;
} }
case DRawDecoding::ADOBERGB: 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"); m_image->getICCProfilFromFile(directory + "adobergb.icm");
break; break;
} }
case DRawDecoding::WIDEGAMMUT: 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"); m_image->getICCProfilFromFile(directory + "widegamut.icm");
break; break;
} }
case DRawDecoding::PROPHOTO: 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"); m_image->getICCProfilFromFile(directory + "prophoto.icm");
break; break;
} }

6
digikam/libs/imageproperties/cameraitempropertiestab.cpp
Unescape View File

@ -397,10 +397,10 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
TQDateTime date; TQDateTime date;
date.setTime_t(itemInfo->mtime); 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)) 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); d->labelFileSize->setText(str);
// -- Image Properties -------------------------------------------------- // -- Image Properties --------------------------------------------------
@ -517,7 +517,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo,
if (photoInfo.dateTime.isValid()) if (photoInfo.dateTime.isValid())
{ {
str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true);
d->labelPhotoDateTime->setText(str); d->labelPhotoDateTime->setText(str);
} }
else else

16
digikam/libs/imageproperties/imagepropertiescolorstab.cpp
Unescape View File

@ -196,16 +196,16 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *linHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);
@ -234,16 +234,16 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
TQPushButton *fullImageButton = new TQPushButton( d->regionBG ); TQPushButton *fullImageButton = new TQPushButton( d->regionBG );
TQToolTip::add( fullImageButton, i18n( "<p>Full Image" ) ); TQToolTip::add( fullImageButton, i18n( "<p>Full Image" ) );
d->regionBG->insert(fullImageButton, HistogramWidget::FullImageHistogram); d->regionBG->insert(fullImageButton, HistogramWidget::FullImageHistogram);
KGlobal::dirs()->addResourceType("image-full", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("image-full", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("image-full", "image-full.png"); directory = TDEGlobal::dirs()->findResourceDir("image-full", "image-full.png");
fullImageButton->setPixmap( TQPixmap( directory + "image-full.png" ) ); fullImageButton->setPixmap( TQPixmap( directory + "image-full.png" ) );
fullImageButton->setToggleButton(true); fullImageButton->setToggleButton(true);
TQPushButton *SelectionImageButton = new TQPushButton( d->regionBG ); TQPushButton *SelectionImageButton = new TQPushButton( d->regionBG );
TQToolTip::add( SelectionImageButton, i18n( "<p>Selection" ) ); TQToolTip::add( SelectionImageButton, i18n( "<p>Selection" ) );
d->regionBG->insert(SelectionImageButton, HistogramWidget::ImageSelectionHistogram); d->regionBG->insert(SelectionImageButton, HistogramWidget::ImageSelectionHistogram);
KGlobal::dirs()->addResourceType("image-selection", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("image-selection", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("image-selection", "image-selection.png"); directory = TDEGlobal::dirs()->findResourceDir("image-selection", "image-selection.png");
SelectionImageButton->setPixmap( TQPixmap( directory + "image-selection.png" ) ); SelectionImageButton->setPixmap( TQPixmap( directory + "image-selection.png" ) );
SelectionImageButton->setToggleButton(true); SelectionImageButton->setToggleButton(true);

6
digikam/libs/imageproperties/imagepropertiestab.cpp
Unescape View File

@ -422,11 +422,11 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url)
d->labelFolder->setText(url.directory()); d->labelFolder->setText(url.directory());
TQDateTime modifiedDate = fileInfo.lastModified(); TQDateTime modifiedDate = fileInfo.lastModified();
str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); str = TDEGlobal::locale()->formatDateTime(modifiedDate, true, true);
d->labelFileModifiedDate->setText(str); d->labelFileModifiedDate->setText(str);
str = TQString("%1 (%2)").arg(KIO::convertSize(fi.size())) 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->labelFileSize->setText(str);
d->labelFileOwner->setText( TQString("%1 - %2").arg(fi.user()).arg(fi.group()) ); 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()) if (photoInfo.dateTime.isValid())
{ {
str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true);
d->labelPhotoDateTime->setText(str); d->labelPhotoDateTime->setText(str);
} }
else else

6
digikam/libs/themeengine/themeengine.cpp
Unescape View File

@ -88,8 +88,8 @@ ThemeEngine* ThemeEngine::instance()
ThemeEngine::ThemeEngine() ThemeEngine::ThemeEngine()
{ {
m_instance = this; m_instance = this;
KGlobal::dirs()->addResourceType("themes", TDEGlobal::dirs()->addResourceType("themes",
KGlobal::dirs()->kde_default("data") TDEGlobal::dirs()->kde_default("data")
+ "digikam/themes"); + "digikam/themes");
d = new ThemeEnginePriv; d = new ThemeEnginePriv;
@ -195,7 +195,7 @@ void ThemeEngine::scanThemes()
d->themeDict.clear(); d->themeDict.clear();
d->currTheme = 0; 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(); for (TQStringList::iterator it=themes.begin(); it != themes.end();
++it) ++it)

4
digikam/libs/threadimageio/loadsavetask.cpp
Unescape View File

@ -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 // 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. // Remove when porting to TQt4.
bool LoadingTask::isShuttingDown() bool LoadingTask::isShuttingDown()
{ {

4
digikam/libs/threadimageio/loadsavethread.cpp
Unescape View File

@ -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 // 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. // Remove when porting to TQt4.
bool LoadSaveThread::isShuttingDown() bool LoadSaveThread::isShuttingDown()
{ {

6
digikam/libs/thumbbar/thumbbar.cpp
Unescape View File

@ -952,7 +952,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item)
if (settings.showFileDate) if (settings.showFileDate)
{ {
TQDateTime modifiedDate = fileInfo.lastModified(); 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; 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; tipText += m_cellBeg + i18n("Size:") + m_cellMid;
str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) 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; tipText += str + m_cellEnd;
} }
@ -1037,7 +1037,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item)
{ {
if (photoInfo.dateTime.isValid()) 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) + "..."; if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "...";
metaStr += m_cellBeg + i18n("Created:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; metaStr += m_cellBeg + i18n("Created:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd;
} }

4
digikam/libs/widgets/common/dlogoaction.cpp
Unescape View File

@ -64,8 +64,8 @@ int DLogoAction::plug(TQWidget *widget, int index)
pixmapLogo->setScaledContents(false); pixmapLogo->setScaledContents(false);
pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" )); pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" ));
pixmapLogo->setFocusPolicy(TQ_NoFocus); pixmapLogo->setFocusPolicy(TQ_NoFocus);

4
digikam/libs/widgets/common/searchtextbar.cpp
Unescape View File

@ -187,8 +187,8 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
KConfig *config = kapp->config(); KConfig *config = kapp->config();
config->setGroup(name + TQString(" Search Text Tool")); config->setGroup(name + TQString(" Search Text Tool"));
d->searchEdit->setCompletionMode((KGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode",
(int)KGlobalSettings::CompletionAuto)); (int)TDEGlobalSettings::CompletionAuto));
} }
SearchTextBar::~SearchTextBar() SearchTextBar::~SearchTextBar()

2
digikam/libs/widgets/common/splashscreen.cpp
Unescape View File

@ -135,7 +135,7 @@ void SplashScreen::drawContents(TQPainter* painter)
painter->setPen(d->color); painter->setPen(d->color);
TQFont fnt(KGlobalSettings::generalFont()); TQFont fnt(TDEGlobalSettings::generalFont());
int fntSize = fnt.pointSize(); int fntSize = fnt.pointSize();
if (fntSize > 0) if (fntSize > 0)
{ {

4
digikam/libs/widgets/common/statusled.cpp
Unescape View File

@ -70,8 +70,8 @@ void StatusLed::setLedColor(LedColor color)
break; break;
} }
KGlobal::dirs()->addResourceType(file.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType(file.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png")); TQString directory = TDEGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png"));
setPixmap(TQPixmap(directory + file + TQString(".png"))); setPixmap(TQPixmap(directory + file + TQString(".png")));
} }

20
digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
Unescape View File

@ -112,8 +112,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
{ {
TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); TQPushButton *duplicateHorButton = new TQPushButton( d->separateView );
d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz);
KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
duplicateHorButton->setToggleButton(true); duplicateHorButton->setToggleButton(true);
TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( duplicateHorButton, i18n("<p>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 ); TQPushButton *duplicateVerButton = new TQPushButton( d->separateView );
d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert);
KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
duplicateVerButton->setToggleButton(true); duplicateVerButton->setToggleButton(true);
TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( duplicateVerButton, i18n("<p>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 ); TQPushButton *separateHorButton = new TQPushButton( d->separateView );
d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal);
KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
separateHorButton->setToggleButton(true); separateHorButton->setToggleButton(true);
TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( separateHorButton, i18n( "<p>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 ); TQPushButton *separateVerButton = new TQPushButton( d->separateView );
d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical);
KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) );
separateVerButton->setToggleButton(true); separateVerButton->setToggleButton(true);
TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( separateVerButton, i18n( "<p>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 ); TQPushButton *noSeparateButton = new TQPushButton( d->separateView );
d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone);
KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("target", "target.png"); directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) );
noSeparateButton->setToggleButton(true); noSeparateButton->setToggleButton(true);
TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not "

20
digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
Unescape View File

@ -152,8 +152,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
{ {
TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); TQPushButton *duplicateHorButton = new TQPushButton( d->separateView );
d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz);
KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
duplicateHorButton->setToggleButton(true); duplicateHorButton->setToggleButton(true);
TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( duplicateHorButton, i18n("<p>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 ); TQPushButton *duplicateVerButton = new TQPushButton( d->separateView );
d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert);
KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
duplicateVerButton->setToggleButton(true); duplicateVerButton->setToggleButton(true);
TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( duplicateVerButton, i18n("<p>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 ); TQPushButton *separateHorButton = new TQPushButton( d->separateView );
d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal);
KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
separateHorButton->setToggleButton(true); separateHorButton->setToggleButton(true);
TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( separateHorButton, i18n( "<p>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 ); TQPushButton *separateVerButton = new TQPushButton( d->separateView );
d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical);
KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) );
separateVerButton->setToggleButton(true); separateVerButton->setToggleButton(true);
TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " TQWhatsThis::add( separateVerButton, i18n( "<p>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 ); TQPushButton *noSeparateButton = new TQPushButton( d->separateView );
d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone);
KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("target", "target.png"); directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) );
noSeparateButton->setToggleButton(true); noSeparateButton->setToggleButton(true);
TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not "

28
digikam/libs/widgets/imageplugins/imagewidget.cpp
Unescape View File

@ -98,8 +98,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
TQPushButton *previewOriginalButton = new TQPushButton( d->previewButtons ); TQPushButton *previewOriginalButton = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewOriginalButton, ImageGuideWidget::PreviewOriginalImage); d->previewButtons->insert(previewOriginalButton, ImageGuideWidget::PreviewOriginalImage);
KGlobal::dirs()->addResourceType("original", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("original", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("original", "original.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("original", "original.png");
previewOriginalButton->setPixmap( TQPixmap( directory + "original.png" ) ); previewOriginalButton->setPixmap( TQPixmap( directory + "original.png" ) );
previewOriginalButton->setToggleButton(true); previewOriginalButton->setToggleButton(true);
TQWhatsThis::add( previewOriginalButton, i18n( "<p>If you enable this option, you will see " TQWhatsThis::add( previewOriginalButton, i18n( "<p>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 ); TQPushButton *previewBothButtonVert = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewBothButtonVert, ImageGuideWidget::PreviewBothImagesVertCont); d->previewButtons->insert(previewBothButtonVert, ImageGuideWidget::PreviewBothImagesVertCont);
KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
previewBothButtonVert->setPixmap( TQPixmap( directory + "bothvert.png" ) ); previewBothButtonVert->setPixmap( TQPixmap( directory + "bothvert.png" ) );
previewBothButtonVert->setToggleButton(true); previewBothButtonVert->setToggleButton(true);
TQWhatsThis::add( previewBothButtonVert, i18n( "<p>If you enable this option, the preview area will " TQWhatsThis::add( previewBothButtonVert, i18n( "<p>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 ); TQPushButton *previewBothButtonHorz = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorzCont); d->previewButtons->insert(previewBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorzCont);
KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
previewBothButtonHorz->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); previewBothButtonHorz->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
previewBothButtonHorz->setToggleButton(true); previewBothButtonHorz->setToggleButton(true);
TQWhatsThis::add( previewBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " TQWhatsThis::add( previewBothButtonHorz, i18n( "<p>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 ); TQPushButton *previewDuplicateBothButtonVert = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewDuplicateBothButtonVert, ImageGuideWidget::PreviewBothImagesVert); d->previewButtons->insert(previewDuplicateBothButtonVert, ImageGuideWidget::PreviewBothImagesVert);
KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
previewDuplicateBothButtonVert->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); previewDuplicateBothButtonVert->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
previewDuplicateBothButtonVert->setToggleButton(true); previewDuplicateBothButtonVert->setToggleButton(true);
TQWhatsThis::add( previewDuplicateBothButtonVert, i18n( "<p>If you enable this option, the preview area will " TQWhatsThis::add( previewDuplicateBothButtonVert, i18n( "<p>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 ); TQPushButton *previewDupplicateBothButtonHorz = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewDupplicateBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorz); d->previewButtons->insert(previewDupplicateBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorz);
KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
previewDupplicateBothButtonHorz->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); previewDupplicateBothButtonHorz->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
previewDupplicateBothButtonHorz->setToggleButton(true); previewDupplicateBothButtonHorz->setToggleButton(true);
TQWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " TQWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "<p>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 ); TQPushButton *previewtargetButton = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewtargetButton, ImageGuideWidget::PreviewTargetImage); d->previewButtons->insert(previewtargetButton, ImageGuideWidget::PreviewTargetImage);
KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("target", "target.png"); directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
previewtargetButton->setPixmap( TQPixmap( directory + "target.png" ) ); previewtargetButton->setPixmap( TQPixmap( directory + "target.png" ) );
previewtargetButton->setToggleButton(true); previewtargetButton->setToggleButton(true);
TQWhatsThis::add( previewtargetButton, i18n( "<p>If you enable this option, you will see " TQWhatsThis::add( previewtargetButton, i18n( "<p>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 ); TQPushButton *previewToggleMouseOverButton = new TQPushButton( d->previewButtons );
d->previewButtons->insert(previewToggleMouseOverButton, ImageGuideWidget::PreviewToggleOnMouseOver); d->previewButtons->insert(previewToggleMouseOverButton, ImageGuideWidget::PreviewToggleOnMouseOver);
KGlobal::dirs()->addResourceType("togglemouseover", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("togglemouseover", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png"); directory = TDEGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png");
previewToggleMouseOverButton->setPixmap( TQPixmap( directory + "togglemouseover.png" ) ); previewToggleMouseOverButton->setPixmap( TQPixmap( directory + "togglemouseover.png" ) );
previewToggleMouseOverButton->setToggleButton(true); previewToggleMouseOverButton->setToggleButton(true);
TQWhatsThis::add( previewToggleMouseOverButton, i18n( "<p>If you enable this option, you will see " TQWhatsThis::add( previewToggleMouseOverButton, i18n( "<p>If you enable this option, you will see "

2
digikam/libs/widgets/metadata/metadatawidget.cpp
Unescape View File

@ -373,7 +373,7 @@ void MetadataWidget::slotPrintMetadata()
KURL MetadataWidget::saveMetadataToFile(const TQString& caption, const TQString& fileFilter) KURL MetadataWidget::saveMetadataToFile(const TQString& caption, const TQString& fileFilter)
{ {
KFileDialog fileSaveDialog(KGlobalSettings::documentPath(), KFileDialog fileSaveDialog(TDEGlobalSettings::documentPath(),
TQString(), TQString(),
this, this,
"MetadataFileSaveDialog", "MetadataFileSaveDialog",

4
digikam/libs/widgets/metadata/worldmapwidget.cpp
Unescape View File

@ -102,8 +102,8 @@ TQPixmap &WorldMapWidget::worldMapPixmap()
{ {
if (!d->worldMap) if (!d->worldMap)
{ {
KGlobal::dirs()->addResourceType("worldmap", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("worldmap", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg"); TQString directory = TDEGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg");
pixmapDeleter.setObject(d->worldMap, new TQPixmap(directory + "worldmap.jpg")); pixmapDeleter.setObject(d->worldMap, new TQPixmap(directory + "worldmap.jpg"));
} }
return *d->worldMap; return *d->worldMap;

4
digikam/showfoto/main.cpp
Unescape View File

@ -85,8 +85,8 @@ int main(int argc, char *argv[])
app.setMainWidget(w); app.setMainWidget(w);
w->show(); w->show();
KGlobal::locale()->setMainCatalogue("digikam"); TDEGlobal::locale()->setMainCatalogue("digikam");
KGlobal::locale()->insertCatalogue("libkdcraw"); TDEGlobal::locale()->insertCatalogue("libkdcraw");
int ret = app.exec(); int ret = app.exec();

8
digikam/showfoto/showfoto.cpp
Unescape View File

@ -164,8 +164,8 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
KConfig* config = kapp->config(); KConfig* config = kapp->config();
config->setGroup("ImageViewer Settings"); config->setGroup("ImageViewer Settings");
KGlobal::dirs()->addResourceType("data", KGlobal::dirs()->kde_default("data") + "digikam"); TDEGlobal::dirs()->addResourceType("data", TDEGlobal::dirs()->kde_default("data") + "digikam");
KGlobal::iconLoader()->addAppDir("digikam"); TDEGlobal::iconLoader()->addAppDir("digikam");
if(config->readBoolEntry("ShowSplash", true) && !kapp->isRestored()) if(config->readBoolEntry("ShowSplash", true) && !kapp->isRestored())
{ {
@ -516,7 +516,7 @@ void ShowFoto::readSettings()
slotToggleShowBar(); slotToggleShowBar();
d->lastOpenedDirectory.setPath( config->readEntry("Last Opened Directory", d->lastOpenedDirectory.setPath( config->readEntry("Last Opened Directory",
KGlobalSettings::documentPath()) ); TDEGlobalSettings::documentPath()) );
TQSizePolicy szPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); TQSizePolicy szPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter) if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter)
@ -1124,7 +1124,7 @@ void ShowFoto::slotDeleteCurrentItem()
if (!KProtocolInfo::isKnownProtocol(dest)) if (!KProtocolInfo::isKnownProtocol(dest))
{ {
dest = KGlobalSettings::trashPath(); dest = TDEGlobalSettings::trashPath();
} }
KIO::Job* job = KIO::move( urlCurrent, dest ); KIO::Job* job = KIO::move( urlCurrent, dest );

2
digikam/themedesigner/main.cpp
Unescape View File

@ -63,7 +63,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KGlobal::locale()->setMainCatalogue( "digikam" ); TDEGlobal::locale()->setMainCatalogue( "digikam" );
TDEApplication app; TDEApplication app;
Digikam::MainWindow *im = new Digikam::MainWindow(); Digikam::MainWindow *im = new Digikam::MainWindow();

2
digikam/themedesigner/themediconitem.cpp
Unescape View File

@ -49,7 +49,7 @@ namespace Digikam
static void dateToString(const TQDateTime& datetime, TQString& str) 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) static TQString squeezedText(TQPainter* p, int width, const TQString& text)

4
digikam/utilities/cameragui/cameraui.cpp
Unescape View File

@ -372,8 +372,8 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
pixmapLogo->setScaledContents( false ); pixmapLogo->setScaledContents( false );
pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum)); pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("logo-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) ); pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) );
pixmapLogo->setFocusPolicy(TQ_NoFocus); pixmapLogo->setFocusPolicy(TQ_NoFocus);

2
digikam/utilities/imageeditor/canvas/undocache.cpp
Unescape View File

@ -66,7 +66,7 @@ UndoCache::UndoCache()
TQString cacheDir; TQString cacheDir;
cacheDir = locateLocal("cache", cacheDir = locateLocal("cache",
KGlobal::instance()->aboutData()->programName() + '/'); TDEGlobal::instance()->aboutData()->programName() + '/');
d->cachePrefix = TQString("%1undocache-%2") d->cachePrefix = TQString("%1undocache-%2")
.arg(cacheDir) .arg(cacheDir)

2
digikam/utilities/imageeditor/editor/editortoolsettings.cpp
Unescape View File

@ -254,7 +254,7 @@ TQSize EditorToolSettings::minimumSizeHint() const
// Do not touch vertical size hint. // Do not touch vertical size hint.
// Limit to 40% of the desktop width. // Limit to 40% of the desktop width.
TQSize hint = TQScrollView::minimumSizeHint(); 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)); hint.setWidth(TQMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5));
return hint; return hint;
} }

6
digikam/utilities/imageeditor/editor/editorwindow.cpp
Unescape View File

@ -699,7 +699,7 @@ void EditorWindow::slotAboutToShowRedoMenu()
void EditorWindow::slotConfToolbars() void EditorWindow::slotConfToolbars()
{ {
saveMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); saveMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings");
KEditToolbar dlg(factory(), this); KEditToolbar dlg(factory(), this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
@ -710,7 +710,7 @@ void EditorWindow::slotConfToolbars()
void EditorWindow::slotNewToolbarConfig() void EditorWindow::slotNewToolbarConfig()
{ {
applyMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); applyMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings");
} }
void EditorWindow::slotIncreaseZoom() void EditorWindow::slotIncreaseZoom()
@ -757,7 +757,7 @@ void EditorWindow::slotZoomSelected()
void EditorWindow::slotZoomTextChanged(const TQString &txt) void EditorWindow::slotZoomTextChanged(const TQString &txt)
{ {
bool r = false; 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) if (r && zoom > 0.0)
m_stackView->setZoomFactor(zoom); m_stackView->setZoomFactor(zoom);
} }

8
digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
Unescape View File

@ -197,16 +197,16 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *linHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) );
d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png");
linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) );
linHistoButton->setToggleButton(true); linHistoButton->setToggleButton(true);
TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG );
TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) );
d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram);
KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png");
logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) );
logHistoButton->setToggleButton(true); logHistoButton->setToggleButton(true);

2
digikam/utilities/imageeditor/tools/imageprint.cpp
Unescape View File

@ -149,7 +149,7 @@ bool ImagePrint::printImageWithTQt()
p.begin( &m_printer ); p.begin( &m_printer );
TQPaintDeviceMetrics metrics( &m_printer ); TQPaintDeviceMetrics metrics( &m_printer );
p.setFont( KGlobalSettings::generalFont() ); p.setFont( TDEGlobalSettings::generalFont() );
TQFontMetrics fm = p.fontMetrics(); TQFontMetrics fm = p.fontMetrics();
int w, h; // will be set to the width and height of the printer int w, h; // will be set to the width and height of the printer

8
digikam/utilities/imageeditor/tools/imageresize.cpp
Unescape View File

@ -212,9 +212,9 @@ ImageResize::ImageResize(TQWidget* parent)
d->cimgLogoLabel = new KURLLabel(firstPage); d->cimgLogoLabel = new KURLLabel(firstPage);
d->cimgLogoLabel->setText(TQString()); d->cimgLogoLabel->setText(TQString());
d->cimgLogoLabel->setURL("http://cimg.sourceforge.net"); 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"); "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" ) ); d->cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) );
TQToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website")); TQToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website"));
@ -603,7 +603,7 @@ void ImageResize::customEvent(TQCustomEvent *event)
void ImageResize::slotUser3() void ImageResize::slotUser3()
{ {
KURL loadBlowupFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), KURL loadBlowupFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Resizing Settings File to Load")) ); TQString( i18n("Photograph Resizing Settings File to Load")) );
if( loadBlowupFile.isEmpty() ) if( loadBlowupFile.isEmpty() )
@ -630,7 +630,7 @@ void ImageResize::slotUser3()
void ImageResize::slotUser2() void ImageResize::slotUser2()
{ {
KURL saveBlowupFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), KURL saveBlowupFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
TQString( "*" ), this, TQString( "*" ), this,
TQString( i18n("Photograph Resizing Settings File to Save")) ); TQString( i18n("Photograph Resizing Settings File to Save")) );
if( saveBlowupFile.isEmpty() ) if( saveBlowupFile.isEmpty() )

8
digikam/utilities/lighttable/lighttablebar.cpp
Unescape View File

@ -100,9 +100,9 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate)
// -- Load rating Pixmap ------------------------------------------ // -- 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"); + "digikam/data");
TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
ratingPixPath += "/rating.png"; ratingPixPath += "/rating.png";
d->ratingPixmap = TQPixmap(ratingPixPath); d->ratingPixmap = TQPixmap(ratingPixPath);
@ -766,9 +766,9 @@ void LightTableBar::contentsDropEvent(TQDropEvent *e)
void LightTableBar::slotThemeChanged() 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"); + "digikam/data");
TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
ratingPixPath += "/rating.png"; ratingPixPath += "/rating.png";
d->ratingPixmap = TQPixmap(ratingPixPath); d->ratingPixmap = TQPixmap(ratingPixPath);

4
digikam/utilities/lighttable/lighttablewindow.cpp
Unescape View File

@ -1508,7 +1508,7 @@ void LightTableWindow::slotEditKeys()
void LightTableWindow::slotConfToolbars() void LightTableWindow::slotConfToolbars()
{ {
saveMainWindowSettings(KGlobal::config(), "LightTable Settings"); saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings");
KEditToolbar dlg(factory(), this); KEditToolbar dlg(factory(), this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
@ -1519,7 +1519,7 @@ void LightTableWindow::slotConfToolbars()
void LightTableWindow::slotNewToolbarConfig() void LightTableWindow::slotNewToolbarConfig()
{ {
applyMainWindowSettings(KGlobal::config(), "LightTable Settings"); applyMainWindowSettings(TDEGlobal::config(), "LightTable Settings");
} }
void LightTableWindow::slotSetup() void LightTableWindow::slotSetup()

4
digikam/utilities/setup/setupcamera.cpp
Unescape View File

@ -116,8 +116,8 @@ SetupCamera::SetupCamera( TQWidget* parent )
KURLLabel *gphotoLogoLabel = new KURLLabel(this); KURLLabel *gphotoLogoLabel = new KURLLabel(this);
gphotoLogoLabel->setText(TQString()); gphotoLogoLabel->setText(TQString());
gphotoLogoLabel->setURL("http://www.gphoto.org"); gphotoLogoLabel->setURL("http://www.gphoto.org");
KGlobal::dirs()->addResourceType("logo-gphoto", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("logo-gphoto", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png");
gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) ); gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) );
TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website")); TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website"));

8
digikam/utilities/setup/setupicc.cpp
Unescape View File

@ -165,8 +165,8 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
KURLLabel *lcmsLogoLabel = new KURLLabel(colorPolicy); KURLLabel *lcmsLogoLabel = new KURLLabel(colorPolicy);
lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setText(TQString());
lcmsLogoLabel->setURL("http://www.littlecms.com"); lcmsLogoLabel->setURL("http://www.littlecms.com");
KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png");
lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) ); lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) );
TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); 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. // Look the ICC color-space profile path include with digiKam dist.
KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles"); TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "digikam/profiles");
TQString digiKamProfilesPath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); TQString digiKamProfilesPath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
TQDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", TQDir::Files); TQDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", TQDir::Files);
const TQFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList(); const TQFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList();
DDebug() << "Scanning ICC profiles included with digiKam: " << digiKamProfilesPath << endl; DDebug() << "Scanning ICC profiles included with digiKam: " << digiKamProfilesPath << endl;

4
digikam/utilities/setup/setupmetadata.cpp
Unescape View File

@ -148,8 +148,8 @@ SetupMetadata::SetupMetadata(TQWidget* parent )
KURLLabel *exiv2LogoLabel = new KURLLabel(hbox); KURLLabel *exiv2LogoLabel = new KURLLabel(hbox);
exiv2LogoLabel->setText(TQString()); exiv2LogoLabel->setText(TQString());
exiv2LogoLabel->setURL("http://www.exiv2.org"); exiv2LogoLabel->setURL("http://www.exiv2.org");
KGlobal::dirs()->addResourceType("logo-exiv2", KGlobal::dirs()->kde_default("data") + "digikam/data"); TDEGlobal::dirs()->addResourceType("logo-exiv2", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png"); TQString directory = TDEGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png");
exiv2LogoLabel->setPixmap( TQPixmap( directory + "logo-exiv2.png" ) ); exiv2LogoLabel->setPixmap( TQPixmap( directory + "logo-exiv2.png" ) );
TQToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website")); TQToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website"));

4
digikam/utilities/slideshow/slideshow.cpp
Unescape View File

@ -104,7 +104,7 @@ SlideShow::SlideShow(const SlideShowSettings& settings)
// --------------------------------------------------------------- // ---------------------------------------------------------------
#if KDE_IS_VERSION(3,2,0) #if KDE_IS_VERSION(3,2,0)
TQRect deskRect = KGlobalSettings::desktopGeometry(this); TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
d->deskX = deskRect.x(); d->deskX = deskRect.x();
d->deskY = deskRect.y(); d->deskY = deskRect.y();
d->deskWidth = deskRect.width(); d->deskWidth = deskRect.width();
@ -407,7 +407,7 @@ void SlideShow::updatePixmap()
{ {
if (photoInfo.dateTime.isValid()) if (photoInfo.dateTime.isValid())
{ {
str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true);
printInfoText(p, offset, str); printInfoText(p, offset, str);
} }
} }

Write Preview
Loading…
Cancel
Save