diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:22 -0600 |
| commit | 6678123f8866f4128b08719affd53d2b39e548af (patch) | |
| tree | acfdb20ef3bba842fcba9d1ef3f011c9082fac16 /libreoffice/git_05_11_2012 | |
| 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_05_11_2012')
| -rw-r--r-- | libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff index d3f995d..66fc4a0 100644 --- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff +++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff @@ -2792,10 +2792,10 @@ index be40226..558c01b 100644 @@ -54,13 +62,13 @@ int main( int argc, char* argv[] ) // we fake the name of the application to have "LibreOffice" in the // title - KAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ), + TDEAboutData qAboutData( "kdefilepicker", I18N_NOOP( "LibreOffice" ), - "0.1", I18N_NOOP( "kdefilepicker is an implementation of the KDE file dialog for LibreOffice." ), + "0.1", I18N_NOOP( "kdefilepicker is an implementation of the " THIS_DESKENV_NAME_CAP " file dialog for LibreOffice." ), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, "(c) 2004, Jan Holesovsky" ); qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); @@ -2862,12 +2862,12 @@ index d66e227..f84136a 100644 * since it will interfere badly with our own. */ @@ -123,7 +132,7 @@ void KDEXLib::Init() - KAboutData *kAboutData = new KAboutData( "LibreOffice", + TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice", I18N_NOOP( "LibreOffice" ), "1.1.0", - I18N_NOOP( "LibreOffice with KDE Native Widget Support." ), + I18N_NOOP( "LibreOffice with " THIS_DESKENV_NAME_CAP " Native Widget Support." ), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, "(c) 2003, 2004 Novell, Inc", I18N_NOOP( "LibreOffice is an office suite.\n" ), diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx |