Rename KCmd to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 8c5f73ae48
commit 868c146fd3

@ -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[] )

@ -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[] )

@ -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[] )

Loading…
Cancel
Save