Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 630332 | Differences between
and this patch

Collapse All | Expand All

(-)qtiplot-0.9.8.9.orig/qtiplot/src/analysis/dialogs/FitDialog.cpp (-5 / +5 lines)
Lines 1020-1028 Link Here
1020
    for (int i = 0; i<parameters; i++){
1020
    for (int i = 0; i<parameters; i++){
1021
        QTableWidgetItem *it = new QTableWidgetItem(paramList[i]);
1021
        QTableWidgetItem *it = new QTableWidgetItem(paramList[i]);
1022
#ifdef Q_CC_MSVC
1022
#ifdef Q_CC_MSVC
1023
        it->setFlags(it->flags() & (~Qt::ItemIsEditable));
1023
        it->setFlags(it->flags() & Qt::ItemFlags(~Qt::ItemIsEditable));
1024
#else
1024
#else
1025
        it->setFlags(!Qt::ItemIsEditable);
1025
        it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
1026
#endif
1026
#endif
1027
        it->setBackground(QBrush(Qt::lightGray));
1027
        it->setBackground(QBrush(Qt::lightGray));
1028
        it->setForeground(Qt::black);
1028
        it->setForeground(Qt::black);
Lines 1049-1055 Link Here
1049
        boxParams->setCellWidget(i, 2, sb);
1049
        boxParams->setCellWidget(i, 2, sb);
1050
1050
1051
        it = new QTableWidgetItem();
1051
        it = new QTableWidgetItem();
1052
		it->setFlags(!Qt::ItemIsEditable);
1052
		it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
1053
		it->setText("--");
1053
		it->setText("--");
1054
		boxParams->setItem(i, 5, it);
1054
		boxParams->setItem(i, 5, it);
1055
	}
1055
	}
