Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
46f989c2
Commit
46f989c2
authored
Jun 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(App): colors getter returns a const pointer now
parent
00bc9aa1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
App.cpp
src/app/App.cpp
+2
-2
App.hpp
src/app/App.hpp
+1
-1
ImageProvider.cpp
src/app/providers/ImageProvider.cpp
+2
-8
No files found.
src/app/App.cpp
View file @
46f989c2
...
...
@@ -353,7 +353,7 @@ void registerToolType (const char *name) {
#define registerSharedToolType(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \
NAME, 1, 0, NAME, \
[](QQmlEngine *, QJSEngine *) -> QObject *{ \
QObject *object =
METHOD(
); \
QObject *object =
const_cast<TYPE *>(METHOD()
); \
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership); \
return object; \
} \
...
...
src/app/App.hpp
View file @
46f989c2
...
...
@@ -64,7 +64,7 @@ public:
return
mNotifier
;
}
Colors
*
getColors
()
const
{
const
Colors
*
getColors
()
const
{
return
mColors
;
}
...
...
src/app/providers/ImageProvider.cpp
View file @
46f989c2
...
...
@@ -58,10 +58,7 @@ static QByteArray buildByteArrayAttribute (const QByteArray &name, const QByteAr
return
attribute
;
}
static
QByteArray
parseFillAndStroke
(
QXmlStreamAttributes
&
readerAttributes
,
const
Colors
&
colors
)
{
static
QByteArray
parseFillAndStroke
(
QXmlStreamAttributes
&
readerAttributes
,
const
Colors
&
colors
)
{
static
QRegExp
regex
(
"^color-([^-]+)-(fill|stroke)$"
);
QByteArray
attributes
;
...
...
@@ -86,10 +83,7 @@ static QByteArray parseFillAndStroke (
return
attributes
;
}
static
QByteArray
parseStyle
(
QXmlStreamAttributes
&
readerAttributes
,
const
Colors
&
colors
)
{
static
QByteArray
parseStyle
(
QXmlStreamAttributes
&
readerAttributes
,
const
Colors
&
colors
)
{
static
QRegExp
regex
(
"^color-([^-]+)-style-(fill|stroke)$"
);
QByteArray
attribute
;
...
...
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