Making it compile & ingores.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=431444

diff --git a/kdeeduui/Makefile.am b/kdeeduui/Makefile.am
index 0b4d034a16d4049ec09ed326a57996b96094433b..dbec4004d0efe817f942ad8d652bcfb54d926834 100644 (file)
--- a/kdeeduui/Makefile.am
+++ b/kdeeduui/Makefile.am
@@ -4,8 +4,7 @@ SUBDIRS = .  tests
 lib_LTLIBRARIES = libkdeeduui.la
 
 libkdeeduui_la_SOURCES = \
-            kedusimpleentrydlg.cpp  kedusimpleentrydlgForm.ui
-                       kdeeduglossary.cpp
+            kedusimpleentrydlg.cpp  kedusimpleentrydlgForm.ui kdeeduglossary.cpp
 
 libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
 libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)

diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp
index 0f064792dc25ccb4041698d4de25b502d6c6cfb0..cf86b6a6f3437050d85a0184e0ec64c1421483f9 100644 (file)
--- a/kdeeduui/kdeeduglossary.cpp
+++ b/kdeeduui/kdeeduglossary.cpp
@@ -7,7 +7,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "glossarydialog.h"
+#include "kdeeduglossary.h"
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -102,7 +102,7 @@ QValueList<GlossaryItem*> Glossary::readItems( QDomDocument &itemDocument )
 //X            list.append( item );
 //X    }
 //X    
-//X    return list;
+       return list;
 }
 
 
@@ -324,6 +324,8 @@ void GlossaryDialog::slotClose()
 
 QString GlossaryItem::toHtml() const
 {
+       //XXX TMP!!!
+       QString code;
 //X    QString code = "<h1>" + m_name + "</h1>" + m_desc;
 //X 
 //X // QString pic_path = locate("data", "kalzium/data/knowledgepics/");
@@ -332,11 +334,13 @@ QString GlossaryItem::toHtml() const
 //X            QString refcode = parseReferences();
 //X            code += refcode;
 //X    }
-//X    return code;
+       return code;
 }
 
-QString KnowledgeItem::parseReferences() const
+QString GlossaryItem::parseReferences() const
 {
+       //XXX TMP!!!
+       QString htmlcode;
 //X    QString htmlcode = "<h3>" + i18n( "References" ) + "</h3>";
 //X    
 //X    bool first = true;
@@ -349,7 +353,7 @@ QString KnowledgeItem::parseReferences() const
 //X            htmlcode += QString( "<a href=\"item://%1\">%2</a>" ).arg( m_ref[i], m_ref[i] );
 //X    }
 //X 
-//X    return htmlcode;
+       return htmlcode;
 }