[Kst] branches/work/kst/portto4/kst/src/libkstapp
Adam Treat
treat at kde.org
Wed Mar 7 19:57:18 CET 2007
SVN commit 640357 by treat:
* Correct inheritance structure
M +2 -0 kstbasicdialog.cpp
M +1 -1 kstchangefiledialog.cpp
M +1 -1 kstchangefiledialog.h
M +1 -1 kstchangenptsdialog.cpp
M +1 -1 kstchangenptsdialog.h
M +1 -1 kstchoosecolordialog.cpp
M +1 -1 kstchoosecolordialog.h
M +2 -0 kstcsddialog.cpp
M +2 -0 kstcurvedialog.cpp
M +1 -1 kstdebugdialog.h
M +1 -1 ksteditviewobjectdialog.cpp
M +1 -1 ksteditviewobjectdialog.h
M +2 -0 ksteqdialog.cpp
M +1 -0 ksteventmonitor.cpp
M +1 -1 kstfilterdialog.h
M +1 -1 kstfitdialog.h
M +1 -1 kstgraphfiledialog.cpp
M +1 -1 kstgraphfiledialog.h
M +2 -0 ksthsdialog.cpp
M +2 -0 kstimagedialog.cpp
M +2 -0 kstmatrixdialog.cpp
M +1 -1 kstmonochromedialog.cpp
M +1 -1 kstmonochromedialog.h
M +2 -0 kstplugindialog.cpp
M +2 -0 kstpsddialog.cpp
M +1 -1 kstquickstartdialog.cpp
M +1 -1 kstquickstartdialog.h
M +1 -1 kstvectordialog.cpp
M +1 -1 kstviewfitsdialog.cpp
M +1 -1 kstviewfitsdialog.h
M +1 -1 kstviewmatricesdialog.cpp
M +1 -1 kstviewmatricesdialog.h
M +1 -1 kstviewscalarsdialog.cpp
M +1 -1 kstviewscalarsdialog.h
M +1 -1 kstviewstringsdialog.cpp
M +1 -1 kstviewstringsdialog.h
--- branches/work/kst/portto4/kst/src/libkstapp/kstbasicdialog.cpp #640356:640357
@@ -39,6 +39,8 @@
#include "kstdefaultnames.h"
#include "kstdataobjectcollection.h"
+#include "ui_kstbasicdialog4.h"
+
const QString& KstBasicDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstBasicDialogI> KstBasicDialogI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/kstchangefiledialog.cpp #640356:640357
@@ -40,7 +40,7 @@
KstChangeFileDialogI::KstChangeFileDialogI(QWidget* parent,
Qt::WindowFlags fl)
-: Ui::KstChangeFileDialog(parent, fl) {
+: QDialog(parent, fl) {
connect(_clearFilter, SIGNAL(clicked()), _filter, SLOT(clear()));
connect(_clearFilter, SIGNAL(clicked()), ChangeFileCurveList, SLOT(clearSelection()));
--- branches/work/kst/portto4/kst/src/libkstapp/kstchangefiledialog.h #640356:640357
@@ -22,7 +22,7 @@
#include "ui_kstchangefiledialog4.h"
-class KstChangeFileDialogI : public Ui::KstChangeFileDialog {
+class KstChangeFileDialogI : public QDialog, public Ui::KstChangeFileDialog {
Q_OBJECT
public:
KstChangeFileDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstchangenptsdialog.cpp #640356:640357
@@ -30,7 +30,7 @@
#include "kstrvector.h"
KstChangeNptsDialogI::KstChangeNptsDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstChangeNptsDialog(parent, fl) {
+: QDialog(parent, fl) {
connect(Cancel, SIGNAL(clicked()),
this, SLOT(reject()));
--- branches/work/kst/portto4/kst/src/libkstapp/kstchangenptsdialog.h #640356:640357
@@ -23,7 +23,7 @@
#include "ui_kstchangenptsdialog4.h"
-class KstChangeNptsDialogI : public QDialog {
+class KstChangeNptsDialogI : public QDialog, public Ui::KstChangeNptsDialog {
Q_OBJECT
public:
KstChangeNptsDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstchoosecolordialog.cpp #640356:640357
@@ -34,7 +34,7 @@
#include "kstrvector.h"
KstChooseColorDialogI::KstChooseColorDialogI(QWidget* parent, Qt::WindowFlags fl)
- : KstChooseColorDialog(parent, fl) {
+ : QDialog(parent, fl) {
xVector->setChecked(true);
connect(Cancel, SIGNAL(clicked()), this, SLOT(reject()));
--- branches/work/kst/portto4/kst/src/libkstapp/kstchoosecolordialog.h #640356:640357
@@ -26,7 +26,7 @@
#include <kcolorcombo.h>
-class KstChooseColorDialogI : public QDialog {
+class KstChooseColorDialogI : public QDialog, public Ui::KstChooseColorDialog {
Q_OBJECT
public:
KstChooseColorDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstcsddialog.cpp #640356:640357
@@ -45,6 +45,8 @@
#include "kstviewwindow.h"
#include "vectorselector.h"
+#include "ui_kstcsddialog4.h"
+
const QString& KstCsdDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstCsdDialogI> KstCsdDialogI::_inst = 0L;
--- branches/work/kst/portto4/kst/src/libkstapp/kstcurvedialog.cpp #640356:640357
@@ -40,6 +40,8 @@
#include "kstuinames.h"
#include "vectorselector.h"
+#include "ui_kstcurvedialog4.h"
+
const QString& KstCurveDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstCurveDialogI> KstCurveDialogI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/kstdebugdialog.h #640356:640357
@@ -23,7 +23,7 @@
class KstLogWidget;
-class KstDebugDialogI : public QDialog {
+class KstDebugDialogI : public QDialog, public Ui::KstDebugDialog {
Q_OBJECT
public:
KstDebugDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0);
--- branches/work/kst/portto4/kst/src/libkstapp/ksteditviewobjectdialog.cpp #640356:640357
@@ -44,7 +44,7 @@
#include <stdio.h>
KstEditViewObjectDialogI::KstEditViewObjectDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstEditViewObjectDialog(parent, fl) {
+: QDialog(parent, fl) {
connect(_cancel, SIGNAL(clicked()), this, SLOT(close()));
connect(_apply, SIGNAL(clicked()), this, SLOT(applyClicked()));
connect(_OK, SIGNAL(clicked()), this, SLOT(okClicked()));
--- branches/work/kst/portto4/kst/src/libkstapp/ksteditviewobjectdialog.h #640356:640357
@@ -32,7 +32,7 @@
class QComboBox;
-class KST_EXPORT KstEditViewObjectDialogI : public QDialog {
+class KST_EXPORT KstEditViewObjectDialogI : public QDialog, public Ui::KstEditViewObjectDialog {
Q_OBJECT
public:
KstEditViewObjectDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/ksteqdialog.cpp #640356:640357
@@ -45,6 +45,8 @@
#include "scalarselector.h"
#include "vectorselector.h"
+#include "ui_ksteqdialog4.h"
+
const QString& KstEqDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstEqDialogI> KstEqDialogI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/ksteventmonitor.cpp #640356:640357
@@ -37,6 +37,7 @@
#include "scalarselector.h"
#include "vectorselector.h"
+#include "ui_ksteventmonitor4.h"
QPointer<KstEventMonitorI> KstEventMonitorI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/kstfilterdialog.h #640356:640357
@@ -26,7 +26,7 @@
#include <QGridLayout>
#include <Q3ValueList>
-class KstFilterDialogI : public KstPluginDialogI {
+class KstFilterDialogI : public KstPluginDialogI, public Ui::KstFilterDialog {
Q_OBJECT
public:
KstFilterDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0);
--- branches/work/kst/portto4/kst/src/libkstapp/kstfitdialog.h #640356:640357
@@ -23,7 +23,7 @@
#include <QGridLayout>
#include <Q3ValueList>
-class KstFitDialogI : public KstPluginDialogI {
+class KstFitDialogI : public KstPluginDialogI, public Ui::KstFitDialog {
Q_OBJECT
public:
KstFitDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstgraphfiledialog.cpp #640356:640357
@@ -36,7 +36,7 @@
KstGraphFileDialogI::KstGraphFileDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstGraphFileDialog(parent, fl) {
+: QDialog(parent, fl) {
_autoSaveTimer = new QTimer(this);
--- branches/work/kst/portto4/kst/src/libkstapp/kstgraphfiledialog.h #640356:640357
@@ -22,7 +22,7 @@
#include "ui_kstgraphfiledialog4.h"
-class KstGraphFileDialogI : public QDialog {
+class KstGraphFileDialogI : public QDialog, public Ui::KstGraphFileDialog {
Q_OBJECT
public:
KstGraphFileDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/ksthsdialog.cpp #640356:640357
@@ -43,6 +43,8 @@
#include "kstviewwindow.h"
#include "vectorselector.h"
+#include "ui_ksthsdialog4.h"
+
const QString& KstHsDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstHsDialogI> KstHsDialogI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/kstimagedialog.cpp #640356:640357
@@ -44,6 +44,8 @@
#include "kstviewwindow.h"
#include "matrixselector.h"
+#include "ui_kstimagedialog4.h"
+
QPointer<KstImageDialogI> KstImageDialogI::_inst;
KstImageDialogI *KstImageDialogI::globalInstance() {
--- branches/work/kst/portto4/kst/src/libkstapp/kstmatrixdialog.cpp #640356:640357
@@ -40,6 +40,8 @@
#include <defaultprimitivenames.h>
#include "vectorselector.h"
+#include "ui_kstmatrixdialog4.h"
+
QPointer<KstMatrixDialogI> KstMatrixDialogI::_inst;
KstMatrixDialogI *KstMatrixDialogI::globalInstance() {
--- branches/work/kst/portto4/kst/src/libkstapp/kstmonochromedialog.cpp #640356:640357
@@ -29,7 +29,7 @@
#include "kstmonochromedialog.h"
KstMonochromeDialogI::KstMonochromeDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstMonochromeDialog(parent, fl) {
+: QDialog(parent, fl) {
availableListBox->clear();
selectedListBox->clear();
--- branches/work/kst/portto4/kst/src/libkstapp/kstmonochromedialog.h #640356:640357
@@ -22,7 +22,7 @@
#include "ui_kstmonochromedialog4.h"
-class KstMonochromeDialogI : public QDialog {
+class KstMonochromeDialogI : public QDialog, public Ui::KstMonochromeDialog {
Q_OBJECT
public:
KstMonochromeDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstplugindialog.cpp #640356:640357
@@ -50,6 +50,8 @@
#include "stringselector.h"
#include "vectorselector.h"
+#include "ui_kstplugindialog4.h"
+
const QString& KstPluginDialogI::plugin_defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstPluginDialogI> KstPluginDialogI::_inst;
--- branches/work/kst/portto4/kst/src/libkstapp/kstpsddialog.cpp #640356:640357
@@ -44,6 +44,8 @@
#include "psddialogwidget.h"
#include "vectorselector.h"
+#include "ui_kstpsddialog4.h"
+
const QString& KstPsdDialogI::defaultTag = KGlobal::staticQString("<Auto Name>");
QPointer<KstPsdDialogI> KstPsdDialogI::_inst = 0L;
--- branches/work/kst/portto4/kst/src/libkstapp/kstquickstartdialog.cpp #640356:640357
@@ -30,7 +30,7 @@
#include "kstsettings.h"
KstQuickStartDialogI::KstQuickStartDialogI(QWidget *parent, Qt::WindowFlags fl)
-: KstQuickStartDialog(parent, fl) {
+: QDialog(parent, fl) {
_fileName->completionObject()->setDir(QDir::currentDirPath());
_app = KstApp::inst();
--- branches/work/kst/portto4/kst/src/libkstapp/kstquickstartdialog.h #640356:640357
@@ -23,7 +23,7 @@
class KstApp;
-class KstQuickStartDialogI : public QDialog {
+class KstQuickStartDialogI : public QDialog, public Ui::KstQuickStartDialog {
Q_OBJECT
public:
KstQuickStartDialogI(QWidget *parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstvectordialog.cpp #640356:640357
@@ -44,8 +44,8 @@
#include "kstvectordialog.h"
#include "kstdefaultnames.h"
#include "kstcombobox.h"
-#include "vectordialogwidget.h"
+#include "ui_kstvectordialog4.h"
QPointer<KstVectorDialogI> KstVectorDialogI::_inst = 0L;
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewfitsdialog.cpp #640356:640357
@@ -34,7 +34,7 @@
const char* name,
bool modal,
WindowFlags fl)
-: KstViewFitsDialog(parent, fl) {
+: QDialog(parent, fl) {
tableFits = new KstFitTable(this, "tableFits");
tableFits->setNumRows(0);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewfitsdialog.h #640356:640357
@@ -24,7 +24,7 @@
#include "ui_kstviewfitsdialog4.h"
-class KstViewFitsDialogI : public QDialog {
+class KstViewFitsDialogI : public QDialog, public Ui::KstViewFitsDialog {
Q_OBJECT
public:
KstViewFitsDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewmatricesdialog.cpp #640356:640357
@@ -29,7 +29,7 @@
#include "matrixselector.h"
KstViewMatricesDialogI::KstViewMatricesDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstViewMatricesDialog(parent, fl) {
+: QDialog(parent, fl) {
_tableMatrices = new KstMatrixTable(this, "tableMatrices");
_tableMatrices->setNumRows(0);
_tableMatrices->setNumCols(5);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewmatricesdialog.h #640356:640357
@@ -24,7 +24,7 @@
#include "kstmatrixtable.h"
-class KstViewMatricesDialogI : public QDialog {
+class KstViewMatricesDialogI : public QDialog, public Ui::KstViewMatricesDialog {
Q_OBJECT
public:
KstViewMatricesDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewscalarsdialog.cpp #640356:640357
@@ -25,7 +25,7 @@
#include "kstviewscalarsdialog.h"
KstViewScalarsDialogI::KstViewScalarsDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstViewScalarsDialog(parent, fl) {
+: QDialog(parent, fl) {
listViewScalars = new KstScalarListView(this, &KST::scalarList);
listViewScalars->setShowSortIndicator(false);
listViewScalars->setSelectionMode(Q3ListView::NoSelection);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewscalarsdialog.h #640356:640357
@@ -27,7 +27,7 @@
//#include "kstscalartable.h"
#include "kstscalarlistview.h"
-class KstViewScalarsDialogI : public QDialog {
+class KstViewScalarsDialogI : public QDialog, public Ui::KstViewScalarsDialog {
Q_OBJECT
public:
KstViewScalarsDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewstringsdialog.cpp #640356:640357
@@ -25,7 +25,7 @@
#include "kstviewstringsdialog.h"
KstViewStringsDialogI::KstViewStringsDialogI(QWidget* parent, Qt::WindowFlags fl)
-: KstViewStringsDialog(parent, fl) {
+: QDialog(parent, fl) {
listViewStrings = new KstStringListView(this, &KST::stringList);
listViewStrings->setShowSortIndicator(false);
listViewStrings->setSelectionMode(Q3ListView::NoSelection);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewstringsdialog.h #640356:640357
@@ -25,7 +25,7 @@
#include <k3listviewsearchline.h>
#include "kststringlistview.h"
-class KstViewStringsDialogI : public QDialog {
+class KstViewStringsDialogI : public QDialog, public Ui::KstViewStringsDialog {
Q_OBJECT
public:
KstViewStringsDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
More information about the Kst
mailing list