[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-03-12 13:07:07
Message-ID: 1205327227.019148.10045.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784795 by rahn:

- Fixing usage of pixmaps and colors 



 M  +4 -4      handlers/dgml/DGMLItemTagHandler.cpp  
 M  +1 -23     scene/GeoSceneItem.cpp  
 M  +0 -8      scene/GeoSceneItem.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLItemTagHandler.cpp #784794:784795
@@ -48,15 +48,15 @@
     // Check whether the tag is valid
     Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Item));
 
+    GeoSceneItem* item = 0;
+
     // Checking for parent item
     GeoStackItem parentItem = parser.parentElement();
     if (parentItem.represents(dgmlTag_Section)) {
-        GeoSceneItem* item = new GeoSceneItem;
+        item = new GeoSceneItem;
         parentItem.nodeAs<GeoSceneSection>()->addItem( item );
         item->setText(parser.attribute(dgmlAttr_text));
-        item->setPixmap(parser.attribute(dgmlAttr_pixmap));
-        item->setColor(parser.attribute(dgmlAttr_color));
     }
 
-    return 0;
+    return item;
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneItem.cpp #784794:784795
@@ -22,9 +22,7 @@
 #include "GeoSceneItem.h"
 
 GeoSceneItem::GeoSceneItem()
-    : m_text( "" ),
-      m_pixmap( "" ),
-      m_color( "" )
+    : m_text( "" )
 {
     /* NOOP */
 }
@@ -43,23 +41,3 @@
 {
     m_text = text;
 }
-
-QString GeoSceneItem::pixmap() const
-{
-    return m_pixmap;
-}
-
-void GeoSceneItem::setPixmap( const QString& pixmap )
-{
-    m_pixmap = pixmap;
-}
-
-QString GeoSceneItem::color() const
-{
-    return m_color;
-}
-
-void GeoSceneItem::setColor( const QString& color )
-{
-    m_color = color;
-}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneItem.h #784794:784795
@@ -37,16 +37,8 @@
     QString text() const;
     void setText(const QString& text);
 
-    QString pixmap() const;
-    void setPixmap(const QString& pixmap);
-
-    QString color() const;
-    void setColor(const QString& color);
-
  protected:
     QString m_text;
-    QString m_pixmap;
-    QString m_color;
 };
 
 
[prev in list] [next in list] [prev in thread] [next in thread]