summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 17:59:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 17:59:05 -0600
commitd9d612c4a178511357ce335ed8790ab78d822d33 (patch)
treea71db1d95ac1b9a92f39ce0f401b46d0b2f4c979
parent28cd5374ba94ff81d3dd63765232b142038a4dbb (diff)
downloadtdevelop-d9d612c4.tar.gz
tdevelop-d9d612c4.zip
Rename KComp to avoid conflicts with KDE4
-rw-r--r--doc/kdearch/index.docbook2
-rw-r--r--languages/cpp/cppnewclassdlg.h6
-rw-r--r--languages/php/phpnewclassdlg.cpp2
-rw-r--r--lib/widgets/kcomboview.h10
-rw-r--r--parts/classview/classviewpart.cpp12
-rw-r--r--parts/quickopen/quickopendialog.h2
-rw-r--r--parts/quickopen/quickopenfiledialog.h2
-rw-r--r--parts/quickopen/quickopenfunctiondialog.h2
8 files changed, 19 insertions, 19 deletions
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index b23587f8..eb7ca4e9 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -375,7 +375,7 @@ Auto-Completion
<itemizedlist>
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KCompletion">KCompletion</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDECompletion">TDECompletion</ulink></title>
<para>
Generic auto-completion of strings.
</para>
diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h
index 818798c0..e7250a6a 100644
--- a/languages/cpp/cppnewclassdlg.h
+++ b/languages/cpp/cppnewclassdlg.h
@@ -26,7 +26,7 @@
class CppSupportPart;
class KDevProject;
class TQPopupMenu;
-class KCompletion;
+class TDECompletion;
class CodeModel;
@@ -196,8 +196,8 @@ private:
TQStringList currNamespace;
bool lowercase_filenames;
TQStringList currBaseClasses;
- KCompletion * compBasename;
- KCompletion * compNamespace;
+ TDECompletion * compBasename;
+ TDECompletion * compNamespace;
void setCompletionBasename( CodeModel *model );
void addCompletionBasenameNamespacesRecursive( const NamespaceDom & namespaceDom, const TQString & namespaceParent = "" );
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 3ed6d952..4e5b7c43 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -32,7 +32,7 @@ using namespace std;
PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) {
m_filenameModified = false;
- KCompletion *comp = new KCompletion();
+ TDECompletion *comp = new TDECompletion();
comp->setItems(baseClassNames);
m_dirEdit->setText(directory);
diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h
index 8a72e5e8..f808c29c 100644
--- a/lib/widgets/kcomboview.h
+++ b/lib/widgets/kcomboview.h
@@ -35,19 +35,19 @@ KComboView provides text completion.
*/
-///This can be used to insert own KCompletion-implementations
-class CustomCompleter : public KCompletion {
+///This can be used to insert own TDECompletion-implementations
+class CustomCompleter : public TDECompletion {
public:
virtual void addItem (const TQString &item) {
- KCompletion::addItem( item );
+ TDECompletion::addItem( item );
}
virtual void removeItem (const TQString &item) {
- KCompletion::removeItem( item );
+ TDECompletion::removeItem( item );
}
virtual void clear() {
- KCompletion::clear();
+ TDECompletion::clear();
}
};
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 80e3e8c4..3bff2daf 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -88,7 +88,7 @@ class FunctionCompletion : public CustomCompleter {
virtual void addItem ( const TQString &item ) {
TQString newItemName = item;
- KCompletion::addItem(newItemName);
+ TDECompletion::addItem(newItemName);
TQString tx = processName( item );
tx += " \"" + item + "\"";
nameMap[item] = tx;
@@ -96,16 +96,16 @@ class FunctionCompletion : public CustomCompleter {
if(tx.length() == 0) {
kdDebug() << "function-name-extraction failed with \"" << item << "\"" << endl;
}else{
- KCompletion::addItem( tx );
+ TDECompletion::addItem( tx );
kdDebug() << "addding \"" << item << "\" as \"" << tx << "\"" << endl;
}
- KCompletion::addItem( item );
+ TDECompletion::addItem( item );
}
virtual void removeItem ( const TQString &item ) {
FuncMap::iterator it = nameMap.find( item );
if( it != nameMap.end() ) {
- KCompletion::removeItem( *it );
+ TDECompletion::removeItem( *it );
revNameMap.remove( *it );
nameMap.remove( it );
}
@@ -114,7 +114,7 @@ class FunctionCompletion : public CustomCompleter {
virtual void clear() {
nameMap.clear();
revNameMap.clear();
- KCompletion::clear();
+ TDECompletion::clear();
}
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 {
}
};
diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h
index a5bd4e50..3446c57a 100644
--- a/parts/quickopen/quickopendialog.h
+++ b/parts/quickopen/quickopendialog.h
@@ -29,7 +29,7 @@
#include "quickopenbase.h"
class QuickOpenPart;
-class KCompletion;
+class TDECompletion;
class QuickOpenDialog : public QuickOpenDialogBase
{
diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h
index 9bda6e43..88dde1c2 100644
--- a/parts/quickopen/quickopenfiledialog.h
+++ b/parts/quickopen/quickopenfiledialog.h
@@ -27,7 +27,7 @@
#include <kurl.h>
class QuickOpenPart;
-class KCompletion;
+class TDECompletion;
class QuickOpenFileDialog : public QuickOpenDialog
{
diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h
index bd8805f5..dc5c69e4 100644
--- a/parts/quickopen/quickopenfunctiondialog.h
+++ b/parts/quickopen/quickopenfunctiondialog.h
@@ -26,7 +26,7 @@
#include "quickopendialog.h"
#include "quickopen_part.h"
-class KCompletion;
+class TDECompletion;
class QuickOpenPart;
class QuickOpenFunctionDialog : public QuickOpenDialog