20 changes: 10 additions & 10 deletions src/libfwbuilder/src/fwbuilder/XMLTools.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class XMLTools
}
};

static std::string readFile(const std::string &file_name) throw(FWException);
static std::string readFile(const std::string &file_name);

/**
* Loads given file, performing version conversion
Expand All @@ -91,19 +91,19 @@ class XMLTools
const UpgradePredicate *upgrade,
const std::string &template_dir,
const std::string &current_version = std::string(FWBUILDER_XML_VERSION)
) throw(FWException);
);

static void setDTD(xmlDocPtr doc,
const std::string &type_name,
const std::string &dtd_file) throw(FWException);
const std::string &dtd_file);

/**
* Saves to file with setting DTD.
*/
static void saveFile(xmlDocPtr doc,
const std::string &file_name,
const std::string &type_name,
const std::string &dtd_file) throw(FWException);
const std::string &dtd_file);

/**
* Saves XML document to the memory buffer
Expand All @@ -112,7 +112,7 @@ class XMLTools
xmlChar **buffer,
int *size,
const std::string &type_name,
const std::string &dtd_file) throw(FWException);
const std::string &dtd_file);

static xmlExternalEntityLoader defaultLoader;

Expand All @@ -126,7 +126,7 @@ class XMLTools
static xmlDocPtr parseFile(const std::string &file_name,
const std::string &buffer,
bool use_dtd, const std::string &template_dir
) throw(FWException);
);

/**
* Performs XSLT transformation of the document in memory
Expand All @@ -135,7 +135,7 @@ class XMLTools
static xmlDocPtr transformDocument(xmlDocPtr doc,
const std::string &stylesheet_file,
const char **params
) throw(FWException);
);

/**
* Performs XSLT transformation of the document. Results are
Expand All @@ -145,7 +145,7 @@ class XMLTools
const std::string &stylesheet_file,
const char **params,
const std::string &dst_file
) throw(FWException);
);

/**
* Performs XSLT transformation of the src file. Results are
Expand All @@ -155,7 +155,7 @@ class XMLTools
const std::string &stylesheet_file,
const char **params,
const std::string &dst_file
) throw(FWException);
);


static std::string quote_linefeeds (const std::string &s);
Expand Down Expand Up @@ -194,7 +194,7 @@ class XMLTools
const std::string &type_name,
const std::string &template_dir,
const std::string &current_version = std::string(FWBUILDER_XML_VERSION)
) throw(FWException);
);

/**
* returns first component of dotted notation.
Expand Down
3 changes: 1 addition & 2 deletions src/libfwbuilder/src/fwbuilder/dns.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void DNS::init()
* Since this is not thread safe, need to use mutex to protect calls to
* these functions.
*/
HostEnt DNS::getHostByAddr(const InetAddr &addr, int type) throw(FWException)
HostEnt DNS::getHostByAddr(const InetAddr &addr, int type)
{
DNS::init();

Expand Down Expand Up @@ -115,7 +115,6 @@ HostEnt DNS::getHostByAddr(const InetAddr &addr, int type) throw(FWException)
}

list<InetAddr> DNS::getHostByName(const string &name, int type)
throw(FWException)
{
DNS::init();

Expand Down
5 changes: 2 additions & 3 deletions src/libfwbuilder/src/fwbuilder/dns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,13 @@ class DNS
* Returned list is sorted.
*/
static std::list<InetAddr> getHostByName(const std::string &name,
int type=AF_INET) throw(FWException);
int type=AF_INET);

/**
* Find all host names of host with given IP.
* This operation does not run in backgound.
*/
static HostEnt getHostByAddr(const InetAddr &addr, int type=AF_INET)
throw(FWException);
static HostEnt getHostByAddr(const InetAddr &addr, int type=AF_INET);

private:

Expand Down
4 changes: 2 additions & 2 deletions src/libfwbuilder/src/fwbuilder/physAddress.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ physAddress::physAddress() : Address()
setPhysAddress("00:00:00:00:00:00");
}

void physAddress::fromXML(xmlNodePtr root) throw(FWException)
void physAddress::fromXML(xmlNodePtr root)
{
FWObject::fromXML(root);

Expand All @@ -57,7 +57,7 @@ void physAddress::fromXML(xmlNodePtr root) throw(FWException)
FREEXMLBUFF(n);
}

