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/file/Makefile.am | 2 +- tdeabc/plugins/file/resourcefile.cpp | 2 +- tdeabc/plugins/file/resourcefile.h | 4 ++-- tdeabc/plugins/file/resourcefileconfig.cpp | 4 ++-- tdeabc/plugins/file/resourcefileconfig.h | 2 +- tdeabc/plugins/file/resourcefileplugin.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tdeabc/plugins/file') diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index 2df682794..475fcd4dc 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h lib_LTLIBRARIES = libtdeabc_file.la libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index b29cf33c3..4df5db42c 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -44,7 +44,7 @@ #include "resourcefile.h" -using namespace KABC; +using namespace TDEABC; ResourceFile::ResourceFile( const TDEConfig *config ) : Resource( config ), mFormat( 0 ), diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h index a77f55798..76652d179 100644 --- a/tdeabc/plugins/file/resourcefile.h +++ b/tdeabc/plugins/file/resourcefile.h @@ -28,7 +28,7 @@ #include -namespace KABC { +namespace TDEABC { class FormatPlugin; class ResourceConfigWidget; @@ -122,7 +122,7 @@ class KABC_EXPORT ResourceFile : public Resource /** Remove a addressee from its source. - This method is mainly called by KABC::AddressBook. + This method is mainly called by TDEABC::AddressBook. */ virtual void removeAddressee( const Addressee& addr ); diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 7c3f4da15..516a33a61 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -34,7 +34,7 @@ #include "resourcefileconfig.h" -using namespace KABC; +using namespace TDEABC; ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name ) : ConfigWidget( parent, name ) @@ -90,7 +90,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res ) mFileNameEdit->setURL( resource->fileName() ); if ( mFileNameEdit->url().isEmpty() ) - mFileNameEdit->setURL( KABC::StdAddressBook::fileName() ); + mFileNameEdit->setURL( TDEABC::StdAddressBook::fileName() ); } void ResourceFileConfig::saveSettings( KRES::Resource *res ) diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h index 18c217eda..e7b8ca9ea 100644 --- a/tdeabc/plugins/file/resourcefileconfig.h +++ b/tdeabc/plugins/file/resourcefileconfig.h @@ -26,7 +26,7 @@ #include -namespace KABC { +namespace TDEABC { class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget { diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp index 7c5b3359d..5a44f76ca 100644 --- a/tdeabc/plugins/file/resourcefileplugin.cpp +++ b/tdeabc/plugins/file/resourcefileplugin.cpp @@ -21,7 +21,7 @@ #include "resourcefile.h" #include "resourcefileconfig.h" -using namespace KABC; +using namespace TDEABC; extern "C" { -- cgit v1.2.1