From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeui/kcolorcombo.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kdeui/kcolorcombo.h') diff --git a/kdeui/kcolorcombo.h b/kdeui/kcolorcombo.h index c4754c55f..8ef33f5c9 100644 --- a/kdeui/kcolorcombo.h +++ b/kdeui/kcolorcombo.h @@ -26,7 +26,7 @@ #ifndef _KCOLORCOMBO_H__ #define _KCOLORCOMBO_H__ -#include +#include #include #include "kselect.h" @@ -39,23 +39,23 @@ class KColorComboInternal; class KDEUI_EXPORT KColorCombo : public QComboBox { Q_OBJECT - Q_PROPERTY( QColor color READ color WRITE setColor ) + Q_PROPERTY( TQColor color READ color WRITE setColor ) public: /** * Constructs a color combo box. */ - KColorCombo( QWidget *parent, const char *name = 0L ); + KColorCombo( TQWidget *parent, const char *name = 0L ); ~KColorCombo(); /** * Selects the color @p col. */ - void setColor( const QColor &col ); + void setColor( const TQColor &col ); /** * Returns the currently selected color. **/ - QColor color() const; + TQColor color() const; /** @@ -67,14 +67,14 @@ signals: /** * Emitted when a new color box has been selected. */ - void activated( const QColor &col ); + void activated( const TQColor &col ); /** * Emitted when a new item has been highlighted. */ - void highlighted( const QColor &col ); + void highlighted( const TQColor &col ); protected: - virtual void resizeEvent( QResizeEvent *re ); + virtual void resizeEvent( TQResizeEvent *re ); private slots: void slotActivated( int index ); @@ -82,8 +82,8 @@ private slots: private: void addColors(); - QColor customColor; - QColor internalcolor; + TQColor customColor; + TQColor internalcolor; protected: virtual void virtual_hook( int id, void* data ); -- cgit v1.2.1