diff options
| author |  Szymon Tomasz Stefanek | 2015-08-02 16:21:11 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-02 16:21:11 +0200 |
| commit | 549da6711569b0cac7b0487fd0e8ce8f92178eef (patch) | |
| tree | 1340da42cb71b1e1728e24b01814458a3e7bb82d /src | |
| parent | Merge pull request #1499 from Pan7/master (diff) | |
| download | KVIrc-549da6711569b0cac7b0487fd0e8ce8f92178eef.tar.gz KVIrc-549da6711569b0cac7b0487fd0e8ce8f92178eef.tar.bz2 KVIrc-549da6711569b0cac7b0487fd0e8ce8f92178eef.zip | |
Fix naming conventions
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviOptions.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviOptions.h | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/KviUserListView.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_userList.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 3f28f613b..9b5300ca7 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -332,7 +332,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]= BOOL_OPTION("DisplayNotifierOnPrimaryScreen",true,KviOption_sectFlagFrame), BOOL_OPTION("ShowDialogOnChannelCtcpPage",false,KviOption_sectFlagCtcp), BOOL_OPTION("PopupNotifierOnNewNotices",true,KviOption_sectFlagFrame), - BOOL_OPTION("UseAwayColor",true,KviOption_sectFlagUserListView) + BOOL_OPTION("UserListViewUseAwayColor",true,KviOption_sectFlagUserListView) }; #define STRING_OPTION(_txt,_val,_flags) KviStringOption(KVI_STRING_OPTIONS_PREFIX _txt,_val,_flags) diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h index 991048480..f3dc9eeb0 100644 --- a/src/kvirc/kernel/KviOptions.h +++ b/src/kvirc/kernel/KviOptions.h @@ -351,7 +351,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList) #define KviOption_boolDisplayNotifierOnPrimaryScreen 256 /* notifier */ #define KviOption_boolShowDialogOnChannelCtcpPage 257 #define KviOption_boolPopupNotifierOnNewNotices 258 /* query */ -#define KviOption_BoolUserListViewAwayColor 259 /* userlist */ +#define KviOption_boolUserListViewUseAwayColor 259 /* userlist */ #define KVI_NUM_BOOL_OPTIONS 260 diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index 8156432d5..24cf81042 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -1853,7 +1853,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) iAvatarAndTextX += 1; } - if(pEntry->globalData()->isAway() && KVI_OPTION_BOOL(KviOption_BoolUserListViewAwayColor)) + if(pEntry->globalData()->isAway() && KVI_OPTION_BOOL(KviOption_boolUserListViewUseAwayColor)) { QRgb rgb2 = pClrFore->rgb(); QRgb rgb1 = KVI_OPTION_COLOR(KviOption_colorUserListViewAwayForeground).rgb(); diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp index 6f67bd941..0bdd1b329 100644 --- a/src/modules/options/OptionsWidget_userList.cpp +++ b/src/modules/options/OptionsWidget_userList.cpp @@ -64,7 +64,7 @@ OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * par KviTalHBox * ahb = new KviTalHBox(g); ahb->setSpacing(4); - KviBoolSelector * ab = addBoolSelector(ahb,__tr2qs_ctx("Away:","options"),KviOption_BoolUserListViewAwayColor); + KviBoolSelector * ab = addBoolSelector(ahb,__tr2qs_ctx("Away:","options"),KviOption_boolUserListViewUseAwayColor); KviColorSelector * as = addColorSelector(ahb,__tr2qs_ctx("","options"),KviOption_colorUserListViewAwayForeground); connect(ab,SIGNAL(toggled(bool)),as,SLOT(setEnabled(bool))); |