diff --git a/widgets/combobox.cpp b/widgets/combobox.cpp index d75b742d4..4e32690cd 100644 --- a/widgets/combobox.cpp +++ b/widgets/combobox.cpp @@ -19,7 +19,7 @@ #include "combobox.h" -#include +#include #include #include @@ -46,7 +46,7 @@ ComboBox::ComboBox(QGraphicsWidget *parent) : QGraphicsProxyWidget(parent), d(new Private) { - QComboBox* native = new QComboBox; + KComboBox* native = new KComboBox; connect(native, SIGNAL(activated(const QString &)), this, SIGNAL(activated(const QString &))); setWidget(native); native->setAttribute(Qt::WA_NoSystemBackground); @@ -59,7 +59,7 @@ ComboBox::~ComboBox() QString ComboBox::text() const { - return static_cast(widget())->currentText(); + return static_cast(widget())->currentText(); } void ComboBox::setStylesheet(const QString &stylesheet) @@ -72,19 +72,19 @@ QString ComboBox::stylesheet() return widget()->styleSheet(); } -QComboBox* ComboBox::nativeWidget() const +KComboBox* ComboBox::nativeWidget() const { - return static_cast(widget()); + return static_cast(widget()); } void ComboBox::addItem(const QString &text) { - static_cast(widget())->addItem(text); + static_cast(widget())->addItem(text); } void ComboBox::clear() { - static_cast(widget())->clear(); + static_cast(widget())->clear(); } void ComboBox::resizeEvent(QGraphicsSceneResizeEvent *event) diff --git a/widgets/combobox.h b/widgets/combobox.h index 4873f733b..cdbae48b8 100644 --- a/widgets/combobox.h +++ b/widgets/combobox.h @@ -23,7 +23,7 @@ #include -class QComboBox; +class KComboBox; #include @@ -37,7 +37,7 @@ class PLASMA_EXPORT ComboBox : public QGraphicsProxyWidget Q_PROPERTY(QGraphicsWidget* parentWidget READ parentWidget) Q_PROPERTY(QString text READ text) Q_PROPERTY(QString stylesheet READ stylesheet WRITE setStylesheet) - Q_PROPERTY(QComboBox* nativeWidget READ nativeWidget) + Q_PROPERTY(KComboBox* nativeWidget READ nativeWidget) public: explicit ComboBox(QGraphicsWidget *parent = 0); @@ -63,7 +63,7 @@ public: /** * @return the native widget wrapped by this ComboBox */ - QComboBox* nativeWidget() const; + KComboBox* nativeWidget() const; /** * Adds an item to the combobox with the given text. The diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp index cf0ea9350..54d9f069b 100644 --- a/widgets/lineedit.cpp +++ b/widgets/lineedit.cpp @@ -19,7 +19,7 @@ #include "lineedit.h" -#include +#include #include #include @@ -46,7 +46,7 @@ LineEdit::LineEdit(QGraphicsWidget *parent) : QGraphicsProxyWidget(parent), d(new Private) { - QLineEdit* native = new QLineEdit; + KLineEdit* native = new KLineEdit; connect(native, SIGNAL(editingFinished()), this, SIGNAL(editingFinished())); connect(native, SIGNAL(returnPressed()), this, SIGNAL(returnPressed())); connect(native, SIGNAL(textEdited(const QString&)), this, SIGNAL(textEdited(const QString&))); @@ -61,12 +61,12 @@ LineEdit::~LineEdit() void LineEdit::setText(const QString &text) { - static_cast(widget())->setText(text); + static_cast(widget())->setText(text); } QString LineEdit::text() const { - return static_cast(widget())->text(); + return static_cast(widget())->text(); } void LineEdit::setStylesheet(const QString &stylesheet) @@ -79,9 +79,9 @@ QString LineEdit::stylesheet() return widget()->styleSheet(); } -QLineEdit* LineEdit::nativeWidget() const +KLineEdit* LineEdit::nativeWidget() const { - return static_cast(widget()); + return static_cast(widget()); } } // namespace Plasma diff --git a/widgets/lineedit.h b/widgets/lineedit.h index cf46a9ff0..ba3ca2390 100644 --- a/widgets/lineedit.h +++ b/widgets/lineedit.h @@ -23,7 +23,7 @@ #include -class QLineEdit; +class KLineEdit; #include @@ -37,7 +37,7 @@ class PLASMA_EXPORT LineEdit : public QGraphicsProxyWidget Q_PROPERTY(QGraphicsWidget* parentWidget READ parentWidget) Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QString stylesheet READ stylesheet WRITE setStylesheet) - Q_PROPERTY(QLineEdit* nativeWidget READ nativeWidget) + Q_PROPERTY(KLineEdit* nativeWidget READ nativeWidget) public: explicit LineEdit(QGraphicsWidget *parent = 0); @@ -70,7 +70,7 @@ public: /** * @return the native widget wrapped by this LineEdit */ - QLineEdit* nativeWidget() const; + KLineEdit* nativeWidget() const; Q_SIGNALS: void editingFinished(); diff --git a/widgets/pushbutton.cpp b/widgets/pushbutton.cpp index 2a6b9b6bb..042037ee8 100644 --- a/widgets/pushbutton.cpp +++ b/widgets/pushbutton.cpp @@ -19,7 +19,7 @@ #include "pushbutton.h" -#include +#include #include #include @@ -61,7 +61,7 @@ public: pm = QPixmap(absImagePath); } - static_cast(q->widget())->setIcon(QIcon(pm)); + static_cast(q->widget())->setIcon(QIcon(pm)); } QString imagePath; @@ -73,7 +73,7 @@ PushButton::PushButton(QGraphicsWidget *parent) : QGraphicsProxyWidget(parent), d(new Private) { - QPushButton* native = new QPushButton; + KPushButton* native = new KPushButton; connect(native, SIGNAL(clicked()), this, SIGNAL(clicked())); setWidget(native); native->setAttribute(Qt::WA_NoSystemBackground); @@ -86,12 +86,12 @@ PushButton::~PushButton() void PushButton::setText(const QString &text) { - static_cast(widget())->setText(text); + static_cast(widget())->setText(text); } QString PushButton::text() const { - return static_cast(widget())->text(); + return static_cast(widget())->text(); } void PushButton::setImage(const QString &path) @@ -137,9 +137,9 @@ QString PushButton::stylesheet() return widget()->styleSheet(); } -QPushButton* PushButton::nativeWidget() const +KPushButton* PushButton::nativeWidget() const { - return static_cast(widget()); + return static_cast(widget()); } void PushButton::resizeEvent(QGraphicsSceneResizeEvent *event) diff --git a/widgets/pushbutton.h b/widgets/pushbutton.h index dddc3527f..96a5586ea 100644 --- a/widgets/pushbutton.h +++ b/widgets/pushbutton.h @@ -23,7 +23,7 @@ #include -class QPushButton; +class KPushButton; #include @@ -38,7 +38,7 @@ class PLASMA_EXPORT PushButton : public QGraphicsProxyWidget Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QString image READ image WRITE setImage) Q_PROPERTY(QString stylesheet READ stylesheet WRITE setStylesheet) - Q_PROPERTY(QPushButton* nativeWidget READ nativeWidget) + Q_PROPERTY(KPushButton* nativeWidget READ nativeWidget) public: explicit PushButton(QGraphicsWidget *parent = 0); @@ -83,7 +83,7 @@ public: /** * @return the native widget wrapped by this PushButton */ - QPushButton* nativeWidget() const; + KPushButton* nativeWidget() const; Q_SIGNALS: void clicked(); diff --git a/widgets/textedit.cpp b/widgets/textedit.cpp index db7bb35e9..251bdd931 100644 --- a/widgets/textedit.cpp +++ b/widgets/textedit.cpp @@ -19,7 +19,7 @@ #include "textedit.h" -#include +#include #include #include @@ -46,7 +46,7 @@ TextEdit::TextEdit(QGraphicsWidget *parent) : QGraphicsProxyWidget(parent), d(new Private) { - QTextEdit* native = new QTextEdit; + KTextEdit* native = new KTextEdit; connect(native, SIGNAL(textChanged()), this, SIGNAL(textChanged())); setWidget(native); native->setAttribute(Qt::WA_NoSystemBackground); @@ -60,12 +60,12 @@ TextEdit::~TextEdit() void TextEdit::setText(const QString &text) { //FIXME I'm not certain about using only the html methods. look at this again later. - static_cast(widget())->setHtml(text); + static_cast(widget())->setHtml(text); } QString TextEdit::text() const { - return static_cast(widget())->toHtml(); + return static_cast(widget())->toHtml(); } void TextEdit::setStylesheet(const QString &stylesheet) @@ -78,9 +78,9 @@ QString TextEdit::stylesheet() return widget()->styleSheet(); } -QTextEdit* TextEdit::nativeWidget() const +KTextEdit* TextEdit::nativeWidget() const { - return static_cast(widget()); + return static_cast(widget()); } void TextEdit::resizeEvent(QGraphicsSceneResizeEvent *event) diff --git a/widgets/textedit.h b/widgets/textedit.h index 4621ba765..79e077d3b 100644 --- a/widgets/textedit.h +++ b/widgets/textedit.h @@ -23,7 +23,7 @@ #include -class QTextEdit; +class KTextEdit; #include @@ -37,7 +37,7 @@ class PLASMA_EXPORT TextEdit : public QGraphicsProxyWidget Q_PROPERTY(QGraphicsWidget* parentWidget READ parentWidget) Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QString stylesheet READ stylesheet WRITE setStylesheet) - Q_PROPERTY(QTextEdit* nativeWidget READ nativeWidget) + Q_PROPERTY(KTextEdit* nativeWidget READ nativeWidget) public: explicit TextEdit(QGraphicsWidget *parent = 0); @@ -70,7 +70,7 @@ public: /** * @return the native widget wrapped by this TextEdit */ - QTextEdit* nativeWidget() const; + KTextEdit* nativeWidget() const; Q_SIGNALS: void textChanged();