diff options
Diffstat (limited to 'kaddressbook/interfaces')
-rw-r--r-- | kaddressbook/interfaces/configurewidget.h | 4 | ||||
-rw-r--r-- | kaddressbook/interfaces/contacteditorwidget.h | 6 | ||||
-rw-r--r-- | kaddressbook/interfaces/core.h | 18 | ||||
-rw-r--r-- | kaddressbook/interfaces/extensionwidget.h | 6 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.h | 8 |
6 files changed, 27 insertions, 27 deletions
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 33bc6f76..c636b10b 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; @@ -35,7 +35,7 @@ class AddressBook; namespace KAB { -class KDE_EXPORT ConfigureWidget : public TQWidget +class TDE_EXPORT ConfigureWidget : public TQWidget { public: ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 85195dd8..c3282b5c 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,15 +28,15 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_CEW_PLUGIN_VERSION 1 namespace KAB { -class KDE_EXPORT ContactEditorWidget : public TQWidget +class TDE_EXPORT ContactEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 0132399c..e689ee8f 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include <tdeabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; @@ -52,9 +52,9 @@ namespace KAB { class SearchManager; -class KDE_EXPORT Core : public TQObject +class TDE_EXPORT Core : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject virtual void setContactSelected( const TQString &uid ) = 0; /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ) = 0; /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ) = 0; /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ) = 0; /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact() = 0; /** - DCOP METHOD: Opens distribution list editor to input a new distribution list. + DCOP method: Opens distribution list editor to input a new distribution list. */ virtual void newDistributionList() = 0; /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ) = 0; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 3de00edd..a7396c2a 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 @@ -36,9 +36,9 @@ namespace KAB { class Core; class ConfigureWidget; -class KDE_EXPORT ExtensionWidget : public TQWidget +class TDE_EXPORT ExtensionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index a2874e8c..ca7da285 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, d->mExportMapper = new TQSignalMapper( this ); d->mImportMapper = new TQSignalMapper( this ); - connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotExportActivated( const TQString& ) ) ); - connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotImportActivated( const TQString& ) ) ); + connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotExportActivated( const TQString& ) ) ); + connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotImportActivated( const TQString& ) ) ); } XXPort::~XXPort() @@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); @@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data ) void XXPort::createExportAction( const TQString &label, const TQString &data ) { TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index b0dd43e7..13321eee 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include <tdeabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_XXPORT_PLUGIN_VERSION 1 @@ -44,7 +44,7 @@ class TDEApplication; @see: K_EXPORT_COMPONENT_FACTORY() */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ - class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ + class TDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ @@ -65,9 +65,9 @@ class TDEApplication; namespace KAB { -class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient +class TDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: |