diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:24:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:24:22 -0600 |
| commit | 6678123f8866f4128b08719affd53d2b39e548af (patch) | |
| tree | acfdb20ef3bba842fcba9d1ef3f011c9082fac16 /libreoffice/git_10_28_2011 | |
| parent | d337ac30737f8bc19e55bbafbb9fe1fdc3c08d86 (diff) | |
| download | thirdparty-6678123f8866f4128b08719affd53d2b39e548af.tar.gz thirdparty-6678123f8866f4128b08719affd53d2b39e548af.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/git_10_28_2011')
| -rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index f397150..35d41cf 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -9355,9 +9355,9 @@ index 0000000..eb20aa3 +{ + // we fake the name of the application to have "OpenOffice.org" in the + // title -+ KAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ), ++ TDEAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ), + "0.1", I18N_NOOP( "tdefilepicker is an implementation of the TDE file dialog for OpenOffice.org." ), -+ KAboutData::License_LGPL, ++ TDEAboutData::License_LGPL, + "(c) 2004, Jan Holesovsky" ); + qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "[email protected]" ); + @@ -16029,11 +16029,11 @@ index 0000000..adeb628 + pInputMethod->SetLocale(); + XrmInitialize(); + -+ KAboutData *kAboutData = new KAboutData( "LibreOffice", ++ TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice", + I18N_NOOP( "LibreOffice" ), + "1.1.0", + I18N_NOOP( "LibreOffice with TDE Native Widget Support." ), -+ KAboutData::License_LGPL, ++ TDEAboutData::License_LGPL, + "(c) 2003, 2004 Novell, Inc\n(c) 2010 Timothy Pearson", + I18N_NOOP( "LibreOffice is an office suite.\n" ), + "http://libreoffice.org", |