diff options
Diffstat (limited to 'ksim')
79 files changed, 271 insertions, 271 deletions
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index f335d0f..3727b1f 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -40,8 +40,8 @@ #include <ksimconfig.h> -KSim::GeneralPrefs::GeneralPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_mainLayout = new TQGridLayout(this); m_mainLayout->setSpacing(6); @@ -122,8 +122,8 @@ void KSim::GeneralPrefs::readConfig(KSim::Config *config) m_recolourThemes->setChecked(config->reColourThemes()); } -KSim::ClockPrefs::ClockPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::ClockPrefs::ClockPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_mainLayout = new TQVBoxLayout(this); m_mainLayout->setSpacing(6); @@ -157,8 +157,8 @@ void KSim::ClockPrefs::readConfig(KSim::Config *config) m_dateCheck->setChecked(config->showDate()); } -KSim::UptimePrefs::UptimePrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); @@ -294,8 +294,8 @@ void KSim::UptimePrefs::removeUptimeItem() m_uptimeCombo->setCurrentItem(currentItem - 1); } -KSim::MemoryPrefs::MemoryPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); @@ -442,8 +442,8 @@ void KSim::MemoryPrefs::removeMemoryItem() m_memCombo->setCurrentItem(currentItem - 1); } -KSim::SwapPrefs::SwapPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index ae77882..776348a 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -45,7 +45,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - GeneralPrefs(TQWidget *tqparent, const char *name=0); + GeneralPrefs(TQWidget *parent, const char *name=0); ~GeneralPrefs(); public slots: @@ -68,7 +68,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ClockPrefs(TQWidget *tqparent, const char *name=0); + ClockPrefs(TQWidget *parent, const char *name=0); ~ClockPrefs(); public slots: @@ -86,7 +86,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - UptimePrefs(TQWidget *tqparent, const char *name=0); + UptimePrefs(TQWidget *parent, const char *name=0); ~UptimePrefs(); public slots: @@ -121,7 +121,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - MemoryPrefs(TQWidget *tqparent, const char *name=0); + MemoryPrefs(TQWidget *parent, const char *name=0); ~MemoryPrefs(); public slots: @@ -158,7 +158,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - SwapPrefs(TQWidget *tqparent, const char *name=0); + SwapPrefs(TQWidget *parent, const char *name=0); ~SwapPrefs(); public slots: diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 24e39f7..2e2587e 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -35,19 +35,19 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *tqparent, const TQString &configFile) + KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences | KPanelExtension::ReportBug, - tqparent, "ksim"); + parent, "ksim"); } } KSim::PanelExtension::PanelExtension(const TQString &configFile, - Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelExtension(configFile, type, actions, tqparent, name) + Type type, int actions, TQWidget *parent, const char *name) + : KPanelExtension(configFile, type, actions, parent, name) { m_dcopClient = new DCOPClient; m_view = new KSim::MainView(config(), true, this, "m_view"); diff --git a/ksim/ksim.h b/ksim/ksim.h index e74e068..2c1a4f5 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -38,7 +38,7 @@ namespace KSim TQ_OBJECT public: PanelExtension( const TQString & configFile, Type type, - int actions, TQWidget * tqparent, const char * name); + int actions, TQWidget * parent, const char * name); ~PanelExtension(); diff --git a/ksim/ksimframe.cpp b/ksim/ksimframe.cpp index 80af61a..a76eddf 100644 --- a/ksim/ksimframe.cpp +++ b/ksim/ksimframe.cpp @@ -23,8 +23,8 @@ #include "ksim.h" #include "themetypes.h" -KSim::Frame::Frame(int type, TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name) +KSim::Frame::Frame(int type, TQWidget *parent, const char *name) + : TQWidget (parent, name) { setType(type); diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 976523f..d793a3a 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -36,7 +36,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - Frame(int type, TQWidget *tqparent, const char *name = 0); + Frame(int type, TQWidget *parent, const char *name = 0); ~Frame(); const TQPixmap *const background() const { return &m_background; } diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index b379540..e5bb44a 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -37,9 +37,9 @@ #include <tqframe.h> KSim::ConfigDialog::ConfigDialog(KSim::Config *config, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : KDialogBase(TreeList, i18n("Configure"), - Help | Ok | Apply | Close, Ok, tqparent, name, true, true) + Help | Ok | Apply | Close, Ok, parent, name, true, true) { resize(466, 363); setShowIconsInTreeList(true); @@ -93,7 +93,7 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(tqparent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -127,7 +127,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) } TQWidget *frame = plugin.configPage()->parentWidget(); - // reparent the widget if the tqparent is not null + // reparent the widget if the parent is not null if (frame) { plugin.configPage()->hide(); plugin.configPage()->reparent(0, TQPoint(0, 0), false); diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 4175ca5..6118adf 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -75,7 +75,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ConfigDialog(KSim::Config *config, TQWidget *tqparent, const char *name = 0); + ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); ~ConfigDialog(); public slots: diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 259ef51..6813aeb 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -41,8 +41,8 @@ #include <string.h> KSim::Sysinfo::Sysinfo(KSim::Config *config, - TQWidget *tqparent, const char *name, WFlags fl) - : DCOPObject("sysinfo"), TQWidget(tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : DCOPObject("sysinfo"), TQWidget(parent, name, fl) { m_config = config; m_layout = new TQVBoxLayout(this); diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 2844a00..c0d1511 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -37,7 +37,7 @@ namespace KSim // TQ_OBJECT K_DCOP public: - Sysinfo(KSim::Config *config, TQWidget *tqparent=0, + Sysinfo(KSim::Config *config, TQWidget *parent=0, const char *name=0, WFlags fl=0); ~Sysinfo(); diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index e84ad7c..0315cd1 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -212,19 +212,19 @@ void KSim::MainView::slotMaskMainView() void KSim::MainView::maskMainView() { - if (!m_topFrame->background()->tqmask() || - !m_leftFrame->background()->tqmask() || - !m_rightFrame->background()->tqmask() || - !m_bottomFrame->background()->tqmask()) + if (!m_topFrame->background()->mask() || + !m_leftFrame->background()->mask() || + !m_rightFrame->background()->mask() || + !m_bottomFrame->background()->mask()) { tqtopLevelWidget()->clearMask(); return; } - TQBitmap topPixmap(*m_topFrame->background()->tqmask()); - TQBitmap leftPixmap(*m_leftFrame->background()->tqmask()); - TQBitmap rightPixmap(*m_rightFrame->background()->tqmask()); - TQBitmap bottomPixmap(*m_bottomFrame->background()->tqmask()); + TQBitmap topPixmap(*m_topFrame->background()->mask()); + TQBitmap leftPixmap(*m_leftFrame->background()->mask()); + TQBitmap rightPixmap(*m_rightFrame->background()->mask()); + TQBitmap bottomPixmap(*m_bottomFrame->background()->mask()); TQSize insideSize(m_pluginLayout->tqgeometry().size()); diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index b90fe00..ca555a4 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -107,15 +107,15 @@ class KSim::Chart::Private }; KSim::Chart::Chart(bool showKrell, int maxValue, - const TQString &title, TQWidget *tqparent, const char *name, - WFlags fl) : TQWidget(tqparent, name, fl) + const TQString &title, TQWidget *parent, const char *name, + WFlags fl) : TQWidget(parent, name, fl) { init(showKrell, maxValue, title); } KSim::Chart::Chart(bool showKrell, int maxValue, - TQWidget *tqparent, const char *name, WFlags fl) - : TQWidget(tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : TQWidget(parent, name, fl) { init(showKrell, maxValue, i18n("None")); } diff --git a/ksim/library/chart.h b/ksim/library/chart.h index 2354e22..cd658c0 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -47,10 +47,10 @@ namespace KSim * @param minValue is the minimum value to show * @param maxValue is the maximum value to show * @param title is the title off the krell bar (if enabled) - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Chart(bool displayMeter, int maxValue, - const TQString &title, TQWidget *tqparent, + const TQString &title, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::Chart. @@ -58,10 +58,10 @@ namespace KSim * @param showKrell is if the krellbar should be shown * @param minValue is the minimum value to show * @param maxValue is the maximum value to show - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Chart(bool displayMeter, int maxValue, - TQWidget *tqparent, const char *name = 0, + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/common.h b/ksim/library/common.h index c64504b..9fc01c0 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -58,7 +58,7 @@ namespace KSim * class Test : public TQWidget, virtual public KSim::Base * { * public: - * Test(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) + * Test(TQWidget *parent, const char *name) : TQWidget(parent, name) * { * } * ~Test() {} diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 37b86b3..0b9ed18 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -50,20 +50,20 @@ class KSim::Label::Private bool showShadow; }; -KSim::Label::Label(TQWidget *tqparent, const char *name, WFlags fl) - : TQWidget(tqparent, name, fl) +KSim::Label::Label(TQWidget *parent, const char *name, WFlags fl) + : TQWidget(parent, name, fl) { initWidget(KSim::Types::None); } -KSim::Label::Label(int type, TQWidget *tqparent, const char *name, - WFlags fl) : TQWidget(tqparent, name, fl) +KSim::Label::Label(int type, TQWidget *parent, const char *name, + WFlags fl) : TQWidget(parent, name, fl) { initWidget(type); } -KSim::Label::Label(int type, const TQString &text, TQWidget *tqparent, - const char *name, WFlags fl) : TQWidget(tqparent, name, fl) +KSim::Label::Label(int type, const TQString &text, TQWidget *parent, + const char *name, WFlags fl) : TQWidget(parent, name, fl) { initWidget(type); setText(text); diff --git a/ksim/library/label.h b/ksim/library/label.h index a888d89..f20d8df 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -42,7 +42,7 @@ namespace KSim /** * Constructs a KSim::Label. * - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -51,12 +51,12 @@ namespace KSim * To create a KSim::Label with the normal theme look * @see KSim::ThemeLoader */ - Label(TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + Label(TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSimLabel. * * @param type is the theme type - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -66,13 +66,13 @@ namespace KSim * NOTE: this is the same as the KSim::Label(TQWidget *, const char *, WFlags) ctor * @see KSim::ThemeLoader */ - Label(int type, TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + Label(int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::Label. * * @param type is the theme type * @param text is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -82,7 +82,7 @@ namespace KSim * @see KSim::ThemeLoader */ Label(int type, const TQString &text, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Label. */ diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp index f2acc2b..3fa8d7f 100644 --- a/ksim/library/led.cpp +++ b/ksim/library/led.cpp @@ -81,10 +81,10 @@ void KSim::Led::setOn(bool force) return; } - if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) { - TQBitmap tqmask(rect.size()); - bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP); - setMask(tqmask); + if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) { + TQBitmap mask(rect.size()); + bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP); + setMask(mask); } bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP); @@ -104,10 +104,10 @@ void KSim::Led::setOff(bool force) return; } - if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) { - TQBitmap tqmask(rect.size()); - bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP); - setMask(tqmask); + if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) { + TQBitmap mask(rect.size()); + bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP); + setMask(mask); } bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP); @@ -184,24 +184,24 @@ class KSim::LedLabel::Private }; KSim::LedLabel::LedLabel(int max, int type, const TQString &label, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Progress(max, type, Panel, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Progress(max, type, Panel, parent, name, fl) { init(); setText(label); } KSim::LedLabel::LedLabel(int max, int type, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Progress(max, type, Panel, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Progress(max, type, Panel, parent, name, fl) { init(); } KSim::LedLabel::LedLabel(int max, - TQWidget *tqparent, const char *name, WFlags fl) + TQWidget *parent, const char *name, WFlags fl) : KSim::Progress(max, KSim::Types::None, - Panel, tqparent, name, fl) + Panel, parent, name, fl) { init(); } diff --git a/ksim/library/led.h b/ksim/library/led.h index 8ed0a14..5c5e615 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -46,7 +46,7 @@ namespace KSim * @param ImageName is the image to display * the image's height is divided by 4 and each item is used for send in, * send out, receive in and receive out - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @param name is the object instance name */ Led(Type type, const TQString &imageName); @@ -114,29 +114,29 @@ namespace KSim * * @param type is the theme type * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ LedLabel(int max, int type, const TQString &label, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * * @param type is the theme type * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ - LedLabel(int max, int type, TQWidget *tqparent, + LedLabel(int max, int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ - LedLabel(int max, TQWidget *tqparent, + LedLabel(int max, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructor for KSim::LedLabel. diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index f3b941c..abe6609 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -77,19 +77,19 @@ class KSim::PluginPage::Private { public: KConfig *config; - KSim::PluginObject *tqparent; + KSim::PluginObject *parent; }; -KSim::PluginPage::PluginPage(KSim::PluginObject *tqparent, const char *name) +KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name) : TQWidget(0, name) { d = new PluginPage::Private; - d->tqparent = tqparent; - if (tqparent && !tqparent->configFileName().isEmpty()) - d->config = new KConfig(tqparent->configFileName() + "rc"); + d->parent = parent; + if (parent && !parent->configFileName().isEmpty()) + d->config = new KConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " - "pointer due to the tqparent being null" << endl; + "pointer due to the parent being null" << endl; d->config = 0; } } @@ -111,25 +111,25 @@ KConfig *KSim::PluginPage::config() const class KSim::PluginView::Private { public: - PluginObject *tqparent; + PluginObject *parent; TQPopupMenu *popupMenu; KConfig *config; }; -KSim::PluginView::PluginView(KSim::PluginObject *tqparent, const char *name) +KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) : TQWidget(0, name) { d = new PluginView::Private; - d->tqparent = tqparent; + d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, TQT_SLOT(showAbout()), 0, -1, 0); - if (tqparent && !tqparent->configFileName().isEmpty()) - d->config = new KConfig(tqparent->configFileName() + "rc"); + if (parent && !parent->configFileName().isEmpty()) + d->config = new KConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " - "pointer due to the tqparent being null" << endl; + "pointer due to the parent being null" << endl; d->config = 0; } } @@ -165,7 +165,7 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) KSim::PluginObject *KSim::PluginView::parentPlugin() const { - return d->tqparent; + return d->parent; } void KSim::PluginView::showAbout() diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index 91285f4..56d491c 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -119,7 +119,7 @@ namespace KSim /** * constructor for PluginPage */ - PluginPage(KSim::PluginObject *tqparent, const char *name); + PluginPage(KSim::PluginObject *parent, const char *name); /** * destructor for PluginPage */ @@ -168,7 +168,7 @@ namespace KSim /** * constructor for PluginView */ - PluginView(KSim::PluginObject *tqparent, const char *name); + PluginView(KSim::PluginObject *parent, const char *name); /** * destructor for PluginView */ diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp index bbdbd61..e37cff1 100644 --- a/ksim/library/progress.cpp +++ b/ksim/library/progress.cpp @@ -40,17 +40,17 @@ class KSim::Progress::Private }; KSim::Progress::Progress(int maxValue, - TQWidget *tqparent, const char *name, - WFlags fl) : KSim::Label(tqparent, name, fl) + TQWidget *parent, const char *name, + WFlags fl) : KSim::Label(parent, name, fl) { init(maxValue); configureObject(); } KSim::Progress::Progress(int maxValue, - int type, const TQString &label, TQWidget *tqparent, + int type, const TQString &label, TQWidget *parent, const char *name, WFlags fl) - : KSim::Label(type, label, tqparent, name, fl) + : KSim::Label(type, label, parent, name, fl) { init(maxValue); configureObject(); @@ -58,17 +58,17 @@ KSim::Progress::Progress(int maxValue, KSim::Progress::Progress(int maxValue, int type, const TQString &label, int value, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Label(type, label, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Label(type, label, parent, name, fl) { init(maxValue, value); configureObject(); } KSim::Progress::Progress(int maxValue, - int type, TQWidget *tqparent, + int type, TQWidget *parent, const char *name, WFlags fl) - : KSim::Label(type, tqparent, name, fl) + : KSim::Label(type, parent, name, fl) { init(maxValue); configureObject(); @@ -76,8 +76,8 @@ KSim::Progress::Progress(int maxValue, KSim::Progress::Progress(int maxValue, int type, ProgressType progressType, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Label(type, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Label(type, parent, name, fl) { init(maxValue, 0, progressType); configureObject(); diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 09c4a21..0e30986 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -42,9 +42,9 @@ namespace KSim * @param maxValue is the maximum value * that the progress bar will show * @param label is the text that will be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ - Progress(int maxValue, TQWidget *tqparent, + Progress(int maxValue, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -53,10 +53,10 @@ namespace KSim * that the progress bar will show * @param type is the theme type * @param label is the text that will be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress * @@ -65,10 +65,10 @@ namespace KSim * @param type is the theme type * @param label is the text that will be displayed * @param value is the initial value to be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - int value, TQWidget *tqparent, const char *name = 0, + int value, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -76,9 +76,9 @@ namespace KSim * @param maxValue is the maximum value * that the progress bar will show * @param type is the theme type - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ - Progress(int maxValue, int type, TQWidget *tqparent, + Progress(int maxValue, int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -87,11 +87,11 @@ namespace KSim * that the progress bar will show * @param type is the theme type * @param progressType is onr of Progress::ProgressType - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, ProgressType progressType, - TQWidget *tqparent, const char *name = 0, + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 58a6f61..3fced29 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -607,11 +607,11 @@ TQValueList<TQPixmap> KSim::Theme::pixmapToList(PixmapType type, for (int i = 0; i < (depth + 1); ++i) { newPixmap.fill(); - if (pixmap.tqmask()) { - TQBitmap tqmask(newPixmap.size()); - bitBlt(&tqmask, 0, 0, pixmap.tqmask(), xOffset, yOffset, + if (pixmap.mask()) { + TQBitmap mask(newPixmap.size()); + bitBlt(&mask, 0, 0, pixmap.mask(), xOffset, yOffset, image.width() - xOffset, size); - newPixmap.setMask(tqmask); + newPixmap.setMask(mask); } bitBlt(&newPixmap, 0, 0, &pixmap, xOffset, yOffset, diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index b89e7eb..0038c85 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -29,8 +29,8 @@ #include <ksimconfig.h> #include <pluginloader.h> -KSim::MonitorPrefs::MonitorPrefs(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Monitor")); addColumn(i18n("Description")); diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index c457472..2ecf4c9 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -32,7 +32,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - MonitorPrefs(TQWidget *tqparent, const char *name=0); + MonitorPrefs(TQWidget *parent, const char *name=0); ~MonitorPrefs(); public slots: diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 9cb570a..39bbffd 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -107,8 +107,8 @@ void CpuPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -CpuView::CpuView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +CpuView::CpuView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef Q_OS_LINUX m_procStream = 0L; @@ -361,8 +361,8 @@ KSim::Progress *CpuView::addLabel() return progress; } -CpuConfig::CpuConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { TQVBoxLayout * mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing( 6 ); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 79e561e..a520b7b 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -54,7 +54,7 @@ class CpuView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - CpuView(KSim::PluginObject *tqparent, const char *name); + CpuView(KSim::PluginObject *parent, const char *name); ~CpuView(); virtual void reparseConfig(); @@ -203,7 +203,7 @@ class CpuConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - CpuConfig(KSim::PluginObject *tqparent, const char *name); + CpuConfig(KSim::PluginObject *parent, const char *name); ~CpuConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 2365e19..c91f173 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -103,8 +103,8 @@ void DiskPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -DiskView::DiskView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +DiskView::DiskView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef Q_OS_LINUX m_bLinux24 = true; @@ -472,8 +472,8 @@ void DiskView::cleanup() m_addAll = false; } -DiskConfig::DiskConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_layout = new TQVBoxLayout(this); m_layout->setSpacing(6); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index f122fbf..1c97040 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -57,7 +57,7 @@ class DiskView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - DiskView(KSim::PluginObject *tqparent, const char *name); + DiskView(KSim::PluginObject *parent, const char *name); ~DiskView(); virtual void reparseConfig(); @@ -134,7 +134,7 @@ class DiskConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - DiskConfig(KSim::PluginObject *tqparent, const char *name); + DiskConfig(KSim::PluginObject *parent, const char *name); ~DiskConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 4149aee..fb04470 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -85,8 +85,8 @@ void FilesystemWidget::Filesystem::setValue(int value) m_display->setValue(value); } -FilesystemWidget::FilesystemWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +FilesystemWidget::FilesystemWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_list.setAutoDelete(true); m_layout = new TQVBoxLayout(this); diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index b709125..a79a34f 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -32,7 +32,7 @@ class FilesystemWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - FilesystemWidget(TQWidget *tqparent, const char *name); + FilesystemWidget(TQWidget *parent, const char *name); ~FilesystemWidget(); void append(int, const TQString &); diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 937d2cc..6b8c928 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -37,17 +37,17 @@ class FSysViewItem : public TQCheckListItem { public: - FSysViewItem(TQListView *tqparent, const TQString &text1, + FSysViewItem(TQListView *parent, const TQString &text1, const TQString &text2, const TQString &text3) - : TQCheckListItem(tqparent, text1, CheckBox) + : TQCheckListItem(parent, text1, CheckBox) { setText(1, text2); setText(2, text3); } }; -FsystemConfig::FsystemConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_mainLayout = new TQGridLayout(this); m_mainLayout->setSpacing(6); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index 96fccf1..82eafb7 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -35,7 +35,7 @@ class FsystemConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - FsystemConfig(KSim::PluginObject *tqparent, const char *name); + FsystemConfig(KSim::PluginObject *parent, const char *name); ~FsystemConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index f73ce3d..9b08da9 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -81,9 +81,9 @@ void PluginModule::showAbout() KAboutApplication(&aboutData).exec(); } -Fsystem::Fsystem(KSim::PluginObject *tqparent, const char *name) +Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) : DCOPObject("fsystem"), - KSim::PluginView(tqparent, name) + KSim::PluginView(parent, name) { config()->setGroup("Fsystem"); TQVBoxLayout *vbLayout = new TQVBoxLayout(this); diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index cf8dc9e..a9eefc6 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -53,7 +53,7 @@ class Fsystem : public KSim::PluginView, public FsystemIface /** * construtor of Fsystem, calls all init functions to create the plugin. */ - Fsystem(KSim::PluginObject *tqparent, const char *name); + Fsystem(KSim::PluginObject *parent, const char *name); ~Fsystem(); virtual void reparseConfig(); diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 2c209b4..c265055 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -72,8 +72,8 @@ void I8KPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -I8KView::I8KView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name), +I8KView::I8KView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name), m_timer( 0L ), m_procFile( 0L ), m_procStream( 0L ) { initGUI(); @@ -208,8 +208,8 @@ void I8KView::updateView() .tqarg( m_unit ) ); } -I8KConfig::I8KConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_unit = new TQCheckBox( i18n( "Show temperature in Fahrenheit" ), this ); diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index 76b8796..01383b5 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -52,7 +52,7 @@ class I8KView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - I8KView(KSim::PluginObject *tqparent, const char *name); + I8KView(KSim::PluginObject *parent, const char *name); ~I8KView(); virtual void reparseConfig(); @@ -84,7 +84,7 @@ class I8KConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - I8KConfig(KSim::PluginObject *tqparent, const char *name); + I8KConfig(KSim::PluginObject *parent, const char *name); ~I8KConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/lm_sensors/NVCtrl.c b/ksim/monitors/lm_sensors/NVCtrl.c index dd5f500..6c61b8a 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.c +++ b/ksim/monitors/lm_sensors/NVCtrl.c @@ -143,7 +143,7 @@ Bool XNVCTRLIsNvScreen ( void XNVCTRLSetAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int value ){ @@ -157,7 +157,7 @@ void XNVCTRLSetAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlSetAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; req->value = value; UnlockDisplay (dpy); @@ -168,7 +168,7 @@ void XNVCTRLSetAttribute ( Bool XNVCTRLQueryAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int *value ){ @@ -187,7 +187,7 @@ Bool XNVCTRLQueryAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); @@ -205,7 +205,7 @@ Bool XNVCTRLQueryAttribute ( Bool XNVCTRLQueryStringAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, char **ptr ){ @@ -227,7 +227,7 @@ Bool XNVCTRLQueryStringAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryStringAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, False)) { UnlockDisplay (dpy); @@ -256,7 +256,7 @@ Bool XNVCTRLQueryStringAttribute ( Bool XNVCTRLQueryValidAttributeValues ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, NVCTRLAttributeValidValuesRec *values ){ @@ -277,7 +277,7 @@ Bool XNVCTRLQueryValidAttributeValues ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryValidAttributeValues; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); @@ -343,8 +343,8 @@ static Bool wire_to_event (Display *dpy, XEvent *host, xEvent *wire) re->attribute_changed.display = dpy; re->attribute_changed.time = event->u.attribute_changed.time; re->attribute_changed.screen = event->u.attribute_changed.screen; - re->attribute_changed.display_tqmask = - event->u.attribute_changed.display_tqmask; + re->attribute_changed.display_mask = + event->u.attribute_changed.display_mask; re->attribute_changed.attribute = event->u.attribute_changed.attribute; re->attribute_changed.value = event->u.attribute_changed.value; break; diff --git a/ksim/monitors/lm_sensors/NVCtrl.h b/ksim/monitors/lm_sensors/NVCtrl.h index 5e78e27..81c9432 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.h +++ b/ksim/monitors/lm_sensors/NVCtrl.h @@ -26,7 +26,7 @@ /* * Integer attributes; these are settable/gettable via * XNVCTRLSetAttribute() and XNVCTRLQueryAttribute, respectively. - * Some attributes may only be read; some may require a display_tqmask + * Some attributes may only be read; some may require a display_mask * argument. This information is encoded in the "permission" comment * after each attribute #define, and can be queried at run time with * XNVCTRLQueryValidAttributeValues(). @@ -40,14 +40,14 @@ * various reasons: they represent static system information, they * can only be changed by changing an XF86Config option, etc). * - * D: The attribute requires the display tqmask argument. The + * D: The attribute requires the display mask argument. The * attributes NV_CTRL_CONNECTED_DISPLAYS and NV_CTRL_ENABLED_DISPLAYS - * will be a bittqmask of what display devices are connected and what + * will be a bitmask of what display devices are connected and what * display devices are enabled for use in X, respectively. Each bit - * in the bittqmask represents a display device; it is these bits which - * should be used as the display_tqmask when dealing with attributes + * in the bitmask represents a display device; it is these bits which + * should be used as the display_mask when dealing with attributes * designated with "D" below. For attributes that do not require the - * display tqmask, the argument is ignored. + * display mask, the argument is ignored. */ @@ -249,7 +249,7 @@ /* - * NV_CTRL_CONNECTED_DISPLAYS - returns a display tqmask indicating what + * NV_CTRL_CONNECTED_DISPLAYS - returns a display mask indicating what * display devices are connected to the GPU driving the specified X * screen. */ @@ -258,7 +258,7 @@ /* - * NV_CTRL_ENABLED_DISPLAYS - returns a display tqmask indicating what + * NV_CTRL_ENABLED_DISPLAYS - returns a display mask indicating what * display devices are enabled for use on the specified X screen. */ @@ -717,7 +717,7 @@ /* * NV_CTRL_STRING_DISPLAY_DEVICE_NAME - name of the display device - * specified in the display_tqmask argument. + * specified in the display_mask argument. */ #define NV_CTRL_STRING_DISPLAY_DEVICE_NAME 4 /* R-D */ @@ -746,7 +746,7 @@ * is no fixed range of valid values. * * ATTRIBUTE_TYPE_BITMASK : the attribute is an integer value, - * interpretted as a bittqmask. + * interpretted as a bitmask. * * ATTRIBUTE_TYPE_BOOL : the attribute is a boolean, valid values are * either 1 (on/true) or 0 (off/false). @@ -763,7 +763,7 @@ * which can only have certain values, depending on GPU. * * - * The permissions field of NVCTRLAttributeValidValuesRec is a bittqmask + * The permissions field of NVCTRLAttributeValidValuesRec is a bitmask * that may contain: * * ATTRIBUTE_TYPE_READ diff --git a/ksim/monitors/lm_sensors/NVCtrlLib.h b/ksim/monitors/lm_sensors/NVCtrlLib.h index 704071c..8d9cec4 100644 --- a/ksim/monitors/lm_sensors/NVCtrlLib.h +++ b/ksim/monitors/lm_sensors/NVCtrlLib.h @@ -55,7 +55,7 @@ Bool XNVCTRLIsNvScreen ( * Sets the attribute to the given value. The attributes and their * possible values are listed in NVCtrl.h. * - * Not all attributes require the display_tqmask parameter; see + * Not all attributes require the display_mask parameter; see * NVCtrl.h for details. * * Possible errors: @@ -66,7 +66,7 @@ Bool XNVCTRLIsNvScreen ( void XNVCTRLSetAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int value ); @@ -78,7 +78,7 @@ void XNVCTRLSetAttribute ( * If XNVCTRLQueryAttribute returns True, value will contain the * value of the specified attribute. * - * Not all attributes require the display_tqmask parameter; see + * Not all attributes require the display_mask parameter; see * NVCtrl.h for details. * * Possible errors: @@ -90,7 +90,7 @@ void XNVCTRLSetAttribute ( Bool XNVCTRLQueryAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int *value ); @@ -112,7 +112,7 @@ Bool XNVCTRLQueryAttribute ( Bool XNVCTRLQueryStringAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, char **ptr ); @@ -129,7 +129,7 @@ Bool XNVCTRLQueryStringAttribute ( Bool XNVCTRLQueryValidAttributeValues ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, NVCTRLAttributeValidValuesRec *values ); @@ -166,7 +166,7 @@ typedef struct { Display *display; Time time; int screen; - unsigned int display_tqmask; + unsigned int display_mask; unsigned int attribute; int value; } XNVCtrlAttributeChangedEvent; diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 76bc4c3..eb2614f 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -71,8 +71,8 @@ void PluginModule::showAbout() KAboutApplication(&aboutData).exec(); } -SensorsView::SensorsView(KSim::PluginObject *tqparent, const char *name) - : DCOPObject("sensors"), KSim::PluginView(tqparent, name) +SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) + : DCOPObject("sensors"), KSim::PluginView(parent, name) { config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 195899e..97fa757 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -50,7 +50,7 @@ class SensorsView : public KSim::PluginView, public KSimSensorsIface Q_OBJECT TQ_OBJECT public: - SensorsView(KSim::PluginObject *tqparent, const char *name); + SensorsView(KSim::PluginObject *parent, const char *name); ~SensorsView(); virtual void reparseConfig(); diff --git a/ksim/monitors/lm_sensors/nv_control.h b/ksim/monitors/lm_sensors/nv_control.h index 9900a00..d94ee95 100644 --- a/ksim/monitors/lm_sensors/nv_control.h +++ b/ksim/monitors/lm_sensors/nv_control.h @@ -87,7 +87,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryAttributeReq; #define sz_xnvCtrlQueryAttributeReq 16 @@ -111,7 +111,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; INT32 value B32; } xnvCtrlSetAttributeReq; @@ -122,7 +122,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryStringAttributeReq; #define sz_xnvCtrlQueryStringAttributeReq 16 @@ -150,7 +150,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryValidAttributeValuesReq; #define sz_xnvCtrlQueryValidAttributeValuesReq 16 @@ -192,7 +192,7 @@ typedef struct { CARD16 sequenceNumber B16; Time time B32; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; CARD32 value B32; CARD32 pad0 B32; diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 8b1ff46..1f1cf10 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -40,10 +40,10 @@ class SensorViewItem : public TQCheckListItem { public: - SensorViewItem(TQListView *tqparent, const TQString &text1, + SensorViewItem(TQListView *parent, const TQString &text1, const TQString &text2, const TQString &text3, const TQString &text4) - : TQCheckListItem(tqparent, text1, CheckBox) + : TQCheckListItem(parent, text1, CheckBox) { setText(1, text2); setText(2, text3); @@ -51,8 +51,8 @@ class SensorViewItem : public TQCheckListItem } }; -SensorsConfig::SensorsConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_layout = new TQGridLayout(this); m_layout->setSpacing(6); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index f37c599..6e27e3d 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -38,7 +38,7 @@ class SensorsConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - SensorsConfig(KSim::PluginObject *tqparent, const char *name); + SensorsConfig(KSim::PluginObject *parent, const char *name); ~SensorsConfig(); void saveConfig(); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index 260ad8e..f6cbe4a 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -66,8 +66,8 @@ void MailPlugin::showAbout() KAboutApplication( &about ).exec(); } -MailView::MailView( KSim::PluginObject* tqparent, const char* name ) - : KSim::PluginView( tqparent, name ) +MailView::MailView( KSim::PluginObject* parent, const char* name ) + : KSim::PluginView( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); @@ -87,8 +87,8 @@ void MailView::updateDisplay() { } -MailLabel::MailLabel( TQWidget* tqparent ) - : KSim::Label( KSim::Types::Mail, tqparent ) +MailLabel::MailLabel( TQWidget* parent ) + : KSim::Label( KSim::Types::Mail, parent ) { // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); @@ -131,17 +131,17 @@ TQPixmap MailLabel::frame( const TQPixmap& source, int number ) const { TQPixmap result( source.width(), source.height() / m_frames ); bitBlt( &result, 0, 0, &source, 0, number * source.height() / m_frames ); - if ( source.tqmask() ) + if ( source.mask() ) { - TQBitmap tqmask( result.size() ); - bitBlt( &tqmask, 0, 0, source.tqmask(), 0, number * source.height() / m_frames ); - result.setMask( tqmask ); + TQBitmap mask( result.size() ); + bitBlt( &mask, 0, 0, source.mask(), 0, number * source.height() / m_frames ); + result.setMask( mask ); } return result; } -MailConfig::MailConfig( KSim::PluginObject* tqparent, const char* name ) - : KSim::PluginPage( tqparent, name ) +MailConfig::MailConfig( KSim::PluginObject* parent, const char* name ) + : KSim::PluginPage( parent, name ) { } diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index 776d574..3ecb647 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -41,7 +41,7 @@ class MailView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - MailView( KSim::PluginObject* tqparent, const char* name ); + MailView( KSim::PluginObject* parent, const char* name ); ~MailView(); virtual void reparseConfig(); @@ -55,7 +55,7 @@ class MailLabel : public KSim::Label Q_OBJECT TQ_OBJECT public: - MailLabel( TQWidget* tqparent ); + MailLabel( TQWidget* parent ); virtual ~MailLabel(); virtual void configureObject( bool ); @@ -81,7 +81,7 @@ class MailConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - MailConfig( KSim::PluginObject* tqparent, const char* name ); + MailConfig( KSim::PluginObject* parent, const char* name ); ~MailConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index daaeb90..42e0ffd 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -99,8 +99,8 @@ void NetPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -NetView::NetView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +NetView::NetView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef __linux__ m_procStream = 0L; diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 3bd8cb1..87ad691 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -45,7 +45,7 @@ class NetView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - NetView(KSim::PluginObject *tqparent, const char *name); + NetView(KSim::PluginObject *parent, const char *name); ~NetView(); virtual void reparseConfig(); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index 9a19047..f3e98b7 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -34,8 +34,8 @@ #include "netconfig.moc" #include "netdialog.h" -NetConfig::NetConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_yes = i18n("yes"); m_no = i18n("no"); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2d07176..4d6de56 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -35,7 +35,7 @@ class NetConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - NetConfig(KSim::PluginObject *tqparent, const char *name); + NetConfig(KSim::PluginObject *parent, const char *name); virtual ~NetConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index d79f06f..c470a2c 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -49,8 +49,8 @@ #include <string.h> -NetDialog::NetDialog(TQWidget *tqparent, const char *name) - : TQTabDialog(tqparent, name, true) +NetDialog::NetDialog(TQWidget *parent, const char *name) + : TQTabDialog(parent, name, true) { m_clicked = false; setCaption(kapp->makeStdCaption(i18n("Network Interface"))); diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 094e40a..2b9f7b1 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -37,7 +37,7 @@ class NetDialog : public TQTabDialog Q_OBJECT TQ_OBJECT public: - NetDialog(TQWidget *tqparent, const char *name = 0); + NetDialog(TQWidget *parent, const char *name = 0); ~NetDialog(); const TQString deviceName() const; diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 75f2dac..6480bf5 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -29,8 +29,8 @@ using namespace KSim::Snmp; -BrowseDialog::BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *tqparent, const char *name ) - : BrowseDialogBase( tqparent, name ), m_host( hostConfig ) +BrowseDialog::BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name ) + : BrowseDialogBase( parent, name ), m_host( hostConfig ) { stop->setGuiItem( KGuiItem( i18n( "&Stop" ), "stop" ) ); diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index 7dfb4f7..2e605b8 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -41,7 +41,7 @@ class BrowseDialog : public BrowseDialogBase Q_OBJECT TQ_OBJECT public: - BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *tqparent, const char *name = 0 ); + BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); TQString selectedObjectIdentifier() const; diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 4682c3b..1679eb6 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -22,8 +22,8 @@ using namespace KSim::Snmp; -ChartMonitor::ChartMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name ) - : KSim::Chart( true /* displayMeter */, 0, TQString(), tqparent, name ), +ChartMonitor::ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name ) + : KSim::Chart( true /* displayMeter */, 0, TQString(), parent, name ), m_lastValue( 0 ), m_config( config ), m_firstSampleReceived( false ) { setTitle( m_config.name ); diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index 6713238..b147922 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -33,7 +33,7 @@ class ChartMonitor : public KSim::Chart Q_OBJECT TQ_OBJECT public: - ChartMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name = 0 ); + ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); public slots: void setData( const Value &data ); diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index f5c1d24..ee50054 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -43,8 +43,8 @@ static bool listViewHasSelection( TQListView *lv ) return false; } -ConfigPage::ConfigPage( Plugin *tqparent, const char *name ) - : KSim::PluginPage( tqparent, name ) +ConfigPage::ConfigPage( Plugin *parent, const char *name ) + : KSim::PluginPage( parent, name ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index f8b811c..6027862 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -35,14 +35,14 @@ namespace Snmp class HostItem : public TQListViewItem { public: - HostItem( TQListView *tqparent, const KSim::Snmp::HostConfig &src ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + HostItem( TQListView *parent, const KSim::Snmp::HostConfig &src ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) { setFromHostConfig( src ); } - HostItem( TQListView *tqparent ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + HostItem( TQListView *parent ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) {} void setFromHostConfig( const KSim::Snmp::HostConfig &src ) @@ -56,14 +56,14 @@ public: class MonitorItem : public TQListViewItem { public: - MonitorItem( TQListView *tqparent, const KSim::Snmp::MonitorConfig &monitor ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + MonitorItem( TQListView *parent, const KSim::Snmp::MonitorConfig &monitor ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) { setFromMonitor( monitor ); } - MonitorItem( TQListView *tqparent ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + MonitorItem( TQListView *parent ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) {} void setFromMonitor( const KSim::Snmp::MonitorConfig &monitor ) @@ -81,7 +81,7 @@ class ConfigPage : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - ConfigPage( Plugin *tqparent, const char *name ); + ConfigPage( Plugin *parent, const char *name ); ~ConfigPage(); virtual void saveConfig(); diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp index 2ea7314..7d66a75 100644 --- a/ksim/monitors/snmp/hostdialog.cpp +++ b/ksim/monitors/snmp/hostdialog.cpp @@ -35,15 +35,15 @@ using namespace KSim::Snmp; -HostDialog::HostDialog( TQWidget *tqparent, const char *name ) - : HostDialogBase( tqparent, name ) +HostDialog::HostDialog( TQWidget *parent, const char *name ) + : HostDialogBase( parent, name ) { init(); port->setValue( 161 ); } -HostDialog::HostDialog( const HostConfig &src, TQWidget *tqparent, const char *name ) - : HostDialogBase( tqparent, name ) +HostDialog::HostDialog( const HostConfig &src, TQWidget *parent, const char *name ) + : HostDialogBase( parent, name ) { init( src ); } diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index d384881..ba5e1c5 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -35,8 +35,8 @@ class HostDialog : public HostDialogBase Q_OBJECT TQ_OBJECT public: - HostDialog( TQWidget *tqparent, const char *name = 0 ); - HostDialog( const HostConfig &src, TQWidget *tqparent, const char *name = 0 ); + HostDialog( TQWidget *parent, const char *name = 0 ); + HostDialog( const HostConfig &src, TQWidget *parent, const char *name = 0 ); HostConfig settings() const; diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp index 5e7ea34..2245a09 100644 --- a/ksim/monitors/snmp/labelmonitor.cpp +++ b/ksim/monitors/snmp/labelmonitor.cpp @@ -21,8 +21,8 @@ using namespace KSim::Snmp; -LabelMonitor::LabelMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name ) - : KSim::Label( tqparent, name ), m_config( config ) +LabelMonitor::LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name ) + : KSim::Label( parent, name ), m_config( config ) { } diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index 6ff8404..90ffd90 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -35,7 +35,7 @@ class LabelMonitor : public KSim::Label Q_OBJECT TQ_OBJECT public: - LabelMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name = 0 ); + LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); public slots: void setData( const Value &data ); diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index 414f4d9..052d2c0 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -24,8 +24,8 @@ using namespace KSim::Snmp; -Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_oid( oid ), m_session( host ) +Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_oid( oid ), m_session( host ) { if ( refresh > 0 ) m_timerId = startTimer( refresh ); diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index 5b88b46..0fddbef 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -36,7 +36,7 @@ class Monitor : public TQObject, public TQThread Q_OBJECT TQ_OBJECT public: - Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *tqparent = 0, const char *name = 0 ); + Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); virtual ~Monitor(); signals: diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index b8cd756..1bcbb0b 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -93,7 +93,7 @@ void MonitorConfig::save( KConfigBase &config ) const config.writeEntry( "DisplayCurrentValueInline", displayCurrentValueInline ); } -TQWidget *MonitorConfig::createMonitorWidget( TQWidget *tqparent, const char *name ) +TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name ) { TQWidget *w; @@ -103,9 +103,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *tqparent, const char *na return 0; if ( display == Label ) - w = new LabelMonitor( *this, tqparent, name ); + w = new LabelMonitor( *this, parent, name ); else - w = new ChartMonitor( *this, tqparent, name ); + w = new ChartMonitor( *this, parent, name ); Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index 00554d7..cf2d525 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -41,7 +41,7 @@ struct MonitorConfig bool isNull() const { return name.isEmpty() || host.isNull(); } - TQWidget *createMonitorWidget( TQWidget *tqparent, const char *name = 0 ); + TQWidget *createMonitorWidget( TQWidget *parent, const char *name = 0 ); HostConfig host; TQString name; diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp index 574f244..1bda0aa 100644 --- a/ksim/monitors/snmp/monitordialog.cpp +++ b/ksim/monitors/snmp/monitordialog.cpp @@ -37,14 +37,14 @@ using namespace KSim::Snmp; -MonitorDialog::MonitorDialog( const HostConfigMap &hosts, TQWidget *tqparent, const char *name ) - : MonitorDialogBase( tqparent, name ), m_hosts( hosts ) +MonitorDialog::MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name ) + : MonitorDialogBase( parent, name ), m_hosts( hosts ) { init(); } -MonitorDialog::MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *tqparent, const char *name ) - : MonitorDialogBase( tqparent, name ), m_hosts( hosts ) +MonitorDialog::MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *parent, const char *name ) + : MonitorDialogBase( parent, name ), m_hosts( hosts ) { init( monitor ); } diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index 62ab5e2..eee6634 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -34,8 +34,8 @@ class MonitorDialog : public MonitorDialogBase Q_OBJECT TQ_OBJECT public: - MonitorDialog( const HostConfigMap &hosts, TQWidget *tqparent, const char *name = 0 ); - MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *tqparent, const char *name = 0 ); + MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); + MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); MonitorConfig monitorConfig() const; diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 8edfe69..7261f21 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -38,8 +38,8 @@ static const char * const probeIdentifiers[] = 0 }; -ProbeDialog::ProbeDialog( const HostConfig &hostConfig, TQWidget *tqparent, const char *name ) - : KProgressDialog( tqparent, name, i18n( "SNMP Host Probe" ), TQString(), true /* modal */ ), +ProbeDialog::ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name ) + : KProgressDialog( parent, name, i18n( "SNMP Host Probe" ), TQString(), true /* modal */ ), m_host( hostConfig ), m_currentMonitor( 0 ), m_canceled( false ) { setLabel( i18n( "Probing for common object identifiers..." ) ); diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index 9ce949f..98e705b 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -40,7 +40,7 @@ class ProbeDialog : public KProgressDialog Q_OBJECT TQ_OBJECT public: - ProbeDialog( const HostConfig &hostConfig, TQWidget *tqparent, const char *name = 0 ); + ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); struct ProbeResult { diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index fbdd4e6..1c8033a 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -27,8 +27,8 @@ using namespace KSim::Snmp; ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, - TQWidget *tqparent, const char *name ) - : ProbeResultDialogBase( tqparent, name ) + TQWidget *parent, const char *name ) + : ProbeResultDialogBase( parent, name ) { info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) ); diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 47e012a..66300bf 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -36,7 +36,7 @@ class ProbeResultDialog : public ProbeResultDialogBase TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); private: void addResultItem( const ProbeDialog::ProbeResult &result ); diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index c6482ab..9515645 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -29,8 +29,8 @@ using namespace KSim::Snmp; -View::View( Plugin *tqparent, const char *name ) - : KSim::PluginView( tqparent, name ) +View::View( Plugin *parent, const char *name ) + : KSim::PluginView( parent, name ) { m_layout = new TQVBoxLayout( this ); diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index af27e23..a87af87 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -37,7 +37,7 @@ class View : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - View( Plugin *tqparent, const char *name ); + View( Plugin *parent, const char *name ); ~View(); virtual void reparseConfig(); diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 70af99d..0aa6c0a 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -38,8 +38,8 @@ namespace static const uint walkerRefresh = 0; -Walker::Walker( const HostConfig &host, const Identifier &startOid, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_stop( false ), m_oid( startOid ), m_session( host ) +Walker::Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_stop( false ), m_oid( startOid ), m_session( host ) { m_timerId = startTimer( walkerRefresh ); start(); diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index c9f8e52..19b440b 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -38,7 +38,7 @@ class Walker : public TQObject, public TQThread Q_OBJECT TQ_OBJECT public: - Walker( const HostConfig &host, const Identifier &startOid, TQObject *tqparent, const char *name = 0 ); + Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); virtual ~Walker(); struct Result diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index 4b2ee3f..afabec5 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -46,8 +46,8 @@ class ThemeViewItem : public KListViewItem { public: - ThemeViewItem(TQListView *tqparent, const TQString &text, - const KURL &url) : KListViewItem(tqparent, text) + ThemeViewItem(TQListView *parent, const TQString &text, + const KURL &url) : KListViewItem(parent, text) { m_url = url; } @@ -58,8 +58,8 @@ class ThemeViewItem : public KListViewItem KURL m_url; }; -KSim::ThemePrefs::ThemePrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_themeLayout = new TQGridLayout(this); m_themeLayout->setSpacing(6); diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 12278a4..ec788b3 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -78,7 +78,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ThemePrefs(TQWidget *tqparent, const char *name=0); + ThemePrefs(TQWidget *parent, const char *name=0); ~ThemePrefs(); public slots: |