From 08814de81490b293a4a5850ab2686b0b9263ab87 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 16 Nov 2012 07:14:51 +0100
Subject: [PATCH] * Let MetadataEditor call Result's doneEditing() method.

---
 src/libtomahawk/Result.cpp | 17 ++++++++++++++++-
 src/libtomahawk/Result.h   |  4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp
index 003b63b82..7c09d434c 100644
--- a/src/libtomahawk/Result.cpp
+++ b/src/libtomahawk/Result.cpp
@@ -27,6 +27,7 @@
 #include "database/DatabaseCommand_Resolve.h"
 #include "database/DatabaseCommand_AllTracks.h"
 #include "database/DatabaseCommand_AddFiles.h"
+#include "filemetadata/MetadataEditor.h"
 
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
@@ -211,7 +212,13 @@ Result::toVariant() const
 QString
 Result::toString() const
 {
-    return QString( "Result(%1) %2\t%3 - %4  %5" ).arg( id() ).arg( score() ).arg( artist().isNull() ? QString() : artist()->name() ).arg( track() ).arg( url() );
+    return QString( "Result(%1, score: %2) %3 - %4%5 (%6)" )
+              .arg( id() )
+              .arg( score() )
+              .arg( artist().isNull() ? QString() : artist()->name() )
+              .arg( track() )
+              .arg( album().isNull() || album()->name().isEmpty() ? "" : QString( " on %1" ).arg( album()->name() ) )
+              .arg( url() );
 }
 
 
@@ -363,3 +370,11 @@ Result::setResolvedBy( Tomahawk::Resolver* resolver )
 {
     m_resolvedBy = QWeakPointer< Tomahawk::Resolver >( resolver );
 }
+
+
+void
+Result::doneEditing()
+{
+    m_query.clear();
+    emit updated();
+}
diff --git a/src/libtomahawk/Result.h b/src/libtomahawk/Result.h
index 0526113ba..622337b02 100644
--- a/src/libtomahawk/Result.h
+++ b/src/libtomahawk/Result.h
@@ -30,6 +30,7 @@
 
 #include "DllMacro.h"
 
+class MetadataEditor;
 class DatabaseCommand_Resolve;
 class DatabaseCommand_AllTracks;
 class DatabaseCommand_AddFiles;
@@ -44,6 +45,7 @@ class DLLEXPORT Result : public QObject
 {
 Q_OBJECT
 
+friend class ::MetadataEditor;
 friend class ::DatabaseCommand_Resolve;
 friend class ::DatabaseCommand_AllTracks;
 friend class ::DatabaseCommand_AddFiles;
@@ -124,12 +126,14 @@ public slots:
 signals:
     // emitted when the collection this result comes from is going offline/online:
     void statusChanged();
+    void updated();
 
 private slots:
     void onOffline();
     void onOnline();
 
     void onResolverRemoved( Tomahawk::Resolver* resolver );
+    void doneEditing();
 
 private:
     // private constructor