using fwbuilder3 as a root for settings, some minor fixes

src/gui/FWBSettings.h

@@ -41,7 +41,7 @@ class QWidget;
 #define LoadStandardObjects 0
 #define LoadLastEditedFile  1
     
-#define SETTINGS_PATH_PREFIX  "/FirewallBuilder2_1"
+#define SETTINGS_PATH_PREFIX  "/FirewallBuilder3"
 
 class FWBSettings : public QSettings {
 

src/gui/FWWindow.cpp

@@ -156,13 +156,17 @@ using namespace libfwbuilder;
 using namespace std;
 using namespace Ui;
 
-FWWindow::FWWindow(): m_space(0),
-  instd(0), autosaveTimer(new QTimer(static_cast<QObject*>(this))), 
-  instDialogOnScreenTimer(new QTimer(static_cast<QObject*>(this))), 
-  printer(0), searchObject(0), replaceObject(0)
+FWWindow::FWWindow() : QMainWindow(),   // QMainWindow(NULL, Qt::Desktop),
+    m_space(0),
+    instd(0), autosaveTimer(new QTimer(static_cast<QObject*>(this))), 
+    instDialogOnScreenTimer(new QTimer(static_cast<QObject*>(this))), 
+    printer(0), searchObject(0), replaceObject(0)
 {
     if (fwbdebug)
+    {
         qDebug("FWWindow constructor");
+        qDebug("windowFlags=%x", int(windowFlags()));
+    }
 
     setUnifiedTitleAndToolBarOnMac(true);
 

src/gui/ProjectPanel.cpp

@@ -181,15 +181,30 @@ void ProjectPanel::initMain(FWWindow *main)
 }
 
 ProjectPanel::ProjectPanel(QWidget *parent): 
-  QWidget(parent), mainW(0), rcs(0), addOnLibs(new listOfLibraries()), 
-  objectTreeFormat(new FWBTree),
-  systemFile(true), safeMode(false), editingStandardLib(false),
-  editingTemplateLib(false),
-  ruleSetRedrawPending(false), objdb(0), editorOwner(0), 
-  oe(0), fd(0), shownInInfo(0), autosaveTimer(new QTimer(static_cast<QObject*>(this))), ruleSetTabIndex(0),
-    visibleFirewall(0), visibleRuleSet(0),lastFirewallIdx(-2), changingTabs(false),
-     noFirewalls(tr("No firewalls defined")), m_panel(0), findObjectWidget(0), 
-     findWhereUsedWidget(0)
+    QWidget(parent, Qt::WindowSystemMenuHint|Qt::Window),
+    mainW(0),
+    rcs(0),
+    addOnLibs(new listOfLibraries()), 
+    objectTreeFormat(new FWBTree),
+    systemFile(true),
+    safeMode(false),
+    editingStandardLib(false),
+    editingTemplateLib(false),
+    ruleSetRedrawPending(false),
+    objdb(0),
+    editorOwner(0), 
+    oe(0),
+    fd(0),
+    shownInInfo(0),
+    autosaveTimer(new QTimer(static_cast<QObject*>(this))), ruleSetTabIndex(0),
+    visibleFirewall(0),
+    visibleRuleSet(0),
+    lastFirewallIdx(-2),
+    changingTabs(false),
+    noFirewalls(tr("No firewalls defined")),
+    m_panel(0),
+    findObjectWidget(0), 
+    findWhereUsedWidget(0)
 {
     if (fwbdebug)
         qDebug("ProjectPanel constructor");

src/gui/fwbuilder_ph.h

@@ -23,7 +23,6 @@
 
 #include "../../config.h"
 #include "VERSION.h"
-#include "build_num"
 #include "definitions.h"
 #include "global.h"
 #include "utils.h"