[Kst] branches/work/kst/pluginify/kst/src

[Adam Treat]

SVN commit 586905 by treat:

* Connect the modified signal in the base class.
* A bit of cleanup of kstdataobject includes
* Only scan for datasource plugins once


 M  +3 -1      libkst/kstdatasource.cpp  
 M  +0 -13     libkstapp/kst.cpp  
 M  +0 -1      libkstapp/kstbasicdialog_i.cpp  
 M  +3 -0      libkstapp/kstdatadialog.ui.h  
 M  +1 -0      libkstapp/kstdatamanager_i.cpp  
 M  +6 -13     libkstmath/kstdataobject.cpp  
 M  +1 -2      libkstmath/kstdataobject.h  
 M  +0 -2      plugins/crossspectrum/crossspectrumdialog_i.cpp  


--- branches/work/kst/pluginify/kst/src/libkst/kstdatasource.cpp #586904:586905
@@ -157,7 +157,9 @@
 
 static QValueList<PluginSortContainer> bestPluginsForSource(const QString& filename, const QString& type) {
   QValueList<PluginSortContainer> bestPlugins;
-  scanPlugins();
+  if (pluginInfo.isEmpty()) {
+    scanPlugins();
+  }
 
   KST::PluginInfoList info = QDeepCopy<KST::PluginInfoList>(pluginInfo);
 
--- branches/work/kst/pluginify/kst/src/libkstapp/kst.cpp #586904:586905
@@ -162,19 +162,6 @@
   _quickStartDialog = new KstQuickStartDialogI(this, 0 , true);
 #endif
 
-  //FIXME these should be in KstDataDialog constructor...
-  connect(KstVectorDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstCurveDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstCsdDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstEqDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstHsDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstPsdDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstPluginDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstFitDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstFilterDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstEventMonitorI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstImageDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
-  connect(KstMatrixDialogI::globalInstance(), SIGNAL(modified()), doc, SLOT(wasModified()));
   connect(this, SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), SLOT(fixKMdi()));
 
   initActions();
--- branches/work/kst/pluginify/kst/src/libkstapp/kstbasicdialog_i.cpp #586904:586905
@@ -52,7 +52,6 @@
 : KstDataDialog(parent, name, modal, fl) {
   setMultiple(false);
   _w = new BasicDialogWidget(_contents);
-  connect(this, SIGNAL(modified()), KstApp::inst()->document(), SLOT(wasModified())); //FIXME this should be in KstDataDialog constructor...
 
   _pluginName = QString::null;
   _grid = 0L;
--- branches/work/kst/pluginify/kst/src/libkstapp/kstdatadialog.ui.h #586904:586905
@@ -10,6 +10,8 @@
 ** destructor.
 *****************************************************************************/
 
+#include "kst.h"
+#include "kstdoc.h"
 
 void KstDataDialog::ok()
 {
@@ -53,6 +55,7 @@
     _newDialog = false;
     _multiple = false;
     _editMultipleMode = false;
+    connect(this, SIGNAL(modified()), KstApp::inst()->document(), SLOT(wasModified()));
     connect(_editMultiple, SIGNAL(clicked()), this, SLOT(toggleEditMultiple()));
     _editMultiple->hide();
     _editMultipleWidget->hide();
--- branches/work/kst/pluginify/kst/src/libkstapp/kstdatamanager_i.cpp #586904:586905
@@ -892,6 +892,7 @@
   }
 }
 
+
 void KstDataManagerI::new_I() {
   QStringList l;
 
--- branches/work/kst/pluginify/kst/src/libkstmath/kstdataobject.cpp #586904:586905
@@ -16,29 +16,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kstvcurve.h"
-
-#include "kstdataobjectcollection.h"
-#include <kstdatacollection.h>
 #include "kstdataobject.h"
+
+#include "ksdebug.h"
 #include "kstdebug.h"
+#include "kstdatacollection.h"
+#include "kstdataobjectcollection.h"
 
-#include <qdeepcopy.h>
 #include <qtimer.h>
+#include <qdeepcopy.h>
 
 #include <assert.h>
 
-#include <kdebug.h>
-
-#include <klibloader.h>
 #include <klocale.h>
-#include <kservicetype.h>
-#include <kstdataobject.h>
+#include <klibloader.h>
 #include <kparts/componentfactory.h>
 
-#include "ksdebug.h"
-#include <klocale.h>
-
 //#define LOCKTRACE
 
 KstDataObject::KstDataObject() : KstObject() {
--- branches/work/kst/pluginify/kst/src/libkstmath/kstdataobject.h #586904:586905
@@ -39,9 +39,8 @@
     KstDataObject(const KstDataObject& object);
     virtual ~KstDataObject();
 
-    static void cleanupForExit();
-
     // These static methods are not for plugins to use
+    static void cleanupForExit();
     /** Returns a list of object plugins found on the system. */
     static QStringList pluginList();
     static KstDataObjectPtr plugin(const QString &name);
--- branches/work/kst/pluginify/kst/src/plugins/crossspectrum/crossspectrumdialog_i.cpp #586904:586905
@@ -63,8 +63,6 @@
 
   _w->_fft->allowDirectEntry( true );
   _w->_sample->allowDirectEntry( true );
-
-  connect(this, SIGNAL(modified()), KstApp::inst()->document(), SLOT(wasModified())); //FIXME this should be in KstDataDialog constructor...
 }