From: Frederik Gladhorn <gladhorn@kde.org>
Date: Mon, 27 Aug 2007 23:56:16 +0000 (+0000)
Subject: add comment to merge section
X-Git-Tag: v3.93.0~23
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=d69aded86bf572b5b24a1f1b69a0f86d26e547ea;p=libqmvoc.git

add comment to merge section

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=705456
---

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 099ca56..d9d9774 100644
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -390,6 +390,10 @@ bool KEduVocDocument::saveAs(const KUrl & url, FileType ft, const QString & gene
 void KEduVocDocument::merge(KEduVocDocument *docToMerge, bool matchIdentifiers)
 {
     kDebug() << "Merging of docs is not implemented"; /// @todo IMPLEMENT ME
+    // This code was really horribly broken.
+    // Now with the new classes we could attempt to reactivate it.
+    // A rewrite might be easier.
+
 /*
   if (docToMerge) {