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
24f35997
Commit
24f35997
authored
6 years ago
by
Allan Nordhøy
Browse files
Options
Downloads
Patches
Plain Diff
Spelling: Id -> ID. Uid -> UID
Change-Id: I582190d3a54038b2e6bc301b1710d96ac5ab7e03
parent
24cdcdd7
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/certificate.cpp
+1
-1
1 addition, 1 deletion
src/certificate.cpp
src/phonedirectorymodel.cpp
+1
-1
1 addition, 1 deletion
src/phonedirectorymodel.cpp
src/ringdevicemodel.cpp
+1
-1
1 addition, 1 deletion
src/ringdevicemodel.cpp
with
3 additions
and
3 deletions
src/certificate.cpp
+
1
−
1
View file @
24f35997
...
@@ -101,7 +101,7 @@ Matrix1D<Certificate::Details,QString> CertificatePrivate::m_slDetailssName = {{
...
@@ -101,7 +101,7 @@ Matrix1D<Certificate::Details,QString> CertificatePrivate::m_slDetailssName = {{
/* SIGNATURE_ALGORITHM */
QObject
::
tr
(
"Signature algorithm"
),
/* SIGNATURE_ALGORITHM */
QObject
::
tr
(
"Signature algorithm"
),
/* MD5_FINGERPRINT */
QObject
::
tr
(
"Md5 fingerprint"
),
/* MD5_FINGERPRINT */
QObject
::
tr
(
"Md5 fingerprint"
),
/* SHA1_FINGERPRINT */
QObject
::
tr
(
"Sha1 fingerprint"
),
/* SHA1_FINGERPRINT */
QObject
::
tr
(
"Sha1 fingerprint"
),
/* PUBLIC_KEY_ID */
QObject
::
tr
(
"Public key
id
"
),
/* PUBLIC_KEY_ID */
QObject
::
tr
(
"Public key
ID
"
),
/* ISSUER_DN */
QObject
::
tr
(
"Issuer domain name"
),
/* ISSUER_DN */
QObject
::
tr
(
"Issuer domain name"
),
/* NEXT_EXPECTED_UPDATE_DATE */
QObject
::
tr
(
"Next expected update"
),
/* NEXT_EXPECTED_UPDATE_DATE */
QObject
::
tr
(
"Next expected update"
),
/* OUTGOING_SERVER */
QObject
::
tr
(
"Outgoing server"
),
/* OUTGOING_SERVER */
QObject
::
tr
(
"Outgoing server"
),
...
...
This diff is collapsed.
Click to expand it.
src/phonedirectorymodel.cpp
+
1
−
1
View file @
24f35997
...
@@ -304,7 +304,7 @@ QVariant PhoneDirectoryModel::headerData(int section, Qt::Orientation orientatio
...
@@ -304,7 +304,7 @@ QVariant PhoneDirectoryModel::headerData(int section, Qt::Orientation orientatio
Q_UNUSED
(
orientation
)
Q_UNUSED
(
orientation
)
static
const
QString
headers
[]
=
{
tr
(
"URI"
),
tr
(
"Type"
),
tr
(
"Person"
),
tr
(
"Account"
),
tr
(
"State"
),
tr
(
"Call count"
),
tr
(
"Week count"
),
static
const
QString
headers
[]
=
{
tr
(
"URI"
),
tr
(
"Type"
),
tr
(
"Person"
),
tr
(
"Account"
),
tr
(
"State"
),
tr
(
"Call count"
),
tr
(
"Week count"
),
tr
(
"Trimester count"
),
tr
(
"Have Called"
),
tr
(
"Last used"
),
tr
(
"Name_count"
),
tr
(
"Total (in seconds)"
),
tr
(
"Popularity_index"
),
tr
(
"Trimester count"
),
tr
(
"Have Called"
),
tr
(
"Last used"
),
tr
(
"Name_count"
),
tr
(
"Total (in seconds)"
),
tr
(
"Popularity_index"
),
tr
(
"Bookmarked"
),
tr
(
"Tracked"
),
tr
(
"Has certificate"
),
tr
(
"Present"
),
tr
(
"Presence message"
),
tr
(
"U
id
"
),
tr
(
"Registered name"
)
};
tr
(
"Bookmarked"
),
tr
(
"Tracked"
),
tr
(
"Has certificate"
),
tr
(
"Present"
),
tr
(
"Presence message"
),
tr
(
"U
ID
"
),
tr
(
"Registered name"
)
};
if
(
role
==
Qt
::
DisplayRole
)
return
headers
[
section
];
if
(
role
==
Qt
::
DisplayRole
)
return
headers
[
section
];
return
QVariant
();
return
QVariant
();
}
}
...
...
This diff is collapsed.
Click to expand it.
src/ringdevicemodel.cpp
+
1
−
1
View file @
24f35997
...
@@ -107,7 +107,7 @@ QVariant RingDeviceModel::headerData( int section, Qt::Orientation ori, int role
...
@@ -107,7 +107,7 @@ QVariant RingDeviceModel::headerData( int section, Qt::Orientation ori, int role
switch
(
section
)
{
switch
(
section
)
{
case
static_cast
<
int
>
(
RingDevice
::
Column
::
Id
):
case
static_cast
<
int
>
(
RingDevice
::
Column
::
Id
):
return
tr
(
"I
d
"
);
return
tr
(
"I
D
"
);
case
static_cast
<
int
>
(
RingDevice
::
Column
::
Name
):
case
static_cast
<
int
>
(
RingDevice
::
Column
::
Name
):
return
tr
(
"Name"
);
return
tr
(
"Name"
);
default:
default:
...
...
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