diff -r fac2248e2afa -r 832e96c9abb6 vymmodel.h --- a/vymmodel.h Mon Mar 08 12:22:15 2010 +0000 +++ b/vymmodel.h Mon Mar 08 12:24:26 2010 +0000 @@ -7,6 +7,8 @@ #include #include +#include + #include "adaptormodel.h" #include "file.h" #include "imageitem.h" @@ -17,6 +19,7 @@ class AttributeItem; class BranchItem; +class FindResultModel; class MapEditor; class XLinkItem; @@ -269,13 +272,11 @@ public: void findDuplicateURLs(); // find duplicate URLs, testing only so far - BranchItem* findText(QString,bool); // Find object + void findAll (FindResultModel*, QString s, Qt::CaseSensitivity cs); // Search all objects at once, also notes + BranchItem* findText(QString s,Qt::CaseSensitivity cs,QTextCursor &cursor); // Find object, also in note void findReset(); // Reset Search - void emitShowFindWidget(); // Tell views to show FindWidget private: QString findString; -signals: - void showFindWidget(); public: void setURL(const QString &url);