aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager')
-rw-r--r--src/plugins/qt4projectmanager/profilecompletion.cpp14
-rw-r--r--src/plugins/qt4projectmanager/profilecompletion.h10
-rw-r--r--src/plugins/qt4projectmanager/profileeditor.cpp46
-rw-r--r--src/plugins/qt4projectmanager/profileeditor.h14
-rw-r--r--src/plugins/qt4projectmanager/profileeditorfactory.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qt4projectmanager.h2
-rw-r--r--src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qtoutputformatter.cpp6
8 files changed, 50 insertions, 50 deletions
diff --git a/src/plugins/qt4projectmanager/profilecompletion.cpp b/src/plugins/qt4projectmanager/profilecompletion.cpp
index b85cd341d62..885d025902b 100644
--- a/src/plugins/qt4projectmanager/profilecompletion.cpp
+++ b/src/plugins/qt4projectmanager/profilecompletion.cpp
@@ -68,7 +68,7 @@ bool ProFileCompletion::shouldRestartCompletion()
return false;
}
-TextEditor::ITextEditable *ProFileCompletion::editor() const
+TextEditor::ITextEditor *ProFileCompletion::editor() const
{
return m_editor;
}
@@ -78,9 +78,9 @@ int ProFileCompletion::startPosition() const
return m_startPosition;
}
-bool ProFileCompletion::supportsEditor(TextEditor::ITextEditable *editor) const
+bool ProFileCompletion::supportsEditor(TextEditor::ITextEditor *editor) const
{
- return qobject_cast<ProFileEditorEditable *>(editor) != 0;
+ return qobject_cast<ProFileEditor *>(editor) != 0;
}
bool ProFileCompletion::supportsPolicy(TextEditor::CompletionPolicy policy) const
@@ -88,7 +88,7 @@ bool ProFileCompletion::supportsPolicy(TextEditor::CompletionPolicy policy) cons
return policy == TextEditor::SemanticCompletion;
}
-bool ProFileCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
+bool ProFileCompletion::triggersCompletion(TextEditor::ITextEditor *editor)
{
m_editor = editor;
const int pos = editor->position();
@@ -128,7 +128,7 @@ bool ProFileCompletion::isInComment() const
return false;
}
-int ProFileCompletion::startCompletion(TextEditor::ITextEditable *editor)
+int ProFileCompletion::startCompletion(TextEditor::ITextEditor *editor)
{
m_editor = editor;
m_startPosition = findStartOfName();
@@ -204,10 +204,10 @@ void ProFileCompletion::complete(const TextEditor::CompletionItem &item, QChar t
}
}
- m_editor->setCurPos(m_startPosition);
+ m_editor->setCursorPosition(m_startPosition);
m_editor->replace(replaceLength, toInsert);
if (cursorOffset)
- m_editor->setCurPos(m_editor->position() + cursorOffset);
+ m_editor->setCursorPosition(m_editor->position() + cursorOffset);
}
bool ProFileCompletion::partiallyComplete(const QList<TextEditor::CompletionItem> &completionItems)
diff --git a/src/plugins/qt4projectmanager/profilecompletion.h b/src/plugins/qt4projectmanager/profilecompletion.h
index eb30684c3e6..9b36df5a2c2 100644
--- a/src/plugins/qt4projectmanager/profilecompletion.h
+++ b/src/plugins/qt4projectmanager/profilecompletion.h
@@ -51,13 +51,13 @@ public:
virtual QList<TextEditor::CompletionItem> getCompletions();
virtual bool shouldRestartCompletion();
- virtual TextEditor::ITextEditable *editor() const;
+ virtual TextEditor::ITextEditor *editor() const;
virtual int startPosition() const;
- virtual bool supportsEditor(TextEditor::ITextEditable *editor) const;
+ virtual bool supportsEditor(TextEditor::ITextEditor *editor) const;
virtual bool supportsPolicy(TextEditor::CompletionPolicy policy) const;
- virtual bool triggersCompletion(TextEditor::ITextEditable *editor);
- virtual int startCompletion(TextEditor::ITextEditable *editor);
+ virtual bool triggersCompletion(TextEditor::ITextEditor *editor);
+ virtual int startCompletion(TextEditor::ITextEditor *editor);
virtual void completions(QList<TextEditor::CompletionItem> *completions);
virtual bool typedCharCompletes(const TextEditor::CompletionItem &item, QChar typedChar);
virtual void complete(const TextEditor::CompletionItem &item, QChar typedChar);
@@ -67,7 +67,7 @@ private:
int findStartOfName(int pos = -1) const;
bool isInComment() const;
- TextEditor::ITextEditable *m_editor;
+ TextEditor::ITextEditor *m_editor;
int m_startPosition;
const QIcon m_variableIcon;
const QIcon m_functionIcon;
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index d9ec2f0e11f..6bb066c1224 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -59,29 +59,29 @@ using namespace Qt4ProjectManager::Internal;
// ProFileEditorEditable
//
-ProFileEditorEditable::ProFileEditorEditable(ProFileEditor *editor)
- : BaseTextEditorEditable(editor),
+ProFileEditor::ProFileEditor(ProFileEditorWidget *editor)
+ : BaseTextEditor(editor),
m_context(Qt4ProjectManager::Constants::C_PROFILEEDITOR,
TextEditor::Constants::C_TEXTEDITOR)
{
// m_contexts << uidm->uniqueIdentifier(Qt4ProjectManager::Constants::PROJECT_KIND);
}
-Core::Context ProFileEditorEditable::context() const
+Core::Context ProFileEditor::context() const
{
return m_context;
}
-Core::IEditor *ProFileEditorEditable::duplicate(QWidget *parent)
+Core::IEditor *ProFileEditor::duplicate(QWidget *parent)
{
- ProFileEditor *ret = new ProFileEditor(parent, qobject_cast<ProFileEditor*>(editor())->factory(),
- qobject_cast<ProFileEditor*>(editor())->actionHandler());
- ret->duplicateFrom(editor());
+ ProFileEditorWidget *ret = new ProFileEditorWidget(parent, qobject_cast<ProFileEditorWidget*>(editorWidget())->factory(),
+ qobject_cast<ProFileEditorWidget*>(editorWidget())->actionHandler());
+ ret->duplicateFrom(editorWidget());
TextEditor::TextEditorSettings::instance()->initializeEditor(ret);
- return ret->editableInterface();
+ return ret->editor();
}
-QString ProFileEditorEditable::id() const
+QString ProFileEditor::id() const
{
return QLatin1String(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
}
@@ -90,8 +90,8 @@ QString ProFileEditorEditable::id() const
// ProFileEditorEditor
//
-ProFileEditor::ProFileEditor(QWidget *parent, ProFileEditorFactory *factory, TextEditor::TextEditorActionHandler *ah)
- : BaseTextEditor(parent), m_factory(factory), m_ah(ah)
+ProFileEditorWidget::ProFileEditorWidget(QWidget *parent, ProFileEditorFactory *factory, TextEditor::TextEditorActionHandler *ah)
+ : BaseTextEditorWidget(parent), m_factory(factory), m_ah(ah)
{
ProFileDocument *doc = new ProFileDocument();
doc->setMimeType(QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE));
@@ -104,11 +104,11 @@ ProFileEditor::ProFileEditor(QWidget *parent, ProFileEditorFactory *factory, Tex
m_commentDefinition.setSingleLine(QString(QLatin1Char('#')));
}
-ProFileEditor::~ProFileEditor()
+ProFileEditorWidget::~ProFileEditorWidget()
{
}
-void ProFileEditor::unCommentSelection()
+void ProFileEditorWidget::unCommentSelection()
{
Utils::unCommentSelection(this, m_commentDefinition);
}
@@ -125,7 +125,7 @@ static bool isValidFileNameChar(const QChar &c)
return false;
}
-ProFileEditor::Link ProFileEditor::findLinkAt(const QTextCursor &cursor,
+ProFileEditorWidget::Link ProFileEditorWidget::findLinkAt(const QTextCursor &cursor,
bool /* resolveTarget */)
{
Link link;
@@ -202,12 +202,12 @@ ProFileEditor::Link ProFileEditor::findLinkAt(const QTextCursor &cursor,
return link;
}
-TextEditor::BaseTextEditorEditable *ProFileEditor::createEditableInterface()
+TextEditor::BaseTextEditor *ProFileEditorWidget::createEditor()
{
- return new ProFileEditorEditable(this);
+ return new ProFileEditor(this);
}
-void ProFileEditor::contextMenuEvent(QContextMenuEvent *e)
+void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{
QMenu *menu = new QMenu();
@@ -224,9 +224,9 @@ void ProFileEditor::contextMenuEvent(QContextMenuEvent *e)
delete menu;
}
-void ProFileEditor::setFontSettings(const TextEditor::FontSettings &fs)
+void ProFileEditorWidget::setFontSettings(const TextEditor::FontSettings &fs)
{
- TextEditor::BaseTextEditor::setFontSettings(fs);
+ TextEditor::BaseTextEditorWidget::setFontSettings(fs);
ProFileHighlighter *highlighter = qobject_cast<ProFileHighlighter*>(baseTextDocument()->syntaxHighlighter());
if (!highlighter)
return;
@@ -244,15 +244,15 @@ void ProFileEditor::setFontSettings(const TextEditor::FontSettings &fs)
highlighter->rehighlight();
}
-void ProFileEditor::addLibrary()
+void ProFileEditorWidget::addLibrary()
{
AddLibraryWizard wizard(file()->fileName(), this);
if (wizard.exec() != QDialog::Accepted)
return;
- TextEditor::BaseTextEditorEditable *editable = editableInterface();
+ TextEditor::BaseTextEditor *editable = editor();
const int endOfDoc = editable->position(TextEditor::ITextEditor::EndOfDoc);
- editable->setCurPos(endOfDoc);
+ editable->setCursorPosition(endOfDoc);
QString snippet = wizard.snippet();
// add extra \n in case the last line is not empty
@@ -264,7 +264,7 @@ void ProFileEditor::addLibrary()
editable->insert(snippet);
}
-void ProFileEditor::jumpToFile()
+void ProFileEditorWidget::jumpToFile()
{
openLink(findLinkAt(textCursor()));
}
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index e5f3d84d72a..b1c9f693b78 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -53,14 +53,14 @@ namespace Internal {
class ProFileEditorFactory;
class ProFileHighlighter;
-class ProFileEditor;
+class ProFileEditorWidget;
-class ProFileEditorEditable : public TextEditor::BaseTextEditorEditable
+class ProFileEditor : public TextEditor::BaseTextEditor
{
Q_OBJECT
public:
- ProFileEditorEditable(ProFileEditor *);
+ ProFileEditor(ProFileEditorWidget *);
Core::Context context() const;
bool duplicateSupported() const { return true; }
@@ -71,14 +71,14 @@ private:
const Core::Context m_context;
};
-class ProFileEditor : public TextEditor::BaseTextEditor
+class ProFileEditorWidget : public TextEditor::BaseTextEditorWidget
{
Q_OBJECT
public:
- ProFileEditor(QWidget *parent, ProFileEditorFactory *factory,
+ ProFileEditorWidget(QWidget *parent, ProFileEditorFactory *factory,
TextEditor::TextEditorActionHandler *ah);
- ~ProFileEditor();
+ ~ProFileEditorWidget();
bool save(const QString &fileName = QString());
@@ -89,7 +89,7 @@ public:
void unCommentSelection();
protected:
virtual Link findLinkAt(const QTextCursor &, bool resolveTarget = true);
- TextEditor::BaseTextEditorEditable *createEditableInterface();
+ TextEditor::BaseTextEditor *createEditor();
void contextMenuEvent(QContextMenuEvent *);
public slots:
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 0aca1e5889b..38d30068f6b 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -88,9 +88,9 @@ Core::IFile *ProFileEditorFactory::open(const QString &fileName)
Core::IEditor *ProFileEditorFactory::createEditor(QWidget *parent)
{
- ProFileEditor *editor = new ProFileEditor(parent, this, m_actionHandler);
+ ProFileEditorWidget *editor = new ProFileEditorWidget(parent, this, m_actionHandler);
TextEditor::TextEditorSettings::instance()->initializeEditor(editor);
- return editor->editableInterface();
+ return editor->editor();
}
QStringList ProFileEditorFactory::mimeTypes() const
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h
index 945717eee10..28a99547e88 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.h
@@ -56,7 +56,7 @@ namespace Qt4ProjectManager {
namespace Internal {
class Qt4Builder;
-class ProFileEditor;
+class ProFileEditorWidget;
class Qt4ProjectManagerPlugin;
}
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 5d2ffb4258c..90ab7efe899 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -328,7 +328,7 @@ void Qt4ProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *pro)
void Qt4ProjectManagerPlugin::addLibrary()
{
Core::EditorManager *em = Core::EditorManager::instance();
- ProFileEditor *editor = qobject_cast<ProFileEditor*>(em->currentEditor()->widget());
+ ProFileEditorWidget *editor = qobject_cast<ProFileEditorWidget*>(em->currentEditor()->widget());
if (editor)
editor->addLibrary();
}
@@ -336,7 +336,7 @@ void Qt4ProjectManagerPlugin::addLibrary()
void Qt4ProjectManagerPlugin::jumpToFile()
{
Core::EditorManager *em = Core::EditorManager::instance();
- ProFileEditor *editor = qobject_cast<ProFileEditor*>(em->currentEditor()->widget());
+ ProFileEditorWidget *editor = qobject_cast<ProFileEditorWidget*>(em->currentEditor()->widget());
if (editor)
editor->jumpToFile();
}
diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
index 14cba0903b0..5137b0e2f70 100644
--- a/src/plugins/qt4projectmanager/qtoutputformatter.cpp
+++ b/src/plugins/qt4projectmanager/qtoutputformatter.cpp
@@ -196,7 +196,7 @@ void QtOutputFormatter::handleLink(const QString &href)
const QString fileName = QUrl(qmlLineColumnLink.cap(1)).toLocalFile();
const int line = qmlLineColumnLink.cap(2).toInt();
const int column = qmlLineColumnLink.cap(3).toInt();
- TextEditor::BaseTextEditor::openEditorAt(m_projectFinder.findFile(fileName), line, column - 1);
+ TextEditor::BaseTextEditorWidget::openEditorAt(m_projectFinder.findFile(fileName), line, column - 1);
return;
}
@@ -207,7 +207,7 @@ void QtOutputFormatter::handleLink(const QString &href)
if (qmlLineLink.indexIn(href) != -1) {
const QString fileName = QUrl(qmlLineLink.cap(1)).toLocalFile();
const int line = qmlLineLink.cap(2).toInt();
- TextEditor::BaseTextEditor::openEditorAt(m_projectFinder.findFile(fileName), line);
+ TextEditor::BaseTextEditorWidget::openEditorAt(m_projectFinder.findFile(fileName), line);
return;
}
@@ -251,7 +251,7 @@ void QtOutputFormatter::handleLink(const QString &href)
// map possible on-device path to source path
fileName = m_projectFinder.findFile(fileName);
}
- TextEditor::BaseTextEditor::openEditorAt(fileName, line, 0);
+ TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, 0);
return;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 00:52:41 +0000