Remove debug formatting functions obsoleted by the new debug operator for QFlag<T>.

Change-Id: I6d737eb86b790eeefb537ca5e6a075bf30a3dcfb
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 4 insertions, 55 deletions

diff --git a/src/gui/kernel/qplatformdrag.cpp b/src/gui/kernel/qplatformdrag.cpp
index f509408f8f..d789c75d1d 100644
--- a/src/gui/kernel/qplatformdrag.cpp
+++ b/src/gui/kernel/qplatformdrag.cpp
@@ -42,57 +42,7 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_DRAGANDDROP
 #ifdef QDND_DEBUG
-QString dragActionsToString(Qt::DropActions actions)
-{
-    QString str;
-    if (actions == Qt::IgnoreAction) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("IgnoreAction");
-    }
-    if (actions & Qt::LinkAction) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("LinkAction");
-    }
-    if (actions & Qt::CopyAction) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("CopyAction");
-    }
-    if (actions & Qt::MoveAction) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("MoveAction");
-    }
-    if ((actions & Qt::TargetMoveAction) == Qt::TargetMoveAction ) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("TargetMoveAction");
-    }
-    return str;
-}
-
-QString KeyboardModifiersToString(Qt::KeyboardModifiers modifiers)
-{
-    QString str;
-    if (modifiers & Qt::ControlModifier) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("ControlModifier");
-    }
-    if (modifiers & Qt::AltModifier) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("AltModifier");
-    }
-    if (modifiers & Qt::ShiftModifier) {
-        if (!str.isEmpty())
-            str += QLatin1String(" | ");
-        str += QLatin1String("ShiftModifier");
-    }
-    return str;
-}
+#  include <QtCore/QDebug>
 #endif
 
 QPlatformDropQtResponse::QPlatformDropQtResponse(bool accepted, Qt::DropAction acceptedAction)
@@ -156,8 +106,7 @@ Qt::DropAction QPlatformDrag::defaultAction(Qt::DropActions possibleActions,
                                            Qt::KeyboardModifiers modifiers) const
 {
 #ifdef QDND_DEBUG
-    qDebug("QDragManager::defaultAction(Qt::DropActions possibleActions)");
-    qDebug("keyboard modifiers : %s", qPrintable(KeyboardModifiersToString(modifiers)));
+    qDebug() << "QDragManager::defaultAction(Qt::DropActions possibleActions)\nkeyboard modifiers : " << modifiers;
 #endif
 
     Qt::DropAction default_action = Qt::IgnoreAction;
@@ -183,7 +132,7 @@ Qt::DropAction QPlatformDrag::defaultAction(Qt::DropActions possibleActions,
         default_action = Qt::LinkAction;
 
 #ifdef QDND_DEBUG
-    qDebug("possible actions : %s", qPrintable(dragActionsToString(possibleActions)));
+    qDebug() << "possible actions : " << possibleActions;
 #endif
 
     // Check if the action determined is allowed
@@ -199,7 +148,7 @@ Qt::DropAction QPlatformDrag::defaultAction(Qt::DropActions possibleActions,
     }
 
 #ifdef QDND_DEBUG
-    qDebug("default action : %s", qPrintable(dragActionsToString(default_action)));
+    qDebug() << "default action : " << default_action;
 #endif
 
     return default_action;