[kopete-devel] KDE/kdenetwork/kopete/protocols/jabber/libiris
SVN commit 1016025 by cfeck: Fix compile with GCC 4.4 CCMAIL: kopete-devel@kde.org A 028_fix_compile_with_gcc44.patch M +1 -0 iris/irisnet/corelib/netinterface_unix.cpp --- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/irisnet/corelib/netinterface_unix.cpp #1016024:1016025 @@ -33,6 +33,7 @@ #include net/route.h #include netinet/in.h #include errno.h +#include unistd.h // for solaris #ifndef SIOCGIFCONF ___ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
[kopete-devel] KDE/kdenetwork/kopete/protocols/jabber/libiris
SVN commit 926385 by mlaurent:
Fix iterator and pedantic
CCMAIL: kopete-devel@kde.org
A 024_fix_semicolons_and_iterator.patch
M +1 -1 iris/irisnet/appledns/appledns.cpp
M +1 -1 iris/irisnet/corelib/jdnsshared.cpp
M +2 -2 iris/irisnet/corelib/netinterface_unix.cpp
M +2 -2 iris/xmpp/cutestuff/httppoll.cpp
M +1 -1 iris/xmpp/cutestuff/socks.cpp
M +2 -2 iris/xmpp/sasl/digestmd5proplist.cpp
M +3 -3 iris/xmpp/xmpp-core/parser.cpp
M +2 -2 iris/xmpp/xmpp-core/protocol.cpp
M +1 -1 iris/xmpp/xmpp-core/stream.cpp
M +2 -2 iris/xmpp/xmpp-core/xmpp.h
M +1 -1 iris/xmpp/xmpp-im/client.cpp
M +1 -1 iris/xmpp/xmpp-im/filetransfer.cpp
M +3 -3 iris/xmpp/xmpp-im/s5b.cpp
M +4 -4 iris/xmpp/xmpp-im/types.cpp
M +1 -1 iris/xmpp/xmpp-im/xmpp_address.h
M +4 -4 iris/xmpp/xmpp-im/xmpp_tasks.cpp
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/irisnet/appledns/appledns.cpp
#926384:926385
@@ -237,7 +237,7 @@
class AppleProvider : public XMPP::IrisNetProvider
{
Q_OBJECT
- Q_INTERFACES(XMPP::IrisNetProvider);
+ Q_INTERFACES(XMPP::IrisNetProvider)
public:
QDnsSd dns;
QHashint,QDnsSdDelegate* delegateById;
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/irisnet/corelib/jdnsshared.cpp
#926384:926385
@@ -416,7 +416,7 @@
None,// don't muck with anything
FillInAddress, // for A/
FillInPtrOwner6, // for PTR, IPv6
- FillInPtrOwner4, // for PTR, IPv4
+ FillInPtrOwner4 // for PTR, IPv4
};
JDnsShared *q;
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/irisnet/corelib/netinterface_unix.cpp
#926384:926385
@@ -318,7 +318,7 @@
class UnixNet : public NetInterfaceProvider
{
Q_OBJECT
- Q_INTERFACES(XMPP::NetInterfaceProvider);
+ Q_INTERFACES(XMPP::NetInterfaceProvider)
public:
QListInfo info;
QTimer t;
@@ -406,7 +406,7 @@
class UnixNetProvider : public IrisNetProvider
{
Q_OBJECT
- Q_INTERFACES(XMPP::IrisNetProvider);
+ Q_INTERFACES(XMPP::IrisNetProvider)
public:
virtual NetInterfaceProvider *createNetInterfaceProvider()
{
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/cutestuff/httppoll.cpp
#926384:926385
@@ -510,7 +510,7 @@
QString HttpProxyPost::getHeader(const QString var) const
{
- for(QStringList::ConstIterator it = d-headerLines.begin(); it !=
d-headerLines.end(); ++it) {
+ for(QStringList::ConstIterator it = d-headerLines.constBegin(); it !=
d-headerLines.constEnd(); ++it) {
const QString s = *it;
int n = s.indexOf(: );
if(n == -1)
@@ -752,7 +752,7 @@
QString HttpProxyGetStream::getHeader(const QString var) const
{
- for(QStringList::ConstIterator it = d-headerLines.begin(); it !=
d-headerLines.end(); ++it) {
+ for(QStringList::ConstIterator it = d-headerLines.constBegin(); it !=
d-headerLines.constEnd(); ++it) {
const QString s = *it;
int n = s.indexOf(: );
if(n == -1)
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/cutestuff/socks.cpp
#926384:926385
@@ -284,7 +284,7 @@
int at = 0;
quint16 c;
bool ok;
- for(QStringList::ConstIterator it = s6.begin(); it != s6.end();
++it) {
+ for(QStringList::ConstIterator it = s6.constBegin(); it !=
s6.constEnd(); ++it) {
c = (*it).toInt(ok, 16);
a6[at++] = (c 8);
a6[at++] = c 0xff;
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/sasl/digestmd5proplist.cpp
#926384:926385
@@ -34,7 +34,7 @@
QByteArray DIGESTMD5PropList::get(const QByteArray var)
{
- for(ConstIterator it = begin(); it != end(); ++it) {
+ for(ConstIterator it = constBegin(); it != constEnd(); ++it) {
if((*it).var == var)
return (*it).val;
}
@@ -123,7 +123,7 @@
int DIGESTMD5PropList::varCount(const QByteArray var)
{
int n = 0;
- for(ConstIterator it = begin(); it != end(); ++it) {
+ for(ConstIterator it = constBegin(); it != constEnd(); ++it) {
if((*it).var == var)
++n;
}
---
trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/parser.cpp
#926384:926385
@@ -603,9 +603,9 @@
QString Parser::Event::nsprefix(const QString s) const
{
- QStringList::ConstIterator it = d-nsnames.begin();
- QStringList::ConstIterator it2 = d-nsvalues.begin();
- for(; it != d-nsnames.end(); ++it) {
+ QStringList::ConstIterator it = d-nsnames.constBegin();
+ QStringList::ConstIterator it2 = d-nsvalues.constBegin();
+
Re: [kopete-devel] KDE/kdenetwork/kopete/protocols/jabber/libiris
On Sunday 15 February 2009 04:13:23 Laurent Montel wrote: SVN commit 926385 by mlaurent: Fix iterator and pedantic CCMAIL: kopete-devel@kde.org A 024_fix_semicolons_and_iterator.patch M +1 -1 iris/irisnet/appledns/appledns.cpp M +1 -1 iris/irisnet/corelib/jdnsshared.cpp M +2 -2 iris/irisnet/corelib/netinterface_unix.cpp M +2 -2 iris/xmpp/cutestuff/httppoll.cpp M +1 -1 iris/xmpp/cutestuff/socks.cpp M +2 -2 iris/xmpp/sasl/digestmd5proplist.cpp M +3 -3 iris/xmpp/xmpp-core/parser.cpp M +2 -2 iris/xmpp/xmpp-core/protocol.cpp M +1 -1 iris/xmpp/xmpp-core/stream.cpp M +2 -2 iris/xmpp/xmpp-core/xmpp.h M +1 -1 iris/xmpp/xmpp-im/client.cpp M +1 -1 iris/xmpp/xmpp-im/filetransfer.cpp M +3 -3 iris/xmpp/xmpp-im/s5b.cpp M +4 -4 iris/xmpp/xmpp-im/types.cpp M +1 -1 iris/xmpp/xmpp-im/xmpp_address.h M +4 -4 iris/xmpp/xmpp-im/xmpp_tasks.cpp Thanks! -- Matt ___ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
[kopete-devel] KDE/kdenetwork/kopete/protocols/jabber/libiris
SVN commit 636049 by chehrlic:
fix IRIS_EXPORT
add a new patch to honor qca2 - changes
update iris_patch_070221.diff
CCMAIL: kopete-devel@kde.org
A 013_qca_svn.patch
M +10 -8 iris/iris_export.h
M +163 -11 iris_patch_070221.diff
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/iris_export.h
#636048:636049
@@ -3,14 +3,16 @@
#include QtGlobal
-#define IRIS_EXPORT Q_DECL_EXPORT
-
+#ifndef IRIS_EXPORT
+# ifdef Q_OS_WIN
+# ifdef MAKE_IRIS_KOPETE_LIB
+# define IRIS_EXPORT Q_DECL_EXPORT
+# else
+# define IRIS_EXPORT Q_DECL_IMPORT
+# endif
+# else
+# define IRIS_EXPORT Q_DECL_EXPORT
+# endif
#endif
-#ifndef IRIS_EXPORT_H
-#define IRIS_EXPORT_H
-#include QtGlobal
-
-#define IRIS_EXPORT Q_DECL_EXPORT
-
#endif
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris_patch_070221.diff
#636048:636049
@@ -268,6 +268,24 @@
typedef enum { StateNone, StateActive, StateComposing, StatePaused,
StateInactive, StateGone } ChatState;
+@@ -108,7 +126,7 @@
+ QDomElement payload_;
+ };
+
+- class HTMLElement
++ class IRIS_EXPORT HTMLElement
+ {
+ public:
+ HTMLElement();
+@@ -149,7 +167,7 @@
+ bool hasId_;
+ };
+
+- class Message
++ class IRIS_EXPORT Message
+ {
+ public:
+ Message(const Jid to=);
@@ -267,7 +285,7 @@
Private *d;
};
@@ -582,11 +600,107 @@
===
--- iris/jabber/filetransfer.cpp (revision 330)
+++ iris/jabber/filetransfer.cpp (working copy)
-@@ -756,3 +756,5 @@
+@@ -56,6 +56,7 @@
+ qlonglong size;
+ qlonglong sent;
+ QString desc;
++ QString preview;
+ bool rangeSupported;
+ qlonglong rangeOffset, rangeLength, length;
+ QString streamType;
+@@ -104,13 +105,14 @@
+ d-proxy = proxy;
+ }
+
+-void FileTransfer::sendFile(const Jid to, const QString fname, qlonglong
size, const QString desc)
++void FileTransfer::sendFile(const Jid to, const QString fname, qlonglong
size, const QString desc, const QString preview)
+ {
+ d-state = Requesting;
+ d-peer = to;
+ d-fname = fname;
+ d-size = size;
+ d-desc = desc;
++ d-preview = preview;
+ d-sender = true;
+ d-id = d-m-link(this);
+
+@@ -118,7 +120,7 @@
+ connect(d-ft, SIGNAL(finished()), SLOT(ft_finished()));
+ QStringList list;
+ list += http://jabber.org/protocol/bytestreams;;
+- d-ft-request(to, d-id, fname, size, desc, list);
++ d-ft-request(to, d-id, fname, size, desc, list,preview);
+ d-ft-go(true);
+ }
+
+@@ -171,6 +173,12 @@
+ return d-desc;
+ }
+
++
++QString XMPP::FileTransfer::preview() const
++{
++ return d-preview;
++}
++
+ bool FileTransfer::rangeSupported() const
+ {
+ return d-rangeSupported;
+@@ -312,6 +320,7 @@
+ d-fname = req.fname;
+ d-size = req.size;
+ d-desc = req.desc;
++ d-preview = req.preview;
+ d-rangeSupported = req.rangeSupported;
+ }
+
+@@ -461,7 +470,7 @@
+ delete d;
+ }
+
+-void JT_FT::request(const Jid to, const QString _id, const QString fname,
qlonglong size, const QString desc, const QStringList streamTypes)
++void JT_FT::request(const Jid to, const QString _id, const QString fname,
qlonglong size, const QString desc, const QStringList streamTypes, const
QString preview)
+ {
+ QDomElement iq;
+ d-to = to;
+@@ -480,6 +489,12 @@
+ de.appendChild(doc()-createTextNode(desc));
+ file.appendChild(de);
+ }
++ if(!preview.isEmpty()) {
++ QDomElement pr = doc()-createElement(preview);
++ pr.setAttribute(xmlns,
http://kopete.kde.org/protocol/file-preview;);
++ pr.appendChild(doc()-createTextNode(preview));
++ file.appendChild(pr);
++ }
+ QDomElement range = doc()-createElement(range);
+ file.appendChild(range);
+ si.appendChild(file);
+@@ -719,6 +734,11 @@
+ QDomElement de = file.elementsByTagName(desc).item(0).toElement();
+ if(!de.isNull())
+ desc = de.text();
++
++ QString preview;
++ QDomElement pr = file.elementsByTagName(preview).item(0).toElement();
++ if(!pr.isNull())
++ preview= pr.text();
+
+ bool rangeSupported = false;
+ QDomElement range = file.elementsByTagName(range).item(0).toElement();
+@@ -750,9 +770,13 @@
+ r.fname = fname;
+ r.size = size;
+ r.desc = desc;
++ r.preview = preview;
+ r.rangeSupported = rangeSupported;
+ r.streamTypes = streamTypes;
+
incoming(r);
return true;
}
+
++
+#include filetransfer.moc
Index: iris/jabber/filetransfer.h
===
@@ -601,7 +715,24 @@
{
Q_OBJECT