xmlNodePtr physAddress::toXML(xmlNodePtr parent) throw(FWException)
xmlNodePtr physAddress::toXML(xmlNodePtr parent)
{
xmlNodePtr me = FWObject::toXML(parent, false);
xmlNewProp(me, TOXMLCAST("name"), STRTOXMLCAST(getName()));
Expand Down
4 changes: 2 additions & 2 deletions src/libfwbuilder/src/fwbuilder/physAddress.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class physAddress : public Address

physAddress();

virtual void fromXML(xmlNodePtr parent) throw(FWException);
virtual xmlNodePtr toXML(xmlNodePtr xml_parent_node) throw(FWException);
virtual void fromXML(xmlNodePtr parent);
virtual xmlNodePtr toXML(xmlNodePtr xml_parent_node);

std::string getPhysAddress() const;
void setPhysAddress(const std::string &s);
Expand Down
35 changes: 16 additions & 19 deletions src/libfwbuilder/src/fwbuilder/snmp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ SNMPQuery::~SNMPQuery()
}

void SNMPQuery::fetchAll(Logger *logger,SyncFlag *stop_program)
throw(FWException)
{
if(community.empty())
throw FWException("No SNMP community specified");
Expand All @@ -198,7 +197,7 @@ void SNMPQuery::fetchAll(Logger *logger,SyncFlag *stop_program)
CHECK_STOP_AND_THROW_EXCEPTION;
}

