Mercurial > octave-nkf

diff libgui/src/main-window.cc @ 17510:7542f4496974

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate some macros in version.h * version.cc: New file. * Makefile.am (DIST_SRC, liboctinterp_la_SOURCES): Add it to the lists. * version.cc, version.in.h (octave_www_statement, octave_contrib_statement, octave_bugs_statement, octave_name_version_and_copyright, octave_name_version_copyright_copying_and_warranty, octave_name_version_copyright_copying_warranty_and_bugs, octave_startup_message): New functions. * version.cc (octave_warranty_statement, format_url): New static functions. * version.in.h (OCTAVE_API_VERSION_NUMBER, OCTAVE_NAME_AND_VERSION, OCTAVE_CONFIG_STATEMENT, OCTAVE_COPYING_STATEMENT, X_OCTAVE_WARRANTY_STATEMENT, OCTAVE_WARRANTY_STATEMENT, OCTAVE_WWW_STATEMENT, OCTAVE_CONTRIB_STATEMENT OCTAVE_BUGS_STATEMENT OCTAVE_NAME_VERSION_AND_COPYRIGHT, OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY, X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY, X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS, OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS, OCTAVE_STARTUP_MESSAGE): Delete macros. Change all uses to new functions.
author John W. Eaton <jwe@octave.org>
date Sat, 28 Sep 2013 15:04:14 -0400
parents d0fa3568eb5d
children 387ecd448b30
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Thu Sep 26 15:28:33 2013 -0400
+++ b/libgui/src/main-window.cc	Sat Sep 28 15:04:14 2013 -0400
@@ -542,9 +542,11 @@
 void
 main_window::show_about_octave (void)
 {
-  QString message = OCTAVE_STARTUP_MESSAGE;
+  std::string message
+    = octave_name_version_copyright_copying_warranty_and_bugs (true);
 
-  QMessageBox::about (this, tr ("About Octave"), message);
+  QMessageBox::about (this, tr ("About Octave"),
+                      QString::fromStdString (message));
 }
 
 void