summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornihui <nihui@MagicLinux.domain>2010-10-13 18:20:38 +0800
committerAndrea Diamantini <adjam7@gmail.com>2010-10-13 22:07:14 +0200
commitd80e449049aedd2b75d5044d5921a3df226077c1 (patch)
treedb850a02778a3f313bf21a3207fab27d448c982f
parentMerge branch 'bkmenuleak' (diff)
downloadrekonq-d80e449049aedd2b75d5044d5921a3df226077c1.tar.xz
commit the fix
-rw-r--r--src/settings/networkwidget.cpp6
-rw-r--r--src/settings/settingsdialog.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/networkwidget.cpp b/src/settings/networkwidget.cpp
index 5495f0ce..7a7001d3 100644
--- a/src/settings/networkwidget.cpp
+++ b/src/settings/networkwidget.cpp
@@ -52,15 +52,15 @@ NetworkWidget::NetworkWidget(QWidget *parent)
KCModuleInfo cacheInfo("cache.desktop");
_cacheModule = new KCModuleProxy(cacheInfo, parent);
- tabWidget->addTab(_cacheModule, i18n(cacheInfo.moduleName().toLocal8Bit()));
+ tabWidget->addTab(_cacheModule, i18n(cacheInfo.moduleName().toUtf8()));
KCModuleInfo cookiesInfo("cookies.desktop");
_cookiesModule = new KCModuleProxy(cookiesInfo, parent);
- tabWidget->addTab(_cookiesModule, i18n(cookiesInfo.moduleName().toLocal8Bit()));
+ tabWidget->addTab(_cookiesModule, i18n(cookiesInfo.moduleName().toUtf8()));
KCModuleInfo proxyInfo("proxy.desktop");
_proxyModule = new KCModuleProxy(proxyInfo, parent);
- tabWidget->addTab(_proxyModule, i18n(proxyInfo.moduleName().toLocal8Bit()));
+ tabWidget->addTab(_proxyModule, i18n(proxyInfo.moduleName().toUtf8()));
connect(_cacheModule, SIGNAL(changed(bool)), this, SLOT(hasChanged()));
connect(_cookiesModule, SIGNAL(changed(bool)), this, SLOT(hasChanged()));
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index eee2a4e1..a3b4f976 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -129,7 +129,7 @@ Private::Private(SettingsDialog *parent)
// -- 8
KCModuleInfo ebrowsingInfo("ebrowsing.desktop");
ebrowsingModule = new KCModuleProxy(ebrowsingInfo, parent);
- pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toLocal8Bit()));
+ pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toUtf8()));
pageItem->setIcon(KIcon(ebrowsingInfo.icon()));
// WARNING