Revert "UI to alert of respend attempt affecting wallet."

This reverts commit ada5a067c7.

Conflicts:
	src/qt/guiconstants.h
	src/wallet.h

src/qt/transactionrecord.h

@@ -20,8 +20,7 @@ class TransactionStatus
 public:
     TransactionStatus():
         countsForBalance(false), sortKey(""),
-        matures_in(0), status(Offline), hasConflicting(false), depth(0), open_for(0), cur_num_blocks(-1),
-        cur_num_conflicts(-1)
+        matures_in(0), status(Offline), depth(0), open_for(0), cur_num_blocks(-1)
     { }
 
     enum Status {
@@ -52,10 +51,6 @@ public:
     /** @name Reported status
        @{*/
     Status status;
-
-    // Has conflicting transactions spending same prevout
-    bool hasConflicting;
-
     qint64 depth;
     qint64 open_for; /**< Timestamp if status==OpenUntilDate, otherwise number
                       of additional blocks that need to be mined before
@@ -64,10 +59,6 @@ public:
 
     /** Current number of blocks (to know whether cached status is still valid) */
     int cur_num_blocks;
-
-    /** Number of conflicts received into wallet as of last status update */
-    int64_t cur_num_conflicts;
-
 };
 
 /** UI model for a transaction. A core transaction can be represented by multiple UI transactions if it has
@@ -145,7 +136,7 @@ public:
 
     /** Return whether a status update is needed.
      */
-    bool statusUpdateNeeded(int64_t nConflictsReceived);
+    bool statusUpdateNeeded();
 };
 
 #endif // TRANSACTIONRECORD_H