From 55cef714419f6e36e66dc75afc40682ea5c73a35 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 21 Dec 2023 11:50:18 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- kviewshell/kviewpart.cpp | 4 ++-- kviewshell/kviewshell.cpp | 18 +++++++++--------- kviewshell/pageSizeWidget.cpp | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kviewshell') diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index 9ababe46..aec9a7c5 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -122,7 +122,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p // Try to load the multiPage int error; - multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, mainWidget, service->name().utf8(), TQStringList(), &error )); // If the loading of the MultiPage failed report and error and abort. @@ -800,7 +800,7 @@ bool KViewPart::openFile() // Try to load the multiPage int error; - multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, TQT_TQOBJECT(mainWidget), + multiPage = static_cast(KParts::ComponentFactory::createInstanceFromService(service, mainWidget, service->name().utf8(), TQStringList(), &error )); if (multiPage.isNull()) { diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 1a29eb71..69641150 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -55,13 +55,13 @@ KViewShell::KViewShell(const TQString& defaultMimeType) if (factory) { if (defaultMimeType == TQString()) { - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart"); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart"); } else { TQStringList args; args << defaultMimeType; - view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args); + view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args); } if (!view) ::exit(-1); @@ -73,24 +73,24 @@ KViewShell::KViewShell(const TQString& defaultMimeType) setCentralWidget(view->widget()); // file menu - KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection()); - recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection()); + KStdAction::open(view, TQT_SLOT(slotFileOpen()), actionCollection()); + recent = KStdAction::openRecent (this, TQT_SLOT(openURL(const KURL &)), actionCollection()); reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + closeAction = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection()); connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile())); // view menu - fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); + fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" ); // settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbar()), actionCollection()); // statusbar connects connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) ); diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 52e52237..9c6d387d 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -57,8 +57,8 @@ pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) // Allow entries between 0 and 1200. More filtering is done by the // pageSize class, which silently ignores values which are out of // range. - widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "widthValidator")); - heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, TQT_TQOBJECT(this), "heightValidator")); + widthInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "widthValidator")); + heightInput->setValidator(new TQDoubleValidator(0.0, 1200.0, 1, this, "heightValidator")); } -- cgit v1.2.1