diff --git a/src/knowit.cpp b/src/knowit.cpp
index b970b7f..57665ce 100644
--- a/src/knowit.cpp
+++ b/src/knowit.cpp
@@ -69,7 +69,7 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
    Edit = new KnowitEdit(EditLayout, "Edit");
    Links = new KnowitLinks(EditLayout);
 
-   connect(&FindDlg, TQT_SIGNAL(search()), this, TQT_SLOT(slotEditFind()));
+   connect(&FindDlg, TQ_SIGNAL(search()), this, TQ_SLOT(slotEditFind()));
    lastSought = 0;
 
    /* main view */
@@ -77,183 +77,183 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
    setCentralWidget(Layout);
 
    TQWhatsThis::add(Layout, i18n("Move it to change tree/edit layout."));
-   connect(Items, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-     this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
-   connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
-     TQT_SLOT(slotItemChanged(TQListViewItem*)));
-   connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
-     TQT_SLOT(slotItemChanged(TQListViewItem*)));
+   connect(Items, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+     this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+   connect(Items, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+     TQ_SLOT(slotItemChanged(TQListViewItem*)));
+   connect(Items, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+     TQ_SLOT(slotItemChanged(TQListViewItem*)));
 
    /* Edit (TQTextEdit) */
    Edit->setMinimumSize(200, 150);
    Edit->setTextFormat(TQt::RichText);
    TQWhatsThis::add(Edit, i18n("<h2>Note text</h2>Add text for selected note here.\n"
       "Text can be formatted, for example <b>bold</b> or <i>italic</i>."));
-   connect(Edit, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotEditChanged()));
-   connect(Edit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotEditChanged()));
-   connect(Edit, TQT_SIGNAL(cursorPositionChanged(int, int)), this,
-     TQT_SLOT(slotEditCursorChanged(int, int)));
-   connect(Edit, TQT_SIGNAL(textDropped(const TQString&, int)),
-      this, TQT_SLOT(slotLinkDropped(const TQString&, int)));
+   connect(Edit, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotEditChanged()));
+   connect(Edit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotEditChanged()));
+   connect(Edit, TQ_SIGNAL(cursorPositionChanged(int, int)), this,
+     TQ_SLOT(slotEditCursorChanged(int, int)));
+   connect(Edit, TQ_SIGNAL(textDropped(const TQString&, int)),
+      this, TQ_SLOT(slotLinkDropped(const TQString&, int)));
    
    /* Links (TDEListBox) */
-   connect(Links, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
-      this, TQT_SLOT(slotShowAttachment(TQListBoxItem*)));
-   connect(Links, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
-      this, TQT_SLOT(slotContextLinksMenu(TQListBoxItem*, const TQPoint&)));
-   connect(Links, TQT_SIGNAL(textDropped(const TQString&, int)),
-      this, TQT_SLOT(slotLinkDropped(const TQString&, int)));
-   connect(Links, TQT_SIGNAL(linkRemove()), this, TQT_SLOT(slotLinkRemove()));
-   connect(Links, TQT_SIGNAL(linkOpen()), this, TQT_SLOT(slotLinkOpen()));
-   connect(Links, TQT_SIGNAL(linkOpenWith()), this, TQT_SLOT(slotLinkOpenWith()));
+   connect(Links, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+      this, TQ_SLOT(slotShowAttachment(TQListBoxItem*)));
+   connect(Links, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
+      this, TQ_SLOT(slotContextLinksMenu(TQListBoxItem*, const TQPoint&)));
+   connect(Links, TQ_SIGNAL(textDropped(const TQString&, int)),
+      this, TQ_SLOT(slotLinkDropped(const TQString&, int)));
+   connect(Links, TQ_SIGNAL(linkRemove()), this, TQ_SLOT(slotLinkRemove()));
+   connect(Links, TQ_SIGNAL(linkOpen()), this, TQ_SLOT(slotLinkOpen()));
+   connect(Links, TQ_SIGNAL(linkOpenWith()), this, TQ_SLOT(slotLinkOpenWith()));
 
    /* Actions: File */
