rename the following methods:

tqparent parent
tqmask mask


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

7 files changed, 47 insertions, 47 deletions

diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 28335ff..2feb47a 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -769,7 +769,7 @@ TQString KJotsMain::currentBookmarkTitle()
     while ( item )
     {
         KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item);
-        item = item->tqparent();
+        item = item->parent();
 
         if ( item )
         {
@@ -865,7 +865,7 @@ void KJotsMain::jumpToBookmark(const TQString& bookmark)
                     {
                         if ( ++pageCount == pageNo )
                         {
-                            static_cast<TQListViewItem*>(entry)->tqparent()->setOpen(true);
+                            static_cast<TQListViewItem*>(entry)->parent()->setOpen(true);
                             subjectList->ensureItemVisible(entry);
                             subjectList->setSelected(entry, true);
                             jumpToEntry(entry);
@@ -914,12 +914,12 @@ void KJotsMain::nextBook()
 */
 void KJotsMain::prevBook()
 {
-    //Don't get caught by tqparent book.
+    //Don't get caught by parent book.
     TQListViewItem *startingPoint = subjectList->currentItem();
     if ( !startingPoint ) return; //sanity check
 
     if ( dynamic_cast<KJotsPage*>(startingPoint) )
-        startingPoint = startingPoint->tqparent();
+        startingPoint = startingPoint->parent();
 
     TQListViewItemIterator it ( startingPoint );
     do {
@@ -1043,7 +1043,7 @@ void KJotsMain::updateCaption()
     while ( item )
     {
         KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item);
-        item = item->tqparent();
+        item = item->parent();
 
         if ( item )
         {
@@ -1081,7 +1081,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
 
     //afterFirst doesn't work like we need it to. We want it to point to the
     //previous sibling, not just the entry directly above it.
-    if ( afterFirst && afterFirst->tqparent() != entry->parentBook() )
+    if ( afterFirst && afterFirst->parent() != entry->parentBook() )
     {
         TQListViewItemIterator it ( afterFirst );
         afterFirst = 0;
@@ -1096,7 +1096,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
             }
 
             //Found a previous sibling!
-            if ( it.current()->tqparent() == entry->parentBook() )
+            if ( it.current()->parent() == entry->parentBook() )
             {
                 afterFirst = it.current();
                 break;
@@ -1108,7 +1108,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
 
     KJotsEntryBase *entryAfter = dynamic_cast<KJotsEntryBase*>(afterFirst);
 
-    if ( entry->isPage() && !item->tqparent() )
+    if ( entry->isPage() && !item->parent() )
     {
         invalidMoveFlag=true; //Don't do anything while we're stuck here.
         subjectList->setItemsMovable(false);
@@ -1149,7 +1149,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
 
     if ( entryAfter )
     {
-        //Set the old tqparent book to dirty, since it just lost a page.
+        //Set the old parent book to dirty, since it just lost a page.
         if ( entryAfter->isBook() )
             entryAfter->setDirty(true);
         else
@@ -1173,7 +1173,7 @@ KJotsBook* KJotsMain::currentBook()
         {
             return dynamic_cast<KJotsBook*>(e);
         }
-        e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::tqparent());
+        e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::parent());
     }
 
     return 0;
diff --git a/kjots/kjotsbookmarks.cpp b/kjots/kjotsbookmarks.cpp
index 7259713..21ce6e8 100644
--- a/kjots/kjotsbookmarks.cpp
+++ b/kjots/kjotsbookmarks.cpp
@@ -23,9 +23,9 @@
 #include "KJotsMain.h"
 #include "kjotsbookmarks.h"
 
-KJotsBookmarks::KJotsBookmarks(KJotsMain* tqparent, const char* name)
-    : TQObject(tqparent, name),
-      m_kjots(tqparent)
+KJotsBookmarks::KJotsBookmarks(KJotsMain* parent, const char* name)
+    : TQObject(parent, name),
+      m_kjots(parent)
 {
 }
 
diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h
index 831b4e5..1351af4 100644
--- a/kjots/kjotsbookmarks.h
+++ b/kjots/kjotsbookmarks.h
@@ -33,7 +33,7 @@ class KJotsBookmarks : public TQObject, public KBookmarkOwner
   TQ_OBJECT
 
     public:
-        KJotsBookmarks(KJotsMain* tqparent = 0, const char* name = 0);
+        KJotsBookmarks(KJotsMain* parent = 0, const char* name = 0);
         ~KJotsBookmarks();
 
         virtual void openBookmarkURL(const TQString& url);
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index 6fdba79..eff6cba 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -36,8 +36,8 @@
 //----------------------------------------------------------------------
 // MYMULTIEDIT
 //----------------------------------------------------------------------
-KJotsEdit::KJotsEdit (TQWidget* tqparent, const char* name)
-    : KEdit(tqparent, name),
+KJotsEdit::KJotsEdit (TQWidget* parent, const char* name)
+    : KEdit(parent, name),
     m_entry(0)
 {
     // no rich text until printing and other such issues are worked out
diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h
index d54a627..39ddc3a 100644
--- a/kjots/kjotsedit.h
+++ b/kjots/kjotsedit.h
@@ -32,7 +32,7 @@ class KJotsEdit : public KEdit
     Q_OBJECT
   TQ_OBJECT
     public:
-        KJotsEdit (TQWidget* tqparent=0, const char* name=0);
+        KJotsEdit (TQWidget* parent=0, const char* name=0);
         ~KJotsEdit ();
 
         void print(TQString title = TQString());
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index e2d9d58..53613c3 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -69,20 +69,20 @@ TQString htmlFooter()
 // KJotsEntryBase
 //
 
-KJotsEntryBase::KJotsEntryBase(KListView* tqparent, TQListViewItem* after=0)
-    :KListViewItem(tqparent,after)
+KJotsEntryBase::KJotsEntryBase(KListView* parent, TQListViewItem* after=0)
+    :KListViewItem(parent,after)
 {
     m_id = 0;
     m_saveInProgress = m_dirty = false;
     m_parent = 0;
 }
 
-KJotsEntryBase::KJotsEntryBase(KListViewItem* tqparent, TQListViewItem* after=0)
-    :KListViewItem(tqparent,after)
+KJotsEntryBase::KJotsEntryBase(KListViewItem* parent, TQListViewItem* after=0)
+    :KListViewItem(parent,after)
 {
     m_id = 0;
     m_saveInProgress = m_dirty = false;
-    m_parent = dynamic_cast<KJotsBook*>(tqparent);
+    m_parent = dynamic_cast<KJotsBook*>(parent);
 }
 
 void KJotsEntryBase::setSubject(const TQString& subj)
@@ -99,13 +99,13 @@ void KJotsEntryBase::setText(int column, const TQString& text)
 }
 
 /*!
-    \brief Sets a new tqparent.
+    \brief Sets a new parent.
     This is mostly just used during drag-and-drop reordering in the list view.
-    We need to keep track of the previous tqparent in case the move is invalid.
+    We need to keep track of the previous parent in case the move is invalid.
 */
 void KJotsEntryBase::resetParent() 
 { 
-    m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::tqparent()); 
+    m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::parent()); 
 }
 
 /*! 
@@ -139,17 +139,17 @@ void KJotsEntryBase::setId(TQ_UINT64 id)
     This function should ONLY be called when saving the file, as it performs
     other functions than generating XML.
 */
-void KJotsEntryBase::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
+void KJotsEntryBase::generateXml( TQDomDocument &doc, TQDomElement &parent )
 {
     TQDomElement title = doc.createElement( "Title" );
     title.appendChild( doc.createTextNode( subject() ));
-    tqparent.appendChild( title );
+    parent.appendChild( title );
 
     TQDomElement id = doc.createElement( "ID" );
     TQString id_string;
     id_string.setNum(m_id);
     id.appendChild( doc.createTextNode(id_string) );
-    tqparent.appendChild( id );
+    parent.appendChild( id );
 
     setDirty( false );
     return;
@@ -217,14 +217,14 @@ int KJotsEntryBase::printTitleBox(TQString title, KPrinter& printer, TQPainter&
 // KJotsBook
 //
 
-KJotsBook::KJotsBook(KListView* tqparent, TQListViewItem* after)
-    : KJotsEntryBase(tqparent, after)
+KJotsBook::KJotsBook(KListView* parent, TQListViewItem* after)
+    : KJotsEntryBase(parent, after)
 {
     init();
 }
 
-KJotsBook::KJotsBook(KListViewItem* tqparent, TQListViewItem* after)
-    : KJotsEntryBase(tqparent, after)
+KJotsBook::KJotsBook(KListViewItem* parent, TQListViewItem* after)
+    : KJotsEntryBase(parent, after)
 {
     init();
 }
@@ -672,10 +672,10 @@ bool KJotsBook::isDirty()
     \brief Creates XML code and performs necessary tasks to save file.
     This function should ONLY be called when saving the file.
 */
-void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
+void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &parent )
 {
     TQDomElement book = doc.createElement( "KJotsBook" );
-    tqparent.appendChild( book );
+    parent.appendChild( book );
 
     KJotsEntryBase::generateXml(doc, book); //let the base class save important stuff
 
@@ -690,9 +690,9 @@ void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
         entry = dynamic_cast<KJotsEntryBase*>(entry->nextSibling());
     }
 
-    if ( !m_fileName.isEmpty() && TQListViewItem::tqparent() )
+    if ( !m_fileName.isEmpty() && TQListViewItem::parent() )
     {
-        //Hmmmm... We were originally loaded from a file, but now we have a tqparent, so
+        //Hmmmm... We were originally loaded from a file, but now we have a parent, so
         //we must have been moved into another tree. Remove the old file now that we
         //have saved ourselves into the new tree.
         deleteBook();
@@ -843,8 +843,8 @@ TQString KJotsBook::generateText( void )
 // KJotsPage
 //
 
-KJotsPage::KJotsPage(KJotsBook* tqparent, TQListViewItem *after)
-    : KJotsEntryBase(tqparent,after),
+KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
+    : KJotsEntryBase(parent,after),
     m_editor(0)
 {
     m_isBook = false;
@@ -982,7 +982,7 @@ void KJotsPage::slotSaveResult(KIO::Job *)
 
 void KJotsPage::print(TQFont& defaultFont)
 {
-    KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::tqparent());
+    KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::parent());
 
     TQString docName = book->subject();
     if (!subject().isNull())
@@ -1116,10 +1116,10 @@ bool KJotsPage::isDirty()
 /*!
     \brief Creates XML code and performs necessary tasks to save file.
     This function should ONLY be called when saving the file.
-*/void KJotsPage::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
+*/void KJotsPage::generateXml( TQDomDocument &doc, TQDomElement &parent )
 {
     TQDomElement page = doc.createElement( "KJotsPage" );
-    tqparent.appendChild( page );
+    parent.appendChild( page );
 
     KJotsEntryBase::generateXml(doc, page); //let the base class save important stuff
 
@@ -1192,12 +1192,12 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode )
 
     if ( top != this ) 
     {
-        KJotsBook *tqparent = parentBook();
-        while ( tqparent )
+        KJotsBook *parent = parentBook();
+        while ( parent )
         {
-            html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject());
-            if ( tqparent == top ) break;
-            tqparent = tqparent->parentBook();
+            html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(parent->id()).tqarg(parent->subject());
+            if ( parent == top ) break;
+            parent = parent->parentBook();
         }
     }
     html += TQString("</tr></table>");
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index b949886..9d7df78 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -145,7 +145,7 @@ class KJotsPage : public KJotsEntryBase
     Q_OBJECT
   TQ_OBJECT
     public:
-        KJotsPage(KJotsBook* tqparent, TQListViewItem* after = 0);
+        KJotsPage(KJotsBook* parent, TQListViewItem* after = 0);
         ~KJotsPage();
 
     public: