From ec71af7c38fab5b2bc6760695e221092fa4bb28c Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 4 Jun 2010 17:17:38 +0000
Subject: cleanup accessors for errors

---
 source/QXmppClient.cpp | 4 ++--
 source/QXmppStream.cpp | 4 ++--
 source/QXmppStream.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source')

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 41e3d1b6..4e3f9267 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -407,7 +407,7 @@ bool QXmppClient::setReconnectionManager(QXmppReconnectionManager*
 
 QAbstractSocket::SocketError QXmppClient::getSocketError()
 {
-    return m_stream->getSocketError();
+    return m_stream->socketError();
 }
 
 /// Returns the XMPP stream error if QXmppClient::Error is QXmppClient::XmppStreamError.
@@ -417,7 +417,7 @@ QAbstractSocket::SocketError QXmppClient::getSocketError()
 
 QXmppStanza::Error::Condition QXmppClient::getXmppStreamError()
 {
-    return m_stream->getXmppStreamError();
+    return m_stream->xmppStreamError();
 }
 
 /// Returns the reference to QXmppVCardManager, implimentation of XEP-0054.
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 775763fb..7509abaa 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -1067,12 +1067,12 @@ void QXmppStream::pingTimeout()
     emit error(QXmppClient::KeepAliveError);
 }
 
-QAbstractSocket::SocketError QXmppStream::getSocketError()
+QAbstractSocket::SocketError QXmppStream::socketError()
 {
     return m_socketError;
 }
 
-QXmppStanza::Error::Condition QXmppStream::getXmppStreamError()
+QXmppStanza::Error::Condition QXmppStream::xmppStreamError()
 {
     return m_xmppStreamError;
 }
diff --git a/source/QXmppStream.h b/source/QXmppStream.h
index c5c23cdf..d9c684ed 100644
--- a/source/QXmppStream.h
+++ b/source/QXmppStream.h
@@ -70,8 +70,8 @@ public:
     bool isConnected() const;
     bool sendPacket(const QXmppPacket&);
 
-    QAbstractSocket::SocketError getSocketError();
-    QXmppStanza::Error::Condition getXmppStreamError();
+    QAbstractSocket::SocketError socketError();
+    QXmppStanza::Error::Condition xmppStreamError();
 
     QXmppConfiguration& configuration();
 
-- 
cgit v1.2.3