From 94273bcb909fac42ef9427e3d8a614cab8c29c66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:27:27 -0600 Subject: Rename KABC namespace --- kaddressbook/editors/Makefile.am | 2 +- kaddressbook/editors/cryptowidget.cpp | 6 +++--- kaddressbook/editors/cryptowidget.h | 8 ++++---- kaddressbook/editors/imeditorwidget.cpp | 4 ++-- kaddressbook/editors/imeditorwidget.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'kaddressbook/editors') diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am index 6c1096c0..2eeafc94 100644 --- a/kaddressbook/editors/Makefile.am +++ b/kaddressbook/editors/Makefile.am @@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined -libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) +libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 89212585..06472da7 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -68,7 +68,7 @@ TQString CryptoWidgetFactory::pageIdentifier() const return "crypto"; } -CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(), @@ -139,7 +139,7 @@ CryptoWidget::~CryptoWidget() { } -void CryptoWidget::loadContact( KABC::Addressee *addr ) +void CryptoWidget::loadContact( TDEABC::Addressee *addr ) { bool blocked = signalsBlocked(); blockSignals( true ); @@ -167,7 +167,7 @@ void CryptoWidget::loadContact( KABC::Addressee *addr ) blockSignals( blocked ); } -void CryptoWidget::storeContact( KABC::Addressee *addr ) +void CryptoWidget::storeContact( TDEABC::Addressee *addr ) { uint cryptoFormats = 0; uint msgFormat = 1; diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h index 288920d1..1d8794ba 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -39,11 +39,11 @@ class CryptoWidget : public KAB::ContactEditorWidget public: - CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~CryptoWidget(); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); private: @@ -60,7 +60,7 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: CryptoWidgetFactory(); - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new CryptoWidget( ab, parent, name ); } diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index b0f1590e..38d641c4 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -190,7 +190,7 @@ TQValueList IMEditorWidget::availableProtocols() const return mProtocols; } -void IMEditorWidget::loadContact( KABC::Addressee *addr ) +void IMEditorWidget::loadContact( TDEABC::Addressee *addr ) { if ( mWidget->lvAddresses ) mWidget->lvAddresses->clear(); @@ -227,7 +227,7 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr ) mWidget->lvAddresses->firstChild()->setSelected( true ); } -void IMEditorWidget::storeContact( KABC::Addressee *addr ) +void IMEditorWidget::storeContact( TDEABC::Addressee *addr ) { // for each changed protocol, write a new custom field containing the current set of // addresses diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 517e2649..1119144c 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -55,8 +55,8 @@ class IMEditorWidget : public KDialogBase IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 ); ~IMEditorWidget() {}; - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); TQValueList availableProtocols() const; bool isModified() const; -- cgit v1.2.3