diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:25:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:25:07 -0600 |
| commit | 2715c65c510713f1a6c9ae83298e0cfb885f5475 (patch) | |
| tree | 3805de35c7f06dceabb33e0226d4bd011cbb2a40 /libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | |
| parent | fe83a8b6495df13916e3cc8ca280e8513f131d6e (diff) | |
| download | thirdparty-2715c65c510713f1a6c9ae83298e0cfb885f5475.tar.gz thirdparty-2715c65c510713f1a6c9ae83298e0cfb885f5475.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff index 891d835..01f481f 100644 --- a/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff +++ b/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff @@ -845,8 +845,8 @@ index 0000000..5de866f +UDK_3_0_0 { + global: + createKabConnection; -+ initKApplication; -+ shutdownKApplication; ++ initTDEApplication; ++ shutdownTDEApplication; + matchKDEVersion; + local: + *; @@ -2858,7 +2858,7 @@ index d66e227..f84136a 100644 +#define THIS_DESKENV_NAME_LOW "kde" +#endif // ENABLE_TDE + - /* #i59042# override KApplications method for session management + /* #i59042# override TDEApplications method for session management * since it will interfere badly with our own. */ @@ -123,7 +132,7 @@ void KDEXLib::Init() |