Removed help button from UI. Fixes #2495.

src/libgui/ActionsDialog.cpp

@@ -97,11 +97,6 @@ void ActionsDialog::loadFWObject(FWObject *o)
     setRule(Rule::cast(o));
 }
 
-void ActionsDialog::getHelpName(QString *str)
-{
-    *str = help_name;
-}
-
 void ActionsDialog::validate(bool *res)
 {
     FWOptions *ruleopt =rule->getOptionsObject();
@@ -212,7 +207,6 @@ void ActionsDialog::setRule(Rule *r)
     {
         // firewall can be NULL if rule set is in Deleted Objects library
         platform = firewall->getStr("platform");
-        help_name = string(platform + "_" + act).c_str();
         editor = DialogFactory::getActionDialogPageName(firewall, r);
     }
 

src/libgui/ActionsDialog.h

@@ -65,8 +65,6 @@ private:
     FWObjectDropArea * TagIntArea ;
     FWObjectDropArea * TagStrArea ;
 
-    QString help_name;
-
  public:
     Ui::ActionsDialog_q *m_dialog;
      
@@ -79,10 +77,7 @@ public slots:
     virtual void tagvalueChanged(int);
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
     void setRule(libfwbuilder::Rule*);
-    
-
 };
 
 #endif 

src/libgui/AddressRangeDialog.cpp

@@ -66,11 +66,6 @@ AddressRangeDialog::~AddressRangeDialog()
     delete m_dialog;
 }
 
-void AddressRangeDialog::getHelpName(QString *str)
-{
-    *str = "AddressRangeDialog";
-}
-
 void AddressRangeDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/AddressRangeDialog.h

@@ -51,8 +51,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // ADDRESSRANGEDIALOG_H

src/libgui/AddressTableDialog.cpp

@@ -77,11 +77,6 @@ AddressTableDialog::~AddressTableDialog()
     delete m_dialog;
 }
 
-void AddressTableDialog::getHelpName(QString *str)
-{
-    *str = "AddressTableDialog";
-}
-
 void AddressTableDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/AddressTableDialog.h

@@ -54,8 +54,6 @@ public slots:
     virtual void validate(bool*);
     virtual void browse();
     virtual void editFile( void  );
-    virtual void getHelpName(QString*);
-
 };
 
 #endif 

src/libgui/AttachedNetworksDialog.cpp

@@ -67,11 +67,6 @@ AttachedNetworksDialog::AttachedNetworksDialog(QWidget *parent) : BaseObjectDial
 
 AttachedNetworksDialog::~AttachedNetworksDialog() { delete m_dialog; }
 
-void AttachedNetworksDialog::getHelpName(QString *str)
-{
-    *str = "AttachedNetworksDialog";
-}
-
 void AttachedNetworksDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/AttachedNetworksDialog.h

@@ -57,9 +57,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-   
-
 };
 
 #endif // ATTACHEDNETWORKSDIALOG_H

src/libgui/BlankDialog.cpp

@@ -43,11 +43,6 @@ BlankDialog::~BlankDialog()
     delete m_dialog;
 }
 
-void BlankDialog::getHelpName(QString *str)
-{
-    *str = "BlankDialog";
-}
-
 void BlankDialog::loadFWObject(FWObject *o)
 {
     obj = o;

src/libgui/BlankDialog.h

@@ -50,9 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif 

src/libgui/ClusterDialog.cpp

@@ -44,11 +44,6 @@ ClusterDialog::~ClusterDialog()
     delete m_dialog;
 }
 
-void ClusterDialog::getHelpName(QString *str)
-{
-    *str = "ClusterDialog";
-}
-
 ClusterDialog::ClusterDialog(QWidget *parent)
     : BaseObjectDialog(parent)
 {

src/libgui/ClusterDialog.h

@@ -54,7 +54,6 @@ public slots:
     virtual void hostOSChanged();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
 };
 
 #endif /* __CLUSTERDIALOG_H_ */

src/libgui/ClusterGroupDialog.cpp

@@ -53,11 +53,6 @@ ClusterGroupDialog::~ClusterGroupDialog()
     delete m_dialog;
 }
 
