5 files changed, 9 insertions, 14 deletions
diff --git a/codemaker/source/bonobowrappermaker/corbaoptions.cxx b/codemaker/source/bonobowrappermaker/corbaoptions.cxx
index 3c644b6ff4dd..1bb75810031a 100644
--- a/codemaker/source/bonobowrappermaker/corbaoptions.cxx
+++ b/codemaker/source/bonobowrappermaker/corbaoptions.cxx
@@ -247,9 +247,8 @@ OString CorbaOptions::prepareHelp()
 
 OString CorbaOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
+    OString version(m_program);
     version += m_program + " Version 2.0\n\n";
-
     return version;
 }
 
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 1bc398391c9d..20ed3683a8bc 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -346,9 +346,8 @@ OString CppuOptions::prepareHelp()
 
 OString CppuOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/cunomaker/cunooptions.cxx b/codemaker/source/cunomaker/cunooptions.cxx
index 50a1223d004f..909ab3edc8dd 100644
--- a/codemaker/source/cunomaker/cunooptions.cxx
+++ b/codemaker/source/cunomaker/cunooptions.cxx
@@ -321,9 +321,8 @@ OString CunoOptions::prepareHelp()
 
 OString CunoOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 1.0\n\n";
-
+    OString version(m_program);
+    version += " Version 1.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/idlmaker/idloptions.cxx b/codemaker/source/idlmaker/idloptions.cxx
index 306e43293223..e495f555e5cb 100644
--- a/codemaker/source/idlmaker/idloptions.cxx
+++ b/codemaker/source/idlmaker/idloptions.cxx
@@ -242,9 +242,8 @@ OString IdlOptions::prepareHelp()
 
 OString IdlOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }
 
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index 24b9b1509cfc..5daedef06089 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -290,9 +290,8 @@ OString JavaOptions::prepareHelp()
 
 OString JavaOptions::prepareVersion()
 {
-    OString version("\nSun Microsystems (R) ");
-    version += m_program + " Version 2.0\n\n";
-
+    OString version(m_program);
+    version += " Version 2.0\n\n";
     return version;
 }