Commit cfdf3b2c authored by Matthias Möller's avatar Matthias Möller

- from file does not set the object name of an object anymore

- so changed this behaviour to the loading plugins
- obj file sets the filename and the path of an object

refs #670

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14545 383ad7c9-94d9-4d36-a494-682f7c89f535
parent a66920fd
......@@ -731,7 +731,6 @@ void BaseObject::setFromFileName(const QString &_filename ) {
setPath(file_info.path());
QString filename = file_info.fileName();
setFileName(filename);
setName(filename);
}
void BaseObject::setName(QString _name ) {
......
......@@ -419,9 +419,7 @@ class DLLEXPORTONLY BaseObject : public QObject {
* @{ */
//===========================================================================
/** Set the object name from a filename. The function will set the name of the
* object to the filename. At the same time the path and the filename is
* set to the one given in the parameter
/** Set the object path and filename from the given parameter.
*
* @param _filename path to the file.
*/
......@@ -437,7 +435,10 @@ class DLLEXPORTONLY BaseObject : public QObject {
/// return the name of the object. The name defaults to NONAME if unset.
QString name( );
/// set the name of the object. ( If you overwrite it, call BaseObject::setName(_name ) it in your funtion first)
/* set the name of the object. ( If you overwrite it, call BaseObject::setName(_name ) it in your funtion first)
* this is may not the filename of the given object, because one file can have multiple objects
*/
virtual void setName(QString _name );
/// return the filename of the object
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment