TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KInstance and KAboutData to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent d337ac3073
commit 6678123f88
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

8
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -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 ++ // we fake the name of the application to have "OpenOffice.org" in the
++ // title ++ // 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." ), ++ "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" ); ++ "(c) 2004, Jan Holesovsky" );
++ qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); ++ 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(); ++ pInputMethod->SetLocale();
++ XrmInitialize(); ++ XrmInitialize();
++ ++
++ KAboutData *kAboutData = new KAboutData( "LibreOffice", ++ TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
++ I18N_NOOP( "LibreOffice" ), ++ I18N_NOOP( "LibreOffice" ),
++ "1.1.0", ++ "1.1.0",
++ I18N_NOOP( "LibreOffice with TDE Native Widget Support." ), ++ I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
++ KAboutData::License_LGPL, ++ TDEAboutData::License_LGPL,
++ "(c) 2003, 2004 Novell, Inc", ++ "(c) 2003, 2004 Novell, Inc",
++ I18N_NOOP( "LibreOffice is an office suite.\n" ), ++ I18N_NOOP( "LibreOffice is an office suite.\n" ),
++ "http://libreoffice.org", ++ "http://libreoffice.org",

8
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -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 ++ // we fake the name of the application to have "OpenOffice.org" in the
++ // title ++ // 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." ), ++ "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" ); ++ "(c) 2004, Jan Holesovsky" );
++ qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); ++ 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(); ++ pInputMethod->SetLocale();
++ XrmInitialize(); ++ XrmInitialize();
++ ++
++ KAboutData *kAboutData = new KAboutData( "LibreOffice", ++ TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
++ I18N_NOOP( "LibreOffice" ), ++ I18N_NOOP( "LibreOffice" ),
++ "1.1.0", ++ "1.1.0",
++ I18N_NOOP( "LibreOffice with TDE Native Widget Support." ), ++ I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
++ KAboutData::License_LGPL, ++ TDEAboutData::License_LGPL,
++ "(c) 2003, 2004 Novell, Inc", ++ "(c) 2003, 2004 Novell, Inc",
++ I18N_NOOP( "LibreOffice is an office suite.\n" ), ++ I18N_NOOP( "LibreOffice is an office suite.\n" ),
++ "http://libreoffice.org", ++ "http://libreoffice.org",

8
libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff
Unescape View File

@ -2792,10 +2792,10 @@ index be40226..558c01b 100644
@@ -54,13 +62,13 @@ int main( int argc, char* argv[] ) @@ -54,13 +62,13 @@ int main( int argc, char* argv[] )
// we fake the name of the application to have "LibreOffice" in the // we fake the name of the application to have "LibreOffice" in the
// title // 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 KDE file dialog for LibreOffice." ),
+ "0.1", I18N_NOOP( "kdefilepicker is an implementation of the " THIS_DESKENV_NAME_CAP " 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" ); "(c) 2004, Jan Holesovsky" );
qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); 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. * since it will interfere badly with our own.
*/ */
@@ -123,7 +132,7 @@ void KDEXLib::Init() @@ -123,7 +132,7 @@ void KDEXLib::Init()
KAboutData *kAboutData = new KAboutData( "LibreOffice", TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
I18N_NOOP( "LibreOffice" ), I18N_NOOP( "LibreOffice" ),
"1.1.0", "1.1.0",
- I18N_NOOP( "LibreOffice with KDE Native Widget Support." ), - I18N_NOOP( "LibreOffice with KDE Native Widget Support." ),
+ I18N_NOOP( "LibreOffice with " THIS_DESKENV_NAME_CAP " 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", "(c) 2003, 2004 Novell, Inc",
I18N_NOOP( "LibreOffice is an office suite.\n" ), 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/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx

8
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -9355,9 +9355,9 @@ index 0000000..eb20aa3
+{ +{
+ // we fake the name of the application to have "OpenOffice.org" in the + // we fake the name of the application to have "OpenOffice.org" in the
+ // title + // 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." ), + "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" ); + "(c) 2004, Jan Holesovsky" );
+ qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" ); + qAboutData.addAuthor( "Jan Holesovsky", I18N_NOOP("Original author and current maintainer"), "kendy@openoffice.org" );
+ +
@ -16029,11 +16029,11 @@ index 0000000..adeb628
+ pInputMethod->SetLocale(); + pInputMethod->SetLocale();
+ XrmInitialize(); + XrmInitialize();
+ +
+ KAboutData *kAboutData = new KAboutData( "LibreOffice", + TDEAboutData *kAboutData = new TDEAboutData( "LibreOffice",
+ I18N_NOOP( "LibreOffice" ), + I18N_NOOP( "LibreOffice" ),
+ "1.1.0", + "1.1.0",
+ I18N_NOOP( "LibreOffice with TDE Native Widget Support." ), + I18N_NOOP( "LibreOffice with TDE Native Widget Support." ),
+ KAboutData::License_LGPL, + TDEAboutData::License_LGPL,
+ "(c) 2003, 2004 Novell, Inc\n(c) 2010 Timothy Pearson", + "(c) 2003, 2004 Novell, Inc\n(c) 2010 Timothy Pearson",
+ I18N_NOOP( "LibreOffice is an office suite.\n" ), + I18N_NOOP( "LibreOffice is an office suite.\n" ),
+ "http://libreoffice.org", + "http://libreoffice.org",

Write Preview
Loading…
Cancel
Save