summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/IDN/LibIDNConverter.h')
-rw-r--r--Swiften/IDN/LibIDNConverter.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/IDN/LibIDNConverter.h b/Swiften/IDN/LibIDNConverter.h
index 23f6bbd..5553ab3 100644
--- a/Swiften/IDN/LibIDNConverter.h
+++ b/Swiften/IDN/LibIDNConverter.h
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2012-2013 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2012-2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
*/
#pragma once
#include <string>
+
#include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
#include <Swiften/IDN/IDNConverter.h>
namespace Swift {
- class SWIFTEN_API LibIDNConverter : public IDNConverter {
- public:
- virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
- virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+ class SWIFTEN_API LibIDNConverter : public IDNConverter {
+ public:
+ virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) override;
+ virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) override;
- virtual std::string getIDNAEncoded(const std::string& s) SWIFTEN_OVERRIDE;
- };
+ virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) override;
+ };
}