-void ClusterGroupDialog::getHelpName(QString *str)
-{
-    *str = "ClusterGroupDialog";
-}
-
 ClusterGroupDialog::ClusterGroupDialog(QWidget *parent)
     : BaseObjectDialog(parent)
 {

src/libgui/ClusterGroupDialog.h

@@ -61,12 +61,10 @@ public slots:
     virtual void validate(bool*);
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void openClusterConfDialog();
-    virtual void getHelpName(QString*);
 
     void openObject(QTreeWidgetItem *item);
     void objectChanged();
     void openParametersEditor();
-
 };
 
 #endif /* __CLUSTERDIALOG_H_ */

src/libgui/CommentEditorPanel.cpp

@@ -127,11 +127,6 @@ void CommentEditorPanel::applyChanges()
         m_project->undoStack->push(cmd.release());
 }
 
-void CommentEditorPanel::getHelpName(QString *str)
-{
-    *str = "CommentEditorPanel";
-}
-
 void CommentEditorPanel::loadFWObject(FWObject *obj)
 {
     Rule *r = Rule::cast(obj);

src/libgui/CommentEditorPanel.h

@@ -60,8 +60,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-    
 };
 
 #endif

src/libgui/CompilerOutputPanel.cpp

@@ -72,11 +72,6 @@ void CompilerOutputPanel::applyChanges()
 {
 }
 
-void CompilerOutputPanel::getHelpName(QString *str)
-{
-    *str = "CompilerOutputPanel";
-}
-
 void CompilerOutputPanel::loadFWObject(FWObject *obj)
 {
     if (fwbdebug)

src/libgui/CompilerOutputPanel.h

@@ -61,7 +61,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
     virtual void closeEvent(QCloseEvent *e);
 
 protected:

src/libgui/CustomServiceDialog.cpp

@@ -68,11 +68,6 @@ CustomServiceDialog::~CustomServiceDialog()
     delete m_dialog;
 }
 
-void CustomServiceDialog::getHelpName(QString *str)
-{
-    *str = "CustomServiceDialog";
-}
-
 void CustomServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/CustomServiceDialog.h

@@ -63,8 +63,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // CUSTOMSERVICEDIALOG_H

src/libgui/DNSNameDialog.cpp

@@ -72,11 +72,6 @@ DNSNameDialog::~DNSNameDialog()
     delete m_dialog;
 }
 
-void DNSNameDialog::getHelpName(QString *str)
-{
-    *str = "DNSNameDialog";
-}
-
 void DNSNameDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/DNSNameDialog.h

@@ -50,8 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-    
 };
 
 #endif 

src/libgui/DynamicGroupDialog.cpp

@@ -310,11 +310,6 @@ void DynamicGroupDialog::validate(bool *result)
 }
 
 
-void DynamicGroupDialog::getHelpName(QString *)
-{
-}
-
-
 void DynamicGroupDialog::addMatchClicked()
 {
     int newRow = m_model->rowCount();

src/libgui/DynamicGroupDialog.h

@@ -61,7 +61,6 @@ class DynamicGroupDialog : public BaseObjectDialog
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool *);
-    virtual void getHelpName(QString *);
 
     void addMatchClicked();
     void deleteFilterClicked();

src/libgui/FWBMainWindow_q.ui

@@ -51,7 +51,7 @@
       <property name="minimumSize">
        <size>
         <width>950</width>
-        <height>300</height>
+        <height>285</height>
        </size>
       </property>
       <property name="maximumSize">
@@ -66,7 +66,7 @@
       <widget class="QWidget" name="dockWidgetContents">
        <layout class="QGridLayout" name="gridLayout">
         <property name="leftMargin">
-         <number>12</number>
+         <number>2</number>
         </property>
         <property name="topMargin">
          <number>2</number>
@@ -231,25 +231,12 @@
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
-                  <width>63</width>
+                  <width>0</width>
                   <height>58</height>
                  </size>
                 </property>
                </spacer>
               </item>
-              <item>
-               <widget class="QPushButton" name="helpObjectEditorButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>Help</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </item>
             <item row="0" column="1">
@@ -269,7 +256,7 @@
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
-                <height>300</height>
+                <height>285</height>
                </size>
               </property>
               <property name="focusPolicy">
@@ -709,19 +696,6 @@
               </widget>
              </widget>
             </item>
-            <item row="1" column="1">
-             <spacer name="verticalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>16</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </widget>

src/libgui/FWWindow.cpp

@@ -231,7 +231,6 @@ FWWindow::FWWindow() : QMainWindow(),   // QMainWindow(NULL, Qt::Desktop),
     m_mainWindow->editorDockWidget->hide();
 
     oe  = new ObjectEditor((QWidget*)m_mainWindow->objectEditorStack);
