diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | eb570158698cf61dad4f77d950ef908160f6c3cc (patch) | |
tree | 649bf182bcf0a20bed5035d25ffd77de5aee138a /kalzium | |
parent | d8762de95349dc6edaa34db9bf699b367c1af6b1 (diff) | |
download | tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.tar.gz tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalzium')
29 files changed, 71 insertions, 71 deletions
diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp index 67a4d231..0b7c8076 100644 --- a/kalzium/src/detailedgraphicaloverview.cpp +++ b/kalzium/src/detailedgraphicaloverview.cpp @@ -28,14 +28,14 @@ email : [email protected] #include <tqpixmap.h> #include <tqrect.h> -DetailedGraphicalOverview::DetailedGraphicalOverview( Element *el, TQWidget *tqparent, const char *name ) -: TQWidget( tqparent, name ) +DetailedGraphicalOverview::DetailedGraphicalOverview( Element *el, TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { init( el ); } -DetailedGraphicalOverview::DetailedGraphicalOverview( TQWidget *tqparent, const char *name ) -: TQWidget( tqparent, name ) +DetailedGraphicalOverview::DetailedGraphicalOverview( TQWidget *parent, const char *name ) +: TQWidget( parent, name ) { init( 0L ); } diff --git a/kalzium/src/detailedgraphicaloverview.h b/kalzium/src/detailedgraphicaloverview.h index 90658abc..176a8e40 100644 --- a/kalzium/src/detailedgraphicaloverview.h +++ b/kalzium/src/detailedgraphicaloverview.h @@ -31,8 +31,8 @@ class DetailedGraphicalOverview : public TQWidget TQ_OBJECT public: - DetailedGraphicalOverview( Element *el, TQWidget *tqparent, const char *name=0 ); - DetailedGraphicalOverview( TQWidget *tqparent, const char *name=0 ); + DetailedGraphicalOverview( Element *el, TQWidget *parent, const char *name=0 ); + DetailedGraphicalOverview( TQWidget *parent, const char *name=0 ); /** * sets the elements whose data will be used to @p el diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 7503c77d..d925ac7a 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -44,8 +44,8 @@ //TODO add bondxx-radius (H-H-distance for example) -DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *tqparent, const char *name) - : KDialogBase( IconList, name, Help|User1|User2|Close, Close, tqparent, name, +DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *name) + : KDialogBase( IconList, name, Help|User1|User2|Close, Close, parent, name, false, //non modal false, KGuiItem(i18n("Next element", "Next"), "1rightarrow"), diff --git a/kalzium/src/detailinfodlg.h b/kalzium/src/detailinfodlg.h index 4087239d..fba57279 100644 --- a/kalzium/src/detailinfodlg.h +++ b/kalzium/src/detailinfodlg.h @@ -42,7 +42,7 @@ class DetailedInfoDlg : public KDialogBase TQ_OBJECT public: - DetailedInfoDlg( Element *el , TQWidget *tqparent=0, const char *name=0); + DetailedInfoDlg( Element *el , TQWidget *parent=0, const char *name=0); void setElement(Element *el); diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index d14eb343..bf717d42 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -30,12 +30,12 @@ #include <tqcheckbox.h> #include <tqlabel.h> -ElementDataViewer::ElementDataViewer( TQWidget *tqparent, const char* name ) +ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Plot Data") , Help | User1 | Close, User1, - tqparent, name ) + parent, name ) { d = KalziumDataObject::instance(); diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h index 062377ae..abd1c5e4 100644 --- a/kalzium/src/elementdataviewer.h +++ b/kalzium/src/elementdataviewer.h @@ -99,7 +99,7 @@ class ElementDataViewer : public KDialogBase TQ_OBJECT public: - ElementDataViewer( TQWidget *tqparent=0 , const char *name =0 ); + ElementDataViewer( TQWidget *parent=0 , const char *name =0 ); /** * the AxixData for the y-Axis diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 4b5f6baf..918b9ac6 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -46,7 +46,7 @@ extern "C" { char* solve_equation(const char *) { return NULL; } #endif -eqchemView::eqchemView(TQWidget *tqparent) : TQWidget(tqparent) +eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) { settingsChanged(); @@ -104,8 +104,8 @@ void eqchemView::compute() m_eqResult->add( equation, disp ); } -EQChemDialog::EQChemDialog( TQWidget *tqparent ) - : KDialogBase(tqparent, "EQChemDialog", true, i18n( "Solve Chemical Equations" ), +EQChemDialog::EQChemDialog( TQWidget *parent ) + : KDialogBase(parent, "EQChemDialog", true, i18n( "Solve Chemical Equations" ), KDialogBase::Apply|KDialogBase::Close|KDialogBase::Help, KDialogBase::Apply, true ) { } diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h index c0b88f9c..38bc380e 100644 --- a/kalzium/src/eqchemview.h +++ b/kalzium/src/eqchemview.h @@ -48,7 +48,7 @@ public: /** * Default constructor */ - eqchemView(TQWidget *tqparent); + eqchemView(TQWidget *parent); /** * Destructor @@ -92,9 +92,9 @@ class EQChemDialog : public KDialogBase /** * public constructor * - * @param tqparent the tqparent widget + * @param parent the parent widget */ - EQChemDialog( TQWidget *tqparent ); + EQChemDialog( TQWidget *parent ); private slots: /** diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index a4aad576..742c3ad1 100644 --- a/kalzium/src/eqresult.cpp +++ b/kalzium/src/eqresult.cpp @@ -89,7 +89,7 @@ void AnswerItem::checkSize() m_richtext->setWidth( (t1>t2)?t1:t2 ); } -EqResult::EqResult(TQWidget *tqparent) : TQListBox(tqparent) +EqResult::EqResult(TQWidget *parent) : TQListBox(parent) { m_alternate_color = false; setMinimumWidth(140); diff --git a/kalzium/src/eqresult.h b/kalzium/src/eqresult.h index ef361ba8..22bea856 100644 --- a/kalzium/src/eqresult.h +++ b/kalzium/src/eqresult.h @@ -75,7 +75,7 @@ class EqResult : public TQListBox TQ_OBJECT public: - EqResult(TQWidget *tqparent); + EqResult(TQWidget *parent); ~EqResult(); public slots: diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index e0e05388..671b1759 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -38,7 +38,7 @@ #include <klocale.h> #include <kstandarddirs.h> -KalziumTip::KalziumTip( TQWidget * tqparent, const char * name, WFlags f ) : TQWidget( tqparent, name, f ) +KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) { setFocusPolicy(TQ_NoFocus); //the widget don't get the keyboard focus setBackgroundMode(NoBackground); // widget has no background @@ -54,8 +54,8 @@ KalziumTip::KalziumTip( TQWidget * tqparent, const char * name, WFlags f ) : TQW void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int visibleHeight ) { TQWidget *p = 0; - if ( dynamic_cast<TQWidget*>( tqparent() ) ) - p = TQT_TQWIDGET( tqparent() ); + if ( dynamic_cast<TQWidget*>( parent() ) ) + p = TQT_TQWIDGET( parent() ); if ( p ) { @@ -113,7 +113,7 @@ void KalziumTip::paintEvent(TQPaintEvent* e) void KalziumTip::mouseMoveEvent(TQMouseEvent * e) { - // delegate the mouse move event to the tqparent (actually the elements table) + // delegate the mouse move event to the parent (actually the elements table) // so that this tooltip doesn't stop to be updated e->ignore(); } @@ -172,12 +172,12 @@ void KalziumTip::displayInternal() int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - //resize pixmap, tqmask and widget - m_tqmask.resize(width, height); + //resize pixmap, mask and widget + m_mask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); - // create and set transparency tqmask + // create and set transparency mask switch(m_maskEffect) { case Plain: @@ -218,14 +218,14 @@ void KalziumTip::displayInternal() void KalziumTip::dissolveMask() { - TQPainter maskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(TQt::black); + m_mask.fill(TQt::black); maskPainter.setBrush(TQt::white); maskPainter.setPen(TQt::white); - maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), - 1600 / m_tqmask.rect().height()); + maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), + 1600 / m_mask.rect().height()); m_dissolveSize += m_dissolveDelta; @@ -257,7 +257,7 @@ void KalziumTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_tqmask); + setMask(m_mask); } void KalziumTip::hide() @@ -269,15 +269,15 @@ void KalziumTip::hide() void KalziumTip::plainMask() { - TQPainter maskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(TQt::black); + m_mask.fill(TQt::black); maskPainter.setBrush(TQt::white); maskPainter.setPen(TQt::white); - maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), - 1600 / m_tqmask.rect().height()); - setMask(m_tqmask); + maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), + 1600 / m_mask.rect().height()); + setMask(m_mask); m_frameTimer.stop(); } diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h index 761b6c86..ec91d692 100644 --- a/kalzium/src/kalziumtip.h +++ b/kalzium/src/kalziumtip.h @@ -45,7 +45,7 @@ class KalziumTip : public TQWidget public: enum MaskEffect { Plain, Dissolve }; - KalziumTip( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KalziumTip( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); void showTip( TQPoint, Element* element, int visibleWidth, int visibleHeight ); //show the tip void hide(); // hide it @@ -55,7 +55,7 @@ class KalziumTip : public TQWidget void plainMask(); void dissolveMask(); - // if the mouse pointer hovers us, send the event to the tqparent + // if the mouse pointer hovers us, send the event to the parent // so we are some-what 'mouse transparent' void mouseMoveEvent(TQMouseEvent * e); void displayInternal(); @@ -67,13 +67,13 @@ class KalziumTip : public TQWidget void internalUpdate(); private: - TQBitmap m_tqmask; + TQBitmap m_mask; TQPoint m_mousePointer; TQPixmap m_pixmap; TQPixmap m_icon; //icon shown on the tip TQPixmap m_noElemIcon; //icon for element wich have no image - MaskEffect m_maskEffect; //inidicates to show tqmask effect or plain + MaskEffect m_maskEffect; //inidicates to show mask effect or plain TQSimpleRichText* m_richText; int m_dissolveSize; diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp index 0bcc4f80..f9fd90ce 100644 --- a/kalzium/src/molcalcwidget.cpp +++ b/kalzium/src/molcalcwidget.cpp @@ -41,8 +41,8 @@ #include <tqtooltip.h> -MolcalcWidget::MolcalcWidget( TQWidget *tqparent, const char *name ) - : MolcalcWidgetBase( tqparent, name ) +MolcalcWidget::MolcalcWidget( TQWidget *parent, const char *name ) + : MolcalcWidgetBase( parent, name ) { clear(); } diff --git a/kalzium/src/molcalcwidget.h b/kalzium/src/molcalcwidget.h index 27cb0269..246fe86b 100644 --- a/kalzium/src/molcalcwidget.h +++ b/kalzium/src/molcalcwidget.h @@ -45,10 +45,10 @@ class MolcalcWidget : public MolcalcWidgetBase public: /** * Constructor - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of this widget */ - MolcalcWidget( TQWidget *tqparent = 0, const char *name = 0 ); + MolcalcWidget( TQWidget *parent = 0, const char *name = 0 ); protected slots: void slotCalcButtonClicked(); diff --git a/kalzium/src/orbitswidget.cpp b/kalzium/src/orbitswidget.cpp index a3811958..06824c0f 100644 --- a/kalzium/src/orbitswidget.cpp +++ b/kalzium/src/orbitswidget.cpp @@ -24,7 +24,7 @@ static TQStringList hulllist; -OrbitsWidget::OrbitsWidget( TQWidget *tqparent, const char *name) : TQWidget( tqparent, name ) +OrbitsWidget::OrbitsWidget( TQWidget *parent, const char *name) : TQWidget( parent, name ) { if ( hulllist.count() == 0 ) { diff --git a/kalzium/src/orbitswidget.h b/kalzium/src/orbitswidget.h index 14ab4752..f214decb 100644 --- a/kalzium/src/orbitswidget.h +++ b/kalzium/src/orbitswidget.h @@ -32,7 +32,7 @@ class OrbitsWidget : public TQWidget TQ_OBJECT public: - OrbitsWidget( TQWidget *tqparent=0 , const char *name =0 ); + OrbitsWidget( TQWidget *parent=0 , const char *name =0 ); void setElementNumber( const int num ); diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index cb4282d4..950f232e 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -41,8 +41,8 @@ #include <tqcolor.h> #include <tqrect.h> -PerodicTableView::PerodicTableView(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), m_kalziumTip(0), table(0), table2(0) +PerodicTableView::PerodicTableView(TQWidget *parent, const char *name) + : TQWidget(parent, name), m_kalziumTip(0), table(0), table2(0) { d = KalziumDataObject::instance(); @@ -171,8 +171,8 @@ void PerodicTableView::slotToolTip( int number ) m_tooltipElementNumber = number; TQWidget *p = 0; - if ( dynamic_cast<TQWidget*>( tqparent() ) ) - p = TQT_TQWIDGET( tqparent() ); + if ( dynamic_cast<TQWidget*>( parent() ) ) + p = TQT_TQWIDGET( parent() ); if( p ) m_kalziumTip->showTip( mapFromGlobal(TQCursor::pos()), diff --git a/kalzium/src/periodictableview.h b/kalzium/src/periodictableview.h index 8115ebe2..196f8290 100644 --- a/kalzium/src/periodictableview.h +++ b/kalzium/src/periodictableview.h @@ -46,10 +46,10 @@ class PerodicTableView : public TQWidget public: /** * Constructor - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of this widget */ - PerodicTableView( TQWidget *tqparent = 0, const char *name = 0); + PerodicTableView( TQWidget *parent = 0, const char *name = 0); ~PerodicTableView(); enum SCHEMETYPE diff --git a/kalzium/src/plotwidget.cpp b/kalzium/src/plotwidget.cpp index 6a5a9156..043678d0 100644 --- a/kalzium/src/plotwidget.cpp +++ b/kalzium/src/plotwidget.cpp @@ -25,9 +25,9 @@ PlotWidget::PlotWidget( double x1, double x2, double y1, double y2, - TQWidget *tqparent, + TQWidget *parent, const char* name) - : KPlotWidget( x1, x2, y1, y2, tqparent, name ) + : KPlotWidget( x1, x2, y1, y2, parent, name ) { m_connectPoints = false; } diff --git a/kalzium/src/plotwidget.h b/kalzium/src/plotwidget.h index 1c5ed5de..a836a462 100644 --- a/kalzium/src/plotwidget.h +++ b/kalzium/src/plotwidget.h @@ -27,7 +27,7 @@ class PlotWidget : public KPlotWidget TQ_OBJECT public: - PlotWidget( double x1 = 0.0, double x2 = 0.0, double y1 = 0.0, double y2 = 0.0, TQWidget *tqparent=0 , const char *name =0 ); + PlotWidget( double x1 = 0.0, double x2 = 0.0, double y1 = 0.0, double y2 = 0.0, TQWidget *parent=0 , const char *name =0 ); /** * toggles if the points will be connected with diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index a2b3da77..54d078a8 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -30,8 +30,8 @@ #include "prefs.h" #include "tempunit.h" -SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *tqparent, const char* name ) - : SOMWidget( tqparent,name ) +SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) + : SOMWidget( parent,name ) { m_list = KalziumDataObject::instance()->ElementList; diff --git a/kalzium/src/somwidget_impl.h b/kalzium/src/somwidget_impl.h index 5d32dbdc..fcf83a12 100644 --- a/kalzium/src/somwidget_impl.h +++ b/kalzium/src/somwidget_impl.h @@ -33,10 +33,10 @@ class SOMWidgetIMPL : public SOMWidget public: /** - * @param tqparent The tqparent of this widget + * @param parent The parent of this widget * @param name The name of this widget */ - SOMWidgetIMPL( TQWidget *tqparent = 0, const char* name = 0 ); + SOMWidgetIMPL( TQWidget *parent = 0, const char* name = 0 ); public slots: /** diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h index dcde91cb..090822a6 100644 --- a/kalzium/src/spectrum.h +++ b/kalzium/src/spectrum.h @@ -143,7 +143,7 @@ class Spectrum TQString bandsAsHtml(); /** - * @return the tqparent element of this spectrum + * @return the parent element of this spectrum */ Element* parentElement() { return m_parentElement; } diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp index d862e5fd..c4a5617a 100644 --- a/kalzium/src/spectrumviewimpl.cpp +++ b/kalzium/src/spectrumviewimpl.cpp @@ -22,8 +22,8 @@ #include "exporter.h" -SpectrumViewImpl::SpectrumViewImpl( TQWidget *tqparent, const char* name ) - : SpectrumView( tqparent, name ) +SpectrumViewImpl::SpectrumViewImpl( TQWidget *parent, const char* name ) + : SpectrumView( parent, name ) { resize( tqminimumSizeHint() ); // simulating an update diff --git a/kalzium/src/spectrumviewimpl.h b/kalzium/src/spectrumviewimpl.h index aea5ad2a..979afa47 100644 --- a/kalzium/src/spectrumviewimpl.h +++ b/kalzium/src/spectrumviewimpl.h @@ -27,10 +27,10 @@ class SpectrumViewImpl : public SpectrumView public: /** - * @param tqparent the tqparent widget + * @param parent the parent widget * @param name the name used internally */ - SpectrumViewImpl( TQWidget* tqparent, const char* name ); + SpectrumViewImpl( TQWidget* parent, const char* name ); /** * sets the spectrum to @p spec diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp index 4f487e64..8dff10e3 100644 --- a/kalzium/src/spectrumwidget.cpp +++ b/kalzium/src/spectrumwidget.cpp @@ -39,7 +39,7 @@ #include <ieeefp.h> #endif -SpectrumWidget::SpectrumWidget( TQWidget *tqparent, const char* name ) : TQWidget( tqparent, name ) +SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget( parent, name ) { startValue = 0; endValue = 0; diff --git a/kalzium/src/spectrumwidget.h b/kalzium/src/spectrumwidget.h index f5c98099..c9bb88aa 100644 --- a/kalzium/src/spectrumwidget.h +++ b/kalzium/src/spectrumwidget.h @@ -37,7 +37,7 @@ class SpectrumWidget : public TQWidget TQ_OBJECT public: - SpectrumWidget( TQWidget *tqparent, const char* name = 0 ); + SpectrumWidget( TQWidget *parent, const char* name = 0 ); ~SpectrumWidget(){} diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp index 576ab17d..a08dbe9e 100644 --- a/kalzium/src/timewidget_impl.cpp +++ b/kalzium/src/timewidget_impl.cpp @@ -20,8 +20,8 @@ #include <knuminput.h> -TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *tqparent, const char* name ) - : TimeWidget( tqparent, name ) +TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name ) + : TimeWidget( parent, name ) { text->tqsetAlignment( text->tqalignment() | TQt::WordBreak ); text->setTextFormat( TQt::RichText ); diff --git a/kalzium/src/timewidget_impl.h b/kalzium/src/timewidget_impl.h index b728b435..8a3bf770 100644 --- a/kalzium/src/timewidget_impl.h +++ b/kalzium/src/timewidget_impl.h @@ -26,10 +26,10 @@ class TimeWidgetIMPL : public TimeWidget public: /** - * @param tqparent The tqparent of this widget + * @param parent The parent of this widget * @param name The name of this widget */ - TimeWidgetIMPL( TQWidget *tqparent = 0, const char* name = 0 ); + TimeWidgetIMPL( TQWidget *parent = 0, const char* name = 0 ); public slots: /** |