From 2f7d0721945d00c7970409c6944a2f80ea1487a9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 14 Dec 2023 21:19:10 +0900 Subject: Remove various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit b436343a9567762fb4e0c278d104aa4000edc8ce) --- src/knowit.cpp | 164 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/src/knowit.cpp b/src/knowit.cpp index 8df37d1..b970b7f 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()), TQT_TQOBJECT(this), TQT_SLOT(slotEditFind())); + connect(&FindDlg, TQT_SIGNAL(search()), this, TQT_SLOT(slotEditFind())); lastSought = 0; /* main view */ @@ -78,7 +78,7 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name), TQWhatsThis::add(Layout, i18n("Move it to change tree/edit layout.")); connect(Items, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(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, @@ -89,87 +89,87 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name), Edit->setTextFormat(TQt::RichText); TQWhatsThis::add(Edit, i18n("

Note text

Add text for selected note here.\n" "Text can be formatted, for example bold or italic.")); - connect(Edit, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotEditChanged())); - connect(Edit, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotEditChanged())); + 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)), - TQT_TQOBJECT(this), TQT_SLOT(slotLinkDropped(const TQString&, int))); + this, TQT_SLOT(slotLinkDropped(const TQString&, int))); /* Links (TDEListBox) */ connect(Links, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_TQOBJECT(this), TQT_SLOT(slotShowAttachment(TQListBoxItem*))); + this, TQT_SLOT(slotShowAttachment(TQListBoxItem*))); connect(Links, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextLinksMenu(TQListBoxItem*, const TQPoint&))); + this, TQT_SLOT(slotContextLinksMenu(TQListBoxItem*, const TQPoint&))); connect(Links, TQT_SIGNAL(textDropped(const TQString&, int)), - TQT_TQOBJECT(this), TQT_SLOT(slotLinkDropped(const TQString&, int))); - connect(Links, TQT_SIGNAL(linkRemove()), TQT_TQOBJECT(this), TQT_SLOT(slotLinkRemove())); - connect(Links, TQT_SIGNAL(linkOpen()), TQT_TQOBJECT(this), TQT_SLOT(slotLinkOpen())); - connect(Links, TQT_SIGNAL(linkOpenWith()), TQT_TQOBJECT(this), TQT_SLOT(slotLinkOpenWith())); + 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())); /* Actions: File */ - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileRecent(const KURL&)), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - new TDEAction(i18n("&Export to HTML..."), "", "", TQT_TQOBJECT(this), + 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()); + new TDEAction(i18n("&Export to HTML..."), "", "", this, TQT_SLOT(slotFileExport()), actionCollection(), "file_export_html"); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); - new TDEAction(i18n("Document &information..."), "", "", TQT_TQOBJECT(this), + KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + new TDEAction(i18n("Document &information..."), "", "", this, TQT_SLOT(slotFileInfo()), actionCollection(), "file_info"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); /* Actions: Edit */ - actionCut = KStdAction::cut(TQT_TQOBJECT(Edit), TQT_SLOT(cut()), actionCollection()); - actionCopy = KStdAction::copy(TQT_TQOBJECT(Edit), TQT_SLOT(copy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(Edit), TQT_SLOT(paste()), actionCollection()); - actionUndo = KStdAction::undo(TQT_TQOBJECT(Edit), TQT_SLOT(undo()), actionCollection()); - actionRedo = KStdAction::redo(TQT_TQOBJECT(Edit), TQT_SLOT(redo()), actionCollection()); + 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()); actionBold = new TDEToggleAction(i18n("Toggle &bold"), "format-text-bold", - "Ctrl+B", TQT_TQOBJECT(this), TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold"); + "Ctrl+B", this, TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold"); actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "format-text-italic", - "Ctrl+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditItalic()), actionCollection(), + "Ctrl+I", this, TQT_SLOT(slotEditItalic()), actionCollection(), "edit_italic"); actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "format-text-underline", - "Ctrl+U", TQT_TQOBJECT(this), TQT_SLOT(slotEditUnderline()), actionCollection(), + "Ctrl+U", this, TQT_SLOT(slotEditUnderline()), actionCollection(), "edit_underline"); - new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this), + new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", this, TQT_SLOT(slotEditColor()), actionCollection(), "edit_color"); - new TDEAction(i18n("&Superscript"), "text_super", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Superscript"), "text_super", "", this, TQT_SLOT(slotEditSuperscript()), actionCollection(), "edit_superscript"); - new TDEAction(i18n("&Subscript"), "text_sub", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Subscript"), "text_sub", "", this, TQT_SLOT(slotEditSubscript()), actionCollection(), "edit_subscript"); - new TDEAction(i18n("&Normal text"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Normal text"), "", "", this, TQT_SLOT(slotEditNormal()), actionCollection(), "edit_align_normal"); - new TDEAction(i18n("&Bullet list"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Bullet list"), "", "", this, TQT_SLOT(slotEditListBullet()), actionCollection(), "list_bullet"); - new TDEAction(i18n("&Numbered list"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Numbered list"), "", "", this, TQT_SLOT(slotEditListNumber()), actionCollection(), "list_number"); - new TDEAction(i18n("&Uppercase list"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Uppercase list"), "", "", this, TQT_SLOT(slotEditListUpper()), actionCollection(), "list_upper"); - new TDEAction(i18n("&Lowercase list"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Lowercase list"), "", "", this, TQT_SLOT(slotEditListLower()), actionCollection(), "list_lower"); - new TDEAction(i18n("N&o list"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("N&o list"), "", "", this, TQT_SLOT(slotEditListNone()), actionCollection(), "list_none"); - KStdAction::find(TQT_TQOBJECT(&FindDlg), TQT_SLOT(exec()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection()); - new TDEAction(i18n("&Go to ¬e..."), "goto", "Ctrl+G", TQT_TQOBJECT(this), + KStdAction::find(&FindDlg, TQT_SLOT(exec()), actionCollection()); + KStdAction::findNext(this, TQT_SLOT(slotEditFindNext()), actionCollection()); + new TDEAction(i18n("&Go to ¬e..."), "goto", "Ctrl+G", this, TQT_SLOT(slotEditGoTo()), actionCollection(), "goto_note"); - actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "format-text-direction-ltr", "Ctrl+L", TQT_TQOBJECT(this), + actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "format-text-direction-ltr", "Ctrl+L", this, TQT_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left"); actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "format-text-direction-rtl", "Ctrl+R", - TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right"); + this, TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right"); actionEditAlignJustify = new TDEToggleAction(i18n("&Justify"), "text_block", "Ctrl+J", - TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify"); - actionEditAlignCenter = new TDEToggleAction(i18n("&Center"), "text_center", "Ctrl+E", TQT_TQOBJECT(this), + this, TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify"); + actionEditAlignCenter = new TDEToggleAction(i18n("&Center"), "text_center", "Ctrl+E", this, TQT_SLOT(slotEditAlignCenter()), actionCollection(), "edit_align_center"); - new TDEAction(i18n("Insert &date"), "date", "F5", TQT_TQOBJECT(this), + new TDEAction(i18n("Insert &date"), "date", "F5", this, TQT_SLOT(slotEditInsertDate()), actionCollection(), "edit_insert_date"); - new TDEAction(i18n("Insert &file..."), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("Insert &file..."), "", "", this, TQT_SLOT(slotEditInsertFile()), actionCollection(), "edit_insert_file"); actionRawTextMode = new TDEToggleAction(i18n("&Raw Text Mode"), - "text-x-src", "F10", TQT_TQOBJECT(this), TQT_SLOT(slotRawTextMode()), + "text-x-src", "F10", this, TQT_SLOT(slotRawTextMode()), actionCollection(), "edit_raw_text"); /* Actions: edit setup */ @@ -181,78 +181,78 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name), connect(Edit, TQT_SIGNAL(redoAvailable(bool)), actionRedo, TQT_SLOT(setEnabled(bool))); /* Actions: notes */ - new TDEAction(i18n("&Add"), "", "Alt+Insert", TQT_TQOBJECT(this), TQT_SLOT(slotNoteAdd()), + new TDEAction(i18n("&Add"), "", "Alt+Insert", this, TQT_SLOT(slotNoteAdd()), actionCollection(), "note_add"); - new TDEAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", TQT_TQOBJECT(this), + new TDEAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", this, TQT_SLOT(slotNoteAddChild()), actionCollection(), "note_add_child"); - new TDEAction(i18n("&Delete"), "", "Alt+Delete", TQT_TQOBJECT(this), + new TDEAction(i18n("&Delete"), "", "Alt+Delete", this, TQT_SLOT(slotNoteRemove()), actionCollection(), "note_delete"); - new TDEAction(i18n("&Rename"), "", "F2", TQT_TQOBJECT(this), + new TDEAction(i18n("&Rename"), "", "F2", this, TQT_SLOT(slotNoteRename()), actionCollection(), "note_rename"); - new TDEAction(i18n("E&xpand all"), "", "", TQT_TQOBJECT(Items), + new TDEAction(i18n("E&xpand all"), "", "", Items, TQT_SLOT(slotExpandAll()), actionCollection(), "note_expand_all"); - new TDEAction(i18n("&Expand current"), "", "Alt++", TQT_TQOBJECT(Items), + new TDEAction(i18n("&Expand current"), "", "Alt++", Items, TQT_SLOT(slotExpand()), actionCollection(), "note_expand"); - new TDEAction(i18n("Co&llapse all"), "", "", TQT_TQOBJECT(Items), + new TDEAction(i18n("Co&llapse all"), "", "", Items, TQT_SLOT(slotCollapseAll()), actionCollection(), "note_collapse_all"); - new TDEAction(i18n("&Collapse current"), "", "Alt+-", TQT_TQOBJECT(Items), + new TDEAction(i18n("&Collapse current"), "", "Alt+-", Items, TQT_SLOT(slotCollapse()), actionCollection(), "note_collapse"); - new TDEAction(i18n("Move up"), "go-up", "Alt+Shift+Up", TQT_TQOBJECT(this), + new TDEAction(i18n("Move up"), "go-up", "Alt+Shift+Up", this, TQT_SLOT(slotNoteMoveUp()), actionCollection(), "note_move_up"); - new TDEAction(i18n("Move down"), "go-down", "Alt+Shift+Down", TQT_TQOBJECT(this), + new TDEAction(i18n("Move down"), "go-down", "Alt+Shift+Down", this, TQT_SLOT(slotNoteMoveDown()), actionCollection(), "note_move_down"); - new TDEAction(i18n("Move level up"), "back", "Alt+Shift+Left", TQT_TQOBJECT(this), + new TDEAction(i18n("Move level up"), "back", "Alt+Shift+Left", this, TQT_SLOT(slotNoteMoveLeft()), actionCollection(), "note_move_left"); - new TDEAction(i18n("Move level down"), "forward", "Alt+Shift+Right", TQT_TQOBJECT(this), + new TDEAction(i18n("Move level down"), "forward", "Alt+Shift+Right", this, TQT_SLOT(slotNoteMoveRight()), actionCollection(), "note_move_right"); - new TDEAction(i18n("Move at the beginning"), "go-top", "Alt+Shift+Home", TQT_TQOBJECT(this), + new TDEAction(i18n("Move at the beginning"), "go-top", "Alt+Shift+Home", this, TQT_SLOT(slotNoteMoveBegin()), actionCollection(), "note_move_begin"); - new TDEAction(i18n("Move at the end"), "go-bottom", "Alt+Shift+End", TQT_TQOBJECT(this), + new TDEAction(i18n("Move at the end"), "go-bottom", "Alt+Shift+End", this, TQT_SLOT(slotNoteMoveEnd()), actionCollection(), "note_move_end"); - new TDEAction(i18n("Sort"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("Sort"), "", "", this, TQT_SLOT(slotNoteSort()), actionCollection(), "note_sort"); /* Actions: Links */ - new TDEAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", TQT_TQOBJECT(this), + new TDEAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", this, TQT_SLOT(slotLinkAdd()), actionCollection(), "link_add"); - new TDEAction(i18n("&Remove link"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Remove link"), "", "", this, TQT_SLOT(slotLinkRemove()), actionCollection(), "link_remove"); - new TDEAction(i18n("Open link"), "system-run", "", TQT_TQOBJECT(this), + new TDEAction(i18n("Open link"), "system-run", "", this, TQT_SLOT(slotLinkOpen()), actionCollection(), "link_open"); - new TDEAction(i18n("Open link with..."), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("Open link with..."), "", "", this, TQT_SLOT(slotLinkOpenWith()), actionCollection(), "link_open_with"); - new TDEAction(i18n("&Modify link..."), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Modify link..."), "", "", this, TQT_SLOT(slotLinkModify()), actionCollection(), "link_modify"); - new TDEAction(i18n("&Copy link location"), "", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Copy link location"), "", "", this, TQT_SLOT(slotLinkCopy()), actionCollection(), "link_copy"); /* Actions: Options */ - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotOptionsKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotOptionsToolbar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(slotOptionsKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(slotOptionsToolbar()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection()); /* Actions: Help */ - new TDEAction(i18n("&Tip of the day"), "idea", "", TQT_TQOBJECT(this), + new TDEAction(i18n("&Tip of the day"), "idea", "", this, TQT_SLOT(slotHelpTip()), actionCollection(), "help_tip"); /* Actions: nonplugged */ - new TDEAction(i18n("Minimize"), "", "", TQT_TQOBJECT(this), TQT_SLOT(showMinimized()), + new TDEAction(i18n("Minimize"), "", "", this, TQT_SLOT(showMinimized()), actionCollection(), "window_minimize"); - new TDEAction(i18n("Switch area"), "", "Ctrl+M", TQT_TQOBJECT(this), + new TDEAction(i18n("Switch area"), "", "Ctrl+M", this, TQT_SLOT(slotEditSwitch()), actionCollection(), "edit_switch"); - new TDEAction(i18n("Overwrite Mode"), "", "Insert", TQT_TQOBJECT(this), + new TDEAction(i18n("Overwrite Mode"), "", "Insert", this, TQT_SLOT(slotOverwriteModeChange()), actionCollection(), "overwrite_mode_change"); - new TDEAction(i18n("Go to previous note"), "", "Alt+Up", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to previous note"), "", "Alt+Up", Items, TQT_SLOT(slotItemUp()), actionCollection(), "note_previous"); - new TDEAction(i18n("Go to next note"), "", "Alt+Down", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to next note"), "", "Alt+Down", Items, TQT_SLOT(slotItemDown()), actionCollection(), "note_next"); - new TDEAction(i18n("Go to first note"), "", "Alt+Home", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to first note"), "", "Alt+Home", Items, TQT_SLOT(slotItemBegin()), actionCollection(), "note_begin"); - new TDEAction(i18n("Go to last note"), "", "Alt+End", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to last note"), "", "Alt+End", Items, TQT_SLOT(slotItemEnd()), actionCollection(), "note_end"); - new TDEAction(i18n("Go to first subnote"), "", "Alt+Right", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to first subnote"), "", "Alt+Right", Items, TQT_SLOT(slotItemRight()), actionCollection(), "note_right"); - new TDEAction(i18n("Go to parent note"), "", "Alt+Left", TQT_TQOBJECT(Items), + new TDEAction(i18n("Go to parent note"), "", "Alt+Left", Items, TQT_SLOT(slotItemLeft()), actionCollection(), "note_left"); /* Actions */ @@ -275,7 +275,7 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name), /* Autosave */ AutosaveTimer = new TQTimer(this); - connect(AutosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFileAutosave())); + connect(AutosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileAutosave())); /* Configuration */ config = kapp->config(); -- cgit v1.2.3