Changeset 449 for trunk/src

Timestamp:

Jan 14, 2010, 10:03:47 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

kernel: DnD: Fixed QDND_DEBUG build.

Location:

trunk/src/gui/kernel

Files:

• qdnd.cpp (modified) (5 diffs)
• qdnd_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qdnd.cpp

@@ -274 +274 @@
     if (actions == Qt::IgnoreAction) {
         if (!str.isEmpty())
-            str += " | ";
-        str += "IgnoreAction";
+            str += QLatin1String(" | ");
+        str += QLatin1String("IgnoreAction");
     }
     if (actions & Qt::LinkAction) {
         if (!str.isEmpty())
-            str += " | ";
-        str += "LinkAction";
+            str += QLatin1String(" | ");
+        str += QLatin1String("LinkAction");
     }
     if (actions & Qt::CopyAction) {
         if (!str.isEmpty())
-            str += " | ";
-        str += "CopyAction";
+            str += QLatin1String(" | ");
+        str += QLatin1String("CopyAction");
     }
     if (actions & Qt::MoveAction) {
         if (!str.isEmpty())
-            str += " | ";
-        str += "MoveAction";
+            str += QLatin1String(" | ");
+        str += QLatin1String("MoveAction");
     }
     if ((actions & Qt::TargetMoveAction) == Qt::TargetMoveAction ) {
         if (!str.isEmpty())
-            str += " | ";
-        str += "TargetMoveAction";
+            str += QLatin1String(" | ");
+        str += QLatin1String("TargetMoveAction");
     }
     return str;
@@ -305 +305 @@
     if (moderfies & Qt::ControlModifier) {
         if (!str.isEmpty())
-            str += " | ";
-        str += Qt::ControlModifier;
+            str += QLatin1String(" | ");
+        str += QLatin1String("ControlModifier");
     }
     if (moderfies & Qt::AltModifier) {
         if (!str.isEmpty())
-            str += " | ";
-        str += Qt::AltModifier;
+            str += QLatin1String(" | ");
+        str += QLatin1String("AltModifier");
     }
     if (moderfies & Qt::ShiftModifier) {
         if (!str.isEmpty())
-            str += " | ";
-        str += Qt::ShiftModifier;
+            str += QLatin1String(" | ");
+        str += QLatin1String("ShiftModifier");
     }
     return str;
@@ -414 +414 @@
 #ifdef QDND_DEBUG
     qDebug("QDragManager::defaultAction(Qt::DropActions possibleActions)");
-    qDebug("keyboard modifiers : %s", KeyboardModifiersToString(modifiers).latin1());
+    qDebug("keyboard modifiers : %ls", KeyboardModifiersToString(modifiers).utf16());
 #endif
 
@@ -453 +453 @@
 
 #ifdef QDND_DEBUG
-    qDebug("possible actions : %s", dragActionsToString(possibleActions).latin1());
+    qDebug("possible actions : %ls", dragActionsToString(possibleActions).utf16());
 #endif
 
@@ -469 +469 @@
 
 #ifdef QDND_DEBUG
-    qDebug("default action : %s", dragActionsToString(defaultAction).latin1());
+    qDebug("default action : %ls", dragActionsToString(defaultAction).utf16());
 #endif
 

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -73 +73 @@
 extern void qt_DrgFreeDragtransfer(DRAGTRANSFER *xfer); // defined in qmime_pm.cpp
 
+#ifdef QDND_DEBUG
+extern QString dragActionsToString(Qt::DropActions actions);
+#endif
+
 /** \internal
  *  Data for QDragEnterEvent/QDragMoveEvent/QPMDropEvent.
@@ -684 +688 @@
                      << "(isExclusive" << wrk->isExclusive() << ", "
                      << "itemCount" << wrk->itemCount() << ") from convertor"
-                     << mime->convertorName() << " (gotExclForMime"
+                     << mime << " (gotExclForMime"
                      << gotExclForMime << ", " << "gotExcl" << gotExcl
                      << ", skipExcl" << skipExcl << ", coopLevel"