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
@@ -2,5 +2,5 @@
 ** $Id$
 **
-** Implementation of QColorDialog class
+** Implementation of OColorDialog class
 **
 ** Created : 990222
@@ -477,5 +477,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -484,5 +484,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -491,5 +491,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -498,5 +498,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -505,5 +505,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -512,5 +512,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -519,5 +519,5 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     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 );
@@ -608,9 +608,9 @@ void QColorShower::setHsv( int h, int s, int v )
 }
 
-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 );
@@ -630,5 +630,5 @@ private:
 
 //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 );
@@ -638,5 +638,5 @@ void QColorDialogPrivate::newHsv( int h, int s, int v )
 
 //sets all widgets to display rgb
-void QColorDialogPrivate::setCurrentColor( QRgb rgb )
+void OColorDialogPrivate::setCurrentColor( QRgb rgb )
 {
     cs->setRgb( rgb );
@@ -645,5 +645,5 @@ void QColorDialogPrivate::setCurrentColor( QRgb rgb )
 
 //sets all widgets exept cs to display rgb
-void QColorDialogPrivate::newColorTypedIn( QRgb rgb )
+void OColorDialogPrivate::newColorTypedIn( QRgb rgb )
 {
     int h, s, v;
@@ -653,5 +653,5 @@ void QColorDialogPrivate::newColorTypedIn( QRgb rgb )
 }
 
-QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
+OColorDialogPrivate::OColorDialogPrivate( OColorDialog *dialog ) :
     QObject(dialog)
 {
@@ -686,6 +686,6 @@ 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
 
@@ -713,8 +713,8 @@ QColorDialogPrivate::QColorDialogPrivate( QColorDialog *dialog ) :
 */
 
-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 );
 }
 
@@ -727,9 +727,9 @@ QColorDialog::QColorDialog(QWidget* parent, const char* name, bool modal) :
 */
 
-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() );
@@ -737,5 +737,5 @@ QColor QColorDialog::getColor( QColor initial, QWidget *parent,
         dlg->setIcon( *qApp->mainWidget()->icon() );
 
-    dlg->setCaption( QColorDialog::tr( "Select color" ) );
+    dlg->setCaption( OColorDialog::tr( "Select color" ) );
     dlg->setColor( initial );
     dlg->showMaximized();
@@ -764,9 +764,9 @@ QColor QColorDialog::getColor( QColor initial, QWidget *parent,
 */
 
-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) );
@@ -798,5 +798,5 @@ QRgb QColorDialog::getRgba( QRgb initial, bool *ok,
 */
 
-QColor QColorDialog::color() const
+QColor OColorDialog::color() const
 {
     return QColor(d->currentColor());
@@ -808,5 +808,5 @@ QColor QColorDialog::color() const
 */
 
-QColorDialog::~QColorDialog()
+OColorDialog::~OColorDialog()
 {
     //d inherits QObject, so it is deleted by Qt.
@@ -820,5 +820,5 @@ QColorDialog::~QColorDialog()
 */
 
-void QColorDialog::setColor( QColor c )
+void OColorDialog::setColor( QColor c )
 {
     d->setCurrentColor( c.rgb() );
@@ -833,5 +833,5 @@ void QColorDialog::setColor( QColor c )
 */
 
-void QColorDialog::setSelectedAlpha( int a )
+void OColorDialog::setSelectedAlpha( int a )
 {
     d->showAlpha( TRUE );
@@ -844,5 +844,5 @@ void QColorDialog::setSelectedAlpha( int a )
 */
 
-int QColorDialog::selectedAlpha() const
+int OColorDialog::selectedAlpha() const
 {
     return d->currentAlpha();
diff --git a/libopie/colordialog.h b/libopie/colordialog.h
index a2d4d30..474bc61 100644
--- a/libopie/colordialog.h
+++ b/libopie/colordialog.h
@@ -2,5 +2,5 @@
 ** $Id$
 **
-** Definition of QColorDialog class
+** Definition of OColorDialog class
 **
 ** Created : 990222
@@ -36,6 +36,6 @@
 **********************************************************************/
 
-#ifndef QCOLORDIALOG_H
-#define QCOLORDIALOG_H
+#ifndef OColorDialog_H
+#define OColorDialog_H
 
 #ifndef QT_H
@@ -43,7 +43,7 @@
 #endif // QT_H
 
-class QColorDialogPrivate;
+class OColorDialogPrivate;
 
-class Q_EXPORT QColorDialog : public QDialog
+class Q_EXPORT OColorDialog : public QDialog
 {
     Q_OBJECT
@@ -55,7 +55,7 @@ public:
 
 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;
@@ -65,11 +65,11 @@ private:
     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
 };
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp
index 35e91f4..9b50a8b 100644
--- a/libopie/colorpopupmenu.cpp
+++ b/libopie/colorpopupmenu.cpp
@@ -159,5 +159,5 @@ void ColorPopupMenu::buttonSelected( const QColor& color )
 void ColorPopupMenu::moreColorClicked()
 {
-    QColor color = QColorDialog::getColor( m_color );
+    QColor color = OColorDialog::getColor( m_color );
     m_color = color;
     emit colorSelected( color );