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

---
 kdict/applet/kdictapplet.cpp                  | 2 +-
 kdict/applet/kdictapplet.h                    | 2 +-
 kopete/kopete/chatwindow/chattexteditpart.cpp | 4 ++--
 kopete/kopete/chatwindow/chattexteditpart.h   | 4 ++--
 kopete/protocols/irc/ircaccount.cpp           | 2 +-
 ksirc/dccNew.cpp                              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 681603b4..011d77ac 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -133,7 +133,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   baseLay->addWidget(matchBtn,0,5);
   TQToolTip::add(matchBtn,i18n("Find matching definitions"));
 
-  completionObject = new KCompletion();
+  completionObject = new TDECompletion();
 
   internalCombo = new KHistoryCombo(baseWidget);
   internalCombo->setBackgroundOrigin(AncestorOrigin);
diff --git a/kdict/applet/kdictapplet.h b/kdict/applet/kdictapplet.h
index d1127e15..8e56e48e 100644
--- a/kdict/applet/kdictapplet.h
+++ b/kdict/applet/kdictapplet.h
@@ -88,7 +88,7 @@ protected slots:
 
 private:
   KHistoryCombo  *internalCombo, *externalCombo;
-  KCompletion    *completionObject;
+  TDECompletion    *completionObject;
   TQLabel         *textLabel, *iconLabel;
   TQPushButton    *verticalBtn, *clipboardBtn, *defineBtn, *matchBtn;
   TQWidget        *baseWidget;
diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp
index 191e7b01..50f02328 100644
--- a/kopete/kopete/chatwindow/chattexteditpart.cpp
+++ b/kopete/kopete/chatwindow/chattexteditpart.cpp
@@ -38,9 +38,9 @@ ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *pare
 	
 	toggleAutoSpellCheck(KopetePrefs::prefs()->spellCheck());
 	
-	mComplete = new KCompletion();
+	mComplete = new TDECompletion();
 	mComplete->setIgnoreCase( true );
-	mComplete->setOrder( KCompletion::Weighted );
+	mComplete->setOrder( TDECompletion::Weighted );
 	
 	// set params on the edit widget
 	edit()->setMinimumSize( TQSize( 75, 20 ) );
diff --git a/kopete/kopete/chatwindow/chattexteditpart.h b/kopete/kopete/chatwindow/chattexteditpart.h
index f5741042..bacf2a7f 100644
--- a/kopete/kopete/chatwindow/chattexteditpart.h
+++ b/kopete/kopete/chatwindow/chattexteditpart.h
@@ -24,7 +24,7 @@
 
 class TQTimer;
 
-class KCompletion;
+class TDECompletion;
 class KDictSpellingHighlighter;
 
 namespace Kopete
@@ -197,7 +197,7 @@ private:
 	TQStringList historyList;
 	int historyPos;
 	
-	KCompletion *mComplete;
+	TDECompletion *mComplete;
 	TQString m_lastMatch;
 	
 	TQTimer *m_typingRepeatTimer;
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 9a316854..1f1be5a7 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -753,7 +753,7 @@ void IRCAccount::slotJoinChannel()
 		Kopete::UI::Global::mainWidget()
 	);
 
-	KCompletion comp;
+	TDECompletion comp;
 	comp.insertItems( chans );
 
 	dlg.lineEdit()->setCompletionObject( &comp );
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 9174d4a7..22257c0d 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -60,7 +60,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
 	}
     }
 
-    KCompletion *comp = cbNicks->completionObject();
+    TDECompletion *comp = cbNicks->completionObject();
 
     TQListBoxItem *i;
     for(i = nickList->firstItem(); i != 0x0; i = i->next()){
-- 
cgit v1.2.1