diff options
Diffstat (limited to 'kaddressbook/features')
-rw-r--r-- | kaddressbook/features/Makefile.am | 6 | ||||
-rw-r--r-- | kaddressbook/features/distributionlistngwidget.cpp | 10 | ||||
-rw-r--r-- | kaddressbook/features/distributionlistwidget.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am index d3311c77b..a2b5db399 100644 --- a/kaddressbook/features/Makefile.am +++ b/kaddressbook/features/Makefile.am @@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ if compile_newdistrlists libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) +libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) else libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) +libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) endif libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) +libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 4ca4e365e..d6b1d7d96 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) event->ignore(); } else { - event->accept( itemRect( item ) ); + event->accept( tqitemRect( item ) ); } } @@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQHBoxLayout *buttonLayout = new TQHBoxLayout(); - layout->addLayout( buttonLayout ); + tqlayout->addLayout( buttonLayout ); TQLabel *label = new TQLabel( this ); label->setText( i18n( "Distribution Lists" ) ); @@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); - layout->addWidget( mListBox ); + tqlayout->addWidget( mListBox ); connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateEntries() ) ); diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 93a00bdfa..878ede7aa 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged() bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const { #ifdef KDEPIM_NEW_DISTRLISTS - return core()->distributionListNames().contains( distrListName ); + return core()->distributionListNames().tqcontains( distrListName ); #else - return mManager->listNames().contains( distrListName ); + return mManager->listNames().tqcontains( distrListName ); #endif } |