Changeset 54

Show
Ignore:
Timestamp:
05/06/07 10:34:36 (2 years ago)
Author:
daboo
Message:

Get rid of svector (finally).

Location:
Mulberry/trunk
Files:
13 removed
115 modified

Legend:

Unmodified
Added
Removed

  • Mulberry/trunk/Linux/Make.header

    r44 r54  
    4545#These shouldn't have to be changed 
    4646JX_MAKE_INCLUDE_DIR = ${JX_ROOT}/include/make 
    47 JX_INC = -I${JX_ROOT}/include/jcore -I${JX_ROOT}/include/jx -I${JX_ROOT}/include/jximage -I${ACE_ROOT} 
     47JX_INC = -I${JX_ROOT}/include/jcore \ 
     48                        -I${JX_ROOT}/include/jx \ 
     49                        -I${JX_ROOT}/include/jximage \ 
     50                        -I${ACE_ROOT} \ 
     51                        ${J_INCLUDE_FREETYPE} 
    4852JX_LDFLAGS = -L${JX_ROOT}/lib -L${ACE_ROOT}/ace 
    4953 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CAddressBookView.h

    r21 r54  
    6060        }; 
    6161 
    62         typedef svector<CAddressBookView*>      CAddressBookViewList; 
     62        typedef vector<CAddressBookView*>       CAddressBookViewList; 
    6363        static cdmutexprotect<CAddressBookViewList> sAddressBookViews;  // List of windows (protected for multi-thread access) 
    6464 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CAddressBookWindow.h

    r21 r54  
    3737{ 
    3838public: 
    39         typedef svector<CAddressBookWindow*>    CAddressBookWindowList; 
     39        typedef vector<CAddressBookWindow*>     CAddressBookWindowList; 
    4040        static cdmutexprotect<CAddressBookWindowList> sAddressBookWindows;      // List of windows (protected for multi-thread access) 
    4141 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CAddressPanelBase.h

    r21 r54  
    2323#include "CTabPanel.h" 
    2424 
    25 #include "svector.h" 
     25#include "vector.h" 
    2626 
    2727// Classes 
    … …  
    4949}; 
    5050 
    51 typedef svector<CAddressPanelBase*> CAddressPanelList; 
     51typedef vector<CAddressPanelBase*> CAddressPanelList; 
    5252 
    5353#endif 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CAddressTable.cp

    r31 r54  
    382382        // Create list to hold deleted items 
    383383        CAddressList* addrs = new CAddressList(); 
    384         addrs->set_keep_small(false); 
    385384 
    386385        // Add each selected address 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CAddressView.h

    r21 r54  
    4141{ 
    4242public: 
    43         typedef svector<CAddressView*>  CAddressViewList; 
     43        typedef vector<CAddressView*>   CAddressViewList; 
    4444        static cdmutexprotect<CAddressViewList> sAddressViews; 
    4545 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book/CGroupTable.h

    r21 r54  
    2222 
    2323#include "CHierarchyTableDrag.h" 
    24 #include "svector.h" 
    2524 
    2625// Classes 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book_Manager/Address_Book_Properties/CAdbkPropDialog.cp

    r21 r54  
    171171 
    172172        // Give list to each panel 
    173         for(svector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
     173        for(vector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
    174174                static_cast<CAdbkPropPanel*>(*iter)->SetAdbkList(mAdbkList); 
    175175 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book_Manager/CAdbkManagerTable.h

    r21 r54  
    2626#include "CAdbkList.h" 
    2727#include "cdstring.h" 
    28 #include "svector.h" 
     28#include "vector.h" 
    2929 
    3030// Classes 
    … …  
    5454        bool                                    mAddressAdded;                  // Indicates address added 
    5555        bool                                    mGroupAdded;                    // Indicates group added 
    56         svector<void*>                  mData;                                  // data 
     56        vector<void*>                   mData;                                  // data 
    5757 
    5858public: 

  • Mulberry/trunk/Linux/Sources/Application/Address_Book_Manager/CAdbkManagerView.h

    r21 r54  
    3838 
    3939public: 
    40         typedef svector<CAdbkManagerView*>      CAdbkManagerViewList; 
     40        typedef vector<CAdbkManagerView*>       CAdbkManagerViewList; 
    4141        static cdmutexprotect<CAdbkManagerViewList>     sAdbkManagerViews; 
    4242 

  • Mulberry/trunk/Linux/Sources/Application/Address_Search/CAdbkSearchTable.h

    r21 r54  
    9090private: 
    9191        CAdbkSearchWindow*                                      mWindow;                                // Owner window 
    92         svector<void*>                                          mData;                                  // data 
     92        vector<void*>                                           mData;                                  // data 
    9393        CColumnInfoArray*                                       mColumnInfo; 
    9494        TableIndexT                                                     mLastParent;                    // last parent row 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_Properties/CCalendarPropDialog.cp

    r21 r54  
    242242 
    243243        // Give list to each panel 
    244         for(svector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
     244        for(vector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
    245245        { 
    246246                static_cast<CCalendarPropPanel*>(*iter)->SetCalList(mCalList); 
    … …  
    275275 
    276276        // Give server to each panel 
    277         for(svector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
     277        for(vector<JXWidgetSet*>::iterator iter = mPanelList.begin(); iter != mPanelList.end(); iter ++) 
    278278                static_cast<CCalendarPropPanel*>(*iter)->SetProtocol(mCalProtocol); 
    279279 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.h

    r21 r54  
    7979        CCalendarStoreView*                                             mTableView; 
    8080        bool                                                                    mListChanging;                  // In the process of changing the list 
    81         svector<calstore::CCalendarStoreNode*>  mData;                                  // data 
     81        vector<calstore::CCalendarStoreNode*>   mData;                                  // data 
    8282 
    8383        virtual void    LClickCell(const STableCell& inCell, const JXKeyModifiers& mods); // Clicked item 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreView.h

    r21 r54  
    3636{ 
    3737public: 
    38         typedef svector<CCalendarStoreView*>    CCalendarStoreViewList; 
     38        typedef vector<CCalendarStoreView*>     CCalendarStoreViewList; 
    3939        static cdmutexprotect<CCalendarStoreViewList> sCalendarStoreViews;      // List of windows (protected for multi-thread access) 
    4040 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarEventBase.h

    r21 r54  
    2323#include "CCommander.h" 
    2424 
    25 #include <vector> 
     25#include "vector.h" 
    2626 
    2727#include "CICalendarPeriod.h" 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarWindow.h

    r21 r54  
    4141{ 
    4242public: 
    43         typedef svector<CCalendarWindow*>       CCalendarWindowList; 
     43        typedef vector<CCalendarWindow*>        CCalendarWindowList; 
    4444        static cdmutexprotect<CCalendarWindowList> sCalendarWindows;    // List of windows (protected for multi-thread access) 
    4545 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Calendar_View/Day_Week_View/CDayWeekTable.h

    r21 r54  
    2727#include "CICalendarComponentExpanded.h" 
    2828 
    29 #include <vector> 
     29#include "vector.h" 
    3030 
    3131class CDayEvent; 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Component_Editing/CNewComponentPanel.h

    r21 r54  
    2020#include "CTabPanel.h" 
    2121 
    22 #include <svector.h> 
     22#include <vector.h> 
    2323 
    2424#include "CICalendarVEvent.h" 
    … …  
    6161}; 
    6262 
    63 typedef svector<CNewComponentPanel*> CNewComponentPanelList; 
     63typedef vector<CNewComponentPanel*> CNewComponentPanelList; 
    6464 
    6565#endif 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Component_Editing/CNewEventDialog.h

    r21 r54  
    3232class CCalendarPopup; 
    3333class CNewComponentPanel; 
    34 typedef svector<CNewComponentPanel*> CNewComponentPanelList; 
     34typedef vector<CNewComponentPanel*> CNewComponentPanelList; 
    3535 
    3636// =========================================================================== 

  • Mulberry/trunk/Linux/Sources/Application/Calendar/Component_Editing/CNewToDoDialog.h

    r21 r54  
    3434class CDateTimeZoneSelect; 
    3535class CNewComponentPanel; 
    36 typedef svector<CNewComponentPanel*> CNewComponentPanelList; 
     36typedef vector<CNewComponentPanel*> CNewComponentPanelList; 
    3737 
    3838// =========================================================================== 

  • Mulberry/trunk/Linux/Sources/Application/General/CWindowsMenu.h

    r21 r54  
    2121#define __CWINDOWSMENU__MULBERRY__ 
    2222 
    23 #include "svector.h" 
     23#include "vector.h" 
    2424#include "CCommander.h" 
    2525#include <functional> 
    … …  
    3030class CWindowsMenu 
    3131{ 
    32         typedef svector<JXWindowDirector*> CWindowList; 
     32        typedef vector<JXWindowDirector*> CWindowList; 
    3333 
    3434private: 

  • Mulberry/trunk/Linux/Sources/Application/Letter/CLetterWindow.h

    r21 r54  
    8484 
    8585public: 
    86         typedef svector<CLetterWindow*> CLetterWindowList; 
     86        typedef vector<CLetterWindow*>  CLetterWindowList; 
    8787        static cdmutexprotect<CLetterWindowList> sLetterWindows;                                // List of windows (protected for multi-thread access) 
    8888 

  • Mulberry/trunk/Linux/Sources/Application/Letter/CMailboxPopup.h

    r21 r54  
    7070 
    7171 private: 
    72         typedef svector<CMailboxPopup*> CMailboxPopupList; 
     72        typedef vector<CMailboxPopup*> CMailboxPopupList; 
    7373        static CMailboxPopupList        sMailboxPopupMenus; 
    7474 

  • Mulberry/trunk/Linux/Sources/Application/Letter/CMailboxToolbarPopup.h

    r21 r54  
    5757 
    5858private: 
    59         typedef svector<CMailboxToolbarPopup*> CMailboxToolbarPopupList; 
     59        typedef vector<CMailboxToolbarPopup*> CMailboxToolbarPopupList; 
    6060        static CMailboxToolbarPopupList sMailboxToolbarPopupMenus; 
    6161 

  • Mulberry/trunk/Linux/Sources/Application/Mailbox/CMailboxTable.h

    r21 r54  
    2727#include <JColorList.h> 
    2828#include <set> 
    29 #include "svector.h" 
     29#include "vector.h"