formatting

direct/src/cluster/ClusterClient.py

@@ -160,7 +160,7 @@ class ClusterClient(DirectObject.DirectObject):
                 server.sendCommandString(commandString)
         if fLocally:
             # Execute locally
-            exec( commandString, __builtins__ )
+            exec(commandString, __builtins__)
 
     def exit(self):
         # Execute remotely
@@ -400,6 +400,6 @@ class DummyClusterClient(DirectObject.DirectObject):
     def __call__(self, commandString, fLocally = 1, serverList = None):
         if fLocally:
             # Execute locally
-            exec( commandString, __builtins__ )
+            exec(commandString, __builtins__)
 
 

direct/src/cluster/ClusterServer.py

@@ -214,7 +214,7 @@ class ClusterServer(DirectObject.DirectObject):
         """ Handle arbitrary command string from client """
         command = self.msgHandler.parseCommandStringDatagram(dgi)
         try:
-            exec( command, __builtins__ )
+            exec(command, __builtins__)
         except:
             pass
 

direct/src/directdevices/DirectDeviceManager.py

@@ -129,7 +129,7 @@ class DirectAnalogs(AnalogNode, DirectObject):
         # Zero out values in deadband
         val = sign * max(abs(val) - self.analogDeadband, 0.0)
         # Clamp value between analog range min and max and scale about center
-        val = min( max( val, self.analogMin ), self.analogMax )
+        val = min(max(val, self.analogMin), self.analogMax)
         # Normalize values to given minVal and maxVal range
         return (((maxVal - minVal) *
                  ((val - self.analogMin) / float(self.analogRange))) + minVal)

direct/src/directtools/DirectCameraControl.py

@@ -249,7 +249,7 @@ class DirectCameraControl(PandaObject):
             self.camManipRef.setPos(self.coaMarkerPos)
             self.camManipRef.setHpr(direct.camera, ZERO_POINT)
         else:
