rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

24 files changed, 97 insertions, 97 deletions

diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h
index 005f108..ec4475a 100644
--- a/ksayit/src/Types.h
+++ b/ksayit/src/Types.h
@@ -54,8 +54,8 @@ This abstract class is the interface to access the items of the TreeView.
 class ListViewInterface : public KListViewItem
 {
 public:
-    ListViewInterface(ListViewInterface *tqparent=0, TQString label=TQString());
-    ListViewInterface(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    ListViewInterface(ListViewInterface *parent=0, TQString label=TQString());
+    ListViewInterface(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ListViewInterface(KListView *lv=0, TQString label=TQString());
 
     // ~ListViewItemInterface();
diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp
index 75f06e7..e6605f9 100644
--- a/ksayit/src/contextmenuhandler.cpp
+++ b/ksayit/src/contextmenuhandler.cpp
@@ -117,8 +117,8 @@ bool ContextActionHandler::characters( const TQString &ch )
 /**
  * MenuHandler
  */
-ContextMenuHandler::ContextMenuHandler(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name), m_DocTreeView(tqparent)
+ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name)
+ : TQObject(parent, name), m_DocTreeView(parent)
 {
     m_popupmenu = NULL;
     m_item = NULL;  
@@ -378,9 +378,9 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ
 }
 
 
-KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *tqparent)
+KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *parent)
 {
-    return new KPopupMenu(tqparent);
+    return new KPopupMenu(parent);
 }
 
 
diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h
index 88d7c0e..8bb9d0a 100644
--- a/ksayit/src/contextmenuhandler.h
+++ b/ksayit/src/contextmenuhandler.h
@@ -69,7 +69,7 @@ class ContextMenuHandler : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-    ContextMenuHandler(TQObject *tqparent = 0, const char *name = 0);
+    ContextMenuHandler(TQObject *parent = 0, const char *name = 0);
 
     ~ContextMenuHandler();
 
@@ -80,10 +80,10 @@ public:
     KPopupMenu* getPopupMenu(ListViewInterface *item);
     
     /**
-     * \returns A pointer to the Submenu as a child of the tqparent
-     * \p tqparent.
+     * \returns A pointer to the Submenu as a child of the parent
+     * \p parent.
      */
-    KPopupMenu* SubMenuFactory(KPopupMenu *tqparent);
+    KPopupMenu* SubMenuFactory(KPopupMenu *parent);
     
     /**
      * Creates an action sufficiant to the given name.
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 901d494..60a7bde 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -31,12 +31,12 @@
 //////////////////////////////////////
 // Interface
 //////////////////////////////////////
-ListViewInterface::ListViewInterface(ListViewInterface *tqparent, TQString label)
-    : KListViewItem( tqparent, label )
+ListViewInterface::ListViewInterface(ListViewInterface *parent, TQString label)
+    : KListViewItem( parent, label )
 {
 }
 
-ListViewInterface::ListViewInterface(ListViewInterface *tqparent, ListViewInterface *after, TQString label) : KListViewItem( tqparent, after, label )
+ListViewInterface::ListViewInterface(ListViewInterface *parent, ListViewInterface *after, TQString label) : KListViewItem( parent, after, label )
 {
 }
 
@@ -116,8 +116,8 @@ TQVariant RobDocument::getValue( unsigned int index ) const
 /**
  * Overview
  */
