Subversion Repositories tpanel

Rev

Rev 193 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 193 Rev 194
Line 97... Line 97...
97 
            mSystemSubPageList.clear();
 97 
            mSystemSubPageList.clear();
98 
 
 98 
 
99 
        sProject = mSystemProject;
 99 
        sProject = mSystemProject;
100 
    }
 100 
    }
101 
 
 101 
 
102 
    if (sProject.empty() || !isValidFile(mProject))
 102 
    if (sProject.empty() || !isValidFile(sProject))
103 
    {
 103 
    {
104 
        TError::setErrorMsg("Empty or invalid project file! <" + sProject + ">");
 104 
        TError::setErrorMsg("Empty or invalid project file! <" + sProject + ">");
105 
        MSG_ERROR(TError::getErrorMsg());
 105 
        MSG_ERROR(TError::getErrorMsg());
106 
        return;
 106 
        return;
107 
    }
 107 
    }
Line 206... Line 206...
206 
    DECL_TRACER("TPageList::findPage(const std::string& name, bool system)");
 206 
    DECL_TRACER("TPageList::findPage(const std::string& name, bool system)");
207 
 
 207 
 
208 
    vector<PAGELIST_T>::iterator iter;
 208 
    vector<PAGELIST_T>::iterator iter;
209 
    PAGELIST_T page;
 209 
    PAGELIST_T page;
210 
 
 210 
 
211 
    if (!system)
 211 
    if (!system && mPageList.size() > 0)
212 
    {
 212 
    {
213 
        for (iter = mPageList.begin(); iter != mPageList.end(); ++iter)
 213 
        for (iter = mPageList.begin(); iter != mPageList.end(); ++iter)
214 
        {
 214 
        {
215 
            if (iter->name.compare(name) == 0)
 215 
            if (iter->name.compare(name) == 0)
216 
            {
 216 
            {
217 
                page = *iter;
 217 
                page = *iter;
218 
                return page;
 218 
                return page;
219 
            }
 219 
            }
220 
        }
 220 
        }
221 
    }
 221 
    }
222 
    else
 222 
    else if (mSystemPageList.size() > 0)
223 
    {
 223 
    {
224 
        for (iter = mSystemPageList.begin(); iter != mSystemPageList.end(); ++iter)
 224 
        for (iter = mSystemPageList.begin(); iter != mSystemPageList.end(); ++iter)
225 
        {
 225 
        {
226 
            if (iter->name.compare(name) == 0)
 226 
            if (iter->name.compare(name) == 0)
227 
            {
 227 
            {
Line 276... Line 276...
276 
    DECL_TRACER("TPageList::findSubPage(const std::string& name, bool system)");
 276 
    DECL_TRACER("TPageList::findSubPage(const std::string& name, bool system)");
277 
 
 277 
 
278 
    vector<SUBPAGELIST_T>::iterator iter;
 278 
    vector<SUBPAGELIST_T>::iterator iter;
279 
    SUBPAGELIST_T page;
 279 
    SUBPAGELIST_T page;
280 
 
 280 
 
281 
    if (!system)
 281 
    if (!system && mSubPageList.size() > 0)
282 
    {
 282 
    {
283 
        for (iter = mSubPageList.begin(); iter != mSubPageList.end(); ++iter)
 283 
        for (iter = mSubPageList.begin(); iter != mSubPageList.end(); ++iter)
284 
        {
 284 
        {
285 
            if (iter->name.compare(name) == 0)
 285 
            if (iter->name.compare(name) == 0)
286 
            {
 286 
            {
287 
                page = *iter;
 287 
                page = *iter;
288 
                return page;
 288 
                return page;
289 
            }
 289 
            }
290 
        }
 290 
        }
291 
    }
 291 
    }
292 
    else
 292 
    else if (mSystemSubPageList.size() > 0)
293 
    {
 293 
    {
294 
        for (iter = mSystemSubPageList.begin(); iter != mSystemSubPageList.end(); ++iter)
 294 
        for (iter = mSystemSubPageList.begin(); iter != mSystemSubPageList.end(); ++iter)
295 
        {
 295 
        {
296 
            if (iter->name.compare(name) == 0)
 296 
            if (iter->name.compare(name) == 0)
297 
            {
 297 
            {