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 --- kamera/kcontrol/kamera.cpp | 12 +++--- kcoloredit/kcoloredit.cpp | 28 ++++++------ kcoloredit/texteditselection.cpp | 2 +- kfax/kfax.cpp | 36 ++++++++-------- kghostview/kgv_miniwidget.cpp | 6 +-- kghostview/kgv_view.cpp | 18 ++++---- kghostview/kgvdocument.cpp | 4 +- kghostview/kgvshell.cpp | 16 +++---- kghostview/marklist.cpp | 2 +- kolourpaint/kpmainwindow_edit.cpp | 20 ++++----- kolourpaint/kpmainwindow_file.cpp | 30 ++++++------- kolourpaint/kpmainwindow_help.cpp | 4 +- kolourpaint/kpmainwindow_image.cpp | 22 +++++----- kolourpaint/kpmainwindow_settings.cpp | 10 ++--- kolourpaint/kpmainwindow_text.cpp | 12 +++--- kolourpaint/kpmainwindow_tools.cpp | 8 ++-- kolourpaint/kpmainwindow_view.cpp | 30 ++++++------- kooka/kooka.cpp | 40 +++++++++--------- kooka/kookaview.cpp | 2 +- kpdf/core/document.cpp | 2 +- kpdf/shell/shell.cpp | 14 +++--- kpdf/ui/minibar.cpp | 6 +-- kpdf/ui/pageview.cpp | 22 +++++----- kpdf/ui/presentationwidget.cpp | 18 ++++---- kpdf/ui/searchwidget.cpp | 4 +- kpdf/ui/thumbnaillist.cpp | 2 +- kpovmodeler/pmdeclareedit.cpp | 2 +- kpovmodeler/pmdialogview.cpp | 2 +- kpovmodeler/pmdockwidget.cpp | 14 +++--- kpovmodeler/pmglview.cpp | 8 ++-- kpovmodeler/pmshell.cpp | 58 ++++++++++++------------- kpovmodeler/pmtreeview.cpp | 16 +++---- ksnapshot/ksnapshot.cpp | 34 +++++++-------- ksvg/test/external/SVGTestWidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 60 +++++++++++++------------- kuickshow/src/kuickshow.cpp | 20 ++++----- kview/kview.cpp | 26 ++++++------ kview/kviewcanvas/kimagecanvas.cpp | 2 +- kview/kviewcanvas/kimagecanvas.h | 2 +- kview/kviewviewer/kviewviewer.cpp | 2 +- kview/photobook/photobook.cpp | 6 +-- kviewshell/kviewpart.cpp | 4 +- kviewshell/kviewshell.cpp | 18 ++++---- kviewshell/pageSizeWidget.cpp | 4 +- libkscan/previewer.cpp | 4 +- libkscan/scandialog.cpp | 2 +- tdeiconedit/tdeicon.cpp | 6 +-- tdeiconedit/tdeiconedit.cpp | 80 +++++++++++++++++------------------ 48 files changed, 370 insertions(+), 372 deletions(-) diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 1fa2639c..08bd3064 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/kamera/kcontrol/kamera.cpp @@ -118,24 +118,24 @@ void KKameraConfig::displayGPSuccessDialogue(void) // create actions TDEAction *act; - act = new TDEAction(i18n("Add"), "camera-photo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); + act = new TDEAction(i18n("Add"), "camera-photo", 0, this, TQT_SLOT(slot_addCamera()), m_actions, "camera_add"); act->setWhatsThis(i18n("Click this button to add a new camera.")); act->plug(m_toolbar); m_toolbar->insertLineSeparator(); - act = new TDEAction(i18n("Test"), "button_ok", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test"); + act = new TDEAction(i18n("Test"), "button_ok", 0, this, TQT_SLOT(slot_testCamera()), m_actions, "camera_test"); act->setWhatsThis(i18n("Click this button to remove the selected camera from the list.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove"); + act = new TDEAction(i18n("Remove"), "edittrash", 0, this, TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove"); act->setWhatsThis(i18n("Click this button to remove the selected camera from the list.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure"); + act = new TDEAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure"); act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.