-    oe->setHelpButton(m_mainWindow->helpObjectEditorButton);
 
     m_mainWindow->editorDockWidget->setupEditor(oe);
     m_mainWindow->editorDockWidget->hide();

src/libgui/FirewallDialog.cpp

@@ -84,11 +84,6 @@ FirewallDialog::FirewallDialog(QWidget *parent) :
     connectSignalsOfAllWidgetsToSlotChange();
 }
 
-void FirewallDialog::getHelpName(QString *str)
-{
-    *str = "FirewallDialog";
-}
-
 void FirewallDialog::loadFWObject(FWObject *o)
 {
     try

src/libgui/FirewallDialog.h

@@ -58,9 +58,6 @@ public slots:
     virtual void validate(bool*);
     virtual void openFWDialog();
     virtual void openOSDialog();
-    virtual void getHelpName(QString*);
-    
-    
 };
 
 #endif // FIREWALLDIALOG_H

src/libgui/GroupObjectDialog.cpp

@@ -409,11 +409,6 @@ void GroupObjectDialog::addIcon(FWObject *o, bool ref)
     listView->addTopLevelItem(tree_item);
 }
 
-void GroupObjectDialog::getHelpName(QString *str)
-{
-    *str = "GroupObjectDialog";
-}
-
 void GroupObjectDialog::loadFWObject(FWObject *o)
 {
     obj = o;

src/libgui/GroupObjectDialog.h

@@ -84,7 +84,6 @@ class GroupObjectDialog : public BaseObjectDialog
     virtual void dropped(QDropEvent *ev);
     virtual void iconContextMenu(const QPoint & pos);
     virtual void listContextMenu(const QPoint & pos);
-    virtual void getHelpName(QString*);
     
     void copyObj();
     void cutObj();

src/libgui/HostDialog.cpp

@@ -68,11 +68,6 @@ HostDialog::~HostDialog()
     delete m_dialog;
 }
 
-void HostDialog::getHelpName(QString *str)
-{
-    *str = "HostDialog";
-}
-
 void HostDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/HostDialog.h

@@ -50,8 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // HOSTDIALOG_H

src/libgui/ICMPServiceDialog.cpp

@@ -68,11 +68,6 @@ ICMPServiceDialog::~ICMPServiceDialog()
     delete m_dialog;
 }
 
-void ICMPServiceDialog::getHelpName(QString *str)
-{
-    *str = "ICMPServiceDialog";
-}
-
 void ICMPServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/ICMPServiceDialog.h

@@ -50,9 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif // ICMPSERVICEDIALOG_H

src/libgui/IPServiceDialog.cpp

@@ -81,11 +81,6 @@ void IPServiceDialog::setCodeLabel()
     }
 }
 
-void IPServiceDialog::getHelpName(QString *str)
-{
-    *str = "IPServiceDialog";
-}
-
 void IPServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/IPServiceDialog.h

@@ -55,7 +55,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
     virtual void anyOptionsStateChanged();
 };
 

src/libgui/IPv4Dialog.cpp

@@ -65,11 +65,6 @@ IPv4Dialog::~IPv4Dialog()
     delete m_dialog;
 }
 
-void IPv4Dialog::getHelpName(QString *str)
-{
-    *str = "IPv4Dialog";
-}
-
 void IPv4Dialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/IPv4Dialog.h

@@ -55,9 +55,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void DNSlookup();
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif // IPV4DIALOG_H

src/libgui/IPv6Dialog.cpp

@@ -74,11 +74,6 @@ IPv6Dialog::~IPv6Dialog()
     delete m_dialog;
 }
 
-void IPv6Dialog::getHelpName(QString *str)
-{
-    *str = "IPv6Dialog";
-}
-
 void IPv6Dialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/IPv6Dialog.h

@@ -55,9 +55,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void DNSlookup();
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif // IPV6DIALOG_H

src/libgui/InterfaceDialog.cpp

@@ -93,11 +93,6 @@ InterfaceDialog::~InterfaceDialog()
     delete m_dialog;
 }
 
-void InterfaceDialog::getHelpName(QString *str)
-{
-    *str = "InterfaceDialog";
-}
-
 void InterfaceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/InterfaceDialog.h

@@ -58,8 +58,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void openIfaceDialog();
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // INTERFACEDIALOG_H

