Skip to content
Permalink
Browse files

fix #8507

made void connectNotify( const char * signal ) protected instead of private
made bool eventFilter( QObject *obj, QEvent *event ) protected instead of private
made void showEvent( QShowEvent * ) and void hideEvent( QHideEvent * ) instead of private
  • Loading branch information
christianurich authored and jef-n committed Sep 10, 2013
1 parent e02b88b commit 349a4c974fab88fdda0d612dea8defe037ec50ba
Showing with 14 additions and 11 deletions.
  1. +5 −4 src/core/qgsmaplayerregistry.h
  2. +2 −1 src/gui/qgsattributedialog.h
  3. +5 −5 src/gui/qgsmapcanvas.h
  4. +2 −1 src/gui/qgsmessagelogviewer.h
@@ -239,17 +239,18 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
//! protected constructor
QgsMapLayerRegistry( QObject * parent = 0 );

/** debugging member
invoked when a connect() is made to this object
*/
void connectNotify( const char * signal );

private:

static QgsMapLayerRegistry* mInstance;

QMap<QString, QgsMapLayer*> mMapLayers;
QSet<QgsMapLayer*> mOwnedLayers;

/** debugging member
invoked when a connect() is made to this object
*/
void connectNotify( const char * signal );


}; // class QgsMapLayerRegistry
@@ -59,9 +59,10 @@ class GUI_EXPORT QgsAttributeDialog : public QObject

void dialogDestroyed();

private:
protected:
bool eventFilter( QObject *obj, QEvent *event );

private:
QDialog *mDialog;
QString mSettingsPath;
// Used to sync multiple widgets for the same field
@@ -410,6 +410,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 );

@@ -459,11 +464,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;

@@ -42,10 +42,11 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
public slots:
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );

private:
protected:
void showEvent( QShowEvent * );
void hideEvent( QHideEvent * );

private:
QToolButton *mButton;
int mCount;

0 comments on commit 349a4c9

Please sign in to comment.
You can’t perform that action at this time.