packages: kde4-kdelibs/kde4-kdelibs-branch.diff, kde4-kdelibs/kde4-kdelibs....
arekm
arekm at pld-linux.org
Sat Feb 5 16:42:57 CET 2011
Author: arekm Date: Sat Feb 5 15:42:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 5; branch updates; two solid fstab backend fixes (there is a little chance that kded4 cpu eating will stop)
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-branch.diff (1.24 -> 1.25) , kde4-kdelibs.spec (1.240 -> 1.241) , kde4-kdelibs-trunk.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.24 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.25
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.24 Thu Oct 21 17:18:21 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff Sat Feb 5 16:42:52 2011
@@ -1,3022 +1,375 @@
-Index: kate/mode/katemodeconfigpage.cpp
+Index: kfile/kfilewidget.cpp
===================================================================
---- kate/mode/katemodeconfigpage.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kate/mode/katemodeconfigpage.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -107,6 +107,7 @@
- ModeConfigPage::~ModeConfigPage ()
- {
- qDeleteAll (m_types);
-+ delete ui;
- }
-
- void ModeConfigPage::apply()
-Index: kate/view/kateviewinternal.cpp
-===================================================================
---- kate/view/kateviewinternal.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kate/view/kateviewinternal.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -928,7 +928,7 @@
- switch( bias ) {
- case KateViewInternal::left: return column() == 0;
- case KateViewInternal::none: return atEdge();
-- case KateViewInternal::right: return column() == doc()->lineLength( line() );
-+ case KateViewInternal::right: return column() >= doc()->lineLength( line() );
- default: Q_ASSERT(false); return false;
- }
- }
-@@ -1031,7 +1031,7 @@
-
- if (n >= 0) {
- for (int i = 0; i < n; i++) {
-- if (m_column == thisLine->length()) {
-+ if (m_column >= thisLine->length()) {
- // Have come to the end of a line
- if (line() >= doc()->lines() - 1)
- // Have come to the end of the document
-@@ -3279,7 +3279,7 @@
- else
- scrollNextPage();
- } else {
-- scrollViewLines(-((e->delta() / 120) * QApplication::wheelScrollLines()));
-+ QApplication::sendEvent(m_lineScroll, e);
- }
-
- } else if (columnScrollingPossible()) {
-Index: kate/document/katedocument.cpp
-===================================================================
---- kate/document/katedocument.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kate/document/katedocument.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -3523,12 +3523,10 @@
- default:
- break;
- }
-- if ( s != old )
-- {
-- removeText( KTextEditor::Range(cursor, 1) );
-- insertText( cursor, s );
-- }
-
-+ removeText( KTextEditor::Range(cursor, 1) );
-+ insertText( cursor, s );
-+
- editEnd();
- }
-
-Index: kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop
-===================================================================
---- kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -38,6 +38,7 @@
- Name[nb]=Spinnvill (ikke ZEN) HTML-koding (lett utgave)
- Name[nds]="Insane"-HTML-Koderen (nich "ZEN") (Eenfach-Verschoon)
- Name[nl]=Insane (niet ZEN) HTML-codering (lichte editie)
-+Name[pl]=Kodowanie HTML Insane (nie ZEN, wersja lekka)
- Name[pt]=Codificação de HTML louca (não ZEN) HTML (edição leve)
- Name[pt_BR]=Codificação de HTML louca (não ZEN) HTML (edição leve)
- Name[se]=Jallas (ii-ZEN) HTML-koden (geahppes veršuvdna)
-@@ -77,6 +78,7 @@
- Comment[nb]=Et programtillegg som gjør velgerfullføring som i zen-coding
- Comment[nds]=En Moduul för ZEN-liek Koderen, a.B. Köörkompletteren
- Comment[nl]=Een plugin, die zen-codering doet zoals keuze-voltooiing
-+Comment[pl]=Wtyczka, która wykonuje uzupełnianie w stylu zen
- Comment[pt]=Um 'plugin' que efectua uma codificação 'zen, como a completação de selectores
- Comment[pt_BR]=Um plug-in que efetua uma codificação zen, como a completação de seletores
- Comment[se]=Lassemoduvla mii bargá zen-lágankodema, nugo válljenollášuhttin
-Index: kfile/kfileplacesview.cpp
-===================================================================
---- kfile/kfileplacesview.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kfile/kfileplacesview.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -160,7 +160,13 @@
- painter->drawPixmap(point, pm);
-
- if (option.state & QStyle::State_Selected) {
-- painter->setPen(option.palette.highlightedText().color());
-+ QPalette::ColorGroup cg = QPalette::Active;
-+ if (!(option.state & QStyle::State_Enabled)) {
-+ cg = QPalette::Disabled;
-+ } else if (!(option.state & QStyle::State_Active)) {
-+ cg = QPalette::Inactive;
-+ }
-+ painter->setPen(option.palette.color(cg, QPalette::HighlightedText));
- }
-
- QRect rectText;
-Index: doc/kded4/man-kded4.8.docbook
-===================================================================
---- doc/kded4/man-kded4.8.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ doc/kded4/man-kded4.8.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -62,7 +62,7 @@
- <para>
- It monitors the directories containing .desktop files.
- When a file is added/removed, it waits 5 seconds (in case of series of
--updates), and then launches <command>kbuildsycoca</command>.
-+updates), and then launches <command>kbuildsycoca4</command>.
- </para>
- <!--
- <para>
-@@ -155,14 +155,14 @@
- </para>
- <para>
- If <command>kded4</command> is called with <command>kded4 --check</command>, then
--it updates the &kde; sycoca using <command>kbuildsycoca</command>.
-+it updates the &kde; sycoca using <command>kbuildsycoca4</command>.
- </para>
- </refsect1>
-
- <refsect1>
- <title>See Also</title>
- <para><replaceable>kdeoptions</replaceable>(7), <replaceable>qtoptions</replaceable>(7),
--<replaceable>kbuildsycoca</replaceable>(8)
-+<replaceable>kbuildsycoca4</replaceable>(8)
- </para>
- </refsect1>
-
-Index: doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook
-===================================================================
---- doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -236,6 +236,12 @@
- installations</para>
- </listitem>
- </varlistentry>
-+<varlistentry>
-+<term>$<envar>KDESYCOCA</envar></term>
-+<listitem>
-+<para>Specifies the path to the sycoca database file</para>
-+</listitem>
-+</varlistentry>
- </variablelist>
-
- </refsect1>
-Index: doc/sonnet/index.docbook
-===================================================================
---- doc/sonnet/index.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ doc/sonnet/index.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -17,13 +17,14 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
-
--<date>2010-01-19</date>
--<releaseinfo>&kde; 4.4</releaseinfo>
-+<date>2010-09-02</date>
-+<releaseinfo>&kde; 4.5</releaseinfo>
- <abstract>
- <para>&sonnet; is the spelling checker used by &kde; applications such
--as &kate;, &kmail;, and &kword;. It is a &GUI;
--frontend to <application>International ISpell</application> and
--<application>ASpell</application>.</para>
-+as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to various free spell checkers.
-+More Information about required spell checkers and dictionaries you find in the
-+documentation of the &systemsettings; module
-+<ulink url="help:kcontrol/spellchecking">Spell Checker</ulink>.</para>
-
- </abstract>
- <keywordset>
-Index: kioslave/http/kcookiejar/domain_info
-===================================================================
---- kioslave/http/kcookiejar/domain_info (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kioslave/http/kcookiejar/domain_info (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -1 +1,2 @@
- twoLevelTLD=name,ai,au,bd,bh,ck,eg,et,fk,il,in,kh,kr,mk,mt,na,np,nz,pg,pk,qa,sa,sb,sg,sv,ua,ug,uk,uy,vn,za,zw
-+gTLDs=com,edu,gov,int,mil,net,org,biz,info,name,pro,aero,coop,museum,asia,cat,jobs,mobi,tel,travel
-Index: kioslave/http/kcookiejar/kcookiejar.cpp
-===================================================================
---- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1188162)
-+++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1188162)
-@@ -36,32 +36,6 @@
-
- #include "kcookiejar.h"
-
--#include <config.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#ifdef HAVE_SYS_PARAM_H
--#include <sys/param.h>
--#endif
--#include <fcntl.h>
--#include <unistd.h>
--#include <stdio.h>
--#include <string.h>
--
--#ifdef USE_SOLARIS
--#include <strings.h>
--#endif
--
--#include <stdlib.h>
--
--//#include <netinet/in.h>
--//#include <arpa/inet.h>
--
--#include <QtCore/QString>
--#include <QtCore/QFile>
--#include <QtCore/QDir>
--#include <QtCore/QRegExp>
--#include <QtCore/QTextStream>
--
- #include <kurl.h>
- #include <kdatetime.h>
- #include <ksystemtimezone.h>
-@@ -70,7 +44,12 @@
- #include <ksavefile.h>
+--- kfile/kfilewidget.cpp (.../tags/KDE/4.6.0/kdelibs) (wersja 1219001)
++++ kfile/kfilewidget.cpp (.../branches/KDE/4.6/kdelibs) (wersja 1219001)
+@@ -54,6 +54,7 @@
+ #include <krecentdirs.h>
#include <kdebug.h>
+ #include <kio/kfileitemdelegate.h>
++#include <kde_file.h>
--#include <algorithm>
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
-+#include <QtCore/QDir>
-+#include <QtCore/QRegExp>
-+#include <QtCore/QTextStream>
-+#include <QtCore/QStringBuilder>
-
- // BR87227
- // Waba: Should the number of cookies be limited?
-@@ -84,13 +63,12 @@
- #define READ_BUFFER_SIZE 8192
- #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
-
--// Note with respect to QString::fromLatin1( )
--// Cookies are stored as 8 bit data and passed to kio_http as
--// latin1 regardless of their actual encoding.
-+// Note with respect to QLatin1String( )....
-+// Cookies are stored as 8 bit data and passed to kio_http as Latin1
-+// regardless of their actual encoding.
-+#define QL1S(x) QLatin1String(x)
-+#define QL1C(x) QLatin1Char(x)
-
--// L1 is used to indicate latin1 constants
--#define QL1S(x) QLatin1String(x)
--
- QString KCookieJar::adviceToStr(KCookieAdvice _advice)
- {
- switch( _advice )
-@@ -151,7 +129,7 @@
- //
- // Checks if a cookie has been expired
- //
--bool KHttpCookie::isExpired(qint64 currentDate) const
-+bool KHttpCookie::isExpired(qint64 currentDate) const
- {
- if (currentDate == -1) {
- KDateTime epoch;
-@@ -169,19 +147,27 @@
- {
- QString result;
-
-- if (useDOMFormat || (mProtocolVersion == 0))
-- {
-- if ( !mName.isEmpty() )
-- result = mName + '=';
-- result += mValue;
-- }
-- else
-- {
-- result = mName + '=' + mValue;
-+ if (useDOMFormat || (mProtocolVersion == 0)) {
-+ if ( mName.isEmpty() )
-+ result = mValue;
-+ else
-+ result = mName % QL1C('=') % mValue;
-+ } else {
-+ result = mName % QL1C('=') % mValue;
- if (mExplicitPath)
-- result += QL1S("; $Path=\"") + mPath + QL1S("\"");
-+ result += QL1S("; $Path=\"") % mPath % QL1C('"');
- if (!mDomain.isEmpty())
-- result += QL1S("; $Domain=\"") + mDomain + QL1S("\"");
-+ result += QL1S("; $Domain=\"") % mDomain % QL1C('"');
-+ if (!mPorts.isEmpty()) {
-+ if (mPorts.length() == 2 && mPorts.at(0) == -1)
-+ result += QL1S("; $Port");
-+ else {
-+ QString portNums;
-+ Q_FOREACH(int port, mPorts)
-+ portNums += QString::number(port) % QL1C(' ');
-+ result += QL1S("; $Port=\"") % portNums.trimmed() % QL1C('"');
-+ }
-+ }
- }
- return result;
- }
-@@ -189,7 +175,7 @@
- //
- // Returns whether this cookie should be send to this location.
- bool KHttpCookie::match(const QString &fqdn, const QStringList &domains,
-- const QString &path) const
-+ const QString &path, int port) const
- {
- // Cookie domain match check
- if (mDomain.isEmpty())
-@@ -203,11 +189,16 @@
- return false;
-
- // Maybe the domain needs an extra dot.
-- QString domain = '.' + mDomain;
-+ QString domain = QL1C('.') % mDomain;
- if ( !domains.contains( domain ) )
- if ( fqdn != mDomain )
- return false;
- }
-+ else if (mProtocolVersion != 0 && port != -1 &&
-+ !mPorts.isEmpty() && !mPorts.contains(port))
-+ {
-+ return false;
-+ }
-
- // Cookie path match check
- if (mPath.isEmpty())
-@@ -245,10 +236,8 @@
-
- KConfig cfg( "khtml/domain_info", KConfig::NoGlobals, "data" );
- KConfigGroup group( &cfg, QString() );
-- QStringList countries = group.readEntry( "twoLevelTLD", QStringList() );
-- Q_FOREACH ( const QString& country, countries ) {
-- m_twoLevelTLD.insert( country, 1 );
-- }
-+ m_gTLDs = QSet<QString>::fromList(group.readEntry("gTLDs", QStringList()));
-+ m_twoLevelTLD = QSet<QString>::fromList(group.readEntry("twoLevelTLD", QStringList()));
- }
-
- //
-@@ -276,13 +265,9 @@
- if (domain2.isEmpty())
- domain2 = cookie.host();
-
-- if (
-- (cookiePtr.name() == cookie.name()) &&
-- (
-- nameMatchOnly ||
-- ( (domain1 == domain2) && (cookiePtr.path() == cookie.path()) )
-- )
-- ) {
-+ if (cookiePtr.name() == cookie.name() &&
-+ (nameMatchOnly || (domain1 == domain2 && cookiePtr.path() == cookie.path())))
-+ {
- if (updateWindowId) {
- Q_FOREACH(long windowId, cookie.windowIds()) {
- if (windowId && (!cookiePtr.windowIds().contains(windowId))) {
-@@ -304,28 +289,35 @@
- //
- QString KCookieJar::findCookies(const QString &_url, bool useDOMFormat, long windowId, KHttpCookieList *pendingCookies)
- {
-- QString cookieStr;
-+ QString cookieStr, fqdn, path;
- QStringList domains;
-- QString fqdn;
-- QString path;
-+ int port = -1;
- KCookieAdvice advice = m_globalAdvice;
-
-- if (!parseUrl(_url, fqdn, path))
-+ if (!parseUrl(_url, fqdn, path, &port))
- return cookieStr;
-
-- bool secureRequest = _url.startsWith( QL1S("https://"), Qt::CaseInsensitive ) ||
-- _url.startsWith( QL1S("webdavs://"), Qt::CaseInsensitive );
-+ const bool secureRequest = (_url.startsWith(QL1S("https://"), Qt::CaseInsensitive) ||
-+ _url.startsWith(QL1S("webdavs://"), Qt::CaseInsensitive));
-+ if (port == -1)
-+ {
-+ if (secureRequest)
-+ port = 443;
-+ else
-+ port = 80;
-+ }
-
- extractDomains(fqdn, domains);
-
- KHttpCookieList allCookies;
-
-+ QStringList::ConstIterator itEnd = domains.constEnd();
- for(QStringList::ConstIterator it = domains.constBegin();
- true;
- ++it)
- {
-- KHttpCookieList *cookieList;
-- if (it == domains.constEnd())
-+ KHttpCookieList *cookieList = 0;
-+ if (it == itEnd)
- {
- cookieList = pendingCookies; // Add pending cookies
- pendingCookies = 0;
-@@ -334,8 +326,11 @@
- }
- else
- {
-- QString key = (*it).isNull() ? QL1S("") : (*it);
-- cookieList = m_cookieDomains.value(key);
-+ if ((*it).isNull())
-+ cookieList = m_cookieDomains.value(QL1S(""));
-+ else
-+ cookieList = m_cookieDomains.value(*it);
-+
- if (!cookieList)
- continue; // No cookies for this domain
- }
-@@ -343,20 +338,19 @@
- if (cookieList->getAdvice() != KCookieDunno)
- advice = cookieList->getAdvice();
-
-- for (KHttpCookieList::iterator cookieIterator = cookieList->begin();
-- cookieIterator != cookieList->end();
-- ++cookieIterator ) {
-- KHttpCookie& cookie = *cookieIterator;
-- // If the we are setup to automatically accept all session cookies and to
-- // treat all cookies as session cookies or the current cookie is a session
-- // cookie, then send the cookie back regardless of domain policy.
-- if (advice == KCookieReject &&
-- !(m_autoAcceptSessionCookies &&
-- (m_ignoreCookieExpirationDate || cookie.expireDate() == 0))) {
-- continue;
-- }
-+ QMutableListIterator<KHttpCookie> cookieIt (*cookieList);
-+ while (cookieIt.hasNext()) {
-+ KHttpCookie& cookie = cookieIt.next();
-+ // If the we are setup to automatically accept all session cookies and to
-+ // treat all cookies as session cookies or the current cookie is a session
-+ // cookie, then send the cookie back regardless of domain policy.
-+ if (advice == KCookieReject &&
-+ !(m_autoAcceptSessionCookies &&
-+ (m_ignoreCookieExpirationDate || cookie.expireDate() == 0))) {
-+ continue;
-+ }
-
-- if (!cookie.match(fqdn, domains, path))
-+ if (!cookie.match(fqdn, domains, path, port))
- continue;
-
- if( cookie.isSecure() && !secureRequest ) {
-@@ -383,18 +377,17 @@
- cookie.windowIds().append(windowId);
- }
-
-- if (it == domains.constEnd()) // Only needed when processing pending cookies
-+ if (it == itEnd) // Only needed when processing pending cookies
- removeDuplicateFromList(&allCookies, cookie);
-
- allCookies.append(cookie);
- }
-- if (it == domains.constEnd())
-+ if (it == itEnd)
- break; // Finished.
- }
-
- int cookieCount = 0;
--
-- int protVersion=0;
-+ int protVersion = 0;
- Q_FOREACH(const KHttpCookie& cookie, allCookies) {
- if (cookie.protocolVersion() > protVersion)
- protVersion = cookie.protocolVersion();
-@@ -402,20 +395,20 @@
-
- Q_FOREACH(const KHttpCookie& cookie, allCookies) {
- if (useDOMFormat) {
-- if (cookieCount > 0)
-+ if (cookieCount == 0) {
-+ if (protVersion > 0)
-+ cookieStr += QL1S("$Version=") % QString::number(protVersion) % QL1S("; ");
+ #include <QtGui/QCheckBox>
+ #include <QtGui/QDockWidget>
+@@ -2294,15 +2295,26 @@
+ // kDebug(kfile_area);
+
+ if ((operationMode == KFileWidget::Saving) && (ops->mode() & KFile::File) ) {
+- const QString urlStr = locationEditCurrentText();
++ QString urlStr = locationEditCurrentText();
+ if (urlStr.isEmpty())
+ return;
+
+- KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true);
+- if (mime && mime->name() != KMimeType::defaultMimeType()) {
+- if (filterWidget->currentFilter() != mime->name() &&
+- filterWidget->filters().indexOf(mime->name()) != -1)
+- filterWidget->setCurrentFilter(mime->name());
++ if( filterWidget->isMimeFilter()) {
++ KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true);
++ if (mime && mime->name() != KMimeType::defaultMimeType()) {
++ if (filterWidget->currentFilter() != mime->name() &&
++ filterWidget->filters().indexOf(mime->name()) != -1)
++ filterWidget->setCurrentFilter(mime->name());
+ }
-+ else
- cookieStr += QL1S("; ");
- cookieStr += cookie.cookieStr(true);
- } else {
- if (cookieCount == 0) {
- cookieStr += QL1S("Cookie: ");
-- if (protVersion > 0) {
-- QString version;
-- version.sprintf("$Version=%d; ", protVersion); // Without quotes
-- cookieStr += version;
-- }
-- } else {
-+ if (protVersion > 0)
-+ cookieStr += QL1S("$Version=") % QString::number(protVersion) % QL1S("; ");
-+ } else
- cookieStr += QL1S("; ");
-- }
- cookieStr += cookie.cookieStr(false);
- }
- cookieCount++;
-@@ -448,15 +441,15 @@
- {
- // No '=' sign -> use string as the value, name is empty
- // (behavior found in Mozilla and IE)
-- Name = "";
-- Value = QString::fromLatin1(header);
-+ Name = QL1S("");
-+ Value = QL1S(header);
- Value.truncate( s - header );
- Value = Value.trimmed();
-- return (s);
-+ return s;
- }
- }
-
-- Name = header;
-+ Name = QL1S(header);
- Name.truncate( s - header );
- Name = Name.trimmed();
-
-@@ -470,7 +463,7 @@
- {
- // End of Name
- Value = "";
-- return (s);
-+ return s;
- }
- }
-
-@@ -486,12 +479,12 @@
- if ((*s=='\0') || (*s=='\n'))
- {
- // End of Name
-- Value = QString::fromLatin1(header);
-+ Value = QL1S(header);
- Value.truncate(s - header);
-- return (s);
-+ return s;
- }
- }
-- Value = QString::fromLatin1(header);
-+ Value = QL1S(header);
- // *s == '\"';
- if (keepQuotes)
- Value.truncate( ++s - header );
-@@ -512,11 +505,11 @@
- while ((*s != '\0') && (*s != ';') && (*s != '\n'))
- s++;
- // End of Name
-- Value = QString::fromLatin1(header);
-+ Value = QL1S(header);
- Value.truncate( s - header );
- Value = Value.trimmed();
- }
-- return (s);
-+ return s;
-
- }
-
-@@ -544,40 +537,28 @@
-
- bool KCookieJar::parseUrl(const QString &_url,
- QString &_fqdn,
-- QString &_path)
-+ QString &_path,
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branch.diff?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.240&r2=1.241&f=u
More information about the pld-cvs-commit
mailing list