diff --git a/src/libgui/ObjectManipulator.h b/src/libgui/ObjectManipulator.h index 18692edf8..f73e470db 100644 --- a/src/libgui/ObjectManipulator.h +++ b/src/libgui/ObjectManipulator.h @@ -323,8 +323,6 @@ public: const std::string &namesuffix); void autorenameVlans(std::list &obj_list); - std::string getFolderNameString(libfwbuilder::FWObject *obj); - void reload(); void loadObjects(); @@ -494,8 +492,6 @@ public: void addSubfolderActions(QList &AddObjectActions, libfwbuilder::FWObject *currentObj, ObjectTreeViewItem *item, bool &addSubfolder); signals: void libraryAccessChanged(bool writable); - - }; #endif diff --git a/src/libgui/ObjectManipulator_tree_ops.cpp b/src/libgui/ObjectManipulator_tree_ops.cpp index 51d7a041d..47b6d912c 100644 --- a/src/libgui/ObjectManipulator_tree_ops.cpp +++ b/src/libgui/ObjectManipulator_tree_ops.cpp @@ -553,7 +553,7 @@ void ObjectManipulator::clearObjects() libs_model->removeRows(0, libs_model->rowCount()); libs_model->addStaticItems(); - + current_tree_view = nullptr; if (fwbdebug) qDebug("ObjectManipulator::clearObjects done"); @@ -814,12 +814,9 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj, FWObject* newFolder = obj->getRoot()->create(ObjectGroup::TYPENAME); newFolder->setParent(obj); - newFolder->setName(folder.toUtf8().constData() - ); sub->setFWObject(newFolder); allItems[newFolder] = sub; obj->setStr("folder", folder.toUtf8().constData()); - newFolder->setStr("folder", getFolderNameString(newFolder)); sub->setUserFolderParent(obj); sub->setUserFolderName(folder); @@ -829,21 +826,6 @@ void ObjectManipulator::addUserFolderToTree(FWObject *obj, } -std::string ObjectManipulator::getFolderNameString(libfwbuilder::FWObject *obj) { - std::string result = ""; - FWObject *parent = obj->getParent(); - - - while(parent != nullptr) { - result = parent->getName() + "/" + result; - parent = parent->getParent(); - } - - result = result + obj->getName(); - - return result; -} - void ObjectManipulator::removeUserFolderFromTree(FWObject *obj, const QString &folder) { @@ -892,4 +874,4 @@ void ObjectManipulator::moveToFromUserFolderInTree(FWObject *obj, refreshSubtree(newItem, nullptr); } - +