[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-04-06 19:13:19
Message-ID: 1144350799.741122.18028.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 527071 by eva:

Qte2:
- make use of SafeDelete class instead of ObjectDeleter


 M  +3 -5      kdecore/patches/kdecore_qt2.3.patch  
 M  +3 -7      kdecore/patches/network_qt2.3.patch  
 M  +3 -5      khtml/patches/ecma_qt2.3.patch  
 M  +3 -5      khtml/patches/rendering_qt2.3.patch  
 M  +3 -7      kio/patches/kcookiejar_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/kdecore/patches/kdecore_qt2.3.patch #527070:527071
@@ -34,7 +34,7 @@
  #include "ksocks.h"
  
 +#if (QT_VERSION < 0x030000)
-+#include "objectdeleter.h"
++#include "safedelete.h"
 +#endif
 +
  #ifdef __CYGWIN__
@@ -83,14 +83,12 @@
  {
    cleanError();
    if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
-@@ -1678,7 +1690,13 @@ void KExtendedSocket::socketActivityRead
+@@ -1678,7 +1690,11 @@ void KExtendedSocket::socketActivityRead
  		  // EOF condition here
  		  ::close(sockfd);
  		  sockfd = -1;	// we're closed
 +#if (QT_VERSION < 0x030000)
-+		  QCustomEvent* e = new QCustomEvent(ObjectDeleter::DeferredLater);
-+		  e->setData(d->qsnIn);
-+		  QApplication::postEvent( this, e );
++		  SafeDelete::deleteSingle( this );
 +#else
  		  d->qsnIn->deleteLater();
 +#endif
--- trunk/kdenox/konq-embed/kdesrc/kdecore/patches/network_qt2.3.patch #527070:527071
@@ -13,7 +13,7 @@
  #endif
  
 +#if (QT_VERSION < 0x030000)
-+#include "objectdeleter.h"
++#include "safedelete.h"
 +#endif
 +
  using namespace KNetwork;
@@ -28,16 +28,12 @@
  
        // is there anything to be queued?
        if (d->input.node.isEmpty() && d->input.service.isEmpty())
-@@ -546,7 +551,15 @@ void KResolver::emitFinished()
+@@ -546,7 +551,11 @@ void KResolver::emitFinished()
    emit finished(d->results);
  
    if (p && d->deleteWhenDone)
 +#if (QT_VERSION < 0x030000)
-+  {
-+    QCustomEvent* e = new QCustomEvent(ObjectDeleter::DeferredLater);
-+    e->setData(this);
-+    QApplication::postEvent( this, e );
-+  }
++    SafeDelete::deleteSingle( this );
 +#else
      deleteLater();		// in QObject
 +#endif
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/ecma_qt2.3.patch #527070:527071
@@ -171,7 +171,7 @@
  #include "xmlserializer.h"
  #include "domparser.h"
  
-+#include "objectdeleter.h"
++#include "safedelete.h"
 +#include "qt3compat.h"
 +
  using namespace KJS;
@@ -186,15 +186,13 @@
      ObjectImp::put(exec, propertyName, value, attr);
    }
  }
-@@ -1034,7 +1037,13 @@ void Window::closeNow()
+@@ -1034,7 +1037,11 @@ void Window::closeNow()
        //kdDebug(6070) << k_funcinfo << " -> closing window" << endl;
        // We want to make sure that window.open won't find this part by name.
        part->setName( 0 );
 -      part->deleteLater();
 +#if (QT_VERSION < 0x030000)
-+      QCustomEvent* e = new QCustomEvent(ObjectDeleter::DeferredLater);
-+      e->setData(part);
-+      QApplication::postEvent( part, e );
++      SafeDelete::deleteSingle( part );
 +#else
 +      part->deleteLater();              // in QObject
 +#endif
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/rendering_qt2.3.patch #527070:527071
@@ -1595,20 +1595,18 @@
  #include "xml/dom_docimpl.h"
  #include <kdebug.h>
  
-+#include "objectdeleter.h"
++#include "safedelete.h"
 +#include "qshareddoublebuffer.h"
 +
  bool khtml::allowWidgetPaintEvents = false;
  
  using namespace khtml;
-@@ -131,7 +139,13 @@ RenderWidget::~RenderWidget()
+@@ -131,7 +139,11 @@ RenderWidget::~RenderWidget()
  
      if(m_widget) {
          m_widget->hide();
 +#if (QT_VERSION < 0x030000)
-+        QCustomEvent* e = new QCustomEvent(ObjectDeleter::DeferredLater);
-+        e->setData(m_widget);
-+        QApplication::postEvent( m_widget, e );
++        SafeDelete::deleteSingle(m_widget);
 +#else
          m_widget->deleteLater();
 +#endif
--- trunk/kdenox/konq-embed/kdesrc/kio/patches/kcookiejar_qt2.3.patch #527070:527071
@@ -52,22 +52,18 @@
  #include "kcookiewin.h"
  #include "kcookieserver.h"
  
-+#include "objectdeleter.h"
++#include "safedelete.h"
 +
  extern "C" {
      KDE_EXPORT KDEDModule *create_kcookiejar(const QCString &name)
      {
-@@ -606,7 +608,15 @@ KCookieServer::reloadPolicy()
+@@ -606,7 +608,11 @@ KCookieServer::reloadPolicy()
  void
  KCookieServer::shutdown()
  {
 -   deleteLater();
 +#if (QT_VERSION < 0x030000)
-+  {
-+    QCustomEvent* e = new QCustomEvent(ObjectDeleter::DeferredLater);
-+    e->setData(this);
-+    QApplication::postEvent( this, e );
-+  }
++    SafeDelete::deleteSingle( this );
 +#else
 +    deleteLater();              // in QObject
 +#endif
[prev in list] [next in list] [prev in thread] [next in thread]