Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 17, 2016, 10:29:21 PM (8 years ago)
Author:
landauf
Message:

merged branch cpp11_v3 back to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/libraries/core/config/ConfigFileEntryValue.h

    r9684 r11071  
    6767
    6868            /// Destructor
    69             inline virtual ~ConfigFileEntryValue() {}
     69            virtual inline ~ConfigFileEntryValue() = default;
    7070
    71             inline virtual const std::string& getName() const
     71            virtual inline const std::string& getName() const override
    7272                { return this->name_; }
    7373
    74             inline virtual void setComment(const std::string& comment)
     74            virtual inline void setComment(const std::string& comment) override
    7575                { this->additionalComment_ = comment; this->update(); }
    7676
    77             inline virtual void setValue(const std::string& value)
     77            virtual inline void setValue(const std::string& value) override
    7878                { this->value_ = value; this->update(); }
    79             inline virtual const std::string& getValue() const
     79            virtual inline const std::string& getValue() const override
    8080                { return this->value_; }
    8181
    82             inline void virtual setString(bool bString)
     82            virtual inline void setString(bool bString) override
    8383                { this->bString_ = bString; this->update(); }
    8484
    85             inline virtual const std::string& getFileEntry() const
     85            virtual inline const std::string& getFileEntry() const override
    8686                { return this->fileEntry_; }
    8787
    8888            /// Returns the "key" of the value (in this case it's just the name of the entry, but for vectors it's different)
    89             inline virtual const std::string& getKeyString() const
     89            virtual inline const std::string& getKeyString() const
    9090                { return this->name_; }
    9191
Note: See TracChangeset for help on using the changeset viewer.