From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeabc/agent.cpp | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 tdeabc/agent.cpp

(limited to 'tdeabc/agent.cpp')

diff --git a/tdeabc/agent.cpp b/tdeabc/agent.cpp
new file mode 100644
index 000000000..571b7803e
--- /dev/null
+++ b/tdeabc/agent.cpp
@@ -0,0 +1,148 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "addressee.h"
+
+#include "agent.h"
+
+using namespace KABC;
+
+Agent::Agent()
+  : mAddressee( 0 ), mIntern( false )
+{
+}
+
+Agent::Agent( const TQString &url )
+  : mAddressee( 0 ),mUrl( url ), mIntern( false )
+{
+}
+
+Agent::Agent( Addressee *addressee )
+  : mAddressee( addressee ), mIntern( true )
+{
+}
+
+Agent::~Agent()
+{
+  delete mAddressee;
+  mAddressee = 0;
+}
+
+bool Agent::operator==( const Agent &a ) const
+{
+  if ( mIntern != a.mIntern )
+    return false;
+
+  if ( !mIntern ) {
+    if ( mUrl != a.mUrl )
+      return false;
+  } else {
+    if ( mAddressee && !a.mAddressee ) return false;
+    if ( !mAddressee && a.mAddressee ) return false;
+    if ( !mAddressee && !a.mAddressee ) return false;
+    if ( (*mAddressee) != (*a.mAddressee) ) return false;
+  }
+
+  return true;
+}
+
+bool Agent::operator!=( const Agent &a ) const
+{
+  return !( a == *this );
+}
+
+Agent &Agent::operator=(  const Agent &addr )
+{
+  if ( this == &addr )
+    return *this;
+
+  if ( addr.mIntern && addr.mAddressee ) {
+    if ( mAddressee )
+      delete mAddressee;
+
+    mAddressee = new Addressee;
+    *mAddressee = *(addr.mAddressee);
+  }
+
+  mUrl = addr.mUrl;
+  mIntern = addr.mIntern;
+
+  return *this;
+}
+
+void Agent::setUrl( const TQString &url )
+{
+  mUrl = url;
+  mIntern = false;
+}
+
+void Agent::setAddressee( Addressee *addressee )
+{
+  mAddressee = addressee;
+  mIntern = true;
+}
+
+bool Agent::isIntern() const
+{
+  return mIntern;
+}
+
+TQString Agent::url() const
+{
+  return mUrl;
+}
+
+Addressee *Agent::addressee() const
+{
+  return mAddressee;
+}
+
+TQString Agent::asString() const
+{
+  if ( mIntern )
+    return "intern agent";
+  else
+    return mUrl;
+}
+
+TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
+{
+  TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
+
+  s << agent.mIntern << agent.mUrl << hasAddressee;
+  if ( hasAddressee )
+    s << (*agent.mAddressee);
+
+  return s;
+}
+
+TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
+{
+  TQ_UINT32 hasAddressee;
+
+  s >> agent.mIntern >> agent.mUrl >> hasAddressee;
+
+  if ( hasAddressee ) {
+    agent.mAddressee = new Addressee;
+    s >> (*agent.mAddressee);
+  }
+
+  return s;
+}
-- 
cgit v1.2.1


From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 20 Feb 2013 16:26:45 -0600
Subject: Rename KABC namespace

---
 tdeabc/agent.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tdeabc/agent.cpp')

diff --git a/tdeabc/agent.cpp b/tdeabc/agent.cpp
index 571b7803e..2b2747697 100644
--- a/tdeabc/agent.cpp
+++ b/tdeabc/agent.cpp
@@ -22,7 +22,7 @@
 
 #include "agent.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Agent::Agent()
   : mAddressee( 0 ), mIntern( false )
@@ -122,7 +122,7 @@ TQString Agent::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Agent &agent )
 {
   TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
 
@@ -133,7 +133,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
   return s;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Agent &agent )
 {
   TQ_UINT32 hasAddressee;
 
-- 
cgit v1.2.1