Rename KComp to avoid conflicts with KDE4

pull/21/head
Timothy Pearson 12 years ago
parent 87620f4792
commit 73299e0f9f

@ -50,7 +50,7 @@ class TQListView;
class TQPopupMenu;
class TQPushButton;
class TQCString;
class KCompletion;
class TDECompletion;
class KMEdit;
class KMComposeWin;
class KMFolderComboBox;

@ -170,7 +170,7 @@ void AddresseeLineEdit::init()
connect( this, TQT_SIGNAL( returnPressed( const TQString& ) ),
this, TQT_SLOT( slotReturnPressed( const TQString& ) ) );
KCompletionBox *box = completionBox();
TDECompletionBox *box = completionBox();
connect( box, TQT_SIGNAL( highlighted( const TQString& ) ),
this, TQT_SLOT( slotPopupCompletion( const TQString& ) ) );
connect( box, TQT_SIGNAL( userCancelled( const TQString& ) ),
@ -757,7 +757,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, int completionItemSource, const TQStringList * keyWords )
{
// Check if there is an exact match for item already, and use the max weight if so.
// Since there's no way to get the information from KCompletion, we have to keep our own TQMap
// Since there's no way to get the information from TDECompletion, we have to keep our own TQMap
CompletionItemsMap::iterator it = s_completionItemMap->find( string );
if ( it != s_completionItemMap->end() ) {
weight = TQMAX( ( *it ).first, weight );
@ -840,7 +840,7 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs )
void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest )
{
KCompletionBox* completionBox = this->completionBox();
TDECompletionBox* completionBox = this->completionBox();
if ( !items.isEmpty() &&
!(items.count() == 1 && m_searchString == items.first()) )
@ -862,9 +862,9 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
completionBox->setCancelledText( m_searchString );
completionBox->popup();
// we have to install the event filter after popup(), since that
// calls show(), and that's where KCompletionBox installs its filter.
// calls show(), and that's where TDECompletionBox installs its filter.
// We want to be first, though, so do it now.
if ( s_completion->order() == KCompletion::Weighted )
if ( s_completion->order() == TDECompletion::Weighted )
tqApp->installEventFilter( this );
}
@ -1006,16 +1006,16 @@ void KPIM::AddresseeLineEdit::slotCompletion()
}
// not cached, to make sure we get an up-to-date value when it changes
KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
TDECompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder()
{
TDEConfig config( "kpimcompletionorder" );
config.setGroup( "General" );
const TQString order = config.readEntry( "CompletionOrder", "Weighted" );
if ( order == "Weighted" )
return KCompletion::Weighted;
return TDECompletion::Weighted;
else
return KCompletion::Sorted;
return TDECompletion::Sorted;
}
int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int weight )
@ -1133,7 +1133,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e)
completionBox()->setSelected( currentIndex, true );
}
// special case of the initial selection, which is unfortunately a header.
// Setting it to selected tricks KCompletionBox into not treating is special
// Setting it to selected tricks TDECompletionBox into not treating is special
// and selecting making it current, instead of the one below.
TQListBoxItem *item = completionBox()->item( currentIndex );
if ( item && itemIsHeader(item) ) {
@ -1233,7 +1233,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
continue;
int idx = (*cit).second;
if ( s_completion->order() == KCompletion::Weighted ) {
if ( s_completion->order() == TDECompletion::Weighted ) {
if ( lastSourceIndex == -1 || lastSourceIndex != idx ) {
const TQString sourceLabel( (*s_completionSources)[idx] );
if ( sections.find(idx) == sections.end() ) {
@ -1247,12 +1247,12 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
}
sections[idx].append( *it );
if ( s_completion->order() == KCompletion::Sorted ) {
if ( s_completion->order() == TDECompletion::Sorted ) {
sortedItems.append( *it );
}
}
if ( s_completion->order() == KCompletion::Weighted ) {
if ( s_completion->order() == TDECompletion::Weighted ) {
// Sort the sections
TQValueList<SourceWithWeight> sourcesAndWeights;

@ -109,7 +109,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
int addCompletionSource( const TQString&, int weight );
/** return whether we are using sorted or weighted display */
static KCompletion::CompOrder completionOrder();
static TDECompletion::CompOrder completionOrder();
k_dcop:
// Connected to the DCOP signal

@ -34,12 +34,12 @@ KMailCompletion::KMailCompletion()
void KMailCompletion::clear()
{
m_keyMap.clear();
KCompletion::clear();
TDECompletion::clear();
}
TQString KMailCompletion::makeCompletion( const TQString &string )
{
TQString match = KCompletion::makeCompletion( string );
TQString match = TDECompletion::makeCompletion( string );
// this should be in postProcessMatch, but postProcessMatch is const and will not allow nextMatch
if ( !match.isEmpty() ){
@ -79,7 +79,7 @@ void KMailCompletion::addItemWithKeys( const TQString& email, int weight, const
TQStringList &emailList = m_keyMap[ (*it) ]; //lookup email-list for given keyword
if ( emailList.find( email ) == emailList.end() ) //add email if not there
emailList.append( email );
addItem( (*it),weight ); //inform KCompletion about keyword
addItem( (*it),weight ); //inform TDECompletion about keyword
}
}
@ -89,7 +89,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const
if ( pMatches->isEmpty() )
return;
//KCompletion has found the keywords for us, we can now map them to mail-addr
//TDECompletion has found the keywords for us, we can now map them to mail-addr
TQMap< TQString, bool > mailAddrDistinct; //TODO replace with TQSet in KDE4
for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) {
const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword

@ -33,7 +33,7 @@ namespace KPIM {
* KMailCompletion allows lookup of email addresses by keyword.
* Typically a keywods would be firstname, lastname, nickname or domain.
*/
class KMailCompletion : public KCompletion
class KMailCompletion : public TDECompletion
{
Q_OBJECT
@ -42,12 +42,12 @@ class KMailCompletion : public KCompletion
KMailCompletion();
/**
* Clears internal keyword map and calls KCompletion::clear.
* Clears internal keyword map and calls TDECompletion::clear.
*/
virtual void clear();
/**
* Uses KCompletion::makeCompletion to find email addresses which starts with string.
* Uses TDECompletion::makeCompletion to find email addresses which starts with string.
* ignores keywords.
*
* @returns email address
@ -57,7 +57,7 @@ class KMailCompletion : public KCompletion
/**
* Specify keywords for email.
*
* Items may be added with KCompletion::addItem, those will only be returned as match if they
* Items may be added with TDECompletion::addItem, those will only be returned as match if they
* are in one of these formats:
* \li contains localpart@domain
* \li contains <email>

Loading…
Cancel
Save