summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kernel/ntqpalette.h8
-rw-r--r--src/kernel/qpalette.cpp26
2 files changed, 2 insertions, 32 deletions
diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h
index 274228c4c..7b0d6f0aa 100644
--- a/src/kernel/ntqpalette.h
+++ b/src/kernel/ntqpalette.h
@@ -122,7 +122,7 @@ public:
~TQPalette();
TQPalette &operator=( const TQPalette & );
- enum ColorGroup { Disabled, Active, Inactive, NColorGroups, Normal=Active };
+ enum ColorGroup { Disabled, Active, Inactive, NColorGroups };
const TQColor &color( ColorGroup, TQColorGroup::ColorRole ) const;
const TQBrush &brush( ColorGroup, TQColorGroup::ColorRole ) const;
@@ -137,16 +137,10 @@ public:
const TQColorGroup &active() const { return data->active; }
const TQColorGroup &disabled() const { return data->disabled; }
const TQColorGroup &inactive() const { return data->inactive; }
-#ifndef TQT_NO_COMPAT
- const TQColorGroup &normal() const { return active(); }
-#endif
void setActive( const TQColorGroup & );
void setDisabled( const TQColorGroup & );
void setInactive( const TQColorGroup & );
-#ifndef TQT_NO_COMPAT
- void setNormal( const TQColorGroup & cg ) { setActive(cg); }
-#endif
bool operator==( const TQPalette &p ) const;
bool operator!=( const TQPalette &p ) const
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 31f45c057..b1ed971f9 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -548,9 +548,7 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const
slightly different.
There are setActive(), setInactive(), and setDisabled() functions
- to modify the palette. (TQt also supports a normal() group; this is
- an obsolete alias for active(), supported for backwards
- compatibility.)
+ to modify the palette.
Colors and brushes can be set for particular roles in any of a
palette's color groups with setColor() and setBrush().
@@ -568,30 +566,8 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const
\value Active
\value Inactive
\value NColorGroups
- \value Normal synonym for Active
*/
-/*!
- \obsolete
-
- \fn const TQColorGroup &TQPalette::normal() const
-
- Returns the active color group. Use active() instead.
-
- \sa setActive() active()
-*/
-
-/*!
- \obsolete
-
- \fn void TQPalette::setNormal( const TQColorGroup & cg )
-
- Sets the active color group to \a cg. Use setActive() instead.
-
- \sa setActive() active()
-*/
-
-
static int palette_count = 1;
/*!