onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-11 15:41:41 +02:00
Code Issues Releases Wiki Activity

bugfix 2571,2660

Browse Source
This commit is contained in:
2008-06-26 13:11:55 +00:00
parent 149cc77c6c
commit 140a7d793b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/ObjectListViewItem.cpp
+4 -4
View File
@@ -27,16 +27,16 @@ bool ObjectListViewItem::operator< ( const QTreeWidgetItem & other ) const
ICMPService * licmp = ICMPService::cast(left); ICMPService * licmp = ICMPService::cast(left);
if (rtcpudp != NULL && ltcpudp != NULL) if (rtcpudp != NULL && ltcpudp != NULL)
{ {
int ls = ltcpudp->getSrcRangeStart(); int ls = ltcpudp->getDstRangeStart();
int rs = rtcpudp->getSrcRangeStart(); int rs = rtcpudp->getDstRangeStart();
if (ls<rs) if (ls<rs)
return true ; return true ;
else else
{ {
if (ls==rs) if (ls==rs)
{ {
int le = ltcpudp->getSrcRangeEnd(); int le = ltcpudp->getDstRangeEnd();
int re = rtcpudp->getSrcRangeEnd(); int re = rtcpudp->getDstRangeEnd();
if (le<re) if (le<re)
return true ; return true ;
else else
src/gui/ObjectManipulator.cpp
+5 -5
View File
@@ -2475,14 +2475,14 @@ void ObjectManipulator::libChangedById(int id)
void ObjectManipulator::changeFirstNotSystemLib() void ObjectManipulator::changeFirstNotSystemLib()
{ {
QString sid2 = "syslib000";
QString sid3 = "syslib001";
for (int i = 0 ; i < idxToLibs.size(); i++) for (int i = 0 ; i < idxToLibs.size(); i++)
{ {
qDebug (QString().setNum(idxToLibs[i]->getId()).toAscii().data()); QString sid1 = FWObjectDatabase::getStringId(idxToLibs[i]->getId()).c_str();
qDebug (QString().setNum(FWObjectDatabase::STANDARD_LIB_ID).toAscii().data()); if ( sid1 != sid2)
if (idxToLibs[i]->getId()!=FWObjectDatabase::STANDARD_LIB_ID)
{ {
if (idxToLibs[i]->getId()!=FWObjectDatabase::DELETED_OBJECTS_ID) if (sid1!=sid3)
{ {
libChanged(i); libChanged(i);
m_objectManipulator->libs->setCurrentIndex(i); m_objectManipulator->libs->setCurrentIndex(i);