From ca46deca14ce840b88432eb4bdb3aa6330c429ac Mon Sep 17 00:00:00 2001 From: asl Date: Wed, 12 Oct 2005 10:52:31 +0000 Subject: [PATCH] PAL10212 --- src/Qtx/QtxPopupMgr.cxx | 10 +++++----- src/Qtx/QtxStdOperations.cxx | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx index d0f2fda9d..6f9d28427 100644 --- a/src/Qtx/QtxPopupMgr.cxx +++ b/src/Qtx/QtxPopupMgr.cxx @@ -232,11 +232,11 @@ QtxPopupMgr::~QtxPopupMgr() void QtxPopupMgr::createOperations() { myOperations = new QtxListOfOperations; - myOperations->append( "logic", new QtxLogic(), 0 ); - myOperations->append( "arithm", new QtxArithmetics(), 50 ); - myOperations->append( "strings", new QtxStrings(), 100 ); - myOperations->append( "sets", new QtxSets(), 150 ); - myOperations->append( "custom", new Operations( this ), 200 ); + myOperations->prepend( "logic", new QtxLogic(), 0 ); + myOperations->prepend( "arithm", new QtxArithmetics(), 50 ); + myOperations->prepend( "strings", new QtxStrings(), 100 ); + myOperations->prepend( "sets", new QtxSets(), 150 ); + myOperations->prepend( "custom", new Operations( this ), 200 ); } //================================================================ diff --git a/src/Qtx/QtxStdOperations.cxx b/src/Qtx/QtxStdOperations.cxx index 69a7453c9..f6c34bd75 100644 --- a/src/Qtx/QtxStdOperations.cxx +++ b/src/Qtx/QtxStdOperations.cxx @@ -777,9 +777,9 @@ QtxParser::Error QtxSets::calculate( const QString& op, QtxValue& v1, QtxValue& remove( aNewList, v2.toList() ); if( op=="=" ) - set( v1, aNewList.isEmpty() ); + set( v1, aNewList.isEmpty() && v1.toList().count()==v2.toList().count() ); else if( op=="<>" || op=="!=" ) - set( v1, !aNewList.isEmpty() ); + set( v1, !aNewList.isEmpty() || v1.toList().count()!=v2.toList().count() ); else v1 = aNewList; } -- 2.39.2