diff options
Diffstat (limited to 'kword')
93 files changed, 379 insertions, 379 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 04575514..65aa9e14 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -63,8 +63,8 @@ #include <assert.h> -KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *tqparent, KWDocument *d, KWGUI *lGui) - : TQScrollView( tqparent, "canvas", /*WNorthWestGravity*/ WStaticContents| WResizeNoErase | WRepaintNoErase ), m_doc( d ) +KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KWGUI *lGui) + : TQScrollView( parent, "canvas", /*WNorthWestGravity*/ WStaticContents| WResizeNoErase | WRepaintNoErase ), m_doc( d ) { m_frameViewManager = new KWFrameViewManager(d); m_gui = lGui; @@ -2039,9 +2039,9 @@ KoPoint KWCanvas::caretPos() // ************** InteractionPolicy *********************** -InteractionPolicy::InteractionPolicy(KWCanvas *tqparent, bool doInit, bool includeInlineFrames) { +InteractionPolicy::InteractionPolicy(KWCanvas *parent, bool doInit, bool includeInlineFrames) { m_gotDragEvents = false; - m_parent = tqparent; + m_parent = parent; if(doInit) { TQValueList<KWFrameView*> selectedFrames = m_parent->frameViewManager()->selectedFrames(); TQValueListIterator<KWFrameView*> framesIterator = selectedFrames.begin(); @@ -2061,7 +2061,7 @@ InteractionPolicy::InteractionPolicy(KWCanvas *tqparent, bool doInit, bool inclu } } -InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) { +InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) { if(buttonState & Qt::LeftButton || buttonState & Qt::RightButton) { // little inner class to make sure we don't duplicate code class Selector { @@ -2085,11 +2085,11 @@ InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMean bool m_leftClick, m_doSomething; }; - Selector selector(tqparent, point, buttonState, keyState); + Selector selector(parent, point, buttonState, keyState); switch(meaning) { case MEANING_MOUSE_MOVE: selector.doSelect(); - return new FrameMovePolicy(tqparent, point); + return new FrameMovePolicy(parent, point); case MEANING_TOPLEFT: case MEANING_TOP: case MEANING_TOPRIGHT: @@ -2099,9 +2099,9 @@ InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *tqparent, MouseMean case MEANING_BOTTOMLEFT: case MEANING_LEFT: selector.doSelect(); - return new FrameResizePolicy(tqparent, meaning, point); + return new FrameResizePolicy(parent, meaning, point); default: - FrameSelectPolicy *fsp = new FrameSelectPolicy(tqparent, meaning, point, buttonState, keyState); + FrameSelectPolicy *fsp = new FrameSelectPolicy(parent, meaning, point, buttonState, keyState); if(fsp->isValid()) return fsp; delete fsp; @@ -2120,8 +2120,8 @@ void InteractionPolicy::cancelInteraction() { // ************** FrameResizePolicy *********************** -FrameResizePolicy::FrameResizePolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point) : - InteractionPolicy (tqparent, true, true), m_boundingRect() { +FrameResizePolicy::FrameResizePolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point) : + InteractionPolicy (parent, true, true), m_boundingRect() { if( meaning == MEANING_TOPLEFT) { m_top = true; m_bottom = false; m_left = true; m_right = false; @@ -2308,8 +2308,8 @@ void FrameResizePolicy::finishInteraction() { // *************** FrameMovePolicy ************************ -FrameMovePolicy::FrameMovePolicy(KWCanvas *tqparent, KoPoint &point) : - InteractionPolicy (tqparent), m_boundingRect() { +FrameMovePolicy::FrameMovePolicy(KWCanvas *parent, KoPoint &point) : + InteractionPolicy (parent), m_boundingRect() { TQValueListConstIterator<KWFrame*> framesIterator = m_frames.begin(); for(;framesIterator != m_frames.end(); ++framesIterator) { @@ -2442,15 +2442,15 @@ void FrameMovePolicy::finishInteraction() { // ************** FrameSelectPolicy *********************** -FrameSelectPolicy::FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) - : InteractionPolicy(tqparent, false) { +FrameSelectPolicy::FrameSelectPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) + : InteractionPolicy(parent, false) { bool leftButton = buttonState & Qt::LeftButton; // this is a special case; if a frame that is curently being edited is 'selected' on the border // we redirect that click to the text part of the frame. // this means we give the user a lot more space to click on the left side of the frame to // select the first characters. - KWFrameSetEdit *fse = tqparent->currentFrameSetEdit(); + KWFrameSetEdit *fse = parent->currentFrameSetEdit(); if(leftButton && fse) { KWFrameView *view = m_parent->frameViewManager()->view(point, KWFrameViewManager::unselected, true); @@ -2462,8 +2462,8 @@ FrameSelectPolicy::FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, K point.setY(TQMIN(point.y(), view->frame()->bottom())); // convert point to the view coordinate system. - TQPoint normalPoint = tqparent->kWordDocument()->zoomPoint(point); - TQPoint mousePos = tqparent->viewMode()->normalToView(normalPoint); + TQPoint normalPoint = parent->kWordDocument()->zoomPoint(point); + TQPoint mousePos = parent->viewMode()->normalToView(normalPoint); TQMouseEvent *me = new TQMouseEvent(TQEvent::MouseButtonPress, mousePos, buttonState, keyState); fse->mousePressEvent(me, normalPoint, point ); diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h index f7fffbbd..955ea605 100644 --- a/kword/KWCanvas.h +++ b/kword/KWCanvas.h @@ -63,7 +63,7 @@ class KWCanvas : public TQScrollView TQ_OBJECT public: - KWCanvas(const TQString& viewMode, TQWidget *tqparent, KWDocument *d, KWGUI *lGui); + KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KWGUI *lGui); virtual ~KWCanvas(); KWDocument * kWordDocument() const { return m_doc; } @@ -405,13 +405,13 @@ class InteractionPolicy { /** * This instanciates a new policy object and decides which policy is created based on the params. - * @param tqparent the tqparent canvas for things like redraw commands. + * @param parent the parent canvas for things like redraw commands. * @param meaning the mouseMeaning of as it is at 'point' * @param point the place where the mouseDown is registred. * @param buttonState which button is used to click, like Qt::LeftButton * @param keyState which keys are held down at the click, like TQt::ControlButton */ - static InteractionPolicy* createPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState); + static InteractionPolicy* createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState); void hadDragEvents() { m_gotDragEvents = true; } bool gotDragEvents() { return m_gotDragEvents; } @@ -419,11 +419,11 @@ class InteractionPolicy { protected: /** * Constructor. - * @param tqparent the tqparent canvas. + * @param parent the parent canvas. * @param doInit if true this will initialize the m_frames and m_indexFrame variables. * @param includeInlineFrames if true the m_frames will include inline frames */ - InteractionPolicy(KWCanvas *tqparent, bool doInit = true, bool includeInlineFrames = false); + InteractionPolicy(KWCanvas *parent, bool doInit = true, bool includeInlineFrames = false); TQValueList<FrameIndex> m_indexFrame; KWCanvas *m_parent; @@ -441,7 +441,7 @@ class InteractionPolicy { */ class FrameResizePolicy : public InteractionPolicy { public: - FrameResizePolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point); + FrameResizePolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point); void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point); KCommand *createCommand(); void finishInteraction(); @@ -460,7 +460,7 @@ class FrameResizePolicy : public InteractionPolicy { */ class FrameMovePolicy : public InteractionPolicy { public: - FrameMovePolicy(KWCanvas *tqparent, KoPoint &point); + FrameMovePolicy(KWCanvas *parent, KoPoint &point); void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point); KCommand *createCommand(); void finishInteraction(); @@ -476,7 +476,7 @@ class FrameMovePolicy : public InteractionPolicy { */ class FrameSelectPolicy : public InteractionPolicy { public: - FrameSelectPolicy(KWCanvas *tqparent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState state, TQt::ButtonState keyState); + FrameSelectPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState state, TQt::ButtonState keyState); void handleMouseMove(TQt::ButtonState keyState, const KoPoint &point); KCommand *createCommand(); void finishInteraction(); diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index a8a3f6c7..977ff322 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -78,49 +78,49 @@ static inline TQPixmap loadIcon( const char * name ) { ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } -KWConfig::KWConfig( KWView* tqparent ) +KWConfig::KWConfig( KWView* parent ) : KDialogBase(KDialogBase::IconList,i18n("Configure KWord") , KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default, - KDialogBase::Ok, tqparent) + KDialogBase::Ok, parent) { TQVBox *page2 = addVBoxPage( i18n("Interface"), i18n("Interface Settings"), loadIcon("configure") ); - m_interfacePage=new ConfigureInterfacePage(tqparent, page2); + m_interfacePage=new ConfigureInterfacePage(parent, page2); TQVBox *page4 = addVBoxPage( i18n("Document"), i18n("Document Settings"), loadIcon("kword_kwd") ); - m_defaultDocPage=new ConfigureDefaultDocPage(tqparent, page4); + m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4); TQVBox *page = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"), loadIcon("spellcheck") ); - m_spellPage = new ConfigureSpellPage(tqparent, page); + m_spellPage = new ConfigureSpellPage(parent, page); TQVBox *page5 = addVBoxPage( i18n("Formula"), i18n("Formula Defaults"), loadIcon("kformula") ); - m_formulaPage=new KFormula::ConfigurePage( tqparent->kWordDocument()->formulaDocument( false ), + m_formulaPage=new KFormula::ConfigurePage( parent->kWordDocument()->formulaDocument( false ), this, KWFactory::instance()->config(), page5 ); TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"), loadIcon("misc") ); - m_miscPage=new ConfigureMiscPage(tqparent, page3); + m_miscPage=new ConfigureMiscPage(parent, page3); TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"), loadIcon("path") ); - m_pathPage=new ConfigurePathPage(tqparent, page6); + m_pathPage=new ConfigurePathPage(parent, page6); if (KoSpeaker::isKttsdInstalled()) { TQVBox *page7 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), loadIcon("access") ); - m_ttsPage=new ConfigureTTSPage(tqparent, page7); + m_ttsPage=new ConfigureTTSPage(parent, page7); } else m_ttsPage = 0; - m_doc = tqparent->kWordDocument(); + m_doc = parent->kWordDocument(); connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); connect( m_interfacePage, TQT_SIGNAL( unitChanged( int ) ), TQT_SLOT( unitChanged( int ) ) ); - unitChanged( tqparent->kWordDocument()->unit() ); + unitChanged( parent->kWordDocument()->unit() ); } void KWConfig::unitChanged( int u ) @@ -211,7 +211,7 @@ void KWConfig::slotDefault() //// ConfigureSpellPage::ConfigureSpellPage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { m_pView=view; config = KWFactory::instance()->config(); @@ -239,7 +239,7 @@ void ConfigureSpellPage::slotDefault() } ConfigureInterfacePage::ConfigureInterfacePage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { m_pView=view; config = KWFactory::instance()->config(); @@ -481,7 +481,7 @@ void ConfigureInterfacePage::slotDefault() //// ConfigureMiscPage::ConfigureMiscPage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { m_pView=view; config = KWFactory::instance()->config(); @@ -681,7 +681,7 @@ void ConfigureMiscPage::setUnit( KoUnit::Unit ) //// ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { m_pView=view; KWDocument * doc = m_pView->kWordDocument(); @@ -918,7 +918,7 @@ void ConfigureDefaultDocPage::slotDefault() void ConfigureDefaultDocPage::selectNewDefaultFont() { TQStringList list; KFontChooser::getFontList(list, KFontChooser::SmoothScalableFonts); - KFontDialog dlg( (TQWidget *)this->tqparent(), "Font Selector", false, true, list, true ); + KFontDialog dlg( (TQWidget *)this->parent(), "Font Selector", false, true, list, true ); dlg.setFont(*font); int result = dlg.exec(); if (KDialog::Accepted == result) { @@ -940,7 +940,7 @@ void ConfigureDefaultDocPage::setUnit( KoUnit::Unit unit ) //// ConfigurePathPage::ConfigurePathPage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { m_pView=view; KWDocument * doc = m_pView->kWordDocument(); @@ -1030,7 +1030,7 @@ void ConfigurePathPage::apply() //// ConfigureTTSPage::ConfigureTTSPage( KWView *view, TQVBox *box, char *name ) - : TQObject( box->tqparent(), name ) + : TQObject( box->parent(), name ) { Q_UNUSED(view); // m_pView=_view; diff --git a/kword/KWConfig.h b/kword/KWConfig.h index afe41b74..c8ea4d87 100644 --- a/kword/KWConfig.h +++ b/kword/KWConfig.h @@ -188,7 +188,7 @@ class KWConfig : public KDialogBase TQ_OBJECT public: enum { KW_KSPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32}; - KWConfig( KWView* tqparent ); + KWConfig( KWView* parent ); void openPage(int flags); public slots: void slotApply(); diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index fac2ced0..8cfa8975 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -39,8 +39,8 @@ #include <tqcombobox.h> -KWConfigFootNoteDia::KWConfigFootNoteDia( TQWidget *tqparent, const char *name, KWDocument *doc ) - : KDialogBase(Tabbed, TQString(), Ok | Cancel , Ok, tqparent, name, true) +KWConfigFootNoteDia::KWConfigFootNoteDia( TQWidget *parent, const char *name, KWDocument *doc ) + : KDialogBase(Tabbed, TQString(), Ok | Cancel , Ok, parent, name, true) { setCaption( i18n("Configure Endnote/Footnote") ); m_doc = doc; diff --git a/kword/KWConfigFootNoteDia.h b/kword/KWConfigFootNoteDia.h index 1b08765b..757be1dd 100644 --- a/kword/KWConfigFootNoteDia.h +++ b/kword/KWConfigFootNoteDia.h @@ -35,7 +35,7 @@ class KWConfigFootNoteDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWConfigFootNoteDia( TQWidget *tqparent, const char *name, KWDocument *doc ); + KWConfigFootNoteDia( TQWidget *parent, const char *name, KWDocument *doc ); protected: void setupTab1(); void setupTab2(); diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 6c124b6a..131192e9 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -31,16 +31,16 @@ #include "KWFrame.h" #include "KWFrameSet.h" -KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Create New Bookmark") ); listBookMark = _list; init(); } -KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KWCreateBookmarkDia::KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Rename Bookmark") ); listBookMark = _list; @@ -80,8 +80,8 @@ void KWCreateBookmarkDia::nameChanged( const TQString &text) /* **************************** */ -KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { m_doc=_doc; setCaption( i18n("Select Bookmark") ); diff --git a/kword/KWCreateBookmarkDia.h b/kword/KWCreateBookmarkDia.h index a18d1aca..fd4354d3 100644 --- a/kword/KWCreateBookmarkDia.h +++ b/kword/KWCreateBookmarkDia.h @@ -32,8 +32,8 @@ class KWCreateBookmarkDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWCreateBookmarkDia( const TQStringList & _list, TQWidget *tqparent, const char *name ); - KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *tqparent, const char *name ); + KWCreateBookmarkDia( const TQStringList & _list, TQWidget *parent, const char *name ); + KWCreateBookmarkDia( const TQStringList & _list, const TQString & _name, TQWidget *parent, const char *name ); TQString bookmarkName()const; protected slots: @@ -51,7 +51,7 @@ class KWSelectBookmarkDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *tqparent, const char *name ); + KWSelectBookmarkDia( const TQStringList & _list, KWDocument *_doc, TQWidget *parent, const char *name ); TQString bookmarkSelected()const; protected slots: void slotSelectionChanged(); diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index cb64b61b..12f7b3b5 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -26,14 +26,14 @@ #include <tqlabel.h> #include <tqlayout.h> -KWDeleteDia::KWDeleteDia( KWView *tqparent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove) - : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, tqparent, "Delete Table items dialog", true ) +KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove) + : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, parent, "Delete Table items dialog", true ) { Q_ASSERT(type == deleteRow || type == deleteColumn); m_type = type; m_table = table; m_toRemove = remove; - m_view = tqparent; + m_view = parent; setupTab1(); setButtonOK( KGuiItem( diff --git a/kword/KWDeleteDia.h b/kword/KWDeleteDia.h index e2ce9ff4..b2a1e226 100644 --- a/kword/KWDeleteDia.h +++ b/kword/KWDeleteDia.h @@ -40,13 +40,13 @@ public: /** * Constructor for the ok-to-delete dialog. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param name the internal name for the widget * @param table the table the rows or columns are to be deleted from * @param type the type of dialog this should become, either deleteRow or deleteColumn * @param remove a list of all the rows or columns that should be deleted. */ - KWDeleteDia( KWView *tqparent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove); + KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove); protected: void setupTab1(); diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 1aa56d5e..5fe52cf6 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -74,18 +74,18 @@ bool KWOrderedFrameSet::operator<( KWOrderedFrameSet ofs ) /* Class: KWDocDocListViewItem */ /******************************************************************/ -KWDocListViewItem::KWDocListViewItem(TQListViewItem* tqparent, const TQString& text) - : KListViewItem(tqparent, text) +KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, const TQString& text) + : KListViewItem(parent, text) { } -KWDocListViewItem::KWDocListViewItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text ) - :KListViewItem(tqparent, after, text) +KWDocListViewItem::KWDocListViewItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text ) + :KListViewItem(parent, after, text) { } -KWDocListViewItem::KWDocListViewItem(TQListView* tqparent, const TQString& text) - :KListViewItem(tqparent, text) +KWDocListViewItem::KWDocListViewItem(TQListView* parent, const TQString& text) + :KListViewItem(parent, text) { } @@ -120,14 +120,14 @@ KWGUI* KWDocListViewItem::gui() /* Class: KWDocStructParagItem */ /******************************************************************/ -KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* tqparent, const TQString& text, KWTextParag* parag ) - : KWDocListViewItem(tqparent, text), m_parag(parag) +KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* parent, const TQString& text, KWTextParag* parag ) + : KWDocListViewItem(parent, text), m_parag(parag) { } -KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* tqparent, TQListViewItem* after, +KWDocStructParagItem::KWDocStructParagItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextParag* parag ) - : KWDocListViewItem(tqparent, after, text), m_parag(parag) + : KWDocListViewItem(parent, after, text), m_parag(parag) { } @@ -185,15 +185,15 @@ void KWDocStructParagItem::speakItem() /* Class: KWDocStructTextFrameItem */ /******************************************************************/ -KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* parent, const TQString& text, KWTextFrameSet* frameset, KWFrame* frame) - : KWDocListViewItem(tqparent, text), m_frame(frame), m_frameset(frameset) + : KWDocListViewItem(parent, text), m_frame(frame), m_frameset(frameset) { } -KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* tqparent, TQListViewItem* after, +KWDocStructTextFrameItem::KWDocStructTextFrameItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextFrameSet* frameset, KWFrame* frame) - : KWDocListViewItem(tqparent, after, text), m_frame(frame), m_frameset(frameset) + : KWDocListViewItem(parent, after, text), m_frame(frame), m_frameset(frameset) { } @@ -345,15 +345,15 @@ KWDocStructParagItem* KWDocStructTextFrameItem::findTextParagItem(const KWTextPa /* Class: KWDocStructTextFrameSetItem */ /******************************************************************/ -KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* parent, const TQString& text, KWTextFrameSet* frameset) - : KWDocListViewItem(tqparent, text ), m_frameset(frameset) + : KWDocListViewItem(parent, text ), m_frameset(frameset) { } -KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* tqparent, TQListViewItem* after, +KWDocStructTextFrameSetItem::KWDocStructTextFrameSetItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextFrameSet* frameset) - : KWDocListViewItem(tqparent, after, text), m_frameset(frameset) + : KWDocListViewItem(parent, after, text), m_frameset(frameset) { } @@ -382,7 +382,7 @@ void KWDocStructTextFrameSetItem::setupTextFrames() { KWFrame* frame = framePtrs.at(j); TQString name; - if ( KListViewItem::tqparent()->firstChild() == this && dok->processingType() == KWDocument::WP ) + if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP ) { if ( dok->numColumns() == 1 ) name=i18n( "Page %1" ).tqarg(TQString::number(j + 1)); @@ -463,15 +463,15 @@ KWDocStructTextFrameItem* KWDocStructTextFrameSetItem::findTextFrameItem(const K /* Class: KWDocStructTableItem */ /******************************************************************/ -KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* parent, const TQString& text, KWTableFrameSet* table) - :KWDocListViewItem(tqparent, text), m_table(table) + :KWDocListViewItem(parent, text), m_table(table) { } -KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* tqparent, TQListViewItem* after, +KWDocStructTableItem::KWDocStructTableItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTableFrameSet* table) - :KWDocListViewItem(tqparent, after, text), m_table(table) + :KWDocListViewItem(parent, after, text), m_table(table) { } @@ -589,9 +589,9 @@ KWDocStructTextFrameItem* KWDocStructTableItem::findCellItem(const KWTextFrameSe /* Class: KWDocStructPictureItem */ /******************************************************************/ -KWDocStructPictureItem::KWDocStructPictureItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructPictureItem::KWDocStructPictureItem(TQListViewItem* parent, const TQString& text, KWPictureFrameSet* pic) - : KWDocListViewItem(tqparent, text), m_pic(pic) + : KWDocListViewItem(parent, text), m_pic(pic) { } @@ -629,9 +629,9 @@ void KWDocStructPictureItem::editProperties() /* Class: KWDocStructFormulaItem */ /******************************************************************/ -KWDocStructFormulaItem::KWDocStructFormulaItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructFormulaItem::KWDocStructFormulaItem(TQListViewItem* parent, const TQString& text, KWFormulaFrameSet* form) - : KWDocListViewItem(tqparent, text), m_form(form) + : KWDocListViewItem(parent, text), m_form(form) { } @@ -675,9 +675,9 @@ void KWDocStructFormulaItem::speakItem() /* Class: KWDocStructPartItem */ /******************************************************************/ -KWDocStructPartItem::KWDocStructPartItem(TQListViewItem* tqparent, const TQString& text, +KWDocStructPartItem::KWDocStructPartItem(TQListViewItem* parent, const TQString& text, KWPartFrameSet* part) - : KWDocListViewItem(tqparent, text), m_part(part) + : KWDocListViewItem(parent, text), m_part(part) { } @@ -715,9 +715,9 @@ void KWDocStructPartItem::editProperties() /* Class: KWDocStructRootItem */ /******************************************************************/ -KWDocStructRootItem::KWDocStructRootItem(TQListView* tqparent, const TQString& text, +KWDocStructRootItem::KWDocStructRootItem(TQListView* parent, const TQString& text, TypeStructDocItem type ) - : KWDocListViewItem(tqparent, text), m_type(type) + : KWDocListViewItem(parent, text), m_type(type) { switch ( type ) { case Arrangement: { @@ -1046,8 +1046,8 @@ KWDocStructTableItem* KWDocStructRootItem::findTableItem(const KWFrameSet* frame /* Class: KWDocStructTree */ /******************************************************************/ -KWDocStructTree::KWDocStructTree(TQWidget* tqparent, KWDocument* doc, KWGUI* gui) - : KListView(tqparent), m_doc(doc), m_gui(gui) +KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui) + : KListView(parent), m_doc(doc), m_gui(gui) { embedded = new KWDocStructRootItem( this, i18n( "Embedded Objects" ), Embedded); formulafrms = new KWDocStructRootItem( this, i18n( "Formula Frames" ), FormulaFrames); @@ -1188,8 +1188,8 @@ void KWDocStructTree::slotReturnPressed(TQListViewItem* i) /* Class: KWDocStruct */ /******************************************************************/ -KWDocStruct::KWDocStruct(TQWidget* tqparent, KWDocument* doc, KWGUI* gui) - : TQWidget(tqparent), m_doc(doc), m_gui(gui) +KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui) + : TQWidget(parent), m_doc(doc), m_gui(gui) { m_layout = new TQVBoxLayout( this ); diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 6d17eeb6..2eb4eb9d 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -91,8 +91,8 @@ protected: class KWDocStructParagItem : public KWDocListViewItem { public: - KWDocStructParagItem(TQListViewItem* tqparent, const TQString& text, KWTextParag* parag); - KWDocStructParagItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, KWTextParag* parag); + KWDocStructParagItem(TQListViewItem* parent, const TQString& text, KWTextParag* parag); + KWDocStructParagItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextParag* parag); virtual ItemType itemType() { return IT_PARAG; } virtual void selectItem(); virtual void editItem(); @@ -114,9 +114,9 @@ protected: class KWDocStructTextFrameItem : public KWDocListViewItem { public: - KWDocStructTextFrameItem(TQListViewItem* tqparent, const TQString& text, + KWDocStructTextFrameItem(TQListViewItem* parent, const TQString& text, KWTextFrameSet* frameset, KWFrame* frame ); - KWDocStructTextFrameItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, + KWDocStructTextFrameItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextFrameSet* frameset, KWFrame* frame ); virtual int ItemType() { return IT_TEXTFRAME; } virtual void selectItem(); @@ -144,8 +144,8 @@ protected: class KWDocStructTextFrameSetItem : public KWDocListViewItem { public: - KWDocStructTextFrameSetItem(TQListViewItem* tqparent, const TQString& text, KWTextFrameSet* frameset); - KWDocStructTextFrameSetItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, + KWDocStructTextFrameSetItem(TQListViewItem* parent, const TQString& text, KWTextFrameSet* frameset); + KWDocStructTextFrameSetItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTextFrameSet* frameset ); virtual int ItemType() { return IT_TEXT; } virtual void selectItem(); @@ -171,8 +171,8 @@ protected: class KWDocStructTableItem : public KWDocListViewItem { public: - KWDocStructTableItem(TQListViewItem* tqparent, const TQString& text, KWTableFrameSet* table ); - KWDocStructTableItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, + KWDocStructTableItem(TQListViewItem* parent, const TQString& text, KWTableFrameSet* table ); + KWDocStructTableItem(TQListViewItem* parent, TQListViewItem* after, const TQString& text, KWTableFrameSet* table ); virtual int ItemType() { return IT_TABLE; } virtual void selectItem(); @@ -197,7 +197,7 @@ protected: class KWDocStructFormulaItem : public KWDocListViewItem { public: - KWDocStructFormulaItem(TQListViewItem* tqparent, const TQString& text, KWFormulaFrameSet* form); + KWDocStructFormulaItem(TQListViewItem* parent, const TQString& text, KWFormulaFrameSet* form); virtual int ItemType() { return IT_FORMULA; } virtual void selectItem(); virtual void editItem(); @@ -218,7 +218,7 @@ protected: class KWDocStructPictureItem : public KWDocListViewItem { public: - KWDocStructPictureItem(TQListViewItem* tqparent, const TQString& text, KWPictureFrameSet* pic); + KWDocStructPictureItem(TQListViewItem* parent, const TQString& text, KWPictureFrameSet* pic); virtual int ItemType() { return IT_PICTURE; } virtual void selectItem(); virtual void editItem(); @@ -237,7 +237,7 @@ protected: class KWDocStructPartItem : public KWDocListViewItem { public: - KWDocStructPartItem(TQListViewItem* tqparent, const TQString& text, KWPartFrameSet* part); + KWDocStructPartItem(TQListViewItem* parent, const TQString& text, KWPartFrameSet* part); virtual int ItemType() { return IT_PART; } virtual void selectItem(); virtual void editItem(); @@ -256,7 +256,7 @@ protected: class KWDocStructRootItem : public KWDocListViewItem { public: - KWDocStructRootItem(TQListView* tqparent, const TQString& text, TypeStructDocItem type); + KWDocStructRootItem(TQListView* parent, const TQString& text, TypeStructDocItem type); virtual int ItemType() { return IT_ROOT; } void setupArrangement(); @@ -285,7 +285,7 @@ class KWDocStructTree : public KListView TQ_OBJECT public: - KWDocStructTree( TQWidget* tqparent, KWDocument* doc, KWGUI* gui ); + KWDocStructTree( TQWidget* parent, KWDocument* doc, KWGUI* gui ); ~KWDocStructTree(); void setup(); @@ -325,7 +325,7 @@ class KWDocStruct : public TQWidget TQ_OBJECT public: - KWDocStruct( TQWidget* tqparent, KWDocument* doc, KWGUI* gui ); + KWDocStruct( TQWidget* parent, KWDocument* doc, KWGUI* gui ); void selectItem(); void editItem(); void deleteItem(); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 5942c28b..9420f048 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -105,7 +105,7 @@ class KWCommandHistory : public KoCommandHistory { public: KWCommandHistory( KWDocument * doc ) : KoCommandHistory( doc->actionCollection(), true ), m_pDoc( doc ) {} -public /*slots*/: // They are already slots in the tqparent. Running tqmoc on the inherited class shouldn't be necessary AFAICS. +public /*slots*/: // They are already slots in the parent. Running tqmoc on the inherited class shouldn't be necessary AFAICS. virtual void undo(); virtual void redo(); private: @@ -151,8 +151,8 @@ public: const int KWDocument::CURRENT_SYNTAX_VERSION = 3; -KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget, widname, tqparent, name, singleViewMode ), +KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* parent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widname, parent, name, singleViewMode ), m_urlIntern() { KWStatisticVariable::setExtendedType( true ); @@ -3011,12 +3011,12 @@ TQDragObject* KWDocument::dragSelected( const TQValueList<KWFrameView*> &selecte return dragSelectedPrivate(0, selectedFrames, 0); } // can't be const due to recalcVariables() -TQDragObject* KWDocument::dragSelected( TQWidget *tqparent, KWTextFrameSet* fs) { +TQDragObject* KWDocument::dragSelected( TQWidget *parent, KWTextFrameSet* fs) { TQValueList<KWFrameView*> noFrames; - return dragSelectedPrivate(tqparent, noFrames, fs); + return dragSelectedPrivate(parent, noFrames, fs); } // can't be const due to recalcVariables() -TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *tqparent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs) +TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *parent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs) { // We'll create a store (ZIP format) in memory TQBuffer buffer; @@ -3039,7 +3039,7 @@ TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *tqparent, const TQValue delete store; - KMultipleDrag* multiDrag = new KMultipleDrag( tqparent ); + KMultipleDrag* multiDrag = new KMultipleDrag( parent ); if ( !plainText.isEmpty() ) multiDrag->addDragObject( new TQTextDrag( plainText, 0 ) ); if ( !picture.isNull() ) @@ -3735,12 +3735,12 @@ void KWDocument::addShell( KoMainWindow *shell ) KoDocument::addShell( shell ); } -KoView* KWDocument::createViewInstance( TQWidget* tqparent, const char* name ) +KoView* KWDocument::createViewInstance( TQWidget* parent, const char* name ) { if ( isEmbedded() ) - return new KWView( "ModeEmbedded", tqparent, name, this ); + return new KWView( "ModeEmbedded", parent, name, this ); else - return new KWView( m_viewModeType, tqparent, name, this ); + return new KWView( m_viewModeType, parent, name, this ); } // Paint this document when it's embedded @@ -5431,15 +5431,15 @@ int KWDocument::lastPage() const { return pageManager()->lastPageNumber(); } -TQWidget* KWDocument::createCustomDocumentWidget(TQWidget *tqparent) { +TQWidget* KWDocument::createCustomDocumentWidget(TQWidget *parent) { KoColumns columns; columns.columns = 1; columns.ptColumnSpacing = m_defaultColumnSpacing; - return new KWStartupWidget(tqparent, this, columns); + return new KWStartupWidget(parent, this, columns); } -KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *tqparent) { - m_parent = tqparent; +KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *parent) { + m_parent = parent; m_needLayout = false; } diff --git a/kword/KWDocument.h b/kword/KWDocument.h index 983b3add..fcda863f 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -131,7 +131,7 @@ public: friend class KWOasisLoader; friend class KWStartupWidget; - KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); ~KWDocument(); enum ProcessingType {WP = 0, DTP = 1}; @@ -169,7 +169,7 @@ public: /** * Return a drag object with the selected text */ - TQDragObject* dragSelected( TQWidget *tqparent, KWTextFrameSet* fs ); + TQDragObject* dragSelected( TQWidget *parent, KWTextFrameSet* fs ); virtual bool loadXML( TQIODevice *, const TQDomDocument & dom ); virtual bool loadChildren( KoStore *store ); @@ -822,7 +822,7 @@ protected: /// fix up Z-order for import from older kword versions. void fixZOrders(); TQString checkSectionTitleInParag( KoTextParag* parag, KWTextFrameSet*, int pageNum ) const; - KoView* createViewInstance( TQWidget* tqparent, const char* name ); + KoView* createViewInstance( TQWidget* parent, const char* name ); virtual bool completeLoading( KoStore* store ); virtual bool completeSaving( KoStore *store ); @@ -846,7 +846,7 @@ protected: TQValueList<KoPictureKey> savePictureList(); /// helper method for the 2 different dragSelected() versions - TQDragObject* dragSelectedPrivate( TQWidget *tqparent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs); + TQDragObject* dragSelectedPrivate( TQWidget *parent, const TQValueList<KWFrameView*> &selectedFrames, KWTextFrameSet* fs); /** * Save the whole document, or just the selection, into OASIS format * When saving the selection, also return the data as plain text and/or plain picture, @@ -871,7 +871,7 @@ protected: const TQValueList<KWFrameView*> &selectedFrames, TQString* plainText ) const; // inherited from KoDocument - TQWidget* createCustomDocumentWidget(TQWidget *tqparent); + TQWidget* createCustomDocumentWidget(TQWidget *parent); private: void clear(); @@ -879,7 +879,7 @@ private: class FramesChangedHandler { public: - FramesChangedHandler(KWDocument *tqparent); + FramesChangedHandler(KWDocument *parent); void addFrame(KWFrame*); void addFrameSet(KWFrameSet*); void execute(); diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 3af07a3e..3638301d 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -32,8 +32,8 @@ #include <tqlabel.h> #include <tqlayout.h> -KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true ) +KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true ) { resize( 412, 339 ); TQWidget *page = new TQWidget( this ); diff --git a/kword/KWEditPersonnalExpression.h b/kword/KWEditPersonnalExpression.h index a408e412..b7690431 100644 --- a/kword/KWEditPersonnalExpression.h +++ b/kword/KWEditPersonnalExpression.h @@ -33,7 +33,7 @@ class KWEditPersonnalExpression : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWEditPersonnalExpression( TQWidget *tqparent, const char *name = 0 ); + KWEditPersonnalExpression( TQWidget *parent, const char *name = 0 ); protected: void init(const TQString& filename ); diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp index 31c3b5aa..50648519 100644 --- a/kword/KWFactory.cpp +++ b/kword/KWFactory.cpp @@ -28,8 +28,8 @@ KInstance* KWFactory::s_instance = 0; KAboutData* KWFactory::s_aboutData = 0; -KWFactory::KWFactory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +KWFactory::KWFactory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { // Create our instance, so that it becomes KGlobal::instance if the // main app is KWord. @@ -44,11 +44,11 @@ KWFactory::~KWFactory() s_instance=0L; } -KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KWDocument *doc = new KWDocument( parentWidget, widname, tqparent, name, !bWantKoDocument ); + KWDocument *doc = new KWDocument( parentWidget, widname, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kword/KWFactory.h b/kword/KWFactory.h index c9b735e7..46803d3e 100644 --- a/kword/KWFactory.h +++ b/kword/KWFactory.h @@ -29,10 +29,10 @@ class KWFactory : public KoFactory Q_OBJECT TQ_OBJECT public: - KWFactory( TQObject* tqparent = 0, const char* name = 0 ); + KWFactory( TQObject* parent = 0, const char* name = 0 ); ~KWFactory(); - virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* tqparent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/kword/KWFindReplace.h b/kword/KWFindReplace.h index c7bdf795..4b6e54d5 100644 --- a/kword/KWFindReplace.h +++ b/kword/KWFindReplace.h @@ -44,7 +44,7 @@ class KWFindReplace : public KoFindReplace TQ_OBJECT public: KWFindReplace( KWCanvas * canvas, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView ); - KWFindReplace( KWCanvas * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView ); + KWFindReplace( KWCanvas * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObjects, KWTextFrameSetEdit* textView ); ~KWFindReplace(); virtual void emitNewCommand(KCommand *); diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 76076ff8..24060cf2 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -34,8 +34,8 @@ /* Class: KWFootNoteDia */ /******************************************************************/ -KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *tqparent, KWDocument *_doc, const char *name ) - : KDialogBase( tqparent, name, true, TQString(), Ok|Cancel|User1, Ok, true ) +KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *parent, KWDocument *_doc, const char *name ) + : KDialogBase( parent, name, true, TQString(), Ok|Cancel|User1, Ok, true ) { m_doc =_doc; //setButtonOKText(i18n("&Insert")); diff --git a/kword/KWFootNoteDia.h b/kword/KWFootNoteDia.h index 7b9b5670..f6ea8419 100644 --- a/kword/KWFootNoteDia.h +++ b/kword/KWFootNoteDia.h @@ -36,7 +36,7 @@ class KWFootNoteDia : public KDialogBase TQ_OBJECT public: - KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *tqparent, KWDocument *_doc, const char *name = 0 ); + KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString & _manualString, TQWidget *parent, KWDocument *_doc, const char *name = 0 ); NoteType noteType() const; KWFootNoteVariable::Numbering numberingType()const; diff --git a/kword/KWFrame.h b/kword/KWFrame.h index 531c6f38..88552259 100644 --- a/kword/KWFrame.h +++ b/kword/KWFrame.h @@ -82,7 +82,7 @@ public: /** * Constructor - * @param fs tqparent frameset + * @param fs parent frameset * @param left, top, width, height coordinates of the frame * The page number will be automatically determined from the position of the frame. * @param ra the "runaround" setting, i.e. whether text should flow below the frame, diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 0d722d15..2d9cb423 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -58,8 +58,8 @@ /******************************************************************/ /* Class KWBrushStylePreview - only used by kwframestylemanager */ /******************************************************************/ -KWBrushStylePreview::KWBrushStylePreview( TQWidget* tqparent ) - : TQFrame(tqparent) +KWBrushStylePreview::KWBrushStylePreview( TQWidget* parent ) + : TQFrame(parent) { } @@ -92,8 +92,8 @@ void KWBrushStylePreview::drawContents( TQPainter* painter ) * position/size ******************************************************************/ -KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame) - : KDialogBase( Tabbed, TQString(), Ok | Apply| Cancel, Ok, tqparent, "framedialog", true) +KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame) + : KDialogBase( Tabbed, TQString(), Ok | Apply| Cancel, Ok, parent, "framedialog", true) { m_noSignal=false; m_frame = frame; @@ -118,8 +118,8 @@ KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame) } /* Contructor when the dialog is used on creation of frame */ -KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame, KWDocument *doc, FrameSetType ft ) - : KDialogBase( Tabbed, i18n("Frame Properties for New Frame"), Ok | Cancel, Ok, tqparent, "framedialog", true) +KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame, KWDocument *doc, FrameSetType ft ) + : KDialogBase( Tabbed, i18n("Frame Properties for New Frame"), Ok | Cancel, Ok, parent, "framedialog", true) { m_noSignal=false; m_frameType=ft; @@ -137,7 +137,7 @@ KWFrameDia::KWFrameDia( TQWidget* tqparent, KWFrame *frame, KWDocument *doc, Fra init(); } -KWFrameDia::KWFrameDia( TQWidget *tqparent, TQPtrList<KWFrame> listOfFrames) : KDialogBase( Tabbed, i18n("Frames Properties"), Ok | Apply | Cancel, Ok, tqparent, "framedialog", true) , m_allFrames() { +KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDialogBase( Tabbed, i18n("Frames Properties"), Ok | Apply | Cancel, Ok, parent, "framedialog", true) , m_allFrames() { m_noSignal=false; m_mainFrame = m_frame = 0L; @@ -2383,8 +2383,8 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) { } KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& title, - TQWidget* tqparent, const char* name ) - : TQGroupBox( title, tqparent, name ), + TQWidget* parent, const char* name ) + : TQGroupBox( title, parent, name ), m_doc( doc ), m_changed( false ), m_noSignal( false ) { diff --git a/kword/KWFrameDia.h b/kword/KWFrameDia.h index 554960be..e8257b7d 100644 --- a/kword/KWFrameDia.h +++ b/kword/KWFrameDia.h @@ -103,10 +103,10 @@ class KWFrameDia : public KDialogBase TQ_OBJECT public: /** Contructor when the dialog is used on creation of m_frame */ - KWFrameDia( TQWidget *tqparent, KWFrame *_frame,KWDocument *_doc,FrameSetType _ft); - KWFrameDia( TQWidget *tqparent, KWFrame *_frame); - KWFrameDia( TQWidget *tqparent, TQPtrList<KWFrame> allFrames); - //KWFrameDia( TQWidget *tqparent, KWCanvas *_canvas); + KWFrameDia( TQWidget *parent, KWFrame *_frame,KWDocument *_doc,FrameSetType _ft); + KWFrameDia( TQWidget *parent, KWFrame *_frame); + KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> allFrames); + //KWFrameDia( TQWidget *parent, KWCanvas *_canvas); //void setCanvas(KWCanvas *_canvas) {canvas =_canvas;} diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp index d0f5682e..cbdaf864 100644 --- a/kword/KWFrameList.cpp +++ b/kword/KWFrameList.cpp @@ -92,7 +92,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) { // We trust that KWTableFrameSet will not make cells overlap ;) if ( m_frame->frameSet()->groupmanager() || daFrame->frameSet()->groupmanager() ) continue; - // Skip all frames from the tqparent frameset, if 'm_frame' is floating + // Skip all frames from the parent frameset, if 'm_frame' is floating // ## might need a for loop for the case of inline-inside-inline, // or maybe calling isPaintedBy instead [depending on what should happen for tables] if ( daFrame->frameSet()->isFloating() && @@ -100,7 +100,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) { daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) ) continue; // Floating frames are not "on top", they are "inside". - // They are not "below" anything either - the tqparent frameset is. + // They are not "below" anything either - the parent frameset is. if ( m_frame->frameSet()->isFloating() ) continue; KoRect intersect = m_frame->intersect( daFrame->outerKoRect() ); diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index b714d96d..7218abe7 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -299,7 +299,7 @@ public: }; /** * Called when our frames change, or when another frameset's frames change. - * Framesets can reimplement it, but should always call the tqparent method. + * Framesets can reimplement it, but should always call the parent method. */ virtual void updateFrames( int flags = 0xff ); @@ -337,7 +337,7 @@ public: //virtual void preparePrinting( TQPainter *, TQProgressDialog *, int & ) { } /** Called once the frameset has been completely loaded or constructed. - * The default implementation calls updateFrames() and zoom(). Call the tqparent :) */ + * The default implementation calls updateFrames() and zoom(). Call the parent :) */ virtual void finalize(); virtual int paragraphs() { return 0; } @@ -390,7 +390,7 @@ public: virtual KoSize floatingFrameSize( int frameNum = 0 ); /** Get the rect of the "floating frame" identified by frameNum, in coordinates RELATIVE TO THE PARENT FRAMESET. - This is especially important for multi-tqparent inline frames. */ + This is especially important for multi-parent inline frames. */ KoRect floatingFrameRect( int frameNum = 0 ); /** Get the 'baseline' to use for the "floating frame" identified by frameNum. -1 means same as the height (usual case) */ diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 0a770770..781e9e8f 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -564,8 +564,8 @@ void KWFrameStyleManager::renameStyle(const TQString &theText) { /* Class: KWFrameStyleBackgroundTab */ /******************************************************************/ -KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * tqparent ) - : KWFrameStyleManagerTab( tqparent ) +KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * parent ) + : KWFrameStyleManagerTab( parent ) { bgwidget = this; m_backgroundColor.setStyle( Qt::SolidPattern ); @@ -621,8 +621,8 @@ void KWFrameStyleBackgroundTab::save() /* Class: KWFrameStyleBordersTab */ /******************************************************************/ -KWFrameStyleBordersTab::KWFrameStyleBordersTab( TQWidget * tqparent ) - : KWFrameStyleManagerTab( tqparent ) +KWFrameStyleBordersTab::KWFrameStyleBordersTab( TQWidget * parent ) + : KWFrameStyleManagerTab( parent ) { m_widget = 0L; m_borders = new KoParagLayout(); diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h index c44adb82..f261b2cd 100644 --- a/kword/KWFrameStyleManager.h +++ b/kword/KWFrameStyleManager.h @@ -50,8 +50,8 @@ class KWFrameStylePreview : public TQWidget TQ_OBJECT public: - KWFrameStylePreview( TQWidget *tqparent ) - : TQWidget( tqparent ), frameStyle( 0 ) { + KWFrameStylePreview( TQWidget *parent ) + : TQWidget( parent ), frameStyle( 0 ) { setBackgroundColor( white ); } @@ -158,7 +158,7 @@ class KWFrameStyleManagerTab : public TQWidget { Q_OBJECT TQ_OBJECT public: - KWFrameStyleManagerTab(TQWidget *tqparent) : TQWidget(tqparent) {}; + KWFrameStyleManagerTab(TQWidget *parent) : TQWidget(parent) {}; /** the new style which is to be displayed */ void setStyle(KWFrameStyle *style) { m_style = style; } @@ -177,7 +177,7 @@ class KWFrameStyleBackgroundTab : public KWFrameStyleManagerTab Q_OBJECT TQ_OBJECT public: - KWFrameStyleBackgroundTab( TQWidget * tqparent ); + KWFrameStyleBackgroundTab( TQWidget * parent ); virtual void update(); virtual void save(); @@ -197,7 +197,7 @@ class KWFrameStyleBordersTab : public KWFrameStyleManagerTab Q_OBJECT TQ_OBJECT public: - KWFrameStyleBordersTab( TQWidget * tqparent ); + KWFrameStyleBordersTab( TQWidget * parent ); ~KWFrameStyleBordersTab(); void setWidget( KoParagLayoutWidget * widget ); diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index 4904ec98..927b0f13 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -39,8 +39,8 @@ static const double HORIZONTAL_SNAP = 6; // horizontal snap zone (in pt) static const double VERTICAL_SNAP = 6; // vertical snap zone (in pt) -KWFrameView::KWFrameView(KWFrameViewManager *tqparent, KWFrame *frame) { - m_manager = tqparent; +KWFrameView::KWFrameView(KWFrameViewManager *parent, KWFrame *frame) { + m_manager = parent; Q_ASSERT(frame); Q_ASSERT(frame->frameSet()); m_frame = frame; @@ -243,7 +243,7 @@ MouseMeaning TableFramePolicy::mouseMeaning( const KoPoint &point, int keyState return MEANING_MOUSE_SELECT; // Shift _and_ at least a frame is selected already // (shift + no frame selected is used to select text) - if ( (keyState & TQt::ShiftButton) && m_view->tqparent()->selectedFrame() != 0 ) + if ( (keyState & TQt::ShiftButton) && m_view->parent()->selectedFrame() != 0 ) return MEANING_MOUSE_SELECT; return MEANING_MOUSE_INSIDE_TEXT; @@ -291,7 +291,7 @@ void TableFramePolicy::setSelected(MouseMeaning selectPolicy) { unsigned int column = static_cast<KWTableFrameSet::Cell *>(fs)->firstColumn(); for (KWTableFrameSet::TableIter cells(fs->groupmanager()); cells; ++cells) { if(cells->firstColumn() >= column && cells->lastColumn() <= column) { - KWFrameView *fv = m_view->tqparent()->view(cells->frame(0)); + KWFrameView *fv = m_view->parent()->view(cells->frame(0)); if(fv) fv->setSelected(true); } @@ -301,7 +301,7 @@ void TableFramePolicy::setSelected(MouseMeaning selectPolicy) { unsigned int row = static_cast<KWTableFrameSet::Cell *>(fs)->firstRow(); for (KWTableFrameSet::TableIter cells(fs->groupmanager()); cells; ++cells) { if(cells->firstRow() >= row && cells->lastRow() <= row) { - KWFrameView *fv = m_view->tqparent()->view(cells->frame(0)); + KWFrameView *fv = m_view->parent()->view(cells->frame(0)); if(fv) fv->setSelected(true); } diff --git a/kword/KWFrameView.h b/kword/KWFrameView.h index d7b63aba..c7017bf7 100644 --- a/kword/KWFrameView.h +++ b/kword/KWFrameView.h @@ -38,19 +38,19 @@ public: /** Constructor */ FramePolicy(KWFrameView *view); /** - * Return the MouseMeaning enum value for the tqparent view. + * Return the MouseMeaning enum value for the parent view. * @param point the point where the mouse is hovering. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ virtual MouseMeaning mouseMeaning( const KoPoint &point, int keyState ) = 0; /** * Return a fully initialized popup for the context of frame at @p point * @param point the point where the mouse is hovering. - * @param view the tqparent view widget + * @param view the parent view widget */ virtual TQPopupMenu* createPopup( const KoPoint &point, KWView *view ) = 0; /** - * Override this method to do more than select the tqparent frame-view + * Override this method to do more than select the parent frame-view */ virtual void setSelected(MouseMeaning) { } @@ -58,12 +58,12 @@ protected: /** * Shared method for all policies called when the border of the frame is clicked. * @param point the point where the mouse is hovering. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ virtual MouseMeaning mouseMeaningOnBorder(const KoPoint &point, int keyState); /** * Shared method for all policies to add the 'set floating' action to a popup menu. - * @param view the tqparent view widget + * @param view the parent view widget * @param actionList the list of actions where the floating action should be added to */ void addFloatingAction(KWView *view, TQPtrList<KAction> &actionList); @@ -83,10 +83,10 @@ class KWFrameView { public: /** * Constructor - * @param tqparent the tqparent + * @param parent the parent * @param frame the frame this view represents. */ - KWFrameView(KWFrameViewManager *tqparent, KWFrame *frame); + KWFrameView(KWFrameViewManager *parent, KWFrame *frame); virtual ~KWFrameView(); /// returns if this frameView is selected. A selected frame is shown differently on screen. @@ -108,22 +108,22 @@ public: bool contains(const KoPoint &point, bool fuzzy = true) const; /** - * Return the MouseMeaning enum value for the tqparent view. + * Return the MouseMeaning enum value for the parent view. * @param point the point where the mouse is hovering. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ MouseMeaning mouseMeaning( const KoPoint &point, int keyState ); - /// Return the tqparent KWFrameViewManager this frameView belongs to - KWFrameViewManager *tqparent() const { return m_manager; } + /// Return the parent KWFrameViewManager this frameView belongs to + KWFrameViewManager *parent() const { return m_manager; } /** * Show a context-sensitive popup menu based on the location of 'point'. * @param point the point at which the mouse was clicked. The context is based on * what is present at that location. - * @param popupPoint the point in the same coordinate system as the tqparent widget of + * @param popupPoint the point in the same coordinate system as the parent widget of * where the popup menu should be located. - * @param view the tqparent widget for the popup. + * @param view the parent widget for the popup. */ void showPopup( const KoPoint &point, KWView *view, const TQPoint &popupPoint) const; diff --git a/kword/KWFrameViewManager.h b/kword/KWFrameViewManager.h index 43ec918e..00e4e08b 100644 --- a/kword/KWFrameViewManager.h +++ b/kword/KWFrameViewManager.h @@ -105,14 +105,14 @@ public: * All the frames that have a presence at the point are considered and depending on * what kind of frame and where in the frame the mouse is the meaning is calculated. * @param point the point where the mouse is hovering. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ MouseMeaning mouseMeaning( const KoPoint &point, int keyState) const; /** * Similar to mouseMeaning(), but instead of returning the meaning this will return * a mouse cursor to represent the action. * @param point the point where the mouse is hovering. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ TQCursor mouseCursor( const KoPoint &point, int keyState ) const; @@ -120,10 +120,10 @@ public: * Show a context-sensitive popup menu based on the location of 'point'. * @param point the point at which the mouse was clicked. The context is based on * what is present at that location. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); - * @param popupPoint the point in the same coordinate system as the tqparent widget of + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); + * @param popupPoint the point in the same coordinate system as the parent widget of * where the popup menu should be located. - * @param view the tqparent widget for the popup. + * @param view the parent widget for the popup. */ void showPopup( const KoPoint &point, KWView *view, int keyState, const TQPoint &popupPoint) const; @@ -137,7 +137,7 @@ public: * / or unselecting any frames based on this information. * @param leftClick true if this select is due to the main button being clicked. * @param point the point clicked. - * @param keyState the bittqmask of keys that are pressed. Same as Event::state(); + * @param keyState the bitmask of keys that are pressed. Same as Event::state(); */ void selectFrames(const KoPoint &point, int keyState, bool leftClick); diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index c7660993..725c932e 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -36,8 +36,8 @@ #include "KWTextParag.h" -KWImportStyleDia::KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name ) - :KoImportStyleDia( currentCollection, tqparent, name ), +KWImportStyleDia::KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name ) + :KoImportStyleDia( currentCollection, parent, name ), m_doc(_doc) { @@ -166,8 +166,8 @@ void KWImportStyleDia::loadFile() delete store; } -KWImportFrameTableStyleDia::KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList &_list, StyleType _type, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KWImportFrameTableStyleDia::KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList &_list, StyleType _type, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Import Style") ); m_doc=_doc; diff --git a/kword/KWImportStyleDia.h b/kword/KWImportStyleDia.h index 075a83fd..16918e42 100644 --- a/kword/KWImportStyleDia.h +++ b/kword/KWImportStyleDia.h @@ -38,7 +38,7 @@ class KWImportStyleDia : public KoImportStyleDia Q_OBJECT TQ_OBJECT public: - KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name = 0 ); + KWImportStyleDia( KWDocument *_doc, KoStyleCollection* currentCollection, TQWidget *parent, const char *name = 0 ); ~KWImportStyleDia(); protected: @@ -55,7 +55,7 @@ class KWImportFrameTableStyleDia : public KDialogBase TQ_OBJECT public: enum StyleType { frameStyle, TableStyle}; - KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList & _list, StyleType _type , TQWidget *tqparent, const char *name ); + KWImportFrameTableStyleDia( KWDocument *_doc, const TQStringList & _list, StyleType _type , TQWidget *parent, const char *name ); ~KWImportFrameTableStyleDia(); TQPtrList<KWFrameStyle> listOfFrameStyleImported() const { return m_frameStyleList;} TQPtrList<KWTableStyle> listOfTableStyleImported() const { return m_tableStyleList;} diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp index 883332bd..09764608 100644 --- a/kword/KWInsertDia.cpp +++ b/kword/KWInsertDia.cpp @@ -30,12 +30,12 @@ #include <tqbuttongroup.h> #include <tqlayout.h> -KWInsertDia::KWInsertDia( KWView *tqparent, KWTableFrameSet *table, InsertType type, int insertHint) - : KDialogBase( Plain, (type==insertRow?i18n("Insert Row") : i18n("Insert Column")), Ok | Cancel, Ok, tqparent, "Insert Table items dialog", true ) +KWInsertDia::KWInsertDia( KWView *parent, KWTableFrameSet *table, InsertType type, int insertHint) + : KDialogBase( Plain, (type==insertRow?i18n("Insert Row") : i18n("Insert Column")), Ok | Cancel, Ok, parent, "Insert Table items dialog", true ) { m_type = type; m_table = table; - m_view = tqparent; + m_view = parent; setupTab1(insertHint); } diff --git a/kword/KWInsertDia.h b/kword/KWInsertDia.h index bb3b30ca..2a6d6d82 100644 --- a/kword/KWInsertDia.h +++ b/kword/KWInsertDia.h @@ -35,7 +35,7 @@ class KWInsertDia : public KDialogBase public: enum InsertType {insertRow, insertColumn}; - KWInsertDia( KWView *tqparent, KWTableFrameSet *table, InsertType type, int insertHint); + KWInsertDia( KWView *parent, KWTableFrameSet *table, InsertType type, int insertHint); protected: void setupTab1(int insertHint); diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index f8b6ace0..28d0cd34 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -27,8 +27,8 @@ #include <tqbuttongroup.h> #include <tqvbox.h> -KWInsertPageDia::KWInsertPageDia( TQWidget *tqparent, const char* name ) - : KDialogBase( tqparent, name,TRUE,i18n("Insert Page"),Ok|Cancel ) +KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) + : KDialogBase( parent, name,TRUE,i18n("Insert Page"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/kword/KWInsertPageDia.h b/kword/KWInsertPageDia.h index daa145c7..f67f7b7e 100644 --- a/kword/KWInsertPageDia.h +++ b/kword/KWInsertPageDia.h @@ -28,7 +28,7 @@ class KWInsertPageDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWInsertPageDia( TQWidget *tqparent, const char* name ); + KWInsertPageDia( TQWidget *parent, const char* name ); InsertPagePos insertPagePos() const; private: diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index a8b6ee49..4b5f3daa 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -46,8 +46,8 @@ class KWInsertPicPreview : public TQScrollView { public: - KWInsertPicPreview( TQWidget *tqparent ) - : TQScrollView( tqparent ) + KWInsertPicPreview( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); setMinimumSize( 300, 200 ); @@ -84,8 +84,8 @@ private: ////////////// -KWInsertPicDia::KWInsertPicDia( TQWidget *tqparent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name ) - : KDialogBase( Plain, i18n("Insert Picture"), Ok|Cancel, Ok, tqparent, name, true ), +KWInsertPicDia::KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name ) + : KDialogBase( Plain, i18n("Insert Picture"), Ok|Cancel, Ok, parent, name, true ), m_bFirst ( true ), m_doc ( _doc ) { setInitialSize( TQSize(400, 300) ); @@ -145,18 +145,18 @@ void KWInsertPicDia::slotChooseImage() m_bFirst = false; } -KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* tqparent ) +KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* parent ) { TQStringList mimetypes ( KImageIO::mimeTypes( KImageIO::Reading ) ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); - KFileDialog fd( _path, TQString(), tqparent, 0, TRUE ); + KFileDialog fd( _path, TQString(), parent, 0, TRUE ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Choose Picture")); - return selectPicture( fd, tqparent ); + return selectPicture( fd, parent ); } -KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *tqparent ) +KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *parent ) { KoPicture picture; @@ -166,7 +166,7 @@ KoPicture KWInsertPicDia::selectPicture( KFileDialog & fd, TQWidget *tqparent ) url = fd.selectedURL(); if( !url.isEmpty() ) - picture.setKeyAndDownloadPicture( url, tqparent ); + picture.setKeyAndDownloadPicture( url, parent ); return picture; } diff --git a/kword/KWInsertPicDia.h b/kword/KWInsertPicDia.h index e9acaf75..1c151b2a 100644 --- a/kword/KWInsertPicDia.h +++ b/kword/KWInsertPicDia.h @@ -31,7 +31,7 @@ class KWInsertPicDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWInsertPicDia( TQWidget *tqparent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name = 0 ); + KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, KWDocument *_doc, const char *name = 0 ); bool makeInline() const; @@ -41,7 +41,7 @@ public: * @param _path the name of the old file * @return the loaded picture (Picture is null if cancelled.) */ - static KoPicture selectPictureDia( const TQString & _path, TQWidget* tqparent ); + static KoPicture selectPictureDia( const TQString & _path, TQWidget* parent ); KoPicture picture ( void ) const; @@ -49,7 +49,7 @@ protected slots: void slotChooseImage(); protected: - static KoPicture selectPicture( KFileDialog & fd, TQWidget *tqparent ); + static KoPicture selectPicture( KFileDialog & fd, TQWidget *parent ); private: diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index 244c2006..e477f502 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -326,7 +326,7 @@ int KWMailMergeDataBase::version() { KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList offers ) : KDialogBase( Plain, i18n( "Mail Merge Setup" ), Ok | Cancel, Ok, - /*tqparent*/ 0, "", true ), pluginOffers( offers ) + /*parent*/ 0, "", true ), pluginOffers( offers ) { TQWidget *back = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() ); @@ -382,8 +382,8 @@ void KWMailMergeChoosePluginDialog::pluginChanged( int pos ) * ******************************************************************/ -KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *tqparent,KWMailMergeDataBase *db) - : KDialogBase(Plain, i18n( "Mail Merge Setup" ), Close, Close, tqparent, "", true ) +KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDataBase *db) + : KDialogBase(Plain, i18n( "Mail Merge Setup" ), Close, Close, parent, "", true ) { db_=db; TQWidget *back = plainPage(); @@ -450,7 +450,7 @@ void KWMailMergeConfigDialog::enableDisableEdit() void KWMailMergeConfigDialog::slotEditClicked() {db_->action=KWSLEdit; - if (db_->plugin) db_->plugin->showConfigDialog((TQWidget*)tqparent(),KWSLEdit); + if (db_->plugin) db_->plugin->showConfigDialog((TQWidget*)parent(),KWSLEdit); } void KWMailMergeConfigDialog::slotCreateClicked() @@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked() void KWMailMergeConfigDialog::slotPreviewClicked() { db_->action=KWSLMergePreview; - KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)tqparent())->tqtopLevelWidget()); + KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget()); if (mw) { KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); @@ -509,9 +509,9 @@ KWMailMergeConfigDialog::~KWMailMergeConfigDialog() * ******************************************************************/ -KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *tqparent, KWMailMergeDataBase *db ) +KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KWMailMergeDataBase *db ) : KDialogBase( Plain, i18n( "Mail Merge - Variable Name" ), - Ok | Cancel, Ok, tqparent, "", true ) + Ok | Cancel, Ok, parent, "", true ) { m_db=db; TQWidget *page = plainPage(); diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h index 2906ebe8..70f75f9e 100644 --- a/kword/KWMailMergeDataBase.h +++ b/kword/KWMailMergeDataBase.h @@ -120,7 +120,7 @@ class KWMailMergeConfigDialog : public KDialogBase TQ_OBJECT public: - KWMailMergeConfigDialog ( TQWidget *tqparent, KWMailMergeDataBase *db ); + KWMailMergeConfigDialog ( TQWidget *parent, KWMailMergeDataBase *db ); ~KWMailMergeConfigDialog(); protected: TQPushButton *edit; @@ -152,7 +152,7 @@ class KWMailMergeVariableInsertDia : public KDialogBase TQ_OBJECT public: - KWMailMergeVariableInsertDia( TQWidget *tqparent, KWMailMergeDataBase *db ); + KWMailMergeVariableInsertDia( TQWidget *parent, KWMailMergeDataBase *db ); TQString getName() const; // ### unused, can we remove this? protected slots: diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp index e95085e7..d21c4bd0 100644 --- a/kword/KWMailMergeDataSource.cpp +++ b/kword/KWMailMergeDataSource.cpp @@ -1,8 +1,8 @@ #include "KWMailMergeDataSource.h" #include "KWMailMergeDataSource.moc" -KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *tqparent): TQObject(tqparent), -DCOPObject(TQCString(tqparent->name())+".plugin_loading"),m_instance(inst) +KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *parent): TQObject(parent), +DCOPObject(TQCString(parent->name())+".plugin_loading"),m_instance(inst) { } const TQMap< TQString, TQString > &KWMailMergeDataSource::getRecordEntries() const {return sampleRecord;} diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h index b773c7a8..d27c509d 100644 --- a/kword/KWMailMergeDataSource.h +++ b/kword/KWMailMergeDataSource.h @@ -49,7 +49,7 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject // TQ_OBJECT K_DCOP public: - KWMailMergeDataSource(KInstance* inst,TQObject *tqparent); + KWMailMergeDataSource(KInstance* inst,TQObject *parent); virtual ~KWMailMergeDataSource(){;} virtual class TQString getValue( const class TQString &name, int record = -1 ) const=0; diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index 7adce7f3..fdea1cf7 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -30,8 +30,8 @@ class MailMergeDraggableLabel : public TQToolButton { public: - MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * tqparent = 0, const char * name = 0 ) - : TQToolButton( tqparent, name ), m_mw(mw) + MailMergeDraggableLabel( KoMainWindow * mw, const TQString & text, TQWidget * parent = 0, const char * name = 0 ) + : TQToolButton( parent, name ), m_mw(mw) { setText(text); setAcceptDrops(true); @@ -103,8 +103,8 @@ private: KWMailMergeLabelAction::KWMailMergeLabelAction( const TQString &text, int accel, - TQObject* receiver, const char* slot, TQObject *tqparent, const char *name ) - : KAction( text, accel, receiver, slot, tqparent, name ), m_label( 0L ) + TQObject* receiver, const char* slot, TQObject *parent, const char *name ) + : KAction( text, accel, receiver, slot, parent, name ), m_label( 0L ) { } diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h index da523864..3a38e2d9 100644 --- a/kword/KWMailMergeLabelAction.h +++ b/kword/KWMailMergeLabelAction.h @@ -33,7 +33,7 @@ class KWMailMergeLabelAction : public KAction TQ_OBJECT public: KWMailMergeLabelAction( const TQString &text, int accel, - TQObject* receiver, const char* slot, TQObject *tqparent = 0, const char *name = 0 ); + TQObject* receiver, const char* slot, TQObject *parent = 0, const char *name = 0 ); virtual int plug( TQWidget *widget, int index = -1 ); virtual void unplug( TQWidget *widget ); diff --git a/kword/KWPage.cpp b/kword/KWPage.cpp index 3518d673..4f8765df 100644 --- a/kword/KWPage.cpp +++ b/kword/KWPage.cpp @@ -21,8 +21,8 @@ #include <tqrect.h> -KWPage::KWPage(KWPageManager *tqparent, int pageNum) { - m_parent = tqparent; +KWPage::KWPage(KWPageManager *parent, int pageNum) { + m_parent = parent; m_pageNum = pageNum; m_pageLayout.ptWidth = -1.0; m_pageLayout.ptHeight = -1.0; diff --git a/kword/KWPage.h b/kword/KWPage.h index b30a2ff9..44bffc2a 100644 --- a/kword/KWPage.h +++ b/kword/KWPage.h @@ -112,10 +112,10 @@ public: private: /** private constructor, only for our friends - * @param tqparent the KWPageManager that we belong to. + * @param parent the KWPageManager that we belong to. * @param pageNum the number of the page as the user will see it. */ - KWPage(KWPageManager *tqparent, int pageNum); + KWPage(KWPageManager *parent, int pageNum); int m_pageNum; PageSideEnum m_pageSide; KoPageLayout m_pageLayout; diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h index 5a85853d..25609c1a 100644 --- a/kword/KWPartFrameSet.h +++ b/kword/KWPartFrameSet.h @@ -154,7 +154,7 @@ public: KWDocumentChild( KWDocument *_wdoc ); ~KWDocumentChild(); - KWDocument* tqparent()const + KWDocument* parent()const { return m_pKWordDoc; } virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index ec77394a..3502701b 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <tqvbox.h> -KWResizeTableDia::KWResizeTableDia( TQWidget *tqparent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn ) - : KDialogBase( tqparent, "resize column dialog" , true, "", Ok | Cancel | User1 | Apply ) +KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn ) + : KDialogBase( parent, "resize column dialog" , true, "", Ok | Cancel | User1 | Apply ) { setButtonText( KDialogBase::User1, i18n("Reset") ); setCaption( i18n( "Resize Column" ) ); diff --git a/kword/KWResizeTableDia.h b/kword/KWResizeTableDia.h index f1512269..7ca65eae 100644 --- a/kword/KWResizeTableDia.h +++ b/kword/KWResizeTableDia.h @@ -39,12 +39,12 @@ class KWResizeTableDia : public KDialogBase public: /** * Constructor. - * @param tqparent tqparent widget for dialog + * @param parent parent widget for dialog * @param table the table to do the resizes on * @param doc the document this table belongs to, for undo information * @param resizeColumn the initial column that the user can resize. */ - KWResizeTableDia( TQWidget *tqparent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn); + KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KWDocument *doc, int resizeColumn); protected: void setupTab1( int resizeColumn); diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 614e790c..047dcf93 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -27,8 +27,8 @@ #include <tqbuttongroup.h> #include <tqvbox.h> -KWSortDia::KWSortDia( TQWidget *tqparent, const char* name ) - : KDialogBase( tqparent, name,TRUE,i18n("Sort Text"),Ok|Cancel ) +KWSortDia::KWSortDia( TQWidget *parent, const char* name ) + : KDialogBase( parent, name,TRUE,i18n("Sort Text"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/kword/KWSortDia.h b/kword/KWSortDia.h index 2ecc1c68..451e0343 100644 --- a/kword/KWSortDia.h +++ b/kword/KWSortDia.h @@ -28,7 +28,7 @@ class KWSortDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KWSortDia( TQWidget *tqparent, const char* name ); + KWSortDia( TQWidget *parent, const char* name ); SortType getSortType() const; private: diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp index c753f4df..5e988ea3 100644 --- a/kword/KWSplitCellDia.cpp +++ b/kword/KWSplitCellDia.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -KWSplitCellDia::KWSplitCellDia( TQWidget* tqparent, const char* name, unsigned int columns, unsigned int rows) - : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, tqparent, name, true) +KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int columns, unsigned int rows) + : KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, parent, name, true) { m_cols = columns; m_rows = rows; diff --git a/kword/KWSplitCellDia.h b/kword/KWSplitCellDia.h index 4a6aa376..c23a1f11 100644 --- a/kword/KWSplitCellDia.h +++ b/kword/KWSplitCellDia.h @@ -36,7 +36,7 @@ class KWSplitCellDia : public KDialogBase { TQ_OBJECT public: - KWSplitCellDia( TQWidget *tqparent, const char *name, unsigned int numcols, unsigned int numrows); + KWSplitCellDia( TQWidget *parent, const char *name, unsigned int numcols, unsigned int numrows); unsigned int rows()const { return m_rows; } unsigned int columns()const { return m_cols; } diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp index 644eca2b..60dab02b 100644 --- a/kword/KWStartupWidget.cpp +++ b/kword/KWStartupWidget.cpp @@ -27,8 +27,8 @@ #include <tqcheckbox.h> #include <tqlayout.h> -KWStartupWidget::KWStartupWidget(TQWidget *tqparent, KWDocument *doc, const KoColumns &columns) - : KWStartupWidgetBase(tqparent) { +KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns) + : KWStartupWidgetBase(parent) { m_columns = columns; m_layout = KoPageLayout::standardLayout(); m_doc = doc; diff --git a/kword/KWStartupWidget.h b/kword/KWStartupWidget.h index 4106ac2f..8202488c 100644 --- a/kword/KWStartupWidget.h +++ b/kword/KWStartupWidget.h @@ -36,11 +36,11 @@ class KWStartupWidget : public KWStartupWidgetBase { public: /** * Constructor. Please note that this class is being used/created by KWDocument. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param doc the document that wants to be altered * @param columns the suggested columns to be shown initially */ - KWStartupWidget(TQWidget *tqparent, KWDocument *doc, const KoColumns &columns); + KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns); private slots: void sizeUpdated(KoPageLayout &tqlayout); diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index a95154f5..e8cd0e92 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -27,8 +27,8 @@ #include <tqprogressdialog.h> #include <tqcheckbox.h> -KWStatisticsDialog::KWStatisticsDialog( TQWidget *tqparent, KWDocument *document ) - : KDialogBase(tqparent, "statistics", true, i18n("Statistics"),KDialogBase::Ok, KDialogBase::Ok, false ) +KWStatisticsDialog::KWStatisticsDialog( TQWidget *parent, KWDocument *document ) + : KDialogBase(parent, "statistics", true, i18n("Statistics"),KDialogBase::Ok, KDialogBase::Ok, false ) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -45,7 +45,7 @@ KWStatisticsDialog::KWStatisticsDialog( TQWidget *tqparent, KWDocument *document m_resultGeneralLabel[i]=0; } m_doc = document; - m_parent = tqparent; + m_parent = parent; m_canceled = true; diff --git a/kword/KWStatisticsDialog.h b/kword/KWStatisticsDialog.h index 0eece6a3..064b6ef2 100644 --- a/kword/KWStatisticsDialog.h +++ b/kword/KWStatisticsDialog.h @@ -37,7 +37,7 @@ class KWStatisticsDialog : public KDialogBase TQ_OBJECT public: - KWStatisticsDialog( TQWidget *tqparent, KWDocument *doc ); + KWStatisticsDialog( TQWidget *parent, KWDocument *doc ); bool wasCanceled()const { return m_canceled; } private: diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 711c76c5..013a2be6 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -70,9 +70,9 @@ void KWTablePreview::paintEvent( TQPaintEvent * ) /* Class: KWTableDia */ /******************************************************************/ -KWTableDia::KWTableDia( TQWidget* tqparent, const char* name, UseMode _useMode, KWCanvas *_canvas, KWDocument *_doc, +KWTableDia::KWTableDia( TQWidget* parent, const char* name, UseMode _useMode, KWCanvas *_canvas, KWDocument *_doc, int rows, int cols, CellSize wid, CellSize hei, bool floating , const TQString & _templateName, int format) - : KDialogBase( Tabbed, i18n("Table Settings"), Ok | Cancel, Ok, tqparent, name, true) + : KDialogBase( Tabbed, i18n("Table Settings"), Ok | Cancel, Ok, parent, name, true) { m_useMode = _useMode; canvas = _canvas; diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h index 0e6ad2d5..09dff25a 100644 --- a/kword/KWTableDia.h +++ b/kword/KWTableDia.h @@ -74,7 +74,7 @@ class KWTableDia : public KDialogBase public: typedef int CellSize; // in fact KWTableFrameSet::CellSize, which is an enum enum UseMode{ NEW, EDIT }; - KWTableDia( TQWidget *tqparent, const char *name, UseMode _useMode, KWCanvas *_canvas, + KWTableDia( TQWidget *parent, const char *name, UseMode _useMode, KWCanvas *_canvas, KWDocument *_doc, int rows, int cols, CellSize wid, CellSize hei, bool floating, const TQString & _templateName, int format); diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 892bc822..f108573b 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -1904,7 +1904,7 @@ void KWTableFrameSet::loadOasis( const TQDomElement& tableTag, KoOasisContext& c parseInsideOfTable( tableTag, context, columnLefts, row, column, 0 ); } -void KWTableFrameSet::parseInsideOfTable( const TQDomElement& tqparent, KoOasisContext& context, +void KWTableFrameSet::parseInsideOfTable( const TQDomElement& parent, KoOasisContext& context, const TQMemArray<double> & columnLefts, uint& row, uint& column, double currentRowHeight ) { @@ -1912,7 +1912,7 @@ void KWTableFrameSet::parseInsideOfTable( const TQDomElement& tqparent, KoOasisC KoStyleStack& styleStack = context.styleStack(); TQDomElement e; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { const TQString localName = e.localName(); const TQString ns = e.namespaceURI(); diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index d3f0ad31..e379f3b6 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -525,7 +525,7 @@ protected: private: void addCellToArray( Cell* cell ); void afterLoadingCell( Cell* cell ); - void parseInsideOfTable( const TQDomElement& tqparent, KoOasisContext& context, + void parseInsideOfTable( const TQDomElement& parent, KoOasisContext& context, const TQMemArray<double> & columnLefts, uint& row, uint& column, double currentRowHeight ); void loadOasisCell( const TQDomElement& element, KoOasisContext& context, diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 7bd70eb6..c7cd547a 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -48,8 +48,8 @@ /* Class: KWTableStylePreview */ /******************************************************************/ -KWTableStylePreview::KWTableStylePreview( const TQString& title, const TQString& text, TQWidget* tqparent, const char* name ) - : TQGroupBox( title, tqparent, name ) +KWTableStylePreview::KWTableStylePreview( const TQString& title, const TQString& text, TQWidget* parent, const char* name ) + : TQGroupBox( title, parent, name ) { m_zoomHandler = new KoTextZoomHandler; TQFont font = KoGlobal::defaultFont(); diff --git a/kword/KWTableStyleManager.h b/kword/KWTableStyleManager.h index 4d95ca75..a264b8a2 100644 --- a/kword/KWTableStyleManager.h +++ b/kword/KWTableStyleManager.h @@ -51,7 +51,7 @@ class KWTableStylePreview : public TQGroupBox TQ_OBJECT public: - KWTableStylePreview(const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0); + KWTableStylePreview(const TQString &title, const TQString &text, TQWidget *parent, const char* name = 0); virtual ~KWTableStylePreview(); void setTableStyle(KWTableStyle *_tableStyle); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index 7fd642e2..c36743df 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -50,8 +50,8 @@ /* Class: KWTableTemplatePreview */ /******************************************************************/ -KWTableTemplatePreview::KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* tqparent, const char* name ) - : TQGroupBox( title, tqparent, name ) +KWTableTemplatePreview::KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* parent, const char* name ) + : TQGroupBox( title, parent, name ) { m_emptyStyle = _emptyStyle; m_zoomHandler = new KoTextZoomHandler; diff --git a/kword/KWTableTemplateSelector.h b/kword/KWTableTemplateSelector.h index 43a6e358..1bae479b 100644 --- a/kword/KWTableTemplateSelector.h +++ b/kword/KWTableTemplateSelector.h @@ -56,7 +56,7 @@ class KWTableTemplatePreview : public TQGroupBox TQ_OBJECT public: - KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* tqparent, const char* name=0L ); + KWTableTemplatePreview( const TQString& title, KWTableStyle *_emptyStyle, TQWidget* parent, const char* name=0L ); ~KWTableTemplatePreview(); void setTableTemplate(KWTableTemplate *_tableTemplate); KWTableTemplate *getTableTemplate()const ; diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index c19da8f0..43a1de5a 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -745,7 +745,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor TQRegion reg; if ( hasFrames ) { reg = frameClipRegion( p, theFrame, clip, m_currentViewMode ); - if ( !isFloating() ) // problem with multitqparent inline frames + if ( !isFloating() ) // problem with multiparent inline frames reg &= p->xForm( viewFrameRect ); } @@ -3323,10 +3323,10 @@ void KWTextFrameSetEdit::startDrag() } } -TQDragObject * KWTextFrameSetEdit::newDrag( TQWidget * tqparent ) +TQDragObject * KWTextFrameSetEdit::newDrag( TQWidget * parent ) { KWTextFrameSet* fs = textFrameSet(); - return fs->kWordDocument()->dragSelected( tqparent, fs ); + return fs->kWordDocument()->dragSelected( parent, fs ); } void KWTextFrameSetEdit::ensureCursorVisible() diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index 58b7730e..ef83a3c8 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -498,7 +498,7 @@ protected: virtual bool textDecreaseIndent(); virtual void startDrag(); - TQDragObject * newDrag( TQWidget * tqparent ); + TQDragObject * newDrag( TQWidget * parent ); private slots: void slotFrameDeleted(KWFrame *); diff --git a/kword/KWTextImage.cpp b/kword/KWTextImage.cpp index 981ce1cb..44031573 100644 --- a/kword/KWTextImage.cpp +++ b/kword/KWTextImage.cpp @@ -53,7 +53,7 @@ void KWTextImage::resize() if ( m_deleted ) return; if ( !m_image.isNull() ) { - //KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument(); + //KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument(); width = m_image.getOriginalSize().width(); // width is a 100%-zoom pixel size. We want a LU pixel size -> we simply need 'to LU', i.e. ptToLayoutPt width = KoTextZoomHandler::ptToLayoutUnitPt( width ); @@ -98,7 +98,7 @@ void KWTextImage::drawCustomItem( TQPainter* p, int x, int y, int wpix, int hpix void KWTextImage::save( TQDomElement & parentElem ) { // This code is similar to KWPictureFrameSet::save - KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument(); + KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument(); TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" ); parentElem.appendChild( imageElem ); @@ -113,7 +113,7 @@ void KWTextImage::save( TQDomElement & parentElem ) void KWTextImage::load( TQDomElement & parentElem ) { // This code is similar to KWPictureFrameSet::load - KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument(); + KWDocument * doc = static_cast<KWTextDocument *>(parent)->textFrameSet()->kWordDocument(); // <IMAGE> (KOffice 1.0) or <PICTURE> (KWord 1.2) TQDomNode node=parentElem.namedItem( "PICTURE" ); diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp index 45fa37cd..5b82b220 100644 --- a/kword/KWVariable.cpp +++ b/kword/KWVariable.cpp @@ -70,10 +70,10 @@ void KWVariableSettings::saveNoteConfiguration( KoXmlWriter& writer ) const writer.endElement(); } -void KWVariableSettings::loadNoteConfiguration( const TQDomElement& tqparent ) +void KWVariableSettings::loadNoteConfiguration( const TQDomElement& parent ) { TQDomElement e; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { if ( e.localName() == "notes-configuration" && e.namespaceURI() == KoXmlNS::text ) { diff --git a/kword/KWVariable.h b/kword/KWVariable.h index e0445957..b61f24a6 100644 --- a/kword/KWVariable.h +++ b/kword/KWVariable.h @@ -47,7 +47,7 @@ class KWVariableSettings : public KoVariableSettings virtual void save( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); void saveNoteConfiguration( KoXmlWriter& writer ) const; - void loadNoteConfiguration( const TQDomElement& tqparent ); + void loadNoteConfiguration( const TQDomElement& parent ); void changeFootNoteCounter( KoParagCounter _c ); void changeEndNoteCounter( KoParagCounter _c ); KoParagCounter endNoteCounter() const { return m_endNoteCounter;} diff --git a/kword/KWView.cpp b/kword/KWView.cpp index f23e634a..fd31fff2 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -224,8 +224,8 @@ class TableInfo { /******************************************************************/ /* Class: KWView */ /******************************************************************/ -KWView::KWView( const TQString& viewMode, TQWidget *tqparent, const char *name, KWDocument* doc ) - : KoView( doc, tqparent, name ) +KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KWDocument* doc ) + : KoView( doc, parent, name ) { m_doc = doc; m_gui = 0; @@ -5414,7 +5414,7 @@ void KWView::guiActivateEvent( KParts::GUIActivateEvent *ev ) { initGui(); if (m_doc->isEmbedded() ) { - // Get zoom level from KoView, i.e. from the tqparent view + // Get zoom level from KoView, i.e. from the parent view const int zoom = tqRound( KoView::zoom() * 100 ); setZoom( zoom, true ); showZoom( zoom ); @@ -7508,7 +7508,7 @@ KWFrameViewManager* KWView::frameViewManager() const { void KWView::deleteSelectedFrames() { int nbCommand=0; - int docItem=0; // bittqmask for changed doc items. + int docItem=0; // bitmask for changed doc items. KMacroCommand * macroCmd = new KMacroCommand( i18n("Delete Frames") ); KWFrameViewManager *fvMgr = frameViewManager(); @@ -7568,8 +7568,8 @@ void KWView::deleteSelectedFrames() { /******************************************************************/ /* Class: KWViewWidget */ /******************************************************************/ -KWViewWidget::KWViewWidget( TQWidget *tqparent, KWView *view ) - : TQWidget( tqparent ), +KWViewWidget::KWViewWidget( TQWidget *parent, KWView *view ) + : TQWidget( parent ), m_view ( view ) { } @@ -7590,8 +7590,8 @@ void KWViewWidget::resizeEvent( TQResizeEvent *e ) /******************************************************************/ /* Class: KWGUI */ /******************************************************************/ -KWGUI::KWGUI( const TQString& viewMode, TQWidget *tqparent, KWView *daView ) - : TQHBox( tqparent, "" ), +KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) + : TQHBox( parent, "" ), m_view ( daView ) { diff --git a/kword/KWView.h b/kword/KWView.h index 58134978..f023e6c6 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -98,7 +98,7 @@ class KWView : public KoView TQ_OBJECT public: - KWView( const TQString& viewMode, TQWidget *tqparent, const char *name, KWDocument *doc ); + KWView( const TQString& viewMode, TQWidget *parent, const char *name, KWDocument *doc ); virtual ~KWView(); virtual DCOPObject* dcopObject(); @@ -822,7 +822,7 @@ class KWViewWidget : public TQWidget TQ_OBJECT public: - KWViewWidget( TQWidget *tqparent, KWView *view ); + KWViewWidget( TQWidget *parent, KWView *view ); protected: void resizeEvent( TQResizeEvent *e ); @@ -841,7 +841,7 @@ class KWGUI : public TQHBox TQ_OBJECT public: - KWGUI( const TQString& viewMode, TQWidget *tqparent, KWView *view ); + KWGUI( const TQString& viewMode, TQWidget *parent, KWView *view ); void showGUI(); diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index af23925e..1e6c20fe 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -46,8 +46,8 @@ * ******************************************************************/ -KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent) - : KWMailMergeDataSource(inst,tqparent) +KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent) + : KWMailMergeDataSource(inst,parent) // : doc( doc_ ) { } @@ -113,10 +113,10 @@ void KWClassicSerialDataSource::removeRecord( int i ) db.remove( it ); } -void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent) +void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); - tqparent.appendChild(def); + parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); @@ -124,7 +124,7 @@ void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent def.appendChild(defEnt); } TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); - tqparent.appendChild(cont); + parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); @@ -183,15 +183,15 @@ bool KWClassicSerialDataSource::showConfigDialog(TQWidget *par,int action) * ******************************************************************/ -KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent ) - : TQListViewItem( tqparent ) +KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent ) + : TQListViewItem( parent ) { editWidget = new TQLineEdit( listView()->viewport() ); listView()->addChild( editWidget ); } -KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after ) - : TQListViewItem( tqparent, after ) +KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after ) + : TQListViewItem( parent, after ) { editWidget = new TQLineEdit( listView()->viewport() ); listView()->addChild( editWidget ); @@ -238,8 +238,8 @@ void KWClassicMailMergeEditorListItem::update() * ******************************************************************/ -KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ ) - : TQListView( tqparent ), db( db_ ) +KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ ) + : TQListView( parent ), db( db_ ) { setSorting( -1 ); addColumn( i18n( "Name" ) ); @@ -329,8 +329,8 @@ void KWClassicMailMergeEditorList::displayRecord( int i ) * ******************************************************************/ -KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ ) - : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ) +KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ ) + : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ) { back = plainPage(); @@ -561,9 +561,9 @@ void KWClassicMailMergeEditor::removeRecord() } extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *tqparent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent) { - return new KWClassicSerialDataSource(inst,tqparent); + return new KWClassicSerialDataSource(inst,parent); } } diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h index 43416b07..03e1ddb3 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.h +++ b/kword/mailmerge/KWClassicSerialDataSource.h @@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource Q_OBJECT TQ_OBJECT public: - KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent); + KWClassicSerialDataSource(KInstance *inst,TQObject *parent); ~KWClassicSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); @@ -81,8 +81,8 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource class KWClassicMailMergeEditorListItem : public TQListViewItem { public: - KWClassicMailMergeEditorListItem( TQListView *tqparent ); - KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after ); + KWClassicMailMergeEditorListItem( TQListView *parent ); + KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after ); virtual ~KWClassicMailMergeEditorListItem(); virtual void setText( int i, const TQString &text ); @@ -107,7 +107,7 @@ class KWClassicMailMergeEditorList : public TQListView TQ_OBJECT public: - KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ ); + KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ ); virtual ~KWClassicMailMergeEditorList(); void invalidateCurrentRecord(); @@ -140,7 +140,7 @@ class KWClassicMailMergeEditor : public KDialogBase TQ_OBJECT public: - KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ ); + KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ ); protected: void resizeEvent( TQResizeEvent *e ); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 855611f5..411ee5e5 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -33,8 +33,8 @@ #include "KWMailMergeKABC.h" #include "KWMailMergeKABCConfig.h" -KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *tqparent ) - : KWMailMergeDataSource( inst, tqparent ) +KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent ) + : KWMailMergeDataSource( inst, parent ) { _addressBook = KABC::StdAddressBook::self(); _iterator = _addressBook->begin(); @@ -480,10 +480,10 @@ void KWMailMergeKABC::refresh( bool ) } -void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& tqparent) +void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent) { TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); - tqparent.appendChild(cont); + parent.appendChild(cont); TQValueList<TQString>::ConstIterator it = _individualUIDs.begin(); for( ; it != _individualUIDs.end(); ++it ) @@ -537,9 +537,9 @@ TQStringList KWMailMergeKABC::singleRecords() const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *tqparent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent ) { - return new KWMailMergeKABC( inst, tqparent ); + return new KWMailMergeKABC( inst, parent ); } } diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h index f2754117..0c40f47d 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.h +++ b/kword/mailmerge/kabc/KWMailMergeKABC.h @@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource TQ_OBJECT public: - KWMailMergeKABC( KInstance *inst, TQObject *tqparent ); + KWMailMergeKABC( KInstance *inst, TQObject *parent ); ~KWMailMergeKABC(); /** diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index 508eb74f..d1c03809 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -39,9 +39,9 @@ #include "KWMailMergeKABCConfig.h" -KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_) +KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_) :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), - Ok | Cancel, Ok, tqparent, "", true) + Ok | Cancel, Ok, parent, "", true) { _db = db_; @@ -119,7 +119,7 @@ void KWMailMergeKABCConfig::addSelectedContacts() destroyAvailableClones( uid ); } } - else if( it.current()->tqparent()->text(0) == i18n("Distribution Lists") ) + else if( it.current()->parent()->text(0) == i18n("Distribution Lists") ) { if( selectedLists ) { @@ -336,7 +336,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) } delete item; } - else if( item->tqparent()->text(0) == i18n("Distribution Lists") ) // remove a list + else if( item->parent()->text(0) == i18n("Distribution Lists") ) // remove a list { if( availableLists ) availableLists->insertItem( item ); @@ -509,15 +509,15 @@ void KWMailMergeKABCConfig::updateAvailable() -KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *tqparent, - const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent ) +KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *parent, + const KABC::Addressee& addressEntry ) : TQListViewItem( parent ) { setText( 0, addressEntry.formattedName() ); _addressEntry = addressEntry; } -KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *tqparent, - const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent ) +KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *parent, + const KABC::Addressee& addressEntry ) : TQListViewItem( parent ) { setText( 0, addressEntry.formattedName() ); _addressEntry = addressEntry; diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h index 32fe74cd..0d0240f1 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h @@ -36,7 +36,7 @@ class KWMailMergeKABCConfig: public KDialogBase Q_OBJECT TQ_OBJECT public: - KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_ ); + KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_ ); virtual ~KWMailMergeKABCConfig(); @@ -58,7 +58,7 @@ private slots: void launchAddressbook() const; /** - Updates the tqparent's mail merge list from items in the right Listview. + Updates the parent's mail merge list from items in the right Listview. */ void acceptSelection(); @@ -126,8 +126,8 @@ class KWMailMergeKABCConfigListItem : public TQListViewItem { public: - KWMailMergeKABCConfigListItem( TQListView *tqparent, const KABC::Addressee& addressEntry ); - KWMailMergeKABCConfigListItem( TQListViewItem *tqparent, const KABC::Addressee& addressEntry ); + KWMailMergeKABCConfigListItem( TQListView *parent, const KABC::Addressee& addressEntry ); + KWMailMergeKABCConfigListItem( TQListViewItem *parent, const KABC::Addressee& addressEntry ); virtual ~KWMailMergeKABCConfigListItem(); /** diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index e48fbf34..6801a64a 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -29,8 +29,8 @@ using namespace KSpread; -KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *tqparent ) - : KWMailMergeDataSource( instance, tqparent ), _spreadSheetNumber( 1 ) +KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent ) + : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 ) { } @@ -72,10 +72,10 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem ) initDocument(); } -void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& tqparent ) +void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent ) { TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) ); - tqparent.appendChild( content ); + parent.appendChild( content ); content.setAttribute( "URL", _url.url() ); content.setAttribute( "SpreadSheetNumber", _spreadSheetNumber ); @@ -85,9 +85,9 @@ void KWMailMergeKSpread::refresh( bool ) { } -bool KWMailMergeKSpread::showConfigDialog( TQWidget *tqparent, int ) +bool KWMailMergeKSpread::showConfigDialog( TQWidget *parent, int ) { - KWMailMergeKSpreadConfig dlg( tqparent, this ); + KWMailMergeKSpreadConfig dlg( parent, this ); int retval = dlg.exec(); if ( retval ) @@ -202,9 +202,9 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *tqparent ) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent ) { - return new KWMailMergeKSpread( instance, tqparent ); + return new KWMailMergeKSpread( instance, parent ); } } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h index 2b039c01..e5b1bb2f 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.h +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h @@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource TQ_OBJECT public: - KWMailMergeKSpread( KInstance *inst, TQObject *tqparent ); + KWMailMergeKSpread( KInstance *inst, TQObject *parent ); ~KWMailMergeKSpread(); /** diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index 00f1ba20..f08ae82e 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -34,9 +34,9 @@ using namespace KSpread; -KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object ) +KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object ) : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), - Ok | Cancel, Ok, tqparent, "", true ), + Ok | Cancel, Ok, parent, "", true ), _document( 0 ), _initialPage( 1 ) { _object = object; diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h index 31706e76..21d6206e 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h @@ -36,7 +36,7 @@ class KWMailMergeKSpreadConfig: public KDialogBase TQ_OBJECT public: - KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object ); + KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object ); virtual ~KWMailMergeKSpreadConfig(); diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index aec361a3..3db1d9d6 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -6,8 +6,8 @@ #include <tqlayout.h> #include <tqcheckbox.h> -KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent) - :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true) +KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) + :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true) { m_fieldList << "" <<"one" << "two" << "three" << "four"; m_sortingList << ""<<i18n("ascending")<<i18n("descending"); diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.h b/kword/mailmerge/sql/KWQtSqlEasyFilter.h index 1384dec7..f95f46b3 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.h +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.h @@ -12,7 +12,7 @@ class KWQtSqlEasyFilter: public KDialogBase Q_OBJECT TQ_OBJECT public: - KWQtSqlEasyFilter( TQWidget *tqparent); + KWQtSqlEasyFilter( TQWidget *parent); virtual ~KWQtSqlEasyFilter(); protected: void createColumn(int i); diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 2518399b..d3feca22 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -37,8 +37,8 @@ * ******************************************************************/ -KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ ) - :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ){ +KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ ) + :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ){ (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new KWQtSqlOpenWidget(plainPage())); widget->drivers->insertStringList(TQSqlDatabase::drivers()); diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h index 949dc2c6..39430517 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h @@ -39,7 +39,7 @@ class KWQtSqlMailMergeOpen : public KDialogBase TQ_OBJECT public: - KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ ); + KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ ); ~KWQtSqlMailMergeOpen(); private: KWQtSqlSerialDataSourceBase *db; diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index c091184e..bbaf97d6 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -41,8 +41,8 @@ * ******************************************************************/ -KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent) - : KWQtSqlSerialDataSourceBase(inst,tqparent),myquery(0) +KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent) + : KWQtSqlSerialDataSourceBase(inst,parent),myquery(0) { port=i18n("default"); } @@ -83,10 +83,10 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor return (myquery->value(name)).toString(); } -void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent) +void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); - tqparent.appendChild(def); + parent.appendChild(def); { TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE")); defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname); @@ -101,7 +101,7 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqpar def.appendChild(defEnt); TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD")); - tqparent.appendChild(sampleEnt); + parent.appendChild(sampleEnt); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); @@ -175,8 +175,8 @@ void KWQtSqlPowerSerialDataSource::addSampleRecordEntry(TQString name) * ******************************************************************/ -KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ ) - :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ) +KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ ) + :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ) { (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new KWQtSqlPowerWidget(plainPage())); @@ -249,8 +249,8 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;} extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *tqparent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent) { - return new KWQtSqlPowerSerialDataSource(inst,tqparent); + return new KWQtSqlPowerSerialDataSource(inst,parent); } } diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h index 6870afe1..3d364338 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h @@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase Q_OBJECT // TQ_OBJECT public: - KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent); + KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent); ~KWQtSqlPowerSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); @@ -81,7 +81,7 @@ class KWQtSqlPowerMailMergeEditor : public KDialogBase // TQ_OBJECT public: - KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ ); + KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ ); ~KWQtSqlPowerMailMergeEditor(); private: KWQtSqlPowerSerialDataSource *db; diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 45ff85bc..ec31df35 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -38,8 +38,8 @@ * ******************************************************************/ -KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent) - : KWQtSqlSerialDataSourceBase(inst,tqparent) +KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent) + : KWQtSqlSerialDataSourceBase(inst,parent) { myquery=0; } @@ -63,11 +63,11 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c return (myquery->value(name)).toString(); } -void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tqparent*/) +void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/) { /* TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); - tqparent.appendChild(def); + parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); @@ -75,7 +75,7 @@ void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tq def.appendChild(defEnt); } TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); - tqparent.appendChild(cont); + parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); @@ -162,8 +162,8 @@ void KWQtSqlSerialDataSource::refresh(bool force) -KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ ) - :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ) +KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ ) + :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ) { tableName=db->tableName; filter=db->filter; @@ -206,13 +206,13 @@ void KWQtSqlDataSourceEditor::slotSetQuery() void KWQtSqlDataSourceEditor::editFilter() { - KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent())); + KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(parent())); f->exec(); } extern "C" { - KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *tqparent) + KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent) { - return new KWQtSqlSerialDataSource(inst,tqparent); + return new KWQtSqlSerialDataSource(inst,parent); } } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h index cc6061a9..ed25b4ee 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h @@ -36,7 +36,7 @@ class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase { public: - KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent); + KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent); ~KWQtSqlSerialDataSource(); virtual void save( TQDomDocument &doc,TQDomElement&); @@ -67,7 +67,7 @@ class KWQtSqlDataSourceEditor : public KDialogBase TQ_OBJECT public: - KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ ); + KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ ); ~KWQtSqlDataSourceEditor(){;} private: KWQtSqlSerialDataSource *db; diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index 040c657e..f31a431a 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -46,10 +46,10 @@ int KWQtSqlSerialDataSourceBase::connectionId=0; -KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent) - : KWMailMergeDataSource(inst,tqparent) +KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent) + : KWMailMergeDataSource(inst,parent) { - DataBaseConnection=TQString("KWTQTSQLPOWER")+tqparent->name()+TQString("--%1").tqarg(connectionId++); + DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++); port=i18n("default"); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h index ee4e02a8..1f3e4396 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h @@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource // TQ_OBJECT K_DCOP public: - KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent); + KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent); ~KWQtSqlSerialDataSourceBase(); virtual bool showConfigDialog(TQWidget *par,int action); |