void SNMPQuery::fetchArpTable(Logger *logger,SyncFlag *stop_program, SNMPConnection *connection) throw(FWException)
void SNMPQuery::fetchArpTable(Logger *logger,SyncFlag *stop_program, SNMPConnection *connection)
{
std::ostringstream str;
*logger << "ARP table\n";
Expand Down Expand Up @@ -300,7 +299,7 @@ void SNMPQuery::fetchArpTable(Logger *logger,SyncFlag *stop_program, SNMPConnect
* it will contain also reference to interface object associated
* with the route.
*/
void SNMPQuery::fetchRoutingTable(Logger *logger,SyncFlag *stop_program, SNMPConnection *connection) throw(FWException)
void SNMPQuery::fetchRoutingTable(Logger *logger,SyncFlag *stop_program, SNMPConnection *connection)
{
std::ostringstream str;
*logger << "Routing table\n";
Expand Down Expand Up @@ -592,7 +591,7 @@ void SNMPQuery::getAddressAndNetmask(Logger * /* UNUSED logger */,
}

void SNMPQuery::fetchInterfaces(Logger *logger, SyncFlag *stop_program,
SNMPConnection *connection) throw(FWException)
SNMPConnection *connection)
{
std::ostringstream str;

Expand Down Expand Up @@ -796,7 +795,7 @@ void SNMPQuery::fetchInterfaces(Logger *logger, SyncFlag *stop_program,

void SNMPQuery::fetchSysInfo(Logger *logger,
SyncFlag *stop_program,
SNMPConnection *connection) throw(FWException)
SNMPConnection *connection)
{
std::ostringstream str;
descr = "";
Expand Down Expand Up @@ -930,7 +929,7 @@ SNMPConnection::~SNMPConnection()
disconnect();
}

void SNMPConnection::connect(int retries, long timeout) throw(FWException)
void SNMPConnection::connect(int retries, long timeout)
{
if(connected)
throw FWException("SNMPSession: already connected");
Expand All @@ -951,7 +950,7 @@ void SNMPConnection::connect(int retries, long timeout) throw(FWException)
connected=true;
}

void SNMPConnection::disconnect() throw(FWException)
void SNMPConnection::disconnect()
{
if(!connected)
throw FWException("SNMPSession: already disconnected");
Expand All @@ -965,7 +964,7 @@ void SNMPConnection::disconnect() throw(FWException)
connected = false;
}

multimap<string, SNMPVariable* > SNMPConnection::walk(const string &variable) throw(FWException)
multimap<string, SNMPVariable* > SNMPConnection::walk(const string &variable)
{
multimap<string, SNMPVariable*> res;

Expand Down Expand Up @@ -1071,7 +1070,6 @@ multimap<string, SNMPVariable* > SNMPConnection::walk(const string &variable) th
}

vector<SNMPVariable*> SNMPConnection::get(const string &variable)
throw(FWException)
{
if(!connected)
throw FWException("SNMPSession: not connected");
Expand Down Expand Up @@ -1114,7 +1112,7 @@ vector<SNMPVariable*> SNMPConnection::get(const string &variable)
}
}

SNMPVariable *SNMPVariable::create(struct variable_list *vars) throw(FWException)
SNMPVariable *SNMPVariable::create(struct variable_list *vars)
{
switch(vars->type)
{
Expand Down Expand Up @@ -1177,7 +1175,7 @@ string SNMPVariable_IPaddr::toString()
return res;
}

InetAddr SNMPVariable_IPaddr::getInetAddrValue() throw(FWException)
InetAddr SNMPVariable_IPaddr::getInetAddrValue()
{
// value comes from ASN1-encoded snmp reply. I am not sure 100% but
// I'll assume it consists of 4 bytes that represent ip address in
Expand All @@ -1190,7 +1188,7 @@ InetAddr SNMPVariable_IPaddr::getInetAddrValue() throw(FWException)
return InetAddr(&addr_conversion.ipaddr);
}

InetAddr SNMPVariable_IPaddr::getNetmaskValue() throw(FWException)
InetAddr SNMPVariable_IPaddr::getNetmaskValue()
{
union {
struct in_addr ipaddr;
Expand Down Expand Up @@ -1253,14 +1251,14 @@ string SNMPVariable::varList2String(vector<SNMPVariable*> &v)
return res;
}

long SNMPVariable::var2Int(SNMPVariable *var) throw(FWException)
long SNMPVariable::var2Int(SNMPVariable *var)
{
if(var->type != SNMPVariable::snmp_int)
throw FWException("Could not extract integer from non-int SNMP variable.");
return dynamic_cast<SNMPVariable_Int *>(var)->getIntValue();
}

long SNMPVariable::varList2Int(vector<SNMPVariable*> &v) throw(FWException)
long SNMPVariable::varList2Int(vector<SNMPVariable*> &v)
{
if(v.size()!=1)
throw FWException("Empty SNMP variable list returned. Could not extract integer");
Expand Down Expand Up @@ -1422,7 +1420,7 @@ bool SNMPCrawler::special(const InetAddrMask &n) const

//TODO: multiple threads (via pool).
void SNMPCrawler::run_impl(Logger *logger,
SyncFlag *stop_program) throw(FWException)
SyncFlag *stop_program)
{
if (snmp_tmp_db==NULL)
snmp_tmp_db = new FWObjectDatabase();
Expand Down Expand Up @@ -1808,7 +1806,7 @@ void SNMPCrawler::run_impl(Logger *logger,
}

void SNMPCrawler::bacresolve_results(Logger *logger,
SyncFlag *) throw(FWException)
SyncFlag *)
{
*logger << "Resolving names\n";

Expand Down Expand Up @@ -1849,7 +1847,6 @@ CrawlerFind::~CrawlerFind()
}

void SNMP_interface_query::run_impl(Logger *logger, SyncFlag *stop_program)
throw(FWException)
{
fetchSysInfo(logger, stop_program);
CHECK_STOP_AND_THROW_EXCEPTION;
Expand Down Expand Up @@ -1878,12 +1875,12 @@ void SNMP_interface_query::run_impl(Logger *logger, SyncFlag *stop_program)
#endif
}

void SNMP_sysdesc_query::run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException)
void SNMP_sysdesc_query::run_impl(Logger *logger,SyncFlag *stop_program)
{
fetchSysInfo(logger,stop_program);
}

void SNMP_discover_query::run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException)
void SNMP_discover_query::run_impl(Logger *logger,SyncFlag *stop_program)
{
fetchArpTable(logger,stop_program);
if(fetch_inerfaces)
Expand Down
42 changes: 20 additions & 22 deletions src/libfwbuilder/src/fwbuilder/snmp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ class SNMPVariable
virtual std::string toString() = 0;

static std::string varList2String(std::vector<SNMPVariable*> &v);
static long varList2Int(std::vector<SNMPVariable*> &v) throw(FWException);
static long var2Int(SNMPVariable *var) throw(FWException);
static long varList2Int(std::vector<SNMPVariable*> &v);
static long var2Int(SNMPVariable *var);
static void freeVarList(std::vector<SNMPVariable*> &v);

protected:

static SNMPVariable *create(struct variable_list *v) throw(FWException);
static SNMPVariable *create(struct variable_list *v);
};

class SNMPVariable_Int : public SNMPVariable
Expand Down Expand Up @@ -152,12 +152,12 @@ class SNMPVariable_IPaddr : public SNMPVariable

virtual std::string toString();

virtual InetAddr getInetAddrValue() throw(FWException);
virtual InetAddr getNetmaskValue() throw(FWException);
virtual InetAddr getInetAddrValue();
virtual InetAddr getNetmaskValue();

protected:

SNMPVariable_IPaddr(u_char *v, size_t l) throw(FWException)
SNMPVariable_IPaddr(u_char *v, size_t l)
{
type = snmp_ipaddr;
if(v)
Expand Down Expand Up @@ -253,10 +253,10 @@ class SNMPConnection
/**
* Optional parameter timeout is in milliseconds.
*/
void connect(int retries=SNMP_DEFAULT_RETRIES, long timeout=SNMP_DEFAULT_TIMEOUT) throw(FWException);
void disconnect() throw(FWException);
std::vector<SNMPVariable*> get(const std::string &variable) throw(FWException);
std::multimap<std::string, SNMPVariable*> walk(const std::string &variable) throw(FWException);
void connect(int retries=SNMP_DEFAULT_RETRIES, long timeout=SNMP_DEFAULT_TIMEOUT);
void disconnect();
std::vector<SNMPVariable*> get(const std::string &variable);
std::multimap<std::string, SNMPVariable*> walk(const std::string &variable);

private:

Expand Down Expand Up @@ -342,14 +342,14 @@ class SNMPQuery : public BackgroundOp
long timeout_=SNMP_DEFAULT_TIMEOUT);

void fetchArpTable(Logger *,SyncFlag *stop_program,
SNMPConnection *connection=NULL) throw(FWException);
SNMPConnection *connection=NULL);
void fetchInterfaces(Logger *,SyncFlag *stop_program,
SNMPConnection *connection=NULL) throw(FWException);
SNMPConnection *connection=NULL);
void fetchSysInfo(Logger *,SyncFlag *stop_program,
SNMPConnection *connection=NULL) throw(FWException);
void fetchAll(Logger *,SyncFlag *stop_program) throw(FWException);
SNMPConnection *connection=NULL);
void fetchAll(Logger *,SyncFlag *stop_program);
void fetchRoutingTable(Logger *,SyncFlag *stop_program,
SNMPConnection *connection=NULL) throw(FWException);
SNMPConnection *connection=NULL);

