Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent ba7aa20da1
commit bf9d53bc58

@ -502,7 +502,7 @@ void AlbumDB::deleteAlbum(int albumID)
.tqarg(albumID) );
}
int AlbumDB::addTag(int tqparentTagID, const TQString& name, const TQString& iconKDE,
int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconKDE,
TQ_LLONG iconID)
{
if (!d->dataBase)
@ -510,7 +510,7 @@ int AlbumDB::addTag(int tqparentTagID, const TQString& name, const TQString& ico
if (!execSql( TQString("INSERT INTO Tags (pid, name) "
"VALUES( %1, '%2')")
.tqarg(tqparentTagID)
.tqarg(parentTagID)
.tqarg(escapeString(name))))
{
return -1;
@ -1122,27 +1122,27 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
// hierarchies. We must check them all until we find the correct hierarchy
if ((*tag).name == tagName)
{
int tqparentID = (*tag).pid;
int parentID = (*tag).pid;
// Check hierarchy, from bottom to top
bool foundParentTag = true;
TQStringList::iterator tqparentTagName = tagHierarchy.end();
TQStringList::iterator parentTagName = tagHierarchy.end();
while (foundParentTag && tqparentTagName != tagHierarchy.begin())
while (foundParentTag && parentTagName != tagHierarchy.begin())
{
--tqparentTagName;
--parentTagName;
foundParentTag = false;
for (TagInfo::List::iterator tqparentTag = currentTagsList.begin();
tqparentTag != currentTagsList.end(); ++tqparentTag )
for (TagInfo::List::iterator parentTag = currentTagsList.begin();
parentTag != currentTagsList.end(); ++parentTag )
{
// check if name is the same, and if ID is identical
// to the tqparent ID we got from the child tag
if ( (*tqparentTag).id == tqparentID &&
(*tqparentTag).name == (*tqparentTagName) )
if ( (*parentTag).id == parentID &&
(*parentTag).name == (*parentTagName) )
{
tqparentID = (*tqparentTag).pid;
parentID = (*parentTag).pid;
foundParentTag = true;
break;
}
@ -1181,9 +1181,9 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
if (tagHierarchy.isEmpty())
continue;
int tqparentTagID = 0;
int parentTagID = 0;
int tagID = 0;
bool tqparentTagExisted = true;
bool parentTagExisted = true;
// Traverse hierarchy from top to bottom
for (TQStringList::iterator tagName = tagHierarchy.begin();
@ -1192,7 +1192,7 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
tagID = 0;
// if the tqparent tag did not exist, we need not check if the child exists
if (tqparentTagExisted)
if (parentTagExisted)
{
for (TagInfo::List::iterator tag = currentTagsList.begin();
tag != currentTagsList.end(); ++tag )
@ -1200,7 +1200,7 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
// find the tag with tag name according to tagHierarchy,
// and tqparent ID identical to the ID of the tag we found in
// the previous run.
if ((*tag).name == (*tagName) && (*tag).pid == tqparentTagID)
if ((*tag).name == (*tagName) && (*tag).pid == parentTagID)
{
tagID = (*tag).id;
break;
@ -1211,12 +1211,12 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
if (tagID != 0)
{
// tag already found in DB
tqparentTagID = tagID;
parentTagID = tagID;
continue;
}
// Tag does not yet exist in DB, add it
tagID = addTag(tqparentTagID, (*tagName), TQString(), 0);
tagID = addTag(parentTagID, (*tagName), TQString(), 0);
if (tagID == -1)
{
@ -1227,12 +1227,12 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
// append to our list of existing tags (for following keywords)
TagInfo info;
info.id = tagID;
info.pid = tqparentTagID;
info.pid = parentTagID;
info.name = (*tagName);
currentTagsList.append(info);
tqparentTagID = tagID;
tqparentTagExisted = false;
parentTagID = tagID;
parentTagExisted = false;
}
// add to result list

@ -163,7 +163,7 @@ public:
/**
* Adds a new tag to the database with given name, icon and tqparent id.
* @param tqparentTagID the id of the tag which will become the new tags tqparent
* @param parentTagID the id of the tag which will become the new tags tqparent
* @param name the name of the tag
* @param iconKDE the name of the icon file (this is filename which kde
* iconloader can load up)
@ -171,7 +171,7 @@ public:
* Note: if the iconKDE parameter is empty, then the iconID parameter is used
* @return the id of the tag added or -1 if it failed
*/
int addTag(int tqparentTagID, const TQString& name,
int addTag(int parentTagID, const TQString& name,
const TQString& iconKDE, TQ_LLONG iconID);
/**
@ -203,7 +203,7 @@ public:
* Set the tqparent tagid for the tag. This is equivalent to reparenting
* the tag
* @param tagID the id of the tag
* @param newParentTagID the new tqparentid for the tag
* @param newParentTagID the new parentid for the tag
*/
void setTagParentID(int tagID, int newParentTagID);

@ -343,7 +343,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter)
bool doesExpand = false;
if (!match)
{
// check if any of the tqparents match the search
// check if any of the parents match the search
Album* tqparent = palbum->tqparent();
while (tqparent && !tqparent->isRoot())
{
@ -1216,7 +1216,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
ImageInfo* item;
for (ImageInfoListIterator it(extImgInfList); (item = it.current()) ; ++it)
{
AlbumLister::instance()->tqinvalidateItem(item);
AlbumLister::instance()->invalidateItem(item);
}
break;
}

@ -990,8 +990,8 @@ void AlbumIconView::slotRename(AlbumIconItem* item)
// The AlbumManager KDirWatch will trigger a DIO::scan.
// When this is completed, DIO will call AlbumLister::instance()->refresh().
// Usually the AlbumLister will ignore changes to already listed items.
// So the renamed item need explicitly be tqinvalidated.
d->imageLister->tqinvalidateItem(&renameInfo);
// So the renamed item need explicitly be invalidated.
d->imageLister->invalidateItem(&renameInfo);
}
void AlbumIconView::slotRenamed(KIO::Job*, const KURL &, const KURL&newURL)

@ -96,7 +96,7 @@ public:
TQString textFilter;
TQMap<TQ_LLONG, ImageInfo*> itemMap;
TQMap<int, int> tqinvalidatedItems;
TQMap<int, int> invalidatedItems;
TQMap<TQDateTime, bool> dayFilter;
TQValueList<int> tagFilter;
@ -479,9 +479,9 @@ void AlbumLister::setNamesFilter(const TQString& namesFilter)
d->namesFilter = namesFilter;
}
void AlbumLister::tqinvalidateItem(const ImageInfo *item)
void AlbumLister::invalidateItem(const ImageInfo *item)
{
d->tqinvalidatedItems.insert(item->id(), item->id());
d->invalidatedItems.insert(item->id(), item->id());
}
void AlbumLister::slotFilterItems()
@ -548,7 +548,7 @@ void AlbumLister::slotResult(KIO::Job* job)
{
DWarning() << "Failed to list url: " << job->errorString() << endl;
d->itemMap.clear();
d->tqinvalidatedItems.clear();
d->invalidatedItems.clear();
return;
}
@ -563,7 +563,7 @@ void AlbumLister::slotResult(KIO::Job* job)
}
d->itemMap.clear();
d->tqinvalidatedItems.clear();
d->invalidatedItems.clear();
emit signalCompleted();
}
@ -601,7 +601,7 @@ void AlbumLister::slotData(KIO::Job*, const TQByteArray& data)
ImageInfo* info = d->itemMap[imageID];
d->itemMap.remove(imageID);
if (d->tqinvalidatedItems.tqcontains(imageID))
if (d->invalidatedItems.tqcontains(imageID))
{
emit signalDeleteItem(info);
emit signalDeleteFilteredItem(info);

@ -120,7 +120,7 @@ public:
* Trigger a recreation of the given ImageInfo object
* for the next refresh.
*/
void tqinvalidateItem(const ImageInfo *item);
void invalidateItem(const ImageInfo *item);
bool tagFiltersIsActive();

@ -82,7 +82,7 @@ DigikamImageInfo::~DigikamImageInfo()
{
}
PAlbum* DigikamImageInfo::tqparentAlbum()
PAlbum* DigikamImageInfo::parentAlbum()
{
if (!palbum_)
{
@ -99,7 +99,7 @@ TQString DigikamImageInfo::title()
TQString DigikamImageInfo::description()
{
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if (p)
{
@ -114,7 +114,7 @@ void DigikamImageInfo::setTitle( const TQString& newName )
{
// Here we get informed that a plugin has renamed the file
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if ( p && !newName.isEmpty() )
{
@ -127,7 +127,7 @@ void DigikamImageInfo::setTitle( const TQString& newName )
void DigikamImageInfo::setDescription( const TQString& description )
{
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if ( p )
{
@ -143,7 +143,7 @@ void DigikamImageInfo::setDescription( const TQString& description )
TQDateTime DigikamImageInfo::time( KIPI::TimeSpec /*spec*/ )
{
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if (p)
{
@ -162,7 +162,7 @@ void DigikamImageInfo::setTime(const TQDateTime& time, KIPI::TimeSpec)
return;
}
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if ( p )
{
@ -185,7 +185,7 @@ TQMap<TQString, TQVariant> DigikamImageInfo::attributes()
{
TQMap<TQString, TQVariant> res;
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if (p)
{
AlbumDB* db = AlbumManager::instance()->albumDB();
@ -206,7 +206,7 @@ TQMap<TQString, TQVariant> DigikamImageInfo::attributes()
void DigikamImageInfo::addAttributes(const TQMap<TQString, TQVariant>& res)
{
PAlbum* p = tqparentAlbum();
PAlbum* p = parentAlbum();
if (p)
{
AlbumDB* db = AlbumManager::instance()->albumDB();

@ -97,7 +97,7 @@ public:
private:
PAlbum *tqparentAlbum();
PAlbum *parentAlbum();
private:

@ -377,7 +377,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter)
bool doesExpand = false;
if (!match)
{
// check if any of the tqparents match the search
// check if any of the parents match the search
Album* tqparent = talbum->tqparent();
while (tqparent && !tqparent->isRoot())
{

@ -267,7 +267,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter)
bool doesExpand = false;
if (!match)
{
// check if any of the tqparents match the search
// check if any of the parents match the search
Album* tqparent = talbum->tqparent();
while (tqparent && !tqparent->isRoot())
{

@ -230,7 +230,7 @@ void TagsPopupMenu::slotAboutToShow()
if (d->assignedTags.isEmpty())
return;
// also add the tqparents of the assigned tags
// also add the parents of the assigned tags
IntList tList;
for (IntList::iterator it = d->assignedTags.begin();
it != d->assignedTags.end(); ++it)

@ -85,9 +85,9 @@ AntiVignettingTool::AntiVignettingTool(TQObject* tqparent)
EditorToolSettings::Cancel);
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 14, 2);
m_tqmaskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
"tqmask applied to the image.") );
// -------------------------------------------------------------
@ -154,7 +154,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* tqparent)
m_gammaInput->setDefaultValue(1.0);
TQWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma re-adjustment of the target image."));
grid->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 2);
grid->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2);
grid->addMultiCellWidget(label1, 1, 1, 0, 2);
grid->addMultiCellWidget(m_densityInput, 2, 2, 0, 2);
grid->addMultiCellWidget(label2, 3, 3, 0, 2);
@ -300,13 +300,13 @@ void AntiVignettingTool::prepareEffect()
// Calc tqmask preview.
DImg preview(ps.width(), ps.height(), false);
memset(preview.bits(), 255, preview.numBytes());
AntiVignetting tqmaskPreview(&preview, 0L, d, p, r, 0, 0, false);
TQPixmap pix = tqmaskPreview.getTargetImage().convertToPixmap();
AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false);
TQPixmap pix = maskPreview.getTargetImage().convertToPixmap();
TQPainter pt(&pix);
pt.setPen( TQPen(TQt::black, 1) );
pt.drawRect( 0, 0, pix.width(), pix.height() );
pt.end();
m_tqmaskPreviewLabel->setPixmap( pix );
m_maskPreviewLabel->setPixmap( pix );
DImg orgImage(orgWidth, orgHeight, iface->originalSixteenBit(),
iface->originalHasAlpha(), data);

@ -72,7 +72,7 @@ private:
private:
TQLabel *m_tqmaskPreviewLabel;
TQLabel *m_maskPreviewLabel;
KDcrawIface::RIntNumInput *m_brightnessInput;
KDcrawIface::RIntNumInput *m_contrastInput;

@ -88,11 +88,11 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent)
TQWidget *gboxSettings = new TQWidget(plainPage());
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 13, 2, spacingHint());
m_tqmaskPreviewLabel = new TQLabel( gboxSettings );
m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
m_maskPreviewLabel = new TQLabel( gboxSettings );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
"tqmask applied to the image.") );
gridSettings->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 2);
gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2);
// -------------------------------------------------------------
@ -298,13 +298,13 @@ void ImageEffect_AntiVignetting::prepareEffect()
// Calc tqmask preview.
Digikam::DImg preview(ps.width(), ps.height(), false);
memset(preview.bits(), 255, preview.numBytes());
AntiVignetting tqmaskPreview(&preview, 0L, d, p, r, 0, 0, false);
TQPixmap pix = tqmaskPreview.getTargetImage().convertToPixmap();
AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false);
TQPixmap pix = maskPreview.getTargetImage().convertToPixmap();
TQPainter pt(&pix);
pt.setPen( TQPen(TQt::black, 1) );
pt.drawRect( 0, 0, pix.width(), pix.height() );
pt.end();
m_tqmaskPreviewLabel->setPixmap( pix );
m_maskPreviewLabel->setPixmap( pix );
Digikam::DImg orgImage(orgWidth, orgHeight, iface->originalSixteenBit(),
iface->originalHasAlpha(), data);

@ -63,7 +63,7 @@ private:
private:
TQLabel *m_tqmaskPreviewLabel;
TQLabel *m_maskPreviewLabel;
KIntNumInput *m_brightnessInput;
KIntNumInput *m_contrastInput;

@ -79,7 +79,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
int Noise, Shade, nRand, component, progress;
uchar *ptr;
Digikam::DColor blendData, grainData, tqmaskData, outData;
Digikam::DColor blendData, grainData, maskData, outData;
if (sixteenBit)
Noise = (Sensibility / 10 + 1) * 256 - 1;
@ -175,14 +175,14 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
// read color from orig image
blendData.setColor(data + offset, sixteenBit);
// read color from tqmask
tqmaskData.setColor(pMaskBits + offset, sixteenBit);
maskData.setColor(pMaskBits + offset, sixteenBit);
// set shade as alpha value - it will be used as source alpha when blending
tqmaskData.setAlpha(Shade);
maskData.setAlpha(Shade);
// compose, write result to blendData.
// Preserve alpha, do not blend it (taken from old algorithm - correct?)
alpha = blendData.alpha();
composer->compose(blendData, tqmaskData);
composer->compose(blendData, maskData);
blendData.setAlpha(alpha);
// write to destination

@ -114,7 +114,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
uchar* pOverlayBits = 0; // Overlay to merge with original converted in gray scale.
uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original.
Digikam::DColor bwData, bwBlurData, grainData, tqmaskData, overData, outData;
Digikam::DColor bwData, bwBlurData, grainData, maskData, overData, outData;
//------------------------------------------
// 1 - Create GrayScale green boosted image.
@ -281,14 +281,14 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
// read color from orig image
bwBlurData.setColor(pBWBlurBits + offset, sixteenBit);
// read color from tqmask
tqmaskData.setColor(pMaskBits + offset, sixteenBit);
maskData.setColor(pMaskBits + offset, sixteenBit);
// set shade as alpha value - it will be used as source alpha when blending
tqmaskData.setAlpha(Shade);
maskData.setAlpha(Shade);
// compose, write result to blendData.
// Preserve alpha, do not blend it (taken from old algorithm - correct?)
alpha = bwBlurData.alpha();
composer->compose(bwBlurData, tqmaskData);
composer->compose(bwBlurData, maskData);
bwBlurData.setAlpha(alpha);
// write to destination

@ -348,18 +348,18 @@ void ImageEffect_InPainting_Dialog::prepareEffect()
int y1 = (int)(selectionRect.top() - 2*settings.amplitude);
int x2 = (int)(selectionRect.right() + 2*settings.amplitude);
int y2 = (int)(selectionRect.bottom() + 2*settings.amplitude);
m_tqmaskRect = TQRect(x1, y1, x2-x1, y2-y1);
m_maskRect = TQRect(x1, y1, x2-x1, y2-y1);
// Mask area normalization.
// We need to check if tqmask area is out of image size else inpainting give strange results.
if (m_tqmaskRect.left() < 0) m_tqmaskRect.setLeft(0);
if (m_tqmaskRect.top() < 0) m_tqmaskRect.setTop(0);
if (m_tqmaskRect.right() > iface.originalWidth()) m_tqmaskRect.setRight(iface.originalWidth());
if (m_tqmaskRect.bottom() > iface.originalHeight()) m_tqmaskRect.setBottom(iface.originalHeight());
if (m_maskRect.left() < 0) m_maskRect.setLeft(0);
if (m_maskRect.top() < 0) m_maskRect.setTop(0);
if (m_maskRect.right() > iface.originalWidth()) m_maskRect.setRight(iface.originalWidth());
if (m_maskRect.bottom() > iface.originalHeight()) m_maskRect.setBottom(iface.originalHeight());
m_tqmaskImage = inPaintingMask.convertToImage().copy(m_tqmaskRect);
m_cropImage = m_originalImage.copy(m_tqmaskRect);
m_maskImage = inPaintingMask.convertToImage().copy(m_maskRect);
m_cropImage = m_originalImage.copy(m_maskRect);
m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>(
new Digikam::GreycstorationIface(
@ -367,7 +367,7 @@ void ImageEffect_InPainting_Dialog::prepareEffect()
settings,
Digikam::GreycstorationIface::InPainting,
0, 0,
m_tqmaskImage, this));
m_maskImage, this));
}
void ImageEffect_InPainting_Dialog::prepareFinal()
@ -408,7 +408,7 @@ void ImageEffect_InPainting_Dialog::putFinalData(void)
if (!m_isComputed)
m_cropImage = m_threadedFilter->getTargetImage();
m_originalImage.bitBltImage(&m_cropImage, m_tqmaskRect.left(), m_tqmaskRect.top());
m_originalImage.bitBltImage(&m_cropImage, m_maskRect.left(), m_maskRect.top());
iface.putOriginalImage(i18n("InPainting"), m_originalImage.bits());
}

@ -97,9 +97,9 @@ private:
bool m_isComputed;
TQRect m_tqmaskRect;
TQRect m_maskRect;
TQImage m_tqmaskImage;
TQImage m_maskImage;
TQComboBox *m_inpaintingTypeCB;

@ -312,18 +312,18 @@ void InPaintingTool::prepareEffect()
int y1 = (int)(selectionRect.top() - 2*settings.amplitude);
int x2 = (int)(selectionRect.right() + 2*settings.amplitude);
int y2 = (int)(selectionRect.bottom() + 2*settings.amplitude);
m_tqmaskRect = TQRect(x1, y1, x2-x1, y2-y1);
m_maskRect = TQRect(x1, y1, x2-x1, y2-y1);
// Mask area normalization.
// We need to check if tqmask area is out of image size else inpainting give strange results.
if (m_tqmaskRect.left() < 0) m_tqmaskRect.setLeft(0);
if (m_tqmaskRect.top() < 0) m_tqmaskRect.setTop(0);
if (m_tqmaskRect.right() > iface.originalWidth()) m_tqmaskRect.setRight(iface.originalWidth());
if (m_tqmaskRect.bottom() > iface.originalHeight()) m_tqmaskRect.setBottom(iface.originalHeight());
if (m_maskRect.left() < 0) m_maskRect.setLeft(0);
if (m_maskRect.top() < 0) m_maskRect.setTop(0);
if (m_maskRect.right() > iface.originalWidth()) m_maskRect.setRight(iface.originalWidth());
if (m_maskRect.bottom() > iface.originalHeight()) m_maskRect.setBottom(iface.originalHeight());
m_tqmaskImage = inPaintingMask.convertToImage().copy(m_tqmaskRect);
m_cropImage = m_originalImage.copy(m_tqmaskRect);
m_maskImage = inPaintingMask.convertToImage().copy(m_maskRect);
m_cropImage = m_originalImage.copy(m_maskRect);
setFilter(dynamic_cast<DImgThreadedFilter*>(
new GreycstorationIface(
@ -331,7 +331,7 @@ void InPaintingTool::prepareEffect()
settings,
GreycstorationIface::InPainting,
0, 0,
m_tqmaskImage, this)));
m_maskImage, this)));
}
void InPaintingTool::prepareFinal()
@ -373,7 +373,7 @@ void InPaintingTool::putFinalData()
if (!m_isComputed)
m_cropImage = filter()->getTargetImage();
m_originalImage.bitBltImage(&m_cropImage, m_tqmaskRect.left(), m_tqmaskRect.top());
m_originalImage.bitBltImage(&m_cropImage, m_maskRect.left(), m_maskRect.top());
iface.putOriginalImage(i18n("InPainting"), m_originalImage.bits());
}

