[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[2639] trunk/mmex/src

[<vo...@us...>]

Revision: 2639
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2639&view=rev
Author:   vomikan
Date:     2012-06-19 20:39:27 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
improvements

Modified Paths:
--------------
    trunk/mmex/src/transactionfilterdialog.cpp
    trunk/mmex/src/transactionfilterdialog.h

Modified: trunk/mmex/src/transactionfilterdialog.cpp
===================================================================
--- trunk/mmex/src/transactionfilterdialog.cpp	2012-06-19 20:08:53 UTC (rev 2638)
+++ trunk/mmex/src/transactionfilterdialog.cpp	2012-06-19 20:39:27 UTC (rev 2639)
@@ -330,7 +330,7 @@
 /****************************************************************************************
 Interface Methods
 *****************************************************************************************/
-bool TransFilterDialog::byDateRange(wxDateTime transDate)
+bool TransFilterDialog::byDateRange(const wxDateTime transDate)
 {
     bool result = false;
     if (cbDateRange_->GetValue())
@@ -348,7 +348,7 @@
     return result;
 }
 
-bool TransFilterDialog::byPayee(wxString payee)
+bool TransFilterDialog::byPayee(const wxString payee)
 {
     bool result = false;
     if (cbPayee_->GetValue())
@@ -398,7 +398,7 @@
     return result;
 }
 
-bool TransFilterDialog::byCategory(wxString category, wxString subCategory)
+bool TransFilterDialog::byCategory(const wxString category, const wxString subCategory)
 {
     // ignore the category test when split category checkbox is active
     if (cbSplitCategory_->GetValue()) return true;
@@ -428,7 +428,7 @@
     return result;
 }
 
-bool TransFilterDialog::byStatus( wxString status )
+bool TransFilterDialog::byStatus(const wxString status )
 {
     if (!cbStatus_->GetValue()) return true;
 
@@ -440,7 +440,7 @@
     return (status == statusStr);
 }
 
-bool TransFilterDialog::byType(wxString type)
+bool TransFilterDialog::byType(const wxString type)
 {
     if (!cbType_->GetValue()) return true;
     wxString transCodeStr = "?";
@@ -450,22 +450,22 @@
     return (type == transCodeStr);
 }
 
-bool TransFilterDialog::searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, wxString sourceStr)
+bool TransFilterDialog::searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, const wxString sourceStr)
 {
     if (!chkBox->GetValue()) return true;
     else if (sourceStr.IsEmpty() && txtCtrl->GetValue().IsEmpty()) return true;
     else if (txtCtrl->GetValue().IsEmpty()) return false;
-    else if (sourceStr.Trim().Lower().Find(txtCtrl->GetValue().Trim().Lower()) != wxNOT_FOUND)
+    else if (sourceStr.Lower().Matches(txtCtrl->GetValue().Trim().Lower()))
         return true;
     return false;
 }
 
-bool TransFilterDialog::byTransNumber(wxString trNum)
+bool TransFilterDialog::byTransNumber(const wxString trNum)
 {
     return searchResult(cbTransNumber_, txtTransNumber_, trNum);
 }
 
-bool TransFilterDialog::byNotes(wxString notes)
+bool TransFilterDialog::byNotes(const wxString notes)
 {
     return searchResult(cbNotes_, txtNotes_, notes);
 }

Modified: trunk/mmex/src/transactionfilterdialog.h
===================================================================
--- trunk/mmex/src/transactionfilterdialog.h	2012-06-19 20:08:53 UTC (rev 2638)
+++ trunk/mmex/src/transactionfilterdialog.h	2012-06-19 20:39:27 UTC (rev 2639)
@@ -48,14 +48,14 @@
 //  Destructor - Currently used for testing only
 //  ~TransFilterDialog( );
 
-    bool byDateRange(wxDateTime transDate);
-    bool byPayee(wxString payee);
+    bool byDateRange(const wxDateTime transDate);
+    bool byPayee(const wxString payee);
     bool bySplitCategory(mmBankTransaction* trans);
-    bool byCategory(wxString category, wxString subCategory);
-    bool byStatus(wxString status );
-    bool byType(wxString type);
-    bool byTransNumber(wxString trNum);
-    bool byNotes(wxString notes); 
+    bool byCategory(const wxString category,const wxString subCategory);
+    bool byStatus(const wxString status );
+    bool byType(const wxString type);
+    bool byTransNumber(const wxString trNum);
+    bool byNotes(const wxString notes); 
 
 private:
     // Define our variables
@@ -107,6 +107,6 @@
     void OnCategorySelect(wxCommandEvent& event);
 
     void OnButtonOK( wxCommandEvent& event );
-    bool searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, wxString sourceStr);
+    bool searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, const wxString sourceStr);
 };
 #endif

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