[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

two more dialog calls migrated


  M +12 -0     dialoglauncher-gui.cpp   1.2
  M +10 -0     dialoglauncher-nogui.cpp   1.2
  M +4 -0      dialoglauncher.h   1.2
  M +2 -2      kstimage.cpp   1.21
  M +2 -2      kstmatrix.cpp   1.12


--- kdeextragear-2/kst/kst/dialoglauncher-gui.cpp  #1.1:1.2
@@ -21,4 +21,6 @@
 #include "kstplugindialog_i.h"
 #include "kstpsddialog_i.h"
+#include "kstmatrixdialog_i.h"
+#include "kstimagedialog_i.h"
 
 namespace KstDialogs {
@@ -43,4 +45,14 @@ namespace KstDialogs {
 
 
+  void showMatrixDialog(const QString& name) {
+    KstMatrixDialogI::globalInstance()->show_Edit(name);
+  }
+
+
+  void showImageDialog(const QString& name) {
+    KstImageDialogI::globalInstance()->show_Edit(name);
+  }
+
+
 };
 

--- kdeextragear-2/kst/kst/dialoglauncher-nogui.cpp  #1.1:1.2
@@ -39,4 +39,14 @@ namespace KstDialogs {
 
 
+  void showMatrixDialog(const QString& name) {
+    Q_UNUSED(name)
+  }
+
+
+  void showImageDialog(const QString& name) {
+    Q_UNUSED(name)
+  }
+
+
 };
 

--- kdeextragear-2/kst/kst/dialoglauncher.h  #1.1:1.2
@@ -28,4 +28,8 @@ namespace KstDialogs {
 
   void showPSDDialog(const QString& name);
+
+  void showMatrixDialog(const QString& name);
+
+  void showImageDialog(const QString& name);
 };
 #endif

--- kdeextragear-2/kst/kst/kstimage.cpp  #1.20:1.21
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
+#include "dialoglauncher.h"
 #include "kstdatacollection.h"
 #include "kstdebug.h"
 #include "kstimage.h"
-#include "kstimagedialog_i.h"
 
 #include <kdebug.h>
@@ -260,5 +260,5 @@ void KstImage::setPalette(KPalette* pal)
 
 void KstImage::_showDialog() {
-  KstImageDialogI::globalInstance()->show_Edit(tagName());
+  KstDialogs::showImageDialog(tagName());
 }
 

--- kdeextragear-2/kst/kst/kstmatrix.cpp  #1.11:1.12
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
+#include "dialoglauncher.h"
 #include "kstdatacollection.h"
 #include "kstdebug.h"
 #include "kstmatrix.h"
-#include "kstmatrixdialog_i.h"
 
 #include <qstylesheet.h>
@@ -201,5 +201,5 @@ QString KstMatrix::propertyString() cons
 
 void KstMatrix::_showDialog() {
-  KstMatrixDialogI::globalInstance()->show_Edit(tagName());
+  KstDialogs::showMatrixDialog(tagName());
 }