@@ -46,9 +46,9 @@ target_link_libraries(kdevpythonlanguagesupport
     ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
     ${KDE4_THREADWEAVER_LIBRARIES}
     ${KDE4_KTEXTEDITOR_LIBS}
+    kdev4pythoncompletion
     kdev4pythonparser
     kdev4pythonduchain
-    kdev4pythoncompletion
 )
 
 install(TARGETS kdevpythonlanguagesupport DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -1,5 +1,5 @@
 include_directories(
-    ${CMAKE_CURRENT_BINRAY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
@@ -16,4 +16,4 @@ target_link_libraries(kdev4pythoncompletion
     ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
 )
 
-install(TARGETS ${kdev4pythoncompletion} DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdev4pythoncompletion DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -6,6 +6,8 @@
 
 using namespace KDevelop;
 
+namespace Python {
+
 QList<CompletionTreeItemPointer> PythonCodeCompletionContext::completionItems(bool& abort, bool fullCompletion)
 {
     QList<CompletionTreeItemPointer> items;
@@ -16,3 +18,4 @@ QList<CompletionTreeItemPointer> PythonCodeCompletionContext::completionItems(bo
     return items;
 }
 
+}
@@ -2,13 +2,17 @@
 #define PYTHONCODECOMPLETIONCONTEXT_H
 
 #include <language/codecompletion/codecompletioncontext.h>
+#include "pythoncompletionexport.h"
 
+namespace Python {
 
-class PythonCodeCompletionContext : public KDevelop::CodeCompletionContext
+class KDEVPYTHONCOMPLETION_EXPORT PythonCodeCompletionContext : public KDevelop::CodeCompletionContext
 {
 
 public:
     virtual QList< KDevelop::CompletionTreeItemPointer > completionItems(bool& abort, bool fullCompletion = true);
 };
 
+}
+
 #endif // PYTHONCODECOMPLETIONCONTEXT_H
@@ -2,6 +2,8 @@
 #include "pythoncodecompletionworker.h"
 #include "ktexteditor/view.h"
 
+namespace Python {
+
 PythonCodeCompletionModel::PythonCodeCompletionModel(QObject* parent)
     : CodeCompletionModel(parent)
 {
@@ -20,3 +22,5 @@ KDevelop::CodeCompletionWorker* PythonCodeCompletionModel::createCompletionWorke
 {
     return new PythonCodeCompletionWorker(this);
 }
+
+}
@@ -5,6 +5,8 @@
 #include <language/duchain/duchainpointer.h>
 #include "pythoncompletionexport.h"
 
+namespace Python {
+
 class KDEVPYTHONCOMPLETION_EXPORT PythonCodeCompletionModel : public KDevelop::CodeCompletionModel
 {
 
@@ -16,4 +18,6 @@ class KDEVPYTHONCOMPLETION_EXPORT PythonCodeCompletionModel : public KDevelop::C
     KTextEditor::Range completionRange(KTextEditor::View* view, const KTextEditor::Cursor &position); 
 };
 
+}
+
 #endif // PYTHONCODECOMPLETIONMODEL_H
@@ -1,6 +1,9 @@
 #include "pythoncodecompletionworker.h"
 #include "pythoncodecompletionmodel.h"
 
+
+namespace Python {
+
 PythonCodeCompletionWorker::PythonCodeCompletionWorker(PythonCodeCompletionModel *parent)
     : KDevelop::CodeCompletionWorker(parent)
 {
@@ -11,3 +14,6 @@ KDevelop::CodeCompletionContext* PythonCodeCompletionWorker::createCompletionCon
 {
     return KDevelop::CodeCompletionWorker::createCompletionContext(context, contextText, followingText, position);
 }
+
+
+}
@@ -4,8 +4,11 @@
 #include "pythoncodecompletionmodel.h"
 #include <language/codecompletion/codecompletionworker.h>
 #include <language/codecompletion/codecompletionitem.h>
+#include "pythoncompletionexport.h"
 
-class PythonCodeCompletionWorker : public KDevelop::CodeCompletionWorker
+namespace Python {
+
+class KDEVPYTHONCOMPLETION_EXPORT PythonCodeCompletionWorker : public KDevelop::CodeCompletionWorker
 {
 
 public:
@@ -14,3 +17,5 @@ class PythonCodeCompletionWorker : public KDevelop::CodeCompletionWorker
 };
 
 #endif // PYTHONCODECOMPLETIONWORKER_H
+
+}
@@ -43,9 +43,13 @@
 #include <language/duchain/duchain.h>
 #include <interfaces/idocumentcontroller.h>
 
+#include <language/codecompletion/codecompletion.h>
+#include <language/codecompletion/codecompletionmodel.h>
+
 #include "pythonparsejob.h"
 #include "pythonhighlighting.h"
 #include "duchain/pythoneditorintegrator.h"
+#include "codecompletion/pythoncodecompletionmodel.h"
 
 #include <stdio.h>
 #include <QWidget>
@@ -68,6 +72,8 @@ LanguageSupport::LanguageSupport( QObject* parent, const QVariantList& /*args*/
     KDEV_USE_EXTENSION_INTERFACE( KDevelop::ILanguageSupport )
 
     m_highlighting = new Highlighting( this );
+    PythonCodeCompletionModel* codeCompletion = new PythonCodeCompletionModel(this);
+    new KDevelop::CodeCompletion(this, codeCompletion, "Python");
 }
 
 LanguageSupport::~LanguageSupport()
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`include_directories(`
`2`		`- ${CMAKE_CURRENT_BINRAY_DIR}`
	`2`	`+ ${CMAKE_CURRENT_BINARY_DIR}`
`3`	`3`	`${CMAKE_CURRENT_SOURCE_DIR}`
`4`	`4`	`)`
`5`	`5`
`@@ -16,4 +16,4 @@ target_link_libraries(kdev4pythoncompletion`
`16`	`16`	`${KDEVPLATFORM_LANGUAGE_LIBRARIES}`
`17`	`17`	`)`
`18`	`18`
`19`		`-install(TARGETS ${kdev4pythoncompletion} DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})`
	`19`	`+install(TARGETS kdev4pythoncompletion DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`using namespace KDevelop;`
`8`	`8`
	`9`	`+namespace Python {`
	`10`	`+`
`9`	`11`	`QList<CompletionTreeItemPointer> PythonCodeCompletionContext::completionItems(bool& abort, bool fullCompletion)`
`10`	`12`	`{`
`11`	`13`	`QList<CompletionTreeItemPointer> items;`
`@@ -16,3 +18,4 @@ QList<CompletionTreeItemPointer> PythonCodeCompletionContext::completionItems(bo`
`16`	`18`	`return items;`
`17`	`19`	`}`
`18`	`20`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#include "pythoncodecompletionworker.h"`
`3`	`3`	`#include "ktexteditor/view.h"`
`4`	`4`
	`5`	`+namespace Python {`
	`6`	`+`
`5`	`7`	`PythonCodeCompletionModel::PythonCodeCompletionModel(QObject* parent)`
`6`	`8`	`: CodeCompletionModel(parent)`
`7`	`9`	`{`
`@@ -20,3 +22,5 @@ KDevelop::CodeCompletionWorker* PythonCodeCompletionModel::createCompletionWorke`
`20`	`22`	`{`
`21`	`23`	`return new PythonCodeCompletionWorker(this);`
`22`	`24`	`}`
	`25`	`+`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`#include "pythoncodecompletionworker.h"`
`2`	`2`	`#include "pythoncodecompletionmodel.h"`
`3`	`3`
	`4`	`+`
	`5`	`+namespace Python {`
	`6`	`+`
`4`	`7`	`PythonCodeCompletionWorker::PythonCodeCompletionWorker(PythonCodeCompletionModel *parent)`
`5`	`8`	`: KDevelop::CodeCompletionWorker(parent)`
`6`	`9`	`{`
`@@ -11,3 +14,6 @@ KDevelop::CodeCompletionContext* PythonCodeCompletionWorker::createCompletionCon`
`11`	`14`	`{`
`12`	`15`	`return KDevelop::CodeCompletionWorker::createCompletionContext(context, contextText, followingText, position);`
`13`	`16`	`}`
	`17`	`+`
	`18`	`+`
	`19`	`+}`