comparison layer/Layer.cpp @ 806:4c8ca536b54f warnfix_no_size_t

Some more unsigned/long removal

 Layer::connectSignals(const Model *model)
 {
     connect(model, SIGNAL(modelChanged()),
             this, SIGNAL(modelChanged()));
 
-    connect(model, SIGNAL(modelChanged(int, int)),
-	    this, SIGNAL(modelChanged(int, int)));
+    connect(model, SIGNAL(modelChangedWithin(int, int)),
+	    this, SIGNAL(modelChangedWithin(int, int)));
 
     connect(model, SIGNAL(completionChanged()),
 	    this, SIGNAL(modelCompletionChanged()));
 
     connect(model, SIGNAL(alignmentCompletionChanged()),

         // What if the clipboard point has no reference frame?  Then
         // we have to treat it as having its own frame as the
         // reference (i.e. having been copied from the reference
         // model).
         
-        long sourceFrame = i->getFrame();
-        long referenceFrame = sourceFrame;
+        int sourceFrame = i->getFrame();
+        int referenceFrame = sourceFrame;
         if (i->haveReferenceFrame()) {
             referenceFrame = i->getReferenceFrame();
         }
-        long myMappedFrame = alignToReference(v, sourceFrame);
+        int myMappedFrame = alignToReference(v, sourceFrame);
 
 //        cerr << "sourceFrame = " << sourceFrame << ", referenceFrame = " << referenceFrame << " (have = " << i->haveReferenceFrame() << "), myMappedFrame = " << myMappedFrame << endl;
 
         if (myMappedFrame != referenceFrame) return true;
     }

 {
     MeasureRect rect;
     QString fs = attributes.value("startFrame");
     int x0 = 0, x1 = 0;
     if (fs != "") {
-        rect.startFrame = fs.toLong();
-        rect.endFrame = attributes.value("endFrame").toLong();
+        rect.startFrame = fs.toInt();
+        rect.endFrame = attributes.value("endFrame").toInt();
         rect.haveFrames = true;
     } else {
         x0 = attributes.value("startX").toInt();
         x1 = attributes.value("endX").toInt();
         rect.haveFrames = false;

 }
 
 void
 Layer::updateMeasurePixrects(View *v) const
 {
-    long sf = v->getStartFrame();
-    long ef = v->getEndFrame();
+    int sf = v->getStartFrame();
+    int ef = v->getEndFrame();
 
     for (MeasureRectSet::const_iterator i = m_measureRects.begin(); 
          i != m_measureRects.end(); ++i) {
 
         // This logic depends on the fact that if one measure rect in

 
         if (i->haveFrames) {
             if (i->startFrame >= v->getStartFrame()) {
                 x0 = v->getXForFrame(i->startFrame);
             }
-            if (i->endFrame <= long(v->getEndFrame())) {
+            if (i->endFrame <= int(v->getEndFrame())) {
                 x1 = v->getXForFrame(i->endFrame);
             }
         }
         
         i->pixrect = QRect(x0, i->pixrect.y(), x1 - x0, i->pixrect.height());

         int x1 = v->width() + 1;
         
         if (r.startFrame >= v->getStartFrame()) {
             x0 = v->getXForFrame(r.startFrame);
         }
-        if (r.endFrame <= long(v->getEndFrame())) {
+        if (r.endFrame <= v->getEndFrame()) {
             x1 = v->getXForFrame(r.endFrame);
         }
         
         QRect pr = QRect(x0, r.pixrect.y(), x1 - x0, r.pixrect.height());
         r.pixrect = pr;