ooo-build r13133 - trunk/patches/dev300
- From: brosenk svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13133 - trunk/patches/dev300
- Date: Wed, 9 Jul 2008 21:35:34 +0000 (UTC)
Author: brosenk
Date: Wed Jul 9 21:35:34 2008
New Revision: 13133
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13133&view=rev
Log:
Don't use kde3 compat functions
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:35:34 2008
@@ -631,9 +631,39 @@
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 20:31:47.186696351 +0200
-@@ -74,27 +74,25 @@
++++ fpicker/source/unx/kde/kdefpmain.cxx 2008-07-09 23:31:17.954697243 +0200
+@@ -74,41 +74,39 @@
// Main
//////////////////////////////////////////////////////////////////////////
@@ -658,8 +688,8 @@
- "(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", ki18n("Original author and current maintainer"), "kendy openoffice org" );
-+ qAboutData.addAuthor( "Bernhard Rosenkraenzer", ki18n("Port to KDE 4.x"), "bero arklinux ch" );
++ qAboutData.addAuthor( ki18n("Jan Holesovsky"), ki18n("Original author and current maintainer"), "kendy openoffice org" );
++ qAboutData.addAuthor( ki18n("Bernhard Rosenkraenzer"), ki18n("Port to KDE 4.x"), "bero arklinux ch", "http://linux.cd/" );
// Let the user see that this does something...
::std::cerr << "kdefilepicker, an implementation of KDE file dialog for OOo." << ::std::endl
@@ -669,34 +699,21 @@
+ 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
- {
+- KLocale::setMainCatalogue( "kdialog" );
++ KLocale::setMainCatalog( "kdialog" );
+
+ KApplication kApplication;
+
+ // Setup the modality
+ KCmdLineArgs *pArgs = KCmdLineArgs::parsedArgs();
+- long nWinId = atol( pArgs->getOption( "winid" ) );
++ long nWinId = pArgs->getOption( "winid" ).toLong();
+ pArgs->clear();
+
+ ModalityFilter qModalityFilter( nWinId );
+
+- FileDialog aFileDialog( NULL, QString(), NULL, "kdefiledialog" );
++ FileDialog aFileDialog( QString::null, QString::null, NULL );
+
+ CommandThread qCommandThread( &aFileDialog );
+ qCommandThread.start();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]