Репозиторий Sisyphus
Последнее обновление: 16 июня 2019 | Пакетов: 17683 | Посещений: 13966019
en ru br
Репозитории ALT
S:0.9.8.9-alt8.svn20120124
5.1: 0.9.7.10-alt1.svn20091021.1
4.1: 0.9.2-alt1.1
4.0: 0.8.9-alt2
3.0: 0.5.8.3-alt1
www.altlinux.org/Changes

Группа :: Науки/Прочее
Пакет: qtiplot

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: qtiplot-0.9.8.9-alt-gcc6.patch
Скачать


diff --git a/qtiplot/src/analysis/dialogs/FitDialog.cpp b/qtiplot/src/analysis/dialogs/FitDialog.cpp
index c6d7e36..e3f624b 100755
--- a/qtiplot/src/analysis/dialogs/FitDialog.cpp
+++ b/qtiplot/src/analysis/dialogs/FitDialog.cpp
@@ -1026,7 +1026,7 @@ void FitDialog::showFitPage()
 #ifdef Q_CC_MSVC
         it->setFlags(it->flags() & (~Qt::ItemIsEditable));
 #else
-        it->setFlags(!Qt::ItemIsEditable);
+        it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
 #endif
         it->setBackground(QBrush(Qt::lightGray));
         it->setForeground(Qt::black);
@@ -1053,7 +1053,7 @@ void FitDialog::showFitPage()
         boxParams->setCellWidget(i, 2, sb);
 
         it = new QTableWidgetItem();
-		it->setFlags(!Qt::ItemIsEditable);
+		it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
 		it->setText("--");
 		boxParams->setItem(i, 5, it);
 	}
@@ -1068,7 +1068,7 @@ void FitDialog::showFitPage()
 #ifdef Q_CC_MSVC
             it->setFlags(it->flags() & (~Qt::ItemIsEditable));
 #else
-            it->setFlags(!Qt::ItemIsEditable);
+            it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
 #endif
             it->setBackground(QBrush(Qt::lightGray));
             boxParams->setItem(i, 4, it);
