onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 20:27:22 +01:00
Code Issues Releases Wiki Activity

fixes #930 duplicating object preserves the name, then GUI complains about it

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-17 19:03:39 +00:00
parent 3665045dfe
commit c9386ad78a
8 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2177
#define BUILD_NUM 2179

4
src/gui/FWWindow.h
View File

@ -321,10 +321,6 @@ public slots:
void findAllFirewalls (std::list<libfwbuilder::Firewall *> &fws);
libfwbuilder::FWObject* duplicateObject(libfwbuilder::FWObject *target,
libfwbuilder::FWObject *obj,
const QString &name = QString::null,
bool askForAutorename=true);
void showDeletedObjects(bool f);
// void select();

11
src/gui/FWWindow_wrappers.cpp
View File

@ -457,17 +457,6 @@ void FWWindow::findAllFirewalls (std::list<Firewall *> &fws)
if (activeProject()) activeProject()->findAllFirewalls (fws);
}
FWObject* FWWindow::duplicateObject(FWObject *target,
FWObject *obj,
const QString &name,
bool askForAutorename)
{
if (activeProject())
return activeProject()->duplicateObject(target,
obj, name, askForAutorename);
return 0;
}
void FWWindow::showDeletedObjects(bool f)
{
if (activeProject()) activeProject()->showDeletedObjects(f);

4
src/gui/ObjectManipulator.h
View File

@ -295,9 +295,7 @@ public:
void openObjectInTree(ObjectTreeViewItem *otvi, bool register_in_history);
libfwbuilder::FWObject* duplicateObject(libfwbuilder::FWObject *target,
libfwbuilder::FWObject *obj,
const QString &name = QString::null,
bool askForAutorename=true);
libfwbuilder::FWObject *obj);
void moveObject(libfwbuilder::FWObject *target,
libfwbuilder::FWObject *obj);

12
src/gui/ObjectManipulator_ops.cpp
View File

@ -204,16 +204,14 @@ void ObjectManipulator::autorenameVlans(list<FWObject*> &obj_list)
}
}
FWObject* ObjectManipulator::duplicateObject(FWObject *targetLib,
FWObject *obj,
const QString &name,
bool)
FWObject* ObjectManipulator::duplicateObject(FWObject *targetLib, FWObject *obj)
{
if (!isTreeReadWrite(this, targetLib)) return NULL;
openLib(targetLib);
QString newName;
if (!name.isEmpty()) newName = name;
else newName = QString::fromUtf8(obj->getName().c_str());
QString newName =
makeNameUnique(obj->getParent(),
QString::fromUtf8(obj->getName().c_str()),
obj->getTypeName().c_str());
return createObject(obj->getTypeName().c_str(), newName, obj);
}

2
src/gui/ObjectManipulator_slots.cpp
View File

@ -239,7 +239,7 @@ void ObjectManipulator::duplicateObj(QAction *action)
obj= *i;
if ( FWBTree().isSystem(obj) || Interface::isA(obj) ) continue;
FWObject *cl = idxToLibs[libid];
nobj = duplicateObject(cl, obj, "", false);
nobj = duplicateObject(cl, obj);
}
editObject(nobj);
ot->freezeSelection(false);

8
src/gui/ProjectPanel.cpp
View File

@ -520,14 +520,6 @@ void ProjectPanel::findAllFirewalls (std::list<Firewall *> &fws)
m_panel->om->findAllFirewalls(fws);
}
FWObject* ProjectPanel::duplicateObject(FWObject *target,
FWObject *obj,
const QString &name,
bool askForAutorename)
{
return m_panel->om->duplicateObject(target, obj, name, askForAutorename);
}
void ProjectPanel::showDeletedObjects(bool f)
{
m_panel->om->showDeletedObjects(f);

4
src/gui/ProjectPanel.h
View File

@ -174,10 +174,6 @@ public:
void findAllFirewalls (std::list<libfwbuilder::Firewall *> &fws);
libfwbuilder::FWObject* duplicateObject(libfwbuilder::FWObject *target,
libfwbuilder::FWObject *obj,
const QString &name = QString::null,
bool askForAutorename=true);
void showDeletedObjects(bool f);
void select();
void unselect();