aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Woehlke <matthew.woehlke@kitware.com>2013-08-07 13:32:37 -0400
committerJohn Ehresman <jpe@wingware.com>2014-04-15 23:17:13 +0200
commit10ce3bcbcdcb7e846c21c3f4055968a33124fd01 (patch)
treed09b9d26539e6f087a691bfe8c51b0bc6e3ce7f2
parent79d3792cae3f2b6e97ee4f41974d51dfec94a9bc (diff)
Fix shadowed virtuals
Change GlobalReceiver to explicitly 'use' [dis]connectNotify of the base class in order to avoid hiding these with its own overloads. This fixes the only (current) -Woverloaded-virtual warning. Change-Id: I364b9939f9078029861054051148c319071fbbe1 Reviewed-by: John Ehresman <jpe@wingware.com>
-rw-r--r--libpyside/globalreceiver.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libpyside/globalreceiver.h b/libpyside/globalreceiver.h
index 47fad2f23..6da783dcb 100644
--- a/libpyside/globalreceiver.h
+++ b/libpyside/globalreceiver.h
@@ -47,6 +47,10 @@ public:
void disconnectNotify(QObject* sender, int slotId);
bool hasConnectionWith(const QObject* object);
+protected:
+ using QObject::connectNotify;
+ using QObject::disconnectNotify;
+
private:
DynamicQMetaObject m_metaObject;
QSet<int> m_shortCircuitSlots;