aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-09-25 01:29:36 +0000
committerGravatar Elvio Basello2008-09-25 01:29:36 +0000
commit01aed3a04efac15eeb5e479658e14bfb8666fb1b (patch)
treea2b6e8ba42a7ac9f80ffd9696879f7013ef3f4ff /src
parentimproved hungarian notation; stylish fixes (diff)
downloadKVIrc-01aed3a04efac15eeb5e479658e14bfb8666fb1b.tar.gz
KVIrc-01aed3a04efac15eeb5e479658e14bfb8666fb1b.tar.bz2
KVIrc-01aed3a04efac15eeb5e479658e14bfb8666fb1b.zip
quick fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2560 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/modules/editor/scripteditor.cpp32
-rw-r--r--src/modules/editor/scripteditor.h4
2 files changed, 17 insertions, 19 deletions
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 8cdf22db6..975171c71 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -857,23 +857,20 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
m_lastCursorPos = 0;
QGridLayout * g = new QGridLayout(this);
- m_pFindLineedit = new QLineEdit(" ",this);
- m_pFindLineedit->setText("");
+ m_pFindLineEdit = new QLineEdit(" ",this);
+ m_pFindLineEdit->setText("");
- QPalette p = m_pFindLineedit->palette();
+ QPalette p = m_pFindLineEdit->palette();
p.setColor(foregroundRole(), g_clrFind);
- m_pFindLineedit->setPalette(p);
-
+ m_pFindLineEdit->setPalette(p);
m_pEditor = new KviScriptEditorWidget(this);
g->addWidget(m_pEditor, 0, 0, 1,4);
-
g->setRowStretch(0,1);
QToolButton * b = new QToolButton(this);
b->setArrowType(Qt::DownArrow);
b->setObjectName("ToolButtonEditor");
-
b->setMinimumWidth(24);
g->addWidget(b,1,0);
@@ -887,18 +884,19 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
g->setColumnStretch(1,1);
g->setColumnStretch(2,10);
- g->addWidget(m_pFindLineedit,1,2);
+ g->addWidget(m_pFindLineEdit,1,2);
+
QLabel *lab= new QLabel("find",this);
lab->setText(tr("Find"));
-
g->addWidget(lab,1,1);
+
m_pRowColLabel = new QLabel("0",this);
m_pRowColLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
m_pRowColLabel->setMinimumWidth(80);
g->addWidget(m_pRowColLabel,1,3);
- connect(m_pFindLineedit,SIGNAL(returnPressed()),m_pEditor,SLOT(slotFind()));
- connect(m_pFindLineedit,SIGNAL(returnPressed()),this,SLOT(slotFind()));
+ connect(m_pFindLineEdit,SIGNAL(returnPressed()),m_pEditor,SLOT(slotFind()));
+ connect(m_pFindLineEdit,SIGNAL(returnPressed()),this,SLOT(slotFind()));
connect(m_pEditor,SIGNAL(keyPressed()),this,SLOT(updateRowColLabel()));
connect(m_pEditor,SIGNAL(textChanged()),this,SLOT(updateRowColLabel()));
connect(m_pEditor,SIGNAL(selectionChanged()),this,SLOT(updateRowColLabel()));
@@ -914,10 +912,10 @@ KviScriptEditorImplementation::~KviScriptEditorImplementation()
void KviScriptEditorImplementation::loadOptions()
{
- QString tmp;
- g_pEditorModulePointer->getDefaultConfigFileName(tmp);
+ QString szTmp;
+ g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
- KviConfig cfg(tmp,KviConfig::Read);
+ KviConfig cfg(szTmp,KviConfig::Read);
g_clrBackground = cfg.readColorEntry("Background",QColor(0,0,0));;
g_clrNormalText = cfg.readColorEntry("NormalText",QColor(100,255,0));
g_clrBracket = cfg.readColorEntry("Bracket",QColor(255,0,0));
@@ -937,7 +935,7 @@ bool KviScriptEditorImplementation::isModified()
void KviScriptEditorImplementation::slotFind()
{
- emit find(m_pFindLineedit->text());
+ emit find(m_pFindLineEdit->text());
}
void KviScriptEditorImplementation::slotNextFind(const QString & szText)
@@ -1042,13 +1040,13 @@ void KviScriptEditorImplementation::text(QString & szText)
void KviScriptEditorImplementation::setFindText(const QString & szText)
{
- m_pFindLineedit->setText(szText);
+ m_pFindLineEdit->setText(szText);
m_pEditor->slotFind();
}
void KviScriptEditorImplementation::setFindLineEditReadOnly(bool b)
{
- m_pFindLineedit->setReadOnly(b);
+ m_pFindLineEdit->setReadOnly(b);
}
void KviScriptEditorImplementation::updateRowColLabel()
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index cc08ff446..708ec131d 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -118,7 +118,7 @@ public:
KviScriptEditorImplementation(QWidget * par);
virtual ~KviScriptEditorImplementation();
public:
- QLineEdit * m_pFindlineedit;
+ QLineEdit * m_pFindLineEdit;
protected:
KviScriptEditorWidget * m_pEditor;
QLabel * m_pRowColLabel;
@@ -135,7 +135,7 @@ public:
void setFindLineEditReadOnly(bool b);
void setCursorPosition(int iPos);
int cursor(){ return m_lastCursorPos; };
- QLineEdit * findLineEdit(){ return m_pFindLineedit; };
+ QLineEdit * findLineEdit(){ return m_pFindLineEdit; };
protected:
virtual void focusInEvent(QFocusEvent * e);
void loadOptions();