From f993a5cd557c661110566c1d02a79369bf562833 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 4 Jul 2005 11:05:11 +0000 Subject: [PATCH] Making it compile & ingores. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=431444 --- kdeeduui/Makefile.am | 3 +-- kdeeduui/kdeeduglossary.cpp | 14 +++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kdeeduui/Makefile.am b/kdeeduui/Makefile.am index 0b4d034..dbec400 100644 --- 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 0f06479..cf86b6a 100644 --- a/kdeeduui/kdeeduglossary.cpp +++ b/kdeeduui/kdeeduglossary.cpp @@ -7,7 +7,7 @@ * * ***************************************************************************/ -#include "glossarydialog.h" +#include "kdeeduglossary.h" #include #include @@ -102,7 +102,7 @@ QValueList 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 = "

" + m_name + "

" + 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 = "

" + i18n( "References" ) + "

"; //X //X bool first = true; @@ -349,7 +353,7 @@ QString KnowledgeItem::parseReferences() const //X htmlcode += QString( "%2" ).arg( m_ref[i], m_ref[i] ); //X } //X -//X return htmlcode; + return htmlcode; } -- 2.47.3