remove unused Qt::DropAction::TargetMoveAction enum

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/global/qnamespace.h b/src/core/global/qnamespace.h
index 3570d7c..ae85462 100644 (file)
--- a/src/core/global/qnamespace.h
+++ b/src/core/global/qnamespace.h
@@ -1150,7 +1150,6 @@ public:
         MoveAction = 0x2,
         LinkAction = 0x4,
         ActionMask = 0xff,
-        TargetMoveAction = 0x8002,
         IgnoreAction = 0x0
     };
     Q_DECLARE_FLAGS(DropActions, DropAction)

diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index 3fd4ab7..b9826a9 100644 (file)
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -63,12 +63,10 @@ QT_BEGIN_NAMESPACE
 //#define QDND_DEBUG
 
 #ifdef QDND_DEBUG
-QString dragActionsToString(Qt::DropActions actions)
+static QString dragActionsToString(Qt::DropActions actions)
 {
     QString str;
     if (actions == Qt::IgnoreAction) {
-        if (!str.isEmpty())
-            str += " | ";
         str += "IgnoreAction";
     }
     if (actions & Qt::LinkAction) {
@@ -86,20 +84,13 @@ QString dragActionsToString(Qt::DropActions actions)
             str += " | ";
         str += "MoveAction";
     }
-    if ((actions & Qt::TargetMoveAction) == Qt::TargetMoveAction ) {
-        if (!str.isEmpty())
-            str += " | ";
-        str += "TargetMoveAction";
-    }
     return str;
 }
 
-QString KeyboardModifiersToString(Qt::KeyboardModifiers moderfies)
+static QString KeyboardModifiersToString(Qt::KeyboardModifiers moderfies)
 {
     QString str;
     if (moderfies & Qt::ControlModifier) {
-        if (!str.isEmpty())
-            str += " | ";
         str += Qt::ControlModifier;
     }
     if (moderfies & Qt::AltModifier) {

diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 1639bf5..6b0adfd 100644 (file)
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -181,7 +181,6 @@ static int qtaction_to_xdndaction(Qt::DropAction a)
     case Qt::LinkAction:
         return ATOM(XdndActionLink);
     case Qt::MoveAction:
-    case Qt::TargetMoveAction:
         return ATOM(XdndActionMove);
     case Qt::IgnoreAction:
         return XNone;