From 546d2312d9b4a09110dd2d87fc7f07b330f7ce95 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 7 Feb 2013 17:56:54 -0600
Subject: Rename KComp to avoid conflicts with KDE4

---
 kabc/addresslineedit.cpp | 10 +++++-----
 kabc/addresslineedit.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kabc')

diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 88703094b..cd6820fcd 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -55,7 +55,7 @@
 
 using namespace KABC;
 
-KCompletion * AddressLineEdit::s_completion = 0L;
+TDECompletion * AddressLineEdit::s_completion = 0L;
 bool AddressLineEdit::s_addressesDirty = false;
 TQTimer* AddressLineEdit::s_LDAPTimer = 0L;
 LdapSearch* AddressLineEdit::s_LDAPSearch = 0L;
@@ -63,7 +63,7 @@ TQString* AddressLineEdit::s_LDAPText = 0L;
 AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L;
 TDEConfig *AddressLineEdit::s_config = 0L;
 
-static KStaticDeleter<KCompletion> completionDeleter;
+static KStaticDeleter<TDECompletion> completionDeleter;
 static KStaticDeleter<TQTimer> ldapTimerDeleter;
 static KStaticDeleter<LdapSearch> ldapSearchDeleter;
 static KStaticDeleter<TQString> ldapTextDeleter;
@@ -93,8 +93,8 @@ AddressLineEdit::AddressLineEdit(TQWidget* parent,
 void AddressLineEdit::init()
 {
   if ( !s_completion ) {
-      completionDeleter.setObject( s_completion, new KCompletion() );
-      s_completion->setOrder( KCompletion::Sorted );
+      completionDeleter.setObject( s_completion, new TDECompletion() );
+      s_completion->setOrder( TDECompletion::Sorted );
       s_completion->setIgnoreCase( true );
   }
 
@@ -115,7 +115,7 @@ void AddressLineEdit::init()
       connect( this, TQT_SIGNAL( completion(const TQString&)),
                this, TQT_SLOT(slotCompletion() ));
       
-      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& )),
diff --git a/kabc/addresslineedit.h b/kabc/addresslineedit.h
index 0cbd5dd43..f81ffbfe4 100644
--- a/kabc/addresslineedit.h
+++ b/kabc/addresslineedit.h
@@ -107,7 +107,7 @@ private:
   TQString m_typedText; // unused
 
   static bool s_addressesDirty;
-  static KCompletion *s_completion;
+  static TDECompletion *s_completion;
   static TQTimer *s_LDAPTimer;
   static LdapSearch *s_LDAPSearch;
   static TQString *s_LDAPText;
-- 
cgit v1.2.1