[Kst] branches/work/kst/portto4/kst/src/libkstapp
Adam Treat
treat at kde.org
Mon Mar 5 20:58:04 CET 2007
SVN commit 639711 by treat:
* QListView -> Q3ListView
* Port various props in ui files
* fixes
M +4 -4 datawizard.cpp
M +3 -3 kst.cpp
M +1 -1 kstchangefiledialog.cpp
M +1 -1 kstchangefiledialog.h
M +2 -2 kstchoosecolordialog.h
M +1 -1 ksteventmonitorentry.h
M +1 -1 kstgraphfiledialog.h
M +2 -2 kstimagedialog4.ui
M +2 -2 kstmatrixtable.h
M +1 -1 kstmonochromedialog.h
M +1 -1 kstprintoptionspage.cpp
M +2 -1 kstprintoptionspage.h
M +1 -1 kstscalarlistview.cpp
M +3 -3 kstsettingsdlg4.ui
M +1 -1 kststringlistview.cpp
M +1 -1 kstviewmanager.cpp
M +3 -1 kstviewmanager.h
M +1 -1 kstviewscalarsdialog.cpp
M +1 -1 kstviewvectorsdialog.h
M +1 -1 pluginmanager.cpp
M +1 -1 pluginmanager.h
M +1 -1 updatethread.h
--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #639710:639711
@@ -38,7 +38,7 @@
#include <knuminput.h>
#include <kiconloader.h>
#include <qregexp.h>
-#include <qlistview.h>
+#include <q3listview.h>
#include <qheader.h>
#include <assert.h>
#include <stdlib.h>
@@ -103,7 +103,7 @@
connect(_vectorSearch, SIGNAL(clicked()), this, SLOT(_search()));
- connect(_vectors, SIGNAL(pressed(QListViewItem*)), this, SLOT(fieldListChanged()));
+ connect(_vectors, SIGNAL(pressed(Q3ListViewItem*)), this, SLOT(fieldListChanged()));
connect(_add, SIGNAL(clicked()), this, SLOT(add()));
@@ -113,9 +113,9 @@
connect(_down, SIGNAL(clicked()), this, SLOT(down()));
- connect(_vectors, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(add()));
+ connect(_vectors, SIGNAL(doubleClicked(Q3ListViewItem*)), this, SLOT(add()));
- connect(_vectorsToPlot, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(remove()));
+ connect(_vectorsToPlot, SIGNAL(doubleClicked(Q3ListViewItem*)), this, SLOT(remove()));
connect(_vectors, SIGNAL(dropped(QDropEvent*)), this, SLOT(vectorsDroppedBack(QDropEvent*)));
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #639710:639711
@@ -121,8 +121,8 @@
static KConfig *kConfigObject = 0L;
-KstApp::KstApp(QWidget *parent, const char *name)
-: KMdiMainFrm(parent, name) {
+KstApp::KstApp(QWidget *parent)
+: KMdiMainFrm(parent) {
assert(!::inst);
::inst = this;
@@ -157,7 +157,7 @@
vectorSaveDialog = new VectorSaveDialog(this);
_monochromeDialog = new KstMonochromeDialogI(this);
#ifdef KST_QUICKSTART_DLG
- _quickStartDialog = new KstQuickStartDialogI(this, 0 , true);
+ _quickStartDialog = new KstQuickStartDialogI(this);
#endif
connect(this, SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), SLOT(fixKMdi()));
--- branches/work/kst/portto4/kst/src/libkstapp/kstchangefiledialog.cpp #639710:639711
@@ -40,7 +40,7 @@
KstChangeFileDialogI::KstChangeFileDialogI(QWidget* parent,
Qt::WindowFlags fl)
-: KstChangeFileDialog(parent, fl) {
+: Ui::KstChangeFileDialog(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 #639710:639711
@@ -22,7 +22,7 @@
#include "ui_kstchangefiledialog4.h"
-class KstChangeFileDialogI : public KstChangeFileDialog {
+class KstChangeFileDialogI : public Ui::KstChangeFileDialog {
Q_OBJECT
public:
KstChangeFileDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/kstchoosecolordialog.h #639710:639711
@@ -42,8 +42,8 @@
QGridLayout* grid;
// list of the current textfields and colorcombos
- QValueList<QLineEdit*> lineEdits;
- QValueList<KColorCombo*> colorCombos;
+ Q3ValueList<QLineEdit*> lineEdits;
+ Q3ValueList<KColorCombo*> colorCombos;
QColor getColorForFile(const QString &fileName);
void cleanColorGroup();
--- branches/work/kst/portto4/kst/src/libkstapp/ksteventmonitorentry.h #639710:639711
@@ -91,7 +91,7 @@
static const QString OUTYVECTOR;
KstVectorMap _vectorsUsed;
- QValueList<int> _indexArray;
+ Q3ValueList<int> _indexArray;
QString _event;
QString _description;
QString _eMailRecipients;
--- branches/work/kst/portto4/kst/src/libkstapp/kstgraphfiledialog.h #639710:639711
@@ -25,7 +25,7 @@
class KstGraphFileDialogI : public QDialog {
Q_OBJECT
public:
- KstGraphFileDialogI(QWidget* parent = 0, WindowFlags fl = 0 );
+ KstGraphFileDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
virtual ~KstGraphFileDialogI();
void setAutoSave(bool as) {_autoSave = as;}
--- branches/work/kst/portto4/kst/src/libkstapp/kstimagedialog4.ui #639710:639711
@@ -254,10 +254,10 @@
<property name="value" >
<double>0.500000000000000</double>
</property>
- <property name="minValue" >
+ <property name="minimum" >
<number>0</number>
</property>
- <property name="maxValue" >
+ <property name="maximum" >
<number>45</number>
</property>
</widget>
--- branches/work/kst/portto4/kst/src/libkstapp/kstmatrixtable.h #639710:639711
@@ -29,8 +29,8 @@
void resizeData(int) {}
QWidget* createEditor(int, int, bool) const { return 0; }
- QTableItem* item(int, int) { return 0; }
- void setItem(int, int, QTableItem *) {}
+ Q3TableItem* item(int, int) { return 0; }
+ void setItem(int, int, Q3TableItem *) {}
void clearCell(int, int) {}
void insertWidget(int, int, QWidget *) {}
QWidget* cellWidget(int, int) const { return 0; }
--- branches/work/kst/portto4/kst/src/libkstapp/kstmonochromedialog.h #639710:639711
@@ -25,7 +25,7 @@
class KstMonochromeDialogI : public QDialog {
Q_OBJECT
public:
- KstMonochromeDialogI(QWidget* parent = 0, WindowFlags fl = 0 );
+ KstMonochromeDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
virtual ~KstMonochromeDialogI();
void setOptions(const QMap<QString,QString>& opts);
--- branches/work/kst/portto4/kst/src/libkstapp/kstprintoptionspage.cpp #639710:639711
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <qbutton.h>
+#include <q3button.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstprintoptionspage.h #639710:639711
@@ -18,6 +18,7 @@
#ifndef _KST_POP_H
#define _KST_POP_H
+class Q3Button;
class QCheckBox;
#include <kdeprint/kprintdialogpage.h>
@@ -34,7 +35,7 @@
QCheckBox *_dateTimeFooter;
QCheckBox *_maintainAspectRatio;
QCheckBox *_bw;
- QButton *_configureBW;
+ Q3Button *_configureBW;
QSpinBox *_curveWidthAdjust;
};
--- branches/work/kst/portto4/kst/src/libkstapp/kstscalarlistview.cpp #639710:639711
@@ -90,7 +90,7 @@
/*
qDebug() << "Updated KstScalarListView: now " << childCount() << " root-child items" << endl;
- QListViewItemIterator it(this);
+ Q3ListViewItemIterator it(this);
while (it.current()) {
KstScalarListViewItem *item = dynamic_cast<KstScalarListViewItem*>(it.current());
if (item) {
--- branches/work/kst/portto4/kst/src/libkstapp/kstsettingsdlg4.ui #639710:639711
@@ -667,10 +667,10 @@
</item>
<item>
<widget class="KDoubleNumInput" name="_valueOffset" >
- <property name="minValue" >
+ <property name="minimum" >
<number>-24</number>
</property>
- <property name="maxValue" >
+ <property name="maximum" >
<number>24</number>
</property>
</widget>
@@ -995,7 +995,7 @@
</item>
<item row="2" column="1" >
<widget class="KIntSpinBox" name="_kIntSpinBoxEMailPort" >
- <property name="maxValue" >
+ <property name="maximum" >
<number>65536</number>
</property>
</widget>
--- branches/work/kst/portto4/kst/src/libkstapp/kststringlistview.cpp #639710:639711
@@ -90,7 +90,7 @@
/*
qDebug() << "Updated KstStringListView: now " << childCount() << " root-child items" << endl;
- QListViewItemIterator it(this);
+ Q3ListViewItemIterator it(this);
while (it.current()) {
KstStringListViewItem *item = dynamic_cast<KstStringListViewItem*>(it.current());
if (item) {
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewmanager.cpp #639710:639711
@@ -186,7 +186,7 @@
}
//
- // the following should not be necessary but is due to a bug in QListView...
+ // the following should not be necessary but is due to a bug in Q3ListView...
//
if (retVal) {
_vm->ViewView->viewport()->setCursor(Qt::ArrowCursor);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewmanager.h #639710:639711
@@ -28,6 +28,8 @@
#include "kstviewobject.h"
#include "kstviewwindow.h"
+#include "ui_kstviewmanager4.h"
+
class KstViewListView : public Q3ListView {
public:
KstViewListView(QWidget * parent = 0, const char * name = 0);
@@ -65,7 +67,7 @@
bool _inUse;
};
-class KstViewManagerI: public KstViewManager {
+class KstViewManagerI: public Ui::KstViewManager {
Q_OBJECT
public:
KstViewManagerI(KstDoc *doc, QWidget* parent = 0, Qt::WindowFlags fl = 0);
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewscalarsdialog.cpp #639710:639711
@@ -28,7 +28,7 @@
: KstViewScalarsDialog(parent, fl) {
listViewScalars = new KstScalarListView(this, &KST::scalarList);
listViewScalars->setShowSortIndicator(false);
- listViewScalars->setSelectionMode(QListView::NoSelection);
+ listViewScalars->setSelectionMode(Q3ListView::NoSelection);
searchWidget = new K3ListViewSearchLineWidget(listViewScalars, this);
QBoxLayout *box = dynamic_cast<QBoxLayout*>(layout());
if (box) {
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewvectorsdialog.h #639710:639711
@@ -24,7 +24,7 @@
#include "kstvectortable.h"
-class KstViewVectorsDialogI : public KstViewVectorsDialog {
+class KstViewVectorsDialogI : public Ui::KstViewVectorsDialog {
Q_OBJECT
public:
KstViewVectorsDialogI(QWidget* parent = 0, Qt::WindowFlags fl = 0 );
--- branches/work/kst/portto4/kst/src/libkstapp/pluginmanager.cpp #639710:639711
@@ -38,7 +38,7 @@
connect(_close, SIGNAL(clicked()), this, SLOT(close()));
- connect(_pluginList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(selectionChanged(QListViewItem*)));
+ connect(_pluginList, SIGNAL(selectionChanged(Q3ListViewItem*)), this, SLOT(selectionChanged(Q3ListViewItem*)));
connect(_install, SIGNAL(clicked()), this, SLOT(install()));
--- branches/work/kst/portto4/kst/src/libkstapp/pluginmanager.h #639710:639711
@@ -30,7 +30,7 @@
private slots:
void init();
- void selectionChanged(QListViewItem *item);
+ void selectionChanged(Q3ListViewItem *item);
void install();
void remove();
void rescan();
--- branches/work/kst/portto4/kst/src/libkstapp/updatethread.h #639710:639711
@@ -50,7 +50,7 @@
private:
bool _paused, _done;
bool _force;
- KstWaitCondition _waitCondition;
+ QWaitCondition _waitCondition;
mutable QMutex _statusMutex;
KstDoc *_doc;
int _updateCounter;
More information about the Kst
mailing list