diff options
Diffstat (limited to 'kparts')
| -rw-r--r-- | kparts/componentfactory.h | 30 | ||||
| -rw-r--r-- | kparts/factory.cpp | 4 | ||||
| -rw-r--r-- | kparts/factory.h | 8 | ||||
| -rw-r--r-- | kparts/genericfactory.h | 10 | ||||
| -rw-r--r-- | kparts/part.cpp | 4 | ||||
| -rw-r--r-- | kparts/part.h | 2 | ||||
| -rw-r--r-- | kparts/partmanager.cpp | 2 | ||||
| -rw-r--r-- | kparts/tests/notepad.cpp | 4 | ||||
| -rw-r--r-- | kparts/tests/parts.cpp | 8 | ||||
| -rw-r--r-- | kparts/tests/parts.h | 4 |
10 files changed, 38 insertions, 38 deletions
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: |