aboutsummaryrefslogtreecommitdiff
path: root/singleapplication_p.h
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-04-13 11:37:18 +0300
committerAqua-sama <aqua@iserlohn-fortress.net>2020-04-13 11:37:18 +0300
commit9d7c34b0fda06f3b4455831a36eb8d420cf29d15 (patch)
tree97b0713b6b35b341b0f7561cbdfacd2df8c8582e /singleapplication_p.h
parentAdd meson build support (diff)
parentMerge pull request #97 from autoantwort/master (diff)
downloadsingleapplication-9d7c34b0fda06f3b4455831a36eb8d420cf29d15.tar.xz
Update to 3.1.1aHEAD3.1.1amaster
Merge branch 'upstream' into staging
Diffstat (limited to 'singleapplication_p.h')
-rw-r--r--singleapplication_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/singleapplication_p.h b/singleapplication_p.h
index 5161411..2682b87 100644
--- a/singleapplication_p.h
+++ b/singleapplication_p.h
@@ -70,9 +70,9 @@ public:
Q_DECLARE_PUBLIC(SingleApplication)
SingleApplicationPrivate( SingleApplication *q_ptr );
- ~SingleApplicationPrivate();
+ ~SingleApplicationPrivate();
- QByteArray getUsername();
+ QString getUsername();
void genBlockServerName();
void initializeMemoryBlock();
void startPrimary();