@ -110,9 +110,9 @@ private:
bool m_isComputed;
TQRect m_tqmaskRect;
TQRect m_maskRect;
TQImage m_tqmaskImage;
TQImage m_maskImage;
TQComboBox *m_inpaintingTypeCB;

@ -726,11 +726,11 @@ void FontChooserWidget::showXLFDArea(bool show)
{
if( show )
{
xlfdEdit->tqparentWidget()->show();
xlfdEdit->parentWidget()->show();
}
else
{
xlfdEdit->tqparentWidget()->hide();
xlfdEdit->parentWidget()->hide();
}
}

@ -95,11 +95,11 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* tqparent)
TQWidget *gboxSettings = new TQWidget(plainPage());
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 8, 1, spacingHint());
m_tqmaskPreviewLabel = new TQLabel( gboxSettings );
m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
m_maskPreviewLabel = new TQLabel( gboxSettings );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
"applied to a cross pattern.") );
gridSettings->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 1);
gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1);
// -------------------------------------------------------------
@ -260,7 +260,7 @@ void ImageEffect_LensDistortion::prepareEffect()
double b = m_brightenInput->value();
LensDistortion transformPreview(&m_previewRasterImage, 0L, m, e, r, b, 0, 0);
m_tqmaskPreviewLabel->setPixmap(TQPixmap::TQPixmap(transformPreview.getTargetImage().convertToPixmap()));
m_maskPreviewLabel->setPixmap(TQPixmap::TQPixmap(transformPreview.getTargetImage().convertToPixmap()));
Digikam::ImageIface* iface = m_imagePreviewWidget->imageIface();

@ -67,7 +67,7 @@ private:
private:
TQLabel *m_tqmaskPreviewLabel;
TQLabel *m_maskPreviewLabel;
KDoubleNumInput *m_mainInput;
KDoubleNumInput *m_edgeInput;

@ -89,9 +89,9 @@ LensDistortionTool::LensDistortionTool(TQObject* tqparent)
EditorToolSettings::ColorGuide);
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1);
m_tqmaskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
"applied to a cross pattern.") );
// -------------------------------------------------------------
@ -136,7 +136,7 @@ LensDistortionTool::LensDistortionTool(TQObject* tqparent)
m_brightenInput->setDefaultValue(0.0);
TQWhatsThis::add(m_brightenInput, i18n("<p>This value adjusts the brightness in image corners."));
grid->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 1);
grid->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1);
grid->addMultiCellWidget(label1, 1, 1, 0, 1);
grid->addMultiCellWidget(m_mainInput, 2, 2, 0, 1);
grid->addMultiCellWidget(label2, 3, 3, 0, 1);
@ -274,7 +274,7 @@ void LensDistortionTool::prepareEffect()
double b = m_brightenInput->value();
LensDistortion transformPreview(&m_previewRasterImage, 0L, m, e, r, b, 0, 0);
m_tqmaskPreviewLabel->setPixmap(TQPixmap(transformPreview.getTargetImage().convertToPixmap()));
m_maskPreviewLabel->setPixmap(TQPixmap(transformPreview.getTargetImage().convertToPixmap()));
ImageIface* iface = m_previewWidget->imageIface();

@ -73,7 +73,7 @@ private:
private:
TQLabel *m_tqmaskPreviewLabel;
TQLabel *m_maskPreviewLabel;
KDcrawIface::RDoubleNumInput *m_mainInput;
KDcrawIface::RDoubleNumInput *m_edgeInput;

@ -116,7 +116,7 @@ void Texture::filterImage(void)
// in the old algorithm, this was
//teData.channel.red = (teData.channel.red * (255 - m_blendGain) +
// transData.channel.red * m_blendGain) >> 8;
// but transdata was uninitialized, its components were aptqparently 0,
// but transdata was uninitialized, its components were apparently 0,
// so I removed the part after the "+".
if (sixteenBit)

@ -596,7 +596,7 @@ void ImageEffect_WhiteBalance::slotChannelChanged(int channel)
void ImageEffect_WhiteBalance::slotAutoAdjustExposure()
{
tqparentWidget()->setCursor( KCursor::waitCursor() );
parentWidget()->setCursor( KCursor::waitCursor() );
Digikam::ImageIface* iface = m_previewWidget->imageIface();
uchar *data = iface->getOriginalImage();
@ -614,7 +614,7 @@ void ImageEffect_WhiteBalance::slotAutoAdjustExposure()
m_mainExposureInput->setValue(exposureLevel);
m_fineExposureInput->setValue(0.0);
tqparentWidget()->unsetCursor();
parentWidget()->unsetCursor();
slotEffect();
}

