Rename KInstance and KAboutData to avoid conflicts with KDE4

4 files changed, 16 insertions, 16 deletions

diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 505915f..050af68 100644
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -9028,9 +9028,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++{
 ++    // we fake the name of the application to have "OpenOffice.org" in the
 ++    // title
-++    KAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
+++    TDEAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
 ++            "0.1", I18N_NOOP( "tdefilepicker is an implementation of the TDE file dialog for OpenOffice.org." ),
-++            KAboutData::License_LGPL,
+++            TDEAboutData::License_LGPL,
 ++            "(c) 2004, Jan Holesovsky" );
 ++    qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
 ++
@@ -15265,11 +15265,11 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    pInputMethod->SetLocale();
 ++    XrmInitialize();
 ++
-++    KAboutData *kAboutData = new KAboutData( "LibreOffice",
+++    TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
 ++            I18N_NOOP( "LibreOffice" ),
 ++            "1.1.0",
 ++            I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
-++            KAboutData::License_LGPL,
+++            TDEAboutData::License_LGPL,
 ++            "(c) 2003, 2004 Novell, Inc",
 ++            I18N_NOOP( "LibreOffice is an office suite.\n" ),
 ++            "http://libreoffice.org",
diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
index b79bf96..17aa587 100644
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@@ -9028,9 +9028,9 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++{
 ++    // we fake the name of the application to have "OpenOffice.org" in the
 ++    // title
-++    KAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
+++    TDEAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
 ++            "0.1", I18N_NOOP( "tdefilepicker is an implementation of the TDE file dialog for OpenOffice.org." ),
-++            KAboutData::License_LGPL,
+++            TDEAboutData::License_LGPL,
 ++            "(c) 2004, Jan Holesovsky" );
 ++    qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
 ++
@@ -15265,11 +15265,11 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++    pInputMethod->SetLocale();
 ++    XrmInitialize();
 ++
-++    KAboutData *kAboutData = new KAboutData( "LibreOffice",
+++    TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
 ++            I18N_NOOP( "LibreOffice" ),
 ++            "1.1.0",
 ++            I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
-++            KAboutData::License_LGPL,
+++            TDEAboutData::License_LGPL,
 ++            "(c) 2003, 2004 Novell, Inc",
 ++            I18N_NOOP( "LibreOffice is an office suite.\n" ),
 ++            "http://libreoffice.org",
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
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index f397150..35d41cf 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -9355,9 +9355,9 @@ index 0000000..eb20aa3
 +{
 +    // we fake the name of the application to have "OpenOffice.org" in the
 +    // title
-+    KAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
++    TDEAboutData qAboutData( "tdefilepicker", I18N_NOOP( "OpenOffice.org" ),
 +            "0.1", I18N_NOOP( "tdefilepicker is an implementation of the TDE file dialog for OpenOffice.org." ),
-+            KAboutData::License_LGPL,
++            TDEAboutData::License_LGPL,
 +            "(c) 2004, Jan Holesovsky" );
 +    qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
 +
@@ -16029,11 +16029,11 @@ index 0000000..adeb628
 +    pInputMethod->SetLocale();
 +    XrmInitialize();
 +
-+    KAboutData *kAboutData = new KAboutData( "LibreOffice",
++    TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
 +            I18N_NOOP( "LibreOffice" ),
 +            "1.1.0",
 +            I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
-+            KAboutData::License_LGPL,
++            TDEAboutData::License_LGPL,
 +            "(c) 2003, 2004 Novell, Inc\n(c) 2010 Timothy Pearson",
 +            I18N_NOOP( "LibreOffice is an office suite.\n" ),
 +            "http://libreoffice.org",