5 files changed, 13 insertions, 13 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 0f9e645..695ab5a 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -366,7 +366,7 @@ void KJotsMain::deleteEntry()
         return;
     }
 
-    KJotsBook* bk = cur->tqparentBook();
+    KJotsBook* bk = cur->parentBook();
     KJotsPage* nxt = dynamic_cast<KJotsPage*>(cur->nextSibling());
 
     me_text->setEntry(0);
@@ -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->tqparentBook() )
+    if ( afterFirst && afterFirst->tqparent() != entry->parentBook() )
     {
         TQListViewItemIterator it ( afterFirst );
         afterFirst = 0;
@@ -1090,13 +1090,13 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
         while ( it.current() )
         {
             //No other items were above this one.
-            if ( it.current() == entry->tqparentBook() ) 
+            if ( it.current() == entry->parentBook() ) 
             {
                 break;
             }
 
             //Found a previous sibling!
-            if ( it.current()->tqparent() == entry->tqparentBook() )
+            if ( it.current()->tqparent() == entry->parentBook() )
             {
                 afterFirst = it.current();
                 break;
@@ -1126,7 +1126,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
         {
             //We have to move item back.
             subjectList->takeItem(item);
-            entry->tqparentBook()->insertItem(item);
+            entry->parentBook()->insertItem(item);
             entry->moveItem(afterFirst);
         } else {
             subjectList->takeItem(item);
@@ -1153,7 +1153,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
         if ( entryAfter->isBook() )
             entryAfter->setDirty(true);
         else
-            entryAfter->tqparentBook()->setDirty(true);
+            entryAfter->parentBook()->setDirty(true);
     }
 
     return;
diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui
index 85ff558..d057ae0 100644
--- a/kjots/confpagefont.ui
+++ b/kjots/confpagefont.ui
@@ -31,7 +31,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontdialog.h</includehint>
 </includehints>
diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui
index 390bfb3..4a45efb 100644
--- a/kjots/confpagemisc.ui
+++ b/kjots/confpagemisc.ui
@@ -145,7 +145,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index d15bf5c..34c1ca0 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -1052,10 +1052,10 @@ TQString KJotsPage::defaultSubject()
 {
     int page = 0;
 
-    if ( tqparentBook() )
+    if ( parentBook() )
     {
         //We can't use childCount() here because it will count books, too.
-        KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(tqparentBook()->firstChild());
+        KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(parentBook()->firstChild());
         while ( entry )
         {
             if ( entry->isPage() ) ++page;
@@ -1192,12 +1192,12 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode )
 
     if ( top != this ) 
     {
-        KJotsBook *tqparent = tqparentBook();
+        KJotsBook *tqparent = parentBook();
         while ( tqparent )
         {
             html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject());
             if ( tqparent == top ) break;
-            tqparent = tqparent->tqparentBook();
+            tqparent = tqparent->parentBook();
         }
     }
     html += TQString("</tr></table>");
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index 2967eb3..b949886 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -74,7 +74,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem
         TQ_UINT64 id() { return m_id; }
         void setId(TQ_UINT64);
 
-        KJotsBook *tqparentBook() { return m_parent; }
+        KJotsBook *parentBook() { return m_parent; }
         void resetParent();
 
         bool isBook() const { return m_isBook; }