TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


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

11 files changed, 155 insertions, 149 deletions

diff --git a/kjots/CHANGES b/kjots/CHANGES
index 9815d90..f8fcbe8 100644
--- a/kjots/CHANGES
+++ b/kjots/CHANGES
@@ -10,17 +10,17 @@ new in version 0.5 (Aaron J. Seigo)
 
 (Carsten Pfeiffer <pfeiffer@kde.org>)
 - use KEdit instead of QMultiLineEdit directly
-  -> gains Search & replace + undo
+  -> gains Search & tqreplace + undo
 - allocate KTMainWindow on the heap to avoid double deletion on quit
 
 new in version 0.4 (Mario Weilguni <mweilguni@kde.org>)
 - works now with Qt 2.0
-- fixed broken layout of main window
-- layout improvements in AskFileName()
-- layout improvements in SubjList()
+- fixed broken tqlayout of main window
+- tqlayout improvements in AskFileName()
+- tqlayout improvements in SubjList()
 - compiles without warnings
 - "Apply" button is only activated when changes were made
-- improved layout of configuration dialog
+- improved tqlayout of configuration dialog
 - fixed a bug in the font selection
 
 - now compiles with EGCS   ( Robert Williams )
@@ -59,10 +59,10 @@ new in version 0.2.1
 
 new in version 0.2.0
 
-- changed the layout to be more KDE conforming (toolbar, statusbar,...)
+- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...)
 - folders are now called books and entries are pages
 - added subject to each page
-- you may popup a window with a list of all subjects and use it to find
+- you may popup a window with a list of all subjects and use it to tqfind
   pages more easily
 - further reduced the minimum size of the window
 
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index e1dedc9..0f9e645 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -72,7 +72,7 @@ KJotsMain::KJotsMain(const char* name)
     // the subject list
     subjectList = new KListView(splitter, "subjectList");
     subjectList->setRootIsDecorated(true);
-    subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+    subjectList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
     subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5);
     subjectList->addColumn(i18n("Pages"));
     subjectList->setFullWidth(true);
@@ -90,7 +90,7 @@ KJotsMain::KJotsMain(const char* name)
     textStack = new TQWidgetStack(splitter);
 
     me_text = new KJotsEdit(textStack, "me_text");
-    me_text->setFocusPolicy(TQWidget::StrongFocus);
+    me_text->setFocusPolicy(TQ_StrongFocus);
     me_text->setEnabled(false);
     textStack->addWidget(me_text);
     connect(me_text, TQT_SIGNAL(findSuccessful()), this, TQT_SLOT(slotFindSuccessful()));
@@ -101,72 +101,72 @@ KJotsMain::KJotsMain(const char* name)
     TQVBoxLayout *bookGrid = new TQVBoxLayout(f_main, KDialog::marginHint(), KDialog::spacingHint());
     bookGrid->addWidget(splitter, 0, 0);
     bookGrid->setMargin(0);
-    splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
+    splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
 
     // create actions
-    actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString::null, CTRL + Key_D, this,
+    actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
             TQT_SLOT(nextBook()), actionCollection(), "go_next_book");
-    actions[ACTION_PREV_BOOK] = new KAction(i18n("Previous Book"), TQString::null, CTRL + SHIFT + Key_D, this,
+    actions[ACTION_PREV_BOOK] = new KAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this),
             TQT_SLOT(prevBook()), actionCollection(), "go_prev_book");
-    actions[ACTION_NEXT_PAGE] = new KAction(i18n("Next Page"), TQString::null, CTRL + Key_PageDown, this,
+    actions[ACTION_NEXT_PAGE] = new KAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this),
             TQT_SLOT(nextPage()), actionCollection(), "go_next_page");
-    actions[ACTION_PREV_PAGE] = new KAction(i18n("Previous Page"), TQString::null, CTRL + Key_PageUp, this,
+    actions[ACTION_PREV_PAGE] = new KAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this),
             TQT_SLOT(prevPage()), actionCollection(), "go_prev_page");
 
-    actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQT_SLOT(newEntry()), actionCollection());
+    actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection());
     actions[ACTION_NEW_PAGE]->setText(i18n("&New Page"));
-    actions[ACTION_NEW_BOOK] = new KAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, this,
+    actions[ACTION_NEW_BOOK] = new KAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this),
             TQT_SLOT(createNewBook()), actionCollection(), "new_book");
 
     exportPageMenu = new KActionMenu(i18n("Export Page"), actionCollection(), "save_page_to");
-    actions[ACTION_PAGE2TEXT] = new KAction(i18n("To Text File..."), TQString::null, 0, this,
+    actions[ACTION_PAGE2TEXT] = new KAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
             TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii");
     actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu());
-    actions[ACTION_PAGE2HTML] = new KAction(i18n("To HTML File..."), TQString::null, 0, this,
+    actions[ACTION_PAGE2HTML] = new KAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
             TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html");
     actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu());
 
     exportBookMenu = new KActionMenu(i18n("Export Book"), actionCollection(), "save_book_to");
-    actions[ACTION_BOOK2TEXT] = new KAction(i18n("To Text File..."), TQString::null, 0, this,
+    actions[ACTION_BOOK2TEXT] = new KAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
             TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii");
     actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu());
-    actions[ACTION_BOOK2HTML] = new KAction(i18n("To HTML File..."), TQString::null, 0, this,
+    actions[ACTION_BOOK2HTML] = new KAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
             TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
     actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu());
 
-    actions[ACTION_DELETE_PAGE] = new KAction(i18n("&Delete Page"), "editdelete", CTRL + Key_Delete, this,
+    actions[ACTION_DELETE_PAGE] = new KAction(i18n("&Delete Page"), "editdelete", CTRL + Key_Delete, TQT_TQOBJECT(this),
             TQT_SLOT(deleteEntry()), actionCollection(), "del_page");
-    actions[ACTION_DELETE_BOOK] = new KAction(i18n("Delete Boo&k"), "editdelete", CTRL + SHIFT + Key_Delete, this,
+    actions[ACTION_DELETE_BOOK] = new KAction(i18n("Delete Boo&k"), "editdelete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
             TQT_SLOT(deleteBook()), actionCollection(), "del_folder");
 
     actions[ACTION_MANUAL_SAVE] = new KAction(i18n("Manual Save"), 0, KStdAccel::save(),
-                         this, TQT_SLOT(autoSave()), actionCollection(), "manual_save");
-    actions[ACTION_PRINT] = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection());
-    actions[ACTION_QUIT] = KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
+                         TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save");
+    actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
+    actions[ACTION_TQUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
 
-    actions[ACTION_CUT] = KStdAction::cut(me_text, TQT_SLOT(cut()), actionCollection());
+    actions[ACTION_CUT] = KStdAction::cut(TQT_TQOBJECT(me_text), TQT_SLOT(cut()), actionCollection());
     connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQT_SLOT(setEnabled(bool)));
     actions[ACTION_CUT]->setEnabled(false);
-    actions[ACTION_COPY]  = KStdAction::copy(me_text, TQT_SLOT(copy()), actionCollection());
+    actions[ACTION_COPY]  = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection());
     connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool)));
     actions[ACTION_COPY]->setEnabled(false);
-    actions[ACTION_PASTE2TITLE] = new KAction(i18n("Copy &into Page Title"), "editcopy", CTRL+Key_T, this,
+    actions[ACTION_PASTE2TITLE] = new KAction(i18n("Copy &into Page Title"), "editcopy", CTRL+Key_T, TQT_TQOBJECT(this),
             TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
     connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool)));
     actions[ACTION_PASTE2TITLE]->setEnabled(false);
-    actions[ACTION_PASTE]  = KStdAction::pasteText(me_text, TQT_SLOT(paste()), actionCollection());
+    actions[ACTION_PASTE]  = KStdAction::pasteText(TQT_TQOBJECT(me_text), TQT_SLOT(paste()), actionCollection());
 
-    actions[ACTION_FIND] = KStdAction::find( this, TQT_SLOT( slotSearch() ), actionCollection() );
-    actions[ACTION_FIND_NEXT] = KStdAction::findNext( this, TQT_SLOT( slotRepeatSearch() ), actionCollection() );
+    actions[ACTION_FIND] = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotSearch() ), actionCollection() );
+    actions[ACTION_FIND_NEXT] = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotRepeatSearch() ), actionCollection() );
     actions[ACTION_FIND_NEXT]->setEnabled(false);
-    actions[ACTION_REPLACE] = KStdAction::replace( this, TQT_SLOT( slotReplace() ), actionCollection() );
+    actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() );
 
-    actions[ACTION_RENAME] = new KAction(i18n("Rename..."), TQString::null, CTRL + Key_M, this,
+    actions[ACTION_RENAME] = new KAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this),
             TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry");
-    actions[ACTION_INSERT_DATE] = new KAction(i18n("Insert Date"), "date", CTRL + Key_I, this,
+    actions[ACTION_INSERT_DATE] = new KAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this),
             TQT_SLOT(insertDate()), actionCollection(), "insert_date");
 
-    KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection());
+    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
 
     bookmarkMenu = new KActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks");
     KJotsBookmarks* bookmarks = new KJotsBookmarks(this);
