diff options
Diffstat (limited to 'src/modules/editor')
| -rw-r--r-- | src/modules/editor/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/editor/ScriptEditorImplementation.cpp (renamed from src/modules/editor/scripteditor.cpp) | 144 | ||||
| -rw-r--r-- | src/modules/editor/ScriptEditorImplementation.h (renamed from src/modules/editor/scripteditor.h) | 42 | ||||
| -rw-r--r-- | src/modules/editor/libkvieditor.cpp | 10 |
4 files changed, 100 insertions, 100 deletions
diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt index 239a32db6..a4eca8e01 100644 --- a/src/modules/editor/CMakeLists.txt +++ b/src/modules/editor/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/editor SET(kvieditor_MOC_HDRS - scripteditor.h + ScriptEditorImplementation.h ) SET(kvieditor_SRCS libkvieditor.cpp - scripteditor.cpp + ScriptEditorImplementation.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index f38f9d33c..6bd4bed4a 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : scripteditor.cpp +// File : ScriptEditorImplementation.cpp // Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -24,7 +24,7 @@ // //============================================================================= -#include "scripteditor.h" +#include "ScriptEditorImplementation.h" #include "KviFileUtils.h" #include "kvi_fileextensions.h" @@ -59,7 +59,7 @@ #include <QPainter> extern KVIRC_API KviModuleManager * g_pModuleManager; -extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList; +extern KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList; extern KviModule * g_pEditorModulePointer; static QColor g_clrBackground(0,0,0); @@ -83,7 +83,7 @@ static bool bSemaphore=false; static bool bCompleterReady=false; -KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent) +ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent) : QTextEdit(pParent) { m_pSyntaxHighlighter=0; @@ -120,14 +120,14 @@ KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent) } else loadCompleterFromFile(); } -KviScriptEditorWidget::~KviScriptEditorWidget() +ScriptEditorWidget::~ScriptEditorWidget() { if(m_pCompleter) delete m_pCompleter; disableSyntaxHighlighter(); } -void KviScriptEditorWidget::checkReadyCompleter() +void ScriptEditorWidget::checkReadyCompleter() { if(bCompleterReady) { @@ -138,7 +138,7 @@ void KviScriptEditorWidget::checkReadyCompleter() } } -void KviScriptEditorWidget::asyncCompleterCreation() +void ScriptEditorWidget::asyncCompleterCreation() { //static int iIndex = 0; //static int iModulesCount = 0; @@ -204,7 +204,7 @@ void KviScriptEditorWidget::asyncCompleterCreation() } } -void KviScriptEditorWidget::loadCompleterFromFile() +void ScriptEditorWidget::loadCompleterFromFile() { QStringList szListFunctionsCommand; QString szTmp("kvscompleter.idx"); @@ -219,7 +219,7 @@ void KviScriptEditorWidget::loadCompleterFromFile() createCompleter(szListFunctionsCommand); } -void KviScriptEditorWidget::createCompleter(QStringList & list) +void ScriptEditorWidget::createCompleter(QStringList & list) { m_pCompleter = new QCompleter(list); m_pCompleter->setCaseSensitivity(Qt::CaseInsensitive); @@ -231,7 +231,7 @@ void KviScriptEditorWidget::createCompleter(QStringList & list) QObject::connect(m_pCompleter, SIGNAL(activated(const QString &)),this, SLOT(insertCompletion(const QString &))); } -void KviScriptEditorWidget::insertCompletion(const QString & szCompletion) +void ScriptEditorWidget::insertCompletion(const QString & szCompletion) { QTextCursor tc = textCursor(); int iExtra = szCompletion.length() - m_pCompleter->completionPrefix().length(); @@ -249,7 +249,7 @@ void KviScriptEditorWidget::insertCompletion(const QString & szCompletion) setTextCursor(tc); } -void KviScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e) +void ScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e) { QMenu * pMenu = createStandardContextMenu(); pMenu->addAction(__tr2qs_ctx("Context sensitive help","editor"),this,SLOT(slotHelp()),Qt::CTRL+Qt::Key_H); @@ -258,15 +258,15 @@ void KviScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e) delete pMenu; } -void KviScriptEditorWidget::slotFind() +void ScriptEditorWidget::slotFind() { - m_szFind = ((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->text(); + m_szFind = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->text(); setText(toPlainText()); } -void KviScriptEditorWidget::slotReplace() +void ScriptEditorWidget::slotReplace() { - KviScriptEditorReplaceDialog * pDialog = new KviScriptEditorReplaceDialog(this,__tr2qs_ctx("Find & Replace","editor")); + ScriptEditorReplaceDialog * pDialog = new ScriptEditorReplaceDialog(this,__tr2qs_ctx("Find & Replace","editor")); connect(pDialog,SIGNAL(replaceAll(const QString &,const QString &)),m_pParent,SLOT(slotReplaceAll(const QString &,const QString &))); connect(pDialog,SIGNAL(initFind()),m_pParent,SLOT(slotInitFind())); connect(pDialog,SIGNAL(nextFind(const QString &)),m_pParent,SLOT(slotNextFind(const QString &))); @@ -274,24 +274,24 @@ void KviScriptEditorWidget::slotReplace() if(pDialog->exec()){}; } -void KviScriptEditorWidget::slotHelp() +void ScriptEditorWidget::slotHelp() { contextSensitiveHelp(); } -void KviScriptEditorWidget::enableSyntaxHighlighter() +void ScriptEditorWidget::enableSyntaxHighlighter() { // we currently delete and re-create the m_pSyntaxHighlighter // as a trick to ensure proper re-highlightning to occur if (!m_pSyntaxHighlighter) - m_pSyntaxHighlighter = new KviScriptEditorSyntaxHighlighter(this); + m_pSyntaxHighlighter = new ScriptEditorSyntaxHighlighter(this); } -void KviScriptEditorWidget::disableSyntaxHighlighter() +void ScriptEditorWidget::disableSyntaxHighlighter() { if (m_pSyntaxHighlighter) delete m_pSyntaxHighlighter; m_pSyntaxHighlighter = 0; } -void KviScriptEditorWidget::updateOptions() +void ScriptEditorWidget::updateOptions() { QPalette p = palette(); p.setColor(QPalette::Base,g_clrBackground); @@ -302,12 +302,12 @@ void KviScriptEditorWidget::updateOptions() disableSyntaxHighlighter(); enableSyntaxHighlighter(); - p = ((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->palette(); + p = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->palette(); p.setColor(foregroundRole(),g_clrFind); - ((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->setPalette(p); + ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->setPalette(p); } -void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e) +void ScriptEditorWidget::keyPressEvent(QKeyEvent * e) { if(m_pCompleter && m_pCompleter->popup()->isVisible()) { @@ -374,7 +374,7 @@ void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e) m_pCompleter->complete(cr); } -QString KviScriptEditorWidget::textUnderCursor() const +QString ScriptEditorWidget::textUnderCursor() const { QString szWord; QTextCursor tc = textCursor(); @@ -410,7 +410,7 @@ QString KviScriptEditorWidget::textUnderCursor() const return szWord; } /* -void KviScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e) +void ScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e) { return; @@ -461,7 +461,7 @@ void KviScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e) QTextEdit::mouseReleaseEvent(e); } */ -bool KviScriptEditorWidget::contextSensitiveHelp() const +bool ScriptEditorWidget::contextSensitiveHelp() const { /* QString szBuffer; @@ -512,7 +512,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const return true; } -KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * pParent) +ScriptEditorWidgetColorOptions::ScriptEditorWidgetColorOptions(QWidget * pParent) : QDialog(pParent) { m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>; @@ -548,19 +548,19 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p connect(b,SIGNAL(clicked()),this,SLOT(reject())); } -KviScriptEditorWidgetColorOptions::~KviScriptEditorWidgetColorOptions() +ScriptEditorWidgetColorOptions::~ScriptEditorWidgetColorOptions() { delete m_pSelectorInterfaceList; } -KviColorSelector * KviScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector * ScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled) { KviColorSelector * s = new KviColorSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(s); return s; } -void KviScriptEditorWidgetColorOptions::okClicked() +void ScriptEditorWidgetColorOptions::okClicked() { for(KviSelectorInterface * i = m_pSelectorInterfaceList->first();i;i = m_pSelectorInterfaceList->next()) { @@ -570,7 +570,7 @@ void KviScriptEditorWidgetColorOptions::okClicked() } -KviScriptEditorSyntaxHighlighter::KviScriptEditorSyntaxHighlighter(KviScriptEditorWidget * pWidget) +ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget * pWidget) : QSyntaxHighlighter(pWidget),m_pTextEdit(pWidget) { // code adpated from QT4 example @@ -604,11 +604,11 @@ KviScriptEditorSyntaxHighlighter::KviScriptEditorSyntaxHighlighter(KviScriptEdit highlightingRules.append(rule); } -KviScriptEditorSyntaxHighlighter::~KviScriptEditorSyntaxHighlighter() +ScriptEditorSyntaxHighlighter::~ScriptEditorSyntaxHighlighter() { } -void KviScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat() +void ScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat() { punctuationFormat.setForeground(g_clrPunctuation); keywordFormat.setForeground(g_clrKeyword); @@ -630,7 +630,7 @@ void KviScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat() } \ } \ -void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) +void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) { if(szText.isEmpty()) { @@ -751,7 +751,7 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) } // 'found matches' highlighting - KviScriptEditorWidget * pEditor = ((KviScriptEditorWidget *)textEdit()); + ScriptEditorWidget * pEditor = ((ScriptEditorWidget *)textEdit()); QString szFind = pEditor->m_szFind; if (!szFind.isEmpty()) { @@ -766,7 +766,7 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) } -KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par) +ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par) :KviScriptEditor(par) { m_pOptionsDialog=0; @@ -782,7 +782,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par) p.setColor(foregroundRole(), g_clrFind); m_pFindLineEdit->setPalette(p); - m_pEditor = new KviScriptEditorWidget(this); + m_pEditor = new ScriptEditorWidget(this); g->addWidget(m_pEditor, 0, 0, 1,4); g->setRowStretch(0,1); @@ -822,7 +822,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par) m_lastCursorPos = 0; } -KviScriptEditorImplementation::~KviScriptEditorImplementation() +ScriptEditorImplementation::~ScriptEditorImplementation() { if(m_pOptionsDialog) { @@ -834,7 +834,7 @@ KviScriptEditorImplementation::~KviScriptEditorImplementation() saveOptions(); } -void KviScriptEditorImplementation::loadOptions() +void ScriptEditorImplementation::loadOptions() { QString szTmp; g_pEditorModulePointer->getDefaultConfigFileName(szTmp); @@ -852,35 +852,35 @@ void KviScriptEditorImplementation::loadOptions() g_fntNormal = cfg.readFontEntry("Font",QFont(KVI_SCRIPTEDITOR_DEFAULT_FONT,8)); } -bool KviScriptEditorImplementation::isModified() +bool ScriptEditorImplementation::isModified() { return m_pEditor->document()->isModified(); } -void KviScriptEditorImplementation::setModified(bool bModified) +void ScriptEditorImplementation::setModified(bool bModified) { return m_pEditor->document()->setModified(bModified); } -void KviScriptEditorImplementation::slotFind() +void ScriptEditorImplementation::slotFind() { emit find(m_pFindLineEdit->text()); } -void KviScriptEditorImplementation::slotNextFind(const QString &) //szText +void ScriptEditorImplementation::slotNextFind(const QString &) //szText { // emit nextFind(const QString & szText); } -void KviScriptEditorImplementation::slotInitFind() +void ScriptEditorImplementation::slotInitFind() { emit initFind(); } -void KviScriptEditorImplementation::slotReplaceAll(const QString & szToReplace, const QString & szReplaceWith) +void ScriptEditorImplementation::slotReplaceAll(const QString & szToReplace, const QString & szReplaceWith) { emit replaceAll(szToReplace,szReplaceWith); } -void KviScriptEditorImplementation::saveOptions() +void ScriptEditorImplementation::saveOptions() { QString szTmp; g_pEditorModulePointer->getDefaultConfigFileName(szTmp); @@ -898,24 +898,24 @@ void KviScriptEditorImplementation::saveOptions() cfg.writeEntry("Font",g_fntNormal); } -void KviScriptEditorImplementation::setFocus() +void ScriptEditorImplementation::setFocus() { m_pEditor->setFocus(); } -void KviScriptEditorImplementation::focusInEvent(QFocusEvent *) +void ScriptEditorImplementation::focusInEvent(QFocusEvent *) { m_pEditor->setFocus(); } -void KviScriptEditorImplementation::setEnabled(bool bEnabled) +void ScriptEditorImplementation::setEnabled(bool bEnabled) { QWidget::setEnabled(bEnabled); m_pEditor->setEnabled(bEnabled); m_pRowColLabel->setEnabled(bEnabled); } -void KviScriptEditorImplementation::saveToFile() +void ScriptEditorImplementation::saveToFile() { QString szFileName; if(KviFileDialog::askForSaveFileName(szFileName, @@ -937,31 +937,31 @@ void KviScriptEditorImplementation::saveToFile() } } -void KviScriptEditorImplementation::setText(const char * txt) +void ScriptEditorImplementation::setText(const char * txt) { setText(QByteArray(txt)); } -void KviScriptEditorImplementation::setUnHighlightedText(const QString & szText) +void ScriptEditorImplementation::setUnHighlightedText(const QString & szText) { m_pEditor->disableSyntaxHighlighter(); m_pEditor->setText(szText); } -void KviScriptEditorImplementation::setText(const QByteArray & szText) +void ScriptEditorImplementation::setText(const QByteArray & szText) { m_pEditor->setPlainText(szText.data()); m_pEditor->document()->setModified(false); updateRowColLabel(); } -void KviScriptEditorImplementation::setReadOnly(bool bReadOnly) +void ScriptEditorImplementation::setReadOnly(bool bReadOnly) { m_pEditor->setReadOnly(bReadOnly); } -void KviScriptEditorImplementation::getText(QByteArray & szText) +void ScriptEditorImplementation::getText(QByteArray & szText) { szText = m_pEditor->toPlainText().toUtf8(); } -void KviScriptEditorImplementation::setText(const QString & szText) +void ScriptEditorImplementation::setText(const QString & szText) { m_pEditor->enableSyntaxHighlighter(); m_pEditor->setPlainText(szText); @@ -972,18 +972,18 @@ void KviScriptEditorImplementation::setText(const QString & szText) updateRowColLabel(); } -void KviScriptEditorImplementation::getText(QString & szText) +void ScriptEditorImplementation::getText(QString & szText) { szText = m_pEditor->toPlainText(); } -void KviScriptEditorImplementation::setFindText(const QString & szText) +void ScriptEditorImplementation::setFindText(const QString & szText) { m_pFindLineEdit->setText(szText); m_pEditor->slotFind(); } -void KviScriptEditorImplementation::updateRowColLabel() +void ScriptEditorImplementation::updateRowColLabel() { if(m_lastCursorPos==m_pEditor->textCursor().position()) return; @@ -995,7 +995,7 @@ void KviScriptEditorImplementation::updateRowColLabel() m_lastCursorPos = m_pEditor->textCursor().position(); } -void KviScriptEditorImplementation::setCursorPosition(int iPos) +void ScriptEditorImplementation::setCursorPosition(int iPos) { QTextCursor cur = m_pEditor->textCursor(); cur.setPosition(iPos); @@ -1003,7 +1003,7 @@ void KviScriptEditorImplementation::setCursorPosition(int iPos) updateRowColLabel(); } -void KviScriptEditorImplementation::loadFromFile() +void ScriptEditorImplementation::loadFromFile() { QString szFileName; if(KviFileDialog::askForOpenFileName(szFileName, @@ -1026,17 +1026,17 @@ void KviScriptEditorImplementation::loadFromFile() } } -void KviScriptEditorImplementation::configureColors() +void ScriptEditorImplementation::configureColors() { if(!m_pOptionsDialog) { - m_pOptionsDialog = new KviScriptEditorWidgetColorOptions(this); + m_pOptionsDialog = new ScriptEditorWidgetColorOptions(this); connect(m_pOptionsDialog,SIGNAL(finished(int)),this,SLOT(optionsDialogFinished(int))); } m_pOptionsDialog->show(); } -void KviScriptEditorImplementation::optionsDialogFinished(int iResult) +void ScriptEditorImplementation::optionsDialogFinished(int iResult) { if(iResult == QDialog::Accepted) { @@ -1045,7 +1045,7 @@ void KviScriptEditorImplementation::optionsDialogFinished(int iResult) } } -KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, const QString & szName) +ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QString & szName) : QDialog(pParent) { setObjectName(szName); @@ -1105,11 +1105,11 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, co connect(m_pFindLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &))); } -KviScriptEditorReplaceDialog::~KviScriptEditorReplaceDialog() +ScriptEditorReplaceDialog::~ScriptEditorReplaceDialog() { } -void KviScriptEditorReplaceDialog::textChanged(const QString & szText) +void ScriptEditorReplaceDialog::textChanged(const QString & szText) { if(!szText.isEmpty()) m_pReplaceButton->setEnabled(true); @@ -1117,21 +1117,21 @@ void KviScriptEditorReplaceDialog::textChanged(const QString & szText) m_pReplaceButton->setEnabled(false); } -void KviScriptEditorReplaceDialog::slotReplace() +void ScriptEditorReplaceDialog::slotReplace() { - QString szText = ((KviScriptEditorWidget *)m_pParent)->toPlainText(); + QString szText = ((ScriptEditorWidget *)m_pParent)->toPlainText(); if(m_pCheckReplaceAll->isChecked()) emit replaceAll(m_pFindLineEdit->text(),m_pReplaceLineEdit->text()); szText.replace(m_pFindLineEdit->text(),m_pReplaceLineEdit->text(),Qt::CaseInsensitive); - ((KviScriptEditorWidget *)m_pParent)->setText(szText); - ((KviScriptEditorWidget *)m_pParent)->document()->setModified(true); + ((ScriptEditorWidget *)m_pParent)->setText(szText); + ((ScriptEditorWidget *)m_pParent)->document()->setModified(true); m_pFindLineEdit->setText(""); m_pReplaceLineEdit->setText(""); setTabOrder(m_pFindLineEdit,m_pReplaceLineEdit); } -void KviScriptEditorReplaceDialog::slotNextFind() +void ScriptEditorReplaceDialog::slotNextFind() { emit nextFind(m_pFindLineEdit->text()); } diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/ScriptEditorImplementation.h index b8611c944..50fcb3ca6 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/ScriptEditorImplementation.h @@ -3,7 +3,7 @@ //============================================================================= // -// File : scripteditor.h +// File : ScriptEditorImplementation.h // Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution @@ -43,18 +43,18 @@ class QTimer; //typedef KviPointerList<int> ColumnList; -class KviScriptEditorSyntaxHighlighter; -class KviScriptEditorWidget : public QTextEdit +class ScriptEditorSyntaxHighlighter; +class ScriptEditorWidget : public QTextEdit { Q_OBJECT Q_PROPERTY(bool contextSensitiveHelp READ contextSensitiveHelp) public: - KviScriptEditorWidget(QWidget * pParent); - virtual ~KviScriptEditorWidget(); + ScriptEditorWidget(QWidget * pParent); + virtual ~ScriptEditorWidget(); public: QString m_szFind; protected: - KviScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter; + ScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter; QCompleter * m_pCompleter; QStringList * m_pListModulesNames; QStringList * m_pListCompletition; @@ -63,7 +63,7 @@ protected: int iIndex,iModulesCount; QString m_szHelp; public: - KviScriptEditorSyntaxHighlighter * syntaxHighlighter(){return m_pSyntaxHighlighter;}; + ScriptEditorSyntaxHighlighter * syntaxHighlighter(){return m_pSyntaxHighlighter;}; void disableSyntaxHighlighter(); void enableSyntaxHighlighter(); @@ -91,12 +91,12 @@ protected: // void mouseReleaseEvent(QMouseEvent * e); }; -class KviScriptEditorWidgetColorOptions : public QDialog +class ScriptEditorWidgetColorOptions : public QDialog { Q_OBJECT public: - KviScriptEditorWidgetColorOptions(QWidget * pParent); - ~KviScriptEditorWidgetColorOptions(); + ScriptEditorWidgetColorOptions(QWidget * pParent); + ~ScriptEditorWidgetColorOptions(); private: KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList; protected: @@ -107,11 +107,11 @@ protected slots: }; -class KviScriptEditorSyntaxHighlighter : public QSyntaxHighlighter +class ScriptEditorSyntaxHighlighter : public QSyntaxHighlighter { public: - KviScriptEditorSyntaxHighlighter(KviScriptEditorWidget * pWidget); - virtual ~KviScriptEditorSyntaxHighlighter(); + ScriptEditorSyntaxHighlighter(ScriptEditorWidget * pWidget); + virtual ~ScriptEditorSyntaxHighlighter(); public: QTextEdit * m_pTextEdit; public: @@ -139,17 +139,17 @@ private: QTextCharFormat commentFormat; }; -class KviScriptEditorImplementation : public KviScriptEditor +class ScriptEditorImplementation : public KviScriptEditor { Q_OBJECT public: - KviScriptEditorImplementation(QWidget * par); - virtual ~KviScriptEditorImplementation(); + ScriptEditorImplementation(QWidget * par); + virtual ~ScriptEditorImplementation(); public: QLineEdit * m_pFindLineEdit; protected: - KviScriptEditorWidgetColorOptions * m_pOptionsDialog; - KviScriptEditorWidget * m_pEditor; + ScriptEditorWidgetColorOptions * m_pOptionsDialog; + ScriptEditorWidget * m_pEditor; QLabel * m_pRowColLabel; int m_lastCursorPos; public: @@ -193,12 +193,12 @@ signals: void nextFind(const QString & szText); }; -class KviScriptEditorReplaceDialog: public QDialog +class ScriptEditorReplaceDialog: public QDialog { Q_OBJECT public: - KviScriptEditorReplaceDialog(QWidget * parent = 0, const QString & szName = QString()); - ~KviScriptEditorReplaceDialog(); + ScriptEditorReplaceDialog(QWidget * parent = 0, const QString & szName = QString()); + ~ScriptEditorReplaceDialog(); public: QLineEdit * m_pFindLineEdit; QLineEdit * m_pReplaceLineEdit; diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index cd65b52d7..6ed7b541a 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -22,7 +22,7 @@ // //============================================================================= -#include "scripteditor.h" +#include "ScriptEditorImplementation.h" #include "KviModule.h" #include "KviWindow.h" @@ -30,11 +30,11 @@ KviModule * g_pEditorModulePointer = 0; -KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList = 0; +KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = 0; static bool editor_module_init(KviModule * m) { - g_pScriptEditorWindowList = new KviPointerList<KviScriptEditorImplementation>; + g_pScriptEditorWindowList = new KviPointerList<ScriptEditorImplementation>; g_pScriptEditorWindowList->setAutoDelete(false); g_pEditorModulePointer = m; @@ -97,10 +97,10 @@ KVIRC_MODULE( KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(QWidget * par) { - return new KviScriptEditorImplementation(par); + return new ScriptEditorImplementation(par); } KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e) { - delete ((KviScriptEditorImplementation *)e); + delete ((ScriptEditorImplementation *)e); } |
