[Marble-commits] KDE/kdeedu/marble/src/lib/graphicsview

[Jens-Michael Hoffmann]

SVN commit 1005234 by jmhoffmann:

Move public constructors which have a d-pointer parameter to the protected access section.


 M  +3 -1      GeoGraphicsItem.h  
 M  +2 -1      MarbleGraphicsItem.h  
 M  +4 -3      ScreenGraphicsItem.h  


--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/GeoGraphicsItem.h #1005233:1005234
@@ -37,7 +37,6 @@
 {
  public:
     GeoGraphicsItem();
-    explicit GeoGraphicsItem( GeoGraphicsItemPrivate *d_ptr );
     virtual ~GeoGraphicsItem();
 
     enum GeoGraphicsItemFlag {
@@ -110,6 +109,9 @@
     virtual void paint( GeoPainter *painter, ViewportParams *viewport,
                         const QString& renderPos, GeoSceneLayer * layer = 0 ) = 0;
 
+ protected:
+    explicit GeoGraphicsItem( GeoGraphicsItemPrivate *d_ptr );
+
  private:     
     GeoGraphicsItemPrivate *p() const;
 };
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/MarbleGraphicsItem.h #1005233:1005234
@@ -45,7 +45,6 @@
     };
      
     explicit MarbleGraphicsItem( MarbleGraphicsItem *parent = 0 );
-    explicit MarbleGraphicsItem( MarbleGraphicsItemPrivate *d_ptr );
     
     virtual ~MarbleGraphicsItem();
     
@@ -104,6 +103,8 @@
     void show();
     
  protected:
+    explicit MarbleGraphicsItem( MarbleGraphicsItemPrivate *d_ptr );
+
     /**
      * Paints the item in item coordinates. This has to be reimplemented by the subclass
      * This function will be called by paintEvent().
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/ScreenGraphicsItem.h #1005233:1005234
@@ -41,9 +41,6 @@
     explicit ScreenGraphicsItem( MarbleGraphicsItem *parent = 0 );
     ScreenGraphicsItem( const QPointF& position, const QSizeF& size,
                         MarbleGraphicsItem *parent = 0 );
-    explicit ScreenGraphicsItem( ScreenGraphicsItemPrivate *d_ptr );
-    ScreenGraphicsItem( const QPointF& position, const QSizeF& size,
-                        ScreenGraphicsItemPrivate *d_ptr );
     
     virtual ~ScreenGraphicsItem();
 
@@ -94,6 +91,10 @@
     void setFlags( GraphicsItemFlags flags );
     
  protected:
+    explicit ScreenGraphicsItem( ScreenGraphicsItemPrivate *d_ptr );
+    ScreenGraphicsItem( const QPointF& position, const QSizeF& size,
+                        ScreenGraphicsItemPrivate *d_ptr );
+
     virtual bool eventFilter( QObject *, QEvent * );
 
     /**