diff options
Diffstat (limited to 'lib/kotext')
67 files changed, 265 insertions, 265 deletions
diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index 0c1b3575..c93807a3 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -15,11 +15,11 @@ #include <KoVariable.h> /* - * Constructs a DateFormatWidget which is a child of 'tqparent', with the + * Constructs a DateFormatWidget which is a child of 'parent', with the * name 'name' and widget flags set to 'fl' */ -DateFormatWidget::DateFormatWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TimeDateFormatWidgetPrototype( tqparent, name, fl ) +DateFormatWidget::DateFormatWidget( TQWidget* parent, const char* name, WFlags fl ) + : TimeDateFormatWidgetPrototype( parent, name, fl ) { setCaption( i18n( "DateFormat", "Format of Date Variable" ) ); TQStringList listDateFormat = KoVariableDateFormat::staticTranslatedFormatPropsList(); diff --git a/lib/kotext/DateFormatWidget.h b/lib/kotext/DateFormatWidget.h index 5f006d36..df028180 100644 --- a/lib/kotext/DateFormatWidget.h +++ b/lib/kotext/DateFormatWidget.h @@ -8,7 +8,7 @@ class DateFormatWidget : public TimeDateFormatWidgetPrototype TQ_OBJECT public: - DateFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + DateFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DateFormatWidget(); TQString resultString(); int correctValue(); diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 6dbb498f..beaeb9f9 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -92,11 +92,11 @@ public: TQPalette m_palette; }; -KFontChooser_local::KFontChooser_local(TQWidget *tqparent, const char *name, +KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, bool makeFrame, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) - : TQWidget(tqparent, name), usingFixed(onlyFixed) + : TQWidget(parent, name), usingFixed(onlyFixed) { charsetsCombo = 0; @@ -743,11 +743,11 @@ void KFontChooser_local::showXLFDArea(bool show) /////////////////////////////////////////////////////////////////////////////// -KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name, +KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name, bool onlyFixed, bool modal, const TQStringList &fontList, bool makeFrame, bool diff, TQButton::ToggleState *sizeIsRelativeState ) - : KDialogBase( tqparent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) + : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) { chooser = new KFontChooser_local( this, "fontChooser", onlyFixed, fontList, makeFrame, 8, @@ -757,10 +757,10 @@ KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name, int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, - TQWidget *tqparent, bool makeFrame, + TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(), + KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, true, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -776,10 +776,10 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi } int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, - TQWidget *tqparent, bool makeFrame, + TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(), + KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -795,11 +795,11 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, - bool onlyFixed, TQWidget *tqparent, + bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font and Text Selector", onlyFixed, true, + KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index bb69cf57..921946af 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -89,7 +89,7 @@ public: * <p> * The above creates a font chooser dialog with only SmoothScaleble fonts. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The widget name. * @param onlyFixed Only display fonts which have fixed-width * character sizes. @@ -109,7 +109,7 @@ public: * *sizeIsRelativeState, user choice may be retrieved by * calling sizeIsRelative(). */ - KFontChooser_local(TQWidget *tqparent = 0L, const char *name = 0L, + KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), bool makeFrame = true, int visibleListSize=8, @@ -143,7 +143,7 @@ public: void setFont( const TQFont &font, bool onlyFixed = false ); /** - * @return The bittqmask corresponding to the attributes the user + * @return The bitmask corresponding to the attributes the user * wishes to change. */ int fontDiffFlags(); @@ -356,7 +356,7 @@ public: /** * Constructs a font selection dialog. * - * @param tqparent The tqparent widget of the dialog, if any. + * @param parent The parent widget of the dialog, if any. * @param name The name of the dialog. * @param modal Specifies whether the dialog is modal or not. * @param onlyFixed only display fonts which have fixed-width @@ -375,7 +375,7 @@ public: * calling sizeIsRelative(). * */ - KFontDialog_local( TQWidget *tqparent = 0L, const char *name = 0, + KFontDialog_local( TQWidget *parent = 0L, const char *name = 0, bool onlyFixed = false, bool modal = false, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, @@ -419,7 +419,7 @@ public: * @param theFont a reference to the font to write the chosen font * into. * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -432,7 +432,7 @@ public: * @return TQDialog::result(). */ static int getFont( TQFont &theFont, bool onlyFixed = false, - TQWidget *tqparent = 0L, bool makeFrame = true, + TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); /** @@ -444,8 +444,8 @@ public: * @param theFont a reference to the font to write the chosen font * into. * @param diffFlags a reference to the int into which the chosen - * difference selection bittqmask should be written. - * Check the returned bittqmask like: + * difference selection bitmask should be written. + * Check the returned bitmask like: * \code * if ( diffFlags & KFontChooser_local::FontDiffFamily ) * [...] @@ -455,7 +455,7 @@ public: * [...] * \endcode * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -468,7 +468,7 @@ public: * @returns TQDialog::result(). */ static int getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed = false, - TQWidget *tqparent = 0L, bool makeFrame = true, + TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); /** @@ -479,7 +479,7 @@ public: * into. * @param theString a reference to the example text that was typed. * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -491,7 +491,7 @@ public: * @return The result of the dialog. */ static int getFontAndText( TQFont &theFont, TQString &theString, - bool onlyFixed = false, TQWidget *tqparent = 0L, + bool onlyFixed = false, TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index dfe6c6df..c45c0481 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -48,8 +48,8 @@ #include <tqregexp.h> -KoCompletionBox::KoCompletionBox( TQWidget * tqparent, const char * name, WFlags f) - : TQLabel(tqparent,name,f) +KoCompletionBox::KoCompletionBox( TQWidget * parent, const char * name, WFlags f) + : TQLabel(parent,name,f) { setBackgroundColor(TQColor("#FFFFE6")); setFocusPolicy(TQ_NoFocus); diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h index 8f4199a2..2f61cb18 100644 --- a/lib/kotext/KoAutoFormat.h +++ b/lib/kotext/KoAutoFormat.h @@ -51,7 +51,7 @@ class KoCompletionBox : public TQLabel Q_OBJECT TQ_OBJECT public: - KoCompletionBox( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KoCompletionBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); ~KoCompletionBox(); TQString& lastWord(); void setLastWord(TQString const &); diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 90b1a97d..e6dce371 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -37,8 +37,8 @@ #include <tqdir.h> #include <tqapplication.h> -KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name ) - : TQLineEdit(tqparent,name) +KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * parent, const char * name ) + : TQLineEdit(parent,name) { } @@ -58,8 +58,8 @@ void KoAutoFormatLineEdit::keyPressEvent ( TQKeyEvent *ke ) /* Class: KoAutoFormatExceptionWidget */ /******************************************************************/ -KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *tqparent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation) - :TQWidget( tqparent ) +KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation) + :TQWidget( parent ) { m_bAbbreviation=_abreviation; m_listException=_list; @@ -166,10 +166,10 @@ void KoAutoFormatExceptionWidget::slotExceptionListSelected() /* Class: KoAutoFormatDia */ /******************************************************************/ -KoAutoFormatDia::KoAutoFormatDia( TQWidget *tqparent, const char *name, +KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) : KDialogBase( Tabbed, i18n("Autocorrection"), Ok | Cancel | User1, Ok, - tqparent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )), + parent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )), oSimpleBegin( autoFormat->getConfigTypographicSimpleQuotes().begin ), oSimpleEnd( autoFormat->getConfigTypographicSimpleQuotes().end ), oDoubleBegin( autoFormat->getConfigTypographicDoubleQuotes().begin ), diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 3e8020e7..14084af5 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -37,7 +37,7 @@ class KoAutoFormatLineEdit : public TQLineEdit Q_OBJECT TQ_OBJECT public: - KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name=0 ); + KoAutoFormatLineEdit ( TQWidget * parent, const char * name=0 ); protected: virtual void keyPressEvent ( TQKeyEvent * ); @@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoAutoFormatDia : public KDialogBase TQ_OBJECT public: - KoAutoFormatDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ); + KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ); ~KoAutoFormatDia(); void addEntryList(const TQString &key, KoAutoFormatEntry *_autoEntry); void editEntryList(const TQString &key,const TQString &newFindString, KoAutoFormatEntry *_autoEntry); diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index ae2f3668..13ca9457 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -59,9 +59,9 @@ public: static const int delayAfterMarked = 10; -KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *tqparent, +KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *parent, const char *name ) - : TQObject( tqparent, name ) + : TQObject( parent, name ) { #ifdef DEBUG_BGSPELLCHECKING kdDebug(32500) << "KoBgSpellCheck::KoBgSpellCheck " << this << endl; diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h index 08f47272..9d96d84b 100644 --- a/lib/kotext/KoBgSpellCheck.h +++ b/lib/kotext/KoBgSpellCheck.h @@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoBgSpellCheck : public TQObject Q_OBJECT TQ_OBJECT public: - KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0, + KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); virtual ~KoBgSpellCheck(); diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index 1d2409b3..8f7c2515 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -27,8 +27,8 @@ #include "KoChangeCaseDia.h" -KoChangeCaseDia::KoChangeCaseDia( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Change Case") ); diff --git a/lib/kotext/KoChangeCaseDia.h b/lib/kotext/KoChangeCaseDia.h index 52b85e72..ace24d5a 100644 --- a/lib/kotext/KoChangeCaseDia.h +++ b/lib/kotext/KoChangeCaseDia.h @@ -31,7 +31,7 @@ class KOTEXT_EXPORT KoChangeCaseDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoChangeCaseDia( TQWidget *tqparent, const char *name ); + KoChangeCaseDia( TQWidget *parent, const char *name ); enum TypeOfCase { UpperCase =0, LowerCase=1, TitleCase=2, ToggleCase=3, SentenceCase=4}; TypeOfCase getTypeOfCase(); diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index 1e264012..a6c8b2bb 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <kdebug.h> -KoCommentDia::KoCommentDia( TQWidget *tqparent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoCommentDia::KoCommentDia( TQWidget *parent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Edit Comment") ); authorName = _authorName; diff --git a/lib/kotext/KoCommentDia.h b/lib/kotext/KoCommentDia.h index a925e802..3f9465d6 100644 --- a/lib/kotext/KoCommentDia.h +++ b/lib/kotext/KoCommentDia.h @@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCommentDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoCommentDia( TQWidget *tqparent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L ); + KoCommentDia( TQWidget *parent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L ); TQString commentText(); private slots: diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 6289675d..66d8d374 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -34,8 +34,8 @@ #include <tqgroupbox.h> #include <tqwhatsthis.h> -KoCompletionDia::KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ) - : KDialogBase( tqparent, name , true, i18n( "Completion" ), Ok|Cancel|User1, +KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) + : KDialogBase( parent, name , true, i18n( "Completion" ), Ok|Cancel|User1, Ok, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) { TQVBox *page = makeVBoxMainWidget(); @@ -53,7 +53,7 @@ void KoCompletionDia::slotOk() KDialogBase::slotOk(); } -KoCompletion::KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat) : KoCompletionBase(tqparent), +KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompletionBase(parent), m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h index c29135aa..1aefb39a 100644 --- a/lib/kotext/KoCompletionDia.h +++ b/lib/kotext/KoCompletionDia.h @@ -31,7 +31,7 @@ class KoCompletion : public KoCompletionBase { TQ_OBJECT public: - KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat ); + KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat ); void saveSettings(); protected slots: @@ -56,7 +56,7 @@ class KOTEXT_EXPORT KoCompletionDia : public KDialogBase { TQ_OBJECT public: - KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ); + KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ); protected slots: virtual void slotOk(); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 4239bf47..54599d07 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -55,14 +55,14 @@ KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bo { if ( p ) p->ref(); - tqparent = p; + parent = p; count = 0; } KoBidiContext::~KoBidiContext() { - if( tqparent && tqparent->deref() ) - delete tqparent; + if( parent && parent->deref() ) + delete parent; } static TQChar *tqshapeBuffer = 0; @@ -924,8 +924,8 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co TQChar::Direction dirCurrent; if(current == (int)text.length()) { KoBidiContext *c = context; - while ( c->tqparent ) - c = c->tqparent; + while ( c->parent ) + c = c->parent; dirCurrent = c->dir; } else if ( current == last ) { dirCurrent = ( basicDir != TQChar::DirON ? basicDir : basicDirection( text, current ) ); @@ -1008,7 +1008,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co } case TQChar::DirPDF: { - KoBidiContext *c = context->tqparent; + KoBidiContext *c = context->parent; if(c) { runs->append( new KoTextRun(sor, eor, context, dir) ); ++eor; sor = eor; dir = TQChar::DirON; status.eor = TQChar::DirON; diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index f4f4253f..72abfbed 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -74,15 +74,15 @@ struct TQ_EXPORT KoBiditqStatus { }; struct TQ_EXPORT KoBidiContext : public TQShared { - // ### ref and deref tqparent? - KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *tqparent = 0, bool override = FALSE ); + // ### ref and deref parent? + KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *parent = 0, bool override = FALSE ); ~KoBidiContext(); unsigned char level; bool override : 1; TQChar::Direction dir : 5; - KoBidiContext *tqparent; + KoBidiContext *parent; }; struct TQ_EXPORT KoBidiControl { diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index 648dc252..e4b9f339 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -25,8 +25,8 @@ #include "KoCreateStyleDia.h" #include <kmessagebox.h> -KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { styleList=_list; setCaption( i18n("Create New Style") ); diff --git a/lib/kotext/KoCreateStyleDia.h b/lib/kotext/KoCreateStyleDia.h index b4c6a5c5..ea94e9fa 100644 --- a/lib/kotext/KoCreateStyleDia.h +++ b/lib/kotext/KoCreateStyleDia.h @@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCreateStyleDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name ); + KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ); TQString nameOfNewStyle()const; protected slots: diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index fd28bfe6..aa74d133 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -37,15 +37,15 @@ * ******************************************************************/ -KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent ) - : KDialogBase( tqparent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel ) +KoVariableNameDia::KoVariableNameDia( TQWidget *parent ) + : KDialogBase( parent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel ) { init(); } -KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable>& vars ) - : KDialogBase( tqparent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel ) +KoVariableNameDia::KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable>& vars ) + : KDialogBase( parent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel ) { init(); @@ -97,8 +97,8 @@ void KoVariableNameDia::textChanged ( const TQString &_text ) * ******************************************************************/ -KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *tqparent ) - : TQListViewItem( tqparent ) +KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *parent ) + : TQListViewItem( parent ) { editWidget = new KLineEdit( listView()->viewport() ); listView()->addChild( editWidget ); @@ -158,8 +158,8 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView * ******************************************************************/ -KoCustomVariablesList::KoCustomVariablesList( TQWidget *tqparent ) - : KListView( tqparent ) +KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) + : KListView( parent ) { header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); @@ -204,8 +204,8 @@ void KoCustomVariablesList::updateItems() * ******************************************************************/ -KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables ) - : KDialogBase( tqparent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel ) +KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables ) + : KDialogBase( parent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel ) { back = makeVBoxMainWidget(); @@ -248,8 +248,8 @@ void KoCustomVariablesDia::slotOk() * ******************************************************************/ -KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel ) +KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) + : KDialogBase( parent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel ) { init(); m_name->setFocus(); @@ -268,8 +268,8 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent ) } // edit existing variable -KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var ) - : KDialogBase( tqparent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel ) +KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ) + : KDialogBase( parent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel ) { m_var = var; init(); diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index b5883ddb..e2116045 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -46,9 +46,9 @@ class KoVariableNameDia : public KDialogBase public: // For KWMailMergeVariableInsertDia - KoVariableNameDia( TQWidget *tqparent ); + KoVariableNameDia( TQWidget *parent ); // For kwview - KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable> &vars ); + KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable> &vars ); TQString getName() const; protected slots: @@ -68,7 +68,7 @@ protected: class KoCustomVariablesListItem : public TQListViewItem { public: - KoCustomVariablesListItem( TQListView *tqparent ); + KoCustomVariablesListItem( TQListView *parent ); void setVariable( KoCustomVariable *v ); KoCustomVariable *getVariable() const; @@ -96,7 +96,7 @@ class KoCustomVariablesList : public KListView TQ_OBJECT public: - KoCustomVariablesList( TQWidget *tqparent ); + KoCustomVariablesList( TQWidget *parent ); void setValues(); void updateItems(); @@ -120,7 +120,7 @@ class KOTEXT_EXPORT KoCustomVariablesDia : public KDialogBase TQ_OBJECT public: - KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables ); + KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables ); protected slots: void slotOk(); @@ -144,11 +144,11 @@ public: /** * Add new variable */ - KoCustomVarDialog( TQWidget *tqparent ); + KoCustomVarDialog( TQWidget *parent ); /** * Edit existing variable @p var */ - KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var ); + KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ); virtual TQString name(); virtual TQString value(); diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 8fb82755..73e0789e 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -29,8 +29,8 @@ #include "KoDecorationTab.moc" -KoDecorationTab::KoDecorationTab( TQWidget* tqparent, const char* name, WFlags fl ) - : KoDecorationTabBase( tqparent, name, fl ) +KoDecorationTab::KoDecorationTab( TQWidget* parent, const char* name, WFlags fl ) + : KoDecorationTabBase( parent, name, fl ) { shadowDistanceKDoubleNumInput->setRange(0, 9, 0.5, false); diff --git a/lib/kotext/KoDecorationTab.h b/lib/kotext/KoDecorationTab.h index be5222fc..6b396a88 100644 --- a/lib/kotext/KoDecorationTab.h +++ b/lib/kotext/KoDecorationTab.h @@ -30,7 +30,7 @@ class KoDecorationTab : public KoDecorationTabBase TQ_OBJECT public: - KoDecorationTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoDecorationTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoDecorationTab(); TQColor getTextColor() const; diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 93f3a21e..258ea98d 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -45,8 +45,8 @@ #include <kiconloader.h> KoFontDia::KoFontDia( const KoTextFormat& initialFormat, - KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, + KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Select Font"), Ok|Cancel|User1|Apply, Ok ), m_initialFormat(initialFormat), m_changedFlags(KoTextFormat::NoFlags) diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index ebd4a93f..7f739d19 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -49,7 +49,7 @@ public: /// so that the font dialog can show which languages are supported for spellchecking. KoFontDia( const KoTextFormat& initialFormat, KSpell2::Broker::Ptr broker = 0, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); int changedFlags() const { return m_changedFlags; } diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index 04d56e4c..f61306b0 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -35,8 +35,8 @@ #include "KoFontDiaPreview.moc" -KoFontDiaPreview::KoFontDiaPreview( TQWidget* tqparent, const char* name , WFlags fl ) - : TQFrame( tqparent, name, fl ) +KoFontDiaPreview::KoFontDiaPreview( TQWidget* parent, const char* name , WFlags fl ) + : TQFrame( parent, name, fl ) ,m_text( i18n( "The quick brown dog jumps over the lazy cat." ) ) ,displayText( i18n( "The quick brown dog jumps over the lazy cat." ) ) ,m_font( KoGlobal::defaultFont() ) diff --git a/lib/kotext/KoFontDiaPreview.h b/lib/kotext/KoFontDiaPreview.h index 5cba0fbc..48bd459e 100644 --- a/lib/kotext/KoFontDiaPreview.h +++ b/lib/kotext/KoFontDiaPreview.h @@ -37,7 +37,7 @@ public: /** * Constructor */ - KoFontDiaPreview( TQWidget* tqparent =0, const char* name = 0, WFlags fl = 0 ); + KoFontDiaPreview( TQWidget* parent =0, const char* name = 0, WFlags fl = 0 ); ~KoFontDiaPreview(); void setText( const TQString &text ); diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index fe8f1621..da0b524e 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -19,8 +19,8 @@ #include "KoFontTab.h" -KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* tqparent, const char* name, WFlags fl ) - : KoFontTabBase( tqparent, name, fl ) +KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, WFlags fl ) + : KoFontTabBase( parent, name, fl ) { TQStringList list; KFontChooser_local::getFontList(list, fontListCriteria); diff --git a/lib/kotext/KoFontTab.h b/lib/kotext/KoFontTab.h index 5cb1d3bb..5333e46a 100644 --- a/lib/kotext/KoFontTab.h +++ b/lib/kotext/KoFontTab.h @@ -29,7 +29,7 @@ class KoFontTab : public KoFontTabBase TQ_OBJECT public: - KoFontTab( uint fontListCriteria=0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoFontTab( uint fontListCriteria=0, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoFontTab(); TQFont getSelection(); diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index b2f829d1..ab7b0577 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -31,8 +31,8 @@ #include "KoHighlightingTab.moc" -KoHighlightingTab::KoHighlightingTab( TQWidget* tqparent, const char* name, WFlags fl ) - : KoHighlightingTabBase( tqparent, name, fl ) +KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags fl ) + : KoHighlightingTabBase( parent, name, fl ) { underlineStyleKComboBox->insertStringList( KoTextFormat::underlineTypeList() ); underlineLineStyleKComboBox->insertStringList( KoTextFormat::underlineStyleList() ); diff --git a/lib/kotext/KoHighlightingTab.h b/lib/kotext/KoHighlightingTab.h index b60b6582..d8ebc1d7 100644 --- a/lib/kotext/KoHighlightingTab.h +++ b/lib/kotext/KoHighlightingTab.h @@ -31,7 +31,7 @@ class KoHighlightingTab : public KoHighlightingTabBase TQ_OBJECT public: - KoHighlightingTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoHighlightingTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoHighlightingTab(); KoTextFormat::UnderlineType getUnderline() const; diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 99ff15b4..327dbe53 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -28,8 +28,8 @@ #include <kdebug.h> #include <tqlabel.h> -KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel|User1, Ok, true ) +KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel|User1, Ok, true ) { setCaption( i18n("Import Styles") ); m_currentCollection = currentCollection; diff --git a/lib/kotext/KoImportStyleDia.h b/lib/kotext/KoImportStyleDia.h index eaf24f5c..ea2ccf91 100644 --- a/lib/kotext/KoImportStyleDia.h +++ b/lib/kotext/KoImportStyleDia.h @@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoImportStyleDia : public KDialogBase public: /// @param currentCollection collection of styles already present in the document /// (this is used to avoid conflicts in the style names and displayNames) - KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name ); + KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name ); ~KoImportStyleDia(); const KoStyleCollection& importedStyles() const { return m_styleList; } diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp index 2ec9fede..cf7b261b 100644 --- a/lib/kotext/KoLanguageTab.cpp +++ b/lib/kotext/KoLanguageTab.cpp @@ -28,8 +28,8 @@ #include "KoLanguageTab.moc" -KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name, WFlags fl ) - : KoLanguageTabBase( tqparent, name, fl ) +KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name, WFlags fl ) + : KoLanguageTabBase( parent, name, fl ) { const TQStringList langNames = KoGlobal::listOfLanguages(); const TQStringList langTags = KoGlobal::listTagOfLanguages(); diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h index f33c85e6..76e4ddef 100644 --- a/lib/kotext/KoLanguageTab.h +++ b/lib/kotext/KoLanguageTab.h @@ -30,7 +30,7 @@ class KoLanguageTab : public KoLanguageTabBase TQ_OBJECT public: - KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoLanguageTab(); TQString getLanguage() const; diff --git a/lib/kotext/KoLayoutTab.cpp b/lib/kotext/KoLayoutTab.cpp index 2ec9da69..9a2d4e18 100644 --- a/lib/kotext/KoLayoutTab.cpp +++ b/lib/kotext/KoLayoutTab.cpp @@ -28,8 +28,8 @@ #include "KoLayoutTab.moc" -KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent, const char* name, WFlags fl ) - : KoLayoutTabBase( tqparent, name, fl ) +KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* parent, const char* name, WFlags fl ) + : KoLayoutTabBase( parent, name, fl ) { if ( !withSubSuperScript ) positionButtonGroup->hide(); diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h index 611e3afa..6b629eef 100644 --- a/lib/kotext/KoLayoutTab.h +++ b/lib/kotext/KoLayoutTab.h @@ -29,7 +29,7 @@ class KoLayoutTab : public KoLayoutTabBase TQ_OBJECT public: - KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoLayoutTab( bool withSubSuperScript, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoLayoutTab(); KoTextFormat::VerticalAlignment getSubSuperScript() const; diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index b5058f1b..6126d6c5 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -88,7 +88,7 @@ void KoParagCounter::tqinvalidate() m_cache.number = -1; m_cache.text = TQString(); m_cache.width = -1; - m_cache.tqparent = INVALID_PARAG; + m_cache.parent = INVALID_PARAG; m_cache.counterFormat = 0; } @@ -345,7 +345,7 @@ int KoParagCounter::number( const KoTextParag *paragraph ) } // Go looking for another paragraph at the same level or higher level. - // (This code shares logic with tqparent()) + // (This code shares logic with parent()) KoTextParag *otherParagraph = paragraph->prev(); KoParagCounter *otherCounter; @@ -434,11 +434,11 @@ KoParagCounter::Numbering KoParagCounter::numbering() const } // Go looking for another paragraph at a higher level. -KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph ) +KoTextParag *KoParagCounter::parent( const KoTextParag *paragraph ) { // Return cached value if possible. - if ( m_cache.tqparent != INVALID_PARAG ) - return m_cache.tqparent; + if ( m_cache.parent != INVALID_PARAG ) + return m_cache.parent; KoTextParag *otherParagraph = paragraph->prev(); KoParagCounter *otherCounter; @@ -489,8 +489,8 @@ KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph ) } break; } - m_cache.tqparent = otherParagraph; - return m_cache.tqparent; + m_cache.parent = otherParagraph; + return m_cache.parent; } TQString KoParagCounter::prefix() const @@ -714,7 +714,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) // If necessary, grab the text of the preceding levels. if ( m_displayLevels > 1 && m_numbering != NUM_NONE ) { - KoTextParag* p = tqparent( paragraph ); + KoTextParag* p = parent( paragraph ); int displayLevels = TQMIN( m_displayLevels, m_depth+1 ); // can't be >depth+1 for ( int level = 1 ; level < displayLevels ; ++level ) { //kdDebug() << "additional level=" << level << "/" << displayLevels-1 << endl; @@ -740,7 +740,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) m_cache.text.prepend( str ); // Prepare next iteration if ( level < displayLevels ) // no need to calc it if we won't use it - p = counter->tqparent( p ); + p = counter->parent( p ); } else // toplevel parents are missing { diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h index 4f32df58..dbedb3e8 100644 --- a/lib/kotext/KoParagCounter.h +++ b/lib/kotext/KoParagCounter.h @@ -197,10 +197,10 @@ public: private: - /** Return our tqparent paragraph, if there is such a thing. For a paragraph "1.1.", - * the tqparent is the paragraph numbered "1.". + /** Return our parent paragraph, if there is such a thing. For a paragraph "1.1.", + * the parent is the paragraph numbered "1.". */ - KoTextParag *tqparent( const KoTextParag *paragraph ); + KoTextParag *parent( const KoTextParag *paragraph ); Numbering m_numbering:3; // Numbering (maximum value: 8) bool m_restartCounter:1; @@ -227,7 +227,7 @@ private: * number of this counter -1 * text of this counter TQString() * width of the label -1 - * tqparent (KoTextParag *)-1 + * parent (KoTextParag *)-1 * the format that was used to calculate the width 0 */ struct @@ -235,7 +235,7 @@ private: int number; TQString text; int width; - KoTextParag *tqparent; + KoTextParag *parent; KoTextFormat * counterFormat; } m_cache; }; diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 3ee02617..4f687956 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -54,8 +54,8 @@ #include <tqapplication.h> #include <tqwidgetstack.h> -KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * tqparent, const char* name ) - :TQWidget( tqparent, name ), +KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * parent, const char* name ) + :TQWidget( parent, name ), stylesList() { noSignals = true; @@ -405,8 +405,8 @@ void KoCounterStyleWidget::numStyleChanged() { -KoSpinBox::KoSpinBox( TQWidget * tqparent, const char * name ) - : TQSpinBox(tqparent,name) +KoSpinBox::KoSpinBox( TQWidget * parent, const char * name ) + : TQSpinBox(parent,name) { m_Etype=NONE; //max value supported by roman number @@ -417,9 +417,9 @@ KoSpinBox::~KoSpinBox( ) } KoSpinBox::KoSpinBox( int minValue, int maxValue, int step , - TQWidget * tqparent , const char * name ) + TQWidget * parent , const char * name ) : TQSpinBox(minValue, maxValue,step , - tqparent , name) + parent , name) { m_Etype=NONE; } @@ -497,8 +497,8 @@ int KoSpinBox::mapTextToValue( bool * ok ) /* class KPagePreview */ /******************************************************************/ -KPagePreview::KPagePreview( TQWidget* tqparent, const char* name ) - : TQGroupBox( i18n( "Preview" ), tqparent, name ) +KPagePreview::KPagePreview( TQWidget* parent, const char* name ) + : TQGroupBox( i18n( "Preview" ), parent, name ) { left = 0; right = 0; @@ -571,8 +571,8 @@ int KPagePreview::convert(double input) { /* class KPagePreview2 */ /******************************************************************/ -KPagePreview2::KPagePreview2( TQWidget* tqparent, const char* name ) - : TQGroupBox( i18n( "Preview" ), tqparent, name ) +KPagePreview2::KPagePreview2( TQWidget* parent, const char* name ) + : TQGroupBox( i18n( "Preview" ), parent, name ) { align = TQt::AlignLeft; } @@ -650,8 +650,8 @@ void KPagePreview2::drawContents( TQPainter* p ) /******************************************************************/ -KoBorderPreview::KoBorderPreview( TQWidget* tqparent, const char* name ) - :TQFrame(tqparent,name) +KoBorderPreview::KoBorderPreview( TQWidget* parent, const char* name ) + :TQFrame(parent,name) { } @@ -776,8 +776,8 @@ TQPen KoBorderPreview::setBorderPen( KoBorder _brd ) /******************************************************************/ class MyFlow : public KoTextFlow { public: - MyFlow(TQWidget *tqparent, KoTextZoomHandler *zoom) { - m_parent = tqparent; + MyFlow(TQWidget *parent, KoTextZoomHandler *zoom) { + m_parent = parent; m_zoomHandler = zoom; } int availableHeight() const { @@ -788,8 +788,8 @@ class MyFlow : public KoTextFlow { KoTextZoomHandler *m_zoomHandler; }; -KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* tqparent, const char* name ) - : TQGroupBox( title, tqparent, name ) +KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* parent, const char* name ) + : TQGroupBox( title, parent, name ) { setMinimumHeight(80); m_zoomHandler = new KoTextZoomHandler; @@ -860,8 +860,8 @@ void KoStylePreview::drawContents( TQPainter *painter ) painter->restore(); } -KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth,TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_SPACING, tqparent, name ), m_unit( unit ) +KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth,TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_SPACING, parent, name ), m_unit( unit ) { TQString unitName = KoUnit::unitName( m_unit ); TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -1205,8 +1205,8 @@ void KoIndentSpacingWidget::afterChanged( double _val ) } -KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_ALIGN, tqparent, name ) +KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_ALIGN, parent, name ) { TQGridLayout *grid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -1359,9 +1359,9 @@ void KoParagAlignWidget::clearAligns() //////////////////////////////////////////////////////////////////////////////// -KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * tqparent, +KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * parent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_DECORATION, tqparent, name ) + : KoParagLayoutWidget( KoParagDia::PD_DECORATION, parent, name ) { TQVBoxLayout *tabLayout = new TQVBoxLayout( this ); wDeco = new KoParagDecorationTab( this ); @@ -1594,8 +1594,8 @@ void KoParagDecorationWidget::brdJoinToggled( bool _on ) { //////////////////////////////////////////////////////////////////////////////// -KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, tqparent, name ) +KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, parent, name ) { TQVBoxLayout *Form1Layout = new TQVBoxLayout( this ); @@ -1720,8 +1720,8 @@ void KoParagCounterWidget::save( KoParagLayout & lay ) { lay.counter = new KoParagCounter( m_counter ); } -KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ ) - : KoUnitDoubleSpinBox ( tqparent, lower, upper, step, value, unit, precision, name ) +KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ ) + : KoUnitDoubleSpinBox ( parent, lower, upper, step, value, unit, precision, name ) { setRange( 0, 9999, 1, false); } @@ -1737,8 +1737,8 @@ void KoTabulatorsLineEdit::keyPressEvent ( TQKeyEvent *ke ) KoUnitDoubleSpinBox::keyPressEvent (ke); } -KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_TABS, tqparent, name ), m_unit(unit) { +KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_TABS, parent, name ), m_unit(unit) { TQString length; if(frameWidth==-1) { frameWidth=9999; @@ -2147,9 +2147,9 @@ TQString KoParagTabulatorsWidget::tabName() { /******************************************************************/ /* Class: KoParagDia */ /******************************************************************/ -KoParagDia::KoParagDia( TQWidget* tqparent, const char* name, +KoParagDia::KoParagDia( TQWidget* parent, const char* name, int flags, KoUnit::Unit unit, double _frameWidth, bool breakLine, bool disableAll ) - : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, tqparent, name, true ) + : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, parent, name, true ) { m_decorationsWidget = 0; m_flags = flags; diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index 6de8115e..c4bbed92 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -74,9 +74,9 @@ class KOTEXT_EXPORT KoParagLayoutWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - // Constructor: tqparent widget, flag (PD_SOMETHING) and name - KoParagLayoutWidget( int flag, TQWidget * tqparent, const char * name = 0 ) - : TQWidget( tqparent, name ), m_flag( flag ) + // Constructor: parent widget, flag (PD_SOMETHING) and name + KoParagLayoutWidget( int flag, TQWidget * parent, const char * name = 0 ) + : TQWidget( parent, name ), m_flag( flag ) { } virtual ~KoParagLayoutWidget() {} @@ -110,7 +110,7 @@ class KOTEXT_EXPORT KoIndentSpacingWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent,const char * name = 0 ); + KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent,const char * name = 0 ); virtual ~KoIndentSpacingWidget() {} virtual void display( const KoParagLayout & lay ); @@ -154,7 +154,7 @@ class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagAlignWidget(bool breakLine, TQWidget * tqparent, const char * name = 0 ); + KoParagAlignWidget(bool breakLine, TQWidget * parent, const char * name = 0 ); virtual ~KoParagAlignWidget() {} virtual void display( const KoParagLayout & lay ); @@ -188,7 +188,7 @@ class KOTEXT_EXPORT KoParagDecorationWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagDecorationWidget( TQWidget * tqparent, const char * name = 0 ); + KoParagDecorationWidget( TQWidget * parent, const char * name = 0 ); virtual ~KoParagDecorationWidget() {} virtual void display( const KoParagLayout & lay ); @@ -265,7 +265,7 @@ class KOTEXT_EXPORT KoCounterStyleWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* tqparent = 0, const char* name = 0 ); + KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* parent = 0, const char* name = 0 ); class StyleRepresenter { public: @@ -348,7 +348,7 @@ class KOTEXT_EXPORT KoParagCounterWidget : public KoParagLayoutWidget TQ_OBJECT public: - KoParagCounterWidget( bool disableAll=false ,TQWidget * tqparent=0L, const char * name = 0 ); + KoParagCounterWidget( bool disableAll=false ,TQWidget * parent=0L, const char * name = 0 ); virtual ~KoParagCounterWidget() {} virtual void display( const KoParagLayout & lay ); @@ -392,7 +392,7 @@ class KoTabulatorsLineEdit : public KoUnitDoubleSpinBox Q_OBJECT TQ_OBJECT public: - KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, + KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); protected: @@ -409,7 +409,7 @@ class KOTEXT_EXPORT KoParagTabulatorsWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent, const char * name = 0 ); + KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent, const char * name = 0 ); virtual ~KoParagTabulatorsWidget() {} virtual void display( const KoParagLayout & lay ); @@ -471,7 +471,7 @@ class KoStylePreview : public TQGroupBox TQ_OBJECT public: - KoStylePreview( const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0 ); + KoStylePreview( const TQString &title, const TQString &text, TQWidget *parent, const char* name = 0 ); virtual ~KoStylePreview(); /** Apply the given @p style to the preview. diff --git a/lib/kotext/KoParagDia_p.h b/lib/kotext/KoParagDia_p.h index 18b75a94..a1ca5737 100644 --- a/lib/kotext/KoParagDia_p.h +++ b/lib/kotext/KoParagDia_p.h @@ -42,8 +42,8 @@ public: enum counterType{ NONE,NUM,ALPHAB_L,ALPHAB_U,ROM_NUM_L,ROM_NUM_U}; KoSpinBox( int minValue, int maxValue, int step = 1, - TQWidget * tqparent = 0, const char * name = 0 ); - KoSpinBox( TQWidget * tqparent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); + KoSpinBox( TQWidget * parent = 0, const char * name = 0 ); virtual ~KoSpinBox(); virtual TQString mapValueToText( int value ); virtual int mapTextToValue( bool * ok ); diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index 96209cba..a68c6768 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -96,7 +96,7 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem ) parentElem.appendChild( element ); element.setAttribute( "name", followingStyle()->displayName() ); } - // TODO save tqparent style, and inherited flags. + // TODO save parent style, and inherited flags. parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" ); } diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 5df4c93d..7b51bb4f 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -933,7 +933,7 @@ bool KoTextCursor::removePreviousChar() // shouldn't be needed, just to make sure. fixCursorPosition(); string->format( -1, TRUE ); - //else if ( string->document() && string->document()->tqparent() ) + //else if ( string->document() && string->document()->parent() ) // string->document()->nextDoubleBuffered = TRUE; return FALSE; } else if ( string->prev() ) { @@ -952,7 +952,7 @@ bool KoTextCursor::remove() int next = string->string()->nextCursorPosition( idx ); string->remove( idx, next-idx ); string->format( -1, TRUE ); - //else if ( doc && doc->tqparent() ) + //else if ( doc && doc->parent() ) // doc->nextDoubleBuffered = TRUE; return FALSE; } else if ( string->next() ) { @@ -990,7 +990,7 @@ void KoTextCursor::killLine() return; string->remove( idx, string->length() - idx - 1 ); string->format( -1, TRUE ); - //else if ( doc && doc->tqparent() ) + //else if ( doc && doc->parent() ) //doc->nextDoubleBuffered = TRUE; } @@ -1690,7 +1690,7 @@ int KoTextFormatterBase::formatVertically( KoTextDocument* doc, KoTextParag* par // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ KoTextCustomItem::KoTextCustomItem( KoTextDocument *p ) - : width(-1), height(0), tqparent(p), xpos(0), ypos(-1), parag(0) + : width(-1), height(0), parent(p), xpos(0), ypos(-1), parag(0) { m_deleted = false; // added for kotext } diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index e161b2fe..44c360d5 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -497,7 +497,7 @@ public: int stretch() const { return stretch_; } KoTextDocument* richText() const { return richtext; } - KoTextTable* table() const { return tqparent; } + KoTextTable* table() const { return parent; } void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); @@ -510,7 +510,7 @@ public: private: TQPainter* painter() const; TQRect geom; - KoTextTable* tqparent; + KoTextTable* parent; KoTextDocument* richtext; int row_; int col_; diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 0acd88cc..a41de932 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -62,11 +62,11 @@ KoSearchContext::~KoSearchContext() } -KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent ) - : TQObject(tqparent), m_ctx(ctx), m_parent(tqparent) +KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ) + : TQObject(parent), m_ctx(ctx), m_parent(parent) { m_bOptionsShown = false; - m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), tqparent ); + m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), parent ); connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) ); m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 ); @@ -100,8 +100,8 @@ void KoSearchContextUI::setCtxHistory( const TQStringList & history ) m_ctx->m_strings = history; } -KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ) - : KFindDialog( tqparent, name, find->m_options, find->m_strings ) +KoSearchDia::KoSearchDia( TQWidget * parent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ) + : KFindDialog( parent, name, find->m_options, find->m_strings ) { // The dialog extension. m_findUI = new KoSearchContextUI( find, findExtension() ); @@ -119,8 +119,8 @@ void KoSearchDia::slotOk() m_findUI->setCtxHistory( findHistory() ); } -KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ) - : KReplaceDialog( tqparent, name, find->m_options, find->m_strings, replace->m_strings ) +KoReplaceDia::KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ) + : KReplaceDialog( parent, name, find->m_options, find->m_strings, replace->m_strings ) { // The dialog extension. m_findUI = new KoSearchContextUI( find, findExtension() ); @@ -146,8 +146,8 @@ void KoReplaceDia::slotOk() -KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) - : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ), +KoFindReplace::KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) + : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, parent ) ), m_replace( 0L ), m_searchContext( *dialog->searchContext() ), m_replaceContext(), @@ -161,9 +161,9 @@ KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const T connectFind( m_find ); } -KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) +KoFindReplace::KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) : m_find( 0L ), - m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ), + m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, parent ) ), m_searchContext( *dialog->searchContext() ), m_replaceContext( *dialog->replaceContext() ), m_searchContextEnabled( dialog->optionFindSelected() ), @@ -510,8 +510,8 @@ int KoFindReplace::numReplacements() const //// -KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent ) - : KFind( pattern, options, tqparent), +KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent ) + : KFind( pattern, options, parent), m_findReplace( _findReplace) { } @@ -525,8 +525,8 @@ bool KoTextFind::validateMatch( const TQString &text, int index, int matchedleng return m_findReplace->validateMatch( text, index, matchedlength ); } -KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent ) - : KReplace( pattern, replacement, options, tqparent), +KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent ) + : KReplace( pattern, replacement, options, parent), m_findReplace( _findReplace) { } @@ -540,8 +540,8 @@ bool KoTextReplace::validateMatch( const TQString &text, int index, int matchedl return m_findReplace->validateMatch( text, index, matchedlength ); } -KoFormatDia::KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx , const char* name) - : KDialogBase( tqparent, name, true, _caption, Ok|Cancel|User1 |User2 ), +KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx , const char* name) + : KDialogBase( parent, name, true, _caption, Ok|Cancel|User1 |User2 ), m_ctx(_ctx) { TQWidget *page = new TQWidget( this ); diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 49eb75d1..e833cbc9 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -102,7 +102,7 @@ class KoSearchContextUI : public TQObject Q_OBJECT TQ_OBJECT public: - KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent ); + KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ); void setCtxOptions( long options ); void setCtxHistory( const TQStringList & history ); KoSearchContext *context() const { return m_ctx;} @@ -128,7 +128,7 @@ class KOTEXT_EXPORT KoSearchDia: TQ_OBJECT public: - KoSearchDia( TQWidget *tqparent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ); + KoSearchDia( TQWidget *parent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -152,7 +152,7 @@ class KOTEXT_EXPORT KoReplaceDia: public: - KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ); + KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -178,7 +178,7 @@ class KoTextFind : public KFind Q_OBJECT TQ_OBJECT public: - KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0); + KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent = 0); ~KoTextFind(); virtual bool validateMatch( const TQString &text, int index, int matchedlength ); private: @@ -193,7 +193,7 @@ class KoTextReplace : public KReplace Q_OBJECT TQ_OBJECT public: - KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0); + KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent = 0); ~KoTextReplace(); virtual bool validateMatch( const TQString &text, int index, int matchedlength ); private: @@ -209,8 +209,8 @@ class KOTEXT_EXPORT KoFindReplace : public TQObject Q_OBJECT TQ_OBJECT public: - KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); - KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); + KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); + KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); ~KoFindReplace(); KoTextParag *currentParag() { @@ -299,7 +299,7 @@ class KoFormatDia: public KDialogBase Q_OBJECT TQ_OBJECT public: - KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L); + KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L); //apply to parameter to context ! void ctxOptions( ); diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 87ef1803..d0361b4c 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -49,9 +49,9 @@ public: KoTextDocument *lastTxtDocument; }; -KoSpell::KoSpell( const Broker::Ptr& broker, TQObject *tqparent, +KoSpell::KoSpell( const Broker::Ptr& broker, TQObject *parent, const char *name ) - : BackgroundChecker( broker, tqparent, name ) + : BackgroundChecker( broker, parent, name ) { d = new Private; d->parag = 0; diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h index 4c1ee72c..55c3971c 100644 --- a/lib/kotext/KoSpell.h +++ b/lib/kotext/KoSpell.h @@ -48,7 +48,7 @@ class KOTEXT_EXPORT KoSpell : public KSpell2::BackgroundChecker TQ_OBJECT public: - KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0, + KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); /** * The destructor instructs ISpell/ASpell to write out the personal diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index 7313e7be..f8c93f01 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -98,7 +98,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context ) } } - // TODO the same thing for style inheritance (style:tqparent-style-name) and setParentStyle() + // TODO the same thing for style inheritance (style:parent-style-name) and setParentStyle() Q_ASSERT( defaultStyle() ); return stylesLoaded; @@ -107,7 +107,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context ) void KoStyleCollection::saveOasis( KoGenStyles& styles, int styleType, KoSavingContext& context ) const { // In order to reduce the bloat, we define that the first style (usually Standard) - // is the "tqparent" (reference) for the others. + // is the "parent" (reference) for the others. // ## This is mostly a hack due to lack of proper style inheritance. // Once that's implemented, default to 'styles derive from Standard', but save normally. TQString refStyleName; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index e921ff1e..e5a7dbfa 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -370,11 +370,11 @@ void KoStyleManager::save() { else { int indexParentStyle=styleIndex( m_inheritCombo->currentItem()-1 ); - KoParagStyle *tqparent=m_origStyles.at(indexParentStyle); - if( tqparent==0L ) //If not found in the orig list (means its a new Style) look in the changeStyles list - tqparent=m_changedStyles.at(indexParentStyle); + KoParagStyle *parent=m_origStyles.at(indexParentStyle); + if( parent==0L ) //If not found in the orig list (means its a new Style) look in the changeStyles list + parent=m_changedStyles.at(indexParentStyle); - m_currentStyle->setParentStyle( tqparent ); + m_currentStyle->setParentStyle( parent ); } if ( d->cbIncludeInTOC ) @@ -447,7 +447,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s ) for ( KoParagStyle* p = m_changedStyles.first(); p != 0L; p = m_changedStyles.next() ) { //when we remove style, we must replace inherite style to 0L - //when tqparent style was removed. + //when parent style was removed. //##########Laurent change inherited style attribute if ( p->parentStyle() == s) p->setParentStyle(0L); @@ -649,8 +649,8 @@ void KoStyleManager::renameStyle(const TQString &theText) { ///////////// -KoStyleParagTab::KoStyleParagTab( TQWidget * tqparent ) - : KoStyleManagerTab( tqparent ) +KoStyleParagTab::KoStyleParagTab( TQWidget * parent ) + : KoStyleManagerTab( parent ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); m_widget = 0L; @@ -677,8 +677,8 @@ void KoStyleParagTab::resizeEvent( TQResizeEvent *e ) if ( m_widget ) m_widget->resize( size() ); } -KoStyleFontTab::KoStyleFontTab( TQWidget * tqparent ) - : KoStyleManagerTab( tqparent ) +KoStyleFontTab::KoStyleFontTab( TQWidget * parent ) + : KoStyleManagerTab( parent ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQTabWidget *fontTabContainer = new TQTabWidget( this ); diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h index 328668fd..af848e1d 100644 --- a/lib/kotext/KoStyleManager.h +++ b/lib/kotext/KoStyleManager.h @@ -123,7 +123,7 @@ class KOTEXT_EXPORT KoStyleManagerTab : public TQWidget { Q_OBJECT TQ_OBJECT public: - KoStyleManagerTab(TQWidget *tqparent) : TQWidget(tqparent) {}; + KoStyleManagerTab(TQWidget *parent) : TQWidget(parent) {}; /** the new style which is to be displayed */ void setStyle(KoParagStyle *style) { m_style = style; } @@ -144,9 +144,9 @@ class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab Q_OBJECT TQ_OBJECT public: - KoStyleParagTab( TQWidget * tqparent ); + KoStyleParagTab( TQWidget * parent ); - // not a constructor parameter since 'this' is the tqparent of the widget + // not a constructor parameter since 'this' is the parent of the widget void setWidget( KoParagLayoutWidget * widget ); virtual void update(); @@ -164,7 +164,7 @@ class KOTEXT_EXPORT KoStyleFontTab : public KoStyleManagerTab Q_OBJECT TQ_OBJECT public: - KoStyleFontTab( TQWidget * tqparent ); + KoStyleFontTab( TQWidget * parent ); ~KoStyleFontTab(); virtual void update(); virtual TQString tabName(); diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h index ff7e4ffc..d232bedc 100644 --- a/lib/kotext/KoTextCustomItem.h +++ b/lib/kotext/KoTextCustomItem.h @@ -83,12 +83,12 @@ public: virtual void pageBreak( int /*y*/, KoTextFlow* /*flow*/ ) {} - KoTextDocument *tqparent; + KoTextDocument *parent; /** The text document in which this customitem is */ - KoTextDocument * textDocument() const { return tqparent; } + KoTextDocument * textDocument() const { return parent; } /** When the user deletes a custom item, it isn't destroyed but * moved into the undo/redo history - setDeleted( true ) diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index de81299c..f981dd26 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -44,7 +44,7 @@ KoTextDocument::KoTextDocument( KoTextZoomHandler *zoomHandler, KoTextFormatColl : m_zoomHandler( zoomHandler ), m_bDestroying( false ), #ifdef TQTEXTTABLE_AVAILABLE - par( 0L /*we don't use tqparent documents */ ), + par( 0L /*we don't use parent documents */ ), tc( 0 ), #endif tArray( 0 ), tStopWidth( 0 ) @@ -1288,7 +1288,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, brush.color() == TQt::white && is_printer(p)); - bool useDoubleBuffer = !parag->document()->tqparent(); + bool useDoubleBuffer = !parag->document()->parent(); if ( is_printer(p) ) useDoubleBuffer = FALSE; // Can't handle transparency using double-buffering, in case of rotation/scaling (due to bitBlt) diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 1f7739aa..8cdc1b52 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -65,7 +65,7 @@ public: // see below for constructor virtual ~KoTextDocument(); - //KoTextDocument *tqparent() const { return par; } + //KoTextDocument *parent() const { return par; } void setText( const TQString &text, const TQString &context ); diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 27556ed6..24214ae4 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -82,11 +82,11 @@ KoTextFormat::KoTextFormat() //#endif } -KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *tqparent ) +KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *parent ) : fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( TRUE ) { #ifdef DEBUG_COLLECTION - kdDebug(32500) << "KoTextFormat with font & color & tqparent (" << tqparent << "), addRef. " << this << endl; + kdDebug(32500) << "KoTextFormat with font & color & parent (" << parent << "), addRef. " << this << endl; #endif int pointSize; if ( f.pointSize() == -1 ) // font was set with a pixelsize, we need a pointsize! @@ -97,7 +97,7 @@ KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_ // WYSIWYG works much much better with scalable fonts -> force it to be scalable fn.setStyleStrategy( TQFont::ForceOutline ); ref = 0; - collection = tqparent; + collection = parent; //leftBearing = fm.minLeftBearing(); //rightBearing = fm.minRightBearing(); //hei = fm.height(); @@ -188,8 +188,8 @@ KoTextFormat::~KoTextFormat() // Removing a format that is in the collection is forbidden, in fact. // It should have been removed from the collection before being deleted. #ifndef NDEBUG - if ( tqparent() && tqparent()->defaultFormat() ) // not when destroying the collection - assert( ! ( tqparent()->dict().find( key() ) == this ) ); + if ( parent() && parent()->defaultFormat() ) // not when destroying the collection + assert( ! ( parent()->dict().find( key() ) == this ) ); // (has to be the same pointer, not only the same key) #endif delete d; @@ -1709,7 +1709,7 @@ KoTextFormatCollection::~KoTextFormatCollection() KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *f ) { - if ( f->tqparent() == this || f == defFormat ) { + if ( f->parent() == this || f == defFormat ) { #ifdef DEBUG_COLLECTION kdDebug(32500) << " format(f) need '" << f->key() << "', best case!" << endl; #endif diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h index 25211f54..0e7c1a13 100644 --- a/lib/kotext/KoTextFormat.h +++ b/lib/kotext/KoTextFormat.h @@ -139,7 +139,7 @@ public: /// A simple text format with some default settings /// Only used for the default format KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, - bool hyphenation, KoTextFormatCollection *tqparent = 0 ); + bool hyphenation, KoTextFormatCollection *parent = 0 ); /// A complete text format (used by KoFontDia) KoTextFormat( const TQFont &_font, @@ -197,8 +197,8 @@ public: void setVAlign( VerticalAlignment a ); bool operator==( const KoTextFormat &f ) const; - KoTextFormatCollection *tqparent() const; - void setCollection( KoTextFormatCollection *tqparent ) { collection = tqparent; } + KoTextFormatCollection *parent() const; + void setCollection( KoTextFormatCollection *parent ) { collection = parent; } TQString key() const; static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign ); @@ -476,7 +476,7 @@ inline bool KoTextFormat::operator==( const KoTextFormat &f ) const return key() == f.key(); } -inline KoTextFormatCollection *KoTextFormat::tqparent() const +inline KoTextFormatCollection *KoTextFormat::parent() const { return collection; } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index d9a2f054..30bf6dd3 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -60,8 +60,8 @@ public: KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, const TQString &defaultLanguage, bool hyphenation, KoParagStyle* defaultStyle, int tabStopWidth, - TQObject* tqparent, const char *name ) - : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) + TQObject* parent, const char *name ) + : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) { textdoc = new KoTextDocument( zh, new KoTextFormatCollection( defaultFont, TQColor(),defaultLanguage, hyphenation ) ); if ( tabStopWidth != -1 ) @@ -70,8 +70,8 @@ KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, } KoTextObject::KoTextObject( KoTextDocument* _textdoc, KoParagStyle* defaultStyle, - TQObject* tqparent, const char *name ) - : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) + TQObject* parent, const char *name ) + : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) { textdoc = _textdoc; init(); @@ -2677,7 +2677,7 @@ KCommand *KoTextFormatInterface::setTextSuperScriptCommand(bool on) KCommand *KoTextFormatInterface::setDefaultFormatCommand() { - KoTextFormatCollection * coll = currentFormat()->tqparent(); + KoTextFormatCollection * coll = currentFormat()->parent(); Q_ASSERT(coll); if(coll) { diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h index a463d0fc..15574075 100644 --- a/lib/kotext/KoTextObject.h +++ b/lib/kotext/KoTextObject.h @@ -192,13 +192,13 @@ public: * @param defaultHyphenation the default setting for hyphenation (see KoTextFormatCollection) * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style) * @param tabStopWidth the global value for the tabstop width - * @param tqparent tqparent widget for this object + * @param parent parent widget for this object * @param name name for this object * */ KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, const TQString &defaultLanguage, bool defaultHyphenation, KoParagStyle* defaultStyle, int tabStopWidth = -1, - TQObject* tqparent = 0, const char *name = 0 ); + TQObject* parent = 0, const char *name = 0 ); /** Alternative constructor. * This constructor allows to use a derived class from KoTextDocument. @@ -206,11 +206,11 @@ public: * @param textdoc the text document to use in this text object. Ownership is transferred * to the text object. * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style) - * @param tqparent tqparent widget for this object + * @param parent parent widget for this object * @param name name for this object */ KoTextObject( KoTextDocument *textdoc, KoParagStyle* defaultStyle, - TQObject* tqparent = 0, const char *name = 0 ); + TQObject* parent = 0, const char *name = 0 ); virtual ~KoTextObject(); @@ -562,7 +562,7 @@ public: // made public for KWTextFrameSet... int eid; // id of last parag int index; // index (for insertion/deletion) Type type; // type of command - KoTextObject* textobj; // tqparent + KoTextObject* textobj; // parent CustomItemsMap customItemsMap; // character position -> qtextcustomitem TQValueList<KoParagLayout> oldParagLayouts; KoParagLayout newParagLayout; diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 633bdb58..23754c28 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -1229,7 +1229,7 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /* else { TQString counterText = m_layout.counter->text( this ); - // There are no bullets...any tqparent bullets have already been suppressed. + // There are no bullets...any parent bullets have already been suppressed. // Just draw the text! Note: one space is always appended. if ( !counterText.isEmpty() ) { @@ -2708,7 +2708,7 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace ) // check for space, tab, line feed, carriage return if ( ch == ' ' || ch == '\t' ||ch == '\r' || ch == '\n') { - // if we were lead by whitespace in some tqparent or previous sibling element, + // if we were lead by whitespace in some parent or previous sibling element, // we completely collapse this space if ( r != 0 || !leadingSpace ) text[w++] = TQChar( ' ' ); @@ -2733,19 +2733,19 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace ) return text; } -void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace ) +void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace ) { bool dummy; - return loadOasisSpan( tqparent, context, pos, stripLeadingSpace, &dummy ); + return loadOasisSpan( parent, context, pos, stripLeadingSpace, &dummy ); } -void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ) +void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ) { - // Parse every child node of the tqparent + // Parse every child node of the parent // Can't use forEachElement here since we also care about text nodes TQDomNode node; - for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) + for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement ts = node.toElement(); TQString textData; @@ -2772,7 +2772,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& c // should only have one space between each of "Foo", "Bar", and "Baz" // so we need to keep track of whether there was any trailing whitespace // in sub-spans so that we can propogate the whitespace compression state - // back up to the tqparent element + // back up to the parent element loadOasisSpan( ts, context, pos, stripLeadingSpace, hasTrailingSpace ); // recurse stripLeadingSpace = *hasTrailingSpace; context.styleStack().restore(); @@ -2885,7 +2885,7 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl return tqlayout; } -void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) +void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) { // First load tqlayout from style KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true ); @@ -2898,7 +2898,7 @@ void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& conte // Load text // OO.o compatibility: ignore leading whitespace in <p> and <h> elements - loadOasisSpan( tqparent, context, pos, true ); + loadOasisSpan( parent, context, pos, true ); // Apply default format to trailing space const int len = str->length(); @@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { KoGenStyles& mainStyles = context.mainStyles(); - // Write paragtqlayout to styles (with tqparent == the parag's style) + // Write paragtqlayout to styles (with parent == the parag's style) TQString parentStyleName; if ( m_layout.style ) parentStyleName = m_layout.style->name(); @@ -3059,7 +3059,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { lastFormatRaw = newFormat; // Remove isMisspelled from format, to avoid useless derived styles - // (which would be indentical to their tqparent style) + // (which would be indentical to their parent style) KoTextFormat tmpFormat( *newFormat ); tmpFormat.setMisspelled( false ); newFormat = formatCollection()->format( &tmpFormat ); diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index 4ccc2196..e27a9afc 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -328,20 +328,20 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param tqparent the xml element that has content as tqchildren. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace */ - void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false ); + void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false ); /** * Load a section of text from a oasis based xml tree. - * @param tqparent the xml element that has content as tqchildren. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace * @param hasTrailingSpace whether there was trailing literal whitespace in the span's text */ - void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ); + void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ); void applyListStyle( KoOasisContext& context, int restartNumbering, bool orderedList, bool heading, int level ); diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index f094053d..6b9937bb 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -228,7 +228,7 @@ protected: /** Draws the cursor (or hides it if b is false). * The default implementation only changes an internal flag, make sure to reimplement - * and to call the tqparent implementation (in all cases) + * and to call the parent implementation (in all cases) */ virtual void drawCursor( bool b ); diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 34fd7cb2..06603969 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -15,11 +15,11 @@ #include <KoVariable.h> /* - * Constructs a TimeFormatWidget which is a child of 'tqparent', with the + * Constructs a TimeFormatWidget which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -TimeFormatWidget::TimeFormatWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TimeDateFormatWidgetPrototype( tqparent, name, fl ) +TimeFormatWidget::TimeFormatWidget( TQWidget* parent, const char* name, WFlags fl ) + : TimeDateFormatWidgetPrototype( parent, name, fl ) { setCaption( i18n( "TimeFormat", "This Dialog Allows You to Set the Format of the Time Variable" ) ); diff --git a/lib/kotext/TimeFormatWidget.h b/lib/kotext/TimeFormatWidget.h index 62ee6957..3fd2c8bf 100644 --- a/lib/kotext/TimeFormatWidget.h +++ b/lib/kotext/TimeFormatWidget.h @@ -8,7 +8,7 @@ class TimeFormatWidget : public TimeDateFormatWidgetPrototype TQ_OBJECT public: - TimeFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TimeFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TimeFormatWidget(); TQString resultString(); int correctValue(); diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic index 1726d063..6ec0f944 100755 --- a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic @@ -2183,7 +2183,7 @@ mani1k 5ma3ri mash5 mas3ko -tqmask3ro +mask3ro ma5sk^^f6 mas3ti mas4v diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 36169272..5d5fbe5e 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -9,8 +9,8 @@ class MyWidget : public TQWidget { public: - MyWidget( KoZoomHandler* _zh, TQWidget* tqparent ) - : TQWidget( tqparent ), m_zh(_zh) { + MyWidget( KoZoomHandler* _zh, TQWidget* parent ) + : TQWidget( parent ), m_zh(_zh) { tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } |