summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/Dialog.cpp8
-rw-r--r--client/client.pro4
-rw-r--r--client/client.rc1
3 files changed, 8 insertions, 5 deletions
diff --git a/client/Dialog.cpp b/client/Dialog.cpp
index e109391..3ae26aa 100644
--- a/client/Dialog.cpp
+++ b/client/Dialog.cpp
@@ -207,7 +207,7 @@ void ProxyDialog::StaticProxyToggled(bool on)
QVariant propVal = btn->property("proxyName");
QString proxyName = propVal.toString();
Logger::Debug("Static Proxy button toggled\n");
- Logger::Debug("State '%s', associated proxy name: %s\n", on ? "down" : "up", proxyName.toStdString().c_str());
+ Logger::Debug("State '%s', associated proxy name: %s\n", on ? "down" : "up", proxyName.toLocal8Bit().data());
if (!on)
{
@@ -215,11 +215,11 @@ void ProxyDialog::StaticProxyToggled(bool on)
}
UpdatedConfig *cfg = UpdatedConfig::CurrentConfig();
- string name = proxyName.toStdString();
+ string name = proxyName.toLocal8Bit().data();
ProxyEntryStatic* proxy = cfg->GetStaticProxy(name);
- if (proxy == NULL)
+ if (proxy == NULL)
{
- Logger::Error("Static proxy with name '%s' was not found\n", proxyName.toStdString().c_str());
+ Logger::Error("Static proxy with name '%s' was not found\n", proxyName.toLocal8Bit().data());
return;
}
diff --git a/client/client.pro b/client/client.pro
index cfdc184..3b6dd8e 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -39,6 +39,8 @@ SOURCES += Dialog.cpp \
Utility.cpp \
Proxifier.cpp
-OTHER_FILES +=
+OTHER_FILES += \
+ client.rc
RESOURCES += client.qrc
+RC_FILE = client.rc
diff --git a/client/client.rc b/client/client.rc
new file mode 100644
index 0000000..a72ba3e
--- /dev/null
+++ b/client/client.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file