diff --git a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp index 09819b2fe..b5186c5a9 100644 --- a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp +++ b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp @@ -21,12 +21,12 @@ */ -#include "../../config.h" -#include "global.h" +#include "../../../config.h" +#include "../global.h" #include "ChooseObjectsPage.h" #include "HostsFile.h" -#include "ObjectDescriptor.h" +#include "../ObjectDescriptor.h" #include #include diff --git a/src/libgui/importAddressListWizard/ChooseObjectsPage.h b/src/libgui/importAddressListWizard/ChooseObjectsPage.h index a4859b7f9..9dc3408b9 100644 --- a/src/libgui/importAddressListWizard/ChooseObjectsPage.h +++ b/src/libgui/importAddressListWizard/ChooseObjectsPage.h @@ -24,7 +24,7 @@ #ifndef __CHOOSEOBJECTSPAGE_H_ #define __CHOOSEOBJECTSPAGE_H_ -#include "../../config.h" +//#include "../../config.h" #include "ui_chooseobjectspage_q.h" #include "fwbuilder/InetAddr.h" diff --git a/src/libgui/importAddressListWizard/CreateObjectsPage.cpp b/src/libgui/importAddressListWizard/CreateObjectsPage.cpp index 19d9569cc..f7cc33ebf 100644 --- a/src/libgui/importAddressListWizard/CreateObjectsPage.cpp +++ b/src/libgui/importAddressListWizard/CreateObjectsPage.cpp @@ -21,13 +21,13 @@ */ -#include "../../config.h" -#include "global.h" -#include "events.h" +#include "../../../config.h" +#include "../global.h" +#include "../events.h" #include "CreateObjectsPage.h" -#include "FWWindow.h" -#include "ProjectPanel.h" +#include "../FWWindow.h" +#include "../ProjectPanel.h" #include "fwbuilder/IPv4.h" #include "fwbuilder/IPv6.h" diff --git a/src/libgui/importAddressListWizard/CreateObjectsPage.h b/src/libgui/importAddressListWizard/CreateObjectsPage.h index a665f66af..eb6915f5d 100644 --- a/src/libgui/importAddressListWizard/CreateObjectsPage.h +++ b/src/libgui/importAddressListWizard/CreateObjectsPage.h @@ -24,7 +24,7 @@ #ifndef __CREATEOBJECTSPAGE_H_ #define __CREATEOBJECTSPAGE_H_ -#include "../../config.h" +//#include "../../config.h" #include "ui_createobjectspage_q.h" diff --git a/src/libgui/importAddressListWizard/FileNamePage.cpp b/src/libgui/importAddressListWizard/FileNamePage.cpp index fe8be2a53..ef5854503 100644 --- a/src/libgui/importAddressListWizard/FileNamePage.cpp +++ b/src/libgui/importAddressListWizard/FileNamePage.cpp @@ -21,11 +21,11 @@ */ -#include "../../config.h" -#include "global.h" +#include "../../../config.h" +#include "../global.h" #include "FileNamePage.h" -#include "FWBSettings.h" +#include "../FWBSettings.h" #include #include diff --git a/src/libgui/importAddressListWizard/FileNamePage.h b/src/libgui/importAddressListWizard/FileNamePage.h index 240185160..265c981f9 100644 --- a/src/libgui/importAddressListWizard/FileNamePage.h +++ b/src/libgui/importAddressListWizard/FileNamePage.h @@ -24,7 +24,7 @@ #ifndef __FILENAMEPAGE_H_ #define __FILENAMEPAGE_H_ -#include "../../config.h" +//#include "../../config.h" #include "ui_filenamepage_q.h" diff --git a/src/libgui/importAddressListWizard/HostsFile.cpp b/src/libgui/importAddressListWizard/HostsFile.cpp index 66e17c7a1..0a70660ad 100644 --- a/src/libgui/importAddressListWizard/HostsFile.cpp +++ b/src/libgui/importAddressListWizard/HostsFile.cpp @@ -21,8 +21,7 @@ */ -#include "../../config.h" -#include "global.h" +//#include "../../config.h" #include "HostsFile.h" @@ -30,6 +29,7 @@ #include #include +extern int fwbdebug; using namespace std; using namespace libfwbuilder; diff --git a/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp b/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp index 9f934292b..85639f187 100644 --- a/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp +++ b/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp @@ -21,8 +21,8 @@ */ -#include "../../config.h" -#include "global.h" +//#include "../../../config.h" +#include "../global.h" #include "ImportAddressListWizard.h" #include "FileNamePage.h" @@ -49,9 +49,6 @@ ImportAddressListWizard::ImportAddressListWizard(QWidget *parent) : QWizard(pare addPage(new SelectLibraryPage(this)); addPage(new CreateObjectsPage(this)); -// adjustSize(); - resize(700, 400); - -// setDefaultProperty("QListWidget", "itemChanged", SIGNAL(itemChanged(QListWidgetItem*))); + resize(700, 500); } diff --git a/src/libgui/importAddressListWizard/ImportAddressListWizard.h b/src/libgui/importAddressListWizard/ImportAddressListWizard.h index 6fbb07040..6245eb229 100644 --- a/src/libgui/importAddressListWizard/ImportAddressListWizard.h +++ b/src/libgui/importAddressListWizard/ImportAddressListWizard.h @@ -24,7 +24,7 @@ #ifndef __IMPORTADDRESSLISTWIZARD_H_ #define __IMPORTADDRESSLISTWIZARD_H_ -#include "../../config.h" +//#include "../../config.h" #include diff --git a/src/libgui/importAddressListWizard/SelectLibraryPage.cpp b/src/libgui/importAddressListWizard/SelectLibraryPage.cpp index 80b993c4f..aa1b954db 100644 --- a/src/libgui/importAddressListWizard/SelectLibraryPage.cpp +++ b/src/libgui/importAddressListWizard/SelectLibraryPage.cpp @@ -21,12 +21,13 @@ */ -#include "../../config.h" -#include "global.h" +//#include "../../config.h" +#include "../global.h" #include "SelectLibraryPage.h" -#include "platforms.h" -#include "FWWindow.h" + +#include "../utils.h" +#include "../FWWindow.h" #include diff --git a/src/libgui/importAddressListWizard/SelectLibraryPage.h b/src/libgui/importAddressListWizard/SelectLibraryPage.h index da80a0c71..84125742f 100644 --- a/src/libgui/importAddressListWizard/SelectLibraryPage.h +++ b/src/libgui/importAddressListWizard/SelectLibraryPage.h @@ -24,7 +24,7 @@ #ifndef __SELECTLIBRARYPAGE_H_ #define __SELECTLIBRARYPAGE_H_ -#include "../../config.h" +//#include "../../config.h" #include "ui_selectlibrarypage_q.h"