[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src/lib/geodata/handlers/dgml
From: Nikolas Zimmermann <wildfox () kde ! org>
Date: 2008-03-10 2:45:58
Message-ID: 1205117158.988119.16276.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 783934 by wildfox:
Cleanup code & style of all tag handlers except minimum/maximum
M +2 -8 DGMLDiscreteTagHandler.cpp
M +0 -2 DGMLDocumentTagHandler.cpp
M +3 -3 DGMLHeadTagHandler.cpp
M +0 -2 DGMLLegendTagHandler.cpp
M +0 -2 DGMLMapTagHandler.cpp
M +0 -2 DGMLPropertyTagHandler.cpp
M +0 -2 DGMLSettingsTagHandler.cpp
M +2 -8 DGMLVisibleTagHandler.cpp
M +3 -3 DGMLZoomTagHandler.cpp
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLDiscreteTagHandler.cpp \
#783933:783934 @@ -47,15 +47,9 @@
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
- if (parentItem.represents(dgmlTag_Zoom))
- {
- bool discrete = false;
+ if (parentItem.represents(dgmlTag_Zoom)) {
QString parsedText = parser.readElementText().toLower().trimmed();
- if ( parsedText == dgmlValue_true || parsedText == dgmlValue_on \
)
- {
- discrete = true;
- }
- parentItem.nodeAs<GeoSceneZoom>()->setDiscrete( discrete );
+ parentItem.nodeAs<GeoSceneZoom>()->setDiscrete(parsedText == \
dgmlValue_true || parsedText == dgmlValue_on); }
return 0;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLDocumentTagHandler.cpp \
#783933:783934 @@ -42,7 +42,5 @@
GeoNode* DGMLDocumentTagHandler::parse(GeoParser& parser) const
{
Q_ASSERT(parser.isStartElement() && \
parser.isValidElement(dgmlTag_Document));
-
- qDebug() << "Parsed <Document> start!";
return geoSceneDoc(parser);
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLHeadTagHandler.cpp \
#783933:783934 @@ -46,8 +46,8 @@
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
- if (!parentItem.represents(dgmlTag_Document))
- return 0;
+ if (parentItem.represents(dgmlTag_Document))
+ return parentItem.nodeAs<GeoSceneDocument>()->head();
- return parentItem.nodeAs<GeoSceneDocument>()->head();;
+ return 0;
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLLegendTagHandler.cpp \
#783933:783934 @@ -42,7 +42,5 @@
GeoNode* DGMLLegendTagHandler::parse(GeoParser& parser) const
{
Q_ASSERT(parser.isStartElement() && \
parser.isValidElement(dgmlTag_Legend));
-
- qDebug() << "Parsed <Legend> start!";
return 0;
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLMapTagHandler.cpp \
#783933:783934 @@ -42,7 +42,5 @@
GeoNode* DGMLMapTagHandler::parse(GeoParser& parser) const
{
Q_ASSERT(parser.isStartElement() && \
parser.isValidElement(dgmlTag_Map));
-
- qDebug() << "Parsed <Map> start!";
return 0;
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLPropertyTagHandler.cpp \
#783933:783934 @@ -42,7 +42,5 @@
GeoNode* DGMLPropertyTagHandler::parse(GeoParser& parser) const
{
Q_ASSERT(parser.isStartElement() && \
parser.isValidElement(dgmlTag_Property));
-
- qDebug() << "Parsed <Property> start!";
return 0;
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLSettingsTagHandler.cpp \
#783933:783934 @@ -42,7 +42,5 @@
GeoNode* DGMLSettingsTagHandler::parse(GeoParser& parser) const
{
Q_ASSERT(parser.isStartElement() && \
parser.isValidElement(dgmlTag_Settings));
-
- qDebug() << "Parsed <Settings> start!";
return 0;
}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLVisibleTagHandler.cpp \
#783933:783934 @@ -47,15 +47,9 @@
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
- if (parentItem.represents(dgmlTag_Head))
- {
- bool visible = false;
+ if (parentItem.represents(dgmlTag_Head)) {
QString parsedText = parser.readElementText().toLower().trimmed();
- if ( parsedText == dgmlValue_true || parsedText == dgmlValue_on \
)
- {
- visible = true;
- }
- parentItem.nodeAs<GeoSceneHead>()->setVisible( visible );
+ parentItem.nodeAs<GeoSceneHead>()->setVisible(parsedText == \
dgmlValue_true || dgmlValue_on); }
return 0;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLZoomTagHandler.cpp \
#783933:783934 @@ -46,8 +46,8 @@
// Checking for parent item
GeoStackItem parentItem = parser.parentElement();
- if (!parentItem.represents(dgmlTag_Head))
- return 0;
+ if (parentItem.represents(dgmlTag_Head))
+ return parentItem.nodeAs<GeoSceneHead>()->zoom();
- return parentItem.nodeAs<GeoSceneHead>()->zoom();;
+ return 0;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic