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

List:       kde-commits
Subject:    kdelibs/kparts
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2003-01-19 13:09:08
[Download RAW message or body]

CVS commit by danimo: 

/me grabs the brown paper bag. The eventfilder works now as expected.

CCMAIL:schumacher@kde.org


  M +11 -6     statusbarextension.cpp   1.2
  M +2 -2      statusbarextension.h   1.2


--- kdelibs/kparts/statusbarextension.cpp  #1.1:1.2
@@ -86,12 +86,15 @@ StatusBarExtension::~StatusBarExtension(
 
 
-void StatusBarExtension::eventFilter(KParts::ReadOnlyPart * /*watched*/, GUIActivateEvent* ev)
+bool StatusBarExtension::eventFilter(QObject * watched, QEvent* ev)
 {
+
+  if (!watched->inherits("KParts::ReadOnlyPart") || !statusBar())
+      return QObject::eventFilter(watched, ev);
+
   KStatusBar * sb = statusBar();
-  //kdDebug() << "StatusBarExtension::guiActivateEvent activated=" << ev->activated()
-  //          << " sb=" << (void*)sb << endl;
-  if ( !sb )
-    return;
-  if ( ev->activated() )
+
+  GUIActivateEvent *gae = static_cast<GUIActivateEvent*>(ev);
+  
+  if ( gae->activated() )
   {
     QValueListIterator<StatusBarItem> it = m_statusBarItems.begin();
@@ -105,4 +108,6 @@ void StatusBarExtension::eventFilter(KPa
       (*it).ensureItemHidden( sb );
   }
+
+  return true;
 
 }

--- kdelibs/kparts/statusbarextension.h  #1.1:1.2
@@ -26,4 +26,5 @@
 class KStatusBar;
 class KMainWindow;
+class QEvent;
 
 namespace KParts
@@ -31,5 +32,4 @@ namespace KParts
 
   class ReadOnlyPart;
-  class GUIActivateEvent;
 
   // Defined in impl
@@ -86,5 +86,5 @@ namespace KParts
 
       /** @internal */
-      void eventFilter( KParts::ReadOnlyPart *watched, GUIActivateEvent* ev );
+      virtual bool eventFilter( QObject *watched, QEvent* ev );
 
     private:


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