Mercurial > octave
changeset 27934:49a0d90cd2a3
maint: Use Octave coding conventions in src/ directory.
* main.in.cc, mkoctfile.in.cc, octave-config.in.cc,
octave-svgconvert.cc:
Use Octave coding conventions in src/ directory.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 11 Jan 2020 13:55:55 -0800 |
| parents | 863ae57eee69 |
| children | f1844e33f621 |
| files | src/main.in.cc src/mkoctfile.in.cc src/octave-config.in.cc src/octave-svgconvert.cc |
| diffstat | 4 files changed, 193 insertions(+), 191 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.in.cc Sat Jan 11 12:53:20 2020 -0800 +++ b/src/main.in.cc Sat Jan 11 13:55:55 2020 -0800 @@ -163,7 +163,8 @@ std::string obd = octave_getenv ("OCTAVE_BINDIR"); - return obd.empty () ? prepend_octave_exec_home (std::string (OCTAVE_BINDIR)) : obd; + return obd.empty () ? prepend_octave_exec_home (std::string (OCTAVE_BINDIR)) + : obd; } static std::string @@ -290,14 +291,14 @@ for (size_t j = 1; j < len; j++) switch (argv[i][j]) { - case 'W': - no_display = true; - break; - case 'q': - warn_display = false; - break; - default: - break; + case 'W': + no_display = true; + break; + case 'q': + warn_display = false; + break; + default: + break; } new_argv[k++] = argv[i];
--- a/src/mkoctfile.in.cc Sat Jan 11 12:53:20 2020 -0800 +++ b/src/mkoctfile.in.cc Sat Jan 11 13:55:55 2020 -0800 @@ -201,7 +201,8 @@ = get_variable ("LIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_LIBDIR%)); vars["OCTLIBDIR"] - = get_variable ("OCTLIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%)); + = get_variable ("OCTLIBDIR", + prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%)); #if defined (OCTAVE_USE_WINDOWS_API) std::string DEFAULT_INCFLAGS @@ -348,148 +349,148 @@ static bool debug = false; static std::string help_msg = -"\n" -"Options:\n" -"\n" -" -h, -?, --help Print this message.\n" -"\n" -" -IDIR Add -IDIR to compile commands.\n" -"\n" -" -idirafter DIR Add -idirafter DIR to compile commands.\n" -"\n" -" -DDEF Add -DDEF to compile commands.\n" -"\n" -" -lLIB Add library LIB to link command.\n" -"\n" -" -LDIR Add -LDIR to link command.\n" -"\n" -" -M, --depend Generate dependency files (.d) for C and C++\n" -" source files.\n" + "\n" + "Options:\n" + "\n" + " -h, -?, --help Print this message.\n" + "\n" + " -IDIR Add -IDIR to compile commands.\n" + "\n" + " -idirafter DIR Add -idirafter DIR to compile commands.\n" + "\n" + " -DDEF Add -DDEF to compile commands.\n" + "\n" + " -lLIB Add library LIB to link command.\n" + "\n" + " -LDIR Add -LDIR to link command.\n" + "\n" + " -M, --depend Generate dependency files (.d) for C and C++\n" + " source files.\n" #if ! defined (OCTAVE_USE_WINDOWS_API) -"\n" -" -pthread Add -pthread to link command.\n" + "\n" + " -pthread Add -pthread to link command.\n" #endif -"\n" -" -RDIR Add -RDIR to link command.\n" -"\n" -" -Wl,... Pass flags though the linker like -Wl,-rpath=...\n" -"\n" -" -W... Pass flags though the compiler like -Wa,OPTION.\n" -"\n" -" -c, --compile Compile, but do not link.\n" -"\n" -" -o FILE, --output FILE Output filename. Default extension is .oct\n" -" (or .mex if --mex is specified) unless linking\n" -" a stand-alone executable.\n" -"\n" -" -g Enable debugging options for compilers.\n" -"\n" -" -p VAR, --print VAR Print configuration variable VAR. There are\n" -" three categories of variables:\n" -"\n" -" Octave configuration variables that users may\n" -" override with environment variables. These are\n" -" used in commands that mkoctfile executes.\n" -"\n" -" ALL_CFLAGS INCLUDEDIR\n" -" ALL_CXXFLAGS LAPACK_LIBS\n" -" ALL_FFLAGS LDFLAGS\n" -" ALL_LDFLAGS LD_STATIC_FLAG\n" -" BLAS_LIBS LIBDIR\n" -" CC LIBOCTAVE\n" -" CFLAGS LIBOCTINTERP\n" -" CPICFLAG OCTAVE_LINK_OPTS\n" -" CPPFLAGS OCTINCLUDEDIR\n" -" CXX OCTAVE_LIBS\n" -" CXXFLAGS OCTAVE_LINK_DEPS\n" -" CXXLD OCTLIBDIR\n" -" CXXPICFLAG OCT_LINK_DEPS\n" -" DL_LDFLAGS OCT_LINK_OPTS\n" -" F77 RDYNAMIC_FLAG\n" -" F77_INTEGER8_FLAG SPECIAL_MATH_LIB\n" -" FFLAGS XTRA_CFLAGS\n" -" FPICFLAG XTRA_CXXFLAGS\n" -" INCFLAGS\n" -"\n" -" Octave configuration variables as above, but\n" -" currently unused by mkoctfile.\n" -"\n" -" AR\n" -" DEPEND_EXTRA_SED_PATTERN\n" -" DEPEND_FLAGS\n" -" FFTW3F_LDFLAGS\n" -" FFTW3F_LIBS\n" -" FFTW3_LDFLAGS\n" -" FFTW3_LIBS\n" -" FFTW_LIBS\n" -" FLIBS\n" -" LIBS\n" -" RANLIB\n" -" READLINE_LIBS\n" -"\n" -" Octave configuration variables that are provided\n" -" for informational purposes only. Except for\n" -" OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n" -" override these variables.\n" -"\n" -" If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n" -" the environment, then other variables are adjusted\n" -" accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n" -" substituted for the original value of the directory\n" -" specified by the --prefix or --exec-prefix options\n" -" that were used when Octave was configured.\n" -"\n" -" API_VERSION LOCALFCNFILEDIR\n" -" ARCHLIBDIR LOCALOCTFILEDIR\n" -" BINDIR LOCALSTARTUPFILEDIR\n" -" CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" -" DATADIR LOCALVERFCNFILEDIR\n" -" DATAROOTDIR LOCALVEROCTFILEDIR\n" -" DEFAULT_PAGER MAN1DIR\n" -" EXEC_PREFIX MAN1EXT\n" -" EXEEXT MANDIR\n" -" FCNFILEDIR OCTAVE_EXEC_HOME\n" -" IMAGEDIR OCTAVE_HOME\n" -" INFODIR OCTAVE_VERSION\n" -" INFOFILE OCTDATADIR\n" -" LIBEXECDIR OCTDOCDIR\n" -" LOCALAPIARCHLIBDIR OCTFILEDIR\n" -" LOCALAPIFCNFILEDIR OCTFONTSDIR\n" -" LOCALAPIOCTFILEDIR STARTUPFILEDIR\n" -" LOCALARCHLIBDIR\n" -"\n" -" --link-stand-alone Link a stand-alone executable file.\n" -"\n" -" --mex Assume we are creating a MEX file. Set the\n" -" default output extension to \".mex\".\n" -"\n" -" -s, --strip Strip output file.\n" -"\n" -" -n, --just-print, --dry-run\n" -" Print commands, but do not execute them.\n" -"\n" -" -v, --verbose Echo commands as they are executed.\n" -"\n" -" FILE Compile or link FILE. Recognized file types are:\n" -"\n" -" .c C source\n" -" .cc C++ source\n" -" .cp C++ source\n" -" .cpp C++ source\n" -" .CPP C++ source\n" -" .cxx C++ source\n" -" .c++ C++ source\n" -" .C C++ source\n" -" .f Fortran source (fixed form)\n" -" .F Fortran source (fixed form)\n" -" .f90 Fortran source (free form)\n" -" .F90 Fortran source (free form)\n" -" .o object file\n" -" .a library file\n" + "\n" + " -RDIR Add -RDIR to link command.\n" + "\n" + " -Wl,... Pass flags though the linker like -Wl,-rpath=...\n" + "\n" + " -W... Pass flags though the compiler like -Wa,OPTION.\n" + "\n" + " -c, --compile Compile, but do not link.\n" + "\n" + " -o FILE, --output FILE Output filename. Default extension is .oct\n" + " (or .mex if --mex is specified) unless linking\n" + " a stand-alone executable.\n" + "\n" + " -g Enable debugging options for compilers.\n" + "\n" + " -p VAR, --print VAR Print configuration variable VAR. There are\n" + " three categories of variables:\n" + "\n" + " Octave configuration variables that users may\n" + " override with environment variables. These are\n" + " used in commands that mkoctfile executes.\n" + "\n" + " ALL_CFLAGS INCLUDEDIR\n" + " ALL_CXXFLAGS LAPACK_LIBS\n" + " ALL_FFLAGS LDFLAGS\n" + " ALL_LDFLAGS LD_STATIC_FLAG\n" + " BLAS_LIBS LIBDIR\n" + " CC LIBOCTAVE\n" + " CFLAGS LIBOCTINTERP\n" + " CPICFLAG OCTAVE_LINK_OPTS\n" + " CPPFLAGS OCTINCLUDEDIR\n" + " CXX OCTAVE_LIBS\n" + " CXXFLAGS OCTAVE_LINK_DEPS\n" + " CXXLD OCTLIBDIR\n" + " CXXPICFLAG OCT_LINK_DEPS\n" + " DL_LDFLAGS OCT_LINK_OPTS\n" + " F77 RDYNAMIC_FLAG\n" + " F77_INTEGER8_FLAG SPECIAL_MATH_LIB\n" + " FFLAGS XTRA_CFLAGS\n" + " FPICFLAG XTRA_CXXFLAGS\n" + " INCFLAGS\n" + "\n" + " Octave configuration variables as above, but\n" + " currently unused by mkoctfile.\n" + "\n" + " AR\n" + " DEPEND_EXTRA_SED_PATTERN\n" + " DEPEND_FLAGS\n" + " FFTW3F_LDFLAGS\n" + " FFTW3F_LIBS\n" + " FFTW3_LDFLAGS\n" + " FFTW3_LIBS\n" + " FFTW_LIBS\n" + " FLIBS\n" + " LIBS\n" + " RANLIB\n" + " READLINE_LIBS\n" + "\n" + " Octave configuration variables that are provided\n" + " for informational purposes only. Except for\n" + " OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n" + " override these variables.\n" + "\n" + " If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n" + " the environment, then other variables are adjusted\n" + " accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n" + " substituted for the original value of the directory\n" + " specified by the --prefix or --exec-prefix options\n" + " that were used when Octave was configured.\n" + "\n" + " API_VERSION LOCALFCNFILEDIR\n" + " ARCHLIBDIR LOCALOCTFILEDIR\n" + " BINDIR LOCALSTARTUPFILEDIR\n" + " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" + " DATADIR LOCALVERFCNFILEDIR\n" + " DATAROOTDIR LOCALVEROCTFILEDIR\n" + " DEFAULT_PAGER MAN1DIR\n" + " EXEC_PREFIX MAN1EXT\n" + " EXEEXT MANDIR\n" + " FCNFILEDIR OCTAVE_EXEC_HOME\n" + " IMAGEDIR OCTAVE_HOME\n" + " INFODIR OCTAVE_VERSION\n" + " INFOFILE OCTDATADIR\n" + " LIBEXECDIR OCTDOCDIR\n" + " LOCALAPIARCHLIBDIR OCTFILEDIR\n" + " LOCALAPIFCNFILEDIR OCTFONTSDIR\n" + " LOCALAPIOCTFILEDIR STARTUPFILEDIR\n" + " LOCALARCHLIBDIR\n" + "\n" + " --link-stand-alone Link a stand-alone executable file.\n" + "\n" + " --mex Assume we are creating a MEX file. Set the\n" + " default output extension to \".mex\".\n" + "\n" + " -s, --strip Strip output file.\n" + "\n" + " -n, --just-print, --dry-run\n" + " Print commands, but do not execute them.\n" + "\n" + " -v, --verbose Echo commands as they are executed.\n" + "\n" + " FILE Compile or link FILE. Recognized file types are:\n" + "\n" + " .c C source\n" + " .cc C++ source\n" + " .cp C++ source\n" + " .cpp C++ source\n" + " .CPP C++ source\n" + " .cxx C++ source\n" + " .c++ C++ source\n" + " .C C++ source\n" + " .f Fortran source (fixed form)\n" + " .F Fortran source (fixed form)\n" + " .f90 Fortran source (free form)\n" + " .F90 Fortran source (free form)\n" + " .o object file\n" + " .a library file\n" #if defined (_MSC_VER) -" .lib library file\n" + " .lib library file\n" #endif -"\n"; + "\n"; static std::string basename (const std::string& s, bool strip_path = false) @@ -1088,7 +1089,7 @@ if (! vars["CXXLD"].empty ()) { octave_libs = "-L" + quote_path (vars["OCTLIBDIR"]) - + ' ' + vars["OCTAVE_LIBS"]; + + ' ' + vars["OCTAVE_LIBS"]; std::string cmd = (vars["CXXLD"] + ' ' + vars["CPPFLAGS"] + ' ' @@ -1117,7 +1118,7 @@ { #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS) octave_libs = "-L" + quote_path (vars["OCTLIBDIR"]) - + ' ' + vars["OCTAVE_LIBS"]; + + ' ' + vars["OCTAVE_LIBS"]; #endif std::string cmd
--- a/src/octave-config.in.cc Sat Jan 11 12:53:20 2020 -0800 +++ b/src/octave-config.in.cc Sat Jan 11 13:55:55 2020 -0800 @@ -54,43 +54,43 @@ static std::string usage_msg = "usage: octave-config [options]"; static std::string help_msg = -"\n" -"Options:\n" -"\n" -" -h, -?, --help Print this message.\n" -"\n" -" --m-site-dir Print the name of the directory where Octave\n" -" expects to find locally installed .m files.\n" -"\n" -" --oct-site-dir Print the name of the directory where Octave\n" -" expects to find locally installed .oct files.\n" -"\n" -" -p VAR, --print VAR Print the value of the given configuration\n" -" variable VAR. Recognized variables are:\n" -"\n" -" API_VERSION LOCALFCNFILEDIR\n" -" ARCHLIBDIR LOCALOCTFILEDIR\n" -" BINDIR LOCALSTARTUPFILEDIR\n" -" CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" -" DATADIR LOCALVERFCNFILEDIR\n" -" DATAROOTDIR LOCALVEROCTFILEDIR\n" -" DEFAULT_PAGER MAN1DIR\n" -" EXEC_PREFIX MAN1EXT\n" -" EXEEXT MANDIR\n" -" FCNFILEDIR OCTAVE_EXEC_HOME\n" -" IMAGEDIR OCTAVE_HOME\n" -" INCLUDEDIR OCTDATADIR\n" -" INFODIR OCTDOCDIR\n" -" INFOFILE OCTFILEDIR\n" -" LIBDIR OCTFONTSDIR\n" -" LIBEXECDIR OCTINCLUDEDIR\n" -" LOCALAPIARCHLIBDIR OCTLIBDIR\n" -" LOCALAPIFCNFILEDIR STARTUPFILEDIR\n" -" LOCALAPIOCTFILEDIR VERSION\n" -" LOCALARCHLIBDIR\n" -"\n" -" -v, --version Print the Octave version number.\n" -"\n"; + "\n" + "Options:\n" + "\n" + " -h, -?, --help Print this message.\n" + "\n" + " --m-site-dir Print the name of the directory where Octave\n" + " expects to find locally installed .m files.\n" + "\n" + " --oct-site-dir Print the name of the directory where Octave\n" + " expects to find locally installed .oct files.\n" + "\n" + " -p VAR, --print VAR Print the value of the given configuration\n" + " variable VAR. Recognized variables are:\n" + "\n" + " API_VERSION LOCALFCNFILEDIR\n" + " ARCHLIBDIR LOCALOCTFILEDIR\n" + " BINDIR LOCALSTARTUPFILEDIR\n" + " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" + " DATADIR LOCALVERFCNFILEDIR\n" + " DATAROOTDIR LOCALVEROCTFILEDIR\n" + " DEFAULT_PAGER MAN1DIR\n" + " EXEC_PREFIX MAN1EXT\n" + " EXEEXT MANDIR\n" + " FCNFILEDIR OCTAVE_EXEC_HOME\n" + " IMAGEDIR OCTAVE_HOME\n" + " INCLUDEDIR OCTDATADIR\n" + " INFODIR OCTDOCDIR\n" + " INFOFILE OCTFILEDIR\n" + " LIBDIR OCTFONTSDIR\n" + " LIBEXECDIR OCTINCLUDEDIR\n" + " LOCALAPIARCHLIBDIR OCTLIBDIR\n" + " LOCALAPIFCNFILEDIR STARTUPFILEDIR\n" + " LOCALAPIOCTFILEDIR VERSION\n" + " LOCALARCHLIBDIR\n" + "\n" + " -v, --version Print the Octave version number.\n" + "\n"; static void initialize (void)
--- a/src/octave-svgconvert.cc Sat Jan 11 12:53:20 2020 -0800 +++ b/src/octave-svgconvert.cc Sat Jan 11 13:55:55 2020 -0800 @@ -317,7 +317,7 @@ void add (QPolygonF p) { if (m_polygons.count () == 0) - m_polygons.push_back (p); + m_polygons.push_back (p); else { QPolygonF tmp = mergepoly (m_polygons.back (), p); @@ -619,7 +619,7 @@ for (int jj = 0; jj < polygon.count (); jj++) { pts += QString ("%1,%2 ").arg (polygon[jj].x ()) - .arg (polygon[jj].y ()); + .arg (polygon[jj].y ()); } node.toElement ().setAttribute ("points", pts.trimmed ()); @@ -759,7 +759,7 @@ // Create a DOM document and load the svg file QDomDocument document; QString msg; - if(! document.setContent (&file, false, &msg)) + if (! document.setContent (&file, false, &msg)) { std::cerr << "Failed to parse XML contents" << std::endl << msg.toStdString (); @@ -809,7 +809,7 @@ int id = QFontDatabase::addApplicationFont (fontpath); if (id < 0) std::cerr << "warning: print: " - "Unable to add default font to database\n"; + "Unable to add default font to database\n"; } else std::cerr << "warning: print: FreeSans font not found\n";