diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:31 -0600 |
| commit | 124cd4e9efafa115583d19bcf65d9ee67ecaf87b (patch) | |
| tree | 8b6f9e54068ea4eda4fe2096aff9b4c48f0f7773 /libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | |
| parent | 6678123f8866f4128b08719affd53d2b39e548af (diff) | |
| download | thirdparty-124cd4e9efafa115583d19bcf65d9ee67ecaf87b.tar.gz thirdparty-124cd4e9efafa115583d19bcf65d9ee67ecaf87b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index 35d41cf..9e99f1b 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -6667,10 +6667,10 @@ index 0000000..375b158 + TQString aLanguage( + (const TQChar *) pProcessLocale->Language->buffer, + (int) pProcessLocale->Language->length); -+ KGlobal::locale()->setLanguage(aLanguage); ++ TDEGlobal::locale()->setLanguage(aLanguage); + + // load TDE address book's localized messages -+ KGlobal::locale()->insertCatalogue("kaddressbook"); ++ TDEGlobal::locale()->insertCatalogue("kaddressbook"); + s_bDidInsertCatalogue = true; + } + @@ -6680,7 +6680,7 @@ index 0000000..375b158 + if ( s_bDidInsertCatalogue ) + // this guard is necessary, since TDE 3.3 seems to crash if we remove a catalogue + // which we did not previously insert -+ KGlobal::locale()->removeCatalogue("kaddressbook"); ++ TDEGlobal::locale()->removeCatalogue("kaddressbook"); + + if ( s_pTDEApplication != NULL ) + { @@ -12455,7 +12455,7 @@ index 0000000..1dbd64f + TQFont aFixedFont; + short nFontHeight; + -+ aFixedFont = KGlobalSettings::fixedFont(); ++ aFixedFont = TDEGlobalSettings::fixedFont(); + nFontHeight = aFixedFont.pointSize(); + return css::beans::Optional< css::uno::Any >( + true, uno::makeAny( nFontHeight ) ); @@ -12466,7 +12466,7 @@ index 0000000..1dbd64f + TQString aFontName; + :: rtl::OUString sFontName; + -+ aFixedFont = KGlobalSettings::fixedFont(); ++ aFixedFont = TDEGlobalSettings::fixedFont(); + aFontName = aFixedFont.family(); + sFontName = (const sal_Unicode *) aFontName.ucs2(); + return css::beans::Optional< css::uno::Any >( @@ -12481,7 +12481,7 @@ index 0000000..1dbd64f + } else if (id.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) + { -+ TQString aDocumentsDir( KGlobalSettings::documentPath() ); ++ TQString aDocumentsDir( TDEGlobalSettings::documentPath() ); + rtl::OUString sDocumentsDir; + rtl::OUString sDocumentsURL; + if ( aDocumentsDir.endsWith(TQChar('/')) ) @@ -15614,7 +15614,7 @@ index 0000000..7c173cc + aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); + + // WM settings -+ KConfig *pConfig = KGlobal::config(); ++ KConfig *pConfig = TDEGlobal::config(); + if ( pConfig ) + { + pConfig->setGroup( "WM" ); |