@@ -245,7 +245,7 @@ void KJotsMain::loadBooks()
 {
     TQDir dir(locateLocal("appdata",""));
     TQStringList files = dir.entryList(TQDir::Files|TQDir::Readable);
-    Q_UINT64 currentSelection = KJotsSettings::currentSelection();
+    TQ_UINT64 currentSelection = KJotsSettings::currentSelection();
 
     //TODO: Eventually we can make use of the ".book" extension here, but for 
     //right now (2005/06/04) there's just too much legacy data out there.
@@ -284,7 +284,7 @@ bool KJotsMain::createNewBook()
     bool ok;
 
     TQString name = KInputDialog::getText( i18n( "New Book" ),
-        i18n( "Book name:" ), TQString::null, &ok, this );
+        i18n( "Book name:" ), TQString(), &ok, this );
 
     if (!ok)
         return false;
@@ -316,7 +316,7 @@ void KJotsMain::deleteBook()
         return;
 
     TQString msg = i18n("<qt>Are you sure you want to delete the <strong>%1</strong> book?</qt>");
-    int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.arg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
+    int result = KMessageBox::warningContinueCancel(tqtopLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
 
     if (result!=KMessageBox::Continue)
         return;
@@ -358,15 +358,15 @@ void KJotsMain::deleteEntry()
     KJotsPage* cur = currentPage();
 
     if (!cur ||
-        KMessageBox::warningContinueCancel(topLevelWidget(),
+        KMessageBox::warningContinueCancel(tqtopLevelWidget(),
                                   i18n("<qt>Are you sure you want to delete the <strong>%1</strong> page?</qt>")
-                                  .arg(cur->subject()),
+                                  .tqarg(cur->subject()),
                                   i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue)
     {
         return;
     }
 
-    KJotsBook* bk = cur->parentBook();
+    KJotsBook* bk = cur->tqparentBook();
     KJotsPage* nxt = dynamic_cast<KJotsPage*>(cur->nextSibling());
 
     me_text->setEntry(0);
@@ -493,7 +493,7 @@ void KJotsMain::saveBookToFile(bool plainText)
         }
 
         if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
-            KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+            KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
         {
             tryAgain = false;
         }
@@ -534,7 +534,7 @@ void KJotsMain::savePageToFile(bool plainText)
         }
 
         if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
-            KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+            KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
         {
             tryAgain = false;
         }
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
 
 void KJotsMain::insertDate()
 {
-  me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
+  me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true) + " ");
 }
 
 void KJotsMain::updateMenu()
