diff options
| author |  Vladimir Panteleev | 2018-12-02 19:42:25 +0000 |
|---|---|---|
| committer |  Benjamin Staneck | 2019-01-16 21:40:14 +0100 |
| commit | dc4d899e7678d7eeb550205883334766c54e11e6 (patch) | |
| tree | a9a6a7befb5cb5717536c56d0b006a254aac109b /src | |
| parent | update nsis plugin, remove pre-windows-7 version detection and add some new ones (diff) | |
| download | KVIrc-dc4d899e7678d7eeb550205883334766c54e11e6.tar.gz KVIrc-dc4d899e7678d7eeb550205883334766c54e11e6.tar.bz2 KVIrc-dc4d899e7678d7eeb550205883334766c54e11e6.zip | |
Unify KVI_MIRCCOLOR_MAX_FOREGROUND/_BACKGROUND into a single constant
The distinction is not meaningful.
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/irc/KviControlCodes.h | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/KviSelectors.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/kvilib/irc/KviControlCodes.h b/src/kvilib/irc/KviControlCodes.h index 4df1f1314..e65f99183 100644 --- a/src/kvilib/irc/KviControlCodes.h +++ b/src/kvilib/irc/KviControlCodes.h @@ -42,8 +42,7 @@ #include "kvi_settings.h" #include "KviCString.h" -#define KVI_MIRCCOLOR_MAX_FOREGROUND 15 -#define KVI_MIRCCOLOR_MAX_BACKGROUND 15 +#define KVI_MIRCCOLOR_MAX 15 // ASCII Stuff: the following defines are meant to be escape sequences // that can go through an IRC connection diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp index aab24c34f..d8fb5fb9d 100644 --- a/src/kvirc/ui/KviSelectors.cpp +++ b/src/kvirc/ui/KviSelectors.cpp @@ -706,7 +706,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par, const QString m_pForePopup = new QMenu(this); connect(m_pForePopup, SIGNAL(triggered(QAction *)), this, SLOT(foreSelected(QAction *))); int iColor; - for(iColor = 0; iColor < KVI_MIRCCOLOR_MAX_FOREGROUND; iColor++) + for(iColor = 0; iColor < KVI_MIRCCOLOR_MAX; iColor++) { QPixmap tmp(120, 16); tmp.fill(KVI_OPTION_MIRCCOLOR(iColor)); @@ -721,7 +721,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par, const QString connect(m_pBackPopup, SIGNAL(triggered(QAction *)), this, SLOT(backSelected(QAction *))); pAction = m_pBackPopup->addAction(__tr2qs("Transparent")); pAction->setData(KviControlCodes::Transparent); - for(iColor = 0; iColor < KVI_MIRCCOLOR_MAX_BACKGROUND; iColor++) + for(iColor = 0; iColor < KVI_MIRCCOLOR_MAX; iColor++) { QPixmap tmp(120, 16); tmp.fill(KVI_OPTION_MIRCCOLOR(iColor)); @@ -753,7 +753,7 @@ void KviMircTextColorSelector::setButtonPalette() { QPalette pal; - if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND) + if(m_uBack > KVI_MIRCCOLOR_MAX) { if(m_uBack != KviControlCodes::Transparent) m_uBack = KviControlCodes::Transparent; @@ -764,8 +764,8 @@ void KviMircTextColorSelector::setButtonPalette() pal = QPalette(KVI_OPTION_MIRCCOLOR(m_uBack)); } - if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND) - m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND; + if(m_uFore > KVI_MIRCCOLOR_MAX) + m_uFore = KVI_MIRCCOLOR_MAX; pal.setColor(QPalette::ButtonText, KVI_OPTION_MIRCCOLOR(m_uFore)); pal.setColor(QPalette::Text, KVI_OPTION_MIRCCOLOR(m_uFore)); |