summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/kgenericfactory.h10
-rw-r--r--kdecore/kgenericfactory.tcc28
-rw-r--r--kdecore/kmultipledrag.h2
-rw-r--r--kdecore/ktempdir.cpp2
-rw-r--r--kdecore/kwin.cpp2
-rw-r--r--kdecore/malloc/malloc.c8
-rw-r--r--kdecore/svgicons/ksvgiconengine.cpp4
7 files changed, 28 insertions, 28 deletions
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 13:00:03 +0000