Commit 26b83226 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix compile enable final

svn path=/trunk/KDE/kdeedu/marble/; revision=720821
parent 08d1db7a
......@@ -29,8 +29,6 @@
#include "ViewParams.h"
#include "VisiblePlaceMark.h"
static const double s_labelOutlineWidth = 2.5;
PlaceMarkLayout::PlaceMarkLayout( QObject* parent )
: QObject( parent )
{
......
......@@ -19,8 +19,6 @@
#include "ViewParams.h"
#include "VisiblePlaceMark.h"
static const double s_labelOutlineWidth = 2.5;
PlaceMarkPainter::PlaceMarkPainter( QObject* parent )
: QObject( parent )
{
......
......@@ -32,6 +32,8 @@
class ViewParams;
class VisiblePlaceMark;
static const double s_labelOutlineWidth = 2.5;
class PlaceMarkPainter : public QObject
{
......
......@@ -17,8 +17,6 @@
#include "MarbleDirs.h"
#include "TileLoader.h"
const int tileDigits = 6;
static uint **jumpTableFromQImage32( QImage &img )
{
......
......@@ -23,6 +23,7 @@
#include <QtGui/QImage>
#include <QtCore/QString>
const int tileDigits = 6;
class TextureTile : public QObject {
Q_OBJECT
......
......@@ -25,8 +25,8 @@
#include "MarbleDirs.h"
#include "TileLoader.h"
#include "TextureTile.h"
const int tileDigits = 6;
const int tileSize = 675;
TileCreator::TileCreator(const QString& prefix, const QString& installmap,
......
......@@ -39,8 +39,6 @@
# endif
#endif
const int tileDigits = 6;
TileLoader::TileLoader( const QString& theme )
{
......
......@@ -21,7 +21,7 @@ namespace
{
const QString DOCUMENT_TAG = "document";
const QString KML_TAG = "kml";
const QString STYLE_TAG = "style";
const QString DOCUMENT_STYLE_TAG = "style";
}
KMLDocumentParser::KMLDocumentParser( KMLDocument& document )
......@@ -82,7 +82,7 @@ bool KMLDocumentParser::startElement( const QString& namespaceUri,
else if ( lowerName == DOCUMENT_TAG ) {
result = true;
}
else if ( lowerName == STYLE_TAG ) {
else if ( lowerName == DOCUMENT_STYLE_TAG ) {
if ( m_currentParser != 0 ) {
delete m_currentParser;
delete m_currentStyle;
......
......@@ -18,7 +18,7 @@
namespace
{
const QString ICON_STYLE_TAG = "iconstyle";
const QString KMLICON_STYLE_TAG = "iconstyle";
const QString ICON_TAG = "icon";
const QString HREF_TAG = "href";
}
......@@ -43,7 +43,7 @@ bool KMLIconStyleParser::startElement( const QString& namespaceURI,
if ( ! result ) {
QString lowerName = name.toLower();
if ( lowerName == ICON_STYLE_TAG ) {
if ( lowerName == KMLICON_STYLE_TAG ) {
result = true;
qDebug("KMLColorStyleParser: Start to parse IconStyle");
}
......@@ -75,7 +75,7 @@ bool KMLIconStyleParser::endElement( const QString& namespaceURI,
switch ( m_phase ) {
case IDLE:
if ( lowerName == ICON_STYLE_TAG ) {
if ( lowerName == KMLICON_STYLE_TAG ) {
m_parsed = true;
result = true;
qDebug("KMLColorStyleParser: IconStyle parsed");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment