Cleanup

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

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 4250c8b8c06baf9f75253917407c0a6ebc3d829d..1cf8e87af12cca44a659874d7ad0ce8ef846cec1 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -78,7 +78,6 @@ KEduVocDocument::KEduVocDocument(QObject *parent)
 
 KEduVocDocument::~KEduVocDocument()
 {
-  delete m_font;
 }
 
 
@@ -111,7 +110,7 @@ void KEduVocDocument::Init ()
   m_remark = "";
   m_version = "";
   m_generator = "";
-  m_font = NULL;
+//  m_font = NULL;
 
   m_activeLeitnerSystem = false;
   m_leitnerSystem = NULL;
@@ -751,12 +750,6 @@ QString KEduVocDocument::docRemark() const
 }
 
 
-QFont* KEduVocDocument::font() const
-{
-  return m_font;
-}
-
-
 void KEduVocDocument::setTitle(const QString & title)
 {
   m_title = title.simplified();
@@ -781,13 +774,6 @@ void KEduVocDocument::setDocRemark(const QString & s)
 }
 
 
-void KEduVocDocument::setFont(QFont* font)
-{
-  delete m_font;
-  m_font = font;
-}
-
-
 int KEduVocDocument::search(const QString &substr, int id, int first, int last, bool word_start)
 {
   if (last >= entryCount() || last < 0)

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 1ffef081180815dc19e0e2f8b2e7f86711d8c108..be056c3f8b4eb6b7be808b7a16efedcff256829e 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -578,11 +578,6 @@ public:
    */
   QString docRemark() const;
 
-  /**
-   * @returns the font
-   */
-  QFont* font() const;
-
   /**
    * Retrieves the identifiers for the current query
    *
@@ -621,11 +616,6 @@ public:
    */
   void setDocRemark(const QString & rem);
 
-  /**
-   * Sets the font
-   */
-  void setFont(QFont *font);
-
   /**
    * Sets the generator of the file
    */
@@ -763,7 +753,6 @@ private:
   int                       m_currentLesson;
   QList<int>                m_extraSizeHints;
   QList<int>                m_sizeHints;
-  QFont*                    m_font;
 
   QString                   m_generator;
   QString                   m_queryorg;

diff --git a/kdeeducore/keduvocwqlreader.cpp b/kdeeducore/keduvocwqlreader.cpp
index d143a8b305801d960466b419f03f778d5bec6f11..69f18e25f5e826d60f78250fd0f93cacb0a2970d 100644 (file)
--- a/kdeeducore/keduvocwqlreader.cpp
+++ b/kdeeducore/keduvocwqlreader.cpp
@@ -84,7 +84,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   s = s.right(s.length() - (p + 1));
   bool it = (s == "1");
 
-  m_doc->setFont(new QFont(fam, ps, b, it));
+  //m_doc->setFont(new QFont(fam, ps, b, it));
 
 /* TODO
   while (inputStream.readLine() != "[Character Info]");