You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tde-packaging/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff

29 lines
1.0 KiB

commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc
Author: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon Jun 12 10:46:33 2023 +0900
Revert "Add single TQObject root parent for all guarded pointers."
Commit b167d09c was functionally incorrect and is causing issues on
selected distributions.
This reverts commit b167d09c43be6c8b7d30f0d4fb1bf1e86c51b8a7.
This resolves issue TDE/tde#128.
(cherry picked from commit fb1f3d64451e8cc405b5db572e2c506564a05680)
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
index 3ac27e7a..803e75e1 100644
--- a/src/kernel/qguardedptr.cpp
+++ b/src/kernel/qguardedptr.cpp
@@ -194,10 +194,9 @@
/* Internal classes */
-static TQObject *__ptrpriv_root_obj = new TQObject(0, "_ptrpriv_root");
TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o)
- : TQObject(__ptrpriv_root_obj, "_ptrpriv" ), obj( o )
+ : TQObject(0, "_ptrpriv" ), obj( o )
{
if ( obj )
connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) );