std::map<int, InterfaceData>* getInterfaces();
std::map<InetAddr, std::string>* getArpTable();
Expand Down Expand Up @@ -385,7 +385,7 @@ class SNMP_interface_query : public SNMPQuery
SNMPQuery::init(hostname, community, retries_, timeout_);
}

virtual void run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException);
virtual void run_impl(Logger *logger,SyncFlag *stop_program);

};

Expand All @@ -408,7 +408,7 @@ class SNMP_sysdesc_query : public SNMPQuery
SNMPQuery::init(hostname, community, retries_, timeout_);
}

virtual void run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException);
virtual void run_impl(Logger *logger,SyncFlag *stop_program);
};

class SNMP_discover_query : public SNMPQuery
Expand All @@ -422,7 +422,7 @@ class SNMP_discover_query : public SNMPQuery
SNMP_discover_query() : SNMPQuery() {}
SNMP_discover_query(std::string hostname, std::string community, int retries_=SNMP_DEFAULT_RETRIES, long timeout_=SNMP_DEFAULT_TIMEOUT, bool _f=true):SNMPQuery(hostname, community, retries_, timeout_) { fetch_inerfaces=_f; }

virtual void run_impl(Logger *logger,SyncFlag *stop_program) throw(FWException);
virtual void run_impl(Logger *logger,SyncFlag *stop_program);
};

class CrawlerFind: public HostEnt
Expand Down Expand Up @@ -513,10 +513,8 @@ class SNMPCrawler : public BackgroundOp
std::map<InetAddr, CrawlerFind> getAllIPs();
std::set<InetAddrMask> getNetworks();

virtual void run_impl(Logger *logger,SyncFlag *stop_program)
throw(FWException);
void bacresolve_results(Logger *logger,SyncFlag *stop_program)
throw(FWException);
virtual void run_impl(Logger *logger,SyncFlag *stop_program);
void bacresolve_results(Logger *logger,SyncFlag *stop_program);

};

