Rename KCmd to avoid conflicts with KDE4

11 years ago · 868c146fd3
parent 8c5f73ae48
commit 868c146fd3
3 changed files with 6 additions and 6 deletions
--- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++// Main
 ++//////////////////////////////////////////////////////////////////////////
 ++
-++static KCmdLineOptions sOptions[] =
++static TDECmdLineOptions sOptions[] =
 ++{
 ++    { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
-++    KCmdLineLastOption
++    TDECmdLineLastOption
 ++};
 ++
 ++int main( int argc, char* argv[] )
--- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff
+++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff
@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
 ++// Main
 ++//////////////////////////////////////////////////////////////////////////
 ++
-++static KCmdLineOptions sOptions[] =
++static TDECmdLineOptions sOptions[] =
 ++{
 ++    { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
-++    KCmdLineLastOption
++    TDECmdLineLastOption
 ++};
 ++
 ++int main( int argc, char* argv[] )
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@ -9345,10 +9345,10 @@ index 0000000..eb20aa3
 +// Main
 +//////////////////////////////////////////////////////////////////////////
 +
-+static KCmdLineOptions sOptions[] =
+static TDECmdLineOptions sOptions[] =
 +{
 +    { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
-+    KCmdLineLastOption
+    TDECmdLineLastOption
 +};
 +
 +int main( int argc, char* argv[] )