-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 4 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.h | 4 |
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 @@ -254,26 +254,26 @@ public: 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" ) ); 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 @@ -33,25 +33,25 @@ 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 ( ); @@ -69,13 +69,13 @@ private: 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 |