Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
760497e8
Commit
760497e8
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
instancemanager: remove pollEvents
Change-Id: Ice84e71ecff31703c379dc34bdbfe09718928ea4
parent
78fbe5d6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/qtwrapper/instancemanager.cpp
+1
-17
1 addition, 17 deletions
src/qtwrapper/instancemanager.cpp
src/qtwrapper/instancemanager_wrap.h
+0
-4
0 additions, 4 deletions
src/qtwrapper/instancemanager_wrap.h
with
1 addition
and
21 deletions
src/qtwrapper/instancemanager.cpp
+
1
−
17
View file @
760497e8
...
@@ -27,9 +27,7 @@
...
@@ -27,9 +27,7 @@
static
int
ringFlags
=
0
;
static
int
ringFlags
=
0
;
void
pollEvents
();
InstanceManagerInterface
::
InstanceManagerInterface
()
InstanceManagerInterface
::
InstanceManagerInterface
()
:
m_pTimer
(
nullptr
)
{
{
using
namespace
std
::
placeholders
;
using
namespace
std
::
placeholders
;
...
@@ -45,15 +43,6 @@ InstanceManagerInterface::InstanceManagerInterface() : m_pTimer(nullptr)
...
@@ -45,15 +43,6 @@ InstanceManagerInterface::InstanceManagerInterface() : m_pTimer(nullptr)
using
DRing
::
VideoSignal
;
using
DRing
::
VideoSignal
;
#endif
#endif
m_pTimer
=
new
QTimer
(
this
);
m_pTimer
->
setInterval
(
50
);
#ifdef Q_OS_WIN
connect
(
m_pTimer
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
pollEvents
()));
#else
connect
(
m_pTimer
,
&
QTimer
::
timeout
,
this
,
&
InstanceManagerInterface
::
pollEvents
);
#endif
m_pTimer
->
start
();
#ifndef MUTE_DRING
#ifndef MUTE_DRING
ringFlags
|=
DRing
::
DRING_FLAG_DEBUG
;
ringFlags
|=
DRing
::
DRING_FLAG_DEBUG
;
ringFlags
|=
DRing
::
DRING_FLAG_CONSOLE_LOG
;
ringFlags
|=
DRing
::
DRING_FLAG_CONSOLE_LOG
;
...
@@ -80,11 +69,6 @@ InstanceManagerInterface::~InstanceManagerInterface()
...
@@ -80,11 +69,6 @@ InstanceManagerInterface::~InstanceManagerInterface()
}
}
void
InstanceManagerInterface
::
pollEvents
()
{
DRing
::
pollEvents
();
}
bool
InstanceManagerInterface
::
isConnected
()
bool
InstanceManagerInterface
::
isConnected
()
{
{
return
true
;
return
true
;
...
...
This diff is collapsed.
Click to expand it.
src/qtwrapper/instancemanager_wrap.h
+
0
−
4
View file @
760497e8
...
@@ -58,11 +58,7 @@ public Q_SLOTS: // METHODS
...
@@ -58,11 +58,7 @@ public Q_SLOTS: // METHODS
bool
isConnected
();
bool
isConnected
();
void
pollEvents
();
private
:
private
:
QTimer
*
m_pTimer
;
Q_SIGNALS
:
// SIGNALS
Q_SIGNALS
:
// SIGNALS
void
started
();
void
started
();
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment