Simon Bonnefoy / gammalib

Commit 7c97aed0c8388c77e8cff305a43d8177db63b4bc

Authored by Michael Mayer
1 parent 320e8a1f

Added default argument to extno() and extver()

Inline Side-by-side
Showing 3 changed files with 55 additions and 28 deletions
include/GFilename.hpp
  View file @7c97aed
... ... @@ -61,8 +61,8 @@ public:
61 61 int length(void) const;
62 62 const std::string& filename(void) const;
63 63 std::string extname(const std::string& defaultname = "") const;
64   - const int& extno(void) const;
65   - const int& extver(void) const;
  64 + int extno(const int& defaultextno = 1) const;
  65 + int extver(const int& defaultextver = 1) const;
66 66 bool has_extname(void) const;
67 67 bool has_extno(void) const;
68 68 bool has_extver(void) const;
... ... @@ -146,30 +146,6 @@ const std::string& GFilename::filename(void) const
146 146  
147 147  
148 148 /***********************************************************************//**
149   - * @brief Return extension number
150   - *
151   - * @return Extension number (-1 if not set).
152   - ***************************************************************************/
153   -inline
154   -const int& GFilename::extno(void) const
155   -{
156   - return (m_extno);
157   -}
158   -
159   -
160   -/***********************************************************************//**
161   - * @brief Return extension version
162   - *
163   - * @return Extension version (0 if not set).
164   - ***************************************************************************/
165   -inline
166   -const int& GFilename::extver(void) const
167   -{
168   - return (m_extver);
169   -}
170   -
171   -
172   -/***********************************************************************//**
173 149 * @brief Signal if filename has an extension name
174 150 *
175 151 * @return True if filename has an extension name, false otherwise.
... ...
pyext/GFilename.i
  View file @7c97aed
... ... @@ -53,8 +53,8 @@ public:
53 53 int length(void) const;
54 54 const std::string& filename(void) const;
55 55 std::string extname(const std::string& defaultname = "") const;
56   - const int& extno(void) const;
57   - const int& extver(void) const;
  56 + int extno(const int& defaultextno = 1) const;
  57 + int extver(const int& defaultextver = 1) const;
58 58 bool has_extname(void) const;
59 59 bool has_extno(void) const;
60 60 bool has_extver(void) const;
... ...
src/support/GFilename.cpp
  View file @7c97aed
... ... @@ -225,6 +225,57 @@ std::string GFilename::extname(const std::string& defaultname) const
225 225  
226 226  
227 227 /***********************************************************************//**
  228 + * @brief Return extension number
  229 + *
  230 + * @param[in] defaultextno Default extension number (default: 1).
  231 + * @return Integer containing extension number.
  232 + *
  233 + * Returns the extension number. If no extension number is given the number
  234 + * provided by the @p defaultextno argument will be used. By default, the
  235 + * @p defaultextno parameter is set to 1.
  236 + ***************************************************************************/
  237 +int GFilename::extno(const int& defaultextno) const
  238 +{
  239 + // Set the extension number
  240 + int extno = m_extno;
  241 +
  242 + // If no extension number is set, the use the default extension number
  243 + if (!has_extno()) {
  244 + extno = defaultextno;
  245 + }
  246 +
  247 + // Return extension number
  248 + return (extno);
  249 +}
  250 +
  251 +
  252 +/***********************************************************************//**
  253 + * @brief Return extension version number
  254 + *
  255 + * @param[in] defaultextver Default extension version number (default: 1).
  256 + * @return Integer containing extension version number.
  257 + *
  258 + * Returns the extension version number. If no extension version number is given the number
  259 + * provided by the @p defaultextver argument will be used. By default, the
  260 + * @p defaultextver parameter is set to 1.
  261 + ***************************************************************************/
  262 +int GFilename::extver(const int& defaultextver) const
  263 +{
  264 + // Set the extension version number
  265 + int extver = m_extver;
  266 +
  267 + // If no extension number is set, the use the default extension version number
  268 + if (!has_extver()) {
  269 + extver = defaultextver;
  270 + }
  271 +
  272 + // Return extension number
  273 + return (extver);
  274 +}
  275 +
  276 +
  277 +
  278 +/***********************************************************************//**
228 279 * @brief Print file name information
229 280 *
230 281 * @param[in] chatter Chattiness (default: NORMAL).
... ...