[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

fix indenting and from the docs:

/* Does locking for you automatically. */
template<class T, class S>
KstObjectList<KstSharedPtr<S> > kstObjectSubList(KstObjectList<KstSharedPtr<T> >& list) {


  M +1 -1      kstdataobject.cpp   1.42
  M +24 -24    matrixselector.ui.h   1.4
  M +2 -1      extensions/js/Makefile.am   1.5


--- kdeextragear-2/kst/kst/kstdataobject.cpp  #1.41:1.42
@@ -70,5 +70,5 @@ KstDataObject::~KstDataObject() {
 
 double *KstDataObject::vectorRealloced(KstVectorPtr v, double *memptr, int newSize) const {
-  if (v.data() == 0L) {
+  if (!v) {
     return 0L;
   }

--- kdeextragear-2/kst/kst/matrixselector.ui.h  #1.3:1.4
@@ -129,9 +129,9 @@ void MatrixSelector::editMatrix()
 
 
-void MatrixSelector::setEdit( QString tag)
+void MatrixSelector::setEdit(QString tag)
 {
-    KST::dataObjectList.lock().readLock();
-    KstMatrixList matrices = kstObjectSubList<KstDataObject, KstMatrix>(KST::dataObjectList);        KstMatrixPtr matrix = *matrices.findTag(tag);
-    KST::dataObjectList.lock().readUnlock();
-    _editMatrix->setEnabled(matrix);
+    KstMatrixList matrices = kstObjectSubList<KstDataObject, KstMatrix>(KST::dataObjectList);
+    _editMatrix->setEnabled(matrices.findTag(tag) != matrices.end());
 }
+
+// vim: ts=8 sw=4 noet

--- kdeextragear-2/kst/kst/extensions/js/Makefile.am  #1.4:1.5
@@ -10,5 +10,6 @@
 kstextension_js_la_LDFLAGS=$(all_libraries) -module -avoid-version
 kstextension_js_la_LIBADD=../../libkst.la $(LIB_KPARTS) -lkjsembed
-kstextension_js_la_SOURCES=js.cpp jsproxies.cpp jsiface.skel jsiface_impl.cpp
+kstextension_js_la_SOURCES=js.cpp jsproxies.cpp jsiface.skel jsiface_impl.cpp \
+                        bind_vector.cpp