From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:26:45 -0600 Subject: Rename KABC namespace --- tdeabc/plugins/ldaptdeio/Makefile.am | 2 +- tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp | 4 ++-- tdeabc/plugins/ldaptdeio/resourceldaptdeio.h | 2 +- tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp | 2 +- tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h | 2 +- tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tdeabc/plugins/ldaptdeio') diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am index f1e8c57d1..205c412ce 100644 --- a/tdeabc/plugins/ldaptdeio/Makefile.am +++ b/tdeabc/plugins/ldaptdeio/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourceldaptdeioconfig.h lib_LTLIBRARIES = libtdeabc_ldaptdeio.la libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libtdeabc_ldaptdeio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE) +libtdeabc_ldaptdeio_la_LIBADD = $(LIB_TDEABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE) libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index ea1a4294c..0e182755a 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -41,7 +41,7 @@ #include "resourceldaptdeio.h" #include "resourceldaptdeioconfig.h" -using namespace KABC; +using namespace TDEABC; // Hack from Netaccess void tqt_enter_modal( TQWidget *widget ); @@ -659,7 +659,7 @@ void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data ) } else if ( name == mAttributes[ "uid" ].lower() ) { d->mAddr.setUid( TQString::fromUtf8( value, value.size() ) ); } else if ( name == mAttributes[ "jpegPhoto" ].lower() ) { - KABC::Picture photo; + TDEABC::Picture photo; TQImage img( value ); if ( !img.isNull() ) { photo.setData( img ); diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h index bf1b70ec0..051470960 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h @@ -28,7 +28,7 @@ class TDEConfig; -namespace KABC { +namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIO : public Resource { diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp index a6af7d065..25099414c 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp @@ -43,7 +43,7 @@ #include "resourceldaptdeioconfig.h" #include "resourceldaptdeioconfig.moc" -using namespace KABC; +using namespace TDEABC; ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h index 121cf639e..0041946b7 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h @@ -40,7 +40,7 @@ class TQString; class KComboBox; class KLineEdit; -namespace KABC { +namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp index 2c4a7d4e0..dcb373b3c 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp @@ -24,7 +24,7 @@ #include #include -using namespace KABC; +using namespace TDEABC; extern "C" { -- cgit v1.2.1