Lines 1062-1070 Link Here
1062
		for (int i = 0; i<boxParams->rowCount(); i++ ){
1062
		for (int i = 0; i<boxParams->rowCount(); i++ ){
1063
            QTableWidgetItem *it = new QTableWidgetItem();
1063
            QTableWidgetItem *it = new QTableWidgetItem();
1064
#ifdef Q_CC_MSVC
1064
#ifdef Q_CC_MSVC
1065
            it->setFlags(it->flags() & (~Qt::ItemIsEditable));
1065
            it->setFlags(it->flags() & Qt::ItemFlags(~Qt::ItemIsEditable));
1066
#else
1066
#else
1067
            it->setFlags(!Qt::ItemIsEditable);
1067
            it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
1068
#endif
1068
#endif
1069
            it->setBackground(QBrush(Qt::lightGray));
1069
            it->setBackground(QBrush(Qt::lightGray));
1070
            boxParams->setItem(i, 4, it);
1070
            boxParams->setItem(i, 4, it);
(-)qtiplot-0.9.8.9.orig/qtiplot/src/core/ConfigDialog.cpp (-1 / +1 lines)
Lines 1390-1396 Link Here
1390
	colorsList->setRowCount(colors);
1390
	colorsList->setRowCount(colors);
1391
	for (int i = 0; i < colors; i++){
1391
	for (int i = 0; i < colors; i++){
1392
		QTableWidgetItem *it = new QTableWidgetItem();
1392
		QTableWidgetItem *it = new QTableWidgetItem();
1393
		it->setFlags(!Qt::ItemIsEditable);
1393
		it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
1394
		it->setBackground(QBrush(colList[i]));
1394
		it->setBackground(QBrush(colList[i]));
1395
		colorsList->setItem(i, 0, it);
1395
		colorsList->setItem(i, 0, it);
1396
1396
(-)qtiplot-0.9.8.9.orig/qtiplot/src/lib/src/ColorMapEditor.cpp (-4 / +4 lines)
Lines 156-164 Link Here
156
156
157
		QTableWidgetItem *it = new QTableWidgetItem(c.name());
157
		QTableWidgetItem *it = new QTableWidgetItem(c.name());
158
	#ifdef Q_CC_MSVC
158
	#ifdef Q_CC_MSVC
159
		it->setFlags(it->flags() & (~Qt::ItemIsEditable));
159
		it->setFlags(it->flags() & Qt::ItemFlags(~Qt::ItemIsEditable));
160
	#else
160
	#else
161
		it->setFlags(!Qt::ItemIsEditable);
161
		it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
162
	#endif
162
	#endif
163
		it->setBackground(QBrush(c));
163
		it->setBackground(QBrush(c));
164
		it->setForeground(QBrush(c));
164
		it->setForeground(QBrush(c));
Lines 247-255 Link Here
247
247
248
	QTableWidgetItem *it = new QTableWidgetItem(c.name());
248
	QTableWidgetItem *it = new QTableWidgetItem(c.name());
249
#ifdef Q_CC_MSVC
249
#ifdef Q_CC_MSVC
250
	it->setFlags(it->flags() & (~Qt::ItemIsEditable));
250
	it->setFlags(it->flags() & Qt::ItemFlags(~Qt::ItemIsEditable));
251
#else
251
#else
252
	it->setFlags(!Qt::ItemIsEditable);
252
	it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
253
#endif
253
#endif
254
	it->setBackground(QBrush(c));
254
	it->setBackground(QBrush(c));
255
	it->setForeground(QBrush(c));
255
	it->setForeground(QBrush(c));
(-)qtiplot-0.9.8.9.orig/qtiplot/src/matrix/MatrixModel.cpp (-2 / +2 lines)
Lines 110-118 Link Here
110
Qt::ItemFlags MatrixModel::flags(const QModelIndex & index ) const
110
Qt::ItemFlags MatrixModel::flags(const QModelIndex & index ) const
111
{
111
{
112
	if (index.isValid())
112
	if (index.isValid())
113
		return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
113
		return Qt::ItemFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
114
	else
114
	else
115
		return Qt::ItemIsEnabled;
115
		return Qt::ItemFlags(Qt::ItemIsEnabled);
116
}
116
}
117
117
118
int MatrixModel::rowCount(const QModelIndex & /* parent */) const
118
int MatrixModel::rowCount(const QModelIndex & /* parent */) const
(-)qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/dialogs/AssociationsDialog.cpp (-1 / +1 lines)
Lines 225-231 Link Here
225
		for (int i=0; i<table->rowCount(); i++ ){
225
		for (int i=0; i<table->rowCount(); i++ ){
226
			QTableWidgetItem *cell = new QTableWidgetItem(colNames[i].replace(",", "."));
226
			QTableWidgetItem *cell = new QTableWidgetItem(colNames[i].replace(",", "."));
227
			cell->setBackground (QBrush(Qt::lightGray));
227
			cell->setBackground (QBrush(Qt::lightGray));
228
			cell->setFlags (Qt::ItemIsEnabled);
228
			cell->setFlags (Qt::ItemFlags(Qt::ItemIsEnabled));
229
			table->setItem(i, 0, cell);
229
			table->setItem(i, 0, cell);
230
			}
230
			}
231
231
(-)qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/dialogs/PlotDialog.cpp (-2 / +2 lines)
Lines 5211-5217 Link Here
5211
    : QTreeWidgetItem( parent, QStringList(s), PlotCurveTreeItem ),
5211
    : QTreeWidgetItem( parent, QStringList(s), PlotCurveTreeItem ),
5212
      d_curve(curve)
5212
      d_curve(curve)
5213
{
5213
{
5214
	setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
5214
	setFlags(Qt::ItemFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
5215
	setIcon(0, QPixmap(":/graph_disabled.png"));
5215
	setIcon(0, QPixmap(":/graph_disabled.png"));
5216
	setCheckState(0, curve->isVisible() ? Qt::Checked : Qt::Unchecked);
5216
	setCheckState(0, curve->isVisible() ? Qt::Checked : Qt::Unchecked);
5217
}
5217
}
Lines 5264-5270 Link Here
5264
	d_widget(w)
5264
	d_widget(w)
5265
{
5265
{
5266
	setActive(false);
5266
	setActive(false);
5267
	setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
5267
	setFlags(Qt::ItemFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
5268
	setCheckState(0, d_widget->isVisible() ? Qt::Checked : Qt::Unchecked);
5268
	setCheckState(0, d_widget->isVisible() ? Qt::Checked : Qt::Unchecked);
5269
}
5269
}
5270
5270

Return to bug 630332