diff options
| author | 2009-01-27 22:29:27 +0000 | |
|---|---|---|
| committer | 2009-01-27 22:29:27 +0000 | |
| commit | afb02605d1c35314abec9f0d36ae5da3d1e20fe6 (patch) | |
| tree | 48bfcedfa44c95dd6a525b74ee0745fee0e6774a /src | |
| parent | forgot to commit new pot :P (diff) | |
| download | KVIrc-afb02605d1c35314abec9f0d36ae5da3d1e20fe6.tar.gz KVIrc-afb02605d1c35314abec9f0d36ae5da3d1e20fe6.tar.bz2 KVIrc-afb02605d1c35314abec9f0d36ae5da3d1e20fe6.zip | |
compilation fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3051 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/editor/scripteditor.cpp | 8 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.h | 24 |
2 files changed, 15 insertions, 17 deletions
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 8af388542..90cefa1ef 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -968,10 +968,12 @@ void KviScriptEditorImplementation::configureColors() } } -KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * parent, const char *) -: QDialog(parent) +KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, const QString & szName) +: QDialog(pParent) { - m_pParent = parent; + setObjectName(szName); + + m_pParent = pParent; emit initFind(); QPalette p = palette(); p.setColor(foregroundRole(),QColor( 0, 0, 0 )); diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index 9a35c1b15..d674fd400 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -117,25 +117,24 @@ public: void highlightBlock(const QString & szText); void updateSyntaxtTextFormat(); private: - struct KviScriptHighlightingRule - { - QRegExp pattern; - QTextCharFormat format; - }; + struct KviScriptHighlightingRule + { + QRegExp pattern; + QTextCharFormat format; + }; + QVector<KviScriptHighlightingRule> highlightingRules; QRegExp commentStartExpression; - QRegExp commentEndExpression; + QRegExp commentEndExpression; - QTextCharFormat bracketFormat; + QTextCharFormat bracketFormat; QTextCharFormat punctuationFormat; QTextCharFormat keywordFormat; QTextCharFormat variableFormat; QTextCharFormat normaltextFormat; QTextCharFormat findFormat; QTextCharFormat functionFormat; - QTextCharFormat commentFormat; - - + QTextCharFormat commentFormat; }; class KviScriptEditorImplementation : public KviScriptEditor @@ -165,14 +164,11 @@ public: void setCursorPosition(int iPos); int cursor(){ return m_lastCursorPos; }; QLineEdit * findLineEdit(){ return m_pFindLineEdit; }; - protected: virtual void focusInEvent(QFocusEvent * e); void loadOptions(); void saveOptions(); - protected slots: - void saveToFile(); void loadFromFile(); void configureColors(); @@ -192,7 +188,7 @@ class KviScriptEditorReplaceDialog: public QDialog { Q_OBJECT public: - KviScriptEditorReplaceDialog(QWidget * parent = 0, const char * name = 0); + KviScriptEditorReplaceDialog(QWidget * parent = 0, const QString & szName = QString()); ~KviScriptEditorReplaceDialog(); public: QLineEdit * m_pFindLineEdit; |
