From 83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:28 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- ark/ark_part.cpp | 24 ++++++++++++------------ ark/arkviewer.cpp | 2 +- ark/mainwindow.cpp | 20 ++++++++++---------- ark/searchbar.cpp | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'ark') diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 9a8cd50..2eaf97a 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -116,43 +116,43 @@ ArkPart::~ArkPart() void ArkPart::setupActions() { - addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), + addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, awidget, TQT_SLOT(action_add()), actionCollection(), "addfile"); - addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), + addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget, TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); - extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), + extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, awidget, TQT_SLOT(action_extract()), actionCollection(), "extract"); - deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), + deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), awidget, TQT_SLOT(action_delete()), actionCollection(), "delete"); - viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), + viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, awidget, TQT_SLOT(action_view()), actionCollection(), "view"); - openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), + openWithAction = new TDEAction(i18n("&Open With..."), 0, awidget, TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); - editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), + editAction = new TDEAction(i18n("Edit &With..."), 0, awidget, TQT_SLOT(action_edit()), actionCollection(), "edit"); testAction = new TDEAction(i18n("&Test integrity"), 0, awidget, TQT_SLOT(action_test()), actionCollection(), "test"); - selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all"); + selectAllAction = KStdAction::selectAll(awidget->fileList(), TQT_SLOT(selectAll()), actionCollection(), "select_all"); - deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); + deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); - invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); + invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); - ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), + ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget, TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); @@ -161,7 +161,7 @@ ArkPart::setupActions() showSearchBar->setChecked( ArkSettings::showSearchBar() ); - connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(awidget), TQT_SLOT( slotShowSearchBarToggled( bool ) ) ); + connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), awidget, TQT_SLOT( slotShowSearchBarToggled( bool ) ) ); initialEnables(); } diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 34f9cfd..6ae8792 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -86,7 +86,7 @@ bool ArkViewer::view( const KURL& filename ) header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); - m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, 0, this ); if ( m_part ) { diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 4726989..255be83 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -49,7 +49,7 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) : KParts::MainWindow(), progressDialog( 0 ) { setXMLFile( "arkui.rc" ); - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart"); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary( "libarkpart", this, name, this, "ArkPart"); if (m_part ) { //Since most of the functionality is still in ArkWidget: @@ -109,24 +109,24 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this), + newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this, TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); - newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); - openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); + newArchAction = KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection()); + openAction = KStdAction::open(this, TQT_SLOT(file_open()), actionCollection()); - reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), + reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); + closeAction = KStdAction::close(this, TQT_SLOT(file_close()), actionCollection(), "file_close"); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); + recent = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection()); recent->loadEntries(kapp->config()); createStandardStatusBarAction(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(window_close()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); openAction->setEnabled( true ); recent->setEnabled( true ); diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 498e3e3..2df9da9 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -35,7 +35,7 @@ SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) : TDEListViewSearchLine( parent, 0, name ) { - TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); + TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQT_SLOT( clear() ), aC, "reset_search" ); resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" -- cgit v1.2.1