From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break
 compatibility with TQt for Qt3; if it does please fix it ASAP!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/kio/kcookiesmanagement.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kcontrol/kio/kcookiesmanagement.cpp')

diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index f2cd45c42..da899be1f 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -94,9 +94,9 @@ CookieProp* CookieListViewItem::leaveCookie()
 TQString CookieListViewItem::text(int f) const
 {
     if (mCookie)
-        return f == 0 ? TQString::null : KIDNA::toUnicode(mCookie->host);
+        return f == 0 ? TQString() : KIDNA::toUnicode(mCookie->host);
     else
-        return f == 0 ? KIDNA::toUnicode(mDomain) : TQString::null;
+        return f == 0 ? KIDNA::toUnicode(mDomain) : TQString();
 }
 
 KCookiesManagement::KCookiesManagement(TQWidget *parent)
@@ -285,9 +285,9 @@ void KCookiesManagement::getCookies(TQListViewItem *cookieDom)
   DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies",
                                                          DCOPArg(fields, "TQValueList<int>"),
                                                          ckd->domain(),
-                                                         TQString::null,
-                                                         TQString::null,
-                                                         TQString::null);
+                                                         TQString(),
+                                                         TQString(),
+                                                         TQString());
   if(reply.isValid())
   {
     TQStringList fieldVal = reply;
@@ -383,7 +383,7 @@ void KCookiesManagement::doPolicy()
 
     if( domain.isEmpty() )
     {
-      CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->parent() );
+      CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->tqparent() );
 
       if ( parent )
         domain = parent->domain ();
@@ -407,8 +407,8 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem)
   CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem );
   if( item->cookie() )
   {
-    CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent());
-    CookiePropList *list = deletedCookies.find(parent->domain());
+    CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->tqparent());
+    CookiePropList *list = deletedCookies.tqfind(parent->domain());
     if(!list)
     {
       list = new CookiePropList;
-- 
cgit v1.2.1