@ -575,7 +575,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo
{
if (::chmod(_dest.data(), permissions) != 0)
{
// couldn't chmod. Eat the error if the filesystem aptqparently doesn't support it.
// couldn't chmod. Eat the error if the filesystem apparently doesn't support it.
if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) )
warning( i18n( "Could not change permissions for\n%1" ).tqarg( url.url() ) );
}
@ -831,7 +831,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o
{
if (::chmod(_dst.data(), mode) != 0)
{
// Eat the error if the filesystem aptqparently doesn't support chmod.
// Eat the error if the filesystem apparently doesn't support chmod.
if ( KIO::testFileSystemFlag( _dst, KIO::SupportsChmod ) )
warning( i18n( "Could not change permissions for\n%1" ).tqarg( dst.url() ) );
}
@ -1583,27 +1583,27 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
// hierarchies. We must check them all until we find the correct hierarchy
if ((*tag).name == tagName)
{
int tqparentID = (*tag).pid;
int parentID = (*tag).pid;
// Check hierarchy, from bottom to top
bool foundParentTag = true;
TQStringList::iterator tqparentTagName = tagHierarchy.end();
TQStringList::iterator parentTagName = tagHierarchy.end();
while (foundParentTag && tqparentTagName != tagHierarchy.begin())
while (foundParentTag && parentTagName != tagHierarchy.begin())
{
--tqparentTagName;
--parentTagName;
foundParentTag = false;
for (TagInfo::List::iterator tqparentTag = tagsList.begin();
tqparentTag != tagsList.end(); ++tqparentTag )
for (TagInfo::List::iterator parentTag = tagsList.begin();
parentTag != tagsList.end(); ++parentTag )
{
// check if name is the same, and if ID is identical
// to the tqparent ID we got from the child tag
if ( (*tqparentTag).id == tqparentID &&
(*tqparentTag).name == (*tqparentTagName) )
if ( (*parentTag).id == parentID &&
(*parentTag).name == (*parentTagName) )
{
tqparentID = (*tqparentTag).pid;
parentID = (*parentTag).pid;
foundParentTag = true;
break;
}
@ -1645,9 +1645,9 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
if (tagHierarchy.isEmpty())
continue;
int tqparentTagID = 0;
int parentTagID = 0;
int tagID = 0;
bool tqparentTagExisted = true;
bool parentTagExisted = true;
// Traverse hierarchy from top to bottom
for (TQStringList::iterator tagName = tagHierarchy.begin();
@ -1656,7 +1656,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
tagID = 0;
// if the tqparent tag did not exist, we need not check if the child exists
if (tqparentTagExisted)
if (parentTagExisted)
{
for (TagInfo::List::iterator tag = tagsList.begin();
tag != tagsList.end(); ++tag )
@ -1664,7 +1664,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
// find the tag with tag name according to tagHierarchy,
// and tqparent ID identical to the ID of the tag we found in
// the previous run.
if ((*tag).name == (*tagName) && (*tag).pid == tqparentTagID)
if ((*tag).name == (*tagName) && (*tag).pid == parentTagID)
{
tagID = (*tag).id;
break;
@ -1675,7 +1675,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
if (tagID != 0)
{
// tag already found in DB
tqparentTagID = tagID;
parentTagID = tagID;
continue;
}
@ -1683,7 +1683,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
// from AlbumDB::addTag
m_sqlDB.execSql( TQString("INSERT INTO Tags (pid, name, icon) "
"VALUES( %1, '%2', 0)")
.tqarg(tqparentTagID)
.tqarg(parentTagID)
.tqarg(escapeString(*tagName)));
tagID = m_sqlDB.lastInsertedRow();
@ -1696,12 +1696,12 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
// append to our list of existing tags (for following keywords)
TagInfo info;
info.id = tagID;
info.pid = tqparentTagID;
info.pid = parentTagID;
info.name = (*tagName);
tagsList.append(info);
tqparentTagID = tagID;
tqparentTagExisted = false;
parentTagID = tagID;
parentTagExisted = false;
}
// from AlbumDB::addItemTag

@ -45,11 +45,11 @@ DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *tqparent, int radiu
initFilter();
}
DImgGaussianBlur::DImgGaussianBlur(DImgThreadedFilter *tqparentFilter,
DImgGaussianBlur::DImgGaussianBlur(DImgThreadedFilter *parentFilter,
const DImg &orgImage, const DImg &destImage,
int progressBegin, int progressEnd, int radius)
: DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd,
tqparentFilter->filterName() + ": GaussianBlur")
: DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd,
parentFilter->filterName() + ": GaussianBlur")
{
m_radius = radius;
filterImage();

@ -43,7 +43,7 @@ public:
DImgGaussianBlur(DImg *orgImage, TQObject *tqparent=0, int radius=3);
// Constructor for slave mode: execute immediately in current thread with specified master filter
DImgGaussianBlur(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage,
DImgGaussianBlur(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage,
int progressBegin=0, int progressEnd=100, int radius=3);
~DImgGaussianBlur(){};

@ -49,11 +49,11 @@ DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *tqparent, double radius, doub
initFilter();
}
DImgSharpen::DImgSharpen(DImgThreadedFilter *tqparentFilter,
DImgSharpen::DImgSharpen(DImgThreadedFilter *parentFilter,
const DImg &orgImage, const DImg &destImage,
int progressBegin, int progressEnd, double radius, double sigma)
: DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd,
tqparentFilter->filterName() + ": Sharpen")
: DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd,
parentFilter->filterName() + ": Sharpen")
{
m_radius = radius;
m_sigma = sigma;

@ -43,7 +43,7 @@ public:
DImgSharpen(DImg *orgImage, TQObject *tqparent=0, double radius=0.0, double sigma=1.0);
// Constructor for slave mode: execute immediately in current thread with specified master filter
DImgSharpen(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage,
DImgSharpen(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage,
int progressBegin=0, int progressEnd=100, double radius=0.0, double sigma=1.0);
~DImgSharpen(){};

@ -15746,8 +15746,8 @@ namespace cimg_library {
- -1 = Backward finite differences
- 0 = Centered finite differences
- 1 = Forward finite differences
- 2 = Using Sobel tqmasks
- 3 = Using rotation invariant tqmasks
- 2 = Using Sobel masks
- 3 = Using rotation invariant masks
- 4 = Using Deriche recusrsive filter.
**/
CImgList<Tfloat> get_gradient(const char *const axes=0, const int scheme=3) const {
@ -19666,7 +19666,7 @@ namespace cimg_library {
return draw_image(0,sprite,opacity);
}
//! Draw a sprite image in the instance image (tqmasked version).
//! Draw a sprite image in the instance image (masked version).
/**
\param sprite Sprite image.
\param tqmask Mask image.
@ -19674,7 +19674,7 @@ namespace cimg_library {
\param y0 Y-coordinate of the sprite position in the instance image.
\param z0 Z-coordinate of the sprite position in the instance image.
\param v0 V-coordinate of the sprite position in the instance image.
\param tqmask_valmax Maximum pixel value of the tqmask image \c tqmask (optional).
\param mask_valmax Maximum pixel value of the tqmask image \c tqmask (optional).
\param opacity Drawing opacity.
\note
- Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite.
@ -19684,7 +19684,7 @@ namespace cimg_library {
template<typename ti, typename tm>
CImg<T>& draw_image(const int x0, const int y0, const int z0, const int v0,
const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1,
const float tqmask_valmax=1) {
const float mask_valmax=1) {
if (is_empty()) return *this;
if (!sprite)
throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.",
@ -19692,8 +19692,8 @@ namespace cimg_library {
if (!tqmask)
throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,tqmask,opacity,tqmask_valmax);
if (is_overlapped(tqmask)) return draw_image(x0,y0,z0,v0,sprite,+tqmask,opacity,tqmask_valmax);
if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,tqmask,opacity,mask_valmax);
if (is_overlapped(tqmask)) return draw_image(x0,y0,z0,v0,sprite,+tqmask,opacity,mask_valmax);
if (tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth)
throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim);
@ -19720,8 +19720,8 @@ namespace cimg_library {
for (int y = 0; y<lY; ++y) {
for (int x=0; x<lX; ++x) {
const float mopacity = (float)(*(ptrm++)*opacity),
nopacity = cimg::abs(mopacity), copacity = tqmask_valmax - cimg::max(mopacity,0);
*ptrd = (T)((nopacity*(*(ptrs++)) + *ptrd*copacity)/tqmask_valmax);
nopacity = cimg::abs(mopacity), copacity = mask_valmax - cimg::max(mopacity,0);
*ptrd = (T)((nopacity*(*(ptrs++)) + *ptrd*copacity)/mask_valmax);
++ptrd;
}
ptrd+=offX; ptrs+=soffX; ptrm+=soffX;
@ -19738,31 +19738,31 @@ namespace cimg_library {
template<typename ti, typename tm>
CImg<T>& draw_image(const int x0, const int y0, const int z0,
const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1,
const float tqmask_valmax=1) {
return draw_image(x0,y0,z0,0,sprite,tqmask,opacity,tqmask_valmax);
const float mask_valmax=1) {
return draw_image(x0,y0,z0,0,sprite,tqmask,opacity,mask_valmax);
}
//! Draw an image.
template<typename ti, typename tm>
CImg<T>& draw_image(const int x0, const int y0,
const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1,
const float tqmask_valmax=1) {
return draw_image(x0,y0,0,sprite,tqmask,opacity,tqmask_valmax);
const float mask_valmax=1) {
return draw_image(x0,y0,0,sprite,tqmask,opacity,mask_valmax);
}
//! Draw an image.
template<typename ti, typename tm>
CImg<T>& draw_image(const int x0,
const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1,
const float tqmask_valmax=1) {
return draw_image(x0,0,sprite,tqmask,opacity,tqmask_valmax);
const float mask_valmax=1) {
return draw_image(x0,0,sprite,tqmask,opacity,mask_valmax);
}
//! Draw an image.
template<typename ti, typename tm>
CImg<T>& draw_image(const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1,
const float tqmask_valmax=1) {
return draw_image(0,sprite,tqmask,opacity,tqmask_valmax);
const float mask_valmax=1) {
return draw_image(0,sprite,tqmask,opacity,mask_valmax);
}
//! Draw a 4D filled rectangle in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0)-(\c x1,\c y1,\c z1,\c v1).
@ -24656,7 +24656,7 @@ namespace cimg_library {
case 1 : (dest.assign(*this))*=tqmask(0); break;
}
}
} else { // Generic version for other tqmasks
} else { // Generic version for other masks
const int
mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2,
mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2),

@ -402,11 +402,11 @@ static void* greycstoration_thread(void *arg) {
ye = y1<source.height?y1:source.height-1,
ze = z1<source.depth?z1:source.depth-1;
CImg<T> img = source.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true);
CImg<unsigned char> tqmask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true);
CImg<unsigned char> mask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true);
img.greycstoration_params[0] = p;
greycstoration_mutex_unlock(p);
if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx);
else img.blur_anisotropic(tqmask_tile,p.amplitude,p.sharpness,p.anisotropy,
else img.blur_anisotropic(mask_tile,p.amplitude,p.sharpness,p.anisotropy,
p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,p.interpolation,p.fast_approx,p.gfact);
greycstoration_mutex_lock(p);
temporary.draw_image(x,y,z,img.crop(b,b,b,img.width-b,img.height-b,img.depth-b));
@ -421,11 +421,11 @@ static void* greycstoration_thread(void *arg) {
xe = x1<source.width?x1:source.width-1,
ye = y1<source.height?y1:source.height-1;
CImg<T> img = source.get_crop(x-b,y-b,xe+b,ye+b,true);
CImg<unsigned char> tqmask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,xe+b,ye+b,true);
CImg<unsigned char> mask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,xe+b,ye+b,true);
img.greycstoration_params[0] = p;
greycstoration_mutex_unlock(p);
if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx);
else img.blur_anisotropic(tqmask_tile,p.amplitude,p.sharpness,p.anisotropy,
else img.blur_anisotropic(mask_tile,p.amplitude,p.sharpness,p.anisotropy,
p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,p.interpolation,p.fast_approx,p.gfact);
temporary.draw_image(x,y,img.crop(b,b,img.width-b,img.height-b));
greycstoration_mutex_lock(p);

@ -1562,7 +1562,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter)
bool doesExpand = false;
if (!match)
{
// check if any of the tqparents match the search
// check if any of the parents match the search
Album* tqparent = tag->tqparent();
while (tqparent && !tqparent->isRoot())
{

@ -243,7 +243,7 @@ void ThumbBarView::setExifRotate(bool exifRotate)
::unlink(TQFile::encodeName(smallThumbPath));
::unlink(TQFile::encodeName(bigThumbPath));
tqinvalidateThumb(item);
invalidateThumb(item);
}
triggerUpdate();
@ -419,12 +419,12 @@ void ThumbBarView::refreshThumbs(const KURL::List& urls)
ThumbBarItem *item = findItemByURL(*it);
if (item)
{
tqinvalidateThumb(item);
invalidateThumb(item);
}
}
}
void ThumbBarView::tqinvalidateThumb(ThumbBarItem* item)
void ThumbBarView::invalidateThumb(ThumbBarItem* item)
{
if (!item) return;
@ -902,7 +902,7 @@ ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* tqparent)
void ThumbBarToolTip::maybeTip(const TQPoint& pos)
{
if ( !tqparentWidget() || !m_view) return;
if ( !parentWidget() || !m_view) return;
ThumbBarItem* item = m_view->findItem( m_view->viewportToContents(pos) );
if (!item) return;

@ -128,7 +128,7 @@ public:
ThumbBarItem* findItemByURL(const KURL& url) const;
void refreshThumbs(const KURL::List& urls);
void tqinvalidateThumb(ThumbBarItem* item);
void invalidateThumb(ThumbBarItem* item);
signals:

@ -136,7 +136,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
uint subItems = 0;
TQString ifDItemName;
MdKeyListViewItem *tqparentifDItem = 0;
MdKeyListViewItem *parentifDItem = 0;
for (DMetadata::MetaDataMap::const_iterator it = ifds.begin(); it != ifds.end(); ++it)
{
@ -148,10 +148,10 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
ifDItemName = currentIfDName;
// Check if the current IfD have any items. If no remove it before to toggle to the next IfD.
if ( subItems == 0 && tqparentifDItem)
delete tqparentifDItem;
if ( subItems == 0 && parentifDItem)
delete parentifDItem;
tqparentifDItem = new MdKeyListViewItem(this, currentIfDName);
parentifDItem = new MdKeyListViewItem(this, currentIfDName);
subItems = 0;
}
@ -165,7 +165,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
if (tagsfilter.tqcontains(it.key().section('.', 2, 2)))
{
TQString tagTitle = m_parent->getTagTitle(it.key());
new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data());
new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data());
subItems++;
}
}
@ -174,15 +174,15 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
// We don't filter the output (Complete Mode)
TQString tagTitle = m_parent->getTagTitle(it.key());
new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data());
new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data());
subItems++;
}
}
}
// To check if the last IfD have any items...
if ( subItems == 0 && tqparentifDItem)
delete tqparentifDItem;
if ( subItems == 0 && parentifDItem)
delete parentifDItem;
setCurrentItemByKey(m_selectedItemKey);
TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) );
@ -194,14 +194,14 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
clear();
uint subItems = 0;
MdKeyListViewItem *tqparentifDItem = 0;
MdKeyListViewItem *parentifDItem = 0;
for (TQStringList::const_iterator itKeysFilter = keysFilter.begin();
itKeysFilter != keysFilter.end();
++itKeysFilter)
{
subItems = 0;
tqparentifDItem = new MdKeyListViewItem(this, *itKeysFilter);
parentifDItem = new MdKeyListViewItem(this, *itKeysFilter);
DMetadata::MetaDataMap::const_iterator it = ifds.end();
@ -219,7 +219,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
if (tagsFilter.tqcontains(it.key().section('.', 2, 2)))
{
TQString tagTitle = m_parent->getTagTitle(it.key());
new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data());
new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data());
subItems++;
}
}
@ -228,7 +228,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
// We don't filter the output (Complete Mode)
TQString tagTitle = m_parent->getTagTitle(it.key());
new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data());
new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data());
subItems++;
}
}
@ -239,8 +239,8 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt
}
// We checking if the last IfD have any items. If no, we remove it.
if ( subItems == 0 && tqparentifDItem)
delete tqparentifDItem;
if ( subItems == 0 && parentifDItem)
delete parentifDItem;
}
setCurrentItemByKey(m_selectedItemKey);

@ -15,7 +15,7 @@ General : New native SlideShow tool witch use the Image Preview feature.
RAW files can be slided very fast.
AlbumGUI : Improvement of pop-up menu of Tags Filter View and Comment & Tags
about auto selection/deselection of tqparents/childs tags in Tags treeview.
about auto selection/deselection of parents/childs tags in Tags treeview.
AlbumGUI : Main Root album show a Welcome page for new users (like Kmail
or Konqueror).
AlbumGUI : Video files can be previewed using an embedded instance of
@ -61,7 +61,7 @@ CameraGUI : JPEG Exif thumbnail and Iptc image preview are recomputed during
CameraGUI : digiKam theme support.
AlbumGUI : Improvement of pop-up menu of Tags Filter View and Comment & Tags about
auto selection/deselection of tqparents/childs tags in Tags treeview.
auto selection/deselection of parents/childs tags in Tags treeview.
AlbumGUI : Main Root album show a Welcome page for new users (like Kmail or Konqueror).
AlbumGUI : Video files can be previewed using an embedded instance of default KDE
media player.

@ -206,7 +206,7 @@ General : Add capability to display count of items in all Album, Date, Ta
Tags Filter Folder View.
The number of items contained in virtual or physical albums can be
displayed on the right of album name. If a tree branch is collapsed,
tqparents album sum-up the number of items from all undisplayed tqchildren albums.
parents album sum-up the number of items from all undisplayed tqchildren albums.
Count of items is performed in background by digiKam KIO-Slaves.
A new option from Setup/Album dialog page can toggle on/off this feature.

@ -1045,7 +1045,7 @@ void ShowFoto::finishSaving(bool success)
void ShowFoto::saveIsComplete()
{
Digikam::LoadingCacheInterface::putImage(m_savingContext->destinationURL.path(), m_canvas->currentImage());
d->thumbBar->tqinvalidateThumb(d->currentItem);
d->thumbBar->invalidateThumb(d->currentItem);
}
void ShowFoto::saveAsIsComplete()
@ -1055,7 +1055,7 @@ void ShowFoto::saveAsIsComplete()
// Add the file to the list of thumbbar images if it's not there already
Digikam::ThumbBarItem* foundItem = d->thumbBar->findItemByURL(m_savingContext->destinationURL);
d->thumbBar->tqinvalidateThumb(foundItem);
d->thumbBar->invalidateThumb(foundItem);
if (!foundItem)
foundItem = new Digikam::ThumbBarItem(d->thumbBar, m_savingContext->destinationURL);

@ -136,16 +136,16 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect,
}
else
{
FolderItem* tqparentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
if (!tqparentItem)
if (!parentItem)
{
DWarning() << "Failed to find tqparent for Album "
<< album->title() << endl;
continue;
}
viewItem = new FolderItem(tqparentItem, album->title());
viewItem = new FolderItem(parentItem, album->title());
}
if (viewItem)
@ -207,9 +207,9 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
if (!album || album->type() != Album::PHYSICAL)
return;
FolderItem* tqparentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
if (!tqparentItem)
if (!parentItem)
{
DWarning() << "Failed to find tqparent for Album "
<< album->title() << endl;
@ -221,7 +221,7 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
AlbumSettings::instance()->getDefaultTreeIconSize(),
KIcon::DefaultState, 0, true);
FolderItem* viewItem = new FolderItem(tqparentItem, album->title());
FolderItem* viewItem = new FolderItem(parentItem, album->title());
viewItem->setPixmap(0, icon);
album->setExtraData(d->folderView, viewItem);
d->albumMap.insert(viewItem, (PAlbum*)album);
@ -364,7 +364,7 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter)
bool match = palbum->title().lower().tqcontains(search);
if (!match)
{
// check if any of the tqparents match the search
// check if any of the parents match the search
Album* tqparent = palbum->tqparent();
while (tqparent && !tqparent->isRoot())
{

@ -95,12 +95,12 @@ void CameraFolderView::addRootFolder(const TQString& folder, int nbItems, const
CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQString& subFolder,
int nbItems, const TQPixmap& pixmap)
{
CameraFolderItem *tqparentItem = findFolder(folder);
CameraFolderItem *parentItem = findFolder(folder);
DDebug() << "CameraFolderView: Adding Subfolder " << subFolder
<< " of folder " << folder << endl;
if (tqparentItem)
if (parentItem)
{
TQString path(folder);
@ -108,7 +108,7 @@ CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQSt
path += '/';
path += subFolder;
CameraFolderItem* item = new CameraFolderItem(tqparentItem, subFolder, path, pixmap);
CameraFolderItem* item = new CameraFolderItem(parentItem, subFolder, path, pixmap);
DDebug() << "CameraFolderView: Added ViewItem with path "
<< item->folderPath() << endl;

@ -1605,10 +1605,10 @@ void CameraUI::slotItemsSelected(CameraIconViewItem* item, bool selected)
d->rightSidebar->slotNoCurrentItem();
}
bool CameraUI::createAutoAlbum(const KURL& tqparentURL, const TQString& sub,
bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub,
const TQDate& date, TQString& errMsg)
{
KURL u(tqparentURL);
KURL u(parentURL);
u.addPath(sub);
// first stat to see if the album exists
@ -1622,7 +1622,7 @@ bool CameraUI::createAutoAlbum(const KURL& tqparentURL, const TQString& sub,
{
errMsg = i18n("A file with same name (%1) exists in folder %2")
.tqarg(sub)
.tqarg(tqparentURL.path());
.tqarg(parentURL.path());
return false;
}
}
@ -1630,11 +1630,11 @@ bool CameraUI::createAutoAlbum(const KURL& tqparentURL, const TQString& sub,
// looks like the directory does not exist, try to create it
AlbumManager* aman = AlbumManager::instance();
PAlbum* tqparent = aman->findPAlbum(tqparentURL);
PAlbum* tqparent = aman->findPAlbum(parentURL);
if (!tqparent)
{
errMsg = i18n("Failed to find Album for path '%1'")
.tqarg(tqparentURL.path());
.tqarg(parentURL.path());
return false;
}

@ -89,7 +89,7 @@ private:
void readSettings();
void saveSettings();
bool dialogClosed();
bool createAutoAlbum(const KURL& tqparentURL, const TQString& sub,
bool createAutoAlbum(const KURL& parentURL, const TQString& sub,
const TQDate& date, TQString& errMsg);
void addFileExtension(const TQString& ext);
void finishDialog();

@ -42,11 +42,11 @@ RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *tqparent, const D
initFilter();
}
RawPostProcessing::RawPostProcessing(DImgThreadedFilter *tqparentFilter,
RawPostProcessing::RawPostProcessing(DImgThreadedFilter *parentFilter,
const DImg &orgImage, const DImg &destImage,
int progressBegin, int progressEnd, const DRawDecoding& settings)
: DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd,
tqparentFilter->filterName() + ": RawPostProcessing")
: DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd,
parentFilter->filterName() + ": RawPostProcessing")
{
m_customRawSettings = settings;
filterImage();

@ -43,7 +43,7 @@ public:
RawPostProcessing(DImg *orgImage, TQObject *tqparent=0, const DRawDecoding& settings=DRawDecoding());
// Constructor for slave mode: execute immediately in current thread with specified master filter
RawPostProcessing(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage,
RawPostProcessing(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage,
int progressBegin=0, int progressEnd=100, const DRawDecoding& settings=DRawDecoding());
~RawPostProcessing(){};

@ -148,7 +148,7 @@ sub getTaggedImages{
$tags[$id]->{"pid"}="$pid";
}
# Now build up the path for tags having tqparents
# Now build up the path for tags having parents
# Eg: a tag people might have a subtag friends: people
# |->friends
# We want to find out the complete path for the subtag. For friends this
@ -163,7 +163,7 @@ sub getTaggedImages{
}
while( $pid != 0){
$tag=$tags[$pid]->{"tag"} . "/$tag"; # add tqparents tag name to path
$tag=$tags[$pid]->{"tag"} . "/$tag"; # add parents tag name to path
$pid=$tags[$pid]->{"pid"}; # look if tqparent has another tqparent
}
# Store path constructed
@ -279,7 +279,7 @@ sub createLinkTree{
#$qtagPath=quotemeta($tagPath);
# For tags that have subtags there is a path defined in qtagPath
# describing the tqparentrelationship as directory path like "friends/family/brothers"
# describing the parentrelationship as directory path like "friends/family/brothers"
# If it is defined we want to use this path instead of the flat tag name like "brothers"
# Doing so results in a directory hirachy that maps the tags tqparent relationships
# into the filesystem.

@ -156,7 +156,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent )
"Note, the word \"copyright\" or the abbreviation \"copr\" may be used in place of the &copy; symbol. "
"In some foreign countries only the copyright symbol is recognized and the abbreviation does not work. "
"Furthermore the copyright symbol must be a full circle with a \"c\" inside; using something like (c) "
"where the tqparentheses form a partial circle is not sufficient. For additional protection worldwide, "
"where the parentheses form a partial circle is not sufficient. For additional protection worldwide, "
"use of the phrase, \"all rights reserved\" following the notice above is encouraged. \nIn Europe "
"you would use: Copyright {Year} {Copyright owner}, all rights reserved. \nIn Japan, for maximum "
"protection, the following three items should appear in the copyright field of the IPTC Core: "

Loading…
Cancel
Save