Skip to content

Commit 641359d

Browse files
christianurichm-kuhn
authored andcommitted
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
1 parent bb002ee commit 641359d

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

src/core/qgsmaplayerregistry.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,18 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
239239
//! protected constructor
240240
QgsMapLayerRegistry( QObject * parent = 0 );
241241

242+
/** debugging member
243+
invoked when a connect() is made to this object
244+
*/
245+
void connectNotify( const char * signal );
246+
242247
private:
243248

244249
static QgsMapLayerRegistry* mInstance;
245250

246251
QMap<QString, QgsMapLayer*> mMapLayers;
247252
QSet<QgsMapLayer*> mOwnedLayers;
248253

249-
/** debugging member
250-
invoked when a connect() is made to this object
251-
*/
252-
void connectNotify( const char * signal );
253254

254255

255256
}; // class QgsMapLayerRegistry

src/gui/qgsattributedialog.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ class GUI_EXPORT QgsAttributeDialog : public QObject
5959

6060
void dialogDestroyed();
6161

62-
private:
62+
protected:
6363
bool eventFilter( QObject *obj, QEvent *event );
6464

65+
private:
6566
QDialog *mDialog;
6667
QString mSettingsPath;
6768
// Used to sync multiple widgets for the same field

src/gui/qgsmapcanvas.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
410410
/// Handle pattern for implementation object
411411
std::auto_ptr<CanvasProperties> mCanvasProperties;
412412

413+
/**debugging member
414+
invoked when a connect() is made to this object
415+
*/
416+
void connectNotify( const char * signal );
417+
413418
private slots:
414419
void crsTransformEnabled( bool );
415420

@@ -459,11 +464,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
459464
the last entry in case a lot of resize events arrive in short time*/
460465
QList< QPair<int, int> > mResizeQueue;
461466

462-
/**debugging member
463-
invoked when a connect() is made to this object
464-
*/
465-
void connectNotify( const char * signal );
466-
467467
//! current layer in legend
468468
QgsMapLayer* mCurrentLayer;
469469

src/gui/qgsmessagelogviewer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
4242
public slots:
4343
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
4444

45-
private:
45+
protected:
4646
void showEvent( QShowEvent * );
4747
void hideEvent( QHideEvent * );
4848

49+
private:
4950
QToolButton *mButton;
5051
int mCount;
5152

0 commit comments

Comments
 (0)