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

List:       kde-commits
Subject:    branches/KDE/4.6/kdeedu/marble/src/lib
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2010-12-29 22:04:15
Message-ID: 20101229220415.13D83AC8AC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1210173 by beschow:

backport from trunk-r1209644: MergedLayerDecorator: don't derive from QObject

* the repaintMap() signal isn't emitted any longer since the MLD went into the StackedTileLoader

 M  +0 -2      MergedLayerDecorator.cpp  
 M  +1 -7      MergedLayerDecorator.h  
 M  +0 -1      StackedTileLoader.cpp  


--- branches/KDE/4.6/kdeedu/marble/src/lib/MergedLayerDecorator.cpp #1210172:1210173
@@ -374,5 +374,3 @@
     }
     return best;
 }
-
-#include "MergedLayerDecorator.moc"
--- branches/KDE/4.6/kdeedu/marble/src/lib/MergedLayerDecorator.h #1210172:1210173
@@ -17,7 +17,6 @@
 #define MARBLE_MERGEDLAYERDECORATOR_H
 
 #include <QtGui/QImage>
-#include <QtCore/QObject>
 
 #include "TileId.h"
 #include "global.h"
@@ -33,10 +32,8 @@
 class StackedTile;
 class TileLoader;
 
-class MergedLayerDecorator : public QObject
+class MergedLayerDecorator
 {
-    Q_OBJECT
-
  public:
     MergedLayerDecorator( TileLoader * const tileLoader, SunLocator* sunLocator );
     virtual ~MergedLayerDecorator();
@@ -51,9 +48,6 @@
     void setTile(QImage* tile);
     void setInfo( TileId const &id );
 
- Q_SIGNALS:
-    void repaintMap();
-
  private:
     QImage loadDataset();
     int maxDivisor( int maximum, int fullLength );
--- branches/KDE/4.6/kdeedu/marble/src/lib/StackedTileLoader.cpp #1210172:1210173
@@ -86,7 +86,6 @@
 {
     connect( d->m_tileLoader, SIGNAL( tileCompleted( TileId, TileId )),
              SLOT( updateTile( TileId, TileId )));
-    connect( &d->m_layerDecorator, SIGNAL( repaintMap() ), SIGNAL( tileUpdateAvailable() ) );
 }
 
 StackedTileLoader::~StackedTileLoader()
[prev in list] [next in list] [prev in thread] [next in thread]