Some namespace cleanup.

This commit is contained in:
Jim Evins
2016-03-27 00:14:38 -04:00
parent 5b7e031c52
commit 7559544b06
156 changed files with 9732 additions and 10126 deletions
+57 -62
View File
@@ -18,8 +18,8 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef glabels_ColorPaletteDialog_h
#define glabels_ColorPaletteDialog_h
#ifndef ColorPaletteDialog_h
#define ColorPaletteDialog_h
#include <QObject>
#include <QDialog>
@@ -29,83 +29,78 @@
#include "ColorPaletteItem.h"
namespace glabels
///
/// Color Palette Dialog
///
class ColorPaletteDialog : public QDialog
{
///
/// Color Palette Dialog
///
class ColorPaletteDialog : public QDialog
{
Q_OBJECT
Q_OBJECT
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
ColorPaletteDialog( const QString& defaultLabel,
const QColor& defaultColor,
const QColor& color,
QWidget* parent = 0 );
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
ColorPaletteDialog( const QString& defaultLabel,
const QColor& defaultColor,
const QColor& color,
QWidget* parent = 0 );
/////////////////////////////////
// Signals
/////////////////////////////////
signals:
void colorChanged( ColorNode colorNode, bool isDefault );
/////////////////////////////////
// Signals
/////////////////////////////////
signals:
void colorChanged( ColorNode colorNode, bool isDefault );
/////////////////////////////////
// Public Methods
/////////////////////////////////
public:
void setKeys( const QList<QString> keyList );
void clearKeys();
/////////////////////////////////
// Public Methods
/////////////////////////////////
public:
void setKeys( const QList<QString> keyList );
void clearKeys();
/////////////////////////////////
// Slots
/////////////////////////////////
private slots:
void onDefaultItemActivated();
void onPaletteItemActivated( int id );
void onHistoryItemActivated( int id );
void onCustomColorItemActivated();
void onColorHistoryChanged();
/////////////////////////////////
// Slots
/////////////////////////////////
private slots:
void onDefaultItemActivated();
void onPaletteItemActivated( int id );
void onHistoryItemActivated( int id );
void onCustomColorItemActivated();
void onColorHistoryChanged();
/////////////////////////////////
// Private Methods
/////////////////////////////////
private:
void loadCustomColorHistory();
/////////////////////////////////
// Private Methods
/////////////////////////////////
private:
void loadCustomColorHistory();
/////////////////////////////////
// Private Members
/////////////////////////////////
private:
QColor mDefaultColor;
ColorNode mColorNode;
/////////////////////////////////
// Private Members
/////////////////////////////////
private:
QColor mDefaultColor;
ColorNode mColorNode;
static const int PALETTE_COLS = 9;
static const int PALETTE_ROWS = 4;
static const int PALETTE_COLS = 9;
static const int PALETTE_ROWS = 4;
typedef struct {
QString colorSpec;
QString name;
} ColorTableEntry;
typedef struct {
QString colorSpec;
QString name;
} ColorTableEntry;
static ColorTableEntry mColorTable[];
static ColorTableEntry mColorTable[];
ColorHistory* mColorHistory;
ColorPaletteItem* mHistoryItem[PALETTE_COLS];
ColorHistory* mColorHistory;
ColorPaletteItem* mHistoryItem[PALETTE_COLS];
};
}
};
#endif // glabels_ColorPaletteDialog_h
#endif // ColorPaletteDialog_h