summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /SwifTools/AutoUpdater
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'SwifTools/AutoUpdater')
-rw-r--r--SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp2
-rw-r--r--SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h4
-rw-r--r--SwifTools/AutoUpdater/SparkleAutoUpdater.h4
-rw-r--r--SwifTools/AutoUpdater/SparkleAutoUpdater.mm4
4 files changed, 7 insertions, 7 deletions
diff --git a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
index adc6d2d..4dd06c7 100644
--- a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
+++ b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.cpp
@@ -22,7 +22,7 @@ bool PlatformAutoUpdaterFactory::isSupported() const {
#endif
}
-AutoUpdater* PlatformAutoUpdaterFactory::createAutoUpdater(const String& appcastURL) {
+AutoUpdater* PlatformAutoUpdaterFactory::createAutoUpdater(const std::string& appcastURL) {
#ifdef HAVE_SPARKLE
return new SparkleAutoUpdater(appcastURL);
#else
diff --git a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
index 11528a3..59df238 100644
--- a/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
+++ b/SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h
@@ -4,7 +4,7 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Base/String.h"
+#include <string>
namespace Swift {
class AutoUpdater;
@@ -13,6 +13,6 @@ namespace Swift {
public:
bool isSupported() const;
- AutoUpdater* createAutoUpdater(const String& appcastURL);
+ AutoUpdater* createAutoUpdater(const std::string& appcastURL);
};
}
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.h b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
index 5fddda5..fc08975 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.h
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
@@ -6,13 +6,13 @@
#pragma once
-#include "Swiften/Base/String.h"
+#include <string>
#include "SwifTools/AutoUpdater/AutoUpdater.h"
namespace Swift {
class SparkleAutoUpdater : public AutoUpdater {
public:
- SparkleAutoUpdater(const String& url);
+ SparkleAutoUpdater(const std::string& url);
~SparkleAutoUpdater();
void checkForUpdates();
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
index a8ae60a..440e178 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
@@ -10,7 +10,7 @@ class SparkleAutoUpdater::Private {
SUUpdater* updater;
};
-SparkleAutoUpdater::SparkleAutoUpdater(const String& url) {
+SparkleAutoUpdater::SparkleAutoUpdater(const std::string& url) {
d = new Private;
d->updater = [SUUpdater sharedUpdater];
@@ -18,7 +18,7 @@ SparkleAutoUpdater::SparkleAutoUpdater(const String& url) {
[d->updater setAutomaticallyChecksForUpdates: true];
NSURL* nsurl = [NSURL URLWithString:
- [NSString stringWithUTF8String: url.getUTF8Data()]];
+ [NSString stringWithUTF8String: url.c_str()]];
[d->updater setFeedURL: nsurl];
}