[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Made plotDialog private and added accessor function


  M +5 -0      kst.cpp   1.117
  M +7 -3      kst.h   1.55
  M +10 -10    kst2dplot.cpp   1.27


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.26:1.27
@@ -1948,20 +1948,20 @@ void Kst2DPlot::mousePressEvent(QWidget 
       return;
     } else if (plot_and_axis_rect.contains(e->pos())) {
-      ParentApp->plotDialog->show_I();
-      ParentApp->plotDialog->_window->setCurrentText(static_cast<KstViewWidget*>(view)->viewObject()->tagName());
+      ParentApp->getPlotDialog()->show_I();
+      ParentApp->getPlotDialog()->_window->setCurrentText(static_cast<KstViewWidget*>(view)->viewObject()->tagName());
       // FIXME: need to update Select first? - let's clean this up and make a
       //        member function to do this for us
-      ParentApp->plotDialog->Select->setCurrentText(tagName());
-      ParentApp->plotDialog->update();
-      ParentApp->plotDialog->TabWidget->setCurrentPage(LIMITS_TAB);
+      ParentApp->getPlotDialog()->Select->setCurrentText(tagName());
+      ParentApp->getPlotDialog()->update();
+      ParentApp->getPlotDialog()->TabWidget->setCurrentPage(LIMITS_TAB);
       return;
     } else if (win_rect.contains(e->pos())) {
-      ParentApp->plotDialog->show_I();
-      ParentApp->plotDialog->_window->setCurrentText(static_cast<KstViewWidget*>(view)->viewObject()->tagName());
+      ParentApp->getPlotDialog()->show_I();
+      ParentApp->getPlotDialog()->_window->setCurrentText(static_cast<KstViewWidget*>(view)->viewObject()->tagName());
       // FIXME: need to update Select first? - let's clean this up and make a
       //        member function to do this for us
-      ParentApp->plotDialog->Select->setCurrentText(tagName());
-      ParentApp->plotDialog->update();
-      ParentApp->plotDialog->TabWidget->setCurrentPage(LABELS_TAB);
+      ParentApp->getPlotDialog()->Select->setCurrentText(tagName());
+      ParentApp->getPlotDialog()->update();
+      ParentApp->getPlotDialog()->TabWidget->setCurrentPage(LABELS_TAB);
       return;
     }

--- kdeextragear-2/kst/kst/kst.cpp  #1.116:1.117
@@ -653,4 +653,9 @@ bool KstApp::openDocumentFile(const QStr
 
 
+KstPlotDialogI *KstApp::getPlotDialog() const {
+  return plotDialog;
+}
+
+
 KstDoc *KstApp::getDocument() const {
   return doc;

--- kdeextragear-2/kst/kst/kst.h  #1.54:1.55
@@ -86,4 +86,7 @@ class KstApp : public KMdiMainFrm {
     KstDoc *getDocument() const;
 
+    /** returns a pointer to the plot dialog */
+    KstPlotDialogI *getPlotDialog() const;
+    
     /** pause the updating of data */
     void setPaused(bool paused);
@@ -104,6 +107,4 @@ class KstApp : public KMdiMainFrm {
 
     // FIXME: make this private again, add an accessor, fix compilation
-    /* Dialog for editing the document properties */
-    KstPlotDialogI *plotDialog;
 
   protected:
@@ -318,5 +319,8 @@ class KstApp : public KMdiMainFrm {
     KstDebugDialogI *debugDialog;
 
-    /** contains the recently used filenames */
+    /* Dialog for editing the document properties */
+    KstPlotDialogI *plotDialog;
+
+    /* contains the recently used filenames */
     KRecentFilesAction *recent;