-Overview::Overview(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -171,8 +171,8 @@ TQVariant Overview::getValue( unsigned int index ) const
 /**
  * Date
  */
-Date::Date(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -238,8 +238,8 @@ TQVariant Date::getValue( unsigned int index ) const
 /**
  * ReleaseInfo
  */
-ReleaseInfo::ReleaseInfo(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -305,8 +305,8 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const
 /**
  * Authorgroup
  */
-AuthorGroup::AuthorGroup(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("kdmconfig", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -361,8 +361,8 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const
 /**
  * Author
  */
-Author::Author(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -445,8 +445,8 @@ TQVariant Author::getValue( unsigned int index ) const
 /**
  * KeywordSet
  */
-KeywordSet::KeywordSet(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -500,8 +500,8 @@ TQVariant KeywordSet::getValue( unsigned int index ) const
 /**
  * Keyword
  */
-Keyword::Keyword(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Keyword::Keyword(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     // new Concept (begin)
     m_valueList.clear();
@@ -566,8 +566,8 @@ TQVariant Keyword::getValue( unsigned int index ) const
 /**
  * Abstract
  */
-Abstract::Abstract(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -622,8 +622,8 @@ TQVariant Abstract::getValue( unsigned int index ) const
 /**
  * Para
  */
-Para::Para(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -696,8 +696,8 @@ TQVariant Para::getValue( unsigned int index ) const
 /**
  * Chapter
  */
-Chapter::Chapter(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -757,8 +757,8 @@ TQVariant Chapter::getValue( unsigned int index ) const
 /**
  * Sect1
  */
-Sect1::Sect1(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -817,8 +817,8 @@ TQVariant Sect1::getValue( unsigned int index ) const
 /**
  * Sect2
  */
-Sect2::Sect2(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -877,8 +877,8 @@ TQVariant Sect2::getValue( unsigned int index ) const
 /**
  * Sect3
  */
-Sect3::Sect3(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -937,8 +937,8 @@ TQVariant Sect3::getValue( unsigned int index ) const
 /**
  * Sect4
  */
-Sect4::Sect4(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
@@ -997,8 +997,8 @@ TQVariant Sect4::getValue( unsigned int index ) const
 /**
  * Sect5
  */
-Sect5::Sect5(ListViewInterface *tqparent, ListViewInterface *after, TQString label)
-    : ListViewInterface(tqparent, after, label)
+Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label)
+    : ListViewInterface(parent, after, label)
 {
     TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
     this->setPixmap(0, pixmap);
diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h
index e24af91..f19f9f0 100644
--- a/ksayit/src/docbookclasses.h
+++ b/ksayit/src/docbookclasses.h
@@ -32,7 +32,7 @@ class TQStringList;
 //
 /**
  Represents the root item of the document, therefore it expects
- a \p TQListView object as tqparent.\n
+ a \p TQListView object as parent.\n
  Structural item only (no references to a DOM node).
  @author Robert Vogl
  */
@@ -41,7 +41,7 @@ class RobDocument : public ListViewInterface
 public:
     /**
      * Constructor
-     * \param lv The ListView tqparent.
+     * \param lv The ListView parent.
      * \param label The label is shown in column 0 of the TreeView and is also
      * used as bookmark title.
      */
@@ -67,7 +67,7 @@ private:
 class Overview : public ListViewInterface
 {
 public:
-    Overview(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Overview(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Overview();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -85,7 +85,7 @@ private:
 class Date : public ListViewInterface
 {
 public:
-    Date(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Date(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Date();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -104,7 +104,7 @@ private:
 class ReleaseInfo : public ListViewInterface
 {
 public:
-    ReleaseInfo(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    ReleaseInfo(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~ReleaseInfo();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -124,7 +124,7 @@ private:
 class AuthorGroup : public ListViewInterface
 {
 public:
-    AuthorGroup(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    AuthorGroup(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~AuthorGroup();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -143,7 +143,7 @@ private:
 class Author : public ListViewInterface
 {
 public:
-    Author(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Author(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Author();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -162,7 +162,7 @@ private:
 class KeywordSet : public ListViewInterface
 {
 public:
-    KeywordSet(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    KeywordSet(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~KeywordSet();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -180,7 +180,7 @@ private:
 class Keyword : public ListViewInterface
 {
 public:
-    Keyword(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Keyword(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Keyword();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -199,7 +199,7 @@ private:
 class Abstract : public ListViewInterface
 {
 public:
-    Abstract(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Abstract(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Abstract();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -217,7 +217,7 @@ private:
 class Para : public ListViewInterface
 {
 public:
-    Para(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Para(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Para();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -236,7 +236,7 @@ private:
 class Chapter : public ListViewInterface
 {
 public:
-    Chapter(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Chapter(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Chapter();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -255,7 +255,7 @@ private:
 class Sect1 : public ListViewInterface
 {
 public:
-    Sect1(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Sect1(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Sect1();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -274,7 +274,7 @@ private:
 class Sect2 : public ListViewInterface
 {
 public:
-    Sect2(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Sect2(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Sect2();
 
     bool setValue( unsigned int index, TQVariant data );
@@ -293,7 +293,7 @@ private:
 class Sect3 : public ListViewInterface
 {
 public:
-    Sect3(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Sect3(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Sect3();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -312,7 +312,7 @@ private:
 class Sect4 : public ListViewInterface
 {
 public:
-    Sect4(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Sect4(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Sect4();
     
     bool setValue( unsigned int index, TQVariant data );
@@ -331,7 +331,7 @@ private:
 class Sect5 : public ListViewInterface
 {
 public:
-    Sect5(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString());
+    Sect5(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString());
     ~Sect5();
     
     bool setValue( unsigned int index, TQVariant data );
diff --git a/ksayit/src/docbookgenerator.cpp b/ksayit/src/docbookgenerator.cpp
index a6f8a72..d9ab809 100644
--- a/ksayit/src/docbookgenerator.cpp
+++ b/ksayit/src/docbookgenerator.cpp
@@ -105,10 +105,10 @@ void DocbookGenerator::writeTitleOfBook(TQTextStream &doc, ListViewInterface *it
     if ( whoAmI != "BookInfo" )
         return;
 
-    // Documents title is stored in root element (tqparent of BookInfo)
-    ListViewInterface *tqparent = static_cast<ListViewInterface*>(item->tqparent());
-    if ( tqparent ){
-        TQString title = tqparent->text(0);
+    // Documents title is stored in root element (parent of BookInfo)
+    ListViewInterface *parent = static_cast<ListViewInterface*>(item->parent());
+    if ( parent ){
+        TQString title = parent->text(0);
 
         // add node to document
         doc << "<Title>" << title << "</Title>" << endl;
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index c4b9797..98b76b1 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -41,8 +41,8 @@
 //////////////////////////////////////
 // TreeView Implementation
 //////////////////////////////////////
-DocTreeViewImpl::DocTreeViewImpl(TQWidget* tqparent, const char* name, WFlags fl)
- : DocTreeView(tqparent, name, fl)
+DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl)
+ : DocTreeView(parent, name, fl)
 {
     m_rootItem = NULL;
     m_url = KURL();
@@ -553,10 +553,10 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe
     if ( !item )
         return;
     
-    // 1. Do we have a tqparent (=parentItem)?
+    // 1. Do we have a parent (=parentItem)?
     // If no -> return, if yes -> recursive call
     ListViewInterface *parentItem = NULL;
-    parentItem = static_cast<ListViewInterface*>( item->tqparent() );
+    parentItem = static_cast<ListViewInterface*>( item->parent() );
     if ( parentItem ){
         recursiveBuildItemIdentifier( parentItem, idstring );
     } else {
@@ -757,9 +757,9 @@ void DocTreeViewImpl::slotDeleteItem()
     
     ListViewInterface *itemToDelete = m_currentItem;
     ListViewInterface *parentItem = NULL;
-    parentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent());
+    parentItem = static_cast<ListViewInterface*>(itemToDelete->parent());
     if ( !parentItem )
-        return; // delete only items with tqparent
+        return; // delete only items with parent
     
     // try to delete bookmark
     TQString url = TQString();
diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h
index f461b84..3021dc8 100644
--- a/ksayit/src/doctreeviewimpl.h
+++ b/ksayit/src/doctreeviewimpl.h
@@ -40,7 +40,7 @@ all required methods to access or manipulate its content.
 class DocTreeViewImpl : public DocTreeView
 {
 public:
-    DocTreeViewImpl(TQWidget* tqparent=0, const char* name=0, WFlags fl=0);
+    DocTreeViewImpl(TQWidget* parent=0, const char* name=0, WFlags fl=0);
 
     ~DocTreeViewImpl();
 
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index a923f5c..25fc7a9 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -26,8 +26,8 @@
 #include "ksayit_ttsplugin.h"
 
 
-FXPluginHandler::FXPluginHandler(TQObject *tqparent, const char *name, KConfig *config)
- : TQObject(tqparent, name), m_config(config)
+FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config)
+ : TQObject(parent, name), m_config(config)
 {
     m_mapPluginList.clear();
     m_lstActivePlugins.clear();
diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h
index ca4aa21..523f5af 100644
--- a/ksayit/src/fxpluginhandler.h
+++ b/ksayit/src/fxpluginhandler.h
@@ -49,7 +49,7 @@ class FXPluginHandler : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-    FXPluginHandler(TQObject *tqparent = 0, const char *name = 0, KConfig *config=0);
+    FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0);
     ~FXPluginHandler();
 
 public: // Methods  
diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp
index c066f88..fc0100e 100644
--- a/ksayit/src/fxsetupimpl.cpp
+++ b/ksayit/src/fxsetupimpl.cpp
@@ -27,10 +27,10 @@
 // #include "freeverbsetupimpl.h"
 #include "fxpluginhandler.h"
 
-FX_SetupImpl::FX_SetupImpl(TQWidget *tqparent, const char *name,
+FX_SetupImpl::FX_SetupImpl(TQWidget *parent, const char *name,
         KConfig *config,
         FXPluginHandler *fxpluginhandler )
- : FX_Setup(tqparent,name), m_config(config), m_fxpluginhandler(fxpluginhandler)
+ : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler)
 { 
    m_fxpluginhandler->getPlugins(pluginlist);
   
diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h
index fc868e6..d0bb367 100644
--- a/ksayit/src/fxsetupimpl.h
+++ b/ksayit/src/fxsetupimpl.h
@@ -40,7 +40,7 @@ class FX_SetupImpl : public FX_Setup  {
   TQ_OBJECT
 
 public: 
-  FX_SetupImpl(TQWidget *tqparent=0, const char *name=0,
+  FX_SetupImpl(TQWidget *parent=0, const char *name=0,
           KConfig *config=0,
           FXPluginHandler *fxpluginhandler=0);
   ~FX_SetupImpl();
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index bdf772c..cefaba6 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -55,9 +55,9 @@
 #define KSAYITUI "ksayitui.rc"
 #define ID_STATUS_MSG 1
 
-KSayItApp::KSayItApp(TQWidget* tqparent, const char* name, WFlags f,
+KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
     const TQCString &objID)
-  : KMainWindow(tqparent, name, f), DCOPObject(objID)
+  : KMainWindow(parent, name, f), DCOPObject(objID)
 {
     config    = NULL;
     view      = NULL;
@@ -811,12 +811,12 @@ void KSayItApp::setActions(int actions)
 {
     // ACTIONS::PLAY | ACTIONS::STOP  | ACTIONS::PAUSE | ACTIONS::FFWD | ACTIONS::FREV;
     
-    // Get the tqmask of supported actions from the plugin.
-    int tqmask = m_kttslib->getActions();
-    kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(tqmask, 0, 2) << endl;
+    // Get the mask of supported actions from the plugin.
+    int mask = m_kttslib->getActions();
+    kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl;
     
     // disable actions not supported by the plugin
-    int ma = actions & tqmask;
+    int ma = actions & mask;
     
     if (ma & ACTIONS::PLAY){
         say->setEnabled(true);
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index bf1e672..97d2c95 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -74,7 +74,7 @@ class KSayItApp : public KMainWindow, public DCOPObject
 public:
     /** construtor of KSayItApp, calls all init functions to create the application.
      */
-    KSayItApp(TQWidget* tqparent=0, const char* name=0, WFlags f=0,
+    KSayItApp(TQWidget* parent=0, const char* name=0, WFlags f=0,
         const TQCString &objID=0);
     ~KSayItApp();
 
diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h
index 211ca36..89154a5 100644
--- a/ksayit/src/ksayit_fxplugin.h
+++ b/ksayit/src/ksayit_fxplugin.h
@@ -38,7 +38,7 @@ class FXPlugin : public TQObject
 // Q_OBJECT
   TQ_OBJECT
 public:
-    FXPlugin(TQObject *tqparent=0, const char* name=0){};
+    FXPlugin(TQObject *parent=0, const char* name=0){};
        
     /** Sets the Main application object. Useful for config objects etc.
      */
diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h
index bb3e9f9..68179d7 100644
--- a/ksayit/src/ksayit_ttsplugin.h
+++ b/ksayit/src/ksayit_ttsplugin.h
@@ -65,7 +65,7 @@
 class TTSPlugin : public TQObject
 {
 protected:
-    TTSPlugin(TQObject *tqparent, const char *name) : TQObject(tqparent, name){};
+    TTSPlugin(TQObject *parent, const char *name) : TQObject(parent, name){};
     
 public:
     /** Returns the name of the plugin. This name is the unique identifier
diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp
index 8e838d5..d764681 100644
--- a/ksayit/src/ksayitbookmarkhandler.cpp
+++ b/ksayit/src/ksayitbookmarkhandler.cpp
@@ -23,8 +23,8 @@
 #include "ksayitbookmarkhandler.h"
 #include "ksayit.h"
 
-KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* tqparent)
- : KBookmarkOwner(), m_bkManager(bkManager), m_parent(tqparent)
+KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* parent)
+ : KBookmarkOwner(), m_bkManager(bkManager), m_parent(parent)
 {
     m_ID       = TQString();
     m_title    = TQString();
diff --git a/ksayit/src/ksayitbookmarkhandler.h b/ksayit/src/ksayitbookmarkhandler.h
index 31be84c..ac98edf 100644
--- a/ksayit/src/ksayitbookmarkhandler.h
+++ b/ksayit/src/ksayitbookmarkhandler.h
@@ -31,7 +31,7 @@ class KSayItApp;
 class KSayItBookmarkHandler : public KBookmarkOwner
 {
 public:
-    KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* tqparent=0);
+    KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* parent=0);
     virtual ~KSayItBookmarkHandler();
 
 public:
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index e7054a2..cf10c32 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -26,8 +26,8 @@
 // App specific includes
 #include "ksayitsystemtray.h"
 
-KSayItSystemTray::KSayItSystemTray(TQWidget *tqparent, const char *name)
- : KSystemTray(tqparent,name)
+KSayItSystemTray::KSayItSystemTray(TQWidget *parent, const char *name)
+ : KSystemTray(parent,name)
 {
   initActions();
   changeState( StateCLIPEMPTY::Instance() );
diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h
index cdeca47..093e219 100644
--- a/ksayit/src/ksayitsystemtray.h
+++ b/ksayit/src/ksayitsystemtray.h
@@ -44,7 +44,7 @@ class KSayItSystemTray : public KSystemTray  {
   friend class State;
 
 public: 
-    KSayItSystemTray(TQWidget *tqparent=0, const char *name=0);
+    KSayItSystemTray(TQWidget *parent=0, const char *name=0);
     ~KSayItSystemTray();
 
 signals:
diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp
index 07c5cdf..e3eb5ee 100644
--- a/ksayit/src/ksayitviewimpl.cpp
+++ b/ksayit/src/ksayitviewimpl.cpp
@@ -33,7 +33,7 @@ using namespace std;
 // App specific includes
 #include "ksayitviewimpl.h"
 
-KSayItViewImpl::KSayItViewImpl(TQWidget *tqparent, const char *name ) : KSayItView(tqparent,name) {
+KSayItViewImpl::KSayItViewImpl(TQWidget *parent, const char *name ) : KSayItView(parent,name) {
 
   // some presets
 
diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h
index fab7e49..6128fe2 100644
--- a/ksayit/src/ksayitviewimpl.h
+++ b/ksayit/src/ksayitviewimpl.h
@@ -36,7 +36,7 @@ class KSayItViewImpl : public KSayItView  {
   TQ_OBJECT
 
 public: 
-    KSayItViewImpl(TQWidget *tqparent=0, const char *name=0);
+    KSayItViewImpl(TQWidget *parent=0, const char *name=0);
     ~KSayItViewImpl();
 
 signals:
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 50e4e1c..298f32f 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -39,12 +39,12 @@
 #include "fxpluginhandler.h"
 #include "kttsdlib.h"
 
-VoiceSetupDlg::VoiceSetupDlg(TQWidget *tqparent, const char *name, const TQString &caption,
+VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption,
         bool modal,
         KConfig *config,
         FXPluginHandler *fxpluginhandler,
         KTTSDLib *ttslib)
- : KDialogBase(IconList, caption, Ok|Cancel, Ok, tqparent, name, modal, true),
+ : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true),
    m_config(config),
    m_fxpluginhandler(fxpluginhandler),
    m_kttslib(ttslib)
diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h
index 10cc42e..30bb37d 100644
--- a/ksayit/src/voicesetupdlg.h
+++ b/ksayit/src/voicesetupdlg.h
@@ -36,7 +36,7 @@ class VoiceSetupDlg : public KDialogBase  {
   TQ_OBJECT
 
 public: 
-  VoiceSetupDlg(TQWidget *tqparent=0, const char *name=0, const TQString &caption=NULL,
+  VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL,
         bool modal=true,
         KConfig *config=0,
         FXPluginHandler *fxpluginhandler=0,