Show
Ignore:
Timestamp:
03/21/12 18:36:20 (14 months ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/include/osg/OperationThread

    r12139 r13041  
    6464        const std::string& getName() const { return _name; } 
    6565 
    66         /** Set whether the operation should be kept once its been applied.*/  
     66        /** Set whether the operation should be kept once its been applied.*/ 
    6767        void setKeep(bool keep) { _keep = keep; } 
    6868 
    69         /** Get whether the operation should be kept once its been applied.*/  
     69        /** Get whether the operation should be kept once its been applied.*/ 
    7070        bool getKeep() const { return _keep; } 
    7171 
    … …  
    7373        virtual void release() {} 
    7474 
    75         /** Do the actual task of this operation.*/  
     75        /** Do the actual task of this operation.*/ 
    7676        virtual void operator () (Object*) = 0; 
    7777 
    7878    protected: 
    79      
     79 
    8080        Operation(): 
    8181            Referenced(true), 
    … …  
    9898{ 
    9999    public: 
    100      
     100 
    101101        OperationQueue(); 
    102          
    103         /** Get the next operation from the operation queue.  
    104           * Return null ref_ptr<> if no operations are left in queue. */   
     102 
     103        /** Get the next operation from the operation queue. 
     104          * Return null ref_ptr<> if no operations are left in queue. */ 
    105105        osg::ref_ptr<Operation> getNextOperation(bool blockIfEmpty = false); 
    106106 
    107107        /** Return true if the operation queue is empty. */ 
    108108        bool empty(); 
    109          
     109 
    110110        /** Return the num of pending operations that are sitting in the OperationQueue.*/ 
    111111        unsigned int getNumOperationsInQueue(); 
    112112 
    113         /** Add operation to end of OperationQueue, this will be  
     113        /** Add operation to end of OperationQueue, this will be 
    114114          * executed by the operation thread once this operation gets to the head of the queue.*/ 
    115115        void add(Operation* operation); 
    116          
     116 
    117117        /** Remove operation from OperationQueue.*/ 
    118118        void remove(Operation* operation); 
    … …  
    123123        /** Remove all operations from OperationQueue.*/ 
    124124        void removeAllOperations(); 
    125          
     125 
    126126        /** Run the operations. */ 
    127127        void runOperations(Object* callingObject=0); 
    128128 
    129129        /** Call release on all operations. */ 
    130         void releaseAllOperations();  
     130        void releaseAllOperations(); 
    131131 
    132132        /** Release operations block that is used to block threads that are waiting on an empty operations queue.*/ 
    … …  
    134134 
    135135        typedef std::set<OperationThread*> OperationThreads; 
    136          
     136 
    137137        /** Get the set of OperationThreads that are sharing this OperationQueue. */ 
    138138        const OperationThreads& getOperationThreads() const { return _operationThreads; } 
    … …  
    143143 
    144144        friend class OperationThread; 
    145          
     145 
    146146        void addOperationThread(OperationThread* thread); 
    147147        void removeOperationThread(OperationThread* thread); 
    148          
     148 
    149149        typedef std::list< osg::ref_ptr<Operation> > Operations; 
    150150 
    … …  
    166166 
    167167        Object* getParent() { return _parent.get(); } 
    168          
     168 
    169169        const Object* getParent() const { return _parent.get(); } 
    170170 
    … …  
    179179        const OperationQueue* getOperationQueue() const { return _operationQueue.get(); } 
    180180 
    181          
    182         /** Add operation to end of OperationQueue, this will be  
     181 
     182        /** Add operation to end of OperationQueue, this will be 
    183183          * executed by the graphics thread once this operation gets to the head of the queue.*/ 
    184184        void add(Operation* operation); 
    185          
     185 
    186186        /** Remove operation from OperationQueue.*/ 
    187187        void remove(Operation* operation); 
    … …  
    193193        void removeAllOperations(); 
    194194 
    195          
     195 
    196196        /** Get the operation currently being run.*/ 
    197197        osg::ref_ptr<Operation> getCurrentOperation() { return _currentOperation; } 
    … …  
    199199        /** Run does the opertion thread run loop.*/ 
    200200        virtual void run(); 
    201          
     201 
    202202        void setDone(bool done); 
    203          
     203 
    204204        bool getDone() const { return _done; } 
    205205 
    206         /** Cancel this graphics thread.*/         
     206        /** Cancel this graphics thread.*/ 
    207207        virtual int cancel(); 
    208208 
    209209    protected: 
    210      
     210 
    211211        virtual ~OperationThread(); 
    212          
     212 
    213213        observer_ptr<Object>            _parent; 
    214214