@@ -657,7 +657,7 @@ void KJotsMain::slotFindSuccessful()
 void KJotsMain::showListviewContextMenu(KListView*, TQListViewItem* i, const TQPoint& p)
 {
     if ( invalidMoveFlag ) return; //Prevent race condition
-    KActionMenu* am = new KActionMenu(this);
+    KActionMenu* am = new KActionMenu(TQT_TQOBJECT(this));
 
     if (!i)
     {
@@ -701,7 +701,7 @@ void KJotsMain::linkClicked(const TQString& link)
         return;
     }
 
-    Q_UINT64 target = link.toULongLong();
+    TQ_UINT64 target = link.toULongLong();
     TQListViewItemIterator it( subjectList );
     while ( it.current() ) {
         KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(it.current());
@@ -769,7 +769,7 @@ TQString KJotsMain::currentBookmarkTitle()
     while ( item )
     {
         KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item);
-        item = item->parent();
+        item = item->tqparent();
 
         if ( item )
         {
@@ -804,7 +804,7 @@ TQString KJotsMain::currentBookmarkURL()
 */
 void KJotsMain::jumpToBookmark(const TQString& bookmark)
 {
-    Q_UINT64 id = bookmark.toULongLong();
+    TQ_UINT64 id = bookmark.toULongLong();
 
     if ( id )
     {
@@ -825,9 +825,9 @@ void KJotsMain::jumpToBookmark(const TQString& bookmark)
         //in the future. CREATION DATE: 2005/06/10
 
         KMessageBox::information(this, 
-            i18n("This bookmark is from an older version of KJots and is not fully supported. It may or may not work. You should delete and recreate this bookmark."), TQString::null, "oldBookmarkWarning"); 
+            i18n("This bookmark is from an older version of KJots and is not fully supported. It may or may not work. You should delete and recreate this bookmark."), TQString(), "oldBookmarkWarning"); 
 
-        int slash = bookmark.findRev('/');
+        int slash = bookmark.tqfindRev('/');
 
         if (slash != -1)
         {
@@ -865,7 +865,7 @@ void KJotsMain::jumpToBookmark(const TQString& bookmark)
                     {
                         if ( ++pageCount == pageNo )
                         {
-                            static_cast<TQListViewItem*>(entry)->parent()->setOpen(true);
+                            static_cast<TQListViewItem*>(entry)->tqparent()->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 parent book.
+    //Don't get caught by tqparent book.
     TQListViewItem *startingPoint = subjectList->currentItem();
     if ( !startingPoint ) return; //sanity check
 
     if ( dynamic_cast<KJotsPage*>(startingPoint) )
-        startingPoint = startingPoint->parent();
+        startingPoint = startingPoint->tqparent();
 
     TQListViewItemIterator it ( startingPoint );
     do {
@@ -1043,7 +1043,7 @@ void KJotsMain::updateCaption()
     while ( item )
     {
         KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item);
-        item = item->parent();
+        item = item->tqparent();
 
         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->parent() != entry->parentBook() )
+    if ( afterFirst && afterFirst->tqparent() != entry->tqparentBook() )
     {
         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->parentBook() ) 
+            if ( it.current() == entry->tqparentBook() ) 
             {
                 break;
             }
 
             //Found a previous sibling!
-            if ( it.current()->parent() == entry->parentBook() )
+            if ( it.current()->tqparent() == entry->tqparentBook() )
             {
                 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->parent() )
+    if ( entry->isPage() && !item->tqparent() )
     {
         invalidMoveFlag=true; //Don't do anything while we're stuck here.
         subjectList->setItemsMovable(false);
@@ -1119,14 +1119,14 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
                                        i18n("All pages must be inside a book. "
                                             "Would you like to create a new book to put the page in, "
                                             "or would you prefer to not move the page at all?"),
-                                       TQString::null,
+                                       TQString(),
                                        i18n("Create New Book"), i18n("Do Not Move Page")) ==
             KMessageBox::No ||
             !createNewBook())
         {
             //We have to move item back.
             subjectList->takeItem(item);
-            entry->parentBook()->insertItem(item);
+            entry->tqparentBook()->insertItem(item);
             entry->moveItem(afterFirst);
         } else {
             subjectList->takeItem(item);
@@ -1149,11 +1149,11 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst,
 
     if ( entryAfter )
     {
-        //Set the old parent book to dirty, since it just lost a page.
+        //Set the old tqparent book to dirty, since it just lost a page.
         if ( entryAfter->isBook() )
             entryAfter->setDirty(true);
         else
-            entryAfter->parentBook()->setDirty(true);
+            entryAfter->tqparentBook()->setDirty(true);
     }
 
     return;
@@ -1173,7 +1173,7 @@ KJotsBook* KJotsMain::currentBook()
         {
             return dynamic_cast<KJotsBook*>(e);
         }
-        e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::parent());
+        e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::tqparent());
     }
 
     return 0;
diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h
index eaa801b..61c830b 100644
--- a/kjots/KJotsMain.h
+++ b/kjots/KJotsMain.h
@@ -67,7 +67,7 @@ class KJotsEdit;
 #define ACTION_DELETE_BOOK 11
 #define ACTION_MANUAL_SAVE 12
 #define ACTION_PRINT 13
-#define ACTION_QUIT 14
+#define ACTION_TQUIT 14
 #define ACTION_CUT 15
 #define ACTION_COPY 16
 #define ACTION_PASTE2TITLE 17
@@ -82,6 +82,7 @@ class KJotsEdit;
 class KJotsMain : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
         KJotsMain( const char* name = 0 );
diff --git a/kjots/confpagefont.ui b/kjots/confpagefont.ui
index e89e5b5..85ff558 100644
--- a/kjots/confpagefont.ui
+++ b/kjots/confpagefont.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>confPageFont</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>confPageFont</cstring>
     </property>
@@ -31,7 +31,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontdialog.h</includehint>
 </includehints>
diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui
index ef66e21..390bfb3 100644
--- a/kjots/confpagemisc.ui
+++ b/kjots/confpagemisc.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>confPageMisc</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>confPageMisc</cstring>
     </property>
@@ -42,7 +42,7 @@
                 <string>This is the number of minutes KJots will wait before automatically saving changes.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="1">
+        <widget class="TQLabel" row="1" column="1">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -83,7 +83,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -100,14 +100,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>kcfg_AutoSave</cstring>
             </property>
@@ -121,7 +121,7 @@
                 <string>When "Enable autosave" is checked, KJots will automatically save changes made to books at the interval defined below.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>kcfg_Unicode</cstring>
             </property>
@@ -145,7 +145,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kjots/kjotsbookmarks.cpp b/kjots/kjotsbookmarks.cpp
index 21ce6e8..7259713 100644
--- a/kjots/kjotsbookmarks.cpp
+++ b/kjots/kjotsbookmarks.cpp
@@ -23,9 +23,9 @@
 #include "KJotsMain.h"
 #include "kjotsbookmarks.h"
 
-KJotsBookmarks::KJotsBookmarks(KJotsMain* parent, const char* name)
-    : TQObject(parent, name),
-      m_kjots(parent)
+KJotsBookmarks::KJotsBookmarks(KJotsMain* tqparent, const char* name)
+    : TQObject(tqparent, name),
+      m_kjots(tqparent)
 {
 }
 
diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h
index 9fa533d..831b4e5 100644
--- a/kjots/kjotsbookmarks.h
+++ b/kjots/kjotsbookmarks.h
@@ -30,9 +30,10 @@ class KJotsMain;
 class KJotsBookmarks : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        KJotsBookmarks(KJotsMain* parent = 0, const char* name = 0);
+        KJotsBookmarks(KJotsMain* tqparent = 0, const char* name = 0);
         ~KJotsBookmarks();
 
         virtual void openBookmarkURL(const TQString& url);
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index 2e4c09d..6fdba79 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -36,12 +36,12 @@
 //----------------------------------------------------------------------
 // MYMULTIEDIT
 //----------------------------------------------------------------------
-KJotsEdit::KJotsEdit (TQWidget* parent, const char* name)
-    : KEdit(parent, name),
+KJotsEdit::KJotsEdit (TQWidget* tqparent, const char* name)
+    : KEdit(tqparent, name),
     m_entry(0)
 {
     // no rich text until printing and other such issues are worked out
-    setTextFormat(Qt::PlainText);
+    setTextFormat(TQt::PlainText);
     setWordWrap(TQTextEdit::WidgetWidth);
     setLinkUnderline(true);
     web_menu = new KPopupMenu(this);;
@@ -55,7 +55,7 @@ KJotsEdit::~KJotsEdit()
 
 void KJotsEdit::mousePressEvent( TQMouseEvent *e )
 {
-    if(e->button() == RightButton &&
+    if(e->button() == Qt::RightButton &&
             hasSelectedText())
     {
         KURL url(selectedText());
@@ -135,7 +135,7 @@ void KJotsEdit::setEntry (KJotsPage *entry)
         m_entry = entry;
         setText(entry->body());
         removeSelection();
-        repaint();
+        tqrepaint();
         setEnabled(true);
         setFocus();
         entry->setEditor(this);
diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h
index d214ce3..d54a627 100644
--- a/kjots/kjotsedit.h
+++ b/kjots/kjotsedit.h
@@ -30,11 +30,12 @@ class KJotsPage;
 class KJotsEdit : public KEdit
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        KJotsEdit (TQWidget* parent=0, const char* name=0);
+        KJotsEdit (TQWidget* tqparent=0, const char* name=0);
         ~KJotsEdit ();
 
-        void print(TQString title = TQString::null);
+        void print(TQString title = TQString());
         void setEntry(KJotsPage*);
 
     signals:
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index dab39c8..d15bf5c 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -46,9 +46,9 @@
 // helper functions for HTML output
 TQString prepForHTML(TQString text)
 {
-    text.replace("<", "&lt;");
-    text.replace(">", "&gt;");
-    text.replace("\n", "<br>");
+    text.tqreplace("<", "&lt;");
+    text.tqreplace(">", "&gt;");
+    text.tqreplace("\n", "<br>");
     return text;
 }
 
@@ -69,20 +69,20 @@ TQString htmlFooter()
 // KJotsEntryBase
 //
 
-KJotsEntryBase::KJotsEntryBase(KListView* parent, TQListViewItem* after=0)
-    :KListViewItem(parent,after)
+KJotsEntryBase::KJotsEntryBase(KListView* tqparent, TQListViewItem* after=0)
+    :KListViewItem(tqparent,after)
 {
     m_id = 0;
     m_saveInProgress = m_dirty = false;
     m_parent = 0;
 }
 
-KJotsEntryBase::KJotsEntryBase(KListViewItem* parent, TQListViewItem* after=0)
-    :KListViewItem(parent,after)
+KJotsEntryBase::KJotsEntryBase(KListViewItem* tqparent, TQListViewItem* after=0)
+    :KListViewItem(tqparent,after)
 {
     m_id = 0;
     m_saveInProgress = m_dirty = false;
-    m_parent = dynamic_cast<KJotsBook*>(parent);
+    m_parent = dynamic_cast<KJotsBook*>(tqparent);
 }
 
 void KJotsEntryBase::setSubject(const TQString& subj)
@@ -99,13 +99,13 @@ void KJotsEntryBase::setText(int column, const TQString& text)
 }
 
 /*!
-    \brief Sets a new parent.
+    \brief Sets a new tqparent.
     This is mostly just used during drag-and-drop reordering in the list view.
-    We need to keep track of the previous parent in case the move is invalid.
+    We need to keep track of the previous tqparent in case the move is invalid.
 */
 void KJotsEntryBase::resetParent() 
 { 
-    m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::parent()); 
+    m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::tqparent()); 
 }
 
 /*! 
@@ -117,12 +117,12 @@ void KJotsEntryBase::resetParent()
 *    with preexisting IDs. Seeing as how we are using an unsigned long long, I am
 *    comfortable with the amount of time we have to worry about this. 
 */
-void KJotsEntryBase::setId(Q_UINT64 id)
+void KJotsEntryBase::setId(TQ_UINT64 id)
 {
     //Find an unused id...
     if ( id == 0 )
     {
-        Q_UINT64 lastId = KJotsSettings::lastId();
+        TQ_UINT64 lastId = KJotsSettings::lastId();
 
         //TODO: In theory, we could wrap. The universe may end beforehand tho.
         id = ++lastId; 
@@ -139,17 +139,17 @@ void KJotsEntryBase::setId(Q_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 &parent )
+void KJotsEntryBase::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
 {
     TQDomElement title = doc.createElement( "Title" );
     title.appendChild( doc.createTextNode( subject() ));
-    parent.appendChild( title );
+    tqparent.appendChild( title );
 
     TQDomElement id = doc.createElement( "ID" );
     TQString id_string;
     id_string.setNum(m_id);
     id.appendChild( doc.createTextNode(id_string) );
-    parent.appendChild( id );
+    tqparent.appendChild( id );
 
     setDirty( false );
     return;
@@ -217,14 +217,14 @@ int KJotsEntryBase::printTitleBox(TQString title, KPrinter& printer, TQPainter&
 // KJotsBook
 //
 
-KJotsBook::KJotsBook(KListView* parent, TQListViewItem* after)
-    : KJotsEntryBase(parent, after)
+KJotsBook::KJotsBook(KListView* tqparent, TQListViewItem* after)
+    : KJotsEntryBase(tqparent, after)
 {
     init();
 }
 
-KJotsBook::KJotsBook(KListViewItem* parent, TQListViewItem* after)
-    : KJotsEntryBase(parent, after)
+KJotsBook::KJotsBook(KListViewItem* tqparent, TQListViewItem* after)
+    : KJotsEntryBase(tqparent, after)
 {
     init();
 }
@@ -264,7 +264,7 @@ bool KJotsBook::isBookFile(const TQString& filename)
     {
         if ( folder.open(IO_ReadWrite) )
         {
-            TQTextStream st(static_cast<TQIODevice*>(&folder));
+            TQTextStream st(TQT_TQIODEVICE(&folder));
             st.setEncoding( KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
             TQString buf = st.readLine().stripWhiteSpace();
 
@@ -306,7 +306,7 @@ bool KJotsBook::openBook(const TQString& filename)
     
             if ( file.exists() && file.open(IO_ReadWrite) ) //TODO: Implement read-only mode?
             {
-                TQTextStream st(static_cast<TQIODevice*>(&file));
+                TQTextStream st(TQT_TQIODEVICE(&file));
                 st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
                 TQString data = st.read();
 
@@ -354,7 +354,7 @@ bool KJotsBook::openBook(const TQString& filename)
             if ( !m_fileName.isEmpty() && !m_fileName.endsWith(".book") )
             {
                 //some old books have incorrect names. So we save a new copy, then kill the old file
-                m_fileName = TQString::null; //trick ourselves into thinking we're a new book
+                m_fileName = TQString(); //trick ourselves into thinking we're a new book
                 saveBook();
                 file.remove();
             }
@@ -388,7 +388,7 @@ bool KJotsBook::openBook(const TQString& filename)
 */
 bool KJotsBook::loadOldBook(TQFile &file)
 {
-    TQTextStream st(static_cast<TQIODevice*>(&file));
+    TQTextStream st(TQT_TQIODEVICE(&file));
     st.setEncoding(  KJotsSettings::unicode() ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale );
     TQString buf = st.readLine();
 
@@ -412,7 +412,7 @@ bool KJotsBook::loadOldBook(TQFile &file)
                 entry->setBody(body);
             }
 
-            body = TQString::null;
+            body = TQString();
             TQString title = buf.mid(10, buf.length());
 
             // now catch the page id
@@ -428,7 +428,7 @@ bool KJotsBook::loadOldBook(TQFile &file)
 
         int pos = 0;
 
-        while ((pos = buf.find('\\',pos)) != -1)
+        while ((pos = buf.tqfind('\\',pos)) != -1)
             if (buf[++pos] == '\\')
                 buf.remove(pos, 1 );
 
@@ -488,7 +488,7 @@ void KJotsBook::saveBook(void)
 void KJotsBook::deleteBook()
 {
     TQFile::remove(m_fileName);
-    m_fileName = TQString::null;
+    m_fileName = TQString();
 }
 
 void KJotsBook::rename()
@@ -532,9 +532,9 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
     //revisions will likely use it. I don't want to make the translators add, remove,
     //and re-add translations, so I'm just keeping this here for now. 
     m_saveProgressDialog = new KProgressDialog(listView(), "bookSaveInProgress",
-                                               i18n("Saving %1").arg(subject()),
+                                               i18n("Saving %1").tqarg(subject()),
                                                i18n("Saving the contents of %1 to %2")
-                                                    .arg(subject(), url.prettyURL()),
+                                                    .tqarg(subject(), url.prettyURL()),
                                                true);
 
     m_saveProgressDialog->progressBar()->setTotalSteps(1);
@@ -613,7 +613,7 @@ void KJotsBook::print(TQFont& defaultFont)
     printer.setFullPage(false);
     printer.setCreator("KJots");
 
-    if (!printer.setup(listView(), i18n("Print: %1").arg(subject())))
+    if (!printer.setup(listView(), i18n("Print: %1").tqarg(subject())))
     {
         return;
     }
@@ -657,7 +657,7 @@ bool KJotsBook::isDirty()
     //Am I dirty?
     if ( KJotsEntryBase::isDirty() ) return true;
 
-    //Check all children to see if any of them are dirty
+    //Check all tqchildren to see if any of them are dirty
     KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild());
     while ( entry )
     {
@@ -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 &parent )
+void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
 {
     TQDomElement book = doc.createElement( "KJotsBook" );
-    parent.appendChild( book );
+    tqparent.appendChild( book );
 
     KJotsEntryBase::generateXml(doc, book); //let the base class save important stuff
 
@@ -690,9 +690,9 @@ void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &parent )
         entry = dynamic_cast<KJotsEntryBase*>(entry->nextSibling());
     }
 
-    if ( !m_fileName.isEmpty() && TQListViewItem::parent() )
+    if ( !m_fileName.isEmpty() && TQListViewItem::tqparent() )
     {
-        //Hmmmm... We were originally loaded from a file, but now we have a parent, so
+        //Hmmmm... We were originally loaded from a file, but now we have a tqparent, so
         //we must have been moved into another tree. Remove the old file now that we
         //have saved ourselves into the new tree.
         deleteBook();
@@ -763,7 +763,7 @@ TQString KJotsBook::getToc()
     KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild());
     while ( entry ) {
         TQString htmlSubject = prepForHTML(entry->subject());
-        toc += TQString("<li><a href=\"#%1\">").arg(entry->id()) + htmlSubject + "</a></li>";
+        toc += TQString("<li><a href=\"#%1\">").tqarg(entry->id()) + htmlSubject + "</a></li>";
 
         KJotsBook *book = dynamic_cast<KJotsBook*>(entry);
         if ( book ) toc += book->getToc();
@@ -787,13 +787,13 @@ TQString KJotsBook::generateHtml( KJotsEntryBase* top, bool diskMode )
 
     if ( top == this )
     {
-        toc = TQString("<h1><a name=\"%1\">%2</a></h1>").arg(id()).arg(htmlTitle);
+        toc = TQString("<h1><a name=\"%1\">%2</a></h1>").tqarg(id()).tqarg(htmlTitle);
     } else {
         if ( diskMode )
         {
-            toc = TQString("<h2><a name=\"%1\">%2</a></h2>").arg(id()).arg(htmlTitle);
+            toc = TQString("<h2><a name=\"%1\">%2</a></h2>").tqarg(id()).tqarg(htmlTitle);
         } else {
-            toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").arg(id()).arg(id()).arg(htmlTitle);
+            toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").tqarg(id()).tqarg(id()).tqarg(htmlTitle);
         }
     }
 
@@ -843,8 +843,8 @@ TQString KJotsBook::generateText( void )
 // KJotsPage
 //
 
-KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
-    : KJotsEntryBase(parent,after),
+KJotsPage::KJotsPage(KJotsBook* tqparent, TQListViewItem *after)
+    : KJotsEntryBase(tqparent,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::parent());
+    KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::tqparent());
 
     TQString docName = book->subject();
     if (!subject().isNull())
@@ -995,7 +995,7 @@ void KJotsPage::print(TQFont& defaultFont)
     printer.setFullPage(false);
     printer.setCreator("KJots");
 
-    if (printer.setup(listView(), i18n("Print: %1").arg(docName)))
+    if (printer.setup(listView(), i18n("Print: %1").tqarg(docName)))
     {
         TQPainter painter( &printer );
         painter.setFont(defaultFont);
@@ -1052,10 +1052,10 @@ TQString KJotsPage::defaultSubject()
 {
     int page = 0;
 
-    if ( parentBook() )
+    if ( tqparentBook() )
     {
         //We can't use childCount() here because it will count books, too.
-        KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(parentBook()->firstChild());
+        KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(tqparentBook()->firstChild());
         while ( entry )
         {
             if ( entry->isPage() ) ++page;
@@ -1066,7 +1066,7 @@ TQString KJotsPage::defaultSubject()
         page = 1;
     }
 
-    return i18n("Page %1").arg(page);
+    return i18n("Page %1").tqarg(page);
 }
 
 /*!
@@ -1116,17 +1116,17 @@ 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 &parent )
+*/void KJotsPage::generateXml( TQDomDocument &doc, TQDomElement &tqparent )
 {
     TQDomElement page = doc.createElement( "KJotsPage" );
-    parent.appendChild( page );
+    tqparent.appendChild( page );
 
     KJotsEntryBase::generateXml(doc, page); //let the base class save important stuff
 
     TQDomElement text = doc.createElement( "Text" );
     TQString saveText = body();
-    if ( saveText.contains("]]>") ) {
-        saveText.replace("]]>","]]&gt;");
+    if ( saveText.tqcontains("]]>") ) {
+        saveText.tqreplace("]]>","]]&gt;");
         text.setAttribute("fixed", "1");
     }
     text.appendChild( doc.createCDATASection( saveText ));
@@ -1153,7 +1153,7 @@ void KJotsPage::parseXml( TQDomElement &me )
                     TQString bodyText = e.text();
                     if ( e.hasAttribute("fixed") ) 
                     {
-                        bodyText.replace("]]&gt;", "]]>");
+                        bodyText.tqreplace("]]&gt;", "]]>");
                     }
                     setBody(bodyText);
                 } 
@@ -1181,23 +1181,23 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode )
     TQString htmlSubject = prepForHTML(subject());
 
     if ( top == this || diskMode ) {
-        html += TQString("<h3><a name=\"%1\">%2</a></h3>").arg(id()).arg(htmlSubject);
+        html += TQString("<h3><a name=\"%1\">%2</a></h3>").tqarg(id()).tqarg(htmlSubject);
     } else {
-        html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").arg(id()).arg(id()).arg(htmlSubject);
+        html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").tqarg(id()).tqarg(id()).tqarg(htmlSubject);
     }
     html += prepForHTML(body());
 
     html += "<br><table border=1><tr>";
-    html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(id()).arg(subject());
+    html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(id()).tqarg(subject());
 
     if ( top != this ) 
     {
-        KJotsBook *parent = parentBook();
-        while ( parent )
+        KJotsBook *tqparent = tqparentBook();
+        while ( tqparent )
         {
-            html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(parent->id()).arg(parent->subject());
-            if ( parent == top ) break;
-            parent = parent->parentBook();
+            html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject());
+            if ( tqparent == top ) break;
+            tqparent = tqparent->tqparentBook();
         }
     }
     html += TQString("</tr></table>");
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index c953ec7..2967eb3 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -49,6 +49,7 @@ namespace KIO
 class KJotsEntryBase : public TQObject, public KListViewItem
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         KJotsEntryBase(KListView*, TQListViewItem*);
         KJotsEntryBase(KListViewItem*, TQListViewItem*);
@@ -70,10 +71,10 @@ class KJotsEntryBase : public TQObject, public KListViewItem
         void setDirty(bool d) { m_dirty = d; } //!< Toggles the dirty flag.
         virtual bool isDirty() { return m_dirty; }; //!< Accessor for dirty flag.
 
-        Q_UINT64 id() { return m_id; }
-        void setId(Q_UINT64);
+        TQ_UINT64 id() { return m_id; }
+        void setId(TQ_UINT64);
 
-        KJotsBook *parentBook() { return m_parent; }
+        KJotsBook *tqparentBook() { return m_parent; }
         void resetParent();
 
         bool isBook() const { return m_isBook; }
@@ -86,7 +87,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem
         bool m_isBook; //!< used for speed and code clarity.
 
     private:
-        Q_UINT64 m_id; //!< unique ID for this entry
+        TQ_UINT64 m_id; //!< unique ID for this entry
         bool m_dirty; //!< Set when this entry has been changed.
         KJotsBook *m_parent; //!< used during drag-n-drop moving
 };
@@ -98,6 +99,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem
 class KJotsBook : public KJotsEntryBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         KJotsBook(KListView*, TQListViewItem* after = 0);
         KJotsBook(KListViewItem*, TQListViewItem* after = 0);
@@ -141,8 +143,9 @@ class KJotsBook : public KJotsEntryBase
 class KJotsPage : public KJotsEntryBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-        KJotsPage(KJotsBook* parent, TQListViewItem* after = 0);
+        KJotsPage(KJotsBook* tqparent, TQListViewItem* after = 0);
         ~KJotsPage();
 
     public: