AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QColorDialog: move all helper classes into the unnamed namespace

Browse Source 
Effects on Linux GCC 4.9 stripped release builds:
  text   -984B
  data    +-0B
  relocs  +-0

Change-Id: Iff914e745939f183ba51b4e625ff795d6b44023a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Marc Mutz 2015-02-27 21:11:29 +01:00
parent 381fbbf748
commit 4300f6e9cc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/dialogs/qcolordialog.cpp
View File

@ -67,11 +67,13 @@
QT_BEGIN_NAMESPACE
namespace {
class QColorLuminancePicker;
class QColorPicker;
class QColorShower;
class QWellArray;
class QColorPickingEventFilter;
} // unnamed namespace
class QColorDialogPrivate : public QDialogPrivate
{
@ -181,6 +183,8 @@ private:
//////////// QWellArray BEGIN
namespace {
struct QWellArrayData;
class QWellArray : public QWidget
@ -562,6 +566,8 @@ private:
QColorDialogPrivate *m_dp;
};
} // unnamed namespace
/*!
Returns the number of custom colors supported by QColorDialog. All
color dialogs share the same custom colors.
@ -622,6 +628,8 @@ static inline void rgb2hsv(QRgb rgb, int &h, int &s, int &v)
c.getHsv(&h, &s, &v);
}
namespace {
class QColorWell : public QWellArray
{
public:
@ -1091,8 +1099,8 @@ private:
QColorDialog *colorDialog;
QGridLayout *gl;
friend class QColorDialog;
friend class QColorDialogPrivate;
friend class QT_PREPEND_NAMESPACE(QColorDialog);
friend class QT_PREPEND_NAMESPACE(QColorDialogPrivate);
};
class QColorShowLabel : public QFrame
@ -1381,6 +1389,8 @@ QColorShower::QColorShower(QColorDialog *parent)
retranslateStrings();
}
} // unnamed namespace
inline QRgb QColorDialogPrivate::currentColor() const { return cs->currentColor(); }
inline int QColorDialogPrivate::currentAlpha() const { return cs->currentAlpha(); }
inline void QColorDialogPrivate::setCurrentAlpha(int a) { cs->setCurrentAlpha(a); }