Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 21 insertions, 21 deletions

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 050af68..9e80e52 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -7612,10 +7612,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++            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;
 ++        }
 ++
@@ -7625,7 +7625,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++            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 )
 ++            {
@@ -11480,7 +11480,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        TQFont aFixedFont;
 ++        short nFontHeight;
 ++
-++        aFixedFont = KGlobalSettings::fixedFont();
+++        aFixedFont = TDEGlobalSettings::fixedFont();
 ++        nFontHeight = aFixedFont.pointSize();
 ++        return css::beans::Optional< css::uno::Any >(
 ++            true, uno::makeAny( nFontHeight ) );
@@ -11491,7 +11491,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        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 >(
@@ -11506,7 +11506,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    } 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('/')) )
@@ -14856,7 +14856,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 ++
 ++    // WM settings
-++    KConfig *pConfig = KGlobal::config();
+++    KConfig *pConfig = TDEGlobal::config();
 ++    if ( pConfig )
 ++    {
 ++        pConfig->setGroup( "WM" );
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index 17aa587..3f717cd 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -7612,10 +7612,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++            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;
 ++        }
 ++
@@ -7625,7 +7625,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++            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 )
 ++            {
@@ -11480,7 +11480,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        TQFont aFixedFont;
 ++        short nFontHeight;
 ++
-++        aFixedFont = KGlobalSettings::fixedFont();
+++        aFixedFont = TDEGlobalSettings::fixedFont();
 ++        nFontHeight = aFixedFont.pointSize();
 ++        return css::beans::Optional< css::uno::Any >(
 ++            true, uno::makeAny( nFontHeight ) );
@@ -11491,7 +11491,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        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 >(
@@ -11506,7 +11506,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    } 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('/')) )
@@ -14856,7 +14856,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 ++
 ++    // WM settings
-++    KConfig *pConfig = KGlobal::config();
+++    KConfig *pConfig = TDEGlobal::config();
 ++    if ( pConfig )
 ++    {
 ++        pConfig->setGroup( "WM" );
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" );