[developerteam getadooble] SF.net SVN: dooble:[1981] trunk/browser

[<tex...@us...>]

Revision: 1981
          http://dooble.svn.sourceforge.net/dooble/?rev=1981&view=rev
Author:   textfield
Date:     2011-02-19 20:56:20 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
It didn't compile. Now it will.

Modified Paths:
--------------
    trunk/browser/Include/dcookies.h
    trunk/browser/Source/dcookies.cc
    trunk/browser/Source/dcookiewindow.cc

Modified: trunk/browser/Include/dcookies.h
===================================================================
--- trunk/browser/Include/dcookies.h	2011-02-19 19:57:55 UTC (rev 1980)
+++ trunk/browser/Include/dcookies.h	2011-02-19 20:56:20 UTC (rev 1981)
@@ -63,6 +63,7 @@
 			 const QUrl &url);
   void populate(void);
   void removeCookie(const QString &domain);
+  void removeCookie(const QNetworkCookie &cookie);
   void removeCookie(const QString &domain, const QString &name,
 		    const QString &path);
   void removeAllCookies(void);

Modified: trunk/browser/Source/dcookies.cc
===================================================================
--- trunk/browser/Source/dcookies.cc	2011-02-19 19:57:55 UTC (rev 1980)
+++ trunk/browser/Source/dcookies.cc	2011-02-19 20:56:20 UTC (rev 1981)
@@ -108,11 +108,7 @@
 	if(list.at(i).isSessionCookie())
 	  continue;
 	else if(list.at(i).expirationDate().toLocalTime() < now)
-	  {
-	    removeCookie(list.at(i));
-	    emit cookieRemoved(list.at(i));
-	    list.removeAt(i);
-	  }
+	  list.removeAt(i);
     }
 
   return list;
@@ -209,6 +205,13 @@
   QSqlDatabase::removeDatabase("cookies");
 }
 
+void dcookies::removeCookie(const QNetworkCookie &cookie)
+{
+  removeCookie(QVariant(cookie.name()).toString(),
+	       cookie.domain(),
+	       cookie.path());
+}
+
 void dcookies::removeCookie(const QString &name, const QString &domain,
 			    const QString &path)
 {

Modified: trunk/browser/Source/dcookiewindow.cc
===================================================================
--- trunk/browser/Source/dcookiewindow.cc	2011-02-19 19:57:55 UTC (rev 1980)
+++ trunk/browser/Source/dcookiewindow.cc	2011-02-19 20:56:20 UTC (rev 1981)
@@ -217,7 +217,8 @@
 
 	  index1 = m_model->index(index1.row(), 0);
 	  dooble::s_cookies->removeCookie
-	    (m_model->itemFromIndex(index1)->data(Qt::UserRole + 1).toString());
+	    (m_model->itemFromIndex(index1)->data(Qt::UserRole + 1).
+	     toString());
 	  m_model->removeRows(index1.row(), 1);
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.