diff options
Diffstat (limited to 'kivio')
95 files changed, 243 insertions, 243 deletions
diff --git a/kivio/kiviopart/addstenciltool.cpp b/kivio/kiviopart/addstenciltool.cpp index e195af69..7e7a0bec 100644 --- a/kivio/kiviopart/addstenciltool.cpp +++ b/kivio/kiviopart/addstenciltool.cpp @@ -32,8 +32,8 @@ namespace Kivio { -AddStencilTool::AddStencilTool(KivioView* tqparent) - : MouseTool(tqparent, "Add Stencil Mouse Tool") +AddStencilTool::AddStencilTool(KivioView* parent) + : MouseTool(parent, "Add Stencil Mouse Tool") { m_leftMouseButtonPressed = false; m_stencil = 0; diff --git a/kivio/kiviopart/addstenciltool.h b/kivio/kiviopart/addstenciltool.h index 29164686..e9a7cef8 100644 --- a/kivio/kiviopart/addstenciltool.h +++ b/kivio/kiviopart/addstenciltool.h @@ -36,7 +36,7 @@ class AddStencilTool : public MouseTool Q_OBJECT TQ_OBJECT public: - AddStencilTool(KivioView* tqparent); + AddStencilTool(KivioView* parent); ~AddStencilTool(); virtual bool processEvent(TQEvent* e); diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp index 5c9addb6..6381d76b 100644 --- a/kivio/kiviopart/kivio_dlg_pageshow.cpp +++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp @@ -33,10 +33,10 @@ #include <kdebug.h> #include <KoTabBar.h> -KivioPageShow::KivioPageShow( KivioView* tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n("Show Page"), Ok|Cancel, Ok ) +KivioPageShow::KivioPageShow( KivioView* parent, const char* name ) +: KDialogBase( parent, name, true, i18n("Show Page"), Ok|Cancel, Ok ) { - m_pView = tqparent; + m_pView = parent; TQWidget* view = new TQWidget(this); setMainWidget(view); diff --git a/kivio/kiviopart/kivio_dlg_pageshow.h b/kivio/kiviopart/kivio_dlg_pageshow.h index 496f4f43..071ec2eb 100644 --- a/kivio/kiviopart/kivio_dlg_pageshow.h +++ b/kivio/kiviopart/kivio_dlg_pageshow.h @@ -32,7 +32,7 @@ class KivioPageShow: public KDialogBase { Q_OBJECT TQ_OBJECT public: - KivioPageShow( KivioView* tqparent, const char* name ); + KivioPageShow( KivioView* parent, const char* name ); public slots: void slotOk(); diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index 778ea2b9..a7dee3d4 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -99,8 +99,8 @@ TQPtrList<KivioDoc>* KivioDoc::s_docs = 0; int KivioDoc::s_docId = 0; -KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) -: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) +KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* parent, const char* name, bool singleViewMode ) +: KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) { dcop = 0; if (!s_docs) @@ -245,13 +245,13 @@ void KivioDoc::initEmpty() KoDocument::initEmpty(); } -KoView* KivioDoc::createViewInstance( TQWidget* tqparent, const char* name ) +KoView* KivioDoc::createViewInstance( TQWidget* parent, const char* name ) { if (!name) { name = "View"; } - return new KivioView( tqparent, name, this ); + return new KivioView( parent, name, this ); } TQDomDocument KivioDoc::saveXML() diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h index 496a5fa8..72bc3d07 100644 --- a/kivio/kiviopart/kivio_doc.h +++ b/kivio/kiviopart/kivio_doc.h @@ -68,7 +68,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument TQ_OBJECT friend class KivioPage; public: - KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); ~KivioDoc(); virtual DCOPObject* dcopObject(); @@ -190,7 +190,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ ); void loadOasisSettings( const TQDomDocument&settingsDoc ); - KoView* createViewInstance( TQWidget* tqparent, const char* name ); + KoView* createViewInstance( TQWidget* parent, const char* name ); /** * List of stencil spawner sets diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp index 9badd432..e883aa2d 100644 --- a/kivio/kiviopart/kivio_factory.cpp +++ b/kivio/kiviopart/kivio_factory.cpp @@ -29,8 +29,8 @@ KInstance* KivioFactory::s_global = 0; KAboutData* KivioFactory::s_aboutData = 0; -KivioFactory::KivioFactory( TQObject* tqparent, const char* name ) -: KoFactory( tqparent, name ) +KivioFactory::KivioFactory( TQObject* parent, const char* name ) +: KoFactory( parent, name ) { global(); } @@ -43,11 +43,11 @@ KivioFactory::~KivioFactory() s_global = 0L; } -KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KivioDoc *doc = new KivioDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); + KivioDoc *doc = new KivioDoc( parentWidget, widgetName, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h index 4fe5ed1a..cb604b53 100644 --- a/kivio/kiviopart/kivio_factory.h +++ b/kivio/kiviopart/kivio_factory.h @@ -28,10 +28,10 @@ class KIVIO_EXPORT KivioFactory : public KoFactory { Q_OBJECT TQ_OBJECT public: - KivioFactory( TQObject* tqparent = 0, const char* name = 0 ); + KivioFactory( TQObject* parent = 0, const char* name = 0 ); ~KivioFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); static KAboutData* aboutData(); diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp index 01e110e0..179b6a49 100644 --- a/kivio/kiviopart/kivio_icon_view.cpp +++ b/kivio/kiviopart/kivio_icon_view.cpp @@ -41,8 +41,8 @@ TQPtrList<KivioIconView> KivioIconView::objList; * KivioIconViewItem * **********************************************************************/ -KivioIconViewItem::KivioIconViewItem( TQIconView *tqparent ) - : TQIconViewItem( tqparent ) +KivioIconViewItem::KivioIconViewItem( TQIconView *parent ) + : TQIconViewItem( parent ) { m_pSpawner = NULL; setText("stencil"); @@ -85,8 +85,8 @@ bool KivioIconViewItem::acceptDrop( const TQMimeSource * ) const * KivioIconView * **********************************************************************/ -KivioIconView::KivioIconView( bool _readWrite,TQWidget *tqparent, const char *name ) -: TQIconView( tqparent, name ) +KivioIconView::KivioIconView( bool _readWrite,TQWidget *parent, const char *name ) +: TQIconView( parent, name ) { m_pSpawnerSet = NULL; m_pCurDrag = NULL; diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h index fda327ef..ec6fa163 100644 --- a/kivio/kiviopart/kivio_icon_view.h +++ b/kivio/kiviopart/kivio_icon_view.h @@ -49,7 +49,7 @@ class KivioIconView : public TQIconView void stencilSelected(KivioStencilSpawner*); public: - KivioIconView( bool _readWrite,TQWidget *tqparent=0, const char *name=0 ); + KivioIconView( bool _readWrite,TQWidget *parent=0, const char *name=0 ); virtual ~KivioIconView(); static void clearCurrentDrag(); @@ -71,7 +71,7 @@ class KivioIconViewItem : public TQIconViewItem KivioStencilSpawner *m_pSpawner; public: - KivioIconViewItem( TQIconView *tqparent ); + KivioIconViewItem( TQIconView *parent ); virtual ~KivioIconViewItem(); void setStencilSpawner(KivioStencilSpawner*); diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp index 7d952e05..7f1ba985 100644 --- a/kivio/kiviopart/kivio_spawner_drag.cpp +++ b/kivio/kiviopart/kivio_spawner_drag.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> -KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, TQWidget *tqparent, const char *name ) - : TQIconDrag( tqparent, name ) +KivioSpawnerDrag::KivioSpawnerDrag( KivioIconView *view, TQWidget *parent, const char *name ) + : TQIconDrag( parent, name ) { m_pView = view; } diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h index efc22880..9bd68dfe 100644 --- a/kivio/kiviopart/kivio_spawner_drag.h +++ b/kivio/kiviopart/kivio_spawner_drag.h @@ -29,7 +29,7 @@ class KivioIconView; class KivioSpawnerDrag : public TQIconDrag { public: - KivioSpawnerDrag( KivioIconView *, TQWidget *tqparent=0, const char *name=0); + KivioSpawnerDrag( KivioIconView *, TQWidget *parent=0, const char *name=0); virtual ~KivioSpawnerDrag(); const char *format(int i) const; diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 4c759a2d..4b42fa09 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -26,8 +26,8 @@ #include <kdebug.h> -KivioStackBar::KivioStackBar(KivioView* view, TQWidget* tqparent, const char* name) - : TQDockWindow(tqparent, name), m_view(view) +KivioStackBar::KivioStackBar(KivioView* view, TQWidget* parent, const char* name) + : TQDockWindow(parent, name), m_view(view) { TQDockWindow::boxLayout()->setSpacing(0); TQDockWindow::boxLayout()->setMargin(0); @@ -45,7 +45,7 @@ KivioStackBar::~KivioStackBar() void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) { - if (TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this)) { + if (TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this)) { w->reparent(this,TQPoint(0,0)); } diff --git a/kivio/kiviopart/kivio_stackbar.h b/kivio/kiviopart/kivio_stackbar.h index 6a4d6b81..452956ff 100644 --- a/kivio/kiviopart/kivio_stackbar.h +++ b/kivio/kiviopart/kivio_stackbar.h @@ -35,7 +35,7 @@ class KivioStackBar : public TQDockWindow Q_OBJECT TQ_OBJECT public: - KivioStackBar(KivioView* view, TQWidget* tqparent=0, const char* name=0); + KivioStackBar(KivioView* view, TQWidget* parent=0, const char* name=0); ~KivioStackBar(); TQWidget* findPage(const TQString& name); diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp index fc2bd62e..f7ea9121 100644 --- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp +++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp @@ -11,8 +11,8 @@ #include <KoPageLayout.h> #include <KoUnitWidgets.h> -KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* tqparent) -: TQWidget(tqparent,"KivioStencilGeometryPanel") +KivioStencilGeometryPanel::KivioStencilGeometryPanel(TQWidget* parent) +: TQWidget(parent,"KivioStencilGeometryPanel") { TQGridLayout* grid = new TQGridLayout(this, 4, 2, 0, 2); diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.h b/kivio/kiviopart/kivio_stencil_geometry_panel.h index b049b2f3..b5f26cf1 100644 --- a/kivio/kiviopart/kivio_stencil_geometry_panel.h +++ b/kivio/kiviopart/kivio_stencil_geometry_panel.h @@ -40,7 +40,7 @@ class KivioStencilGeometryPanel : public TQWidget void rotationChanged(int); public: - KivioStencilGeometryPanel(TQWidget* tqparent); + KivioStencilGeometryPanel(TQWidget* parent); virtual ~KivioStencilGeometryPanel(); }; diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index 657faf48..c500f34a 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -24,8 +24,8 @@ using namespace Kivio; -ZoomAction::ZoomAction(TQObject* tqparent, const char* name) -: TKSelectAction(tqparent,name) +ZoomAction::ZoomAction(TQObject* parent, const char* name) +: TKSelectAction(parent,name) { setEditable(true); TQStringList lst; diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h index d3a44a01..d4ae6f41 100644 --- a/kivio/kiviopart/kivio_zoomaction.h +++ b/kivio/kiviopart/kivio_zoomaction.h @@ -27,7 +27,7 @@ class ZoomAction : public TKSelectAction { Q_OBJECT TQ_OBJECT public: - ZoomAction( TQObject* tqparent, const char* name ); + ZoomAction( TQObject* parent, const char* name ); ~ZoomAction(); void insertItem( int ); diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index f4f9e6cf..b61e877a 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -38,8 +38,8 @@ #include <kiconloader.h> KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix, - TQObject* tqparent, const char *name) - : KActionMenu(text, pix, tqparent, name) + TQObject* parent, const char *name) + : KActionMenu(text, pix, parent, name) { m_emitSignals = true; setShortcutConfigurable( false ); @@ -161,7 +161,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) void KivioArrowHeadAction::loadArrowHeads(KPopupMenu* popup) { - TQBitmap tqmask; + TQBitmap mask; TQPixmap pixAll = Kivio::arrowHeadPixmap(); TQPixmap pix(pixAll.width(), 17); TQPainter p(&pix, popup); diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h index 08fca394..9989d5f7 100644 --- a/kivio/kiviopart/kivioarrowheadaction.h +++ b/kivio/kiviopart/kivioarrowheadaction.h @@ -32,7 +32,7 @@ class KivioArrowHeadAction : public KActionMenu TQ_OBJECT public: KivioArrowHeadAction(const TQString &text, const TQString &pix, - TQObject* tqparent = 0, const char *name = 0); + TQObject* parent = 0, const char *name = 0); ~KivioArrowHeadAction(); KPopupMenu* popupMenu() const; diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp index 23b03be6..a57af7c8 100644 --- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp @@ -861,9 +861,9 @@ void Kivio1DStencil::drawText( KivioIntraStencilData *pData ) p.setPen(m_pTextStyle->color()); p.setFont(f); p.drawText( 0, 0, boundRect.width(), boundRect.height(), tf, m_pTextStyle->text() ); - TQBitmap tqmask; - tqmask = pix; - pix.setMask(tqmask); + TQBitmap mask; + mask = pix; + pix.setMask(mask); painter->drawPixmap(_x, _y, pix); } diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp index f3903685..e41f5788 100644 --- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp @@ -514,17 +514,17 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil ) int KivioBaseTargetStencil::resizeHandlePositions() { // Calculate the resize handle positions - int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL; + int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL; if( m_pProtection->at( kpWidth ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); } if( m_pProtection->at( kpHeight) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); } - return tqmask; + return mask; } diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp index 46526892..cc8eb0e3 100644 --- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp @@ -606,19 +606,19 @@ KivioCollisionType KivioPyStencil::checkForCollision( KoPoint *pPoint, double ) int KivioPyStencil::resizeHandlePositions() { // Calculate the resize handle positions - int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL; + int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL; if( m_pProtection->at( kpWidth ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); } if( m_pProtection->at( kpHeight) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); } - return tqmask; + return mask; } diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index 1046e9d8..6f00df1a 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -741,9 +741,9 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD p.setPen( TQColor(0, 0, 0) ); int tf = pShapeData->vTextAlign() | pShapeData->hTextAlign(); p.drawText( 0, 0, _w, _h, tf | TQt::WordBreak, pShapeData->text() ); - TQBitmap tqmask; - tqmask = pix; - pix.setMask(tqmask); + TQBitmap mask; + mask = pix; + pix.setMask(mask); painter->drawPixmap(_x, _y, pix); } @@ -1976,24 +1976,24 @@ bool KivioSMLStencil::checkCollisionTextBox( KivioShape *, KoPoint * ) int KivioSMLStencil::resizeHandlePositions() { // Calculate the resize handle positions - int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL; + int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL; if( m_pProtection->at( kpWidth ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); } if( m_pProtection->at( kpHeight ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); } if( m_pProtection->at( kpAspect ) ) { - tqmask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS; + mask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS; } - return tqmask; + return mask; } KivioLineStyle KivioSMLStencil::lineStyle() diff --git a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h index 5a00560c..dcde7904 100644 --- a/kivio/kiviopart/kiviosdk/kiviostencilfactory.h +++ b/kivio/kiviopart/kiviosdk/kiviostencilfactory.h @@ -32,8 +32,8 @@ class KIVIO_EXPORT KivioStencilFactory : public TQObject Q_OBJECT TQ_OBJECT public: - KivioStencilFactory(TQObject *tqparent=0, const char*name=0, const TQStringList& args = TQStringList()) - : TQObject(tqparent, name) { Q_UNUSED(args) } + KivioStencilFactory(TQObject *parent=0, const char*name=0, const TQStringList& args = TQStringList()) + : TQObject(parent, name) { Q_UNUSED(args) } virtual KivioStencil *NewStencil(const TQString& name) =0; virtual KivioStencil *NewStencil()=0; virtual TQPixmap *GetIcon()=0; diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index 0d3eada8..0741dfdc 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -64,8 +64,8 @@ static const char * default_plug_xpm[] = { " ##############"}; KivioStencilSetAction::KivioStencilSetAction(const TQString &text, const TQString &pix, - KActionCollection *tqparent, const char *name) - : KAction(text, pix, 0, tqparent, name) + KActionCollection *parent, const char *name) + : KAction(text, pix, 0, parent, name) { setShortcutConfigurable( false ); diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h index 13cb9efe..1bee42d4 100644 --- a/kivio/kiviopart/kiviostencilsetaction.h +++ b/kivio/kiviopart/kiviostencilsetaction.h @@ -37,7 +37,7 @@ class KivioStencilSetAction : public KAction TQ_OBJECT public: KivioStencilSetAction(const TQString &text, const TQString &pix, - KActionCollection *tqparent, const char *name); + KActionCollection *parent, const char *name); virtual ~KivioStencilSetAction(); diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index 3983644c..e0d2b363 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -40,8 +40,8 @@ #include <klineedit.h> namespace Kivio { - StencilSetInstaller::StencilSetInstaller(TQWidget *tqparent, const char *name) - : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, tqparent, name) + StencilSetInstaller::StencilSetInstaller(TQWidget *parent, const char *name) + : KDialogBase(KDialogBase::Plain, i18n("Install Stencil Set"), Ok|Cancel, Ok, parent, name) { TQFrame* page = plainPage(); TQVBoxLayout* l = new TQVBoxLayout(page); diff --git a/kivio/kiviopart/kiviostencilsetinstaller.h b/kivio/kiviopart/kiviostencilsetinstaller.h index 80e1b25b..c6d8c706 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.h +++ b/kivio/kiviopart/kiviostencilsetinstaller.h @@ -32,7 +32,7 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - StencilSetInstaller(TQWidget *tqparent = 0, const char *name = 0); + StencilSetInstaller(TQWidget *parent = 0, const char *name = 0); ~StencilSetInstaller(); public slots: diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index b44ab4c2..d3d30dae 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -30,8 +30,8 @@ using namespace Kivio; -DragBarButton::DragBarButton( const TQString& text, TQWidget* tqparent, const char* name ) -: TQPushButton(text,tqparent,name) +DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char* name ) +: TQPushButton(text,parent,name) { m_pIcon = 0L; m_bPressed = false; diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h index 88bfe60b..6f207a7f 100644 --- a/kivio/kiviopart/stencilbarbutton.h +++ b/kivio/kiviopart/stencilbarbutton.h @@ -29,7 +29,7 @@ class DragBarButton : public TQPushButton Q_OBJECT TQ_OBJECT public: - DragBarButton( const TQString&, TQWidget* tqparent, const char* name = 0 ); + DragBarButton( const TQString&, TQWidget* parent, const char* name = 0 ); ~DragBarButton(); void setIcon( const TQString& ); diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp index d0121dd0..ecf923f9 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -34,12 +34,12 @@ #include <klocale.h> #include <kdebug.h> -StencilBarDockManager::StencilBarDockManager( KivioView* tqparent, const char* name ) -: TQWidget(tqparent,name) +StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* name ) +: TQWidget(parent,name) { dragButton = 0L; dragWidget = 0L; - m_pView = tqparent; + m_pView = parent; m_destinationBar = 0L; dragPos = OnDesktop; @@ -323,8 +323,8 @@ KoToolDockMoveManager::KoToolDockMoveManager() gv.line_width = 2; gv.foreground = WhitePixel(qt_xdisplay(), scr)^BlackPixel(qt_xdisplay(), scr); gv.subwindow_mode = IncludeInferiors; - long tqmask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode; - rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), tqmask, &gv); + long mask = GCForeground | GCFunction | GCLineWidth | GCSubwindowMode; + rootgc = XCreateGC(qt_xdisplay(), qt_xrootwin(), mask, &gv); #endif timer = new TQTimer(this); diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h index 8894def1..8406e5f0 100644 --- a/kivio/kiviopart/stencilbardockmanager.h +++ b/kivio/kiviopart/stencilbardockmanager.h @@ -57,7 +57,7 @@ class StencilBarDockManager : public TQWidget OnTopLevelBar = 6 }; - StencilBarDockManager( KivioView* tqparent, const char* name = 0 ); + StencilBarDockManager( KivioView* parent, const char* name = 0 ); ~StencilBarDockManager(); void insertStencilSet( TQWidget*, const TQString&, BarPos = AutoSelect, diff --git a/kivio/kiviopart/tools/kivio_mousetool.cpp b/kivio/kiviopart/tools/kivio_mousetool.cpp index 77b55d01..e74d0147 100644 --- a/kivio/kiviopart/tools/kivio_mousetool.cpp +++ b/kivio/kiviopart/tools/kivio_mousetool.cpp @@ -21,7 +21,7 @@ #include "kivio_pluginmanager.h" namespace Kivio { - MouseTool::MouseTool(KivioView* tqparent, const char* name) : Kivio::Plugin(tqparent, name) + MouseTool::MouseTool(KivioView* parent, const char* name) : Kivio::Plugin(parent, name) { connect(this, TQT_SIGNAL(activated(Kivio::MouseTool*)), view()->pluginManager(), TQT_SLOT(activate(Kivio::MouseTool*))); } diff --git a/kivio/kiviopart/tools/kivio_mousetool.h b/kivio/kiviopart/tools/kivio_mousetool.h index 7bffaf33..0b717f29 100644 --- a/kivio/kiviopart/tools/kivio_mousetool.h +++ b/kivio/kiviopart/tools/kivio_mousetool.h @@ -34,7 +34,7 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - MouseTool(KivioView* tqparent = 0, const char* name = 0); + MouseTool(KivioView* parent = 0, const char* name = 0); ~MouseTool(); virtual bool processEvent(TQEvent* e) = 0; diff --git a/kivio/kiviopart/tools/kivio_plugin.cpp b/kivio/kiviopart/tools/kivio_plugin.cpp index 12128f60..7e227fb1 100644 --- a/kivio/kiviopart/tools/kivio_plugin.cpp +++ b/kivio/kiviopart/tools/kivio_plugin.cpp @@ -21,7 +21,7 @@ #include "kivio_factory.h" namespace Kivio { - Plugin::Plugin(KivioView* tqparent, const char* name) : KParts::Plugin(TQT_TQOBJECT(tqparent), name) + Plugin::Plugin(KivioView* parent, const char* name) : KParts::Plugin(TQT_TQOBJECT(parent), name) { setInstance(KivioFactory::global()); } diff --git a/kivio/kiviopart/tools/kivio_plugin.h b/kivio/kiviopart/tools/kivio_plugin.h index 944742d3..cd261eab 100644 --- a/kivio/kiviopart/tools/kivio_plugin.h +++ b/kivio/kiviopart/tools/kivio_plugin.h @@ -32,10 +32,10 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - Plugin(KivioView* tqparent = 0, const char* name = 0); + Plugin(KivioView* parent = 0, const char* name = 0); ~Plugin(); - KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); } + KivioView* view() { return static_cast<KivioView*>(TQT_TQWIDGET(parent())); } }; } diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.cpp b/kivio/kiviopart/tools/kivio_pluginmanager.cpp index 89f7f0a7..9b99904e 100644 --- a/kivio/kiviopart/tools/kivio_pluginmanager.cpp +++ b/kivio/kiviopart/tools/kivio_pluginmanager.cpp @@ -24,7 +24,7 @@ #include "kivio_plugin.h" namespace Kivio { - PluginManager::PluginManager(KivioView* tqparent, const char* name) : TQObject(tqparent, name) + PluginManager::PluginManager(KivioView* parent, const char* name) : TQObject(parent, name) { m_activeTool = 0; m_defaultTool = 0; @@ -83,7 +83,7 @@ namespace Kivio { Kivio::Plugin* PluginManager::findPlugin(const TQString& name) { - TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(tqparent()); + TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(parent()); KParts::Plugin* p = plugins.first(); bool found = false; diff --git a/kivio/kiviopart/tools/kivio_pluginmanager.h b/kivio/kiviopart/tools/kivio_pluginmanager.h index a0ac51fe..ced84748 100644 --- a/kivio/kiviopart/tools/kivio_pluginmanager.h +++ b/kivio/kiviopart/tools/kivio_pluginmanager.h @@ -32,7 +32,7 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - PluginManager(KivioView* tqparent, const char* name = 0); + PluginManager(KivioView* parent, const char* name = 0); ~PluginManager(); bool delegateEvent(TQEvent* e); diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp index 26238213..e46e522c 100644 --- a/kivio/kiviopart/tools/mousetoolaction.cpp +++ b/kivio/kiviopart/tools/mousetoolaction.cpp @@ -25,50 +25,50 @@ namespace Kivio { MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut, - TQObject* tqparent, const char* name) - : KRadioAction(text, cut, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, cut, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name) - : KRadioAction(text, cut, receiver, slot, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, cut, receiver, slot, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut, - TQObject* tqparent, const char* name) - : KRadioAction(text, pix, cut, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, pix, cut, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut, - TQObject* tqparent, const char* name) - : KRadioAction(text, pix, cut, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, pix, cut, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name) - : KRadioAction(text, pix, cut, receiver, slot, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, pix, cut, receiver, slot, parent, name) { } MouseToolAction::MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name) - : KRadioAction(text, pix, cut, receiver, slot, tqparent, name) + TQObject* parent, const char* name) + : KRadioAction(text, pix, cut, receiver, slot, parent, name) { } -MouseToolAction::MouseToolAction(TQObject* tqparent, const char* name) - : KRadioAction(tqparent, name) +MouseToolAction::MouseToolAction(TQObject* parent, const char* name) + : KRadioAction(parent, name) { } diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h index 0e528578..26351ff2 100644 --- a/kivio/kiviopart/tools/mousetoolaction.h +++ b/kivio/kiviopart/tools/mousetoolaction.h @@ -36,72 +36,72 @@ class KIVIO_EXPORT MouseToolAction : public KRadioAction * * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0); + MouseToolAction(const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0); /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ MouseToolAction(const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0); + TQObject* parent = 0, const char* name = 0); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0); + TQObject* parent = 0, const char* name = 0); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ MouseToolAction(const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ MouseToolAction(const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name = 0); + TQObject* parent, const char* name = 0); /** - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - MouseToolAction(TQObject* tqparent = 0, const char* name = 0); + MouseToolAction(TQObject* parent = 0, const char* name = 0); ~MouseToolAction(); diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp index 68336367..b37c001f 100644 --- a/kivio/kiviopart/ui/addstencilsetdialog.cpp +++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp @@ -24,8 +24,8 @@ namespace Kivio { -AddStencilSetDialog::AddStencilSetDialog(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, false, i18n("Stencil Sets"), KDialogBase::Close) +AddStencilSetDialog::AddStencilSetDialog(TQWidget *parent, const char *name) + : KDialogBase(parent, name, false, i18n("Stencil Sets"), KDialogBase::Close) { m_mainWidget = new AddStencilSetPanel(this); setMainWidget(m_mainWidget); diff --git a/kivio/kiviopart/ui/addstencilsetdialog.h b/kivio/kiviopart/ui/addstencilsetdialog.h index 0f23d919..27a42cfa 100644 --- a/kivio/kiviopart/ui/addstencilsetdialog.h +++ b/kivio/kiviopart/ui/addstencilsetdialog.h @@ -30,7 +30,7 @@ class AddStencilSetDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - AddStencilSetDialog(TQWidget *tqparent = 0, const char *name = 0); + AddStencilSetDialog(TQWidget *parent = 0, const char *name = 0); ~AddStencilSetDialog(); public slots: diff --git a/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp index 94feb142..61e8a56e 100644 --- a/kivio/kiviopart/ui/export_page_dialog.cpp +++ b/kivio/kiviopart/ui/export_page_dialog.cpp @@ -9,8 +9,8 @@ #include "export_page_dialog_base.h" #include "kivio_config.h" -ExportPageDialog::ExportPageDialog( TQWidget *tqparent, const char *name ) - : KDialogBase(tqparent, name, true, i18n("Export Page"), Ok|Cancel, Ok) +ExportPageDialog::ExportPageDialog( TQWidget *parent, const char *name ) + : KDialogBase(parent, name, true, i18n("Export Page"), Ok|Cancel, Ok) { m_view = new ExportPageDialogBase(this); setMainWidget(m_view); diff --git a/kivio/kiviopart/ui/export_page_dialog.h b/kivio/kiviopart/ui/export_page_dialog.h index 0384b0ba..a3251e69 100644 --- a/kivio/kiviopart/ui/export_page_dialog.h +++ b/kivio/kiviopart/ui/export_page_dialog.h @@ -10,7 +10,7 @@ class ExportPageDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ExportPageDialog(TQWidget* tqparent=0, const char* name=0); + ExportPageDialog(TQWidget* parent=0, const char* name=0); int quality(); int border(); diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 546c3203..5185dfc6 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -27,8 +27,8 @@ #define TOGGLE_ACTION(X) ((KToggleAction*)child(X)) -KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* tqparent, const char* name) -: KivioBirdEyePanelBase(tqparent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc()) +KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* parent, const char* name) +: KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc()) { handlePress = false; m_buffer = new TQPixmap(); diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h index 1138663c..6dc388e0 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.h +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h @@ -34,7 +34,7 @@ class KivioBirdEyePanel : public KivioBirdEyePanelBase { Q_OBJECT TQ_OBJECT public: - KivioBirdEyePanel(KivioView* view, TQWidget* tqparent=0, const char* name=0); + KivioBirdEyePanel(KivioView* view, TQWidget* parent=0, const char* name=0); ~KivioBirdEyePanel(); bool eventFilter(TQObject*, TQEvent*); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 2e92bd00..fadba0e3 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -35,8 +35,8 @@ #include <kiconloader.h> #include <kinputdialog.h> -KivioLayerItem::KivioLayerItem(TQListView* tqparent, KivioLayer* d, int id) -: TQListViewItem(tqparent), data(d) +KivioLayerItem::KivioLayerItem(TQListView* parent, KivioLayer* d, int id) +: TQListViewItem(parent), data(d) { TQString ids; TQString space; @@ -63,8 +63,8 @@ void KivioLayerItem::update() /*********************************************************/ -KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* tqparent, const char* name) -: KivioLayerPanelBase(tqparent, name), m_pView(view) +KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char* name) +: KivioLayerPanelBase(parent, name), m_pView(view) { list->header()->hide(); list->addColumn(i18n("View"),15); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h index 55a908c2..b4f1e00d 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.h +++ b/kivio/kiviopart/ui/kivio_layer_panel.h @@ -32,7 +32,7 @@ class KivioLayerItem: public TQListViewItem { friend class KivioLayerPanel; public: - KivioLayerItem(TQListView* tqparent, KivioLayer*, int id); + KivioLayerItem(TQListView* parent, KivioLayer*, int id); ~KivioLayerItem(); KivioLayer* layer() const { return data; } @@ -51,7 +51,7 @@ class KivioLayerPanel : public KivioLayerPanelBase Q_OBJECT TQ_OBJECT public: - KivioLayerPanel(KivioView* view, TQWidget* tqparent=0, const char* name=0); + KivioLayerPanel(KivioView* view, TQWidget* parent=0, const char* name=0); ~KivioLayerPanel(); bool eventFilter(TQObject*, TQEvent*); diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp index f9521151..6de8c0ba 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.cpp +++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp @@ -32,8 +32,8 @@ #include <kdebug.h> #include <klocale.h> -KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *tqparent, const char *name ) - : KivioProtectionPanelBase(tqparent, name), m_pView(view) +KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *parent, const char *name ) + : KivioProtectionPanelBase(parent, name), m_pView(view) { TQObject::connect( m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)) ); TQObject::connect( m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)) ); diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h index 3fd80695..a8a8173a 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.h +++ b/kivio/kiviopart/ui/kivio_protection_panel.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - KivioProtectionPanel( KivioView *view, TQWidget *tqparent=0, const char *name=0 ); + KivioProtectionPanel( KivioView *view, TQWidget *parent=0, const char *name=0 ); virtual ~KivioProtectionPanel(); public slots: diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index acc2e63a..11c2cc28 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -38,8 +38,8 @@ #include "kivioglobal.h" namespace Kivio { - AddStencilSetPanel::AddStencilSetPanel(TQWidget *tqparent, const char *name) - : KivioStencilSetWidget(tqparent, name) + AddStencilSetPanel::AddStencilSetPanel(TQWidget *parent, const char *name) + : KivioStencilSetWidget(parent, name) { int height = m_stencilsetGBox->height() / 2; TQValueList<int> sizes; @@ -171,7 +171,7 @@ namespace Kivio { void AddStencilSetPanel::changeStencilSet(TQListViewItem* li) { - if(!li || !li->tqparent()) { + if(!li || !li->parent()) { return; } diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h index 802c54da..30cac93b 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h @@ -31,7 +31,7 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - AddStencilSetPanel(TQWidget *tqparent = 0, const char *name = 0); + AddStencilSetPanel(TQWidget *parent = 0, const char *name = 0); ~AddStencilSetPanel(); public slots: diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp index 03f0ac3a..b208813a 100644 --- a/kivio/kiviopart/ui/kivioaligndialog.cpp +++ b/kivio/kiviopart/ui/kivioaligndialog.cpp @@ -28,8 +28,8 @@ #include "kivio_page.h" #include "aligndialog.h" -KivioAlignDialog::KivioAlignDialog(TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok) +KivioAlignDialog::KivioAlignDialog(TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok) { m_view = new KivioAlignDialogWidget(this); setMainWidget(m_view); diff --git a/kivio/kiviopart/ui/kivioaligndialog.h b/kivio/kiviopart/ui/kivioaligndialog.h index 18808b2c..20527999 100644 --- a/kivio/kiviopart/ui/kivioaligndialog.h +++ b/kivio/kiviopart/ui/kivioaligndialog.h @@ -31,7 +31,7 @@ class KivioAlignDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KivioAlignDialog(TQWidget* tqparent = 0, const char* name = 0); + KivioAlignDialog(TQWidget* parent = 0, const char* name = 0); AlignData align(); diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 69312faf..9237333e 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -36,8 +36,8 @@ #include "kivio_view.h" #include "kivioglobal.h" -KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok) +KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok) { m_unit = KoUnit::U_PT; init(); @@ -111,7 +111,7 @@ void KivioArrowHeadFormatDlg::init() void KivioArrowHeadFormatDlg::loadArrowHeads(KComboBox* combo) { - TQBitmap tqmask; + TQBitmap mask; TQPixmap pixAll = Kivio::arrowHeadPixmap(); TQPixmap pix(pixAll.width(), 17); TQPainter p(&pix, combo); diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h index 49912798..a829873c 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h @@ -33,7 +33,7 @@ class KivioArrowHeadFormatDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name = 0); + KivioArrowHeadFormatDlg(KivioView* parent, const char* name = 0); int startAHType(); double startAHWidth(); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 136b7deb..23900894 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -48,8 +48,8 @@ #include <tqlayout.h> #include <tqtabwidget.h> -// GuidesListViewItem::GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u) -// : KListViewItem(tqparent), m_data(gd) +// GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) +// : KListViewItem(parent), m_data(gd) // { // setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? // "guides_vertical":"guides_horizontal")); @@ -87,12 +87,12 @@ /*****************************************************************************/ -KivioOptionsDialog::KivioOptionsDialog(KivioView* tqparent, const char* name) - : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, tqparent, name) +KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name) + : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, parent, name) { initPage(); initGrid(); - unitChanged(tqparent->doc()->unit()); + unitChanged(parent->doc()->unit()); } void KivioOptionsDialog::initPage() @@ -101,7 +101,7 @@ void KivioOptionsDialog::initPage() kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32)); m_pageIndex = pageIndex(page); - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit()); m_layout = Kivio::Config::defaultPageLayout(); m_font = Kivio::Config::font(); @@ -158,8 +158,8 @@ void KivioOptionsDialog::initGrid() TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium )); m_gridIndex = pageIndex(page); - KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->unit(); - KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->grid(); + KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit(); + KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->grid(); double pgw = m_layout.ptWidth; double pgh = m_layout.ptHeight; double fw = Kivio::Config::gridXSpacing(); @@ -210,7 +210,7 @@ void KivioOptionsDialog::initGrid() void KivioOptionsDialog::applyPage() { - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); view->doc()->setUnit(static_cast<KoUnit::Unit>(m_unitCombo->currentItem())); Kivio::Config::setUnit(KoUnit::unitName(view->doc()->unit())); Kivio::Config::setDefaultPageLayout(m_layout); @@ -230,7 +230,7 @@ void KivioOptionsDialog::applyGrid() Kivio::Config::setShowGrid(m_gridChBox->isChecked()); Kivio::Config::setSnapGrid(m_snapChBox->isChecked()); Kivio::Config::setGridColor(m_gridColorBtn->color()); - KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent())); view->doc()->updateView(0); } diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index c1516748..589dab35 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -40,7 +40,7 @@ class TQFont; // class GuidesListViewItem : public KListViewItem // { // public: -// GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u); +// GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u); // ~GuidesListViewItem(); // // void setUnit(KoUnit::Unit u); @@ -59,7 +59,7 @@ class KivioOptionsDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KivioOptionsDialog(KivioView* tqparent, const char* name = 0); + KivioOptionsDialog(KivioView* parent, const char* name = 0); protected: void initPage(); diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 359381de..3361ad23 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -32,8 +32,8 @@ #include "kivio_view.h" -KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok) +KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok) { m_unit = KoUnit::U_PT; init(); @@ -83,7 +83,7 @@ void KivioStencilFormatDlg::init() void KivioStencilFormatDlg::initLinePatterns() { - TQBitmap tqmask; + TQBitmap mask; TQPixmap pix(m_patternCBox->width(), 17); TQPainter p(&pix, m_patternCBox); TQPen pen; @@ -96,8 +96,8 @@ void KivioStencilFormatDlg::initLinePatterns() p.setPen(pen); p.drawLine(0, 8, pix.width(), 8); - tqmask = pix; - pix.setMask(tqmask); + mask = pix; + pix.setMask(mask); m_patternCBox->insertItem(pix, i); } @@ -106,7 +106,7 @@ void KivioStencilFormatDlg::initLinePatterns() void KivioStencilFormatDlg::initFillPatterns() { - TQBitmap tqmask; + TQBitmap mask; TQPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4); TQPainter p(&pix, m_fillPatternCBox); TQBrush brush; @@ -126,7 +126,7 @@ void KivioStencilFormatDlg::initFillPatterns() void KivioStencilFormatDlg::initLineEndStyles() { - TQBitmap tqmask; + TQBitmap mask; TQPixmap pix(m_lineEndStyleCBox->width(), 17); TQPainter p(&pix, m_lineEndStyleCBox); TQPen pen; @@ -142,8 +142,8 @@ void KivioStencilFormatDlg::initLineEndStyles() p.setPen(pen); p.drawLine(6, 8, pix.width() - 12, 8); - tqmask = pix; - pix.setMask(tqmask); + mask = pix; + pix.setMask(mask); m_lineEndStyleCBox->insertItem(pix, i); } diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.h b/kivio/kiviopart/ui/kiviostencilformatdlg.h index 6d45d4e2..358ddd20 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.h +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.h @@ -35,7 +35,7 @@ class KivioStencilFormatDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KivioStencilFormatDlg(KivioView* tqparent, const char* name = 0); + KivioStencilFormatDlg(KivioView* parent, const char* name = 0); double lineWidth(); TQColor lineColor(); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 43f783e1..94dd995d 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -31,8 +31,8 @@ #include "kivio_view.h" #include "kivio_doc.h" -KivioTextFormatDlg::KivioTextFormatDlg(KivioView* tqparent, const char* name) - : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, tqparent, name) +KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name) + : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, parent, name) { m_valign = TQt::AlignVCenter; m_halign = TQt::AlignHCenter; @@ -183,7 +183,7 @@ void KivioTextFormatDlg::setTextColor(TQColor c) void KivioTextFormatDlg::slotDefault() { - setFont((static_cast<KivioView*>(TQT_TQWIDGET(tqparent())))->doc()->defaultFont()); + setFont((static_cast<KivioView*>(TQT_TQWIDGET(parent())))->doc()->defaultFont()); setTextColor(TQColor(0, 0, 0)); setHAlign(TQt::AlignHCenter); setVAlign(TQt::AlignVCenter); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h index 6792f3f3..4bc8a567 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.h +++ b/kivio/kiviopart/ui/kiviotextformatdlg.h @@ -35,7 +35,7 @@ class KivioTextFormatDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - KivioTextFormatDlg(KivioView* tqparent, const char* name = 0); + KivioTextFormatDlg(KivioView* parent, const char* name = 0); int valign(); int halign(); diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index eabc8723..ed32c284 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -27,8 +27,8 @@ namespace Kivio { -LayerListToolTip::LayerListToolTip(TQWidget* tqparent, TQListView* listView) - : TQToolTip(tqparent) +LayerListToolTip::LayerListToolTip(TQWidget* parent, TQListView* listView) + : TQToolTip(parent) { m_listView = listView; } diff --git a/kivio/kiviopart/ui/layerlisttooltip.h b/kivio/kiviopart/ui/layerlisttooltip.h index 29bbabe6..f7c12037 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.h +++ b/kivio/kiviopart/ui/layerlisttooltip.h @@ -30,7 +30,7 @@ namespace Kivio { class LayerListToolTip : public TQToolTip { public: - LayerListToolTip(TQWidget* tqparent, TQListView* listView); + LayerListToolTip(TQWidget* parent, TQListView* listView); ~LayerListToolTip(); void maybeTip(const TQPoint& pos); diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 28793807..7483e98d 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -40,8 +40,8 @@ namespace Kivio { class ObjectListItem : public KListViewItem { public: - ObjectListItem(KListView* tqparent, KivioStencil* _stencil) - : KListViewItem(tqparent, "") + ObjectListItem(KListView* parent, KivioStencil* _stencil) + : KListViewItem(parent, "") { m_stencil = _stencil; setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil)); @@ -80,8 +80,8 @@ class ObjectListItem : public KListViewItem KivioStencil* m_stencil; }; -ObjectListPalette::ObjectListPalette(KivioView* tqparent, const char* name) - : TQWidget(tqparent, name), m_view(tqparent) +ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) + : TQWidget(parent, name), m_view(parent) { m_blockUpdate = false; diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h index 17fbd0f4..01db4ceb 100644 --- a/kivio/kiviopart/ui/objectlistpalette.h +++ b/kivio/kiviopart/ui/objectlistpalette.h @@ -34,7 +34,7 @@ class ObjectListPalette : public TQWidget Q_OBJECT TQ_OBJECT public: - ObjectListPalette(KivioView* tqparent = 0, const char* name = 0); + ObjectListPalette(KivioView* parent = 0, const char* name = 0); ~ObjectListPalette(); void updateObjectList(); diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp index 848579c9..8a61df93 100644 --- a/kivio/plugins/kivioconnectortool/plugin.cpp +++ b/kivio/plugins/kivioconnectortool/plugin.cpp @@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory ) KInstance* ConnectorToolFactory::s_global = 0; -ConnectorToolFactory::ConnectorToolFactory( TQObject* tqparent, const char* name ) -: KLibFactory( tqparent, name ) +ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name ) +: KLibFactory( parent, name ) { s_global = new KInstance("kivio"); } @@ -42,12 +42,12 @@ ConnectorToolFactory::~ConnectorToolFactory() delete s_global; } -TQObject* ConnectorToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new ConnectorTool( (KivioView*)tqparent ); + TQObject *obj = new ConnectorTool( (KivioView*)parent ); return obj; } diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h index e8d9803b..267bbbb4 100644 --- a/kivio/plugins/kivioconnectortool/plugin.h +++ b/kivio/plugins/kivioconnectortool/plugin.h @@ -30,10 +30,10 @@ class ConnectorToolFactory : public KLibFactory { Q_OBJECT TQ_OBJECT public: - ConnectorToolFactory( TQObject* tqparent = 0, const char* name = 0 ); + ConnectorToolFactory( TQObject* parent = 0, const char* name = 0 ); ~ConnectorToolFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp index 199e78d6..41ec75e0 100644 --- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp +++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.cpp @@ -48,8 +48,8 @@ static KivioStencilSpawnerInfo sinfo = KivioStencilSpawnerInfo("Dave Marotti", " #include <kgenericfactory.h> K_EXPORT_COMPONENT_FACTORY( straight_connector, KGenericFactory<KivioConnectorFactory>( "KivioConnectorFactory" ) ) -KivioConnectorFactory::KivioConnectorFactory(TQObject *tqparent, const char* name, const TQStringList& args) : - KivioStencilFactory(tqparent, name, args) +KivioConnectorFactory::KivioConnectorFactory(TQObject *parent, const char* name, const TQStringList& args) : + KivioStencilFactory(parent, name, args) { kdDebug(43000) << "new straight line connector factory: " << endl; } diff --git a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h index e0ea7476..c9f1549e 100644 --- a/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h +++ b/kivio/plugins/kivioconnectortool/straight_connector/straight_connector.h @@ -85,7 +85,7 @@ class KIVIOPLUGINS_EXPORT KivioConnectorFactory : public KivioStencilFactory Q_OBJECT TQ_OBJECT public: - KivioConnectorFactory(TQObject *tqparent=0, const char* name=0, const TQStringList& args = TQStringList()); + KivioConnectorFactory(TQObject *parent=0, const char* name=0, const TQStringList& args = TQStringList()); KivioStencil *NewStencil(const TQString& name); KivioStencil *NewStencil(); TQPixmap *GetIcon(); diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index a1597f85..ca3ff402 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -47,7 +47,7 @@ #include "polylineconnectorspawner.h" #include "mousetoolaction.h" -ConnectorTool::ConnectorTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Connector Mouse Tool") +ConnectorTool::ConnectorTool( KivioView* parent ) : Kivio::MouseTool(parent, "Connector Mouse Tool") { m_connectorAction = new Kivio::MouseToolAction(i18n("Straight Connector"), "kivio_connector", 0, actionCollection(), "connector"); diff --git a/kivio/plugins/kivioconnectortool/tool_connector.h b/kivio/plugins/kivioconnectortool/tool_connector.h index 7dd1462b..74497053 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.h +++ b/kivio/plugins/kivioconnectortool/tool_connector.h @@ -40,7 +40,7 @@ class ConnectorTool : public Kivio::MouseTool Q_OBJECT TQ_OBJECT public: - ConnectorTool( KivioView* tqparent ); + ConnectorTool( KivioView* parent ); ~ConnectorTool(); virtual bool processEvent(TQEvent* e); diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp index c6d22e64..fba217c6 100644 --- a/kivio/plugins/kivioselecttool/plugin.cpp +++ b/kivio/plugins/kivioselecttool/plugin.cpp @@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory ) KInstance* SelectToolFactory::s_global = 0; -SelectToolFactory::SelectToolFactory( TQObject* tqparent, const char* name ) -: KLibFactory( tqparent, name ) +SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name ) +: KLibFactory( parent, name ) { s_global = new KInstance("kivio"); } @@ -42,12 +42,12 @@ SelectToolFactory::~SelectToolFactory() delete s_global; } -TQObject* SelectToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new SelectTool( (KivioView*)tqparent ); + TQObject *obj = new SelectTool( (KivioView*)parent ); return obj; } diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h index dffe4161..5564327f 100644 --- a/kivio/plugins/kivioselecttool/plugin.h +++ b/kivio/plugins/kivioselecttool/plugin.h @@ -30,10 +30,10 @@ class SelectToolFactory : public KLibFactory { Q_OBJECT TQ_OBJECT public: - SelectToolFactory( TQObject* tqparent = 0, const char* name = 0 ); + SelectToolFactory( TQObject* parent = 0, const char* name = 0 ); ~SelectToolFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index b201f4d4..b6c24c57 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -48,7 +48,7 @@ #include "kivio_pluginmanager.h" -SelectTool::SelectTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Selection Mouse Tool") +SelectTool::SelectTool( KivioView* parent ) : Kivio::MouseTool(parent, "Selection Mouse Tool") { view()->pluginManager()->setDefaultTool(this); diff --git a/kivio/plugins/kivioselecttool/tool_select.h b/kivio/plugins/kivioselecttool/tool_select.h index 6e476b99..7a71dabf 100644 --- a/kivio/plugins/kivioselecttool/tool_select.h +++ b/kivio/plugins/kivioselecttool/tool_select.h @@ -56,7 +56,7 @@ class SelectTool : public Kivio::MouseTool Q_OBJECT TQ_OBJECT public: - SelectTool( KivioView* tqparent ); + SelectTool( KivioView* parent ); ~SelectTool(); virtual bool processEvent(TQEvent* e); diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp index a622f6e3..5c4b74f7 100644 --- a/kivio/plugins/kiviosmlconnector/plugin.cpp +++ b/kivio/plugins/kiviosmlconnector/plugin.cpp @@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory ) KInstance* SMLConnectorFactory::s_global = 0; -SMLConnectorFactory::SMLConnectorFactory( TQObject* tqparent, const char* name ) -: KLibFactory( tqparent, name ) +SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name ) +: KLibFactory( parent, name ) { s_global = new KInstance("kivio"); } @@ -42,12 +42,12 @@ SMLConnectorFactory::~SMLConnectorFactory() delete s_global; } -TQObject* SMLConnectorFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new SMLConnector( (KivioView*)tqparent ); + TQObject *obj = new SMLConnector( (KivioView*)parent ); return obj; } diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h index 9868fcc0..0a1f9056 100644 --- a/kivio/plugins/kiviosmlconnector/plugin.h +++ b/kivio/plugins/kiviosmlconnector/plugin.h @@ -30,10 +30,10 @@ class SMLConnectorFactory : public KLibFactory { Q_OBJECT TQ_OBJECT public: - SMLConnectorFactory( TQObject* tqparent = 0, const char* name = 0 ); + SMLConnectorFactory( TQObject* parent = 0, const char* name = 0 ); ~SMLConnectorFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp index 3ab38fa4..3745820c 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp @@ -48,8 +48,8 @@ static KivioStencilSpawnerInfo sinfo = KivioStencilSpawnerInfo( "Ian Reinhart Ge K_EXPORT_COMPONENT_FACTORY( sml_connector, KGenericFactory<KivioSMLConnectorFactory>( "KivioSMLConnectorFactory" ) ) -KivioSMLConnectorFactory::KivioSMLConnectorFactory( TQObject *tqparent, const char* name, const TQStringList& args ) : - KivioStencilFactory( tqparent, name, args ) +KivioSMLConnectorFactory::KivioSMLConnectorFactory( TQObject *parent, const char* name, const TQStringList& args ) : + KivioStencilFactory( parent, name, args ) { kdDebug(43000) << "new sml stencil factory: " << endl; } diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h index 0be46d46..a50ec750 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h @@ -95,7 +95,7 @@ class KivioSMLConnectorFactory : public KivioStencilFactory Q_OBJECT TQ_OBJECT public: - KivioSMLConnectorFactory(TQObject *tqparent=0, const char* name=0, const TQStringList& args = TQStringList()); + KivioSMLConnectorFactory(TQObject *parent=0, const char* name=0, const TQStringList& args = TQStringList()); KivioStencil *NewStencil(const TQString& name); KivioStencil *NewStencil(); TQPixmap *GetIcon(); diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp index 672c0a43..c25fb36b 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp @@ -32,7 +32,7 @@ #include "kivio_command.h" namespace Kivio { - TargetTool::TargetTool(KivioView* tqparent) : MouseTool(tqparent, "Add Target Mouse Tool") + TargetTool::TargetTool(KivioView* parent) : MouseTool(parent, "Add Target Mouse Tool") { m_targetAction = new Kivio::MouseToolAction(i18n("Add Connector Target"), "add_target", 0, actionCollection(), "addTargetTool"); diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.h b/kivio/plugins/kiviotargettool/kiviotargettool.h index 52286f82..064c4f05 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettool.h +++ b/kivio/plugins/kiviotargettool/kiviotargettool.h @@ -38,7 +38,7 @@ namespace Kivio { Q_OBJECT TQ_OBJECT public: - TargetTool(KivioView* tqparent); + TargetTool(KivioView* parent); ~TargetTool(); virtual bool processEvent(TQEvent* e); diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp index 599c3a01..048c8e32 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp @@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotargettool, KivioTargetToolFactory ) KInstance* KivioTargetToolFactory::s_global = 0; -KivioTargetToolFactory::KivioTargetToolFactory(TQObject *tqparent, const char *name) - : KLibFactory(tqparent, name) +KivioTargetToolFactory::KivioTargetToolFactory(TQObject *parent, const char *name) + : KLibFactory(parent, name) { s_global = new KInstance("kivio"); } @@ -35,12 +35,12 @@ KivioTargetToolFactory::~KivioTargetToolFactory() delete s_global; } -TQObject* KivioTargetToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(TQT_TQWIDGET(tqparent))); + TQObject *obj = new Kivio::TargetTool(static_cast<KivioView*>(TQT_TQWIDGET(parent))); return obj; } diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h index e1ba4521..84619e47 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h @@ -31,10 +31,10 @@ class KivioTargetToolFactory : public KLibFactory Q_OBJECT TQ_OBJECT public: - KivioTargetToolFactory(TQObject *tqparent = 0, const char *name = 0); + KivioTargetToolFactory(TQObject *parent = 0, const char *name = 0); ~KivioTargetToolFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp index cd9a43ec..fd173935 100644 --- a/kivio/plugins/kiviotexttool/plugin.cpp +++ b/kivio/plugins/kiviotexttool/plugin.cpp @@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory ) KInstance* TextToolFactory::s_global = 0; -TextToolFactory::TextToolFactory( TQObject* tqparent, const char* name ) -: KLibFactory( tqparent, name ) +TextToolFactory::TextToolFactory( TQObject* parent, const char* name ) +: KLibFactory( parent, name ) { s_global = new KInstance("kivio"); } @@ -42,12 +42,12 @@ TextToolFactory::~TextToolFactory() delete s_global; } -TQObject* TextToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject *obj = new TextTool( (KivioView*)tqparent ); + TQObject *obj = new TextTool( (KivioView*)parent ); return obj; } diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h index 1e30ddb0..f6194c14 100644 --- a/kivio/plugins/kiviotexttool/plugin.h +++ b/kivio/plugins/kiviotexttool/plugin.h @@ -30,10 +30,10 @@ class TextToolFactory : public KLibFactory { Q_OBJECT TQ_OBJECT public: - TextToolFactory( TQObject* tqparent = 0, const char* name = 0 ); + TextToolFactory( TQObject* parent = 0, const char* name = 0 ); ~TextToolFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index a68b9548..49a42589 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -35,8 +35,8 @@ namespace Kivio { -StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel) +StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, caption, KDialogBase::Ok|KDialogBase::Cancel) { m_hAlign = -1; m_vAlign = -1; diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.h b/kivio/plugins/kiviotexttool/stenciltexteditor.h index d57cb9dd..7f61c5aa 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.h +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.h @@ -36,7 +36,7 @@ class StencilTextEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - StencilTextEditor(const TQString& caption, TQWidget *tqparent = 0, const char *name = 0); + StencilTextEditor(const TQString& caption, TQWidget *parent = 0, const char *name = 0); ~StencilTextEditor(); void setFont(const TQFont& font); diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 645a79a4..7d449ae0 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -46,7 +46,7 @@ #include "stenciltexteditor.h" -TextTool::TextTool( KivioView* tqparent ) : Kivio::MouseTool(tqparent, "Text Mouse Tool") +TextTool::TextTool( KivioView* parent ) : Kivio::MouseTool(parent, "Text Mouse Tool") { m_textAction = new Kivio::MouseToolAction( i18n("Text Tool"), "text", Key_F2, actionCollection(), "text" ); connect(m_textAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setActivated(bool))); diff --git a/kivio/plugins/kiviotexttool/tool_text.h b/kivio/plugins/kiviotexttool/tool_text.h index 1bc43bb9..f6c4870a 100644 --- a/kivio/plugins/kiviotexttool/tool_text.h +++ b/kivio/plugins/kiviotexttool/tool_text.h @@ -38,7 +38,7 @@ class KIVIO_EXPORT TextTool : public Kivio::MouseTool Q_OBJECT TQ_OBJECT public: - TextTool( KivioView* tqparent ); + TextTool( KivioView* parent ); ~TextTool(); virtual bool processEvent(TQEvent* e); diff --git a/kivio/plugins/kiviozoomtool/plugin.cpp b/kivio/plugins/kiviozoomtool/plugin.cpp index 6248e432..4ecd452d 100644 --- a/kivio/plugins/kiviozoomtool/plugin.cpp +++ b/kivio/plugins/kiviozoomtool/plugin.cpp @@ -31,8 +31,8 @@ K_EXPORT_COMPONENT_FACTORY( libkiviozoomtool, ZoomToolFactory ) KInstance* ZoomToolFactory::s_global = 0; -ZoomToolFactory::ZoomToolFactory( TQObject* tqparent, const char* name ) -: KLibFactory( tqparent, name ) +ZoomToolFactory::ZoomToolFactory( TQObject* parent, const char* name ) +: KLibFactory( parent, name ) { s_global = new KInstance("kivio"); } @@ -42,12 +42,12 @@ ZoomToolFactory::~ZoomToolFactory() delete s_global; } -TQObject* ZoomToolFactory::createObject( TQObject* tqparent, const char*, const char*, const TQStringList& ) +TQObject* ZoomToolFactory::createObject( TQObject* parent, const char*, const char*, const TQStringList& ) { - if ( !tqparent->inherits("KivioView") ) + if ( !parent->inherits("KivioView") ) return 0; - TQObject* obj = new ZoomTool( (KivioView*)tqparent ); + TQObject* obj = new ZoomTool( (KivioView*)parent ); return obj; } diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h index 42ceb091..0bdfde14 100644 --- a/kivio/plugins/kiviozoomtool/plugin.h +++ b/kivio/plugins/kiviozoomtool/plugin.h @@ -30,10 +30,10 @@ class ZoomToolFactory : public KLibFactory { Q_OBJECT TQ_OBJECT public: - ZoomToolFactory( TQObject* tqparent = 0, const char* name = 0 ); + ZoomToolFactory( TQObject* parent = 0, const char* name = 0 ); ~ZoomToolFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index f690c9f3..01a148be 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -38,7 +38,7 @@ #include <tqapplication.h> #include <tqcursor.h> -ZoomTool::ZoomTool(KivioView* tqparent) : Kivio::MouseTool(tqparent, "Zoom Mouse Tool") +ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Tool") { m_zoomAction = new KRadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom"); m_zoomAction->setWhatsThis(i18n("By pressing this button you can zoom in on a specific area.")); @@ -53,8 +53,8 @@ ZoomTool::ZoomTool(KivioView* tqparent) : Kivio::MouseTool(tqparent, "Zoom Mouse KoZoomAction* viewZoom = new KoZoomAction(i18n("Zoom &Level"), "viewmag", 0, actionCollection(), "viewZoom" ); viewZoom->setWhatsThis(i18n("This allows you to zoom in or out of a document. You can either choose one of the predefined zoomfactors or enter a new zoomfactor (in percent).")); - connect(viewZoom, TQT_SIGNAL(zoomChanged(const TQString&)), tqparent, TQT_SLOT(viewZoom(const TQString&))); - connect(tqparent, TQT_SIGNAL(zoomChanged(int)), viewZoom, TQT_SLOT(setZoom(int))); + connect(viewZoom, TQT_SIGNAL(zoomChanged(const TQString&)), parent, TQT_SLOT(viewZoom(const TQString&))); + connect(parent, TQT_SIGNAL(zoomChanged(int)), viewZoom, TQT_SLOT(setZoom(int))); m_pPlus = KStdAction::zoomIn(this, TQT_SLOT(zoomPlus()), actionCollection(), "zoomPlus"); m_pPlus->setWhatsThis(i18n("You can zoom in on the document by pressing this button.")); diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.h b/kivio/plugins/kiviozoomtool/tool_zoom.h index 15700f75..1cb77431 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.h +++ b/kivio/plugins/kiviozoomtool/tool_zoom.h @@ -36,7 +36,7 @@ class ZoomTool : public Kivio::MouseTool Q_OBJECT TQ_OBJECT public: - ZoomTool(KivioView* tqparent); + ZoomTool(KivioView* parent); virtual ~ZoomTool(); virtual bool processEvent(TQEvent* e); |