aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
authorGravatar Elvio Basello2011-03-23 20:54:15 +0000
committerGravatar Elvio Basello2011-03-23 20:54:15 +0000
commitf6a40f39ab13b0118f9b1735469080d3017eb159 (patch)
tree469f6745a596d7fd310474b9acb413af4e49bbeb /src/modules/options
parentupdate (diff)
downloadKVIrc-f6a40f39ab13b0118f9b1735469080d3017eb159.tar.gz
KVIrc-f6a40f39ab13b0118f9b1735469080d3017eb159.tar.bz2
KVIrc-f6a40f39ab13b0118f9b1735469080d3017eb159.zip
improved hungarian notation;
added doxygen comments; updated docs; git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5678 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp28
-rw-r--r--src/modules/options/OptionsWidget_sound.cpp7
-rw-r--r--src/modules/options/OptionsWidget_textEncoding.cpp12
3 files changed, 27 insertions, 20 deletions
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index bf9bb13d6..6d44cee36 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -226,13 +226,15 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
QString tmp;
m_pEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding","options"));
m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding","options"));
- while(d->szName)
+ while(d->pcName)
{
- tmp = QString("%1 (%2)").arg(d->szName,d->szDescription);
+ tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription);
m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
- if(KviQString::equalCI(d->szName,n->encoding()))srvcurrent = i + 1;
- if(KviQString::equalCI(d->szName,n->textEncoding()))txtcurrent = i + 1;
+ if(KviQString::equalCI(d->pcName,n->encoding()))
+ srvcurrent = i + 1;
+ if(KviQString::equalCI(d->pcName,n->textEncoding()))
+ txtcurrent = i + 1;
i = i + 1;
d = KviLocale::encodingDescription(i);
}
@@ -466,7 +468,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
n->setEncoding(QString());
} else {
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1);
- n->setEncoding(d->szName);
+ n->setEncoding(d->pcName);
}
}
if(m_pTextEncodingEditor)
@@ -476,7 +478,7 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
n->setTextEncoding(QString());
} else {
KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1);
- n->setTextEncoding(dd->szName);
+ n->setTextEncoding(dd->pcName);
}
}
if(m_pChannelListSelector)
@@ -780,13 +782,15 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
QString tmp;
m_pEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding","options"));
m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding","options"));
- while(d->szName)
+ while(d->pcName)
{
- tmp = QString("%1 (%2)").arg(d->szName,d->szDescription);
+ tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription);
m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
- if(KviQString::equalCI(d->szName,s->encoding()))srvcurrent = i + 1;
- if(KviQString::equalCI(d->szName,s->textEncoding()))txtcurrent = i + 1;
+ if(KviQString::equalCI(d->pcName,s->encoding()))
+ srvcurrent = i + 1;
+ if(KviQString::equalCI(d->pcName,s->textEncoding()))
+ txtcurrent = i + 1;
i = i + 1;
d = KviLocale::encodingDescription(i);
}
@@ -1081,7 +1085,7 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s)
s->setEncoding(QString());
} else {
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1);
- s->setEncoding(d->szName);
+ s->setEncoding(d->pcName);
}
}
if(m_pTextEncodingEditor)
@@ -1091,7 +1095,7 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s)
s->setTextEncoding(QString());
} else {
KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1);
- s->setTextEncoding(dd->szName);
+ s->setTextEncoding(dd->pcName);
}
}
s->setIp("");
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index c617a8ca4..532158807 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -104,10 +104,11 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
int iMatch = 0;
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
- while(d->szName)
+ while(d->pcName)
{
- if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
- m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->szName);
+ if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))
+ iMatch = i + 1;
+ m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName);
i++;
d = KviLocale::encodingDescription(i);
}
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index 5167acd8e..561dcd8af 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -62,13 +62,15 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
int i = 0;
int iTextMatch = 0, iSrvMatch=0;
KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
- while(d->szName)
+ while(d->pcName)
{
- if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding)))iTextMatch = i + 1;
- if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding)))iSrvMatch = i + 1;
+ if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding)))
+ iTextMatch = i + 1;
+ if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding)))
+ iSrvMatch = i + 1;
- m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->szName);
- m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->szName);
+ m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName);
+ m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName);
i++;
d = KviLocale::encodingDescription(i);
}