aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManjeet Dahiya <manjeetdahiya@gmail.com>2010-09-01 12:57:59 +0000
committerManjeet Dahiya <manjeetdahiya@gmail.com>2010-09-01 12:57:59 +0000
commit7928a07468cf277ea5519a386728eca1b19c1eff (patch)
tree303320114139ea731df2cd0e97a367f0527fb601 /src
parent01017e2ca66be42fc2933ec4bc8d388b9d4a85f2 (diff)
downloadqxmpp-7928a07468cf277ea5519a386728eca1b19c1eff.tar.gz
change className
Diffstat (limited to 'src')
-rw-r--r--src/QXmppOutgoingClient.cpp4
-rw-r--r--src/QXmppOutgoingServer.cpp4
-rw-r--r--src/QXmppSrvLookup.cpp (renamed from src/QXmppServiceInfo.cpp)26
-rw-r--r--src/QXmppSrvLookup.h (renamed from src/QXmppServiceInfo.h)14
-rw-r--r--src/src.pro4
5 files changed, 26 insertions, 26 deletions
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index 6cf78d64..a62ef3c2 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -32,7 +32,7 @@
#include "QXmppPacket.h"
#include "QXmppPresence.h"
#include "QXmppOutgoingClient.h"
-#include "QXmppServiceInfo.h"
+#include "QXmppSrvLookup.h"
#include "QXmppStreamFeatures.h"
#include "QXmppNonSASLAuth.h"
#include "QXmppSaslAuth.h"
@@ -161,7 +161,7 @@ void QXmppOutgoingClient::connectToHost()
if (host.isEmpty() || !port)
{
debug(QString("Looking up server for domain %1").arg(domain));
- QXmppServiceInfo serviceInfo = QXmppServiceInfo::fromName("_xmpp-client._tcp." + domain);
+ QXmppSrvLookup serviceInfo = QXmppSrvLookup::fromName("_xmpp-client._tcp." + domain);
if (!serviceInfo.records().isEmpty())
{
// take the first returned record
diff --git a/src/QXmppOutgoingServer.cpp b/src/QXmppOutgoingServer.cpp
index 41c52219..90fffcc3 100644
--- a/src/QXmppOutgoingServer.cpp
+++ b/src/QXmppOutgoingServer.cpp
@@ -28,7 +28,7 @@
#include "QXmppConstants.h"
#include "QXmppDialback.h"
#include "QXmppOutgoingServer.h"
-#include "QXmppServiceInfo.h"
+#include "QXmppSrvLookup.h"
#include "QXmppStreamFeatures.h"
#include "QXmppUtils.h"
@@ -82,7 +82,7 @@ void QXmppOutgoingServer::connectToHost(const QString &domain)
// lookup server for domain
debug(QString("Looking up server for domain %1").arg(domain));
- QXmppServiceInfo serviceInfo = QXmppServiceInfo::fromName("_xmpp-server._tcp." + domain);
+ QXmppSrvLookup serviceInfo = QXmppSrvLookup::fromName("_xmpp-server._tcp." + domain);
if (!serviceInfo.records().isEmpty())
{
// take the first returned record
diff --git a/src/QXmppServiceInfo.cpp b/src/QXmppSrvLookup.cpp
index ab43dc1b..68b19595 100644
--- a/src/QXmppServiceInfo.cpp
+++ b/src/QXmppSrvLookup.cpp
@@ -23,7 +23,7 @@
#include <QDebug>
-#include "QXmppServiceInfo.h"
+#include "QXmppSrvLookup.h"
#ifdef Q_OS_WIN
#include <windows.h>
@@ -40,7 +40,7 @@
/// Constructs an empty service record object.
///
-QXmppServiceInfo::SrvRecord::SrvRecord()
+QXmppSrvLookup::SrvRecord::SrvRecord()
: host_port(0)
{
}
@@ -48,7 +48,7 @@ QXmppServiceInfo::SrvRecord::SrvRecord()
/// Returns host name for this service record.
///
-QString QXmppServiceInfo::SrvRecord::hostName() const
+QString QXmppSrvLookup::SrvRecord::hostName() const
{
return host_name;
}
@@ -57,7 +57,7 @@ QString QXmppServiceInfo::SrvRecord::hostName() const
///
/// \param hostName
-void QXmppServiceInfo::SrvRecord::setHostName(const QString &hostName)
+void QXmppSrvLookup::SrvRecord::setHostName(const QString &hostName)
{
host_name = hostName;
}
@@ -65,7 +65,7 @@ void QXmppServiceInfo::SrvRecord::setHostName(const QString &hostName)
/// Returns the port for this service record.
///
-quint16 QXmppServiceInfo::SrvRecord::port() const
+quint16 QXmppSrvLookup::SrvRecord::port() const
{
return host_port;
}
@@ -74,7 +74,7 @@ quint16 QXmppServiceInfo::SrvRecord::port() const
///
/// \param port
-void QXmppServiceInfo::SrvRecord::setPort(quint16 port)
+void QXmppSrvLookup::SrvRecord::setPort(quint16 port)
{
host_port = port;
}
@@ -82,27 +82,27 @@ void QXmppServiceInfo::SrvRecord::setPort(quint16 port)
/// If the lookup failed, this function returns a human readable description of the error.
///
-QString QXmppServiceInfo::errorString() const
+QString QXmppSrvLookup::errorString() const
{
return m_errorString;
}
/// Returns the list of records associated with this service.
///
-QList<QXmppServiceInfo::SrvRecord> QXmppServiceInfo::records() const
+QList<QXmppSrvLookup::SrvRecord> QXmppSrvLookup::records() const
{
return m_records;
}
/// Perform a DNS lookup for an SRV entry.
///
-/// Returns a QXmppServiceInfo object containing the found records.
+/// Returns a QXmppSrvLookup object containing the found records.
///
/// \param dname
-QXmppServiceInfo QXmppServiceInfo::fromName(const QString &dname)
+QXmppSrvLookup QXmppSrvLookup::fromName(const QString &dname)
{
- QXmppServiceInfo result;
+ QXmppSrvLookup result;
#ifdef Q_OS_WIN
PDNS_RECORD records, ptr;
@@ -119,7 +119,7 @@ QXmppServiceInfo QXmppServiceInfo::fromName(const QString &dname)
{
if ((ptr->wType == DNS_TYPE_SRV) && !strcmp((char*)ptr->pName, dname.toUtf8()))
{
- QXmppServiceInfo::SrvRecord record;
+ QXmppSrvLookup::SrvRecord record;
record.setHostName(QString::fromUtf8((char*)ptr->Data.Srv.pNameTarget));
record.setPort(ptr->Data.Srv.wPort);
result.m_records.append(record);
@@ -193,7 +193,7 @@ QXmppServiceInfo QXmppServiceInfo::fromName(const QString &dname)
result.m_errorString = QLatin1String("dn_expand failed");
return result;
}
- QXmppServiceInfo::SrvRecord record;
+ QXmppSrvLookup::SrvRecord record;
record.setHostName(answer);
record.setPort(port);
result.m_records.append(record);
diff --git a/src/QXmppServiceInfo.h b/src/QXmppSrvLookup.h
index 0b752371..3e4d98d6 100644
--- a/src/QXmppServiceInfo.h
+++ b/src/QXmppSrvLookup.h
@@ -21,16 +21,16 @@
*
*/
-#ifndef QXMPPSERVICEINFO_H
-#define QXMPPSERVICEINFO_H
+#ifndef QXMPPSRVLOOKUP_H
+#define QXMPPSRVLOOKUP_H
#include <QList>
#include <QString>
-/// \brief The QXmppServiceInfo class provides static methods for DNS SRV lookups.
+/// \brief The QXmppSrvLookup class provides static methods for DNS SRV lookups.
///
-class QXmppServiceInfo
+class QXmppSrvLookup
{
public:
/// \brief Represents a DNS SRV record
@@ -52,13 +52,13 @@ public:
};
QString errorString() const;
- QList<QXmppServiceInfo::SrvRecord> records() const;
+ QList<QXmppSrvLookup::SrvRecord> records() const;
- static QXmppServiceInfo fromName(const QString &dname);
+ static QXmppSrvLookup fromName(const QString &dname);
private:
QString m_errorString;
- QList<QXmppServiceInfo::SrvRecord> m_records;
+ QList<QXmppSrvLookup::SrvRecord> m_records;
};
#endif
diff --git a/src/src.pro b/src/src.pro
index 388449ec..1a9d4b74 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -65,7 +65,7 @@ INSTALL_HEADERS = QXmppUtils.h \
QXmppServer.h \
QXmppServerExtension.h \
QXmppServerPlugin.h \
- QXmppServiceInfo.h \
+ QXmppSrvLookup.h \
QXmppSessionIq.h \
QXmppSocks.h \
QXmppStanza.h \
@@ -118,7 +118,7 @@ SOURCES += QXmppUtils.cpp \
QXmppSaslAuth.cpp \
QXmppServer.cpp \
QXmppServerExtension.cpp \
- QXmppServiceInfo.cpp \
+ QXmppSrvLookup.cpp \
QXmppSessionIq.cpp \
QXmppSocks.cpp \
QXmppStanza.cpp \