2 files changed, 4 insertions, 4 deletions

diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index d20412a..5981d0b 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -242,50 +242,50 @@ public:
         void setBackgroundColor ( const QColor &c ) 
         {
                 m_bgcolor = c;
         }
         
         void drawBackground ( QPainter *p, const QRect &r )
         {
                 if ( !m_bgpix. isNull ( )) {
                         p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 
                                                                   ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
                 } 
                 else
                         p-> fillRect ( r, m_bgcolor );
         }
         
 private:
         QColor m_textcolor;
         QColor m_bgcolor;
         QPixmap m_bgpix;
         TabConfig::BackgroundType m_bgtype;
 };
 
 
 
-TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 
-        : QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
+TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) 
+        : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
 {
         setCaption ( tr( "Edit Tab" ));
         
         QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
         
         OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
         QWidget *bgtab;
                
         tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
         tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
                 tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );                           
         
         tw-> setCurrentTab ( bgtab );                                       
         
                 QWidget *sample = new QVBox ( this );
         QTabBar *tb = new QTabBar ( sample );
         QString name ( tr( "Previewing %1" ). arg ( tabname ));
         
         tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name ));
         
         m_sample = new SampleView ( sample );
                         
         lay-> addWidget ( tw, 10 );
         lay-> addWidget ( sample, 1 );
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h
index 892a3ad..4f99d5d 100644
--- a/core/settings/launcher/tabdialog.h
+++ b/core/settings/launcher/tabdialog.h
@@ -21,61 +21,61 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef __TABDIALOG_H__
 #define __TABDIALOG_H__
 
 #include <qdialog.h>
 #include "tabconfig.h"
 
 class QButtonGroup;
 class OFontSelector;
 class SampleView;
 class OColorButton;
 class QPushButton;
 class QCheckBox;
 
 
 class TabDialog : public QDialog {
         Q_OBJECT
 public:
-        TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 );
+        TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 );
                 virtual ~TabDialog ( );
 
 public slots:
         virtual void accept ( );
 
 protected slots:
         void iconSizeClicked ( int );
         void fontClicked ( const QFont & );
         void bgTypeClicked ( int );
         void bgColorClicked ( const QColor & );
         void iconColorClicked ( const QColor & );
         void bgImageClicked ( );
         void bgDefaultClicked ( );
 
 private:
         QWidget *createBgTab ( QWidget *parent );
         QWidget *createFontTab ( QWidget *parent );
         QWidget *createIconTab ( QWidget *parent );
         
         
 private:
         SampleView *m_sample;
         QButtonGroup *m_iconsize;
         OFontSelector *m_fontselect;
         OColorButton *m_solidcolor;
         OColorButton *m_iconcolor;
         QPushButton *m_imagebrowse;
                 QString m_bgimage;
         QButtonGroup *m_bgtype;
         QCheckBox *m_fontuse;
         
         TabConfig &m_tc;
 };
 
 
-#endif
\ No newline at end of file
+#endif