summaryrefslogtreecommitdiffstats
path: root/src/gvcore
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitf1087d880d002e2f4bde6adad1592bda91460d12 (patch)
tree4299342b1275cda0c626877485a02fa8fdd7c1d5 /src/gvcore
parentff8c66f117613688a0979d2296cbf6c778136419 (diff)
downloadgwenview-f1087d880d002e2f4bde6adad1592bda91460d12.tar.gz
gwenview-f1087d880d002e2f4bde6adad1592bda91460d12.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gwenview@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gvcore')
-rw-r--r--src/gvcore/clicklineedit.cpp4
-rw-r--r--src/gvcore/clicklineedit.h2
-rw-r--r--src/gvcore/deletedialog.cpp4
-rw-r--r--src/gvcore/deletedialog.h2
-rw-r--r--src/gvcore/document.cpp6
-rw-r--r--src/gvcore/documentloadedimpl.cpp6
-rw-r--r--src/gvcore/externaltoolaction.cpp4
-rw-r--r--src/gvcore/externaltoolaction.h2
-rw-r--r--src/gvcore/externaltoolcontext.cpp4
-rw-r--r--src/gvcore/externaltoolcontext.h2
-rw-r--r--src/gvcore/externaltooldialog.cpp12
-rw-r--r--src/gvcore/externaltooldialog.h2
-rw-r--r--src/gvcore/externaltoolmanager.cpp12
-rw-r--r--src/gvcore/externaltoolmanager.h4
-rw-r--r--src/gvcore/filedetailview.cpp4
-rw-r--r--src/gvcore/filedetailview.h2
-rw-r--r--src/gvcore/filedetailviewitem.h12
-rw-r--r--src/gvcore/fileoperation.cpp36
-rw-r--r--src/gvcore/fileoperation.h22
-rw-r--r--src/gvcore/fileopobject.cpp12
-rw-r--r--src/gvcore/fileopobject.h32
-rw-r--r--src/gvcore/filethumbnailview.cpp6
-rw-r--r--src/gvcore/filethumbnailview.h2
-rw-r--r--src/gvcore/filethumbnailviewitem.h2
-rw-r--r--src/gvcore/fileviewcontroller.cpp4
-rw-r--r--src/gvcore/fileviewcontroller.h2
-rw-r--r--src/gvcore/fullscreenbar.cpp12
-rw-r--r--src/gvcore/fullscreenbar.h2
-rw-r--r--src/gvcore/imagesavedialog.cpp4
-rw-r--r--src/gvcore/imagesavedialog.h2
-rw-r--r--src/gvcore/imageview.cpp10
-rw-r--r--src/gvcore/imageview.h2
-rw-r--r--src/gvcore/imageviewcontroller.cpp14
-rw-r--r--src/gvcore/imageviewcontroller.h2
-rw-r--r--src/gvcore/inputdialog.cpp4
-rw-r--r--src/gvcore/inputdialog.h2
-rw-r--r--src/gvcore/printdialog.cpp4
-rw-r--r--src/gvcore/printdialog.h2
-rw-r--r--src/gvcore/qxcfi.cpp58
-rw-r--r--src/gvcore/qxcfi.h14
40 files changed, 167 insertions, 167 deletions
diff --git a/src/gvcore/clicklineedit.cpp b/src/gvcore/clicklineedit.cpp
index f35cbe3..3b7db6a 100644
--- a/src/gvcore/clicklineedit.cpp
+++ b/src/gvcore/clicklineedit.cpp
@@ -26,8 +26,8 @@
namespace Gwenview {
-ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const char* name ) :
- KLineEdit( tqparent, name )
+ClickLineEdit::ClickLineEdit(TQWidget *parent, const char* name ) :
+ KLineEdit( parent, name )
{
mDrawClickMsg = true;
}
diff --git a/src/gvcore/clicklineedit.h b/src/gvcore/clicklineedit.h
index 84259e8..c36305b 100644
--- a/src/gvcore/clicklineedit.h
+++ b/src/gvcore/clicklineedit.h
@@ -38,7 +38,7 @@ class ClickLineEdit : public KLineEdit
TQ_OBJECT
TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
public:
- ClickLineEdit(TQWidget *tqparent, const char* name = 0 );
+ ClickLineEdit(TQWidget *parent, const char* name = 0 );
void setClickMessage( const TQString &msg );
TQString clickMessage() const { return mClickMessage; }
diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp
index cc0010e..1a998a3 100644
--- a/src/gvcore/deletedialog.cpp
+++ b/src/gvcore/deletedialog.cpp
@@ -39,8 +39,8 @@
namespace Gwenview {
-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"),
Ok | Cancel, Cancel /* Default */, true /* separator */),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")
diff --git a/src/gvcore/deletedialog.h b/src/gvcore/deletedialog.h
index dbb2d9d..6825368 100644
--- a/src/gvcore/deletedialog.h
+++ b/src/gvcore/deletedialog.h
@@ -31,7 +31,7 @@ class DeleteDialog : public KDialogBase
TQ_OBJECT
public:
- DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog");
+ DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
void setURLList(const KURL::List &files);
bool shouldDelete() const;
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index 3069ae5..caa93f5 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -73,7 +73,7 @@ const char* CONFIG_SAVE_AUTOMATICALLY="save automatically";
/**
- * Returns a widget suitable to use as a dialog tqparent
+ * Returns a widget suitable to use as a dialog parent
*/
static TQWidget* dialogParentWidget() {
return KApplication::kApplication()->mainWidget();
@@ -102,8 +102,8 @@ public:
// Document
//
//-------------------------------------------------------------------
-Document::Document(TQObject* tqparent)
-: TQObject(tqparent) {
+Document::Document(TQObject* parent)
+: TQObject(parent) {
d=new DocumentPrivate;
d->mModified=false;
d->mImpl=new DocumentEmptyImpl(this);
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index 35f9441..aacea94 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -130,11 +130,11 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
}
} else {
- TQFileInfo tqparent=TQFileInfo(info.dirPath());
- if (!tqparent.isWritable()) {
+ TQFileInfo parent=TQFileInfo(info.dirPath());
+ if (!parent.isWritable()) {
return
i18n("The %1 folder is read-only.")
- .tqarg(tqparent.filePath());
+ .tqarg(parent.filePath());
}
}
}
diff --git a/src/gvcore/externaltoolaction.cpp b/src/gvcore/externaltoolaction.cpp
index 4953e8d..5cd33d8 100644
--- a/src/gvcore/externaltoolaction.cpp
+++ b/src/gvcore/externaltoolaction.cpp
@@ -31,9 +31,9 @@ Copyright 2000-2004 Aur�lien G�teau
namespace Gwenview {
ExternalToolAction::ExternalToolAction(
- TQObject* tqparent, const KService* service,
+ TQObject* parent, const KService* service,
const KURL::List& urls)
-: KAction(tqparent)
+: KAction(parent)
, mService(service)
, mURLs(urls)
{
diff --git a/src/gvcore/externaltoolaction.h b/src/gvcore/externaltoolaction.h
index 287938a..6f8e252 100644
--- a/src/gvcore/externaltoolaction.h
+++ b/src/gvcore/externaltoolaction.h
@@ -36,7 +36,7 @@ class ExternalToolAction : public KAction {
Q_OBJECT
TQ_OBJECT
public:
- ExternalToolAction(TQObject* tqparent, const KService*, const KURL::List&);
+ ExternalToolAction(TQObject* parent, const KService*, const KURL::List&);
private slots:
void openExternalTool();
diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp
index a82f900..1e0f0e6 100644
--- a/src/gvcore/externaltoolcontext.cpp
+++ b/src/gvcore/externaltoolcontext.cpp
@@ -36,10 +36,10 @@ Copyright 2000-2004 Aur�lien G�teau
namespace Gwenview {
ExternalToolContext::ExternalToolContext(
- TQObject* tqparent,
+ TQObject* parent,
std::list<KService*> services,
KURL::List urls)
-: TQObject(tqparent)
+: TQObject(parent)
, mServices(services)
, mURLs(urls)
{}
diff --git a/src/gvcore/externaltoolcontext.h b/src/gvcore/externaltoolcontext.h
index 0c61e1c..2efb9c8 100644
--- a/src/gvcore/externaltoolcontext.h
+++ b/src/gvcore/externaltoolcontext.h
@@ -41,7 +41,7 @@ class LIBGWENVIEW_EXPORT ExternalToolContext : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- ExternalToolContext(TQObject* tqparent,
+ ExternalToolContext(TQObject* parent,
std::list<KService*> services,
KURL::List urls);
TQPopupMenu* popupMenu();
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index 9742c58..e579b99 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -51,8 +51,8 @@ enum { ID_ALL_IMAGES=0, ID_ALL_FILES, ID_CUSTOM };
class ToolListViewItem : public KListViewItem {
public:
- ToolListViewItem(KListView* tqparent, const TQString& label)
- : KListViewItem(tqparent, label), mDesktopFile(0L) {}
+ ToolListViewItem(KListView* parent, const TQString& label)
+ : KListViewItem(parent, label), mDesktopFile(0L) {}
void setDesktopFile(KDesktopFile* df) {
mDesktopFile=df;
@@ -244,8 +244,8 @@ struct ExternalToolDialogPrivate {
class ToolListViewFilterObject : public TQObject {
ExternalToolDialogPrivate* d;
public:
- ToolListViewFilterObject(TQObject* tqparent, ExternalToolDialogPrivate* _d)
- : TQObject(tqparent), d(_d) {}
+ ToolListViewFilterObject(TQObject* parent, ExternalToolDialogPrivate* _d)
+ : TQObject(parent), d(_d) {}
bool eventFilter(TQObject*, TQEvent* event) {
if (event->type()!=TQEvent::MouseButtonPress) return false;
@@ -254,9 +254,9 @@ public:
};
-ExternalToolDialog::ExternalToolDialog(TQWidget* tqparent)
+ExternalToolDialog::ExternalToolDialog(TQWidget* parent)
: KDialogBase(
- tqparent,0, false, TQString(), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel,
+ parent,0, false, TQString(), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel,
KDialogBase::Ok, true)
{
setWFlags(getWFlags() | TQt::WDestructiveClose);
diff --git a/src/gvcore/externaltooldialog.h b/src/gvcore/externaltooldialog.h
index 149817b..b5ab048 100644
--- a/src/gvcore/externaltooldialog.h
+++ b/src/gvcore/externaltooldialog.h
@@ -35,7 +35,7 @@ class LIBGWENVIEW_EXPORT ExternalToolDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ExternalToolDialog(TQWidget* tqparent);
+ ExternalToolDialog(TQWidget* parent);
~ExternalToolDialog();
protected slots:
diff --git a/src/gvcore/externaltoolmanager.cpp b/src/gvcore/externaltoolmanager.cpp
index 0732257..4fd4e03 100644
--- a/src/gvcore/externaltoolmanager.cpp
+++ b/src/gvcore/externaltoolmanager.cpp
@@ -95,7 +95,7 @@ struct ExternalToolManagerPrivate {
}
ExternalToolContext* createContextInternal(
- TQObject* tqparent, const KURL::List& urls, const TQStringList& mimeTypes)
+ TQObject* parent, const KURL::List& urls, const TQStringList& mimeTypes)
{
bool onlyOneURL=urls.size()==1;
@@ -119,7 +119,7 @@ struct ExternalToolManagerPrivate {
}
selectionServices.sort(compareKServicePtrByName);
- return new ExternalToolContext(tqparent, selectionServices, urls);
+ return new ExternalToolContext(parent, selectionServices, urls);
}
};
@@ -257,7 +257,7 @@ KDesktopFile* ExternalToolManager::createUserDesktopFile(const TQString& name) {
ExternalToolContext* ExternalToolManager::createContext(
- TQObject* tqparent, const KFileItemList* items)
+ TQObject* parent, const KFileItemList* items)
{
KURL::List urls;
TQStringList mimeTypes;
@@ -273,12 +273,12 @@ ExternalToolContext* ExternalToolManager::createContext(
}
}
- return d->createContextInternal(tqparent, urls, mimeTypes);
+ return d->createContextInternal(parent, urls, mimeTypes);
}
ExternalToolContext* ExternalToolManager::createContext(
- TQObject* tqparent, const KURL& url)
+ TQObject* parent, const KURL& url)
{
KURL::List urls;
TQStringList mimeTypes;
@@ -287,7 +287,7 @@ ExternalToolContext* ExternalToolManager::createContext(
TQString mimeType=KMimeType::findByURL(url, 0, url.isLocalFile(), true)->name();
mimeTypes.append(mimeType);
- return d->createContextInternal(tqparent, urls, mimeTypes);
+ return d->createContextInternal(parent, urls, mimeTypes);
}
diff --git a/src/gvcore/externaltoolmanager.h b/src/gvcore/externaltoolmanager.h
index 96a6706..c3b7c31 100644
--- a/src/gvcore/externaltoolmanager.h
+++ b/src/gvcore/externaltoolmanager.h
@@ -42,8 +42,8 @@ class LIBGWENVIEW_EXPORT ExternalToolManager {
public:
~ExternalToolManager();
- ExternalToolContext* createContext(TQObject* tqparent, const KFileItemList*);
- ExternalToolContext* createContext(TQObject* tqparent, const KURL&);
+ ExternalToolContext* createContext(TQObject* parent, const KFileItemList*);
+ ExternalToolContext* createContext(TQObject* parent, const KURL&);
static ExternalToolManager* instance();
TQDict<KDesktopFile>& desktopFiles() const;
diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp
index 5cce441..f061c13 100644
--- a/src/gvcore/filedetailview.cpp
+++ b/src/gvcore/filedetailview.cpp
@@ -73,8 +73,8 @@ static TQPixmap createShownItemPixmap(int size, const TQColor& color) {
}
-FileDetailView::FileDetailView(TQWidget *tqparent, const char *name)
- : KListView(tqparent, name), FileViewBase()
+FileDetailView::FileDetailView(TQWidget *parent, const char *name)
+ : KListView(parent, name), FileViewBase()
{
mSortingCol = COL_NAME;
mBlockSortingSignal = false;
diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h
index 346f618..5003524 100644
--- a/src/gvcore/filedetailview.h
+++ b/src/gvcore/filedetailview.h
@@ -49,7 +49,7 @@ class FileDetailView : public KListView, public FileViewBase
friend class FileDetailViewItem;
public:
- FileDetailView(TQWidget* tqparent, const char* name);
+ FileDetailView(TQWidget* parent, const char* name);
virtual ~FileDetailView();
virtual TQWidget* widget() { return this; }
diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
index ef769a9..1104bce 100644
--- a/src/gvcore/filedetailviewitem.h
+++ b/src/gvcore/filedetailviewitem.h
@@ -39,22 +39,22 @@ namespace Gwenview {
class FileDetailViewItem : public KListViewItem
{
public:
- FileDetailViewItem( TQListView* tqparent, const TQString &text,
+ FileDetailViewItem( TQListView* parent, const TQString &text,
const TQPixmap &icon, KFileItem* fi )
- : KListViewItem( tqparent, text ), inf( fi ) {
+ : KListViewItem( parent, text ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}
- FileDetailViewItem( TQListView* tqparent, KFileItem* fi )
- : KListViewItem( tqparent ), inf( fi ) {
+ FileDetailViewItem( TQListView* parent, KFileItem* fi )
+ : KListViewItem( parent ), inf( fi ) {
init();
}
- FileDetailViewItem( TQListView* tqparent, const TQString &text,
+ FileDetailViewItem( TQListView* parent, const TQString &text,
const TQPixmap &icon, KFileItem* fi,
TQListViewItem* after)
- : KListViewItem( tqparent, after ), inf( fi ) {
+ : KListViewItem( parent, after ), inf( fi ) {
setPixmap( 0, icon );
setText( 0, text );
}
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index da5b8d8..6fa54dd 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -40,51 +40,51 @@ namespace Gwenview {
namespace FileOperation {
-void copyTo(const KURL::List& srcURL,TQWidget* tqparent) {
- FileOpObject* op=new FileOpCopyToObject(srcURL,tqparent);
+void copyTo(const KURL::List& srcURL,TQWidget* parent) {
+ FileOpObject* op=new FileOpCopyToObject(srcURL,parent);
(*op)();
}
-void linkTo(const KURL::List& srcURL,TQWidget* tqparent) {
- FileOpObject* op=new FileOpLinkToObject(srcURL,tqparent);
+void linkTo(const KURL::List& srcURL,TQWidget* parent) {
+ FileOpObject* op=new FileOpLinkToObject(srcURL,parent);
(*op)();
}
-void moveTo(const KURL::List& srcURL,TQWidget* tqparent,TQObject* receiver,const char* slot) {
- FileOpObject* op=new FileOpMoveToObject(srcURL,tqparent);
+void moveTo(const KURL::List& srcURL,TQWidget* parent,TQObject* receiver,const char* slot) {
+ FileOpObject* op=new FileOpMoveToObject(srcURL,parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
-void makeDir(const KURL& parentURL, TQWidget* tqparent, TQObject* receiver, const char* slot) {
- FileOpObject* op=new FileOpMakeDirObject(parentURL, tqparent);
+void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver, const char* slot) {
+ FileOpObject* op=new FileOpMakeDirObject(parentURL, parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
-void del(const KURL::List& url,TQWidget* tqparent,TQObject* receiver,const char* slot) {
- FileOpObject* op = new FileOpDelObject(url,tqparent);
+void del(const KURL::List& url,TQWidget* parent,TQObject* receiver,const char* slot) {
+ FileOpObject* op = new FileOpDelObject(url,parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
-void trash(const KURL::List& url, TQWidget* tqparent, TQObject* receiver, const char* slot) {
- FileOpObject* op = new FileOpTrashObject(url,tqparent);
+void trash(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) {
+ FileOpObject* op = new FileOpTrashObject(url,parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
-void realDelete(const KURL::List& url, TQWidget* tqparent, TQObject* receiver, const char* slot) {
- FileOpObject* op = new FileOpRealDeleteObject(url,tqparent);
+void realDelete(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) {
+ FileOpObject* op = new FileOpRealDeleteObject(url,parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
-void rename(const KURL& url,TQWidget* tqparent,TQObject* receiver,const char* slot) {
- FileOpObject* op=new FileOpRenameObject(url,tqparent);
+void rename(const KURL& url,TQWidget* parent,TQObject* receiver,const char* slot) {
+ FileOpObject* op=new FileOpRenameObject(url,parent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(renamed(const TQString&)),receiver,slot);
(*op)();
}
@@ -101,8 +101,8 @@ void fillDropURLMenu(TQPopupMenu* menu, const KURL::List& urls, const KURL& targ
}
-void openDropURLMenu(TQWidget* tqparent, const KURL::List& urls, const KURL& target, bool* wasMoved) {
- TQPopupMenu menu(tqparent);
+void openDropURLMenu(TQWidget* parent, const KURL::List& urls, const KURL& target, bool* wasMoved) {
+ TQPopupMenu menu(parent);
if (wasMoved) *wasMoved=false;
fillDropURLMenu(&menu, urls, target, wasMoved);
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index fb79d7b..6fe8c50 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -39,14 +39,14 @@ namespace Gwenview {
*/
namespace FileOperation {
-LIBGWENVIEW_EXPORT void copyTo(const KURL::List&,TQWidget* tqparent=0L);
-LIBGWENVIEW_EXPORT void moveTo(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
-LIBGWENVIEW_EXPORT void linkTo(const KURL::List& srcURL,TQWidget* tqparent);
-LIBGWENVIEW_EXPORT void makeDir(const KURL& parentURL, TQWidget* tqparent, TQObject* receiver=0L, const char* slot=0L);
-LIBGWENVIEW_EXPORT void del(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
-LIBGWENVIEW_EXPORT void trash(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
-LIBGWENVIEW_EXPORT void realDelete(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
-LIBGWENVIEW_EXPORT void rename(const KURL&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
+LIBGWENVIEW_EXPORT void copyTo(const KURL::List&,TQWidget* parent=0L);
+LIBGWENVIEW_EXPORT void moveTo(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L);
+LIBGWENVIEW_EXPORT void linkTo(const KURL::List& srcURL,TQWidget* parent);
+LIBGWENVIEW_EXPORT void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver=0L, const char* slot=0L);
+LIBGWENVIEW_EXPORT void del(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L);
+LIBGWENVIEW_EXPORT void trash(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L);
+LIBGWENVIEW_EXPORT void realDelete(const KURL::List&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L);
+LIBGWENVIEW_EXPORT void rename(const KURL&,TQWidget* parent,TQObject* receiver=0L,const char* slot=0L);
/**
@@ -56,8 +56,8 @@ class DropMenuContext : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- DropMenuContext(TQObject* tqparent, const KURL::List& src, const KURL& dst, bool* wasMoved)
- : TQObject(tqparent)
+ DropMenuContext(TQObject* parent, const KURL::List& src, const KURL& dst, bool* wasMoved)
+ : TQObject(parent)
, mSrc(src)
, mDst(dst)
, mWasMoved(wasMoved)
@@ -87,7 +87,7 @@ private:
LIBGWENVIEW_EXPORT void fillDropURLMenu(TQPopupMenu*, const KURL::List&, const KURL& target, bool* wasMoved=0L);
-LIBGWENVIEW_EXPORT void openDropURLMenu(TQWidget* tqparent, const KURL::List&, const KURL& target, bool* wasMoved=0L);
+LIBGWENVIEW_EXPORT void openDropURLMenu(TQWidget* parent, const KURL::List&, const KURL& target, bool* wasMoved=0L);
} // namespace
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index b195072..28fc78e 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -51,8 +51,8 @@ namespace Gwenview {
*/
class DirSelectDialog : public KFileDialog {
public:
- DirSelectDialog(const TQString& startDir, TQWidget* tqparent)
- : KFileDialog(startDir, TQString(), tqparent, "dirselectdialog", true) {
+ DirSelectDialog(const TQString& startDir, TQWidget* parent)
+ : KFileDialog(startDir, TQString(), parent, "dirselectdialog", true) {
locationEdit->setEnabled(false);
filterWidget->setEnabled(false);
setMode(KFile::Directory | KFile::ExistingOnly);
@@ -64,15 +64,15 @@ public:
//-FileOpObject--------------------------------------------------------------------
-FileOpObject::FileOpObject(const KURL& url,TQWidget* tqparent)
-: mParent(tqparent)
+FileOpObject::FileOpObject(const KURL& url,TQWidget* parent)
+: mParent(parent)
{
mURLList.append(url);
}
-FileOpObject::FileOpObject(const KURL::List& list,TQWidget* tqparent)
-: mParent(tqparent), mURLList(list)
+FileOpObject::FileOpObject(const KURL::List& list,TQWidget* parent)
+: mParent(parent), mURLList(list)
{}
diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h
index 9ec3429..a15db50 100644
--- a/src/gvcore/fileopobject.h
+++ b/src/gvcore/fileopobject.h
@@ -46,8 +46,8 @@ class FileOpObject : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpObject(const KURL&,TQWidget* tqparent=0L);
- FileOpObject(const KURL::List&,TQWidget* tqparent=0L);
+ FileOpObject(const KURL&,TQWidget* parent=0L);
+ FileOpObject(const KURL::List&,TQWidget* parent=0L);
virtual void operator()()=0;
signals:
@@ -68,8 +68,8 @@ class FileOpCopyToObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpCopyToObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpCopyToObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpCopyToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpCopyToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -77,8 +77,8 @@ class FileOpLinkToObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpLinkToObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpLinkToObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpLinkToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpLinkToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -86,8 +86,8 @@ class FileOpMoveToObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpMoveToObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpMoveToObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpMoveToObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpMoveToObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -95,7 +95,7 @@ class FileOpMakeDirObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpMakeDirObject(const KURL& url, TQWidget* tqparent=0L) : FileOpObject(url, tqparent) {}
+ FileOpMakeDirObject(const KURL& url, TQWidget* parent=0L) : FileOpObject(url, parent) {}
void operator()();
};
@@ -103,8 +103,8 @@ class FileOpDelObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpDelObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpDelObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpDelObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpDelObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -113,8 +113,8 @@ class FileOpTrashObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpTrashObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpTrashObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpTrashObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpTrashObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -123,8 +123,8 @@ class FileOpRealDeleteObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpRealDeleteObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
- FileOpRealDeleteObject(const KURL::List& urlList,TQWidget* tqparent=0L) : FileOpObject(urlList,tqparent) {}
+ FileOpRealDeleteObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
+ FileOpRealDeleteObject(const KURL::List& urlList,TQWidget* parent=0L) : FileOpObject(urlList,parent) {}
void operator()();
};
@@ -133,7 +133,7 @@ class FileOpRenameObject : public FileOpObject {
Q_OBJECT
TQ_OBJECT
public:
- FileOpRenameObject(const KURL& url,TQWidget* tqparent=0L) : FileOpObject(url,tqparent) {}
+ FileOpRenameObject(const KURL& url,TQWidget* parent=0L) : FileOpObject(url,parent) {}
void operator()();
signals:
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 2448520..51445be 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -110,7 +110,7 @@ public:
}
void updatePosition() {
- FileThumbnailView* view=static_cast<FileThumbnailView*>(TQT_TQWIDGET(tqparent()));
+ FileThumbnailView* view=static_cast<FileThumbnailView*>(TQT_TQWIDGET(parent()));
TQSize tmp=view->clipper()->size() - size();
move(tmp.width() - 2, tmp.height() - 2);
}
@@ -159,8 +159,8 @@ static FileThumbnailViewItem* viewItem(const FileThumbnailView* view, const KFil
}
-FileThumbnailView::FileThumbnailView(TQWidget* tqparent)
-: KIconView(tqparent), FileViewBase()
+FileThumbnailView::FileThumbnailView(TQWidget* parent)
+: KIconView(parent), FileViewBase()
{
d=new Private;
d->mUpdateThumbnailsOnNextShow=false;
diff --git a/src/gvcore/filethumbnailview.h b/src/gvcore/filethumbnailview.h
index 8cc2776..8077aa6 100644
--- a/src/gvcore/filethumbnailview.h
+++ b/src/gvcore/filethumbnailview.h
@@ -52,7 +52,7 @@ Q_OBJECT
public:
enum ItemDetail { FILENAME=1, FILESIZE=2, FILEDATE=4, IMAGESIZE=8 };
- FileThumbnailView(TQWidget* tqparent);
+ FileThumbnailView(TQWidget* parent);
~FileThumbnailView();
TQWidget* widget() { return this; }
diff --git a/src/gvcore/filethumbnailviewitem.h b/src/gvcore/filethumbnailviewitem.h
index 55b2c98..b242355 100644
--- a/src/gvcore/filethumbnailviewitem.h
+++ b/src/gvcore/filethumbnailviewitem.h
@@ -42,7 +42,7 @@ public:
class WrappedLine;
enum { PADDING=4 };
- FileThumbnailViewItem(TQIconView* tqparent,const TQString& text,const TQPixmap& icon, KFileItem* fileItem);
+ FileThumbnailViewItem(TQIconView* parent,const TQString& text,const TQPixmap& icon, KFileItem* fileItem);
~FileThumbnailViewItem();
KFileItem* fileItem() const { return mFileItem; }
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index e58e654..bdacf01 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -252,8 +252,8 @@ public:
// FileViewController
//
//-----------------------------------------------------------------------
-FileViewController::FileViewController(TQWidget* tqparent,KActionCollection* actionCollection)
-: TQWidget(tqparent)
+FileViewController::FileViewController(TQWidget* parent,KActionCollection* actionCollection)
+: TQWidget(parent)
, mMode(FILE_LIST)
, mPrefetch( NULL )
, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE)
diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
index 8aae0d0..de0de53 100644
--- a/src/gvcore/fileviewcontroller.h
+++ b/src/gvcore/fileviewcontroller.h
@@ -62,7 +62,7 @@ public:
enum Mode { FILE_LIST, THUMBNAIL};
enum FilterMode { ALL, IMAGES_ONLY, VIDEOS_ONLY };
- FileViewController(TQWidget* tqparent,KActionCollection*);
+ FileViewController(TQWidget* parent,KActionCollection*);
~FileViewController();
// Properties
diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp
index 46f0af8..311b98d 100644
--- a/src/gvcore/fullscreenbar.cpp
+++ b/src/gvcore/fullscreenbar.cpp
@@ -75,8 +75,8 @@ struct FullScreenBar::Private {
};
-FullScreenBar::FullScreenBar(TQWidget* tqparent)
-: KToolBar(tqparent, "FullScreenBar") {
+FullScreenBar::FullScreenBar(TQWidget* parent)
+: KToolBar(parent, "FullScreenBar") {
d=new Private;
d->mState=OUT;
d->mFirstShow=true;
@@ -105,15 +105,15 @@ FullScreenBar::~FullScreenBar() {
void FullScreenBar::resizeEvent(TQResizeEvent* event) {
KToolBar::resizeEvent(event);
- // Create a tqmask
+ // Create a mask
TQPainter painter;
- TQBitmap tqmask(size(), true);
- painter.begin(&tqmask);
+ TQBitmap mask(size(), true);
+ painter.begin(&mask);
painter.setBrush(TQt::white);
fillMask(painter, rect());
painter.end();
- setMask(tqmask);
+ setMask(mask);
}
diff --git a/src/gvcore/fullscreenbar.h b/src/gvcore/fullscreenbar.h
index 729b69c..b24d721 100644
--- a/src/gvcore/fullscreenbar.h
+++ b/src/gvcore/fullscreenbar.h
@@ -34,7 +34,7 @@ class FullScreenBar : public KToolBar {
Q_OBJECT
TQ_OBJECT
public:
- FullScreenBar(TQWidget* tqparent);
+ FullScreenBar(TQWidget* parent);
~FullScreenBar();
void slideIn();
diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp
index c98b30c..db1e325 100644
--- a/src/gvcore/imagesavedialog.cpp
+++ b/src/gvcore/imagesavedialog.cpp
@@ -44,8 +44,8 @@ static int findFormatInFilterList(const TQStringList& filters, const TQString& f
}
-ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidget* tqparent)
-: KFileDialog(":ImageSaveDialog",TQString(),tqparent,"imagesavedialog",true)
+ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidget* parent)
+: KFileDialog(":ImageSaveDialog",TQString(),parent,"imagesavedialog",true)
, mURL(url)
, mImageFormat(imageFormat)
{
diff --git a/src/gvcore/imagesavedialog.h b/src/gvcore/imagesavedialog.h
index 6cd33f8..6ac3b1d 100644
--- a/src/gvcore/imagesavedialog.h
+++ b/src/gvcore/imagesavedialog.h
@@ -34,7 +34,7 @@ class ImageSaveDialog : public KFileDialog {
Q_OBJECT
TQ_OBJECT
public:
- ImageSaveDialog(KURL& url,const TQCString& imageFormat,TQWidget* tqparent);
+ ImageSaveDialog(KURL& url,const TQCString& imageFormat,TQWidget* parent);
TQCString imageFormat() const { return mImageFormat; }
protected slots:
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 8bc670b..16575ef 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -272,15 +272,15 @@ inline bool doDelayedSmoothing() {
class ImageView::EventFilter : public TQObject {
public:
- EventFilter(ImageView* tqparent)
- : TQObject(tqparent) {}
+ EventFilter(ImageView* parent)
+ : TQObject(parent) {}
bool eventFilter(TQObject*, TQEvent* event) {
switch (event->type()) {
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
case TQEvent::AccelOverride:
- return static_cast< ImageView* >( TQT_TQWIDGET(tqparent()))
+ return static_cast< ImageView* >( TQT_TQWIDGET(parent()))
->viewportKeyEvent(TQT_TQKEYEVENT(event));
default:
break;
@@ -291,8 +291,8 @@ public:
-ImageView::ImageView(TQWidget* tqparent,Document* document, KActionCollection* actionCollection)
-: TQScrollView(tqparent,0L,WResizeNoErase|WRepaintNoErase|WPaintClever)
+ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* actionCollection)
+: TQScrollView(parent,0L,WResizeNoErase|WRepaintNoErase|WPaintClever)
{
d=new Private;
d->mDocument=document;
diff --git a/src/gvcore/imageview.h b/src/gvcore/imageview.h
index f688e27..9dc94a9 100644
--- a/src/gvcore/imageview.h
+++ b/src/gvcore/imageview.h
@@ -67,7 +67,7 @@ public:
enum ZoomMode { ZOOM_FIT, ZOOM_FIT_WIDTH, ZOOM_FIT_HEIGHT, ZOOM_FREE };
typedef TQMap<ToolID,ToolBase*> Tools;
- ImageView(TQWidget* tqparent,Document*,KActionCollection*);
+ ImageView(TQWidget* parent,Document*,KActionCollection*);
~ImageView();
// Properties
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index a3721d0..f24a2e8 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -64,11 +64,11 @@ namespace Gwenview {
*/
class XMLGUIBuilder : public KXMLGUIBuilder {
public:
- XMLGUIBuilder(TQWidget* tqparent) : KXMLGUIBuilder(tqparent) {}
+ XMLGUIBuilder(TQWidget* parent) : KXMLGUIBuilder(parent) {}
- virtual TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id) {
+ virtual TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id) {
if (element.tagName().lower() == "toolbar") {
- return KXMLGUIBuilder::createContainer(tqparent, index, element, id);
+ return KXMLGUIBuilder::createContainer(parent, index, element, id);
} else {
return 0;
}
@@ -264,8 +264,8 @@ struct ImageViewController::Private {
//------------------------------------------------------------------------
-ImageViewController::ImageViewController(TQWidget* tqparent, Document* document, KActionCollection* actionCollection)
-: TQObject(tqparent) {
+ImageViewController::ImageViewController(TQWidget* parent, Document* document, KActionCollection* actionCollection)
+: TQObject(parent) {
d=new Private;
d->mImageViewController=this;
d->mDocument=document;
@@ -273,7 +273,7 @@ ImageViewController::ImageViewController(TQWidget* tqparent, Document* document,
d->mAutoHideTimer=new TQTimer(this);
d->mCursorHidden=false;
- d->mContainer=new TQWidget(tqparent);
+ d->mContainer=new TQWidget(parent);
d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer);
d->mToolBar=new KToolBar(d->mContainer, "", true);
@@ -425,7 +425,7 @@ bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
// have to check we are not dealing with another object.
bool isAChildOfStack=false;
TQObject* parentObject;
- for (parentObject=object->tqparent(); parentObject; parentObject=parentObject->tqparent()) {
+ for (parentObject=object->parent(); parentObject; parentObject=parentObject->parent()) {
if (TQT_BASE_OBJECT(parentObject)==TQT_BASE_OBJECT(d->mStack)) {
isAChildOfStack=true;
break;
diff --git a/src/gvcore/imageviewcontroller.h b/src/gvcore/imageviewcontroller.h
index 641660b..bb4d0ee 100644
--- a/src/gvcore/imageviewcontroller.h
+++ b/src/gvcore/imageviewcontroller.h
@@ -46,7 +46,7 @@ class LIBGWENVIEW_EXPORT ImageViewController : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- ImageViewController(TQWidget* tqparent, Document*, KActionCollection*);
+ ImageViewController(TQWidget* parent, Document*, KActionCollection*);
~ImageViewController();
TQWidget* widget() const;
diff --git a/src/gvcore/inputdialog.cpp b/src/gvcore/inputdialog.cpp
index cdd4267..4ca8a7c 100644
--- a/src/gvcore/inputdialog.cpp
+++ b/src/gvcore/inputdialog.cpp
@@ -36,8 +36,8 @@ struct InputDialog::Private {
};
-InputDialog::InputDialog(TQWidget* tqparent)
-: KDialogBase(tqparent, "InputDialog", true, TQString(),
+InputDialog::InputDialog(TQWidget* parent)
+: KDialogBase(parent, "InputDialog", true, TQString(),
KDialogBase::Ok|KDialogBase::Cancel)
{
d = new Private;
diff --git a/src/gvcore/inputdialog.h b/src/gvcore/inputdialog.h
index d34d465..2613a20 100644
--- a/src/gvcore/inputdialog.h
+++ b/src/gvcore/inputdialog.h
@@ -38,7 +38,7 @@ class InputDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- InputDialog(TQWidget* tqparent);
+ InputDialog(TQWidget* parent);
~InputDialog();
void setLabel(const TQString& label);
KLineEdit* lineEdit() const;
diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp
index 2359793..98524af 100644
--- a/src/gvcore/printdialog.cpp
+++ b/src/gvcore/printdialog.cpp
@@ -76,8 +76,8 @@ static inline double unitToMM(Unit unit) {
}
-PrintDialogPage::PrintDialogPage( Document* document, TQWidget *tqparent, const char *name )
- : KPrintDialogPage( tqparent, name ) {
+PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const char *name )
+ : KPrintDialogPage( parent, name ) {
mDocument = document;
mContent = new PrintDialogPageBase(this);
setTitle( mContent->caption() );
diff --git a/src/gvcore/printdialog.h b/src/gvcore/printdialog.h
index 2dc9f24..b94ec90 100644
--- a/src/gvcore/printdialog.h
+++ b/src/gvcore/printdialog.h
@@ -51,7 +51,7 @@ class LIBGWENVIEW_EXPORT PrintDialogPage : public KPrintDialogPage {
TQ_OBJECT
public:
- PrintDialogPage( Document* document, TQWidget *tqparent = 0L, const char *name = 0 );
+ PrintDialogPage( Document* document, TQWidget *parent = 0L, const char *name = 0 );
~PrintDialogPage();
virtual void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
index 8c690ba..89ef317 100644
--- a/src/gvcore/qxcfi.cpp
+++ b/src/gvcore/qxcfi.cpp
@@ -561,7 +561,7 @@ void XCFImageFormat::initializeImage ( XCFImage& xcf_image )
// individual colors.
// Note: TQt treats a bitmap with a Black and White color palette
- // as a tqmask, so only the "on" bits are drawn, regardless of the
+ // as a mask, so only the "on" bits are drawn, regardless of the
// order color table entries. Otherwise (i.e., at least one of the
// color table entries is not black or white), it obeys the one-
// or two-color palette. Have to ask about this...
@@ -750,7 +750,7 @@ void XCFImageFormat::setPalette ( XCFImage& xcf_image, TQImage& image )
/*!
* An XCF file can contain an arbitrary number of properties associated
- * with the image (and layer and tqmask).
+ * with the image (and layer and mask).
* \param xcf_io the data stream connected to the XCF image
* \param xcf_image XCF image data.
* \return true if there were no I/O errors.
@@ -964,15 +964,15 @@ bool XCFImageFormat::loadLayerProperties ( SafeDataStream& xcf_io, Layer& layer
break;
case PROP_APPLY_MASK:
- property >> layer.apply_tqmask;
+ property >> layer.apply_mask;
break;
case PROP_EDIT_MASK:
- property >> layer.edit_tqmask;
+ property >> layer.edit_mask;
break;
case PROP_SHOW_MASK:
- property >> layer.show_tqmask;
+ property >> layer.show_mask;
break;
case PROP_OFFSETS:
@@ -995,9 +995,9 @@ bool XCFImageFormat::loadLayerProperties ( SafeDataStream& xcf_io, Layer& layer
/*!
* An XCF file can contain an arbitrary number of properties associated
- * with a channel. Note that this routine only reads tqmask channel properties.
+ * with a channel. Note that this routine only reads mask channel properties.
* \param xcf_io the data stream connected to the XCF image.
- * \param layer layer containing the tqmask channel to collect the properties.
+ * \param layer layer containing the mask channel to collect the properties.
* \return true if there were no I/O errors.
*/
bool XCFImageFormat::loadChannelProperties ( SafeDataStream& xcf_io, Layer& layer )
@@ -1167,9 +1167,9 @@ bool XCFImageFormat::loadLevel ( SafeDataStream& xcf_io, Layer& layer, TQ_INT32
}
/*!
- * A layer can have a one channel image which is used as a tqmask.
+ * A layer can have a one channel image which is used as a mask.
* \param xcf_io the data stream connected to the XCF image.
- * \param layer the layer to collect the tqmask image.
+ * \param layer the layer to collect the mask image.
* \return true if there were no I/O errors.
*/
bool XCFImageFormat::loadMask ( SafeDataStream& xcf_io, Layer& layer )
@@ -1181,7 +1181,7 @@ bool XCFImageFormat::loadMask ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> width >> height >> name;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on tqmask info" );
+ qDebug( "XCF: read failure on mask info" );
return false;
}
@@ -1194,7 +1194,7 @@ bool XCFImageFormat::loadMask ( SafeDataStream& xcf_io, Layer& layer )
xcf_io >> hierarchy_offset;
if ( xcf_io.failed() ) {
- qDebug( "XCF: read failure on tqmask image offset" );
+ qDebug( "XCF: read failure on mask image offset" );
return false;
}
@@ -1393,8 +1393,8 @@ void XCFImageFormat::assignImageBytes ( Layer& layer, uint i, uint j )
}
/*!
- * Copy the bytes from the tile buffer into the tqmask tile TQImage.
- * \param layer layer containing the tile buffer and the tqmask tile matrix.
+ * Copy the bytes from the tile buffer into the mask tile TQImage.
+ * \param layer layer containing the tile buffer and the mask tile matrix.
* \param i column index of current tile.
* \param j row index of current tile.
*/
@@ -1605,9 +1605,9 @@ void XCFImageFormat::copyRGBToRGB ( Layer& layer, uint i, uint j, int k, int l,
if ( layer.type == RGBA_GIMAGE )
src_a = INT_MULT( src_a, tqAlpha( src ) );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -1678,9 +1678,9 @@ void XCFImageFormat::copyGrayAToRGB ( Layer& layer, uint i, uint j, int k, int l
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -1726,7 +1726,7 @@ void XCFImageFormat::copyIndexedAToIndexed ( Layer& layer,uint i,uint j,int k,in
src_a = INT_MULT( src_a, layer.opacity );
- if ( layer.apply_tqmask == 1 &&
+ if ( layer.apply_mask == 1 &&
layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a,
@@ -1762,9 +1762,9 @@ void XCFImageFormat::copyIndexedAToRGB ( Layer& layer, uint i, uint j, int k, in
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -2019,9 +2019,9 @@ void XCFImageFormat::mergeRGBToRGB ( Layer& layer, uint i, uint j, int k, int l,
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -2121,9 +2121,9 @@ void XCFImageFormat::mergeGrayAToGray ( Layer& layer, uint i, uint j, int k, int
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -2232,9 +2232,9 @@ void XCFImageFormat::mergeGrayAToRGB ( Layer& layer, uint i, uint j, int k, int
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
@@ -2290,7 +2290,7 @@ void XCFImageFormat::mergeIndexedAToIndexed ( Layer& layer,uint i,uint j,int k,i
src_a = INT_MULT( src_a, layer.opacity );
- if ( layer.apply_tqmask == 1 &&
+ if ( layer.apply_mask == 1 &&
layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a,
@@ -2324,9 +2324,9 @@ void XCFImageFormat::mergeIndexedAToRGB ( Layer& layer, uint i, uint j, int k, i
src_a = INT_MULT( src_a, layer.opacity );
- // Apply the tqmask (if any)
+ // Apply the mask (if any)
- if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ if ( layer.apply_mask == 1 && layer.mask_tiles.size() > j &&
layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
diff --git a/src/gvcore/qxcfi.h b/src/gvcore/qxcfi.h
index be0c3d6..570ee53 100644
--- a/src/gvcore/qxcfi.h
+++ b/src/gvcore/qxcfi.h
@@ -130,7 +130,7 @@ class XCFImageFormat : public TQImageFormatPlugin {
TQ_INT32 type; //!< Type of the layer (GimpImageType)
char* name; //!< Name of the layer
TQ_UINT32 hierarchy_offset; //!< File position of Tile hierarchy
- TQ_UINT32 mask_offset; //!< File position of tqmask image
+ TQ_UINT32 mask_offset; //!< File position of mask image
uint nrows; //!< Number of rows of tiles (y direction)
uint ncols; //!< Number of columns of tiles (x direction)
@@ -139,9 +139,9 @@ class XCFImageFormat : public TQImageFormatPlugin {
//! For Grayscale and Indexed images, the alpha channel is stored
//! separately (in this data structure, anyway).
Tiles alpha_tiles;
- Tiles mask_tiles; //!< The layer tqmask (optional)
+ Tiles mask_tiles; //!< The layer mask (optional)
- //! Additional information about a layer tqmask.
+ //! Additional information about a layer mask.
struct {
TQ_UINT32 opacity;
TQ_UINT32 visible;
@@ -155,9 +155,9 @@ class XCFImageFormat : public TQImageFormatPlugin {
TQ_UINT32 visible; //!< Is the layer visible?
TQ_UINT32 linked; //!< Is this layer linked (geometrically)
TQ_UINT32 preserve_transparency; //!< Preserve alpha when drawing on layer?
- TQ_UINT32 apply_tqmask; //!< Apply the layer tqmask?
- TQ_UINT32 edit_tqmask; //!< Is the layer tqmask the being edited?
- TQ_UINT32 show_tqmask; //!< Show the layer tqmask rather than the image?
+ TQ_UINT32 apply_mask; //!< Apply the layer mask?
+ TQ_UINT32 edit_mask; //!< Is the layer mask the being edited?
+ TQ_UINT32 show_mask; //!< Show the layer mask rather than the image?
TQ_INT32 x_offset; //!< x offset of the layer relative to the image
TQ_INT32 y_offset; //!< y offset of the layer relative to the image
TQ_UINT32 mode; //!< Combining mode of layer (LayerModeEffects)
@@ -168,7 +168,7 @@ class XCFImageFormat : public TQImageFormatPlugin {
//! The data from tile buffer is copied to the Tile by this
//! method. Depending on the type of the tile (RGB, Grayscale,
- //! Indexed) and use (image or tqmask), the bytes in the buffer are
+ //! Indexed) and use (image or mask), the bytes in the buffer are
//! copied in different ways.
void (*assignBytes)( Layer& layer, uint i, uint j );