Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
e867b578
Commit
e867b578
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
positionmanager: fix signature
Change-Id: I68b830eeb775ed043c617db838a5160213152720 GitLab:
#1194
parent
944a20b2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/positionmanager.cpp
+8
-8
8 additions, 8 deletions
src/app/positionmanager.cpp
src/app/positionmanager.h
+8
-8
8 additions, 8 deletions
src/app/positionmanager.h
with
16 additions
and
16 deletions
src/app/positionmanager.cpp
+
8
−
8
View file @
e867b578
...
...
@@ -93,7 +93,7 @@ PositionManager::isConvSharingPosition(const QString& accountId, const QString&
}
void
PositionManager
::
loadPreviousLocations
(
QString
&
accountId
)
PositionManager
::
loadPreviousLocations
(
const
QString
&
accountId
)
{
for
(
auto
it
=
objectListSharingUris_
.
begin
();
it
!=
objectListSharingUris_
.
end
();
it
++
)
{
if
(
it
.
key
().
first
!=
accountId
)
{
...
...
@@ -112,7 +112,7 @@ PositionManager::loadPreviousLocations(QString& accountId)
}
QString
PositionManager
::
getmapTitle
(
QString
&
accountId
,
QString
convId
)
PositionManager
::
getmapTitle
(
const
QString
&
accountId
,
const
QString
&
convId
)
{
if
(
!
convId
.
isEmpty
()
&&
!
accountId
.
isEmpty
())
{
return
lrcInstance_
->
getAccountInfo
(
accountId
).
conversationModel
->
title
(
convId
);
...
...
@@ -180,7 +180,7 @@ PositionManager::onWatchdogTimeout()
}
void
PositionManager
::
sharePosition
(
int
maximumTime
,
QString
accountId
,
QString
convId
)
PositionManager
::
sharePosition
(
int
maximumTime
,
const
QString
&
accountId
,
const
QString
&
convId
)
{
try
{
if
(
settingsManager_
->
getValue
(
Settings
::
Key
::
PositionShareDuration
)
!=
0
)
...
...
@@ -193,7 +193,7 @@ PositionManager::sharePosition(int maximumTime, QString accountId, QString convI
}
void
PositionManager
::
stopSharingPosition
(
QString
accountId
,
const
QString
convId
)
PositionManager
::
stopSharingPosition
(
const
QString
&
accountId
,
const
QString
&
convId
)
{
QString
stopMsg
;
PositionKey
key
=
qMakePair
(
accountId
,
convId
);
...
...
@@ -249,7 +249,7 @@ PositionManager::sendStopMessage(QString accountId, const QString convId)
}
void
PositionManager
::
unPinMap
(
QString
key
)
PositionManager
::
unPinMap
(
const
QString
&
key
)
{
QMutexLocker
lk
(
&
mapStatusMutex_
);
if
(
mapStatus_
.
find
(
key
)
!=
mapStatus_
.
end
())
{
...
...
@@ -262,7 +262,7 @@ PositionManager::unPinMap(QString key)
}
void
PositionManager
::
pinMap
(
QString
key
)
PositionManager
::
pinMap
(
const
QString
&
key
)
{
QMutexLocker
lk
(
&
mapStatusMutex_
);
if
(
mapStatus_
.
find
(
key
)
!=
mapStatus_
.
end
())
{
...
...
@@ -280,7 +280,7 @@ PositionManager::pinMap(QString key)
}
void
PositionManager
::
setMapInactive
(
const
QString
key
)
PositionManager
::
setMapInactive
(
const
QString
&
key
)
{
QMutexLocker
lk
(
&
mapStatusMutex_
);
if
(
mapStatus_
.
find
(
key
)
!=
mapStatus_
.
end
())
{
...
...
@@ -296,7 +296,7 @@ PositionManager::setMapInactive(const QString key)
}
void
PositionManager
::
setMapActive
(
QString
key
)
PositionManager
::
setMapActive
(
const
QString
&
key
)
{
if
(
mapStatus_
.
find
(
key
)
==
mapStatus_
.
end
())
{
mapStatus_
.
insert
(
key
,
false
);
...
...
This diff is collapsed.
Click to expand it.
src/app/positionmanager.h
+
8
−
8
View file @
e867b578
...
...
@@ -73,12 +73,12 @@ protected:
void
sendStopMessage
(
QString
accountId
=
""
,
const
QString
convId
=
""
);
Q_INVOKABLE
void
connectAccountModel
();
Q_INVOKABLE
void
pinMap
(
QString
key
);
Q_INVOKABLE
void
unPinMap
(
QString
key
);
Q_INVOKABLE
void
setMapActive
(
QString
key
);
Q_INVOKABLE
void
setMapInactive
(
const
QString
key
);
Q_INVOKABLE
void
sharePosition
(
int
maximumTime
,
QString
accountId
,
QString
convId
);
Q_INVOKABLE
void
stopSharingPosition
(
QString
accountId
=
""
,
const
QString
convId
=
""
);
Q_INVOKABLE
void
pinMap
(
const
QString
&
key
);
Q_INVOKABLE
void
unPinMap
(
const
QString
&
key
);
Q_INVOKABLE
void
setMapActive
(
const
QString
&
key
);
Q_INVOKABLE
void
setMapInactive
(
const
QString
&
key
);
Q_INVOKABLE
void
sharePosition
(
int
maximumTime
,
const
QString
&
accountId
,
const
QString
&
convId
);
Q_INVOKABLE
void
stopSharingPosition
(
const
QString
&
accountId
=
""
,
const
QString
&
convId
=
""
);
Q_INVOKABLE
void
startPositioning
();
Q_INVOKABLE
void
stopPositioning
();
...
...
@@ -86,8 +86,8 @@ protected:
Q_INVOKABLE
bool
isPositionSharedToConv
(
const
QString
&
accountId
,
const
QString
&
convUid
);
Q_INVOKABLE
bool
isConvSharingPosition
(
const
QString
&
accountId
,
const
QString
&
convUri
);
Q_INVOKABLE
void
loadPreviousLocations
(
QString
&
accountId
);
Q_INVOKABLE
QString
getmapTitle
(
QString
&
accountId
,
QString
convId
=
""
);
Q_INVOKABLE
void
loadPreviousLocations
(
const
QString
&
accountId
);
Q_INVOKABLE
QString
getmapTitle
(
const
QString
&
accountId
,
const
QString
&
convId
=
""
);
private
Q_SLOTS
:
void
onPositionErrorReceived
(
const
QString
error
);
...
...
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