From 15020669d9b0f4dd93c72da4eebadff3ab0bc760 Mon Sep 17 00:00:00 2001 From: xavierqet Date: Sun, 10 Aug 2008 18:53:31 +0000 Subject: [PATCH] Suppression d'avertissements a la compilation git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@369 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/borderinset.cpp | 2 +- sources/configpages.cpp | 6 +++--- sources/diagramview.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/borderinset.cpp b/sources/borderinset.cpp index 2d58a2993..aaf86daa7 100644 --- a/sources/borderinset.cpp +++ b/sources/borderinset.cpp @@ -318,7 +318,7 @@ void BorderInset::setRowsHeaderWidth(const qreal &new_rhw) { */ void BorderInset::setDiagramHeight(const qreal &height) { // taille des lignes a utiliser = rows_height - setNbRows(ceil(height / rows_height)); + setNbRows(qRound(ceil(height / rows_height))); } /** diff --git a/sources/configpages.cpp b/sources/configpages.cpp index 811cdf955..b372aa285 100644 --- a/sources/configpages.cpp +++ b/sources/configpages.cpp @@ -34,7 +34,7 @@ NewDiagramPage::NewDiagramPage(QWidget *parent) : ConfigPage(parent) { // recupere les dimensions du schema int columns_count_value = settings.value("diagrameditor/defaultcols", 15).toInt(); int columns_width_value = qRound(settings.value("diagrameditor/defaultcolsize", 50.0).toDouble()); - int rows_count_value = settings.value("diagrameditor/defaultrows", 6).toDouble(); + int rows_count_value = settings.value("diagrameditor/defaultrows", 6).toInt(); int rows_height_value = qRound(settings.value("diagrameditor/defaultrowsize", 80.0).toDouble()); QVBoxLayout *vlayout1 = new QVBoxLayout(); @@ -60,7 +60,7 @@ NewDiagramPage::NewDiagramPage(QWidget *parent) : ConfigPage(parent) { columns_count -> setValue(columns_count_value); columns_width = new QSpinBox(diagram_size_box); - columns_width -> setMinimum(BorderInset::minColumnsWidth()); + columns_width -> setMinimum(qRound(BorderInset::minColumnsWidth())); columns_width -> setSingleStep(10); columns_width -> setValue(columns_width_value); columns_width -> setPrefix(tr("\327")); @@ -73,7 +73,7 @@ NewDiagramPage::NewDiagramPage(QWidget *parent) : ConfigPage(parent) { rows_count -> setValue(rows_count_value); rows_height = new QSpinBox(diagram_size_box); - rows_height -> setMinimum(BorderInset::minRowsHeight()); + rows_height -> setMinimum(qRound(BorderInset::minRowsHeight())); rows_height -> setSingleStep(10); rows_height -> setValue(rows_height_value); rows_height -> setPrefix(tr("\327")); diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index 7619bce9f..5003d2c97 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -571,7 +571,7 @@ void DiagramView::dialogEditInfos() { columns_count -> setValue(columns_count_value); QSpinBox *columns_width = new QSpinBox(diagram_size_box); - columns_width -> setMinimum(BorderInset::minColumnsWidth()); + columns_width -> setMinimum(qRound(BorderInset::minColumnsWidth())); columns_width -> setSingleStep(10); columns_width -> setValue(columns_width_value); columns_width -> setPrefix(tr("\327")); @@ -584,7 +584,7 @@ void DiagramView::dialogEditInfos() { rows_count -> setValue(rows_count_value); QSpinBox *rows_height = new QSpinBox(diagram_size_box); - rows_height -> setMinimum(BorderInset::minRowsHeight()); + rows_height -> setMinimum(qRound(BorderInset::minRowsHeight())); rows_height -> setSingleStep(10); rows_height -> setValue(rows_height_value); rows_height -> setPrefix(tr("\327"));