onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

bug 2023676 and 2023292

Browse Source
This commit is contained in:
Vadim Kurland 2008-07-21 15:47:19 +00:00
parent a56203a759
commit 5d86d011e1
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/ChangeLog
View File

@ -1,3 +1,12 @@
2008-07-21 Vadim Kurland <vadim@vk.crocodile.org>
* ProjectPanel.h (libfwbuilder): Added missing declarations for
gcc 4.3 per bug #2023292: "fwbuilder 3.0.0 does not build"
* (libfwbuilder) Applied patch for gcc 4.3 per bug #2023676:
"libfwbuilder does not build against gcc 4.3".
2008-07-20 <vadim@vk.crocodile.org>
* RuleSetView.cpp (RuleTableModel::insertRow): fixed bug (no #)

2
src/gui/ProjectPanel.cpp
View File

@ -4,7 +4,7 @@
Copyright (C) 2008 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
Author: alek@codeminders.com
$Id$

42
src/gui/ProjectPanel.h
View File

@ -4,7 +4,7 @@
Copyright (C) 2008 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
Author: alek@codeminders.com
$Id$
@ -34,6 +34,7 @@ namespace libfwbuilder {
class Firewall;
class PolicyRule;
class RuleSet;
class Rule;
class RuleElement;
class FWObject;
class FWReference;
@ -97,6 +98,13 @@ class ProjectPanel: public QWidget {
bool enableAvtoSaveState;
public:
QMdiSubWindow *mdiWindow;
Ui::ProjectPanel_q *m_panel;
FindObjectWidget *findObjectWidget;
FindWhereUsedWidget *findWhereUsedWidget;
QSet<QString> copySet;
void readyStatus(bool f) { ready=f; }
@ -105,27 +113,25 @@ public:
ProjectPanel* clone(ProjectPanel * cln);
void openRuleSet(libfwbuilder::FWObject * obj);
void closeRuleSet(libfwbuilder::FWObject * obj)
{ if (visibleRuleSet==obj) visibleRuleSet=NULL; }
void openRuleSet(libfwbuilder::FWObject *obj);
void closeRuleSet(libfwbuilder::FWObject *obj)
{ if ((libfwbuilder::FWObject*)(visibleRuleSet)==obj) visibleRuleSet=NULL;};
FWBTree * getFWTree () {return objectTreeFormat;}
bool isClosing (){return closing;}
QMdiSubWindow *mdiWindow;
Ui::ProjectPanel_q *m_panel;
FindObjectWidget *findObjectWidget;
FindWhereUsedWidget *findWhereUsedWidget;
QSet<QString> copySet;
ProjectPanel(QWidget *parent);
FWBTree * getFWTree () {return objectTreeFormat;};
bool isClosing (){return closing;};
ProjectPanel(QWidget *parent);
~ProjectPanel();
void storeLastOpenedLib();
void loadLastOpenedLib(QString filename="");
void initMain(FWWindow *main);
void loadObjects();
void loadObjects(libfwbuilder::FWObjectDatabase *db);
void clearObjects();
libfwbuilder::FWObjectDatabase* db() { return objdb; }
libfwbuilder::FWObjectDatabase* db() { return objdb; };
bool hasObject(libfwbuilder::FWObject* obj)
{ return objdb->findInIndex(obj->getId()); };
@ -137,13 +143,13 @@ public:
libfwbuilder::FWObject* getCurrentLib();
libfwbuilder::FWObject* createObject(const QString &objType,
const QString &objName,
libfwbuilder::FWObject *copyFrom=NULL);
const QString &objName,
libfwbuilder::FWObject *copyFrom=NULL);
libfwbuilder::FWObject* createObject(libfwbuilder::FWObject *parent,
const QString &objType,
const QString &objName,
libfwbuilder::FWObject *copyFrom=NULL);
const QString &objType,
const QString &objName,
libfwbuilder::FWObject *copyFrom=NULL);
libfwbuilder::FWObject* copyObj2Tree(const QString &objType,
const QString &objName,