summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-15 11:10:20 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-15 12:05:19 (GMT)
commitab402e9e044e6f141a318c9b082671c828b915f3 (patch)
tree06194776a0102007b9a5fa5a6650f60b648d813b /Swift/QtUI/QtConnectionSettingsWindow.cpp
parente94541a7156f4ccceaf1a3f7135b9c89c067883b (diff)
downloadswift-contrib-ab402e9e044e6f141a318c9b082671c828b915f3.zip
swift-contrib-ab402e9e044e6f141a318c9b082671c828b915f3.tar.bz2
Added URL parser.
Diffstat (limited to 'Swift/QtUI/QtConnectionSettingsWindow.cpp')
-rw-r--r--Swift/QtUI/QtConnectionSettingsWindow.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/Swift/QtUI/QtConnectionSettingsWindow.cpp b/Swift/QtUI/QtConnectionSettingsWindow.cpp
index b5afe50..56ac65f 100644
--- a/Swift/QtUI/QtConnectionSettingsWindow.cpp
+++ b/Swift/QtUI/QtConnectionSettingsWindow.cpp
@@ -48,8 +48,7 @@ QtConnectionSettingsWindow::QtConnectionSettingsWindow(const ClientOptions& opti
ui.manual_proxyType->setCurrentIndex(0);
ClientOptions defaults;
- if (options.boshURL.empty()) {
- int i = 0;
+ if (options.boshURL.isEmpty()) {
bool isDefault = options.useStreamCompression == defaults.useStreamCompression;
isDefault &= options.useTLS == defaults.useTLS;
isDefault &= options.allowPLAINWithoutTLS == defaults.allowPLAINWithoutTLS;
@@ -83,7 +82,7 @@ QtConnectionSettingsWindow::QtConnectionSettingsWindow(const ClientOptions& opti
} else {
ui.connectionMethod->setCurrentIndex(2);
ui.bosh_uri->setText(P2QSTRING(options.boshURL.toString()));
- if (!options.boshHTTPConnectProxyURL.empty()) {
+ if (!options.boshHTTPConnectProxyURL.isEmpty()) {
ui.bosh_manualProxy->setChecked(true);
ui.bosh_manualProxyHost->setText(P2QSTRING(options.boshHTTPConnectProxyURL.getHost()));
ui.bosh_manualProxyPort->setText(P2QSTRING(boost::lexical_cast<std::string>(options.boshHTTPConnectProxyURL.getPort())));
@@ -125,7 +124,7 @@ ClientOptions QtConnectionSettingsWindow::getOptions() {
}
else {
/* BOSH */
- options.boshURL = URL(Q2PSTRING(ui.bosh_uri->text()));
+ options.boshURL = URL::fromString(Q2PSTRING(ui.bosh_uri->text()));
if (ui.bosh_manualProxy->isChecked()) {
std::string host = Q2PSTRING(ui.bosh_manualProxyHost->text());
int port = 80;