summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise/libgroupwise/qca/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/groupwise/libgroupwise/qca/src
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/groupwise/libgroupwise/qca/src')
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp18
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/qca.h16
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h2
4 files changed, 20 insertions, 18 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
index b7ae1bb4..e9a361d9 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
@@ -5,4 +5,4 @@ INCLUDES = $(all_includes)
libqca_la_SOURCES = \
qca.cpp
-libqca_la_LIBADD = -lqt-mt
+# libqca_la_LIBADD = -lqt-mt
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index 10cae6b8..f00eee70 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -1,5 +1,5 @@
/*
- * qca.cpp - Qt Cryptographic Architecture
+ * qca.cpp - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::fromLatin1(cs);
+ return TQString::tqfromLatin1(cs);
}
bool RSAKey::fromPEM(const TQString &str)
@@ -798,7 +798,7 @@ TQString Cert::toPEM() const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::fromLatin1(cs);
+ return TQString::tqfromLatin1(cs);
}
bool Cert::fromPEM(const TQString &str)
@@ -864,8 +864,8 @@ public:
TQPtrList<QCA_CertContext> store;
};
-TLS::TLS(TQObject *parent)
-:TQObject(parent)
+TLS::TLS(TQObject *tqparent)
+:TQObject(tqparent)
{
d = new Private;
}
@@ -1132,8 +1132,8 @@ public:
TQByteArray inbuf, outbuf;
};
-SASL::SASL(TQObject *parent)
-:TQObject(parent)
+SASL::SASL(TQObject *tqparent)
+:TQObject(tqparent)
{
d = new Private;
reset();
@@ -1232,13 +1232,13 @@ void SASL::setExternalSSF(int x)
d->ext_ssf = x;
}
-void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
{
d->localAddr = addr;
d->localPort = port;
}
-void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port)
+void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port)
{
d->remoteAddr = addr;
d->remotePort = port;
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index 9df6f7cd..dab99d5a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -1,5 +1,5 @@
/*
- * qca.h - Qt Cryptographic Architecture
+ * qca.h - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@@ -311,9 +311,10 @@ namespace QCA
void fromContext(QCA_CertContext *);
};
- class QCA_EXPORT TLS : public QObject
+ class QCA_EXPORT TLS : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Validity {
NoCert,
@@ -332,7 +333,7 @@ namespace QCA
};
enum Error { ErrHandshake, ErrCrypt };
- TLS(TQObject *parent=0);
+ TLS(TQObject *tqparent=0);
~TLS();
void setCertificate(const Cert &cert, const RSAKey &key);
@@ -372,9 +373,10 @@ namespace QCA
Private *d;
};
- class QCA_EXPORT SASL : public QObject
+ class QCA_EXPORT SASL : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Error { ErrAuth, ErrCrypt };
enum ErrorCond {
@@ -390,7 +392,7 @@ namespace QCA
NoUser,
RemoteUnavail
};
- SASL(TQObject *parent=0);
+ SASL(TQObject *tqparent=0);
~SASL();
static void setAppName(const TQString &name);
@@ -412,8 +414,8 @@ namespace QCA
void setExternalAuthID(const TQString &authid);
void setExternalSSF(int);
- void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
- void setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port);
+ void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port);
+ void setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port);
// initialize
bool startClient(const TQString &service, const TQString &host, const TQStringList &mechlist, bool allowClientSendFirst=true);
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
index 6eda17f9..9f4fa1fb 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
@@ -141,7 +141,7 @@ public:
struct QCA_SASLHostPort
{
TQHostAddress addr;
- Q_UINT16 port;
+ TQ_UINT16 port;
};
struct QCA_SASLNeedParams