Mirrors/QtAwesome
1
0
Fork 0
mirror of https://github.com/gamecreature/QtAwesome.git synced 2025-12-17 04:04:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename fa::linux to fa::_linux to avoid name conflict with linux system #defines

Browse Source
This commit is contained in:
Joel Nordell
2016-01-28 12:06:13 -06:00
parent 9b354b3f04
commit 34f5247d76
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QtAwesome/QtAwesome.cpp
View File

@@ -568,7 +568,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("link", fa::link ); m.insert("link", fa::link );
m.insert("linkedin", fa::linkedin ); m.insert("linkedin", fa::linkedin );
m.insert("linkedinsquare", fa::linkedinsquare ); m.insert("linkedinsquare", fa::linkedinsquare );
m.insert("linux", fa::linux ); m.insert("linux", fa::_linux );
m.insert("list", fa::list ); m.insert("list", fa::list );
m.insert("listalt", fa::listalt ); m.insert("listalt", fa::listalt );
m.insert("listol", fa::listol ); m.insert("listol", fa::listol );

2
QtAwesome/QtAwesome.h
View File

@@ -391,7 +391,7 @@ namespace fa {
link = 0xf0c1, link = 0xf0c1,
linkedin = 0xf0e1, linkedin = 0xf0e1,
linkedinsquare = 0xf08c, linkedinsquare = 0xf08c,
linux = 0xf17c, _linux = 0xf17c,
list = 0xf03a, list = 0xf03a,
listalt = 0xf022, listalt = 0xf022,
listol = 0xf0cb, listol = 0xf0cb,