summaryrefslogtreecommitdiff
authordrw <drw>2002-04-30 01:09:14 (UTC)
committer drw <drw>2002-04-30 01:09:14 (UTC)
commited745f7e21eb32fbf5d9a3f1734d79b25cfa629c (patch) (side-by-side diff)
treeb91b936b12d1d25a813858b76a62e023d8ac2d23
parentb794af4c50efffe239c94e5a015e90565ff991c3 (diff)
downloadopie-ed745f7e21eb32fbf5d9a3f1734d79b25cfa629c.zip
opie-ed745f7e21eb32fbf5d9a3f1734d79b25cfa629c.tar.gz
opie-ed745f7e21eb32fbf5d9a3f1734d79b25cfa629c.tar.bz2
Renamed QColorDialog to OColorDialog
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/colordialog.cpp56
-rw-r--r--libopie/colordialog.h22
-rw-r--r--libopie/colorpopupmenu.cpp2
3 files changed, 40 insertions, 40 deletions
diff --git a/libopie/colordialog.cpp b/libopie/colordialog.cpp
index 6d72ff6..684d6ea 100644
--- a/libopie/colordialog.cpp
+++ b/libopie/colordialog.cpp
@@ -1,10 +1,10 @@
/****************************************************************************
** $Id$
**
-** Implementation of QColorDialog class
+** Implementation of OColorDialog class
**
** Created : 990222
**
** Copyright (C) 1999-2000 Trolltech AS. All rights reserved.
**
** This file is part of the dialogs module of the Qt GUI Toolkit.
@@ -473,55 +473,55 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
this, SIGNAL( newCol( QRgb ) ) );
connect( lab, SIGNAL( colorDropped( QRgb ) ),
this, SLOT( setRgb( QRgb ) ) );
hEd = new QColNumLineEdit( this );
hEd->setValidator( val360 );
- QLabel *l = new QLabel( hEd, QColorDialog::tr("Hue:"), this );
+ QLabel *l = new QLabel( hEd, OColorDialog::tr("Hue:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 0, 1 );
gl->addWidget( hEd, 0, 2 );
sEd = new QColNumLineEdit( this );
sEd->setValidator( val256 );
- l = new QLabel( sEd, QColorDialog::tr("Sat:"), this );
+ l = new QLabel( sEd, OColorDialog::tr("Sat:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 1, 1 );
gl->addWidget( sEd, 1, 2 );
vEd = new QColNumLineEdit( this );
vEd->setValidator( val256 );
- l = new QLabel( vEd, QColorDialog::tr("Val:"), this );
+ l = new QLabel( vEd, OColorDialog::tr("Val:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 2, 1 );
gl->addWidget( vEd, 2, 2 );
rEd = new QColNumLineEdit( this );
rEd->setValidator( val256 );
- l = new QLabel( rEd, QColorDialog::tr("Red:"), this );
+ l = new QLabel( rEd, OColorDialog::tr("Red:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 0, 3 );
gl->addWidget( rEd, 0, 4 );
gEd = new QColNumLineEdit( this );
gEd->setValidator( val256 );
- l = new QLabel( gEd, QColorDialog::tr("Green:"), this );
+ l = new QLabel( gEd, OColorDialog::tr("Green:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 1, 3 );
gl->addWidget( gEd, 1, 4 );
bEd = new QColNumLineEdit( this );
bEd->setValidator( val256 );
- l = new QLabel( bEd, QColorDialog::tr("Blue:"), this );
+ l = new QLabel( bEd, OColorDialog::tr("Blue:"), this );
l->setAlignment( AlignRight|AlignVCenter );
gl->addWidget( l, 2, 3 );
gl->addWidget( bEd, 2, 4 );
alphaEd = new QColNumLineEdit( this );
alphaEd->setValidator( val256 );
- alphaLab = new QLabel( alphaEd, QColorDialog::tr("Alpha channel:"), this );
+ alphaLab = new QLabel( alphaEd, OColorDialog::tr("Alpha channel:"), this );
alphaLab->setAlignment( AlignRight|AlignVCenter );
gl->addMultiCellWidget( alphaLab, 3, 3, 1, 3 );
gl->addWidget( alphaEd, 3, 4 );
alphaEd->hide();
alphaLab->hide();
@@ -604,17 +604,17 @@ void QColorShower::setHsv( int h, int s, int v )
bEd->setNum( qBlue(currentColor()) );
showCurrentColor();
}
-class QColorDialogPrivate : public QObject
+class OColorDialogPrivate : public QObject
{
Q_OBJECT
public:
- QColorDialogPrivate( QColorDialog *p );
+ OColorDialogPrivate( OColorDialog *p );
QRgb currentColor() const { return cs->currentColor(); }
void setCurrentColor( QRgb rgb );
int currentAlpha() const { return cs->currentAlpha(); }
void setCurrentAlpha( int a ) { cs->setCurrentAlpha( a ); }
void showAlpha( bool b ) { cs->showAlpha( b ); }
@@ -626,36 +626,36 @@ private:
QColorPicker *cp;
QColorLuminancePicker *lp;
QColorShower *cs;
};
//sets all widgets to display h,s,v
-void QColorDialogPrivate::newHsv( int h, int s, int v )
+void OColorDialogPrivate::newHsv( int h, int s, int v )
{
cs->setHsv( h, s, v );
cp->setCol( h, s );
lp->setCol( h, s, v );
}
//sets all widgets to display rgb
-void QColorDialogPrivate::setCurrentColor( QRgb rgb )
+void OColorDialogPrivate::setCurrentColor( QRgb rgb )
{
cs->setRgb( rgb );
newColorTypedIn( rgb );
}
//sets all widgets exept cs to display rgb
-void QColorDialogPrivate::newColorTypedIn( QRgb rgb )
+void OColorDialogPrivate::newColorTypedIn( QRgb rgb )
{
int h, s, v;
rgb2hsv(rgb, h, s, v );
cp->setCol( h, s );
lp->setCol( h, s, v);
}
-QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
+OColorDialogPrivate::OColorDialogPrivate( OColorDialog *dialog ) :
QObject(dialog)
{
int border = 2;
QVBoxLayout *topLay = new QVBoxLayout( dialog, border, 2 );
QHBoxLayout *pickLay = new QHBoxLayout( topLay );
@@ -682,14 +682,14 @@ QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
}
// BEING REVISED: jo
/*!
- \class QColorDialog qcolordialog.h
- \brief The QColorDialog class provides a dialog widget for specifying colors.
+ \class OColorDialog OColorDialog.h
+ \brief The OColorDialog class provides a dialog widget for specifying colors.
\ingroup dialogs
The color dialog's function is to allow users to choose colors -
for instance, you might use this in a drawing program to allow the
user to set the brush color.
@@ -709,37 +709,37 @@ QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
/*!
Constructs a default color dialog. Use setColor() for setting an initial value.
\sa getColor()
*/
-QColorDialog::QColorDialog(QWidget* parent, const char* name, bool modal) :
+OColorDialog::OColorDialog(QWidget* parent, const char* name, bool modal) :
QDialog(parent, name, modal )
{
- d = new QColorDialogPrivate( this );
+ d = new OColorDialogPrivate( this );
}
/*!
Pops up a modal color dialog letting the user choose a color and returns
that color. The color is initially set to \a initial. Returns an \link QColor::isValid() invalid\endlink color if the user cancels
the dialog. All colors allocated by the dialog will be deallocated
before this function returns.
*/
-QColor QColorDialog::getColor( QColor initial, QWidget *parent,
+QColor OColorDialog::getColor( QColor initial, QWidget *parent,
const char *name )
{
int allocContext = QColor::enterAllocContext();
- QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal
+ OColorDialog *dlg = new OColorDialog( parent, name, TRUE ); //modal
if ( parent && parent->icon() && !parent->icon()->isNull() )
dlg->setIcon( *parent->icon() );
else if ( qApp->mainWidget() && qApp->mainWidget()->icon() && !qApp->mainWidget()->icon()->isNull() )
dlg->setIcon( *qApp->mainWidget()->icon() );
- dlg->setCaption( QColorDialog::tr( "Select color" ) );
+ dlg->setCaption( OColorDialog::tr( "Select color" ) );
dlg->setColor( initial );
dlg->showMaximized();
int resultCode = dlg->exec();
QColor::leaveAllocContext();
QColor result;
if ( resultCode == QDialog::Accepted ) {
@@ -760,17 +760,17 @@ QColor QColorDialog::getColor( QColor initial, QWidget *parent,
If \a ok is non-null, \c *ok is set to TRUE if the user clicked OK,
and FALSE if the user clicked Cancel.
If the user clicks Cancel the \a initial value is returned.
*/
-QRgb QColorDialog::getRgba( QRgb initial, bool *ok,
+QRgb OColorDialog::getRgba( QRgb initial, bool *ok,
QWidget *parent, const char* name )
{
int allocContext = QColor::enterAllocContext();
- QColorDialog *dlg = new QColorDialog( parent, name, TRUE ); //modal
+ OColorDialog *dlg = new OColorDialog( parent, name, TRUE ); //modal
dlg->setColor( initial );
dlg->setSelectedAlpha( qAlpha(initial) );
dlg->showMaximized();
int resultCode = dlg->exec();
QColor::leaveAllocContext();
QRgb result = initial;
@@ -794,58 +794,58 @@ QRgb QColorDialog::getRgba( QRgb initial, bool *ok,
/*!
Returns the color currently selected in the dialog.
\sa setColor()
*/
-QColor QColorDialog::color() const
+QColor OColorDialog::color() const
{
return QColor(d->currentColor());
}
/*! Destructs the dialog and frees any memory it allocated.
*/
-QColorDialog::~QColorDialog()
+OColorDialog::~OColorDialog()
{
//d inherits QObject, so it is deleted by Qt.
}
/*!
Sets the color shown in the dialog to \a c.
\sa color()
*/
-void QColorDialog::setColor( QColor c )
+void OColorDialog::setColor( QColor c )
{
d->setCurrentColor( c.rgb() );
}
/*!
Sets the initial alpha channel value to \a a, and show the alpha channel
entry box.
*/
-void QColorDialog::setSelectedAlpha( int a )
+void OColorDialog::setSelectedAlpha( int a )
{
d->showAlpha( TRUE );
d->setCurrentAlpha( a );
}
/*!
Returns the value selected for the alpha channel.
*/
-int QColorDialog::selectedAlpha() const
+int OColorDialog::selectedAlpha() const
{
return d->currentAlpha();
}
#include "colordialog.moc"
diff --git a/libopie/colordialog.h b/libopie/colordialog.h
index a2d4d30..474bc61 100644
--- a/libopie/colordialog.h
+++ b/libopie/colordialog.h
@@ -1,10 +1,10 @@
/****************************************************************************
** $Id$
**
-** Definition of QColorDialog class
+** Definition of OColorDialog class
**
** Created : 990222
**
** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
**
** This file is part of the dialogs module of the Qt GUI Toolkit.
@@ -32,46 +32,46 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
-#ifndef QCOLORDIALOG_H
-#define QCOLORDIALOG_H
+#ifndef OColorDialog_H
+#define OColorDialog_H
#ifndef QT_H
#include <qdialog.h>
#endif // QT_H
-class QColorDialogPrivate;
+class OColorDialogPrivate;
-class Q_EXPORT QColorDialog : public QDialog
+class Q_EXPORT OColorDialog : public QDialog
{
Q_OBJECT
public:
static QColor getColor( QColor, QWidget *parent=0, const char* name=0 ); // ### 3.0: make const QColor&
static QRgb getRgba( QRgb, bool* ok = 0,
QWidget *parent=0, const char* name=0 );
private:
- ~QColorDialog();
+ ~OColorDialog();
- QColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE );
+ OColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE );
void setColor( QColor ); // ### 3.0: make const QColor&
QColor color() const;
private:
void setSelectedAlpha( int );
int selectedAlpha() const;
private:
- QColorDialogPrivate *d;
- friend class QColorDialogPrivate;
+ OColorDialogPrivate *d;
+ friend class OColorDialogPrivate;
private: // Disabled copy constructor and operator=
#if defined(Q_DISABLE_COPY)
- QColorDialog( const QColorDialog & );
- QColorDialog& operator=( const QColorDialog & );
+ OColorDialog( const OColorDialog & );
+ OColorDialog& operator=( const OColorDialog & );
#endif
};
#endif
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp
index 35e91f4..9b50a8b 100644
--- a/libopie/colorpopupmenu.cpp
+++ b/libopie/colorpopupmenu.cpp
@@ -155,11 +155,11 @@ void ColorPopupMenu::buttonSelected( const QColor& color )
emit colorSelected( color );
hide();
}
void ColorPopupMenu::moreColorClicked()
{
- QColor color = QColorDialog::getColor( m_color );
+ QColor color = OColorDialog::getColor( m_color );
m_color = color;
emit colorSelected( color );
hide();
}