Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
e8a2170e
Kaydet (Commit)
e8a2170e
authored
Kas 24, 2015
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
vcl: fix for kde4.
Change-Id: If68e58a5b1d6dfe7d7851513eed73ec20d1cd912
üst
f2736763
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
KDEXLib.cxx
vcl/unx/kde4/KDEXLib.cxx
+8
-5
KDEXLib.hxx
vcl/unx/kde4/KDEXLib.hxx
+2
-2
No files found.
vcl/unx/kde4/KDEXLib.cxx
Dosyayı görüntüle @
e8a2170e
...
...
@@ -276,7 +276,7 @@ void KDEXLib::socketNotifierActivated( int fd )
sdata
.
handle
(
fd
,
sdata
.
data
);
}
bool
KDEXLib
::
Yield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
SalYieldResult
KDEXLib
::
Yield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
{
if
(
!
m_isGlibEventLoopType
)
{
...
...
@@ -287,7 +287,9 @@ bool KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
// otherwise they can remain unhandled for quite a long while
wasEvent
=
processYield
(
false
,
bHandleAllCurrentEvents
);
}
return
SalXLib
::
Yield
(
bWait
,
bHandleAllCurrentEvents
)
||
wasEvent
;
SalYieldResult
aResult
=
SalXLib
::
Yield
(
bWait
,
bHandleAllCurrentEvents
);
return
(
aResult
==
SalYieldResult
::
EVENT
||
wasEvent
)
?
SalYieldResult
::
EVENT
:
SalYieldResult
::
TIMEOUT
;
}
// if we are the main thread (which is where the event processing is done),
// good, just do it
...
...
@@ -303,11 +305,11 @@ bool KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
// temporarily do it while checking for new events)
SalYieldMutexReleaser
aReleaser
;
Q_EMIT
processYieldSignal
(
bWait
,
bHandleAllCurrentEvents
);
return
false
;
return
SalYieldResult
::
TIMEOUT
;
}
}
bool
KDEXLib
::
processYield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
SalYieldResult
KDEXLib
::
processYield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
{
blockIdleTimeout
=
!
bWait
;
QAbstractEventDispatcher
*
dispatcher
=
QAbstractEventDispatcher
::
instance
(
qApp
->
thread
());
...
...
@@ -323,7 +325,8 @@ bool KDEXLib::processYield( bool bWait, bool bHandleAllCurrentEvents )
if
(
bWait
&&
!
wasEvent
)
dispatcher
->
processEvents
(
QEventLoop
::
WaitForMoreEvents
);
blockIdleTimeout
=
false
;
return
wasEvent
;
return
wasEvent
?
SalYieldResult
::
EVENT
:
SalYieldResult
::
TIMEOUT
;
}
void
KDEXLib
::
StartTimer
(
sal_uLong
nMS
)
...
...
vcl/unx/kde4/KDEXLib.hxx
Dosyayı görüntüle @
e8a2170e
...
...
@@ -67,7 +67,7 @@ class KDEXLib : public QObject, public SalXLib
void
userEventActivated
();
void
startTimeoutTimer
();
void
startUserEventTimer
();
bool
processYield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
);
SalYieldResult
processYield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
);
Q_SIGNALS
:
void
startTimeoutTimerSignal
();
void
startUserEventTimerSignal
();
...
...
@@ -81,7 +81,7 @@ class KDEXLib : public QObject, public SalXLib
virtual
~
KDEXLib
();
virtual
void
Init
()
override
;
virtual
bool
Yield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
override
;
virtual
SalYieldResult
Yield
(
bool
bWait
,
bool
bHandleAllCurrentEvents
)
override
;
virtual
void
Insert
(
int
fd
,
void
*
data
,
YieldFunc
pending
,
YieldFunc
queued
,
YieldFunc
handle
)
override
;
virtual
void
Remove
(
int
fd
)
override
;
virtual
void
StartTimer
(
sal_uLong
nMS
)
override
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment