rename the following methods:

tqparent parent
tqmask mask


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

@ -56,16 +56,16 @@ Album::~Album()
clear();
}
void Album::setParent(Album* tqparent)
void Album::setParent(Album* parent)
{
if (tqparent)
if (parent)
{
m_parent = tqparent;
tqparent->insertChild(this);
m_parent = parent;
parent->insertChild(this);
}
}
Album* Album::tqparent() const
Album* Album::parent() const
{
return m_parent;
}
@ -234,7 +234,7 @@ bool Album::isAncestorOf(Album* album) const
val = true;
break;
}
a = a->tqparent();
a = a->parent();
}
return val;
}
@ -299,9 +299,9 @@ TQString PAlbum::url() const
{
return "/";
}
else if (tqparent())
else if (parent())
{
u = ((PAlbum*)tqparent())->url();
u = ((PAlbum*)parent())->url();
if (!u.endsWith("/"))
u += '/';
}
@ -366,10 +366,10 @@ TQString TAlbum::tagPath(bool leadingSlash) const
TQString u;
if (tqparent())
if (parent())
{
u = ((TAlbum*)tqparent())->tagPath(leadingSlash);
if (!tqparent()->isRoot())
u = ((TAlbum*)parent())->tagPath(leadingSlash);
if (!parent()->isRoot())
u += '/';
}
@ -393,9 +393,9 @@ KURL TAlbum::kurl() const
{
url.setPath("/");
}
else if (tqparent())
else if (parent())
{
TAlbum *p = static_cast<TAlbum*>(tqparent());
TAlbum *p = static_cast<TAlbum*>(parent());
url.setPath(p->kurl().path(1));
url.addPath(TQString::number(id()));
}
@ -511,7 +511,7 @@ AlbumIterator& AlbumIterator::operator++()
{
while ( (album = m_current->next()) == 0 )
{
m_current = m_current->tqparent();
m_current = m_current->parent();
if ( m_current == m_root )
{

@ -77,9 +77,9 @@ public:
void clear();
/**
* @return the tqparent album for this album
* @return the parent album for this album
*/
Album* tqparent() const;
Album* parent() const;
/**
* @return the first child of this album or 0 if no tqchildren
@ -157,7 +157,7 @@ public:
bool isRoot() const;
/**
* @return true if the @p album is in the tqparent hierarchy
* @return true if the @p album is in the parent hierarchy
*
* @param album Album to check whether it belongs in the child
* hierarchy
@ -232,11 +232,11 @@ protected:
/**
* @internal use only
*
* Set the tqparent of the album
* Set the parent of the album
*
* @param tqparent set the tqparent album of album to @p tqparent
* @param parent set the parent album of album to @p parent
*/
void setParent(Album* tqparent);
void setParent(Album* parent);
/**
* @internal use only

@ -1138,7 +1138,7 @@ IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool crea
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
// to the parent ID we got from the child tag
if ( (*parentTag).id == parentID &&
(*parentTag).name == (*parentTagName) )
{
@ -1191,14 +1191,14 @@ 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 the parent tag did not exist, we need not check if the child exists
if (parentTagExisted)
{
for (TagInfo::List::iterator tag = currentTagsList.begin();
tag != currentTagsList.end(); ++tag )
{
// find the tag with tag name according to tagHierarchy,
// and tqparent ID identical to the ID of the tag we found in
// and parent ID identical to the ID of the tag we found in
// the previous run.
if ((*tag).name == (*tagName) && (*tag).pid == parentTagID)
{

@ -162,8 +162,8 @@ public:
void deleteAlbum(int albumID);
/**
* Adds a new tag to the database with given name, icon and tqparent id.
* @param parentTagID the id of the tag which will become the new tags tqparent
* Adds a new tag to the database with given name, icon and parent id.
* @param parentTagID the id of the tag which will become the new tags parent
* @param name the name of the tag
* @param iconKDE the name of the icon file (this is filename which kde
* iconloader can load up)
@ -200,7 +200,7 @@ public:
TQString getTagIcon(int tagID);
/**
* Set the tqparent tagid for the tag. This is equivalent to reparenting
* Set the parent tagid for the tag. This is equivalent to reparenting
* the tag
* @param tagID the id of the tag
* @param newParentTagID the new parentid for the tag

@ -88,11 +88,11 @@ class AlbumFolderViewItem : public FolderItem
public:
AlbumFolderViewItem(TQListView *tqparent, PAlbum *album);
AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album);
AlbumFolderViewItem(TQListView *parent, PAlbum *album);
AlbumFolderViewItem(TQListViewItem *parent, PAlbum *album);
// special group item (collection/dates)
AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name,
AlbumFolderViewItem(TQListViewItem* parent, const TQString& name,
int year, int month);
PAlbum* album() const;
@ -115,8 +115,8 @@ private:
PAlbum *m_album;
};
AlbumFolderViewItem::AlbumFolderViewItem(TQListView *tqparent, PAlbum *album)
: FolderItem(tqparent, album->title())
AlbumFolderViewItem::AlbumFolderViewItem(TQListView *parent, PAlbum *album)
: FolderItem(parent, album->title())
{
setDragEnabled(true);
m_album = album;
@ -124,8 +124,8 @@ AlbumFolderViewItem::AlbumFolderViewItem(TQListView *tqparent, PAlbum *album)
m_count = 0;
}
AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album)
: FolderItem(tqparent, album->title())
AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *parent, PAlbum *album)
: FolderItem(parent, album->title())
{
setDragEnabled(true);
m_album = album;
@ -134,9 +134,9 @@ AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album
}
// special group item (collection/dates)
AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name,
AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem* parent, const TQString& name,
int year, int month)
: FolderItem(tqparent, name, true)
: FolderItem(parent, name, true)
{
m_album = 0;
m_year = year;
@ -150,7 +150,7 @@ void AlbumFolderViewItem::refresh()
if (!m_album) return;
if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() &&
dynamic_cast<AlbumFolderViewItem*>(tqparent()))
dynamic_cast<AlbumFolderViewItem*>(parent()))
{
if (isOpen())
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count));
@ -258,8 +258,8 @@ public:
TQValueList<AlbumFolderViewItem*> groupItems;
};
AlbumFolderView::AlbumFolderView(TQWidget *tqparent)
: FolderView(tqparent, "AlbumFolderView")
AlbumFolderView::AlbumFolderView(TQWidget *parent)
: FolderView(parent, "AlbumFolderView")
{
d = new AlbumFolderViewPriv();
d->albumMan = AlbumManager::instance();
@ -344,16 +344,16 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter)
if (!match)
{
// check if any of the parents match the search
Album* tqparent = palbum->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = palbum->parent();
while (parent && !parent->isRoot())
{
if (tqparent->title().lower().contains(search))
if (parent->title().lower().contains(search))
{
match = true;
break;
}
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}
@ -408,16 +408,16 @@ void AlbumFolderView::slotAlbumAdded(Album *album)
return;
bool failed;
AlbumFolderViewItem* tqparent = findParent(palbum, failed);
AlbumFolderViewItem* parent = findParent(palbum, failed);
if (failed)
{
DWarning() << k_funcinfo << " Failed to find Album tqparent "
DWarning() << k_funcinfo << " Failed to find Album parent "
<< palbum->url() << endl;
return;
}
AlbumFolderViewItem *item;
if (!tqparent)
if (!parent)
{
// root album
item = new AlbumFolderViewItem(this, palbum);
@ -426,7 +426,7 @@ void AlbumFolderView::slotAlbumAdded(Album *album)
}
else
{
item = new AlbumFolderViewItem(tqparent, palbum);
item = new AlbumFolderViewItem(parent, palbum);
palbum->setExtraData(this, item);
}
@ -448,7 +448,7 @@ void AlbumFolderView::slotAlbumDeleted(Album *album)
AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this);
if(item)
{
AlbumFolderViewItem *itemParent = dynamic_cast<AlbumFolderViewItem*>(item->tqparent());
AlbumFolderViewItem *itemParent = dynamic_cast<AlbumFolderViewItem*>(item->parent());
if(itemParent)
itemParent->takeItem(item);
@ -469,8 +469,8 @@ void AlbumFolderView::slotAlbumRenamed(Album *album)
AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this);
if(item)
item->refresh();
if (item->tqparent())
item->tqparent()->sort();
if (item->parent())
item->parent()->sort();
}
void AlbumFolderView::slotAlbumsCleared()
@ -596,7 +596,7 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
}
// Root folder only shows "New Album..."
if(item && item->tqparent())
if(item && item->parent())
{
popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 14);
popmenu.insertItem(SmallIcon("albumfolder-properties"), i18n("Album Properties..."), 11);
@ -740,14 +740,14 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item)
return;
}
PAlbum *tqparent;
PAlbum *parent;
if(!item)
tqparent = d->albumMan->findPAlbum(0);
parent = d->albumMan->findPAlbum(0);
else
tqparent = item->album();
parent = item->album();
if (!tqparent)
if (!parent)
return;
TQString title;
@ -756,7 +756,7 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item)
TQDate date;
TQStringList albumCollections;
if(!AlbumPropsEdit::createNew(tqparent, title, comments, date, collection,
if(!AlbumPropsEdit::createNew(parent, title, comments, date, collection,
albumCollections))
return;
@ -768,7 +768,7 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item)
}
TQString errMsg;
PAlbum* album = d->albumMan->createPAlbum(tqparent, title, comments,
PAlbum* album = d->albumMan->createPAlbum(parent, title, comments,
date, collection, errMsg);
if (!album)
{
@ -985,7 +985,7 @@ bool AlbumFolderView::acceptDrop(const TQDropEvent *e) const
if(itemDrag == itemDrop)
return false;
// Dragging a tqparent on its child makes no sense
// Dragging a parent on its child makes no sense
if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album()))
return false;
@ -1009,7 +1009,7 @@ bool AlbumFolderView::acceptDrop(const TQDropEvent *e) const
}
}
if(itemDrop && !itemDrop->tqparent())
if(itemDrop && !itemDrop->parent())
{
// Do not allow drop images on album root
return false;
@ -1367,20 +1367,20 @@ void AlbumFolderView::albumImportFolder()
return;
}
PAlbum* tqparent = 0;
PAlbum* parent = 0;
if(selectedItem())
{
AlbumFolderViewItem *folderItem = dynamic_cast<AlbumFolderViewItem*>(selectedItem());
Album *album = folderItem->album();
if (album && album->type() == Album::PHYSICAL)
{
tqparent = dynamic_cast<PAlbum*>(album);
parent = dynamic_cast<PAlbum*>(album);
}
}
if(!tqparent)
tqparent = dynamic_cast<PAlbum*>(d->albumMan->findPAlbum(0));
if(!parent)
parent = dynamic_cast<PAlbum*>(d->albumMan->findPAlbum(0));
TQString libraryPath = tqparent->folderPath();
TQString libraryPath = parent->folderPath();
KFileDialog dlg(TQString(), "inode/directory", this, "importFolder", true);
dlg.setCaption(i18n("Select folders to import"));
@ -1392,7 +1392,7 @@ void AlbumFolderView::albumImportFolder()
if(urls.empty())
return;
KIO::Job* job = DIO::copy(urls, tqparent->kurl());
KIO::Job* job = DIO::copy(urls, parent->kurl());
connect(job, TQT_SIGNAL(result(KIO::Job *)),
this, TQT_SLOT(slotDIOResult(KIO::Job *)));
}
@ -1441,16 +1441,16 @@ AlbumFolderViewItem* AlbumFolderView::findParent(PAlbum* album, bool& failed)
AlbumFolderViewItem* AlbumFolderView::findParentByFolder(PAlbum* album, bool& failed)
{
AlbumFolderViewItem* tqparent =
(AlbumFolderViewItem*) album->tqparent()->extraData(this);
if (!tqparent)
AlbumFolderViewItem* parent =
(AlbumFolderViewItem*) album->parent()->extraData(this);
if (!parent)
{
failed = true;
return 0;
}
failed = false;
return tqparent;
return parent;
}
AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool& failed)
@ -1461,7 +1461,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool
if (collection.isEmpty() || !collectionList.contains(collection))
collection = i18n("Uncategorized Albums");
AlbumFolderViewItem* tqparent = 0;
AlbumFolderViewItem* parent = 0;
for (TQValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin();
it != d->groupItems.end(); ++it)
@ -1469,20 +1469,20 @@ AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool
AlbumFolderViewItem* groupItem = *it;
if (groupItem->text(0) == collection)
{
tqparent = groupItem;
parent = groupItem;
break;
}
}
// Need to create a new tqparent item
if (!tqparent)
// Need to create a new parent item
if (!parent)
{
tqparent = new AlbumFolderViewItem(firstChild(), collection, 0, 0);
d->groupItems.append(tqparent);
parent = new AlbumFolderViewItem(firstChild(), collection, 0, 0);
d->groupItems.append(parent);
}
failed = false;
return tqparent;
return parent;
}
AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& failed)
@ -1492,7 +1492,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail
TQString timeString = TQString::number(date.year()) + ", " +
KGlobal::locale()->calendar()->monthName(date, false);
AlbumFolderViewItem* tqparent = 0;
AlbumFolderViewItem* parent = 0;
for (TQValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin();
it != d->groupItems.end(); ++it)
@ -1500,21 +1500,21 @@ AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& fail
AlbumFolderViewItem* groupItem = *it;
if (groupItem->text(0) == timeString)
{
tqparent = groupItem;
parent = groupItem;
break;
}
}
// Need to create a new tqparent item
if (!tqparent)
// Need to create a new parent item
if (!parent)
{
tqparent = new AlbumFolderViewItem(firstChild(), timeString,
parent = new AlbumFolderViewItem(firstChild(), timeString,
date.year(), date.month());
d->groupItems.append(tqparent);
d->groupItems.append(parent);
}
failed = false;
return tqparent;
return parent;
}
void AlbumFolderView::resort()
@ -1552,7 +1552,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem)
if (!album || album->isRoot())
return;
AlbumFolderViewItem* oldParent = dynamic_cast<AlbumFolderViewItem*>(folderItem->tqparent());
AlbumFolderViewItem* oldParent = dynamic_cast<AlbumFolderViewItem*>(folderItem->parent());
bool failed;
AlbumFolderViewItem* newParent = findParent(album, failed);
@ -1567,7 +1567,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem)
else
removeItem(folderItem);
// insert into new tqparent
// insert into new parent
if (newParent)
newParent->insertItem(folderItem);
else

@ -54,7 +54,7 @@ class AlbumFolderView : public FolderView
public:
AlbumFolderView(TQWidget *tqparent);
AlbumFolderView(TQWidget *parent);
~AlbumFolderView();
void albumImportFolder();

@ -80,11 +80,11 @@ static void dateToString(const TQDateTime& datetime, TQString& str)
str = KGlobal::locale()->formatDateTime(datetime, true, false);
}
AlbumIconItem::AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info)
: IconItem(tqparent)
AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info)
: IconItem(parent)
{
d = new AlbumIconItemPriv;
d->view = (AlbumIconView*) tqparent->iconView();
d->view = (AlbumIconView*) parent->iconView();
d->info = info;
}

@ -48,7 +48,7 @@ class AlbumIconItem : public IconItem
public:
AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info);
AlbumIconItem(IconGroupItem* parent, ImageInfo* info);
~AlbumIconItem();
ImageInfo* imageInfo() const;

@ -191,8 +191,8 @@ public:
AlbumFileTip *toolTip;
};
AlbumIconView::AlbumIconView(TQWidget* tqparent)
: IconView(tqparent)
AlbumIconView::AlbumIconView(TQWidget* parent)
: IconView(parent)
{
d = new AlbumIconViewPrivate;
d->init();
@ -778,14 +778,14 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
case 20: // goto album
{
// send a signal to the tqparent widget (digikamview.cpp)
// send a signal to the parent widget (digikamview.cpp)
emit signalGotoAlbumAndItem(iconItem);
break;
}
case 21: // goto date
{
// send a signal to the tqparent widget (digikamview.cpp)
// send a signal to the parent widget (digikamview.cpp)
emit signalGotoDateAndItem(iconItem);
break;
}
@ -2216,7 +2216,7 @@ void AlbumIconView::slotAlbumModified()
void AlbumIconView::slotGotoTag(int tagID)
{
// send a signal to the tqparent widget (digikamview.cpp) to change
// send a signal to the parent widget (digikamview.cpp) to change
// to Tag view and the corresponding item
emit signalGotoTagAndItem(tagID);

@ -67,7 +67,7 @@ class AlbumIconView : public IconView,
public:
AlbumIconView(TQWidget* tqparent);
AlbumIconView(TQWidget* parent);
~AlbumIconView();
void setAlbum(Album* album);

@ -66,8 +66,8 @@ public:
RatingFilter *ratingFilter;
};
AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* tqparent)
: TQHBox(tqparent)
AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* parent)
: TQHBox(parent)
{
d = new AlbumIconViewFilterPriv;

@ -48,7 +48,7 @@ class AlbumIconViewFilter : public TQHBox
public:
AlbumIconViewFilter(TQWidget* tqparent);
AlbumIconViewFilter(TQWidget* parent);
~AlbumIconViewFilter();
void readSettings();

@ -471,7 +471,7 @@ void AlbumManager::scanPAlbums()
// this might look like there is memory leak here, since removePAlbum
// doesn't delete albums and looks like child Albums don't get deleted.
// But when the tqparent album gets deleted, the tqchildren are also deleted.
// But when the parent album gets deleted, the tqchildren are also deleted.
PAlbum* album = d->pAlbumDict.find(it.key());
if (!album)
@ -493,13 +493,13 @@ void AlbumManager::scanPAlbums()
KURL u;
u.setPath(info.url);
TQString name = u.fileName();
// Get its tqparent
// Get its parent
TQString purl = u.upURL().path(-1);
PAlbum* tqparent = d->pAlbumDict.find(purl);
if (!tqparent)
PAlbum* parent = d->pAlbumDict.find(purl);
if (!parent)
{
DWarning() << k_funcinfo << "Could not find tqparent with url: "
DWarning() << k_funcinfo << "Could not find parent with url: "
<< purl << " for: " << info.url << endl;
continue;
}
@ -511,7 +511,7 @@ void AlbumManager::scanPAlbums()
album->m_date = info.date;
album->m_icon = info.icon;
album->setParent(tqparent);
album->setParent(parent);
d->dirWatch->addDir(album->folderPath());
insertPAlbum(album);
@ -573,7 +573,7 @@ void AlbumManager::scanTAlbums()
TagInfo::List tList = d->db->scanTags();
// sort the list. needed because we want the tags can be read in any order,
// but we want to make sure that we are ensure to find the tqparent TAlbum
// but we want to make sure that we are ensure to find the parent TAlbum
// for a new TAlbum
{
@ -603,14 +603,14 @@ void AlbumManager::scanTAlbums()
if (album->m_id == 0)
continue;
TAlbum* tqparent = tagDict.find(album->m_pid);
if (tqparent)
TAlbum* parent = tagDict.find(album->m_pid);
if (parent)
{
album->setParent(tqparent);
album->setParent(parent);
}
else
{
DWarning() << "Failed to find tqparent tag for tag "
DWarning() << "Failed to find parent tag for tag "
<< iter.current()->m_title
<< " with pid "
<< iter.current()->m_pid << endl;
@ -643,26 +643,26 @@ void AlbumManager::scanTAlbums()
if (tmap.contains(info.id))
continue;
// Its a new album. Find the tqparent of the album
// Its a new album. Find the parent of the album
TagMap::iterator iter = tmap.find(info.pid);
if (iter == tmap.end())
{
DWarning() << "Failed to find tqparent tag for tag "
DWarning() << "Failed to find parent tag for tag "
<< info.name
<< " with pid "
<< info.pid << endl;
continue;
}
TAlbum* tqparent = iter.data();
TAlbum* parent = iter.data();
// Create the new TAlbum
TAlbum* album = new TAlbum(info.name, info.id, false);
album->m_icon = info.icon;
album->setParent(tqparent);
album->setParent(parent);
insertTAlbum(album);
// also insert it in the map we are doing lookup of tqparent tags
// also insert it in the map we are doing lookup of parent tags
tmap.insert(info.id, album);
}
@ -917,16 +917,16 @@ TAlbum* AlbumManager::findTAlbum(const TQString &tagPath) const
}
PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent,
PAlbum* AlbumManager::createPAlbum(PAlbum* parent,
const TQString& name,
const TQString& caption,
const TQDate& date,
const TQString& collection,
TQString& errMsg)
{
if (!tqparent)
if (!parent)
{
errMsg = i18n("No tqparent found for album.");
errMsg = i18n("No parent found for album.");
return 0;
}
@ -944,7 +944,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent,
}
// first check if we have another album with the same name
Album *child = tqparent->m_firstChild;
Album *child = parent->m_firstChild;
while (child)
{
if (child->title() == name)
@ -955,7 +955,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent,
child = child->m_next;
}
TQString path = tqparent->folderPath();
TQString path = parent->folderPath();
path += '/' + name;
path = TQDir::cleanDirPath(path);
@ -992,7 +992,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent,
album->m_collection = collection;
album->m_date = date;
album->setParent(tqparent);
album->setParent(parent);
d->dirWatch->addDir(album->folderPath());
@ -1105,12 +1105,12 @@ bool AlbumManager::updatePAlbumIcon(PAlbum *album, TQ_LLONG iconID, TQString& er
return true;
}
TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name,
TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const TQString& name,
const TQString& iconkde, TQString& errMsg)
{
if (!tqparent)
if (!parent)
{
errMsg = i18n("No tqparent found for tag");
errMsg = i18n("No parent found for tag");
return 0;
}
@ -1128,7 +1128,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name,
}
// first check if we have another album with the same name
Album *child = tqparent->m_firstChild;
Album *child = parent->m_firstChild;
while (child)
{
if (child->title() == name)
@ -1139,7 +1139,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name,
child = child->m_next;
}
int id = d->db->addTag(tqparent->id(), name, iconkde, 0);
int id = d->db->addTag(parent->id(), name, iconkde, 0);
if (id == -1)
{
errMsg = i18n("Failed to add tag to database");
@ -1148,7 +1148,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name,
TAlbum *album = new TAlbum(name, id, false);
album->m_icon = iconkde;
album->setParent(tqparent);
album->setParent(parent);
insertTAlbum(album);
@ -1263,7 +1263,7 @@ bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, TQString &errMsg
}
d->db->setTagParentID(album->id(), newParent->id());
album->tqparent()->removeChild(album);
album->parent()->removeChild(album);
album->setParent(newParent);
emit signalTAlbumMoved(album, newParent);

@ -237,14 +237,14 @@ public:
*/
//@{
/**
* Create a new PAlbum with supplied properties as a child of the tqparent
* Create a new PAlbum with supplied properties as a child of the parent
* This is equivalent to creating a new folder on the disk with supplied
* name in the tqparent's folder path. Also the supplied attributes are written
* name in the parent's folder path. Also the supplied attributes are written
* out to the database
* \note the signalAlbumAdded will be fired before this function returns. Its
* recommended to connect to that signal to get notification of new album added
* @return the newly created PAlbum or 0 if it fails
* @param tqparent the tqparent album under which to create the new Album
* @param parent the parent album under which to create the new Album
* @param name the name of the new album
* @param caption the caption for the new album
* @param date the date for the new album
@ -252,7 +252,7 @@ public:
* @param errMsg this will contain the error message describing why the
* operation failed
*/
PAlbum* createPAlbum(PAlbum* tqparent, const TQString& name,
PAlbum* createPAlbum(PAlbum* parent, const TQString& name,
const TQString& caption, const TQDate& date,
const TQString& collection,
TQString& errMsg);
@ -285,19 +285,19 @@ public:
*/
//@{
/**
* Create a new TAlbum with supplied properties as a child of the tqparent
* Create a new TAlbum with supplied properties as a child of the parent
* The tag is added to the database
* \note the signalAlbumAdded will be fired before this function returns. Its
* recommended to connect to that signal to get notification of new album added
* @return the newly created TAlbum or 0 if it fails
* @param tqparent the tqparent album under which to create the new Album
* @param parent the parent album under which to create the new Album
* @param name the name of the new album
* @param iconkde the iconkde for the new album (this is a filename which
* kde iconloader can load up
* @param errMsg this will contain the error message describing why the
* operation failed
*/
TAlbum* createTAlbum(TAlbum* tqparent, const TQString& name,
TAlbum* createTAlbum(TAlbum* parent, const TQString& name,
const TQString& iconkde, TQString& errMsg);
/**
@ -332,8 +332,8 @@ public:
bool renameTAlbum(TAlbum* album, const TQString& name, TQString& errMsg);
/**
* Move a TAlbum to a new tqparent.
* This updates the tag tqparent ID in the database
* Move a TAlbum to a new parent.
* This updates the tag parent ID in the database
* @return true if the operation succeeds, false otherwise
* @param album the Album which should be moved
* @param newParent the Parent Album to which album should be moved

@ -306,14 +306,14 @@ bool AlbumPropsEdit::editProps(PAlbum *album, TQString& title,
return ok;
}
bool AlbumPropsEdit::createNew(PAlbum *tqparent,
bool AlbumPropsEdit::createNew(PAlbum *parent,
TQString& title,
TQString& comments,
TQDate& date,
TQString& collection,
TQStringList& albumCollections)
{
AlbumPropsEdit dlg(tqparent, true);
AlbumPropsEdit dlg(parent, true);
bool ok = dlg.exec() == TQDialog::Accepted;

@ -65,7 +65,7 @@ public:
TQString& collection,
TQStringList& albumCollections);
static bool createNew(PAlbum *tqparent,
static bool createNew(PAlbum *parent,
TQString& title,
TQString& comments,
TQDate& date,

@ -66,8 +66,8 @@ public:
MediaPlayerView *mediaPlayerView;
};
AlbumWidgetStack::AlbumWidgetStack(TQWidget *tqparent)
: TQWidgetStack(tqparent, 0, TQt::WDestructiveClose)
AlbumWidgetStack::AlbumWidgetStack(TQWidget *parent)
: TQWidgetStack(parent, 0, TQt::WDestructiveClose)
{
d = new AlbumWidgetStackPriv;

@ -62,7 +62,7 @@ public:
public:
AlbumWidgetStack(TQWidget *tqparent=0);
AlbumWidgetStack(TQWidget *parent=0);
~AlbumWidgetStack();
AlbumIconView *albumIconView();

@ -62,8 +62,8 @@ public:
TQString file;
};
CameraList::CameraList(TQObject *tqparent, const TQString& file)
: TQObject(tqparent)
CameraList::CameraList(TQObject *parent, const TQString& file)
: TQObject(parent)
{
d = new CameraListPrivate;
d->clist.setAutoDelete(true);

@ -45,7 +45,7 @@ class CameraList : public TQObject
public:
CameraList(TQObject *tqparent, const TQString& file);
CameraList(TQObject *parent, const TQString& file);
~CameraList();
bool load();

@ -63,8 +63,8 @@ class DateFolderItem : public FolderItem
public:
DateFolderItem(TQListView* tqparent, DAlbum* album);
DateFolderItem(TQListViewItem* tqparent, DAlbum* album);
DateFolderItem(TQListView* parent, DAlbum* album);
DateFolderItem(TQListViewItem* parent, DAlbum* album);
~DateFolderItem();
@ -88,8 +88,8 @@ private:
DAlbum *m_album;
};
DateFolderItem::DateFolderItem(TQListView* tqparent, DAlbum* album)
: FolderItem(tqparent, TQString(), true)
DateFolderItem::DateFolderItem(TQListView* parent, DAlbum* album)
: FolderItem(parent, TQString(), true)
{
m_count = 0;
m_album = album;
@ -97,8 +97,8 @@ DateFolderItem::DateFolderItem(TQListView* tqparent, DAlbum* album)
setText(0, m_name);
}
DateFolderItem::DateFolderItem(TQListViewItem* tqparent, DAlbum* album)
: FolderItem(tqparent, TQString())
DateFolderItem::DateFolderItem(TQListViewItem* parent, DAlbum* album)
: FolderItem(parent, TQString())
{
m_count = 0;
m_album = album;
@ -184,8 +184,8 @@ public:
MonthWidget *monthview;
};
DateFolderView::DateFolderView(TQWidget* tqparent)
: TQVBox(tqparent, "DateFolderView")
DateFolderView::DateFolderView(TQWidget* parent)
: TQVBox(parent, "DateFolderView")
{
d = new DateFolderViewPriv;
d->listview = new FolderView(this, "DateListView");
@ -260,11 +260,11 @@ void DateFolderView::slotAlbumAdded(Album* a)
}
TQString yr = TQString::number(date.year());
TQListViewItem* tqparent = findRootItemByYear(yr);
TQListViewItem* parent = findRootItemByYear(yr);
if (tqparent)
if (parent)
{
DateFolderItem* item = new DateFolderItem(tqparent, album);
DateFolderItem* item = new DateFolderItem(parent, album);
item->setPixmap(0, SmallIcon("date", AlbumSettings::instance()->getDefaultTreeIconSize()));
album->setExtraData(this, item);
}

@ -49,7 +49,7 @@ class DateFolderView : public TQVBox
public:
DateFolderView(TQWidget* tqparent);
DateFolderView(TQWidget* parent);
~DateFolderView();
void setActive(bool val);

@ -29,8 +29,8 @@
namespace Digikam
{
DCOPIface::DCOPIface(TQObject *tqparent, const char *name)
: TQObject(tqparent, name), DCOPObject(name)
DCOPIface::DCOPIface(TQObject *parent, const char *name)
: TQObject(parent, name), DCOPObject(name)
{
}

@ -51,10 +51,10 @@ public:
/**
* Standard constructor.
* @param tqparent Parent object reference, passed to @ref TQObject constructor
* @param parent Parent object reference, passed to @ref TQObject constructor
* @param name Specifis the name of the object, passed to @ref TQObject constructor
*/
DCOPIface(TQObject *tqparent = 0, const char *name = 0);
DCOPIface(TQObject *parent = 0, const char *name = 0);
/**
* Standard destructor

@ -72,9 +72,9 @@ namespace Digikam
using namespace std;
DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* tqparent,
DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent,
const char* name, bool modal, WFlags fl)
: KDialogBase(tqparent, name, modal, i18n( "Album Library Path" ),
: KDialogBase(parent, name, modal, i18n( "Album Library Path" ),
Help|Ok|Cancel, Ok, true )
{

@ -48,7 +48,7 @@ class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase
public:
DigikamFirstRun(KConfig* config, TQWidget* tqparent = 0, const char* name = 0,
DigikamFirstRun(KConfig* config, TQWidget* parent = 0, const char* name = 0,
bool modal = true, WFlags fl = WDestructiveClose);
~DigikamFirstRun();

@ -104,7 +104,7 @@ public:
searchSearchBar = 0;
tagFilterSearchBar = 0;
splitter = 0;
tqparent = 0;
parent = 0;
iconView = 0;
folderView = 0;
albumManager = 0;
@ -145,7 +145,7 @@ public:
SearchTextBar *searchSearchBar;
SearchTextBar *tagFilterSearchBar;
DigikamApp *tqparent;
DigikamApp *parent;
AlbumIconView *iconView;
AlbumFolderView *folderView;
@ -163,11 +163,11 @@ public:
TagFilterView *tagFilterView;
};
DigikamView::DigikamView(TQWidget *tqparent)
: TQHBox(tqparent)
DigikamView::DigikamView(TQWidget *parent)
: TQHBox(parent)
{
d = new DigikamViewPriv;
d->tqparent = static_cast<DigikamApp *>(tqparent);
d->parent = static_cast<DigikamApp *>(parent);
d->albumManager = AlbumManager::instance();
d->leftSideBar = new Sidebar(this, "Digikam Left Sidebar", Sidebar::Left);
@ -270,37 +270,37 @@ void DigikamView::setupConnections()
{
// -- DigikamApp connections ----------------------------------
connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()),
connect(d->parent, TQT_SIGNAL(signalEscapePressed()),
this, TQT_SLOT(slotEscapePreview()));
connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()),
connect(d->parent, TQT_SIGNAL(signalEscapePressed()),
d->albumWidgetStack, TQT_SLOT(slotEscapePreview()));
connect(d->tqparent, TQT_SIGNAL(signalNextItem()),
connect(d->parent, TQT_SIGNAL(signalNextItem()),
this, TQT_SLOT(slotNextItem()));
connect(d->tqparent, TQT_SIGNAL(signalPrevItem()),
connect(d->parent, TQT_SIGNAL(signalPrevItem()),
this, TQT_SLOT(slotPrevItem()));
connect(d->tqparent, TQT_SIGNAL(signalFirstItem()),
connect(d->parent, TQT_SIGNAL(signalFirstItem()),
this, TQT_SLOT(slotFirstItem()));
connect(d->tqparent, TQT_SIGNAL(signalLastItem()),
connect(d->parent, TQT_SIGNAL(signalLastItem()),
this, TQT_SLOT(slotLastItem()));
connect(d->tqparent, TQT_SIGNAL(signalCopyAlbumItemsSelection()),
connect(d->parent, TQT_SIGNAL(signalCopyAlbumItemsSelection()),
d->iconView, TQT_SLOT(slotCopy()));
connect(d->tqparent, TQT_SIGNAL(signalPasteAlbumItemsSelection()),
connect(d->parent, TQT_SIGNAL(signalPasteAlbumItemsSelection()),
d->iconView, TQT_SLOT(slotPaste()));
connect(this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(this, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()),
connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()),
this, TQT_SLOT(slotCancelSlideShow()));
// -- AlbumManager connections --------------------------------
@ -356,10 +356,10 @@ void DigikamView::setupConnections()
d->iconView, TQT_SLOT(slotAlbumModified()));
connect(d->iconView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(d->iconView, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
// -- Sidebar Connections -------------------------------------
@ -382,24 +382,24 @@ void DigikamView::setupConnections()
d->rightSideBar, TQT_SLOT(slotNoCurrentItem()));
connect(d->rightSideBar, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(d->rightSideBar, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
connect(d->tagFilterView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(d->tagFilterView, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
connect(d->tagFolderView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(d->tagFolderView, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
connect(d->tqparent, TQT_SIGNAL(signalResetTagFilters()),
connect(d->parent, TQT_SIGNAL(signalResetTagFilters()),
d->tagFilterView, TQT_SLOT(slotResetTagFilters()));
// -- Filter Bars Connections ---------------------------------
@ -820,16 +820,16 @@ void DigikamView::changeAlbumFromHistory(Album *album, TQWidget *widget)
d->leftSideBar->setActiveTab(widget);
d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
}
}
void DigikamView::clearHistory()
{
d->albumHistory->clearHistory();
d->tqparent->enableAlbumBackwardHistory(false);
d->tqparent->enableAlbumForwardHistory(false);
d->parent->enableAlbumBackwardHistory(false);
d->parent->enableAlbumForwardHistory(false);
}
void DigikamView::getBackwardHistory(TQStringList &titles)
@ -854,8 +854,8 @@ void DigikamView::slotSelectAlbum(const KURL &)
AlbumFolderItem_Deprecated *item;
item = static_cast<AlbumFolderItem_Deprecated*>(album->getViewItem());
mFolderView_Deprecated->setSelected(item);
d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
}
*/
}
@ -954,8 +954,8 @@ void DigikamView::slotAlbumSelected(Album* album)
}
d->albumHistory->addAlbum(album, d->leftSideBar->getActiveTab());
d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty());
d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty());
d->iconView->setAlbum(album);
if (album->isRoot())
@ -1080,25 +1080,25 @@ void DigikamView::toggleZoomActions()
{
if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewImageMode)
{
d->tqparent->enableZoomMinusAction(true);
d->tqparent->enableZoomPlusAction(true);
d->parent->enableZoomMinusAction(true);
d->parent->enableZoomPlusAction(true);
if (d->albumWidgetStack->maxZoom())
d->tqparent->enableZoomPlusAction(false);
d->parent->enableZoomPlusAction(false);
if (d->albumWidgetStack->minZoom())
d->tqparent->enableZoomMinusAction(false);
d->parent->enableZoomMinusAction(false);
}
else if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
{
d->tqparent->enableZoomMinusAction(true);
d->tqparent->enableZoomPlusAction(true);
d->parent->enableZoomMinusAction(true);
d->parent->enableZoomPlusAction(true);
if (d->thumbSize >= ThumbnailSize::Huge)
d->tqparent->enableZoomPlusAction(false);
d->parent->enableZoomPlusAction(false);
if (d->thumbSize <= ThumbnailSize::Small)
d->tqparent->enableZoomMinusAction(false);
d->parent->enableZoomMinusAction(false);
}
}
@ -1175,15 +1175,15 @@ void DigikamView::slotAlbumSyncPicturesMetadata()
BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album);
connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)),
d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&)));
connect(syncMetadata, TQT_SIGNAL(signalProgressValue(int)),
d->tqparent, TQT_SLOT(slotProgressValue(int)));
d->parent, TQT_SLOT(slotProgressValue(int)));
connect(syncMetadata, TQT_SIGNAL(signalComplete()),
this, TQT_SLOT(slotAlbumSyncPicturesMetadataDone()));
connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()),
connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()),
syncMetadata, TQT_SLOT(slotAbort()));
syncMetadata->parseAlbum();

