From d8a617b8946d1b8427e098a61e41586bc6e4eebb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:43:18 -0600
Subject: [PATCH] Rename additional global TQt functions

---
 libreoffice/3.3.2/patches/libreoffice-trinity.diff          | 2 +-
 libreoffice/3.3.3/patches/libreoffice-trinity.diff          | 2 +-
 libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 4c1b370..d530434 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -15381,7 +15381,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
 ++            XInitThreads();
 ++
-++        rtl::OString aVersion( qVersion() );
+++        rtl::OString aVersion( tqVersion() );
 ++#if OSL_DEBUG_LEVEL > 1
 ++        fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
 ++#endif
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index f565332..1e1fae0 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -15381,7 +15381,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++        if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
 ++            XInitThreads();
 ++
-++        rtl::OString aVersion( qVersion() );
+++        rtl::OString aVersion( tqVersion() );
 ++#if OSL_DEBUG_LEVEL > 1
 ++        fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
 ++#endif
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 42012e5..61f5792 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -16135,7 +16135,7 @@ index 0000000..adeb628
 +        if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
 +            XInitThreads();
 +
-+        rtl::OString aVersion( qVersion() );
++        rtl::OString aVersion( tqVersion() );
 +#if OSL_DEBUG_LEVEL > 1
 +        fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
 +#endif