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

---
 tderesources/scalix/scalixadmin/Makefile.am  | 2 +-
 tderesources/scalix/scalixadmin/ldapview.cpp | 8 ++++----
 tderesources/scalix/scalixadmin/ldapview.h   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tderesources/scalix/scalixadmin')

diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am
index 05d29b985..4d072ac47 100644
--- a/tderesources/scalix/scalixadmin/Makefile.am
+++ b/tderesources/scalix/scalixadmin/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = scalixadmin
 INCLUDES = $(all_includes)
 
 scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-scalixadmin_LDADD   = $(LIB_KABC)
+scalixadmin_LDADD   = $(LIB_TDEABC)
 scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
                       otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
                       delegatemanager.cpp delegateview.cpp delegatepage.cpp delegatedialog.cpp \
diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp
index bc3059984..3e6eea04f 100644
--- a/tderesources/scalix/scalixadmin/ldapview.cpp
+++ b/tderesources/scalix/scalixadmin/ldapview.cpp
@@ -44,7 +44,7 @@ LdapView::LdapView( TQWidget *parent )
   addColumn( i18n( "User" ) );
   setFullWidth( true );
 
-  mClient = new KABC::LdapClient;
+  mClient = new TDEABC::LdapClient;
 
   mClient->setHost( Settings::self()->ldapHost() );
   mClient->setPort( Settings::self()->ldapPort() );
@@ -56,8 +56,8 @@ LdapView::LdapView( TQWidget *parent )
   attrs << "surname" << "mail";
   mClient->setAttrs( attrs );
 
-  connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
-           this, TQT_SLOT( entryAdded( const KABC::LdapObject& ) ) );
+  connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+           this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
   connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
            this, TQT_SLOT( error( const TQString& ) ) );
 }
@@ -83,7 +83,7 @@ void LdapView::setQuery( const TQString &query )
   mClient->startQuery( query );
 }
 
-void LdapView::entryAdded( const KABC::LdapObject &obj )
+void LdapView::entryAdded( const TDEABC::LdapObject &obj )
 {
   const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
                                            .arg( TQString(obj.attrs[ "mail" ].first()) );
diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h
index 3cb635e8b..9de458178 100644
--- a/tderesources/scalix/scalixadmin/ldapview.h
+++ b/tderesources/scalix/scalixadmin/ldapview.h
@@ -22,7 +22,7 @@
 
 #include <tdelistview.h>
 
-namespace KABC {
+namespace TDEABC {
 class LdapClient;
 class LdapObject;
 }
@@ -42,11 +42,11 @@ class LdapView : public TDEListView
     void setQuery( const TQString &query );
 
   private slots:
-    void entryAdded( const KABC::LdapObject& );
+    void entryAdded( const TDEABC::LdapObject& );
     void error( const TQString& );
 
   private:
-    KABC::LdapClient *mClient;
+    TDEABC::LdapClient *mClient;
 };
 
 #endif
-- 
cgit v1.2.1