-   KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
-   KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
-   actionRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileRecent(const KURL&)), actionCollection());
-   KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
-   KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+   KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection());
+   KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection());
+   actionRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileRecent(const KURL&)), actionCollection());
+   KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection());
+   KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection());
    new TDEAction(i18n("&Export to HTML..."), "", "", this,
-      TQT_SLOT(slotFileExport()), actionCollection(), "file_export_html");
-   KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+      TQ_SLOT(slotFileExport()), actionCollection(), "file_export_html");
+   KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection());
    new TDEAction(i18n("Document &information..."), "", "", this,
-      TQT_SLOT(slotFileInfo()), actionCollection(), "file_info");
-   KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+      TQ_SLOT(slotFileInfo()), actionCollection(), "file_info");
+   KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection());
 
    /* Actions: Edit */
-   actionCut = KStdAction::cut(Edit, TQT_SLOT(cut()), actionCollection());
-   actionCopy = KStdAction::copy(Edit, TQT_SLOT(copy()), actionCollection());
-   KStdAction::paste(Edit, TQT_SLOT(paste()), actionCollection());
-   actionUndo = KStdAction::undo(Edit, TQT_SLOT(undo()), actionCollection());
-   actionRedo = KStdAction::redo(Edit, TQT_SLOT(redo()), actionCollection());
+   actionCut = KStdAction::cut(Edit, TQ_SLOT(cut()), actionCollection());
+   actionCopy = KStdAction::copy(Edit, TQ_SLOT(copy()), actionCollection());
+   KStdAction::paste(Edit, TQ_SLOT(paste()), actionCollection());
+   actionUndo = KStdAction::undo(Edit, TQ_SLOT(undo()), actionCollection());
+   actionRedo = KStdAction::redo(Edit, TQ_SLOT(redo()), actionCollection());
    actionBold = new TDEToggleAction(i18n("Toggle &bold"), "format-text-bold",
-      "Ctrl+B", this, TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold");
+      "Ctrl+B", this, TQ_SLOT(slotEditBold()), actionCollection(), "edit_bold");
    actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "format-text-italic",
-      "Ctrl+I", this, TQT_SLOT(slotEditItalic()), actionCollection(),
+      "Ctrl+I", this, TQ_SLOT(slotEditItalic()), actionCollection(),
       "edit_italic");
    actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "format-text-underline",
-      "Ctrl+U", this, TQT_SLOT(slotEditUnderline()), actionCollection(),
+      "Ctrl+U", this, TQ_SLOT(slotEditUnderline()), actionCollection(),
       "edit_underline");
    new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", this,
-      TQT_SLOT(slotEditColor()), actionCollection(), "edit_color");
+      TQ_SLOT(slotEditColor()), actionCollection(), "edit_color");
    new TDEAction(i18n("&Superscript"), "text_super", "", this,
-      TQT_SLOT(slotEditSuperscript()), actionCollection(), "edit_superscript");
+      TQ_SLOT(slotEditSuperscript()), actionCollection(), "edit_superscript");
    new TDEAction(i18n("&Subscript"), "text_sub", "", this,
-      TQT_SLOT(slotEditSubscript()), actionCollection(), "edit_subscript");
+      TQ_SLOT(slotEditSubscript()), actionCollection(), "edit_subscript");
    new TDEAction(i18n("&Normal text"), "", "", this,
-      TQT_SLOT(slotEditNormal()), actionCollection(), "edit_align_normal");
+      TQ_SLOT(slotEditNormal()), actionCollection(), "edit_align_normal");
    new TDEAction(i18n("&Bullet list"), "", "", this,
-      TQT_SLOT(slotEditListBullet()), actionCollection(), "list_bullet");
+      TQ_SLOT(slotEditListBullet()), actionCollection(), "list_bullet");
    new TDEAction(i18n("&Numbered list"), "", "", this,
-      TQT_SLOT(slotEditListNumber()), actionCollection(), "list_number");
+      TQ_SLOT(slotEditListNumber()), actionCollection(), "list_number");
    new TDEAction(i18n("&Uppercase list"), "", "", this,
-      TQT_SLOT(slotEditListUpper()), actionCollection(), "list_upper");
+      TQ_SLOT(slotEditListUpper()), actionCollection(), "list_upper");
    new TDEAction(i18n("&Lowercase list"), "", "", this,
-      TQT_SLOT(slotEditListLower()), actionCollection(), "list_lower");
+      TQ_SLOT(slotEditListLower()), actionCollection(), "list_lower");
    new TDEAction(i18n("N&o list"), "", "", this,
-      TQT_SLOT(slotEditListNone()), actionCollection(), "list_none");
-   KStdAction::find(&FindDlg, TQT_SLOT(exec()), actionCollection());
-   KStdAction::findNext(this, TQT_SLOT(slotEditFindNext()), actionCollection());
+      TQ_SLOT(slotEditListNone()), actionCollection(), "list_none");
+   KStdAction::find(&FindDlg, TQ_SLOT(exec()), actionCollection());
+   KStdAction::findNext(this, TQ_SLOT(slotEditFindNext()), actionCollection());
    new TDEAction(i18n("&Go to &note..."), "goto", "Ctrl+G", this,
-      TQT_SLOT(slotEditGoTo()), actionCollection(), "goto_note");
+      TQ_SLOT(slotEditGoTo()), actionCollection(), "goto_note");
    actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "format-text-direction-ltr", "Ctrl+L", this,
