Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-dashboard
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
4
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
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
cellframe
cellframe-dashboard
Commits
704a4639
Commit
704a4639
authored
5 years ago
by
jonymt
Browse files
Options
Downloads
Patches
Plain Diff
[*] changed ifdef for Win
parent
66615cfd
No related branches found
No related tags found
1 merge request
!8
Features 2442
Pipeline
#666
passed with stage
in 2 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
KelvinDashboardService/DapChainHistoryHandler.cpp
+2
-1
2 additions, 1 deletion
KelvinDashboardService/DapChainHistoryHandler.cpp
KelvinDashboardService/DapChainHistoryHandler.h
+1
-0
1 addition, 0 deletions
KelvinDashboardService/DapChainHistoryHandler.h
with
3 additions
and
1 deletion
KelvinDashboardService/DapChainHistoryHandler.cpp
+
2
−
1
View file @
704a4639
...
@@ -36,7 +36,8 @@ void DapChainHistoryHandler::onRequestNewHistory(const QMap<QString, QVariant>&
...
@@ -36,7 +36,8 @@ void DapChainHistoryHandler::onRequestNewHistory(const QMap<QString, QVariant>&
#ifdef Q_OS_LINUX
#ifdef Q_OS_LINUX
reg_str
=
"(
\\
w{3}
\\
s
\\
w{3}
\\
s
\\
d+
\\
s
\\
d{1,2}:
\\
d{2}:
\\
d{2}
\\
s
\\
d{4})
\\
n"
reg_str
=
"(
\\
w{3}
\\
s
\\
w{3}
\\
s
\\
d+
\\
s
\\
d{1,2}:
\\
d{2}:
\\
d{2}
\\
s
\\
d{4})
\\
n"
"
\\
s(
\\
w+)
\\
s(
\\
d+)
\\
s(
\\
w+)
\\
s
\\
w+
\\
s+(
\\
w+)"
;
"
\\
s(
\\
w+)
\\
s(
\\
d+)
\\
s(
\\
w+)
\\
s
\\
w+
\\
s+(
\\
w+)"
;
#elif Q_OS_WIN
#endif
#ifdef Q_OS_WIN
reg_str
=
"(
\\
w{3}
\\
s
\\
w{3}
\\
s
\\
d+
\\
s
\\
d{1,2}:
\\
d{2}:
\\
d{2}
\\
s
\\
d{4})
\\
r
\\
n"
reg_str
=
"(
\\
w{3}
\\
s
\\
w{3}
\\
s
\\
d+
\\
s
\\
d{1,2}:
\\
d{2}:
\\
d{2}
\\
s
\\
d{4})
\\
r
\\
n"
"
\\
s(
\\
w+)
\\
s(
\\
d+)
\\
s(
\\
w+)
\\
s
\\
w+
\\
s+(
\\
w+)"
;
"
\\
s(
\\
w+)
\\
s(
\\
d+)
\\
s(
\\
w+)
\\
s
\\
w+
\\
s+(
\\
w+)"
;
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
KelvinDashboardService/DapChainHistoryHandler.h
+
1
−
0
View file @
704a4639
#ifndef DAPCHAINHISTORYHANDLER_H
#ifndef DAPCHAINHISTORYHANDLER_H
#define DAPCHAINHISTORYHANDLER_H
#define DAPCHAINHISTORYHANDLER_H
#include
<QtGlobal>
#include
<QObject>
#include
<QObject>
#include
<QVariantList>
#include
<QVariantList>
#include
<QTimer>
#include
<QTimer>
...
...
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