diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:12 -0600 |
| commit | fd5d099065a748cac49e20a13481f85666c53c71 (patch) | |
| tree | a0f1672cd88eb0e69b9ddc2ed9b08ecd98538bd3 /kaddressbook/interfaces | |
| parent | b440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff) | |
| download | tdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kaddressbook/interfaces')
| -rw-r--r-- | kaddressbook/interfaces/core.h | 6 | ||||
| -rw-r--r-- | kaddressbook/interfaces/xxport.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index c291f208..3a5baba9 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -44,7 +44,7 @@ class Resource; class TQWidget; -class KActionCollection; +class TDEActionCollection; class TDEConfig; class KURL; @@ -71,10 +71,10 @@ class KDE_EXPORT Core : public TQObject virtual TDEConfig *config() const = 0; /** - Returns a pointer to the global KActionCollection object. So + Returns a pointer to the global TDEActionCollection object. So other classes can register their actions easily. */ - virtual KActionCollection *actionCollection() const = 0; + virtual TDEActionCollection *actionCollection() const = 0; /** Returns a pointer to the gui client. diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index 68b88312..a934bb97 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -77,7 +77,7 @@ KABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - KAction *action = new KAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_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 ); - KAction *action = new KAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); |