src/libgui/LibraryDialog.cpp

@@ -79,11 +79,6 @@ LibraryDialog::~LibraryDialog()
     delete m_dialog;
 }
 
-void LibraryDialog::getHelpName(QString *str)
-{
-    *str = "LibraryDialog";
-}
-
 void LibraryDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/LibraryDialog.h

@@ -58,9 +58,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void changeColor();
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif // LIBRARYDIALOG_H

src/libgui/MetricEditorPanel.cpp

@@ -78,11 +78,6 @@ void MetricEditorPanel::applyChanges()
     rule->setMetric( value() );
 }
 
-void MetricEditorPanel::getHelpName(QString *str)
-{
-    *str = "MetricEditorPanel";
-}
-
 void MetricEditorPanel::loadFWObject(libfwbuilder::FWObject *obj)
 {
     RoutingRule *r=RoutingRule::cast(obj);

src/libgui/MetricEditorPanel.h

@@ -56,10 +56,7 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
     virtual void closeEvent(QCloseEvent *e);
-    
-
 };
 
 #endif

src/libgui/NATRuleOptionsDialog.cpp

@@ -66,11 +66,6 @@ NATRuleOptionsDialog::NATRuleOptionsDialog(QWidget *parent) : BaseObjectDialog(p
     init=false;
 }
 
