summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <cullmann@kde.org>2014-01-19 15:38:10 (GMT)
committerChristoph Cullmann <cullmann@kde.org>2014-01-19 15:38:10 (GMT)
commit984110c67f22fe19bcaf8b17286c92c1551f2103 (patch)
tree48011b5e4fd09c28f63796467046939eaca85fd1
parentcdef90c0bcc7e0e6636618f0edfee6940d82114f (diff)
return the strings per value
-rw-r--r--src/document/katedocument.cpp2
-rw-r--r--src/document/katedocument.h4
-rw-r--r--src/include/ktexteditor/document.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
index c0b1e0a..3d9a56e 100644
--- a/src/document/katedocument.cpp
+++ b/src/document/katedocument.cpp
@@ -4031,7 +4031,7 @@ bool KTextEditor::DocumentPrivate::setEncoding(const QString &e)
return m_config->setEncoding(e);
}
-const QString &KTextEditor::DocumentPrivate::encoding() const
+QString KTextEditor::DocumentPrivate::encoding() const
{
return m_config->encoding();
}
diff --git a/src/document/katedocument.h b/src/document/katedocument.h
index f6a5331..a9520ef 100644
--- a/src/document/katedocument.h
+++ b/src/document/katedocument.h
@@ -835,7 +835,7 @@ public:
bool findMatchingBracket(KTextEditor::Range &range, int maxLines = -1);
public:
- virtual const QString &documentName() const
+ virtual QString documentName() const
{
return m_docName;
}
@@ -894,7 +894,7 @@ private:
public:
virtual bool setEncoding(const QString &e);
- virtual const QString &encoding() const;
+ virtual QString encoding() const;
public Q_SLOTS:
void setWordWrap(bool on);
diff --git a/src/include/ktexteditor/document.h b/src/include/ktexteditor/document.h
index b498772..c7135cb 100644
--- a/src/include/ktexteditor/document.h
+++ b/src/include/ktexteditor/document.h
@@ -189,7 +189,7 @@ public:
* documents with url.
* \return readable document name
*/
- virtual const QString &documentName() const = 0;
+ virtual QString documentName() const = 0;
/**
* Get this document's mimetype.
@@ -261,7 +261,7 @@ public:
* \return current encoding of the document
* \see setEncoding()
*/
- virtual const QString &encoding() const = 0;
+ virtual QString encoding() const = 0;
/*
* General file related actions.