[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/kdevelop4-extra-plugins/php/completion
From:       Milian Wolff <mail () milianw ! de>
Date:       2009-04-30 20:00:28
Message-ID: 1241121628.226440.29223.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961852 by mwolff:

adapt to kdevplatform changes

 M  +7 -7      context.cpp  
 M  +1 -1      model.cpp  
 M  +1 -2      model.h  


--- trunk/playground/devtools/kdevelop4-extra-plugins/php/completion/context.cpp \
#961851:961852 @@ -609,11 +609,11 @@
                             if (method) {
                                 if (decl.second == 0) {
                                     // this function is already implemented
-                                    alreadyImplemented << \
decl.first->indexedIdentifier().index; +                                    \
alreadyImplemented << decl.first->indexedIdentifier().getIndex();  continue;
                                 }
                                 // skip already implemented functions
-                                if \
(alreadyImplemented.contains(decl.first->indexedIdentifier().index)) { +              \
if (alreadyImplemented.contains(decl.first->indexedIdentifier().getIndex())) {  \
continue;  }
                                 // skip non-static functions when requested
@@ -631,13 +631,13 @@
                                 // skip public functions when requested
                                 if (filterPublic && method->accessPolicy() == \
                Declaration::Public) {
                                     // make sure no non-public base methods are \
                added
-                                    alreadyImplemented << \
decl.first->indexedIdentifier().index; +                                    \
alreadyImplemented << decl.first->indexedIdentifier().getIndex();  continue;
                                 }
                                 // skip final methods
                                 if (method->isFinal()) {
                                     // make sure no non-final base methods are added
-                                    alreadyImplemented << \
decl.first->indexedIdentifier().index; +                                    \
alreadyImplemented << decl.first->indexedIdentifier().getIndex();  continue;
                                 }
                                 // make sure we inherit or implement the base class \
of this method @@ -660,7 +660,7 @@
                                 items << CompletionTreeItemPointer(new \
                ImplementationItem(itype, DeclarationPointer(decl.first),
                                                                     \
                KDevelop::CodeCompletionContext::Ptr(this), decl.second));
                                 // don't add identical items twice to the completion \
                choices
-                                alreadyImplemented << \
decl.first->indexedIdentifier().index; +                                \
alreadyImplemented << decl.first->indexedIdentifier().getIndex();  }
                         }
                     }
@@ -753,8 +753,8 @@
             DeclarationDepthPair decl = i.previous();
             Declaration* dec = decl.first;
             if (dec->kind() == Declaration::Instance) {
-                if (existingIdentifiers.contains(dec->indexedIdentifier().index)) \
                continue;
-                existingIdentifiers.insert(dec->indexedIdentifier().index);
+                if (existingIdentifiers.contains(dec->indexedIdentifier().getIndex())) \
continue; +                \
existingIdentifiers.insert(dec->indexedIdentifier().getIndex());  }
             if (abort)
                 return items;
--- trunk/playground/devtools/kdevelop4-extra-plugins/php/completion/model.cpp \
#961851:961852 @@ -74,7 +74,7 @@
 
 Range CodeCompletionModel::completionRange(View* view, const Cursor &position)
 {
-    Range range = CodeCompletionModelControllerInterface::completionRange(view, \
position); +    Range range = KDevelop::CodeCompletionModel::completionRange(view, \
position);  if (range.start().column() > 0) {
         KTextEditor::Range preRange(Cursor(range.start().line(), \
                range.start().column() - 1),
                                     Cursor(range.start().line(), \
                range.start().column()));
--- trunk/playground/devtools/kdevelop4-extra-plugins/php/completion/model.h \
#961851:961852 @@ -38,10 +38,9 @@
 namespace Php
 {
 
-class KDEVPHPCOMPLETION_EXPORT CodeCompletionModel : public \
KDevelop::CodeCompletionModel, public \
KTextEditor::CodeCompletionModelControllerInterface +class KDEVPHPCOMPLETION_EXPORT \
CodeCompletionModel : public KDevelop::CodeCompletionModel  {
     Q_OBJECT
-    Q_INTERFACES(KTextEditor::CodeCompletionModelControllerInterface)
 
 public:
     CodeCompletionModel(QObject* parent = 0);


[prev in list] [next in list] [prev in thread] [next in thread]