-void NATRuleOptionsDialog::getHelpName(QString *str)
-{
-    *str = "NATRuleOptionsDialog";
-}
-
 void NATRuleOptionsDialog::loadFWObject(FWObject *o)
 {
     obj = o;

src/libgui/NATRuleOptionsDialog.h

@@ -54,8 +54,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // __NATRULEOPTIONSDIALOG_H

src/libgui/NetworkDialog.cpp

@@ -67,11 +67,6 @@ NetworkDialog::NetworkDialog(QWidget *parent) : BaseObjectDialog(parent)
 
 NetworkDialog::~NetworkDialog() { delete m_dialog; }
 
-void NetworkDialog::getHelpName(QString *str)
-{
-    *str = "NetworkDialog";
-}
-
 void NetworkDialog::loadFWObject(FWObject *o)
 {
     obj = o;

src/libgui/NetworkDialog.h

@@ -51,9 +51,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void addressEntered();
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif // NETWORKDIALOG_H

src/libgui/NetworkDialogIPv6.cpp

@@ -67,11 +67,6 @@ NetworkDialogIPv6::NetworkDialogIPv6(QWidget *parent) : BaseObjectDialog(parent)
 
 NetworkDialogIPv6::~NetworkDialogIPv6() { delete m_dialog; }
 
-void NetworkDialogIPv6::getHelpName(QString *str)
-{
-    *str = "NetworkDialogIPv6";
-}
-
 void NetworkDialogIPv6::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/NetworkDialogIPv6.h

@@ -52,8 +52,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void addressEntered();
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // NETWORKDIALOG_H

src/libgui/ObjectEditor.cpp

@@ -108,7 +108,6 @@ using namespace libfwbuilder;
 ObjectEditor::ObjectEditor( QWidget *parent):
     QObject(parent), opened(0), current_dialog_idx(-1), current_dialog_name(""),
     editorStack(dynamic_cast<QStackedWidget*>(parent)),
-    helpButton(0),
     m_project(0),
     openedOpt(optNone)
 {
@@ -256,7 +255,6 @@ void ObjectEditor::activateDialog(const QString &dialog_name,
     openedOpt = opt;
 
     load();
-    findAndLoadHelp();
 
     //show();
 
@@ -271,10 +269,6 @@ void ObjectEditor::activateDialog(const QString &dialog_name,
     connect(dialogs[ current_dialog_idx ], SIGNAL(changed_sign()),
             this,
             SLOT(changed()));
-
-    connect(this, SIGNAL(getHelpName_sign(QString*)),
-            dialogs[ current_dialog_idx ],
-            SLOT(getHelpName(QString*)));
 }
 
 void ObjectEditor::open(FWObject *obj)
@@ -313,7 +307,6 @@ void ObjectEditor::disconnectSignals()
     disconnect( SIGNAL(loadObject_sign(libfwbuilder::FWObject*)) );
     disconnect( SIGNAL(validate_sign(bool*)) );
     disconnect( SIGNAL(applyChanges_sign()) );
-    disconnect( SIGNAL(getHelpName_sign(QString*)) );
     if (current_dialog_idx>=0) dialogs[current_dialog_idx]->disconnect( this );
 }
 
@@ -324,35 +317,6 @@ void ObjectEditor::purge()
     openedOpt = optNone;
 }
 
-void ObjectEditor::setHelpButton(QPushButton * b)
-{
-    helpButton=b;
-    helpButton->setEnabled(true);
-    connect((QWidget*)helpButton,SIGNAL(clicked()),this,SLOT(help()));
-}
-
-void ObjectEditor::help()
-{
-    QString help_name;
-    emit getHelpName_sign(&help_name);
-    if (fwbdebug)
-        qDebug("ObjectEditor::help: %s", help_name.toStdString().c_str());
-    Help *h = Help::getHelpWindow(mw);
-    h->setSource(QUrl(help_name + ".html"));
-    h->raise();
-    h->show();
-}
-
-void ObjectEditor::findAndLoadHelp()
-{
-    QString help_name;
-    emit getHelpName_sign(&help_name);
-
-    // is help available?
-    Help *h = Help::getHelpWindow(mw);
-    helpButton->setEnabled(!h->findHelpFile(help_name + ".html").isEmpty());
-}
-
 void ObjectEditor::load()
 {
     emit loadObject_sign(opened);

src/libgui/ObjectEditor.h

@@ -56,11 +56,9 @@ class ObjectEditor : public QObject {
     int current_dialog_idx;
     QString current_dialog_name;
     QStackedWidget *editorStack;
-    QPushButton *helpButton;
     ProjectPanel *m_project;
     
     void disconnectSignals();
-    void findAndLoadHelp();
 
 public: 
     enum OptType{optAction, optComment, optMetric, optNone};
@@ -96,14 +94,11 @@ public:
     void purge();
     bool validate();
     
-    void setHelpButton(QPushButton * b);
-
     int getCurrentDialogIndex() { return current_dialog_idx; };
     QWidget* getCurrentObjectDialog();
     
 public slots:
 
-    void help();
     void changed();
     void blank();
 
@@ -127,11 +122,6 @@ signals:
      * the user and saves data in the object.
      */
     void applyChanges_sign();
-
-    /**
-     * the dialog class returns corresponding help file name
-     */
-    void getHelpName_sign(QString *str);
 };
 
 #endif

src/libgui/PhysicalAddressDialog.cpp

@@ -68,11 +68,6 @@ PhysicalAddressDialog::~PhysicalAddressDialog()
     delete m_dialog;
 }
 
-void PhysicalAddressDialog::getHelpName(QString *str)
-{
-    *str = "PhysicalAddressDialog";
-}
-
 void PhysicalAddressDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/PhysicalAddressDialog.h

@@ -51,8 +51,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // PHYSICALADDRESSDIALOG_H

src/libgui/PrototypeDialogClass.cpp

@@ -48,11 +48,6 @@
 using namespace libfwbuilder;
 using namespace std;
 
-void PrototypeDialog::getHelpName(QString *str)
-{
-    *str = "PrototypeDialog";
-}
-
 void PrototypeDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/PrototypeDialogClass.h

@@ -49,8 +49,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void closeEvent(QCloseEvent *e);
-    virtual void getHelpName(QString*);
-    
 };
 
 #endif // __PROTOTYPEDIALOG_H

src/libgui/RoutingRuleOptionsDialog.cpp

@@ -70,11 +70,6 @@ RoutingRuleOptionsDialog::RoutingRuleOptionsDialog(QWidget *parent) :
     m_dialog->setupUi(this);
 }
 
-void RoutingRuleOptionsDialog::getHelpName(QString *str)
-{
-    *str = "RoutingRuleOptionsDialog";
-}
-
 void RoutingRuleOptionsDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/RoutingRuleOptionsDialog.h

@@ -57,8 +57,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // __ROUTINGRULEOPTIONSDIALOG_H

src/libgui/RuleOptionsDialog.cpp

@@ -83,12 +83,6 @@ RuleOptionsDialog::RuleOptionsDialog(QWidget *parent) :
     init=false;
 }
 
-void RuleOptionsDialog::getHelpName(QString *str)
-{
-    // can make help name different depending on the currently opened tab
-    *str = help_name;
-}
-
 void RuleOptionsDialog::loadFWObject(FWObject *o)
 {
     obj = o;
@@ -98,8 +92,6 @@ void RuleOptionsDialog::loadFWObject(FWObject *o)
     platform = firewall->getStr("platform").c_str();
     string version = firewall->getStr("version");
 
-    help_name = platform + "_rule_options";
-
     // build a map for combobox so visible combobox items can be localized
     QStringList route_options = getRouteOptions_pf_ipf(platform);
     QStringList route_load_options = getRouteLoadOptions_pf(platform);

src/libgui/RuleOptionsDialog.h

@@ -50,8 +50,6 @@ class RuleOptionsDialog : public BaseObjectDialog
     Ui::RuleOptionsDialog_q*m_dialog;
     libfwbuilder::FWObject *firewall;
     
-    QString help_name;
-
 public:
     RuleOptionsDialog(QWidget *parent);
     ~RuleOptionsDialog();
@@ -64,7 +62,6 @@ public slots:
     virtual void cancelChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
     virtual void connlimitAboveLabelChange();
     virtual void limitLabelChange();
     virtual void iptRouteContinueToggled();  // #2367

src/libgui/RuleSetDialog.cpp

@@ -72,11 +72,6 @@ RuleSetDialog::~RuleSetDialog()
     delete m_dialog;
 }
 
-void RuleSetDialog::getHelpName(QString *str)
-{
-    *str = QString(obj->getTypeName().c_str());
-}
-
 void RuleSetDialog::loadFWObject(FWObject *o)
 {
     obj = o;

src/libgui/RuleSetDialog.h

@@ -53,8 +53,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // RULESETDIALOG_H

src/libgui/TCPServiceDialog.cpp

@@ -67,11 +67,6 @@ TCPServiceDialog::~TCPServiceDialog()
     delete m_dialog;
 }
 
-void TCPServiceDialog::getHelpName(QString *str)
-{
-    *str = "TCPServiceDialog";
-}
-
 void TCPServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/TCPServiceDialog.h

@@ -51,8 +51,6 @@ public slots:
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
     virtual void toggleEstablished();
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // TCPSERVICEDIALOG_H

src/libgui/TagServiceDialog.cpp

@@ -70,11 +70,6 @@ TagServiceDialog::TagServiceDialog(QWidget *parent) : BaseObjectDialog(parent)
     connectSignalsOfAllWidgetsToSlotChange();
 }
 
-void TagServiceDialog::getHelpName(QString *str)
-{
-    *str = "TagServiceDialog";
-}
-
 void TagServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/TagServiceDialog.h

@@ -50,9 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-    
-
 };
 
 #endif 

src/libgui/TimeDialog.cpp

@@ -72,11 +72,6 @@ TimeDialog::~TimeDialog()
     delete m_dialog;
 }
 
-void TimeDialog::getHelpName(QString *str)
-{
-    *str = "TimeDialog";
-}
-
 void TimeDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/TimeDialog.h

@@ -53,8 +53,6 @@ public slots:
     virtual void useStartOrEndDate();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // __TIMEDIALOG_H

src/libgui/UDPServiceDialog.cpp

@@ -66,11 +66,6 @@ UDPServiceDialog::~UDPServiceDialog()
     delete m_dialog;
 }
 
-void UDPServiceDialog::getHelpName(QString *str)
-{
-    *str = "UDPServiceDialog";
-}
-
 void UDPServiceDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/UDPServiceDialog.h

@@ -50,8 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // UDPSERVICEDIALOG_H

src/libgui/UserDialog.cpp

@@ -64,11 +64,6 @@ UserDialog::UserDialog(QWidget *parent) : BaseObjectDialog(parent)
 
 UserDialog::~UserDialog() { delete m_dialog; }
 
-void UserDialog::getHelpName(QString *str)
-{
-    *str = "UserDialog";
-}
-
 void UserDialog::loadFWObject(FWObject *o)
 {
     obj=o;

src/libgui/UserDialog.h

@@ -50,8 +50,6 @@ public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);
     virtual void validate(bool*);
-    virtual void getHelpName(QString*);
-
 };
 
 #endif // UserDialog_H

src/libgui/commentkeywords_q.ui

@@ -37,13 +37,6 @@
      <property name="tabChangesFocus">
       <bool>true</bool>
      </property>
-     <property name="html">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Enter comment here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
     </widget>
    </item>
    <item row="1" column="0">
@@ -61,13 +54,6 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="keywordsLabel">
-     <property name="text">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;No keywords&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>