[Tora-cvs] SF.net SVN: tora:[3000] trunk/tora/src/toresultdata.cpp

[<mrj...@us...>]

Revision: 3000
          http://tora.svn.sourceforge.net/tora/?rev=3000&view=rev
Author:   mrjohnson0
Date:     2008-09-14 18:27:10 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
qmap::operator[] adds a default constructed value.

fixes filter toggle button displaying incorrectly

Modified Paths:
--------------
    trunk/tora/src/toresultdata.cpp

Modified: trunk/tora/src/toresultdata.cpp
===================================================================
--- trunk/tora/src/toresultdata.cpp	2008-09-14 17:34:40 UTC (rev 2999)
+++ trunk/tora/src/toresultdata.cpp	2008-09-14 18:27:10 UTC (rev 3000)
@@ -196,7 +196,8 @@
     }
 
     FilterName = filterName();
-    filterAct->setChecked(AllFilter || Criteria.contains(FilterName));
+    bool filter = AllFilter || Criteria.contains(FilterName);
+    filterAct->setChecked(filter);
 
     toConnection &conn = connection();
 
@@ -204,7 +205,7 @@
     SQL = SQL.arg(conn.quote(Owner)).arg(conn.quote(Table));
 
     bool where = false;
-    if (!Criteria[FilterName].isEmpty())
+    if (filter && !Criteria[FilterName].isEmpty())
     {
         SQL += " WHERE ";
         SQL += Criteria[FilterName];
@@ -212,7 +213,7 @@
         where = true;
     }
 
-    if (!Order[FilterName].isEmpty())
+    if (filter && !Order[FilterName].isEmpty())
     {
         SQL += " ORDER BY ";
         SQL += Order[FilterName];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.