-      TQT_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left");
+      TQ_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left");
    actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "format-text-direction-rtl", "Ctrl+R",
-      this, TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right");
+      this, TQ_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right");
    actionEditAlignJustify = new TDEToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
-      this, TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify");
+      this, TQ_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify");
    actionEditAlignCenter = new TDEToggleAction(i18n("&Center"), "text_center", "Ctrl+E", this,
-      TQT_SLOT(slotEditAlignCenter()), actionCollection(), "edit_align_center");
+      TQ_SLOT(slotEditAlignCenter()), actionCollection(), "edit_align_center");
    new TDEAction(i18n("Insert &date"), "date", "F5", this,
-      TQT_SLOT(slotEditInsertDate()), actionCollection(), "edit_insert_date");
+      TQ_SLOT(slotEditInsertDate()), actionCollection(), "edit_insert_date");
    new TDEAction(i18n("Insert &file..."), "", "", this,
-      TQT_SLOT(slotEditInsertFile()), actionCollection(), "edit_insert_file");
+      TQ_SLOT(slotEditInsertFile()), actionCollection(), "edit_insert_file");
    actionRawTextMode = new TDEToggleAction(i18n("&Raw Text Mode"),
-       "text-x-src", "F10", this, TQT_SLOT(slotRawTextMode()),
+       "text-x-src", "F10", this, TQ_SLOT(slotRawTextMode()),
        actionCollection(), "edit_raw_text");
 
    /* Actions: edit setup */
    actionCut->setEnabled(false);
    actionCopy->setEnabled(false);
-   connect(Edit, TQT_SIGNAL(copyAvailable(bool)), actionCut, TQT_SLOT(setEnabled(bool)));
-   connect(Edit, TQT_SIGNAL(copyAvailable(bool)), actionCopy, TQT_SLOT(setEnabled(bool)));
-   connect(Edit, TQT_SIGNAL(undoAvailable(bool)), actionUndo, TQT_SLOT(setEnabled(bool)));
-   connect(Edit, TQT_SIGNAL(redoAvailable(bool)), actionRedo, TQT_SLOT(setEnabled(bool)));
+   connect(Edit, TQ_SIGNAL(copyAvailable(bool)), actionCut, TQ_SLOT(setEnabled(bool)));
+   connect(Edit, TQ_SIGNAL(copyAvailable(bool)), actionCopy, TQ_SLOT(setEnabled(bool)));
+   connect(Edit, TQ_SIGNAL(undoAvailable(bool)), actionUndo, TQ_SLOT(setEnabled(bool)));
+   connect(Edit, TQ_SIGNAL(redoAvailable(bool)), actionRedo, TQ_SLOT(setEnabled(bool)));
 
    /* Actions: notes */
