make 1.8 compile with sip newer sip version (basically backport of @6…

…41359d3)
qgis · Oct 24, 2013 · 306e177 · 306e177
1 parent 4539469
commit 306e177
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/core/qgsmaplayerregistry.h b/src/core/qgsmaplayerregistry.h
@@ -164,17 +164,16 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
 //! protected constructor
     QgsMapLayerRegistry( QObject * parent = 0 );
 
-  private:
-
-    static QgsMapLayerRegistry* mInstance;
-
-    QMap<QString, QgsMapLayer*> mMapLayers;
-
     /** debugging member
         invoked when a connect() is made to this object
     */
     void connectNotify( const char * signal );
 
+  private:
+
+    static QgsMapLayerRegistry* mInstance;
+
+    QMap<QString, QgsMapLayer*> mMapLayers;
 
 }; // class QgsMapLayerRegistry
 

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -408,6 +408,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     /// Handle pattern for implementation object
     std::auto_ptr<CanvasProperties> mCanvasProperties;
 
+    /**debugging member
+       invoked when a connect() is made to this object
+    */
+    void connectNotify( const char * signal );
+
   private slots:
     void crsTransformEnabled( bool );
 
@@ -455,11 +460,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
        the last entry in case a lot of resize events arrive in short time*/
     QList< QPair<int, int> > mResizeQueue;
 
-    /**debugging member
-       invoked when a connect() is made to this object
-    */
-    void connectNotify( const char * signal );
-
     //! current layer in legend
     QgsMapLayer* mCurrentLayer;
 

diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h
@@ -42,10 +42,11 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
   public slots:
     void logMessage( QString message, QString tag, int level );
 
-  private:
+  protected:
     void showEvent( QShowEvent * );
     void hideEvent( QHideEvent * );
 
+  private:
     QToolButton *mButton;
     int mCount;