diff options
Diffstat (limited to 'tdeabc/plugins')
29 files changed, 36 insertions, 36 deletions
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am index 39e8a7af4..d054bbaf9 100644 --- a/tdeabc/plugins/dir/Makefile.am +++ b/tdeabc/plugins/dir/Makefile.am @@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h lib_LTLIBRARIES = libtdeabc_dir.la libtdeabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp libtdeabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libtdeabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI) +libtdeabc_dir_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI) libtdeabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h kde_module_LTLIBRARIES = tdeabc_dir.la diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 4d0ff54ef..eaf774066 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -45,7 +45,7 @@ #include "resourcedir.h" -using namespace KABC; +using namespace TDEABC; extern "C" { diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h index dc3bdbd23..035b8a6ae 100644 --- a/tdeabc/plugins/dir/resourcedir.h +++ b/tdeabc/plugins/dir/resourcedir.h @@ -30,7 +30,7 @@ class TQTimer; -namespace KABC { +namespace TDEABC { class FormatPlugin; class Lock; @@ -82,7 +82,7 @@ class KABC_EXPORT ResourceDir : 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/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp index 2807872f8..212ef6156 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.cpp +++ b/tdeabc/plugins/dir/resourcedirconfig.cpp @@ -32,7 +32,7 @@ #include "resourcedirconfig.h" -using namespace KABC; +using namespace TDEABC; ResourceDirConfig::ResourceDirConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) @@ -86,7 +86,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res ) mFileNameEdit->setURL( resource->path() ); if ( mFileNameEdit->url().isEmpty() ) - mFileNameEdit->setURL( KABC::StdAddressBook::directoryName() ); + mFileNameEdit->setURL( TDEABC::StdAddressBook::directoryName() ); } void ResourceDirConfig::saveSettings( KRES::Resource *res ) diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h index 9df1778d3..98efd76d0 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.h +++ b/tdeabc/plugins/dir/resourcedirconfig.h @@ -26,7 +26,7 @@ #include <tderesources/configwidget.h> -namespace KABC { +namespace TDEABC { class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget { diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp index d789a93f4..5662a7062 100644 --- a/tdeabc/plugins/dir/resourcedirplugin.cpp +++ b/tdeabc/plugins/dir/resourcedirplugin.cpp @@ -21,7 +21,7 @@ #include "resourcedir.h" #include "resourcedirconfig.h" -using namespace KABC; +using namespace TDEABC; extern "C" { diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp index 75de2ea82..a5df5fe18 100644 --- a/tdeabc/plugins/evolution/resourceevo.cpp +++ b/tdeabc/plugins/evolution/resourceevo.cpp @@ -12,7 +12,7 @@ #include "resourceevo.h" using namespace Evolution; -using namespace KABC; +using namespace TDEABC; class EvolutionFactory : public KRES::PluginFactoryBase { diff --git a/tdeabc/plugins/evolution/resourceevo.h b/tdeabc/plugins/evolution/resourceevo.h index 29e163e1c..82bcab5cb 100644 --- a/tdeabc/plugins/evolution/resourceevo.h +++ b/tdeabc/plugins/evolution/resourceevo.h @@ -4,7 +4,7 @@ namespace Evolution { class DBWrapper; } -namespace KABC { +namespace TDEABC { class ResourceEvolution : public Resource { public: ResourceEvolution( const TDEConfig* config ); 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 <tdeabc/resource.h> -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 <tderesources/configwidget.h> -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" { 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 <tdeglobal.h> #include <tdelocale.h> -using namespace KABC; +using namespace TDEABC; extern "C" { diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp index 5a46890d8..390e84224 100644 --- a/tdeabc/plugins/net/resourcenet.cpp +++ b/tdeabc/plugins/net/resourcenet.cpp @@ -35,7 +35,7 @@ #include "resourcenet.h" -using namespace KABC; +using namespace TDEABC; class ResourceNet::ResourceNetPrivate { diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h index 49707081e..18a3b715b 100644 --- a/tdeabc/plugins/net/resourcenet.h +++ b/tdeabc/plugins/net/resourcenet.h @@ -35,7 +35,7 @@ namespace TDEIO { class Job; } -namespace KABC { +namespace TDEABC { class FormatPlugin; diff --git a/tdeabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp index 8d5903f8b..ab3cddf3e 100644 --- a/tdeabc/plugins/net/resourcenetconfig.cpp +++ b/tdeabc/plugins/net/resourcenetconfig.cpp @@ -31,7 +31,7 @@ #include "resourcenetconfig.h" -using namespace KABC; +using namespace TDEABC; ResourceNetConfig::ResourceNetConfig( TQWidget* parent, const char* name ) : ConfigWidget( parent, name ), mInEditMode( false ) diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h index 3c8986122..f2ba37800 100644 --- a/tdeabc/plugins/net/resourcenetconfig.h +++ b/tdeabc/plugins/net/resourcenetconfig.h @@ -26,7 +26,7 @@ #include <tderesources/configwidget.h> -namespace KABC { +namespace TDEABC { class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget { diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp index 51fa507cc..8db397152 100644 --- a/tdeabc/plugins/net/resourcenetplugin.cpp +++ b/tdeabc/plugins/net/resourcenetplugin.cpp @@ -21,7 +21,7 @@ #include "resourcenet.h" #include "resourcenetconfig.h" -using namespace KABC; +using namespace TDEABC; extern "C" { diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp index bab9b5c06..ed284cdc5 100644 --- a/tdeabc/plugins/sql/resourcesql.cpp +++ b/tdeabc/plugins/sql/resourcesql.cpp @@ -29,7 +29,7 @@ #include "resourcesql.h" #include "resourcesqlconfig.h" -using namespace KABC; +using namespace TDEABC; extern "C" { diff --git a/tdeabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h index 770e5b73b..b7c82e6b0 100644 --- a/tdeabc/plugins/sql/resourcesql.h +++ b/tdeabc/plugins/sql/resourcesql.h @@ -28,7 +28,7 @@ class TQSqlDatabase; -namespace KABC { +namespace TDEABC { class ResourceSql : public Resource { diff --git a/tdeabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp index 2f5b9d5b7..34a678aca 100644 --- a/tdeabc/plugins/sql/resourcesqlconfig.cpp +++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp @@ -29,7 +29,7 @@ #include "resource.h" #include "resourcesqlconfig.h" -using namespace KABC; +using namespace TDEABC; ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name ) : ResourceConfigWidget( parent, name ) @@ -77,7 +77,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name ) void ResourceSqlConfig::loadSettings( TDEConfig *config ) { mUser->setText( config->readEntry( "SqlUser" ) ); - mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) ); + mPassword->setText( TDEABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) ); mDbName->setText( config->readEntry( "SqlName" ) ); mHost->setText( config->readEntry( "SqlHost" ) ); mPort->setValue( config->readNumEntry( "SqlPort" ) ); @@ -86,7 +86,7 @@ void ResourceSqlConfig::loadSettings( TDEConfig *config ) void ResourceSqlConfig::saveSettings( TDEConfig *config ) { config->writeEntry( "SqlUser", mUser->text() ); - config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) ); + config->writeEntry( "SqlPassword", TDEABC::Resource::cryptStr( mPassword->text() ) ); config->writeEntry( "SqlName", mDbName->text() ); config->writeEntry( "SqlHost", mHost->text() ); config->writeEntry( "SqlPort", mPort->value() ); diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h index ae2de7d6d..f9b2c0a61 100644 --- a/tdeabc/plugins/sql/resourcesqlconfig.h +++ b/tdeabc/plugins/sql/resourcesqlconfig.h @@ -26,7 +26,7 @@ class KLineEdit; class TQSpinBox; -namespace KABC { +namespace TDEABC { class ResourceSqlConfig : public ResourceConfigWidget { |