[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krecipes] src/dialogs/recipeinput: Create and use headerIdColumn() function.
From:       José_Manuel_Santamaría_Lema <panfaust () gmail ! com>
Date:       2016-04-01 9:56:56
Message-ID: E1alvp2-0008L1-4n () scm ! kde ! org
[Download RAW message or body]

Git commit 9e79cdb11b749d45c2d4ffafcb20cd8dd26ce77f by José Manuel Santamaría Lema.
Committed on 01/04/2016 at 09:44.
Pushed by joselema into branch 'master'.

Create and use headerIdColumn() function.

M  +8    -3    src/dialogs/recipeinput/ingredientseditor.cpp
M  +1    -0    src/dialogs/recipeinput/ingredientseditor.h

http://commits.kde.org/krecipes/9e79cdb11b749d45c2d4ffafcb20cd8dd26ce77f

diff --git a/src/dialogs/recipeinput/ingredientseditor.cpp \
b/src/dialogs/recipeinput/ingredientseditor.cpp index 900c6eb..98954d4 100644
--- a/src/dialogs/recipeinput/ingredientseditor.cpp
+++ b/src/dialogs/recipeinput/ingredientseditor.cpp
@@ -118,6 +118,11 @@ int IngredientsEditor::headerColumn()
 	return 0;
 }
 
+int IngredientsEditor::headerIdColumn()
+{
+	return 4;
+}
+
 void IngredientsEditor::setDatabase( RecipeDB * database )
 {
 	//Disconnect all signals from the old database
@@ -314,7 +319,7 @@ void IngredientsEditor::setRowData( int row, const Element & \
header )  {
 	QModelIndex index;
 	//The "Id" item.
-	index = m_sourceModel->index( row, ingredientIdColumn() );
+	index = m_sourceModel->index( row, headerIdColumn() );
 	m_sourceModel->setData( index, QVariant(header.id), Qt::EditRole );
 	m_sourceModel->setData( index, QVariant(header.id), IdRole );
 	m_sourceModel->setData( index, QVariant(true), IsHeaderRole );
@@ -961,7 +966,7 @@ void IngredientsEditor::headerCreatedDBSlot( const Element & \
newHeader )  if ( (modelHeaderId == RecipeDB::InvalidId)
 		&& (newHeader.name == modelHeaderName) ) {
 			m_sourceModel->setData( index, newHeader.id, IdRole );
-			index = m_sourceModel->index( i, ingredientIdColumn() ); //FIXME: create \
headerIdColumn +			index = m_sourceModel->index( i, headerIdColumn() );
 			m_sourceModel->setData( index, newHeader.id, Qt::DisplayRole );
 		}
 
@@ -1032,7 +1037,7 @@ void IngredientsEditor::headerRemovedDBSlot( int \
headerRemovedId )  modelHeaderName = m_sourceModel->data( index, Qt::DisplayRole \
).toString();  if ( modelHeaderId == headerRemovedId ) {
 			m_sourceModel->setData( index, RecipeDB::InvalidId, IdRole );
-			index = m_sourceModel->index( i, ingredientIdColumn() ); //FIXME: create \
headerIdColumn +			index = m_sourceModel->index( i, headerIdColumn() );
 			m_sourceModel->setData( index, RecipeDB::InvalidId, Qt::DisplayRole );
 		}
 	}
diff --git a/src/dialogs/recipeinput/ingredientseditor.h \
b/src/dialogs/recipeinput/ingredientseditor.h index 51084bd..96b7911 100644
--- a/src/dialogs/recipeinput/ingredientseditor.h
+++ b/src/dialogs/recipeinput/ingredientseditor.h
@@ -51,6 +51,7 @@ public:
 	inline int prepmethodsColumn();
 	inline int ingredientIdColumn();
 	inline int headerColumn();
+	inline int headerIdColumn();
 
 	void setDatabase( RecipeDB * database );
 


[prev in list] [next in list] [prev in thread] [next in thread]