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
fc32858b
Commit
fc32858b
authored
10 years ago
by
Emmanuel Lepage Vallee
Browse files
Options
Downloads
Patches
Plain Diff
person: As ::profilePhoto is now used for vCards, rename it personPhoto
Refs #67080
parent
e7aadb2d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/delegates/pixmapmanipulationdelegate.cpp
+1
-1
1 addition, 1 deletion
src/delegates/pixmapmanipulationdelegate.cpp
src/delegates/pixmapmanipulationdelegate.h
+1
-1
1 addition, 1 deletion
src/delegates/pixmapmanipulationdelegate.h
src/private/vcardutils.cpp
+1
-1
1 addition, 1 deletion
src/private/vcardutils.cpp
with
3 additions
and
3 deletions
src/delegates/pixmapmanipulationdelegate.cpp
+
1
−
1
View file @
fc32858b
...
...
@@ -77,7 +77,7 @@ QByteArray PixmapManipulationDelegate::toByteArray(const QVariant& pxm)
return
QByteArray
();
}
QVariant
PixmapManipulationDelegate
::
p
rofile
Photo
(
const
QByteArray
&
data
,
const
QString
&
type
)
QVariant
PixmapManipulationDelegate
::
p
erson
Photo
(
const
QByteArray
&
data
,
const
QString
&
type
)
{
Q_UNUSED
(
data
)
Q_UNUSED
(
type
)
...
...
This diff is collapsed.
Click to expand it.
src/delegates/pixmapmanipulationdelegate.h
+
1
−
1
View file @
fc32858b
...
...
@@ -63,7 +63,7 @@ public:
virtual
QVariant
numberCategoryIcon
(
const
QVariant
&
p
,
const
QSize
&
size
,
bool
displayPresence
=
false
,
bool
isPresent
=
false
);
virtual
QVariant
securityIssueIcon
(
const
QModelIndex
&
index
);
virtual
QByteArray
toByteArray
(
const
QVariant
&
pxm
);
virtual
QVariant
p
rofile
Photo
(
const
QByteArray
&
data
,
const
QString
&
type
=
"PNG"
);
virtual
QVariant
p
erson
Photo
(
const
QByteArray
&
data
,
const
QString
&
type
=
"PNG"
);
virtual
QVariant
collectionIcon
(
const
CollectionInterface
*
interface
,
PixmapManipulationDelegate
::
CollectionIconHint
hint
=
PixmapManipulationDelegate
::
CollectionIconHint
::
NONE
)
const
;
/**
...
...
This diff is collapsed.
Click to expand it.
src/private/vcardutils.cpp
+
1
−
1
View file @
fc32858b
...
...
@@ -103,7 +103,7 @@ struct VCardMapper {
break
;
}
QVariant
photo
=
PixmapManipulationDelegate
::
instance
()
->
p
rofile
Photo
(
fn
,
type
);
QVariant
photo
=
PixmapManipulationDelegate
::
instance
()
->
p
erson
Photo
(
fn
,
type
);
c
->
setPhoto
(
photo
);
}
...
...
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