diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-21 09:22:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-21 09:22:17 +0100 |
| commit | 64e238bc304e60e685acbf4f52b606fb2e92b686 (patch) | |
| tree | b773e3a7bf353148c6efc0b608bf7e6f8d572732 /vcl | |
| parent | e92f098ae50c6de5f1ca4714cd77eb29e2b591cd (diff) | |
loplugin:datamembershadow: KDEXLib::blockIdleTimeout shadows SalXLib member
This smells like there's some sort of needless duplicationg among KDEXLib and
its base calss SalXLib, but this duplication of blockIdleTimeout members had
been like that ever since those members' introduction in
06d731428ef6cf93c7333e8228bfb6088853b52f "make idle timers actually activate
only when idle".
Change-Id: Ic3eec821b2433745e83fc23d65d3c5f8e1fcf663
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 510c5c9c81e2..cdf148995cec 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -51,7 +51,7 @@ KDEXLib::KDEXLib() : SalXLib(), m_bStartupDone(false), m_pFreeCmdLineArgs(nullptr), m_pAppCmdLineArgs(nullptr), m_nFakeCmdLineArgs( 0 ), m_frameWidth( -1 ), m_isGlibEventLoopType(false), - m_allowKdeDialogs(false), blockIdleTimeout(false) + m_allowKdeDialogs(false), m_blockIdleTimeout(false) { // the timers created here means they belong to the main thread. // As the timeoutTimer runs the LO event queue, which may block on a dialog, @@ -306,7 +306,7 @@ SalYieldResult KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) SalYieldResult KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents ) { - blockIdleTimeout = !bWait; + m_blockIdleTimeout = !bWait; QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance( qApp->thread()); bool wasEvent = false; for( int cnt = bHandleAllCurrentEvents ? 100 : 1; @@ -319,7 +319,7 @@ SalYieldResult KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents ) } if( bWait && !wasEvent ) dispatcher->processEvents( QEventLoop::WaitForMoreEvents ); - blockIdleTimeout = false; + m_blockIdleTimeout = false; return wasEvent ? SalYieldResult::EVENT : SalYieldResult::TIMEOUT; } @@ -362,7 +362,7 @@ void KDEXLib::timeoutActivated() // QGuiEventDispatcherGlib makes glib watch also X11 fd, but its hasPendingEvents() // doesn't check X11, so explicitly check XPending() here. - bool idle = QApplication::hasPendingEvents() && !blockIdleTimeout && !XPending( QX11Info::display()); + bool idle = QApplication::hasPendingEvents() && !m_blockIdleTimeout && !XPending( QX11Info::display()); X11SalData::Timeout( idle ); // QTimer is not single shot, so will be restarted immediately } diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index c4e18f92e2e6..3383ce8d34c9 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -56,7 +56,7 @@ class KDEXLib : public QObject, public SalXLib int m_frameWidth; bool m_isGlibEventLoopType; bool m_allowKdeDialogs; - bool blockIdleTimeout; + bool m_blockIdleTimeout; private: void setupEventLoop(); |