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

List:       kde-commits
Subject:    KDE/kdelibs
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2010-12-13 17:46:42
Message-ID: 20101213174642.77070AC8A7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1206166 by zwabel:

Move CodeCompletionModelControllerInterface4 into a private kate folder, it may \
                become a public interface with KDE 4.7.
CCMAIL: kwrite-devel@kde.org


 M  +0 -7      interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp  
 M  +0 -16     interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h  
 M  +1 -0      kate/CMakeLists.txt  
 A             kate/completion/codecompletionmodelcontrollerinterfacev4.cpp   \
[License: LGPL (v2+)]  A             \
kate/completion/codecompletionmodelcontrollerinterfacev4.h   [License: LGPL (v2+)]  M \
+1 -1      kate/completion/katecompletionmodel.cpp    M  +1 -1      \
kate/completion/katewordcompletion.h  


--- trunk/KDE/kdelibs/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp \
#1206165:1206166 @@ -203,11 +203,4 @@
 }
 //END V3
 
-//BEGIN V4
-bool CodeCompletionModelControllerInterface4::shouldHideItemsWithEqualNames() const
-{
-  return false;
 }
-//END V4
-
-}
--- trunk/KDE/kdelibs/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h \
#1206165:1206166 @@ -337,24 +337,8 @@
 };
 //END V3
 
-//BEGIN V4
-///Extension of CodeCompletionModelControllerInterface3
-class KTEXTEDITOR_EXPORT_DEPRECATED CodeCompletionModelControllerInterface4 : public \
                CodeCompletionModelControllerInterface3 {
-  public:
-
-    /**
-     * When multiple completion models are used at the same time, it may happen that \
                multiple models add items with the same
-     * name to the list. This option allows to hide items from this completion model \
                when another model with higher priority
-     * contains items with the same name.
-     * \return Whether items of this completion model should be hidden if another \
                completion model has items with the same name
-     */
-    virtual bool shouldHideItemsWithEqualNames() const;
-};
-//END V4
 }
-
 Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface, \
"org.kde.KTextEditor.CodeCompletionModelControllerInterface")  \
Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface2, \
"org.kde.KTextEditor.CodeCompletionModelControllerInterface2")  \
Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface3, \
                "org.kde.KTextEditor.CodeCompletionModelControllerInterface3")
-Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface4, \
"org.kde.KTextEditor.CodeCompletionModelControllerInterface4")  #endif // \
                KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODELCONTROLLERINTERFACE_H
--- trunk/KDE/kdelibs/kate/CMakeLists.txt #1206165:1206166
@@ -48,6 +48,7 @@
 buffer/katetexthistory.cpp
 
 # completion (widget, model, delegate, ...)
+completion/codecompletionmodelcontrollerinterfacev4.cpp
 completion/katecompletionwidget.cpp
 completion/katecompletionmodel.cpp
 completion/katecompletiontree.cpp
--- trunk/KDE/kdelibs/kate/completion/katecompletionmodel.cpp #1206165:1206166
@@ -36,7 +36,7 @@
 #include "kateview.h"
 #include "katerenderer.h"
 #include "kateconfig.h"
-#include <ktexteditor/codecompletionmodelcontrollerinterface.h>
+#include "codecompletionmodelcontrollerinterfacev4.h"
 
 using namespace KTextEditor;
 
--- trunk/KDE/kdelibs/kate/completion/katewordcompletion.h #1206165:1206166
@@ -27,7 +27,7 @@
 #include <ktexteditor/codecompletioninterface.h>
 #include <ktexteditor/codecompletionmodel.h>
 #include <ktexteditor/configpage.h>
-#include <ktexteditor/codecompletionmodelcontrollerinterface.h>
+#include "codecompletionmodelcontrollerinterfacev4.h"
 #include <kxmlguiclient.h>
 
 #include <QtCore/QEvent>


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