diff options
Diffstat (limited to 'kpresenter')
| -rw-r--r-- | kpresenter/KPrBackground.cpp | 2 | ||||
| -rw-r--r-- | kpresenter/KPrView.cpp | 522 |
2 files changed, 262 insertions, 262 deletions
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 1f8281ac..a3fdbedc 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -524,7 +524,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T double w = _origSize.width(); w *= ext.width(); #if KDE_IS_VERSION(3,1,90) - TQRect desk = TDEGlobalSettings::desktopGeometry(TQT_TQWIDGET(kapp->activeWindow())); + TQRect desk = TDEGlobalSettings::desktopGeometry(kapp->activeWindow()); #else TQRect desk = TQApplication::desktop()->screenGeometry(); #endif diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 88d54ad6..e43e3ce0 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -364,14 +364,14 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( shell() ) changeNbOfRecentFiles( m_pKPresenterDoc->maxRecentFiles() ); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); + connect(this, TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); connect( m_pKPresenterDoc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - TQT_TQOBJECT(this), TQT_SLOT( refreshCustomMenu())); + this, TQT_SLOT( refreshCustomMenu())); // Cut and copy are directly connected to the selectionChanged signal if ( m_pKPresenterDoc->isReadWrite() ) connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); + this, TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); else actionEditCut->setEnabled( false ); @@ -389,16 +389,16 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); //statusbar stuff - connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( currentPageChanged(int) ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); - connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); - connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateRuler())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateScrollBarRanges())); - connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),TQT_TQOBJECT(this), TQT_SLOT(updateSideBarMenu())); - connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),TQT_TQOBJECT(this), TQT_SLOT(slotUnitChanged(KoUnit::Unit))); - connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( documentModified( bool )) ); - connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished())); + connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), this, TQT_SLOT( pageNumChanged()) ); + connect( this, TQT_SIGNAL( currentPageChanged(int) ), this, TQT_SLOT( pageNumChanged()) ); + connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); + connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), this, TQT_SLOT( updateObjectStatusBarItem() )); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateRuler())); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),this, TQT_SLOT( slotUpdateScrollBarRanges())); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),this, TQT_SLOT(updateSideBarMenu())); + connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),this, TQT_SLOT(slotUnitChanged(KoUnit::Unit))); + connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), this, TQT_SLOT( documentModified( bool )) ); + connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(loadingFinished())); KStatusBar * sb = statusBar(); m_sbPageLabel = 0L; @@ -1075,13 +1075,13 @@ void KPrView::toolsAutoform() afChoose->setCaption( i18n( "Insert Autoform" ) ); TQObject::connect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); + this, TQT_SLOT( afChooseOk( const TQString & ) ) ); TQObject::connect( afChoose, TQT_SIGNAL( afchooseCanceled()), - TQT_TQOBJECT(this), TQT_SLOT(slotAfchooseCanceled())); + this, TQT_SLOT(slotAfchooseCanceled())); afChoose->exec(); TQObject::disconnect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); + this, TQT_SLOT( afChooseOk( const TQString & ) ) ); delete afChoose; afChoose = 0; } @@ -1235,9 +1235,9 @@ void KPrView::extraProperties() m_propertyEditor = new KPrPropertyEditor( this, "KPrPropertyEditor", m_canvas->activePage(), m_pKPresenterDoc ); m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); + connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); m_propertyEditor->exec(); - disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); + disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); delete m_propertyEditor; m_propertyEditor = 0; @@ -1260,7 +1260,7 @@ void KPrView::extraRotate() if ( m_canvas->numberOfObjectSelected() > 0 ) { if ( !rotateDia ) { rotateDia = new KPrRotationDialogImpl( this ); - connect( rotateDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( rotateOk() ) ); + connect( rotateDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( rotateOk() ) ); } rotateDia->setAngle( m_canvas->getSelectedObj()->getAngle() ); m_canvas->setToolEditMode( TEM_MOUSE ); @@ -1275,7 +1275,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); shadowDia->resize( shadowDia->minimumSize() ); - connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); + connect( shadowDia, TQT_SIGNAL( apply() ), this, TQT_SLOT( shadowOk() ) ); } KPrObject *object=m_canvas->getSelectedObj(); @@ -1305,10 +1305,10 @@ void KPrView::extraBackground() page->getBackYFactor( ), page ); backDia->setCaption( i18n( "Slide Background" ) ); - TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; + TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; backDia->exec(); - TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); + TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), this, TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); delete backDia; } @@ -1453,10 +1453,10 @@ void KPrView::screenConfigPages() delete pgConfDia; pgConfDia = new KPrPgConfDia( this, kPresenterDoc() ); pgConfDia->setCaption( i18n( "Configure Slide Show" ) ); - TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); + TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); pgConfDia->exec(); - TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); + TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), this, TQT_SLOT( pgConfOk() ) ); delete pgConfDia; pgConfDia = 0; } @@ -1838,7 +1838,7 @@ void KPrView::mtextFont() , this, 0 ); connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - TQT_TQOBJECT(this), TQT_SLOT( slotApplyFont() ) ); + this, TQT_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -2164,7 +2164,7 @@ void KPrView::createGUI() connect( sidebar, TQT_SIGNAL( selectPage( int, bool ) ), m_pKPresenterDoc, TQT_SLOT( selectPage( int, bool ) ) ); connect( sidebar, TQT_SIGNAL( showPage( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( skipToPage( int ) ) ); + this, TQT_SLOT( skipToPage( int ) ) ); // This sucks when resizing the window //splitter->setResizeMode( sidebar, TQSplitter::FollowSizeHint ); //splitter->setResizeMode( pageBase, TQSplitter::Stretch ); @@ -2180,15 +2180,15 @@ void KPrView::createGUI() m_canvas=new KPrCanvas( pageBase, "Canvas", this ); TQObject::connect( m_canvas, TQT_SIGNAL( fontChanged( const TQFont & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); + this, TQT_SLOT( fontChanged( const TQFont & ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( colorChanged( const TQColor & ) ), - TQT_TQOBJECT(this), TQT_SLOT( colorChanged( const TQColor & ) ) ); + this, TQT_SLOT( colorChanged( const TQColor & ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( alignChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( alignChanged( int ) ) ); + this, TQT_SLOT( alignChanged( int ) ) ); TQObject::connect( m_canvas, TQT_SIGNAL( objectSelectedChanged()), - TQT_TQOBJECT(this), TQT_SLOT( objectSelectedChanged())); + this, TQT_SLOT( objectSelectedChanged())); TQObject::connect( m_canvas, TQT_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), - TQT_TQOBJECT(this), TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); + this, TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); // setup notebar. @@ -2207,8 +2207,8 @@ void KPrView::createGUI() if ( m_pKPresenterDoc && m_canvas ) { - TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( stopAutomaticPresentation() ) ); - TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( restartPresentation() ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), this, TQT_SLOT( stopAutomaticPresentation() ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), this, TQT_SLOT( restartPresentation() ) ); connect( getVRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); @@ -2250,7 +2250,7 @@ void KPrView::createGUI() } else actionViewShowNoteBar->setChecked(true); // HACK This is needed to be able to calculate a good initial size for the notebar - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( initialLayoutOfSplitter() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( initialLayoutOfSplitter() ) ); } KPrPage *initPage=m_pKPresenterDoc->initialActivePage(); if ( !initPage ) @@ -2316,179 +2316,179 @@ void KPrView::guiActivateEvent( KParts::GUIActivateEvent *ev ) void KPrView::setupActions() { - actionEditCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + actionEditCut = KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); + actionEditCopy = KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + actionEditPaste = KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); connect( m_pKPresenterDoc, TQT_SIGNAL( enablePaste( bool ) ), actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state actionEditDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", CTRL + TQt::Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( editDelete() ), + this, TQT_SLOT( editDelete() ), actionCollection(), "edit_delete" ); - actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - actionEditDeSelectAll= KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); + actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + actionEditDeSelectAll= KStdAction::deselect( this, TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); actionEditCopyPage = new TDEAction( i18n( "Copy Slide" ), "edit-copy", - 0, TQT_TQOBJECT(this), TQT_SLOT( editCopyPage() ), + 0, this, TQT_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new TDEAction( i18n( "Duplicate Slide" ), "newslide", - 0, TQT_TQOBJECT(this), TQT_SLOT( editDuplicatePage() ), + 0, this, TQT_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); actionEditDelPage = new TDEAction( i18n( "Delete Slide" ), "delslide", 0, - TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ), + this, TQT_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + actionEditFind=KStdAction::find( this, TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); + actionEditFindNext = KStdAction::findNext( this, TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + actionEditFindPrevious = KStdAction::findPrev( this, TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + actionEditReplace=KStdAction::replace( this, TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); // ---------------- View actions if ( !m_pKPresenterDoc->isEmbedded() ) { actionViewShowSideBar = new TDEToggleAction( i18n("Show Sidebar"), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewShowSideBar() ), + this, TQT_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); actionViewShowNoteBar = new TDEToggleAction( i18n("Show Notebar"), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewShowNoteBar() ), + this, TQT_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), + this, TQT_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KPresenter shows you tabs, spaces, carriage returns and other non-printing characters." ) ); actionViewSlideMaster = new TDEToggleAction( i18n( "Slide &Master" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewSlideMaster() ), + this, TQT_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); actionViewShowGuideLine= new TDEToggleAction( i18n( "Guide Lines" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), + this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); actionViewShowGrid = new TDEToggleAction( i18n( "Show &Grid" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), + this, TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), + this, TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions actionInsertPage = new TDEAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, - TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), + this, TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); new TDEAction( i18n( "Insert &Slide..." ), "newslide", 0, - TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), + this, TQT_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); actionInsertPicture = new TDEAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, - TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), + this, TQT_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions actionToolsMouse = new TDEToggleAction( i18n( "Select" ), "select", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsMouse() ), + this, TQT_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); actionToolsRotate = new TDEToggleAction( i18n( "&Rotate" ), "rotate", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsRotate() ), + this, TQT_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); actionToolsZoom = new TDEToggleAction( i18n( "&Zoom" ), "viewmag", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsZoom() ), + this, TQT_SLOT( toolsZoom() ), actionCollection(), "tools_zoom" ); actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new TDEActionMenu( i18n( "&Shape" ), "rectangle", actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); - connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); + connect(actionToolsShapePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsShapePopup())); actionToolsRectangle = new TDEToggleAction( i18n( "&Rectangle" ), "rectangle", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsRectangle() ), + 0, this, TQT_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); actionToolsCircleOrEllipse = new TDEToggleAction( i18n( "&Circle/Ellipse" ), "circle", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsCircleOrEllipse() ), + 0, this, TQT_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); actionToolsPie = new TDEToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsPie() ), + this, TQT_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); actionToolsText = new TDEToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord - TQT_TQOBJECT(this), TQT_SLOT( toolsText() ), + this, TQT_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); actionToolsAutoform = new TDEToggleAction( i18n( "&Arrows && Connections" ), "autoform", - 0, TQT_TQOBJECT(this), TQT_SLOT( toolsAutoform() ), + 0, this, TQT_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); actionToolsDiagramm = new TDEToggleAction( i18n( "&Chart" ), "frame_chart", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsDiagramm() ), + this, TQT_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); actionToolsTable = new TDEToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, - TQT_TQOBJECT(this), TQT_SLOT( toolsTable() ), + this, TQT_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); actionToolsObject = new KoPartSelectAction( i18n( "&Object" ), "frame_query", - TQT_TQOBJECT(this), TQT_SLOT( toolsObject() ), + this, TQT_SLOT( toolsObject() ), actionCollection(), "tools_object" ); actionToolsLinePopup = new TDEActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); - connect(actionToolsLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsLinePopup())); + connect(actionToolsLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsLinePopup())); actionToolsLine = new TDEToggleAction( i18n( "&Line" ), "line", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsLine() ), + this, TQT_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); actionToolsFreehand = new TDEToggleAction( i18n( "&Freehand" ), "freehand", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsFreehand() ), + this, TQT_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); actionToolsPolyline = new TDEToggleAction( i18n( "Po&lyline" ), "polyline", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsPolyline() ), + this, TQT_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); actionToolsQuadricBezierCurve = new TDEToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsQuadricBezierCurve() ), + this, TQT_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsCubicBezierCurve = new TDEToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsCubicBezierCurve() ), + this, TQT_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); actionToolsConvexOrConcavePolygon = new TDEToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsConvexOrConcavePolygon() ), + this, TQT_SLOT( toolsConvexOrConcavePolygon() ), actionCollection(), "tools_polygon" ); actionToolsConvexOrConcavePolygon->setExclusiveGroup( "tools" ); @@ -2496,39 +2496,39 @@ void KPrView::setupActions() actionToolsClosedLinePopup = new TDEActionMenu( i18n( "&Closed Line" ), "closed_freehand", actionCollection(), "tools_closed_linepopup" ); actionToolsClosedLinePopup->setDelayed(true); - connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsClosedLinePopup())); + connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), this, TQT_SLOT(toolsClosedLinePopup())); actionToolsClosedFreehand = new TDEToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedFreehand() ), + this, TQT_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); actionToolsClosedPolyline = new TDEToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedPolyline() ), + this, TQT_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); actionToolsClosedQuadricBezierCurve = new TDEToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedQuadricBezierCurve() ), + this, TQT_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsClosedCubicBezierCurve = new TDEToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, - TQT_TQOBJECT(this), TQT_SLOT( toolsClosedCubicBezierCurve() ), + this, TQT_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new TDEAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( mtextFont() ), + actionTextFont = new TDEAction( i18n( "&Font..." ), 0, this, TQT_SLOT( mtextFont() ), actionCollection(), "text_font" ); actionTextFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); + this, TQT_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG actionTextFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -2539,22 +2539,22 @@ void KPrView::setupActions() actionCollection(), "text_fontfamily" ); #endif connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString & ) ) ); + this, TQT_SLOT( fontSelected( const TQString & ) ) ); actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", CTRL + TQt::Key_B, - TQT_TQOBJECT(this), TQT_SLOT( textBold() ), + this, TQT_SLOT( textBold() ), actionCollection(), "format-text-bold" ); actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", CTRL + TQt::Key_I, - TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), + this, TQT_SLOT( textItalic() ), actionCollection(), "format-text-italic" ); actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", CTRL + TQt::Key_U, - TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), + this, TQT_SLOT( textUnderline() ), actionCollection(), "text_underline" ); actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), + this, TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); actionTextColor = new TTDESelectColorAction( i18n( "&Color..." ), TTDESelectColorAction::TextColor, @@ -2564,23 +2564,23 @@ void KPrView::setupActions() actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", ALT + TQt::Key_L, - TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), + this, TQT_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); actionTextAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), + this, TQT_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", ALT + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), + this, TQT_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); actionTextAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, - TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), + this, TQT_SLOT( textAlignBlock() ), actionCollection(), "text_alignblock" ); actionTextAlignBlock->setExclusiveGroup( "align" ); @@ -2596,7 +2596,7 @@ void KPrView::setupActions() // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQT_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise @@ -2609,29 +2609,29 @@ void KPrView::setupActions() actionFormatNumber->insert( act ); } actionTextDepthPlus = new TDEAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", - CTRL + TQt::Key_Plus, TQT_TQOBJECT(this), TQT_SLOT( textDepthPlus() ), + CTRL + TQt::Key_Plus, this, TQT_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); actionTextDepthMinus = new TDEAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", - CTRL + TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( textDepthMinus() ), + CTRL + TQt::Key_Minus, this, TQT_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); actionTextExtentCont2Height = new TDEAction( i18n( "Extend Contents to Object &Height" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), + this, TQT_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); actionTextExtendObj2Cont = new TDEAction( i18n( "&Extend Object to Fit Contents" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), + this, TQT_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); actionTextInsertPageNum = new TDEAction( i18n( "&Insert Slide Number" ), "pgnum", 0, - TQT_TQOBJECT(this), TQT_SLOT( textInsertPageNum() ), + this, TQT_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraProperties() ), + this, TQT_SLOT( extraProperties() ), actionCollection(), "extra_properties" ); actionExtraArrangePopup = new TDEActionMenu( i18n( "Arra&nge Objects" ), "arrange", @@ -2639,98 +2639,98 @@ void KPrView::setupActions() actionExtraArrangePopup->setDelayed( false ); actionExtraRaise = new TDEAction( i18n( "Ra&ise Objects" ), "raise", - CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( extraRaise() ), + CTRL+TQt::SHIFT+TQt::Key_R, this, TQT_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); actionExtraLower = new TDEAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, - TQT_TQOBJECT(this), TQT_SLOT( extraLower() ), + this, TQT_SLOT( extraLower() ), actionCollection(), "extra_lower" ); actionExtraBringForward= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, TQT_TQOBJECT(this), TQT_SLOT( extraBringForward() ), + 0, this, TQT_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); actionExtraSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, TQT_TQOBJECT(this), TQT_SLOT( extraSendBackward() ), + 0, this, TQT_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "object-rotate-right", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraRotate() ), + this, TQT_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); actionExtraShadow = new TDEAction( i18n( "&Shadow Objects..." ), "shadow", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraShadow() ), + this, TQT_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); actionExtraAlignObjLeft = new TDEAction( i18n( "Align &Left" ), "aoleft", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjLeft() ), + this, TQT_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); actionExtraAlignObjCenterH = new TDEAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterH() ), + this, TQT_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); actionExtraAlignObjRight = new TDEAction( i18n( "Align &Right" ), "aoright", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjRight() ), + this, TQT_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); actionExtraAlignObjTop = new TDEAction( i18n( "Align &Top" ), "aotop", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjTop() ), + this, TQT_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); actionExtraAlignObjCenterV = new TDEAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterV() ), + this, TQT_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); actionExtraAlignObjBottom = new TDEAction( i18n( "Align &Bottom" ), "aobottom", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjBottom() ), + this, TQT_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); actionExtraBackground = new TDEAction( i18n( "Slide Bac&kground..." ), "background", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraBackground() ), + this, TQT_SLOT( extraBackground() ), actionCollection(), "extra_background" ); actionExtraLayout = new TDEAction( i18n( "Page &Layout..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLayout() ), + this, TQT_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); m_actionExtraHeader = new TDEToggleAction( i18n( "Enable Document &Header" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), + this, TQT_SLOT( viewHeader() ), actionCollection(), "extra_header" ); m_actionExtraHeader->setCheckedState( i18n( "Disable Document &Header" ) ); m_actionExtraHeader->setToolTip( i18n( "Shows and hides header display for the current slide." ) ); m_actionExtraFooter = new TDEToggleAction( i18n( "Enable Document Foo&ter" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), + this, TQT_SLOT( viewFooter() ), actionCollection(), "extra_footer" ); m_actionExtraFooter->setCheckedState( i18n( "Disable Document Foo&ter" ) ); m_actionExtraFooter->setToolTip( i18n( "Shows and hides footer display for the current slide." ) ); actionExtraConfigure = new TDEAction( i18n( "Configure KPresenter..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraConfigure() ), + this, TQT_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); actionExtraWebPres = new TDEAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraWebPres() ), + this, TQT_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); actionExtraMSPres = new TDEAction( i18n( "Create Memor&y Stick Slideshow..." ), - 0, TQT_TQOBJECT(this), TQT_SLOT( extraMSPres() ), + 0, this, TQT_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); actionExtraCreateTemplate = new TDEAction( i18n( "Template Manager" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), + this, TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); actionExtraDefaultTemplate = new TDEAction( i18n( "Use Current Slide as Default Template" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraDefaultTemplate() ), + this, TQT_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); actionExtraAlignObjsPopup = new TDEActionMenu( i18n("Align O&bjects"), "alignobjs", @@ -2738,20 +2738,20 @@ void KPrView::setupActions() actionExtraAlignObjsPopup->setDelayed( false ); actionExtraLineBegin = new TDEAction( i18n("Line Begin"), "line_begin", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLineBegin() ), + this, TQT_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); actionExtraLineEnd = new TDEAction( i18n("Line End"), "line_end", 0, - TQT_TQOBJECT(this), TQT_SLOT( extraLineEnd() ), + this, TQT_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style", - TQT_TQOBJECT(this), TQT_SLOT( extraPenStyle(int) ), + this, TQT_SLOT( extraPenStyle(int) ), actionCollection(), "extra_penstyle" ); actionExtraPenStyle->setShowCurrentSelection(false); actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width", - TQT_TQOBJECT(this), TQT_SLOT( extraPenWidth(double) ), + this, TQT_SLOT( extraPenWidth(double) ), actionCollection(), "extra_penwidth" ); actionExtraPenWidth->setUnit( kPresenterDoc()->unit() ); actionExtraPenWidth->setShowCurrentSelection(false); @@ -2760,65 +2760,65 @@ void KPrView::setupActions() actionExtraGroup = new TDEAction( i18n( "&Group Objects" ), "group", TQKeySequence( "Ctrl+G" ), - TQT_TQOBJECT(this), TQT_SLOT( extraGroup() ), + this, TQT_SLOT( extraGroup() ), actionCollection(), "extra_group" ); actionExtraUnGroup = new TDEAction( i18n( "&Ungroup Objects" ), "ungroup", TQKeySequence( "Ctrl+Shift+G" ), - TQT_TQOBJECT(this), TQT_SLOT( extraUnGroup() ), + this, TQT_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions actionScreenConfigPages = new TDEAction( i18n( "&Configure Slide Show..." ), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenConfigPages() ), + this, TQT_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); actionScreenAssignEffect = new TDEAction( i18n( "Edit &Object Effect..." ), "effect", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenAssignEffect() ), + this, TQT_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); actionScreenTransEffect = new TDEAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenTransEffect() ), + this, TQT_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); actionScreenStart = new TDEAction( i18n( "&Start" ), "2rightarrow", TQt::Key_F12, - TQT_TQOBJECT(this), TQT_SLOT( screenStart() ), + this, TQT_SLOT( screenStart() ), actionCollection(), "screen_start" ); actionScreenStartFromFirst = new TDEAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenStartFromFirst() ), + this, TQT_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); actionScreenFirst = new TDEAction( i18n( "&Go to Start" ), "go-first", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenFirst() ), + this, TQT_SLOT( screenFirst() ), actionCollection(), "screen_first" ); actionScreenPrev = new TDEAction( i18n( "&Previous Slide" ), "back", TQt::Key_Prior, - TQT_TQOBJECT(this), TQT_SLOT( screenPrev() ), + this, TQT_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); actionScreenNext = new TDEAction( i18n( "&Next Slide" ), "forward", TQt::Key_Next, - TQT_TQOBJECT(this), TQT_SLOT( screenNext() ), + this, TQT_SLOT( screenNext() ), actionCollection(), "screen_next" ); actionScreenLast = new TDEAction( i18n( "Go to &End" ), "go-last", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenLast() ), + this, TQT_SLOT( screenLast() ), actionCollection(), "screen_last" ); actionScreenSkip = new TDEAction( i18n( "Goto &Slide..." ), "goto", 0, - TQT_TQOBJECT(this), TQT_SLOT( screenSkip() ), + this, TQT_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action @@ -2832,113 +2832,113 @@ void KPrView::setupActions() actionCollection(), "pen_color" ); connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); actionPenColor->setDefaultColor(TQColor()); - actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), + actionExtendObjectHeight = new TDEAction( i18n( "&Extend Contents to Object Height" ),0, this, TQT_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), + actionResizeTextObject = new TDEAction( i18n( "&Resize Object to Fit Contents" ),0, this, TQT_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); - actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,TQT_TQOBJECT(this), + actionRenamePage=new TDEAction(i18n( "&Rename Slide..." ),0,this, TQT_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); - actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, TQT_TQOBJECT(this), + actionPicOriginalSize = new TDEAction( i18n( "Sca&le to Original Size" ), 0, this, TQT_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); - actionPic640x480=new TDEAction(i18n( "640x480" ),0,TQT_TQOBJECT(this), + actionPic640x480=new TDEAction(i18n( "640x480" ),0,this, TQT_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); - actionPic800x600=new TDEAction(i18n( "800x600" ),0,TQT_TQOBJECT(this), + actionPic800x600=new TDEAction(i18n( "800x600" ),0,this, TQT_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); - actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,TQT_TQOBJECT(this), + actionPic1024x768=new TDEAction(i18n( "1024x768" ),0,this, TQT_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); - actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,TQT_TQOBJECT(this), + actionPic1280x1024=new TDEAction(i18n( "1280x1024" ),0,this, TQT_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); - actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,TQT_TQOBJECT(this), + actionPic1600x1200=new TDEAction(i18n( "1600x1200" ),0,this, TQT_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); - actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,TQT_TQOBJECT(this), + actionChangePic=new TDEAction( i18n( "&Change Picture..." ),"frame_image",0,this, TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); - actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, TQT_TQOBJECT(this), + actionImageEffect = new TDEAction( i18n("Image &Effect..."), 0, this, TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), + this, TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), + this, TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", ALT + TQt::SHIFT + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), + this, TQT_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), + this, TQT_SLOT( insertLink() ), actionCollection(), "insert_link" ); #if 0 //code from page.cpp //not implemented picResizeMenu->insertSeparator(); - picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), TQT_TQOBJECT(this), TQT_SLOT( picViewOrigFactor() ) ); + picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, TQT_SLOT( picViewOrigFactor() ) ); #endif (void) new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), + this, TQT_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); - actionExtraSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + actionExtraSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, - TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), + this, TQT_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), + this, TQT_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( openLink() ), + this, TQT_SLOT( openLink() ), actionCollection(), "open_link" ); actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(changeLink()), + this, TQT_SLOT(changeLink()), actionCollection(), "change_link"); actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), + this, TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), + this, TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), + this, TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); actionEditCustomVarsEdit = new TDEAction( i18n( "&Custom Variables..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), + this, TQT_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), + this, TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); @@ -2960,31 +2960,31 @@ void KPrView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), + this, TQT_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); actionIncreaseFontSize = new TDEAction( i18n("Increase Font Size"),"fontsizeup", 0, - TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), + this, TQT_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); actionDecreaseFontSize = new TDEAction( i18n("Decrease Font Size"),"fontsizedown", 0, - TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), + this, TQT_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), + this, TQT_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( viewZoom( const TQString & ) ) ); + this, TQT_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, - TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), + this, TQT_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, @@ -2994,166 +2994,166 @@ void KPrView::setupActions() actionFormatStyle = new TDESelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); + this, TQT_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), + this, TQT_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); // ------------------- Actions with a key binding and no GUI item new TDEAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), - TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), + this, TQT_SLOT( insertComment() ), actionCollection(), "insert_comment" ); actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(editComment()), + this, TQT_SLOT(editComment()), actionCollection(), "edit_comment"); actionAddGuideLine = new TDEAction( i18n( "Add Guide Line..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( addGuideLine()), + this, TQT_SLOT( addGuideLine()), actionCollection(), "add_guideline"); actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - TQT_TQOBJECT(this), TQT_SLOT(removeComment()), + this, TQT_SLOT(removeComment()), actionCollection(), "remove_comment"); actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), + this, TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); actionConfigureCompletion = new TDEAction( i18n( "&Configure Completion..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), + this, TQT_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "zoom-out",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomMinus() ), + this, TQT_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "zoom-in",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPlus() ), + this, TQT_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomEntirePage() ), + this, TQT_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPageWidth() ), + this, TQT_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "zoom-fit-best",0, - TQT_TQOBJECT(this), TQT_SLOT( zoomSelectedObject() ), + this, TQT_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomPageHeight() ), + this, TQT_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); actionZoomAllObject= new TDEAction( i18n( "Zoom All Objects" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( zoomAllObject() ), + this, TQT_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); actionFlipHorizontal= new TDEAction( i18n( "Horizontal Flip" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( flipHorizontal() ), + this, TQT_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); actionFlipVertical= new TDEAction( i18n( "Vertical Flip" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( flipVertical() ), + this, TQT_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); actionDuplicateObj = new TDEAction( i18n( "Duplicate Object..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( duplicateObj() ), + this, TQT_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), + this, TQT_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), + this, TQT_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); actionCloseObject = new TDEAction( i18n( "Close Object" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( closeObject()), + this, TQT_SLOT( closeObject()), actionCollection(), "close_object" ); actionAlignVerticalTop = new TDEToggleAction( i18n( "Align Top" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), + this, TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new TDEToggleAction( i18n( "Align Bottom" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), + this, TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new TDEToggleAction( i18n( "Align Middle" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), + this, TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new TDEAction( i18n("Save Picture..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), + this, TQT_SLOT( savePicture() ), actionCollection(), "save_picture"); actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), + this, TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); actionInsertFile= new TDEAction( i18n( "File..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), + this, TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), + this, TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); actionSaveBackgroundPicture= new TDEAction( i18n( "Save Background Picture..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT(backgroundPicture() ), + this, TQT_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), + this, TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), + this, TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); actionCustomSlideShow = new TDEAction( i18n( "Custom Slide Show..." ), 0, - TQT_TQOBJECT(this), TQT_SLOT( customSlideShow() ), + this, TQT_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); actionDisplayObjectFromMasterPage = new TDEToggleAction( i18n( "Hide Object From Slide Master" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( displayObjectFromMasterPage() ), + this, TQT_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); actionDisplayBackgroundPage = new TDEToggleAction( i18n( "Hide Background" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( displayBackground() ), + this, TQT_SLOT( displayBackground() ), actionCollection(), "display_background" ); actionDisplayBackgroundPage->setCheckedState(i18n("Display Background")); } @@ -3658,55 +3658,55 @@ void KPrView::setupPopupMenus() // create right button line begin rb_lbegin = new TQPopupMenu(); TQ_CHECK_PTR( rb_lbegin ); - rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginNormal() ) ); + rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, TQT_SLOT( extraLineBeginNormal() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, TQT_SLOT( extraLineBeginArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginRect() ) ); + rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, TQT_SLOT( extraLineBeginRect() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginCircle() ) ); + rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, TQT_SLOT( extraLineBeginCircle() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginLineArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDimensionLine() ) ); + rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, TQT_SLOT( extraLineBeginDimensionLine() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); rb_lbegin->setMouseTracking( true ); rb_lbegin->setCheckable( false ); // create right button line end rb_lend = new TQPopupMenu(); TQ_CHECK_PTR( rb_lend ); - rb_lend->insertItem( KPBarIcon("line_normal_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndNormal() ) ); + rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, TQT_SLOT( extraLineEndNormal() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, TQT_SLOT( extraLineEndArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_rect_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndRect() ) ); + rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, TQT_SLOT( extraLineEndRect() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_circle_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndCircle() ) ); + rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, TQT_SLOT( extraLineEndCircle() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, TQT_SLOT( extraLineEndLineArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDimensionLine() ) ); + rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, TQT_SLOT( extraLineEndDimensionLine() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, TQT_SLOT( extraLineEndDoubleLineArrow() ) ); rb_lend->setMouseTracking( true ); rb_lend->setCheckable( false ); // create arrange-objects popup m_arrangeObjectsPopup = new TQPopupMenu(); TQ_CHECK_PTR(m_arrangeObjectsPopup); - m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), TQT_TQOBJECT(this), TQT_SLOT(extraLower())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, TQT_SLOT(extraLower())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), TQT_TQOBJECT(this), TQT_SLOT(extraSendBackward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, TQT_SLOT(extraSendBackward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), TQT_TQOBJECT(this), TQT_SLOT(extraBringForward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, TQT_SLOT(extraBringForward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), TQT_TQOBJECT(this), TQT_SLOT(extraRaise())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, TQT_SLOT(extraRaise())); m_arrangeObjectsPopup->setMouseTracking(true); m_arrangeObjectsPopup->setCheckable(false); @@ -3748,8 +3748,8 @@ void KPrView::setupScrollbars() horz = new TQScrollBar( TQt::Horizontal, pageBase ); vert->show(); horz->show(); - TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollV( int ) ) ); - TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollH( int ) ) ); + TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollV( int ) ) ); + TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( scrollH( int ) ) ); vert->setValue(vert->maxValue()); horz->setValue(horz->maxValue()); vert->setValue(vert->minValue()); @@ -3758,12 +3758,12 @@ void KPrView::setupScrollbars() pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); pgNext->setAutoRepeat( TRUE ); TQToolTip::add( pgNext, i18n( "Next slide" ) ); - connect( pgNext, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( nextPage() ) ); + connect( pgNext, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) ); pgPrev = new TQToolButton( pageBase ); pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); pgPrev->setAutoRepeat( TRUE ); TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); - connect( pgPrev, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( prevPage() ) ); + connect( pgPrev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) ); } void KPrView::setupRulers() @@ -3787,9 +3787,9 @@ void KPrView::setupRulers() v_ruler->setGeometry( 0, vSpace, hSpace, m_canvas->height() ); TQObject::connect( h_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); TQObject::connect( h_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); connect( h_ruler, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotHRulerDoubleClicked() ) ); @@ -3797,15 +3797,15 @@ void KPrView::setupRulers() TQT_SLOT( slotHRulerDoubleClicked(double) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), - TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + this, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); TQObject::connect( v_ruler, TQT_SIGNAL( doubleClicked() ), - TQT_TQOBJECT(this), TQT_SLOT( openPageLayoutDia() ) ); + this, TQT_SLOT( openPageLayoutDia() ) ); - connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newLeftIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newFirstIndent( double ) ) ); - connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newRightIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), this, TQT_SLOT( newLeftIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), this, TQT_SLOT( newFirstIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), this, TQT_SLOT( newRightIndent( double ) ) ); } void KPrView::unitChanged( KoUnit::Unit u ) @@ -4358,9 +4358,9 @@ void KPrView::insertSpecialChar() { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -4370,9 +4370,9 @@ void KPrView::slotSpecialCharDlgClosed() if ( m_specialCharDlg) { disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); + this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -4587,22 +4587,22 @@ void KPrView::startKSpell() { // m_spellCurrFrameSetNum is supposed to be set by the caller of this method if ( !m_spell.kospell ) - m_spell.kospell = new KoSpell( m_broker, TQT_TQOBJECT(this) ); + m_spell.kospell = new KoSpell( m_broker, this ); m_spell.kospell->check( m_spell.textIterator, true ); delete m_spell.dlg; m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); + this, TQT_SLOT(spellCheckerDone(const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - TQT_TQOBJECT(this), TQT_SLOT( spellCheckerCancel() ) ); + this, TQT_SLOT( spellCheckerCancel() ) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); } @@ -4759,7 +4759,7 @@ void KPrView::showParagraphDialog(int initialPage, double initialTabPos) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplyParag() ) ); + connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag() ) ); m_paragDlg->exec(); delete m_paragDlg; @@ -4837,7 +4837,7 @@ void KPrView::addVariableActions( int type, const TQStringList & texts, VariableDef v; v.type = type; v.subtype = i; - TDEAction * act = new TDEAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); @@ -4882,7 +4882,7 @@ void KPrView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new TDEAction( varName, shortCuts[varName], TQT_TQOBJECT(this), + act = new TDEAction( varName, shortCuts[varName], this, TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); @@ -4895,7 +4895,7 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + act = new TDEAction( i18n("New..."), 0, this, TQT_SLOT( insertNewCustomVariable() ), actionCollection(), TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -5394,7 +5394,7 @@ void KPrView::openThePresentationDurationDialog() presDurationDia = new KPrPresDurationDia( this, "presDurationDia", kPresenterDoc(), presentationDurationStringList, presentationTotalDurationString ); presDurationDia->setCaption( i18n( "Presentation Duration" ) ); - TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), TQT_TQOBJECT(this), TQT_SLOT( pddClosed() ) ); + TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), this, TQT_SLOT( pddClosed() ) ); presDurationDia->exec(); delete presDurationDia; @@ -5488,7 +5488,7 @@ void KPrView::updateStyleList() { TQString name = "paragstyle_" + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQT_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -6377,7 +6377,7 @@ TQPtrList<TDEAction> KPrView::listOfResultOfCheckWord( const TQString &word ) if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { TDEAction * act = new TDEAction( (*it)); - connect( act, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); + connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -6421,7 +6421,7 @@ void KPrView::initialLayoutOfSplitter() return; } - TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->parent()) ); + TQSplitter* splitterVertical = static_cast<TQSplitter*>( notebar->parent() ); TQValueList<int> tmpList; int noteHeight = height() / 25; tmpList << height() - noteHeight << noteHeight; |