From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/ldapsearchdialog.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libkdepim/ldapsearchdialog.cpp') diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp index 37b29f6d..2297e17e 100644 --- a/libkdepim/ldapsearchdialog.cpp +++ b/libkdepim/ldapsearchdialog.cpp @@ -44,7 +44,7 @@ using namespace KPIM; static TQString asUtf8( const TQByteArray &val ) { if ( val.isEmpty() ) - return TQString::null; + return TQString(); const char *data = val.data(); @@ -101,8 +101,8 @@ namespace KPIM { 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 ) { const KPIM::LdapAttrValue &mailAttrs = attrs[ "mail" ]; if ( mailAttrs.isEmpty() ) { @@ -124,9 +124,9 @@ class ContactListItem : public TQListViewItem } -LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) +LDAPSearchDialog::LDAPSearchDialog( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | - User2 | User3 | Cancel, Default, parent, name, false, true ) + User2 | User3 | Cancel, Default, tqparent, name, false, true ) { setButtonCancel( KStdGuiItem::close() ); TQFrame *page = plainPage(); @@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) 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 ); @@ -363,7 +363,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; } } @@ -375,7 +375,7 @@ void LDAPSearchDialog::slotStartSearch() { cancelQuery(); - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); disconnect( mSearchButton, TQT_SIGNAL( clicked() ), -- cgit v1.2.3