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

* applied patch from slif@bellsouth.net to fix compiler

Browse Source 
warnings. Patch applied partially since not all fixes were
appropriate.
This commit is contained in:
Vadim Kurland 2010-06-08 20:35:48 +00:00
parent f2e206c38b
commit c9ed497303
6 changed files with 14 additions and 10 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 2966
#define BUILD_NUM 2967

4
doc/ChangeLog
View File

@ -1,5 +1,9 @@
2010-06-08 Vadim Kurland <vadim@vk.crocodile.org>
* applied patch from slif@bellsouth.net to fix compiler
warnings. Patch applied partially since not all fixes were
appropriate.
* IPTImporter.cpp (IPTImporter::pushPolicyRule): fixed #1512 SF
bug 3012953: iptables importer sometimes does not recognize rule
with " ESTABLISHED,RELATED ". Parser properly processed iptables

6
src/gui/FWWindowPrint.cpp
View File

@ -103,13 +103,13 @@ void FWWindow::filePrint()
if (!st->getStr("PrintSetup/tableResolution").isEmpty())
{
tableResolution = st->getInt("PrintSetup/tableResolution");
// for backwards compatibility, convert resolutino from an index
// for backwards compatibility, convert resolution from an index
// in a table to float 0..1.0
// Previously values were from the following list:
// 50%, 75%, 100%, 150%, 200%, default 100%
float old_res[] = {50, 75, 100, 150, 200 };
int old_res[] = {50, 75, 100, 150, 200 };
if (tableResolution <= 4 )
tableResolution = old_res[int(tableResolution)];
tableResolution = old_res[tableResolution];
}
QDialog dlg;

2
src/gui/FirewallSelectorWidget.cpp
View File

@ -249,7 +249,7 @@ void FirewallSelectorWidget::clear()
void FirewallSelectorWidget::resizeEvent(QResizeEvent*)
{
int total = this->viewport()->width();
if (total < 100) total = this->width() * 0.95;
if (total < 100) total = int(this->width() * 0.95);
int controls;
if ( total/3 > 100 ) controls = 100; else controls = total/3;
this->setColumnWidth(0, total - controls*2);

8
src/gui/InterfaceEditorWidget.cpp
View File

@ -120,9 +120,9 @@ void InterfaceEditorWidget::setData(InterfaceData *data)
{
foreach( InetAddrMask* addr, data->addr_mask )
{
int row = addNewAddress(addr->getAddressPtr()->toString().c_str(),
addr->getNetmaskPtr()->toString().c_str(),
!addr->getAddressPtr()->isV6());
addNewAddress(addr->getAddressPtr()->toString().c_str(),
addr->getNetmaskPtr()->toString().c_str(),
!addr->getAddressPtr()->isV6());
}
}
}
@ -406,7 +406,7 @@ bool InterfaceEditorWidget::validateAddress(const QString &addr,
void InterfaceEditorWidget::resizeEvent ( QResizeEvent * )
{
int total = this->m_ui->addresses->viewport()->width();
if (total < 100) total = this->m_ui->addresses->width() * 0.95;
if (total < 100) total = int(this->m_ui->addresses->width() * 0.95);
int controls;
if ( total/4 > 130 ) controls = 130; else controls = total/4;
this->m_ui->addresses->setColumnWidth(0, (total - controls*2)/2);

2
src/gui/main.cpp
View File

@ -255,7 +255,7 @@ int main( int argc, char *argv[] )
#endif
// setup single shot timer to call startupLoad()
QTimer::singleShot(0.5, mw, SLOT(startupLoad()));
QTimer::singleShot(500, mw, SLOT(startupLoad()));
app->exec();