Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-11-10 10:34:02 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-12-23 11:46:08 (GMT) |
| commit | fd69376ab41d443d854fe26367dc027dd490d96b (patch) | |
| tree | 8c786e791f61bb949f546243ef5c419a0f241a5a /Swift/QtUI/QtSwift.h | |
| parent | eac8b0d41d9ba7609a22f0d84fabc488872cc547 (diff) | |
| download | swift-fd69376ab41d443d854fe26367dc027dd490d96b.zip swift-fd69376ab41d443d854fe26367dc027dd490d96b.tar.bz2 | |
Bundle a bare set of emoticons with Swift.
Change-Id: I6b5bc58558a94b5d3939171ebf5d318a067c8b3d
Diffstat (limited to 'Swift/QtUI/QtSwift.h')
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index 94b0648..216527d 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -61,7 +61,7 @@ namespace Swift { ~QtSwift(); private: XMLSettingsProvider* loadSettingsFile(const QString& fileName); - QMap<QString, QString> loadEmoticonsFile(const QString& fileName); + void loadEmoticonsFile(const QString& fileName, QMap<QString, QString>& emoticons); private: QtEventLoop clientMainThreadCaller_; PlatformTLSFactories tlsFactories_; |