[Kst] branches/work/kst/portto4/kst/src/libkstapp
Adam Treat
treat at kde.org
Thu Mar 1 20:02:05 CET 2007
SVN commit 638380 by treat:
* Q3GridLayout -> QGridLayout...
M +2 -3 kstbasicdialog.cpp
M +2 -2 kstbasicdialog.h
M +2 -2 kstchoosecolordialog.cpp
M +3 -3 ksteditviewobjectdialog.cpp
M +2 -3 ksteditviewobjectdialog.h
M +2 -2 kstfilterdialog.cpp
M +2 -2 kstfilterdialog.h
M +2 -2 kstfitdialog.cpp
M +2 -2 kstfitdialog.h
M +4 -4 kstplugindialog.cpp
M +4 -4 kstplugindialog.h
M +2 -2 kstprintoptionspage.cpp
--- branches/work/kst/portto4/kst/src/libkstapp/kstbasicdialog.cpp #638379:638380
@@ -20,7 +20,7 @@
#include <qlayout.h>
#include <qlineedit.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3Frame>
#include <QLabel>
@@ -29,7 +29,6 @@
#include <kmessagebox.h>
#include "kstbasicdialog.h"
-#include "basicdialogwidget.h"
// application specific includes
#include "kst.h"
@@ -94,7 +93,7 @@
+ ptr->outputScalarList().count()
+ ptr->outputStringList().count();
- _grid = new Q3GridLayout(_w->_frame, numInputOutputs + 1, 2, 0, 8);
+ _grid = new QGridLayout(_w->_frame, numInputOutputs + 1, 2, 0, 8);
_grid->setColStretch(1,1);
_grid->setColStretch(0,0);
--- branches/work/kst/portto4/kst/src/libkstapp/kstbasicdialog.h #638379:638380
@@ -20,7 +20,7 @@
#include <qpointer.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
#include "kst_export.h"
@@ -75,7 +75,7 @@
BasicDialogWidget *_w;
// layout items
- Q3GridLayout *_grid;
+ QGridLayout *_grid;
Q3ValueList<QWidget*> _widgets;
};
--- branches/work/kst/portto4/kst/src/libkstapp/kstchoosecolordialog.cpp #638379:638380
@@ -20,7 +20,7 @@
#include <q3valuelist.h>
#include <qradiobutton.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <kcombobox.h>
#include <kcolorcombo.h>
@@ -71,7 +71,7 @@
cleanColorGroup();
// new grid
- grid = new Q3GridLayout(colorFrame, fileNameList.count(), 2, 0, 8);
+ grid = new QGridLayout(colorFrame, fileNameList.count(), 2, 0, 8);
grid->setColStretch(1,0);
int i = fileNameList.count();
--- branches/work/kst/portto4/kst/src/libkstapp/ksteditviewobjectdialog.cpp #638379:638380
@@ -29,7 +29,7 @@
#include <qspinbox.h>
#include <qstyle.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
#include <QPixmap>
@@ -117,7 +117,7 @@
if (_viewObject) {
_customWidget = _viewObject->configWidget();
if (_customWidget) {
- _grid = new Q3GridLayout(_propertiesFrame, 1, 1);
+ _grid = new QGridLayout(_propertiesFrame, 1, 1);
_customWidget->reparent(_propertiesFrame, QPoint(0, 0));
_grid->addWidget(_customWidget, 0, 0);
_viewObject->fillConfigWidget(_customWidget, _isNew);
@@ -135,7 +135,7 @@
int numProperties = _viewObject->metaObject()->numProperties(true);
// create a new grid
- _grid = new Q3GridLayout(_propertiesFrame, numProperties, 2, 0, 8);
+ _grid = new QGridLayout(_propertiesFrame, numProperties, 2, 0, 8);
_grid->setColStretch(0,0);
_grid->setColStretch(1,1);
--- branches/work/kst/portto4/kst/src/libkstapp/ksteditviewobjectdialog.h #638379:638380
@@ -27,11 +27,10 @@
#include "kst_export.h"
#include <qpointer.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
class QComboBox;
-class Q3GridLayout;
class KST_EXPORT KstEditViewObjectDialogI : public QDialog {
Q_OBJECT
@@ -60,7 +59,7 @@
// for layout purposes
Q3ValueList<QWidget*> _inputWidgets; // the widgets used to change properties
Q3ValueList<QWidget*> _widgets; // all other widgets
- Q3GridLayout* _grid;
+ QGridLayout* _grid;
QPointer<QWidget> _customWidget;
bool _isNew;
--- branches/work/kst/portto4/kst/src/libkstapp/kstfilterdialog.cpp #638379:638380
@@ -25,7 +25,7 @@
//Added by qt3to4:
#include <Q3ValueList>
#include <QLabel>
-#include <Q3GridLayout>
+#include <QGridLayout>
// include files for KDE
#include <kmessagebox.h>
@@ -288,7 +288,7 @@
}
-void KstFilterDialogI::generateEntries(bool input, int& cnt, QWidget *parent, Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
+void KstFilterDialogI::generateEntries(bool input, int& cnt, QWidget *parent, QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
// get fixed vector for filter
QString fixedVector;
--- branches/work/kst/portto4/kst/src/libkstapp/kstfilterdialog.h #638379:638380
@@ -23,7 +23,7 @@
#include <QDialog>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
class KstFilterDialogI : public KstPluginDialogI {
@@ -49,7 +49,7 @@
bool createCurve(KstCPluginPtr plugin);
bool saveInputs(KstCPluginPtr plugin, KstSharedPtr<Plugin> p);
- void generateEntries(bool input, int& cnt, QWidget *parent, Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
+ void generateEntries(bool input, int& cnt, QWidget *parent, QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
};
#endif
--- branches/work/kst/portto4/kst/src/libkstapp/kstfitdialog.cpp #638379:638380
@@ -28,7 +28,7 @@
//Added by qt3to4:
#include <Q3ValueList>
#include <QLabel>
-#include <Q3GridLayout>
+#include <QGridLayout>
// include files for KDE
#include <kmessagebox.h>
@@ -242,7 +242,7 @@
}
-void KstFitDialogI::generateEntries(bool input, int& cnt, QWidget *parent, Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
+void KstFitDialogI::generateEntries(bool input, int& cnt, QWidget *parent, QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
const QString& pluginName = _pluginList[_w->PluginCombo->currentItem()];
const Plugin::Data& pluginData = PluginCollection::self()->pluginList()[PluginCollection::self()->pluginNameList()[pluginName]];
--- branches/work/kst/portto4/kst/src/libkstapp/kstfitdialog.h #638379:638380
@@ -20,7 +20,7 @@
#include "kstplugindialog.h"
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
class KstFitDialogI : public KstPluginDialogI {
@@ -47,7 +47,7 @@
bool createCurve(KstCPluginPtr plugin);
- void generateEntries(bool input, int& cnt, QWidget *parent, Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
+ void generateEntries(bool input, int& cnt, QWidget *parent, QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
bool saveInputs(KstCPluginPtr plugin, KstSharedPtr<Plugin> p);
};
--- branches/work/kst/portto4/kst/src/libkstapp/kstplugindialog.cpp #638379:638380
@@ -32,7 +32,7 @@
#include <q3whatsthis.h>
//Added by qt3to4:
#include <Q3ValueList>
-#include <Q3GridLayout>
+#include <QGridLayout>
// include files for KDE
#include <kcolorbutton.h>
@@ -658,7 +658,7 @@
}
-void KstPluginDialogI::generateEntries(bool input, int& cnt, QWidget *parent, Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
+void KstPluginDialogI::generateEntries(bool input, int& cnt, QWidget *parent, QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table) {
QString scalarLabelTemplate, vectorLabelTemplate, stringLabelTemplate;
if (input) {
@@ -780,7 +780,7 @@
delete _pluginInputOutputGrid;
// create new info grid
- _pluginInfoGrid = new Q3GridLayout(_w->_pluginInfoFrame, 2, 2, 0, 8);
+ _pluginInfoGrid = new QGridLayout(_w->_pluginInfoFrame, 2, 2, 0, 8);
_pluginInfoGrid->setColStretch(1,1); // stretch the right column
_pluginInfoGrid->setColStretch(0,0); // don't stretch the left column
@@ -819,7 +819,7 @@
int numInputOutputs = pluginData._inputs.count() + pluginData._outputs.count();
// generate inputs
- _pluginInputOutputGrid = new Q3GridLayout(_w->_pluginInputOutputFrame, numInputOutputs + 1, 2, 0, 8);
+ _pluginInputOutputGrid = new QGridLayout(_w->_pluginInputOutputFrame, numInputOutputs + 1, 2, 0, 8);
_pluginInputOutputGrid->setColStretch(1,1);
_pluginInputOutputGrid->setColStretch(0,0);
generateEntries(true, cnt, _w->_pluginInputOutputFrame, _pluginInputOutputGrid, pluginData._inputs);
--- branches/work/kst/portto4/kst/src/libkstapp/kstplugindialog.h #638379:638380
@@ -23,7 +23,7 @@
#include "kstdatadialog.h"
#include "kst_export.h"
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <Q3ValueList>
class PluginDialogWidget;
@@ -61,14 +61,14 @@
virtual bool saveInputs(KstCPluginPtr plugin, KstSharedPtr<Plugin> p);
bool saveOutputs(KstCPluginPtr plugin, KstSharedPtr<Plugin> p);
virtual void generateEntries(bool input, int& cnt, QWidget *parent,
- Q3GridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
+ QGridLayout *grid, const Q3ValueList<Plugin::Data::IOValue>& table);
QMap<QString,QString> cacheInputs(const Q3ValueList<Plugin::Data::IOValue>& table);
void restoreInputs(const Q3ValueList<Plugin::Data::IOValue>& table, const QMap<QString,QString>& v);
// layout items
- Q3GridLayout* _pluginInfoGrid;
- Q3GridLayout* _pluginInputOutputGrid;
+ QGridLayout* _pluginInfoGrid;
+ QGridLayout* _pluginInputOutputGrid;
Q3ValueList<QWidget*> _pluginWidgets;
private:
--- branches/work/kst/portto4/kst/src/libkstapp/kstprintoptionspage.cpp #638379:638380
@@ -21,7 +21,7 @@
#include <qlayout.h>
#include <qspinbox.h>
//Added by qt3to4:
-#include <Q3GridLayout>
+#include <QGridLayout>
#include <klocale.h>
@@ -35,7 +35,7 @@
setTitle(i18n("Kst Options"));
- Q3GridLayout *grid = new Q3GridLayout(this, 4, 2);
+ QGridLayout *grid = new QGridLayout(this, 4, 2);
_dateTimeFooter = new QCheckBox(i18n("Append plot information to each page"), this);
grid->addMultiCellWidget(_dateTimeFooter, row, row, 0, 1);
More information about the Kst
mailing list