@ -51,7 +51,7 @@ class DigikamView : public TQHBox
public:
DigikamView(TQWidget *tqparent);
DigikamView(TQWidget *parent);
~DigikamView();
void applySettings();

@ -44,8 +44,8 @@
namespace Digikam
{
FirstRunWidget::FirstRunWidget( TQWidget* tqparent )
: TQWidget( tqparent )
FirstRunWidget::FirstRunWidget( TQWidget* parent )
: TQWidget( parent )
{
setName( "FirstRunWidget" );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );

@ -46,7 +46,7 @@ class DIGIKAM_EXPORT FirstRunWidget : public TQWidget
public:
FirstRunWidget( TQWidget* tqparent = 0 );
FirstRunWidget( TQWidget* parent = 0 );
~FirstRunWidget();
public:

@ -40,15 +40,15 @@
namespace Digikam
{
FolderItem::FolderItem(TQListView* tqparent, const TQString& text, bool special)
: TQListViewItem(tqparent, text)
FolderItem::FolderItem(TQListView* parent, const TQString& text, bool special)
: TQListViewItem(parent, text)
{
m_special = special;
m_focus = false;
}
FolderItem::FolderItem(TQListViewItem* tqparent, const TQString& text, bool special)
: TQListViewItem(tqparent, text)
FolderItem::FolderItem(TQListViewItem* parent, const TQString& text, bool special)
: TQListViewItem(parent, text)
{
m_special = special;
m_focus = false;
@ -147,16 +147,16 @@ int FolderItem::id() const
// ------------------------------------------------------------------------------------
FolderCheckListItem::FolderCheckListItem(TQListView* tqparent, const TQString& text,
FolderCheckListItem::FolderCheckListItem(TQListView* parent, const TQString& text,
TQCheckListItem::Type tt)
: TQCheckListItem(tqparent, text, tt)
: TQCheckListItem(parent, text, tt)
{
m_focus = false;
}
FolderCheckListItem::FolderCheckListItem(TQListViewItem* tqparent, const TQString& text,
FolderCheckListItem::FolderCheckListItem(TQListViewItem* parent, const TQString& text,
TQCheckListItem::Type tt)
: TQCheckListItem(tqparent, text, tt)
: TQCheckListItem(parent, text, tt)
{
m_focus = false;
}

@ -40,8 +40,8 @@ class DIGIKAM_EXPORT FolderItem : public TQListViewItem
{
public:
FolderItem(TQListView* tqparent, const TQString& text, bool special=false);
FolderItem(TQListViewItem* tqparent, const TQString& text, bool special=false);
FolderItem(TQListView* parent, const TQString& text, bool special=false);
FolderItem(TQListViewItem* parent, const TQString& text, bool special=false);
virtual ~FolderItem();
@ -67,9 +67,9 @@ class FolderCheckListItem : public TQCheckListItem
{
public:
FolderCheckListItem(TQListView* tqparent, const TQString& text,
FolderCheckListItem(TQListView* parent, const TQString& text,
TQCheckListItem::Type tt);
FolderCheckListItem(TQListViewItem* tqparent, const TQString& text,
FolderCheckListItem(TQListViewItem* parent, const TQString& text,
TQCheckListItem::Type tt);
virtual ~FolderCheckListItem();

@ -77,8 +77,8 @@ public:
//-----------------------------------------------------------------------------
FolderView::FolderView(TQWidget *tqparent, const char *name)
: TQListView(tqparent, name)
FolderView::FolderView(TQWidget *parent, const char *name)
: TQListView(parent, name)
{
d = new FolderViewPriv;

@ -72,7 +72,7 @@ public:
OmitRoot
};
FolderView(TQWidget *tqparent, const char *name = "FolderView");
FolderView(TQWidget *parent, const char *name = "FolderView");
virtual ~FolderView();
void setActive(bool val);

@ -68,14 +68,14 @@ public:
};
};
IconGroupItem::IconGroupItem(IconView* tqparent)
IconGroupItem::IconGroupItem(IconView* parent)
{
d = new IconGroupItemPriv;
d->view = tqparent;
d->view = parent;
m_next = 0;
m_prev = 0;
tqparent->insertGroup(this);
parent->insertGroup(this);
}
IconGroupItem::~IconGroupItem()

@ -45,7 +45,7 @@ class DIGIKAM_EXPORT IconGroupItem
public:
IconGroupItem(IconView* tqparent);
IconGroupItem(IconView* parent);
virtual ~IconGroupItem();
IconView* iconView() const;

@ -35,8 +35,8 @@
namespace Digikam
{
IconItem::IconItem(IconGroupItem* tqparent)
: m_group(tqparent)
IconItem::IconItem(IconGroupItem* parent)
: m_group(parent)
{
m_next = 0;
m_prev = 0;

@ -46,7 +46,7 @@ class DIGIKAM_EXPORT IconItem
public:
IconItem(IconGroupItem* tqparent);
IconItem(IconGroupItem* parent);
virtual ~IconItem();
IconItem* nextItem() const;

@ -133,8 +133,8 @@ public:
};
};
IconView::IconView(TQWidget* tqparent, const char* name)
: TQScrollView(tqparent, name, TQt::WStaticContents|TQt::WNoAutoErase)
IconView::IconView(TQWidget* parent, const char* name)
: TQScrollView(parent, name, TQt::WStaticContents|TQt::WNoAutoErase)
{
viewport()->setBackgroundMode(TQt::NoBackground);
viewport()->setFocusProxy(this);

@ -53,7 +53,7 @@ class DIGIKAM_EXPORT IconView : public TQScrollView
public:
IconView(TQWidget* tqparent=0, const char* name=0);
IconView(TQWidget* parent=0, const char* name=0);
virtual ~IconView();
IconGroupItem* firstGroup() const;

@ -88,7 +88,7 @@ public:
previewThread = 0;
previewPreloadThread = 0;
imageInfo = 0;
tqparent = 0;
parent = 0;
hasPrev = false;
hasNext = false;
loadFullImageSize = false;
@ -121,14 +121,14 @@ public:
PreviewLoadThread *previewThread;
PreviewLoadThread *previewPreloadThread;
AlbumWidgetStack *tqparent;
AlbumWidgetStack *parent;
};
ImagePreviewView::ImagePreviewView(AlbumWidgetStack *tqparent)
: PreviewWidget(tqparent)
ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent)
: PreviewWidget(parent)
{
d = new ImagePreviewViewPriv;
d->tqparent = tqparent;
d->parent = parent;
// get preview size from screen size, but limit from VGA to WTQXGA
d->previewSize = TQMAX(KApplication::desktop()->height(),
@ -252,7 +252,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description
if (preview.isNull())
{
d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode);
d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode);
TQPixmap pix(visibleWidth(), visibleHeight());
pix.fill(ThemeEngine::instance()->baseColor());
TQPainter p(&pix);
@ -265,7 +265,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description
p.end();
// three copies - but the image is small
setImage(DImg(pix.convertToImage()));
d->tqparent->previewLoaded();
d->parent->previewLoaded();
emit signalPreviewLoaded(false);
}
else
@ -273,9 +273,9 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description
DImg img(preview);
if (AlbumSettings::instance()->getExifRotate())
d->previewThread->exifRotate(img, description.filePath);
d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode);
d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode);
setImage(img);
d->tqparent->previewLoaded();
d->parent->previewLoaded();
emit signalPreviewLoaded(true);
}

@ -53,7 +53,7 @@ Q_OBJECT
public:
ImagePreviewView(AlbumWidgetStack *tqparent=0);
ImagePreviewView(AlbumWidgetStack *parent=0);
~ImagePreviewView();
void setLoadFullImageSize(bool b);

@ -46,8 +46,8 @@ namespace Digikam
class DateValidator : public TQValidator
{
public:
DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 )
: TQValidator( TQT_TQOBJECT(tqparent), name ), mKeywords( keywords )
DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
: TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords )
{}
virtual State validate( TQString &str, int& ) const
@ -73,8 +73,8 @@ class DateValidator : public TQValidator
TQStringList mKeywords;
};
KDateEdit::KDateEdit( TQWidget *tqparent, const char *name )
: TQComboBox( true, tqparent, name ),
KDateEdit::KDateEdit( TQWidget *parent, const char *name )
: TQComboBox( true, parent, name ),
mReadOnly( false ),
mDiscardNextMousePress( false )
{

@ -60,7 +60,7 @@ class KDateEdit : public TQComboBox
public:
KDateEdit( TQWidget *tqparent = 0, const char *name = 0 );
KDateEdit( TQWidget *parent = 0, const char *name = 0 );
virtual ~KDateEdit();
/**

@ -40,9 +40,9 @@
namespace Digikam
{
KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *tqparent,
KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *parent,
const char *name)
: TQPopupMenu( tqparent, name )
: TQPopupMenu( parent, name )
{
mItems = items;
mDatePicker = new KDatePicker( this );

@ -72,11 +72,11 @@ public:
@param items List of all desirable items, separated with a bitwise OR.
@param date Initial date of datepicker-widget.
@param tqparent The object's tqparent.
@param parent The object's parent.
@param name The object's name.
*/
KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(),
TQWidget *tqparent = 0, const char *name = 0);
TQWidget *parent = 0, const char *name = 0);
/**
@return A pointer to the private variable mDatePicker, an instance of

@ -34,8 +34,8 @@
namespace Digikam
{
KDateTimeEdit::KDateTimeEdit(TQWidget *tqparent, const char *name)
: TQHBox(tqparent, name)
KDateTimeEdit::KDateTimeEdit(TQWidget *parent, const char *name)
: TQHBox(parent, name)
{
m_datePopUp = new KDateEdit(this, "datepopup");
m_timePopUp = new TQTimeEdit(TQTime::currentTime(), this);

@ -55,10 +55,10 @@ public:
/**
* constructor
* @param tqparent the tqparent widget
* @param parent the parent widget
* @param name the name of the widget
*/
KDateTimeEdit(TQWidget *tqparent, const char *name);
KDateTimeEdit(TQWidget *parent, const char *name);
/**
* destructor

@ -538,8 +538,8 @@ bool DigikamImageCollection::operator==(ImageCollectionShared& imgCollection)
//-- LibKipi interface -----------------------------------------------------------
DigikamKipiInterface::DigikamKipiInterface( TQObject *tqparent, const char *name)
: KIPI::Interface( tqparent, name )
DigikamKipiInterface::DigikamKipiInterface( TQObject *parent, const char *name)
: KIPI::Interface( parent, name )
{
albumManager_ = AlbumManager::instance();
albumDB_ = albumManager_->albumDB();

@ -158,7 +158,7 @@ class DigikamKipiInterface : public KIPI::Interface
public:
DigikamKipiInterface( TQObject *tqparent, const char *name=0);
DigikamKipiInterface( TQObject *parent, const char *name=0);
~DigikamKipiInterface();
virtual KIPI::ImageCollection currentAlbum();

@ -76,8 +76,8 @@ public:
KParts::ReadOnlyPart *mediaPlayerPart;
};
MediaPlayerView::MediaPlayerView(TQWidget *tqparent)
: TQWidgetStack(tqparent, 0, TQt::WDestructiveClose)
MediaPlayerView::MediaPlayerView(TQWidget *parent)
: TQWidgetStack(parent, 0, TQt::WDestructiveClose)
{
d = new MediaPlayerViewPriv;

@ -48,7 +48,7 @@ Q_OBJECT
public:
MediaPlayerView(TQWidget *tqparent=0);
MediaPlayerView(TQWidget *parent=0);
~MediaPlayerView();
void setMediaPlayerFromUrl(const KURL& url);

@ -49,8 +49,8 @@ public:
}
};
MimeFilter::MimeFilter(TQWidget* tqparent)
: TQComboBox(tqparent)
MimeFilter::MimeFilter(TQWidget* parent)
: TQComboBox(parent)
{
d = new MimeFilterPriv;
insertItem( i18n("All Files"), AllFiles );

@ -55,7 +55,7 @@ public:
public:
MimeFilter(TQWidget* tqparent);
MimeFilter(TQWidget* parent);
~MimeFilter();
void setMimeFilter(int filter);

@ -77,8 +77,8 @@ public:
struct Month days[42];
};
MonthWidget::MonthWidget(TQWidget* tqparent)
: TQFrame(tqparent, 0, TQt::WNoAutoErase)
MonthWidget::MonthWidget(TQWidget* parent)
: TQFrame(parent, 0, TQt::WNoAutoErase)
{
d = new MonthWidgetPriv;
init();

@ -44,7 +44,7 @@ class MonthWidget : public TQFrame
public:
MonthWidget(TQWidget* tqparent);
MonthWidget(TQWidget* parent);
~MonthWidget();
void setYearMonth(int year, int month);

@ -68,8 +68,8 @@ public:
AlbumLister::RatingCondition filterCond;
};
RatingFilter::RatingFilter(TQWidget* tqparent)
: RatingWidget(tqparent)
RatingFilter::RatingFilter(TQWidget* parent)
: RatingWidget(parent)
{
d = new RatingFilterPriv;
@ -81,7 +81,7 @@ RatingFilter::RatingFilter(TQWidget* tqparent)
"albums contents. Use contextual pop-up menu to "
"set rating filter condition."));
// To dispatch signal from tqparent widget with filter condition.
// To dispatch signal from parent widget with filter condition.
connect(this, TQT_SIGNAL(signalRatingChanged(int)),
this, TQT_SLOT(slotRatingChanged()));
}

@ -42,7 +42,7 @@ class RatingFilter : public RatingWidget
public:
RatingFilter(TQWidget* tqparent);
RatingFilter(TQWidget* parent);
~RatingFilter();
void setRatingFilterCondition(AlbumLister::RatingCondition cond);

@ -44,8 +44,8 @@
namespace Digikam
{
RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent)
: TQPopupMenu(tqparent)
RatingPopupMenu::RatingPopupMenu(TQWidget* parent)
: TQPopupMenu(parent)
{
KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data");
TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
@ -60,8 +60,8 @@ RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent)
{
TQPixmap pix(starbm.width() * 5, starbm.height());
pix.fill(ThemeEngine::instance()->textSpecialRegColor());
TQBitmap tqmask(starbm.width() * 5, starbm.height());
TQPainter painter(&tqmask);
TQBitmap mask(starbm.width() * 5, starbm.height());
TQPainter painter(&mask);
painter.drawTiledPixmap(0, 0,
i*starbm.width(), pix.height(),
starbm);
@ -69,7 +69,7 @@ RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent)
5*starbm.width()-i*starbm.width(), pix.height(),
clearbm);
painter.end();
pix.setMask(tqmask);
pix.setMask(mask);
insertItem(pix, i);
}
}

@ -40,7 +40,7 @@ class RatingPopupMenu : public TQPopupMenu
public:
RatingPopupMenu(TQWidget* tqparent=0);
RatingPopupMenu(TQWidget* parent=0);
~RatingPopupMenu();
};

@ -61,8 +61,8 @@ public:
TQPixmap regPixmap;
};
RatingWidget::RatingWidget(TQWidget* tqparent)
: TQWidget(tqparent)
RatingWidget::RatingWidget(TQWidget* parent)
: TQWidget(parent)
{
d = new RatingWidgetPriv;

@ -41,7 +41,7 @@ class RatingWidget : public TQWidget
public:
RatingWidget(TQWidget* tqparent);
RatingWidget(TQWidget* parent);
virtual ~RatingWidget();
void setRating(int val);

@ -90,8 +90,8 @@ public:
SearchResultsView *resultsView;
};
SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* tqparent, KURL& url)
: KDialogBase(tqparent, 0, true, i18n("Advanced Search"),
SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
: KDialogBase(parent, 0, true, i18n("Advanced Search"),
Help|Ok|Cancel, Ok, true), m_url(url)
{
d = new SearchAdvancedDialogPriv;

@ -57,10 +57,10 @@ public:
/**
* Constructor
* @param tqparent tqparent window
* @param parent parent window
* @param url holds the url for the search
*/
SearchAdvancedDialog(TQWidget* tqparent, KURL& url);
SearchAdvancedDialog(TQWidget* parent, KURL& url);
/**
* Destructor

@ -64,11 +64,11 @@ class SearchFolderItem : public FolderItem
public:
SearchFolderItem(TQListView* tqparent, SAlbum* album)
: FolderItem(tqparent, album->title()),
SearchFolderItem(TQListView* parent, SAlbum* album)
: FolderItem(parent, album->title()),
m_album(album)
{
m_album->setExtraData(tqparent, this);
m_album->setExtraData(parent, this);
}
~SearchFolderItem()
@ -102,8 +102,8 @@ private:
SAlbum *m_album;
};
SearchFolderView::SearchFolderView(TQWidget* tqparent)
: FolderView(tqparent, "SearchFolderView")
SearchFolderView::SearchFolderView(TQWidget* parent)
: FolderView(parent, "SearchFolderView")
{
addColumn(i18n("My Searches"));
setResizeMode(TQListView::LastColumn);

@ -42,7 +42,7 @@ class SearchFolderView : public FolderView
public:
SearchFolderView(TQWidget* tqparent);
SearchFolderView(TQWidget* parent);
~SearchFolderView();
void quickSearchNew();

@ -71,9 +71,9 @@ public:
SearchResultsView *resultsView;
};
SearchQuickDialog::SearchQuickDialog(TQWidget* tqparent, KURL& url)
SearchQuickDialog::SearchQuickDialog(TQWidget* parent, KURL& url)
: KDialogBase(Plain, i18n("Quick Search"), Help|Ok|Cancel, Ok,
tqparent, 0, true, true), m_url(url)
parent, 0, true, true), m_url(url)
{
d = new SearchQuickDialogPriv;
d->timer = new TQTimer(this);

@ -57,10 +57,10 @@ public:
/**
* Constructor
* @param tqparent tqparent window
* @param parent parent window
* @param url holds the url for the search
*/
SearchQuickDialog(TQWidget* tqparent, KURL& url);
SearchQuickDialog(TQWidget* parent, KURL& url);
/**
* Destructor
*/

@ -66,8 +66,8 @@ public:
KIO::TransferJob* listJob;
};
SearchResultsView::SearchResultsView(TQWidget* tqparent)
: TQIconView(tqparent)
SearchResultsView::SearchResultsView(TQWidget* parent)
: TQIconView(parent)
{
d = new SearchResultsViewPriv;
d->libraryPath = AlbumManager::instance()->getLibraryPath();

@ -56,7 +56,7 @@ class SearchResultsView : public TQIconView
public:
SearchResultsView(TQWidget* tqparent);
SearchResultsView(TQWidget* parent);
~SearchResultsView();
void openURL(const KURL& url);

@ -111,9 +111,9 @@ RuleOpTable[] =
{ I18N_NOOP("Equals"), "EQ", SearchAdvancedRule::RATING },
};
SearchRuleLabel::SearchRuleLabel(const TQString& text, TQWidget *tqparent,
SearchRuleLabel::SearchRuleLabel(const TQString& text, TQWidget *parent,
const char *name, WFlags f )
: TQLabel(text, tqparent, name, f)
: TQLabel(text, parent, name, f)
{
}
@ -122,10 +122,10 @@ void SearchRuleLabel::mouseDoubleClickEvent( TQMouseEvent * e )
emit signalDoubleClick( e );
}
SearchAdvancedRule::SearchAdvancedRule(TQWidget* tqparent, SearchAdvancedRule::Option option)
SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Option option)
: SearchAdvancedBase(SearchAdvancedBase::RULE)
{
m_box = new TQVBox(tqparent);
m_box = new TQVBox(parent);
m_box->tqlayout()->setSpacing( KDialog::spacingHint() );
m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@ -514,10 +514,10 @@ void SearchAdvancedRule::removeCheck()
m_check = 0;
}
SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* tqparent)
SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent)
: SearchAdvancedBase(SearchAdvancedBase::GROUP)
{
m_box = new TQHBox(tqparent);
m_box = new TQHBox(parent);
m_box->tqlayout()->setSpacing(KDialog::spacingHint());
m_groupbox = new TQVGroupBox(m_box);
m_check = new TQCheckBox(m_box);
@ -574,7 +574,7 @@ void SearchAdvancedGroup::removeRules()
}
rule->addCheck();
rule->widget()->reparent((TQWidget*)m_box->tqparent(), TQPoint(0,0));
rule->widget()->reparent((TQWidget*)m_box->parent(), TQPoint(0,0));
rule->widget()->show();
}

@ -60,12 +60,12 @@ public:
/** Constructor. See for more info the TQLabel clas.
* @param text Text of the label
* @param tqparent The tqparent widget
* @param parent The parent widget
* @param name The name
* @param f WFlags
*/
SearchRuleLabel(const TQString & text,
TQWidget * tqparent,
TQWidget * parent,
const char * name=0,
WFlags f=0 );
@ -201,11 +201,11 @@ class SearchAdvancedRule : public SearchAdvancedBase
public:
/**
* Constructor
* @param tqparent The tqparent
* @param parent The parent
* @param option Holds the Option of the rule, see the enum.
*
*/
SearchAdvancedRule(TQWidget* tqparent, Option option);
SearchAdvancedRule(TQWidget* parent, Option option);
/**
* destructor
@ -332,9 +332,9 @@ class SearchAdvancedGroup : public SearchAdvancedBase
public:
/**
* Constructor
* @param tqparent the tqparent
* @param parent the parent
*/
SearchAdvancedGroup(TQWidget* tqparent);
SearchAdvancedGroup(TQWidget* parent);
/**
* Destructor

@ -54,7 +54,7 @@ class TagsListCreationErrorDialog : public KDialogBase
public:
TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap);
TagsListCreationErrorDialog(TQWidget* parent, const TQMap<TQString, TQString>& errMap);
~TagsListCreationErrorDialog(){};
};
@ -87,8 +87,8 @@ public:
SearchTextBar *titleEdit;
};
TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create)
: KDialogBase(tqparent, 0, true, 0, Help|Ok|Cancel, Ok, true)
TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
: KDialogBase(parent, 0, true, 0, Help|Ok|Cancel, Ok, true)
{
d = new TagEditDlgPriv;
d->mainRootAlbum = album;
@ -127,7 +127,7 @@ TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create)
"Ex.: <i>\"Country/City/Paris\"</i></li>"
"<li>',' can be used to create more than one tags hierarchy at the same time.<br>"
"Ex.: <i>\"City/Paris, Monument/Notre-Dame\"</i></li>"
"<li>If a tag hierarchy starts with '/', root tag album is used as tqparent.</li></ul></p></qt>"
"<li>If a tag hierarchy starts with '/', root tag album is used as parent.</li></ul></p></qt>"
));
if (d->create)
@ -152,7 +152,7 @@ TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create)
d->iconButton->setFixedSize(40, 40);
iconTextLabel->setBuddy(d->iconButton);
// In create mode, by default assign the icon of the tqparent (if not root) to this new tag.
// In create mode, by default assign the icon of the parent (if not root) to this new tag.
if (d->create && !d->mainRootAlbum->isRoot())
d->icon = d->mainRootAlbum->icon();
else
@ -262,9 +262,9 @@ void TagEditDlg::slotTitleChanged(const TQString& newtitle)
enableButtonOK(!newtitle.isEmpty());
}
bool TagEditDlg::tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon)
bool TagEditDlg::tagEdit(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon)
{
TagEditDlg dlg(tqparent, album);
TagEditDlg dlg(parent, album);
bool valRet = dlg.exec();
if (valRet == TQDialog::Accepted)
@ -276,9 +276,9 @@ bool TagEditDlg::tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQS
return valRet;
}
bool TagEditDlg::tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon)
bool TagEditDlg::tagCreate(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon)
{
TagEditDlg dlg(tqparent, album, true);
TagEditDlg dlg(parent, album, true);
bool valRet = dlg.exec();
if (valRet == TQDialog::Accepted)
@ -366,19 +366,19 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr
return createdTagsList;
}
void TagEditDlg::showtagsListCreationError(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap)
void TagEditDlg::showtagsListCreationError(TQWidget* parent, const TQMap<TQString, TQString>& errMap)
{
if (!errMap.isEmpty())
{
TagsListCreationErrorDialog dlg(tqparent, errMap);
TagsListCreationErrorDialog dlg(parent, errMap);
dlg.exec();
}
}
// ------------------------------------------------------------------------------
TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap)
: KDialogBase(tqparent, 0, true, 0, Help|Ok, Ok, false)
TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* parent, const TQMap<TQString, TQString>& errMap)
: KDialogBase(parent, 0, true, 0, Help|Ok, Ok, false)
{
setHelp("tagscreation.anchor", "digikam");
setCaption(i18n("Tag creation Error"));

@ -49,26 +49,26 @@ class TagEditDlg : public KDialogBase
public:
TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create=false);
TagEditDlg(TQWidget *parent, TAlbum* album, bool create=false);
~TagEditDlg();
TQString title() const;
TQString icon() const;
static bool tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon);
static bool tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon);
static bool tagEdit(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon);
static bool tagCreate(TQWidget *parent, TAlbum* album, TQString& title, TQString& icon);
/** Create a list of new Tag album using a list of tags hierarchies separated by ",".
A hierarchy of tags is a string path of tags name separated by "/".
If a hierarchy start by "/" or if mainRootAlbum is null, it will be created from
root tag album, else it will be created from mainRootAlbum as tqparent album.
root tag album, else it will be created from mainRootAlbum as parent album.
'errMap' is Map of TAlbum path and error message if tag creation failed.
Return the list of created Albums.
*/
static AlbumList createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr, const TQString& icon,
TQMap<TQString, TQString>& errMap);
static void showtagsListCreationError(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap);
static void showtagsListCreationError(TQWidget* parent, const TQMap<TQString, TQString>& errMap);
private slots:

@ -78,8 +78,8 @@ class TagFilterViewItem : public FolderCheckListItem
public:
TagFilterViewItem(TQListView* tqparent, TAlbum* tag, bool untagged=false);
TagFilterViewItem(TQListViewItem* tqparent, TAlbum* tag);
TagFilterViewItem(TQListView* parent, TAlbum* tag, bool untagged=false);
TagFilterViewItem(TQListViewItem* parent, TAlbum* tag);
TAlbum* album() const;
int id() const;
@ -104,8 +104,8 @@ private:
TAlbum *m_album;
};
TagFilterViewItem::TagFilterViewItem(TQListView* tqparent, TAlbum* album, bool untagged)
: FolderCheckListItem(tqparent, album ? album->title() : i18n("Not Tagged"),
TagFilterViewItem::TagFilterViewItem(TQListView* parent, TAlbum* album, bool untagged)
: FolderCheckListItem(parent, album ? album->title() : i18n("Not Tagged"),
TQCheckListItem::CheckBox/*Controller*/)
{
m_album = album;
@ -117,8 +117,8 @@ TagFilterViewItem::TagFilterViewItem(TQListView* tqparent, TAlbum* album, bool u
m_album->setExtraData(listView(), this);
}
TagFilterViewItem::TagFilterViewItem(TQListViewItem* tqparent, TAlbum* album)
: FolderCheckListItem(tqparent, album->title(),
TagFilterViewItem::TagFilterViewItem(TQListViewItem* parent, TAlbum* album)
: FolderCheckListItem(parent, album->title(),
TQCheckListItem::CheckBox/*Controller*/)
{
m_album = album;
@ -270,8 +270,8 @@ public:
AlbumLister::MatchingCondition matchingCond;
};
TagFilterView::TagFilterView(TQWidget* tqparent)
: FolderView(tqparent, "TagFilterView")
TagFilterView::TagFilterView(TQWidget* parent)
: FolderView(parent, "TagFilterView")
{
d = new TagFilterViewPrivate;
d->timer = new TQTimer(this);
@ -378,16 +378,16 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter)
if (!match)
{
// check if any of the parents match the search
Album* tqparent = talbum->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = talbum->parent();
while (parent && !parent->isRoot())
{
if (tqparent->title().lower().contains(search))
if (parent->title().lower().contains(search))
{
match = true;
break;
}
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}
@ -498,7 +498,7 @@ bool TagFilterView::acceptDrop(const TQDropEvent *e) const
if(itemDrag == itemDrop)
return false;
// Dragging a tqparent on its child makes no sense
// Dragging a parent on its child makes no sense
if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album()))
return false;
@ -511,7 +511,7 @@ bool TagFilterView::acceptDrop(const TQDropEvent *e) const
if (tag)
{
if (tag->tqparent())
if (tag->parent())
{
// Only other possibility is image items being dropped
// And allow this only if there is a Tag to be dropped
@ -680,21 +680,21 @@ void TagFilterView::slotTagAdded(Album* album)
if (!tag)
return;
if (tag->tqparent()->isRoot())
if (tag->parent()->isRoot())
{
new TagFilterViewItem(this, tag);
}
else
{
TagFilterViewItem* tqparent = (TagFilterViewItem*)(tag->tqparent()->extraData(this));
if (!tqparent)
TagFilterViewItem* parent = (TagFilterViewItem*)(tag->parent()->extraData(this));
if (!parent)
{
DWarning() << k_funcinfo << " Failed to find tqparent for Tag "
DWarning() << k_funcinfo << " Failed to find parent for Tag "
<< tag->tagPath() << endl;
return;
}
new TagFilterViewItem(tqparent, tag);
new TagFilterViewItem(parent, tag);
}
setTagThumbnail(tag);
@ -723,9 +723,9 @@ void TagFilterView::slotTagMoved(TAlbum* tag, TAlbum* newParent)
if (!item)
return;
if (item->tqparent())
if (item->parent())
{
TQListViewItem* oldPItem = item->tqparent();
TQListViewItem* oldPItem = item->parent();
oldPItem->takeItem(item);
TagFilterViewItem* newPItem = (TagFilterViewItem*)(newParent->extraData(this));
@ -1122,24 +1122,24 @@ void TagFilterView::slotABCContextMenu()
void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, const TQString& _icon)
{
TAlbum *tqparent;
TAlbum *parent;
TQString title = _title;
TQString icon = _icon;
AlbumManager *man = AlbumManager::instance();
if (!item)
tqparent = man->findTAlbum(0);
parent = man->findTAlbum(0);
else
tqparent = item->album();
parent = item->album();
if (title.isNull())
{
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon))
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
return;
}
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap);
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
@ -1297,7 +1297,7 @@ void TagFilterView::toggleParentTags(TagFilterViewItem* tItem, bool b)
Album *a = dynamic_cast<Album*>(item->album());
if (a)
{
if (a == album->tqparent())
if (a == album->parent())
{
item->setOn(b);
toggleParentTags(item, b);

@ -54,7 +54,7 @@ public:
public:
TagFilterView(TQWidget* tqparent);
TagFilterView(TQWidget* parent);
~TagFilterView();
void stateChanged(TagFilterViewItem*);

@ -74,8 +74,8 @@ class TagFolderViewItem : public FolderItem
public:
TagFolderViewItem(TQListView *tqparent, TAlbum *album);
TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album);
TagFolderViewItem(TQListView *parent, TAlbum *album);
TagFolderViewItem(TQListViewItem *parent, TAlbum *album);
TAlbum* album() const;
int id() const;
@ -91,16 +91,16 @@ private:
TAlbum *m_album;
};
TagFolderViewItem::TagFolderViewItem(TQListView *tqparent, TAlbum *album)
: FolderItem(tqparent, album->title())
TagFolderViewItem::TagFolderViewItem(TQListView *parent, TAlbum *album)
: FolderItem(parent, album->title())
{
setDragEnabled(true);
m_album = album;
m_count = 0;
}
TagFolderViewItem::TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album)
: FolderItem(tqparent, album->title())
TagFolderViewItem::TagFolderViewItem(TQListViewItem *parent, TAlbum *album)
: FolderItem(parent, album->title())
{
setDragEnabled(true);
m_album = album;
@ -112,7 +112,7 @@ void TagFolderViewItem::refresh()
if (!m_album) return;
if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() &&
dynamic_cast<TagFolderViewItem*>(tqparent()))
dynamic_cast<TagFolderViewItem*>(parent()))
{
if (isOpen())
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count));
@ -181,8 +181,8 @@ public:
AlbumManager *albumMan;
};
TagFolderView::TagFolderView(TQWidget *tqparent)
: FolderView(tqparent, "TagFolderView")
TagFolderView::TagFolderView(TQWidget *parent)
: FolderView(parent, "TagFolderView")
{
d = new TagFolderViewPriv();
d->albumMan = AlbumManager::instance();
@ -268,16 +268,16 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter)
if (!match)
{
// check if any of the parents match the search
Album* tqparent = talbum->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = talbum->parent();
while (parent && !parent->isRoot())
{
if (tqparent->title().lower().contains(search))
if (parent->title().lower().contains(search))
{
match = true;
break;
}
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}
@ -342,17 +342,17 @@ void TagFolderView::slotAlbumAdded(Album *album)
}
else
{
TagFolderViewItem *tqparent =
(TagFolderViewItem*)tag->tqparent()->extraData(this);
TagFolderViewItem *parent =
(TagFolderViewItem*)tag->parent()->extraData(this);
if (!tqparent)
if (!parent)
{
DWarning() << k_funcinfo << " Failed to find tqparent for Tag "
DWarning() << k_funcinfo << " Failed to find parent for Tag "
<< tag->title() << endl;
return;
}
item = new TagFolderViewItem(tqparent, tag);
item = new TagFolderViewItem(parent, tag);
tag->setExtraData(this, item);
}
@ -371,7 +371,7 @@ void TagFolderView::slotAlbumDeleted(Album *album)
TagFolderViewItem *item = (TagFolderViewItem*)album->extraData(this);
if(item)
{
TagFolderViewItem *itemParent = dynamic_cast<TagFolderViewItem*>(item->tqparent());
TagFolderViewItem *itemParent = dynamic_cast<TagFolderViewItem*>(item->parent());
if(itemParent)
itemParent->takeItem(item);
@ -396,9 +396,9 @@ void TagFolderView::slotAlbumMoved(TAlbum* tag, TAlbum* newParent)
if (!item)
return;
if (item->tqparent())
if (item->parent())
{
TQListViewItem* oldPItem = item->tqparent();
TQListViewItem* oldPItem = item->parent();
oldPItem->takeItem(item);
}
else
@ -543,7 +543,7 @@ void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int)
popmenu.insertItem(SmallIcon("tag-new"), i18n("New Tag..."), 10);
popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu);
if(tag && tag->tqparent())
if(tag && tag->parent())
{
popmenu.insertItem(SmallIcon("tag-properties"), i18n("Edit Tag Properties..."), 11);
popmenu.insertItem(SmallIcon("tag-reset"), i18n("Reset Tag Icon"), 13);
@ -626,21 +626,21 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con
{
TQString title = _title;
TQString icon = _icon;
TAlbum *tqparent;
TAlbum *parent;
if(!item)
tqparent = d->albumMan->findTAlbum(0);
parent = d->albumMan->findTAlbum(0);
else
tqparent = item->album();
parent = item->album();
if (title.isNull())
{
if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon))
if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
return;
}
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap);
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
@ -764,7 +764,7 @@ TQDragObject* TagFolderView::dragObject()
if(!item)
return 0;
if(!item->tqparent())
if(!item->parent())
return 0;
TagDrag *t = new TagDrag(item->album()->id(), this);
@ -789,14 +789,14 @@ bool TagFolderView::acceptDrop(const TQDropEvent *e) const
if(itemDrag == itemDrop)
return false;
// Dragging a tqparent on its child makes no sense
// Dragging a parent on its child makes no sense
if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album()))
return false;
return true;
}
if (ItemDrag::canDecode(e) && itemDrop && itemDrop->tqparent())
if (ItemDrag::canDecode(e) && itemDrop && itemDrop->parent())
{
// Only other possibility is image items being dropped
// And allow this only if there is a Tag to be dropped

@ -48,7 +48,7 @@ class TagFolderView : public FolderView
public:
TagFolderView(TQWidget *tqparent);
TagFolderView(TQWidget *parent);
~TagFolderView();
void tagNew();

@ -238,11 +238,11 @@ void TagsPopupMenu::slotAboutToShow()
TAlbum* album = man->findTAlbum(*it);
if (album)
{
Album* a = album->tqparent();
Album* a = album->parent();
while (a)
{
tList.append(a->id());
a = a->tqparent();
a = a->parent();
}
}
}
@ -337,8 +337,8 @@ void TagsPopupMenu::slotActivated(int id)
int tagID = id - ADDTAGID;
AlbumManager* man = AlbumManager::instance();
TAlbum* tqparent = man->findTAlbum(tagID);
if (!tqparent)
TAlbum* parent = man->findTAlbum(tagID);
if (!parent)
{
DWarning() << "Failed to find album with id "
<< tagID << endl;
@ -346,11 +346,11 @@ void TagsPopupMenu::slotActivated(int id)
}
TQString title, icon;
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon))
if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon))
return;
TQMap<TQString, TQString> errMap;
AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap);
AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap);
for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)

