[Kst] branches/work/kst/kst1kde4/kst/src/libkstapp
Zongyi Zhang
freebody.kst at gmail.com
Tue Mar 23 00:43:08 CET 2010
SVN commit 1106489 by zhang:
continue kst1kde4
M +1 -1 kstbasicdialog.cpp
M +1 -1 kstbasicdialog.h
M +1 -1 kstcurvedialog.cpp
M +1 -1 kstcurvedialog.h
M +1 -1 kstdebugdialog.cpp
M +1 -1 kstdebugdialog.h
M +1 -1 ksteqdialog.cpp
M +1 -1 ksteqdialog.h
M +2 -2 kstfilterdialog.cpp
M +1 -1 kstfilterdialog.h
M +1 -1 kstfitdialog.cpp
M +1 -1 kstfitdialog.h
M +1 -1 kstgraphfiledialog.cpp
M +1 -1 kstgraphfiledialog.h
M +1 -1 ksthsdialog.cpp
M +1 -1 ksthsdialog.h
M +1 -1 kstmatrixdialog.cpp
M +1 -1 kstmatrixdialog.h
M +1 -1 kstplugindialog.cpp
M +1 -1 kstplugindialog.h
M +1 -1 kstpsddialog.cpp
M +1 -1 kstpsddialog.h
M +1 -1 kstvectordialog.cpp
M +1 -1 kstvectordialog.h
M +1 -1 kstvectorsavedialog.cpp
M +1 -1 kstviewscalarsdialog.cpp
M +1 -1 kstviewscalarsdialog.h
M +1 -1 kstviewstringsdialog.cpp
M +1 -1 kstviewstringsdialog.h
M +1 -1 kstviewwidget.h
M +2 -2 kstvvdialog.cpp
M +1 -1 kstvvdialog.h
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstbasicdialog.cpp #1106488:1106489
@@ -44,7 +44,7 @@
}
-KstBasicDialog::KstBasicDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstBasicDialog::KstBasicDialog(QWidget* parent, const char* name, bool modal, Qt::Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
setMultiple(false);
_w = new BasicDialogWidget(_contents);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstbasicdialog.h #1106488:1106489
@@ -34,7 +34,7 @@
class KST_EXPORT KstBasicDialog : public KstDataDialog {
Q_OBJECT
public:
- KstBasicDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0);
+ KstBasicDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::Qt::WindowFlags fl = 0);
virtual ~KstBasicDialog();
static KstBasicDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstcurvedialog.cpp #1106488:1106489
@@ -53,7 +53,7 @@
}
-KstCurveDialog::KstCurveDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstCurveDialog::KstCurveDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new CurveDialogWidget(_contents);
setMultiple(true);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstcurvedialog.h #1106488:1106489
@@ -27,7 +27,7 @@
class KstCurveDialog : public KstDataDialog {
Q_OBJECT
public:
- KstCurveDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstCurveDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstCurveDialog();
KST_EXPORT static KstCurveDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdebugdialog.cpp #1106488:1106489
@@ -38,7 +38,7 @@
* TRUE to construct a modal dialog.
*/
KstDebugDialog::KstDebugDialog(QWidget* parent,
- const char* name, bool modal, WFlags fl)
+ const char* name, bool modal, Qt::WindowFlags fl)
: QDialog(parent, name, modal, fl ) {
setupUi(this);
_log = new KstLogWidget(TabPage, "logwidget");
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdebugdialog.h #1106488:1106489
@@ -25,7 +25,7 @@
Q_OBJECT
public:
KstDebugDialog(QWidget* parent = 0, const char* name = 0,
- bool modal = FALSE, WFlags fl = 0);
+ bool modal = FALSE, Qt::WindowFlags fl = 0);
virtual ~KstDebugDialog();
public:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksteqdialog.cpp #1106488:1106489
@@ -56,7 +56,7 @@
}
-KstEqDialog::KstEqDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstEqDialog::KstEqDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new Ui::EqDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksteqdialog.h #1106488:1106489
@@ -27,7 +27,7 @@
class KST_EXPORT KstEqDialog : public KstDataDialog {
Q_OBJECT
public:
- KstEqDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0);
+ KstEqDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0);
virtual ~KstEqDialog();
static KstEqDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstfilterdialog.cpp #1106488:1106489
@@ -47,8 +47,8 @@
}
-KstFilterDialog::KstFilterDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
-: KstPluginDialogI(parent, name, modal, fl) {
+KstFilterDialog::KstFilterDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
+: KstPluginDialog(parent, name, modal, fl) {
_w->_curveAppearance->show();
}
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstfilterdialog.h #1106488:1106489
@@ -23,7 +23,7 @@
class KstFilterDialog : public KstPluginDialog {
Q_OBJECT
public:
- KstFilterDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0);
+ KstFilterDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0);
virtual ~KstFilterDialog();
static KstFilterDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstfitdialog.cpp #1106488:1106489
@@ -50,7 +50,7 @@
}
-KstFitDialog::KstFitDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstFitDialog::KstFitDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstPluginDialog(parent, name, modal, fl) {
_w->_curveAppearance->show();
}
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstfitdialog.h #1106488:1106489
@@ -23,7 +23,7 @@
class KstFitDialog : public KstPluginDialog {
Q_OBJECT
public:
- KstFitDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstFitDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstFitDialog();
static KstFitDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstgraphfiledialog.cpp #1106488:1106489
@@ -36,7 +36,7 @@
KstGraphFileDialog::KstGraphFileDialog(QWidget* parent, const char* name,
- bool modal, WFlags fl)
+ bool modal, Qt::WindowFlags fl)
: QDialog(parent, name, modal, fl) {
setupUi(this);
_autoSaveTimer = new QTimer(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstgraphfiledialog.h #1106488:1106489
@@ -24,7 +24,7 @@
Q_OBJECT
public:
KstGraphFileDialog(QWidget* parent = 0, const char* name = 0,
- bool modal = false, WFlags fl = 0 );
+ bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstGraphFileDialog();
void setAutoSave(bool as) {_autoSave = as;}
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksthsdialog.cpp #1106488:1106489
@@ -55,7 +55,7 @@
}
-KstHsDialog::KstHsDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstHsDialog::KstHsDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new Ui::HistogramDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ksthsdialog.h #1106488:1106489
@@ -27,7 +27,7 @@
class KST_EXPORT KstHsDialog : public KstDataDialog {
Q_OBJECT
public:
- KstHsDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstHsDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstHsDialog();
static KstHsDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.cpp #1106488:1106489
@@ -48,7 +48,7 @@
}
-KstMatrixDialog::KstMatrixDialog(QWidget* parent, const char* name, bool modal, WFlags fl)
+KstMatrixDialog::KstMatrixDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new Ui::MatrixDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.h #1106488:1106489
@@ -29,7 +29,7 @@
class KST_EXPORT KstMatrixDialog : public KstDataDialog {
Q_OBJECT
public:
- KstMatrixDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstMatrixDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstMatrixDialog();
static KstMatrixDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstplugindialog.cpp #1106488:1106489
@@ -58,7 +58,7 @@
}
-KstPluginDialog::KstPluginDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstPluginDialog::KstPluginDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new PluginDialogWidget(_contents);
_w>setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstplugindialog.h #1106488:1106489
@@ -26,7 +26,7 @@
class KST_EXPORT KstPluginDialog : public KstDataDialog {
Q_OBJECT
public:
- KstPluginDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0);
+ KstPluginDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0);
virtual ~KstPluginDialog();
static KstPluginDialog *globalInstance();
static const QString& plugin_defaultTag;
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstpsddialog.cpp #1106488:1106489
@@ -54,7 +54,7 @@
}
-KstPsdDialog::KstPsdDialog(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
+KstPsdDialog::KstPsdDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new PSDDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstpsddialog.h #1106488:1106489
@@ -28,7 +28,7 @@
Q_OBJECT
public:
KstPsdDialog(QWidget* parent = 0, const char* name = 0,
- bool modal = false, Qt::WFlags fl = 0 );
+ bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstPsdDialog();
KST_EXPORT static KstPsdDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.cpp #1106488:1106489
@@ -62,7 +62,7 @@
KstVectorDialog::KstVectorDialog(QWidget* parent, const char* name,
- bool modal, Qt::WFlags fl)
+ bool modal, Qt::WindowFlags fl)
: KstDataDialog(parent, name, modal, fl) {
_w = new VectorDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.h #1106488:1106489
@@ -28,7 +28,7 @@
class KST_EXPORT KstVectorDialog : public KstDataDialog {
Q_OBJECT
public:
- KstVectorDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstVectorDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstVectorDialog();
static KstVectorDialog *globalInstance();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectorsavedialog.cpp #1106488:1106489
@@ -34,7 +34,7 @@
KstVectorSaveDialog::KstVectorSaveDialog(QWidget* parent,
const char* name,
bool modal,
- Qt::WFlags fl)
+ Qt::WindowFlags fl)
: QDialog(parent, name, modal, fl) {
setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewscalarsdialog.cpp #1106488:1106489
@@ -27,7 +27,7 @@
KstViewScalarsDialog::KstViewScalarsDialog(QWidget* parent,
const char* name,
bool modal,
- WFlags fl)
+ Qt::WindowFlags fl)
: QDialog(parent, name, modal, fl) {
setupUi(this);
listViewScalars = new KstScalarListView(this, &KST::scalarList);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewscalarsdialog.h #1106488:1106489
@@ -29,7 +29,7 @@
public:
KstViewScalarsDialog(QWidget* parent = 0,
const char* name = 0,
- bool modal = false, WFlags fl = 0 );
+ bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstViewScalarsDialog();
KListViewSearchLineWidget *searchWidget;
KstScalarListView *listViewScalars;
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewstringsdialog.cpp #1106488:1106489
@@ -27,7 +27,7 @@
KstViewStringsDialog::KstViewStringsDialog(QWidget* parent,
const char* name,
bool modal,
- WFlags fl)
+ Qt::WindowFlags fl)
: QDialog(parent, name, modal, fl) {
setupUi(this);
listViewStrings = new KstStringListView(this, &KST::stringList);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewstringsdialog.h #1106488:1106489
@@ -28,7 +28,7 @@
public:
KstViewStringsDialog(QWidget* parent = 0,
const char* name = 0,
- bool modal = false, WFlags fl = 0 );
+ bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstViewStringsDialog();
KListViewSearchLineWidget *searchWidget;
KstStringListView *listViewStrings;
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewwidget.h #1106488:1106489
@@ -29,7 +29,7 @@
class KstViewWidget : public QWidget {
Q_OBJECT
public:
- KstViewWidget(KstTopLevelViewPtr view, QWidget *parent = 0L, const char *name = 0L, Qt::WFlags w = 0);
+ KstViewWidget(KstTopLevelViewPtr view, QWidget *parent = 0L, const char *name = 0L, Qt::WindowFlags w = 0);
virtual ~KstViewWidget();
void setDropEnabled(bool);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvvdialog.cpp #1106488:1106489
@@ -56,8 +56,8 @@
}
-KstVvDialog::KstVvDialogI(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
-: KstDataDialog(parent, name, modal, fl) {
+KstVvDialog::KstVvDialog(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
+: QDialog(parent, fl) {
_w = new VectorViewDialogWidget(_contents);
_w->setupUi(this);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvvdialog.h #1106488:1106489
@@ -26,7 +26,7 @@
class KST_EXPORT KstVvDialog : public KstDataDialog {
Q_OBJECT
public:
- KstVvDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0 );
+ KstVvDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0 );
virtual ~KstVvDialog();
static KstVvDialog *globalInstance();
More information about the Kst
mailing list