summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/tabdialog.cpp4
-rw-r--r--core/settings/launcher/tabdialog.h4
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
@@ -258,18 +258,18 @@ private:
258 QColor m_textcolor; 258 QColor m_textcolor;
259 QColor m_bgcolor; 259 QColor m_bgcolor;
260 QPixmap m_bgpix; 260 QPixmap m_bgpix;
261 TabConfig::BackgroundType m_bgtype; 261 TabConfig::BackgroundType m_bgtype;
262}; 262};
263 263
264 264
265 265
266TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 266TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl )
267 : QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) 267 : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
268{ 268{
269 setCaption ( tr( "Edit Tab" )); 269 setCaption ( tr( "Edit Tab" ));
270 270
271 QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); 271 QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
272 272
273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
274 QWidget *bgtab; 274 QWidget *bgtab;
275 275
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
@@ -37,17 +37,17 @@ class SampleView;
37class OColorButton; 37class OColorButton;
38class QPushButton; 38class QPushButton;
39class QCheckBox; 39class QCheckBox;
40 40
41 41
42class TabDialog : public QDialog { 42class TabDialog : public QDialog {
43 Q_OBJECT 43 Q_OBJECT
44public: 44public:
45 TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 ); 45 TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 );
46 virtual ~TabDialog ( ); 46 virtual ~TabDialog ( );
47 47
48public slots: 48public slots:
49 virtual void accept ( ); 49 virtual void accept ( );
50 50
51protected slots: 51protected slots:
52 void iconSizeClicked ( int ); 52 void iconSizeClicked ( int );
53 void fontClicked ( const QFont & ); 53 void fontClicked ( const QFont & );
@@ -73,9 +73,9 @@ private:
73 QString m_bgimage; 73 QString m_bgimage;
74 QButtonGroup *m_bgtype; 74 QButtonGroup *m_bgtype;
75 QCheckBox *m_fontuse; 75 QCheckBox *m_fontuse;
76 76
77 TabConfig &m_tc; 77 TabConfig &m_tc;
78}; 78};
79 79
80 80
81#endif \ No newline at end of file 81#endif