Differential D24349 Diff 70407 src/kcms/kio/kcookiespolicies.cpp

Changeset View

Standalone View

View Options

src/kcms/kio/kcookiespolicies.cpp

Show All 18 Lines
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details. 20​ * GNU General Public License for more details.
21 * 21​ *
22 * You should have received a copy of the GNU General Public License 22​ * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software 23​ * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 24​ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
25 */ 25​ */
26 26​
27// TODO: remove me ​
28#undef QT_NO_CAST_FROM_ASCII ​
29 ​
30// Own 27​// Own
31#include "kcookiespolicies.h" 28​#include "kcookiespolicies.h"
32 29​
33// Local 30​// Local
34#include "ksaveioconfig.h" 31​#include "ksaveioconfig.h"
35 32​
36// Qt 33​// Qt
37#include <QCheckBox> 34​#include <QCheckBox>
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s)
172 169​
173void KCookiesPolicies::changePressed(QTreeWidgetItem* item, bool state) 170​void KCookiesPolicies::changePressed(QTreeWidgetItem* item, bool state)
174{ 171​{
175 Q_ASSERT(item); 172​ Q_ASSERT(item);
176 const QString oldDomain(item->text (0)); 173​ const QString oldDomain(item->text (0));
177 174​
178 KCookiesPolicySelectionDlg pdlg (this); 175​ KCookiesPolicySelectionDlg pdlg (this);
179 pdlg.setWindowTitle (i18nc ("@title:window", "Change Cookie Policy")); 176​ pdlg.setWindowTitle (i18nc ("@title:window", "Change Cookie Policy"));
180 pdlg.setPolicy (KCookieAdvice::strToAdvice (mDomainPolicyMap.value(oldDomain))); 177​ pdlg.setPolicy (KCookieAdvice::strToAdvice(QString::fromLatin1(mDomainPolicyMap.value(oldDomain))));
181 pdlg.setEnableHostEdit (state, oldDomain); 178​ pdlg.setEnableHostEdit (state, oldDomain);
182 179​
183 if (pdlg.exec() && !pdlg.domain().isEmpty()) { 180​ if (pdlg.exec() && !pdlg.domain().isEmpty()) {
184 const QString newDomain = tolerantFromAce (pdlg.domain().toLatin1()); 181​ const QString newDomain = tolerantFromAce (pdlg.domain().toLatin1());
185 int advice = pdlg.advice(); 182​ int advice = pdlg.advice();
186 if (newDomain == oldDomain || !handleDuplicate (newDomain, advice)) { 183​ if (newDomain == oldDomain || !handleDuplicate (newDomain, advice)) {
187 mDomainPolicyMap[newDomain] = KCookieAdvice::adviceToStr(advice); 184​ mDomainPolicyMap[newDomain] = KCookieAdvice::adviceToStr(advice);
188 item->setText(0, newDomain); 185​ item->setText(0, newDomain);
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 Line(s)354{
361 bool state = mUi.cbEnableCookies->isChecked(); 358​ bool state = mUi.cbEnableCookies->isChecked();
362 group.writeEntry ("Cookies", state); 359​ group.writeEntry ("Cookies", state);
363 state = mUi.cbRejectCrossDomainCookies->isChecked(); 360​ state = mUi.cbRejectCrossDomainCookies->isChecked();
364 group.writeEntry ("RejectCrossDomainCookies", state); 361​ group.writeEntry ("RejectCrossDomainCookies", state);
365 state = mUi.cbAutoAcceptSessionCookies->isChecked(); 362​ state = mUi.cbAutoAcceptSessionCookies->isChecked();
366 group.writeEntry ("AcceptSessionCookies", state); 363​ group.writeEntry ("AcceptSessionCookies", state);
367 364​
368 QString advice; 365​ QString advice;
369 if (mUi.rbPolicyAccept->isChecked()) 366​ if (mUi.rbPolicyAccept->isChecked()) {
370 advice = KCookieAdvice::adviceToStr (KCookieAdvice::Accept); 367​ advice = QString::fromLatin1(KCookieAdvice::adviceToStr(KCookieAdvice::Accept));
dfaureUnsubmitted
Done

fromLatin1 is enough for adviceToStr, like you did on line 177 (so it's inconsistent)

(repeats 3 more times)

dfaure: fromLatin1 is enough for adviceToStr, like you did on line 177 (so it's inconsistent) (repeats…
ahmadsamirAuthorUnsubmitted
Not Done

Apparently I was confused by the I18N_NOOP calls in adviceToStr, but looking again now, the translations aren't saved in the config file...

ahmadsamir: Apparently I was confused by the I18N_NOOP calls in adviceToStr, but looking again now, the…
371 else if (mUi.rbPolicyAcceptForSession->isChecked()) 368​ } else if (mUi.rbPolicyAcceptForSession->isChecked()) {
372 advice = KCookieAdvice::adviceToStr (KCookieAdvice::AcceptForSession); 369​ advice = QString::fromLatin1(KCookieAdvice::adviceToStr(KCookieAdvice::AcceptForSession));
373 else if (mUi.rbPolicyReject->isChecked()) 370​ } else if (mUi.rbPolicyReject->isChecked()) {
374 advice = KCookieAdvice::adviceToStr (KCookieAdvice::Reject); 371​ advice = QString::fromLatin1(KCookieAdvice::adviceToStr(KCookieAdvice::Reject));
375 else 372​ } else {
376 advice = KCookieAdvice::adviceToStr (KCookieAdvice::Ask); 373​ advice = QString::fromLatin1(KCookieAdvice::adviceToStr(KCookieAdvice::Ask));
374​ }
377 375​
378 group.writeEntry ("CookieGlobalAdvice", advice); 376​ group.writeEntry ("CookieGlobalAdvice", advice);
379 377​
380 QStringList domainConfig; 378​ QStringList domainConfig;
381 QMapIterator<QString, const char*> it (mDomainPolicyMap); 379​ QMapIterator<QString, const char*> it (mDomainPolicyMap);
382 while (it.hasNext()) { 380​ while (it.hasNext()) {
383 it.next(); 381​ it.next();
384 const QString policy = tolerantToAce(it.key()) + QLatin1Char(':') + QLatin1String(it.value()); 382​ const QString policy = QLatin1String(tolerantToAce(it.key())) + QLatin1Char(':') + QLatin1String(it.value());
385 domainConfig << policy; 383​ domainConfig << policy;
386 } 384​ }
387 385​
388 group.writeEntry ("CookieDomainAdvice", domainConfig); 386​ group.writeEntry ("CookieDomainAdvice", domainConfig);
389 group.sync(); 387​ group.sync();
390 388​
391 // Update the cookiejar... 389​ // Update the cookiejar...
392 if (!mUi.cbEnableCookies->isChecked()) { 390​ if (!mUi.cbEnableCookies->isChecked()) {
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines