[Uml-devel] CVS: kdesdk/umbrello/umbrello uml.cpp,1.3,1.4 umlview.cpp,1.4,1.5

[kde at office.kde.org]

Update of /home/kde/kdesdk/umbrello/umbrello
In directory office:/tmp/cvs-serv5387

Modified Files:
	uml.cpp umlview.cpp 
Log Message:
fixed [Bug 53653] copy and cut actions will hide grid 
Grid is no longer turned off after a copy or cut


Index: uml.cpp
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/uml.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- uml.cpp	25 Jan 2003 19:00:40 -0000	1.3
+++ uml.cpp	30 Jan 2003 16:47:26 -0000	1.4
@@ -786,6 +786,7 @@
 bool UMLApp::editCutCopy( bool bFromView ) {
 	UMLClipboard clipboard;
 	QMimeSource * clipdata = 0;
+
 	if((clipdata = clipboard.copy(doc, bFromView)) != 0) {
 		QClipboard* clip = QApplication::clipboard();
 		clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory

Index: umlview.cpp
===================================================================
RCS file: /home/kde/kdesdk/umbrello/umbrello/umlview.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- umlview.cpp	27 Jan 2003 21:37:14 -0000	1.4
+++ umlview.cpp	30 Jan 2003 16:47:26 -0000	1.5
@@ -543,7 +543,7 @@
 	}
 	//make sure can find UMLObject
 	if(status && !(temp = getDocument()->findUMLObject(data -> getID()) ) ) {
-		kdDebug() << k_funcinfo << " object not found" << endl;
+		kdDebug() << " object not found" << endl;
 		status = false;
 	}
 	//make sure dragging item onto correct diagram
@@ -580,7 +580,7 @@
 		status = false;
 	}
 	if(status && !( o = getDocument()->findUMLObject(data->getID()) ) ) {
-		kdDebug() << k_funcinfo << " object not found" << endl;
+		kdDebug() << " object not found" << endl;
 		status = false;
 	}
 	if(status) {
@@ -1121,6 +1121,7 @@
 	}
 
 	// we don't want to get the grid
+	bool showSnapGrid = getShowSnapGrid();
 	setShowSnapGrid(false);
 	QPixmap pixmap(rect.x() + rect.width(), rect.y() + rect.height());
 	QPainter painter;
@@ -1130,7 +1131,7 @@
 	painter.end();
 
 	bitBlt(&diagram, QPoint(0, 0), &pixmap, rect);
-	setShowSnapGrid(getShowSnapGrid());
+	setShowSnapGrid(showSnapGrid);
 
 	canvas()->setAllChanged();
 	//select again