From d69aded86bf572b5b24a1f1b69a0f86d26e547ea Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 27 Aug 2007 23:56:16 +0000 Subject: [PATCH] add comment to merge section svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=705456 --- keduvocdocument/keduvocdocument.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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) { -- 2.47.3