manually merge pull request #744 (fixes #7444)

jef-n · jef-n · commit 5569b0af0dd3 · 2013-07-17T13:05:23.000+02:00
diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -224,16 +224,9 @@ void CoordinateCapture::copy()
   if ( myClipboard->supportsSelection() )
   {
     myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Selection );
-    //QString myMessage = tr("Clipboard contents set to: ");
-    //statusBar()->showMessage(myMessage + myClipboard->text(QClipboard::Selection));
-  }
-  else
-  {
-    //user has an inferior operating system....
-    myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Clipboard );
-    //QString myMessage = tr("Clipboard contents set to: ");
-    //statusBar()->showMessage(myMessage + myClipboard->text(QClipboard::Clipboard));
   }
+
+  myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Clipboard );
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -224,16 +224,9 @@ void CoordinateCapture::copy()`
`224`	`224`	`if ( myClipboard->supportsSelection() )`
`225`	`225`	`{`
`226`	`226`	`myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Selection );`
`227`		`- //QString myMessage = tr("Clipboard contents set to: ");`
`228`		`- //statusBar()->showMessage(myMessage + myClipboard->text(QClipboard::Selection));`
`229`		`- }`
`230`		`- else`
`231`		`- {`
`232`		`- //user has an inferior operating system....`
`233`		`- myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Clipboard );`
`234`		`- //QString myMessage = tr("Clipboard contents set to: ");`
`235`		`- //statusBar()->showMessage(myMessage + myClipboard->text(QClipboard::Clipboard));`
`236`	`227`	`}`
	`228`	`+`
	`229`	`+ myClipboard->setText( mpUserCrsEdit->text() + "," + mpCanvasEdit->text(), QClipboard::Clipboard );`
`237`	`230`	`}`
`238`	`231`
`239`	`232`