@ -54,11 +54,11 @@ class TimeLineFolderItem : public FolderItem
public:
TimeLineFolderItem(TQListView* tqparent, SAlbum* album)
: FolderItem(tqparent, album->title()),
TimeLineFolderItem(TQListView* parent, SAlbum* album)
: FolderItem(parent, album->title()),
m_album(album)
{
m_album->setExtraData(tqparent, this);
m_album->setExtraData(parent, this);
}
~TimeLineFolderItem()
@ -89,8 +89,8 @@ private:
SAlbum *m_album;
};
TimeLineFolderView::TimeLineFolderView(TQWidget* tqparent)
: FolderView(tqparent, "TimeLineFolderView")
TimeLineFolderView::TimeLineFolderView(TQWidget* parent)
: FolderView(parent, "TimeLineFolderView")
{
m_currentTimeLineSearchName = TQString("_Current_Time_Line_Search_");
addColumn(i18n("My Date Searches"));

@ -42,7 +42,7 @@ class TimeLineFolderView : public FolderView
public:
TimeLineFolderView(TQWidget* tqparent);
TimeLineFolderView(TQWidget* parent);
~TimeLineFolderView();
void searchDelete(SAlbum* album);

@ -113,8 +113,8 @@ public:
TimeLineFolderView *timeLineFolderView;
};
TimeLineView::TimeLineView(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
TimeLineView::TimeLineView(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new TimeLineViewPriv;
d->timer = new TQTimer(this);

@ -45,7 +45,7 @@ class TimeLineView : public TQWidget
public:
TimeLineView(TQWidget *tqparent=0);
TimeLineView(TQWidget *parent=0);
~TimeLineView();
TimeLineFolderView *folderView() const;

@ -111,8 +111,8 @@ public:
TimeLineWidget::ScaleMode scaleMode;
};
TimeLineWidget::TimeLineWidget(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
TimeLineWidget::TimeLineWidget(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new TimeLineWidgetPriv;
setBackgroundMode(TQt::NoBackground);

@ -72,7 +72,7 @@ public:
public:
TimeLineWidget(TQWidget *tqparent=0);
TimeLineWidget(TQWidget *parent=0);
~TimeLineWidget();
void setTimeUnit(TimeUnit timeUnit);

@ -47,8 +47,8 @@
namespace Digikam
{
WelcomePageView::WelcomePageView(TQWidget* tqparent)
: KHTMLPart(tqparent)
WelcomePageView::WelcomePageView(TQWidget* parent)
: KHTMLPart(parent)
{
widget()->setFocusPolicy(TQ_WheelFocus);
// Let's better be paranoid and disable plugins (it defaults to enabled):

@ -47,7 +47,7 @@ class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart
public:
WelcomePageView(TQWidget* tqparent);
WelcomePageView(TQWidget* parent);
~WelcomePageView();
private:

@ -80,8 +80,8 @@
namespace DigikamAdjustCurvesImagesPlugin
{
AdjustCurveDialog::AdjustCurveDialog(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Curves"), "adjustcurves", true, false)
AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Adjust Color Curves"), "adjustcurves", true, false)
{
m_destinationPreviewData = 0L;

@ -54,7 +54,7 @@ class AdjustCurveDialog : public Digikam::ImageDlgBase
public:
AdjustCurveDialog(TQWidget *tqparent);
AdjustCurveDialog(TQWidget *parent);
~AdjustCurveDialog();
private:

@ -85,8 +85,8 @@ using namespace Digikam;
namespace DigikamAdjustCurvesImagesPlugin
{
AdjustCurvesTool::AdjustCurvesTool(TQObject* tqparent)
: EditorTool(tqparent)
AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
: EditorTool(parent)
{
m_destinationPreviewData = 0;

@ -55,7 +55,7 @@ class AdjustCurvesTool : public Digikam::EditorTool
public:
AdjustCurvesTool(TQObject *tqparent);
AdjustCurvesTool(TQObject *parent);
~AdjustCurvesTool();
private:

@ -41,8 +41,8 @@ using namespace DigikamAdjustCurvesImagesPlugin;
K_EXPORT_COMPONENT_FACTORY( digikamimageplugin_adjustcurves,
KGenericFactory<ImagePlugin_AdjustCurves>("digikamimageplugin_adjustcurves"));
ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *tqparent, const char*, const TQStringList&)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustCurves")
ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *parent, const char*, const TQStringList&)
: Digikam::ImagePlugin(parent, "ImagePlugin_AdjustCurves")
{
m_curvesAction = new KAction(i18n("Curves Adjust..."), "adjustcurves",
CTRL+SHIFT+Key_M, // NOTE: Photoshop 7 use CTRL+M (but it's used in KDE to toogle menu bar).

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustCurves : public Digikam::Imag
public:
ImagePlugin_AdjustCurves(TQObject *tqparent, const char* name,
ImagePlugin_AdjustCurves(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_AdjustCurves();

@ -78,8 +78,8 @@
namespace DigikamAdjustLevelsImagesPlugin
{
AdjustLevelDialog::AdjustLevelDialog(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Levels"),
AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Adjust Color Levels"),
"adjustlevels", true, false)
{
m_destinationPreviewData = 0L;
@ -899,7 +899,7 @@ bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
// pass the event on to the tqparent class
// pass the event on to the parent class
return KDialogBase::eventFilter(obj, ev);
}
}

@ -55,7 +55,7 @@ class AdjustLevelDialog : public Digikam::ImageDlgBase
public:
AdjustLevelDialog(TQWidget *tqparent);
AdjustLevelDialog(TQWidget *parent);
~AdjustLevelDialog();
private:

@ -85,8 +85,8 @@ using namespace Digikam;
namespace DigikamAdjustLevelsImagesPlugin
{
AdjustLevelsTool::AdjustLevelsTool(TQObject* tqparent)
: EditorTool(tqparent)
AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
: EditorTool(parent)
{
m_destinationPreviewData = 0;
@ -881,7 +881,7 @@ bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
// pass the event on to the tqparent class
// pass the event on to the parent class
return EditorTool::eventFilter(obj, ev);
}
}

@ -59,7 +59,7 @@ class AdjustLevelsTool : public Digikam::EditorTool
public:
AdjustLevelsTool(TQObject *tqparent);
AdjustLevelsTool(TQObject *parent);
~AdjustLevelsTool();
private:

@ -41,9 +41,9 @@ using namespace DigikamAdjustLevelsImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_adjustlevels,
KGenericFactory<ImagePlugin_AdjustLevels>("digikamimageplugin_adjustlevels"))
ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *tqparent, const char*,
ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *parent, const char*,
const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustLevels")
: Digikam::ImagePlugin(parent, "ImagePlugin_AdjustLevels")
{
m_levelsAction = new KAction(i18n("Levels Adjust..."), "adjustlevels",
CTRL+Key_L, // NOTE: Photoshop 7 use CTRL+L.

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustLevels : public Digikam::Imag
public:
ImagePlugin_AdjustLevels(TQObject *tqparent, const char* name,
ImagePlugin_AdjustLevels(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_AdjustLevels();

@ -40,9 +40,9 @@
namespace DigikamAntiVignettingImagesPlugin
{
AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent, double density,
AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, TQObject *parent, double density,
double power, double radius, int xshift, int yshift, bool normalize)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "AntiVignetting")
: Digikam::DImgThreadedFilter(orgImage, parent, "AntiVignetting")
{
m_density = density;
m_power = power;

@ -36,7 +36,7 @@ class AntiVignetting : public Digikam::DImgThreadedFilter
public:
AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent=0, double density=2.0,
AntiVignetting(Digikam::DImg *orgImage, TQObject *parent=0, double density=2.0,
double power=1.0, double radius=1.0, int xshift=0, int yshift=0, bool normalize=true);
~AntiVignetting(){};

@ -66,8 +66,8 @@ using namespace Digikam;
namespace DigikamAntiVignettingImagesPlugin
{
AntiVignettingTool::AntiVignettingTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
AntiVignettingTool::AntiVignettingTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("antivignettings");
setToolName(i18n("Vignetting Correction"));
@ -88,7 +88,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* tqparent)
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.") );
"mask applied to the image.") );
// -------------------------------------------------------------
@ -297,7 +297,7 @@ void AntiVignettingTool::prepareEffect()
TQSize ps(orgWidth, orgHeight);
ps.scale( TQSize(120, 120), TQSize::ScaleMin );
// Calc tqmask preview.
// Calc mask preview.
DImg preview(ps.width(), ps.height(), false);
memset(preview.bits(), 255, preview.numBytes());
AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false);

@ -53,7 +53,7 @@ class AntiVignettingTool : public Digikam::EditorToolThreaded
public:
AntiVignettingTool(TQObject *tqparent);
AntiVignettingTool(TQObject *parent);
~AntiVignettingTool();
private slots:

@ -59,8 +59,8 @@
namespace DigikamAntiVignettingImagesPlugin
{
ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Vignetting Correction"),
ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Vignetting Correction"),
"antivignettings", false, true, false,
Digikam::ImageGuideWidget::HVGuideMode, 0, true)
{
@ -91,7 +91,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent)
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.") );
"mask applied to the image.") );
gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2);
// -------------------------------------------------------------
@ -295,7 +295,7 @@ void ImageEffect_AntiVignetting::prepareEffect()
TQSize ps(orgWidth, orgHeight);
ps.scale( TQSize(120, 120), TQSize::ScaleMin );
// Calc tqmask preview.
// Calc mask preview.
Digikam::DImg preview(ps.width(), ps.height(), false);
memset(preview.bits(), 255, preview.numBytes());
AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false);

@ -44,7 +44,7 @@ class ImageEffect_AntiVignetting : public Digikam::ImageGuideDlg
public:
ImageEffect_AntiVignetting(TQWidget *tqparent);
ImageEffect_AntiVignetting(TQWidget *parent);
~ImageEffect_AntiVignetting();
private slots:

@ -42,8 +42,8 @@ using namespace DigikamAntiVignettingImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_antivignetting,
KGenericFactory<ImagePlugin_AntiVignetting>("digikamimageplugin_antivignetting"));
ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_AntiVignetting")
ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting")
{
m_antivignettingAction = new KAction(i18n("Vignetting Correction..."), "antivignetting", 0,
this, TQT_SLOT(slotAntiVignetting()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::Im
public:
ImagePlugin_AntiVignetting(TQObject *tqparent, const char* name,
ImagePlugin_AntiVignetting(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_AntiVignetting();

@ -47,8 +47,8 @@
namespace DigikamBlurFXImagesPlugin
{
BlurFX::BlurFX(Digikam::DImg *orgImage, TQObject *tqparent, int blurFXType, int distance, int level)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "BlurFX")
BlurFX::BlurFX(Digikam::DImg *orgImage, TQObject *parent, int blurFXType, int distance, int level)
: Digikam::DImgThreadedFilter(orgImage, parent, "BlurFX")
{
m_blurFXType = blurFXType;
m_distance = distance;

@ -40,7 +40,7 @@ class BlurFX : public Digikam::DImgThreadedFilter
public:
BlurFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int blurFXType=ZoomBlur,
BlurFX(Digikam::DImg *orgImage, TQObject *parent=0, int blurFXType=ZoomBlur,
int distance=100, int level=45);
~BlurFX(){};

@ -61,8 +61,8 @@ using namespace Digikam;
namespace DigikamBlurFXImagesPlugin
{
BlurFXTool::BlurFXTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
BlurFXTool::BlurFXTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("blurfx");
setToolName(i18n("Blur FX"));

@ -53,7 +53,7 @@ class BlurFXTool : public Digikam::EditorToolThreaded
public:
BlurFXTool(TQObject *tqparent);
BlurFXTool(TQObject *parent);
~BlurFXTool();
private slots:

@ -53,8 +53,8 @@
namespace DigikamBlurFXImagesPlugin
{
ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Apply Blurring Special Effect to Photograph"),
ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Apply Blurring Special Effect to Photograph"),
"blurfx", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -44,7 +44,7 @@ class ImageEffect_BlurFX : public Digikam::CtrlPanelDlg
public:
ImageEffect_BlurFX(TQWidget *tqparent);
ImageEffect_BlurFX(TQWidget *parent);
~ImageEffect_BlurFX();
private slots:

@ -42,8 +42,8 @@ using namespace DigikamBlurFXImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_blurfx,
KGenericFactory<ImagePlugin_BlurFX>("digikamimageplugin_blurfx"));
ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_BlurFX")
ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_BlurFX")
{
m_blurfxAction = new KAction(i18n("Blur Effects..."), "blurfx", 0,
this, TQT_SLOT(slotBlurFX()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_BlurFX : public Digikam::ImagePlugi
public:
ImagePlugin_BlurFX(TQObject *tqparent, const char* name,
ImagePlugin_BlurFX(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_BlurFX();

@ -42,7 +42,7 @@
namespace DigikamBorderImagesPlugin
{
Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHeight,
Border::Border(Digikam::DImg *image, TQObject *parent, int orgWidth, int orgHeight,
TQString borderPath, int borderType, float borderPercent,
Digikam::DColor solidColor,
Digikam::DColor niepceBorderColor,
@ -51,7 +51,7 @@ Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHe
Digikam::DColor bevelLowerRightColor,
Digikam::DColor decorativeFirstColor,
Digikam::DColor decorativeSecondColor)
: Digikam::DImgThreadedFilter(image, tqparent, "Border")
: Digikam::DImgThreadedFilter(image, parent, "Border")
{
m_orgWidth = orgWidth;
m_orgHeight = orgHeight;
@ -78,7 +78,7 @@ Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHe
initFilter();
}
Border::Border(Digikam::DImg *orgImage, TQObject *tqparent, int orgWidth, int orgHeight,
Border::Border(Digikam::DImg *orgImage, TQObject *parent, int orgWidth, int orgHeight,
TQString borderPath, int borderType,
int borderWidth1, int borderWidth2, int borderWidth3, int borderWidth4,
Digikam::DColor solidColor,
@ -88,7 +88,7 @@ Border::Border(Digikam::DImg *orgImage, TQObject *tqparent, int orgWidth, int or
Digikam::DColor bevelLowerRightColor,
Digikam::DColor decorativeFirstColor,
Digikam::DColor decorativeSecondColor)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Border")
: Digikam::DImgThreadedFilter(orgImage, parent, "Border")
{
m_orgWidth = orgWidth;
m_orgHeight = orgHeight;

@ -69,7 +69,7 @@ public:
public:
/** Constructor using settings to preserve aspect ratio of image. */
Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0,
Border(Digikam::DImg *orgImage, TQObject *parent=0, int orgWidth=0, int orgHeight=0,
TQString borderPath=TQString(), int borderType=SolidBorder, float borderPercent=0.1,
Digikam::DColor solidColor = Digikam::DColor(),
Digikam::DColor niepceBorderColor = Digikam::DColor(),
@ -80,7 +80,7 @@ public:
Digikam::DColor decorativeSecondColor = Digikam::DColor());
/** Constructor using settings to not-preserve aspect ratio of image. */
Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0,
Border(Digikam::DImg *orgImage, TQObject *parent=0, int orgWidth=0, int orgHeight=0,
TQString borderPath=TQString(), int borderType=SolidBorder,
int borderWidth1=100, int borderWidth2=20, int borderWidth3=20, int borderWidth4=10,
Digikam::DColor solidColor = Digikam::DColor(),

@ -63,8 +63,8 @@ using namespace Digikam;
namespace DigikamBorderImagesPlugin
{
BorderTool::BorderTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
BorderTool::BorderTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("border");
setToolName(i18n("Add Border"));

@ -62,7 +62,7 @@ class BorderTool : public Digikam::EditorToolThreaded
public:
BorderTool(TQObject *tqparent);
BorderTool(TQObject *parent);
~BorderTool();
private:

@ -56,8 +56,8 @@
namespace DigikamBorderImagesPlugin
{
ImageEffect_Border::ImageEffect_Border(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Add Border Around Photograph"),
ImageEffect_Border::ImageEffect_Border(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Add Border Around Photograph"),
"border", false, false, false,
Digikam::ImageGuideWidget::HVGuideMode)
{

@ -52,7 +52,7 @@ class ImageEffect_Border : public Digikam::ImageGuideDlg
public:
ImageEffect_Border(TQWidget *tqparent);
ImageEffect_Border(TQWidget *parent);
~ImageEffect_Border();
private:

@ -42,8 +42,8 @@ using namespace DigikamBorderImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_border,
KGenericFactory<ImagePlugin_Border>("digikamimageplugin_border"));
ImagePlugin_Border::ImagePlugin_Border(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Border")
ImagePlugin_Border::ImagePlugin_Border(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_Border")
{
m_borderAction = new KAction(i18n("Add Border..."), "bordertool",
0,

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Border : public Digikam::ImagePlugi
public:
ImagePlugin_Border(TQObject *tqparent, const char* name,
ImagePlugin_Border(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Border();

@ -88,8 +88,8 @@
namespace DigikamChannelMixerImagesPlugin
{
ChannelMixerDialog::ChannelMixerDialog(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Color Channel Mixer"),
ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Color Channel Mixer"),
"channelmixer", true, false)
{
m_destinationPreviewData = 0L;

@ -53,7 +53,7 @@ class ChannelMixerDialog : public Digikam::ImageDlgBase
public:
ChannelMixerDialog(TQWidget *tqparent);
ChannelMixerDialog(TQWidget *parent);
~ChannelMixerDialog();
private:

@ -91,8 +91,8 @@ using namespace Digikam;
namespace DigikamChannelMixerImagesPlugin
{
ChannelMixerTool::ChannelMixerTool(TQObject* tqparent)
: EditorTool(tqparent)
ChannelMixerTool::ChannelMixerTool(TQObject* parent)
: EditorTool(parent)
{
m_destinationPreviewData = 0;

@ -56,7 +56,7 @@ class ChannelMixerTool : public Digikam::EditorTool
public:
ChannelMixerTool(TQObject *tqparent);
ChannelMixerTool(TQObject *parent);
~ChannelMixerTool();
private:

@ -41,9 +41,9 @@ using namespace DigikamChannelMixerImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_channelmixer,
KGenericFactory<ImagePlugin_ChannelMixer>("digikamimageplugin_channelmixer"))
ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *tqparent, const char*,
ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *parent, const char*,
const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_ChannelMixer")
: Digikam::ImagePlugin(parent, "ImagePlugin_ChannelMixer")
{
m_channelMixerAction = new KAction(i18n("Channel Mixer..."), "channelmixer",
CTRL+Key_H,

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::Imag
public:
ImagePlugin_ChannelMixer(TQObject *tqparent, const char* name,
ImagePlugin_ChannelMixer(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_ChannelMixer();

@ -42,8 +42,8 @@
namespace DigikamCharcoalImagesPlugin
{
Charcoal::Charcoal(Digikam::DImg *orgImage, TQObject *tqparent, double pencil, double smooth)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Charcoal")
Charcoal::Charcoal(Digikam::DImg *orgImage, TQObject *parent, double pencil, double smooth)
: Digikam::DImgThreadedFilter(orgImage, parent, "Charcoal")
{
m_pencil = pencil;
m_smooth = smooth;

@ -36,7 +36,7 @@ class Charcoal : public Digikam::DImgThreadedFilter
public:
Charcoal(Digikam::DImg *orgImage, TQObject *tqparent=0, double pencil=5.0, double smooth=10.0);
Charcoal(Digikam::DImg *orgImage, TQObject *parent=0, double pencil=5.0, double smooth=10.0);
~Charcoal(){};
private:

@ -59,8 +59,8 @@ using namespace Digikam;
namespace DigikamCharcoalImagesPlugin
{
CharcoalTool::CharcoalTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
CharcoalTool::CharcoalTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("charcoal");
setToolName(i18n("Charcoal"));

@ -50,7 +50,7 @@ class CharcoalTool : public Digikam::EditorToolThreaded
public:
CharcoalTool(TQObject* tqparent);
CharcoalTool(TQObject* parent);
~CharcoalTool();
private slots:

@ -52,8 +52,8 @@
namespace DigikamCharcoalImagesPlugin
{
ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Charcoal Drawing"),
ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Charcoal Drawing"),
"charcoal", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -41,7 +41,7 @@ class ImageEffect_Charcoal : public Digikam::CtrlPanelDlg
public:
ImageEffect_Charcoal(TQWidget* tqparent);
ImageEffect_Charcoal(TQWidget* parent);
~ImageEffect_Charcoal();
private slots:

@ -43,9 +43,9 @@ using namespace DigikamCharcoalImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_charcoal,
KGenericFactory<ImagePlugin_Charcoal>("digikamimageplugin_charcoal"));
ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *tqparent, const char*,
ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *parent, const char*,
const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Charcoal")
: Digikam::ImagePlugin(parent, "ImagePlugin_Charcoal")
{
m_charcoalAction = new KAction(i18n("Charcoal Drawing..."), "charcoaltool", 0,
this, TQT_SLOT(slotCharcoal()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Charcoal : public Digikam::ImagePlu
public:
ImagePlugin_Charcoal(TQObject *tqparent, const char* name,
ImagePlugin_Charcoal(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Charcoal();

@ -76,8 +76,8 @@ using namespace Digikam;
namespace DigikamColorFXImagesPlugin
{
ColorFXTool::ColorFXTool(TQObject* tqparent)
: EditorTool(tqparent)
ColorFXTool::ColorFXTool(TQObject* parent)
: EditorTool(parent)
{
setName("coloreffects");
setToolName(i18n("Color Effects"));

@ -58,7 +58,7 @@ class ColorFXTool : public Digikam::EditorTool
public:
ColorFXTool(TQObject *tqparent);
ColorFXTool(TQObject *parent);
~ColorFXTool();
private:

@ -68,8 +68,8 @@
namespace DigikamColorFXImagesPlugin
{
ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent,
ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent)
: Digikam::ImageDlgBase(parent,
i18n("Apply Color Special Effects to Photograph"),
"coloreffect", false, false)
{

@ -54,7 +54,7 @@ class ImageEffect_ColorFX : public Digikam::ImageDlgBase
public:
ImageEffect_ColorFX(TQWidget *tqparent);
ImageEffect_ColorFX(TQWidget *parent);
~ImageEffect_ColorFX();
private:

@ -44,8 +44,8 @@ using namespace DigikamColorFXImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_colorfx,
KGenericFactory<ImagePlugin_ColorFX>("digikamimageplugin_colorfx"));
ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_ColorFX")
ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX")
{
m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0,
this, TQT_SLOT(slotColorFX()),

@ -40,7 +40,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ColorFX : public Digikam::ImagePlug
public:
ImagePlugin_ColorFX(TQObject *tqparent, const char* name, const TQStringList &args);
ImagePlugin_ColorFX(TQObject *parent, const char* name, const TQStringList &args);
~ImagePlugin_ColorFX();
void setEnabledActions(bool enable);

@ -72,8 +72,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
AutoCorrectionTool::AutoCorrectionTool(TQObject* tqparent)
: EditorTool(tqparent)
AutoCorrectionTool::AutoCorrectionTool(TQObject* parent)
: EditorTool(parent)
{
setName("autocorrection");
setToolName(i18n("Auto-Correction"));

@ -56,7 +56,7 @@ class AutoCorrectionTool : public Digikam::EditorTool
public:
AutoCorrectionTool(TQObject *tqparent);
AutoCorrectionTool(TQObject *parent);
~AutoCorrectionTool();
protected:

@ -74,8 +74,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
BCGTool::BCGTool(TQObject* tqparent)
: EditorTool(tqparent)
BCGTool::BCGTool(TQObject* parent)
: EditorTool(parent)
{
setName("bcgadjust");
setToolName(i18n("Brightness / Contrast / Gamma"));

@ -58,7 +58,7 @@ class BCGTool : public Digikam::EditorTool
public:
BCGTool(TQObject *tqparent);
BCGTool(TQObject *parent);
~BCGTool();
private slots:

@ -59,8 +59,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
BlurTool::BlurTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
BlurTool::BlurTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("gaussianblur");
setToolName(i18n("Blur"));

@ -49,7 +49,7 @@ class BlurTool : public Digikam::EditorToolThreaded
public:
BlurTool(TQObject *tqparent);
BlurTool(TQObject *parent);
~BlurTool();
private slots:

@ -158,8 +158,8 @@ const TQPixmap* ListBoxBWPreviewItem::pixmap() const
// -----------------------------------------------------------------------------------
BWSepiaTool::BWSepiaTool(TQObject* tqparent)
: EditorTool(tqparent)
BWSepiaTool::BWSepiaTool(TQObject* parent)
: EditorTool(parent)
{
setName("convertbw");
setToolName(i18n("Black && White"));
@ -840,7 +840,7 @@ void BWSepiaTool::finalRendering()
void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type)
{
// Value to multiply RGB 8 bits component of tqmask used by changeTonality() method.
// Value to multiply RGB 8 bits component of mask used by changeTonality() method.
int mul = sb ? 255 : 1;
DImgImageFilters filter;
double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0);

@ -68,7 +68,7 @@ class BWSepiaTool : public Digikam::EditorTool
public:
BWSepiaTool(TQObject *tqparent);
BWSepiaTool(TQObject *parent);
~BWSepiaTool();
friend class PreviewPixmapFactory;

@ -75,8 +75,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
HSLTool::HSLTool(TQObject* tqparent)
: EditorTool(tqparent)
HSLTool::HSLTool(TQObject* parent)
: EditorTool(parent)
{
setName("adjusthsl");
setToolName(i18n("Hue / Saturation / Lightness"));

@ -60,7 +60,7 @@ class HSLTool : public Digikam::EditorTool
public:
HSLTool(TQObject *tqparent);
HSLTool(TQObject *parent);
~HSLTool();
private slots:

@ -63,8 +63,8 @@ public:
TQPixmap pixmap;
};
HSPreviewWidget::HSPreviewWidget(TQWidget *tqparent, int xBorder)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
HSPreviewWidget::HSPreviewWidget(TQWidget *parent, int xBorder)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new HSPreviewWidgetPrivate;
d->xBorder = xBorder;

@ -40,7 +40,7 @@ class HSPreviewWidget : public TQWidget
public:
HSPreviewWidget(TQWidget *tqparent=0, int xBorder=0);
HSPreviewWidget(TQWidget *parent=0, int xBorder=0);
~HSPreviewWidget();
void setHS(double hue, double sat);

@ -68,8 +68,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_HSL::ImageEffect_HSL(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Hue/Saturation/Lightness"), "hsladjust", false)
ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Hue/Saturation/Lightness"), "hsladjust", false)
{
m_destinationPreviewData = 0L;
setHelp("hsladjusttool.anchor", "digikam");

@ -54,7 +54,7 @@ class ImageEffect_HSL : public Digikam::ImageDlgBase
public:
ImageEffect_HSL(TQWidget *tqparent);
ImageEffect_HSL(TQWidget *parent);
~ImageEffect_HSL();
private slots:

@ -96,8 +96,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
ICCProofTool::ICCProofTool(TQObject* tqparent)
: EditorTool(tqparent)
ICCProofTool::ICCProofTool(TQObject* parent)
: EditorTool(parent)
{
setName("colormanagement");
setToolName(i18n("Color Management"));

@ -68,7 +68,7 @@ class ICCProofTool : public Digikam::EditorTool
public:
ICCProofTool(TQObject* tqparent);
ICCProofTool(TQObject* parent);
~ICCProofTool();
protected:

@ -71,8 +71,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Auto Color Correction"),
ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Auto Color Correction"),
"autocorrection", false), m_destinationPreviewData(0L)
{
setHelp("autocolorcorrectiontool.anchor", "digikam");

@ -56,7 +56,7 @@ class ImageEffect_AutoCorrection : public Digikam::ImageDlgBase
public:
ImageEffect_AutoCorrection(TQWidget *tqparent);
ImageEffect_AutoCorrection(TQWidget *parent);
~ImageEffect_AutoCorrection();
protected:

@ -67,8 +67,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_BCG::ImageEffect_BCG(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Brightness Contrast Gamma Adjustments"),
ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Brightness Contrast Gamma Adjustments"),
"bcgadjust", false)
{
m_destinationPreviewData = 0L;

@ -55,7 +55,7 @@ class ImageEffect_BCG : public Digikam::ImageDlgBase
public:
ImageEffect_BCG(TQWidget *tqparent);
ImageEffect_BCG(TQWidget *parent);
~ImageEffect_BCG();
private slots:

@ -50,8 +50,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_Blur::ImageEffect_Blur(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Apply Gaussian Blur on Photograph"),
ImageEffect_Blur::ImageEffect_Blur(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Apply Gaussian Blur on Photograph"),
"gaussianblur", false, true, true)
{
setHelp("blursharpentool.anchor", "digikam");

@ -40,7 +40,7 @@ class ImageEffect_Blur : public Digikam::CtrlPanelDlg
public:
ImageEffect_Blur(TQWidget *tqparent);
ImageEffect_Blur(TQWidget *parent);
~ImageEffect_Blur();
private slots:

@ -151,8 +151,8 @@ const TQPixmap* ListBoxBWPreviewItem::pixmap() const
// -----------------------------------------------------------------------------------
ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Convert to Black & White"),
ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Convert to Black & White"),
"convertbw", true, false),
m_destinationPreviewData(0L),
m_channelCB(0),
@ -846,7 +846,7 @@ void ImageEffect_BWSepia::finalRendering()
void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type)
{
// Value to multiply RGB 8 bits component of tqmask used by changeTonality() method.
// Value to multiply RGB 8 bits component of mask used by changeTonality() method.
int mul = sb ? 255 : 1;
Digikam::DImgImageFilters filter;
double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0);

@ -64,7 +64,7 @@ class ImageEffect_BWSepia : public Digikam::ImageDlgBase
public:
ImageEffect_BWSepia(TQWidget *tqparent);
ImageEffect_BWSepia(TQWidget *parent);
~ImageEffect_BWSepia();
friend class PreviewPixmapFactory;

@ -89,8 +89,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent,i18n("Color Management"),
ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
: Digikam::ImageDlgBase(parent,i18n("Color Management"),
"colormanagement", true, false)
{
m_destinationPreviewData = 0;

@ -64,7 +64,7 @@ class ImageEffect_ICCProof : public Digikam::ImageDlgBase
public:
ImageEffect_ICCProof(TQWidget* tqparent);
ImageEffect_ICCProof(TQWidget* parent);
~ImageEffect_ICCProof();
protected:

@ -68,8 +68,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Red Eye Reduction"), "redeye", false)
ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Red Eye Reduction"), "redeye", false)
{
m_destinationPreviewData = 0;
setHelp("redeyecorrectiontool.anchor", "digikam");
@ -394,10 +394,10 @@ void ImageEffect_RedEye::finalRendering()
void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
{
Digikam::DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true,
Digikam::DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true,
selection.bits(), true);
selection = tqmask.copy();
selection = mask.copy();
float redThreshold = m_redThreshold->value()/10.0;
int hue = m_HSSelector->xValue();
int sat = m_HSSelector->yValue();
@ -437,12 +437,12 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
green_norm *= coloring.green() / level;
blue_norm *= coloring.blue() / level;
// Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel.
// Perform a red color pixels detection in selection image and create a correction mask using an alpha channel.
if (!selection.sixteenBit()) // 8 bits image.
{
uchar* ptr = selection.bits();
uchar* mptr = tqmask.bits();
uchar* mptr = mask.bits();
uchar r, g, b, r1, g1, b1;
for (uint i = 0 ; i < selection.width() * selection.height() ; i++)
@ -479,7 +479,7 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
else // 16 bits image.
{
unsigned short* ptr = (unsigned short*)selection.bits();
unsigned short* mptr = (unsigned short*)tqmask.bits();
unsigned short* mptr = (unsigned short*)mask.bits();
unsigned short r, g, b, r1, g1, b1;
for (uint i = 0 ; i < selection.width() * selection.height() ; i++)
@ -514,19 +514,19 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
}
}
// Now, we will blur only the transparency pixels from the tqmask.
// Now, we will blur only the transparency pixels from the mask.
Digikam::DImg tqmask2 = tqmask.copy();
Digikam::DImg mask2 = mask.copy();
Digikam::DImgImageFilters filter;
filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(),
tqmask2.sixteenBit(), m_smoothLevel->value());
filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(),
mask2.sixteenBit(), m_smoothLevel->value());
if (!selection.sixteenBit()) // 8 bits image.
{
uchar* mptr = tqmask.bits();
uchar* mptr2 = tqmask2.bits();
uchar* mptr = mask.bits();
uchar* mptr2 = mask2.bits();
for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++)
for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++)
{
if (mptr2[3] < 255)
{
@ -542,10 +542,10 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
}
else // 16 bits image.
{
unsigned short* mptr = (unsigned short*)tqmask.bits();
unsigned short* mptr2 = (unsigned short*)tqmask2.bits();
unsigned short* mptr = (unsigned short*)mask.bits();
unsigned short* mptr2 = (unsigned short*)mask2.bits();
for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++)
for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++)
{
if (mptr2[3] < 65535)
{
@ -560,14 +560,14 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection)
}
}
// - Perform pixels blending using alpha channel between the tqmask and the selection.
// - Perform pixels blending using alpha channel between the mask and the selection.
Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffSrcOver);
// NOTE: 'tqmask' is the Source image, 'selection' is the Destination image.
// NOTE: 'mask' is the Source image, 'selection' is the Destination image.
selection.bitBlendImage(composer, &tqmask,
0, 0, tqmask.width(), tqmask.height(),
selection.bitBlendImage(composer, &mask,
0, 0, mask.width(), mask.height(),
0, 0);
}

@ -58,8 +58,8 @@ class RedEyePassivePopup : public KPassivePopup
{
public:
RedEyePassivePopup(TQWidget* tqparent)
: KPassivePopup(tqparent), m_parent(tqparent)
RedEyePassivePopup(TQWidget* parent)
: KPassivePopup(parent), m_parent(parent)
{
}
@ -84,7 +84,7 @@ class ImageEffect_RedEye : public Digikam::ImageDlgBase
public:
ImageEffect_RedEye(TQWidget *tqparent);
ImageEffect_RedEye(TQWidget *parent);
~ImageEffect_RedEye();
private slots:

@ -66,8 +66,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_RGB::ImageEffect_RGB(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Color Balance"), "colorbalance", false)
ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Color Balance"), "colorbalance", false)
{
m_destinationPreviewData = 0L;
setHelp("colorbalancetool.anchor", "digikam");

@ -52,7 +52,7 @@ class ImageEffect_RGB : public Digikam::ImageDlgBase
public:
ImageEffect_RGB(TQWidget *tqparent);
ImageEffect_RGB(TQWidget *parent);
~ImageEffect_RGB();
private:

@ -59,8 +59,8 @@ using namespace Digikam;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_core,
KGenericFactory<ImagePlugin_Core>("digikam"));
ImagePlugin_Core::ImagePlugin_Core(TQObject *tqparent, const char*, const TQStringList&)
: ImagePlugin(tqparent, "ImagePlugin_Core")
ImagePlugin_Core::ImagePlugin_Core(TQObject *parent, const char*, const TQStringList&)
: ImagePlugin(parent, "ImagePlugin_Core")
{
//-------------------------------
// Fix and Colors menu actions

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Core : public Digikam::ImagePlugin
public:
ImagePlugin_Core(TQObject *tqparent, const char* name, const TQStringList &args);
ImagePlugin_Core(TQObject *parent, const char* name, const TQStringList &args);
~ImagePlugin_Core();
void setEnabledSelectionActions(bool enable);

@ -61,8 +61,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Aspect Ratio Crop & Composition Guide"),
ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Aspect Ratio Crop & Composition Guide"),
"aspectratiocrop", false)
{
setHelp("ratiocroptool.anchor", "digikam");

@ -52,7 +52,7 @@ class ImageEffect_RatioCrop : public Digikam::ImageDlgBase
public:
ImageEffect_RatioCrop(TQWidget *tqparent);
ImageEffect_RatioCrop(TQWidget *parent);
~ImageEffect_RatioCrop();
private:

@ -139,10 +139,10 @@ public:
Digikam::ImageIface *iface;
};
ImageSelectionWidget::ImageSelectionWidget(int w, int h, TQWidget *tqparent,
ImageSelectionWidget::ImageSelectionWidget(int w, int h, TQWidget *parent,
int widthRatioValue, int heightRatioValue,
int aspectRatioType, int orient, int guideLinesType)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new ImageSelectionWidgetPriv;
d->currentAspectRatioType = aspectRatioType;

@ -90,7 +90,7 @@ public:
public:
ImageSelectionWidget(int width, int height, TQWidget *tqparent=0,
ImageSelectionWidget(int width, int height, TQWidget *parent=0,
int widthRatioValue=1, int heightRatioValue=1,
int aspectRatio=RATIO01X01, int orient=Landscape,
int guideLinesType=GuideNone);

@ -71,8 +71,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
RatioCropTool::RatioCropTool(TQObject* tqparent)
: EditorTool(tqparent)
RatioCropTool::RatioCropTool(TQObject* parent)
: EditorTool(parent)
{
setName("aspectratiocrop");
setToolName(i18n("Aspect Ratio Crop"));

@ -54,7 +54,7 @@ class RatioCropTool : public Digikam::EditorTool
public:
RatioCropTool(TQObject *tqparent);
RatioCropTool(TQObject *parent);
~RatioCropTool();
private:

@ -76,8 +76,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
RedEyeTool::RedEyeTool(TQObject* tqparent)
: EditorTool(tqparent)
RedEyeTool::RedEyeTool(TQObject* parent)
: EditorTool(parent)
{
setName("redeye");
setToolName(i18n("Red Eye"));
@ -407,10 +407,10 @@ void RedEyeTool::finalRendering()
void RedEyeTool::redEyeFilter(DImg& selection)
{
DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true,
DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true,
selection.bits(), true);
selection = tqmask.copy();
selection = mask.copy();
float redThreshold = m_redThreshold->value()/10.0;
int hue = m_HSSelector->xValue();
int sat = m_HSSelector->yValue();
@ -450,12 +450,12 @@ void RedEyeTool::redEyeFilter(DImg& selection)
green_norm *= coloring.green() / level;
blue_norm *= coloring.blue() / level;
// Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel.
// Perform a red color pixels detection in selection image and create a correction mask using an alpha channel.
if (!selection.sixteenBit()) // 8 bits image.
{
uchar* ptr = selection.bits();
uchar* mptr = tqmask.bits();
uchar* mptr = mask.bits();
uchar r, g, b, r1, g1, b1;
for (uint i = 0 ; i < selection.width() * selection.height() ; i++)
@ -492,7 +492,7 @@ void RedEyeTool::redEyeFilter(DImg& selection)
else // 16 bits image.
{
unsigned short* ptr = (unsigned short*)selection.bits();
unsigned short* mptr = (unsigned short*)tqmask.bits();
unsigned short* mptr = (unsigned short*)mask.bits();
unsigned short r, g, b, r1, g1, b1;
for (uint i = 0 ; i < selection.width() * selection.height() ; i++)
@ -527,19 +527,19 @@ void RedEyeTool::redEyeFilter(DImg& selection)
}
}
// Now, we will blur only the transparency pixels from the tqmask.
// Now, we will blur only the transparency pixels from the mask.
DImg tqmask2 = tqmask.copy();
DImg mask2 = mask.copy();
DImgImageFilters filter;
filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(),
tqmask2.sixteenBit(), m_smoothLevel->value());
filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(),
mask2.sixteenBit(), m_smoothLevel->value());
if (!selection.sixteenBit()) // 8 bits image.
{
uchar* mptr = tqmask.bits();
uchar* mptr2 = tqmask2.bits();
uchar* mptr = mask.bits();
uchar* mptr2 = mask2.bits();
for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++)
for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++)
{
if (mptr2[3] < 255)
{
@ -555,10 +555,10 @@ void RedEyeTool::redEyeFilter(DImg& selection)
}
else // 16 bits image.
{
unsigned short* mptr = (unsigned short*)tqmask.bits();
unsigned short* mptr2 = (unsigned short*)tqmask2.bits();
unsigned short* mptr = (unsigned short*)mask.bits();
unsigned short* mptr2 = (unsigned short*)mask2.bits();
for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++)
for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++)
{
if (mptr2[3] < 65535)
{
@ -573,14 +573,14 @@ void RedEyeTool::redEyeFilter(DImg& selection)
}
}
// - Perform pixels blending using alpha channel between the tqmask and the selection.
// - Perform pixels blending using alpha channel between the mask and the selection.
DColorComposer *composer = DColorComposer::getComposer(DColorComposer::PorterDuffSrcOver);
// NOTE: 'tqmask' is the Source image, 'selection' is the Destination image.
// NOTE: 'mask' is the Source image, 'selection' is the Destination image.
selection.bitBlendImage(composer, &tqmask,
0, 0, tqmask.width(), tqmask.height(),
selection.bitBlendImage(composer, &mask,
0, 0, mask.width(), mask.height(),
0, 0);
}

@ -62,8 +62,8 @@ class RedEyePassivePopup : public KPassivePopup
{
public:
RedEyePassivePopup(TQWidget* tqparent)
: KPassivePopup(tqparent), m_parent(tqparent)
RedEyePassivePopup(TQWidget* parent)
: KPassivePopup(parent), m_parent(parent)
{
}
@ -88,7 +88,7 @@ class RedEyeTool : public Digikam::EditorTool
public:
RedEyeTool(TQObject *tqparent);
RedEyeTool(TQObject *parent);
~RedEyeTool();
private slots:

@ -73,8 +73,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
RGBTool::RGBTool(TQObject* tqparent)
: EditorTool(tqparent)
RGBTool::RGBTool(TQObject* parent)
: EditorTool(parent)
{
setName("colorbalance");
setToolName(i18n("Color Balance"));

@ -56,7 +56,7 @@ class RGBTool : public Digikam::EditorTool
public:
RGBTool(TQObject *tqparent);
RGBTool(TQObject *parent);
~RGBTool();
private:

@ -150,13 +150,13 @@ f__fatal(int n, char *s)
else
fprintf(stderr,"%s: %s\n",s,F_err[n-100]);
if (f__curunit) {
fprintf(stderr,"aptqparent state: unit %d ",
fprintf(stderr,"apparent state: unit %d ",
(int)(f__curunit-f__units));
fprintf(stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n",
f__curunit->ufnm);
}
else
fprintf(stderr,"aptqparent state: internal I/O\n");
fprintf(stderr,"apparent state: internal I/O\n");
if (f__fmtbuf)
fprintf(stderr,"last format: %s\n",f__fmtbuf);
fprintf(stderr,"lately %s %s %s %s",f__reading?"reading":"writing",

@ -62,8 +62,8 @@
namespace DigikamImagesPluginCore
{
ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Sharpening Photograph"), "sharpen",
ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Sharpening Photograph"), "sharpen",
true, true, true)
{
setHelp("blursharpentool.anchor", "digikam");
@ -77,7 +77,7 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* tqparent)
m_sharpMethod = new TQComboBox( false, gboxSettings );
m_sharpMethod->insertItem( i18n("Simple sharp") );
m_sharpMethod->insertItem( i18n("Unsharp tqmask") );
m_sharpMethod->insertItem( i18n("Unsharp mask") );
m_sharpMethod->insertItem( i18n("Refocus") );
TQWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image."));

@ -49,7 +49,7 @@ class ImageEffect_Sharpen : public Digikam::CtrlPanelDlg
public:
ImageEffect_Sharpen(TQWidget *tqparent);
ImageEffect_Sharpen(TQWidget *parent);
~ImageEffect_Sharpen();
private slots:

@ -37,9 +37,9 @@
namespace DigikamImagesPluginCore
{
Refocus::Refocus(Digikam::DImg *orgImage, TQObject *tqparent, int matrixSize, double radius,
Refocus::Refocus(Digikam::DImg *orgImage, TQObject *parent, int matrixSize, double radius,
double gauss, double correlation, double noise)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Refocus")
: Digikam::DImgThreadedFilter(orgImage, parent, "Refocus")
{
m_matrixSize = matrixSize;
m_radius = radius;

@ -36,7 +36,7 @@ class Refocus : public Digikam::DImgThreadedFilter
public:
Refocus(Digikam::DImg *orgImage, TQObject *tqparent=0, int matrixSize=5, double radius=0.9,
Refocus(Digikam::DImg *orgImage, TQObject *parent=0, int matrixSize=5, double radius=0.9,
double gauss=0.0, double correlation=0.5, double noise=0.01);
~Refocus(){};

@ -71,8 +71,8 @@ using namespace Digikam;
namespace DigikamImagesPluginCore
{
SharpenTool::SharpenTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
SharpenTool::SharpenTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("sharpen");
setToolName(i18n("Sharpen"));
@ -94,7 +94,7 @@ SharpenTool::SharpenTool(TQObject* tqparent)
m_sharpMethod = new RComboBox(m_gboxSettings->plainPage());
m_sharpMethod->insertItem( i18n("Simple sharp") );
m_sharpMethod->insertItem( i18n("Unsharp tqmask") );
m_sharpMethod->insertItem( i18n("Unsharp mask") );
m_sharpMethod->insertItem( i18n("Refocus") );
m_sharpMethod->setDefaultItem(SimpleSharp);
TQWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image."));

@ -54,7 +54,7 @@ class SharpenTool : public Digikam::EditorToolThreaded
public:
SharpenTool(TQObject *tqparent);
SharpenTool(TQObject *parent);
~SharpenTool();
private slots:

@ -38,9 +38,9 @@
namespace DigikamImagesPluginCore
{
UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent, int radius,
UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, TQObject *parent, int radius,
double amount, double threshold)
: DImgThreadedFilter(orgImage, tqparent, "UnsharpMask")
: DImgThreadedFilter(orgImage, parent, "UnsharpMask")
{
m_radius = radius;
m_amount = amount;

@ -36,7 +36,7 @@ class UnsharpMask : public Digikam::DImgThreadedFilter
public:
UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent=0, int radius=1,
UnsharpMask(Digikam::DImg *orgImage, TQObject *parent=0, int radius=1,
double amount=1.0, double threshold=0.05);
~UnsharpMask(){};

@ -46,9 +46,9 @@
namespace DigikamDistortionFXImagesPlugin
{
DistortionFX::DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent, int effectType,
DistortionFX::DistortionFX(Digikam::DImg *orgImage, TQObject *parent, int effectType,
int level, int iteration, bool antialiasing)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "DistortionFX")
: Digikam::DImgThreadedFilter(orgImage, parent, "DistortionFX")
{
m_effectType = effectType;
m_level = level;

@ -44,7 +44,7 @@ class DistortionFX : public Digikam::DImgThreadedFilter
public:
DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int effectType=0,
DistortionFX(Digikam::DImg *orgImage, TQObject *parent=0, int effectType=0,
int level=0, int iteration=0, bool antialiasing=true);
~DistortionFX(){};

@ -69,8 +69,8 @@ using namespace Digikam;
namespace DigikamDistortionFXImagesPlugin
{
DistortionFXTool::DistortionFXTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
DistortionFXTool::DistortionFXTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("distortionfx");
setToolName(i18n("Distortion Effects"));

@ -55,7 +55,7 @@ class DistortionFXTool : public Digikam::EditorToolThreaded
public:
DistortionFXTool(TQObject *tqparent);
DistortionFXTool(TQObject *parent);
~DistortionFXTool();
private slots:

@ -61,8 +61,8 @@
namespace DigikamDistortionFXImagesPlugin
{
ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Distortion Effects"),
ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Distortion Effects"),
"distortionfx", false, true, false,
Digikam::ImageGuideWidget::HVGuideMode)
{

@ -47,7 +47,7 @@ class ImageEffect_DistortionFX : public Digikam::ImageGuideDlg
public:
ImageEffect_DistortionFX(TQWidget *tqparent);
ImageEffect_DistortionFX(TQWidget *parent);
~ImageEffect_DistortionFX();
private slots:

@ -44,8 +44,8 @@ using namespace DigikamDistortionFXImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_distortionfx,
KGenericFactory<ImagePlugin_DistortionFX>("digikamimageplugin_distortionfx"));
ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_DistortionFX")
ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX")
{
m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0,
this, TQT_SLOT(slotDistortionFX()),

@ -41,7 +41,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_DistortionFX : public Digikam::Imag
public:
ImagePlugin_DistortionFX(TQObject *tqparent, const char* name,
ImagePlugin_DistortionFX(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_DistortionFX();

@ -39,8 +39,8 @@
namespace DigikamEmbossImagesPlugin
{
Emboss::Emboss(Digikam::DImg *orgImage, TQObject *tqparent, int depth)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Emboss")
Emboss::Emboss(Digikam::DImg *orgImage, TQObject *parent, int depth)
: Digikam::DImgThreadedFilter(orgImage, parent, "Emboss")
{
m_depth = depth;
initFilter();

@ -40,7 +40,7 @@ class Emboss : public Digikam::DImgThreadedFilter
public:
Emboss(Digikam::DImg *orgImage, TQObject *tqparent=0, int depth=30);
Emboss(Digikam::DImg *orgImage, TQObject *parent=0, int depth=30);
~Emboss(){};
private:

@ -58,8 +58,8 @@ using namespace Digikam;
namespace DigikamEmbossImagesPlugin
{
EmbossTool::EmbossTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
EmbossTool::EmbossTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("emboss");
setToolName(i18n("Emboss"));

@ -51,7 +51,7 @@ class EmbossTool : public Digikam::EditorToolThreaded
public:
EmbossTool(TQObject* tqparent);
EmbossTool(TQObject* parent);
~EmbossTool();
private slots:

@ -51,8 +51,8 @@
namespace DigikamEmbossImagesPlugin
{
ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Emboss Image"), "emboss", false, false, true,
ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Emboss Image"), "emboss", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{
TQString whatsThis;

@ -42,7 +42,7 @@ class ImageEffect_Emboss : public Digikam::CtrlPanelDlg
public:
ImageEffect_Emboss(TQWidget* tqparent);
ImageEffect_Emboss(TQWidget* parent);
~ImageEffect_Emboss();
private slots:

@ -43,9 +43,9 @@ using namespace DigikamEmbossImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_emboss,
KGenericFactory<ImagePlugin_Emboss>("digikamimageplugin_emboss"));
ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *tqparent, const char*,
ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *parent, const char*,
const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Emboss")
: Digikam::ImagePlugin(parent, "ImagePlugin_Emboss")
{
m_embossAction = new KAction(i18n("Emboss..."), "embosstool", 0,
this, TQT_SLOT(slotEmboss()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Emboss : public Digikam::ImagePlugi
public:
ImagePlugin_Emboss(TQObject *tqparent, const char* name,
ImagePlugin_Emboss(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Emboss();

@ -44,8 +44,8 @@
namespace DigikamFilmGrainImagesPlugin
{
FilmGrain::FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "FilmGrain")
FilmGrain::FilmGrain(Digikam::DImg *orgImage, TQObject *parent, int sensibility)
: Digikam::DImgThreadedFilter(orgImage, parent, "FilmGrain")
{
m_sensibility = sensibility;
initFilter();
@ -72,10 +72,10 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
uchar* data = orgImage->bits();
Digikam::DImg grain(Width, Height, sixteenBit); // Grain blured without curves adjustment.
Digikam::DImg tqmask(Width, Height, sixteenBit); // Grain tqmask with curves adjustment.
Digikam::DImg mask(Width, Height, sixteenBit); // Grain mask with curves adjustment.
uchar* pGrainBits = grain.bits();
uchar* pMaskBits = tqmask.bits();
uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original.
uchar* pMaskBits = mask.bits();
uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original.
int Noise, Shade, nRand, component, progress;
uchar *ptr;
@ -86,7 +86,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
else
Noise = Sensibility / 10;
// This value controls the shading pixel effect between original image and grain tqmask.
// This value controls the shading pixel effect between original image and grain mask.
if (sixteenBit)
Shade = (52 + 1) * 256 - 1;
else
@ -96,7 +96,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = (uint) dt.secsTo(Y2000);
// Make gray grain tqmask.
// Make gray grain mask.
grainData.setSixteenBit(sixteenBit);
@ -127,7 +127,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
postProgress( progress );
}
// Smooth grain tqmask using gaussian blur with radius 1.
// Smooth grain mask using gaussian blur with radius 1.
Digikam::DImgGaussianBlur(this, grain, grain, 25, 30, 1);
// Normally, film grain tends to be most noticeable in the midtones, and much less
@ -174,7 +174,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
// read color from orig image
blendData.setColor(data + offset, sixteenBit);
// read color from tqmask
// read color from mask
maskData.setColor(pMaskBits + offset, sixteenBit);
// set shade as alpha value - it will be used as source alpha when blending
maskData.setAlpha(Shade);

@ -38,7 +38,7 @@ class FilmGrain : public Digikam::DImgThreadedFilter
public:
FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=12);
FilmGrain(Digikam::DImg *orgImage, TQObject *parent=0, int sensibility=12);
~FilmGrain(){};

@ -58,8 +58,8 @@ using namespace Digikam;
namespace DigikamFilmGrainImagesPlugin
{
FilmGrainTool::FilmGrainTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
FilmGrainTool::FilmGrainTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("filmgrain");
setToolName(i18n("Film Grain"));

@ -49,7 +49,7 @@ class FilmGrainTool : public Digikam::EditorToolThreaded
public:
FilmGrainTool(TQObject* tqparent);
FilmGrainTool(TQObject* parent);
~FilmGrainTool();
private slots:

@ -55,8 +55,8 @@
namespace DigikamFilmGrainImagesPlugin
{
ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Add Film Grain to Photograph"),
ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Add Film Grain to Photograph"),
"filmgrain", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -44,7 +44,7 @@ class ImageEffect_FilmGrain : public Digikam::CtrlPanelDlg
public:
ImageEffect_FilmGrain(TQWidget* tqparent);
ImageEffect_FilmGrain(TQWidget* parent);
~ImageEffect_FilmGrain();
private slots:

@ -43,8 +43,8 @@ using namespace DigikamFilmGrainImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_filmgrain,
KGenericFactory<ImagePlugin_FilmGrain>("digikamimageplugin_filmgrain"));
ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_FilmGrain")
ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_FilmGrain")
{
m_filmgrainAction = new KAction(i18n("Add Film Grain..."), "filmgrain", 0,
this, TQT_SLOT(slotFilmGrain()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FilmGrain : public Digikam::ImagePl
public:
ImagePlugin_FilmGrain(TQObject *tqparent, const char* name,
ImagePlugin_FilmGrain(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_FilmGrain();

@ -38,9 +38,9 @@
namespace DigikamFreeRotationImagesPlugin
{
FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent, double angle, bool antialiasing,
FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *parent, double angle, bool antialiasing,
int autoCrop, TQColor backgroundColor, int orgW, int orgH)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "FreeRotation")
: Digikam::DImgThreadedFilter(orgImage, parent, "FreeRotation")
{
m_angle = angle;
m_orgW = orgW;

@ -41,7 +41,7 @@ class FreeRotation : public Digikam::DImgThreadedFilter
public:
FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent=0, double angle=0.0,
FreeRotation(Digikam::DImg *orgImage, TQObject *parent=0, double angle=0.0,
bool antialiasing=true, int autoCrop=NoAutoCrop, TQColor backgroundColor=TQt::black,
int orgW=0, int orgH=0);

@ -64,8 +64,8 @@ using namespace Digikam;
namespace DigikamFreeRotationImagesPlugin
{
FreeRotationTool::FreeRotationTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
FreeRotationTool::FreeRotationTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("freerotation");
setToolName(i18n("Free Rotation"));

@ -56,7 +56,7 @@ class FreeRotationTool : public Digikam::EditorToolThreaded
public:
FreeRotationTool(TQObject *tqparent);
FreeRotationTool(TQObject *parent);
~FreeRotationTool();
private slots:

@ -57,8 +57,8 @@
namespace DigikamFreeRotationImagesPlugin
{
ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Free Rotation"), "freerotation",
ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Free Rotation"), "freerotation",
false, true, true, Digikam::ImageGuideWidget::HVGuideMode)
{
// No need Abort button action.

@ -47,7 +47,7 @@ class ImageEffect_FreeRotation : public Digikam::ImageGuideDlg
public:
ImageEffect_FreeRotation(TQWidget *tqparent);
ImageEffect_FreeRotation(TQWidget *parent);
~ImageEffect_FreeRotation();
private slots:

@ -42,8 +42,8 @@ using namespace DigikamFreeRotationImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_freerotation,
KGenericFactory<ImagePlugin_FreeRotation>("digikamimageplugin_freerotation"));
ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_FreeRotation")
ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_FreeRotation")
{
m_freerotationAction = new KAction(i18n("Free Rotation..."), "freerotation", 0,
this, TQT_SLOT(slotFreeRotation()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FreeRotation : public Digikam::Imag
public:
ImagePlugin_FreeRotation(TQObject *tqparent, const char* name,
ImagePlugin_FreeRotation(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_FreeRotation();

@ -37,8 +37,8 @@
namespace DigikamHotPixelsImagesPlugin
{
BlackFrameListView::BlackFrameListView(TQWidget* tqparent)
: TQListView(tqparent)
BlackFrameListView::BlackFrameListView(TQWidget* parent)
: TQListView(parent)
{
addColumn(i18n("Preview"));
addColumn(i18n("Size"));
@ -51,19 +51,19 @@ BlackFrameListView::BlackFrameListView(TQWidget* tqparent)
// --------------------------------------------------------------------------
BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url)
: TQObject(tqparent), TQListViewItem(tqparent)
BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url)
: TQObject(parent), TQListViewItem(parent)
{
m_parent = tqparent;
m_parent = parent;
m_blackFrameURL = url;
m_parser = new BlackFrameParser(tqparent);
m_parser = new BlackFrameParser(parent);
m_parser->parseBlackFrame(url);
connect(m_parser, TQT_SIGNAL(parsed(TQValueList<HotPixel>)),
this, TQT_SLOT(slotParsed(TQValueList<HotPixel>)));
connect(this, TQT_SIGNAL(parsed(TQValueList<HotPixel>, const KURL&)),
tqparent, TQT_SLOT(slotParsed(TQValueList<HotPixel>, const KURL&)));
parent, TQT_SLOT(slotParsed(TQValueList<HotPixel>, const KURL&)));
connect(m_parser, TQT_SIGNAL(signalLoadingProgress(float)),
this, TQT_SIGNAL(signalLoadingProgress(float)));

@ -54,7 +54,7 @@ class BlackFrameListView : public TQListView
public:
BlackFrameListView(TQWidget* tqparent=0);
BlackFrameListView(TQWidget* parent=0);
~BlackFrameListView(){};
signals:
@ -78,7 +78,7 @@ Q_OBJECT
public:
BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url);
BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url);
~BlackFrameListViewItem(){};
virtual TQString text(int column)const;

@ -56,8 +56,8 @@
namespace DigikamHotPixelsImagesPlugin
{
BlackFrameParser::BlackFrameParser(TQObject *tqparent)
: TQObject(tqparent)
BlackFrameParser::BlackFrameParser(TQObject *parent)
: TQObject(parent)
{
m_imageLoaderThread = 0;
}

@ -62,7 +62,7 @@ class BlackFrameParser: public TQObject
public:
BlackFrameParser(TQObject *tqparent);
BlackFrameParser(TQObject *parent);
~BlackFrameParser();
void parseHotPixels(const TQString &file);

@ -55,9 +55,9 @@
namespace DigikamHotPixelsImagesPlugin
{
HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent, const TQValueList<HotPixel>& hpList,
HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, TQObject *parent, const TQValueList<HotPixel>& hpList,
int interpolationMethod)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "HotPixels")
: Digikam::DImgThreadedFilter(orgImage, parent, "HotPixels")
{
m_hpList = hpList;
m_interpolationMethod = interpolationMethod;

@ -68,7 +68,7 @@ public:
public:
HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent,
HotPixelFixer(Digikam::DImg *orgImage, TQObject *parent,
const TQValueList<HotPixel>& hpList, int interpolationMethod);
~HotPixelFixer();

@ -69,8 +69,8 @@ using namespace Digikam;
namespace DigikamHotPixelsImagesPlugin
{
HotPixelsTool::HotPixelsTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
HotPixelsTool::HotPixelsTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("hotpixels");
setToolName(i18n("Hot Pixels"));

@ -69,7 +69,7 @@ class HotPixelsTool : public Digikam::EditorToolThreaded
public:
HotPixelsTool(TQObject *tqparent);
HotPixelsTool(TQObject *parent);
~HotPixelsTool();
private slots:

@ -58,8 +58,8 @@
namespace DigikamHotPixelsImagesPlugin
{
ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* tqparent)
: CtrlPanelDlg(tqparent, i18n("Hot Pixels Correction"),
ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* parent)
: CtrlPanelDlg(parent, i18n("Hot Pixels Correction"),
"hotpixels", false, false, false,
Digikam::ImagePannelWidget::SeparateViewDuplicate)
{

@ -61,7 +61,7 @@ class ImageEffect_HotPixels : public Digikam::CtrlPanelDlg
public:
ImageEffect_HotPixels(TQWidget *tqparent);
ImageEffect_HotPixels(TQWidget *parent);
~ImageEffect_HotPixels();
private slots:

@ -44,8 +44,8 @@ using namespace DigikamHotPixelsImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_hotpixels,
KGenericFactory<ImagePlugin_HotPixels>("digikamimageplugin_hotpixels"));
ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_HotPixels")
ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_HotPixels")
{
m_hotpixelsAction = new KAction(i18n("Hot Pixels..."), "hotpixels", 0,
this, TQT_SLOT(slotHotPixels()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_HotPixels : public Digikam::ImagePl
public:
ImagePlugin_HotPixels(TQObject *tqparent, const char* name,
ImagePlugin_HotPixels(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_HotPixels();

@ -57,8 +57,8 @@
namespace DigikamInfraredImagesPlugin
{
ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Simulate Infrared Film to Photograph"),
ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Simulate Infrared Film to Photograph"),
"infrared", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -44,7 +44,7 @@ class ImageEffect_Infrared : public Digikam::CtrlPanelDlg
public:
ImageEffect_Infrared(TQWidget* tqparent);
ImageEffect_Infrared(TQWidget* parent);
~ImageEffect_Infrared();
private slots:

@ -43,8 +43,8 @@ using namespace DigikamInfraredImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_infrared,
KGenericFactory<ImagePlugin_Infrared>("digikamimageplugin_infrared"));
ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Infrared")
ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_Infrared")
{
m_infraredAction = new KAction(i18n("Infrared Film..."), "infrared", 0,
this, TQT_SLOT(slotInfrared()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Infrared : public Digikam::ImagePlu
public:
ImagePlugin_Infrared(TQObject *tqparent, const char* name,
ImagePlugin_Infrared(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Infrared();

@ -44,8 +44,8 @@
namespace DigikamInfraredImagesPlugin
{
Infrared::Infrared(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility, bool grain)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Infrared")
Infrared::Infrared(Digikam::DImg *orgImage, TQObject *parent, int sensibility, bool grain)
: Digikam::DImgThreadedFilter(orgImage, parent, "Infrared")
{
m_sensibility = sensibility;
m_grain = grain;
@ -110,9 +110,9 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
uchar* pBWBits = 0; // Black and White conversion.
uchar* pBWBlurBits = 0; // Black and White with blur.
uchar* pGrainBits = 0; // Grain blured without curves adjustment.
uchar* pMaskBits = 0; // Grain tqmask with curves adjustment.
uchar* pMaskBits = 0; // Grain mask with curves adjustment.
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.
uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original.
Digikam::DColor bwData, bwBlurData, grainData, maskData, overData, outData;
@ -153,14 +153,14 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
}
//-----------------------------------------------------------------
// 2 - Create Gaussian blured averlay tqmask with grain if necessary.
// 2 - Create Gaussian blured averlay mask with grain if necessary.
//-----------------------------------------------------------------
if (Grain)
{
// Create gray grain tqmask.
// Create gray grain mask.
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
@ -198,7 +198,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
postProgress( progress );
}
// Smooth grain tqmask using gaussian blur.
// Smooth grain mask using gaussian blur.
Digikam::DImgImageFilters().gaussianBlurImage(pGrainBits, Width, Height, sixteenBit, 1);
@ -223,7 +223,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
if (Grain)
{
Digikam::ImageCurves *grainCurves = new Digikam::ImageCurves(sixteenBit);
pMaskBits = new uchar[numBytes]; // Grain tqmask with curves adjustment.
pMaskBits = new uchar[numBytes]; // Grain mask with curves adjustment.
// We modify only global luminosity of the grain.
if (sixteenBit)
@ -268,7 +268,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffNone);
int alpha;
int Shade = 52; // This value control the shading pixel effect between original image and grain tqmask.
int Shade = 52; // This value control the shading pixel effect between original image and grain mask.
if (sixteenBit)
Shade = (Shade + 1) * 256 - 1;
@ -280,7 +280,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
// read color from orig image
bwBlurData.setColor(pBWBlurBits + offset, sixteenBit);
// read color from tqmask
// read color from mask
maskData.setColor(pMaskBits + offset, sixteenBit);
// set shade as alpha value - it will be used as source alpha when blending
maskData.setAlpha(Shade);
@ -317,7 +317,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
}
//------------------------------------------
// 3 - Merge Grayscale image & overlay tqmask.
// 3 - Merge Grayscale image & overlay mask.
//------------------------------------------
// Merge overlay and gray scale image using 'Overlay' Gimp method for increase the highlight.

@ -37,7 +37,7 @@ class Infrared : public Digikam::DImgThreadedFilter
public:
Infrared(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=1, bool grain=true);
Infrared(Digikam::DImg *orgImage, TQObject *parent=0, int sensibility=1, bool grain=true);
~Infrared(){};

@ -60,8 +60,8 @@ using namespace Digikam;
namespace DigikamInfraredImagesPlugin
{
InfraredTool::InfraredTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
InfraredTool::InfraredTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("infrared");
setToolName(i18n("Infrared"));

@ -50,7 +50,7 @@ class InfraredTool : public Digikam::EditorToolThreaded
public:
InfraredTool(TQObject* tqparent);
InfraredTool(TQObject* parent);
~InfraredTool();
private slots:

@ -83,7 +83,7 @@ class InPaintingPassivePopup : public KPassivePopup
{
public:
InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {}
InPaintingPassivePopup(TQWidget* parent) : KPassivePopup(parent), m_parent(parent) {}
protected:
@ -96,7 +96,7 @@ private:
//------------------------------------------------------------------------------------------
void ImageEffect_InPainting::inPainting(TQWidget* tqparent)
void ImageEffect_InPainting::inPainting(TQWidget* parent)
{
// -- check if we actually have a selection --------------------
@ -107,7 +107,7 @@ void ImageEffect_InPainting::inPainting(TQWidget* tqparent)
if (!w || !h)
{
InPaintingPassivePopup* popup = new InPaintingPassivePopup(tqparent);
InPaintingPassivePopup* popup = new InPaintingPassivePopup(parent);
popup->setView(i18n("Inpainting Photograph Tool"),
i18n("You need to select a region to inpaint to use "
"this tool"));
@ -119,14 +119,14 @@ void ImageEffect_InPainting::inPainting(TQWidget* tqparent)
// -- run the dlg ----------------------------------------------
ImageEffect_InPainting_Dialog dlg(tqparent);
ImageEffect_InPainting_Dialog dlg(parent);
dlg.exec();
}
//------------------------------------------------------------------------------------------
ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Photograph Inpainting"),
ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Photograph Inpainting"),
"inpainting", true, true, false,
Digikam::ImageGuideWidget::HVGuideMode,
0, true, true, true)
@ -322,12 +322,12 @@ void ImageEffect_InPainting_Dialog::prepareEffect()
iface.originalSixteenBit(), iface.originalHasAlpha(), data);
delete [] data;
// Selected area from the image and tqmask creation:
// Selected area from the image and mask creation:
//
// We optimize the computation time to use the current selected area in image editor
// and to create an inpainting tqmask with it. Because inpainting is done by interpolation
// and to create an inpainting mask with it. Because inpainting is done by interpolation
// neighboor pixels which can be located far from the selected area, we need to ajust the
// tqmask size in according with the parameter algorithms, especially 'amplitude'.
// mask size in according with the parameter algorithms, especially 'amplitude'.
// Mask size is computed like this :
//
// (image_size_x + 2*amplitude , image_size_y + 2*amplitude)
@ -351,7 +351,7 @@ void ImageEffect_InPainting_Dialog::prepareEffect()
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.
// We need to check if mask area is out of image size else inpainting give strange results.
if (m_maskRect.left() < 0) m_maskRect.setLeft(0);
if (m_maskRect.top() < 0) m_maskRect.setTop(0);

@ -52,7 +52,7 @@ class ImageEffect_InPainting
{
public:
static void inPainting(TQWidget *tqparent);
static void inPainting(TQWidget *parent);
};
//-----------------------------------------------------------
@ -64,7 +64,7 @@ class ImageEffect_InPainting_Dialog : public Digikam::ImageGuideDlg
public:
ImageEffect_InPainting_Dialog(TQWidget* tqparent);
ImageEffect_InPainting_Dialog(TQWidget* parent);
~ImageEffect_InPainting_Dialog();
private slots:

@ -45,8 +45,8 @@ using namespace Digikam;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inpainting,
KGenericFactory<ImagePlugin_InPainting>("digikamimageplugin_inpainting"));
ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_InPainting")
ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_InPainting")
{
m_inPaintingAction = new KAction(i18n("Inpainting..."), "inpainting",
CTRL+Key_E,

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InPainting : public Digikam::ImageP
public:
ImagePlugin_InPainting(TQObject *tqparent, const char* name,
ImagePlugin_InPainting(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_InPainting();

@ -82,8 +82,8 @@ using namespace Digikam;
namespace DigikamInPaintingImagesPlugin
{
InPaintingTool::InPaintingTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
InPaintingTool::InPaintingTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("inpainting");
setToolName(i18n("Inpainting"));
@ -286,12 +286,12 @@ void InPaintingTool::prepareEffect()
iface.originalSixteenBit(), iface.originalHasAlpha(), data);
delete [] data;
// Selected area from the image and tqmask creation:
// Selected area from the image and mask creation:
//
// We optimize the computation time to use the current selected area in image editor
// and to create an inpainting tqmask with it. Because inpainting is done by interpolation
// and to create an inpainting mask with it. Because inpainting is done by interpolation
// neighboor pixels which can be located far from the selected area, we need to ajust the
// tqmask size in according with the parameter algorithms, especially 'amplitude'.
// mask size in according with the parameter algorithms, especially 'amplitude'.
// Mask size is computed like this :
//
// (image_size_x + 2*amplitude , image_size_y + 2*amplitude)
@ -315,7 +315,7 @@ void InPaintingTool::prepareEffect()
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.
// We need to check if mask area is out of image size else inpainting give strange results.
if (m_maskRect.left() < 0) m_maskRect.setLeft(0);
if (m_maskRect.top() < 0) m_maskRect.setTop(0);

@ -57,7 +57,7 @@ class InPaintingPassivePopup : public KPassivePopup
{
public:
InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {}
InPaintingPassivePopup(TQWidget* parent) : KPassivePopup(parent), m_parent(parent) {}
protected:
@ -77,7 +77,7 @@ class InPaintingTool : public Digikam::EditorToolThreaded
public:
InPaintingTool(TQObject* tqparent);
InPaintingTool(TQObject* parent);
~InPaintingTool();
private slots:

@ -75,11 +75,11 @@ public:
TQPalette m_palette;
};
FontChooserWidget::FontChooserWidget(TQWidget *tqparent, const char *name,
FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
bool onlyFixed, const TQStringList &fontList,
int visibleListSize, bool diff,
TQButton::ToggleState *sizeIsRelativeState )
: TQWidget(tqparent, name), usingFixed(onlyFixed)
: TQWidget(parent, name), usingFixed(onlyFixed)
{
charsetsCombo = 0;

@ -74,7 +74,7 @@ public:
public:
FontChooserWidget(TQWidget *tqparent = 0L, const char *name = 0L,
FontChooserWidget(TQWidget *parent = 0L, const char *name = 0L,
bool onlyFixed = false,
const TQStringList &fontList = TQStringList(),
int visibleListSize=8,

@ -69,8 +69,8 @@
namespace DigikamInsertTextImagesPlugin
{
ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Insert Text on Photograph"),
ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Insert Text on Photograph"),
"inserttext", false, false)
{
TQString whatsThis;

@ -55,7 +55,7 @@ class ImageEffect_InsertText : public Digikam::ImageDlgBase
public:
ImageEffect_InsertText(TQWidget *tqparent);
ImageEffect_InsertText(TQWidget *parent);
~ImageEffect_InsertText();
signals:

@ -41,8 +41,8 @@ using namespace DigikamInsertTextImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inserttext,
KGenericFactory<ImagePlugin_InsertText>("digikamimageplugin_inserttext"));
ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_InsertText")
ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_InsertText")
{
m_insertTextAction = new KAction(i18n("Insert Text..."), "inserttext",
SHIFT+CTRL+Key_T,

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImageP
public:
ImagePlugin_InsertText(TQObject *tqparent, const char* name,
ImagePlugin_InsertText(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_InsertText();

@ -71,8 +71,8 @@ using namespace Digikam;
namespace DigikamInsertTextImagesPlugin
{
InsertTextTool::InsertTextTool(TQObject* tqparent)
: EditorTool(tqparent)
InsertTextTool::InsertTextTool(TQObject* parent)
: EditorTool(parent)
{
setName("inserttext");
setToolName(i18n("Insert Text"));

@ -61,7 +61,7 @@ class InsertTextTool : public Digikam::EditorTool
public:
InsertTextTool(TQObject *tqparent);
InsertTextTool(TQObject *parent);
~InsertTextTool();
signals:

@ -51,8 +51,8 @@
namespace DigikamInsertTextImagesPlugin
{
InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
m_currentMoving = false;

@ -86,7 +86,7 @@ Q_OBJECT
public:
InsertTextWidget(int w, int h, TQWidget *tqparent=0);
InsertTextWidget(int w, int h, TQWidget *parent=0);
~InsertTextWidget();
Digikam::ImageIface* imageIface();

@ -61,8 +61,8 @@
namespace DigikamLensDistortionImagesPlugin
{
ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Lens Distortion Correction"),
ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Lens Distortion Correction"),
"lensdistortion", false, true, true,
Digikam::ImageGuideWidget::HVGuideMode)
{

@ -48,7 +48,7 @@ class ImageEffect_LensDistortion : public Digikam::ImageGuideDlg
public:
ImageEffect_LensDistortion(TQWidget *tqparent);
ImageEffect_LensDistortion(TQWidget *parent);
~ImageEffect_LensDistortion();
private slots:

@ -41,8 +41,8 @@ using namespace DigikamLensDistortionImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_lensdistortion,
KGenericFactory<ImagePlugin_LensDistortion>("digikamimageplugin_lensdistortion"));
ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_LensDistortion")
ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_LensDistortion")
{
m_lensdistortionAction = new KAction(i18n("Lens Distortion..."), "lensdistortion", 0,
this, TQT_SLOT(slotLensDistortion()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::Im
public:
ImagePlugin_LensDistortion(TQObject *tqparent, const char* name,
ImagePlugin_LensDistortion(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_LensDistortion();

@ -37,10 +37,10 @@
namespace DigikamLensDistortionImagesPlugin
{
LensDistortion::LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent, double main,
LensDistortion::LensDistortion(Digikam::DImg *orgImage, TQObject *parent, double main,
double edge, double rescale, double brighten,
int center_x, int center_y)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "LensDistortion")
: Digikam::DImgThreadedFilter(orgImage, parent, "LensDistortion")
{
m_main = main;
m_edge = edge;

@ -37,7 +37,7 @@ class LensDistortion : public Digikam::DImgThreadedFilter
public:
LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent=0, double main=0.0,
LensDistortion(Digikam::DImg *orgImage, TQObject *parent=0, double main=0.0,
double edge=0.0, double rescale=0.0, double brighten=0.0,
int center_x=0, int center_y=0);

@ -69,8 +69,8 @@ using namespace Digikam;
namespace DigikamLensDistortionImagesPlugin
{
LensDistortionTool::LensDistortionTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
LensDistortionTool::LensDistortionTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("lensdistortion");
setToolName(i18n("Lens Distortion"));

@ -53,7 +53,7 @@ class LensDistortionTool : public Digikam::EditorToolThreaded
public:
LensDistortionTool(TQObject *tqparent);
LensDistortionTool(TQObject *parent);
~LensDistortionTool();
private slots:

@ -61,8 +61,8 @@
namespace DigikamNoiseReductionImagesPlugin
{
ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Noise Reduction"),
ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Noise Reduction"),
"noisereduction", true, true, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -40,7 +40,7 @@ class ImageEffect_NoiseReduction : public Digikam::CtrlPanelDlg
public:
ImageEffect_NoiseReduction(TQWidget* tqparent);
ImageEffect_NoiseReduction(TQWidget* parent);
~ImageEffect_NoiseReduction();
private slots:

@ -42,8 +42,8 @@ using namespace DigikamNoiseReductionImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_noisereduction,
KGenericFactory<ImagePlugin_NoiseReduction>("digikamimageplugin_noisereduction"));
ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_NoiseReduction")
ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_NoiseReduction")
{
m_noiseReductionAction = new KAction(i18n("Noise Reduction..."), "noisereduction", 0,
this, TQT_SLOT(slotNoiseReduction()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_NoiseReduction : public Digikam::Im
public:
ImagePlugin_NoiseReduction(TQObject *tqparent, const char* name,
ImagePlugin_NoiseReduction(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_NoiseReduction();

@ -48,10 +48,10 @@
namespace DigikamNoiseReductionImagesPlugin
{
NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent,
NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, TQObject *parent,
double radius, double lsmooth, double effect, double texture, double sharp,
double csmooth, double lookahead, double gamma, double damping, double phase)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "NoiseReduction")
: Digikam::DImgThreadedFilter(orgImage, parent, "NoiseReduction")
{
m_radius = radius; /* default radius default = 1.0 */
m_sharp = sharp; /* Sharpness factor default = 0.25 */

@ -201,7 +201,7 @@ class NoiseReduction : public Digikam::DImgThreadedFilter
public:
NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent,
NoiseReduction(Digikam::DImg *orgImage, TQObject *parent,
double radius, double lsmooth, double effect, double texture, double sharp,
double csmooth, double lookahead, double gamma, double damping, double phase);
~NoiseReduction(){};

@ -68,8 +68,8 @@ using namespace Digikam;
namespace DigikamNoiseReductionImagesPlugin
{
NoiseReductionTool::NoiseReductionTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
NoiseReductionTool::NoiseReductionTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("noisereduction");
setToolName(i18n("Noise Reduction"));

@ -49,7 +49,7 @@ class NoiseReductionTool : public Digikam::EditorToolThreaded
public:
NoiseReductionTool(TQObject* tqparent);
NoiseReductionTool(TQObject* parent);
~NoiseReductionTool();
private:

@ -54,8 +54,8 @@
namespace DigikamOilPaintImagesPlugin
{
ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Apply Oil Paint Effect"),
ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Apply Oil Paint Effect"),
"oilpaint", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -41,7 +41,7 @@ class ImageEffect_OilPaint : public Digikam::CtrlPanelDlg
public:
ImageEffect_OilPaint(TQWidget* tqparent);
ImageEffect_OilPaint(TQWidget* parent);
~ImageEffect_OilPaint();
private slots:

@ -42,8 +42,8 @@ using namespace DigikamOilPaintImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_oilpaint,
KGenericFactory<ImagePlugin_OilPaint>("digikamimageplugin_oilpaint"));
ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *tqparent, const char*, const TQStringList&)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_OilPaint")
ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *parent, const char*, const TQStringList&)
: Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint")
{
m_oilpaintAction = new KAction(i18n("Oil Paint..."), "oilpaint", 0,
this, TQT_SLOT(slotOilPaint()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_OilPaint : public Digikam::ImagePlu
public:
ImagePlugin_OilPaint(TQObject *tqparent, const char* name,
ImagePlugin_OilPaint(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_OilPaint();

@ -41,8 +41,8 @@
namespace DigikamOilPaintImagesPlugin
{
OilPaint::OilPaint(Digikam::DImg *orgImage, TQObject *tqparent, int brushSize, int smoothness)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "OilPaint")
OilPaint::OilPaint(Digikam::DImg *orgImage, TQObject *parent, int brushSize, int smoothness)
: Digikam::DImgThreadedFilter(orgImage, parent, "OilPaint")
{
m_brushSize = brushSize;
m_smoothness = smoothness;

@ -37,7 +37,7 @@ class OilPaint : public Digikam::DImgThreadedFilter
public:
OilPaint(Digikam::DImg *orgImage, TQObject *tqparent=0, int brushSize=1, int smoothness=30);
OilPaint(Digikam::DImg *orgImage, TQObject *parent=0, int brushSize=1, int smoothness=30);
~OilPaint(){};

@ -61,8 +61,8 @@ using namespace Digikam;
namespace DigikamOilPaintImagesPlugin
{
OilPaintTool::OilPaintTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
OilPaintTool::OilPaintTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("oilpaint");
setToolName(i18n("Oil Paint"));

@ -50,7 +50,7 @@ class OilPaintTool : public Digikam::EditorToolThreaded
public:
OilPaintTool(TQObject* tqparent);
OilPaintTool(TQObject* parent);
~OilPaintTool();
private slots:

@ -60,8 +60,8 @@
namespace DigikamPerspectiveImagesPlugin
{
ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Adjust Photograph Perspective"),
ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Adjust Photograph Perspective"),
"perspective", false, false)
{
TQString whatsThis;

@ -50,7 +50,7 @@ class ImageEffect_Perspective : public Digikam::ImageDlgBase
public:
ImageEffect_Perspective(TQWidget* tqparent);
ImageEffect_Perspective(TQWidget* parent);
~ImageEffect_Perspective();
private slots:

@ -41,8 +41,8 @@ using namespace DigikamPerspectiveImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_perspective,
KGenericFactory<ImagePlugin_Perspective>("digikamimageplugin_perspective"));
ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Perspective")
ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_Perspective")
{
m_perspectiveAction = new KAction(i18n("Perspective Adjustment..."), "perspective", 0,
this, TQT_SLOT(slotPerspective()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::Image
public:
ImagePlugin_Perspective(TQObject *tqparent, const char* name,
ImagePlugin_Perspective(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Perspective();

@ -67,8 +67,8 @@ using namespace Digikam;
namespace DigikamPerspectiveImagesPlugin
{
PerspectiveTool::PerspectiveTool(TQObject* tqparent)
: EditorTool(tqparent)
PerspectiveTool::PerspectiveTool(TQObject* parent)
: EditorTool(parent)
{
setName("perspective");
setToolName(i18n("Perspective"));

@ -59,7 +59,7 @@ class PerspectiveTool : public Digikam::EditorTool
public:
PerspectiveTool(TQObject* tqparent);
PerspectiveTool(TQObject* parent);
~PerspectiveTool();
private slots:

@ -60,8 +60,8 @@
namespace DigikamPerspectiveImagesPlugin
{
PerspectiveWidget::PerspectiveWidget(int w, int h, TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
PerspectiveWidget::PerspectiveWidget(int w, int h, TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
setBackgroundMode(TQt::NoBackground);
setMinimumSize(w, h);

@ -58,7 +58,7 @@ Q_OBJECT
public:
PerspectiveWidget(int width, int height, TQWidget *tqparent=0);
PerspectiveWidget(int width, int height, TQWidget *parent=0);
~PerspectiveWidget();
TQRect getTargetSize(void);

@ -53,8 +53,8 @@
namespace DigikamRainDropImagesPlugin
{
ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Add Raindrops to Photograph"),
ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Add Raindrops to Photograph"),
"raindrops", false, true, false,
Digikam::ImageGuideWidget::HVGuideMode)
{

@ -41,7 +41,7 @@ class ImageEffect_RainDrop : public Digikam::ImageGuideDlg
public:
ImageEffect_RainDrop(TQWidget *tqparent);
ImageEffect_RainDrop(TQWidget *parent);
~ImageEffect_RainDrop();
private slots:

@ -41,8 +41,8 @@ using namespace DigikamRainDropImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_raindrop,
KGenericFactory<ImagePlugin_RainDrop>("digikamimageplugin_raindrop"));
ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_RainDrop")
ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop")
{
m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0,
this, TQT_SLOT(slotRainDrop()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_RainDrop : public Digikam::ImagePlu
public:
ImagePlugin_RainDrop(TQObject *tqparent, const char* name,
ImagePlugin_RainDrop(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_RainDrop();

@ -45,9 +45,9 @@
namespace DigikamRainDropImagesPlugin
{
RainDrop::RainDrop(Digikam::DImg *orgImage, TQObject *tqparent, int drop,
RainDrop::RainDrop(Digikam::DImg *orgImage, TQObject *parent, int drop,
int amount, int coeff, TQRect *selection)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "RainDrop")
: Digikam::DImgThreadedFilter(orgImage, parent, "RainDrop")
{
m_drop = drop;
m_amount = amount;

@ -39,7 +39,7 @@ class RainDrop : public Digikam::DImgThreadedFilter
public:
RainDrop(Digikam::DImg *orgImage, TQObject *tqparent=0, int drop=80,
RainDrop(Digikam::DImg *orgImage, TQObject *parent=0, int drop=80,
int amount=150, int coeff=30, TQRect *selection=0L);
~RainDrop(){};

@ -60,8 +60,8 @@ using namespace Digikam;
namespace DigikamRainDropImagesPlugin
{
RainDropTool::RainDropTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
RainDropTool::RainDropTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("raindrops");
setToolName(i18n("Raindrops"));

@ -49,7 +49,7 @@ class RainDropTool : public Digikam::EditorToolThreaded
public:
RainDropTool(TQObject *tqparent);
RainDropTool(TQObject *parent);
~RainDropTool();
private slots:

@ -59,8 +59,8 @@
namespace DigikamRestorationImagesPlugin
{
ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Photograph Restoration"),
ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Photograph Restoration"),
"restoration", true, true, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -51,7 +51,7 @@ class ImageEffect_Restoration : public Digikam::CtrlPanelDlg
public:
ImageEffect_Restoration(TQWidget* tqparent);
ImageEffect_Restoration(TQWidget* parent);
~ImageEffect_Restoration();
private slots:

@ -43,8 +43,8 @@ using namespace DigikamRestorationImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_restoration,
KGenericFactory<ImagePlugin_Restoration>("digikamimageplugin_restoration"));
ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Restoration")
ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_Restoration")
{
m_restorationAction = new KAction(i18n("Restoration..."), "restoration", 0,
this, TQT_SLOT(slotRestoration()),

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Restoration : public Digikam::Image
public:
ImagePlugin_Restoration(TQObject *tqparent, const char* name,
ImagePlugin_Restoration(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Restoration();

@ -63,8 +63,8 @@ using namespace Digikam;
namespace DigikamRestorationImagesPlugin
{
RestorationTool::RestorationTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
RestorationTool::RestorationTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("restoration");
setToolName(i18n("Restoration"));

@ -53,7 +53,7 @@ class RestorationTool : public Digikam::EditorToolThreaded
public:
RestorationTool(TQObject* tqparent);
RestorationTool(TQObject* parent);
~RestorationTool();
private slots:

@ -55,8 +55,8 @@
namespace DigikamShearToolImagesPlugin
{
ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* tqparent)
: Digikam::ImageGuideDlg(tqparent, i18n("Shear Tool"), "sheartool",
ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent)
: Digikam::ImageGuideDlg(parent, i18n("Shear Tool"), "sheartool",
false, true, true,
Digikam::ImageGuideWidget::HVGuideMode)
{

@ -46,7 +46,7 @@ class ImageEffect_ShearTool : public Digikam::ImageGuideDlg
public:
ImageEffect_ShearTool(TQWidget* tqparent);
ImageEffect_ShearTool(TQWidget* parent);
~ImageEffect_ShearTool();
private slots:

@ -41,8 +41,8 @@ using namespace DigikamShearToolImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_sheartool,
KGenericFactory<ImagePlugin_ShearTool>("digikamimageplugin_sheartool"));
ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_ShearTool")
ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_ShearTool")
{
m_sheartoolAction = new KAction(i18n("Shear..."), "shear", 0,
this, TQT_SLOT(slotShearTool()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ShearTool : public Digikam::ImagePl
public:
ImagePlugin_ShearTool(TQObject *tqparent, const char* name,
ImagePlugin_ShearTool(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_ShearTool();

@ -41,9 +41,9 @@
namespace DigikamShearToolImagesPlugin
{
Shear::Shear(Digikam::DImg *orgImage, TQObject *tqparent, float hAngle, float vAngle,
Shear::Shear(Digikam::DImg *orgImage, TQObject *parent, float hAngle, float vAngle,
bool antialiasing, TQColor backgroundColor, int orgW, int orgH)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "sheartool")
: Digikam::DImgThreadedFilter(orgImage, parent, "sheartool")
{
m_hAngle = hAngle;
m_vAngle = vAngle;

@ -41,7 +41,7 @@ class Shear : public Digikam::DImgThreadedFilter
public:
Shear(Digikam::DImg *orgImage, TQObject *tqparent=0, float hAngle=0.0, float vAngle=0.0,
Shear(Digikam::DImg *orgImage, TQObject *parent=0, float hAngle=0.0, float vAngle=0.0,
bool antialiasing=true, TQColor backgroundColor=TQt::black, int orgW=0, int orgH=0);
~Shear(){};

@ -62,8 +62,8 @@ using namespace Digikam;
namespace DigikamShearToolImagesPlugin
{
ShearTool::ShearTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
ShearTool::ShearTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("sheartool");
setToolName(i18n("Shear Tool"));

@ -55,7 +55,7 @@ class ShearTool : public Digikam::EditorToolThreaded
public:
ShearTool(TQObject* tqparent);
ShearTool(TQObject* parent);
~ShearTool();
private slots:

@ -51,8 +51,8 @@ struct DirSelectWidget::Private
KURL m_rootUrl;
};
DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString headerLabel)
: KFileTreeView( tqparent, name)
DirSelectWidget::DirSelectWidget(TQWidget* parent, const char* name, TQString headerLabel)
: KFileTreeView( parent, name)
{
d = new Private;
@ -65,8 +65,8 @@ DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString
}
DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl,
TQWidget* tqparent, const char* name, TQString headerLabel)
: KFileTreeView( tqparent, name)
TQWidget* parent, const char* name, TQString headerLabel)
: KFileTreeView( parent, name)
{
d = new Private;

@ -46,10 +46,10 @@ Q_OBJECT
public:
DirSelectWidget(TQWidget* tqparent, const char* name=0, TQString headerLabel=TQString());
DirSelectWidget(TQWidget* parent, const char* name=0, TQString headerLabel=TQString());
DirSelectWidget(KURL rootUrl=KURL("/"), KURL currentUrl=KURL(),
TQWidget* tqparent=0, const char* name=0, TQString headerLabel=TQString());
TQWidget* parent=0, const char* name=0, TQString headerLabel=TQString());
~DirSelectWidget();

@ -71,8 +71,8 @@
namespace DigikamSuperImposeImagesPlugin
{
ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("Template Superimpose to Photograph"),
ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("Template Superimpose to Photograph"),
"superimpose", false, false)
{
TQString whatsThis;

@ -54,7 +54,7 @@ class ImageEffect_SuperImpose : public Digikam::ImageDlgBase
public:
ImageEffect_SuperImpose(TQWidget* tqparent);
ImageEffect_SuperImpose(TQWidget* parent);
~ImageEffect_SuperImpose();
private slots:

@ -43,8 +43,8 @@ using namespace DigikamSuperImposeImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_superimpose,
KGenericFactory<ImagePlugin_SuperImpose>("digikamimageplugin_superimpose"));
ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_SuperImpose")
ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_SuperImpose")
{
m_superimposeAction = new KAction(i18n("Template Superimpose..."), "superimpose", 0,
this, TQT_SLOT(slotSuperImpose()),

@ -40,7 +40,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::Image
public:
ImagePlugin_SuperImpose(TQObject *tqparent, const char* name,
ImagePlugin_SuperImpose(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_SuperImpose();

@ -74,8 +74,8 @@ using namespace Digikam;
namespace DigikamSuperImposeImagesPlugin
{
SuperImposeTool::SuperImposeTool(TQObject* tqparent)
: EditorTool(tqparent)
SuperImposeTool::SuperImposeTool(TQObject* parent)
: EditorTool(parent)
{
setName("superimpose");
setToolName(i18n("Template Superimpose"));

@ -55,7 +55,7 @@ class SuperImposeTool : public Digikam::EditorTool
public:
SuperImposeTool(TQObject* tqparent);
SuperImposeTool(TQObject* parent);
~SuperImposeTool();
private slots:

@ -46,8 +46,8 @@
namespace DigikamSuperImposeImagesPlugin
{
SuperImposeWidget::SuperImposeWidget(int w, int h, TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
SuperImposeWidget::SuperImposeWidget(int w, int h, TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
m_pixmap = new TQPixmap(w, h);
m_editMode = MOVE;

@ -67,7 +67,7 @@ Q_OBJECT
public:
SuperImposeWidget(int w, int h, TQWidget *tqparent=0);
SuperImposeWidget(int w, int h, TQWidget *parent=0);
~SuperImposeWidget();
void setEditMode(int mode);

@ -54,8 +54,8 @@
namespace DigikamTextureImagesPlugin
{
ImageEffect_Texture::ImageEffect_Texture(TQWidget* tqparent)
: Digikam::CtrlPanelDlg(tqparent, i18n("Apply Texture"),
ImageEffect_Texture::ImageEffect_Texture(TQWidget* parent)
: Digikam::CtrlPanelDlg(parent, i18n("Apply Texture"),
"texture", false, false, true,
Digikam::ImagePannelWidget::SeparateViewAll)
{

@ -47,7 +47,7 @@ class ImageEffect_Texture : public Digikam::CtrlPanelDlg
public:
ImageEffect_Texture(TQWidget* tqparent);
ImageEffect_Texture(TQWidget* parent);
~ImageEffect_Texture();
private:

@ -42,8 +42,8 @@ using namespace DigikamTextureImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_texture,
KGenericFactory<ImagePlugin_Texture>("digikamimageplugin_texture"));
ImagePlugin_Texture::ImagePlugin_Texture(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_Texture")
ImagePlugin_Texture::ImagePlugin_Texture(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_Texture")
{
m_textureAction = new KAction(i18n("Apply Texture..."), "texture", 0,
this, TQT_SLOT(slotTexture()),

@ -38,7 +38,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Texture : public Digikam::ImagePlug
public:
ImagePlugin_Texture(TQObject *tqparent, const char* name,
ImagePlugin_Texture(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_Texture();

@ -36,8 +36,8 @@
namespace DigikamTextureImagesPlugin
{
Texture::Texture(Digikam::DImg *orgImage, TQObject *tqparent, int blendGain, TQString texturePath)
: Digikam::DImgThreadedFilter(orgImage, tqparent, "Texture")
Texture::Texture(Digikam::DImg *orgImage, TQObject *parent, int blendGain, TQString texturePath)
: Digikam::DImgThreadedFilter(orgImage, parent, "Texture")
{
m_blendGain = blendGain;
m_texturePath = texturePath;

@ -41,7 +41,7 @@ class Texture : public Digikam::DImgThreadedFilter
public:
Texture(Digikam::DImg *orgImage, TQObject *tqparent=0, int blendGain=200,
Texture(Digikam::DImg *orgImage, TQObject *parent=0, int blendGain=200,
TQString texturePath=TQString());
~Texture(){};

@ -61,8 +61,8 @@ using namespace Digikam;
namespace DigikamTextureImagesPlugin
{
TextureTool::TextureTool(TQObject* tqparent)
: EditorToolThreaded(tqparent)
TextureTool::TextureTool(TQObject* parent)
: EditorToolThreaded(parent)
{
setName("texture");
setToolName(i18n("Texture"));

@ -55,7 +55,7 @@ class TextureTool : public Digikam::EditorToolThreaded
public:
TextureTool(TQObject* tqparent);
TextureTool(TQObject* parent);
~TextureTool();
private:

@ -79,8 +79,8 @@
namespace DigikamWhiteBalanceImagesPlugin
{
ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* tqparent)
: Digikam::ImageDlgBase(tqparent, i18n("White Color Balance Correction"),
ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
: Digikam::ImageDlgBase(parent, i18n("White Color Balance Correction"),
"whitebalance", true, false)
{
TQString whatsThis;

@ -61,7 +61,7 @@ class ImageEffect_WhiteBalance : public Digikam::ImageDlgBase
public:
ImageEffect_WhiteBalance(TQWidget* tqparent);
ImageEffect_WhiteBalance(TQWidget* parent);
~ImageEffect_WhiteBalance();
protected:

@ -42,8 +42,8 @@ using namespace DigikamWhiteBalanceImagesPlugin;
K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_whitebalance,
KGenericFactory<ImagePlugin_WhiteBalance>("digikamimageplugin_whitebalance"));
ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *tqparent, const char*, const TQStringList &)
: Digikam::ImagePlugin(tqparent, "ImagePlugin_WhiteBalance")
ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *parent, const char*, const TQStringList &)
: Digikam::ImagePlugin(parent, "ImagePlugin_WhiteBalance")
{
m_whitebalanceAction = new KAction(i18n("White Balance..."), "whitebalance",
CTRL+SHIFT+Key_W,

@ -39,7 +39,7 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::Imag
public:
ImagePlugin_WhiteBalance(TQObject *tqparent, const char* name,
ImagePlugin_WhiteBalance(TQObject *parent, const char* name,
const TQStringList &args);
~ImagePlugin_WhiteBalance();

@ -90,8 +90,8 @@ using namespace Digikam;
namespace DigikamWhiteBalanceImagesPlugin
{
WhiteBalanceTool::WhiteBalanceTool(TQObject* tqparent)
: EditorTool(tqparent)
WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
: EditorTool(parent)
{
setName("whitebalance");
setToolName(i18n("White Balance"));

@ -67,7 +67,7 @@ class WhiteBalanceTool : public Digikam::EditorTool
public:
WhiteBalanceTool(TQObject* tqparent);
WhiteBalanceTool(TQObject* parent);
~WhiteBalanceTool();
private:

@ -479,7 +479,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo
// build the album list
buildAlbumList();
// get the tqparent album
// get the parent album
AlbumInfo album = findAlbum(url.directory());
if (album.id == -1)
{
@ -644,7 +644,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o
// build the album list
buildAlbumList();
// find the src tqparent album
// find the src parent album
AlbumInfo srcAlbum = findAlbum(src.directory());
if (srcAlbum.id == -1)
{
@ -653,7 +653,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o
return;
}
// find the dst tqparent album
// find the dst parent album
AlbumInfo dstAlbum = findAlbum(dst.directory());
if (dstAlbum.id == -1)
{
@ -1599,7 +1599,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath)
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
// to the parent ID we got from the child tag
if ( (*parentTag).id == parentID &&
(*parentTag).name == (*parentTagName) )
{
@ -1655,14 +1655,14 @@ 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 the parent tag did not exist, we need not check if the child exists
if (parentTagExisted)
{
for (TagInfo::List::iterator tag = tagsList.begin();
tag != tagsList.end(); ++tag )
{
// find the tag with tag name according to tagHierarchy,
// and tqparent ID identical to the ID of the tag we found in
// and parent ID identical to the ID of the tag we found in
// the previous run.
if ((*tag).name == (*tagName) && (*tag).pid == parentTagID)
{

@ -186,7 +186,7 @@ void kio_digikamtagsProtocol::special(const TQByteArray& data)
if (recurseTags)
{
// Obtain all images with the given tag, or with this tag as a tqparent.
// Obtain all images with the given tag, or with this tag as a parent.
m_db.execSql( TQString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n "
" Images.datetime, Albums.url \n "
" FROM Images, Albums \n "

@ -69,7 +69,7 @@ public:
CtrlPanelDlgPriv()
{
tqparent = 0;
parent = 0;
timer = 0;
aboutData = 0;
progressBar = true;
@ -82,7 +82,7 @@ public:
int currentRenderingMode;
TQWidget *tqparent;
TQWidget *parent;
TQTimer *timer;
@ -91,12 +91,12 @@ public:
KAboutData *aboutData;
};
CtrlPanelDlg::CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name,
CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
bool loadFileSettings, bool tryAction, bool progressBar,
int separateViewMode, TQFrame* bannerFrame)
: KDialogBase(Plain, 0,
Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok,
tqparent, 0, true, true,
parent, 0, true, true,
i18n("&Abort"),
i18n("&Save As..."),
i18n("&Load..."))
@ -105,7 +105,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name,
setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
d = new CtrlPanelDlgPriv;
d->tqparent = tqparent;
d->parent = parent;
d->name = name;
d->tryAction = tryAction;
d->progressBar = progressBar;

@ -53,7 +53,7 @@ class DIGIKAM_EXPORT CtrlPanelDlg : public KDialogBase
public:
CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name,
CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
bool loadFileSettings=false, bool tryAction=false, bool progressBar=true,
int separateViewMode=ImagePannelWidget::SeparateViewAll,
TQFrame* bannerFrame=0);

@ -58,8 +58,8 @@ namespace Digikam
// DeleteWidget implementation
//////////////////////////////////////////////////////////////////////////////
DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name)
: DeleteDialogBase(tqparent, name),
DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
: DeleteDialogBase(parent, name),
m_listMode(DeleteDialogMode::Files),
m_deleteMode(DeleteDialogMode::UseTrash)
{
@ -179,8 +179,8 @@ void DeleteWidget::updateText()
// DeleteDialog implementation
//////////////////////////////////////////////////////////////////////////////
DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name)
: KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name,
DeleteDialog::DeleteDialog(TQWidget *parent, const char *name)
: KDialogBase(Swallow, WStyle_DialogBorder, parent, name,
true, // modal
i18n("About to delete selected files"), // caption
Ok | Cancel, // available buttons

@ -75,7 +75,7 @@ class DeleteWidget : public DeleteDialogBase
public:
DeleteWidget(TQWidget *tqparent = 0, const char *name = 0);
DeleteWidget(TQWidget *parent = 0, const char *name = 0);
void setFiles(const KURL::List &files);
void setListMode(DeleteDialogMode::ListMode mode);
@ -108,7 +108,7 @@ public:
public:
DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog");
DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
bool confirmDeleteList(const KURL::List &condemnedURLs,
DeleteDialogMode::ListMode listMode,

@ -76,8 +76,8 @@ public:
KProgress *progress;
};
DProgressDlg::DProgressDlg(TQWidget *tqparent, const TQString &caption)
: KDialogBase(tqparent, 0, true, caption, Cancel)
DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption)
: KDialogBase(parent, 0, true, caption, Cancel)
{
d = new DProgressDlgPriv;

@ -46,7 +46,7 @@ Q_OBJECT
public:
DProgressDlg(TQWidget *tqparent=0, const TQString &caption=TQString());
DProgressDlg(TQWidget *parent=0, const TQString &caption=TQString());
~DProgressDlg();
void setButtonText(const TQString &text);

@ -34,9 +34,9 @@
namespace Digikam
{
ICCProfileInfoDlg::ICCProfileInfoDlg(TQWidget* tqparent, const TQString& profilePath,
ICCProfileInfoDlg::ICCProfileInfoDlg(TQWidget* parent, const TQString& profilePath,
const TQByteArray& profileData)
: KDialogBase(tqparent, 0, true, i18n("Color Profile Info"),
: KDialogBase(parent, 0, true, i18n("Color Profile Info"),
Help|Ok, Ok, true)
{
setHelp("iccprofile.anchor", "digikam");

@ -48,7 +48,7 @@ class DIGIKAM_EXPORT ICCProfileInfoDlg : public KDialogBase
public:
ICCProfileInfoDlg(TQWidget *tqparent, const TQString& profilePath, const TQByteArray& profileData=TQByteArray());
ICCProfileInfoDlg(TQWidget *parent, const TQString& profilePath, const TQByteArray& profileData=TQByteArray());
~ICCProfileInfoDlg();
};

@ -83,8 +83,8 @@ public:
TQGuardedPtr<ThumbnailJob> thumbJob;
};
ImageDialogPreview::ImageDialogPreview(TQWidget *tqparent)
: KPreviewWidgetBase(tqparent)
ImageDialogPreview::ImageDialogPreview(TQWidget *parent)
: KPreviewWidgetBase(parent)
{
d = new ImageDialogPreviewPrivate;
@ -261,7 +261,7 @@ public:
KURL::List urls;
};
ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, const TQString& caption)
ImageDialog::ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect, const TQString& caption)
{
d = new ImageDialogPrivate;
d->singleSelect = singleSelect;
@ -297,7 +297,7 @@ ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect,
DDebug() << "fileformats=" << d->fileformats << endl;
KFileDialog dlg(url.path(), d->fileformats, tqparent, "imageFileOpenDialog", false);
KFileDialog dlg(url.path(), d->fileformats, parent, "imageFileOpenDialog", false);
ImageDialogPreview *preview = new ImageDialogPreview(&dlg);
dlg.setPreviewWidget(preview);
dlg.setOperationMode(KFileDialog::Opening);
@ -345,18 +345,18 @@ KURL::List ImageDialog::urls() const
return d->urls;
}
KURL::List ImageDialog::getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption)
KURL::List ImageDialog::getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption)
{
ImageDialog dlg(tqparent, url, false, caption);
ImageDialog dlg(parent, url, false, caption);
if (!dlg.urls().isEmpty())
return dlg.urls();
else
return KURL::List();
}
KURL ImageDialog::getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption)
KURL ImageDialog::getImageURL(TQWidget* parent, const KURL& url, const TQString& caption)
{
ImageDialog dlg(tqparent, url, true, caption);
ImageDialog dlg(parent, url, true, caption);
if (dlg.url() != KURL())
return dlg.url();
else

@ -46,7 +46,7 @@ class DIGIKAM_EXPORT ImageDialogPreview : public KPreviewWidgetBase
public:
ImageDialogPreview(TQWidget *tqparent=0);
ImageDialogPreview(TQWidget *parent=0);
~ImageDialogPreview();
TQSize tqsizeHint() const;
@ -78,7 +78,7 @@ class DIGIKAM_EXPORT ImageDialog
public:
ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect=false, const TQString& caption=TQString());
ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect=false, const TQString& caption=TQString());
~ImageDialog();
KURL url() const;
@ -87,8 +87,8 @@ public:
bool singleSelect() const;
TQString fileformats() const;
static KURL::List getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString());
static KURL getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString());
static KURL::List getImageURLs(TQWidget* parent, const KURL& url, const TQString& caption=TQString());
static KURL getImageURL(TQWidget* parent, const KURL& url, const TQString& caption=TQString());
private:

@ -69,7 +69,7 @@ public:
{
aboutData = 0;
timer = 0;
tqparent = 0;
parent = 0;
mainLayout = 0;
hbox = 0;
settingsSideBar = 0;
@ -80,7 +80,7 @@ public:
TQGridLayout *mainLayout;
TQWidget *tqparent;
TQWidget *parent;
TQString name;
@ -95,10 +95,10 @@ public:
Sidebar *settingsSideBar;
};
ImageDlgBase::ImageDlgBase(TQWidget* tqparent, TQString title, TQString name,
ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name,
bool loadFileSettings, bool tryAction, TQFrame* bannerFrame)
: KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok,
tqparent, 0, true, true,
parent, 0, true, true,
TQString(),
i18n("&Save As..."),
i18n("&Load..."))
@ -108,7 +108,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* tqparent, TQString title, TQString name,
showButton(User1, false);
d = new ImageDlgBasePriv;
d->tqparent = tqparent;
d->parent = parent;
d->name = name;
d->tryAction = tryAction;

@ -55,7 +55,7 @@ class DIGIKAM_EXPORT ImageDlgBase : public KDialogBase
public:
ImageDlgBase(TQWidget *tqparent, TQString title, TQString name,
ImageDlgBase(TQWidget *parent, TQString title, TQString name,
bool loadFileSettings=true, bool tryAction=false, TQFrame* bannerFrame=0);
~ImageDlgBase();

@ -80,7 +80,7 @@ public:
tryAction = false;
progress = true;
currentRenderingMode = NoneRendering;
tqparent = 0;
parent = 0;
settings = 0;
timer = 0;
aboutData = 0;
@ -99,7 +99,7 @@ public:
int currentRenderingMode;
TQWidget *tqparent;
TQWidget *parent;
TQWidget *settings;
TQTimer *timer;
@ -124,14 +124,14 @@ public:
Sidebar *settingsSideBar;
};
ImageGuideDlg::ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name,
ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
bool loadFileSettings, bool progress,
bool guideVisible, int guideMode, TQFrame* bannerFrame,
bool prevModeOptions, bool useImageSelection,
bool tryAction)
: KDialogBase(Plain, 0,
Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok,
tqparent, 0, true, true,
parent, 0, true, true,
i18n("&Abort"),
i18n("&Save As..."),
i18n("&Load..."))
@ -140,7 +140,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name,
setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
d = new ImageGuideDlgPriv;
d->tqparent = tqparent;
d->parent = parent;
d->name = name;
d->progress = progress;
d->tryAction = tryAction;

@ -56,7 +56,7 @@ class DIGIKAM_EXPORT ImageGuideDlg : public KDialogBase
public:
ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name,
ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
bool loadFileSettings=false, bool progress=true,
bool guideVisible=true,
int guideMode=ImageGuideWidget::HVGuideMode,

@ -70,8 +70,8 @@ public:
SearchTextBar *searchBar;
};
RawCameraDlg::RawCameraDlg(TQWidget *tqparent)
: KDialogBase(tqparent, 0, true, TQString(), Help|Ok, Ok, true)
RawCameraDlg::RawCameraDlg(TQWidget *parent)
: KDialogBase(parent, 0, true, TQString(), Help|Ok, Ok, true)
{
setHelp("digitalstillcamera.anchor", "digikam");
setCaption(i18n("List of supported RAW cameras"));

@ -44,7 +44,7 @@ class DIGIKAM_EXPORT RawCameraDlg : public KDialogBase
public:
RawCameraDlg(TQWidget* tqparent);
RawCameraDlg(TQWidget* parent);
~RawCameraDlg();
private slots:

@ -300,7 +300,7 @@ public:
TQPixmap convertToPixmap();
TQPixmap convertToPixmap(IccTransform* monitorICCtrans);
/** Return a tqmask image where pure white and pure black pixels are over-colored.
/** Return a mask image where pure white and pure black pixels are over-colored.
This way is used to identify over and under exposed pixels.
*/
TQImage pureColorMask(ExposureSettingsContainer *expoSettings);

@ -38,8 +38,8 @@
namespace Digikam
{
DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *tqparent, int radius)
: DImgThreadedFilter(orgImage, tqparent, "GaussianBlur")
DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *parent, int radius)
: DImgThreadedFilter(orgImage, parent, "GaussianBlur")
{
m_radius = radius;
initFilter();

@ -40,7 +40,7 @@ class DIGIKAM_EXPORT DImgGaussianBlur : public DImgThreadedFilter
public:
DImgGaussianBlur(DImg *orgImage, TQObject *tqparent=0, int radius=3);
DImgGaussianBlur(DImg *orgImage, TQObject *parent=0, int radius=3);
// Constructor for slave mode: execute immediately in current thread with specified master filter
DImgGaussianBlur(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage,

@ -785,7 +785,7 @@ void DImgImageFilters::channelMixerImage(uchar *data, int Width, int Height, boo
}
}
/** Change color tonality of an image to appling a RGB color tqmask.*/
/** Change color tonality of an image to appling a RGB color mask.*/
void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool sixteenBit,
int redMask, int greenMask, int blueMask)
{
@ -798,8 +798,8 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s
int hue, sat, lig;
DColor tqmask(redMask, greenMask, blueMask, 0, sixteenBit);
tqmask.getHSL(&hue, &sat, &lig);
DColor mask(redMask, greenMask, blueMask, 0, sixteenBit);
mask.getHSL(&hue, &sat, &lig);
if (!sixteenBit) // 8 bits image.
{
@ -807,15 +807,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s
for (int i = 0 ; i < width*height ; i++)
{
// Convert to grayscale using tonal tqmask
// Convert to grayscale using tonal mask
lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]);
tqmask.setRGB(hue, sat, lig, sixteenBit);
mask.setRGB(hue, sat, lig, sixteenBit);
ptr[0] = (uchar)tqmask.blue();
ptr[1] = (uchar)tqmask.green();
ptr[2] = (uchar)tqmask.red();
ptr[0] = (uchar)mask.blue();
ptr[1] = (uchar)mask.green();
ptr[2] = (uchar)mask.red();
ptr += 4;
}
}
@ -825,15 +825,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s
for (int i = 0 ; i < width*height ; i++)
{
// Convert to grayscale using tonal tqmask
// Convert to grayscale using tonal mask
lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]);
tqmask.setRGB(hue, sat, lig, sixteenBit);
mask.setRGB(hue, sat, lig, sixteenBit);
ptr[0] = (unsigned short)tqmask.blue();
ptr[1] = (unsigned short)tqmask.green();
ptr[2] = (unsigned short)tqmask.red();
ptr[0] = (unsigned short)mask.blue();
ptr[1] = (unsigned short)mask.green();
ptr[2] = (unsigned short)mask.red();
ptr += 4;
}
}

@ -41,8 +41,8 @@
namespace Digikam
{
DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *tqparent, double radius, double sigma)
: DImgThreadedFilter(orgImage, tqparent, "Sharpen")
DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *parent, double radius, double sigma)
: DImgThreadedFilter(orgImage, parent, "Sharpen")
{
m_radius = radius;
m_sigma = sigma;

@ -40,7 +40,7 @@ class DIGIKAM_EXPORT DImgSharpen : public DImgThreadedFilter
public:
DImgSharpen(DImg *orgImage, TQObject *tqparent=0, double radius=0.0, double sigma=1.0);
DImgSharpen(DImg *orgImage, TQObject *parent=0, double radius=0.0, double sigma=1.0);
// Constructor for slave mode: execute immediately in current thread with specified master filter
DImgSharpen(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage,

@ -35,13 +35,13 @@
namespace Digikam
{
DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, TQObject *tqparent,
DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, TQObject *parent,
const TQString& name)
: TQThread()
{
// remove meta data
m_orgImage = orgImage->copyImageData();
m_parent = tqparent;
m_parent = parent;
m_cancel = false;
// See B.K.O #133026: make a deep copy of Qstring to prevent crash
@ -93,11 +93,11 @@ void DImgThreadedFilter::initFilter(void)
if (m_parent)
start(); // m_parent is valide, start thread ==> run()
else
startComputation(); // no tqparent : no using thread.
startComputation(); // no parent : no using thread.
}
else // No image data
{
if (m_parent) // If tqparent then send event about a problem.
if (m_parent) // If parent then send event about a problem.
{
postProgress(0, false, false);
DDebug() << m_name << "::No valid image data !!! ..." << endl;

@ -48,7 +48,7 @@ class DIGIKAM_EXPORT DImgThreadedFilter : public TQThread
public:
/** Class used to post status of computation to tqparent. */
/** Class used to post status of computation to parent. */
class EventData
{
public:
@ -66,7 +66,7 @@ class EventData
public:
DImgThreadedFilter(DImg *orgImage, TQObject *tqparent=0,
DImgThreadedFilter(DImg *orgImage, TQObject *parent=0,
const TQString& name=TQString());
~DImgThreadedFilter();
@ -92,8 +92,8 @@ protected:
/** Clean up filter data if necessary. Call by stopComputation() method. */
virtual void cleanupFilter(void){};
/** Post Event to tqparent about progress. Warning: you need to delete
'EventData' instance to 'customEvent' tqparent implementation. */
/** Post Event to parent about progress. Warning: you need to delete
'EventData' instance to 'customEvent' parent implementation. */
void postProgress(int progress=0, bool starting=true, bool success=false);
protected:
@ -106,7 +106,7 @@ protected:
The filter will be executed in the current thread.
orgImage and destImage will not be copied.
progressBegin and progressEnd can indicate the progress span
that the slave filter uses in the tqparent filter's progress.
that the slave filter uses in the parent filter's progress.
Any derived filter class that is publicly available to other filters
should implement an additional constructor using this constructor.
*/
@ -125,11 +125,11 @@ protected:
/** Used to stop compution loop. */
bool m_cancel;
/** The progress span that a slave filter uses in the tqparent filter's progress. */
/** The progress span that a slave filter uses in the parent filter's progress. */
int m_progressBegin;
int m_progressSpan;
/** To post event from thread to tqparent. */
/** To post event from thread to parent. */
TQObject *m_parent;
/** Filter name.*/

@ -65,8 +65,8 @@ public:
KIntNumInput *JPEG2000compression;
};
JP2KSettings::JP2KSettings(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
JP2KSettings::JP2KSettings(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new JP2KSettingsPriv;

@ -44,7 +44,7 @@ Q_OBJECT
public:
JP2KSettings(TQWidget *tqparent=0);
JP2KSettings(TQWidget *parent=0);
~JP2KSettings();
void setCompressionValue(int val);

@ -71,8 +71,8 @@ public:
KIntNumInput *JPEGcompression;
};
JPEGSettings::JPEGSettings(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
JPEGSettings::JPEGSettings(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new JPEGSettingsPriv;

@ -44,7 +44,7 @@ Q_OBJECT
public:
JPEGSettings(TQWidget *tqparent=0);
JPEGSettings(TQWidget *parent=0);
~JPEGSettings();
void setCompressionValue(int val);

@ -61,8 +61,8 @@ public:
KIntNumInput *PNGcompression;
};
PNGSettings::PNGSettings(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
PNGSettings::PNGSettings(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new PNGSettingsPriv;

@ -44,7 +44,7 @@ Q_OBJECT
public:
PNGSettings(TQWidget *tqparent=0);
PNGSettings(TQWidget *parent=0);
~PNGSettings();
void setCompressionValue(int val);

@ -58,8 +58,8 @@ public:
TQCheckBox *TIFFcompression;
};
TIFFSettings::TIFFSettings(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
TIFFSettings::TIFFSettings(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new TIFFSettingsPriv;

@ -44,7 +44,7 @@ Q_OBJECT
public:
TIFFSettings(TQWidget *tqparent=0);
TIFFSettings(TQWidget *parent=0);
~TIFFSettings();
void setCompression(bool b);

@ -2000,7 +2000,7 @@ namespace cimg_library {
- \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window.
This exception is thrown when image display request cannot be satisfied.
The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of
The parent class CImgException may be thrown itself when errors that cannot be classified in one of
the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally
reserved to %CImg Library functions.
\b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple
@ -7624,7 +7624,7 @@ namespace cimg_library {
vtemplate.visualid = XVisualIDFromVisual(visual);
int nb_visuals;
XVisualInfo *vinfo = XGetVisualInfo(cimg::X11attr().display,VisualIDMask,&vtemplate,&nb_visuals);
if (vinfo && vinfo->red_tqmask<vinfo->blue_tqmask) cimg::X11attr().blue_first = true;
if (vinfo && vinfo->red_mask<vinfo->blue_mask) cimg::X11attr().blue_first = true;
cimg::X11attr().byte_order = ImageByteOrder(cimg::X11attr().display);
XFree(vinfo);
XLockDisplay(cimg::X11attr().display);
@ -14096,16 +14096,16 @@ namespace cimg_library {
CImg<T> get_resize_halfXY() const {
if (is_empty()) return *this;
const Tfloat tqmask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f,
const Tfloat mask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f,
0.1231940459f, 0.1935127547f, 0.1231940459f,
0.07842776544f, 0.1231940459f, 0.07842776544f };
T I[9] = { 0 };
CImg<T> dest(width/2,height/2,depth,dim);
cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I)
if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)
(I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] +
I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] +
I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]);
(I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] +
I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] +
I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]);
return dest;
}
@ -15813,7 +15813,7 @@ namespace cimg_library {
grad[1](x,y,z,k) = (Tfloat)Icn - Icc;
}
} break;
case 2 : { // using Sobel tqmask
case 2 : { // using Sobel mask
CImg_3x3(I,T);
const Tfloat a = 1, b = 2;
cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) {
@ -15821,7 +15821,7 @@ namespace cimg_library {
grad[1](x,y,z,k) = -a*Ipp - b*Icp - a*Inp + a*Ipn + b*Icn + a*Inn;
}
} break;
case 3 : { // using rotation invariant tqmask
case 3 : { // using rotation invariant mask
CImg_3x3(I,T);
const Tfloat a = (Tfloat)(0.25f*(2-cimg_std::sqrt(2.0f))), b = (Tfloat)(0.5f*(cimg_std::sqrt(2.0f)-1));
cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) {
@ -19669,34 +19669,34 @@ namespace cimg_library {
//! Draw a sprite image in the instance image (masked version).
/**
\param sprite Sprite image.
\param tqmask Mask image.
\param mask Mask image.
\param x0 X-coordinate of the sprite position in the instance image.
\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 mask_valmax Maximum pixel value of the tqmask image \c tqmask (optional).
\param mask_valmax Maximum pixel value of the mask image \c mask (optional).
\param opacity Drawing opacity.
\note
- Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite.
- Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite.
- Clipping is supported.
- Dimensions along x,y and z of \p sprite and \p tqmask must be the same.
- Dimensions along x,y and z of \p sprite and \p mask must be the same.
**/
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 CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=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.",
pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data);
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,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)
if (!mask)
throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.",
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,mask,opacity,mask_valmax);
if (is_overlapped(mask)) return draw_image(x0,y0,z0,v0,sprite,+mask,opacity,mask_valmax);
if (mask.width!=sprite.width || mask.height!=sprite.height || mask.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);
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim);
const bool bx = (x0<0), by = (y0<0), bz = (z0<0), bv = (v0<0);
const int
lX = sprite.dimx() - (x0 + sprite.dimx()>dimx()?x0 + sprite.dimx() - dimx():0) + (bx?x0:0),
@ -19704,10 +19704,10 @@ namespace cimg_library {
lZ = sprite.dimz() - (z0 + sprite.dimz()>dimz()?z0 + sprite.dimz() - dimz():0) + (bz?z0:0),
lV = sprite.dimv() - (v0 + sprite.dimv()>dimv()?v0 + sprite.dimv() - dimv():0) + (bv?v0:0);
const int
coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)-(bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0),
ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz();
coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)-(bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0),
ssize = mask.dimx()*mask.dimy()*mask.dimz();
const ti *ptrs = sprite.data + coff;
const tm *ptrm = tqmask.data + coff;
const tm *ptrm = mask.data + coff;
const unsigned int
offX = width - lX, soffX = sprite.width - lX,
offY = width*(height - lY), soffY = sprite.width*(sprite.height - lY),
@ -19715,7 +19715,7 @@ namespace cimg_library {
if (lX>0 && lY>0 && lZ>0 && lV>0) {
T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0);
for (int v = 0; v<lV; ++v) {
ptrm = tqmask.data + (ptrm - tqmask.data)%ssize;
ptrm = mask.data + (ptrm - mask.data)%ssize;
for (int z = 0; z<lZ; ++z) {
for (int y = 0; y<lY; ++y) {
for (int x=0; x<lX; ++x) {
@ -19737,32 +19737,32 @@ namespace cimg_library {
//! Draw an image.
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 CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1,
const float mask_valmax=1) {
return draw_image(x0,y0,z0,0,sprite,tqmask,opacity,mask_valmax);
return draw_image(x0,y0,z0,0,sprite,mask,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 CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1,
const float mask_valmax=1) {
return draw_image(x0,y0,0,sprite,tqmask,opacity,mask_valmax);
return draw_image(x0,y0,0,sprite,mask,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 CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1,
const float mask_valmax=1) {
return draw_image(x0,0,sprite,tqmask,opacity,mask_valmax);
return draw_image(x0,0,sprite,mask,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,
CImg<T>& draw_image(const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1,
const float mask_valmax=1) {
return draw_image(0,sprite,tqmask,opacity,mask_valmax);
return draw_image(0,sprite,mask,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).
@ -22229,12 +22229,12 @@ namespace cimg_library {
case '\t' : x+=4*font[' '].width; break;
default : if (c<font.size) {
letter = font[c];
const CImg<T>& tqmask = (c+256)<(int)font.size?font[c+256]:font[c];
const CImg<T>& mask = (c+256)<(int)font.size?font[c+256]:font[c];
if (foreground_color) for (unsigned int p = 0; p<letter.width*letter.height; ++p)
if (tqmask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)(letter(p,0,0,k)*foreground_color[k]);
if (mask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)(letter(p,0,0,k)*foreground_color[k]);
if (background_color) for (unsigned int p = 0; p<letter.width*letter.height; ++p)
if (!tqmask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)background_color[k];
if (!background_color && font.size>=512) draw_image(x,y,letter,tqmask,opacity,(T)1);
if (!mask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)background_color[k];
if (!background_color && font.size>=512) draw_image(x,y,letter,mask,opacity,(T)1);
else draw_image(x,y,letter,opacity);
x+=letter.width;
}
@ -22777,11 +22777,11 @@ namespace cimg_library {
\param y Y-coordinate of the starting point of the region to fill.
\param z Z-coordinate of the starting point of the region to fill.
\param color An array of dimv() values of type \c T, defining the drawing color.
\param region Image that will contain the tqmask of the filled region tqmask, as an output.
\param region Image that will contain the mask of the filled region mask, as an output.
\param sigma Tolerance concerning neighborhood values.
\param opacity Opacity of the drawing.
\param high_connexity Tells if 8-connexity must be used (only for 2D images).
\return \p region is initialized with the binary tqmask of the filled region.
\return \p region is initialized with the binary mask of the filled region.
**/
template<typename tc, typename t>
CImg<T>& draw_fill(const int x, const int y, const int z,
@ -24508,45 +24508,45 @@ namespace cimg_library {
//@{
//----------------------------
//! Compute the correlation of the instance image by a tqmask.
//! Compute the correlation of the instance image by a mask.
/**
The correlation of the instance image \p *this by the tqmask \p tqmask is defined to be :
The correlation of the instance image \p *this by the mask \p mask is defined to be :
res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*tqmask(i,j,k)
res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*mask(i,j,k)
\param tqmask = the correlation kernel.
\param mask = the correlation kernel.
\param cond = the border condition type (0=zero, 1=dirichlet)
\param weighted_correl = enable local normalization.
**/
template<typename t>
CImg<T>& correlate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_correl=false) {
return get_correlate(tqmask,cond,weighted_correl).transfer_to(*this);
CImg<T>& correlate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_correl=false) {
return get_correlate(mask,cond,weighted_correl).transfer_to(*this);
}
template<typename t>
CImg<typename cimg::superset2<T,t,float>::type> get_correlate(const CImg<t>& tqmask, const unsigned int cond=1,
CImg<typename cimg::superset2<T,t,float>::type> get_correlate(const CImg<t>& mask, const unsigned int cond=1,
const bool weighted_correl=false) const {
typedef typename cimg::superset2<T,t,float>::type Ttfloat;
if (is_empty()) return *this;
if (!tqmask || tqmask.dim!=1)
throw CImgArgumentException("CImg<%s>::correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
if (!mask || mask.dim!=1)
throw CImgArgumentException("CImg<%s>::correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.",
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
CImg<Ttfloat> dest(width,height,depth,dim);
if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) {
// A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 tqmask (with cond=1)
switch (tqmask.depth) {
if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) {
// A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 mask (with cond=1)
switch (mask.depth) {
case 3 : {
T I[27] = { 0 };
cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] +
I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] +
I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] +
I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] +
I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] +
I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] +
I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] +
I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] +
I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26]);
(I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] +
I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] +
I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] +
I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] +
I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] +
I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] +
I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] +
I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] +
I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) {
const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] +
I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] +
@ -24563,10 +24563,10 @@ namespace cimg_library {
case 2 : {
T I[8] = { 0 };
cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[0]*tqmask[0] + I[1]*tqmask[1] +
I[2]*tqmask[2] + I[3]*tqmask[3] +
I[4]*tqmask[4] + I[5]*tqmask[5] +
I[6]*tqmask[6] + I[7]*tqmask[7]);
(I[0]*mask[0] + I[1]*mask[1] +
I[2]*mask[2] + I[3]*mask[3] +
I[4]*mask[4] + I[5]*mask[5] +
I[6]*mask[6] + I[7]*mask[7]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) {
const double weight = (double)(I[0]*I[0] + I[1]*I[1] +
I[2]*I[2] + I[3]*I[3] +
@ -24577,16 +24577,16 @@ namespace cimg_library {
} break;
default :
case 1 :
switch (tqmask.width) {
switch (mask.width) {
case 6 : {
T I[36] = { 0 };
cimg_forZV(*this,z,v) cimg_for6x6(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] +
I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] +
I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] +
I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] +
I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26] + I[27]*tqmask[27] + I[28]*tqmask[28] + I[29]*tqmask[29] +
I[30]*tqmask[30] + I[31]*tqmask[31] + I[32]*tqmask[32] + I[33]*tqmask[33] + I[34]*tqmask[34] + I[35]*tqmask[35]);
(I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] +
I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] +
I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] +
I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] +
I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26] + I[27]*mask[27] + I[28]*mask[28] + I[29]*mask[29] +
I[30]*mask[30] + I[31]*mask[31] + I[32]*mask[32] + I[33]*mask[33] + I[34]*mask[34] + I[35]*mask[35]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) {
const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] +
I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] + I[10]*I[10] + I[11]*I[11] +
@ -24600,11 +24600,11 @@ namespace cimg_library {
case 5 : {
T I[25] = { 0 };
cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] +
I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] +
I[10]*tqmask[10] + I[11]*tqmask[11] + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] +
I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + I[18]*tqmask[18] + I[19]*tqmask[19] +
I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + I[24]*tqmask[24]);
(I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] +
I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] +
I[10]*mask[10] + I[11]*mask[11] + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] +
I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + I[18]*mask[18] + I[19]*mask[19] +
I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + I[24]*mask[24]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) {
const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] +
I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] +
@ -24617,10 +24617,10 @@ namespace cimg_library {
case 4 : {
T I[16] = { 0 };
cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] +
I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] +
I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] +
I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15]);
(I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] +
I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] +
I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] +
I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) {
const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] +
I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] +
@ -24632,9 +24632,9 @@ namespace cimg_library {
case 3 : {
T I[9] = { 0 };
cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] +
I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] +
I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]);
(I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] +
I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] +
I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) {
const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] +
I[3]*I[3] + I[4]*I[4] + I[5]*I[5] +
@ -24645,28 +24645,28 @@ namespace cimg_library {
case 2 : {
T I[4] = { 0 };
cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat)
(I[0]*tqmask[0] + I[1]*tqmask[1] +
I[2]*tqmask[2] + I[3]*tqmask[3]);
(I[0]*mask[0] + I[1]*mask[1] +
I[2]*mask[2] + I[3]*mask[3]);
if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) {
const double weight = (double)(I[0]*I[0] + I[1]*I[1] +
I[2]*I[2] + I[3]*I[3]);
if (weight>0) dest(x,y,z,v)/=(Ttfloat)cimg_std::sqrt(weight);
}
} break;
case 1 : (dest.assign(*this))*=tqmask(0); break;
case 1 : (dest.assign(*this))*=mask(0); break;
}
}
} 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),
mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2,
mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2),
mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2;
cimg_forV(*this,v)
if (!weighted_correl) { // Classical correlation
for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) {
Ttfloat val = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm)
val+=(*this)(x+xm,y+ym,z+zm,v)*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=(*this)(x+xm,y+ym,z+zm,v)*mask(mx1+xm,my1+ym,mz1+zm);
dest(x,y,z,v) = (Ttfloat)val;
}
if (cond)
@ -24674,7 +24674,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Ttfloat val = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm)
val+=_atXYZ(x+xm,y+ym,z+zm,v)*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=_atXYZ(x+xm,y+ym,z+zm,v)*mask(mx1+xm,my1+ym,mz1+zm);
dest(x,y,z,v) = (Ttfloat)val;
}
else
@ -24682,7 +24682,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Ttfloat val = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm)
val+=atXYZ(x+xm,y+ym,z+zm,v,0)*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=atXYZ(x+xm,y+ym,z+zm,v,0)*mask(mx1+xm,my1+ym,mz1+zm);
dest(x,y,z,v) = (Ttfloat)val;
}
} else { // Weighted correlation
@ -24690,7 +24690,7 @@ namespace cimg_library {
Ttfloat val = 0, weight = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const Ttfloat cval = (Ttfloat)(*this)(x+xm,y+ym,z+zm,v);
val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=cval*mask(mx1+xm,my1+ym,mz1+zm);
weight+=cval*cval;
}
dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0;
@ -24701,7 +24701,7 @@ namespace cimg_library {
Ttfloat val = 0, weight = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const Ttfloat cval = (Ttfloat)_atXYZ(x+xm,y+ym,z+zm,v);
val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=cval*mask(mx1+xm,my1+ym,mz1+zm);
weight+=cval*cval;
}
dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0;
@ -24712,7 +24712,7 @@ namespace cimg_library {
Ttfloat val = 0, weight = 0;
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const Ttfloat cval = (Ttfloat)atXYZ(x+xm,y+ym,z+zm,v,0);
val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm);
val+=cval*mask(mx1+xm,my1+ym,mz1+zm);
weight+=cval*cval;
}
dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0;
@ -24722,50 +24722,50 @@ namespace cimg_library {
return dest;
}
//! Compute the convolution of the image by a tqmask.
//! Compute the convolution of the image by a mask.
/**
The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be :
The result \p res of the convolution of an image \p img by a mask \p mask is defined to be :
res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k)
res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k)
\param tqmask = the correlation kernel.
\param mask = the correlation kernel.
\param cond = the border condition type (0=zero, 1=dirichlet)
\param weighted_convol = enable local normalization.
**/
template<typename t>
CImg<T>& convolve(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_convol=false) {
return get_convolve(tqmask,cond,weighted_convol).transfer_to(*this);
CImg<T>& convolve(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_convol=false) {
return get_convolve(mask,cond,weighted_convol).transfer_to(*this);
}
template<typename t>
CImg<typename cimg::superset2<T,t,float>::type> get_convolve(const CImg<t>& tqmask, const unsigned int cond=1,
CImg<typename cimg::superset2<T,t,float>::type> get_convolve(const CImg<t>& mask, const unsigned int cond=1,
const bool weighted_convol=false) const {
typedef typename cimg::superset2<T,t,float>::type Ttfloat;
if (is_empty()) return *this;
if (!tqmask || tqmask.dim!=1)
throw CImgArgumentException("CImg<%s>::convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
return get_correlate(CImg<t>(tqmask.ptr(),tqmask.size(),1,1,1,true).get_mirror('x').resize(tqmask,-1),cond,weighted_convol);
if (!mask || mask.dim!=1)
throw CImgArgumentException("CImg<%s>::convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.",
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
return get_correlate(CImg<t>(mask.ptr(),mask.size(),1,1,1,true).get_mirror('x').resize(mask,-1),cond,weighted_convol);
}
//! Return the erosion of the image by a structuring element.
template<typename t>
CImg<T>& erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) {
return get_erode(tqmask,cond,weighted_erosion).transfer_to(*this);
CImg<T>& erode(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_erosion=false) {
return get_erode(mask,cond,weighted_erosion).transfer_to(*this);
}
template<typename t>
CImg<typename cimg::superset<T,t>::type> get_erode(const CImg<t>& tqmask, const unsigned int cond=1,
CImg<typename cimg::superset<T,t>::type> get_erode(const CImg<t>& mask, const unsigned int cond=1,
const bool weighted_erosion=false) const {
typedef typename cimg::superset<T,t>::type Tt;
if (is_empty()) return *this;
if (!tqmask || tqmask.dim!=1)
throw CImgArgumentException("CImg<%s>::erode() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
if (!mask || mask.dim!=1)
throw CImgArgumentException("CImg<%s>::erode() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.",
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
CImg<Tt> dest(width,height,depth,dim);
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),
mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2,
mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2),
mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2;
cimg_forV(*this,v)
if (!weighted_erosion) { // Classical erosion
@ -24773,7 +24773,7 @@ namespace cimg_library {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
}
dest(x,y,z,v) = min_val;
}
@ -24783,7 +24783,7 @@ namespace cimg_library {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
}
dest(x,y,z,v) = min_val;
}
@ -24793,7 +24793,7 @@ namespace cimg_library {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval;
}
dest(x,y,z,v) = min_val;
}
@ -24801,7 +24801,7 @@ namespace cimg_library {
for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) + mval);
if (mval && cval<min_val) min_val = cval;
}
@ -24812,7 +24812,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) + mval);
if (mval && cval<min_val) min_val = cval;
}
@ -24823,7 +24823,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Tt min_val = cimg::type<Tt>::max();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) + mval);
if (mval && cval<min_val) min_val = cval;
}
@ -24840,32 +24840,32 @@ namespace cimg_library {
}
CImg<T> get_erode(const unsigned int n, const unsigned int cond=1) const {
static CImg<T> tqmask;
static CImg<T> mask;
if (n<2) return *this;
if (tqmask.width!=n) tqmask.assign(n,n,1,1,1);
const CImg<T> res = get_erode(tqmask,cond,false);
if (n>20) tqmask.assign();
if (mask.width!=n) mask.assign(n,n,1,1,1);
const CImg<T> res = get_erode(mask,cond,false);
if (n>20) mask.assign();
return res;
}
//! Dilate the image by a structuring element.
template<typename t>
CImg<T>& dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) {
return get_dilate(tqmask,cond,weighted_dilatation).transfer_to(*this);
CImg<T>& dilate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) {
return get_dilate(mask,cond,weighted_dilatation).transfer_to(*this);
}
template<typename t>
CImg<typename cimg::superset<T,t>::type> get_dilate(const CImg<t>& tqmask, const unsigned int cond=1,
CImg<typename cimg::superset<T,t>::type> get_dilate(const CImg<t>& mask, const unsigned int cond=1,
const bool weighted_dilatation=false) const {
typedef typename cimg::superset<T,t>::type Tt;
if (is_empty()) return *this;
if (!tqmask || tqmask.dim!=1)
throw CImgArgumentException("CImg<%s>::dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data);
if (!mask || mask.dim!=1)
throw CImgArgumentException("CImg<%s>::dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.",
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data);
CImg<Tt> dest(width,height,depth,dim);
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),
mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2,
mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2),
mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2;
cimg_forV(*this,v)
if (!weighted_dilatation) { // Classical dilatation
@ -24873,7 +24873,7 @@ namespace cimg_library {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
}
dest(x,y,z,v) = max_val;
}
@ -24883,7 +24883,7 @@ namespace cimg_library {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
}
dest(x,y,z,v) = max_val;
}
@ -24893,7 +24893,7 @@ namespace cimg_library {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0);
if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval;
}
dest(x,y,z,v) = max_val;
}
@ -24901,7 +24901,7 @@ namespace cimg_library {
for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) - mval);
if (mval && cval>max_val) max_val = cval;
}
@ -24912,7 +24912,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) - mval);
if (mval && cval>max_val) max_val = cval;
}
@ -24923,7 +24923,7 @@ namespace cimg_library {
for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) {
Tt max_val = cimg::type<Tt>::min();
for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) {
const t mval = tqmask(mx1+xm,my1+ym,mz1+zm);
const t mval = mask(mx1+xm,my1+ym,mz1+zm);
const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) - mval);
if (mval && cval>max_val) max_val = cval;
}
@ -24940,11 +24940,11 @@ namespace cimg_library {
}
CImg<T> get_dilate(const unsigned int n, const unsigned int cond=1) const {
static CImg<T> tqmask;
static CImg<T> mask;
if (n<2) return *this;
if (tqmask.width!=n) tqmask.assign(n,n,1,1,1);
const CImg<T> res = get_dilate(tqmask,cond,false);
if (n>20) tqmask.assign();
if (mask.width!=n) mask.assign(n,n,1,1,1);
const CImg<T> res = get_dilate(mask,cond,false);
if (n>20) mask.assign();
return res;
}
@ -25476,7 +25476,7 @@ namespace cimg_library {
//! Blur an image in an anisotropic way.
/**
\param tqmask Binary tqmask.
\param mask Binary mask.
\param amplitude Amplitude of the anisotropic blur.
\param sharpness Contour preservation.
\param anisotropy Smoothing anisotropy.
@ -25490,7 +25490,7 @@ namespace cimg_library {
\param geom_factor Geometry factor.
**/
template<typename tm>
CImg<T>& blur_anisotropic(const CImg<tm>& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f,
CImg<T>& blur_anisotropic(const CImg<tm>& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f,
const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f, const float da=30,
const float gauss_prec=2, const unsigned int interpolation_type=0, const bool fast_approx=true,
const float geom_factor=1) {
@ -25502,7 +25502,7 @@ namespace cimg_library {
"Admissible parameters are in the range : amplitude>0, sharpness>0, anisotropy in [0,1], "
"alpha>0, sigma>0, dl>0, da>0, gauss_prec>0.",
pixel_type(),amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec);
const bool threed = (depth>1), no_tqmask = tqmask.is_empty();
const bool threed = (depth>1), no_mask = mask.is_empty();
const float nsharpness = cimg::max(sharpness,1e-5f), power1 = 0.5f*nsharpness, power2 = power1/(1e-7f+1-anisotropy);
CImg<floatT> blurred = CImg<floatT>(*this,false).blur(alpha);
if (geom_factor>0) blurred*=geom_factor;
@ -25513,7 +25513,7 @@ namespace cimg_library {
CImg<floatT> val(3), vec(3,3), G(blurred.get_structure_tensor());
if (sigma>0) G.blur(sigma);
cimg_forXYZ(*this,x,y,z) {
if (no_tqmask || tqmask(x,y,z)) {
if (no_mask || mask(x,y,z)) {
G.get_tensor_at(x,y,z).symmetric_eigen(val,vec);
const float l1 = val[2], l2 = val[1], l3 = val[0],
ux = vec(0,0), uy = vec(0,1), uz = vec(0,2),
@ -25537,7 +25537,7 @@ namespace cimg_library {
CImg<floatT> val(2), vec(2,2), G(blurred.get_structure_tensor());
if (sigma>0) G.blur(sigma);
cimg_forXY(*this,x,y) {
if (no_tqmask || tqmask(x,y)) {
if (no_mask || mask(x,y)) {
G.get_tensor_at(x,y).symmetric_eigen(val,vec);
const float l1 = val[1], l2 = val[0],
ux = vec(1,0), uy = vec(1,1),
@ -25558,11 +25558,11 @@ namespace cimg_library {
}
template<typename tm>
CImg<T> get_blur_anisotropic(const CImg<tm>& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f,
CImg<T> get_blur_anisotropic(const CImg<tm>& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f,
const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f,
const float da=30, const float gauss_prec=2, const unsigned int interpolation_type=0,
const bool fast_approx=true, const float geom_factor=1) const {
return (+*this).blur_anisotropic(tqmask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor);
return (+*this).blur_anisotropic(mask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor);
}
//! Blur an image following in an anisotropic way.
@ -29139,27 +29139,27 @@ namespace cimg_library {
switch (bpp) {
case 1 : { // Monochrome
for (int y=height-1; y>=0; --y) {
unsigned char tqmask = 0x80, val = 0;
unsigned char mask = 0x80, val = 0;
cimg_forX(*this,x) {
if (tqmask==0x80) val = *(ptrs++);
const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0));
if (mask==0x80) val = *(ptrs++);
const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0));
(*this)(x,y,2) = (T)*(col++);
(*this)(x,y,1) = (T)*(col++);
(*this)(x,y,0) = (T)*(col++);
tqmask = cimg::ror(tqmask);
mask = cimg::ror(mask);
} ptrs+=align; }
} break;
case 4 : { // 16 colors
for (int y=height-1; y>=0; --y) {
unsigned char tqmask = 0xF0, val = 0;
unsigned char mask = 0xF0, val = 0;
cimg_forX(*this,x) {
if (tqmask==0xF0) val = *(ptrs++);
const unsigned char color = (unsigned char)((tqmask<16)?(val&tqmask):((val&tqmask)>>4));
if (mask==0xF0) val = *(ptrs++);
const unsigned char color = (unsigned char)((mask<16)?(val&mask):((val&mask)>>4));
unsigned char *col = (unsigned char*)(palette+color);
(*this)(x,y,2) = (T)*(col++);
(*this)(x,y,1) = (T)*(col++);
(*this)(x,y,0) = (T)*(col++);
tqmask = cimg::ror(tqmask,4);
mask = cimg::ror(mask,4);
} ptrs+=align; }
} break;
case 8 : { // 256 colors
@ -35025,9 +35025,9 @@ namespace cimg_library {
for (unsigned int y=0; y<h; ++y)
for (unsigned int x=0; x<256*w; ++x) {
m>>=1; if (!m) { m = 0x80000000; val = *(ptr++); }
CImg<T>& img = res[x/w], &tqmask = res[x/w+256];
CImg<T>& img = res[x/w], &mask = res[x/w+256];
unsigned int xm = x%w;
img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0);
img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0);
}
if (variable_size) res.crop_font();
if (paddingx || paddingy) cimglist_for(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0);

@ -82,7 +82,7 @@ struct _greycstoration_params {
// Non-specific parameters of the algorithms.
CImg<T> *source;
const CImg<unsigned char> *tqmask;
const CImg<unsigned char> *mask;
CImg<T> *temporary;
unsigned long *counter;
unsigned int tile;
@ -104,7 +104,7 @@ struct _greycstoration_params {
// Default constructor
_greycstoration_params():patch_based(false),amplitude(0),sharpness(0),anisotropy(0),alpha(0),sigma(0),gfact(1),
dl(0),da(0),gauss_prec(0),interpolation(0),patch_size(0),
sigma_s(0),sigma_p(0),lookup_size(0),source(0),tqmask(0),temporary(0),counter(0),tile(0),
sigma_s(0),sigma_p(0),lookup_size(0),source(0),mask(0),temporary(0),counter(0),tile(0),
tile_border(0),thread(0),nb_threads(0),fast_approx(false),is_running(false), stop_request(0), mutex(0) {}
};
@ -149,8 +149,8 @@ float greycstoration_progress() const {
return cimg::min(counter*99.9f/maxcounter,99.9f);
}
//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a tqmask.
CImg& greycstoration_run(const CImg<unsigned char>& tqmask,
//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a mask.
CImg& greycstoration_run(const CImg<unsigned char>& mask,
const float amplitude=60, const float sharpness=0.7f, const float anisotropy=0.3f,
const float alpha=0.6f, const float sigma=1.1f, const float gfact=1.0f,
const float dl=0.8f, const float da=30.0f,
@ -162,10 +162,10 @@ CImg& greycstoration_run(const CImg<unsigned char>& tqmask,
" the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data);
else {
if (!tqmask.is_empty() && !tqmask.is_sameXY(*this))
throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given tqmask (%u,%u,%u,%u,%p) and instance image "
if (!mask.is_empty() && !mask.is_sameXY(*this))
throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given mask (%u,%u,%u,%u,%p) and instance image "
"(%u,%u,%u,%u,%p) have different dimensions.",
pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data,width,height,depth,dim,data);
pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data,width,height,depth,dim,data);
if (nb_threads>16) cimg::warn("CImg<%s>::greycstoration_run() : Multi-threading mode limited to 16 threads max.");
const unsigned int
ntile = (tile && (tile<width || tile<height || (depth>1 && tile<depth)))?tile:0,
@ -195,7 +195,7 @@ CImg& greycstoration_run(const CImg<unsigned char>& tqmask,
greycstoration_params[k].interpolation = interpolation;
greycstoration_params[k].fast_approx = fast_approx;
greycstoration_params[k].source = this;
greycstoration_params[k].tqmask = &tqmask;
greycstoration_params[k].mask = &mask;
greycstoration_params[k].temporary = temporary;
greycstoration_params[k].counter = counter;
greycstoration_params[k].tile = ntile;
@ -239,8 +239,8 @@ CImg& greycstoration_run(const float amplitude=50, const float sharpness=0.7f, c
const float dl=0.8f, const float da=30.0f,
const float gauss_prec=2.0f, const unsigned int interpolation=0, const bool fast_approx=true,
const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) {
static const CImg<unsigned char> empty_tqmask;
return greycstoration_run(empty_tqmask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec,
static const CImg<unsigned char> empty_mask;
return greycstoration_run(empty_mask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec,
interpolation,fast_approx,tile,tile_border,nb_threads);
}
@ -249,7 +249,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm
const unsigned int lookup_size=20, const bool fast_approx=true,
const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) {
static const CImg<unsigned char> empty_tqmask;
static const CImg<unsigned char> empty_mask;
if (greycstoration_is_running())
throw CImgInstanceException("CImg<T>::greycstoration_run() : A GREYCstoration thread is already running on"
" the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data);
@ -277,7 +277,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm
greycstoration_params[k].sigma_p = sigma_p;
greycstoration_params[k].lookup_size = lookup_size;
greycstoration_params[k].source = this;
greycstoration_params[k].tqmask = &empty_tqmask;
greycstoration_params[k].mask = &empty_mask;
greycstoration_params[k].temporary = temporary;
greycstoration_params[k].counter = counter;
greycstoration_params[k].tile = ntile;
@ -370,7 +370,7 @@ static void* greycstoration_thread(void *arg) {
#endif
_greycstoration_params &p = *(_greycstoration_params*)arg;
greycstoration_mutex_lock(p);
const CImg<unsigned char> &tqmask = *(p.tqmask);
const CImg<unsigned char> &mask = *(p.mask);
CImg<T> &source = *(p.source);
if (!p.tile) {
@ -378,7 +378,7 @@ static void* greycstoration_thread(void *arg) {
// Non-tiled version
//------------------
if (p.patch_based) source.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx);
else source.blur_anisotropic(tqmask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,
else source.blur_anisotropic(mask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,
p.interpolation,p.fast_approx,p.gfact);
} else {
@ -402,7 +402,7 @@ 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> mask_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 = mask.is_empty()?mask:mask.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);
@ -421,7 +421,7 @@ 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> mask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,xe+b,ye+b,true);
CImg<unsigned char> mask_tile = mask.is_empty()?mask:mask.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);
@ -446,7 +446,7 @@ static void* greycstoration_thread(void *arg) {
if (p.counter) delete p.counter;
if (p.temporary) { source = *(p.temporary); delete p.temporary; }
if (p.stop_request) delete p.stop_request;
p.tqmask = 0;
p.mask = 0;
p.amplitude = p.sharpness = p.anisotropy = p.alpha = p.sigma = p.gfact = p.dl = p.da = p.gauss_prec = p.sigma_s = p.sigma_p = 0;
p.patch_size = p.interpolation = p.lookup_size = 0;
p.fast_approx = false;

@ -93,7 +93,7 @@ public:
GreycstorationSettings settings; // Current Greycstoraion algorithm settings.
CImg<> img; // Main image.
CImg<uchar> tqmask; // The tqmask used with inpaint or resize mode
CImg<uchar> mask; // The mask used with inpaint or resize mode
};
GreycstorationIface::GreycstorationIface(DImg *orgImage,
@ -101,8 +101,8 @@ GreycstorationIface::GreycstorationIface(DImg *orgImage,
int mode,
int newWidth, int newHeight,
const TQImage& inPaintingMask,
TQObject *tqparent)
: DImgThreadedFilter(orgImage, tqparent)
TQObject *parent)
: DImgThreadedFilter(orgImage, parent)
{
d = new GreycstorationIfacePriv;
d->settings = settings;
@ -143,11 +143,11 @@ void GreycstorationIface::initFilter()
if (m_parent)
start(); // m_parent is valide, start thread ==> run()
else
startComputation(); // no tqparent : no using thread.
startComputation(); // no parent : no using thread.
}
else // No image data
{
if (m_parent) // If tqparent then send event about a problem.
if (m_parent) // If parent then send event about a problem.
{
postProgress(0, false, false);
DDebug() << m_name << "::No valid image data !!! ..." << endl;
@ -332,23 +332,23 @@ void GreycstorationIface::inpainting()
register int x, y;
d->tqmask = CImg<uchar>(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3);
d->mask = CImg<uchar>(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3);
uchar *ptr = d->inPaintingMask.bits();
for (y = 0; y < d->inPaintingMask.height(); y++)
{
for (x = 0; x < d->inPaintingMask.width(); x++)
{
d->tqmask(x, y, 0) = ptr[2]; // blue.
d->tqmask(x, y, 1) = ptr[1]; // green.
d->tqmask(x, y, 2) = ptr[0]; // red.
d->mask(x, y, 0) = ptr[2]; // blue.
d->mask(x, y, 1) = ptr[1]; // green.
d->mask(x, y, 2) = ptr[0]; // red.
ptr += 4;
}
}
}
else
{
DDebug() << "Inpainting image: tqmask is null!" << endl;
DDebug() << "Inpainting image: mask is null!" << endl;
m_cancel = true;
return;
}
@ -358,7 +358,7 @@ void GreycstorationIface::inpainting()
// This function will start a thread running one iteration of the GREYCstoration filter.
// It returns immediately, so you can do what you want after (update a progress bar for
// instance).
d->img.greycstoration_run(d->tqmask,
d->img.greycstoration_run(d->mask,
d->settings.amplitude,
d->settings.sharpness,
d->settings.anisotropy,
@ -388,12 +388,12 @@ void GreycstorationIface::resize()
int w = m_destImage.width();
int h = m_destImage.height();
d->tqmask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255);
d->mask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255);
if (!anchor)
d->tqmask.resize(w, h, 1, 1, 1);
d->mask.resize(w, h, 1, 1, 1);
else
d->tqmask = !d->tqmask.resize(w, h, 1, 1, 4);
d->mask = !d->mask.resize(w, h, 1, 1, 4);
d->img.resize(w, h, 1, -100, init);
@ -402,7 +402,7 @@ void GreycstorationIface::resize()
// This function will start a thread running one iteration of the GREYCstoration filter.
// It returns immediately, so you can do what you want after (update a progress bar for
// instance).
d->img.greycstoration_run(d->tqmask,
d->img.greycstoration_run(d->mask,
d->settings.amplitude,
d->settings.sharpness,
d->settings.anisotropy,

@ -62,7 +62,7 @@ public:
int mode=Restore,
int newWidth=0, int newHeight=0,
const TQImage& inPaintingMask=TQImage(),
TQObject *tqparent=0);
TQObject *parent=0);
~GreycstorationIface();

@ -58,7 +58,7 @@ public:
GreycstorationWidgetPriv()
{
tqparent = 0;
parent = 0;
advancedPage = 0;
alphaInput = 0;
@ -107,7 +107,7 @@ public:
TQCheckBox *fastApproxCBox;
TQTabWidget *tqparent;
TQTabWidget *parent;
RComboBox *interpolationBox;
@ -125,17 +125,17 @@ public:
RIntNumInput *tileInput;
};
GreycstorationWidget::GreycstorationWidget(TQTabWidget *tqparent)
: TQObject(TQT_TQOBJECT(tqparent))
GreycstorationWidget::GreycstorationWidget(TQTabWidget *parent)
: TQObject(TQT_TQOBJECT(parent))
{
d = new GreycstorationWidgetPriv;
d->tqparent = tqparent;
d->parent = parent;
// -------------------------------------------------------------
d->generalPage = new TQWidget( tqparent );
d->generalPage = new TQWidget( parent );
TQGridLayout* grid1 = new TQGridLayout(d->generalPage, 6, 2, KDialog::spacingHint());
tqparent->addTab( d->generalPage, i18n("General") );
parent->addTab( d->generalPage, i18n("General") );
d->sharpnessLabel = new TQLabel(i18n("Detail preservation:"), d->generalPage);
d->sharpnessInput = new RDoubleNumInput(d->generalPage);
@ -195,9 +195,9 @@ GreycstorationWidget::GreycstorationWidget(TQTabWidget *tqparent)
// -------------------------------------------------------------
d->advancedPage = new TQWidget( tqparent );
d->advancedPage = new TQWidget( parent );
TQGridLayout* grid2 = new TQGridLayout(d->advancedPage, 6, 2, KDialog::spacingHint());
tqparent->addTab( d->advancedPage, i18n("Advanced Settings") );
parent->addTab( d->advancedPage, i18n("Advanced Settings") );
d->daLabel = new TQLabel(i18n("Angular step:"), d->advancedPage);
d->daInput = new RDoubleNumInput(d->advancedPage);
@ -262,8 +262,8 @@ void GreycstorationWidget::setEnabled(bool b)
{
d->generalPage->setEnabled(b);
d->advancedPage->setEnabled(b);
d->tqparent->setTabEnabled(d->generalPage, b);
d->tqparent->setTabEnabled(d->advancedPage, b);
d->parent->setTabEnabled(d->generalPage, b);
d->parent->setTabEnabled(d->advancedPage, b);
}
void GreycstorationWidget::setSettings(GreycstorationSettings settings)

@ -48,7 +48,7 @@ class DIGIKAM_EXPORT GreycstorationWidget : public TQObject
public:
GreycstorationWidget(TQTabWidget *tqparent);
GreycstorationWidget(TQTabWidget *parent);
~GreycstorationWidget();
void setSettings(GreycstorationSettings settings);

@ -69,7 +69,7 @@ public:
ImageHistogramPriv()
{
tqparent = 0;
parent = 0;
imageData = 0;
histogram = 0;
runningFlag = true;
@ -86,44 +86,44 @@ public:
/** Numbers of histogram segments dependaing of image bytes depth*/
int histoSegments;
/** To post event from thread to tqparent.*/
TQObject *tqparent;
/** To post event from thread to parent.*/
TQObject *parent;
/** Used to stop thread during calculations.*/
bool runningFlag;
};
ImageHistogram::ImageHistogram(const DImg& image, TQObject *tqparent)
ImageHistogram::ImageHistogram(const DImg& image, TQObject *parent)
: TQThread()
{
setup(image.bits(), image.width(), image.height(), image.sixteenBit(), tqparent);
setup(image.bits(), image.width(), image.height(), image.sixteenBit(), parent);
}
ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent)
ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent)
: TQThread()
{
setup(i_data, i_w, i_h, i_sixteenBits, tqparent);
setup(i_data, i_w, i_h, i_sixteenBits, parent);
}
void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent)
void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent)
{
d = new ImageHistogramPriv;
d->imageData = i_data;
d->imageWidth = i_w;
d->imageHeight = i_h;
d->tqparent = tqparent;
d->parent = parent;
d->histoSegments = i_sixteenBits ? 65536 : 256;
if (d->imageData && d->imageWidth && d->imageHeight)
{
if (d->tqparent)
if (d->parent)
start();
else
calcHistogramValues();
}
else
{
if (d->tqparent)
if (d->parent)
postProgress(false, false);
}
}
@ -149,7 +149,7 @@ void ImageHistogram::postProgress(bool starting, bool success)
eventData->starting = starting;
eventData->success = success;
eventData->histogram = this;
TQApplication::postEvent(d->tqparent, new TQCustomEvent(TQEvent::User, eventData));
TQApplication::postEvent(d->parent, new TQCustomEvent(TQEvent::User, eventData));
}
void ImageHistogram::stopCalcHistogramValues(void)
@ -170,7 +170,7 @@ void ImageHistogram::calcHistogramValues()
register uint i;
int max;
if (d->tqparent)
if (d->parent)
postProgress(true, false);
d->histogram = new ImageHistogramPriv::double_packet[d->histoSegments];
@ -180,7 +180,7 @@ void ImageHistogram::calcHistogramValues()
{
DWarning() << ("HistogramWidget::calcHistogramValues: Unable to allocate memory!") << endl;
if (d->tqparent)
if (d->parent)
postProgress(false, false);
return;
@ -239,7 +239,7 @@ void ImageHistogram::calcHistogramValues()
}
}
if (d->tqparent && d->runningFlag)
if (d->parent && d->runningFlag)
postProgress(false, true);
}

@ -73,12 +73,12 @@ public:
public:
ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent=0);
ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent=0);
ImageHistogram(const DImg& image, TQObject *tqparent=0);
ImageHistogram(const DImg& image, TQObject *parent=0);
~ImageHistogram();
void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent);
void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *parent);
/** Method to stop threaded computations.*/
void stopCalcHistogramValues(void);

@ -156,8 +156,8 @@ public:
KSqueezedTextLabel *labelPhotoWhiteBalance;
};
CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* tqparent, bool navBar)
: NavigateBarTab(tqparent)
CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
: NavigateBarTab(parent)
{
d = new CameraItemPropertiesTabPriv;

@ -51,7 +51,7 @@ class DIGIKAM_EXPORT CameraItemPropertiesTab : public NavigateBarTab
public:
CameraItemPropertiesTab(TQWidget* tqparent, bool navBar=true);
CameraItemPropertiesTab(TQWidget* parent, bool navBar=true);
~CameraItemPropertiesTab();
void setCurrentItem(const GPItemInfo* itemInfo=0,

@ -134,8 +134,8 @@ public:
MetadataHub hub;
};
ImageDescEditTab::ImageDescEditTab(TQWidget *tqparent, bool navBar)
: NavigateBarTab(tqparent)
ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar)
: NavigateBarTab(parent)
{
d = new ImageDescEditTabPriv;
@ -1212,15 +1212,15 @@ void ImageDescEditTab::slotAlbumAdded(Album* a)
}
else
{
TAlbumCheckListItem* tqparent = (TAlbumCheckListItem*)(tag->tqparent()->extraData(d->tagsView));
if (!tqparent)
TAlbumCheckListItem* parent = (TAlbumCheckListItem*)(tag->parent()->extraData(d->tagsView));
if (!parent)
{
DWarning() << k_funcinfo << "Failed to find tqparent for Tag " << tag->title()
DWarning() << k_funcinfo << "Failed to find parent for Tag " << tag->title()
<< endl;
return;
}
viewItem = new TAlbumCheckListItem(tqparent, tag);
viewItem = new TAlbumCheckListItem(parent, tag);
d->tagsSearchBar->lineEdit()->completionObject()->addItem(tag->title());
d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath());
d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath().remove(0, 1)); // without root "/"
@ -1274,9 +1274,9 @@ void ImageDescEditTab::slotAlbumMoved(TAlbum* tag, TAlbum* newParent)
if (!item)
return;
if (item->tqparent())
if (item->parent())
{
TQListViewItem* oldPItem = item->tqparent();
TQListViewItem* oldPItem = item->parent();
oldPItem->takeItem(item);
}
else
@ -1336,7 +1336,7 @@ void ImageDescEditTab::toggleParentTags(TAlbum *album, bool b)
{
if (!item->album())
continue;
if (item->album() == album->tqparent())
if (item->album() == album->parent())
{
item->setOn(b);
toggleParentTags(item->album() , b);
@ -1509,7 +1509,7 @@ void ImageDescEditTab::updateRecentTags()
icon = loader->getStandardTagIcon(album, AlbumThumbnailLoader::SmallerSize);
}
}
TQString text = album->title() + " (" + ((TAlbum*)album->tqparent())->prettyURL() + ')';
TQString text = album->title() + " (" + ((TAlbum*)album->parent())->prettyURL() + ')';
menu->insertItem(icon, text, album->id());
}
}
@ -1563,16 +1563,16 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter)
if (!match)
{
// check if any of the parents match the search
Album* tqparent = tag->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = tag->parent();
while (parent && !parent->isRoot())
{
if (tqparent->title().lower().contains(search))
if (parent->title().lower().contains(search))
{
match = true;
break;
}
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}
@ -1653,12 +1653,12 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
if (tagAssigned)
{
Album* tqparent = tag->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = tag->parent();
while (parent && !parent->isRoot())
{
TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)tqparent->extraData(d->tagsView);
TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)parent->extraData(d->tagsView);
pitem->setVisible(true);
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}
}

@ -54,7 +54,7 @@ class DIGIKAM_EXPORT ImageDescEditTab : public NavigateBarTab
public:
ImageDescEditTab(TQWidget *tqparent, bool navBar=true);
ImageDescEditTab(TQWidget *parent, bool navBar=true);
~ImageDescEditTab();
void assignRating(int rating);

@ -143,8 +143,8 @@ public:
SharedLoadSaveThread *imageLoaderThread;
};
ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar)
: NavigateBarTab(tqparent)
ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar)
: NavigateBarTab(parent)
{
d = new ImagePropertiesColorsTabPriv;

@ -54,7 +54,7 @@ class DIGIKAM_EXPORT ImagePropertiesColorsTab : public NavigateBarTab
public:
ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar=true);
ImagePropertiesColorsTab(TQWidget* parent, bool navBar=true);
~ImagePropertiesColorsTab();
void setData(const KURL& url=KURL(), const TQRect &selectionArea = TQRect(),

@ -86,8 +86,8 @@ public:
GPSWidget *gpsWidget;
};
ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar)
: NavigateBarTab(tqparent)
ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool navBar)
: NavigateBarTab(parent)
{
d = new ImagePropertiesMetadataTabPriv;

@ -50,7 +50,7 @@ class DIGIKAM_EXPORT ImagePropertiesMetaDataTab : public NavigateBarTab
public:
ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar=true);
ImagePropertiesMetaDataTab(TQWidget* parent, bool navBar=true);
~ImagePropertiesMetaDataTab();
void setCurrentURL(const KURL& url=KURL());

@ -49,10 +49,10 @@
namespace Digikam
{
ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *tqparent, const char *name,
ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *parent, const char *name,
TQSplitter *splitter, Side side,
bool mimimizedDefault, bool navBar)
: Sidebar(tqparent, name, side, mimimizedDefault)
: Sidebar(parent, name, side, mimimizedDefault)
{
m_image = 0;
m_currentRect = TQRect();
@ -60,9 +60,9 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *tqparent, const char *n
m_dirtyMetadataTab = false;
m_dirtyColorTab = false;
m_propertiesTab = new ImagePropertiesTab(tqparent, navBar);
m_metadataTab = new ImagePropertiesMetaDataTab(tqparent, navBar);
m_colorTab = new ImagePropertiesColorsTab(tqparent, navBar);
m_propertiesTab = new ImagePropertiesTab(parent, navBar);
m_metadataTab = new ImagePropertiesMetaDataTab(parent, navBar);
m_colorTab = new ImagePropertiesColorsTab(parent, navBar);
setSplitter(splitter);

@ -53,7 +53,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBar : public Sidebar
public:
ImagePropertiesSideBar(TQWidget* tqparent, const char *name, TQSplitter *splitter,
ImagePropertiesSideBar(TQWidget* parent, const char *name, TQSplitter *splitter,
Side side=Left, bool mimimizedDefault=false, bool navBar=false);
~ImagePropertiesSideBar();

@ -87,14 +87,14 @@ public:
CameraItemPropertiesTab *cameraItemTab;
};
ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *tqparent, const char *name,
ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *parent, const char *name,
TQSplitter *splitter, Side side,
bool mimimizedDefault)
: Sidebar(tqparent, name, side, mimimizedDefault)
: Sidebar(parent, name, side, mimimizedDefault)
{
d = new ImagePropertiesSideBarCamGuiPriv;
d->cameraItemTab = new CameraItemPropertiesTab(tqparent, true);
d->metadataTab = new ImagePropertiesMetaDataTab(tqparent, true);
d->cameraItemTab = new CameraItemPropertiesTab(parent, true);
d->metadataTab = new ImagePropertiesMetaDataTab(parent, true);
setSplitter(splitter);

@ -53,7 +53,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBarCamGui : public Sidebar
public:
ImagePropertiesSideBarCamGui(TQWidget* tqparent, const char *name, TQSplitter *splitter,
ImagePropertiesSideBarCamGui(TQWidget* parent, const char *name, TQSplitter *splitter,
Side side=Left, bool mimimizedDefault=false);
~ImagePropertiesSideBarCamGui();

@ -79,14 +79,14 @@ public:
bool hasImageInfoOwnership;
};
ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *tqparent, const char *name, TQSplitter *splitter,
ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *parent, const char *name, TQSplitter *splitter,
Side side, bool mimimizedDefault)
: ImagePropertiesSideBar(tqparent, name, splitter, side, mimimizedDefault, false)
: ImagePropertiesSideBar(parent, name, splitter, side, mimimizedDefault, false)
{
// Navigate bar is disabled by passing false to tqparent class constructor, and tab constructors
// Navigate bar is disabled by passing false to parent class constructor, and tab constructors
d = new ImagePropertiesSideBarDBPriv;
d->desceditTab = new ImageDescEditTab(tqparent, false);
d->desceditTab = new ImageDescEditTab(parent, false);
appendTab(d->desceditTab, SmallIcon("imagecomment"), i18n("Captions/Tags"));

@ -60,7 +60,7 @@ class DIGIKAM_EXPORT ImagePropertiesSideBarDB : public ImagePropertiesSideBar
public:
ImagePropertiesSideBarDB(TQWidget* tqparent, const char *name, TQSplitter *splitter, Side side=Left,
ImagePropertiesSideBarDB(TQWidget* parent, const char *name, TQSplitter *splitter, Side side=Left,
bool mimimizedDefault=false);
~ImagePropertiesSideBarDB();

@ -169,8 +169,8 @@ public:
KSqueezedTextLabel *labelPhotoWhiteBalance;
};
ImagePropertiesTab::ImagePropertiesTab(TQWidget* tqparent, bool navBar)
: NavigateBarTab(tqparent)
ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
: NavigateBarTab(parent)
{
d = new ImagePropertiesTabPriv;

@ -51,7 +51,7 @@ class DIGIKAM_EXPORT ImagePropertiesTab : public NavigateBarTab
public:
ImagePropertiesTab(TQWidget* tqparent, bool navBar=true);
ImagePropertiesTab(TQWidget* parent, bool navBar=true);
~ImagePropertiesTab();
void setCurrentURL(const KURL& url=KURL());

@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2007-01-04
* Description : A tqparent tab class with a navigation bar
* Description : A parent tab class with a navigation bar
*
* Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@ -56,8 +56,8 @@ public:
NavigateBarWidget *navigateBar;
};
NavigateBarTab::NavigateBarTab(TQWidget* tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
NavigateBarTab::NavigateBarTab(TQWidget* parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new NavigateBarTabPriv;
m_navigateBarLayout = 0;

@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2007-01-04
* Description : A tqparent tab class with a navigation bar
* Description : A parent tab class with a navigation bar
*
* Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@ -54,7 +54,7 @@ class DIGIKAM_EXPORT NavigateBarTab : public TQWidget
public:
NavigateBarTab(TQWidget* tqparent);
NavigateBarTab(TQWidget* parent);
~NavigateBarTab();
void setNavigateBarState(bool hasPrevious, bool hasNext);

@ -55,8 +55,8 @@ public:
StatusNavigateBar *navBar;
};
NavigateBarWidget::NavigateBarWidget(TQWidget *tqparent, bool show)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
NavigateBarWidget::NavigateBarWidget(TQWidget *parent, bool show)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new NavigateBarWidgetPriv;

@ -45,7 +45,7 @@ Q_OBJECT
public:
NavigateBarWidget(TQWidget *tqparent=0, bool show=true);
NavigateBarWidget(TQWidget *parent=0, bool show=true);
~NavigateBarWidget();
void setFileName(TQString filename=TQString());

@ -67,8 +67,8 @@ extern "C"
namespace Digikam
{
TAlbumCheckListItem::TAlbumCheckListItem(TQListView* tqparent, TAlbum* album)
: FolderCheckListItem(tqparent, album->title(), TQCheckListItem::RadioButtonController)
TAlbumCheckListItem::TAlbumCheckListItem(TQListView* parent, TAlbum* album)
: FolderCheckListItem(parent, album->title(), TQCheckListItem::RadioButtonController)
{
setDragEnabled(true);
m_album = album;
@ -78,8 +78,8 @@ TAlbumCheckListItem::TAlbumCheckListItem(TQListView* tqparent, TAlbum* album)
m_album->setExtraData(listView(), this);
}
TAlbumCheckListItem::TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album)
: FolderCheckListItem(tqparent, album->title(), TQCheckListItem::CheckBox)
TAlbumCheckListItem::TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album)
: FolderCheckListItem(parent, album->title(), TQCheckListItem::CheckBox)
{
setDragEnabled(true);
m_album = album;
@ -94,7 +94,7 @@ void TAlbumCheckListItem::refresh()
if (!m_album) return;
if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() &&
dynamic_cast<TAlbumCheckListItem*>(tqparent()))
dynamic_cast<TAlbumCheckListItem*>(parent()))
{
if (isOpen())
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count));
@ -167,8 +167,8 @@ void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status)
// ------------------------------------------------------------------------
TAlbumListView::TAlbumListView(TQWidget* tqparent)
: FolderView(tqparent, "TAlbumListView")
TAlbumListView::TAlbumListView(TQWidget* parent)
: FolderView(parent, "TAlbumListView")
{
addColumn(i18n("Tags"));
header()->hide();
@ -198,7 +198,7 @@ TQDragObject* TAlbumListView::dragObject()
if(!item)
return 0;
if(!item->tqparent())
if(!item->parent())
return 0;
TagDrag *t = new TagDrag(item->id(), this);
@ -223,14 +223,14 @@ bool TAlbumListView::acceptDrop(const TQDropEvent *e) const
if(itemDrag == itemDrop)
return false;
// Dragging a tqparent on its child makes no sense
// Dragging a parent on its child makes no sense
if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album()))
return false;
return true;
}
if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->tqparent())
if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->parent())
{
// Only other possibility is image items being dropped
// And allow this only if there is a Tag to be dropped

@ -43,9 +43,9 @@ class DIGIKAM_EXPORT TAlbumCheckListItem : public FolderCheckListItem
{
public:
TAlbumCheckListItem(TQListView* tqparent, TAlbum* album);
TAlbumCheckListItem(TQListView* parent, TAlbum* album);
TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album);
TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album);
void settqStatus(MetadataHub::TagtqStatus status);
void refresh();
@ -75,7 +75,7 @@ class DIGIKAM_EXPORT TAlbumListView : public FolderView
public:
TAlbumListView(TQWidget* tqparent);
TAlbumListView(TQWidget* parent);
~TAlbumListView();
void stateChanged(TAlbumCheckListItem *item);

@ -101,7 +101,7 @@ BOOL EqualsTo(const char* a, const char *b)
}
/* Does return a bitwise tqmask holding the measurements contained in a Sheet */
/* Does return a bitwise mask holding the measurements contained in a Sheet */
static
DWORD MaskOfDataSet(LCMSHANDLE hSheet)
@ -243,7 +243,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet)
}
/* Build tqmask according to data format */
/* Build mask according to data format */
dwMask = MaskOfDataSet(hSheet);
@ -253,7 +253,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet)
LPPATCH Patch = m -> Patches + i;
/* Fill in data according to tqmask */
/* Fill in data according to mask */
if (dwMask & PATCH_HAS_Lab) {
@ -307,7 +307,7 @@ BOOL cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8)
DWORD dwMask = 0;
int i;
/* Find tqmask of fields */
/* Find mask of fields */
for (i=0; i < m ->nPatches; i++) {
if (m ->Allowed[i]) {
@ -416,7 +416,7 @@ void FixLabOnly(LPMEASUREMENT m)
/* Higher level function. Does merge reference and measurement sheet into */
/* a MEASUREMENT struct. Data to keep is described in dwNeededSamplesType */
/* tqmask as follows: */
/* mask as follows: */
/* */
/* PATCH_HAS_Lab 0x00000001 */
/* PATCH_HAS_XYZ 0x00000002 */

@ -152,9 +152,9 @@ public:
// -------------------------------------------------------------------------
ThumbBarView::ThumbBarView(TQWidget* tqparent, int orientation, bool exifRotate,
ThumbBarView::ThumbBarView(TQWidget* parent, int orientation, bool exifRotate,
ThumbBarToolTipSettings settings)
: TQScrollView(tqparent)
: TQScrollView(parent)
{
d = new ThumbBarViewPriv;
d->orientation = orientation;
@ -882,8 +882,8 @@ void ThumbBarItem::tqrepaint()
// -------------------------------------------------------------------------
ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* tqparent)
: TQToolTip(tqparent->viewport()), m_maxStringLen(30), m_view(tqparent)
ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* parent)
: TQToolTip(parent->viewport()), m_maxStringLen(30), m_view(parent)
{
m_headBeg = TQString("<tr bgcolor=\"orange\"><td colspan=\"2\">"
"<nobr><font size=\"-1\" color=\"black\"><b>");

@ -100,7 +100,7 @@ public:
public:
ThumbBarView(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true,
ThumbBarView(TQWidget* parent, int orientation=Vertical, bool exifRotate=true,
ThumbBarToolTipSettings settings=ThumbBarToolTipSettings());
virtual ~ThumbBarView();
@ -204,7 +204,7 @@ class DIGIKAM_EXPORT ThumbBarToolTip : public TQToolTip
public:
ThumbBarToolTip(ThumbBarView *tqparent);
ThumbBarToolTip(ThumbBarView *parent);
virtual ~ThumbBarToolTip(){};
protected:

@ -52,8 +52,8 @@ public:
TQColor color2;
};
ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *tqparent)
: TQFrame(tqparent, 0, TQt::WDestructiveClose)
ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent)
: TQFrame(parent, 0, TQt::WDestructiveClose)
{
d = new ColorGradientWidgetPriv;
d->orientation = o;

@ -53,7 +53,7 @@ public:
public:
ColorGradientWidget( int o, int size, TQWidget *tqparent=0 );
ColorGradientWidget( int o, int size, TQWidget *parent=0 );
~ColorGradientWidget();

@ -107,8 +107,8 @@ public:
};
CurvesWidget::CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
CurvesWidget::CurvesWidget(int w, int h, TQWidget *parent, bool readOnly)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new CurvesWidgetPriv;
@ -117,8 +117,8 @@ CurvesWidget::CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly)
CurvesWidget::CurvesWidget(int w, int h,
uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits,
TQWidget *tqparent, bool readOnly)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
TQWidget *parent, bool readOnly)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new CurvesWidgetPriv;

@ -66,12 +66,12 @@ public:
public:
CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly=false);
CurvesWidget(int w, int h, TQWidget *parent, bool readOnly=false);
CurvesWidget(int w, int h, // Widget size.
uchar *i_data, uint i_w, uint i_h, // Full image info.
bool i_sixteenBits, // 8 or 16 bits image.
TQWidget *tqparent=0, // Parent widget instance.
TQWidget *parent=0, // Parent widget instance.
bool readOnly=false); // If true : widget with full edition mode capabilities.
// If false : display curve data only without edition.

@ -34,11 +34,11 @@
namespace Digikam
{
DCursorTracker::DCursorTracker(const TQString& txt, TQWidget *tqparent)
DCursorTracker::DCursorTracker(const TQString& txt, TQWidget *parent)
: TQLabel(txt, 0, "", WX11BypassWM)
{
tqparent->setMouseTracking(true);
tqparent->installEventFilter(this);
parent->setMouseTracking(true);
parent->installEventFilter(this);
setEnable(true);
}
@ -97,8 +97,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e)
}
DTipTracker::DTipTracker(const TQString& txt, TQWidget *tqparent)
: DCursorTracker(txt, tqparent)
DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent)
: DCursorTracker(txt, parent)
{
setPalette(TQToolTip::palette());
setFrameStyle(TQFrame::Plain | TQFrame::Box);

@ -45,7 +45,7 @@ class DIGIKAM_EXPORT DCursorTracker : public TQLabel
public:
DCursorTracker(const TQString& txt, TQWidget *tqparent);
DCursorTracker(const TQString& txt, TQWidget *parent);
void setText(const TQString& txt);
void setEnable(bool b);
@ -68,7 +68,7 @@ class DTipTracker : public DCursorTracker
public:
DTipTracker(const TQString& txt, TQWidget *tqparent);
DTipTracker(const TQString& txt, TQWidget *parent);
};
} // namespace Digikam

@ -43,8 +43,8 @@
namespace Digikam
{
DLogoAction::DLogoAction(TQObject* tqparent, const char* name)
: KAction(tqparent, name)
DLogoAction::DLogoAction(TQObject* parent, const char* name)
: KAction(parent, name)
{
setText("digikam.org");
setIcon("digikam");

@ -42,7 +42,7 @@ class DIGIKAM_EXPORT DLogoAction : public KAction
public:
DLogoAction(TQObject* tqparent, const char* name=0);
DLogoAction(TQObject* parent, const char* name=0);
virtual int plug(TQWidget *widget, int index=-1);

@ -48,8 +48,8 @@ namespace Digikam
static TQImage s_dpopupmenu_sidePixmap;
static TQColor s_dpopupmenu_sidePixmapColor;
DPopupMenu::DPopupMenu(TQWidget* tqparent, const char* name)
: KPopupMenu(tqparent, name)
DPopupMenu::DPopupMenu(TQWidget* parent, const char* name)
: KPopupMenu(parent, name)
{
// Must be initialized so that we know the size on first invocation
if ( s_dpopupmenu_sidePixmap.isNull() )

@ -51,7 +51,7 @@ class DIGIKAM_EXPORT DPopupMenu : public KPopupMenu
public:
DPopupMenu(TQWidget *tqparent=0, const char *name=0);
DPopupMenu(TQWidget *parent=0, const char *name=0);
~DPopupMenu();
int sidePixmapWidth() const;

@ -82,8 +82,8 @@ public:
JP2KSettings *JPEG2000Options;
};
FileSaveOptionsBox::FileSaveOptionsBox(TQWidget *tqparent)
: TQWidgetStack(tqparent, 0, TQt::WDestructiveClose)
FileSaveOptionsBox::FileSaveOptionsBox(TQWidget *parent)
: TQWidgetStack(parent, 0, TQt::WDestructiveClose)
{
d = new FileSaveOptionsBoxPriv;

@ -47,7 +47,7 @@ Q_OBJECT
public:
FileSaveOptionsBox(TQWidget *tqparent=0);
FileSaveOptionsBox(TQWidget *parent=0);
~FileSaveOptionsBox();
void applySettings();

@ -110,9 +110,9 @@ public:
// Constructor without image data (needed to use updateData() method after instance created).
HistogramWidget::HistogramWidget(int w, int h,
TQWidget *tqparent, bool selectMode,
TQWidget *parent, bool selectMode,
bool showProgress, bool statisticsVisible)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new HistogramWidgetPriv;
setup(w, h, selectMode, showProgress, statisticsVisible);
@ -126,9 +126,9 @@ HistogramWidget::HistogramWidget(int w, int h,
HistogramWidget::HistogramWidget(int w, int h,
uchar *i_data, uint i_w, uint i_h,
bool i_sixteenBits,
TQWidget *tqparent, bool selectMode,
TQWidget *parent, bool selectMode,
bool showProgress, bool statisticsVisible)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new HistogramWidgetPriv;
d->sixteenBits = i_sixteenBits;
@ -144,9 +144,9 @@ HistogramWidget::HistogramWidget(int w, int h,
uchar *i_data, uint i_w, uint i_h,
uchar *s_data, uint s_w, uint s_h,
bool i_sixteenBits,
TQWidget *tqparent, bool selectMode,
TQWidget *parent, bool selectMode,
bool showProgress, bool statisticsVisible)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new HistogramWidgetPriv;
d->sixteenBits = i_sixteenBits;

@ -81,7 +81,7 @@ public:
/** Constructor without image data. Needed to use updateData() method after to create instance.*/
HistogramWidget(int w, int h, // Widget size.
TQWidget *tqparent=0, bool selectMode=true,
TQWidget *parent=0, bool selectMode=true,
bool showProgress=true,
bool statisticsVisible=false);
@ -89,7 +89,7 @@ public:
HistogramWidget(int w, int h, // Widget size.
uchar *i_data, uint i_w, uint i_h, // Full image info.
bool i_sixteenBits, // 8 or 16 bits image.
TQWidget *tqparent=0, bool selectMode=true,
TQWidget *parent=0, bool selectMode=true,
bool showProgress=true,
bool statisticsVisible=false);
@ -98,7 +98,7 @@ public:
uchar *i_data, uint i_w, uint i_h, // Full image info.
uchar *s_data, uint s_w, uint s_h, // Image selection info.
bool i_sixteenBits, // 8 or 16 bits image.
TQWidget *tqparent=0, bool selectMode=true,
TQWidget *parent=0, bool selectMode=true,
bool showProgress=true,
bool statisticsVisible=false);

@ -66,8 +66,8 @@ public:
TQImage image;
};
PanIconWidget::PanIconWidget(TQWidget *tqparent, WFlags flags)
: TQWidget(tqparent, 0, flags)
PanIconWidget::PanIconWidget(TQWidget *parent, WFlags flags)
: TQWidget(parent, 0, flags)
{
d = new PanIconWidgetPriv;
m_flicker = false;

@ -48,7 +48,7 @@ Q_OBJECT
public:
PanIconWidget(TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose);
PanIconWidget(TQWidget *parent=0, WFlags flags=TQt::WDestructiveClose);
~PanIconWidget();
void setImage(int previewWidth, int previewHeight, const TQImage& image);

@ -97,8 +97,8 @@ public:
TQColor bgColor;
};
PreviewWidget::PreviewWidget(TQWidget *tqparent)
: TQScrollView(tqparent, 0, TQt::WDestructiveClose)
PreviewWidget::PreviewWidget(TQWidget *parent)
: TQScrollView(parent, 0, TQt::WDestructiveClose)
{
d = new PreviewWidgetPriv;
d->bgColor.setRgb(0, 0, 0);

@ -48,7 +48,7 @@ Q_OBJECT
public:
PreviewWidget(TQWidget *tqparent=0);
PreviewWidget(TQWidget *parent=0);
~PreviewWidget();
void setZoomFactor(double z);

@ -59,8 +59,8 @@ public:
TQString message;
};
DLineEdit::DLineEdit(const TQString &msg, TQWidget *tqparent)
: KLineEdit(tqparent)
DLineEdit::DLineEdit(const TQString &msg, TQWidget *parent)
: KLineEdit(parent)
{
d = new DLineEditPriv;
setMessage(msg);
@ -152,8 +152,8 @@ public:
DLineEdit *searchEdit;
};
SearchTextBar::SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString &msg)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new SearchTextBarPriv;
setFocusPolicy(TQ_NoFocus);

@ -51,7 +51,7 @@ class DIGIKAM_EXPORT DLineEdit : public KLineEdit
public:
DLineEdit(const TQString &msg, TQWidget *tqparent);
DLineEdit(const TQString &msg, TQWidget *parent);
~DLineEdit();
void setMessage(const TQString &msg);
@ -78,7 +78,7 @@ Q_OBJECT
public:
SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg=i18n("Search..."));
SearchTextBar(TQWidget *parent, const char* name, const TQString &msg=i18n("Search..."));
~SearchTextBar();
void setText(const TQString& text);

@ -86,8 +86,8 @@ public:
Sidebar::Side side;
};
Sidebar::Sidebar(TQWidget *tqparent, const char *name, Side side, bool minimizedDefault)
: KMultiTabBar(KMultiTabBar::Vertical, tqparent, name)
Sidebar::Sidebar(TQWidget *parent, const char *name, Side side, bool minimizedDefault)
: KMultiTabBar(KMultiTabBar::Vertical, parent, name)
{
d = new SidebarPriv;
d->minimizedDefault = minimizedDefault;
@ -351,7 +351,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
}
}
// Else, pass the event on to the tqparent class
// Else, pass the event on to the parent class
return KMultiTabBar::eventFilter(obj, ev);
}

@ -67,12 +67,12 @@ public:
/**
* Creates a new sidebar
* @param tqparent sidebar's tqparent
* @param parent sidebar's parent
* @param name the name of the widget is used to store its state to config
* @param side where the sidebar should be displayed. At the left or right border.
* @param minimizedDefault hide the sidebar when the program is started the first time?
*/
Sidebar(TQWidget *tqparent, const char *name, Side side=Left, bool mimimizedDefault=false);
Sidebar(TQWidget *parent, const char *name, Side side=Left, bool mimimizedDefault=false);
virtual ~Sidebar();
/**

@ -62,8 +62,8 @@ public:
SqueezedComboBoxTip *tooltip;
};
SqueezedComboBox::SqueezedComboBox(TQWidget *tqparent, const char *name)
: TQComboBox(tqparent, name)
SqueezedComboBox::SqueezedComboBox(TQWidget *parent, const char *name)
: TQComboBox(parent, name)
{
d = new SqueezedComboBoxPriv;
d->timer = new TQTimer(this);
@ -173,8 +173,8 @@ TQString SqueezedComboBox::itemHighlighted()
// ------------------------------------------------------------------------
SqueezedComboBoxTip::SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name)
: TQToolTip( tqparent )
SqueezedComboBoxTip::SqueezedComboBoxTip(TQWidget *parent, SqueezedComboBox *name)
: TQToolTip( parent )
{
m_originalWidget = name;
}

@ -62,10 +62,10 @@ public:
/**
* Constructor
* @param tqparent tqparent widget
* @param parent parent widget
* @param name name to give to the widget
*/
SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 );
SqueezedComboBox(TQWidget *parent = 0, const char *name = 0 );
/**
* destructor
@ -141,10 +141,10 @@ public:
* t = new SqueezedComboBoxTip( this->listBox()->viewport(), this );
* @endcode
*
* @param tqparent tqparent widget (viewport)
* @param name tqparent widget
* @param parent parent widget (viewport)
* @param name parent widget
*/
SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name);
SqueezedComboBoxTip(TQWidget *parent, SqueezedComboBox *name);
protected:
/**

@ -39,8 +39,8 @@
namespace Digikam
{
StatusLed::StatusLed(TQWidget *tqparent)
: TQLabel(tqparent)
StatusLed::StatusLed(TQWidget *parent)
: TQLabel(parent)
{
setLedColor(Gray);
setFocusPolicy(TQ_NoFocus);

@ -53,7 +53,7 @@ public:
public:
StatusLed(TQWidget *tqparent=0);
StatusLed(TQWidget *parent=0);
~StatusLed();
LedColor ledColor() const;

@ -62,8 +62,8 @@ public:
TQToolButton *lastButton;
};
StatusNavigateBar::StatusNavigateBar(TQWidget *tqparent)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
StatusNavigateBar::StatusNavigateBar(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new StatusNavigateBarPriv;
setFocusPolicy(TQ_NoFocus);

@ -56,7 +56,7 @@ public:
public:
StatusNavigateBar(TQWidget *tqparent=0);
StatusNavigateBar(TQWidget *parent=0);
~StatusNavigateBar();
void setNavigateBarState(bool hasPrev, bool hasNext);

@ -73,8 +73,8 @@ public:
KProgress *progressBar;
};
StatusProgressBar::StatusProgressBar(TQWidget *tqparent)
: TQWidgetStack(tqparent, 0, TQt::WDestructiveClose)
StatusProgressBar::StatusProgressBar(TQWidget *parent)
: TQWidgetStack(parent, 0, TQt::WDestructiveClose)
{
d = new StatusProgressBarPriv;
setFocusPolicy(TQ_NoFocus);

@ -55,7 +55,7 @@ public:
public:
StatusProgressBar(TQWidget *tqparent=0);
StatusProgressBar(TQWidget *parent=0);
~StatusProgressBar();
void tqsetAlignment(int a);

@ -44,8 +44,8 @@
namespace Digikam
{
TQSliderReverseWheel::TQSliderReverseWheel(TQWidget *tqparent)
: TQSlider(tqparent)
TQSliderReverseWheel::TQSliderReverseWheel(TQWidget *parent)
: TQSlider(parent)
{
// empty, we just need to re-implement wheelEvent to reverse the wheel
}
@ -100,8 +100,8 @@ public:
DTipTracker *zoomTracker;
};
StatusZoomBar::StatusZoomBar(TQWidget *tqparent)
: TQHBox(tqparent, 0, TQt::WDestructiveClose)
StatusZoomBar::StatusZoomBar(TQWidget *parent)
: TQHBox(parent, 0, TQt::WDestructiveClose)
{
d = new StatusZoomBarPriv;
setFocusPolicy(TQ_NoFocus);

@ -49,7 +49,7 @@ class DIGIKAM_EXPORT TQSliderReverseWheel : public TQSlider
public:
TQSliderReverseWheel(TQWidget *tqparent=0);
TQSliderReverseWheel(TQWidget *parent=0);
~TQSliderReverseWheel();
private:
@ -67,7 +67,7 @@ Q_OBJECT
public:
StatusZoomBar( TQWidget *tqparent=0 );
StatusZoomBar( TQWidget *parent=0 );
~StatusZoomBar();
void setEnableZoomPlus(bool e);

@ -195,8 +195,8 @@ public:
MEASUREMENT Measurement;
};
CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *tqparent, cmsHPROFILE hMonitor)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *parent, cmsHPROFILE hMonitor)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new CIETongueWidgetPriv;
d->blinkTimer = new TQTimer( this );

@ -62,7 +62,7 @@ Q_OBJECT
public:
CIETongueWidget(int w, int h, TQWidget *tqparent=0, cmsHPROFILE hMonitor=0);
CIETongueWidget(int w, int h, TQWidget *parent=0, cmsHPROFILE hMonitor=0);
~CIETongueWidget();
bool setProfileData(const TQByteArray& profileData=TQByteArray());

@ -42,8 +42,8 @@
namespace Digikam
{
ICCPreviewWidget::ICCPreviewWidget(TQWidget *tqparent)
: KPreviewWidgetBase( tqparent )
ICCPreviewWidget::ICCPreviewWidget(TQWidget *parent)
: KPreviewWidgetBase( parent )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVGroupBox *box = new TQVGroupBox( this );

@ -48,7 +48,7 @@ Q_OBJECT
public:
ICCPreviewWidget(TQWidget *tqparent);
ICCPreviewWidget(TQWidget *parent);
~ICCPreviewWidget();
public slots:

@ -118,8 +118,8 @@ public:
};
ICCProfileWidget::ICCProfileWidget(TQWidget* tqparent, const char* name, int w, int h)
: MetadataWidget(tqparent, name)
ICCProfileWidget::ICCProfileWidget(TQWidget* parent, const char* name, int w, int h)
: MetadataWidget(parent, name)
{
cmsErrorAction(LCMS_ERROR_SHOW);

@ -46,7 +46,7 @@ class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget
public:
ICCProfileWidget(TQWidget* tqparent, const char* name=0, int w=256, int h=256);
ICCProfileWidget(TQWidget* parent, const char* name=0, int w=256, int h=256);
~ICCProfileWidget();
bool loadFromURL(const KURL& url);

@ -97,11 +97,11 @@ public:
DImg preview;
};
ImageGuideWidget::ImageGuideWidget(int w, int h, TQWidget *tqparent,
ImageGuideWidget::ImageGuideWidget(int w, int h, TQWidget *parent,
bool spotVisible, int guideMode,
const TQColor& guideColor, int guideSize,
bool blink, bool useImageSelection)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new ImageGuideWidgetPriv;
d->spotVisible = spotVisible;

@ -78,7 +78,7 @@ public:
public:
ImageGuideWidget(int w, int h, TQWidget *tqparent=0,
ImageGuideWidget(int w, int h, TQWidget *parent=0,
bool spotVisible=true, int guideMode=HVGuideMode,
const TQColor& guideColor=TQt::red, int guideSize=1,
bool blink=false, bool useImageSelection=false);

@ -78,8 +78,8 @@ public:
};
ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSection,
ImagePanIconWidget *pan, TQWidget *tqparent, int separateViewMode)
: TQWidget(tqparent, 0, TQt::WDestructiveClose)
ImagePanIconWidget *pan, TQWidget *parent, int separateViewMode)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new ImagePanelWidgetPriv;
d->settingsSection = settingsSection;

@ -62,7 +62,7 @@ public:
public:
ImagePanelWidget(uint w, uint h, const TQString& settingsSection, ImagePanIconWidget *pan,
TQWidget *tqparent=0, int separateViewMode=SeparateViewAll);
TQWidget *parent=0, int separateViewMode=SeparateViewAll);
~ImagePanelWidget();
TQRect getOriginalImageRegion();

@ -64,8 +64,8 @@ public:
ImageIface *iface;
};
ImagePanIconWidget::ImagePanIconWidget(int w, int h, TQWidget *tqparent, WFlags flags)
: PanIconWidget(tqparent, flags)
ImagePanIconWidget::ImagePanIconWidget(int w, int h, TQWidget *parent, WFlags flags)
: PanIconWidget(parent, flags)
{
d = new ImagePanIconWidgetPriv;

@ -45,7 +45,7 @@ Q_OBJECT
public:
ImagePanIconWidget(int width, int height, TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose);
ImagePanIconWidget(int width, int height, TQWidget *parent=0, WFlags flags=TQt::WDestructiveClose);
~ImagePanIconWidget();
void setHighLightPoints(const TQPointArray& pointsList);

@ -104,8 +104,8 @@ public:
};
ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSection,
TQWidget *tqparent, int separateViewMode)
: TQHBox(tqparent, 0, TQt::WDestructiveClose)
TQWidget *parent, int separateViewMode)
: TQHBox(parent, 0, TQt::WDestructiveClose)
{
d = new ImagePannelWidgetPriv;
d->settingsSection = settingsSection;

@ -60,7 +60,7 @@ public:
public:
ImagePannelWidget(uint w, uint h, const TQString& settingsSection, TQWidget *tqparent=0,
ImagePannelWidget(uint w, uint h, const TQString& settingsSection, TQWidget *parent=0,
int separateViewMode=SeparateViewAll);
~ImagePannelWidget();

@ -79,8 +79,8 @@ public:
ImageIface *iface;
};
ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *tqparent, bool scrollBar)
: PreviewWidget(tqparent)
ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scrollBar)
: PreviewWidget(parent)
{
d = new ImageRegionWidgetPriv;
d->iface = new ImageIface(0, 0);

@ -57,7 +57,7 @@ public:
public:
ImageRegionWidget(int wp, int hp, TQWidget *tqparent=0, bool scrollBar=true);
ImageRegionWidget(int wp, int hp, TQWidget *parent=0, bool scrollBar=true);
~ImageRegionWidget();
void setContentsPosition(int x, int y, bool targetDone);

@ -74,10 +74,10 @@ public:
ImageGuideWidget *previewWidget;
};
ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *tqparent,
ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
const TQString& previewWhatsThis, bool prevModeOptions,
int guideMode, bool guideVisible, bool useImageSelection)
: TQWidget(tqparent)
: TQWidget(parent)
{
d = new ImageWidgetPriv;
d->settingsSection = settingsSection;

@ -59,7 +59,7 @@ public:
public:
ImageWidget(const TQString& settingsSection, TQWidget *tqparent=0,
ImageWidget(const TQString& settingsSection, TQWidget *parent=0,
const TQString& previewWhatsThis=TQString(), bool prevModeOptions=true,
int guideMode=ImageGuideWidget::PickColorMode,
bool guideVisible=true, bool useImageSelection=false);

@ -81,8 +81,8 @@ static const char* StandardExifEntryList[] =
"-1"
};
ExifWidget::ExifWidget(TQWidget* tqparent, const char* name)
: MetadataWidget(tqparent, name)
ExifWidget::ExifWidget(TQWidget* parent, const char* name)
: MetadataWidget(parent, name)
{
view()->setSortColumn(-1);

@ -43,7 +43,7 @@ class DIGIKAM_EXPORT ExifWidget : public MetadataWidget
public:
ExifWidget(TQWidget* tqparent, const char* name=0);
ExifWidget(TQWidget* parent, const char* name=0);
~ExifWidget();
bool loadFromURL(const KURL& url);

@ -91,8 +91,8 @@ public:
WorldMapWidget *map;
};
GPSWidget::GPSWidget(TQWidget* tqparent, const char* name)
: MetadataWidget(tqparent, name)
GPSWidget::GPSWidget(TQWidget* parent, const char* name)
: MetadataWidget(parent, name)
{
d = new GPSWidgetPriv;

@ -57,7 +57,7 @@ public:
public:
GPSWidget(TQWidget* tqparent, const char* name=0);
GPSWidget(TQWidget* parent, const char* name=0);
~GPSWidget();
bool loadFromURL(const KURL& url);

@ -64,8 +64,8 @@ static const char* StandardIptcEntryList[] =
"-1"
};
IptcWidget::IptcWidget(TQWidget* tqparent, const char* name)
: MetadataWidget(tqparent, name)
IptcWidget::IptcWidget(TQWidget* parent, const char* name)
: MetadataWidget(parent, name)
{
for (int i=0 ; TQString(StandardIptcEntryList[i]) != TQString("-1") ; i++)
m_keysFilter << StandardIptcEntryList[i];

@ -39,7 +39,7 @@ class DIGIKAM_EXPORT IptcWidget : public MetadataWidget
public:
IptcWidget(TQWidget* tqparent, const char* name=0);
IptcWidget(TQWidget* parent, const char* name=0);
~IptcWidget();
bool loadFromURL(const KURL& url);

@ -108,8 +108,8 @@ static const char* ExifEntryListToIgnore[] =
"-1"
};
MakerNoteWidget::MakerNoteWidget(TQWidget* tqparent, const char* name)
: MetadataWidget(tqparent, name)
MakerNoteWidget::MakerNoteWidget(TQWidget* parent, const char* name)
: MetadataWidget(parent, name)
{
for (int i=0 ; TQString(ExifEntryListToIgnore[i]) != TQString("-1") ; i++)
m_keysFilter << ExifEntryListToIgnore[i];

@ -40,7 +40,7 @@ class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget
public:
MakerNoteWidget(TQWidget* tqparent, const char* name=0);
MakerNoteWidget(TQWidget* parent, const char* name=0);
~MakerNoteWidget();
bool loadFromURL(const KURL& url);

@ -41,8 +41,8 @@
namespace Digikam
{
MdKeyListViewItem::MdKeyListViewItem(TQListView *tqparent, const TQString& key)
: TQListViewItem(tqparent)
MdKeyListViewItem::MdKeyListViewItem(TQListView *parent, const TQString& key)
: TQListViewItem(parent)
{
m_decryptedKey = key;

@ -44,7 +44,7 @@ class DIGIKAM_EXPORT MdKeyListViewItem : public TQListViewItem
public:
MdKeyListViewItem(TQListView *tqparent, const TQString& key);
MdKeyListViewItem(TQListView *parent, const TQString& key);
~MdKeyListViewItem();
TQString getMdKey();

@ -44,8 +44,8 @@
namespace Digikam
{
MetadataListView::MetadataListView(TQWidget* tqparent)
: TQListView(tqparent)
MetadataListView::MetadataListView(TQWidget* parent)
: TQListView(parent)
{
header()->hide();
addColumn("Name"); // No need i18n here.
@ -57,7 +57,7 @@ MetadataListView::MetadataListView(TQWidget* tqparent)
// free space to metadata content
setVScrollBarMode(TQScrollView::AlwaysOff);
m_parent = dynamic_cast<MetadataWidget *>(tqparent);
m_parent = dynamic_cast<MetadataWidget *>(parent);
connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));

@ -47,7 +47,7 @@ class DIGIKAM_EXPORT MetadataListView : public TQListView
public:
MetadataListView(TQWidget* tqparent);
MetadataListView(TQWidget* parent);
~MetadataListView();
TQString getCurrentItemKey();

@ -35,9 +35,9 @@
namespace Digikam
{
MetadataListViewItem::MetadataListViewItem(TQListViewItem *tqparent, const TQString& key,
MetadataListViewItem::MetadataListViewItem(TQListViewItem *parent, const TQString& key,
const TQString& title, const TQString& value)
: TQListViewItem(tqparent)
: TQListViewItem(parent)
{
m_key = key;

@ -41,7 +41,7 @@ class DIGIKAM_EXPORT MetadataListViewItem : public TQListViewItem
{
public:
MetadataListViewItem(TQListViewItem *tqparent, const TQString& key,
MetadataListViewItem(TQListViewItem *parent, const TQString& key,
const TQString& title, const TQString& value);
~MetadataListViewItem();

@ -94,8 +94,8 @@ public:
DMetadata::MetaDataMap metaDataMap;
};
MetadataWidget::MetadataWidget(TQWidget* tqparent, const char* name)
: TQWidget(tqparent, name)
MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
: TQWidget(parent, name)
{
d = new MetadataWidgetPriv;

@ -59,7 +59,7 @@ public:
public:
MetadataWidget(TQWidget* tqparent, const char* name=0);
MetadataWidget(TQWidget* parent, const char* name=0);
~MetadataWidget();
int getMode();

@ -73,8 +73,8 @@ static KStaticDeleter<TQPixmap> pixmapDeleter;
TQPixmap *WorldMapWidgetPriv::worldMap = 0;
WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *tqparent)
: TQScrollView(tqparent, 0, TQt::WDestructiveClose)
WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *parent)
: TQScrollView(parent, 0, TQt::WDestructiveClose)
{
d = new WorldMapWidgetPriv;

@ -44,7 +44,7 @@ Q_OBJECT
public:
WorldMapWidget(int w, int h, TQWidget *tqparent);
WorldMapWidget(int w, int h, TQWidget *parent);
~WorldMapWidget();
void setGPSPosition(double lat, double lng);

@ -136,7 +136,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
005 ==> 116248 : Ask user which plugins should be enabled on first startup.
006 ==> 115441 : Resize EXIF-rotated images doesn't work.
007 ==> 115460 : Opening and closing right pane with tag filter also changes width of left pane and vv.
008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find tqparent for Tag.
008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find parent for Tag.
009 ==> 109253 : digiKam does not store comments in image EXIF tags.
010 ==> 115764 : Modify EXIF creation date.
011 ==> 121487 : "Tip of the day" text gets cut off.
@ -203,7 +203,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
071 ==> 126326 : Camera download: auto-rotated images loose EXIF info when 'No EXIF information found.'
is written to console.
072 ==> 121242 : mimelnk/x-image-raw.desktop conflicts with kdegraphics-3.5.x.
073 ==> 127374 : Unsharp tqmask: max. radius way too small.
073 ==> 127374 : Unsharp mask: max. radius way too small.
074 ==> 116485 : Mimimize button missing on "Compaq Flash Reader" camera window.
075 ==> 127577 : Raw display too dark and not rotated.
076 ==> 127634 : Communication between digiKam and its kioslaves broken if size_t != off_t.

@ -14,7 +14,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
003 ==> 165823 : Digikam crashes if last picture is removed from lighttable.
004 ==> 165921 : Translation bug: Missing german translation.
005 ==> 130906 : Allow user to click text of tags to tag an image (not checkbox only).
006 ==> 126871 : Click on tqparent folder in tree should generate a reaction.
006 ==> 126871 : Click on parent folder in tree should generate a reaction.
007 ==> 162812 : Sharpen slider enhancement refresh previews continuously.
008 ==> 166274 : Rename files on download from camera.
009 ==> 166472 : Thumbnail bar gone in image editor when switching back from fullscreen.
@ -104,7 +104,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
007 ==> 147466 : digiKam crashes on termination if an audio file played.
008 ==> 146973 : Crashes when clicking on preview image.
009 ==> 148976 : digiKam Deleted 2.3 g of Pictures.
010 ==> 145252 : Utqmask settings used for album directory, not for image files.
010 ==> 145252 : Umask settings used for album directory, not for image files.
011 ==> 125775 : digiKam way to save and delete "Searches".
012 ==> 150908 : Canon g3 not recognized works version 0.9.1.
013 ==> 152092 : Showfoto crashes ( signal 11 ) on exit.
@ -162,7 +162,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
001 ==> 146393 : No gamma adjustment when opening RAW file.
002 ==> 158377 : digiKam duplicates downloaded images while overwriting existing ones.
003 ==> 151122 : Opening Albums Has Become Very Slow.
004 ==> 145252 : Utqmask settings used for album directory, not for image files
004 ==> 145252 : Umask settings used for album directory, not for image files
005 ==> 144253 : Failed to update old Database to new Database format.
006 ==> 159467 : Misleading error message with path change in digikamrc file.
007 ==> 157237 : Connect the data when using the left tabs.

@ -84,8 +84,8 @@ public:
Digikam::SetupICC *iccPage;
};
Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page)
: KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent,
Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
: KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent,
name, true, true )
{
d = new SetupPrivate;

@ -61,7 +61,7 @@ public:
ICCPage
};
Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed);
Setup(TQWidget* parent=0, const char* name=0, Page page=LastPageUsed);
~Setup();
private slots:

@ -93,15 +93,15 @@ public:
KColorButton *overExposureColor;
};
SetupEditor::SetupEditor(TQWidget* tqparent )
: TQWidget(tqparent)
SetupEditor::SetupEditor(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupEditorPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() );
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent);
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent);
d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"),
interfaceOptionsGroup);
@ -131,7 +131,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent )
// --------------------------------------------------------
TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent);
TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), parent);
TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup);
TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox);
@ -149,7 +149,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent )
// --------------------------------------------------------
TQVGroupBox *ExifGroupOptions = new TQVGroupBox(i18n("EXIF Actions"), tqparent);
TQVGroupBox *ExifGroupOptions = new TQVGroupBox(i18n("EXIF Actions"), parent);
d->exifRotateBox = new TQCheckBox(ExifGroupOptions);
d->exifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag"));
@ -159,7 +159,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent )
// --------------------------------------------------------
TQVGroupBox *sortOptionsGroup = new TQVGroupBox(i18n("Sort order for images"), tqparent);
TQVGroupBox *sortOptionsGroup = new TQVGroupBox(i18n("Sort order for images"), parent);
TQHBox* sortBox = new TQHBox(sortOptionsGroup);
new TQLabel(i18n("Sort images by:"), sortBox);

@ -40,7 +40,7 @@ class SetupEditor : public TQWidget
public:
SetupEditor(TQWidget* tqparent=0);
SetupEditor(TQWidget* parent=0);
~SetupEditor();
void applySettings();

@ -89,13 +89,13 @@ public:
TQVGroupBox *photoSettingBox;
};
SetupToolTip::SetupToolTip(TQWidget* tqparent)
: TQWidget(tqparent)
SetupToolTip::SetupToolTip(TQWidget* parent)
: TQWidget(parent)
{
d = new SetupToolTipPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() );
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), tqparent);
d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), parent);
TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when "
"the mouse hovers over a thumbbar item."));
@ -103,7 +103,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent)
// --------------------------------------------------------
d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent);
d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), parent);
d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox);
TQWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name."));
@ -124,7 +124,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent)
// --------------------------------------------------------
d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent);
d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), parent);
d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox);
TQWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the "

@ -40,7 +40,7 @@ class SetupToolTip : public TQWidget
public:
SetupToolTip(TQWidget* tqparent = 0);
SetupToolTip(TQWidget* parent = 0);
~SetupToolTip();
void applySettings();

@ -107,8 +107,8 @@ static TQString squeezedText(TQPainter* p, int width, const TQString& text)
return fullText;
}
ThemedIconItem::ThemedIconItem(IconGroupItem* tqparent)
: IconItem(tqparent)
ThemedIconItem::ThemedIconItem(IconGroupItem* parent)
: IconItem(parent)
{
}

@ -35,7 +35,7 @@ class ThemedIconItem : public IconItem
{
public:
ThemedIconItem(IconGroupItem* tqparent);
ThemedIconItem(IconGroupItem* parent);
~ThemedIconItem();
protected:

@ -58,8 +58,8 @@ public:
TQFont fnXtra;
};
ThemedIconView::ThemedIconView(TQWidget* tqparent)
: IconView(tqparent)
ThemedIconView::ThemedIconView(TQWidget* parent)
: IconView(parent)
{
d = new ThemedIconViewPriv;
d->thumbSize = 128;

@ -44,7 +44,7 @@ class ThemedIconView : public IconView
public:
ThemedIconView(TQWidget* tqparent);
ThemedIconView(TQWidget* parent);
~ThemedIconView();
TQRect tqitemRect() const;

@ -69,8 +69,8 @@ public:
AlbumList::Iterator albumsIt;
};
BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* tqparent)
: DProgressDlg(tqparent)
BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* parent)
: DProgressDlg(parent)
{
d = new BatchAlbumsSyncMetadataPriv;
d->imageInfoJob = new ImageInfoJob();

@ -46,7 +46,7 @@ class BatchAlbumsSyncMetadata : public DProgressDlg
public:
BatchAlbumsSyncMetadata(TQWidget* tqparent);
BatchAlbumsSyncMetadata(TQWidget* parent);
~BatchAlbumsSyncMetadata();
signals:

@ -70,15 +70,15 @@ public:
ImageInfo *imageInfo;
};
BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, Album *album)
: TQObject(tqparent)
BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, Album *album)
: TQObject(parent)
{
d = new BatchSyncMetadataPriv;
d->album = album;
}
BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list)
: TQObject(tqparent)
BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, const ImageInfoList& list)
: TQObject(parent)
{
d = new BatchSyncMetadataPriv;
d->imageInfoList = list;

@ -49,10 +49,10 @@ class BatchSyncMetadata : public TQObject
public:
/** Constructor witch sync all metatada pictures from an Album */
BatchSyncMetadata(TQObject* tqparent, Album *album);
BatchSyncMetadata(TQObject* parent, Album *album);
/** Constructor witch sync all metatada from an images list */
BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list);
BatchSyncMetadata(TQObject* parent, const ImageInfoList& list);
~BatchSyncMetadata();

@ -74,8 +74,8 @@ public:
TQGuardedPtr<ThumbnailJob> thumbJob;
};
BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* tqparent)
: DProgressDlg(tqparent)
BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* parent)
: DProgressDlg(parent)
{
d = new BatchThumbsGeneratorPriv;
setValue(0);

@ -45,7 +45,7 @@ class BatchThumbsGenerator : public DProgressDlg
public:
BatchThumbsGenerator(TQWidget* tqparent);
BatchThumbsGenerator(TQWidget* parent);
~BatchThumbsGenerator();
signals:

@ -80,13 +80,13 @@ public:
SearchTextBar *searchBar;
};
AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect,
AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect,
const TQString& header,
const TQString& newAlbumString,
bool allowRootSelection )
: KDialogBase(Plain, i18n("Select Album"),
Help|User1|Ok|Cancel, Ok,
tqparent, 0, true, true,
parent, 0, true, true,
i18n("&New Album"))
{
d = new AlbumSelectDialogPrivate;
@ -136,11 +136,11 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect,
}
else
{
FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView));
if (!parentItem)
{
DWarning() << "Failed to find tqparent for Album "
DWarning() << "Failed to find parent for Album "
<< album->title() << endl;
continue;
}
@ -207,11 +207,11 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
if (!album || album->type() != Album::PHYSICAL)
return;
FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView));
FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView));
if (!parentItem)
{
DWarning() << "Failed to find tqparent for Album "
DWarning() << "Failed to find parent for Album "
<< album->title() << endl;
return;
}
@ -323,13 +323,13 @@ void AlbumSelectDialog::slotUser1()
}
}
PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* tqparent,
PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* parent,
PAlbum* albumToSelect,
const TQString& header,
const TQString& newAlbumString,
bool allowRootSelection )
{
AlbumSelectDialog dlg(tqparent, albumToSelect,
AlbumSelectDialog dlg(parent, albumToSelect,
header, newAlbumString,
allowRootSelection);
@ -365,16 +365,16 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter)
if (!match)
{
// check if any of the parents match the search
Album* tqparent = palbum->tqparent();
while (tqparent && !tqparent->isRoot())
Album* parent = palbum->parent();
while (parent && !parent->isRoot())
{
if (tqparent->title().lower().contains(search))
if (parent->title().lower().contains(search))
{
match = true;
break;
}
tqparent = tqparent->tqparent();
parent = parent->parent();
}
}

@ -47,14 +47,14 @@ class AlbumSelectDialog : public KDialogBase
public:
AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect,
AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect,
const TQString& header=TQString(),
const TQString& newAlbumString=TQString(),
bool allowRootSelection=false);
~AlbumSelectDialog();
static PAlbum* selectAlbum(TQWidget* tqparent,
static PAlbum* selectAlbum(TQWidget* parent,
PAlbum* albumToSelect,
const TQString& header=TQString(),
const TQString& newAlbumString=TQString(),

@ -56,8 +56,8 @@ public:
TQPixmap pix;
};
AnimWidget::AnimWidget(TQWidget* tqparent, int size)
: TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase)
AnimWidget::AnimWidget(TQWidget* parent, int size)
: TQWidget(parent, 0, WResizeNoErase|WRepaintNoErase)
{
d = new AnimWidgetPriv;
setBackgroundMode(TQt::NoBackground);

@ -41,7 +41,7 @@ class AnimWidget : public TQWidget
public:
AnimWidget(TQWidget* tqparent, int size=28);
AnimWidget(TQWidget* parent, int size=28);
~AnimWidget();
void start();

@ -145,7 +145,7 @@ public:
skipAll = false;
canceled = false;
downloadTotal = 0;
tqparent = 0;
parent = 0;
timer = 0;
camera = 0;
thread = 0;
@ -158,7 +158,7 @@ public:
int downloadTotal;
TQWidget *tqparent;
TQWidget *parent;
TQTimer *timer;
@ -188,11 +188,11 @@ private:
CameraControllerPriv *d;
TQObject *tqparent;
TQObject *parent;
};
CameraThread::CameraThread(CameraController* controller)
: d(controller->d), tqparent(controller)
: d(controller->d), parent(controller)
{
}
@ -220,7 +220,7 @@ void CameraThread::run()
CameraEvent* event = new CameraEvent(CameraEvent::gp_connected);
event->result = result;
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
if (result)
sendInfo(i18n("Connection established"));
@ -243,7 +243,7 @@ void CameraThread::run()
event->map.insert("summary", TQVariant(summary));
event->map.insert("manual", TQVariant(manual));
event->map.insert("about", TQVariant(about));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
break;
}
case(CameraCommand::gp_listfolders):
@ -260,7 +260,7 @@ void CameraThread::run()
CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfolders);
event->map.insert("folders", TQVariant(flist));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
sendInfo(i18n("The folders have been listed."));
@ -289,7 +289,7 @@ void CameraThread::run()
ds << itemsList;
event->map.insert("files", TQVariant(ba));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
sendInfo(i18n("Listing files in %1 is complete").tqarg(folder));
@ -314,7 +314,7 @@ void CameraThread::run()
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
event->map.insert("thumbnail", TQVariant(thumbnail));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
@ -342,7 +342,7 @@ void CameraThread::run()
event->map.insert("file", TQVariant(file));
event->map.insert("exifSize", TQVariant(esize));
event->map.insert("exifData", TQVariant(ba));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
}
@ -371,7 +371,7 @@ void CameraThread::run()
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
event->map.insert("dest", TQVariant(dest));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
KURL tempURL(dest);
tempURL = tempURL.upURL();
@ -443,7 +443,7 @@ void CameraThread::run()
event->map.insert("file", TQVariant(file));
event->map.insert("dest", TQVariant(dest));
event->map.insert("temp", TQVariant(temp));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
else
{
@ -451,7 +451,7 @@ void CameraThread::run()
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
event->map.insert("dest", TQVariant(dest));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
}
@ -471,7 +471,7 @@ void CameraThread::run()
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
event->map.insert("dest", TQVariant(dest));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
else
{
@ -504,7 +504,7 @@ void CameraThread::run()
ds << itemsInfo;
event->map.insert("info", TQVariant(ba));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
else
{
@ -512,7 +512,7 @@ void CameraThread::run()
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
event->map.insert("src", TQVariant(src));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
}
@ -530,14 +530,14 @@ void CameraThread::run()
CameraEvent* event = new CameraEvent(CameraEvent::gp_deleted);
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
else
{
CameraEvent* event = new CameraEvent(CameraEvent::gp_deleteFailed);
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
}
@ -556,14 +556,14 @@ void CameraThread::run()
CameraEvent* event = new CameraEvent(CameraEvent::gp_locked);
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
else
{
CameraEvent* event = new CameraEvent(CameraEvent::gp_lockFailed);
event->map.insert("folder", TQVariant(folder));
event->map.insert("file", TQVariant(file));
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
break;
}
@ -581,33 +581,33 @@ void CameraThread::sendBusy(bool val)
{
CameraEvent* event = new CameraEvent(CameraEvent::gp_busy);
event->result = val;
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
void CameraThread::sendError(const TQString& msg)
{
CameraEvent* event = new CameraEvent(CameraEvent::gp_errormsg);
event->msg = msg;
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
void CameraThread::sendInfo(const TQString& msg)
{
CameraEvent* event = new CameraEvent(CameraEvent::gp_infomsg);
event->msg = msg;
TQApplication::postEvent(tqparent, event);
TQApplication::postEvent(parent, event);
}
//-- Camera Controller ------------------------------------------------------
CameraController::CameraController(TQWidget* tqparent, const TQString& title, const TQString& model,
CameraController::CameraController(TQWidget* parent, const TQString& title, const TQString& model,
const TQString& port, const TQString& path)
: TQObject(tqparent)
: TQObject(parent)
{
d = new CameraControllerPriv;
d->tqparent = tqparent;
d->parent = parent;
d->canceled = false;
d->close = false;
d->overwriteAll = false;
@ -938,7 +938,7 @@ void CameraController::customEvent(TQCustomEvent* e)
break;
}
KIO::RenameDlg dlg(d->tqparent, i18n("Rename File"),
KIO::RenameDlg dlg(d->parent, i18n("Rename File"),
folder + TQString("/") + file, dest,
KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP));
@ -1029,12 +1029,12 @@ void CameraController::customEvent(TQCustomEvent* e)
{
if (d->cmdQueue.isEmpty())
{
KMessageBox::error(d->tqparent, msg);
KMessageBox::error(d->parent, msg);
}
else
{
msg += i18n(" Do you want to continue?");
int result = KMessageBox::warningContinueCancel(d->tqparent, msg);
int result = KMessageBox::warningContinueCancel(d->parent, msg);
if (result != KMessageBox::Continue)
slotCancel();
}
@ -1068,12 +1068,12 @@ void CameraController::customEvent(TQCustomEvent* e)
{
if (d->cmdQueue.isEmpty())
{
KMessageBox::error(d->tqparent, msg);
KMessageBox::error(d->parent, msg);
}
else
{
msg += i18n(" Do you want to continue?");
int result = KMessageBox::warningContinueCancel(d->tqparent, msg);
int result = KMessageBox::warningContinueCancel(d->parent, msg);
if (result != KMessageBox::Continue)
slotCancel();
}
@ -1103,12 +1103,12 @@ void CameraController::customEvent(TQCustomEvent* e)
{
if (d->cmdQueue.isEmpty())
{
KMessageBox::error(d->tqparent, msg);
KMessageBox::error(d->parent, msg);
}
else
{
msg += i18n(" Do you want to continue?");
int result = KMessageBox::warningContinueCancel(d->tqparent, msg);
int result = KMessageBox::warningContinueCancel(d->parent, msg);
if (result != KMessageBox::Continue)
slotCancel();
}
@ -1138,12 +1138,12 @@ void CameraController::customEvent(TQCustomEvent* e)
{
if (d->cmdQueue.isEmpty())
{
KMessageBox::error(d->tqparent, msg);
KMessageBox::error(d->parent, msg);
}
else
{
msg += i18n(" Do you want to continue?");
int result = KMessageBox::warningContinueCancel(d->tqparent, msg);
int result = KMessageBox::warningContinueCancel(d->parent, msg);
if (result != KMessageBox::Continue)
slotCancel();
}

@ -48,7 +48,7 @@ class CameraController : public TQObject
public:
CameraController(TQWidget* tqparent, const TQString& title, const TQString& model,
CameraController(TQWidget* parent, const TQString& title, const TQString& model,
const TQString& port, const TQString& path);
~CameraController();

@ -45,10 +45,10 @@
namespace Digikam
{
CameraFolderDialog::CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView,
CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraView,
const TQStringList& cameraFolderList,
const TQString& cameraName, const TQString& rootPath)
: KDialogBase(tqparent, 0, true,
: KDialogBase(parent, 0, true,
i18n("%1 - Select Camera Folder").tqarg(cameraName),
Help|Ok|Cancel, Ok, true)
{

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save