diff options
Diffstat (limited to 'kivio/kiviopart/kivio_view.cpp')
| -rw-r--r-- | kivio/kiviopart/kivio_view.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index d06bc5f05..a64bb9ce7 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -172,9 +172,9 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) // Handle progress information from the doc m_statusBarProgress = 0; - connect(m_pDoc, TQT_SIGNAL(initProgress()), TQT_TQOBJECT(this), TQT_SLOT(initStatusBarProgress())); - connect(m_pDoc, TQT_SIGNAL(progress(int)), TQT_TQOBJECT(this), TQT_SLOT(setStatusBarProgress(int))); - connect(m_pDoc, TQT_SIGNAL(endProgress()), TQT_TQOBJECT(this), TQT_SLOT(removeStatusBarProgress())); + connect(m_pDoc, TQT_SIGNAL(initProgress()), this, TQT_SLOT(initStatusBarProgress())); + connect(m_pDoc, TQT_SIGNAL(progress(int)), this, TQT_SLOT(setStatusBarProgress(int))); + connect(m_pDoc, TQT_SIGNAL(endProgress()), this, TQT_SLOT(removeStatusBarProgress())); bool isModified = doc->isModified(); m_pStencilBarDockManager = new StencilBarDockManager(this); @@ -197,7 +197,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) connect( m_pTabBar, TQT_SIGNAL( doubleClicked() ), TQT_SLOT( renamePage() ) ); connect( m_pTabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) ); - connect(m_pTabBar, TQT_SIGNAL(tabMoved(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(moveTab(unsigned, unsigned))); + connect(m_pTabBar, TQT_SIGNAL(tabMoved(unsigned, unsigned)), this, TQT_SLOT(moveTab(unsigned, unsigned))); m_pTabBar->setReverseLayout( TQApplication::reverseLayout() ); // Scroll Bar @@ -257,8 +257,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( m_pCanvas ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) ); + connect( this, TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); + connect( this, TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) ); setInstance(KivioFactory::global()); if ( !m_pDoc->isReadWrite() ) @@ -294,7 +294,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) connect( m_pDoc, TQT_SIGNAL( sig_updateGrid()),TQT_SLOT(slotUpdateGrid())); - connect(m_pDoc, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished())); + connect(m_pDoc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(loadingFinished())); initActions(); @@ -341,8 +341,8 @@ void KivioView::createGeometryDock() m_pStencilGeometryPanel->setUnit(m_pDoc->unit()); paletteManager()->addWidget(m_pStencilGeometryPanel, "stencilgeometrypanel", "geometrydocker"); - connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilPosition(double, double)) ); - connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilSize(double, double)) ); + connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), this, TQT_SLOT(slotChangeStencilPosition(double, double)) ); + connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), this, TQT_SLOT(slotChangeStencilSize(double, double)) ); // connect(m_pStencilGeometryPanel, TQT_SIGNAL(rotationChanged(int)), TQT_SLOT(slotChangeStencilRotation(int))); connect( m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_pStencilGeometryPanel, TQT_SLOT(setUnit(KoUnit::Unit)) ); @@ -381,35 +381,35 @@ void KivioView::setupActions() KivioStencilSetAction* addStSet = new KivioStencilSetAction( i18n("Add Stencil Set"), "open_stencilset", actionCollection(), "addStencilSet" ); connect(addStSet,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(addStencilSet(const TQString&))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu())); - connect(addStSet, TQT_SIGNAL(showDialog()), TQT_TQOBJECT(this), TQT_SLOT(showAddStencilSetDialog())); + connect(this, TQT_SIGNAL(updateStencilSetList()), addStSet, TQT_SLOT(updateMenu())); + connect(addStSet, TQT_SIGNAL(showDialog()), this, TQT_SLOT(showAddStencilSetDialog())); - m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, TQT_TQOBJECT(this), + m_alignAndDistribute = new TDEAction( i18n("Align && Distribute..."), CTRL+ALT+Key_A, this, TQT_SLOT(alignStencilsDlg()), actionCollection(), "alignStencils" ); - m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); - m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); - m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); - connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); + m_editCut = KStdAction::cut( this, TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); + m_editCopy = KStdAction::copy( this, TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); + m_editPaste = KStdAction::paste( this, TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); + connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardDataChanged())); - m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); - m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); + m_selectAll = KStdAction::selectAll(this, TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); + m_selectNone = KStdAction::deselect(this, TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); - m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" ); + m_groupAction = new TDEAction( i18n("Group Selection"), "group", CTRL+Key_G, this, TQT_SLOT(groupStencils()), actionCollection(), "groupStencils" ); m_groupAction->setWhatsThis(i18n("Group selected objects into a single stencil")); - m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, TQT_TQOBJECT(this), TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" ); + m_ungroupAction = new TDEAction( i18n("Ungroup"), "ungroup", CTRL+SHIFT+Key_G, this, TQT_SLOT(ungroupStencils()), actionCollection(), "ungroupStencils" ); m_ungroupAction->setWhatsThis(i18n("Break up a selected group stencil")); - m_stencilToFront = new TDEAction( i18n("Bring to Front"), "bring_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" ); - m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, TQT_TQOBJECT(this), TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" ); + m_stencilToFront = new TDEAction( i18n("Bring to Front"), "bring_forward", 0, this, TQT_SLOT(bringStencilToFront()), actionCollection(), "bringStencilToFront" ); + m_stencilToBack = new TDEAction( i18n("Send to Back"), "send_backward", 0, this, TQT_SLOT(sendStencilToBack()), actionCollection(), "sendStencilToBack" ); - m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(textFormat()), + m_menuTextFormatAction = new TDEAction(i18n("&Text..."), 0, 0, this, TQT_SLOT(textFormat()), actionCollection(), "textFormat"); - m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(stencilFormat()), + m_menuStencilConnectorsAction = new TDEAction(i18n("&Stencils && Connectors..."), 0, 0, this, TQT_SLOT(stencilFormat()), actionCollection(), "stencilFormat"); - m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(arrowHeadFormat()), + m_arrowHeadsMenuAction = new TDEAction(i18n("&Arrowheads..."), 0, 0, this, TQT_SLOT(arrowHeadFormat()), actionCollection(), "arrowHeadFormat"); m_arrowHeadsMenuAction->setWhatsThis(i18n("Arrowheads allow you to add an arrow to the beginning and/or end of a line.")); @@ -427,7 +427,7 @@ void KivioView::setupActions() m_setFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "setFontSize" ); connect( m_setFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( setFontSize(int ) ) ); + this, TQT_SLOT( setFontSize(int ) ) ); m_setTextColor = new TTDESelectColorAction( i18n("Text Color"), TTDESelectColorAction::TextColor, actionCollection(), "setTextColor" ); @@ -443,43 +443,43 @@ void KivioView::setupActions() connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool))); m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", CTRL + Key_L, - TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), + this, TQT_SLOT( textAlignLeft() ), actionCollection(), "textAlignLeft" ); m_textAlignLeft->setExclusiveGroup( "align" ); m_textAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", CTRL + ALT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), + this, TQT_SLOT( textAlignCenter() ), actionCollection(), "textAlignCenter" ); m_textAlignCenter->setExclusiveGroup( "align" ); m_textAlignCenter->setChecked( TRUE ); m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", CTRL + ALT + Key_R, - TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), + this, TQT_SLOT( textAlignRight() ), actionCollection(), "textAlignRight" ); m_textAlignRight->setExclusiveGroup( "align" ); m_textVAlignSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), + this, TQT_SLOT( textSuperScript() ), actionCollection(), "textVAlignSuper" ); m_textVAlignSuper->setExclusiveGroup( "valign" ); m_textVAlignSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), + this, TQT_SLOT( textSubScript() ), actionCollection(), "textVAlignSub" ); m_textVAlignSub->setExclusiveGroup( "valign" ); - m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", TQT_TQOBJECT(this), TQT_SLOT(setLineWidth(double)), + m_lineWidthAction = new KoLineWidthAction(i18n("Line Width"), "linewidth", this, TQT_SLOT(setLineWidth(double)), actionCollection(), "setLineWidth"); m_lineWidthAction->setUnit(m_pDoc->unit()); connect(m_pDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)), m_lineWidthAction, TQT_SLOT(setUnit(KoUnit::Unit))); - m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", TQT_TQOBJECT(this), TQT_SLOT(setLineStyle(int)), + m_lineStyleAction = new KoLineStyleAction(i18n("Line Style"), "linestyle", this, TQT_SLOT(setLineStyle(int)), actionCollection(), "setLineStyle"); - m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(this), TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" ); - m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, TQT_TQOBJECT(this), TQT_SLOT(insertPage()), actionCollection(), "insertPage" ); - m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,TQT_TQOBJECT(this), TQT_SLOT(removePage()), actionCollection(), "removePage" ); + m_paperLayout = new TDEAction( i18n("Page Layout..."), 0, this, TQT_SLOT(paperLayoutDlg()), actionCollection(), "paperLayout" ); + m_insertPage = new TDEAction( i18n("Insert Page"),"item_add", 0, this, TQT_SLOT(insertPage()), actionCollection(), "insertPage" ); + m_removePage = new TDEAction( i18n("Remove Page"), "item_remove",0,this, TQT_SLOT(removePage()), actionCollection(), "removePage" ); - m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,TQT_TQOBJECT(this), TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); + m_renamePage = new TDEAction( i18n("Rename Page..."), "item_rename",0,this, TQT_SLOT(renamePage()), actionCollection(), "renamePage" ); - m_showPage = new TDEAction( i18n("Show Page..."),0 ,TQT_TQOBJECT(this),TQT_SLOT(showPage()), actionCollection(), "showPage" ); - m_hidePage = new TDEAction( i18n("Hide Page"),0 ,TQT_TQOBJECT(this),TQT_SLOT(hidePage()), actionCollection(), "hidePage" ); + m_showPage = new TDEAction( i18n("Show Page..."),0 ,this,TQT_SLOT(showPage()), actionCollection(), "showPage" ); + m_hidePage = new TDEAction( i18n("Hide Page"),0 ,this,TQT_SLOT(hidePage()), actionCollection(), "hidePage" ); showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" ); connect( showPageMargins, TQT_SIGNAL(toggled(bool)), TQT_SLOT(togglePageMargins(bool))); @@ -506,7 +506,7 @@ void KivioView::setupActions() // Guides actions showGuides = new TDEToggleAction( i18n("Guide Lines"), 0, actionCollection(), "showGuides" ); connect( showGuides, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleShowGuides(bool))); - TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addGuideLine()), + TDEAction* addGuide = new TDEAction(i18n("Add Guide Line..."), 0, this, TQT_SLOT(addGuideLine()), actionCollection(), "addGuideLine"); connect(showGuides, TQT_SIGNAL(toggled(bool)), addGuide, TQT_SLOT(setEnabled(bool))); //-- @@ -516,13 +516,13 @@ void KivioView::setupActions() connect( m_setArrowHeads, TQT_SIGNAL(endChanged(int)), TQT_SLOT(slotSetEndArrow(int))); connect( m_setArrowHeads, TQT_SIGNAL(startChanged(int)), TQT_SLOT(slotSetStartArrow(int))); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsDialog()), actionCollection(), "options"); + KStdAction::preferences(this, TQT_SLOT(optionsDialog()), actionCollection(), "options"); - (void) new TDEAction(i18n("Install Stencil Set..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction(i18n("Install Stencil Set..."), 0, this, TQT_SLOT(installStencilSet()), actionCollection(), "installStencilSet"); m_editDelete = new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); + this, TQT_SLOT(deleteObject()), actionCollection(), "deleteObject"); } void KivioView::initActions() @@ -587,9 +587,9 @@ void KivioView::addPage( KivioPage* page ) insertPage( page ); TQObject::connect( page, TQT_SIGNAL( sig_PageHidden( KivioPage* ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotPageHidden( KivioPage* ) ) ); + this, TQT_SLOT( slotPageHidden( KivioPage* ) ) ); TQObject::connect( page, TQT_SIGNAL( sig_PageShown( KivioPage* ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotPageShown( KivioPage* ) ) ); + this, TQT_SLOT( slotPageShown( KivioPage* ) ) ); updatePageStatusLabel(); } @@ -2262,8 +2262,8 @@ void KivioView::showAddStencilSetDialog() { if(!m_addStencilSetDialog) { m_addStencilSetDialog = new Kivio::AddStencilSetDialog(this, "AddStencilSetDialog"); - connect(m_addStencilSetDialog, TQT_SIGNAL(addStencilSet(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(addStencilSet(const TQString&))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList())); + connect(m_addStencilSetDialog, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SLOT(addStencilSet(const TQString&))); + connect(this, TQT_SIGNAL(updateStencilSetList()), m_addStencilSetDialog, TQT_SLOT(updateList())); } m_addStencilSetDialog->show(); |