diff --git a/qtiplot/src/core/ConfigDialog.cpp b/qtiplot/src/core/ConfigDialog.cpp
index 307f338..0876112 100755
--- a/qtiplot/src/core/ConfigDialog.cpp
+++ b/qtiplot/src/core/ConfigDialog.cpp
@@ -1390,7 +1390,7 @@ void ConfigDialog::setColorsList(const QList<QColor>& colList, const QStringList
 	colorsList->setRowCount(colors);
 	for (int i = 0; i < colors; i++){
 		QTableWidgetItem *it = new QTableWidgetItem();
-		it->setFlags(!Qt::ItemIsEditable);
+		it->setFlags(Qt::ItemFlags(!Qt::ItemIsEditable));
 		it->setBackground(QBrush(colList[i]));
 		colorsList->setItem(i, 0, it);
 
diff --git a/qtiplot/src/lib/src/ColorMapEditor.cpp b/qtiplot/src/lib/src/ColorMapEditor.cpp
index 61894da..e4b8d4d 100644
--- a/qtiplot/src/lib/src/ColorMapEditor.cpp
+++ b/qtiplot/src/lib/src/ColorMapEditor.cpp
@@ -158,7 +158,7 @@ void ColorMapEditor::setColorMap(const LinearColorMap& map)
 	#ifdef Q_CC_MSVC
 		it->setFlags(it->flags() & (~Qt::ItemIsEditable));
 	#else
-		it->setFlags(!Qt::ItemIsEditable);
+		it->setFlags(Qt::ItemFlags(Qt::ItemFlags(!Qt::ItemIsEditable)));
 	#endif
 		it->setBackground(QBrush(c));
 		it->setForeground(QBrush(c));
@@ -249,7 +249,7 @@ void ColorMapEditor::insertLevel()
 #ifdef Q_CC_MSVC
 	it->setFlags(it->flags() & (~Qt::ItemIsEditable));
 #else
-	it->setFlags(!Qt::ItemIsEditable);
+	it->setFlags(Qt::ItemFlags(Qt::ItemFlags(!Qt::ItemIsEditable)));
 #endif
 	it->setBackground(QBrush(c));
 	it->setForeground(QBrush(c));
diff --git a/qtiplot/src/matrix/MatrixValuesDialog.cpp b/qtiplot/src/matrix/MatrixValuesDialog.cpp
index 363f369..ddd257f 100755
--- a/qtiplot/src/matrix/MatrixValuesDialog.cpp
+++ b/qtiplot/src/matrix/MatrixValuesDialog.cpp
@@ -72,7 +72,7 @@ MatrixValuesDialog::MatrixValuesDialog( ScriptingEnv *env, QWidget* parent, Qt::
 	gl1->setColumnStretch(1, 1);
 	gl1->setColumnStretch(3, 1);
 
-	functions = new QComboBox(false);
+	functions = new QComboBox();
 	functions->addItems(scriptEnv->mathFunctions());
 	btnAddFunction = new QPushButton(tr( "Add &Function" ));
 	btnAddCell = new QPushButton(tr( "Add Ce&ll" ));
diff --git a/qtiplot/src/plot2D/dialogs/LayerDialog.cpp b/qtiplot/src/plot2D/dialogs/LayerDialog.cpp
index cd8526f..f207701 100755
--- a/qtiplot/src/plot2D/dialogs/LayerDialog.cpp
+++ b/qtiplot/src/plot2D/dialogs/LayerDialog.cpp
@@ -69,14 +69,14 @@ multi_layer(NULL)
 	QGridLayout *gl2 = new QGridLayout(gb2);
 	gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
 
-	alignHorBox = new QComboBox( false );
+	alignHorBox = new QComboBox();
 	alignHorBox->insertItem( tr( "Center" ) );
 	alignHorBox->insertItem( tr( "Left" ) );
 	alignHorBox->insertItem( tr( "Right" ) );
 	gl2->addWidget(alignHorBox, 0, 1);
 
 	gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
-	alignVertBox = new QComboBox( false );
+	alignVertBox = new QComboBox();
 	alignVertBox->insertItem( tr( "Center" ) );
 	alignVertBox->insertItem( tr( "Top" ) );
 	alignVertBox->insertItem( tr( "Bottom" ) );
diff --git a/qtiplot/src/plot2D/dialogs/PlotDialog.cpp b/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
index 73bca25..286fd10 100755
--- a/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
+++ b/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
@@ -957,7 +957,7 @@ void PlotDialog::initPiePage()
 	l4->setBuddy(boxFirstColor);
 	gl2->addWidget(l4, 0, 0);
 
-	boxPiePattern = new PatternBox(false);
+	boxPiePattern = new PatternBox();
 	gl2->addWidget(boxPiePattern, 1, 1);
 	gl2->setRowStretch(2, 1);
 
@@ -1340,7 +1340,7 @@ void PlotDialog::initLinePage()
 	hb->addWidget(boxCurveOpacity);
 	gl2->addLayout(hb, 1, 1);
 
-	boxPattern = new PatternBox(false);
+	boxPattern = new PatternBox();
 	gl2->addWidget(boxPattern, 2, 1);
 	
 	QLabel *l6 = new QLabel("&" + tr("Pattern"));
@@ -2129,17 +2129,17 @@ void PlotDialog::initVectPage()
     QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
     labelXEnd = new QLabel(tr( "X End" ));
     gl3->addWidget(labelXEnd, 0, 0);
-	xEndBox = new QComboBox(false);
+	xEndBox = new QComboBox();
     gl3->addWidget(xEndBox, 0, 1);
 
 	labelYEnd = new QLabel(tr( "Y End" ));
     gl3->addWidget(labelYEnd, 1, 0);
-	yEndBox = new  QComboBox( false);
+	yEndBox = new  QComboBox();
     gl3->addWidget(yEndBox, 1, 1);
 
 	labelPosition = new QLabel(tr( "Position" ));
     gl3->addWidget(labelPosition, 2, 0);
-	vectPosBox = new  QComboBox( false);
+	vectPosBox = new  QComboBox();
 	vectPosBox->addItem(tr("Tail"));
 	vectPosBox->addItem(tr("Middle"));
 	vectPosBox->addItem(tr("Head"));
diff --git a/qtiplot/src/table/SetColValuesDialog.cpp b/qtiplot/src/table/SetColValuesDialog.cpp
index 2586ffc..8f9447e 100755
--- a/qtiplot/src/table/SetColValuesDialog.cpp
+++ b/qtiplot/src/table/SetColValuesDialog.cpp
@@ -72,12 +72,12 @@ SetColValuesDialog::SetColValuesDialog( ScriptingEnv *env, QWidget* parent, Qt::
 	hbox1->addWidget(end);
 
 	QGridLayout *gl1 = new QGridLayout();
-	functions = new QComboBox(false);
+	functions = new QComboBox();
 	functions->addItems(muParserScripting::functionsList(true));
 	gl1->addWidget(functions, 0, 0);
 	btnAddFunction = new QPushButton(tr( "Add function" ));
 	gl1->addWidget(btnAddFunction, 0, 1);
-	boxColumn = new QComboBox(false);
+	boxColumn = new QComboBox();
 	gl1->addWidget(boxColumn, 1, 0);
 	btnAddCol = new QPushButton(tr( "Add column" ));
 	gl1->addWidget(btnAddCol, 1, 1);
diff --git a/qtiplot/src/table/TableDialog.cpp b/qtiplot/src/table/TableDialog.cpp
index 7f0e27c..80b2ec1 100755
--- a/qtiplot/src/table/TableDialog.cpp
+++ b/qtiplot/src/table/TableDialog.cpp
@@ -136,7 +136,7 @@ TableDialog::TableDialog(Table *t, QWidget* parent, Qt::WFlags fl )
     labelFormat = new QLabel(tr( "Format:" ));
  	gl1->addWidget(labelFormat, 2, 0);
 
-    formatBox = new QComboBox(false);
+    formatBox = new QComboBox();
     gl1->addWidget(formatBox, 2, 1);
 
 	labelNumeric = new QLabel(tr( "Precision:" ));
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin