[Kst] kst_threading_branch: kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

branch: commit old changes

HEAD: revert signal to old, deprecated version for compatibility


  M +6 -0      kstobject.cpp   1.8
  M +1 -2      updatethread.cpp   1.1.2.5
  M +3 -3      variablelisteditor.ui   1.4
  M +6 -4      variablelisteditor.ui.h   1.2


--- kdeextragear-2/kst/kst/kstobject.cpp  #1.7:1.8
@@ -26,4 +26,5 @@ KstObject::~KstObject() {
 
 int KstObject::operator==(const QString& tag) const {
+  Synchronized();
   return (tag == _tag) ? 1 : 0;
 }
@@ -31,4 +32,5 @@ int KstObject::operator==(const QString&
 // Returns true if update has already been done
 bool KstObject::checkUpdateCounter(int update_counter) {
+  Synchronized();
   if (update_counter == _lastUpdateCounter) {
     return true;
@@ -45,16 +47,20 @@ void KstObject::virtual_hook(int id, voi
 
 const QString& KstObject::tagName() const {
+  Synchronized();
   return _tag;
 }
 
 void KstObject::setTagName(const QString& newTag) {
+  Synchronized();
   _tag = newTag;
 }
 
 QString KstObject::tagLabel() const {
+  Synchronized();
   return QString("[%1]").arg(_tag);
 }
 
 int KstObject::getUsage() const {
+  Synchronized();
   return _KShared_count() - 1;
 }

--- kdeextragear-2/kst/kst/updatethread.cpp  #1.1.2.4:1.1.2.5
@@ -98,8 +98,7 @@ bool UpdateThread::doUpdates(bool force)
 
   { // scope to destroy the temporary list
-  KST::vectorList.lock();
   KstRVectorList rvl = kstObjectSubList<KstVector,KstRVector>(KST::vectorList);
-  KST::vectorList.unlock();
 
+  // FIXME XXXX rvl may not need ot be locked anymore
   // Update data vectors
   for (i = 0;;) {

--- kdeextragear-2/kst/kst/variablelisteditor.ui  #1.3:1.4
@@ -134,7 +134,7 @@
     <connection>
         <sender>_variableList</sender>
-        <signal>doubleClicked(QListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>doubleClicked(QListViewItem*)</signal>
         <receiver>VariableListEditor</receiver>
-        <slot>doubleClicked(QListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>doubleClicked(QListViewItem*)</slot>
     </connection>
 </connections>
@@ -143,5 +143,5 @@
 </includes>
 <slots>
-    <slot access="private">doubleClicked( QListViewItem * i, const QPoint &amp;, int c )</slot>
+    <slot access="private">doubleClicked( QListViewItem * i )</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>

--- kdeextragear-2/kst/kst/variablelisteditor.ui.h  #1.1:1.2
@@ -11,9 +11,11 @@
 
 
-void VariableListEditor::doubleClicked( QListViewItem *i, const QPoint &, int c )
+void VariableListEditor::doubleClicked( QListViewItem *i )
 {
-    if (c == 1) {
-        i->startRename(c);
-    }
+    // Must support old Qt versions so we can't use the undeprecated form of
+    // this signal
+    //if (c == 1) {
+        i->startRename(1); //c);
+    //}
 }