diff options
Diffstat (limited to 'kaddressbook/interfaces')
-rw-r--r-- | kaddressbook/interfaces/Makefile.am | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/configurewidget.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/interfaces/configurewidget.h | 8 | ||||
-rw-r--r-- | kaddressbook/interfaces/contacteditorwidget.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/interfaces/contacteditorwidget.h | 12 | ||||
-rw-r--r-- | kaddressbook/interfaces/core.h | 8 | ||||
-rw-r--r-- | kaddressbook/interfaces/extensionwidget.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/interfaces/extensionwidget.h | 4 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.cpp | 10 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.h | 14 |
10 files changed, 35 insertions, 35 deletions
diff --git a/kaddressbook/interfaces/Makefile.am b/kaddressbook/interfaces/Makefile.am index 7b4373643..a857dddb2 100644 --- a/kaddressbook/interfaces/Makefile.am +++ b/kaddressbook/interfaces/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libkabinterfaces.la libkabinterfaces_la_SOURCES = configurewidget.cpp contacteditorwidget.cpp \ core.cpp extensionwidget.cpp xxport.cpp libkabinterfaces_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libkabinterfaces_la_LIBADD = $(LIB_KABC) +libkabinterfaces_la_LIBADD = $(LIB_TDEABC) kabincludedir = $(includedir)/kaddressbook kabinclude_HEADERS = configurewidget.h contacteditorwidget.h core.h \ diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp index bcb7a1764..bce8136c1 100644 --- a/kaddressbook/interfaces/configurewidget.cpp +++ b/kaddressbook/interfaces/configurewidget.cpp @@ -27,7 +27,7 @@ using namespace KAB; -ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, +ConfigureWidget::ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mAddressBook( ab ) { @@ -47,7 +47,7 @@ void ConfigureWidget::saveSettings( TDEConfig* ) // should be reimplemented in the views, extensions etc. } -KABC::AddressBook *ConfigureWidget::addressBook() const +TDEABC::AddressBook *ConfigureWidget::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index e8df353df..33bc6f762 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -38,7 +38,7 @@ namespace KAB { class KDE_EXPORT ConfigureWidget : public TQWidget { public: - ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ConfigureWidget(); /** @@ -61,10 +61,10 @@ class KDE_EXPORT ConfigureWidget : public TQWidget /** Returns a pointer to the address book of this widget. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; }; } diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp index 3059b7a40..91e388733 100644 --- a/kaddressbook/interfaces/contacteditorwidget.cpp +++ b/kaddressbook/interfaces/contacteditorwidget.cpp @@ -25,7 +25,7 @@ using namespace KAB; -ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab, +ContactEditorWidget::ContactEditorWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mAddressBook( ab ), mModified( false ) { @@ -35,7 +35,7 @@ ContactEditorWidget::~ContactEditorWidget() { } -KABC::AddressBook *ContactEditorWidget::addressBook() const +TDEABC::AddressBook *ContactEditorWidget::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index c8efa56c1..85195dd84 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -42,7 +42,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget public: typedef TQValueList<ContactEditorWidget*> List; - ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ContactEditorWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ContactEditorWidget(); /** @@ -62,13 +62,13 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget /** Load the contacts data into the GUI. */ - virtual void loadContact( KABC::Addressee *addr ) = 0; + virtual void loadContact( TDEABC::Addressee *addr ) = 0; /** Save the data from the GUI into the passed contact object. */ - virtual void storeContact( KABC::Addressee *addr ) = 0; + virtual void storeContact( TDEABC::Addressee *addr ) = 0; /** Sets whether the contact should be presented as @@ -104,10 +104,10 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget /** Returns a pointer to the address book object. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; bool mModified; class ContactEditorWidgetPrivate; @@ -117,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget class ContactEditorWidgetFactory : public KLibFactory { public: - virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, + virtual ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; /** diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index fcf41028f..0132399c1 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -37,7 +37,7 @@ #include <kxmlguiclient.h> #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; class Resource; } @@ -63,7 +63,7 @@ class KDE_EXPORT Core : public TQObject /** Returns a pointer to the StdAddressBook of the application. */ - virtual KABC::AddressBook *addressBook() const = 0; + virtual TDEABC::AddressBook *addressBook() const = 0; /** Returns a pointer to the TDEConfig object of the application. @@ -84,7 +84,7 @@ class KDE_EXPORT Core : public TQObject /** Returns the current sort field. */ - virtual KABC::Field *currentSortField() const = 0; + virtual TDEABC::Field *currentSortField() const = 0; /** Returns the uid list of the currently selected contacts. @@ -96,7 +96,7 @@ class KDE_EXPORT Core : public TQObject resource or a null pointer if no resource was selected by the user. */ - virtual KABC::Resource *requestResource( TQWidget *parent ) = 0; + virtual TDEABC::Resource *requestResource( TQWidget *parent ) = 0; /** Returns the parent widget. diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp index 63f90200b..da4fcc7d8 100644 --- a/kaddressbook/interfaces/extensionwidget.cpp +++ b/kaddressbook/interfaces/extensionwidget.cpp @@ -47,9 +47,9 @@ bool ExtensionWidget::contactsSelected() const return mCore->selectedUIDs().count() != 0; } -KABC::Addressee::List ExtensionWidget::selectedContacts() +TDEABC::Addressee::List ExtensionWidget::selectedContacts() { - KABC::Addressee::List list; + TDEABC::Addressee::List list; const TQStringList uids = mCore->selectedUIDs(); TQStringList::ConstIterator it; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 265484a4d..3de00edde 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -60,7 +60,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget Use @ref addresseesSelected() to test if there exists selected contacts. */ - KABC::Addressee::List selectedContacts(); + TDEABC::Addressee::List selectedContacts(); /** This method is called whenever the selection in the view changed. @@ -79,7 +79,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget virtual TQString identifier() const = 0; signals: - void modified( const KABC::Addressee::List &list ); + void modified( const TDEABC::Addressee::List &list ); void deleted( const TQStringList& uidList ); private: diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index d0790ccfa..a2874e8c6 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -40,7 +40,7 @@ class XXPort::XXPortPrivate TDEApplication *mKApp; }; -XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent, +XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ), d( new XXPortPrivate ) @@ -62,16 +62,16 @@ XXPort::~XXPort() d = 0; } -bool XXPort::exportContacts( const KABC::AddresseeList&, const TQString& ) +bool XXPort::exportContacts( const TDEABC::AddresseeList&, const TQString& ) { // do nothing return false; } -KABC::AddresseeList XXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const { // do nothing - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } void XXPort::createImportAction( const TQString &label, const TQString &data ) @@ -94,7 +94,7 @@ void XXPort::createExportAction( const TQString &label, const TQString &data ) setXMLFile( identifier() + "_xxportui.rc" ); } -KABC::AddressBook *XXPort::addressBook() const +TDEABC::AddressBook *XXPort::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 515470c55..b0dd43e74 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -45,7 +45,7 @@ class TDEApplication; */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ - KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ + KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ return new XXPortClass( ab, parent, name ); \ @@ -71,7 +71,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient public: - XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~XXPort(); /** @@ -104,12 +104,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Reimplement this method for exporting the contacts. */ - virtual bool exportContacts( const KABC::AddresseeList &list, const TQString& identifier ); + virtual bool exportContacts( const TDEABC::AddresseeList &list, const TQString& identifier ); /** Reimplement this method for importing the contacts. */ - virtual KABC::AddresseeList importContacts( const TQString& identifier ) const; + virtual TDEABC::AddresseeList importContacts( const TQString& identifier ) const; signals: /** @@ -140,7 +140,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Returns a pointer to the address book object. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; /** Returns a pointer to the parent widget. It can be used as parent for @@ -153,7 +153,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient void slotExportActivated( const TQString& ); private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; TQWidget *mParentWidget; class XXPortPrivate; @@ -163,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient class XXPortFactory : public KLibFactory { public: - virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, + virtual XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; protected: |