Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mtxclient
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
mtxclient
Commits
8841d5f0
Commit
8841d5f0
authored
4 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Don't use nested namespace declarations in headers
Qt < 5.9 moc chokes on that
parent
02299eee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/mtx/log.hpp
+5
-1
5 additions, 1 deletion
include/mtx/log.hpp
include/mtx/pushrules.hpp
+3
-1
3 additions, 1 deletion
include/mtx/pushrules.hpp
include/mtx/user_interactive.hpp
+3
-1
3 additions, 1 deletion
include/mtx/user_interactive.hpp
with
11 additions
and
3 deletions
include/mtx/log.hpp
+
5
−
1
View file @
8841d5f0
...
...
@@ -2,9 +2,13 @@
#include
<string_view>
namespace
mtx
::
utils
::
log
{
namespace
mtx
{
namespace
utils
{
namespace
log
{
void
log_warning
(
const
std
::
string_view
&
msg
);
void
log_error
(
const
std
::
string_view
&
msg
);
}
}
}
This diff is collapsed.
Click to expand it.
include/mtx/pushrules.hpp
+
3
−
1
View file @
8841d5f0
...
...
@@ -10,7 +10,8 @@
#include
<variant>
#include
<vector>
namespace
mtx
::
pushrules
{
namespace
mtx
{
namespace
pushrules
{
struct
PushCondition
{
//! Required. The kind of condition to apply. See conditions for more information on the
...
...
@@ -147,3 +148,4 @@ to_json(nlohmann::json &obj, const Enabled &enabled);
void
from_json
(
const
nlohmann
::
json
&
obj
,
Enabled
&
enabled
);
}
}
This diff is collapsed.
Click to expand it.
include/mtx/user_interactive.hpp
+
3
−
1
View file @
8841d5f0
...
...
@@ -8,7 +8,8 @@
#include
<nlohmann/json.hpp>
namespace
mtx
::
user_interactive
{
namespace
mtx
{
namespace
user_interactive
{
using
AuthType
=
std
::
string
;
namespace
auth_types
{
constexpr
std
::
string_view
password
=
"m.login.password"
;
...
...
@@ -165,3 +166,4 @@ struct Auth
void
to_json
(
nlohmann
::
json
&
obj
,
const
Auth
&
auth
);
}
}
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