diff options
135 files changed, 458 insertions, 458 deletions
diff --git a/KDE3PORTING.html b/KDE3PORTING.html index ab89d2d0f..c86394543 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -652,7 +652,7 @@ notification about a change in tqalignment. <H4>KPanelApplet</H4> <p>The virtual methods orientationChange() and popupDirectionChange() are deprecated. -Instead you should reimplement positionChange() and tqalignmentChange() to be +Instead you should reimplement positionChange() and alignmentChange() to be notified of changes in the position and tqalignment of the panel on which your applet resides. In addition, the popupDirection() method and the Direction enum are deprecated. Instead you should use the position() method and Position enum. Applets that use @@ -661,7 +661,7 @@ a future version. <H4>KPanelExtension</H4> -<p>There is a new method tqalignmentChange() that your extension should reimplement if +<p>There is a new method alignmentChange() that your extension should reimplement if it needs to know about changes in tqalignment. <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h index 32990840e..10e9f4a74 100644 --- a/interfaces/kmediaplayer/player.h +++ b/interfaces/kmediaplayer/player.h @@ -56,7 +56,7 @@ public: /** This constructor is what to use when a GUI is required, as in the * case of a KMediaPlayer/Player. */ - Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name); + Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~Player(void); diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h index 2530257eb..0a4f4c769 100644 --- a/interfaces/ktexteditor/editor.h +++ b/interfaces/ktexteditor/editor.h @@ -58,7 +58,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart unsigned int myEditorNumber; }; -KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); +KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); } diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index 0e52c4f00..2da9e252f 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char return 0; } -KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName, +KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName, const char* name,const TQString& postfix,bool fallBackToKatePart){ KTextEditor::Editor *tmpEd=0; @@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObje KService::Ptr serv=KService::serviceByDesktopName(editor); if (serv) { - tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name); + tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name); if (tmpEd) return tmpEd; } if (fallBackToKatePart) - return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name); + return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name); return 0; } diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h index a5118c3d4..0010dd3a8 100644 --- a/interfaces/ktexteditor/editorchooser.h +++ b/interfaces/ktexteditor/editorchooser.h @@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget void writeAppSetting(const TQString& postfix=TQString::null); static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true); - static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); + static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); private: class PrivateEditorChooser *d; }; diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp index c334dd990..80071447c 100644 --- a/interfaces/ktexteditor/ktexteditor.cpp +++ b/interfaces/ktexteditor/ktexteditor.cpp @@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const return myEditorNumber; } -Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ) +Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) { - return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name ); + return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name ); } Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name ) diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 3325c69e9..05af27ff8 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w) m_tabWidth = w; if (m_highlight && m_highlight->foldingIndentationSensitive()) - tqinvalidateHighlighting(); + invalidateHighlighting(); } } @@ -881,7 +881,7 @@ void KateBuffer::setHighlight(uint hlMode) m_highlight = h; if (tqinvalidate) - tqinvalidateHighlighting(); + invalidateHighlighting(); // inform the document that the hl was really changed // needed to update attributes and more ;) @@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode) } } -void KateBuffer::tqinvalidateHighlighting() +void KateBuffer::invalidateHighlighting() { m_lineHighlightedMax = 0; m_lineHighlighted = 0; @@ -977,7 +977,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b { if (KateHlManager::self()->resetDynamicCtxs()) { - kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; + kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; // avoid recursive invalidation KateHlManager::self()->setForceNoDCReset(true); diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 43430ec2c..450f260ab 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -591,7 +591,7 @@ class KateBuffer : public TQObject /** * Invalidate highlighting of whole buffer. */ - void tqinvalidateHighlighting(); + void invalidateHighlighting(); KateCodeFoldingTree *foldingTree () { return &m_regionTree; }; diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index dbab1ef08..cc6a462ac 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -91,7 +91,7 @@ class KatePartPluginItem // KateDocument Constructor // KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, - bool bReadOnly, TQWidget *tqparentWidget, + bool bReadOnly, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name) : Kate::Document(parent, name), m_plugins (KateFactory::self()->plugins().count()), @@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // if single view mode, like in the konqui embedding, create a default view ;) if ( m_bSingleViewMode ) { - KTextEditor::View *view = createView( tqparentWidget, widgetName ); + KTextEditor::View *view = createView( parentWidget, widgetName ); insertChildClient( view ); view->show(); setWidget( view ); @@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate) m_views.tqat(z)->renderer()->updateAttributes (); if (needInvalidate) - m_buffer->tqinvalidateHighlighting(); + m_buffer->invalidateHighlighting(); tagAll (); } diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index 5c426761b..46e9e87f8 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -91,7 +91,7 @@ class KateDocument : public Kate::Document, public: KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false, - TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); ~KateDocument (); bool closeURL(); diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index a9ccc7333..c42f698a3 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory public: /** * reimplemented create object method - * @param tqparentWidget parent widget + * @param parentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) + KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args); + return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args); } }; @@ -206,14 +206,14 @@ KateFactory *KateFactory::self () return s_self; } -KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) +KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) { TQCString classname( _classname ); bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" ); bool bWantBrowserView = ( classname == "Browser/View" ); bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" )); - KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name); + KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name); part->setReadWrite( !bWantReadOnly ); return part; diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 4c1ce0706..0fd939ce3 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -71,7 +71,7 @@ class KateFactory /** * reimplemented create object method - * @param tqparentWidget parent widget + * @param parentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -79,7 +79,7 @@ class KateFactory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, + KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index 8bdc73b39..9cb4a62c6 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -213,7 +213,7 @@ class KateHighlighting inline bool noHighlighting () const { return noHl; }; - // be carefull: all documents hl should be tqinvalidated after calling this method! + // be carefull: all documents hl should be invalidated after calling this method! void dropDynamicContexts(); TQString indentation () { return m_indentation; } @@ -377,7 +377,7 @@ class KateHlManager : public TQObject uint countDynamicCtxs() { return dynamicCtxsCount; }; void setForceNoDCReset(bool b) { forceNoDCReset = b; }; - // be carefull: all documents hl should be tqinvalidated after having successfully called this method! + // be carefull: all documents hl should be invalidated after having successfully called this method! bool resetDynamicCtxs(); signals: diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 2b5e2342e..6b4f149fc 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser->enableColumn(KFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); m_schema = -1; } @@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 4afd26255..566b6ea27 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) private: class KFontChooser *m_fontchooser; diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index 3f964e613..84eaca37c 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public TQWhatsThis Kate::Command *cmd = KateCmd::self()->queryCommand( name ); if ( cmd ) { - if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) ) + if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) ) return beg + name + mid + s + end; else return beg + name + mid + i18n("No help for '%1'").arg( name ) + end; @@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) void KateCmdLine::hideMe () // unless i have focus ;) { - if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) { + if ( isVisibleTo(parentWidget()) && ! hasFocus() ) { m_view->toggleCmdLine (); } } diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index ac1d8bdf5..9a2e88548 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, - /*tqparentWidget*/toplevel, + /*parentWidget*/toplevel, /*widgetName*/"testkate"); part->readConfig(&cfg); diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 7352c1d13..a73eb1fd8 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -127,7 +127,7 @@ class KCertPartPrivate { }; -KCertPart::KCertPart(TQWidget *tqparentWidget, const char *widgetName, +KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadWritePart(parent, name) { @@ -149,7 +149,7 @@ _silentImport = false; d = new KCertPartPrivate; d->browserExtension = new KParts::BrowserExtension(this); -_frame = new TQFrame(tqparentWidget, widgetName); +_frame = new TQFrame(parentWidget, widgetName); setWidget(_frame); _baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(), diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h index 9b5520f30..ec011c08d 100644 --- a/kcert/kcertpart.h +++ b/kcert/kcertpart.h @@ -68,7 +68,7 @@ class KPKCS12Item : public KListViewItem { class KCertPart : public KParts::ReadWritePart { Q_OBJECT public: - KCertPart(TQWidget *tqparentWidget, const char *widgetName, + KCertPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent = 0L, const char *name = 0L, const TQStringList &args = TQStringList() ); virtual ~KCertPart(); diff --git a/kdecore/kgenericfactory.h b/kdecore/kgenericfactory.h index e3f04ce66..3faaae7bf 100644 --- a/kdecore/kgenericfactory.h +++ b/kdecore/kgenericfactory.h @@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance() * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, + * <code>MyPart( TQWidget *parentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -216,7 +216,7 @@ protected: * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, + * <code>MyPart( TQWidget *parentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -253,7 +253,7 @@ protected: * { * Q_ OBJECT * public: - * MyDialogComponent( TQWidget *tqparentWidget, const char *name, + * MyDialogComponent( TQWidget *parentWidget, const char *name, * const TQStringList &args ); * ... * }; @@ -311,7 +311,7 @@ protected: * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, + * <code>MyPart( TQWidget *parentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -348,7 +348,7 @@ protected: * { * Q_ OBJECT * public: - * MyDialogComponent( TQWidget *tqparentWidget, const char *name, + * MyDialogComponent( TQWidget *parentWidget, const char *name, * const TQStringList &args ); * ... * }; diff --git a/kdecore/kgenericfactory.tcc b/kdecore/kgenericfactory.tcc index 1ce9a6c70..c3afb1b5a 100644 --- a/kdecore/kgenericfactory.tcc +++ b/kdecore/kgenericfactory.tcc @@ -121,7 +121,7 @@ namespace KDEPrivate typename If< TQWidgetInheritanceTest< Product >::Result, TQWidget, TQObject >::Result >::Result BaseType; - static inline Product *create( TQWidget *tqparentWidget, const char *widgetName, + static inline Product *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { @@ -129,7 +129,7 @@ namespace KDEPrivate while ( tqmetaObject ) { if ( !qstrcmp( className, tqmetaObject->className() ) ) - return create( tqparentWidget, widgetName, + return create( parentWidget, widgetName, parent, name, args, Type2Type<BaseType>() ); tqmetaObject = tqmetaObject->tqsuperClass(); } @@ -139,14 +139,14 @@ namespace KDEPrivate typedef typename If< TQWidgetInheritanceTest<ParentType>::Result, ParentType, TQWidget >::Result WidgetParentType; - static inline Product *create( TQWidget *tqparentWidget, const char *widgetName, + static inline Product *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args, Type2Type<KParts::Part> ) { - return new Product( tqparentWidget, widgetName, parent, name, args ); + return new Product( parentWidget, widgetName, parent, name, args ); } - static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/, + static inline Product *create( TQWidget* /*parentWidget*/, const char* /*widgetName*/, TQObject *parent, const char *name, const TQStringList &args, Type2Type<TQWidget> ) { @@ -157,7 +157,7 @@ namespace KDEPrivate return new Product( p, name, args ); } - static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/, + static inline Product *create( TQWidget* /*parentWidget*/, const char* /*widgetName*/, TQObject *parent, const char *name, const TQStringList &args, Type2Type<TQObject> ) { @@ -175,12 +175,12 @@ namespace KDEPrivate class MultiFactory { public: - inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + inline static TQObject *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( tqparentWidget, widgetName, + return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, parent, name, className, args ))); } @@ -215,19 +215,19 @@ namespace KDEPrivate class MultiFactory< KTypeList<Product, ProductListTail>, TQObject > { public: - inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + inline static TQObject *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { // try with the head of the typelist first. the head is always // a concrete type. - TQObject *object = MultiFactory<Product>::create( tqparentWidget, widgetName, + TQObject *object = MultiFactory<Product>::create( parentWidget, widgetName, parent, name, className, args ); if ( !object ) - object = MultiFactory<ProductListTail>::create( tqparentWidget, widgetName, + object = MultiFactory<ProductListTail>::create( parentWidget, widgetName, parent, name, className, args ); @@ -241,7 +241,7 @@ namespace KDEPrivate KTypeList<ParentType, ParentTypeListTail> > { public: - inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + inline static TQObject *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) @@ -249,7 +249,7 @@ namespace KDEPrivate // try with the head of the typelist first. the head is always // a concrete type. TQObject *object = MultiFactory<Product, ParentType> - ::create( tqparentWidget, widgetName, + ::create( parentWidget, widgetName, parent, name, className, args ); // if that failed continue by advancing the typelist, calling this @@ -257,7 +257,7 @@ namespace KDEPrivate // at the end we reach the nulltype specialization. if ( !object ) object = MultiFactory<ProductListTail, ParentTypeListTail> - ::create( tqparentWidget, widgetName, + ::create( parentWidget, widgetName, parent, name, className, args ); return object; diff --git a/kdecore/kmultipledrag.h b/kdecore/kmultipledrag.h index 5dc6e2972..2490ec694 100644 --- a/kdecore/kmultipledrag.h +++ b/kdecore/kmultipledrag.h @@ -40,7 +40,7 @@ class KMultipleDragPrivate; * Sample code for this: * * \code - * KMultipleDrag *drag = new KMultipleDrag( tqparentWidget ); + * KMultipleDrag *drag = new KMultipleDrag( parentWidget ); * drag->addDragObject( new TQImageDrag( someQImage, 0 ) ); * drag->addDragObject( new KURLDrag( someKURL, 0 ) ); * drag->drag(); diff --git a/kdecore/ktempdir.cpp b/kdecore/ktempdir.cpp index 3a68e304e..dc443b3d5 100644 --- a/kdecore/ktempdir.cpp +++ b/kdecore/ktempdir.cpp @@ -177,7 +177,7 @@ rmtree(const TQCString& name) * * Potential problems: * - opendir/readdir/closedir is not re-entrant - * - unlink and rmdir tqinvalidates a opendir/readdir/closedir + * - unlink and rmdir invalidates a opendir/readdir/closedir * - limited number of file descriptors for opendir/readdir/closedir */ if ( ::closedir( dp ) ) diff --git a/kdecore/kwin.cpp b/kdecore/kwin.cpp index 01f942aac..fa68da63c 100644 --- a/kdecore/kwin.cpp +++ b/kdecore/kwin.cpp @@ -311,7 +311,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) Grmbl. See TQDialog::show(). That should get fixed in Qt somehow. */ if( tqqt_cast< TQDialog* >( subwindow ) != NULL - && subwindow->tqparentWidget() == NULL + && subwindow->parentWidget() == NULL && kapp->mainWidget() != NULL ) { kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget()," diff --git a/kdecore/malloc/malloc.c b/kdecore/malloc/malloc.c index 56d0b7324..c25800f5d 100644 --- a/kdecore/malloc/malloc.c +++ b/kdecore/malloc/malloc.c @@ -393,7 +393,7 @@ extern "C" { defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the expense of not being able to handle more than 2^32 of malloced space. If this limitation is acceptable, you are encouraged to set - this unless you are on a platform requiring 16byte tqalignments. In + this unless you are on a platform requiring 16byte alignments. In this case the tqalignment requirements turn out to negate any potential advantages of decreasing size_t word size. @@ -421,7 +421,7 @@ extern "C" { /* MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks. It must be a power of two at least 2 * SIZE_SZ, even on machines - for which smaller tqalignments would suffice. It may be defined as + for which smaller alignments would suffice. It may be defined as larger than this though. Note however that code and data structures are optimized for the case of 8-byte tqalignment. */ @@ -1938,7 +1938,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ Note that the `foot' of the current chunk is actually represented as the prev_size of the NEXT chunk. This makes it easier to - deal with tqalignments etc but can be very confusing when trying + deal with alignments etc but can be very confusing when trying to extend or adapt this code. The two exceptions to all this are @@ -3454,7 +3454,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; double fencepost at old_top to prevent consolidation with space we don't own. These fenceposts are artificial chunks that are marked as inuse and are in any case too small to use. We need - two to make sizes and tqalignments work out. + two to make sizes and alignments work out. */ if (old_size != 0) { diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp index 53a212c37..85830126b 100644 --- a/kdecore/svgicons/ksvgiconengine.cpp +++ b/kdecore/svgicons/ksvgiconengine.cpp @@ -225,8 +225,8 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n TQPtrList<TQDomNamedNodeMap> applyList; applyList.setAutoDelete(true); - TQDomNode tqshape = node.tqparentNode(); - for(; !tqshape.isNull() ; tqshape = tqshape.tqparentNode()) + TQDomNode tqshape = node.parentNode(); + for(; !tqshape.isNull() ; tqshape = tqshape.parentNode()) applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes())); // Apply parent attributes diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp index 58caa39b7..7c0f9ada7 100644 --- a/kdefx/kstyle.cpp +++ b/kdefx/kstyle.cpp @@ -364,7 +364,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, else pix.resize( w-2, h-2 ); - TQString title = wid->tqparentWidget()->caption(); + TQString title = wid->parentWidget()->caption(); TQPainter p2; p2.begin(&pix); p2.fillRect(pix.rect(), cg.brush(TQColorGroup::Highlight)); @@ -569,7 +569,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { widget = static_cast<TQWidget*>(p->device()); - parent = widget->tqparentWidget(); + parent = widget->parentWidget(); } else return; // Don't paint on non-widgets @@ -986,7 +986,7 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const TQWidget* parent = 0; // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size - if (widget && (parent = widget->tqparentWidget() ) + if (widget && (parent = widget->parentWidget() ) && !parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && !parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) ) @@ -1200,10 +1200,10 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control, TQPainter p2; p2.begin(&pix); - if ( slider->tqparentWidget() && - slider->tqparentWidget()->backgroundPixmap() && - !slider->tqparentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(slider->tqparentWidget()->backgroundPixmap()); + if ( slider->parentWidget() && + slider->parentWidget()->backgroundPixmap() && + !slider->parentWidget()->backgroundPixmap()->isNull() ) { + TQPixmap pixmap = *(slider->parentWidget()->backgroundPixmap()); p2.drawTiledPixmap(r, pixmap, slider->pos()); } else pix.fill(cg.background()); diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index 878c2fa43..16a6271cb 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/cups/imagepreview.cpp @@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){ int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; QPixmap buffer(width(), height()); - buffer.fill(tqparentWidget(), 0, 0); + buffer.fill(parentWidget(), 0, 0); QPainter p(&buffer); p.drawImage(x,y,tmpImage); p.end(); diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index 8b51ccfb6..4e62e791b 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -31,33 +31,33 @@ public: KPrintActionPrivate() { type = All; - tqparentWidget = 0; + parentWidget = 0; } PrinterType type; QStringList printers; - TQWidget *tqparentWidget; + TQWidget *parentWidget; }; -KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } KPrintAction::~KPrintAction() @@ -65,13 +65,13 @@ KPrintAction::~KPrintAction() delete d; } -void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget) +void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); d->type = type; - d->tqparentWidget = tqparentWidget; + d->parentWidget = parentWidget; } void KPrintAction::slotAboutToShow() @@ -105,26 +105,26 @@ void KPrintAction::slotActivated(int ID) { KPrinter printer(false); KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]); - if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget)) + if (mprt && mprt->autoConfigure(&printer, d->parentWidget)) { // emit the signal emit print(&printer); } } -KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all")); + return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all")); } -KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular")); + return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular")); } -KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special")); + return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special")); } #include "kprintaction.moc" diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h index b9ba54add..eb23d6e31 100644 --- a/kdeprint/kprintaction.h +++ b/kdeprint/kprintaction.h @@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu public: enum PrinterType { All, Regular, Specials }; - KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); virtual ~KPrintAction(); - static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); signals: void print(KPrinter*); @@ -47,7 +47,7 @@ protected slots: void slotActivated(int); protected: - void initialize(PrinterType type, TQWidget *tqparentWidget); + void initialize(PrinterType type, TQWidget *parentWidget); private: class KPrintActionPrivate; diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index 8146b841a..c62730fde 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer) TQPtrList<KMPrinter> *plist = KMFactory::self()->manager()->printerList(); if (!KMManager::self()->errorMsg().isEmpty()) { - KMessageBox::error(tqparentWidget(), + KMessageBox::error(parentWidget(), "<qt><nobr>"+ i18n("An error occurred while retrieving the printer list:") +"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>"); @@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag ) { MessageWindow::remove( this ); if ( !flag ) - KMessageBox::error(tqparentWidget(), + KMessageBox::error(parentWidget(), "<qt><nobr>"+ i18n("An error occurred while retrieving the printer list:") +"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>"); diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index c0377993a..9d6688001 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown() void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd) { - m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1); - m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1); + m_inputfile->parentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1); + m_outputfile->parentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1); m_view->setEnabled(cmd.tqfind("%filterargs") != -1); - m_name->tqparentWidget()->setEnabled(m_view->isEnabled()); + m_name->parentWidget()->setEnabled(m_view->isEnabled()); slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0)); m_view->setOpen(m_view->firstChild(), m_view->isEnabled()); } @@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime() void KXmlCommandDlg::slotEditCommand() { - KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget()); + KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget()); } void KXmlCommandDlg::slotAddReq() diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index 307dbaeee..ab025748b 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked() if ( !d->scanning ) { if ( d->localPrefix() == d->prefixaddress || - KMessageBox::warningContinueCancel( this->tqparentWidget(), + KMessageBox::warningContinueCancel( this->parentWidget(), i18n( "You are about to scan a subnet (%1.*) that does not " "correspond to the current subnet of this computer (%2.*). Do you want " "to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ), diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp index 5504fa411..77931d165 100644 --- a/kdeprint/messagewindow.cpp +++ b/kdeprint/messagewindow.cpp @@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, MessageWindow::~MessageWindow() { - m_windows.remove( tqparentWidget() ); + m_windows.remove( parentWidget() ); } void MessageWindow::slotTimer() { - TQSize psz = tqparentWidget()->size(), sz = tqsizeHint(); - move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); + TQSize psz = parentWidget()->size(), sz = tqsizeHint(); + move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); if ( !isVisible() ) { show(); diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index cd7c0fbb3..b4587dda5 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->tqparentWidget()->layout()->activate(); + mVersionLabel->parentWidget()->layout()->activate(); } update(); @@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->tqparentWidget()->layout()->activate(); + mIconLabel->parentWidget()->layout()->activate(); } diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 2c5b5caec..3502f9d20 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -813,7 +813,7 @@ void KAction::plugMainWindowAccel( TQWidget *w ) // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 2d926f971..9c5d201fb 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -2024,7 +2024,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h index a9b8e4f6c..97fa3c2e2 100644 --- a/kdeui/kcommand.h +++ b/kdeui/kcommand.h @@ -180,7 +180,7 @@ public: /** * Erases all the undo/redo history. - * Use this when reloading the data, for instance, since this tqinvalidates + * Use this when reloading the data, for instance, since this invalidates * all the commands. */ void clear(); diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp index 264a9992e..655eff862 100644 --- a/kdeui/kdialogbase.cpp +++ b/kdeui/kdialogbase.cpp @@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget) { delete d->detailsWidget; d->detailsWidget = detailsWidget; - if (d->detailsWidget->tqparentWidget() != this) + if (d->detailsWidget->parentWidget() != this) d->detailsWidget->reparent(this, TQPoint(0,0)); d->detailsWidget->hide(); if( mIsActivated ) @@ -1748,7 +1748,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, const TQString& groupName ) const { int w, h; - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); w = tqsizeHint().width(); @@ -1771,7 +1771,7 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, bool global ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(&config, groupName); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index 006c822ad..f5dd09efc 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -323,7 +323,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) delete drag; drag = nd; - if (drag->tqparentWidget()!=this) { + if (drag->parentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } @@ -351,7 +351,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (!btn) return; - if (btn->tqparentWidget()!=this) { + if (btn->parentWidget()!=this) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); @@ -382,7 +382,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { - if (btn->tqparentWidget()==this) { + if (btn->parentWidget()==this) { if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); delete btn; } @@ -858,7 +858,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } #endif @@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable { d->_parent = parent; d->transient = transientEnabled; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( tqparentWidget() ){ + if ( parentWidget() ){ if ( parent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(parent()))->updateName(); } @@ -1091,7 +1091,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // create a new dockwidget that will contain the target and this - TQWidget* parentDock = target->tqparentWidget(); + TQWidget* parentDock = target->parentWidget(); KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock ); newDock->currentDockPos = target->currentDockPos; @@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !parent() ) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } @@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1295,7 +1295,7 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* parentW = tqparentWidget(); + TQWidget* parentW = parentWidget(); if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) @@ -1337,7 +1337,7 @@ void KDockWidget::undock() KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup - TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget(); + TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { @@ -1396,16 +1396,16 @@ void KDockWidget::undock() d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget(); + KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget(); setFormerBrotherDockWidget(secondWidget); applyToWidget( 0L ); group->hide(); - if ( !group->tqparentWidget() ){ + if ( !group->parentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); secondWidget->resize( group->width(), group->height() ); } else { - TQWidget* obj = group->tqparentWidget(); + TQWidget* obj = group->parentWidget(); secondWidget->applyToWidget( obj ); if ( obj->inherits("KDockSplitter") ){ KDockSplitter* parentOfGroup = (KDockSplitter*)obj; @@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) listOfCaption.remove( listOfCaption.length()-1, 1 ); listOfName.remove( listOfName.length()-1, 1 ); - tab->tqparentWidget()->setName( listOfName.utf8() ); - tab->tqparentWidget()->setCaption( listOfCaption ); + tab->parentWidget()->setName( listOfName.utf8() ); + tab->parentWidget()->setCaption( listOfCaption ); - tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint - if ( tab->tqparentWidget()->parent() ) - if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName(); + tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible() } if ( isVisible() ) return; - TQWidget* p = tqparentWidget(); + TQWidget* p = parentWidget(); while ( p ){ if ( !p->isVisible() ) p->show(); - p = p->tqparentWidget(); + p = p->parentWidget(); } if( !parent() ) // is undocked dockBack(); @@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->tqparentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); + if ( w->parentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); } } diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 707a72f19..55ffc6229 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -585,15 +585,15 @@ void KDockSplitter::updateName() if ( !initialised ) return; TQString new_name = TQString( child0->name() ) + "," + child1->name(); - tqparentWidget()->setName( new_name.latin1() ); - tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - tqparentWidget()->tqrepaint( false ); + parentWidget()->setName( new_name.latin1() ); + parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); + parentWidget()->tqrepaint( false ); - ((KDockWidget*)tqparentWidget())->firstName = child0->name(); - ((KDockWidget*)tqparentWidget())->lastName = child1->name(); - ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation; + ((KDockWidget*)parentWidget())->firstName = child0->name(); + ((KDockWidget*)parentWidget())->lastName = child1->name(); + ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation; - TQWidget* p = tqparentWidget()->tqparentWidget(); + TQWidget* p = parentWidget()->parentWidget(); if ( p && p->inherits("KDockSplitter" ) ) ((KDockSplitter*)p)->updateName(); } diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index c64892d8a..6aae075e2 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show) { if( show ) { - xlfdEdit->tqparentWidget()->show(); + xlfdEdit->parentWidget()->show(); } else { - xlfdEdit->tqparentWidget()->hide(); + xlfdEdit->parentWidget()->hide(); } } diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp index 748a0654d..293f9d546 100644 --- a/kdeui/kfontrequester.cpp +++ b/kdeui/kfontrequester.cpp @@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title ) void KFontRequester::buttonClicked() { - int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() ); + int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() ); if ( result == KDialog::Accepted ) { diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp index 5ab906a7c..663838fa8 100644 --- a/kdeui/khelpmenu.cpp +++ b/kdeui/khelpmenu.cpp @@ -307,7 +307,7 @@ void KHelpMenu::contextHelpActivated() TQWhatsThis::enterWhatsThisMode(); TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) - w = w->tqparentWidget(); + w = w->parentWidget(); #ifdef Q_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 584a82c18..3605d492d 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, TQString itemName = items.last(); IconListItem *item = new IconListItem( mIconList, pixmap, itemName ); mIconListToPageStack.insert(item, page); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); if (mIconList->isVisible()) mIconList->updateWidth(); @@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // if( widget->isA(TQFRAME_OBJECT_NAME_STRING) ) { - return d->mPageToInt[widget->tqparentWidget()]; + return d->mPageToInt[widget->parentWidget()]; } else { @@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged() TQFont listFont( mIconList->font() ); listFont.setBold( true ); mIconList->setFont( listFont ); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); } } @@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth() } -void KJanusWidget::IconListBox::tqinvalidateHeight() +void KJanusWidget::IconListBox::invalidateHeight() { mHeightValid = false; } -void KJanusWidget::IconListBox::tqinvalidateWidth() +void KJanusWidget::IconListBox::invalidateWidth() { mWidthValid = false; } diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h index 5f521612c..fc3eb2f27 100644 --- a/kdeui/kjanuswidget.h +++ b/kdeui/kjanuswidget.h @@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public TQWidget IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 ); void updateMinimumHeight(); void updateWidth(); - void tqinvalidateHeight(); - void tqinvalidateWidth(); + void invalidateHeight(); + void invalidateWidth(); void setShowAll( bool showAll ); protected: diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 21b22f76b..1a605be18 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force ) void KMainWindow::saveWindowSize( KConfig * config ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; #if defined Q_WS_X11 @@ -937,7 +937,7 @@ void KMainWindow::restoreWindowSize( KConfig * config ) parseGeometry(true); } else { // restore the size - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if ( d->defaultWindowSize.isNull() ) // only once d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index ed2702a9a..fcd56ddaa 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -167,8 +167,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) top_level = true; d->wasTopLevel = top_level; - if( tqparentWidget() - && tqparentWidget()->tqtopLevelWidget()->isFullScreen()) + if( parentWidget() + && parentWidget()->tqtopLevelWidget()->isFullScreen()) top_level = false; if ( isTopLevelMenu() == top_level ) @@ -189,19 +189,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->margin = margin(); d->fallback_mode = false; bool wasShown = !isHidden(); - reparent( tqparentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); + reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); - if( tqparentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + if( parentWidget()) + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); TQMenuBar::setMargin( 0 ); updateFallbackSize(); d->min_size = TQSize( 0, 0 ); - if( tqparentWidget() && !tqparentWidget()->isTopLevel()) - setShown( tqparentWidget()->isVisible()); + if( parentWidget() && !parentWidget()->isTopLevel()) + setShown( parentWidget()->isVisible()); else if ( wasShown ) show(); } else @@ -217,8 +217,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); updateMenuBarSize(); - if ( tqparentWidget() ) - reparent( tqparentWidget(), TQPoint(0,0), !isHidden()); + if ( parentWidget() ) + reparent( parentWidget(), TQPoint(0,0), !isHidden()); } } @@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()) ) + if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size @@ -257,21 +257,21 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()) && ev->type() == TQEvent::Reparent ) + if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif - setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible()); + setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( tqparentWidget() && !tqparentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget())) + if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget())) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget())) + if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget())) { if( ev->type() == TQEvent::WindowStateChange - && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() ) + && !parentWidget()->tqtopLevelWidget()->isFullScreen() ) setTopLevelMenuInternal( d->wasTopLevel ); } } diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index d592f35cc..152368b87 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -82,7 +82,7 @@ void KPanelApplet::tqsetAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; - tqalignmentChange( a ); + alignmentChange( a ); } // FIXME: Remove implementation for KDE 4 diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index c53fb50ca..34adf910a 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -324,7 +324,7 @@ protected: * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment /*a*/ ) {} + virtual void alignmentChange( Alignment /*a*/ ) {} /** * Use this method to set the custom menu for this applet so that it can be shown diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index 0a5ee11a7..d3dc33c54 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -75,7 +75,7 @@ void KPanelExtension::tqsetAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; - tqalignmentChange( a ); + alignmentChange( a ); } void KPanelExtension::setSize( Size size, int customSize ) diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index 486aa6fc5..d1131638d 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -309,7 +309,7 @@ protected: * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment ) {} + virtual void alignmentChange( Alignment ) {} /** * Use this method to set the custom menu for this extensions so that it can be shown diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index 6b63a951c..c4ef260e7 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -353,7 +353,7 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // therefore the lastHitIndex is valid i = d->lastHitIndex; } - } else if (key == Key_Backspace && tqparentMenu) { + } else if (key == Key_Backspace && parentMenu) { // backspace with no chars in the buffer... go back a menu. hide(); resetKeyboardVars(); diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp index c9bebc47d..f0586ab28 100644 --- a/kdeui/ksystemtray.cpp +++ b/kdeui/ksystemtray.cpp @@ -77,13 +77,13 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) move( -1000, -1000 ); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); - if (tqparentWidget()) + if (parentWidget()) { new KAction(i18n("Minimize"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 - KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId()); + KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId()); d->on_all_desktops = info.onAllDesktops(); #else d->on_all_desktops = false; @@ -152,9 +152,9 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) case Qt::MidButton: // fall through case Qt::RightButton: - if ( tqparentWidget() ) { + if ( parentWidget() ) { KAction* action = d->actionCollection->action("minimizeRestore"); - if ( tqparentWidget()->isVisible() ) + if ( parentWidget()->isVisible() ) action->setText( i18n("&Minimize") ); else action->setText( i18n("&Restore") ); @@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* ) // entry is "minimize", otherwise it's "restore" void KSystemTray::minimizeRestoreAction() { - if ( tqparentWidget() ) { - bool restore = !( tqparentWidget()->isVisible() ); + if ( parentWidget() ) { + bool restore = !( parentWidget()->isVisible() ); minimizeRestore( restore ); } } @@ -207,9 +207,9 @@ void KSystemTray::maybeQuit() // KDE4: stop closing the parent widget? it results in complex application code // instead make applications connect to the quitSelected() signal - if (tqparentWidget()) + if (parentWidget()) { - tqparentWidget()->close(); + parentWidget()->close(); } else { @@ -237,7 +237,7 @@ void KSystemTray::setInactive() // (just like taskbar); otherwise hide it void KSystemTray::activateOrHide() { - TQWidget *pw = tqparentWidget(); + TQWidget *pw = parentWidget(); if ( !pw ) return; @@ -283,7 +283,7 @@ void KSystemTray::activateOrHide() void KSystemTray::minimizeRestore( bool restore ) { - TQWidget* pw = tqparentWidget(); + TQWidget* pw = parentWidget(); if( !pw ) return; #ifdef Q_WS_X11 diff --git a/kdeui/ksystemtray.h b/kdeui/ksystemtray.h index 0e22b1d6a..26e1b948a 100644 --- a/kdeui/ksystemtray.h +++ b/kdeui/ksystemtray.h @@ -163,7 +163,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the tqparentWidget() and the context menu. + for the parentWidget() and the context menu. Feel free to reimplement this if you need something special. */ @@ -171,7 +171,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the tqparentWidget() and the context menu. + for the parentWidget() and the context menu. Feel free to reimplement this if you need something special. */ diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index 18c5a03d6..8e2477e5f 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) mActivateDragSwitchTabTimer = new TQTimer( this ); connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); } KTabBar::~KTabBar() diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp index 884ff6a59..9846059ed 100644 --- a/kdeui/kurllabel.cpp +++ b/kdeui/kurllabel.cpp @@ -353,8 +353,8 @@ bool KURLLabel::event (TQEvent *e) { if (e && e->type() == TQEvent::ParentPaletteChange) { - // use tqparentWidget() unless you are a toplevel widget, then try qAapp - TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette(); + // use parentWidget() unless you are a toplevel widget, then try qAapp + TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground()); setPalette(p); diff --git a/kdeui/kwhatsthismanager.cpp b/kdeui/kwhatsthismanager.cpp index 0ec05e5c4..b7873ed0e 100644 --- a/kdeui/kwhatsthismanager.cpp +++ b/kdeui/kwhatsthismanager.cpp @@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &) " describe the widget, you are welcome to <a href=\"submit" "-whatsthis\">send us your own \"What's This?\" help</a> for it."); TQString parent; - if (m_widget -> tqparentWidget ()) - parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ()); + if (m_widget -> parentWidget ()) + parent = TQWhatsThis::textFor (m_widget -> parentWidget ()); if (parent != txt) if (! parent . isEmpty ()) return parent; @@ -68,7 +68,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n"); TQString dsc = TQString ("current --> ") + m_widget -> name (); dsc . append (TQString (" (") + m_widget -> className () + ")\n"); - for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) { + for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> parentWidget ()) { dsc . append (w -> name ()); dsc . append (TQString (" (") + w -> className () + ")\n"); } diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp index e6412fa6d..123d85b2c 100644 --- a/kdeui/kxmlguibuilder.cpp +++ b/kdeui/kxmlguibuilder.cpp @@ -146,7 +146,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // otherwise its shortcuts appear. TQWidget* p = parent; while ( p && !::tqqt_cast<KMainWindow *>( p ) ) - p = p->tqparentWidget(); + p = p->parentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index 150a5aa23..a20be86d6 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.tqparentNode().tqreplaceChild(additive, base); + base.parentNode().tqreplaceChild(additive, base); return true; } diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index c08e012a4..794579cdb 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -839,7 +839,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) { TQWidget* pos = this; while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget())) - pos = pos->tqparentWidget(); + pos = pos->parentWidget(); if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 0962a7916..e7c136f38 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { m_button = TQT_TQOBJECT_CONST(sender())->name(); - static_cast<const TQWidget*>(sender())->tqparentWidget()->close(); + static_cast<const TQWidget*>(sender())->parentWidget()->close(); } #include "kjavaappletserver.moc" diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 981f8e49e..bb80a1e83 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); } void KHTMLFactory::ref() diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e5319bf83..e9d5c62a8 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -45,7 +45,7 @@ public: KHTMLFactory( bool clone = false ); virtual ~KHTMLFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); static void registerPart( KHTMLPart *part ); static void deregisterPart( KHTMLPart *part ); diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 64f0ea247..3363c02f6 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; @@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, tqparentWidget, widgetname ), prof ); + init( new KHTMLView( this, parentWidget, widgetname ), prof ); } KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) @@ -4643,7 +4643,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName, +KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) @@ -4679,9 +4679,9 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) - res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); + res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(tqparentWidget), widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index 95cd952b1..af8a1695d 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -243,10 +243,10 @@ public: * rendered in. You can specify two different parent objects for a * KHTMLPart, one parent for the KHTMLPart document and on parent * for the KHTMLView. If the second @p parent argument is 0L, then - * @p tqparentWidget is used as parent for both objects, the part and + * @p parentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0, + KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); @@ -1168,7 +1168,7 @@ protected: * to be a object of your derived type, in which case you should return a new instance for * the mimetype 'text/html' . */ - virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 195602849..a8ee4d7ef 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory() delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, +KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent ); setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_khtml->setAutoloadImages( true ); diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index 735df4491..dda918177 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -44,7 +44,7 @@ public: KHTMLImageFactory(); virtual ~KHTMLImageFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); @@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, + KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); virtual ~KHTMLImage(); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 6502ade52..2cbd99384 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if (d->clickCount > 0 && TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) { - d->clickCount = 0; // moving the mouse outside the threshold tqinvalidates the click + d->clickCount = 0; // moving the mouse outside the threshold invalidates the click } // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events @@ -1903,7 +1903,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) if (c->isWidgetType()) { TQWidget *w = TQT_TQWIDGET(c); // don't install the event filter on toplevels - if (w->tqparentWidget(true) == view) { + if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__khtml")) { w->installEventFilter(this); w->unsetCursor(); @@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *c = v; while (v && v != view) { c = v; - v = v->tqparentWidget(true); + v = v->parentWidget(true); } if (v && !strcmp(c->name(), "__khtml")) { @@ -1948,7 +1948,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) while (v && v != view) { x += v->x(); y += v->y(); - v = v->tqparentWidget(); + v = v->parentWidget(); } viewportToContents( x, y, x, y ); TQPaintEvent *pe = TQT_TQPAINTEVENT(e); @@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->tqparentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { + if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->tqparentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { + if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 187e051d1..8aeb2cdbd 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index a17269d74..f3bf95219 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart { Q_OBJECT public: - KMultiPart( TQWidget *tqparentWidget, const char *widgetName, + KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KMultiPart(); diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index f2e64b5f8..30beadd7c 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -1329,7 +1329,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin m_overflowHeight = 0; - tqinvalidateVerticalPositions(); + invalidateVerticalPositions(); #ifdef DEBUG_LAYOUT TQTime qt; qt.start(); diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index f2822bc94..cd4ef30ca 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -137,7 +137,7 @@ protected: void updateDocumentSize(); // internal setters for cached values of document width/height - // Setting to -1/-1 tqinvalidates the cache. + // Setting to -1/-1 invalidates the cache. void setCachedDocWidth(int w ) { m_cachedDocWidth = w; } void setCachedDocHeight(int h) { m_cachedDocHeight = h; } diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index 89adbf548..8c4c8ab56 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2; } -void RenderObject::tqinvalidateVerticalPositions() +void RenderObject::invalidateVerticalPositions() { m_verticalPosition = PositionUndefined; RenderObject *child = firstChild(); while( child ) { - child->tqinvalidateVerticalPositions(); + child->invalidateVerticalPositions(); child = child->nextSibling(); } } diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index 49e9065e4..e403601d3 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -748,7 +748,7 @@ public: virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } // recursively tqinvalidate current layout - // unused: void tqinvalidateLayout(); + // unused: void invalidateLayout(); virtual void calcVerticalMargins() {} void removeFromObjectLists(); @@ -790,7 +790,7 @@ protected: virtual TQRect viewRect() const; void remove(); - void tqinvalidateVerticalPositions(); + void invalidateVerticalPositions(); bool attemptDirectLayerTranslation(); void updateWidgetMasks(); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 49c5097f6..80632cc81 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -667,7 +667,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) break; case TQEvent::Wheel: - if (widget()->tqparentWidget() == view()->viewport()) { + if (widget()->parentWidget() == view()->viewport()) { // don't allow the widget to react to wheel event unless its // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 2d456ddeb..9721788a2 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -271,7 +271,7 @@ bool KBookmark::isSeparator() const bool KBookmark::hasParent() const { - TQDomElement parent = element.tqparentNode().toElement(); + TQDomElement parent = element.parentNode().toElement(); return !parent.isNull(); } @@ -311,7 +311,7 @@ TQString KBookmark::icon() const KBookmarkGroup KBookmark::parentGroup() const { - return KBookmarkGroup( element.tqparentNode().toElement() ); + return KBookmarkGroup( element.parentNode().toElement() ); } KBookmarkGroup KBookmark::toGroup() const diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index fa4ce416b..250d62a59 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -234,7 +234,7 @@ void KBookmarkManager::parse() const if ( n.isProcessingInstruction() ) { TQDomProcessingInstruction pi = n.toProcessingInstruction(); - pi.tqparentNode().removeChild(pi); + pi.parentNode().removeChild(pi); } TQDomProcessingInstruction pi; diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index c0f73949e..8ce3e87af 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -53,7 +53,7 @@ KFilePreview::~KFilePreview() // don't delete the preview, we can reuse it // (it will get deleted by ~KDirOperator) - if ( preview && preview->tqparentWidget() == this ) { + if ( preview && preview->parentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index a04f89773..3c0a85423 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -130,7 +130,7 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); + TQHeader *header = static_cast<TQHeader*>( parentWidget() ); int section = 0; if ( header->orientation() == Qt::Horizontal ) diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 5cb7afe58..218a72f37 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -401,7 +401,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) } else { m_listBox = view; - if ( m_listBox->tqparentWidget() != this ) + if ( m_listBox->parentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index 66b79925e..86286bcda 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = tqparentWidget(); + TQWidget *p = parentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 510d3538c..867d4004f 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -318,10 +318,10 @@ void Job::showErrorDialog( TQWidget * parent ) } } -void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget ) +void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) { d->m_autoErrorHandling = enable; - d->m_errorParentWidget = tqparentWidget; + d->m_errorParentWidget = parentWidget; } bool Job::isAutoErrorHandlingEnabled() const diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 6651565f1..03ff3d452 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -155,17 +155,17 @@ namespace KIO { /** * Enable or disable the automatic error handling. When automatic * error handling is enabled and an error occurs, then showErrorDialog() - * is called with the specified @p tqparentWidget (if supplied) , right before + * is called with the specified @p parentWidget (if supplied) , right before * the emission of the result signal. * * The default is false. * * @param enable enable or disable automatic error handling - * @param tqparentWidget the parent widget, passed to showErrorDialog. + * @param parentWidget the parent widget, passed to showErrorDialog. * Can be 0 for top-level * @see isAutoErrorHandlingEnabled(), showErrorDialog() */ - void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 ); + void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 ); /** * Returns whether automatic error handling is enabled or disabled. diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 4d12bf3e9..5dd138b05 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -447,7 +447,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, if ( currentTag == type ) { acl_delete_entry( newACL, entry ); // we have to start from the beginning, the iterator is - // tqinvalidated, on deletion + // invalidated, on deletion ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry ); } else { ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry ); diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index b15731f1c..6574ba012 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -1098,7 +1098,7 @@ void KFileItem::virtual_hook( int, void* ) TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ) { - // We don't need to save/restore anything that refresh() tqinvalidates, + // We don't need to save/restore anything that refresh() invalidates, // since that means we can re-determine those by ourselves. s << a.m_url; s << a.m_strName; diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 748f62347..b2b27d363 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -712,7 +712,7 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { const TQString& wallet = w->walletName(); assert(_passwords.tqcontains(wallet)); if (w->refCount() == 0 || force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } @@ -757,7 +757,7 @@ int KWalletD::close(int handle, bool force) { } _wallets.remove(handle); if (force) { - tqinvalidateHandle(handle); + invalidateHandle(handle); } if (_passwords.tqcontains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::tqinvalidateHandle(int handle) { +void KWalletD::invalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index ba83b4efc..2aea371ba 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/kwalletd/kwalletd.h @@ -161,7 +161,7 @@ class KWalletD : public KDEDModule { // Generate a new unique handle. int generateHandle(); // Invalidate a handle (remove it from the TQMap) - void tqinvalidateHandle(int handle); + void invalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); diff --git a/kioslave/http/http.h b/kioslave/http/http.h index c5de923d0..2985eb938 100644 --- a/kioslave/http/http.h +++ b/kioslave/http/http.h @@ -403,7 +403,7 @@ protected: /** * Resets any per connection settings. These are different from - * per-session settings in that they must be tqinvalidates every time + * per-session settings in that they must be invalidates every time * a request is made, e.g. a retry to re-send the header to the * server, as compared to only when a new request arrives. */ diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 6302a8406..6ac025c7f 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -181,8 +181,8 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_revMap.insert(tab,w); - if (((KDockWidget*)tqparentWidget())->mayBeShow()) - ((KDockWidget*)tqparentWidget())->dockBack(); + if (((KDockWidget*)parentWidget())->mayBeShow()) + ((KDockWidget*)parentWidget())->dockBack(); if (::tqqt_cast<KDockWidgetHeader*>(w->getHeader())) { @@ -335,7 +335,7 @@ void DockContainer::changeOverlapMode() void DockContainer::hideIfNeeded() { kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl; if (!itemNames.count()) - ((KDockWidget*)tqparentWidget())->undock(); + ((KDockWidget*)parentWidget())->undock(); } void DockContainer::removeWidget(KDockWidget* dwdg) @@ -363,7 +363,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) tabCaptions.remove(w->name()); tabTooltips.remove(w->name()); if (!itemNames.count()) - ((KDockWidget*)tqparentWidget())->undock(); + ((KDockWidget*)parentWidget())->undock(); } void DockContainer::undockWidget(KDockWidget *dwdg) diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index ac45fc3a5..aea04fa01 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -97,8 +97,8 @@ namespace KMDI { //============ constructor ============// -MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name) - : KParts::DockMainWindow( tqparentWidget, name) +MainWindow::MainWindow(TQWidget* parentWidget, const char* name) + : KParts::DockMainWindow( parentWidget, name) , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>) , d(new KMDIPrivate::MainWindowPrivate()) { @@ -156,19 +156,19 @@ void MainWindow::setupToolViews () w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - TQPtrList<KDockWidget> leftRetqparentWidgets; - TQPtrList<KDockWidget> rightRetqparentWidgets; - TQPtrList<KDockWidget> bottomRetqparentWidgets; - TQPtrList<KDockWidget> topRetqparentWidgets; + TQPtrList<KDockWidget> leftReparentWidgets; + TQPtrList<KDockWidget> rightReparentWidgets; + TQPtrList<KDockWidget> bottomReparentWidgets; + TQPtrList<KDockWidget> topReparentWidgets; if (mainDock->parentDockTabGroup()) { mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - findToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft); - findToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight); - findToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom); - findToolViewsDockedToMain(&topRetqparentWidgets,KDockWidget::DockTop); + findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); + findToolViewsDockedToMain(&rightReparentWidgets,KDockWidget::DockRight); + findToolViewsDockedToMain(&bottomReparentWidgets,KDockWidget::DockBottom); + findToolViewsDockedToMain(&topReparentWidgets,KDockWidget::DockTop); mainDock->setEnableDocking(KDockWidget::DockNone); //::DockCorner); mainDock->setDockSite(KDockWidget::DockCorner); @@ -220,10 +220,10 @@ void MainWindow::setupToolViews () m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers(leftRetqparentWidgets,m_leftContainer); - dockToolViewsIntoContainers(rightRetqparentWidgets,m_rightContainer); - dockToolViewsIntoContainers(bottomRetqparentWidgets,m_bottomContainer); - dockToolViewsIntoContainers(topRetqparentWidgets,m_topContainer); + dockToolViewsIntoContainers(leftReparentWidgets,m_leftContainer); + dockToolViewsIntoContainers(rightReparentWidgets,m_rightContainer); + dockToolViewsIntoContainers(bottomReparentWidgets,m_bottomContainer); + dockToolViewsIntoContainers(topReparentWidgets,m_topContainer); dockManager->setSpecialLeftDockContainer(m_leftContainer); dockManager->setSpecialRightDockContainer(m_rightContainer); diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index 597bc15f5..d7351a330 100644 --- a/kmdi/kmdi/mainwindow.h +++ b/kmdi/kmdi/mainwindow.h @@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow /** * Constructor. */ - MainWindow ( TQWidget* tqparentWidget, const char* name = ""); + MainWindow ( TQWidget* parentWidget, const char* name = ""); /** * Destructor. diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 0a35ba25f..c0d191ff4 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -186,8 +186,8 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd if (!DockToOurself) if(pTargetWnd != 0L) { pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); if (!pTargetDock) { - if (pTargetWnd->tqparentWidget()) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget()); + if (pTargetWnd->parentWidget()) { + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget()); } } } diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index 97f5f246c..63bdc5a24 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) ) { // same as: if no button or left button pressed - TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); resizeWindow( m_iResizeCorner, p.x(), p.y() ); } else @@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons() TQRect KMdiChildFrm::mdiAreaContentsRect() const { - TQFrame * p = ( TQFrame* ) tqparentWidget(); + TQFrame * p = ( TQFrame* ) parentWidget(); if ( p ) { return p->contentsRect(); diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index eb64c9395..f14b03e6f 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/kmdichildfrmcaption.cpp @@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset; // set new child frame position - tqparentWidget() ->move( mousePosInChildArea ); + parentWidget() ->move( mousePosInChildArea ); } //=============== setActive ===============// diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index ee64bf159..9c1d18c7b 100644 --- a/kmdi/kmdichildview.cpp +++ b/kmdi/kmdichildview.cpp @@ -44,8 +44,8 @@ //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f ) - : TQWidget( tqparentWidget, name, f ) +KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f ) + : TQWidget( parentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) @@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f ) - : TQWidget( tqparentWidget, name, f ) +KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f ) + : TQWidget( parentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h index e02325e79..1c1f2a1cf 100644 --- a/kmdi/kmdichildview.h +++ b/kmdi/kmdichildview.h @@ -182,13 +182,13 @@ public: /** * Constructor */ - KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Constructor * sets "Unnamed" as default caption */ - KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Destructor @@ -603,7 +603,7 @@ private: inline KMdiChildFrm *KMdiChildView::mdiParent() const { - TQWidget * pw = tqparentWidget(); + TQWidget * pw = parentWidget(); if ( pw != 0L ) if ( pw->inherits( "KMdiChildFrm" ) ) return ( KMdiChildFrm * ) pw; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 9720c5214..caf335a85 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -204,8 +204,8 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_map.insert( w, tab ); m_revMap.insert( tab, w ); - if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() ) - ( ( KDockWidget* ) tqparentWidget() ) ->dockBack(); + if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) + ( ( KDockWidget* ) parentWidget() ) ->dockBack(); if ( ::tqqt_cast<KDockWidgetHeader*>(w->getHeader()) ) { @@ -362,7 +362,7 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) tqparentWidget() )->undock(); + ( ( KDockWidget* ) parentWidget() )->undock(); } } diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 487f9c2b2..36c743bf8 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -136,8 +136,8 @@ public: }; //============ constructor ============// -KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) - : KParts::DockMainWindow( tqparentWidget, name, flags ) +KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) + : KParts::DockMainWindow( parentWidget, name, flags ) , m_mdiMode( KMdi::UndefinedMode ) , m_pMdi( 0L ) , m_pTaskBar( 0L ) @@ -294,7 +294,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the children first to a list, as removing tqinvalidates our iterator + //save the children first to a list, as removing invalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) children.append( w ); @@ -391,7 +391,7 @@ void KMdiMainFrm::slot_toggleTaskBar() void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { if ( e->oldSize().height() != e->size().height() ) return ; @@ -406,7 +406,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) void KMdiMainFrm::setMinimumSize( int minw, int minh ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) return ; DockMainWindow::setMinimumSize( minw, minh ); } @@ -627,7 +627,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic lpC->setClient( pWnd, bAutomaticResize ); lpC->setFocus(); pWnd->youAreAttached( lpC ); - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -772,12 +772,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews; m_pClose->hide(); } - KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) m_pClose->hide(); } #if 0 - KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -1234,7 +1234,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the children first to a list, as removing tqinvalidates our iterator + //save the children first to a list, as removing invalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { @@ -1302,7 +1302,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->tqparentWidget(); + pW = pW->parentWidget(); } if ( rootDockWindow ) @@ -1395,7 +1395,7 @@ void KMdiMainFrm::switchToToplevelMode() setMainDockWidget( m_pDockbaseAreaOfDocumentViews ); } // TQApplication::sendPostedEvents(); //why do we need to empty the event queue? - if ( !tqparentWidget() ) + if ( !parentWidget() ) { //if we don't have a parent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by @@ -1556,7 +1556,7 @@ void KMdiMainFrm::switchToChildframeMode() if ( !pView->isToolView() ) pView->show(); } - if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1662,7 +1662,7 @@ void KMdiMainFrm::finishTabPageMode() TQSize mins = pView->tqminimumSize(); TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->tqparentWidget(); + TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); m_documentTabWidget->removePage( pView ); pView->reparent( 0, 0, p ); @@ -1688,7 +1688,7 @@ void KMdiMainFrm::finishTabPageMode() void KMdiMainFrm::setupTabbedDocumentViewSpace() { // resize to childframe mode size of the mainwindow if we were in toplevel mode - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() if ( mainDock->parentDockTabGroup() ) w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); - TQPtrList<KDockWidget> leftRetqparentWidgets; - TQPtrList<KDockWidget> rightRetqparentWidgets; - TQPtrList<KDockWidget> bottomRetqparentWidgets; - TQPtrList<KDockWidget> topRetqparentWidgets; + TQPtrList<KDockWidget> leftReparentWidgets; + TQPtrList<KDockWidget> rightReparentWidgets; + TQPtrList<KDockWidget> bottomReparentWidgets; + TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); - findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft ); - findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight ); - findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom ); - findToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop ); + findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); + findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); + findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom ); + findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop ); mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner); mainDock->setDockSite( KDockWidget::DockCorner ); @@ -1996,10 +1996,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer ); - dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer ); - dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer ); - dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer ); + dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer ); + dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer ); + dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer ); + dockToolViewsIntoContainers( topReparentWidgets, m_topContainer ); dockManager->setSpecialLeftDockContainer( m_leftContainer ); @@ -2078,7 +2078,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) TQSize mins = pView->tqminimumSize(); TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->tqparentWidget(); + TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); pView->reparent( 0, 0, p ); pView->reparent( 0, 0, p ); @@ -2101,7 +2101,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) } else { - pParent = pParent->tqparentWidget(); + pParent = pParent->parentWidget(); } } while ( pParent && !pDockW ); @@ -2262,10 +2262,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition() { if ( m_pMainMenuBar == 0L ) return ; - if ( m_pMainMenuBar->tqparentWidget() == 0L ) + if ( m_pMainMenuBar->parentWidget() == 0L ) return ; - int menuW = m_pMainMenuBar->tqparentWidget() ->width(); + int menuW = m_pMainMenuBar->parentWidget() ->width(); int h; int y; if ( frameDecorOfAttachedViews() == KMdi::Win95Look ) diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index e38797d75..f6fecbb9c 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -296,7 +296,7 @@ private: // methods public: - KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) ); + KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) ); virtual ~KMdiMainFrm(); /** diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index 9a412acb5..20034480f 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/kmditaskbar.cpp @@ -343,7 +343,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) int tbHandlePixel; tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; - if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) + if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) { diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index f12caba05..fa8a35f74 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd ); if ( !pTargetDock ) { - if ( pTargetWnd->tqparentWidget() ) + if ( pTargetWnd->parentWidget() ) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() ); } } } diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index a560a8902..e00a4d705 100644 --- a/kmdi/test/hello.cpp +++ b/kmdi/test/hello.cpp @@ -18,8 +18,8 @@ Constructs a Hello widget. Starts a 40 ms animation timer. */ -Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget ) - : KMdiChildView(title, tqparentWidget), t(text), b(0) +Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) + : KMdiChildView(title, parentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); diff --git a/kmdi/test/hello.h b/kmdi/test/hello.h index 762318d87..808d25b90 100644 --- a/kmdi/test/hello.h +++ b/kmdi/test/hello.h @@ -22,7 +22,7 @@ class Hello : public KMdiChildView { Q_OBJECT public: - Hello( const char *title, const char *text, TQWidget* tqparentWidget = 0 ); + Hello( const char *title, const char *text, TQWidget* parentWidget = 0 ); signals: void clicked(); protected: diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index bfb1135dd..e460c2318 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -46,8 +46,8 @@ struct Engine::Private }; Engine::Engine( KNewStuff *newStuff, const TQString &type, - TQWidget *tqparentWidget ) : - mParentWidget( tqparentWidget ), mDownloadDialog( 0 ), + TQWidget *parentWidget ) : + mParentWidget( parentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), d(new Private), mType( type ) { @@ -57,8 +57,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type, } Engine::Engine( KNewStuff *newStuff, const TQString &type, - const TQString &providerList, TQWidget *tqparentWidget ) : - mParentWidget( tqparentWidget ), + const TQString &providerList, TQWidget *parentWidget ) : + mParentWidget( parentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), mProviderList( providerList ), d(new Private), diff --git a/knewstuff/engine.h b/knewstuff/engine.h index 14c7e2b3d..f4b0b4920 100644 --- a/knewstuff/engine.h +++ b/knewstuff/engine.h @@ -58,18 +58,18 @@ class KDE_EXPORT Engine : public TQObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" - @param tqparentWidget the parent window + @param parentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 ); /** Constructor. @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" @param providerList the URL of the provider list - @param tqparentWidget the parent window + @param parentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); /** Destructor. @@ -88,7 +88,7 @@ class KDE_EXPORT Engine : public TQObject @return parent widget */ - TQWidget *tqparentWidget() const { return mParentWidget; } + TQWidget *parentWidget() const { return mParentWidget; } /** Initiates the download process, retrieving provider lists and invoking diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index 84fef0ac1..6a37aa61d 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -39,14 +39,14 @@ KAction* KNS::standardAction(const TQString& what, 0, recvr, slot, parent, name); } -KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget ) +KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget ) { - mEngine = new Engine( this, type, tqparentWidget ); + mEngine = new Engine( this, type, parentWidget ); } -KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget ) +KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget ) { - mEngine = new Engine( this, type, providerList, tqparentWidget ); + mEngine = new Engine( this, type, providerList, parentWidget ); } TQString KNewStuff::type() const @@ -54,9 +54,9 @@ TQString KNewStuff::type() const return mEngine->type(); } -TQWidget *KNewStuff::tqparentWidget() const +TQWidget *KNewStuff::parentWidget() const { - return mEngine->tqparentWidget(); + return mEngine->parentWidget(); } KNewStuff::~KNewStuff() diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h index 0891aa4de..5d2319aec 100644 --- a/knewstuff/knewstuff.h +++ b/knewstuff/knewstuff.h @@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 ); + KNewStuff( const TQString &type, TQWidget *parentWidget = 0 ); /** Constructor. @@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper @param providerList the URL of the provider list - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); + KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); virtual ~KNewStuff(); /** @@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff /** Return parent widget. */ - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; /** Start download process. diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 6dfccf202..8438e25ea 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -135,7 +135,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) TQString file = destinationPath(entry); if ( KStandardDirs::exists( file ) ) { - int result = KMessageBox::warningContinueCancel( tqparentWidget(), + int result = KMessageBox::warningContinueCancel( parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg( file ), TQString::null, i18n("Overwrite") ); diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index ed68fcf8a..f68be7ae3 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -33,8 +33,8 @@ using namespace KNS; -KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget) - : KNewStuff(type, tqparentWidget) +KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *parentWidget) + : KNewStuff(type, parentWidget) { m_tempDir = 0L; connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool))); @@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName) } else ok = false; if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); return ok; } @@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result) if (!valid) { signatureStr.prepend( "<br>"); - if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) valid = true; } else - KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); + KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); if (valid) { installResource(); @@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result) { if (result == 0) { - KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason.")); + KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason.")); } else { if (result & Security::BAD_PASSPHRASE) { - if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) { disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); removeTempDirectory(); @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget()); + KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/knewstuffsecure.h b/knewstuff/knewstuffsecure.h index 52a8d856b..1a6bc44a1 100644 --- a/knewstuff/knewstuffsecure.h +++ b/knewstuff/knewstuffsecure.h @@ -46,10 +46,10 @@ public: @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget=0); + KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0); virtual ~KNewStuffSecure(); /** Installs the downloaded resource. Do not call or reimplement directly. diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index 1d059d34f..813aee041 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -206,8 +206,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren } -ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) : - TQObject( tqparentWidget ) +ProviderLoader::ProviderLoader( TQWidget *parentWidget ) : + TQObject( parentWidget ) { mProviders.setAutoDelete( true ); } diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 98b5b7def..37e2a8daf 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -176,9 +176,9 @@ class KDE_EXPORT ProviderLoader : public TQObject /** * Constructor. * - * @param tqparentWidget the parent widget + * @param parentWidget the parent widget */ - ProviderLoader( TQWidget *tqparentWidget ); + ProviderLoader( TQWidget *parentWidget ); /** * Starts asynchronously loading the list of providers of the diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h index 64feac1c8..ac37cabfe 100644 --- a/kparts/componentfactory.h +++ b/kparts/componentfactory.h @@ -82,7 +82,7 @@ namespace KParts * \endcode * * @param factory The factory to ask for the creation of the component - * @param tqparentWidget the parent widget for the part + * @param parentWidget the parent widget for the part * @param widgetName the name of the part's widget * @param parent The parent object (see TQObject constructor) * @param name The name of the object to create (see TQObject constructor) @@ -93,13 +93,13 @@ namespace KParts */ template <class T> static T *createPartInstanceFromFactory( KParts::Factory *factory, - TQWidget *tqparentWidget = 0, + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ) { - KParts::Part *object = factory->createPart( tqparentWidget, widgetName, + KParts::Part *object = factory->createPart( parentWidget, widgetName, parent, name, T::tqstaticMetaObject()->className(), args ); @@ -156,7 +156,7 @@ namespace KParts template <class T> static T *createPartInstanceFromLibrary( const char *libraryName, - TQWidget *tqparentWidget = 0, + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -186,7 +186,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - T *res = createPartInstanceFromFactory<T>( partFactory, tqparentWidget, + T *res = createPartInstanceFromFactory<T>( partFactory, parentWidget, widgetName, parent, name, args ); if ( !res ) { @@ -218,7 +218,7 @@ namespace KParts template <class T> static T *createPartInstanceFromService( const KService::Ptr &service, - TQWidget *tqparentWidget = 0, + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -233,7 +233,7 @@ namespace KParts return 0; } - return createPartInstanceFromLibrary<T>( library.local8Bit().data(), tqparentWidget, + return createPartInstanceFromLibrary<T>( library.local8Bit().data(), parentWidget, widgetName, parent, name, args, error ); } @@ -267,7 +267,7 @@ namespace KParts template <class T, class ServiceIterator> static T *createPartInstanceFromServices( ServiceIterator begin, ServiceIterator end, - TQWidget *tqparentWidget = 0, + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -281,7 +281,7 @@ namespace KParts if ( error ) *error = 0; - T *component = createPartInstanceFromService<T>( service, tqparentWidget, + T *component = createPartInstanceFromService<T>( service, parentWidget, widgetName, parent, name, args, error ); if ( component ) @@ -344,18 +344,18 @@ namespace KParts * You can use this method to create a generic viewer - that can display any * kind of file, provided that there is a ReadOnlyPart installed for it - in 5 lines: * \code - * // Given the following: KURL url, TQWidget* tqparentWidget and TQObject* parentObject. + * // Given the following: KURL url, TQWidget* parentWidget and TQObject* parentObject. * TQString mimetype = KMimeType::findByURL( url )->name(); - * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, tqparentWidget, 0, parentObject, 0 ); + * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, parentWidget, 0, parentObject, 0 ); * if ( part ) { * part->openURL( url ); - * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as tqparentWidget + * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as parentWidget * } * \endcode * * @param serviceType the type of service for which to find a part, e.g. a mimetype * @param constraint an optional constraint to pass to the trader (see KTrader) - * @param tqparentWidget the parent widget, will be set as the parent of the part's widget + * @param parentWidget the parent widget, will be set as the parent of the part's widget * @param widgetName the name that will be given to the part's widget * @param parent the parent object for the part itself * @param name the name that will be given to the part @@ -369,7 +369,7 @@ namespace KParts template <class T> static T *createPartInstanceFromQuery( const TQString &serviceType, const TQString &constraint, - TQWidget *tqparentWidget = 0, + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -385,7 +385,7 @@ namespace KParts } return createPartInstanceFromServices<T>( offers.begin(), offers.end(), - tqparentWidget, widgetName, + parentWidget, widgetName, parent, name, args, error ); } diff --git a/kparts/factory.cpp b/kparts/factory.cpp index 092d550d1..7d04b43d1 100644 --- a/kparts/factory.cpp +++ b/kparts/factory.cpp @@ -39,9 +39,9 @@ Factory::~Factory() { } -Part *Factory::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) +Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - Part* part = createPartObject( tqparentWidget, widgetName, parent, name, classname, args ); + Part* part = createPartObject( parentWidget, widgetName, parent, name, classname, args ); if ( part ) emit objectCreated( part ); return part; diff --git a/kparts/factory.h b/kparts/factory.h index d8315bd1b..26c53b9dc 100644 --- a/kparts/factory.h +++ b/kparts/factory.h @@ -60,7 +60,7 @@ public: * \endcode * This could result in a call to * \code - * createPart( tqparentWidget, name, parentObject, parentName, "KParts::Part", + * createPart( parentWidget, name, parentObject, parentName, "KParts::Part", * TQStringList("name1="value1"", "name2="value2") ); * \endcode * @@ -71,7 +71,7 @@ public: * important for reference counting, and allows unloading the * library automatically once all its objects have been destroyed. */ - Part *createPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); + Part *createPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); /** * If you have a part contained in a shared library you might want to query @@ -108,13 +108,13 @@ protected: * \endcode * This could result in a call to * \code - * createPart( tqparentWidget, name, parentObject, parentName, "Kparts::Part", + * createPart( parentWidget, name, parentObject, parentName, "Kparts::Part", * TQStringList("name1="value1"", "name2="value2") ); * \endcode * * @returns the newly created part. */ - virtual Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0; + virtual Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0; /** * Reimplemented from KLibFactory. Calls createPart() diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h index 241943fcb..f4ab3be16 100644 --- a/kparts/genericfactory.h +++ b/kparts/genericfactory.h @@ -66,7 +66,7 @@ namespace KParts * * The template argument has to inherit from KParts::Part and has to implement two methods: * 1) There needs to be a public constructor with the following signature: - * MyPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ) + * MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ) * * 2) It needs to provide one static method to create a KAboutData object per * request, holding information about the component's name, its authors, license, etc. @@ -97,12 +97,12 @@ namespace KParts public: GenericFactory() { } - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - T *part = KDEPrivate::ConcreteFactory<T>::create( tqparentWidget, + T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget, widgetName, parent, name, @@ -125,12 +125,12 @@ namespace KParts public: GenericFactory() { } - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( tqparentWidget, + TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( parentWidget, widgetName, parent, name, className, diff --git a/kparts/part.cpp b/kparts/part.cpp index 201a774a7..aacdf4c74 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -162,10 +162,10 @@ Part::~Part() delete d; } -void Part::embed( TQWidget * tqparentWidget ) +void Part::embed( TQWidget * parentWidget ) { if ( widget() ) - widget()->reparent( tqparentWidget, 0, TQPoint( 0, 0 ), true ); + widget()->reparent( parentWidget, 0, TQPoint( 0, 0 ), true ); } TQWidget *Part::widget() diff --git a/kparts/part.h b/kparts/part.h index 7913710c7..0c4023f6c 100644 --- a/kparts/part.h +++ b/kparts/part.h @@ -208,7 +208,7 @@ public: * This method is not recommended since creating the widget with the correct * parent is simpler anyway. */ - virtual void embed( TQWidget * tqparentWidget ); + virtual void embed( TQWidget * parentWidget ); /** * @return The widget defined by this part, set by setWidget(). diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 2a11e4df5..e1f211b84 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -288,7 +288,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) return false; } - w = w->tqparentWidget(); + w = w->parentWidget(); if ( w && ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) ) diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp index 4472bfe55..e0857a51e 100644 --- a/kparts/tests/notepad.cpp +++ b/kparts/tests/notepad.cpp @@ -16,14 +16,14 @@ #include <kstatusbar.h> #include <kstandarddirs.h> -NotepadPart::NotepadPart( TQWidget* tqparentWidget, const char*, +NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, TQObject* parent, const char* name, const TQStringList& ) : KParts::ReadWritePart( parent, name ) { setInstance( NotepadFactory::instance() ); - m_edit = new TQMultiLineEdit( tqparentWidget, "NotepadPart's multiline edit" ); + m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); (void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp index f11f0194f..d932a168f 100644 --- a/kparts/tests/parts.cpp +++ b/kparts/tests/parts.cpp @@ -18,12 +18,12 @@ #include <kaction.h> #include <klocale.h> -Part1::Part1( TQObject *parent, TQWidget * tqparentWidget ) +Part1::Part1( TQObject *parent, TQWidget * parentWidget ) : KParts::ReadOnlyPart( parent, "Part1" ) { m_instance = new KInstance( "kpartstestpart" ); setInstance( m_instance ); - m_edit = new TQMultiLineEdit( tqparentWidget ); + m_edit = new TQMultiLineEdit( parentWidget ); setWidget( m_edit ); setXMLFile( "kpartstest_part1.rc" ); @@ -56,12 +56,12 @@ bool Part1::openFile() return true; } -Part2::Part2( TQObject *parent, TQWidget * tqparentWidget ) +Part2::Part2( TQObject *parent, TQWidget * parentWidget ) : KParts::Part( parent, "Part2" ) { m_instance = new KInstance( "part2" ); setInstance( m_instance ); - TQWidget * w = new TQWidget( tqparentWidget, "Part2Widget" ); + TQWidget * w = new TQWidget( parentWidget, "Part2Widget" ); setWidget( w ); TQCheckBox * cb = new TQCheckBox( "something", w ); diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h index 873a6fea4..6f373a85c 100644 --- a/kparts/tests/parts.h +++ b/kparts/tests/parts.h @@ -13,7 +13,7 @@ class Part1 : public KParts::ReadOnlyPart { Q_OBJECT public: - Part1( TQObject *parent, TQWidget * tqparentWidget ); + Part1( TQObject *parent, TQWidget * parentWidget ); virtual ~Part1(); protected: @@ -28,7 +28,7 @@ class Part2 : public KParts::Part { Q_OBJECT public: - Part2( TQObject *parent, TQWidget * tqparentWidget ); + Part2( TQObject *parent, TQWidget * parentWidget ); virtual ~Part2(); protected: diff --git a/krandr/ktimerdialog.cpp b/krandr/ktimerdialog.cpp index af1b85c49..fe5ab89df 100644 --- a/krandr/ktimerdialog.cpp +++ b/krandr/ktimerdialog.cpp @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget ) // yuck, here goes. TQVBox *newWidget = new TQVBox( this ); - if ( widget->tqparentWidget() != mainWidget ) { + if ( widget->parentWidget() != mainWidget ) { widget->reparent( newWidget, 0, TQPoint(0,0) ); } else { newWidget->insertChild( TQT_TQOBJECT(widget) ); diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index 4a32922d1..d02e9484c 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -1642,11 +1642,11 @@ void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control, tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->tqparentWidget() && - toolbutton->tqparentWidget()->backgroundPixmap() && - !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->parentWidget() && + toolbutton->parentWidget()->backgroundPixmap() && + !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (widget->parent()) diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index d3efc088b..e8f8d7792 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -1276,11 +1276,11 @@ void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control, tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->tqparentWidget() && - toolbutton->tqparentWidget()->backgroundPixmap() && - !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->parentWidget() && + toolbutton->parentWidget()->backgroundPixmap() && + !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } } diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 9f3133498..5a4112025 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -347,8 +347,8 @@ void KeramikStyle::polish(TQWidget* widget) else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) widget->setBackgroundMode( NoBackground ); - else if ( widget->tqparentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->tqparentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + else if ( widget->parentWidget() && + ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); @@ -388,8 +388,8 @@ void KeramikStyle::unPolish(TQWidget* widget) else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) widget->setBackgroundMode( PaletteBackground ); - else if ( widget->tqparentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->tqparentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + else if ( widget->parentWidget() && + ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); @@ -477,7 +477,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = TQT_TQWIDGET(widget->tqparentWidget()); + TQWidget *parent = TQT_TQWIDGET(widget->parentWidget()); int x_offset = widget->x(), y_offset = widget->y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { @@ -1093,7 +1093,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQWidget* paintWidget = dynamic_cast<TQWidget*>(p->device()); TQToolBar* parent = 0; if (paintWidget) - parent = ::tqqt_cast<TQToolBar*>(paintWidget->tqparentWidget()); + parent = ::tqqt_cast<TQToolBar*>(paintWidget->parentWidget()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) ); if ( !(flags & Style_Horizontal) ) @@ -1306,16 +1306,16 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const { //Form widgets are in the KHTMLView, but that has 2 further inner levels //of widgets - QClipperWidget, and outside of that, QViewportWidget - TQWidget* potentialClipPort = widget->tqparentWidget(); + TQWidget* potentialClipPort = widget->parentWidget(); if ( !potentialClipPort || potentialClipPort->isTopLevel() ) return false; - TQWidget* potentialViewPort = potentialClipPort->tqparentWidget(); + TQWidget* potentialViewPort = potentialClipPort->parentWidget(); if (!potentialViewPort || potentialViewPort->isTopLevel() || qstrcmp(potentialViewPort->name(), "qt_viewport") ) return false; - TQWidget* potentialKHTML = potentialViewPort->tqparentWidget(); + TQWidget* potentialKHTML = potentialViewPort->parentWidget(); if (!potentialKHTML || potentialKHTML->isTopLevel() || qstrcmp(potentialKHTML->className(), "KHTMLView") ) return false; @@ -1466,13 +1466,13 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element, case CE_ToolButtonLabel: { //const TQToolButton *toolbutton = static_cast<const TQToolButton * >(widget); - bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); TQRect nr = r; if (!onToolbar) { - if (widget->tqparentWidget() && - !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) ) + if (widget->parentWidget() && + !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) ) { //Make sure we don't cut into the endline if (!qstrcmp(widget->name(), "close")) @@ -2136,9 +2136,9 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control, case CC_ScrollBar: { const TQScrollBar* sb = static_cast< const TQScrollBar* >( widget ); - if (highlightScrollBar && sb->tqparentWidget()) //Don't do the check if not highlighting anyway + if (highlightScrollBar && sb->parentWidget()) //Don't do the check if not highlighting anyway { - if (sb->tqparentWidget()->tqcolorGroup().button() != sb->tqcolorGroup().button()) + if (sb->parentWidget()->tqcolorGroup().button() != sb->tqcolorGroup().button()) customScrollMode = true; } bool horizontal = sb->orientation() == Qt::Horizontal; @@ -2209,14 +2209,14 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control, // ------------------------------------------------------------------- case CC_ToolButton: { const TQToolButton *toolbutton = (const TQToolButton *) widget; - bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); bool onExtender = !onToolbar && - widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBarExtensionWidget") && - widget->tqparentWidget()->tqparentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + widget->parentWidget() && widget->parentWidget()->inherits( "QToolBarExtensionWidget") && + widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); bool onControlButtons = false; - if (!onToolbar && !onExtender && widget->tqparentWidget() && - !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) ) + if (!onToolbar && !onExtender && widget->parentWidget() && + !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) ) { onControlButtons = true; titleBarMode = Maximized; @@ -2255,11 +2255,11 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control, } // Check whether to draw a background pixmap - else if ( toolbutton->tqparentWidget() && - toolbutton->tqparentWidget()->backgroundPixmap() && - !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->parentWidget() && + toolbutton->parentWidget()->backgroundPixmap() && + !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (onToolbar) @@ -2441,7 +2441,7 @@ TQSize KeramikStyle::tqsizeFromContents( ContentsType contents, case CT_ToolButton: { - bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); if (!onToolbar) //Behaves like a button, so scale appropriately to the border { int w = contentSize.width(); @@ -2859,7 +2859,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) TQMouseEvent* mev = TQT_TQMOUSEEVENT(event); TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); - TQWidget* parent = box->tqparentWidget(); + TQWidget* parent = box->parentWidget(); if (!parent) return false; diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 0d27285d7..8ccc1ac96 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -294,7 +294,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, bool drawTitle = false; if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); - TQWidget *p = w->tqparentWidget(); + TQWidget *p = w->parentWidget(); if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { drawTitle = true; title = p->caption(); diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index 07cd4d96b..3401b66d7 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -426,7 +426,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, bool drawTitle = false; if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); - TQWidget *p = w->tqparentWidget(); + TQWidget *p = w->parentWidget(); if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { drawTitle = true; title = p->caption(); diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index e1685d2cc..3779bfd9b 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -2951,10 +2951,10 @@ void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control, // If we're pressed, on, or raised... if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget ) { tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); - } else if (tb->tqparentWidget() && - tb->tqparentWidget()->backgroundPixmap() && - !tb->tqparentWidget()->backgroundPixmap()->isNull()) { - TQPixmap pixmap = *(tb->tqparentWidget()->backgroundPixmap()); + } else if (tb->parentWidget() && + tb->parentWidget()->backgroundPixmap() && + !tb->parentWidget()->backgroundPixmap()->isNull()) { + TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, tb->pos() ); } } @@ -3458,9 +3458,9 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) if ( ::tqqt_cast<TQLineEdit*>(obj) ) { TQWidget* widget = TQT_TQWIDGET(obj); - if ( ::tqqt_cast<TQSpinWidget*>(widget->tqparentWidget()) ) + if ( ::tqqt_cast<TQSpinWidget*>(widget->parentWidget()) ) { - TQWidget* spinbox = widget->tqparentWidget(); + TQWidget* spinbox = widget->parentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { spinbox->tqrepaint(false); diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp index d47b1c4a2..0bd5aa892 100644 --- a/kutils/kfind.cpp +++ b/kutils/kfind.cpp @@ -211,7 +211,7 @@ KDialogBase* KFind::findNextDialog( bool create ) { if ( !m_dialog && create ) { - m_dialog = new KFindNextDialog( m_pattern, tqparentWidget() ); + m_dialog = new KFindNextDialog( m_pattern, parentWidget() ); connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) ); connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); } @@ -704,7 +704,7 @@ TQWidget* KFind::dialogsParent() const // If the find dialog is still up, it should get the focus when closing a message box // Otherwise, maybe the "find next?" dialog is up // Otherwise, the "view" is the parent. - return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : tqparentWidget() ); + return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : parentWidget() ); } #include "kfind.moc" diff --git a/kutils/kfind.h b/kutils/kfind.h index b28f59596..e37b26fa7 100644 --- a/kutils/kfind.h +++ b/kutils/kfind.h @@ -389,7 +389,7 @@ signals: protected: - TQWidget* tqparentWidget() const { return (TQWidget *)parent(); } + TQWidget* parentWidget() const { return (TQWidget *)parent(); } TQWidget* dialogsParent() const; protected slots: diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index 2052991b3..36483aa34 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -445,13 +445,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 81e158c67..505e165a5 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -101,7 +101,7 @@ KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, KListView *lv void KPluginListViewToolTip::maybeTip( const TQPoint &pos ) { - if ( !tqparentWidget() || !m_listView ) + if ( !parentWidget() || !m_listView ) return; KPluginInfoLVI *item = dynamic_cast<KPluginInfoLVI *>( m_listView->itemAt( pos ) ); diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp index 3829f7988..204384ae3 100644 --- a/kutils/kreplace.cpp +++ b/kutils/kreplace.cpp @@ -90,7 +90,7 @@ KReplaceNextDialog* KReplace::dialog() { if ( !m_dialog ) { - m_dialog = new KReplaceNextDialog( tqparentWidget() ); + m_dialog = new KReplaceNextDialog( parentWidget() ); connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) ); connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) ); connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) ); @@ -102,9 +102,9 @@ KReplaceNextDialog* KReplace::dialog() void KReplace::displayFinalDialog() const { if ( !m_replacements ) - KMessageBox::information(tqparentWidget(), i18n("No text was replaced.")); + KMessageBox::information(parentWidget(), i18n("No text was replaced.")); else - KMessageBox::information(tqparentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) ); + KMessageBox::information(parentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) ); } KFind::Result KReplace::replace() @@ -316,7 +316,7 @@ bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const i18n("Do you want to restart search from the end?") : i18n("Do you want to restart search at the beginning?"); - int ret = KMessageBox::questionYesNo( tqparentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") ); + int ret = KMessageBox::questionYesNo( parentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") ); return( ret == KMessageBox::Yes ); } |