ooo-build r13135 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Jul  9 22:30:44 2008
New Revision: 13135
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13135&view=rev

Log:
rediff


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 22:30:44 2008
@@ -1,6 +1,6 @@
---- config_office/configure.in.ark	2008-06-14 15:28:05.682810320 +0200
-+++ config_office/configure.in	2008-06-14 15:28:32.734780743 +0200
-@@ -5655,7 +5655,7 @@ your KDE installation by exporting KDEDI
+--- config_office/configure.in.kde4fpicker~	2008-07-10 00:12:02.046715223 +0200
++++ config_office/configure.in	2008-07-10 00:23:50.984694910 +0200
+@@ -5801,7 +5801,7 @@ your KDE installation by exporting KDEDI
      fi
  
      dnl Set the variables
@@ -9,8 +9,8 @@
      KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lQtCore -lQtGui"
  fi
  AC_SUBST(KDE_CFLAGS)
---- fpicker/source/unx/kde/kdecommandthread.cxx.fpicker-kde4~	2008-07-09 12:43:02.378694846 +0200
-+++ fpicker/source/unx/kde/kdecommandthread.cxx	2008-07-09 12:43:10.996967838 +0200
+--- fpicker/source/unx/kde/kdecommandthread.cxx.kde4fpicker~	2008-07-10 00:11:18.425692998 +0200
++++ fpicker/source/unx/kde/kdecommandthread.cxx	2008-07-10 00:23:50.986696561 +0200
 @@ -55,6 +55,7 @@
   *  All Rights Reserved.
   *
@@ -70,8 +70,8 @@
          }
          else
              qBuffer.append( *pUnicode );
---- fpicker/source/unx/kde/kdecommandthread.hxx.fpicker-kde4~	2008-07-09 12:43:02.380696287 +0200
-+++ fpicker/source/unx/kde/kdecommandthread.hxx	2008-07-09 12:43:11.347946664 +0200
+--- fpicker/source/unx/kde/kdecommandthread.hxx.kde4fpicker~	2008-07-10 00:11:18.426694382 +0200
++++ fpicker/source/unx/kde/kdecommandthread.hxx	2008-07-10 00:23:50.986696561 +0200
 @@ -55,6 +55,7 @@
   *  All Rights Reserved.
   *
@@ -100,8 +100,8 @@
  };
  
  class CommandThread : public QThread
---- fpicker/source/unx/kde/kdefilepicker.cxx.fpicker-kde4~	2008-07-09 12:43:02.383694504 +0200
-+++ fpicker/source/unx/kde/kdefilepicker.cxx	2008-07-09 12:43:11.853967122 +0200
+--- fpicker/source/unx/kde/kdefilepicker.cxx.kde4fpicker~	2008-07-10 00:11:19.584944383 +0200
++++ fpicker/source/unx/kde/kdefilepicker.cxx	2008-07-10 00:23:50.990695254 +0200
 @@ -64,14 +64,11 @@
  
  #include <qcheckbox.h>
@@ -546,8 +546,8 @@
  
          filterChanged();
      }
---- fpicker/source/unx/kde/kdefilepicker.hxx.fpicker-kde4~	2008-07-09 12:43:02.385697133 +0200
-+++ fpicker/source/unx/kde/kdefilepicker.hxx	2008-07-09 12:43:12.146967279 +0200
+--- fpicker/source/unx/kde/kdefilepicker.hxx.kde4fpicker~	2008-07-10 00:11:19.584944383 +0200
++++ fpicker/source/unx/kde/kdefilepicker.hxx	2008-07-10 00:23:50.991695311 +0200
 @@ -65,9 +65,10 @@
  #include <kfiledialog.h>
  #include <kfilefiltercombo.h>
@@ -631,38 +631,8 @@
      void                        appendEscaped( QString &rBuffer, const QString &rString );
      QString                     escapeString( const QString &rString );
  };
---- fpicker/source/unx/kde/kdemodalityfilter.cxx.ark	2008-07-09 20:37:34.703697395 +0200
-+++ fpicker/source/unx/kde/kdemodalityfilter.cxx	2008-07-09 20:37:50.346945629 +0200
-@@ -63,6 +63,7 @@
- 
- #include <kapplication.h>
- #include <kdialogbase.h>
-+#include <QX11Info>
- 
- #include <netwm.h>
- #include <X11/Xlib.h>
-@@ -90,7 +91,7 @@ bool ModalityFilter::eventFilter( QObjec
-         KDialogBase* pDlg = ::qt_cast< KDialogBase* >( pObject );
-         if ( pDlg != NULL && m_nWinId != 0 )
-         {
--            XSetTransientForHint( qt_xdisplay(), pDlg->winId(), m_nWinId );
-+            XSetTransientForHint( QX11Info::display(), pDlg->winId(), m_nWinId );
-             m_nWinId = 0;
-         }
-     }
---- fpicker/source/unx/kde/kdemodalityfilter.hxx.ark	2008-07-09 20:11:06.379503817 +0200
-+++ fpicker/source/unx/kde/kdemodalityfilter.hxx	2008-07-09 20:14:37.315944482 +0200
-@@ -62,7 +62,7 @@
- #ifndef _KDEMODALITYFILTER_HXX_
- #define _KDEMODALITYFILTER_HXX_
- 
--#include <qobject.h>
-+#include <QWidget>
- 
- class ModalityFilter : public QObject
- {
---- fpicker/source/unx/kde/kdefpmain.cxx.ark	2008-07-09 20:14:51.094796124 +0200
-+++ fpicker/source/unx/kde/kdefpmain.cxx	2008-07-09 23:31:17.954697243 +0200
+--- fpicker/source/unx/kde/kdefpmain.cxx.kde4fpicker~	2008-07-10 00:11:19.682945316 +0200
++++ fpicker/source/unx/kde/kdefpmain.cxx	2008-07-10 00:23:50.993695356 +0200
 @@ -74,41 +74,39 @@
  // Main
  //////////////////////////////////////////////////////////////////////////
@@ -717,8 +687,8 @@
      
      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
+--- fpicker/source/unx/kde/kdemodalityfilter.cxx.kde4fpicker~	2008-07-10 00:23:50.992695019 +0200
++++ fpicker/source/unx/kde/kdemodalityfilter.cxx	2008-07-10 00:23:50.994695273 +0200
 @@ -62,7 +62,7 @@
  #include <kdemodalityfilter.hxx>
  
@@ -737,3 +707,14 @@
          if ( pDlg != NULL && m_nWinId != 0 )
          {
              XSetTransientForHint( QX11Info::display(), pDlg->winId(), m_nWinId );
+--- fpicker/source/unx/kde/kdemodalityfilter.hxx.kde4fpicker~	2008-07-10 00:11:18.435695037 +0200
++++ fpicker/source/unx/kde/kdemodalityfilter.hxx	2008-07-10 00:23:50.992695019 +0200
+@@ -62,7 +62,7 @@
+ #ifndef _KDEMODALITYFILTER_HXX_
+ #define _KDEMODALITYFILTER_HXX_
+ 
+-#include <qobject.h>
++#include <QWidget>
+ 
+ class ModalityFilter : public QObject
+ {