[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/konqueror/settings/kio
From:       Laurent Montel <montel () kde ! org>
Date:       2007-04-02 13:37:08
Message-ID: 1175521028.290047.18377.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 649293 by mlaurent:

compile/link


 M  +1 -1      CMakeLists.txt  
 M  +3 -3      kcookiesmanagement.cpp  
 M  +5 -5      kcookiespolicies.cpp  


--- trunk/KDE/kdebase/konqueror/settings/kio/CMakeLists.txt #649292:649293
@@ -32,7 +32,7 @@
 kde4_add_plugin(kcm_kio ${kcm_kio_PART_SRCS})
 
 
-target_link_libraries(kcm_kio  ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(kcm_kio  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} )
 
 install(TARGETS kcm_kio  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdebase/konqueror/settings/kio/kcookiesmanagement.cpp #649292:649293
@@ -31,8 +31,8 @@
 #include <QList>
 
 #include <QtDBus/QtDBus>
+#include <QtCore/QUrl>
 
-#include <kidna.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kdialog.h>
@@ -95,9 +95,9 @@
 QString CookieListViewItem::text(int f) const
 {
     if (mCookie)
-        return f == 0 ? QString() : KIDNA::toUnicode(mCookie->host);
+        return f == 0 ? QString() : QUrl::fromAce(mCookie->host.toLatin1());
     else
-        return f == 0 ? KIDNA::toUnicode(mDomain) : QString();
+        return f == 0 ? QUrl::fromAce(mDomain.toLatin1()) : QString();
 }
 
 KCookiesManagement::KCookiesManagement(const KComponentData &componentData, QWidget \
                *parent)
--- trunk/KDE/kdebase/konqueror/settings/kio/kcookiespolicies.cpp #649292:649293
@@ -31,9 +31,9 @@
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QtDBus/QtDBus>
+#include <QtCore/QUrl>
 
 #include <kiconloader.h>
-#include <kidna.h>
 #include <kmessagebox.h>
 #include <k3listview.h>
 #include <k3listviewsearchline.h>
@@ -118,7 +118,7 @@
 
   if (pdlg.exec() && !pdlg.domain().isEmpty())
   {
-    QString domain = KIDNA::toUnicode(pdlg.domain());
+    QString domain = QUrl::fromAce(pdlg.domain().toLatin1());
     int advice = pdlg.advice();
 
     if ( !handleDuplicate(domain, advice) )
@@ -153,7 +153,7 @@
 
   if( pdlg.exec() && !pdlg.domain().isEmpty())
   {
-    QString newDomain = KIDNA::toUnicode(pdlg.domain());
+    QString newDomain = QUrl::fromAce(pdlg.domain().toLatin1());
     int advice = pdlg.advice();
     if (newDomain == oldDomain || !handleDuplicate(newDomain, advice))
     {
@@ -254,7 +254,7 @@
 
     if (!domain.isEmpty())
     {
-        Q3ListViewItem* index = new Q3ListViewItem( dlg->lvDomainPolicy, \
KIDNA::toUnicode(domain), +        Q3ListViewItem* index = new Q3ListViewItem( \
                dlg->lvDomainPolicy, QUrl::fromAce(domain.toLatin1()),
                                                   \
i18n(KCookieAdvice::adviceToStr(advice)) );  m_pDomainPolicy[index] = \
KCookieAdvice::adviceToStr(advice);  }
@@ -391,7 +391,7 @@
 
   while( at )
   {
-    domainConfig.append(QString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
 +    domainConfig.append(QString::fromLatin1("%1:%2").arg(QString(QUrl::toAce(at->text(0)))).arg(m_pDomainPolicy[at]));
  at = at->nextSibling();
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]