The availability of this feature and the contents of the Configuration dialog depend on the camera model.")); act->plug(m_toolbar); - act = new TDEAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary"); + act = new TDEAction(i18n("Information"), "hwinfo", 0, this, TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary"); act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.

The availability of this feature and the contents of the Configuration dialog depend on the camera model.")); act->plug(m_toolbar); m_toolbar->insertLineSeparator(); - act = new TDEAction(i18n("Cancel"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel"); + act = new TDEAction(i18n("Cancel"), "process-stop", 0, this, TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel"); act->setWhatsThis(i18n("Click this button to cancel the current camera operation.")); act->setEnabled(false); act->plug(m_toolbar); diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index f933bea9..05c5e1aa 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -64,39 +64,39 @@ KColorEditApp::~KColorEditApp() { void KColorEditApp::initActions() { // File actiojns - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ), actionCollection() ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection() ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); - m_actSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), + KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection() ); + KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() ); + KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection() ); + KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); + m_actSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ), actionCollection() ); - m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this), + m_actRecent = KStdAction::openRecent( this, TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(), + this, TQT_SLOT( slotFileNewWindow() ), actionCollection(), "file_new_window" ); // Edit actions - m_actCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotEditCut() ), + m_actCut = KStdAction::cut( this, TQT_SLOT( slotEditCut() ), actionCollection() ); - m_actCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ), + m_actCopy = KStdAction::copy( this, TQT_SLOT( slotEditCopy() ), actionCollection() ); - m_actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotEditPaste() ), + m_actPaste = KStdAction::paste( this, TQT_SLOT( slotEditPaste() ), actionCollection() ); m_actPaste->setEnabled( false ); // Color Menu - m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this), + m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), this, TQT_SLOT( slotViewColorNames() ), actionCollection(), "color_view_names" ); m_actNames->setCheckedState(i18n("Hide &Color Names")); - m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this), + m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), this, TQT_SLOT( slotColorFromPalette() ), actionCollection(), "color_from_palette" ); - ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this), + ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), this, TQT_SLOT( slotColorFromScreen() ), actionCollection(), "color_from_screen" ); } diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index f1da81a1..ee5cf729 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -61,7 +61,7 @@ TextEditSelection::~TextEditSelection(){ void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString, const int row, const int column, TQGridLayout* layout) { TQLabel* label = new TQLabel(labelString, this); - lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) )); + lineEdit->setValidator(new TQIntValidator( 0, maxValue, lineEdit )); lineEditTable[index] = lineEdit; lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") )); lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index c33ec78d..c68b07c4 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -236,43 +236,43 @@ TopLevel::~TopLevel() void TopLevel::setupMenuBar() { // File menu - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( faxOpen() ), actionCollection() ); - actRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( faxOpen( const KURL & ) ), + KStdAction::open( this, TQT_SLOT( faxOpen() ), actionCollection() ); + actRecent = KStdAction::openRecent( this, TQT_SLOT( faxOpen( const KURL & ) ), actionCollection() ); - actSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( faxSave() ), actionCollection() ); - actSaveAs = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( faxSaveAs() ), + actSave = KStdAction::save( this, TQT_SLOT( faxSave() ), actionCollection() ); + actSaveAs = KStdAction::saveAs( this, TQT_SLOT( faxSaveAs() ), actionCollection() ); - actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - actAdd = new TDEAction( i18n( "A&dd..." ), "document-new", TDEShortcut(), TQT_TQOBJECT(this), + actPrint = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + actAdd = new TDEAction( i18n( "A&dd..." ), "document-new", TDEShortcut(), this, TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); actRecent->setMaxItems( 5 ); // View Menu - actSize = KStdAction::actualSize( TQT_TQOBJECT(this), TQT_SLOT( actualSize() ), + actSize = KStdAction::actualSize( this, TQT_SLOT( actualSize() ), actionCollection() ); - actZoomIn = KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( zoomin() ), actionCollection() ); - actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ), + actZoomIn = KStdAction::zoomIn( this, TQT_SLOT( zoomin() ), actionCollection() ); + actZoomOut = KStdAction::zoomOut( this, TQT_SLOT( zoomout() ), actionCollection() ); - actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), TQT_TQOBJECT(this), + actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), this, TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); - actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this), + actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), this, TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); - actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this), + actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), this, TQT_SLOT( flipPage() ), actionCollection(), "view_flip" ); // Go menu - actNext = KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( nextPage() ), actionCollection() ); - actPrev = KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( prevPage() ), actionCollection() ); - actFirst = KStdAction::firstPage( TQT_TQOBJECT(this), TQT_SLOT( firstPage() ), + actNext = KStdAction::next( this, TQT_SLOT( nextPage() ), actionCollection() ); + actPrev = KStdAction::prior( this, TQT_SLOT( prevPage() ), actionCollection() ); + actFirst = KStdAction::firstPage( this, TQT_SLOT( firstPage() ), actionCollection() ); - actLast = KStdAction::lastPage( TQT_TQOBJECT(this), TQT_SLOT( lastPage() ), + actLast = KStdAction::lastPage( this, TQT_SLOT( lastPage() ), actionCollection() ); // Settings menu - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( faxoptions() ), actionCollection() ); + KStdAction::preferences( this, TQT_SLOT( faxoptions() ), actionCollection() ); } void TopLevel::setupStatusBar() diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 5d6ca3df..4a4dfc93 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -384,7 +384,7 @@ void KGVMiniWidget::showPage( int pagenumber ) kdDebug(4500) << "KGVMiniWidget::showPage( " << pagenumber << " )" << endl; - TQT_TQWIDGET( _psWidget->parent() )->show(); + static_cast( _psWidget->parent() )->show(); _psWidget->setFileName(_document->fileName(), dsc()->isStructured() ); _psWidget->clear(); @@ -452,8 +452,8 @@ void KGVMiniWidget::showPage( int pagenumber ) } } // Do this after ajusting pagenumber above - _thumbnailService->cancelRequests( -1 , TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ) ); - _thumbnailService->delayedGetThumbnail( pagenumber, TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ), true ); + _thumbnailService->cancelRequests( -1 , _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ) ); + _thumbnailService->delayedGetThumbnail( pagenumber, _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ), true ); emit newPageShown( pagenumber ); } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 1002e123..59140d72 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -165,14 +165,14 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _markList = new MarkList( _mainWidget, "marklist", _docManager ); _markList->setFixedWidth( PAGELIST_WIDTH ); vlay->addWidget( _markList, 1 ); - connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ), + connect( _markList, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ), this, TQT_SLOT( showPopup( int, int, const TQPoint& ) ) ); - connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( selected( int ) ), + connect( _markList, TQT_SIGNAL( selected( int ) ), _docManager, TQT_SLOT( goToPage( int ) ) ); connect( _docManager, TQT_SIGNAL( newPageShown( int ) ), - TQT_TQOBJECT(_markList), TQT_SLOT( select( int ) ) ); + _markList, TQT_SLOT( select( int ) ) ); connect( _docManager, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); connect( _scrollBox, TQT_SIGNAL( valueChangedRelative( int, int ) ), @@ -195,27 +195,27 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*, _popup = new TDEPopupMenu( _markList, "marklist_menu" ); TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M, - TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ), + _markList, TQT_SLOT( markCurrent() ), actionCollection(), "mark_current" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &All Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ), + _markList, TQT_SLOT( markAll() ), actionCollection(), "mark_all" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Even Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ), + _markList, TQT_SLOT( markEven() ), actionCollection(), "mark_even" ); act->plug( _popup ); act = new TDEAction( i18n( "Mark &Odd Pages" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ), + _markList, TQT_SLOT( markOdd() ), actionCollection(), "mark_odd" ); act->plug( _popup ); act = new TDEAction( i18n( "&Toggle Page Marks" ), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ), + _markList, TQT_SLOT( toggleMarks() ), actionCollection(), "toggle" ); act->plug( _popup ); act = new TDEAction( i18n("&Remove Page Marks"), 0, - TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ), + _markList, TQT_SLOT( removeMarks() ), actionCollection(), "remove" ); act->plug( _popup ); diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index ae0742da..96cc28c6 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -565,9 +565,7 @@ void KGVDocument::saveAs() TQString(), _part->widget(), TQString() ); - if( !TDEIO::NetAccess::upload( _fileName, - saveURL, - static_cast( 0 ) ) ) { + if( !TDEIO::NetAccess::upload( _fileName, saveURL, 0 ) ) { // TODO: Proper error dialog } } diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 0835efb3..10a5c5e2 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -60,29 +60,29 @@ KGVShell::KGVShell() : _tmpFile( 0 ) { m_gvpart = KParts::ComponentFactory::createPartInstanceFromLibrary< KGVPart >( "libkghostviewpart", this, "kgvpart", - TQT_TQOBJECT(this), "kgvpart" ); + this, "kgvpart" ); /*---- File -----------------------------------------------------------*/ openact = - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), + KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection() ); recent = - KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ), + KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ), actionCollection() ); KStdAction::print( m_gvpart->document(), TQT_SLOT( print() ), actionCollection() ); (void) - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); /*---- View -----------------------------------------------------------*/ new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), m_gvpart, TQT_SLOT( reloadFile() ), actionCollection(), "reload" ); - new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this), + new TDEAction( i18n( "&Maximize" ), Key_M, this, TQT_SLOT( slotMaximize() ), actionCollection(), "maximize"); - _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() ); + _showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection() ); /*---- Settings -------------------------------------------------------*/ #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) @@ -91,11 +91,11 @@ KGVShell::KGVShell() : setAutoSaveSettings(); setStandardToolBarMenuEnabled(true); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) - m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); + m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); #else m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) ); #endif - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index b84924eb..257c21c6 100644 --- a/kghostview/marklist.cpp +++ b/kghostview/marklist.cpp @@ -105,7 +105,7 @@ void MarkListItem::paintEvent( TQPaintEvent* ) */ if ( _requested ) return; if ( !_thumbnailW->paletteBackgroundPixmap() || _thumbnailW->paletteBackgroundPixmap()->isNull() ) { - _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, TQT_TQOBJECT(this), TQT_SLOT( setPixmap( TQPixmap ) ) ); + _miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, this, TQT_SLOT( setPixmap( TQPixmap ) ) ); _requested = true; } } diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 61cb7319..dd62bcda 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -103,25 +103,25 @@ void kpMainWindow::setupEditMenuActions () } - m_actionCut = KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT (slotCut ()), ac); - m_actionCopy = KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT (slotCopy ()), ac); - m_actionPaste = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (slotPaste ()), ac); + m_actionCut = KStdAction::cut (this, TQT_SLOT (slotCut ()), ac); + m_actionCopy = KStdAction::copy (this, TQT_SLOT (slotCopy ()), ac); + m_actionPaste = KStdAction::paste (this, TQT_SLOT (slotPaste ()), ac); m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"), TQt::CTRL + TQt::SHIFT + TQt::Key_V, - TQT_TQOBJECT(this), TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); + this, TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window"); //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac); m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotDelete ()), ac, "edit_clear"); + this, TQT_SLOT (slotDelete ()), ac, "edit_clear"); - m_actionSelectAll = KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT (slotSelectAll ()), ac); - m_actionDeselect = KStdAction::deselect (TQT_TQOBJECT(this), TQT_SLOT (slotDeselect ()), ac); + m_actionSelectAll = KStdAction::selectAll (this, TQT_SLOT (slotSelectAll ()), ac); + m_actionDeselect = KStdAction::deselect (this, TQT_SLOT (slotDeselect ()), ac); m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); + this, TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file"); m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); + this, TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file"); m_editMenuDocumentActionsEnabled = false; @@ -130,7 +130,7 @@ void kpMainWindow::setupEditMenuActions () // Paste should always be enabled, as long as there is something paste // (independent of whether we have a document or not) connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()), - TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ())); + this, TQT_SLOT (slotEnablePaste ())); slotEnablePaste (); } diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index bc408f2c..25834797 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -67,41 +67,41 @@ void kpMainWindow::setupFileMenuActions () #endif TDEActionCollection *ac = actionCollection (); - m_actionNew = KStdAction::openNew (TQT_TQOBJECT(this), TQT_SLOT (slotNew ()), ac); - m_actionOpen = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (slotOpen ()), ac); + m_actionNew = KStdAction::openNew (this, TQT_SLOT (slotNew ()), ac); + m_actionOpen = KStdAction::open (this, TQT_SLOT (slotOpen ()), ac); - m_actionOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT (slotOpenRecent (const KURL &)), ac); + m_actionOpenRecent = KStdAction::openRecent (this, TQT_SLOT (slotOpenRecent (const KURL &)), ac); m_actionOpenRecent->loadEntries (kapp->config ()); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\trecent URLs=" << m_actionOpenRecent->items () << endl; #endif - m_actionSave = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT (slotSave ()), ac); - m_actionSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac); + m_actionSave = KStdAction::save (this, TQT_SLOT (slotSave ()), ac); + m_actionSaveAs = KStdAction::saveAs (this, TQT_SLOT (slotSaveAs ()), ac); m_actionExport = new TDEAction (i18n ("E&xport..."), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotExport ()), ac, "file_export"); + this, TQT_SLOT (slotExport ()), ac, "file_export"); m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotScan ()), ac, "file_scan"); + this, TQT_SLOT (slotScan ()), ac, "file_scan"); //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac); m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (), - TQT_TQOBJECT(this), TQT_SLOT (slotReload ()), ac, "file_revert"); + this, TQT_SLOT (slotReload ()), ac, "file_revert"); slotEnableReload (); - m_actionPrint = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT (slotPrint ()), ac); - m_actionPrintPreview = KStdAction::printPreview (TQT_TQOBJECT(this), TQT_SLOT (slotPrintPreview ()), ac); + m_actionPrint = KStdAction::print (this, TQT_SLOT (slotPrint ()), ac); + m_actionPrintPreview = KStdAction::printPreview (this, TQT_SLOT (slotPrintPreview ()), ac); - m_actionMail = KStdAction::mail (TQT_TQOBJECT(this), TQT_SLOT (slotMail ()), ac); + m_actionMail = KStdAction::mail (this, TQT_SLOT (slotMail ()), ac); m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); + this, TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered"); m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); + this, TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled"); - m_actionClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotClose ()), ac); - m_actionQuit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotQuit ()), ac); + m_actionClose = KStdAction::close (this, TQT_SLOT (slotClose ()), ac); + m_actionQuit = KStdAction::quit (this, TQT_SLOT (slotQuit ()), ac); m_scanDialog = 0; diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp index db2a9b01..7b4488fa 100644 --- a/kolourpaint/kpmainwindow_help.cpp +++ b/kolourpaint/kpmainwindow_help.cpp @@ -57,7 +57,7 @@ void kpMainWindow::setupHelpMenuActions () // -- Thurston d->m_actionHelpTakingScreenshots = new TDEAction ( i18n ("Acquiring &Screenshots"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshots ()), + this, TQT_SLOT (slotHelpTakingScreenshots ()), ac, "help_taking_screenshots"); @@ -188,7 +188,7 @@ void kpMainWindow::slotHelpTakingScreenshots () disconnect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), messageLabel, TQT_SLOT (openLink (const TQString &))); connect (messageLabel, TQT_SIGNAL (linkClicked (const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); + this, TQT_SLOT (slotHelpTakingScreenshotsFollowLink (const TQString &))); dlg.setMainWidget (messageLabel); diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp index cb3bca73..533b11f9 100644 --- a/kolourpaint/kpmainwindow_image.cpp +++ b/kolourpaint/kpmainwindow_image.cpp @@ -90,37 +90,37 @@ void kpMainWindow::setupImageMenuActions () TDEActionCollection *ac = actionCollection (); m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E, - TQT_TQOBJECT(this), TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale"); + this, TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale"); m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T, - TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop"); + this, TQT_SLOT (slotCrop ()), ac, "image_crop"); m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U, - TQT_TQOBJECT(this), TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); + this, TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop"); m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F, - TQT_TQOBJECT(this), TQT_SLOT (slotFlip ()), ac, "image_flip"); + this, TQT_SLOT (slotFlip ()), ac, "image_flip"); m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT (slotRotate ()), ac, "image_rotate"); + this, TQT_SLOT (slotRotate ()), ac, "image_rotate"); m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K, - TQT_TQOBJECT(this), TQT_SLOT (slotSkew ()), ac, "image_skew"); + this, TQT_SLOT (slotSkew ()), ac, "image_skew"); m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); + this, TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white"); m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); + this, TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale"); m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I, - TQT_TQOBJECT(this), TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors"); + this, TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors"); m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N, - TQT_TQOBJECT(this), TQT_SLOT (slotClear ()), ac, "image_clear"); + this, TQT_SLOT (slotClear ()), ac, "image_clear"); m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M, - TQT_TQOBJECT(this), TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects"); + this, TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects"); enableImageMenuDocumentActions (false); } diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index b3a7448e..6dfff99b 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -57,19 +57,19 @@ void kpMainWindow::setupSettingsMenuActions () createStandardStatusBarAction (); - m_actionFullScreen = KStdAction::fullScreen (TQT_TQOBJECT(this), TQT_SLOT (slotFullScreen ()), ac, + m_actionFullScreen = KStdAction::fullScreen (this, TQT_SLOT (slotFullScreen ()), ac, this/*window*/); m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); + this, TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path"); m_actionShowPath->setCheckedState (i18n ("Hide &Path")); slotEnableSettingsShowPath (); - m_actionKeyBindings = KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT (slotKeyBindings ()), ac); - m_actionConfigureToolbars = KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT (slotConfigureToolBars ()), ac); - // m_actionConfigure = KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure ()), ac); + m_actionKeyBindings = KStdAction::keyBindings (this, TQT_SLOT (slotKeyBindings ()), ac); + m_actionConfigureToolbars = KStdAction::configureToolbars (this, TQT_SLOT (slotConfigureToolBars ()), ac); + // m_actionConfigure = KStdAction::preferences (this, TQT_SLOT (slotConfigure ()), ac); enableSettingsMenuDocumentActions (false); diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp index 9fd87672..11058217 100644 --- a/kolourpaint/kpmainwindow_text.cpp +++ b/kolourpaint/kpmainwindow_text.cpp @@ -50,22 +50,22 @@ void kpMainWindow::setupTextToolBarActions () TDEActionCollection *ac = actionCollection (); m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); + this, TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family"); m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); + this, TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size"); m_actionTextBold = new TDEToggleAction (i18n ("Bold"), "format-text-bold"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); + this, TQT_SLOT (slotTextBoldChanged ()), ac, "format-text-bold"); m_actionTextItalic = new TDEToggleAction (i18n ("Italic"), "format-text-italic"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); + this, TQT_SLOT (slotTextItalicChanged ()), ac, "format-text-italic"); m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"), "format-text-underline"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); + this, TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline"); m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"), "format-text-strikethrough"/*icon*/, 0/*shortcut*/, - TQT_TQOBJECT(this), TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); + this, TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru"); readAndApplyTextSettings (); diff --git a/kolourpaint/kpmainwindow_tools.cpp b/kolourpaint/kpmainwindow_tools.cpp index 50bd74ed..26c6bc00 100644 --- a/kolourpaint/kpmainwindow_tools.cpp +++ b/kolourpaint/kpmainwindow_tools.cpp @@ -103,23 +103,23 @@ void kpMainWindow::setupToolActions () m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_1), - TQT_TQOBJECT(this), TQT_SLOT (slotActionPrevToolOptionGroup1 ()), + this, TQT_SLOT (slotActionPrevToolOptionGroup1 ()), ac, "prev_tool_option_group_1"); m_actionNextToolOptionGroup1 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #1)"), kpTool::shortcutForKey (TQt::Key_2), - TQT_TQOBJECT(this), TQT_SLOT (slotActionNextToolOptionGroup1 ()), + this, TQT_SLOT (slotActionNextToolOptionGroup1 ()), ac, "next_tool_option_group_1"); m_actionPrevToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Previous Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_3), - TQT_TQOBJECT(this), TQT_SLOT (slotActionPrevToolOptionGroup2 ()), + this, TQT_SLOT (slotActionPrevToolOptionGroup2 ()), ac, "prev_tool_option_group_2"); m_actionNextToolOptionGroup2 = new kpSingleKeyTriggersAction ( i18n ("Next Tool Option (Group #2)"), kpTool::shortcutForKey (TQt::Key_4), - TQT_TQOBJECT(this), TQT_SLOT (slotActionNextToolOptionGroup2 ()), + this, TQT_SLOT (slotActionNextToolOptionGroup2 ()), ac, "next_tool_option_group_2"); } diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index f76b6183..39d6cab3 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -67,18 +67,18 @@ void kpMainWindow::setupViewMenuActions () m_actionFullScreen->setEnabled (false);*/ - m_actionActualSize = KStdAction::actualSize (TQT_TQOBJECT(this), TQT_SLOT (slotActualSize ()), ac); - /*m_actionFitToPage = KStdAction::fitToPage (TQT_TQOBJECT(this), TQT_SLOT (slotFitToPage ()), ac); - m_actionFitToWidth = KStdAction::fitToWidth (TQT_TQOBJECT(this), TQT_SLOT (slotFitToWidth ()), ac); - m_actionFitToHeight = KStdAction::fitToHeight (TQT_TQOBJECT(this), TQT_SLOT (slotFitToHeight ()), ac);*/ + m_actionActualSize = KStdAction::actualSize (this, TQT_SLOT (slotActualSize ()), ac); + /*m_actionFitToPage = KStdAction::fitToPage (this, TQT_SLOT (slotFitToPage ()), ac); + m_actionFitToWidth = KStdAction::fitToWidth (this, TQT_SLOT (slotFitToWidth ()), ac); + m_actionFitToHeight = KStdAction::fitToHeight (this, TQT_SLOT (slotFitToHeight ()), ac);*/ - m_actionZoomIn = KStdAction::zoomIn (TQT_TQOBJECT(this), TQT_SLOT (slotZoomIn ()), ac); - m_actionZoomOut = KStdAction::zoomOut (TQT_TQOBJECT(this), TQT_SLOT (slotZoomOut ()), ac); + m_actionZoomIn = KStdAction::zoomIn (this, TQT_SLOT (slotZoomIn ()), ac); + m_actionZoomOut = KStdAction::zoomOut (this, TQT_SLOT (slotZoomOut ()), ac); m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); + this, TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to"); m_actionZoom->setEditable (true); // create the zoom list for the 1st call to zoomTo() below @@ -91,7 +91,7 @@ void kpMainWindow::setupViewMenuActions () m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G, - TQT_TQOBJECT(this), TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); + this, TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid"); m_actionShowGrid->setCheckedState (i18n ("Hide &Grid")); @@ -99,12 +99,12 @@ void kpMainWindow::setupViewMenuActions () // Testcase: Press CTRL+H twice on a fresh KolourPaint. // The second CTRL+H doesn't close the thumbnail. m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H, - TQT_TQOBJECT(this), TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); + this, TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail"); m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail")); // Please do not use setCheckedState() here - it wouldn't make sense m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); + this, TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail"); // For consistency with the above action, don't use setCheckedState() // @@ -114,7 +114,7 @@ void kpMainWindow::setupViewMenuActions () d->m_actionShowThumbnailRectangle = new TDEToggleAction ( i18n ("Enable Thumbnail &Rectangle"), 0, - TQT_TQOBJECT(this), TQT_SLOT (slotThumbnailShowRectangleToggled ()), + this, TQT_SLOT (slotThumbnailShowRectangleToggled ()), actionCollection (), "view_show_thumbnail_rectangle"); @@ -511,7 +511,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor) // caused mainly by m_scrollView->center() // // TODO: remove flicker completely - //TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT (finishZoomTo ())); + //TQTimer::singleShot (0, this, TQT_SLOT (finishZoomTo ())); // Later: I don't think there is an update() that needs to be queued // - let's reduce latency instead. @@ -823,7 +823,7 @@ void kpMainWindow::notifyThumbnailGeometryChanged () { m_thumbnailSaveConfigTimer = new TQTimer (this); connect (m_thumbnailSaveConfigTimer, TQT_SIGNAL (timeout ()), - TQT_TQOBJECT(this), TQT_SLOT (slotSaveThumbnailGeometry ())); + this, TQT_SLOT (slotSaveThumbnailGeometry ())); } m_thumbnailSaveConfigTimer->start (500/*msec*/, true/*single shot*/); @@ -1122,7 +1122,7 @@ void kpMainWindow::updateThumbnail () kdDebug () << "\t\tconnecting thumbnail::visibilityChange to destroy slot" << endl; #endif connect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); #if DEBUG_KP_MAIN_WINDOW kdDebug () << "\t\tDONE" << endl; #endif @@ -1144,7 +1144,7 @@ void kpMainWindow::updateThumbnail () disconnect (m_thumbnail, TQT_SIGNAL (visibilityChanged (bool)), - TQT_TQOBJECT(this), TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); + this, TQT_SLOT (slotDestroyThumbnailIfNotVisible (bool))); m_thumbnail->deleteLater (); m_thumbnail = 0; } diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 845df5fc..0f5dbe2c 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -125,14 +125,14 @@ void Kooka::startup( void ) void Kooka::setupActions() { - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this) , TQT_SLOT(close()), actionCollection()); + KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); + KStdAction::quit(this , TQT_SLOT(close()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); m_view->createDockMenu(actionCollection(), this, "settings_show_docks" ); @@ -180,68 +180,68 @@ actionCollection()); /* thumbview and gallery actions */ act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0, - TQT_TQOBJECT(m_view), TQT_SLOT( slIVShowZoomDialog()), + m_view, TQT_SLOT( slIVShowZoomDialog()), actionCollection(), "showZoomDialog" ); m_view->connectViewerAction( act ); (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N, - TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ), + m_view, TQT_SLOT( slCreateNewImgFromSelection() ), actionCollection(), "createFromSelection" ); (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ), + this, TQT_SLOT( slMirrorVertical() ), actionCollection(), "mirrorVertical" ); (void) new TDEAction(i18n("&Mirror Image Horizontally"), "mirror-horiz", CTRL+Key_M, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ), + this, TQT_SLOT( slMirrorHorizontal() ), actionCollection(), "mirrorHorizontal" ); (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ), + this, TQT_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "document-open", CTRL+Key_G, - TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ), + m_view, TQT_SLOT( slOpenCurrInGraphApp() ), actionCollection(), "openInGraphApp" ); act = new TDEAction(i18n("&Rotate Image Clockwise"), "object-rotate-right", CTRL+Key_R, - TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ), + this, TQT_SLOT( slRotateClockWise() ), actionCollection(), "rotateClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "object-rotate-left", CTRL+Key_W, - TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ), + this, TQT_SLOT( slRotateCounterClockWise() ), actionCollection(), "rotateCounterClockwise" ); m_view->connectViewerAction( act ); act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D, - TQT_TQOBJECT(this), TQT_SLOT( slRotate180() ), + this, TQT_SLOT( slRotate180() ), actionCollection(), "upsitedown" ); m_view->connectViewerAction( act ); /* Gallery actions */ act = new TDEAction(i18n("&Create Folder..."), "folder-new", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ), + m_view->gallery(),TQT_SLOT( slotCreateFolder() ), actionCollection(), "foldernew" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Save Image..."), "document-save", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ), + m_view->gallery(),TQT_SLOT( slotExportFile() ), actionCollection(), "saveImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Import Image..."), "inline_image", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotImportFile() ), + m_view->gallery(),TQT_SLOT( slotImportFile() ), actionCollection(), "importImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Delete Image"), "edittrash", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotDeleteItems() ), + m_view->gallery(),TQT_SLOT( slotDeleteItems() ), actionCollection(), "deleteImage" ); m_view->connectGalleryAction( act ); act = new TDEAction(i18n("&Unload Image"), "window-close", 0, - TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotUnloadItems() ), + m_view->gallery(),TQT_SLOT( slotUnloadItems() ), actionCollection(), "unloadImage" ); m_view->connectGalleryAction( act ); @@ -257,11 +257,11 @@ actionCollection()); #endif (void) new TDEAction(i18n("Select Scan Device"), "scanner", 0, - TQT_TQOBJECT(m_view), TQT_SLOT( slSelectDevice()), + m_view, TQT_SLOT( slSelectDevice()), actionCollection(), "selectsource" ); (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slEnableWarnings()), + this, TQT_SLOT(slEnableWarnings()), actionCollection(), "enable_msgs"); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 8cca60ad..2bbb4756 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -191,7 +191,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU m_dockScanParam->setDockSite(KDockWidget::DockFullSite); m_dockScanParam->setWidget( 0 ); // later - sane = new KScanDevice( TQT_TQOBJECT(m_dockScanParam) ); + sane = new KScanDevice( m_dockScanParam ); TQ_CHECK_PTR(sane); m_dockScanParam->manualDock( m_dockRecent, // dock target diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index f97be985..f880645f 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -357,7 +357,7 @@ void KPDFDocument::reparseConfig() TQWidget *KPDFDocument::widget() const { - return TQT_TQWIDGET(parent()); + return static_cast(parent()); } bool KPDFDocument::isOpened() const diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 209f8760..8f2c08c3 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -66,7 +66,7 @@ void Shell::init() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", TQT_TQOBJECT(this), 0, "KParts::ReadOnlyPart"); + m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", this, 0, "KParts::ReadOnlyPart"); if (m_part) { // then, setup our actions @@ -146,19 +146,19 @@ void Shell::writeSettings() void Shell::setupActions() { - TDEAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - m_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ), actionCollection() ); + TDEAction * openAction = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + m_recent = KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ), actionCollection() ); connect( m_recent, TQT_SIGNAL( activated() ), openAction, TQT_SLOT( activate() ) ); m_recent->setWhatsThis( i18n( "Click to open a file or Click and hold to select a recent file" ) ); m_printAction = KStdAction::print( m_part, TQT_SLOT( slotPrint() ), actionCollection() ); m_printAction->setEnabled( false ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - m_showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); + m_showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); } void Shell::saveProperties(TDEConfig* config) diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index 73af93d7..87ebc8c4 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -146,7 +146,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool if ( pages < 1 ) { m_currentPage = -1; - TQT_TQWIDGET( parent() )->hide(); + static_cast( parent() )->hide(); return; } @@ -171,7 +171,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool m_pagesButton->setText( TQString::number( pages ) ); m_prevButton->setEnabled( false ); m_nextButton->setEnabled( false ); - TQT_TQWIDGET( parent() )->show(); + static_cast( parent() )->show(); } void MiniBar::notifyViewportChanged( bool /*smoothMove*/ ) @@ -333,7 +333,7 @@ PagesEdit::PagesEdit( MiniBar * parent ) focusOutEvent( 0 ); // use an integer validator - m_validator = new TQIntValidator( 1, 1, TQT_TQOBJECT(this) ); + m_validator = new TQIntValidator( 1, 1, this ); setValidator( m_validator ); // customize text properties diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index aa03cc57..b0a20f99 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -246,16 +246,16 @@ PageView::~PageView() void PageView::setupActions( TDEActionCollection * ac ) { // Zoom actions ( higher scales takes lots of memory! ) - d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" ); + d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, this, TQT_SLOT( slotZoom() ), ac, "zoom_to" ); d->aZoom->setEditable( true ); #if KDE_IS_VERSION(3,4,89) d->aZoom->setMaxComboViewCount( 13 ); #endif updateZoomText(); - KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), ac, "zoom_in" ); + KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ), ac, "zoom_in" ); - KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), ac, "zoom_out" ); + KStdAction::zoomOut( this, TQT_SLOT( slotZoomOut() ), ac, "zoom_out" ); d->aZoomFitWidth = new TDEToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" ); connect( d->aZoomFitWidth, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToWidthToggled( bool ) ) ); @@ -269,10 +269,10 @@ void PageView::setupActions( TDEActionCollection * ac ) // rotate actions TDEAction *action; action = new TDEAction( i18n("Rotate Right"), "object-rotate-right", TDEShortcut( "Ctrl+Shift++" ), - TQT_TQOBJECT(this), TQT_SLOT( slotRotateRight() ), ac, "rotate_right" ); + this, TQT_SLOT( slotRotateRight() ), ac, "rotate_right" ); action = new TDEAction( i18n("Rotate Left"), "object-rotate-left", TDEShortcut( "Ctrl+Shift+-" ), - TQT_TQOBJECT(this), TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" ); + this, TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" ); // View-Layout actions d->aViewTwoPages = new TDEToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" ); @@ -289,25 +289,25 @@ void PageView::setupActions( TDEActionCollection * ac ) d->aViewCoverPage->setEnabled( KpdfSettings::viewColumns() > 1 ); // Mouse-Mode actions - d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); + d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, this, TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" ); d->aMouseNormal->setExclusiveGroup( "MouseType" ); d->aMouseNormal->setChecked( true ); - TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); + TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, this, TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" ); mz->setExclusiveGroup( "MouseType" ); - d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); + d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, this, TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" ); d->aMouseSelect->setExclusiveGroup( "MouseType" ); -/* d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); +/* d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, this, TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" ); d->aMouseEdit->setExclusiveGroup("MouseType"); d->aMouseEdit->setEnabled( false ); // implement feature before removing this line*/ // Other actions - TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); + TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, this, TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" ); su->setShortcut( "Shift+Up" ); - TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); + TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, this, TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" ); sd->setShortcut( "Shift+Down" ); } diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index a7d2c0f0..f88726a1 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -61,7 +61,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc ) m_width = -1; - m_accel = new TDEAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" ); + m_accel = new TDEAccel( this, this, "presentationmode-accel" ); // show widget and take control showFullScreen(); @@ -100,11 +100,11 @@ PresentationWidget::~PresentationWidget() void PresentationWidget::setupActions( TDEActionCollection * ac ) { - m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ), false, true ); - m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ), false, true ); - m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotFirstPage() ), false, true ); - m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotLastPage() ), false, true ); - m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( close() ), false, true ); + m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), this, TQT_SLOT( slotPrevPage() ), false, true ); + m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), this, TQT_SLOT( slotNextPage() ), false, true ); + m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), this, TQT_SLOT( slotFirstPage() ), false, true ); + m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), this, TQT_SLOT( slotLastPage() ), false, true ); + m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), this, TQT_SLOT( close() ), false, true ); } void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool /*documentChanged*/ ) @@ -307,9 +307,9 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe ) m_topBar = new TDEToolBar( this, "presentationBar" ); m_topBar->setIconSize( 32 ); m_topBar->setMovingEnabled( false ); - m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) ); - m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ) ); - m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) ); + m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPrevPage() ) ); + m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNextPage() ) ); + m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) ); m_topBar->setGeometry( 0, 0, m_width, 32 + 10 ); m_topBar->alignItemRight( 1 ); m_topBar->hide(); diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index 8fcbfe22..4200cba7 100644 --- a/kpdf/ui/searchwidget.cpp +++ b/kpdf/ui/searchwidget.cpp @@ -45,13 +45,13 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) // 1. text line insertLined( TQString(), LEDIT_ID, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_TQOBJECT(this), TQT_SLOT( slotTextChanged(const TQString &) ), true, + this, TQT_SLOT( slotTextChanged(const TQString &) ), true, i18n( "Enter at least 3 letters to filter pages" ), 0/*size*/, 1 ); // 2. clear button (uses a lineEdit slot, so it must be created after) insertButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CLEAR_ID, TQT_SIGNAL( clicked() ), - TQT_TQOBJECT(getLined( LEDIT_ID )), TQT_SLOT( clear() ), true, + getLined( LEDIT_ID ), TQT_SLOT( clear() ), true, i18n( "Clear filter" ), 0/*index*/ ); // 3.1. create the popup menu for changing filtering features diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index 334651e0..b68eed81 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -564,7 +564,7 @@ ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * lis // insert a togglebutton [show only bookmarked pages] //insertSeparator(); insertButton( "bookmark", FILTERB_ID, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(list), TQT_SLOT( slotFilterBookmarks( bool ) ), + list, TQT_SLOT( slotFilterBookmarks( bool ) ), true, i18n( "Show bookmarked pages only" ) ); setToggle( FILTERB_ID ); setButton( FILTERB_ID, KpdfSettings::filterBookmarks() ); diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index e0b3bab5..e36f9650 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -201,6 +201,6 @@ void PMDeclareEdit::slotItemSelected( TQListBoxItem* item ) void PMDeclareEdit::slotSelect( ) { if( m_pSelectedObject ) - part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, TQT_TQOBJECT(this) ); + part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, this ); } #include "pmdeclareedit.moc" diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index c2bfeb62..12ade91e 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -325,7 +325,7 @@ void PMDialogView::slotControlPointSelectionChanged( ) { if( m_pDisplayedWidget && m_pDisplayedWidget->displayedObject( ) ) emit objectChanged( m_pDisplayedWidget->displayedObject( ), - PMCControlPointSelection, TQT_TQOBJECT(this) ); + PMCControlPointSelection, this ); } void PMDialogView::displayObject( PMObject* obj, bool updateDescription ) diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 0b9d75a9..b6b77653 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -142,7 +142,7 @@ PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f mainDockWidget = 0L; d = new PMDockMainWindowPrivate( ); - PartBase::setPartObject( TQT_TQOBJECT(this) ); + PartBase::setPartObject( this ); } PMDockMainWindow::~PMDockMainWindow() @@ -179,7 +179,7 @@ void PMDockMainWindow::createGUI( Part * part ) if( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); + loadPlugins( this, this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -485,7 +485,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); header = 0L; @@ -527,7 +527,7 @@ PMDockWidget::~PMDockWidget() d->blockHasUndockedSignal = false; } emit iMBeingClosed(); - manager->childDock->remove( TQT_TQOBJECT(this) ); + manager->childDock->remove( this ); delete pix; delete d; // destroy private data } @@ -1464,8 +1464,8 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "PMDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "PMDockTabGroup", "_dock_tab" ) ) return 0L; if (!childDockWidgetList) return 0L; if ( childDockWidgetList->find(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L; @@ -2271,7 +2271,7 @@ PMDockWidget* PMDockManager::getDockWidgetFromName( const TQString& dockName ) PMDockWidget* autoCreate = 0L; if ( autoCreateDock ){ autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); - autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 9e0e6deb..e9da1a96 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -955,12 +955,12 @@ void PMGLView::graphicalChange( const TQPoint& mousePos ) m_pActiveObject->controlPointsChangedList( m_controlPoints, changedObjects ); if( changedObjects.isEmpty( ) ) - emit objectChanged( m_pActiveObject, PMCGraphicalChange, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCGraphicalChange, this ); else { PMObjectListIterator it( changedObjects ); for( ; it.current( ); ++it ) - emit objectChanged( it.current( ), PMCGraphicalChange, TQT_TQOBJECT(this) ); + emit objectChanged( it.current( ), PMCGraphicalChange, this ); } } @@ -1353,7 +1353,7 @@ void PMGLView::selectControlPoint( PMControlPoint* cp, bool select, bool deselec } if( selectionChanged ) - emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCControlPointSelection, this ); } void PMGLView::startSelection( ) @@ -1652,7 +1652,7 @@ void PMGLView::slotControlPoint( int id ) PMControlPointListIterator cit( m_controlPoints ); for( ; cit.current( ); ++cit ) cit.current( )->setSelected( p == cit.current( ) ); - emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pActiveObject, PMCControlPointSelection, this ); } } diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index 82c02642..a48b75a1 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -52,7 +52,7 @@ PMShell::PMShell( const KURL& url ) setPluginLoadingMode( DoNotLoadPlugins ); setInstance( PMFactory::instance( ), false ); - m_pPart = new PMPart( this, "part", TQT_TQOBJECT(this), "part", true, this ); + m_pPart = new PMPart( this, "part", this, "part", true, this ); m_pPart->setReadWrite( ); // read-write mode m_viewNumber = 0; m_objectsToDelete.setAutoDelete( true ); @@ -95,66 +95,66 @@ void PMShell::setupActions( ) // m_helpMenu = new KHelpMenu( this, PMFactory::aboutData( ), true, // actionCollection( ) ); - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew( ) ), actionCollection( ) ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen( ) ), actionCollection( ) ); - m_pRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL& ) ), + KStdAction::openNew( this, TQT_SLOT( slotFileNew( ) ), actionCollection( ) ); + KStdAction::open( this, TQT_SLOT( slotFileOpen( ) ), actionCollection( ) ); + m_pRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ), actionCollection( ) ); - KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave( ) ), actionCollection( ) ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); + KStdAction::save( this, TQT_SLOT( slotFileSave( ) ), actionCollection( ) ); + KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) ); - KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT( slotFileRevert( ) ), actionCollection( ) ); - KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint( ) ), actionCollection( ) ); + KStdAction::revert( this, TQT_SLOT( slotFileRevert( ) ), actionCollection( ) ); + KStdAction::print( this, TQT_SLOT( slotFilePrint( ) ), actionCollection( ) ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose( ) ), actionCollection( ) ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close( ) ), actionCollection( ) ); + KStdAction::close( this, TQT_SLOT( slotFileClose( ) ), actionCollection( ) ); + KStdAction::quit( this, TQT_SLOT( close( ) ), actionCollection( ) ); - m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, TQT_TQOBJECT(this), + m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, this, TQT_SLOT( slotShowPath( ) ), actionCollection( ), "options_show_path" ); m_pPathAction->setCheckedState(i18n("Hide &Path")); - m_pStatusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT( slotShowStatusbar( ) ), + m_pStatusbarAction = KStdAction::showStatusbar( this, TQT_SLOT( slotShowStatusbar( ) ), actionCollection( ) ); - KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT( saveOptions( ) ), actionCollection( ) ); + KStdAction::saveOptions( this, TQT_SLOT( saveOptions( ) ), actionCollection( ) ); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys( ) ), + KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys( ) ), actionCollection( ) ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars( ) ), + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars( ) ), actionCollection( ) ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotSettings( ) ), actionCollection( ) ); + KStdAction::preferences( this, TQT_SLOT( slotSettings( ) ), actionCollection( ) ); - m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this), + m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, this, TQT_SLOT( slotNewTopView( ) ), actionCollection( ), "view_new_topview" ); - m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this), + m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, this, TQT_SLOT( slotNewBottomView( ) ), actionCollection( ), "view_new_bottomview" ); - m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this), + m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, this, TQT_SLOT( slotNewLeftView( ) ), actionCollection( ), "view_new_leftview" ); - m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this), + m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, this, TQT_SLOT( slotNewRightView( ) ), actionCollection( ), "view_new_rightview" ); - m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this), + m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, this, TQT_SLOT( slotNewFrontView( ) ), actionCollection( ), "view_new_frontview" ); - m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this), + m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, this, TQT_SLOT( slotNewBackView( ) ), actionCollection( ), "view_new_back_view" ); - m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this), + m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, this, TQT_SLOT( slotNewCameraView( ) ), actionCollection( ), "view_new_cameraview" ); - m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this), + m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, this, TQT_SLOT( slotNewTreeView( ) ), actionCollection( ), "view_new_treeview" ); - m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this), + m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, this, TQT_SLOT( slotNewDialogView( ) ), actionCollection( ), "view_new_dialogview" ); #ifdef KPM_WITH_OBJECT_LIBRARY - m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this), + m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, this, TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ), "view_new_librarybrowser" ); #endif @@ -167,7 +167,7 @@ void PMShell::setupActions( ) PMViewLayoutManager::theManager( )->fillPopupMenu( menu ); connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSelectedLayout( int ) ) ); - m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, TQT_TQOBJECT(this), + m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, this, TQT_SLOT( slotSaveViewLayout( ) ), actionCollection( ), "save_view_layout" ); } @@ -347,7 +347,7 @@ void PMShell::slotDockWidgetClosed( ) if( m_objectsToDelete.containsRef( o ) == 0 ) { m_objectsToDelete.append( o ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteClosedObjects( ) ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteClosedObjects( ) ) ); } } } @@ -377,7 +377,7 @@ void PMShell::openURL( const KURL& url ) void PMShell::slotOpenRecent( const KURL& url ) { m_openRecentURL = url; - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecentTimer( ) ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenRecentTimer( ) ) ); } void PMShell::slotOpenRecentTimer( ) diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 41cd66b9..d6597b97 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -361,7 +361,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) if( m_selectionCleared ) { - emit objectChanged( 0, PMCNewSelection, TQT_TQOBJECT(this) ); + emit objectChanged( 0, PMCNewSelection, this ); specialAction = true; } else if( m_itemSelected || m_itemDeselected ) @@ -378,7 +378,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) m_pLastSelected->setSelected( true ); emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, - TQT_TQOBJECT(this) ); + this ); } else { @@ -407,7 +407,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) { tmp->setSelected( true ); emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ), - PMCSelected, TQT_TQOBJECT(this) ); + PMCSelected, this ); if( tmp == m_pLastSelected ) break; } @@ -418,7 +418,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) { tmp->setSelected( true ); emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ), - PMCSelected, TQT_TQOBJECT(this) ); + PMCSelected, this ); if( tmp == oldCurrent ) break; } @@ -436,12 +436,12 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) if( m_itemSelected ) { if( m_pLastSelected->object( )->isSelectable( ) ) - emit objectChanged( m_pLastSelected->object( ), PMCSelected, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCSelected, this ); else m_pLastSelected->setSelected( false ); } else if( m_itemDeselected ) - emit objectChanged( m_pLastSelected->object( ), PMCDeselected, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCDeselected, this ); } m_acceptSelect = false; } @@ -526,7 +526,7 @@ void PMTreeView::viewportMouseReleaseEvent( TQMouseEvent* e ) m_pLastSelected->setSelected( true ); m_acceptSelect = false; - emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, TQT_TQOBJECT(this) ); + emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, this ); } } } @@ -769,7 +769,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e ) m_acceptSelect = false; emit objectChanged( ( ( PMTreeViewItem* ) newSelection )->object( ), - PMCNewSelection, TQT_TQOBJECT(this) ); + PMCNewSelection, this ); } if( deleteItem && m_pPart->isReadWrite( ) ) diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index be4fed35..6f5a5e9f 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -111,9 +111,9 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) autoincFilename(); } - connect( &grabTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( grabTimerDone() ) ); - connect( &updateTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( updatePreview() ) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateCaption() ) ); + connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); + connect( &updateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updatePreview() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( updateCaption() ) ); KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); @@ -139,24 +139,24 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) } TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(kapp), TQT_SLOT(quit())); + accel->insert(TDEStdAccel::Quit, kapp, TQT_SLOT(quit())); accel->insert( "QuickSave", i18n("Quick Save Snapshot &As..."), i18n("Save the snapshot to the file specified by the user without showing the file dialog."), - CTRL+SHIFT+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSave())); - accel->insert(TDEStdAccel::Save, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); -// accel->insert(TDEShortcut(CTRL+Key_A), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); + CTRL+SHIFT+Key_S, this, TQT_SLOT(slotSave())); + accel->insert(TDEStdAccel::Save, this, TQT_SLOT(slotSaveAs())); +// accel->insert(TDEShortcut(CTRL+Key_A), this, TQT_SLOT(slotSaveAs())); accel->insert( "SaveAs", i18n("Save Snapshot &As..."), i18n("Save the snapshot to the file specified by the user."), - CTRL+Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); - accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); - accel->insert(TDEStdAccel::Copy, TQT_TQOBJECT(this), TQT_SLOT(slotCopy())); - - accel->insert( "Quit2", Key_Q, TQT_TQOBJECT(this), TQT_SLOT(slotSave())); - accel->insert( "Save2", Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs())); - accel->insert( "Print2", Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrint())); - accel->insert( "New2", Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); - accel->insert( "New3", Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGrab())); + CTRL+Key_A, this, TQT_SLOT(slotSaveAs())); + accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint())); + accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab())); + accel->insert(TDEStdAccel::Copy, this, TQT_SLOT(slotCopy())); + + accel->insert( "Quit2", Key_Q, this, TQT_SLOT(slotSave())); + accel->insert( "Save2", Key_S, this, TQT_SLOT(slotSaveAs())); + accel->insert( "Print2", Key_P, this, TQT_SLOT(slotPrint())); + accel->insert( "New2", Key_N, this, TQT_SLOT(slotGrab())); + accel->insert( "New3", Key_Space, this, TQT_SLOT(slotGrab())); setEscapeButton( User1 ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( reject() ) ); diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp index a42d4da6..dd79370b 100644 --- a/ksvg/test/external/SVGTestWidget.cpp +++ b/ksvg/test/external/SVGTestWidget.cpp @@ -20,7 +20,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url) setMouseTracking(true); setFocusPolicy(TQWidget::WheelFocus); - m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished())); + m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotRenderingFinished())); if(!m_doc) return; diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 70b3ffd2..8f957cb9 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -146,103 +146,103 @@ void ImageWindow::updateActions() void ImageWindow::setupActions() { new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestNext() ), + this, TQT_SLOT( slotRequestNext() ), m_actions, "next_image" ); new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ), + this, TQT_SLOT( slotRequestPrevious() ), m_actions, "previous_image" ); new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ), + this, TQT_SLOT( imageDelete() ), m_actions, "delete_image" ); new TDEAction( i18n("Move Image to Trash"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ), + this, TQT_SLOT( imageTrash() ), m_actions, "trash_image" ); new TDEAction( i18n("Zoom In"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ), + this, TQT_SLOT( zoomIn() ), m_actions, "zoom_in" ); new TDEAction( i18n("Zoom Out"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ), + this, TQT_SLOT( zoomOut() ), m_actions, "zoom_out" ); new TDEAction( i18n("Restore Original Size"), Key_O, - TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ), + this, TQT_SLOT( showImageOriginalSize() ), m_actions, "original_size" ); new TDEAction( i18n("Maximize"), Key_M, - TQT_TQOBJECT(this), TQT_SLOT( maximize() ), + this, TQT_SLOT( maximize() ), m_actions, "maximize" ); new TDEAction( i18n("Rotate 90 Degrees"), Key_9, - TQT_TQOBJECT(this), TQT_SLOT( rotate90() ), + this, TQT_SLOT( rotate90() ), m_actions, "rotate90" ); new TDEAction( i18n("Rotate 180 Degrees"), Key_8, - TQT_TQOBJECT(this), TQT_SLOT( rotate180() ), + this, TQT_SLOT( rotate180() ), m_actions, "rotate180" ); new TDEAction( i18n("Rotate 270 Degrees"), Key_7, - TQT_TQOBJECT(this), TQT_SLOT( rotate270() ), + this, TQT_SLOT( rotate270() ), m_actions, "rotate270" ); new TDEAction( i18n("Flip Horizontally"), Key_Asterisk, - TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ), + this, TQT_SLOT( flipHoriz() ), m_actions, "flip_horicontally" ); new TDEAction( i18n("Flip Vertically"), Key_Slash, - TQT_TQOBJECT(this), TQT_SLOT( flipVert() ), + this, TQT_SLOT( flipVert() ), m_actions, "flip_vertically" ); new TDEAction( i18n("Print Image..."), TDEStdAccel::print(), - TQT_TQOBJECT(this), TQT_SLOT( printImage() ), + this, TQT_SLOT( printImage() ), m_actions, "print_image" ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ), + KStdAction::saveAs( this, TQT_SLOT( saveImage() ), m_actions, "save_image_as" ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), + KStdAction::close( this, TQT_SLOT( close() ), m_actions, "close_image" ); // -------- new TDEAction( i18n("More Brightness"), Key_B, - TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ), + this, TQT_SLOT( moreBrightness() ), m_actions, "more_brightness" ); new TDEAction( i18n("Less Brightness"), SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ), + this, TQT_SLOT( lessBrightness() ), m_actions, "less_brightness" ); new TDEAction( i18n("More Contrast"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ), + this, TQT_SLOT( moreContrast() ), m_actions, "more_contrast" ); new TDEAction( i18n("Less Contrast"), SHIFT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ), + this, TQT_SLOT( lessContrast() ), m_actions, "less_contrast" ); new TDEAction( i18n("More Gamma"), Key_G, - TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ), + this, TQT_SLOT( moreGamma() ), m_actions, "more_gamma" ); new TDEAction( i18n("Less Gamma"), SHIFT + Key_G, - TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ), + this, TQT_SLOT( lessGamma() ), m_actions, "less_gamma" ); // -------- new TDEAction( i18n("Scroll Up"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ), + this, TQT_SLOT( scrollUp() ), m_actions, "scroll_up" ); new TDEAction( i18n("Scroll Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ), + this, TQT_SLOT( scrollDown() ), m_actions, "scroll_down" ); new TDEAction( i18n("Scroll Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ), + this, TQT_SLOT( scrollLeft() ), m_actions, "scroll_left" ); new TDEAction( i18n("Scroll Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ), + this, TQT_SLOT( scrollRight() ), m_actions, "scroll_right" ); // -------- new TDEAction( i18n("Pause Slideshow"), Key_P, - TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ), + this, TQT_SLOT( pauseSlideShow() ), m_actions, "kuick_slideshow_pause" ); - TDEAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 ); + TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQT_SLOT( toggleFullscreen() ), m_actions, 0 ); TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload), - TQT_TQOBJECT(this), TQT_SLOT( reload() ), + this, TQT_SLOT( reload() ), m_actions, "reload_image" ); new TDEAction( i18n("Properties"), ALT + Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), + this, TQT_SLOT( slotProperties() ), m_actions, "properties" ); m_actions->readShortcutSettings(); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 7023eb84..6e48642a 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -246,24 +246,24 @@ void KuickShow::initGUI( const KURL& startDir ) this, TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) ); // setup actions - TDEAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ), + TDEAction *open = KStdAction::open( this, TQT_SLOT( slotOpenURL() ), coll, "openURL" ); - TDEAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), + TDEAction *print = KStdAction::print( this, TQT_SLOT( slotPrint() ), coll, "kuick_print" ); print->setText( i18n("Print Image...") ); TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( configuration() ), + this, TQT_SLOT( configuration() ), coll, "kuick_configure" ); TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide", TDEShortcut( Key_F2 ), - TQT_TQOBJECT(this), TQT_SLOT( startSlideShow() ), + this, TQT_SLOT( startSlideShow() ), coll, "kuick_slideshow" ); TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" ); + this, TQT_SLOT( about() ), coll, "about" ); oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"), "window-new", @@ -276,17 +276,17 @@ void KuickShow::initGUI( const KURL& startDir ) TQT_SLOT( toggleBrowser() )); TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInOtherWindow() ), + this, TQT_SLOT( slotShowInOtherWindow() ), coll, "kuick_showInOtherWindow" ); TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInSameWindow() ), + this, TQT_SLOT( slotShowInSameWindow() ), coll, "kuick_showInSameWindow" ); TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"), - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ), + TDEShortcut(), this, TQT_SLOT( slotShowFullscreen() ), coll, "kuick_showFullscreen" ); - TDEAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit"); + TDEAction *quit = KStdAction::quit( this, TQT_SLOT(slotQuit()), coll, "quit"); // remove TQString() parameter -- ellis coll->readShortcutSettings( TQString() ); @@ -1300,7 +1300,7 @@ void KuickShow::slotReplayEvent() DelayedRepeatEvent *e = m_delayedRepeatItem; m_delayedRepeatItem = 0L; // otherwise, eventFilter aborts - eventFilter( TQT_TQOBJECT(e->viewer), static_cast(e->event) ); + eventFilter( e->viewer, static_cast(e->event) ); delete e; // ### WORKAROUND for TQIconView bug in TQt <= 3.0.3 at least diff --git a/kview/kview.cpp b/kview/kview.cpp index f335f722..33b57312 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -59,12 +59,12 @@ KView::KView() : KParts::MainWindow( 0, "KView" ) , m_pViewer( 0 ) , m_pCanvas( 0 ) - , m_pWinModule( new KWinModule( TQT_TQOBJECT(this), KWinModule::INFO_DESKTOP ) ) + , m_pWinModule( new KWinModule( this, KWinModule::INFO_DESKTOP ) ) , m_bImageSizeChangedBlocked( false ) , m_bFullscreen( false ) { KParts::ReadWritePart * part = KParts::ComponentFactory::createPartInstanceFromLibrary( - "libkviewviewer", this, "KViewViewer Widget", TQT_TQOBJECT(this), "KImageViewer Part" ); + "libkviewviewer", this, "KViewViewer Widget", this, "KImageViewer Part" ); if( part ) { m_pViewer = static_cast( part ); @@ -112,7 +112,7 @@ KView::KView() m_pViewer->widget()->installEventFilter( this ); // reload configuration when it's changed by the conf dlg - KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), TQT_SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); setPluginLoadingMode( LoadPluginsIfEnabled ); createGUI( part ); @@ -489,9 +489,9 @@ void KView::cursorPos( const TQPoint & pos ) void KView::setupActions( TQObject * partobject ) { // File - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenFile() ), actionCollection() ); - m_paRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); - TDEAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); + KStdAction::open( this, TQT_SLOT( slotOpenFile() ), actionCollection() ); + m_paRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); + TDEAction * aClose = KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); @@ -506,15 +506,15 @@ void KView::setupActions( TQObject * partobject ) extension, TQT_SLOT( del() ), actionCollection(), "del" ); connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); } - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); // Edit - TDEAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); + TDEAction * aCopy = KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); aCopy->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) ); - m_paPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), actionCollection() ); + m_paPaste = KStdAction::paste( this, TQT_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); + TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, this, TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); TDEAction * aReload = new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), partobject, @@ -523,17 +523,17 @@ void KView::setupActions( TQObject * partobject ) connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); // Settings - m_paShowMenubar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); m_paShowStatusBar = ::tqt_cast( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); connect( m_paShowFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), actionCollection() ); + KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), actionCollection() ); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index e65f0302..5b51acee 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -75,7 +75,7 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) ); KSettings::Dispatcher::self()->registerInstance( - KImageCanvasFactory::instance(), TQT_TQOBJECT(this), + KImageCanvasFactory::instance(), this, TQT_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index 849fb1ec..f9ea3e73 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -147,7 +147,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas /** * @return a pointer to the TQWidget interface of this object */ - TQWidget * widget() { return static_cast( this ); } + TQWidget * widget() { return this; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index c70ea673..48195506 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, KImageIO::registerFormats(); TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery( - "KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) ); + "KImageViewer/Canvas", TQString(), m_pParentWidget ); m_pCanvas = static_cast( widget->tqt_cast( "KImageViewer::Canvas" ) ); kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl; if( ! ( widget && m_pCanvas ) ) diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index ed21f123..00b0790b 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -167,7 +167,7 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) { KService::Ptr service = *i; mViewer = KParts::ComponentFactory:: - createPartInstanceFromService( service, this, 0, TQT_TQOBJECT(this) ); + createPartInstanceFromService( service, this, 0, this ); // is this the correct way to get the supported mimetypes? if (mViewer) @@ -236,8 +236,8 @@ PhotoBookPart::PhotoBookPart( bv, TQT_SIGNAL(emitUpdateButton(bool, bool)), this, TQT_SLOT(slotUpdateButton(bool, bool)) ); - m_pNextAction = KStdAction::next(TQT_TQOBJECT(bv), TQT_SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(TQT_TQOBJECT(bv), TQT_SLOT(previous()), actionCollection(), "previous"); + m_pNextAction = KStdAction::next(bv, TQT_SLOT(next()), actionCollection(), "next"); + m_pPreviousAction = KStdAction::prior(bv, TQT_SLOT(previous()), actionCollection(), "previous"); setXMLFile( "photobookui.rc" ); 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")); } diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index e8194b6d..b899c76f 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -147,11 +147,11 @@ Previewer::Previewer(TQWidget *parent, const char *name ) /* Actions for the previewer zoom */ TDEAction *act; act = new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, - TQT_TQOBJECT(this), TQT_SLOT( slScaleToWidth()), TQT_TQOBJECT(this), "preview_scaletowidth" ); + this, TQT_SLOT( slScaleToWidth()), this, "preview_scaletowidth" ); act->plug( img_canvas->contextMenu()); act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, - TQT_TQOBJECT(this), TQT_SLOT( slScaleToHeight()), TQT_TQOBJECT(this), "preview_scaletoheight" ); + this, TQT_SLOT( slScaleToHeight()), this, "preview_scaletoheight" ); act->plug( img_canvas->contextMenu()); /*Signals: Control the custom-field and show size of selection */ diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index f2656e33..2a989212 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -78,7 +78,7 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) TQ_CHECK_PTR( splitter ); m_scanParams = 0; - m_device = new KScanDevice( TQT_TQOBJECT(this) ); + m_device = new KScanDevice( this ); connect(m_device, TQT_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)), this, TQT_SLOT(slotFinalImage(TQImage *, ImgScanInfo *))); diff --git a/tdeiconedit/tdeicon.cpp b/tdeiconedit/tdeicon.cpp index cd3ab63a..7a1eb3d9 100644 --- a/tdeiconedit/tdeicon.cpp +++ b/tdeiconedit/tdeicon.cpp @@ -155,7 +155,7 @@ bool TDEIconEditIcon::promptForFile(const TQImage *img) KURL url = KFileDialog::getOpenURL( TQString(), filter ); */ bool loaded = false; - KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(parent()) ); + KURL url = KFileDialog::getImageOpenURL( TQString(), static_cast(parent()) ); if( !url.isEmpty() ) { @@ -174,7 +174,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image) TQString file; //Get list of file types.. - KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(parent()), "file dialog", true); + KFileDialog *dialog=new KFileDialog(TQString(), TQString(), static_cast(parent()), "file dialog", true); dialog->setCaption( i18n("Save Icon As") ); dialog->setKeepLocation( true ); dialog->setMimeFilter( KImageIO::mimeTypes(KImageIO::Writing), "image/png" ); @@ -206,7 +206,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image) if(TQFile::exists(file)) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(file), i18n( "Overwrite File?" ), diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp index b4fe1d49..61a80ec7 100644 --- a/tdeiconedit/tdeiconedit.cpp +++ b/tdeiconedit/tdeiconedit.cpp @@ -64,7 +64,7 @@ void TDEIconEdit::init() gridview = new KGridView(&img, history, this); grid = gridview->grid(); - icon = new TDEIconEditIcon(TQT_TQOBJECT(this), &grid->image()); + icon = new TDEIconEditIcon(this, &grid->image()); setAcceptDrops(true); @@ -240,43 +240,43 @@ void TDEIconEdit::setupActions() // File Menu action = new TDEAction(i18n("New &Window"), "window-new", cut, - TQT_TQOBJECT(this), TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window"); + this, TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window"); action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window.")); - action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection()); + action = KStdAction::openNew(this, TQT_SLOT(slotNew()), actionCollection()); action->setWhatsThis(i18n("New\n\nCreate a new icon, either from a" " template or by specifying the size")); - action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection()); + action = KStdAction::open(this, TQT_SLOT(slotOpen()), actionCollection()); action->setWhatsThis(i18n("Open\n\nOpen an existing icon")); - m_actRecent = KStdAction::openRecent(TQT_TQOBJECT(this), + m_actRecent = KStdAction::openRecent(this, TQT_SLOT(slotOpenRecent(const KURL&)), actionCollection()); m_actRecent->setMaxItems(15); // FIXME should be configurable! m_actRecent->loadEntries(kapp->config()); - action = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection()); + action = KStdAction::save(this, TQT_SLOT(slotSave()), actionCollection()); action->setWhatsThis(i18n("Save\n\nSave the current icon")); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), actionCollection()); - action = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); + action = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); action->setWhatsThis(i18n("Print\n\nOpens a print dialog to let you print" " the current icon.")); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); // Edit Menu - m_actCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); + m_actCut = KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); m_actCut->setWhatsThis(i18n("Cut\n\nCut the current selection out of the" " icon.\n\n(Tip: You can make both rectangular and circular selections)")); - m_actCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); + m_actCopy = KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); m_actCopy->setWhatsThis(i18n("Copy\n\nCopy the current selection out of the" " icon.\n\n(Tip: You can make both rectangular and circular selections)")); - m_actPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); + m_actPaste = KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); m_actPaste->setWhatsThis(i18n("Paste\n\n" "Paste the contents of the clipboard into the current icon.\n\n" "If the contents are larger than the current icon you can paste them" @@ -284,29 +284,29 @@ void TDEIconEdit::setupActions() "(Tip: Select \"Paste transparent pixels\" in the configuration dialog" " if you also want to paste transparency.)")); - m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid), + m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, grid, TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" ); - KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection()); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); + KStdAction::clear(this, TQT_SLOT(slotClear()), actionCollection()); + KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); action = new TDEAction(i18n("Resi&ze..."), "transform", cut, - TQT_TQOBJECT(grid), TQT_SLOT(editResize()), actionCollection(), "edit_resize"); + grid, TQT_SLOT(editResize()), actionCollection(), "edit_resize"); action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while" " trying to preserve the contents")); action = new TDEAction(i18n("&GrayScale"), "grayscale", cut, - TQT_TQOBJECT(grid), TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale"); + grid, TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale"); action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n" "(Warning: The result is likely to contain colors not in the icon" " palette")); // View Menu - m_actZoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()), + m_actZoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection()); m_actZoomIn->setWhatsThis(i18n("Zoom in\n\nZoom in by one.")); - m_actZoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()), + m_actZoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one.")); @@ -314,26 +314,26 @@ void TDEIconEdit::setupActions() actionCollection(), "view_zoom" ); // xgettext:no-c-format - action = new TDEAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ), + action = new TDEAction( i18n( "100%" ), cut, this, TQT_SLOT( slotZoom1() ), actionCollection(), "view_zoom_1" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ), + action = new TDEAction( i18n( "200%" ), cut, this, TQT_SLOT( slotZoom2() ), actionCollection(), "view_zoom_2" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ), + action = new TDEAction( i18n( "500%" ), cut, this, TQT_SLOT( slotZoom5() ), actionCollection(), "view_zoom_5" ); actMenu->insert( action ); // xgettext:no-c-format - action = new TDEAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ), + action = new TDEAction( i18n( "1000%" ), cut, this, TQT_SLOT( slotZoom10() ), actionCollection(), "view_zoom_10" ); actMenu->insert( action ); // Settings Menu - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), + KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureSettings()), + KStdAction::preferences(this, TQT_SLOT(slotConfigureSettings()), actionCollection()); createStandardStatusBarAction(); @@ -341,7 +341,7 @@ void TDEIconEdit::setupActions() TDEToggleAction *toggle; toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid", - cut, TQT_TQOBJECT(this), TQT_SLOT( slotShowGrid() ), actionCollection(), + cut, this, TQT_SLOT( slotShowGrid() ), actionCollection(), "options_show_grid" ); toggle->setCheckedState(i18n("Hide &Grid")); toggle->setWhatsThis( i18n( "Show grid\n\nToggles the grid in the icon" @@ -350,14 +350,14 @@ void TDEIconEdit::setupActions() // Tools Menu toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolPointer()), actionCollection(), + cut, this, TQT_SLOT(slotToolPointer()), actionCollection(), "tool_find_pixel"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked" " on will be the current draw color")); toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFreehand()), actionCollection(), + cut, this, TQT_SLOT(slotToolFreehand()), actionCollection(), "tool_freehand"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Free hand\n\nDraw non-linear lines")); @@ -366,64 +366,64 @@ void TDEIconEdit::setupActions() grid->setTool(TDEIconEditGrid::Freehand); toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolRectangle()), actionCollection(), + cut, this, TQT_SLOT(slotToolRectangle()), actionCollection(), "tool_rectangle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle")); toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledRectangle()), actionCollection(), + cut, this, TQT_SLOT(slotToolFilledRectangle()), actionCollection(), "tool_filled_rectangle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle")); toolAction = new TDERadioAction(i18n("Circle"), "circle", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolCircle()), actionCollection(), + cut, this, TQT_SLOT(slotToolCircle()), actionCollection(), "tool_circle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle")); toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledCircle()), actionCollection(), + cut, this, TQT_SLOT(slotToolFilledCircle()), actionCollection(), "tool_filled_circle"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle")); toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEllipse()), actionCollection(), + cut, this, TQT_SLOT(slotToolEllipse()), actionCollection(), "tool_ellipse"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse")); toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledEllipse()), actionCollection(), + cut, this, TQT_SLOT(slotToolFilledEllipse()), actionCollection(), "tool_filled_ellipse"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse")); toolAction = new TDERadioAction(i18n("Spray"), "airbrush", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSpray()), actionCollection(), + cut, this, TQT_SLOT(slotToolSpray()), actionCollection(), "tool_spray"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the" " current color")); toolAction = new TDERadioAction(i18n("Flood Fill"), "fill", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFlood()), actionCollection(), + cut, this, TQT_SLOT(slotToolFlood()), actionCollection(), "tool_flood_fill"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with" " the same color with the current color")); toolAction = new TDERadioAction(i18n("Line"), "line", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolLine()), actionCollection(), + cut, this, TQT_SLOT(slotToolLine()), actionCollection(), "tool_line"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically," " horizontally or at 45 deg. angles")); toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser", - cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEraser()), actionCollection(), + cut, this, TQT_SLOT(slotToolEraser()), actionCollection(), "tool_eraser"); toolAction->setExclusiveGroup("toolActions"); toolAction->setWhatsThis(i18n("Erase\n\nErase pixels. Set the pixels to" @@ -432,14 +432,14 @@ void TDEIconEdit::setupActions() " to use)")); toolAction = new TDERadioAction(i18n("Rectangular Selection"), - "selectrect", cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSelectRect()), + "selectrect", cut, this, TQT_SLOT(slotToolSelectRect()), actionCollection(), "edit_select_rectangle"); toolAction->setExclusiveGroup( "toolActions" ); toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section" " of the icon using the mouse.")); toolAction = new TDERadioAction(i18n("Circular Selection"), - "selectcircle", cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSelectCircle()), + "selectcircle", cut, this, TQT_SLOT(slotToolSelectCircle()), actionCollection(), "edit_select_circle"); toolAction->setExclusiveGroup( "toolActions" ); toolAction->setWhatsThis(i18n("Select\n\nSelect a circular section of the" -- cgit v1.2.1