[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 472895 by staikos:

cleanup


 M  +15 -25    kstdoc.cpp  


--- trunk/extragear/graphics/kst/kst/kstdoc.cpp #472894:472895
@@ -759,21 +759,16 @@
 }
 
 void KstDoc::samplesUp() {
-  KstRVectorPtr V;
-  int f0, n, skip;
-  bool doSkip, doAve;
-  int fileN;
-
   KstRVectorList rvl = kstObjectSubList<KstVector,KstRVector>(KST::vectorList);
   for (int i = 0; i < (int)rvl.count(); i++) {
-    V = rvl[i];
+    KstRVectorPtr V = rvl[i];
     V->writeLock();
-    f0 = V->reqStartFrame();
-    n = V->reqNumFrames();
-    skip = V->skip();
-    doSkip = V->doSkip();
-    doAve = V->doAve();
-    fileN = V->fileLength();
+    int f0 = V->reqStartFrame();
+    int n = V->reqNumFrames();
+    int skip = V->skip();
+    bool doSkip = V->doSkip();
+    bool doAve = V->doAve();
+    int fileN = V->fileLength();
 
     if (f0 + 2 * n > fileN) {
       f0 = fileN - n;
@@ -792,23 +787,18 @@
 
 
 void KstDoc::samplesDown() {
-  KstRVectorPtr V;
-  int f0, n, skip;
-  bool doSkip, doAve;
-  int fileN;
-
   KstRVectorList rvl = kstObjectSubList<KstVector,KstRVector>(KST::vectorList);
   for (int i = 0; i < (int)rvl.count(); i++) {
-    V = rvl[i];
+    KstRVectorPtr V = rvl[i];
     V->writeLock();
-    f0 = V->reqStartFrame();
-    if (f0 == -1)
+    int f0 = V->reqStartFrame();
+    if (f0 == -1) {
       f0 = V->startFrame();
-    n = V->reqNumFrames();
-    skip = V->skip();
-    doSkip = V->doSkip();
-    doAve =  V->doAve();
-    fileN = V->fileLength();
+    }
+    int n = V->reqNumFrames();
+    int skip = V->skip();
+    bool doSkip = V->doSkip();
+    bool doAve =  V->doAve();
 
     if (f0 - n < 0) {
       f0 = 0;