-   new TDEAction(i18n("&Add"), "", "Alt+Insert", this, TQT_SLOT(slotNoteAdd()),
+   new TDEAction(i18n("&Add"), "", "Alt+Insert", this, TQ_SLOT(slotNoteAdd()),
       actionCollection(), "note_add");
    new TDEAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", this,
-      TQT_SLOT(slotNoteAddChild()), actionCollection(), "note_add_child");
+      TQ_SLOT(slotNoteAddChild()), actionCollection(), "note_add_child");
    new TDEAction(i18n("&Delete"), "", "Alt+Delete", this,
-      TQT_SLOT(slotNoteRemove()), actionCollection(), "note_delete");
+      TQ_SLOT(slotNoteRemove()), actionCollection(), "note_delete");
    new TDEAction(i18n("&Rename"), "", "F2", this,
-      TQT_SLOT(slotNoteRename()), actionCollection(), "note_rename");
+      TQ_SLOT(slotNoteRename()), actionCollection(), "note_rename");
    new TDEAction(i18n("E&xpand all"), "", "", Items,
-      TQT_SLOT(slotExpandAll()), actionCollection(), "note_expand_all");
+      TQ_SLOT(slotExpandAll()), actionCollection(), "note_expand_all");
    new TDEAction(i18n("&Expand current"), "", "Alt++", Items,
-      TQT_SLOT(slotExpand()), actionCollection(), "note_expand");
+      TQ_SLOT(slotExpand()), actionCollection(), "note_expand");
    new TDEAction(i18n("Co&llapse all"), "", "", Items,
-      TQT_SLOT(slotCollapseAll()), actionCollection(), "note_collapse_all");
+      TQ_SLOT(slotCollapseAll()), actionCollection(), "note_collapse_all");
    new TDEAction(i18n("&Collapse current"), "", "Alt+-", Items,
-      TQT_SLOT(slotCollapse()), actionCollection(), "note_collapse");
+      TQ_SLOT(slotCollapse()), actionCollection(), "note_collapse");
    new TDEAction(i18n("Move up"), "go-up", "Alt+Shift+Up", this,
-      TQT_SLOT(slotNoteMoveUp()), actionCollection(), "note_move_up");
+      TQ_SLOT(slotNoteMoveUp()), actionCollection(), "note_move_up");
    new TDEAction(i18n("Move down"), "go-down", "Alt+Shift+Down", this,
-      TQT_SLOT(slotNoteMoveDown()), actionCollection(), "note_move_down");
+      TQ_SLOT(slotNoteMoveDown()), actionCollection(), "note_move_down");
    new TDEAction(i18n("Move level up"), "back", "Alt+Shift+Left", this,
-      TQT_SLOT(slotNoteMoveLeft()), actionCollection(), "note_move_left");
+      TQ_SLOT(slotNoteMoveLeft()), actionCollection(), "note_move_left");
    new TDEAction(i18n("Move level down"), "forward", "Alt+Shift+Right", this,
-      TQT_SLOT(slotNoteMoveRight()), actionCollection(), "note_move_right");
+      TQ_SLOT(slotNoteMoveRight()), actionCollection(), "note_move_right");
    new TDEAction(i18n("Move at the beginning"), "go-top", "Alt+Shift+Home", this,
-      TQT_SLOT(slotNoteMoveBegin()), actionCollection(), "note_move_begin");
+      TQ_SLOT(slotNoteMoveBegin()), actionCollection(), "note_move_begin");
    new TDEAction(i18n("Move at the end"), "go-bottom", "Alt+Shift+End", this,
-      TQT_SLOT(slotNoteMoveEnd()), actionCollection(), "note_move_end");
+      TQ_SLOT(slotNoteMoveEnd()), actionCollection(), "note_move_end");
    new TDEAction(i18n("Sort"), "", "", this,
-      TQT_SLOT(slotNoteSort()), actionCollection(), "note_sort");
+      TQ_SLOT(slotNoteSort()), actionCollection(), "note_sort");
 
    /* Actions: Links */
    new TDEAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", this,
