summaryrefslogtreecommitdiffstats
path: root/kaddressbook/ldapsearchdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/ldapsearchdialog.cpp')
-rw-r--r--kaddressbook/ldapsearchdialog.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 7074a5966..f23049909 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -49,7 +49,7 @@
static TQString asUtf8( const TQByteArray &val )
{
if ( val.isEmpty() )
- return TQString::null;
+ return TQString();
const char *data = val.data();
@@ -101,11 +101,11 @@ static TQMap<TQString, TQString>& adrbookattr2ldap()
return keys;
}
-class ContactListItem : public QListViewItem
+class ContactListItem : public TQListViewItem
{
public:
- ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs )
- : TQListViewItem( parent ), mAttrs( attrs )
+ ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs )
+ : TQListViewItem( tqparent ), mAttrs( attrs )
{ }
KPIM::LdapAttrMap mAttrs;
@@ -139,9 +139,9 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi
}
LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
- TQWidget* parent, const char* name )
+ TQWidget* tqparent, const char* name )
: KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 |
- Cancel, Default, parent, name, false, true ),
+ Cancel, Default, tqparent, name, false, true ),
mAddressBook( ab ), mCore( core ), d( new Private )
{
setButtonCancel( KStdGuiItem::close() );
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
page );
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
- groupBox->setColumnLayout( 0, Qt::Vertical );
+ groupBox->setColumnLayout( 0, TQt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -202,7 +202,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
mResultListView->setShowSortIndicator( true );
topLayout->addWidget( mResultListView );
- KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
+ KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
@@ -372,7 +372,7 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
result = result.arg( "telephoneNumber" ).arg( query );
} else {
// Error?
- result = TQString::null;
+ result = TQString();
return result;
}
}
@@ -384,7 +384,7 @@ void LDAPSearchDialog::slotStartSearch()
{
cancelQuery();
- TQApplication::setOverrideCursor( Qt::waitCursor );
+ TQApplication::setOverrideCursor( TQt::waitCursor );
mSearchButton->setText( i18n( "Stop" ) );
disconnect( mSearchButton, TQT_SIGNAL( clicked() ),
@@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
const ContactListItem * const cli = *it;
KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
- const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() );
+ const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
if ( existing.isEmpty() ) {
addr.setUid( KApplication::randomString( 10 ) );