aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <cullmann@kde.org>2014-01-19 23:14:33 (GMT)
committerChristoph Cullmann <cullmann@kde.org>2014-01-19 23:14:41 (GMT)
commitac591aefe0c24341faa02a4686fc42d65e993aef (patch)
tree5c56864e3ab03eedbab980baa3e32635542fd05a
parentf03071f3f8099f34049c4b1d6b66fcdbc20d345a (diff)
more cleanups
-rw-r--r--src/document/katedocument.cpp2
-rw-r--r--src/document/katedocument.h2
-rw-r--r--src/include/ktexteditor/document.h12
-rw-r--r--src/include/ktexteditor/editor.h2
-rw-r--r--src/spellcheck/spellcheckdialog.cpp1
-rw-r--r--src/spellcheck/spellingmenu.cpp1
-rw-r--r--src/syntax/katehighlightmenu.cpp1
-rw-r--r--src/syntax/katesyntaxmanager.cpp1
-rw-r--r--src/utils/kateautoindent.cpp1
-rw-r--r--src/utils/katebookmarks.cpp1
-rw-r--r--src/utils/katefactory.cpp1
-rw-r--r--src/utils/kateglobal.cpp2
-rw-r--r--src/utils/kateglobal.h2
-rw-r--r--src/utils/katetemplatehandler.cpp3
-rw-r--r--src/view/kateanimation.cpp2
-rw-r--r--src/view/katefadeeffect.cpp1
-rw-r--r--src/view/katemessagewidget.cpp1
-rw-r--r--src/view/kateviewhelpers.cpp3
-rw-r--r--src/view/kateviewinternal.cpp1
19 files changed, 9 insertions, 31 deletions
diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
index a82fe46..314de67 100644
--- a/src/document/katedocument.cpp
+++ b/src/document/katedocument.cpp
@@ -301,7 +301,7 @@ KTextEditor::View *KTextEditor::DocumentPrivate::createView(QWidget *parent, KTe
return newView;
}
-const QList<KTextEditor::View *> &KTextEditor::DocumentPrivate::views() const
+QList<KTextEditor::View *> KTextEditor::DocumentPrivate::views() const
{
return m_textEditViews;
}
diff --git a/src/document/katedocument.h b/src/document/katedocument.h
index 26eae68..3f1d07f 100644
--- a/src/document/katedocument.h
+++ b/src/document/katedocument.h
@@ -154,7 +154,7 @@ private:
//
public:
virtual KTextEditor::View *createView(QWidget *parent, KTextEditor::MainWindow *mainWindow = nullptr);
- virtual const QList<KTextEditor::View *> &views() const;
+ virtual QList<KTextEditor::View *> views() const;
virtual KTextEditor::View *activeView() const
{
diff --git a/src/include/ktexteditor/document.h b/src/include/ktexteditor/document.h
index a2d4f56..51291d1 100644
--- a/src/include/ktexteditor/document.h
+++ b/src/include/ktexteditor/document.h
@@ -88,9 +88,8 @@ class DocumentPrivate;
*
* A View displays the document's content. As already mentioned, a document
* can have any number of views, all synchronized. Get a list of all views
- * with views(). Only one of the views can be active (i.e. has focus), get
- * it by using activeView(). Create a new view with createView(). Every time
- * a new view is created the signal viewCreated() is emitted.
+ * with views(). Create a new view with createView(). Every time a new view
+ * is created the signal viewCreated() is emitted.
*
* \section doc_readwrite Read-Only Mode
*
@@ -156,14 +155,9 @@ public:
virtual View *createView(QWidget *parent, KTextEditor::MainWindow *mainWindow = nullptr) = 0;
/**
- * Return the view which currently has user focus, if any.
- */
- virtual View *activeView() const = 0;
-
- /**
* Returns the views pre-casted to KTextEditor::View%s
*/
- virtual const QList<View *> &views() const = 0;
+ virtual QList<View *> views() const = 0;
Q_SIGNALS:
/**
diff --git a/src/include/ktexteditor/editor.h b/src/include/ktexteditor/editor.h
index d0b225d..f7d56f9 100644
--- a/src/include/ktexteditor/editor.h
+++ b/src/include/ktexteditor/editor.h
@@ -165,7 +165,7 @@ public:
* \return list of all existing documents
* \see createDocument()
*/
- virtual const QList<Document *> &documents() = 0;
+ virtual QList<Document *> documents() = 0;
/*
* General Information about this editor.
diff --git a/src/spellcheck/spellcheckdialog.cpp b/src/spellcheck/spellcheckdialog.cpp
index a722ccb..bf23b9d 100644
--- a/src/spellcheck/spellcheckdialog.cpp
+++ b/src/spellcheck/spellcheckdialog.cpp
@@ -25,7 +25,6 @@
*/
#include "spellcheckdialog.h"
-#include "spellcheckdialog.moc"
#include "katedocument.h"
#include "kateglobal.h"
diff --git a/src/spellcheck/spellingmenu.cpp b/src/spellcheck/spellingmenu.cpp
index 51d933a..2319680 100644
--- a/src/spellcheck/spellingmenu.cpp
+++ b/src/spellcheck/spellingmenu.cpp
@@ -19,7 +19,6 @@
*/
#include "spellingmenu.h"
-#include "spellingmenu.moc"
#include "katedocument.h"
#include "kateglobal.h"
diff --git a/src/syntax/katehighlightmenu.cpp b/src/syntax/katehighlightmenu.cpp
index 37ff429..879ab19 100644
--- a/src/syntax/katehighlightmenu.cpp
+++ b/src/syntax/katehighlightmenu.cpp
@@ -19,7 +19,6 @@
//BEGIN Includes
#include "katehighlightmenu.h"
-#include "katehighlightmenu.moc"
#include "katedocument.h"
#include "kateconfig.h"
diff --git a/src/syntax/katesyntaxmanager.cpp b/src/syntax/katesyntaxmanager.cpp
index 525bd09..4568801 100644
--- a/src/syntax/katesyntaxmanager.cpp
+++ b/src/syntax/katesyntaxmanager.cpp
@@ -24,7 +24,6 @@
//BEGIN INCLUDES
#include "katesyntaxmanager.h"
-#include "katesyntaxmanager.moc"
#include "katetextline.h"
#include "katedocument.h"
diff --git a/src/utils/kateautoindent.cpp b/src/utils/kateautoindent.cpp
index 6732958..33ba1ba 100644
--- a/src/utils/kateautoindent.cpp
+++ b/src/utils/kateautoindent.cpp
@@ -19,7 +19,6 @@
*/
#include "kateautoindent.h"
-#include "kateautoindent.moc"
#include "kateconfig.h"
#include "katehighlight.h"
diff --git a/src/utils/katebookmarks.cpp b/src/utils/katebookmarks.cpp
index 21ebe23..ce338f0 100644
--- a/src/utils/katebookmarks.cpp
+++ b/src/utils/katebookmarks.cpp
@@ -18,7 +18,6 @@
*/
#include "katebookmarks.h"
-#include "katebookmarks.moc"
#include "katedocument.h"
#include "kateview.h"
diff --git a/src/utils/katefactory.cpp b/src/utils/katefactory.cpp
index 3ffb527..ddc936e 100644
--- a/src/utils/katefactory.cpp
+++ b/src/utils/katefactory.cpp
@@ -82,4 +82,3 @@ public:
};
#include "katefactory.moc"
-
diff --git a/src/utils/kateglobal.cpp b/src/utils/kateglobal.cpp
index 2d277f7..5d2f456 100644
--- a/src/utils/kateglobal.cpp
+++ b/src/utils/kateglobal.cpp
@@ -248,7 +248,7 @@ KTextEditor::Document *KTextEditor::EditorPrivate::createDocument(QObject *paren
return doc;
}
-const QList<KTextEditor::Document *> &KTextEditor::EditorPrivate::documents()
+QList<KTextEditor::Document *> KTextEditor::EditorPrivate::documents()
{
return m_docs;
}
diff --git a/src/utils/kateglobal.h b/src/utils/kateglobal.h
index 22b2dc9..162b904 100644
--- a/src/utils/kateglobal.h
+++ b/src/utils/kateglobal.h
@@ -139,7 +139,7 @@ public:
* Returns a list of all documents of this editor.
* @return list of all existing documents
*/
- const QList<KTextEditor::Document *> &documents();
+ QList<KTextEditor::Document *> documents();
/**
* Set the global application object.
diff --git a/src/utils/katetemplatehandler.cpp b/src/utils/katetemplatehandler.cpp
index be79026..0023ade 100644
--- a/src/utils/katetemplatehandler.cpp
+++ b/src/utils/katetemplatehandler.cpp
@@ -1126,6 +1126,3 @@ QString KateTemplateHandler::MirrorBehaviour::getMirrorString(const QString &sou
}
//END MIRROR BEHAVOUR
-
-#include "katetemplatehandler.moc"
-
diff --git a/src/view/kateanimation.cpp b/src/view/kateanimation.cpp
index 01d734f..7ed9196 100644
--- a/src/view/kateanimation.cpp
+++ b/src/view/kateanimation.cpp
@@ -19,7 +19,7 @@
*/
#include "kateanimation.h"
-#include "kateanimation.moc"
+
#include "katefadeeffect.h"
#include "kateglobal.h"
diff --git a/src/view/katefadeeffect.cpp b/src/view/katefadeeffect.cpp
index 5299a23..8a6597d 100644
--- a/src/view/katefadeeffect.cpp
+++ b/src/view/katefadeeffect.cpp
@@ -19,7 +19,6 @@
*/
#include "katefadeeffect.h"
-#include "katefadeeffect.moc"
#include <QWidget>
#include <QTimeLine>
diff --git a/src/view/katemessagewidget.cpp b/src/view/katemessagewidget.cpp
index 2eba5da..4e498c5 100644
--- a/src/view/katemessagewidget.cpp
+++ b/src/view/katemessagewidget.cpp
@@ -19,7 +19,6 @@
*/
#include "katemessagewidget.h"
-#include "katemessagewidget.moc"
#include "katepartdebug.h"
diff --git a/src/view/kateviewhelpers.cpp b/src/view/kateviewhelpers.cpp
index 8f7a0d5..7ae2a78 100644
--- a/src/view/kateviewhelpers.cpp
+++ b/src/view/kateviewhelpers.cpp
@@ -2534,6 +2534,3 @@ void KatePasteMenu::paste()
// paste
m_view->paste(&KTextEditor::EditorPrivate::self()->clipboardHistory()[i]);
}
-
-#include "kateviewhelpers.moc"
-
diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp
index 867e468..df32718 100644
--- a/src/view/kateviewinternal.cpp
+++ b/src/view/kateviewinternal.cpp
@@ -27,7 +27,6 @@
*/
#include "kateviewinternal.h"
-#include "kateviewinternal.moc"
#include "kateview.h"
#include "kateviewhelpers.h"