mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-20 02:07:23 +01:00
fixing build problems on windows
This commit is contained in:
parent
21fe9b7117
commit
485a681bb0
@ -26,7 +26,9 @@
|
|||||||
|
|
||||||
#include "ChooseObjectsPage.h"
|
#include "ChooseObjectsPage.h"
|
||||||
#include "HostsFile.h"
|
#include "HostsFile.h"
|
||||||
|
|
||||||
#include "../ObjectDescriptor.h"
|
#include "../ObjectDescriptor.h"
|
||||||
|
#include "../FilterDialog.h"
|
||||||
|
|
||||||
#include <QProgressDialog>
|
#include <QProgressDialog>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|||||||
@ -29,10 +29,10 @@
|
|||||||
|
|
||||||
#include "fwbuilder/InetAddr.h"
|
#include "fwbuilder/InetAddr.h"
|
||||||
|
|
||||||
#include "FilterDialog.h"
|
|
||||||
|
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
|
class Filter;
|
||||||
|
class FilterDialog;
|
||||||
|
|
||||||
class ChooseObjectsPage : public QWizardPage
|
class ChooseObjectsPage : public QWizardPage
|
||||||
{
|
{
|
||||||
|
|||||||
@ -24,11 +24,11 @@
|
|||||||
#include "../../../config.h"
|
#include "../../../config.h"
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
#include "../events.h"
|
#include "../events.h"
|
||||||
|
|
||||||
#include "CreateObjectsPage.h"
|
|
||||||
#include "../FWWindow.h"
|
#include "../FWWindow.h"
|
||||||
#include "../ProjectPanel.h"
|
#include "../ProjectPanel.h"
|
||||||
|
|
||||||
|
#include "CreateObjectsPage.h"
|
||||||
|
|
||||||
#include "fwbuilder/IPv4.h"
|
#include "fwbuilder/IPv4.h"
|
||||||
#include "fwbuilder/IPv6.h"
|
#include "fwbuilder/IPv6.h"
|
||||||
|
|
||||||
|
|||||||
@ -23,9 +23,9 @@
|
|||||||
|
|
||||||
#include "../../../config.h"
|
#include "../../../config.h"
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
|
#include "../FWBSettings.h"
|
||||||
|
|
||||||
#include "FileNamePage.h"
|
#include "FileNamePage.h"
|
||||||
#include "../FWBSettings.h"
|
|
||||||
|
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
|||||||
@ -67,7 +67,7 @@ void HostsFile::parse() throw(FWException)
|
|||||||
{
|
{
|
||||||
InetAddr addr(AF_INET6, addr_s.toStdString());
|
InetAddr addr(AF_INET6, addr_s.toStdString());
|
||||||
foreach(QString name, names) data[addr] << name.trimmed();
|
foreach(QString name, names) data[addr] << name.trimmed();
|
||||||
} catch (FWException &ex)
|
} catch (FWException&)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
@ -23,12 +23,11 @@
|
|||||||
|
|
||||||
//#include "../../config.h"
|
//#include "../../config.h"
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
|
|
||||||
#include "SelectLibraryPage.h"
|
|
||||||
|
|
||||||
#include "../utils.h"
|
#include "../utils.h"
|
||||||
#include "../FWWindow.h"
|
#include "../FWWindow.h"
|
||||||
|
|
||||||
|
#include "SelectLibraryPage.h"
|
||||||
|
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user