summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtSwift.h')
-rw-r--r--Swift/QtUI/QtSwift.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index f35d2cc..d876cd8 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -8,2 +8,3 @@
+#include <map>
#include <string>
@@ -14,2 +15,3 @@
#include <Swiften/Base/Platform.h>
+#include <Swiften/Client/ClientOptions.h>
#include <Swiften/EventLoop/Qt/QtEventLoop.h>
@@ -70,2 +72,3 @@ namespace Swift {
void handleAutoUpdaterStateChanged(AutoUpdater::State updatedState);
+ void handleWantsToAddAccount();
@@ -75,2 +78,9 @@ namespace Swift {
static const std::string& updateChannelToFeed(const std::string& channel);
+ QtLoginWindow* addAccount();
+ ClientOptions parseClientOptions(const std::string& optionString);
+ void restoreAccounts();
+ /**
+ * Upgrades the config from pre-multi-account to post-multi-account format (added in 5.0).
+ */
+ void migrateLastLoginAccount();
@@ -91,3 +101,2 @@ namespace Swift {
URIHandler* uriHandler_;
- QtChatTabs* tabs_;
ApplicationPathProvider* applicationPathProvider_;
@@ -100,2 +109,5 @@ namespace Swift {
ActualIdleDetector idleDetector_;
+ std::map<std::string, std::string> emoticons_;
+ bool enableAdHocCommandOnJID_ = false;
+ bool useDelayForLatency_;
#if defined(SWIFTEN_PLATFORM_MACOSX)