From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 30 Jun 2011 00:15:53 +0000 Subject: TQt4 port piklab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/progs/icd1/gui/icd1_group_ui.cpp | 16 ++++++++-------- src/progs/icd1/gui/icd1_group_ui.h | 9 +++++---- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src/progs/icd1/gui') diff --git a/src/progs/icd1/gui/icd1_group_ui.cpp b/src/progs/icd1/gui/icd1_group_ui.cpp index 34f28d5..1ae73a3 100644 --- a/src/progs/icd1/gui/icd1_group_ui.cpp +++ b/src/progs/icd1/gui/icd1_group_ui.cpp @@ -13,13 +13,13 @@ #include "progs/icd1/base/icd1_prog.h" //---------------------------------------------------------------------------- -Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, QWidget *parent) - : ::Programmer::PicAdvancedDialog(base, parent, "icd1_advanced_dialog") +Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent) + : ::Programmer::PicAdvancedDialog(base, tqparent, "icd1_advanced_dialog") { uint row = _selfTestContainer->numRows(); - QLabel *label = new QLabel(i18n("Result:"), _selfTestContainer); + TQLabel *label = new TQLabel(i18n("Result:"), _selfTestContainer); _selfTestContainer->addWidget(label, row,row, 0,0); - _selfTestLabel = new QLabel(_selfTestContainer); + _selfTestLabel = new TQLabel(_selfTestContainer); _selfTestContainer->addWidget(_selfTestLabel, row,row, 1,1); } @@ -30,12 +30,12 @@ void Icd1::AdvancedDialog::updateDisplay() } //---------------------------------------------------------------------------- -::Programmer::ConfigWidget *Icd1::GroupUI::createConfigWidget(QWidget *parent) const +::Programmer::ConfigWidget *Icd1::GroupUI::createConfigWidget(TQWidget *tqparent) const { - return new ::Programmer::ConfigWidget(static_cast(group()), parent); + return new ::Programmer::ConfigWidget(static_cast(group()), tqparent); } -::Programmer::AdvancedDialog *Icd1::GroupUI::createAdvancedDialog(::Programmer::Base &base, QWidget *parent) const +::Programmer::AdvancedDialog *Icd1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const { - return new AdvancedDialog(static_cast(base), parent); + return new AdvancedDialog(static_cast(base), tqparent); } diff --git a/src/progs/icd1/gui/icd1_group_ui.h b/src/progs/icd1/gui/icd1_group_ui.h index f60562a..c4f1c33 100644 --- a/src/progs/icd1/gui/icd1_group_ui.h +++ b/src/progs/icd1/gui/icd1_group_ui.h @@ -20,12 +20,13 @@ class Group; class AdvancedDialog : public ::Programmer::PicAdvancedDialog { Q_OBJECT + TQ_OBJECT public: - AdvancedDialog(ProgrammerBase &base, QWidget *parent); + AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent); virtual void updateDisplay(); private: - QLabel *_selfTestLabel; + TQLabel *_selfTestLabel; ProgrammerBase &base() { return static_cast(_base); } }; @@ -33,9 +34,9 @@ private: class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(QWidget *parent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, QWidget *parent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; }; } // namespace -- cgit v1.2.1