ooo-build r13129 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Wed Jul  9 20:07:16 2008
New Revision: 13129
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13129&view=rev

Log:
kdemodalityfilter fix for KDE4 fpicker


Modified:
   trunk/ChangeLog
   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 20:07:16 2008
@@ -631,3 +631,72 @@
      void                        appendEscaped( QString &rBuffer, const QString &rString );
      QString                     escapeString( const QString &rString );
  };
+--- fpicker/source/unx/kde/kdefpmain.cxx.ark	2008-07-09 20:14:51.094796124 +0200
++++ fpicker/source/unx/kde/kdefpmain.cxx	2008-07-09 20:31:47.186696351 +0200
+@@ -74,27 +74,25 @@
+ // Main
+ //////////////////////////////////////////////////////////////////////////
+ 
+-static KCmdLineOptions sOptions[] =
+-{
+-    { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
+-    KCmdLineLastOption
+-};
+-
+ int main( int argc, char* argv[] )
+ {
++    KCmdLineOptions options;
++    options.add("winid <argument>", ki18n("Window ID to which is the fpicker modal"));
+     // we fake the name of the application to have "OpenOffice.org" in the
+     // title
+-    KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "OpenOffice.org" ),
+-            "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for OpenOffice.org." ),
++    KAboutData qAboutData( "kdefilepicker", 0, ki18n( "OpenOffice.org" ),
++            "0.1",
++	    ki18n( "kdefilepicker is an implementation of the KDE file dialog for OpenOffice.org." ),
+             KAboutData::License_LGPL,
+-            "(c) 2004, Jan Holesovsky" );
+-    qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy openoffice org" );
++            ki18n("(c) 2004, Jan Holesovsky") );
++    qAboutData.addAuthor( "Jan Holesovsky", KLocalizedString("Original author and current maintainer"), "kendy openoffice org" );
++    qAboutData.addAuthor( "Bernhard Rosenkraenzer", KLocalizedString("Port to KDE 4.x"), "bero arklinux ch" );
+ 
+     // Let the user see that this does something...
+     ::std::cerr << "kdefilepicker, an implementation of KDE file dialog for OOo." << ::std::endl
+         << "Type 'exit' and press Enter to finish." << ::std::endl;
+ 
+-    KCmdLineArgs::addCmdLineOptions( sOptions );
++    KCmdLineArgs::addCmdLineOptions( options );
+     KCmdLineArgs::init( argc, argv, &qAboutData );
+ 
+     KLocale::setMainCatalogue( "kdialog" );
+--- 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
+ {