From fcc92d44845b4d3f85ca7efecfe25cd25de9a849 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Wed, 25 Mar 2009 17:12:05 +0000
Subject: implemented #408 (password fields with a tick to hide/show text) gcc
4.3 noise reduction
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3164 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
src/modules/editor/scripteditor.cpp | 2 +-
src/modules/mediaplayer/mp_mp3.cpp | 2 +-
src/modules/options/optw_interfacelookglobal.cpp | 2 +-
src/modules/options/optw_servers.cpp | 38 ++++++++++++++++--------
src/modules/options/optw_servers.h | 4 +--
5 files changed, 31 insertions(+), 17 deletions(-)
(limited to 'src/modules')
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 19b5aa50d..0d07dfbc0 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -410,7 +410,7 @@ void KviScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e)
if (e->button() == Qt::RightButton)
{
QString szBuffer;
- /*
+ /\*
int iPara = paragraphAt(e->pos());
int iIndex=charAt(e->pos(),&iPara);
szBuffer = this->text(iPara);
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp
index 21d5bab7f..0d6ee9408 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/mp_mp3.cpp
@@ -248,7 +248,7 @@ int get_first_header(mp3info *mp3, long startpos)
fseek(mp3->file,startpos,SEEK_SET);
while(1)
{
- while((c=fgetc(mp3->file)) != 255 && (c != EOF));
+ while((c=fgetc(mp3->file)) != 255 && (c != EOF)) {}
if(c == 255)
{
ungetc(c,mp3->file);
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index e3c5911bd..2864cb603 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -41,7 +41,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont);
KviTalToolTip::add(b,__tr2qs_ctx("This option will force a static font for every widget that has no specific font setting","options"));
- KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Show icons in popup menus","options"),KviOption_boolShowIconsInPopupMenus);
+ addBoolSelector(0,0,1,0,__tr2qs_ctx("Show icons in popup menus","options"),KviOption_boolShowIconsInPopupMenus);
KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 8492dd068..3b909e9d4 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -136,8 +136,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
"specified in the \"Identity\" options tab.","options"));
l = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
- m_pPassEditor = new QLineEdit(gbox);
- m_pPassEditor->setEchoMode(QLineEdit::Password);
+ m_pPassEditor = new KviPasswordLineEdit(gbox);
m_pPassEditor->setText(n->password());
KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("If this network requires a password, put it in this field, otherwise leave it empty.","options"));
@@ -420,17 +419,25 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n)
if(m_pAutoConnectCheck)
n->setAutoConnect(m_pAutoConnectCheck->isChecked());
if(m_pEncodingEditor)
- if(m_pEncodingEditor->currentIndex() <= 0)n->setEncoding(QString());
- else {
+ {
+ if(m_pEncodingEditor->currentIndex() <= 0)
+ {
+ n->setEncoding(QString());
+ } else {
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1);
n->setEncoding(d->szName);
}
+ }
if(m_pTextEncodingEditor)
- if(m_pTextEncodingEditor->currentIndex() <= 0)n->setTextEncoding(QString());
- else {
+ {
+ if(m_pTextEncodingEditor->currentIndex() <= 0)
+ {
+ n->setTextEncoding(QString());
+ } else {
KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1);
n->setTextEncoding(dd->szName);
}
+ }
if(m_pChannelListSelector)
m_pChannelListSelector->commit();
if(m_lstChannels.isEmpty())n->setAutoJoinChannelList(0);
@@ -512,8 +519,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
"specified in the \"Identity\" options tab.","options"));
l = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
- m_pPassEditor = new QLineEdit(gbox);
- m_pPassEditor->setEchoMode(QLineEdit::Password);
+ m_pPassEditor = new KviPasswordLineEdit(gbox);
m_pPassEditor->setText(s->password());
KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("If this server requires a password, put it in this field, otherwise leave it empty.","options"));
@@ -895,17 +901,25 @@ void KviServerDetailsWidget::fillData(KviServer * s)
if(m_pLinkFilterEditor)
s->setLinkFilter(m_pLinkFilterEditor->lineEdit()->text());
if(m_pEncodingEditor)
- if(m_pEncodingEditor->currentIndex() <= 0)s->m_szEncoding = "";
- else {
+ {
+ if(m_pEncodingEditor->currentIndex() <= 0)
+ {
+ s->m_szEncoding = "";
+ } else {
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1);
s->m_szEncoding = d->szName;
}
+ }
if(m_pTextEncodingEditor)
- if(m_pTextEncodingEditor->currentIndex() <= 0)s->m_szTextEncoding = "";
- else {
+ {
+ if(m_pTextEncodingEditor->currentIndex() <= 0)
+ {
+ s->m_szTextEncoding = "";
+ } else {
KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1);
s->m_szTextEncoding = dd->szName;
}
+ }
s->setIp("");
if(m_pCacheIpCheck)
s->setCacheIp(m_pCacheIpCheck->isChecked());
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 64a053737..6dc264384 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -75,7 +75,7 @@ protected:
KviScriptEditor * m_pOnLoginEditor;
QLineEdit * m_pUserEditor;
- QLineEdit * m_pPassEditor;
+ KviPasswordLineEdit * m_pPassEditor;
QLineEdit * m_pNickEditor;
QLineEdit * m_pRealEditor;
QLineEdit * m_pDescEditor;
@@ -114,7 +114,7 @@ protected:
KviScriptEditor * m_pOnConnectEditor;
KviScriptEditor * m_pOnLoginEditor;
QLineEdit * m_pUserEditor;
- QLineEdit * m_pPassEditor;
+ KviPasswordLineEdit * m_pPassEditor;
QLineEdit * m_pNickEditor;
QLineEdit * m_pRealEditor;
QLineEdit * m_pDescEditor;
--
cgit v1.3.1-10-gc9f91