Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
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
Container 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
Nheko Reborn
nheko
Commits
847ae37d
Commit
847ae37d
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Linting
parent
bdf9b6e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/Gentoo/nheko-9999.ebuild
+10
-10
10 additions, 10 deletions
dist/Gentoo/nheko-9999.ebuild
include/Versions.h
+0
-2
0 additions, 2 deletions
include/Versions.h
src/LoginPage.cc
+4
-4
4 additions, 4 deletions
src/LoginPage.cc
src/Versions.cc
+2
-2
2 additions, 2 deletions
src/Versions.cc
with
16 additions
and
18 deletions
dist/Gentoo/nheko-9999.ebuild
+
10
−
10
View file @
847ae37d
...
...
@@ -9,8 +9,8 @@ HOMEPAGE="https://github.com/mujx/nheko"
inherit git-r3 eutils cmake-utils
if
[[
${
PV
}
==
"9999"
]]
;
then
SRC_URI
=
""
EGIT_REPO_URI
=
"git://github.com/mujx/nheko.git"
SRC_URI
=
""
EGIT_REPO_URI
=
"git://github.com/mujx/nheko.git"
fi
LICENSE
=
"GPL-3"
...
...
@@ -18,26 +18,26 @@ SLOT="0"
IUSE
=
""
DEPEND
=
">=dev-qt/qtgui-5.7.1
media-libs/fontconfig"
media-libs/fontconfig"
RDEPEND
=
"
${
DEPEND
}
"
src_configure
()
{
cmake-utils_src_configure
cmake-utils_src_configure
}
src_compile
()
{
emake
DESTDIR
=
"
${
D
}
"
emake
DESTDIR
=
"
${
D
}
"
}
src_install
()
{
local
icon_size
local
icon_size
for
icon_size
in
16 32 48 64 128 256 512
;
do
newicon
-s
"
${
icon_size
}
"
\
"
${
S
}
/resources/nheko-
${
icon_size
}
.png"
\
nheko.png
"
${
S
}
/resources/nheko-
${
icon_size
}
.png"
\
nheko.png
done
domenu
${
S
}
/resources/nheko.desktop
domenu
${
S
}
/resources/nheko.desktop
dobin
${
S
}
/build/nheko
dobin
${
S
}
/build/nheko
}
This diff is collapsed.
Click to expand it.
include/Versions.h
+
0
−
2
View file @
847ae37d
...
...
@@ -22,7 +22,6 @@
#include
"Deserializable.h"
class
VersionsResponse
:
public
Deserializable
{
public:
...
...
@@ -38,5 +37,4 @@ private:
};
QVector
<
Version_
>
supported_versions_
;
};
This diff is collapsed.
Click to expand it.
src/LoginPage.cc
+
4
−
4
View file @
847ae37d
...
...
@@ -21,9 +21,9 @@
#include
"LoginPage.h"
LoginPage
::
LoginPage
(
QSharedPointer
<
MatrixClient
>
client
,
QWidget
*
parent
)
:
QWidget
(
parent
)
,
inferredServerAddress_
()
,
client_
{
client
}
:
QWidget
(
parent
)
,
inferredServerAddress_
()
,
client_
{
client
}
{
setStyleSheet
(
"background-color: #f9f9f9"
);
...
...
@@ -212,7 +212,7 @@ void LoginPage::versionError(QString error)
QString
mxidAddress
=
matrixid_input_
->
text
().
split
(
":"
).
at
(
1
);
if
(
currentServer
.
host
()
==
inferredServerAddress_
&&
!
currentServer
.
host
().
startsWith
(
"matrix"
))
{
error_label_
->
setText
(
""
);
currentServer
.
setHost
(
QString
(
"matrix."
)
+
currentServer
.
host
());
currentServer
.
setHost
(
QString
(
"matrix."
)
+
currentServer
.
host
());
serverInput_
->
setText
(
currentServer
.
host
());
client_
->
setServer
(
currentServer
.
host
());
client_
->
versions
();
...
...
This diff is collapsed.
Click to expand it.
src/Versions.cc
+
2
−
2
View file @
847ae37d
...
...
@@ -35,7 +35,7 @@ void VersionsResponse::deserialize(const QJsonDocument &data)
throw
DeserializationException
(
"Versions: missing version list"
);
auto
versions
=
object
.
value
(
"versions"
).
toArray
();
for
(
auto
const
&
elem
:
versions
)
{
for
(
auto
const
&
elem
:
versions
)
{
QString
str
=
elem
.
toString
();
QRegExp
rx
(
"r(
\\
d+)
\\
.(
\\
d+)
\\
.(
\\
d+)"
);
...
...
@@ -53,7 +53,7 @@ void VersionsResponse::deserialize(const QJsonDocument &data)
bool
VersionsResponse
::
isVersionSupported
(
unsigned
int
major
,
unsigned
int
minor
,
unsigned
int
patch
)
{
for
(
auto
&
v
:
supported_versions_
)
{
for
(
auto
&
v
:
supported_versions_
)
{
if
(
v
.
major_
==
major
&&
v
.
minor_
==
minor
&&
v
.
patch_
>=
patch
)
return
true
;
}
...
...
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