fixing build problems on windows

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 <QProgressDialog>
 #include <QMessageBox>

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"

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"

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"
 
 

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 <QFileInfo>
 #include <QFileDialog>

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"
 
 

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 <QRegExp>
 #include <QtDebug>
 
+extern int fwbdebug;
 
 using namespace std;
 using namespace libfwbuilder;

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);
 }
 

src/libgui/importAddressListWizard/ImportAddressListWizard.h

@@ -24,7 +24,7 @@
 #ifndef __IMPORTADDRESSLISTWIZARD_H_
 #define __IMPORTADDRESSLISTWIZARD_H_
 
-#include "../../config.h"
+//#include "../../config.h"
 
 #include <QWizard>
 

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 <QtDebug>
 

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"