diff options
Diffstat (limited to 'kpresenter')
89 files changed, 244 insertions, 244 deletions
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index 41f940a6..b616f802 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -43,8 +43,8 @@ #include <KoPicture.h> -KPrBackPreview::KPrBackPreview( TQWidget *tqparent, KPrPage *page ) - : TQFrame( tqparent ) +KPrBackPreview::KPrBackPreview( TQWidget *parent, KPrPage *page ) + : TQFrame( parent ) { setFrameStyle( WinPanel | Sunken ); back = new KPrBackGround( page ); @@ -65,13 +65,13 @@ void KPrBackPreview::drawContents( TQPainter *p ) p->restore(); } -KPrBackDialog::KPrBackDialog( TQWidget* tqparent, const char* name, +KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, BackType backType, const TQColor &backColor1, const TQColor &backColor2, BCType _bcType, const KoPicture &backPic, BackView backPicView, bool _unbalanced, int _xfactor, int _yfactor, KPrPage *_page ) - : KDialogBase( tqparent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| + : KDialogBase( parent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| KDialogBase::User1|KDialogBase::User2 ), m_useMasterBackground( 0 ), m_picture(backPic),m_oldpicture(backPic), m_page( _page ) { diff --git a/kpresenter/KPrBackDia.h b/kpresenter/KPrBackDia.h index 36ae92f5..dba9b9bc 100644 --- a/kpresenter/KPrBackDia.h +++ b/kpresenter/KPrBackDia.h @@ -48,7 +48,7 @@ class KPrBackPreview : public TQFrame TQ_OBJECT public: - KPrBackPreview( TQWidget *tqparent, KPrPage *page ); + KPrBackPreview( TQWidget *parent, KPrPage *page ); virtual ~KPrBackPreview(); KPrBackGround *backGround() const { @@ -69,7 +69,7 @@ class KPrBackDialog : public KDialogBase TQ_OBJECT public: - KPrBackDialog( TQWidget* tqparent, const char* name, + KPrBackDialog( TQWidget* parent, const char* name, BackType backType, const TQColor &backColor1, const TQColor &backColor2, BCType _bcType, const KoPicture &backPic, diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 7e4b4371..6e550fe0 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -33,8 +33,8 @@ #include <kcolorbutton.h> #include <kcombobox.h> -KPrBrushProperty::KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush ) - : TQWidget( tqparent, name ) +KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KPrBrushCmd::Brush &brush ) + : TQWidget( parent, name ) , m_brush( brush ) { TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h index 58f415d8..ed9ca272 100644 --- a/kpresenter/KPrBrushProperty.h +++ b/kpresenter/KPrBrushProperty.h @@ -38,7 +38,7 @@ class KPrBrushProperty : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush ); + KPrBrushProperty( TQWidget *parent, const char *name, const KPrBrushCmd::Brush &brush ); ~KPrBrushProperty(); int getBrushPropertyChange() const; diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 2ada2d93..c43faed3 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -92,8 +92,8 @@ const int KPrCanvas::MOUSE_SNAP_DISTANCE = 4; const int KPrCanvas::KEY_SNAP_DISTANCE = 2; -KPrCanvas::KPrCanvas( TQWidget *tqparent, const char *name, KPrView *_view ) -: TQWidget( tqparent, name, WStaticContents|WResizeNoErase|WRepaintNoErase ) +KPrCanvas::KPrCanvas( TQWidget *parent, const char *name, KPrView *_view ) +: TQWidget( parent, name, WStaticContents|WResizeNoErase|WRepaintNoErase ) , buffer( size() ) , m_gl( _view, _view->zoomHandler() ) , m_paintGuides( false ) @@ -108,7 +108,7 @@ KPrCanvas::KPrCanvas( TQWidget *tqparent, const char *name, KPrView *_view ) m_keyPressEvent = false; m_drawSymetricObject = false; - if ( tqparent ) { + if ( parent ) { showingLastSlide = false; mousePressed = false; drawContour = false; diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index c7c67c02..e2b373e1 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -87,7 +87,7 @@ class KPrCanvas : public TQWidget public: /// constructor - KPrCanvas( TQWidget *tqparent=0,const char *name=0,KPrView *_view=0 ); + KPrCanvas( TQWidget *parent=0,const char *name=0,KPrView *_view=0 ); /// destructor ~KPrCanvas(); diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index da37a08e..e93977aa 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -79,47 +79,47 @@ #include <kspell2/broker.h> using namespace KSpell2; -KPrConfig::KPrConfig( KPrView* tqparent ) +KPrConfig::KPrConfig( KPrView* parent ) : KDialogBase(KDialogBase::IconList,i18n("Configure KPresenter") , KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default, - KDialogBase::Ok, tqparent) + KDialogBase::Ok, parent) { - m_doc = tqparent->kPresenterDoc(); + m_doc = parent->kPresenterDoc(); TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"), BarIcon("misc", KIcon::SizeMedium) ); - _interfacePage=new KPrConfigureInterfacePage( tqparent, page ); + _interfacePage=new KPrConfigureInterfacePage( parent, page ); page = addVBoxPage( i18n("Color"), i18n("Color"), BarIcon("colorize", KIcon::SizeMedium) ); - _colorBackground = new KPrConfigureColorBackground( tqparent, page ); + _colorBackground = new KPrConfigureColorBackground( parent, page ); page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"), BarIcon("spellcheck", KIcon::SizeMedium) ); - _spellPage=new KPrConfigureSpellPage(tqparent, page); + _spellPage=new KPrConfigureSpellPage(parent, page); page = addVBoxPage( i18n("Misc"), i18n("Misc"), BarIcon("misc", KIcon::SizeMedium) ); - _miscPage=new KPrConfigureMiscPage(tqparent, page); + _miscPage=new KPrConfigureMiscPage(parent, page); page = addVBoxPage( i18n("Document"), i18n("Document Settings"), BarIcon("kpresenter_kpr", KIcon::SizeMedium) ); - _defaultDocPage=new KPrConfigureDefaultDocPage(tqparent, page); + _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page); page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"), BarIcon("configure", KIcon::SizeMedium) ); - _toolsPage=new KPrConfigureToolsPage(tqparent, page); + _toolsPage=new KPrConfigureToolsPage(parent, page); page = addVBoxPage( i18n("Paths"), i18n("Path Settings"), BarIcon("path") ); - m_pathPage=new KPrConfigurePathPage(tqparent, page); + m_pathPage=new KPrConfigurePathPage(parent, page); if (KoSpeaker::isKttsdInstalled()) { page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) ); - m_ttsPage=new KPrConfigureTTSPage(tqparent, page); + m_ttsPage=new KPrConfigureTTSPage(parent, page); } else m_ttsPage = 0; connect( this, TQT_SIGNAL( okClicked() ),this, TQT_SLOT( slotApply() ) ); @@ -203,8 +203,8 @@ void KPrConfig::slotDefault() } } -KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent , char *name ) - :TQWidget ( tqparent,name ) +KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, TQWidget *parent , char *name ) + :TQWidget ( parent,name ) { TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); @@ -312,8 +312,8 @@ void KPrConfigureInterfacePage::slotDefault() showStatusBar->setChecked(true); } -KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent , char *name ) - :TQWidget ( tqparent,name ) +KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidget *parent , char *name ) + :TQWidget ( parent,name ) { m_pView = _view; config = KPrFactory::global()->config(); @@ -382,12 +382,12 @@ void KPrConfigureColorBackground::slotDefault() -KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { m_pView=_view; config = KPrFactory::global()->config(); - m_spellConfigWidget = new ConfigWidget( _view->broker(), tqparent ); + m_spellConfigWidget = new ConfigWidget( _view->broker(), parent ); m_spellConfigWidget->setBackgroundCheckingButtonShown( true ); } @@ -410,8 +410,8 @@ void KPrConfigureSpellPage::slotDefault() m_spellConfigWidget->slotDefault(); } -KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); @@ -588,8 +588,8 @@ void KPrConfigureMiscPage::slotDefault() resolutionX->setValue( MM_TO_POINT( 5.0 )); } -KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); @@ -811,8 +811,8 @@ void KPrConfigureDefaultDocPage::selectNewDefaultFont() { } } -KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); @@ -930,8 +930,8 @@ void KPrConfigureToolsPage::slotDefault() pieValues.pieLength = 270 * 16; } -KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); @@ -1036,8 +1036,8 @@ void KPrConfigurePathPage::apply() //// -KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ) +KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char *name ) + : TQWidget( parent, name ) { Q_UNUSED(_view); diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h index 604b283c..50ad34f2 100644 --- a/kpresenter/KPrConfig.h +++ b/kpresenter/KPrConfig.h @@ -51,7 +51,7 @@ class KPrConfigureInterfacePage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent = 0, char *name = 0 ); + KPrConfigureInterfacePage( KPrView *_view, TQWidget *parent = 0, char *name = 0 ); void apply(); void slotDefault(); private: @@ -68,7 +68,7 @@ class KPrConfigureColorBackground : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent = 0, char *name = 0 ); + KPrConfigureColorBackground( KPrView* _view, TQWidget *parent = 0, char *name = 0 ); void apply(); void slotDefault(); protected: @@ -85,7 +85,7 @@ class KPrConfigureSpellPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigureSpellPage( KPrView *_view, TQWidget *parent, char *name = 0 ); void apply(); void slotDefault(); private: @@ -99,7 +99,7 @@ class KPrConfigureMiscPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureMiscPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, char *name = 0 ); KCommand *apply(); void slotDefault(); private: @@ -118,7 +118,7 @@ class KPrConfigureDefaultDocPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureDefaultDocPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigureDefaultDocPage( KPrView *_view, TQWidget *parent, char *name = 0 ); ~KPrConfigureDefaultDocPage(); KCommand *apply(); void slotDefault(); @@ -150,7 +150,7 @@ class KPrConfigureToolsPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureToolsPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigureToolsPage( KPrView *_view, TQWidget *parent, char *name = 0 ); ~KPrConfigureToolsPage(); void apply(); void slotDefault(); @@ -172,7 +172,7 @@ class KPrConfigurePathPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigurePathPage( KPrView *_view, TQWidget *parent, char *name = 0 ); void slotDefault(); void apply(); private slots: @@ -190,7 +190,7 @@ class KPrConfigureTTSPage : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); + KPrConfigureTTSPage( KPrView *_view, TQWidget *parent, char *name = 0 ); void slotDefault(); void apply(); private slots: @@ -216,7 +216,7 @@ class KPrConfig : public KDialogBase TQ_OBJECT public: enum { KP_INTERFACE = 1, KP_COLOR=2, KP_KSPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 }; - KPrConfig( KPrView* tqparent ); + KPrConfig( KPrView* parent ); public slots: void slotApply(); void slotDefault(); diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 2cc74ef8..7c0fa1c9 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -253,9 +253,9 @@ KPrCustomSlideShowItem::KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * p { } -KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, +KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* parent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name ) -: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) +: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) , listNameCustomSlideShow( _listNameSlideShow ) { init(); @@ -265,9 +265,9 @@ KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, TQString } } -KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, +KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* parent, const TQString &_customName, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name ) -: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) +: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) , listNameCustomSlideShow( _listNameSlideShow ) { init(); diff --git a/kpresenter/KPrCustomSlideShowDia.h b/kpresenter/KPrCustomSlideShowDia.h index 94e6bf2a..ba0a0834 100644 --- a/kpresenter/KPrCustomSlideShowDia.h +++ b/kpresenter/KPrCustomSlideShowDia.h @@ -87,8 +87,8 @@ class KPrDefineCustomSlideShow : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name = 0L); - KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, + KPrDefineCustomSlideShow( TQWidget* parent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name = 0L); + KPrDefineCustomSlideShow( TQWidget* parent, const TQString &_customName, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name = 0L ); TQString customSlideShowName() const; diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 1a884752..7a880406 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -136,9 +136,9 @@ KoDocument *KPrChild::hitTest( const TQPoint &, const TQWMatrix & ) return 0; } -KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, +KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget,widgetName, tqparent, name, singleViewMode ), + : KoDocument( parentWidget,widgetName, parent, name, singleViewMode ), _gradientCollection(), m_customListTest( 0L ), m_childCountBeforeInsert( 0 ) { @@ -3837,12 +3837,12 @@ void KPrDocument::makeUsedSoundFileList() } } -KoView* KPrDocument::createViewInstance( TQWidget* tqparent, const char* name ) +KoView* KPrDocument::createViewInstance( TQWidget* parent, const char* name ) { //the page numbers have to be recalced for the sticky objects //as it could not be done during the constructor of KPrView recalcPageNum(); - return new KPrView( this, tqparent, name ); + return new KPrView( this, parent, name ); } void KPrDocument::paintContent( TQPainter& painter, const TQRect& rect, diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index f5921b65..c51060a4 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -90,8 +90,8 @@ public: KPrChild( KPrDocument *_kpr ); ~KPrChild(); - // get tqparent - KPrDocument* tqparent()const { return m_parent; } + // get parent + KPrDocument* parent()const { return m_parent; } virtual KoDocument *hitTest( const TQPoint &, const TQWMatrix & ); @@ -548,7 +548,7 @@ protected slots: virtual void openTemplate( const TQString& file ); protected: - KoView* createViewInstance( TQWidget* tqparent, const char* name ); + KoView* createViewInstance( TQWidget* parent, const char* name ); void testAndCloseAllTextObjectProtectedContent(); // ************ functions ************ /** diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp index 3396e438..0b0c7646 100644 --- a/kpresenter/KPrDuplicateObjDia.cpp +++ b/kpresenter/KPrDuplicateObjDia.cpp @@ -34,8 +34,8 @@ #include <kseparator.h> #include <KoUnitWidgets.h> -KPrDuplicatObjDia::KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name) - : KDialogBase( tqparent, name, true, "", Ok | Cancel, Ok, true ) +KPrDuplicatObjDia::KPrDuplicatObjDia( TQWidget *parent, KPrDocument * _doc, const char *name) + : KDialogBase( parent, name, true, "", Ok | Cancel, Ok, true ) { m_doc=_doc; KoUnit::Unit unit = m_doc->unit(); diff --git a/kpresenter/KPrDuplicateObjDia.h b/kpresenter/KPrDuplicateObjDia.h index 1c49cb5e..91fe5e5d 100644 --- a/kpresenter/KPrDuplicateObjDia.h +++ b/kpresenter/KPrDuplicateObjDia.h @@ -34,7 +34,7 @@ class KPrDuplicatObjDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name=0L); + KPrDuplicatObjDia( TQWidget *parent, KPrDocument * _doc, const char *name=0L); int nbCopy() const; double angle() const; double increaseX() const; diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index cfc39358..a394e0a8 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -48,9 +48,9 @@ #include <kstandarddirs.h> #include <kfiledialog.h> -KPrEffectDia::KPrEffectDia( TQWidget* tqparent, const char* name, const TQPtrList<KPrObject>& _objs, +KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<KPrObject>& _objs, KPrView *_view ) - : KDialogBase( tqparent, name, true ), objs( _objs ) + : KDialogBase( parent, name, true ), objs( _objs ) { view = _view; KPrObject *obj = objs.at( 0 ); diff --git a/kpresenter/KPrEffectDia.h b/kpresenter/KPrEffectDia.h index af0f4d00..a1bf29ee 100644 --- a/kpresenter/KPrEffectDia.h +++ b/kpresenter/KPrEffectDia.h @@ -45,7 +45,7 @@ class KPrEffectDia : public KDialogBase TQ_OBJECT public: - KPrEffectDia( TQWidget* tqparent, const char*, const TQPtrList<KPrObject> &_objs, + KPrEffectDia( TQWidget* parent, const char*, const TQPtrList<KPrObject> &_objs, KPrView* ); ~KPrEffectDia(); diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp index 076c1ce8..f9419cbe 100644 --- a/kpresenter/KPrFactory.cpp +++ b/kpresenter/KPrFactory.cpp @@ -29,8 +29,8 @@ KInstance* KPrFactory::s_global = 0; KAboutData* KPrFactory::s_aboutData = 0; -KPrFactory::KPrFactory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +KPrFactory::KPrFactory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { (void)global(); } @@ -43,12 +43,12 @@ KPrFactory::~KPrFactory() s_global=0; } -KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, +KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KPrDocument *doc = new KPrDocument( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); + KPrDocument *doc = new KPrDocument( parentWidget, widgetName, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h index be83fc84..ca0d112b 100644 --- a/kpresenter/KPrFactory.h +++ b/kpresenter/KPrFactory.h @@ -29,10 +29,10 @@ class KPrFactory : public KoFactory Q_OBJECT TQ_OBJECT public: - KPrFactory( TQObject* tqparent = 0, const char* name = 0 ); + KPrFactory( TQObject* parent = 0, const char* name = 0 ); ~KPrFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, + 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() ); diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp index 59a5fcfe..3836a8ad 100644 --- a/kpresenter/KPrFindReplace.cpp +++ b/kpresenter/KPrFindReplace.cpp @@ -29,16 +29,16 @@ #include <KoSearchDia.h> #include "KPrTextDocument.h" -KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog, +KPrFindReplace::KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView) - : KoFindReplace( tqparent, dialog, lstObjects, textView ) + : KoFindReplace( parent, dialog, lstObjects, textView ) { m_canvas = canvas; } -KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog, +KPrFindReplace::KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ) - : KoFindReplace( tqparent, dialog, lstObjects, textView ) + : KoFindReplace( parent, dialog, lstObjects, textView ) { m_canvas = canvas; } diff --git a/kpresenter/KPrFindReplace.h b/kpresenter/KPrFindReplace.h index 54ee6861..e1495523 100644 --- a/kpresenter/KPrFindReplace.h +++ b/kpresenter/KPrFindReplace.h @@ -45,12 +45,12 @@ class KPrFindReplace : public KoFindReplace TQ_OBJECT public: /** - * The tqparent widget can't be the canvas, otherwise the 'find next' dialog + * The parent widget can't be the canvas, otherwise the 'find next' dialog * scrolls up/down when using the scrollbars (hehe, cool effect). */ - KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog, + KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); - KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog, + KPrFindReplace( TQWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); ~KPrFindReplace(); diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 16378ef4..89cf00ab 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -31,8 +31,8 @@ #include <KoGeneralPropertyUi.h> -KPrGeneralProperty::KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ) -: TQWidget( tqparent, name ) +KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ) +: TQWidget( parent, name ) , m_ratio( 1.0 ) , m_generalValue( generalValue ) , m_unit( unit ) diff --git a/kpresenter/KPrGeneralProperty.h b/kpresenter/KPrGeneralProperty.h index 73497851..d472d274 100644 --- a/kpresenter/KPrGeneralProperty.h +++ b/kpresenter/KPrGeneralProperty.h @@ -54,7 +54,7 @@ public: Height = 64 }; - KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ); + KPrGeneralProperty( TQWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ); ~KPrGeneralProperty(); int getGeneralPropertyChange() const; diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index fb9ef42a..d5d0ed24 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -33,8 +33,8 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, const TQValueList<int> &slides, int start, - TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Goto Slide..."), Ok|Cancel), + TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Goto Slide..."), Ok|Cancel), oldPage(start) { @@ -65,15 +65,15 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, spinbox->setCurrentItem( spinbox->count()-1 ); } - if ( tqparent ) - tqparent->setCursor( TQt::forbiddenCursor ); + if ( parent ) + parent->setCursor( TQt::forbiddenCursor ); } int KPrGotoPage::gotoPage( const KPrDocument *doc, const TQValueList<int> &slides, int start, - TQWidget *tqparent) + TQWidget *parent) { - KPrGotoPage dia( doc, slides, start,tqparent, 0L ); + KPrGotoPage dia( doc, slides, start,parent, 0L ); dia.exec(); dia.resetCursor(); return dia.page(); diff --git a/kpresenter/KPrGotoPage.h b/kpresenter/KPrGotoPage.h index 22baf3cb..50b89c4f 100644 --- a/kpresenter/KPrGotoPage.h +++ b/kpresenter/KPrGotoPage.h @@ -35,11 +35,11 @@ class KPrGotoPage : public KDialogBase public: KPrGotoPage( const KPrDocument *doc, const TQValueList<int> &slides, int start, - TQWidget *tqparent = 0L, const char *name = 0L ); + TQWidget *parent = 0L, const char *name = 0L ); static int gotoPage( const KPrDocument *doc, const TQValueList<int> &slides, int start, - TQWidget *tqparent = 0L ); + TQWidget *parent = 0L ); int page() const; diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index a0354850..6a0162c1 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -32,8 +32,8 @@ #include "KPrImageEffectDia.h" -KPrImageEffectDia::KPrImageEffectDia(TQWidget * tqparent, const char * name): - KDialogBase(tqparent, name, true, i18n("Image Effect"), Ok|Cancel, Ok) +KPrImageEffectDia::KPrImageEffectDia(TQWidget * parent, const char * name): + KDialogBase(parent, name, true, i18n("Image Effect"), Ok|Cancel, Ok) { m_pix = TQPixmap(); diff --git a/kpresenter/KPrImageEffectDia.h b/kpresenter/KPrImageEffectDia.h index 38b03937..0a8fc84b 100644 --- a/kpresenter/KPrImageEffectDia.h +++ b/kpresenter/KPrImageEffectDia.h @@ -33,7 +33,7 @@ class KPrImageEffectDia: public KDialogBase { TQ_OBJECT public: - KPrImageEffectDia(TQWidget * tqparent = 0, const char * name = 0); + KPrImageEffectDia(TQWidget * parent = 0, const char * name = 0); ~KPrImageEffectDia(); /** diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index f649ebc1..c2db00b4 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -35,8 +35,8 @@ #include "KPrTextObject.h" KPrImportStyleDia::KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, - TQWidget *tqparent, const char *name ) - :KoImportStyleDia( currentCollection, tqparent, name ), + TQWidget *parent, const char *name ) + :KoImportStyleDia( currentCollection, parent, name ), m_doc(_doc) { } diff --git a/kpresenter/KPrImportStyleDia.h b/kpresenter/KPrImportStyleDia.h index 8b550d9f..afae4533 100644 --- a/kpresenter/KPrImportStyleDia.h +++ b/kpresenter/KPrImportStyleDia.h @@ -35,7 +35,7 @@ class KPrImportStyleDia : public KoImportStyleDia Q_OBJECT TQ_OBJECT public: - KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name = 0 ); + KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name = 0 ); ~KPrImportStyleDia(); protected: diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 2e942de7..48074143 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -32,8 +32,8 @@ #include "marginui.h" #include <KoUnitWidgets.h>//for KoUnitDoubleSpinBox -KPrMarginWidget::KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit ) -: TQWidget( tqparent, name ) +KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUnit::Unit unit ) +: TQWidget( parent, name ) , m_unit( unit ) , m_changed( false ) , m_noSignal( false ) diff --git a/kpresenter/KPrMarginWidget.h b/kpresenter/KPrMarginWidget.h index fc8930ee..6345df3e 100644 --- a/kpresenter/KPrMarginWidget.h +++ b/kpresenter/KPrMarginWidget.h @@ -33,7 +33,7 @@ class KPrMarginWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit ); + KPrMarginWidget( TQWidget *parent, const char *name, const KoUnit::Unit unit ); ~KPrMarginWidget(); bool changed() const { return m_changed; } diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index 2abc986f..ea050f41 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -34,9 +34,9 @@ #include "KPrDocument.h" -KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom, +KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *parent, double value, double limitTop, double limitBottom, KPrDocument *_doc, const char *name) - : KDialogBase( tqparent, name , true, "", Ok | Cancel | User1, Ok, true ) + : KDialogBase( parent, name , true, "", Ok | Cancel | User1, Ok, true ) { m_doc=_doc; m_bRemoveLine = false; @@ -64,9 +64,9 @@ double KPrMoveHelpLineDia::newPosition() const } -KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect & _pageRect, +KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pageRect, KPrDocument *_doc, const char *name) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { limitOfPage=_pageRect; m_doc=_doc; @@ -113,9 +113,9 @@ void KPrInsertHelpLineDia::slotRadioButtonClicked() } } -KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect & _pageRect, +KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *parent, const KoRect & _pageRect, KPrDocument *_doc, double posX, double posY, const char *name) - : KDialogBase( tqparent, name , true, "", Ok|Cancel| User1, Ok, true ), + : KDialogBase( parent, name , true, "", Ok|Cancel| User1, Ok, true ), m_bRemovePoint( false ) { limitOfPage=_pageRect; diff --git a/kpresenter/KPrMoveHelpLineDia.h b/kpresenter/KPrMoveHelpLineDia.h index 7bed8b88..92e15058 100644 --- a/kpresenter/KPrMoveHelpLineDia.h +++ b/kpresenter/KPrMoveHelpLineDia.h @@ -35,7 +35,7 @@ class KPrMoveHelpLineDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom, + KPrMoveHelpLineDia( TQWidget *parent, double value, double limitTop, double limitBottom, KPrDocument *_doc, const char *name=0L); double newPosition() const; @@ -55,7 +55,7 @@ class KPrInsertHelpLineDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, const char *name=0L); + KPrInsertHelpLineDia( TQWidget *parent, const KoRect &r, KPrDocument *_doc, const char *name=0L); double newPosition() const; //return true if we add a new horizontal line help @@ -78,7 +78,7 @@ class KPrInsertHelpPointDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, double poxX=0.0, + KPrInsertHelpPointDia( TQWidget *parent, const KoRect &r, KPrDocument *_doc, double poxX=0.0, double posY=0.0, const char *name=0L); KoPoint newPosition() const; diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index bbc14a57..1afef977 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -25,8 +25,8 @@ #include <KoTextZoomHandler.h> #include "KPrUtils.h" -KPrPBPreview::KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType ) - : TQFrame( tqparent, name ) +KPrPBPreview::KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType ) + : TQFrame( parent, name ) { //FIXME zoom _zoomHandler=new KoTextZoomHandler(); diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h index 092adb4e..c3ba061e 100644 --- a/kpresenter/KPrPBPreview.h +++ b/kpresenter/KPrPBPreview.h @@ -47,7 +47,7 @@ public: Gradient }; - KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType = Pen ); + KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen ); ~KPrPBPreview(); void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); } void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); } diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index df4ca0fc..d8e65bac 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -1449,7 +1449,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) if ( !doc ) return NULL; - if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have tqparent + if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have parent return NULL; TQRect r = TQRect( (int)_rect.left(), (int)_rect.top(), @@ -1550,11 +1550,11 @@ void KPrPage::recalcPageNum() } } -void KPrPage::changePicture( const KURL & url, TQWidget *tqparent ) +void KPrPage::changePicture( const KURL & url, TQWidget *parent ) { // filename has been chosen in KPrView with a filedialog, // so we know it exists - KoPicture image = m_doc->pictureCollection()->downloadPicture( url, tqparent ); + KoPicture image = m_doc->pictureCollection()->downloadPicture( url, parent ); TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) diff --git a/kpresenter/KPrPage.h b/kpresenter/KPrPage.h index 431a3662..142068ed 100644 --- a/kpresenter/KPrPage.h +++ b/kpresenter/KPrPage.h @@ -417,7 +417,7 @@ public: void slotRepaintVariable(); void recalcPageNum(); - void changePicture( const KURL & url, TQWidget *tqparent ); + void changePicture( const KURL & url, TQWidget *parent ); void insertPicture( const TQString &filename, const KoPoint &pos ); void insertPicture( const TQString &_file, const KoRect &_rect ); diff --git a/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp index c1ecdac9..36798a0a 100644 --- a/kpresenter/KPrPageIface.cpp +++ b/kpresenter/KPrPageIface.cpp @@ -484,7 +484,7 @@ void KPrPageIface::slideSelected(bool _b) void KPrPageIface::changePicture( const TQString & filename ) { - // TODO: find a better tqparent + // TODO: find a better parent m_page->changePicture(filename, 0); } diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index e2c24e1a..9f903608 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -47,7 +47,7 @@ KPrPartObject &KPrPartObject::operator=( const KPrPartObject & ) void KPrPartObject::updateChildGeometry() { - KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); + KoTextZoomHandler* zh = child->parent()->zoomHandler(); child->setGeometry( zh->zoomRect( getRect() ), true ); child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) ); @@ -58,7 +58,7 @@ void KPrPartObject::rotate( float _angle ) KPrObject::rotate( _angle ); child->setRotation( _angle ); - KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); + KoTextZoomHandler* zh = child->parent()->zoomHandler(); child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) ); } @@ -151,7 +151,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, void KPrPartObject::slot_changed( KoChild *_koChild ) { - KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); + KoTextZoomHandler* zh = child->parent()->zoomHandler(); KoRect g = zh->unzoomRect( _koChild->tqgeometry() ); KPrObject::setOrig( g.x(), g.y() ); KPrObject::setSize( g.width(), g.height() ); diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index 388d7dee..d6790084 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -33,8 +33,8 @@ #include <knuminput.h> -KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds ) -: TQWidget( tqparent, name ) +KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds ) +: TQWidget( parent, name ) , m_pen( pen ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kpresenter/KPrPenStyleWidget.h b/kpresenter/KPrPenStyleWidget.h index 7bbd2c01..19abd8ea 100644 --- a/kpresenter/KPrPenStyleWidget.h +++ b/kpresenter/KPrPenStyleWidget.h @@ -36,7 +36,7 @@ class KPrPenStyleWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true ); + KPrPenStyleWidget( TQWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true ); ~KPrPenStyleWidget(); int getPenConfigChange() const; diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 378b8990..a7df156f 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -47,9 +47,9 @@ #include <knuminput.h> #include <tqslider.h> -KPrPgConfDia::KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc ) +KPrPgConfDia::KPrPgConfDia( TQWidget* parent, KPrDocument* doc ) : KDialogBase( KDialogBase::Tabbed, i18n("Configure Slide Show"), - Ok|Cancel, Ok, tqparent, "pgConfDia", true ), + Ok|Cancel, Ok, parent, "pgConfDia", true ), m_doc( doc ) { setupPageGeneral(); diff --git a/kpresenter/KPrPgConfDia.h b/kpresenter/KPrPgConfDia.h index d322c6e9..79f13f1f 100644 --- a/kpresenter/KPrPgConfDia.h +++ b/kpresenter/KPrPgConfDia.h @@ -50,7 +50,7 @@ class KPrPgConfDia : public KDialogBase public: // constructor - destructor - KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc ); + KPrPgConfDia( TQWidget* parent, KPrDocument* doc ); ~KPrPgConfDia(); bool getInfiniteLoop() const; bool getShowEndOfPresentationSlide() const; diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp index 7964b4bc..a2eafde8 100644 --- a/kpresenter/KPrPicturePreview.cpp +++ b/kpresenter/KPrPicturePreview.cpp @@ -27,8 +27,8 @@ #include <tqpainter.h> -KPrPicturePreview::KPrPicturePreview( TQWidget* tqparent, const char* name) -: TQFrame( tqparent, name ) +KPrPicturePreview::KPrPicturePreview( TQWidget* parent, const char* name) +: TQFrame( parent, name ) , mirrorType( PM_NORMAL ) , depth( 0 ) , swapRGB( false ) diff --git a/kpresenter/KPrPicturePreview.h b/kpresenter/KPrPicturePreview.h index 766025e7..a511f2ac 100644 --- a/kpresenter/KPrPicturePreview.h +++ b/kpresenter/KPrPicturePreview.h @@ -34,7 +34,7 @@ class KPrPicturePreview : public TQFrame TQ_OBJECT public: - KPrPicturePreview( TQWidget* tqparent, const char* name); + KPrPicturePreview( TQWidget* parent, const char* name); ~KPrPicturePreview() {} void setDepth( int depth); diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 135cc189..5e0e6db8 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -28,9 +28,9 @@ #include <tqcheckbox.h> #include <tqlayout.h> -KPrPictureProperty::KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap, +KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap, KPrPictureSettingCmd::PictureSettings pictureSettings ) -: TQWidget( tqparent, name ) +: TQWidget( parent, name ) , m_pictureSettings( pictureSettings ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kpresenter/KPrPictureProperty.h b/kpresenter/KPrPictureProperty.h index 8dc7debe..eb8caa8b 100644 --- a/kpresenter/KPrPictureProperty.h +++ b/kpresenter/KPrPictureProperty.h @@ -33,7 +33,7 @@ class KPrPictureProperty : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap, + KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap, KPrPictureSettingCmd::PictureSettings pictureSettings ); ~KPrPictureProperty(); diff --git a/kpresenter/KPrPieObject.cpp b/kpresenter/KPrPieObject.cpp index efbe6953..a830e703 100644 --- a/kpresenter/KPrPieObject.cpp +++ b/kpresenter/KPrPieObject.cpp @@ -232,8 +232,8 @@ void KPrPieObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, p.drawPixmap( 0, 0, gradient->pixmap() ); p.end(); - TQBitmap tqmask( size, true ); - p.begin( &tqmask ); + TQBitmap mask( size, true ); + p.begin( &mask ); p.setPen( TQPen( TQt::color1 ) ); p.setBrush( TQBrush( TQt::color1 ) ); if ( pieType == PT_CHORD ) @@ -249,7 +249,7 @@ void KPrPieObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, _zoomHandler->zoomItY( oh - 2 * pw), p_angle, p_len ); } p.end(); - m_gradientPix.setMask( tqmask ); + m_gradientPix.setMask( mask ); } _painter->drawPixmap( 0, 0, m_gradientPix, 0, 0, size.width(), size.height() ); _painter->setBrush( TQt::NoBrush ); diff --git a/kpresenter/KPrPiePreview.cpp b/kpresenter/KPrPiePreview.cpp index d7091b26..e6d4f020 100644 --- a/kpresenter/KPrPiePreview.cpp +++ b/kpresenter/KPrPiePreview.cpp @@ -24,8 +24,8 @@ #include <tqpainter.h> -KPrPiePreview::KPrPiePreview( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +KPrPiePreview::KPrPiePreview( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h index 8ac068a2..1f3ca45f 100644 --- a/kpresenter/KPrPiePreview.h +++ b/kpresenter/KPrPiePreview.h @@ -35,7 +35,7 @@ class KPrPiePreview : public TQFrame TQ_OBJECT public: - KPrPiePreview( TQWidget* tqparent, const char* ); + KPrPiePreview( TQWidget* parent, const char* ); ~KPrPiePreview() {} void setAngle( int _angle ) diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 44996750..694a9653 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -31,8 +31,8 @@ #include "KPrPiePreview.h" -KPrPieProperty::KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues ) -: TQWidget( tqparent, name ) +KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues ) +: TQWidget( parent, name ) , m_pieValues( pieValues ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kpresenter/KPrPieProperty.h b/kpresenter/KPrPieProperty.h index 82542fc0..3d89d961 100644 --- a/kpresenter/KPrPieProperty.h +++ b/kpresenter/KPrPieProperty.h @@ -32,7 +32,7 @@ class KPrPieProperty : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues ); + KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues ); ~KPrPieProperty(); int getPiePropertyChange() const; diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp index 114420bc..e41e9c6f 100644 --- a/kpresenter/KPrPolygonPreview.cpp +++ b/kpresenter/KPrPolygonPreview.cpp @@ -27,8 +27,8 @@ #include <math.h> -KPrPolygonPreview::KPrPolygonPreview( TQWidget* tqparent, const char* name) - : TQFrame( tqparent, name ) +KPrPolygonPreview::KPrPolygonPreview( TQWidget* parent, const char* name) + : TQFrame( parent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h index ce1aa948..4d6cc248 100644 --- a/kpresenter/KPrPolygonPreview.h +++ b/kpresenter/KPrPolygonPreview.h @@ -36,7 +36,7 @@ class KPrPolygonPreview : public TQFrame TQ_OBJECT public: - KPrPolygonPreview( TQWidget* tqparent, const char*); + KPrPolygonPreview( TQWidget* parent, const char*); ~KPrPolygonPreview() {} void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index d065c628..fe303a0b 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -29,8 +29,8 @@ #include "polygonpropertyui.h" #include "KPrPolygonPreview.h" -KPrPolygonProperty::KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ) -: TQWidget( tqparent, name ) +KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ) +: TQWidget( parent, name ) , m_polygonSettings( polygonSettings ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kpresenter/KPrPolygonProperty.h b/kpresenter/KPrPolygonProperty.h index 5b41391e..f5960574 100644 --- a/kpresenter/KPrPolygonProperty.h +++ b/kpresenter/KPrPolygonProperty.h @@ -31,7 +31,7 @@ class KPrPolygonProperty : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ); + KPrPolygonProperty( TQWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ); ~KPrPolygonProperty(); int getPolygonPropertyChange() const; diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index c1e7b80f..88163c62 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -30,10 +30,10 @@ #include <kdebug.h> #include <klocale.h> -KPrPresDurationDia::KPrPresDurationDia( TQWidget *tqparent, const char *name, +KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, KPrDocument *_doc, TQStringList _durationListString, const TQString &_durationString ) - : KDialogBase( tqparent, name, false, "", KDialogBase::Close ), + : KDialogBase( parent, name, false, "", KDialogBase::Close ), doc( _doc ) { m_durationListString = _durationListString; diff --git a/kpresenter/KPrPresDurationDia.h b/kpresenter/KPrPresDurationDia.h index 92395994..973397a6 100644 --- a/kpresenter/KPrPresDurationDia.h +++ b/kpresenter/KPrPresDurationDia.h @@ -33,7 +33,7 @@ class KPrPresDurationDia : public KDialogBase TQ_OBJECT public: - KPrPresDurationDia( TQWidget *tqparent, const char *name, + KPrPresDurationDia( TQWidget *parent, const char *name, KPrDocument *_doc, TQStringList _durationListString, const TQString &_durationString ); diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 5e0b573d..3dce55a3 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -32,8 +32,8 @@ // local includes #include "KPrPrinterDlg.h" - KPrPrinterDlg::KPrPrinterDlg( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) + KPrPrinterDlg::KPrPrinterDlg( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n( "KPresenter Options" ) ); TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 ); diff --git a/kpresenter/KPrPrinterDlg.h b/kpresenter/KPrPrinterDlg.h index 404fcf8d..7a881e38 100644 --- a/kpresenter/KPrPrinterDlg.h +++ b/kpresenter/KPrPrinterDlg.h @@ -35,7 +35,7 @@ class KPrPrinterDlg : public KPrintDialogPage TQ_OBJECT public: /// Getting the common arguments. - KPrPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 ); + KPrPrinterDlg( TQWidget *parent = 0, const char *name = 0 ); /// Reimplemented. void getOptions( TQMap<TQString, TQString>& opts, bool include_def = false ); diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp index 4e8ec38f..80681763 100644 --- a/kpresenter/KPrPropertyEditor.cpp +++ b/kpresenter/KPrPropertyEditor.cpp @@ -36,8 +36,8 @@ #include <klocale.h> #include <kstdguiitem.h> -KPrPropertyEditor::KPrPropertyEditor( TQWidget *tqparent, const char *name, KPrPage *page, KPrDocument *doc ) - : TQTabDialog( tqparent, name, true ) +KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc ) + : TQTabDialog( parent, name, true ) , m_page( page ) , m_doc( doc ) , m_objects( page->getSelectedObjects() ) diff --git a/kpresenter/KPrPropertyEditor.h b/kpresenter/KPrPropertyEditor.h index d6fccd6d..74ab5e81 100644 --- a/kpresenter/KPrPropertyEditor.h +++ b/kpresenter/KPrPropertyEditor.h @@ -42,7 +42,7 @@ class KPrPropertyEditor : public TQTabDialog TQ_OBJECT public: - KPrPropertyEditor( TQWidget *tqparent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 ); + KPrPropertyEditor( TQWidget *parent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 ); ~KPrPropertyEditor(); KCommand * getCommand(); diff --git a/kpresenter/KPrRectPreview.cpp b/kpresenter/KPrRectPreview.cpp index a1f7311c..6d889d73 100644 --- a/kpresenter/KPrRectPreview.cpp +++ b/kpresenter/KPrRectPreview.cpp @@ -23,8 +23,8 @@ #include <tqpainter.h> -KPrRectPreview::KPrRectPreview( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +KPrRectPreview::KPrRectPreview( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h index 3b91fe33..bf539132 100644 --- a/kpresenter/KPrRectPreview.h +++ b/kpresenter/KPrRectPreview.h @@ -33,7 +33,7 @@ class KPrRectPreview : public TQFrame TQ_OBJECT public: - KPrRectPreview( TQWidget* tqparent, const char* ); + KPrRectPreview( TQWidget* parent, const char* ); ~KPrRectPreview() {} void setRnds( int _rx, int _ry ) diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 73573646..2174755b 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -29,8 +29,8 @@ #include <tqtoolbutton.h> #include <tqlayout.h> -KPrRectProperty::KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue ) -: TQWidget( tqparent, name ) +KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue ) +: TQWidget( parent, name ) , m_rectValue( rectValue ) { formerVerticalValue = 0; diff --git a/kpresenter/KPrRectProperty.h b/kpresenter/KPrRectProperty.h index b276d9c9..6e139a91 100644 --- a/kpresenter/KPrRectProperty.h +++ b/kpresenter/KPrRectProperty.h @@ -32,7 +32,7 @@ class KPrRectProperty : public TQWidget Q_OBJECT TQ_OBJECT public: - KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue ); + KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue ); ~KPrRectProperty(); int getRectPropertyChange() const; diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 6f751698..4f2d59ca 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -33,8 +33,8 @@ #include "rotationpropertyui.h" #include "KPrTextPreview.h" -KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *tqparent, const char* name ) -: KDialogBase( tqparent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true ) +KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *parent, const char* name ) +: KDialogBase( parent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true ) , m_dialog( new RotationPropertyUI( this, name ) ) { noSignals = false; @@ -114,8 +114,8 @@ void KPrRotationDialogImpl::angleMode( int angle ) } -KPrCircleToggle::KPrCircleToggle( TQWidget *tqparent, const TQString &image, int id ) - : TQLabel( tqparent ) +KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id ) + : TQLabel( parent ) { KIconLoader il("kpresenter"); m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28); @@ -125,7 +125,7 @@ KPrCircleToggle::KPrCircleToggle( TQWidget *tqparent, const TQString &image, int m_id = id; setMouseTracking(true); setPixmap( m_off ); - KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (tqparent); + KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (parent); if(cg != 0) cg->add(this); } @@ -143,8 +143,8 @@ void KPrCircleToggle::setChecked(bool on) { emit clicked(m_id); } -KPrCircleGroup::KPrCircleGroup(TQWidget *tqparent) - : TQFrame(tqparent), m_buttons() +KPrCircleGroup::KPrCircleGroup(TQWidget *parent) + : TQFrame(parent), m_buttons() { noSignals=false; } diff --git a/kpresenter/KPrRotationDialogImpl.h b/kpresenter/KPrRotationDialogImpl.h index 7741ff76..e030641b 100644 --- a/kpresenter/KPrRotationDialogImpl.h +++ b/kpresenter/KPrRotationDialogImpl.h @@ -37,7 +37,7 @@ class KPrRotationDialogImpl : public KDialogBase TQ_OBJECT public: - KPrRotationDialogImpl( TQWidget *tqparent, const char* name = 0 ); + KPrRotationDialogImpl( TQWidget *parent, const char* name = 0 ); ~KPrRotationDialogImpl() {} void setAngle( double angle ); @@ -68,12 +68,12 @@ class KPrCircleToggle : public TQLabel public: /** * Constructor. - * @param tqparent the tqparent widget, as required by TQt. + * @param parent the parent widget, as required by TQt. * @param image the named image that we will use. "rotate/" is * prepended and "dn" is appended for the checked state. * @param id the id that will be used in the clicked signal */ - KPrCircleToggle(TQWidget *tqparent, const TQString &image, int id); + KPrCircleToggle(TQWidget *parent, const TQString &image, int id); /// return the id which is passed in the constructor int id() { return m_id; } @@ -108,9 +108,9 @@ class KPrCircleGroup : public TQFrame public: /** * Constructor. - * @param tqparent the tqparent widget, as required by TQt. + * @param parent the parent widget, as required by TQt. */ - KPrCircleGroup(TQWidget *tqparent); + KPrCircleGroup(TQWidget *parent); /** * Set the angle the group is currently representing. If there is a child button * that registred itself (using add()) with an ID that matches the argument angle diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index 8fd0cb00..e46e80fd 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -10,8 +10,8 @@ #include "KPrShadowDialogImpl.h" #include "KPrTextPreview.h" -KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *tqparent, const char* name ) - : ShadowDialogBase( tqparent, name ) +KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *parent, const char* name ) + : ShadowDialogBase( parent, name ) { _preview = new KPrTextPreview( previewPanel ); TQHBoxLayout *lay = new TQHBoxLayout( previewPanel, previewPanel->lineWidth(), 0 ); diff --git a/kpresenter/KPrShadowDialogImpl.h b/kpresenter/KPrShadowDialogImpl.h index c6c95876..4f9ffa01 100644 --- a/kpresenter/KPrShadowDialogImpl.h +++ b/kpresenter/KPrShadowDialogImpl.h @@ -13,7 +13,7 @@ class KPrShadowDialogImpl : public ShadowDialogBase TQ_OBJECT public: - KPrShadowDialogImpl( TQWidget *tqparent, const char* name = 0 ); + KPrShadowDialogImpl( TQWidget *parent, const char* name = 0 ); ~KPrShadowDialogImpl() {} void setShadowDirection( ShadowDirection sd ); diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index a1077a17..b39ab5b0 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -69,9 +69,9 @@ TQValidator::State KPrRenamePageValidator::validate( TQString & input, int& ) co class ThumbToolTip : public TQToolTip { public: - ThumbToolTip( KPrThumbBar *tqparent ) - : TQToolTip( tqparent->viewport() ) - , m_thumbBar( tqparent ) + ThumbToolTip( KPrThumbBar *parent ) + : TQToolTip( parent->viewport() ) + , m_thumbBar( parent ) {} protected: @@ -92,8 +92,8 @@ private: class OutlineSlideItem: public KListViewItem { public: - OutlineSlideItem( KListView * tqparent, KPrPage* page, bool _masterPage ); - OutlineSlideItem( KListView * tqparent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); + OutlineSlideItem( KListView * parent, KPrPage* page, bool _masterPage ); + OutlineSlideItem( KListView * parent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); KPrPage* page() const { return m_page; } @@ -110,7 +110,7 @@ private: class OutlineObjectItem: public KListViewItem { public: - OutlineObjectItem( OutlineSlideItem * tqparent, KPrObject* object, + OutlineObjectItem( OutlineSlideItem * parent, KPrObject* object, const TQString& name = TQString() ); KPrObject* object() const { return m_object; } @@ -124,11 +124,11 @@ private: class ThumbItem : public TQIconViewItem { public: - ThumbItem( TQIconView *tqparent, const TQString & text, const TQPixmap & icon ) - : TQIconViewItem( tqparent, text, icon ) + ThumbItem( TQIconView *parent, const TQString & text, const TQPixmap & icon ) + : TQIconViewItem( parent, text, icon ) { uptodate = true; } - ThumbItem( TQIconView *tqparent, TQIconViewItem *after, const TQString & text, const TQPixmap & icon ) - : TQIconViewItem( tqparent, after, text, icon ) + ThumbItem( TQIconView *parent, TQIconViewItem *after, const TQString & text, const TQPixmap & icon ) + : TQIconViewItem( parent, after, text, icon ) { uptodate = true; } virtual bool isUptodate() { return uptodate; }; @@ -138,8 +138,8 @@ private: bool uptodate; }; -KPrSideBar::KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v) - :TQTabWidget(tqparent), m_doc(d), m_view(v) +KPrSideBar::KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v) + :TQTabWidget(parent), m_doc(d), m_view(v) { setTabPosition(TQTabWidget::Top); setTabShape(TQTabWidget::Triangular); @@ -233,8 +233,8 @@ void KPrSideBarBase::setViewMasterPage( bool _b ) m_viewMasterPage = _b; } -KPrThumbBar::KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v) - :KIconView(tqparent), KPrSideBarBase( d,v) +KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v) + :KIconView(parent), KPrSideBarBase( d,v) { uptodate = false; m_offsetX = 0; @@ -577,16 +577,16 @@ void KPrThumbBar::slotRefreshItems() refreshItems(); } -OutlineSlideItem::OutlineSlideItem( KListView* tqparent, KPrPage* _page, bool _masterPage ) - : KListViewItem( tqparent ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( KListView* parent, KPrPage* _page, bool _masterPage ) + : KListViewItem( parent ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); setPixmap( 0, KPBarIcon( "slide" ) ); } -OutlineSlideItem::OutlineSlideItem( KListView* tqparent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) - : KListViewItem( tqparent, after ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( KListView* parent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) + : KListViewItem( parent, after ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); @@ -676,9 +676,9 @@ void OutlineSlideItem::updateTitle() setText( 0, title ); } -OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* tqparent, KPrObject* _object, +OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* parent, KPrObject* _object, const TQString& name ) - : KListViewItem( tqparent ), m_object( _object ) + : KListViewItem( parent ), m_object( _object ) { setObject( m_object ); setDragEnabled( false ); @@ -755,8 +755,8 @@ void OutlineObjectItem::setObject( KPrObject* object ) } } -KPrOutline::KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v ) - : KListView( tqparent ), KPrSideBarBase( d, v) +KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) + : KListView( parent ), KPrSideBarBase( d, v) { rebuildItems(); setSorting( -1 ); @@ -922,7 +922,7 @@ void KPrOutline::itemClicked( TQListViewItem *item ) if( !object ) return; // ensure the owner slide is shown first - OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->tqparent()); + OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->parent()); if( slideItem && m_doc->activePage() != slideItem->page() ) { KPrPage* page = slideItem->page(); @@ -946,12 +946,12 @@ void KPrOutline::itemClicked( TQListViewItem *item ) * When an item is about to move (using drag-and-drop), it makes shure that * it's not moved right after an object. */ -void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *tqparent, TQListViewItem *target ) +void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *parent, TQListViewItem *target ) { kdDebug(33001) << "slotDropped" << endl; - /* slide doesn't have tqparent (always 0) + /* slide doesn't have parent (always 0) * Only slides can move at the moment, objects can't. */ - if ( tqparent ) + if ( parent ) return; // This code is taken from KListView @@ -969,7 +969,7 @@ void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *tqparent, T i->setSelected( false ); // don't move the item as it is allready - moveItem(i, tqparent, target ); + moveItem(i, parent, target ); // Only one item can be moved break; @@ -987,7 +987,7 @@ bool KPrOutline::acceptDrag( TQDropEvent* e ) const void KPrOutline::setCurrentPage( int pg ) { OutlineSlideItem *item = slideItem( pg ); - if( item && ( item!=currentItem()->tqparent() ) ) + if( item && ( item!=currentItem()->parent() ) ) { blockSignals( true ); setCurrentItem( item ); diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index b1d7eeb3..b6450f11 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -69,7 +69,7 @@ class KPrThumbBar : public KIconView, public KPrSideBarBase TQ_OBJECT public: - KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v); + KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v); ~KPrThumbBar(); void setCurrentPage( int pg ); void updateItem( int pagenr, bool sticky = false ); @@ -106,7 +106,7 @@ class KPrOutline: public KListView, public KPrSideBarBase TQ_OBJECT public: - KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v ); + KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ); ~KPrOutline(); void setCurrentPage( int pg ); TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); } @@ -134,7 +134,7 @@ public slots: private slots: void itemClicked( TQListViewItem *i ); - void slotDropped( TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *target ); + void slotDropped( TQDropEvent *e, TQListViewItem *parent, TQListViewItem *target ); void rightButtonPressed( TQListViewItem *i, const TQPoint &pnt, int c ); void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &p ); @@ -148,7 +148,7 @@ class KPrSideBar: public TQTabWidget TQ_OBJECT public: - KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v); + KPrSideBar(TQWidget *parent, KPrDocument *d, KPrView *v); void setCurrentPage( int pg ) { m_outline->setCurrentPage(pg); m_thb->setCurrentPage(pg); diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index 0f95e03b..f0b3a05b 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -43,8 +43,8 @@ #include "KPrPageEffects.h" #include "slidetransitionwidget.h" -KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view ) -: KDialogBase( tqparent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true ) +KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *parent, const char *name, KPrView *view ) +: KDialogBase( parent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true ) , m_dialog( new SlideTransitionWidget( this ) ), m_view( view ), m_soundPlayer(0), m_pageEffect( 0 ) { int pgnum = m_view->getCurrPgNum() - 1; diff --git a/kpresenter/KPrSlideTransitionDia.h b/kpresenter/KPrSlideTransitionDia.h index e339b62c..bd4ee1c7 100644 --- a/kpresenter/KPrSlideTransitionDia.h +++ b/kpresenter/KPrSlideTransitionDia.h @@ -40,7 +40,7 @@ class KPrSlideTransitionDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view ); + KPrSlideTransitionDia( TQWidget *parent, const char *name, KPrView *view ); ~KPrSlideTransitionDia(); protected: diff --git a/kpresenter/KPrSoundPlayer.cpp b/kpresenter/KPrSoundPlayer.cpp index 5ec7610a..0dbd2d4b 100644 --- a/kpresenter/KPrSoundPlayer.cpp +++ b/kpresenter/KPrSoundPlayer.cpp @@ -55,8 +55,8 @@ public: #endif }; -KPrSoundPlayer::KPrSoundPlayer( const TQString &fileName, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +KPrSoundPlayer::KPrSoundPlayer( const TQString &fileName, TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new KPresenterSoundPlayerPrivate( fileName ); diff --git a/kpresenter/KPrSoundPlayer.h b/kpresenter/KPrSoundPlayer.h index 1f4cc52e..46683dc8 100644 --- a/kpresenter/KPrSoundPlayer.h +++ b/kpresenter/KPrSoundPlayer.h @@ -47,7 +47,7 @@ class KPrSoundPlayer : public TQObject Q_OBJECT TQ_OBJECT public: - KPrSoundPlayer( const TQString &fileName, TQObject *tqparent = 0, const char *name = 0 ); + KPrSoundPlayer( const TQString &fileName, TQObject *parent = 0, const char *name = 0 ); ~KPrSoundPlayer(); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 06b5d5df..7f665ef7 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -2365,7 +2365,7 @@ bool KPrTextView::canDecode( TQMimeSource *e ) return kpTextObject()->kPresenterDocument()->isReadWrite() && ( !KoTextObject::providesOasis( e ).isNull() || TQTextDrag::canDecode( e ) ); } -TQDragObject * KPrTextView::newDrag( TQWidget * tqparent ) +TQDragObject * KPrTextView::newDrag( TQWidget * parent ) { TQBuffer buffer; const TQCString mimeType = "application/vnd.oasis.opendocument.text"; @@ -2415,7 +2415,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * tqparent ) delete store; - KMultipleDrag* multiDrag = new KMultipleDrag( tqparent ); + KMultipleDrag* multiDrag = new KMultipleDrag( parent ); if ( !plainText.isEmpty() ) multiDrag->addDragObject( new TQTextDrag( plainText, 0 ) ); KoStoreDrag* storeDrag = new KoStoreDrag( mimeType, 0 ); diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index 41dbe91e..3bacdb69 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -290,7 +290,7 @@ protected slots: protected: bool canDecode( TQMimeSource *e ); - TQDragObject * newDrag( TQWidget * tqparent ); + TQDragObject * newDrag( TQWidget * parent ); // Reimplemented from KoTextView virtual void doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, TQChar ch ); virtual bool doIgnoreDoubleSpace(KoTextParag * parag, int index,TQChar ch ); diff --git a/kpresenter/KPrTextPreview.cpp b/kpresenter/KPrTextPreview.cpp index 27bb8b5b..8309fffa 100644 --- a/kpresenter/KPrTextPreview.cpp +++ b/kpresenter/KPrTextPreview.cpp @@ -5,8 +5,8 @@ #include <tqpainter.h> #include <tqfont.h> -KPrTextPreview::KPrTextPreview( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ), +KPrTextPreview::KPrTextPreview( TQWidget* parent, const char* name ) + : TQFrame( parent, name ), shadowDirection( SD_LEFT_BOTTOM ), shadowDistance( 0 ), angle( 0 ) diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h index b4914251..f25d6987 100644 --- a/kpresenter/KPrTextPreview.h +++ b/kpresenter/KPrTextPreview.h @@ -10,7 +10,7 @@ class KPrTextPreview : public TQFrame TQ_OBJECT public: - KPrTextPreview( TQWidget* tqparent, const char* name = 0 ); + KPrTextPreview( TQWidget* parent, const char* name = 0 ); ~KPrTextPreview() {} void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); } diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 850c89b4..6708065b 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -31,9 +31,9 @@ #include "KPrMarginWidget.h" -KPrTextProperty::KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct, +KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const MarginsStruct &marginsStruct, const KoUnit::Unit unit, PropValue protectContent ) -: TQWidget( tqparent, name ) +: TQWidget( parent, name ) , m_unit( unit ) , m_protectContent( protectContent ) { diff --git a/kpresenter/KPrTextProperty.h b/kpresenter/KPrTextProperty.h index ec19483f..c30eeded 100644 --- a/kpresenter/KPrTextProperty.h +++ b/kpresenter/KPrTextProperty.h @@ -43,7 +43,7 @@ public: Margins = 2 }; - KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct, + KPrTextProperty( TQWidget *parent, const char *name, const MarginsStruct &marginsStruct, const KoUnit::Unit unit, PropValue protectContent ); ~KPrTextProperty(); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index 2d305841..a7fc0899 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -55,8 +55,8 @@ #include <kfiledialog.h> -KPrEffectPreview::KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view ) - : TQLabel( tqparent ), doc( _doc ), view( _view ), m_pageEffect( 0 ) +KPrEffectPreview::KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view ) + : TQLabel( parent ), doc( _doc ), view( _view ), m_pageEffect( 0 ) { setFrameStyle( StyledPanel | Sunken ); } @@ -142,9 +142,9 @@ void KPrEffectPreview::slotDoPageEffect() } -KPrTransEffectDia::KPrTransEffectDia( TQWidget *tqparent, const char *name, +KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, KPrDocument *_doc, KPrView *_view ) - : KDialogBase( tqparent, name, true, "", KDialogBase::User1|Ok|Cancel ), + : KDialogBase( parent, name, true, "", KDialogBase::User1|Ok|Cancel ), doc( _doc ), view( _view ), soundPlayer( 0 ) { enableButtonSeparator( true ); diff --git a/kpresenter/KPrTransEffectDia.h b/kpresenter/KPrTransEffectDia.h index b6018d43..3091f038 100644 --- a/kpresenter/KPrTransEffectDia.h +++ b/kpresenter/KPrTransEffectDia.h @@ -52,7 +52,7 @@ class KPrEffectPreview : public TQLabel TQ_OBJECT public: - KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view ); + KPrEffectPreview( TQWidget *parent, KPrDocument *_doc, KPrView *_view ); public slots: void setPixmap( const TQPixmap& pixmap ); @@ -78,7 +78,7 @@ class KPrTransEffectDia: public KDialogBase TQ_OBJECT public: - KPrTransEffectDia( TQWidget *tqparent, const char *name, + KPrTransEffectDia( TQWidget *parent, const char *name, KPrDocument *_doc, KPrView *_view ); PageEffect getPageEffect() const { return pageEffect; } diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp index fbf91cc9..fa21141a 100644 --- a/kpresenter/KPrUtils.cpp +++ b/kpresenter/KPrUtils.cpp @@ -345,10 +345,10 @@ TQCursor KPrUtils::penCursor() 0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap pen_bitmap( 24, 24, pen_bits, true ); - TQBitmap pen_tqmask( 24, 24 ); + TQBitmap pen_mask( 24, 24 ); TQPixmap pix( pen_bitmap ); - pen_tqmask = pix.createHeuristicMask( false ); - pix.setMask( pen_tqmask ); + pen_mask = pix.createHeuristicMask( false ); + pix.setMask( pen_mask ); return TQCursor( pix, 1, 22 ); } @@ -364,10 +364,10 @@ TQCursor KPrUtils::rotateCursor() 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap rotate_bitmap( 22, 22, rotate_bits, true ); - TQBitmap rotate_tqmask( 22, 22 ); + TQBitmap rotate_mask( 22, 22 ); TQPixmap pix( rotate_bitmap ); - rotate_tqmask = pix.createHeuristicMask( false ); - pix.setMask( rotate_tqmask ); + rotate_mask = pix.createHeuristicMask( false ); + pix.setMask( rotate_mask ); return TQCursor( pix, 11, 13 ); } diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index f3bc053d..ab184148 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -6421,7 +6421,7 @@ void KPrView::initialLayoutOfSplitter() return; } - TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->tqparent()) ); + TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->parent()) ); TQValueList<int> tmpList; int noteHeight = height() / 25; tmpList << height() - noteHeight << noteHeight; diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index ecfb736e..1fc3cc7e 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -105,7 +105,7 @@ namespace KSpell2 { class PageBase : public TQWidget { public: - PageBase( TQWidget *tqparent, KPrView *v ) : TQWidget( tqparent ), view( v ) {} + PageBase( TQWidget *parent, KPrView *v ) : TQWidget( parent ), view( v ) {} void resizeEvent( TQResizeEvent *e ); private: diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 957e07f2..aa68e58e 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -1289,7 +1289,7 @@ void KPrWebPresentationCreateDialog::saveConfig() filename = TQString(); KFileDialog fd (filename, i18n("*.kpweb|KPresenter Web-Presentation (*.kpweb)"), - 0/*tqparent*/, 0/*name*/, true/*modal*/); + 0/*parent*/, 0/*name*/, true/*modal*/); fd.setCaption (i18n ("Save Web Presentation Configuration")); fd.setOperationMode (KFileDialog::Saving); fd.setMode (KFile::File | KFile::LocalOnly); diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 64268e28..ccbfc0e8 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -34,8 +34,8 @@ #include <KPrFactory.h> -AFChoose::AFChoose(TQWidget *tqparent, const TQString &caption, const char *name) - : TQTabDialog(tqparent,name,true) +AFChoose::AFChoose(TQWidget *parent, const TQString &caption, const char *name) + : TQTabDialog(parent,name,true) { setCaption(caption); setCancelButton(i18n("&Cancel")); diff --git a/kpresenter/autoformEdit/AFChoose.h b/kpresenter/autoformEdit/AFChoose.h index d109059d..c76a7302 100644 --- a/kpresenter/autoformEdit/AFChoose.h +++ b/kpresenter/autoformEdit/AFChoose.h @@ -37,7 +37,7 @@ class AFChoose : public TQTabDialog public: // constructor - destructor - AFChoose(TQWidget *tqparent=0, const TQString &caption=TQString(), const char *name=0); + AFChoose(TQWidget *parent=0, const TQString &caption=TQString(), const char *name=0); ~AFChoose(); private: |