WebSVN – tpanel – Diff – /trunk/tpagelist.cpp

  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 #include <string>
+#include "tpageinterface.h"
 #include "tpagelist.h"
 #include "tconfig.h"
 #include "terror.h"
 #if __cplusplus < 201402L
     DECL_TRACER("TPageList::findPage(int pageID)");
     vector<PAGELIST_T>::iterator iter;
     PAGELIST_T page;
-    if (pageID < 5000)
+    if (pageID < SYSTEM_PAGE_START)
+    {
         for (iter = mPageList.begin(); iter != mPageList.end(); ++iter)
+        {
             if (iter->pageID == pageID)
+            {
     DECL_TRACER("TPageList::findSubPage(int pageID)");
     vector<SUBPAGELIST_T>::iterator iter;
     SUBPAGELIST_T page;
-    if (pageID < 5000)
+    if (pageID < SYSTEM_PAGE_START)
+    {
         for (iter = mSubPageList.begin(); iter != mSubPageList.end(); ++iter)
+        {
             if (iter->pageID == pageID)
+            {
             return iter->pageID;
+    }
     return -1;
+}
+int TPageList::findSubViewListID(int pageID, int *index)
+{
+    DECL_TRACER("TPageList::findSubViewListID(int pageID, int *index)");
+    if (mSubViewList.empty() || pageID <= 0)
+        return -1;
+    vector<SUBVIEWLIST_T>::iterator iter;
+    for (iter = mSubViewList.begin(); iter != mSubViewList.end(); ++iter)
+    {
+        vector<SUBVIEWITEM_T>::iterator itItem;
+        for (itItem = iter->items.begin(); itItem != iter->items.end(); ++itItem)
+        {
+            if (itItem->pageID == pageID)
+            {
+                if (index)
+                    *index = itItem->index;
+                return iter->id;
+            }
+        }
+    }
+    return -1;
+}

Subversion Repositories tpanel

(root)/trunk/tpagelist.cpp @ 383 – Rev 289 → 300