-            wrt = direct.camera.getTransform( self.camManipRef )
+            wrt = direct.camera.getTransform(self.camManipRef)
             self.camManipRef.setHpr(self.camManipRef,
                                     (-1 * deltaX * 180.0),
                                     (deltaY * 180.0),
@@ -270,7 +270,7 @@ class DirectCameraControl(PandaObject):
         t.coaCenter = getScreenXY(self.coaMarker)
         t.lastAngle = getCrankAngle(t.coaCenter)
         # Store the camera/manipRef offset transform
-        t.wrt = direct.camera.getTransform( self.camManipRef )
+        t.wrt = direct.camera.getTransform(self.camManipRef)
         taskMgr.add(t, 'manipulateCamera')
 
     def mouseRollTask(self, state):
@@ -382,7 +382,7 @@ class DirectCameraControl(PandaObject):
 
     def updateCoaMarkerSize(self, coaDist = None):
         if not coaDist:
-            coaDist = Vec3(self.coaMarker.getPos( direct.camera )).length()
+            coaDist = Vec3(self.coaMarker.getPos(direct.camera)).length()
         # KEH: use current display region for fov
         # sf = COA_MARKER_SF * coaDist * math.tan(deg2Rad(direct.dr.fovV))
         sf = COA_MARKER_SF * coaDist * math.tan(deg2Rad(direct.drList.getCurrentDr().fovV))
@@ -463,7 +463,7 @@ class DirectCameraControl(PandaObject):
         # Record undo point
         direct.pushUndo([direct.camera])
         # Determine marker location
-        markerToCam = self.coaMarker.getPos( direct.camera )
+        markerToCam = self.coaMarker.getPos(direct.camera)
         dist = Vec3(markerToCam - ZERO_POINT).length()
         scaledCenterVec = Y_AXIS * dist
         delta = markerToCam - scaledCenterVec

direct/src/directtools/DirectGeometry.py

@@ -17,7 +17,7 @@ class LineNodePath(NodePath):
         # Attach a geomNode to the parent and set self to be
         # the resulting node path
         self.lineNode = GeomNode("lineNode")
-        self.assign(parent.attachNewNode( self.lineNode ))
+        self.assign(parent.attachNewNode(self.lineNode))
         if name:
             self.setName(name)
 
@@ -27,26 +27,26 @@ class LineNodePath(NodePath):
         ls.setThickness(thickness)
         ls.setColor(colorVec)
 
-    def moveTo( self, *_args ):
+    def moveTo(self, *_args):
-        apply( self.lineSegs.moveTo, _args )
+        apply(self.lineSegs.moveTo, _args)
 
-    def drawTo( self, *_args ):
+    def drawTo(self, *_args):
-        apply( self.lineSegs.drawTo, _args )
+        apply(self.lineSegs.drawTo, _args)
 
-    def create( self, frameAccurate = 0 ):
+    def create(self, frameAccurate = 0):
         self.lineSegs.create( self.lineNode, frameAccurate )
 
-    def reset( self ):
+    def reset(self):
         self.lineSegs.reset()
         self.lineNode.removeAllGeoms()
 
-    def isEmpty( self ):
+    def isEmpty(self):
         return self.lineSegs.isEmpty()
 
-    def setThickness( self, thickness ):
+    def setThickness(self, thickness):
-        self.lineSegs.setThickness( thickness )
+        self.lineSegs.setThickness(thickness)
 
-    def setColor( self, *_args ):
+    def setColor(self, *_args):
         apply( self.lineSegs.setColor, _args )
 
     def setVertex( self, *_args):

dtool/src/cppparser/cppIdentifier.cxx

@@ -78,7 +78,7 @@ operator == (const CPPIdentifier &other) const {
   if (_names.size() != other._names.size()) {
     return false;
   }
-  for (int i = 0; i < (int)_names.size(); i++) {
+  for (int i = 0; i < (int)_names.size(); ++i) {
     if (_names[i] != other._names[i]) {
       return false;
     }
@@ -107,7 +107,7 @@ operator < (const CPPIdentifier &other) const {
   if (_names.size() != other._names.size()) {
     return _names.size() < other._names.size();
   }
-  for (int i = 0; i < (int)_names.size(); i++) {
+  for (int i = 0; i < (int)_names.size(); ++i) {
     if (_names[i] != other._names[i]) {
       return _names[i] < other._names[i];
     }
@@ -492,7 +492,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
   CPPIdentifier *rep = new CPPIdentifier(*this);
 
   bool anything_changed = false;
-  for (int i = 0; i < (int)rep->_names.size(); i++) {
+  for (int i = 0; i < (int)rep->_names.size(); ++i) {
     if (_names[i].has_templ()) {
       rep->_names[i].set_templ
         (_names[i].get_templ()->substitute_decl(subst, current_scope, global_scope));

dtool/src/cppparser/cppManifest.cxx

@@ -156,7 +156,7 @@ output(ostream &out) const {
     out << "(";
     if (_num_parameters > 0) {
       out << "$1";
-      for (int i = 1; i < _num_parameters; i++) {
+      for (int i = 1; i < _num_parameters; ++i) {
         out << ", $" << i + 1;
       }
     }
@@ -248,7 +248,7 @@ save_expansion(const string &exp, const vector_string &parameter_names) {
 
       // Is this identifier one of our parameters?
       int pnum = -1;
-      for (int i = 0; pnum == -1 && i < (int)parameter_names.size(); i++) {
+      for (int i = 0; pnum == -1 && i < (int)parameter_names.size(); ++i) {
         if (parameter_names[i] == ident) {
           pnum = i;
         }

dtool/src/cppparser/cppParameterList.cxx

@@ -46,7 +46,7 @@ is_equivalent(const CPPParameterList &other) const {
   if (_parameters.size() != other._parameters.size()) {
     return false;
   }
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (!_parameters[i]->_type->is_equivalent(*other._parameters[i]->_type)) {
       return false;
     }
@@ -67,7 +67,7 @@ operator == (const CPPParameterList &other) const {
   if (_parameters.size() != other._parameters.size()) {
     return false;
   }
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (*_parameters[i] != *other._parameters[i]) {
       return false;
     }
@@ -98,7 +98,7 @@ operator < (const CPPParameterList &other) const {
   if (_parameters.size() != other._parameters.size()) {
     return _parameters.size() < other._parameters.size();
   }
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (*_parameters[i] != *other._parameters[i]) {
       return *_parameters[i] < *other._parameters[i];
     }
@@ -114,7 +114,7 @@ operator < (const CPPParameterList &other) const {
 ////////////////////////////////////////////////////////////////////
 bool CPPParameterList::
 is_tbd() const {
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (_parameters[i]->_type->is_tbd()) {
       return true;
     }
@@ -132,7 +132,7 @@ is_tbd() const {
 ////////////////////////////////////////////////////////////////////
 bool CPPParameterList::
 is_parameter_expr() const {
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (_parameters[i]->_type->is_parameter_expr()) {
       return true;
     }
@@ -150,7 +150,7 @@ is_parameter_expr() const {
 ////////////////////////////////////////////////////////////////////
 bool CPPParameterList::
 is_fully_specified() const {
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (!_parameters[i]->is_fully_specified()) {
       return false;
     }
@@ -169,7 +169,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
                 CPPScope *current_scope, CPPScope *global_scope) {
   CPPParameterList *rep = new CPPParameterList;
   bool any_changed = false;
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     CPPInstance *inst =
       _parameters[i]->substitute_decl(subst, current_scope, global_scope)
       ->as_instance();
@@ -197,7 +197,7 @@ CPPParameterList *CPPParameterList::
 resolve_type(CPPScope *current_scope, CPPScope *global_scope) {
   CPPParameterList *rep = new CPPParameterList;
   bool any_changed = false;
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     CPPInstance *inst = _parameters[i];
     CPPType *new_type = inst->_type;
     if (new_type->is_tbd()) {
@@ -232,7 +232,7 @@ void CPPParameterList::
 output(ostream &out, CPPScope *scope, bool parameter_names,
        int num_default_parameters) const {
   if (!_parameters.empty()) {
-    for (int i = 0; i < (int)_parameters.size(); i++) {
+    for (int i = 0; i < (int)_parameters.size(); ++i) {
       if (i != 0) {
         out << ", ";
       }

dtool/src/cppparser/cppStructType.cxx

@@ -332,7 +332,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
   bool unchanged =
     (rep->_ident == _ident && rep->_scope == _scope);
 
-  for (int i = 0; i < (int)_derivation.size(); i++) {
+  for (int i = 0; i < (int)_derivation.size(); ++i) {
     rep->_derivation[i]._base =
       _derivation[i]._base->substitute_decl(subst, current_scope, global_scope)->as_type();
     if (rep->_derivation[i]._base != _derivation[i]._base) {

dtool/src/cppparser/cppTemplateParameterList.cxx

@@ -117,7 +117,7 @@ build_subst_decl(const CPPTemplateParameterList &formal_params,
 ////////////////////////////////////////////////////////////////////
 bool CPPTemplateParameterList::
 is_fully_specified() const {
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (!_parameters[i]->is_fully_specified()) {
       return false;
     }
@@ -134,7 +134,7 @@ is_fully_specified() const {
 ////////////////////////////////////////////////////////////////////
 bool CPPTemplateParameterList::
 is_tbd() const {
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     CPPType *type = _parameters[i]->as_type();
     if (type != (CPPType *)NULL &&
         (type->is_tbd() || type->as_class_template_parameter() != NULL)) {
@@ -158,7 +158,7 @@ operator == (const CPPTemplateParameterList &other) const {
   if (_parameters.size() != other._parameters.size()) {
     return false;
   }
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (*_parameters[i] != *other._parameters[i]) {
       return false;
     }
@@ -186,7 +186,7 @@ operator < (const CPPTemplateParameterList &other) const {
   if (_parameters.size() != other._parameters.size()) {
     return _parameters.size() < other._parameters.size();
   }
-  for (int i = 0; i < (int)_parameters.size(); i++) {
+  for (int i = 0; i < (int)_parameters.size(); ++i) {
     if (*_parameters[i] != *other._parameters[i]) {
       return *_parameters[i] < *other._parameters[i];
     }
@@ -205,7 +205,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
   CPPTemplateParameterList *rep = new CPPTemplateParameterList(*this);
 
   bool anything_changed = false;
-  for (int i = 0; i < (int)rep->_parameters.size(); i++) {
+  for (int i = 0; i < (int)rep->_parameters.size(); ++i) {
     rep->_parameters[i] =
       _parameters[i]->substitute_decl(subst, current_scope, global_scope);
     if (rep->_parameters[i] != _parameters[i]) {

dtool/src/cppparser/indent.cxx

@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////
 ostream &
 indent(ostream &out, int indent_level) {
-  for (int i = 0; i < indent_level; i++) {
+  for (int i = 0; i < indent_level; ++i) {
     out << ' ';
   }
   return out;

dtool/src/dconfig/dconfig.h

@@ -161,7 +161,7 @@ ConfigTable::Symbol& Config<GetConfig>::GetAll(const ConfigString sym,
    ConfigVariableList var(sym, "DConfig", ConfigFlags::F_dconfig);
 
    int num_values = var.get_num_values();
-   for (int i = 0; i < num_values; i++) {
+   for (int i = 0; i < num_values; ++i) {
      string value = var.get_string_value(i);
      s.push_back(SymbolEnt(SymbolEnt::ConfigFile, value));
    }

dtool/src/dtoolutil/dSearchPath.cxx

@@ -397,7 +397,7 @@ void DSearchPath::
 write(ostream &out, int indent_level) const {
   Directories::const_iterator di;
   for (di = _directories.begin(); di != _directories.end(); ++di) {
-    for (int i = 0; i < indent_level; i++) {
+    for (int i = 0; i < indent_level; ++i) {
       out << ' ';
     }
     out << (*di) << "\n";

panda/src/express/datagram.cxx

@@ -115,7 +115,7 @@ pad_bytes(size_t size) {
 
   while (size > 0) {
     _data.push_back('\0');
-    size--;
+    --size;
   }
 }
 
@@ -150,7 +150,7 @@ append_data(const void *data, size_t size) {
   //  _data.reserve(_data.size() + size);
 
   const uchar *source = (const uchar *)data;
-  for (size_t i = 0; i < size; i++) {
+  for (size_t i = 0; i < size; ++i) {
     _data.v().push_back(source[i]);
   }
 }