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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-07-12 0:17:26
Message-ID: 1121127446.814767.22201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 433852 by ctennis:

Make previous commit compile, and fix another QList instance

 M  +7 -7      kapplication.cpp  


--- branches/work/kde4/kdelibs/kdecore/kapplication.cpp #433851:433852
@@ -408,7 +408,7 @@
 };
 
 
-static Q3PtrList<QWidget>*x11Filter = 0;
+static QList<const QWidget*> *x11Filter = 0;
 static bool autoDcopRegistration = true;
 
 void KApplication::installX11EventFilter( QWidget* filter )
@@ -416,21 +416,21 @@
     if ( !filter )
         return;
     if (!x11Filter)
-        x11Filter = new Q3PtrList<QWidget>;
+        x11Filter = new QList<const QWidget *>;
     connect ( filter, SIGNAL( destroyed() ), this, SLOT( x11FilterDestroyed() ) );
     x11Filter->append( filter );
 }
 
 void KApplication::x11FilterDestroyed()
 {
-    removeX11EventFilter( static_cast< const QWidget* >( sender()));
+    removeX11EventFilter( qobject_cast< const QWidget* >( sender()));
 }
 
 void KApplication::removeX11EventFilter( const QWidget* filter )
 {
     if ( !x11Filter || !filter )
         return;
-    x11Filter->removeRef( filter );
+    x11Filter->removeAll( filter );
     if ( x11Filter->isEmpty() ) {
         delete x11Filter;
         x11Filter = 0;
@@ -1702,7 +1702,7 @@
     }
 
     if (x11Filter) {
-        for (QWidget *w=x11Filter->first(); w; w=x11Filter->next()) {
+        foreach (const QWidget *w, *x11Filter) {
             if (((KAppX11HackWidget*) w)->publicx11Event(_event))
                 return true;
         }
@@ -3022,8 +3022,8 @@
   foreach(KApplicationPrivate::URLActionRule rule, d->urlActionRestrictions) {
      if ((result != rule.permission) && // No need to check if it doesn't make a difference
          (action == rule.action) &&
-         rule->baseMatch(baseURL, baseClass) &&
-         rule->destMatch(destURL, destClass, baseURL, baseClass))
+         rule.baseMatch(baseURL, baseClass) &&
+         rule.destMatch(destURL, destClass, baseURL, baseClass))
      {
         result = rule.permission;
      }
[prev in list] [next in list] [prev in thread] [next in thread]