Expand Down
16 changes: 8 additions & 8 deletions src/libfwbuilder/src/fwbuilder/uint128.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,12 @@ template<>
struct numeric_limits<uint128>
{
static const bool is_specialized = true;
// static uint128 min() throw()
// static uint128 min()
// {
// return 0;
// }
//
// static uint128 max() throw()
// static uint128 max()
// {
// return uint128(
// std::numeric_limits<uint64_t>::max(),
Expand All @@ -545,12 +545,12 @@ struct numeric_limits<uint128>
static const int digits10 = 39;
static const int radix = 2;

static uint128 epsilon() throw()
static uint128 epsilon()
{
return 0;
}

static uint128 round_error() throw()
static uint128 round_error()
{
return 0;
}
Expand All @@ -565,22 +565,22 @@ struct numeric_limits<uint128>
static const float_denorm_style has_denorm = denorm_absent;
static const bool has_denorm_loss = false;

static uint128 infinity() throw()
static uint128 infinity()
{
return static_cast<uint128>(0);
}

static uint128 quiet_NaN() throw()
static uint128 quiet_NaN()
{
return static_cast<uint128>(0);
}

static uint128 signaling_NaN() throw()
static uint128 signaling_NaN()
{
return static_cast<uint128>(0);
}

static uint128 denorm_min() throw()
static uint128 denorm_min()
{
return static_cast<uint128>(0);
}
Expand Down
4 changes: 2 additions & 2 deletions src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void BaseCompiler::printError(const string &errstr)
* the process but just returns. In embedded mode it always throws
* exception to stop compiling
*/
void BaseCompiler::abort(const string &errstr) throw(FWException)
void BaseCompiler::abort(const string &errstr)
{
printError(errstr);
if (inEmbeddedMode())
Expand All @@ -183,7 +183,7 @@ void BaseCompiler::abort(const string &errstr) throw(FWException)
void BaseCompiler::abort(FWObject *fw,
FWObject *ruleset,
FWObject *rule,
const string &errstr) throw(FWException)
const string &errstr)
{
message("error", fw, ruleset, rule, errstr);
if (inEmbeddedMode())
Expand Down
4 changes: 2 additions & 2 deletions src/libfwbuilder/src/fwcompiler/BaseCompiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ namespace fwcompiler {
* in testing mode (flag test_mode==true), then just prints
* the error message and returns.
*/
virtual void abort(const std::string &errstr) throw(libfwbuilder::FWException);
virtual void abort(const std::string &errstr);
virtual void abort(libfwbuilder::FWObject *fw,
libfwbuilder::FWObject *ruleset,
libfwbuilder::FWObject *rule,
const std::string &errstr) throw(libfwbuilder::FWException);
const std::string &errstr);

/**
* prints an error message and returns
Expand Down
4 changes: 2 additions & 2 deletions src/libfwbuilder/src/fwcompiler/Compiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ void Compiler::epilog()
{
}

void Compiler::abort(const string &errstr) throw(FWException)
void Compiler::abort(const string &errstr)
{
BaseCompiler::abort(fw, source_ruleset, NULL, errstr);
}

void Compiler::abort(FWObject *rule, const string &errstr) throw(FWException)
void Compiler::abort(FWObject *rule, const string &errstr)
{
BaseCompiler::abort(fw, source_ruleset, rule, errstr);
}
Expand Down
5 changes: 2 additions & 3 deletions src/libfwbuilder/src/fwcompiler/Compiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,9 +1011,8 @@ namespace fwcompiler {
/**
* overloaded methods: uses current firewall and ruleset objects
*/
virtual void abort(const std::string &errstr) throw(libfwbuilder::FWException);
virtual void abort(libfwbuilder::FWObject *rule, const std::string &errstr)
throw(libfwbuilder::FWException);
virtual void abort(const std::string &errstr);
virtual void abort(libfwbuilder::FWObject *rule, const std::string &errstr);

virtual void error(const std::string &errstr);
virtual void error(libfwbuilder::FWObject *rule, const std::string &errstr);
Expand Down
6 changes: 1 addition & 5 deletions src/libgui/DialogFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ BaseObjectDialog *DialogFactory::createDialog(QWidget *parent, const QString &ob


QWidget *DialogFactory::createFWDialog(QWidget *parent, FWObject *o)
throw(FWException)
{
string platform = o->getStr("platform");
string host_os = o->getStr("host_OS");
Expand Down Expand Up @@ -266,7 +265,6 @@ QWidget *DialogFactory::createFWDialog(QWidget *parent, FWObject *o)


QWidget *DialogFactory::createOSDialog(QWidget *parent,FWObject *o)
throw(FWException)
{
string host_os = o->getStr("host_OS");

Expand Down Expand Up @@ -301,7 +299,6 @@ QWidget *DialogFactory::createOSDialog(QWidget *parent,FWObject *o)
}

QWidget *DialogFactory::createIfaceDialog(QWidget *parent,FWObject *o)
throw(FWException)
{
FWObject *h = Host::getParentHost(o);
//FWObject *h = Interface::cast(o)->getParentHost();
Expand Down Expand Up @@ -332,7 +329,6 @@ QWidget *DialogFactory::createIfaceDialog(QWidget *parent,FWObject *o)
}

QWidget *DialogFactory::createClusterConfDialog(QWidget *parent, FWObject *o)
throw(FWException)
{
FWObject *objparent = o->getParent();
while (objparent && objparent->getTypeName()!="Cluster")
Expand Down Expand Up @@ -378,7 +374,7 @@ QString DialogFactory::getClusterGroupOptionsDialogName(FWObject *o)
}

QWidget *DialogFactory::createClusterGroupOptionsDialog(
QWidget *parent, FWObject *o) throw(libfwbuilder::FWException)
QWidget *parent, FWObject *o)
{
QString dlgname = getClusterGroupOptionsDialogName(o);

Expand Down
15 changes: 5 additions & 10 deletions src/libgui/DialogFactory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,12 @@ class DialogFactory {

static BaseObjectDialog *createDialog(QWidget *parent,const QString &objType);

static QWidget *createFWDialog(QWidget *parent,libfwbuilder::FWObject *o)
throw(libfwbuilder::FWException);
static QWidget *createOSDialog(QWidget *parent,libfwbuilder::FWObject *o)
throw(libfwbuilder::FWException);
static QWidget *createIfaceDialog(QWidget *parent,libfwbuilder::FWObject *o)
throw(libfwbuilder::FWException);
static QWidget *createClusterConfDialog(QWidget *parent, libfwbuilder::FWObject *o)
throw(libfwbuilder::FWException);
static QWidget *createFWDialog(QWidget *parent,libfwbuilder::FWObject *o);
static QWidget *createOSDialog(QWidget *parent,libfwbuilder::FWObject *o);
static QWidget *createIfaceDialog(QWidget *parent,libfwbuilder::FWObject *o);
static QWidget *createClusterConfDialog(QWidget *parent, libfwbuilder::FWObject *o);
static QString getClusterGroupOptionsDialogName(libfwbuilder::FWObject *o);
static QWidget *createClusterGroupOptionsDialog(QWidget *parent, libfwbuilder::FWObject *o)
throw(libfwbuilder::FWException);
static QWidget *createClusterGroupOptionsDialog(QWidget *parent, libfwbuilder::FWObject *o);

static std::string getActionDialogPageName(libfwbuilder::Firewall *fw,
libfwbuilder::Rule *rule);
Expand Down
14 changes: 7 additions & 7 deletions src/libgui/RCS.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ void RCS::abandon()
/**
* initial RCS checkin
*/
void RCS::add() throw(libfwbuilder::FWException)
void RCS::add()
{
int i = filename.lastIndexOf("/");
QString rcspath = filename.left(i);
Expand Down Expand Up @@ -669,7 +669,7 @@ bool RCS::isInRCS()
return true;
}

bool RCS::co(bool force) throw(libfwbuilder::FWException)
bool RCS::co(bool force)
{
return co(selectedRev,force);
}
Expand Down Expand Up @@ -702,7 +702,7 @@ bool RCS::co(bool force) throw(libfwbuilder::FWException)
* lock
*
*/
bool RCS::co(const QString &rev,bool force) throw(libfwbuilder::FWException)
bool RCS::co(const QString &rev,bool force)
{
/* first check if filename is already in RCS */

Expand Down Expand Up @@ -909,7 +909,7 @@ after the program crashed.").arg(locked_rev),


bool RCS::ci( const QString &_lm,
bool unlock) throw(libfwbuilder::FWException)
bool unlock)
{
/* first check if filename is already in RCS */
if (!rcs_available || !isInRCS()) return false;
Expand Down Expand Up @@ -1026,7 +1026,7 @@ bool RCS::ci( const QString &_lm,
* "-z+09:00" works properly
*
*/
QString RCS::rlog() throw(libfwbuilder::FWException)
QString RCS::rlog()
{
if (!rcs_available)
throw(FWException(QObject::tr("RCS tools are unavailable").toStdString()));
Expand Down Expand Up @@ -1074,14 +1074,14 @@ QString RCS::rlog() throw(libfwbuilder::FWException)
throw( FWException( msg.toLatin1().constData() ) );
}

QStringList RCS::rcsdiff(const QString&) throw(libfwbuilder::FWException)
QStringList RCS::rcsdiff(const QString&)
{
isDiff();
QString temp = stdoutBuffer;
return temp.split("\n");
}

bool RCS::isDiff(const QString &rev) throw(libfwbuilder::FWException)
bool RCS::isDiff(const QString &rev)
{
if (!rcs_available)
throw(FWException(QObject::tr("RCS tools are unavailable").toStdString()));
Expand Down
14 changes: 7 additions & 7 deletions src/libgui/RCS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class RCS : public QObject {
/**
* Retrieves RCS log.
*/
QString rlog() throw(libfwbuilder::FWException);
QString rlog();


public:
Expand All @@ -135,7 +135,7 @@ class RCS : public QObject {
QList<Revision>::iterator begin() { return revisions.begin(); }
QList<Revision>::iterator end() { return revisions.end(); }

void add() throw(libfwbuilder::FWException);
void add();

/**
* this makes RCS object "forget" about the file
Expand All @@ -151,23 +151,23 @@ class RCS : public QObject {
* RCS checkout. Returns true if successfull and false if file is
* not in RCS. In case of error throws exception
*/
bool co(const QString &rev,bool force=false) throw(libfwbuilder::FWException);
bool co(const QString &rev,bool force=false);

/**
* checks out currently selected revision (set using setSelectedRev)
*/
bool co(bool force=false) throw(libfwbuilder::FWException);
bool co(bool force=false);

/**
* RCS checkin. Returns true if successfull and false if file is
* not in RCS. In case of error throws exception
*/
bool ci(const QString &logmsg =" ", bool unlock=false) throw(libfwbuilder::FWException);
bool ci(const QString &logmsg =" ", bool unlock=false);

/**
* Retrieves RCS diff.
*/
QStringList rcsdiff(const QString &rev="") throw(libfwbuilder::FWException);
QStringList rcsdiff(const QString &rev="");

/**
* checks if the working copy of the file is different from RCS
Expand All @@ -178,7 +178,7 @@ class RCS : public QObject {
* This is essentially just a code returned by rcsdiff with all
* its output ignored.
*/
bool isDiff(const QString &rev="") throw(libfwbuilder::FWException);
bool isDiff(const QString &rev="");

/**
* these two methods just return status
Expand Down
2 changes: 1 addition & 1 deletion src/libgui/importAddressListWizard/HostsFile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace std;
using namespace libfwbuilder;


void HostsFile::parse() throw(FWException)
void HostsFile::parse()
{
QFile file(file_name);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
Expand Down
2 changes: 1 addition & 1 deletion src/libgui/importAddressListWizard/HostsFile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class HostsFile

HostsFile(const QString &file_name) { this->file_name = file_name; }

void parse() throw(libfwbuilder::FWException);
void parse();

// Returns all hosts found
std::map<libfwbuilder::InetAddr, QStringList> getAll() { return data; }
Expand Down
2 changes: 1 addition & 1 deletion src/pflib/TableFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ string TableFactory::generateTblID(RuleElement *re)
}

void TableFactory::registerTable(const string& tblname, const string& tblid,
FWObject* tbl) throw(FWException)
FWObject* tbl)
{
// two different table objects should have different names
//
Expand Down
2 changes: 1 addition & 1 deletion src/pflib/TableFactory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace fwcompiler

void registerTable(const std::string& tblname,
const std::string& tblid,
libfwbuilder::FWObject *tbl) throw(libfwbuilder::FWException);
libfwbuilder::FWObject *tbl);
void createTablesForRE(libfwbuilder::RuleElement *re,
libfwbuilder::Rule *rule);
void addObjectToTable(libfwbuilder::FWObject *tblgrp,
Expand Down