[fwbuilder-commits] r2979 - in branches/v4_0: . doc src/gui src/gui/unit_tests/GroupObjectDialogTest

[<va...@in...>]

Author: vadim
Date: 2010-06-12 17:32:48 -0700 (Sat, 12 Jun 2010)
New Revision: 2979

Modified:
   branches/v4_0/build_num
   branches/v4_0/doc/ChangeLog
   branches/v4_0/src/gui/GroupObjectDialog.h
   branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
   branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h
Log:


* GroupObjectDialog.h (class GroupObjectDialog): fixed #1499
"GroupObjectDialogTest.cpp does not compile with gcc 3.4.6" and SF
bug 3015307.  There is no reason to make method insertObject()
protected which caused problems (and hacky workaround) in the unit
test.



Modified: branches/v4_0/build_num
===================================================================
--- branches/v4_0/build_num	2010-06-12 23:55:54 UTC (rev 2978)
+++ branches/v4_0/build_num	2010-06-13 00:32:48 UTC (rev 2979)
@@ -1 +1 @@
-#define BUILD_NUM 2977
+#define BUILD_NUM 2978

Modified: branches/v4_0/doc/ChangeLog
===================================================================
--- branches/v4_0/doc/ChangeLog	2010-06-12 23:55:54 UTC (rev 2978)
+++ branches/v4_0/doc/ChangeLog	2010-06-13 00:32:48 UTC (rev 2979)
@@ -1,5 +1,11 @@
 2010-06-12  Vadim Kurland  <va...@vk...>
 
+	* GroupObjectDialog.h (class GroupObjectDialog): fixed #1499
+	"GroupObjectDialogTest.cpp does not compile with gcc 3.4.6" and SF
+	bug 3015307.  There is no reason to make method insertObject()
+	protected which caused problems (and hacky workaround) in the unit
+	test.
+
 	* IPTImporter.cpp (IPTImporter::finalize): fixed SF bug #3015305
 	"compile error XML validity ". The problem was introduced with a
 	change that made policy importer cabaple of reproducing default

Modified: branches/v4_0/src/gui/GroupObjectDialog.h
===================================================================
--- branches/v4_0/src/gui/GroupObjectDialog.h	2010-06-12 23:55:54 UTC (rev 2978)
+++ branches/v4_0/src/gui/GroupObjectDialog.h	2010-06-13 00:32:48 UTC (rev 2979)
@@ -65,15 +65,15 @@
     void setupPopupMenu(const QPoint&);
     void saveColumnWidths();
 
- protected:
-    void insertObject(libfwbuilder::FWObject *o);
-
  public:
     GroupObjectDialog(QWidget *parent);
     ~GroupObjectDialog();
 
     enum viewType { Icon, List };
 
+    // making insertObject() public so we can use it in unit tests
+    void insertObject(libfwbuilder::FWObject *o);
+    
  public slots:
     virtual void applyChanges();
     virtual void loadFWObject(libfwbuilder::FWObject *obj);

Modified: branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
===================================================================
--- branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp	2010-06-12 23:55:54 UTC (rev 2978)
+++ branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp	2010-06-13 00:32:48 UTC (rev 2979)
@@ -160,18 +160,9 @@
     return FWTYPE::cast(om->createObject(FWBTree().getStandardSlotForObject(findUserLibrary(), FWTYPE::TYPENAME), FWTYPE::TYPENAME, name));
 }
 
-class PublicGroupDialog: public GroupObjectDialog
-{
-public:
-    void insertObject(FWObject *o)
-    {
-        GroupObjectDialog::insertObject(o);
-    }
-};
-
 bool checkObjectInsertion(GroupObjectDialog *dlg, Group *grp, FWObject *obj)
 {
-    static_cast<PublicGroupDialog*>(dlg)->insertObject(obj);
+    dlg->insertObject(obj);
     for (Group::iterator i = grp->begin(); i!= grp->end(); i++)
     {
         if (FWObjectReference::cast(*i)->getPointer() == obj)
@@ -184,7 +175,7 @@
 
 bool checkObjectInsertion2(GroupObjectDialog *dlg, ServiceGroup *grp, FWObject *obj)
 {
-    static_cast<PublicGroupDialog*>(dlg)->insertObject(obj);
+    dlg->insertObject(obj);
     for (ServiceGroup::iterator i = grp->begin(); i!= grp->end(); i++)
     {
         if (FWServiceReference::cast(*i)->getPointer() == obj)

Modified: branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h
===================================================================
--- branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h	2010-06-12 23:55:54 UTC (rev 2978)
+++ branches/v4_0/src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.h	2010-06-13 00:32:48 UTC (rev 2979)
@@ -51,7 +51,8 @@
 
 class GroupObjectDialogTest : public QObject
 {
-    Q_OBJECT
+    Q_OBJECT;
+    
     libfwbuilder::Library* findUserLibrary();
     template <class FWTYPE> FWTYPE* createObject(QString name);
     ObjectManipulator *om;