[Uml-devel] kdesdk/umbrello/umbrello/clipboard

[Jonathan Riddell]

CVS commit by jriddell: 

Fix beastie 65634, cut'n'paste of (at least) text lines in diagrams loses non-usascii-characters
It was encoded as utf8 but then decoded as the default locale


  M +8 -7      umldrag.cpp   1.20


--- kdesdk/umbrello/umbrello/clipboard/umldrag.cpp  #1.19:1.20
@@ -311,5 +311,5 @@ bool UMLDrag::decodeClip1(const QMimeSou
                 return false;
         }
-        QString xmiClip(payload);
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;
@@ -385,5 +385,5 @@ bool UMLDrag::decodeClip2(const QMimeSou
                 return false;
         }
-        QString xmiClip(payload);
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;
@@ -477,5 +477,5 @@ bool UMLDrag::getClip3TypeAndID(const QM
         }
         QTextStream clipdata(payload, IO_ReadOnly);
-        QString xmiClip(payload);
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;
@@ -535,5 +535,5 @@ bool UMLDrag::decodeClip3(const QMimeSou
         }
         QTextStream clipdata(payload, IO_ReadOnly);
-        QString xmiClip(payload);
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;
@@ -592,5 +592,6 @@ bool UMLDrag::decodeClip4(const QMimeSou
                 return false;
         }
-        QString xmiClip(payload);
+
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;
@@ -692,5 +693,5 @@ bool UMLDrag::decodeClip5(const QMimeSou
                 return false;
         }
-        QString xmiClip(payload);
+        QString xmiClip = QString::fromUtf8(payload);
 
         QString error;