-      TQT_SLOT(slotLinkAdd()), actionCollection(), "link_add");
+      TQ_SLOT(slotLinkAdd()), actionCollection(), "link_add");
    new TDEAction(i18n("&Remove link"), "", "", this,
-      TQT_SLOT(slotLinkRemove()), actionCollection(), "link_remove");
+      TQ_SLOT(slotLinkRemove()), actionCollection(), "link_remove");
    new TDEAction(i18n("Open link"), "system-run", "", this,
-      TQT_SLOT(slotLinkOpen()), actionCollection(), "link_open");
+      TQ_SLOT(slotLinkOpen()), actionCollection(), "link_open");
    new TDEAction(i18n("Open link with..."), "", "", this,
-      TQT_SLOT(slotLinkOpenWith()), actionCollection(), "link_open_with");
+      TQ_SLOT(slotLinkOpenWith()), actionCollection(), "link_open_with");
    new TDEAction(i18n("&Modify link..."), "", "", this,
-      TQT_SLOT(slotLinkModify()), actionCollection(), "link_modify");
+      TQ_SLOT(slotLinkModify()), actionCollection(), "link_modify");
    new TDEAction(i18n("&Copy link location"), "", "", this,
-      TQT_SLOT(slotLinkCopy()), actionCollection(), "link_copy");
+      TQ_SLOT(slotLinkCopy()), actionCollection(), "link_copy");
 
    /* Actions: Options */
-   KStdAction::keyBindings(this, TQT_SLOT(slotOptionsKeys()), actionCollection());
-   KStdAction::configureToolbars(this, TQT_SLOT(slotOptionsToolbar()), actionCollection());
-   KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection());
+   KStdAction::keyBindings(this, TQ_SLOT(slotOptionsKeys()), actionCollection());
+   KStdAction::configureToolbars(this, TQ_SLOT(slotOptionsToolbar()), actionCollection());
+   KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection());
             
    /* Actions: Help */
    new TDEAction(i18n("&Tip of the day"), "idea", "", this,
-      TQT_SLOT(slotHelpTip()), actionCollection(), "help_tip");
+      TQ_SLOT(slotHelpTip()), actionCollection(), "help_tip");
 
    /* Actions: nonplugged */
-   new TDEAction(i18n("Minimize"), "", "", this, TQT_SLOT(showMinimized()),
+   new TDEAction(i18n("Minimize"), "", "", this, TQ_SLOT(showMinimized()),
       actionCollection(), "window_minimize");
    new TDEAction(i18n("Switch area"), "", "Ctrl+M", this,
-      TQT_SLOT(slotEditSwitch()), actionCollection(), "edit_switch");
+      TQ_SLOT(slotEditSwitch()), actionCollection(), "edit_switch");
    new TDEAction(i18n("Overwrite Mode"), "", "Insert", this,
-      TQT_SLOT(slotOverwriteModeChange()), actionCollection(), "overwrite_mode_change");
+      TQ_SLOT(slotOverwriteModeChange()), actionCollection(), "overwrite_mode_change");
    new TDEAction(i18n("Go to previous note"), "", "Alt+Up", Items,
-      TQT_SLOT(slotItemUp()), actionCollection(), "note_previous");
+      TQ_SLOT(slotItemUp()), actionCollection(), "note_previous");
    new TDEAction(i18n("Go to next note"), "", "Alt+Down", Items,
-      TQT_SLOT(slotItemDown()), actionCollection(), "note_next");
+      TQ_SLOT(slotItemDown()), actionCollection(), "note_next");
    new TDEAction(i18n("Go to first note"), "", "Alt+Home", Items,
-      TQT_SLOT(slotItemBegin()), actionCollection(), "note_begin");
+      TQ_SLOT(slotItemBegin()), actionCollection(), "note_begin");
    new TDEAction(i18n("Go to last note"), "", "Alt+End", Items,
-      TQT_SLOT(slotItemEnd()), actionCollection(), "note_end");
+      TQ_SLOT(slotItemEnd()), actionCollection(), "note_end");
    new TDEAction(i18n("Go to first subnote"), "", "Alt+Right", Items,
-      TQT_SLOT(slotItemRight()), actionCollection(), "note_right");
+      TQ_SLOT(slotItemRight()), actionCollection(), "note_right");
    new TDEAction(i18n("Go to parent note"), "", "Alt+Left", Items,
-      TQT_SLOT(slotItemLeft()), actionCollection(), "note_left");
+      TQ_SLOT(slotItemLeft()), actionCollection(), "note_left");
 
    /* Actions */
 #if TDE_VERSION_MAJOR >= 3 && TDE_VERSION_MINOR >= 1
@@ -265,8 +265,8 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
    /* Insert/overwrite mode */
    statusBar()->insertFixedItem(("WWW"), StatusOvr, true);
    statusBar()->changeItem(i18n("INS"), StatusOvr);
-   connect(statusBar(), TQT_SIGNAL(pressed(int)), this,
-      TQT_SLOT(slotOverwriteModeChange(int)));
+   connect(statusBar(), TQ_SIGNAL(pressed(int)), this,
+      TQ_SLOT(slotOverwriteModeChange(int)));
 
    /* System tray */
    systray = new KnowitTray(this, "Systray");
@@ -275,7 +275,7 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
 
    /* Autosave */
    AutosaveTimer = new TQTimer(this);
-   connect(AutosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileAutosave()));
+   connect(AutosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileAutosave()));
 
    /* Configuration */
    config = kapp->config();
diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp
index d333c8f..8d79fed 100644
--- a/src/knowitlink.cpp
+++ b/src/knowitlink.cpp
@@ -55,8 +55,8 @@ KnowitLinkDialog::KnowitLinkDialog()
    layout->addWidget(new TQLabel(i18n("Link description:"), plainPage()));
    layout->addWidget(linkDescription = new KLineEdit("Link description", plainPage()));
 
-   connect(browse, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse()));
-   connect(linkType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int)));
+   connect(browse, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowse()));
+   connect(linkType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int)));
 }
 
 KnowitLinkDialog::~KnowitLinkDialog()
diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp
index d844658..e698bb8 100644
--- a/src/knowitpref.cpp
+++ b/src/knowitpref.cpp
@@ -323,11 +323,11 @@ void KnowitPreferences::setOptions(const KnowitOptions& Options)
    insertDateItalicButton->setOn(Options.insertDateItalic);
    insertDateUnderlineButton->setOn(Options.insertDateUnderline);
    slotUpdateDatePreview();
-   connect(insertDateColorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateDatePreview()));
-   connect(insertDateFormatEdit, TQT_SIGNAL(textChanged (const TQString &)), this, TQT_SLOT(slotUpdateDatePreview()));
-   connect(insertDateItalicButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUpdateDatePreview()));
-   connect(insertDateBoldButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUpdateDatePreview()));
-   connect(insertDateUnderlineButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUpdateDatePreview()));
+   connect(insertDateColorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpdateDatePreview()));
+   connect(insertDateFormatEdit, TQ_SIGNAL(textChanged (const TQString &)), this, TQ_SLOT(slotUpdateDatePreview()));
+   connect(insertDateItalicButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUpdateDatePreview()));
+   connect(insertDateBoldButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUpdateDatePreview()));
+   connect(insertDateUnderlineButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUpdateDatePreview()));
 
    /* non-GUI options */
    firstLink = Options.firstLink;
diff --git a/src/knowittray.cpp b/src/knowittray.cpp
index a09d6c0..a0c72e8 100644
--- a/src/knowittray.cpp
+++ b/src/knowittray.cpp
@@ -22,12 +22,12 @@ KnowitTray::KnowitTray (TQWidget* parent, const char* name) :
    KSystemTray(parent, name)
 {
    contextMenu()->insertItem(i18n("&Undock"), parent,
-      TQT_SLOT(slotUndock()));
+      TQ_SLOT(slotUndock()));
 }
 
 void KnowitTray::contextMenuAboutToShow (TDEPopupMenu* menu)
 {
    menu->removeItemAt(menu->count()-1);
-   menu->insertItem(i18n("&Quit"), parent(), TQT_SLOT(slotFileQuit()));
+   menu->insertItem(i18n("&Quit"), parent(), TQ_SLOT(slotFileQuit()));
 }