Rename KComp to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 28cd5374ba
commit d9d612c4a1

@ -375,7 +375,7 @@ Auto-Completion
<itemizedlist> <itemizedlist>
<listitem><formalpara><title><ulink url="kdeapi:tdecore/KCompletion">KCompletion</ulink></title> <listitem><formalpara><title><ulink url="kdeapi:tdecore/TDECompletion">TDECompletion</ulink></title>
<para> <para>
Generic auto-completion of strings. Generic auto-completion of strings.
</para> </para>

@ -26,7 +26,7 @@
class CppSupportPart; class CppSupportPart;
class KDevProject; class KDevProject;
class TQPopupMenu; class TQPopupMenu;
class KCompletion; class TDECompletion;
class CodeModel; class CodeModel;
@ -196,8 +196,8 @@ private:
TQStringList currNamespace; TQStringList currNamespace;
bool lowercase_filenames; bool lowercase_filenames;
TQStringList currBaseClasses; TQStringList currBaseClasses;
KCompletion * compBasename; TDECompletion * compBasename;
KCompletion * compNamespace; TDECompletion * compNamespace;
void setCompletionBasename( CodeModel *model ); void setCompletionBasename( CodeModel *model );
void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" ); void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" );

@ -32,7 +32,7 @@ using namespace std;
PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) { PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) {
m_filenameModified = false; m_filenameModified = false;
KCompletion *comp = new KCompletion(); TDECompletion *comp = new TDECompletion();
comp->setItems(baseClassNames); comp->setItems(baseClassNames);
m_dirEdit->setText(directory); m_dirEdit->setText(directory);

@ -35,19 +35,19 @@ KComboView provides text completion.
*/ */
///This can be used to insert own KCompletion-implementations ///This can be used to insert own TDECompletion-implementations
class CustomCompleter : public KCompletion { class CustomCompleter : public TDECompletion {
public: public:
virtual void addItem (const TQString &item) { virtual void addItem (const TQString &item) {
KCompletion::addItem( item ); TDECompletion::addItem( item );
} }
virtual void removeItem (const TQString &item) { virtual void removeItem (const TQString &item) {
KCompletion::removeItem( item ); TDECompletion::removeItem( item );
} }
virtual void clear() { virtual void clear() {
KCompletion::clear(); TDECompletion::clear();
} }
}; };

@ -88,7 +88,7 @@ class FunctionCompletion : public CustomCompleter {
virtual void addItem ( const TQString &item ) { virtual void addItem ( const TQString &item ) {
TQString newItemName = item; TQString newItemName = item;
KCompletion::addItem(newItemName); TDECompletion::addItem(newItemName);
TQString tx = processName( item ); TQString tx = processName( item );
tx += " \"" + item + "\""; tx += " \"" + item + "\"";
nameMap[item] = tx; nameMap[item] = tx;
@ -96,16 +96,16 @@ class FunctionCompletion : public CustomCompleter {
if(tx.length() == 0) { if(tx.length() == 0) {
kdDebug() << "function-name-extraction failed with \"" << item << "\"" << endl; kdDebug() << "function-name-extraction failed with \"" << item << "\"" << endl;
}else{ }else{
KCompletion::addItem( tx ); TDECompletion::addItem( tx );
kdDebug() << "addding \"" << item << "\" as \"" << tx << "\"" << endl; kdDebug() << "addding \"" << item << "\" as \"" << tx << "\"" << endl;
} }
KCompletion::addItem( item ); TDECompletion::addItem( item );
} }
virtual void removeItem ( const TQString &item ) { virtual void removeItem ( const TQString &item ) {
FuncMap::iterator it = nameMap.find( item ); FuncMap::iterator it = nameMap.find( item );
if( it != nameMap.end() ) { if( it != nameMap.end() ) {
KCompletion::removeItem( *it ); TDECompletion::removeItem( *it );
revNameMap.remove( *it ); revNameMap.remove( *it );
nameMap.remove( it ); nameMap.remove( it );
} }
@ -114,7 +114,7 @@ class FunctionCompletion : public CustomCompleter {
virtual void clear() { virtual void clear() {
nameMap.clear(); nameMap.clear();
revNameMap.clear(); revNameMap.clear();
KCompletion::clear(); TDECompletion::clear();
} }
virtual void postProcessMatch ( TQString *match ) const { virtual void postProcessMatch ( TQString *match ) const {
@ -133,7 +133,7 @@ class FunctionCompletion : public CustomCompleter {
} }
} }
virtual void postProcessMatches ( KCompletionMatches *matches ) const { virtual void postProcessMatches ( TDECompletionMatches *matches ) const {
} }
}; };

@ -29,7 +29,7 @@
#include "quickopenbase.h" #include "quickopenbase.h"
class QuickOpenPart; class QuickOpenPart;
class KCompletion; class TDECompletion;
class QuickOpenDialog : public QuickOpenDialogBase class QuickOpenDialog : public QuickOpenDialogBase
{ {

@ -27,7 +27,7 @@
#include <kurl.h> #include <kurl.h>
class QuickOpenPart; class QuickOpenPart;
class KCompletion; class TDECompletion;
class QuickOpenFileDialog : public QuickOpenDialog class QuickOpenFileDialog : public QuickOpenDialog
{ {

@ -26,7 +26,7 @@
#include "quickopendialog.h" #include "quickopendialog.h"
#include "quickopen_part.h" #include "quickopen_part.h"
class KCompletion; class TDECompletion;
class QuickOpenPart; class QuickOpenPart;
class QuickOpenFunctionDialog : public QuickOpenDialog class QuickOpenFunctionDialog : public QuickOpenDialog

Loading…
Cancel
Save