ooo-build r13134 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Jul  9 21:45:37 2008
New Revision: 13134
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13134&view=rev

Log:
Fix kdemodalityfilter.cxx


Modified:
   trunk/patches/dev300/kde4-fpicker.diff

Modified: trunk/patches/dev300/kde4-fpicker.diff
==============================================================================
--- trunk/patches/dev300/kde4-fpicker.diff	(original)
+++ trunk/patches/dev300/kde4-fpicker.diff	Wed Jul  9 21:45:37 2008
@@ -717,3 +717,23 @@
      
      CommandThread qCommandThread( &aFileDialog );
      qCommandThread.start();
+--- fpicker/source/unx/kde/kdemodalityfilter.cxx.kde4~	2008-07-09 23:41:22.263696781 +0200
++++ fpicker/source/unx/kde/kdemodalityfilter.cxx	2008-07-09 23:42:19.445695190 +0200
+@@ -62,7 +62,7 @@
+ #include <kdemodalityfilter.hxx>
+ 
+ #include <kapplication.h>
+-#include <kdialogbase.h>
++#include <kdialog.h>
+ #include <QX11Info>
+ 
+ #include <netwm.h>
+@@ -88,7 +88,7 @@ bool ModalityFilter::eventFilter( QObjec
+ {
+     if ( pObject->isWidgetType() && pEvent->type() == QEvent::Show )
+     {
+-        KDialogBase* pDlg = ::qt_cast< KDialogBase* >( pObject );
++        KDialog* pDlg = qobject_cast< KDialog* >( pObject );
+         if ( pDlg != NULL && m_nWinId != 0 )
+         {
+             XSetTransientForHint( QX11Info::display(), pDlg->winId(), m_nWinId );