diff options
| -rw-r--r-- | kbugbuster/tderesources/kcalresource.cpp | 4 | ||||
| -rw-r--r-- | kbugbuster/tderesources/kcalresource.h | 4 | ||||
| -rw-r--r-- | kdeaccounts-plugin/kdeaccountsformat.cpp | 8 | ||||
| -rw-r--r-- | kdeaccounts-plugin/kdeaccountsformat.h | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index 0e59e55e..5cc58b39 100644 --- a/kbugbuster/tderesources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -91,7 +91,7 @@ void KCalResource::init() mOpen = false; - mLock = new KABC::LockNull( true ); + mLock = new TDEABC::LockNull( true ); TDEConfig config( "kbugbusterrc" ); @@ -300,7 +300,7 @@ void KCalResource::doClose() mOpen = false; } -KABC::Lock *KCalResource::lock() +TDEABC::Lock *KCalResource::lock() { return mLock; } diff --git a/kbugbuster/tderesources/kcalresource.h b/kbugbuster/tderesources/kcalresource.h index 4c8c7353..a9467b9f 100644 --- a/kbugbuster/tderesources/kcalresource.h +++ b/kbugbuster/tderesources/kcalresource.h @@ -79,7 +79,7 @@ class KCalResource : public KCal::ResourceCached */ TQString cacheFile(); - KABC::Lock *lock(); + TDEABC::Lock *lock(); bool isSaving(); @@ -115,7 +115,7 @@ class KCalResource : public KCal::ResourceCached TDEIO::FileCopyJob *mDownloadJob; TDEIO::FileCopyJob *mUploadJob; - KABC::Lock *mLock; + TDEABC::Lock *mLock; class Private; Private *d; diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp index 97a07d4d..8c01307c 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.cpp +++ b/kdeaccounts-plugin/kdeaccountsformat.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT KABC::FormatPlugin *format() + KDE_EXPORT TDEABC::FormatPlugin *format() { return new KDEAccountsFormat(); } @@ -20,8 +20,8 @@ extern "C" * pfeiffer Carsten Pfeiffer pfeiffer@kde.org */ -bool KDEAccountsFormat::loadAll( KABC::AddressBook *book, - KABC::Resource *resource, +bool KDEAccountsFormat::loadAll( TDEABC::AddressBook *book, + TDEABC::Resource *resource, TQFile *file ) { if ( !book || !file ) // eh? @@ -70,7 +70,7 @@ bool KDEAccountsFormat::loadAll( KABC::AddressBook *book, if ( !email.isEmpty() ) { - KABC::Addressee address; + TDEABC::Addressee address; address.setNickName( nickName ); address.setNameFromString( name ); address.setOrganization("KDE Project"); diff --git a/kdeaccounts-plugin/kdeaccountsformat.h b/kdeaccounts-plugin/kdeaccountsformat.h index ea763c38..3fc6bb7e 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.h +++ b/kdeaccounts-plugin/kdeaccountsformat.h @@ -12,29 +12,29 @@ #include <tdeabc/formatplugin.h> -namespace KABC { +namespace TDEABC { class AddressBook; } -class KDEAccountsFormat : public KABC::FormatPlugin +class KDEAccountsFormat : public TDEABC::FormatPlugin { public: KDEAccountsFormat() {} ~KDEAccountsFormat() {} - virtual bool loadAll( KABC::AddressBook *, - KABC::Resource *resource, TQFile *file ); + virtual bool loadAll( TDEABC::AddressBook *, + TDEABC::Resource *resource, TQFile *file ); - virtual bool load( KABC::Addressee&, TQFile *) + virtual bool load( TDEABC::Addressee&, TQFile *) { tqDebug("*** KDE Accounts format: load single entry not supported."); return false; } - virtual void save( const KABC::Addressee&, TQFile *) + virtual void save( const TDEABC::Addressee&, TQFile *) { tqDebug("*** KDE Accounts format: save not supported."); } - virtual void saveAll( KABC::AddressBook *, KABC::Resource *, TQFile *) + virtual void saveAll( TDEABC::AddressBook *, TDEABC::Resource *, TQFile *) { tqDebug("*** KDE Accounts format: save not supported."); } |