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

blinken/src/highscoredialog.cpp

@@ -30,7 +30,7 @@ static const int namesFontSize = 25;
 class scoresWidget : public TQWidget
 {
 	public:
-		scoresWidget(TQWidget *tqparent, const TQValueList< TQPair<int, TQString> > &scores);
+		scoresWidget(TQWidget *parent, const TQValueList< TQPair<int, TQString> > &scores);
 		TQSize calcSize();
 
 	protected:
@@ -40,7 +40,7 @@ class scoresWidget : public TQWidget
 		const TQValueList< TQPair<int, TQString> > &m_scores;
 };
 
-scoresWidget::scoresWidget(TQWidget *tqparent, const TQValueList< TQPair<int, TQString> > &scores) : TQWidget(tqparent, 0, WStaticContents | WNoAutoErase), m_scores(scores)
+scoresWidget::scoresWidget(TQWidget *parent, const TQValueList< TQPair<int, TQString> > &scores) : TQWidget(parent, 0, WStaticContents | WNoAutoErase), m_scores(scores)
 {
 }
 
@@ -115,7 +115,7 @@ TQSize scoresWidget::calcSize()
 class myTabWidget : public TQTabWidget
 {
 	public:
-		myTabWidget(TQWidget *tqparent) : TQTabWidget(tqparent) {}
+		myTabWidget(TQWidget *parent) : TQTabWidget(parent) {}
 		
 		TQSize tabBarSizeHint() const
 		{
@@ -125,7 +125,7 @@ class myTabWidget : public TQTabWidget
 
 /* highScoreDialog */
 
-highScoreDialog::highScoreDialog(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Highscores"), KDialogBase::Close)
+highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Highscores"), KDialogBase::Close)
 {
 	m_tw = new myTabWidget(this);
 	setMainWidget(m_tw);

blinken/src/highscoredialog.h

@@ -20,7 +20,7 @@ class myTabWidget;
 class highScoreDialog : private KDialogBase
 {
 	public:
-		highScoreDialog(TQWidget *tqparent);
+		highScoreDialog(TQWidget *parent);
 		
 		bool scoreGoodEnough(int level, int score);
 		void addScore(int level, int score, const TQString &name);

kalzium/src/detailedgraphicaloverview.cpp

@@ -28,14 +28,14 @@ email                : cniehaus@kde.org
 #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 );
 }

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

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"), 

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);
 

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();
 

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

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 )
 {
 }

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:
 		/**

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);

kalzium/src/eqresult.h

@@ -75,7 +75,7 @@ class EqResult : public TQListBox
   TQ_OBJECT
 public:
     
-    EqResult(TQWidget *tqparent);
+    EqResult(TQWidget *parent);
     ~EqResult();
 
 public slots:

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();
 }
 

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;

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();
 }

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();

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 )
 	{

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 );
 

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()), 

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

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;
 }

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 

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;
 

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:
 		/**

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; }

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

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

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;

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(){}
 

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 );

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:
 		/**

kanagram/src/kanagramgame.cpp

@@ -34,9 +34,9 @@
 
 #include <stdlib.h>
 
-KanagramGame::KanagramGame(TQWidget* tqparent) : m_index(0)
+KanagramGame::KanagramGame(TQWidget* parent) : m_index(0)
 {
-	m_parent = tqparent;
+	m_parent = parent;
 	loadDefaultVocab();
 }
 

kanagram/src/kanagramgame.h

@@ -33,7 +33,7 @@ class KanagramGame : public TQObject
 Q_OBJECT
   TQ_OBJECT
 	public:
-		KanagramGame(TQWidget *tqparent);
+		KanagramGame(TQWidget *parent);
 		~KanagramGame();
 		void refreshVocabList();
 		void loadDefaultVocab();

kanagram/src/keduvocdocument.cpp

@@ -44,7 +44,7 @@ using namespace std;
 //  KEduVocDocument
 //********************************************************
 
-KEduVocDocument::KEduVocDocument(TQObject * /*tqparent*/)
+KEduVocDocument::KEduVocDocument(TQObject * /*parent*/)
 {
   Init();
 }
@@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   if (!url.isEmpty())
     doc_url = url;
 
-  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -180,9 +180,9 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
 }
 
 
-bool KEduVocDocument::saveAs(TQObject * /*tqparent*/, const KURL & url, FileType ft, const TQString & generator)
+bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator)
 {
-//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   KURL tmp (url);
 
@@ -717,7 +717,7 @@ void KEduVocDocument::setLeitnerSystem( LeitnerSystem* system )
 {
 	leitnerSystem = system;
 	
-	/*KWordQuizApp* app = (KWordQuizApp*) tqparent();
+	/*KWordQuizApp* app = (KWordQuizApp*) parent();
 	app->slotLeitnerSystem();*/
 }
 

kanagram/src/keduvocdocument.h

@@ -440,7 +440,7 @@ class KEduVocDocument : public TQObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs(TQObject *tqparent, const KURL & url, FileType ft, const TQString & generator);
+  bool saveAs(TQObject *parent, const KURL & url, FileType ft, const TQString & generator);
 
   /** returns count of entries
    */

kanagram/src/leitnersystemview.cpp

@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 
-LeitnerSystemView::LeitnerSystemView(TQWidget * tqparent, const char* name, WFlags f)
- : TQScrollView(tqparent, name, f)
+LeitnerSystemView::LeitnerSystemView(TQWidget * parent, const char* name, WFlags f)
+ : TQScrollView(parent, name, f)
 {
 	m_highlightedBox = -1;
 }

kanagram/src/leitnersystemview.h

@@ -28,7 +28,7 @@ class LeitnerSystemView : public TQScrollView
   TQ_OBJECT
 		
 public:
-    LeitnerSystemView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0);
+    LeitnerSystemView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0);
 
     ~LeitnerSystemView();
 

kanagram/src/mainsettings.cpp

@@ -35,11 +35,11 @@
 #include "mainsettings.h"
 #include "kanagramsettings.h"
 
-MainSettings::MainSettings(TQWidget *tqparent) : MainSettingsWidget(tqparent)
+MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 {
-	m_parent = (KConfigDialog*)tqparent;
+	m_parent = (KConfigDialog*)parent;
 
-	connect(tqparent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
+	connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
 	connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
 	
 	setupTranslations();

kanagram/src/mainsettings.h

@@ -32,7 +32,7 @@ class MainSettings : public MainSettingsWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		MainSettings(TQWidget *tqparent);
+		MainSettings(TQWidget *parent);
 		~MainSettings();
 	
 	public slots:

kanagram/src/newstuff.cpp

@@ -11,7 +11,7 @@
 #include "kanagramsettings.h"
 #include "newstuffdialog.h"
 
-NewStuff::NewStuff(TQWidget *tqparent) : NewStuffWidget(tqparent)
+NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent)
 {
 	connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs()));
 }

kanagram/src/newstuff.h

@@ -8,7 +8,7 @@ class NewStuff : public NewStuffWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		NewStuff(TQWidget *tqparent);
+		NewStuff(TQWidget *parent);
 		~NewStuff();
 
 	private slots:

kanagram/src/vocabedit.cpp

@@ -41,7 +41,7 @@
 #include "kanagramsettings.h"
 
 
-VocabEdit::VocabEdit(TQWidget *tqparent, TQString fileName) : VocabEditWidget(tqparent), m_fileName("")
+VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(parent), m_fileName("")
 {
 	if(fileName != "")
 	{

kanagram/src/vocabedit.h

@@ -34,8 +34,8 @@ class VocabEdit : public VocabEditWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		VocabEdit(TQWidget *tqparent);
-		VocabEdit(TQWidget *tqparent, TQString fileName);
+		VocabEdit(TQWidget *parent);
+		VocabEdit(TQWidget *parent, TQString fileName);
 		~VocabEdit();
 	
 	public slots:

kanagram/src/vocabsettings.cpp

@@ -16,7 +16,7 @@
 #include "keduvocdocument.h"
 #include "kanagramsettings.h"
 
-VocabSettings::VocabSettings(TQWidget *tqparent) : VocabSettingsWidget(tqparent)
+VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent)
 {
 	connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew()));
 	connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));

kanagram/src/vocabsettings.h

@@ -8,7 +8,7 @@ class VocabSettings : public VocabSettingsWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		VocabSettings(TQWidget *tqparent);
+		VocabSettings(TQWidget *parent);
 		~VocabSettings();
 		void refreshView();
 

kbruch/src/exercisebase.cpp

@@ -25,8 +25,8 @@
 /* ----- public member functions ----- */
 
 /* constructor */
-ExerciseBase::ExerciseBase(TQWidget * tqparent, const char * name):
-		TQWidget(tqparent, name)
+ExerciseBase::ExerciseBase(TQWidget * parent, const char * name):
+		TQWidget(parent, name)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor ExerciseBase()" << endl;

kbruch/src/exercisebase.h

@@ -40,7 +40,7 @@ class ExerciseBase : public TQWidget
 
 public:
 	/** constructor */
-	ExerciseBase(TQWidget * tqparent = 0, const char * name = 0);
+	ExerciseBase(TQWidget * parent = 0, const char * name = 0);
 
 	/** destructor */
 	~ExerciseBase();

kbruch/src/exercisecompare.cpp

@@ -35,8 +35,8 @@
 /* ----- public member functions ----- */
 
 /* constructor */
-ExerciseCompare::ExerciseCompare(TQWidget * tqparent, const char * name):
-		ExerciseBase(tqparent, name)
+ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name):
+		ExerciseBase(parent, name)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor ExerciseCompare()" << endl;

kbruch/src/exercisecompare.h

@@ -49,7 +49,7 @@ class ExerciseCompare : public ExerciseBase
 
 public:
 	/** constructor */
-	ExerciseCompare(TQWidget * tqparent = 0, const char * name = 0);
+	ExerciseCompare(TQWidget * parent = 0, const char * name = 0);
 
 	/** destructor */
 	~ExerciseCompare();

kbruch/src/exerciseconvert.cpp

@@ -41,8 +41,8 @@
 /* ----- public member functions ----- */
 
 /* constructor */
-ExerciseConvert::ExerciseConvert(TQWidget * tqparent, const char * name):
-		ExerciseBase(tqparent, name)
+ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name):
+		ExerciseBase(parent, name)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor ExerciseConvert()" << endl;

kbruch/src/exerciseconvert.h

@@ -47,7 +47,7 @@ class ExerciseConvert : public ExerciseBase
 
 public:
 	/** constructor */
-	ExerciseConvert(TQWidget * tqparent = 0, const char * name = 0);
+	ExerciseConvert(TQWidget * parent = 0, const char * name = 0);
 
 	/** destructor */
 	~ExerciseConvert();

kbruch/src/exercisefactorize.cpp

@@ -44,8 +44,8 @@
 /* ----- public member functions ----- */
 
 /* constructor */
-ExerciseFactorize::ExerciseFactorize(TQWidget * tqparent, const char * name):
-		ExerciseBase(tqparent, name)
+ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name):
+		ExerciseBase(parent, name)
 {
 	TQPalette pal;
 	TQColorGroup cg;

kbruch/src/exercisefactorize.h

@@ -64,7 +64,7 @@ class ExerciseFactorize : public ExerciseBase
 
 public:
 	/** constructor */
-	ExerciseFactorize(TQWidget * tqparent = 0, const char * name = 0);
+	ExerciseFactorize(TQWidget * parent = 0, const char * name = 0);
 
 	/** destructor */
 	~ExerciseFactorize();

kbruch/src/factorizedwidget.cpp

@@ -21,8 +21,8 @@
 /* these includes are needed for TQt support */
 #include <tqpainter.h>
 
-FactorizedWidget::FactorizedWidget(TQWidget * tqparent, const char * name, const uintList para_factors) :
-			FractionBaseWidget(tqparent, name), m_factors(para_factors)
+FactorizedWidget::FactorizedWidget(TQWidget * parent, const char * name, const uintList para_factors) :
+			FractionBaseWidget(parent, name), m_factors(para_factors)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor FactorizedWidget" << endl;

kbruch/src/factorizedwidget.h

@@ -39,7 +39,7 @@ class FactorizedWidget : public FractionBaseWidget
 
 public:
 	/** constructor */
-	FactorizedWidget(TQWidget * tqparent, const char * name, const uintList para_factors);
+	FactorizedWidget(TQWidget * parent, const char * name, const uintList para_factors);
 
 	/** destructor */
 	~FactorizedWidget();

kbruch/src/fractionbasewidget.cpp

@@ -26,8 +26,8 @@
 
 #include "settingsclass.h"
 
-FractionBaseWidget::FractionBaseWidget(TQWidget * tqparent = 0, const char * name = 0) :
-			TQWidget(tqparent, name)
+FractionBaseWidget::FractionBaseWidget(TQWidget * parent = 0, const char * name = 0) :
+			TQWidget(parent, name)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor FractionBaseWidget" << endl;

kbruch/src/fractionbasewidget.h

@@ -40,7 +40,7 @@ class FractionBaseWidget : public TQWidget
 
 public:
 	/** constructor */
-	FractionBaseWidget(TQWidget * tqparent, const char * name);
+	FractionBaseWidget(TQWidget * parent, const char * name);
 
 	/** destructor */
 	~FractionBaseWidget();

kbruch/src/rationalwidget.cpp

@@ -22,8 +22,8 @@
 #include <tqpainter.h>
 #include <tqstring.h>
 
-RationalWidget::RationalWidget(TQWidget * tqparent, const char * name, const TQString pnumber, const uint pperiodStart, const uint pperiodLength):
-			FractionBaseWidget(tqparent, name), m_number(pnumber),
+RationalWidget::RationalWidget(TQWidget * parent, const char * name, const TQString pnumber, const uint pperiodStart, const uint pperiodLength):
+			FractionBaseWidget(parent, name), m_number(pnumber),
 				m_periodStart(pperiodStart), m_periodLength(pperiodLength)
 {
 #ifdef DEBUG

kbruch/src/rationalwidget.h

@@ -38,7 +38,7 @@ class RationalWidget : public FractionBaseWidget
 
 public:
 	/** constructor */
-	RationalWidget(TQWidget * tqparent, const char * name, const TQString pnumber, const uint pperiodStart = 1, const uint pperiodLength = 0);
+	RationalWidget(TQWidget * parent, const char * name, const TQString pnumber, const uint pperiodStart = 1, const uint pperiodLength = 0);
 
 	/** destructor */
 	~RationalWidget();

kbruch/src/ratiowidget.cpp

@@ -21,9 +21,9 @@
 /* these includes are needed for TQt support */
 #include <tqpainter.h>
 
-RatioWidget::RatioWidget(TQWidget * tqparent = 0, const char * name = 0,
+RatioWidget::RatioWidget(TQWidget * parent = 0, const char * name = 0,
 													const ratio para_ratio = *new ratio()) :
-			FractionBaseWidget(tqparent, name), m_ratio(para_ratio)
+			FractionBaseWidget(parent, name), m_ratio(para_ratio)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor RatioWidget" << endl;

kbruch/src/ratiowidget.h

@@ -37,7 +37,7 @@ class RatioWidget : public FractionBaseWidget
 
 public:
 	/** constructor */
-	RatioWidget(TQWidget * tqparent, const char * name, const ratio para_ratio);
+	RatioWidget(TQWidget * parent, const char * name, const ratio para_ratio);
 
 	/** destructor */
 	~RatioWidget();

kbruch/src/resultwidget.cpp

@@ -23,9 +23,9 @@
 
 #include "settingsclass.h"
 
-ResultWidget::ResultWidget(TQWidget * tqparent = 0, const char * name = 0,
+ResultWidget::ResultWidget(TQWidget * parent = 0, const char * name = 0,
 													const ratio para_result = *new ratio()) :
-			FractionBaseWidget(tqparent, name), m_result(para_result)
+			FractionBaseWidget(parent, name), m_result(para_result)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor ResultWidget" << endl;

kbruch/src/resultwidget.h

@@ -37,7 +37,7 @@ class ResultWidget : public FractionBaseWidget
 
 public:
 	/** constructor */
-	ResultWidget(TQWidget * tqparent, const char * name, const ratio para_result);
+	ResultWidget(TQWidget * parent, const char * name, const ratio para_result);
 
 	/** destructor */
 	~ResultWidget();

kbruch/src/statisticsview.cpp

@@ -31,8 +31,8 @@
 #include "settingsclass.h"
 
 /* constructor */
-StatisticsView::StatisticsView(TQWidget * tqparent, const char * name):
-		TQWidget(tqparent, name), m_count(0), m_correct(0)
+StatisticsView::StatisticsView(TQWidget * parent, const char * name):
+		TQWidget(parent, name), m_count(0), m_correct(0)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor StatisticsView()" << endl;

kbruch/src/statisticsview.h

@@ -41,7 +41,7 @@ class StatisticsView : public TQWidget
 
 public:
 	/** constructor */
-	StatisticsView(TQWidget * tqparent = 0, const char * name = 0);
+	StatisticsView(TQWidget * parent = 0, const char * name = 0);
 
 	/** destructor */
 	~StatisticsView();

kbruch/src/taskview.cpp

@@ -38,9 +38,9 @@
 /* ----- public member functions ----- */
 
 /* constructor */
-TaskView::TaskView(TQWidget * tqparent, const char * name,	bool padd_sub,
+TaskView::TaskView(TQWidget * parent, const char * name,	bool padd_sub,
                   bool pmul_div, unsigned int pnr_ratios, unsigned int pmax_md):
-		ExerciseBase(tqparent, name), add_sub(padd_sub), mul_div(pmul_div),
+		ExerciseBase(parent, name), add_sub(padd_sub), mul_div(pmul_div),
 		nr_ratios(pnr_ratios), max_md(pmax_md)
 {
 #ifdef DEBUG

kbruch/src/taskview.h

@@ -55,7 +55,7 @@ class TaskView : public ExerciseBase
 
 public:
 	/** constructor */
-	TaskView(TQWidget * tqparent = 0, const char * name = 0,
+	TaskView(TQWidget * parent = 0, const char * name = 0,
 	         bool padd_sub = true, bool pmul_div = false,
 	         unsigned int pnr_ratios = 2, unsigned int pmax_md = 10);
 

kbruch/src/taskwidget.cpp

@@ -24,9 +24,9 @@
 /* these includes are needed for TQt support */
 #include <tqpainter.h>
 
-TaskWidget::TaskWidget(TQWidget * tqparent = 0, const char * name = 0,
+TaskWidget::TaskWidget(TQWidget * parent = 0, const char * name = 0,
 													const task para_task = *new task()) :
-			FractionBaseWidget(tqparent, name), m_task(para_task)
+			FractionBaseWidget(parent, name), m_task(para_task)
 {
 #ifdef DEBUG
 	kdDebug() << "constructor TaskWidget" << endl;

kbruch/src/taskwidget.h

@@ -47,7 +47,7 @@ class TaskWidget : public FractionBaseWidget
 
 public:
 	/** constructor */
-	TaskWidget(TQWidget * tqparent, const char * name, const task para_task);
+	TaskWidget(TQWidget * parent, const char * name, const task para_task);
 
 	/** destructor */
 	~TaskWidget();

keduca/keduca/kcheckeduca.cpp

@@ -21,7 +21,7 @@
 #include <tqstyle.h>
 #include <kaccelmanager.h>
 
-KCheckEduca::KCheckEduca(TQWidget *tqparent, const char *name ) : TQCheckBox(tqparent,name)
+KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
 {
     _doc = 0;
     KAcceleratorManager::setNoAccel( this );

keduca/keduca/kcheckeduca.h

@@ -31,7 +31,7 @@ class KCheckEduca : public TQCheckBox  {
   TQ_OBJECT
 
 public:
-    KCheckEduca(TQWidget *tqparent=0, const char *name=0);
+    KCheckEduca(TQWidget *parent=0, const char *name=0);
     ~KCheckEduca();
 
 protected:

keduca/keduca/keduca.cpp

@@ -30,8 +30,8 @@
 
 #include <tqlabel.h>
 
-Keduca::Keduca( TQWidget* tqparent, const char *name, WFlags f )
-	: KParts::MainWindow( tqparent, name, f ), _part( 0 )
+Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
+	: KParts::MainWindow( parent, name, f ), _part( 0 )
 {
 	setXMLFile( "keducaui.rc" );
 	

keduca/keduca/keduca.h

@@ -38,7 +38,7 @@ class Keduca : public KParts::MainWindow
 
 public:
     /** construtor */
-    Keduca(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
+    Keduca(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
     /** destructor */
     ~Keduca();
   /** Open gallery window */

keduca/keduca/keduca_part.cpp

@@ -35,9 +35,9 @@ typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory;
 K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory )
 
 KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName,
-                        TQObject *tqparent, const char *name,
+                        TQObject *parent, const char *name,
                         const TQStringList &/*args*/ )
-	: KParts::ReadOnlyPart( tqparent, name )
+	: KParts::ReadOnlyPart( parent, name )
 {
 	setInstance( KEducaPartFactory::instance() );
 	

keduca/keduca/keduca_part.h

@@ -41,7 +41,7 @@ class KEducaPart : public KParts::ReadOnlyPart
 		/*
 		 * Constructor.
 		 */
-		KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+		KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent,
 		            const char *name, const TQStringList &args );
 
 		/*

keduca/keduca/keducaprefs.cpp

@@ -27,7 +27,7 @@
 #include <tqbuttongroup.h>
 
 
-KEducaPrefs::KEducaPrefs(TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, tqparent, name, modal, true)
+KEducaPrefs::KEducaPrefs(TQWidget *parent, const char *name, bool modal ) : KDialogBase(IconList, i18n("Configure"), Ok|Cancel, Ok, parent, name, modal, true)
 {
     setPageGeneral();
     configRead();

keduca/keduca/keducaprefs.h

@@ -32,7 +32,7 @@ class KEducaPrefs : public KDialogBase  {
   TQ_OBJECT
 
 public:
-    KEducaPrefs(TQWidget *tqparent=0, const char *name=0, bool modal=true);
+    KEducaPrefs(TQWidget *parent=0, const char *name=0, bool modal=true);
     ~KEducaPrefs();
 
 private:

keduca/keduca/keducaview.cpp

@@ -37,8 +37,8 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-KEducaView::KEducaView( TQWidget *tqparent, const char *name )
-    : TQWidgetStack( tqparent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
+KEducaView::KEducaView( TQWidget *parent, const char *name )
+    : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
 {
     init();
 }

keduca/keduca/keducaview.h

@@ -46,7 +46,7 @@ class KEducaView : public TQWidgetStack
   TQ_OBJECT
 
 public:
-    KEducaView(TQWidget *tqparent=0, const char *name=0);
+    KEducaView(TQWidget *parent=0, const char *name=0);
     ~KEducaView();
     /** Open url */
     bool openURL( const KURL &url);

keduca/keduca/kgroupeduca.cpp

@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 
-KGroupEduca::KGroupEduca(TQWidget *tqparent, const char *name ) : TQVButtonGroup(i18n("Answers"), tqparent, name)
+KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name)
 {
     _sv = new TQScrollView(this);
     _sv->setVScrollBarMode(TQScrollView::Auto);

keduca/keduca/kgroupeduca.h

@@ -32,7 +32,7 @@ class KGroupEduca : public TQVButtonGroup  {
 public:
     enum ButtonType { Radio, Check };
 
-    KGroupEduca(TQWidget *tqparent=0, const char *name=0);
+    KGroupEduca(TQWidget *parent=0, const char *name=0);
     ~KGroupEduca();
     /** Insert a check or radio button */
     void insertAnswer( const TQString& text);

keduca/keduca/kquestion.cpp

@@ -27,8 +27,8 @@
 #include <kprogress.h>
 #include <klocale.h>
 
-KQuestion::KQuestion( TQWidget *tqparent, const char *name )
-  : TQHBox( tqparent, name ), _countdownTimer( 0 )
+KQuestion::KQuestion( TQWidget *parent, const char *name )
+  : TQHBox( parent, name ), _countdownTimer( 0 )
 {
   initGUI();
 }

keduca/keduca/kquestion.h

@@ -36,7 +36,7 @@ class KQuestion : public TQHBox
   TQ_OBJECT
 
 public:
-    KQuestion(TQWidget *tqparent=0, const char *name=0);
+    KQuestion(TQWidget *parent=0, const char *name=0);
     ~KQuestion();
     /** Set pixmap */
     void setPixmap( const TQPixmap pixmap);

keduca/keduca/kradioeduca.cpp

@@ -20,7 +20,7 @@
 #include <tqstyle.h>
 #include <kaccelmanager.h>
 
-KRadioEduca::KRadioEduca(TQWidget *tqparent, const char *name) : TQRadioButton(tqparent,name)
+KRadioEduca::KRadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
 {
     _doc=0;
     KAcceleratorManager::setNoAccel(this);

keduca/keduca/kradioeduca.h

@@ -30,7 +30,7 @@ class KRadioEduca : public TQRadioButton {
   TQ_OBJECT
 
 public:
-    KRadioEduca(TQWidget *tqparent=0, const char *name=0);
+    KRadioEduca(TQWidget *parent=0, const char *name=0);
     ~KRadioEduca();
 
 protected:

keduca/keducabuilder/kcontroladdedit.cpp

@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-KControlAddEdit::KControlAddEdit(TQWidget *tqparent, const char *name, bool modal, WFlags f)
-    : KControlAddEditBase(tqparent, name, modal, f),
+KControlAddEdit::KControlAddEdit(TQWidget *parent, const char *name, bool modal, WFlags f)
+    : KControlAddEditBase(parent, name, modal, f),
       _currentAnswerItem(0)
 {
     configRead();

keduca/keducabuilder/kcontroladdedit.h

@@ -38,7 +38,7 @@ class KControlAddEdit : public KControlAddEditBase  {
   TQ_OBJECT
 
 public:
-    KControlAddEdit(TQWidget *tqparent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
+    KControlAddEdit(TQWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
     ~KControlAddEdit();
     /** Init keducaFile pointer and EditMode */
     void init(FileRead *keducaFile, bool editMode);

keduca/keducabuilder/kcontrolheader.cpp

@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *tqparent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, tqparent, name, true, true)
+KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *parent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, parent, name, true, true)
 {
     _keducaFile = keducaFile;
     init();

keduca/keducabuilder/kcontrolheader.h

@@ -36,7 +36,7 @@ class KControlHeader : public KDialogBase  {
   TQ_OBJECT
 
 public:
-    KControlHeader(FileRead *keducaFile, TQWidget *tqparent=0, const char *name=0);
+    KControlHeader(FileRead *keducaFile, TQWidget *parent=0, const char *name=0);
     ~KControlHeader();
 
 private:

keduca/keducabuilder/keducabuilder.cpp

@@ -60,8 +60,8 @@ static const char* const keducabuilder_data[] = {
     ".#############.",
     "..............."};
 
-KEducaBuilder::KEducaBuilder(TQWidget* tqparent, const char *name, WFlags f )
-    : KMainWindow(tqparent,name,f),
+KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f )
+    : KMainWindow(parent,name,f),
       _nativeFormat("application/x-edu")
 {
     _keducaFile = new FileRead();

keduca/keducabuilder/keducabuilder.h

@@ -39,7 +39,7 @@ class KEducaBuilder : public KMainWindow  {
   TQ_OBJECT
 
 public:
-    KEducaBuilder(TQWidget* tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
+    KEducaBuilder(TQWidget* parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose);
     ~KEducaBuilder();
     /** start a dialog that asks the user what he wants to do to start*/
     bool startChooser();

keduca/keducabuilder/keducaeditorstartdialog.cpp

@@ -29,8 +29,8 @@
 
 /**
  */
-KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * tqparent, const char* name, bool modal, WFlags fl)
-    :KEducaEditorStartDialogBase(tqparent,  name,  modal, fl),
+KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const char* name, bool modal, WFlags fl)
+    :KEducaEditorStartDialogBase(parent,  name,  modal, fl),
      _choice(NewDoc),
      _maxRecentDocumentItems(20)
 {

keduca/keducabuilder/keducaeditorstartdialog.h

@@ -36,7 +36,7 @@ public:
     enum {Rejected=0, OpenDoc=1, OpenRecentDoc=2, Gallery=3, NewDoc=4}StartChoice;
     /** Constructor.
      */
-    KEducaEditorStartDialog(KEducaBuilder * tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     /** Destructor.
      */
     virtual ~KEducaEditorStartDialog();

keduca/keducabuilder/klangcombo.cpp

@@ -31,8 +31,8 @@ KLanguageCombo::~KLanguageCombo ()
 {
 }
 
-KLanguageCombo::KLanguageCombo (TQWidget * tqparent, const char *name)
-    : KTagComboBox(tqparent, name)
+KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
+    : KTagComboBox(parent, name)
 {
 }
 

keduca/keducabuilder/klangcombo.h

@@ -38,7 +38,7 @@ class KLanguageCombo : public KTagComboBox
   TQ_OBJECT
 
 public:
-    KLanguageCombo(TQWidget *tqparent=0, const char *name=0);
+    KLanguageCombo(TQWidget *parent=0, const char *name=0);
     ~KLanguageCombo();
 
     void insertLanguage(const TQString& path, const TQString& name, const TQString& sub = TQString(), const TQString &submenu = TQString());

keduca/keducabuilder/ktagcombobox.cpp

@@ -36,8 +36,8 @@ KTagComboBox::~KTagComboBox ()
     delete _tags;
 }
 
-KTagComboBox::KTagComboBox (TQWidget * tqparent, const char *name)
-    : TQComboBox(tqparent, name)
+KTagComboBox::KTagComboBox (TQWidget * parent, const char *name)
+    : TQComboBox(parent, name)
 {
     _popup = new TQPopupMenu(this);
     _tags = new TQStringList;

keduca/keducabuilder/ktagcombobox.h

@@ -42,7 +42,7 @@ class KTagComboBox : public TQComboBox
   TQ_OBJECT
 
 public:
-    KTagComboBox(TQWidget *tqparent=0, const char *name=0);
+    KTagComboBox(TQWidget *parent=0, const char *name=0);
     ~KTagComboBox();
 
     void insertItem(const TQIconSet& icon, const TQString &text, const TQString &tag, const TQString &submenu = TQString(), int index=-1 );

keduca/libkeduca/fileread.cpp

@@ -29,8 +29,8 @@
 #include <tqpixmap.h>
 #include <tqbuffer.h>
 
-FileRead::FileRead( TQObject *tqparent, const char *name )
-    :TQObject(tqparent, name),
+FileRead::FileRead( TQObject *parent, const char *name )
+    :TQObject(parent, name),
      _changed(false),
      _tmpfile(0)
 {
@@ -875,20 +875,20 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results )
 }
 
 /** Insert xml format data */
-void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data)
+void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data)
 {
     TQDomElement domELEMENT = doc.createElement( tagName );
     TQDomText DATAelement = doc.createTextNode( data );
 
-    tqparent.appendChild( domELEMENT );
+    parent.appendChild( domELEMENT );
     domELEMENT.appendChild( DATAelement );
 }
 
 /** Insert xml data format */
-void FileRead::insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data)
+void FileRead::insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data)
 {
     TQDomText DATAelement = doc.createTextNode( data );
-    tqparent.appendChild( DATAelement );
+    parent.appendChild( DATAelement );
 }
 
 /** Get Header */

keduca/libkeduca/fileread.h

@@ -37,7 +37,7 @@ class FileRead : public TQObject {
   TQ_OBJECT
 
 public:
-    FileRead( TQObject *tqparent=0, const char *name=0 );
+    FileRead( TQObject *parent=0, const char *name=0 );
     virtual ~FileRead();
     enum QuestionField { TQF_TEXT, TQF_PICTURE, TQF_POINTS, TQF_TYPE, TQF_TIME, TQF_TIP, TQF_EXPLAIN };
     enum AnswerField { AF_TEXT, AF_VALUE, AF_POINT };
@@ -219,9 +219,9 @@ private:
     // Private methods
 
     /** Insert xml format data */
-    void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &tagName, const TQString &data);
+    void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &tagName, const TQString &data);
     /** Insert xml data format */
-    void insertXML( TQDomDocument &doc, TQDomElement &tqparent, const TQString &data);
+    void insertXML( TQDomDocument &doc, TQDomElement &parent, const TQString &data);
 
 protected:
     /** Open keduca file. This function does the actual work and expects a local filename . */

keduca/libkeduca/kgallerydialog.cpp

@@ -30,8 +30,8 @@
 #include <tqdom.h>
 #include <tqfileinfo.h>
 
-KGalleryDialog::KGalleryDialog(TQWidget *tqparent, const char *name )
-      :KGalleryDialogBase(tqparent,name)
+KGalleryDialog::KGalleryDialog(TQWidget *parent, const char *name )
+      :KGalleryDialogBase(parent,name)
 {
   configRead();
 }

keduca/libkeduca/kgallerydialog.h

@@ -37,7 +37,7 @@ class KGalleryDialog : public KGalleryDialogBase  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-	KGalleryDialog(TQWidget *tqparent=0, const char *name=0);
+	KGalleryDialog(TQWidget *parent=0, const char *name=0);
 	~KGalleryDialog();
   /** Open keduca file. This function can open a remote or local url. */
   bool openFile( const KURL &url );

kgeography/src/answersdialog.cpp

@@ -17,7 +17,7 @@
 #include "answer.h"
 #include "answersdialog.h"
 
-answersDialog::answersDialog(TQWidget *tqparent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers) : KDialogBase(tqparent, 0, true, i18n("Your Answers Were"), Ok)
+answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers) : KDialogBase(parent, 0, true, i18n("Your Answers Were"), Ok)
 {
 	TQLabel *l1, *l2, *l3;
 	TQFont boldFont, bigFont;

kgeography/src/answersdialog.h

@@ -23,7 +23,7 @@ class userAnswer;
 class answersDialog : public KDialogBase
 {
 	public:
-		answersDialog(TQWidget *tqparent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers);
+		answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers);
 	
 	protected:
 		void showEvent(TQShowEvent *e);

kgeography/src/askwidget.cpp

@@ -16,7 +16,7 @@
 #include "askwidget.h"
 #include "map.h"
 
-askWidget::askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(tqparent), p_map(m), p_count(count)
+askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(parent), p_map(m), p_count(count)
 {
 	if (showLabel)
 	{

kgeography/src/askwidget.h

@@ -25,7 +25,7 @@ class askWidget : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel = true);
+		askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel = true);
 		virtual ~askWidget();
 		
 		virtual TQString getQuestionHook() const = 0;

kgeography/src/boxasker.cpp

@@ -23,7 +23,7 @@
 #include "boxasker.h"
 #include "map.h"
 
-boxAsker::boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : askWidget(tqparent, m, w, count)
+boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWidget(parent, m, w, count)
 {
 	p_lay = new TQVBoxLayout(this);
 	

kgeography/src/boxasker.h

@@ -24,7 +24,7 @@ class boxAsker : public askWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 		~boxAsker();
 	
 	protected:

kgeography/src/capitaldivisionasker.cpp

@@ -15,7 +15,7 @@
 #include "capitaldivisionasker.h"
 #include "map.h"
 
-capitalDivisionAsker::capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+capitalDivisionAsker::capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }

kgeography/src/capitaldivisionasker.h

@@ -18,7 +18,7 @@ class TQLabel;
 class capitalDivisionAsker : public boxAsker
 {
 	public:
-		capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);

kgeography/src/divisioncapitalasker.cpp

@@ -15,7 +15,7 @@
 #include "divisioncapitalasker.h"
 #include "map.h"
 
-divisionCapitalAsker::divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+divisionCapitalAsker::divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }

kgeography/src/divisioncapitalasker.h

@@ -16,7 +16,7 @@
 class divisionCapitalAsker : public boxAsker
 {
 	public:
-		divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);

kgeography/src/divisionflagasker.cpp

@@ -16,7 +16,7 @@
 #include "divisionflagasker.h"
 #include "map.h"
 
-divisionFlagAsker::divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+divisionFlagAsker::divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }

kgeography/src/divisionflagasker.h

@@ -16,7 +16,7 @@
 class divisionFlagAsker : public boxAsker
 {
 	public:
-		divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 	
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);

kgeography/src/flagdivisionasker.cpp

@@ -17,7 +17,7 @@
 #include "flagdivisionasker.h"
 #include "map.h"
 
-flagDivisionAsker::flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+flagDivisionAsker::flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	p_flag = new TQWidget(this);
 	p_lay -> insertWidget(0, p_flag);

kgeography/src/flagdivisionasker.h

@@ -16,7 +16,7 @@
 class flagDivisionAsker : public boxAsker
 {
 	public:
-		flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 	
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);

kgeography/src/mapasker.cpp

@@ -20,7 +20,7 @@
 #include "mapasker.h"
 #include "mapwidget.h"
 
-mapAsker::mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(tqparent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true)
+mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(parent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true)
 {
 	TQGridLayout *lay = new TQGridLayout(this, 2, 2);
 

kgeography/src/mapasker.h

@@ -27,7 +27,7 @@ class mapAsker : public askWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count = 0);
+		mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count = 0);
 		~mapAsker();
 
 		TQSize mapSize() const;

kgeography/src/mapchooser.cpp

@@ -19,7 +19,7 @@
 
 #include "mapchooser.h"
 
-mapChooser::mapChooser(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
+mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
 {
 	TQHBox *mainHB;
 	TQStringList list;

kgeography/src/mapchooser.h

@@ -23,7 +23,7 @@ class mapChooser : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapChooser(TQWidget *tqparent);
+		mapChooser(TQWidget *parent);
 		~mapChooser();
 
 		KGmap *getMap();

kgeography/src/mapwidget.cpp

@@ -19,7 +19,7 @@
 
 #include "mapwidget.h"
 
-mapWidget::mapWidget(TQWidget *tqparent) : TQWidget(tqparent)
+mapWidget::mapWidget(TQWidget *parent) : TQWidget(parent)
 {
 	p_wantZoom = false;
 	p_zooming = false;

kgeography/src/mapwidget.h

@@ -20,7 +20,7 @@ class mapWidget : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapWidget(TQWidget *tqparent);
+		mapWidget(TQWidget *parent);
 		
 		void init(const TQString &path, int scrollBarWidth, int scrollBarHeight);
 

kgeography/src/mypopup.cpp

@@ -16,7 +16,7 @@
 #include "mypopup.h"
 
 
-myPopup::myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(tqparent)
+myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(parent)
 {
 	TQHBoxLayout *lay = new TQHBoxLayout(this);
 	lay -> setMargin(4);

kgeography/src/mypopup.h

@@ -20,7 +20,7 @@ Q_OBJECT
 	friend class popupManager;
 	
 	private:
-		myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2 = TQString(), const TQString &flagFile = TQString());
+		myPopup(TQWidget *parent, const TQString &text, const TQString &text2 = TQString(), const TQString &flagFile = TQString());
 	
 	signals:
 		void deleteMe();

kgeography/src/popupmanager.cpp

@@ -11,9 +11,9 @@
 #include "mypopup.h"
 #include "popupmanager.h"
 
-popupManager::popupManager(TQWidget *tqparent)
+popupManager::popupManager(TQWidget *parent)
 {
-	p_parent = tqparent;
+	p_parent = parent;
 	p_mp = 0;
 }
 

kgeography/src/popupmanager.h

@@ -22,7 +22,7 @@ class popupManager : public TQObject
 Q_OBJECT
   TQ_OBJECT
 	public:
-		popupManager(TQWidget *tqparent);
+		popupManager(TQWidget *parent);
 
 		// shows text at p and the flag
 		void show(const TQString &text, const TQString &text2, const TQPoint &p, const TQString &flagFile);

khangman/khangman/khangman.cpp

@@ -498,7 +498,7 @@ TQString KHangMan::charIcon(const TQChar & c)
     p.setPen(TQt::black);
     p.drawText(r, TQt::AlignCenter, (TQString) c);
 
-    ///Create transparency tqmask
+    ///Create transparency mask
     TQBitmap bm(128, 128);
     bm.fill(TQt::color0);
     TQPainter b(&bm);

khangman/khangman/khangmanview.cpp

@@ -41,10 +41,10 @@
 #include "khangmanview.h"
 
 
-KHangManView::KHangManView(KHangMan*tqparent, const char *name)
-    : TQWidget(tqparent, name, WStaticContents | WNoAutoErase)
+KHangManView::KHangManView(KHangMan*parent, const char *name)
+    : TQWidget(parent, name, WStaticContents | WNoAutoErase)
 {
-    khangman = tqparent;
+    khangman = parent;
     
     // The widget for entering letters.
     m_letterInput = new KLineEdit( this, "charWrite" );

khangman/khangman/khangmanview.h

@@ -44,11 +44,11 @@ class KHangManView : public TQWidget
   TQ_OBJECT
 public:
 
-    KHangManView(KHangMan *tqparent=0, const char *name=0);
+    KHangManView(KHangMan *parent=0, const char *name=0);
 
     virtual ~KHangManView();
 
-    ///tqparent instance
+    ///parent instance
     KHangMan *khangman;
 
     void setTheme();

kig/ChangeLog

@@ -10,7 +10,7 @@
 2005-09-16  Pino Toscano <toscano.pino@tiscali.it>
 
 	* Move a text label by (2,2), so the attached ones should be less
-	sticky to the "tqparent" object.
+	sticky to the "parent" object.
 
 2005-09-08  Pino Toscano <toscano.pino@tiscali.it>
 
@@ -1399,7 +1399,7 @@
 	* show an appropriate error when trying to open an non-existing
 		file..
 
-	* clean up the object tqparent-child relation mechanism.  Rather
+	* clean up the object parent-child relation mechanism.  Rather
 	large code cleanup, that simplifies a lot of code..  Needed a
 	backwards-compatible file format extension.  This commit now also
 	adds proper treatment of internal objects, because it no longer

kig/DESIGN

@@ -221,7 +221,7 @@ Next, an ObjectHierarchy object is constructed, which stores the way
 to calculate the second point from the first point and the objects
 from the previous paragraph.
 
-An object is then constructed that has as tqparent the curve tqparent that
+An object is then constructed that has as parent the curve parent that
 the first point is constrained to, the HierarchyImp containing the
 ObjectHierarchy from the previous paragraph, and all the objects from
 the "side of the tree".  This new object is an ObjectTypeCalcer with

kig/examples/figure_angle.fgeo

@@ -14,17 +14,17 @@
       <y>-0.216667</y>
     </point>
     <line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="827A5C0"/>
-      <tqparent ref="8248660"/>
+      <parent ref="827A5C0"/>
+      <parent ref="8248660"/>
     </line>
     <line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="822A6B0"/>
-      <tqparent ref="8248660"/>
+      <parent ref="822A6B0"/>
+      <parent ref="8248660"/>
     </line>
     <angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="822A6B0"/>
-      <tqparent ref="8248660"/>
-      <tqparent ref="827A5C0"/>
+      <parent ref="822A6B0"/>
+      <parent ref="8248660"/>
+      <parent ref="827A5C0"/>
     </angle>
   </drgeo>
 </drgenius>

kig/examples/figure_manyobjects.fgeo

@@ -18,12 +18,12 @@
       <y>1.883333</y>
     </point>
     <point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
-      <tqparent ref="82257B8"/>
-      <tqparent ref="8255158"/>
+      <parent ref="82257B8"/>
+      <parent ref="8255158"/>
     </point>
     <halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="8250D30"/>
-      <tqparent ref="8250458"/>
+      <parent ref="8250D30"/>
+      <parent ref="8250458"/>
     </halfLine>
     <point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
       <x>-2.833333</x>
@@ -38,12 +38,12 @@
       <y>3.983333</y>
     </point>
     <segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82257B8"/>
-      <tqparent ref="82AED28"/>
+      <parent ref="82257B8"/>
+      <parent ref="82AED28"/>
     </segment>
     <line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82043A0"/>
-      <tqparent ref="8115668"/>
+      <parent ref="82043A0"/>
+      <parent ref="8115668"/>
     </line>
     <point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
       <x>-5.533333</x>
@@ -52,21 +52,21 @@
     <vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
       <Ox>-2.800000</Ox>
       <Oy>1.883333</Oy>
-      <tqparent ref="8255158"/>
-      <tqparent ref="82B26F0"/>
+      <parent ref="8255158"/>
+      <parent ref="82B26F0"/>
     </vector>
     <point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
       <x>3.166667</x>
       <y>-0.683333</y>
     </point>
     <circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82B4358"/>
-      <tqparent ref="8115668"/>
+      <parent ref="82B4358"/>
+      <parent ref="8115668"/>
     </circle>
     <arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82257B8"/>
-      <tqparent ref="82B26F0"/>
-      <tqparent ref="8250D30"/>
+      <parent ref="82257B8"/>
+      <parent ref="82B26F0"/>
+      <parent ref="8250D30"/>
     </arcCircle>
   </drgeo>
 </drgenius>

kig/examples/session_alotofthings.fgeo

@@ -30,37 +30,37 @@
       <y>1.783334</y>
     </point>
     <line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="8281F08"/>
-      <tqparent ref="82076B0"/>
+      <parent ref="8281F08"/>
+      <parent ref="82076B0"/>
     </line>
     <arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="8208228"/>
-      <tqparent ref="822F448"/>
-      <tqparent ref="82535F0"/>
+      <parent ref="8208228"/>
+      <parent ref="822F448"/>
+      <parent ref="82535F0"/>
     </arcCircle>
     <halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="822FB88"/>
-      <tqparent ref="82B08A0"/>
+      <parent ref="822FB88"/>
+      <parent ref="82B08A0"/>
     </halfLine>
     <point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
       <x>-1.066667</x>
       <y>-0.416667</y>
     </point>
     <point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
-      <tqparent ref="82A86B8"/>
-      <tqparent ref="82C2F40"/>
+      <parent ref="82A86B8"/>
+      <parent ref="82C2F40"/>
     </point>
     <point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="1">
-      <tqparent ref="82A86B8"/>
-      <tqparent ref="82C2F40"/>
+      <parent ref="82A86B8"/>
+      <parent ref="82C2F40"/>
     </point>
     <line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82C8738"/>
-      <tqparent ref="82C3C40"/>
+      <parent ref="82C8738"/>
+      <parent ref="82C3C40"/>
     </line>
     <point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
-      <tqparent ref="82C4DC8"/>
-      <tqparent ref="82BF640"/>
+      <parent ref="82C4DC8"/>
+      <parent ref="82BF640"/>
     </point>
   </drgeo>
   <text name="Testo 1">Figure 1 contains:
@@ -99,32 +99,32 @@ Figure 3 contains:
       <y>1.650000</y>
     </point>
     <line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82EB588"/>
-      <tqparent ref="831A340"/>
+      <parent ref="82EB588"/>
+      <parent ref="831A340"/>
     </line>
     <point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
-      <tqparent ref="831A340"/>
-      <tqparent ref="82D1958"/>
+      <parent ref="831A340"/>
+      <parent ref="82D1958"/>
     </point>
     <line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="8339778"/>
-      <tqparent ref="8337158"/>
+      <parent ref="8339778"/>
+      <parent ref="8337158"/>
     </line>
     <point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
       <x>-6.200000</x>
       <y>-1.483334</y>
     </point>
     <line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="8322E28"/>
-      <tqparent ref="82D1958"/>
+      <parent ref="8322E28"/>
+      <parent ref="82D1958"/>
     </line>
     <point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
-      <tqparent ref="831E530"/>
-      <tqparent ref="8337158"/>
+      <parent ref="831E530"/>
+      <parent ref="8337158"/>
     </point>
     <point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
-      <tqparent ref="8322C38"/>
-      <tqparent ref="831E530"/>
+      <parent ref="8322C38"/>
+      <parent ref="831E530"/>
     </point>
   </drgeo>
   <drgeo name="Figure 3" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
@@ -147,16 +147,16 @@ Figure 3 contains:
     <vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
       <Ox>-6.433334</Ox>
       <Oy>2.050000</Oy>
-      <tqparent ref="837C5E0"/>
-      <tqparent ref="83380E8"/>
+      <parent ref="837C5E0"/>
+      <parent ref="83380E8"/>
     </vector>
     <circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="82FBCC8"/>
-      <tqparent ref="83565C8"/>
+      <parent ref="82FBCC8"/>
+      <parent ref="83565C8"/>
     </circle>
     <circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
-      <tqparent ref="83A2B10"/>
-      <tqparent ref="8108B10"/>
+      <parent ref="83A2B10"/>
+      <parent ref="8108B10"/>
     </circle>
   </drgeo>
 </drgenius>

kig/filters/cabri-filter.cc

@@ -441,10 +441,10 @@ KigDocument* KigFilterCabri::load( const TQString& file )
       obj.thick *= 2;
       if ( args.size() != 1 || obj.data.size() != 2 )
         KIG_FILTER_PARSE_ERROR;
-      ObjectCalcer* tqparent = args[0];
-      if ( !tqparent->imp()->inherits( CurveImp::stype() ) )
+      ObjectCalcer* parent = args[0];
+      if ( !parent->imp()->inherits( CurveImp::stype() ) )
         KIG_FILTER_PARSE_ERROR;
-      const CurveImp* curve = static_cast<const CurveImp*>( tqparent->imp() );
+      const CurveImp* curve = static_cast<const CurveImp*>( parent->imp() );
       Coordinate pt = Coordinate( obj.data[0], obj.data[1] );
       double param = curve->getParam( pt, *ret );
       args.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) );
@@ -486,11 +486,11 @@ KigDocument* KigFilterCabri::load( const TQString& file )
       // points, or a vector...
       if ( args.size() != 1 || !obj.data.empty() )
         KIG_FILTER_PARSE_ERROR;
-      ObjectCalcer* tqparent = args[0];
-      if ( tqparent->imp()->inherits( SegmentImp::stype() ) )
-        oc = fact->propertyObjectCalcer( tqparent, "mid-point" ) ;
-      else if ( tqparent->imp()->inherits( VectorImp::stype() ) )
-        oc = fact->propertyObjectCalcer( tqparent, "vect-mid-point" );
+      ObjectCalcer* parent = args[0];
+      if ( parent->imp()->inherits( SegmentImp::stype() ) )
+        oc = fact->propertyObjectCalcer( parent, "mid-point" ) ;
+      else if ( parent->imp()->inherits( VectorImp::stype() ) )
+        oc = fact->propertyObjectCalcer( parent, "vect-mid-point" );
       else KIG_FILTER_PARSE_ERROR;
     }
     else if ( obj.type == "PBiss" )
@@ -505,12 +505,12 @@ KigDocument* KigFilterCabri::load( const TQString& file )
       }
       if ( args.size() != 1 || !obj.data.empty() )
         KIG_FILTER_PARSE_ERROR;
-      ObjectCalcer* tqparent = args[0];
+      ObjectCalcer* parent = args[0];
       ObjectCalcer* midpoint = 0;
-      if ( tqparent->imp()->inherits( SegmentImp::stype() ) )
-        midpoint = fact->propertyObjectCalcer( tqparent, "mid-point" ) ;
-//       else if ( tqparent->imp()->inherits( VectorImp::stype() ) )
-//         midpoint = fact->propertyObjectCalcer( tqparent, "vect-mid-point" );
+      if ( parent->imp()->inherits( SegmentImp::stype() ) )
+        midpoint = fact->propertyObjectCalcer( parent, "mid-point" ) ;
+//       else if ( parent->imp()->inherits( VectorImp::stype() ) )
+//         midpoint = fact->propertyObjectCalcer( parent, "vect-mid-point" );
       else KIG_FILTER_PARSE_ERROR;
       midpoint->calc( *ret );
       args.push_back( midpoint );

kig/filters/drgeo-filter.cc

@@ -201,7 +201,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       {
         TQDomElement ce = c.toElement();
         if ( ce.isNull() ) continue;
-        else if ( ce.tagName() == "tqparent" )
+        else if ( ce.tagName() == "parent" )
           elem.parents.push_back( ce.attribute( "ref" ) );
       }
       TQString curid = domelem.attribute( "id" );
@@ -255,7 +255,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
     if ( parents.size() > 0 )
       for ( uint j = 0; j < parents.size(); ++j )
       {
-        kdDebug() << "+++++++++ tqparent[" << j << "]: " << parents[j] << " - "
+        kdDebug() << "+++++++++ parent[" << j << "]: " << parents[j] << " - "
                   << parents[j]->imp()->type()->internalName() << endl;
       }
     else

kig/filters/exporter.cc

@@ -65,13 +65,13 @@ class ExporterAction
   KigWidget* mw;
 public:
   ExporterAction( const KigPart* doc, KigWidget* w,
-                  KActionCollection* tqparent, KigExporter* exp );
+                  KActionCollection* parent, KigExporter* exp );
   void slotActivated();
 };
 
 ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
-                                KActionCollection* tqparent, KigExporter* exp )
-  : KAction( exp->menuEntryName(), KShortcut(), 0, 0, tqparent ),
+                                KActionCollection* parent, KigExporter* exp )
+  : KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ),
     mexp( exp ), mdoc( doc ), mw( w )
 {
   TQString iconstr = exp->menuIcon();

kig/filters/imageexporteroptions.cc

@@ -23,8 +23,8 @@
 
 #include <knuminput.h>
 
-ImageExporterOptions::ImageExporterOptions( TQWidget* tqparent, const TQSize& s )
-  : ImageExporterOptionsBase( tqparent, "imageexporteroptions" ), msize( s ),
+ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s )
+  : ImageExporterOptionsBase( parent, "imageexporteroptions" ), msize( s ),
     minternallysettingstuff( false )
 {
   keepAspectRatio->setChecked( true );

kig/filters/imageexporteroptions.h

@@ -35,7 +35,7 @@ class ImageExporterOptions
   // value like to user changes...
   bool minternallysettingstuff;
 public:
-  ImageExporterOptions( TQWidget* tqparent, const TQSize& s );
+  ImageExporterOptions( TQWidget* parent, const TQSize& s );
   ~ImageExporterOptions();
 
 protected slots:

kig/filters/kgeo-filter.cc

@@ -111,10 +111,10 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
   c->setGroup("Main");
   int number = c->readNumEntry ("Number");
 
-  // first we determine the tqparent relationships, and sort the
+  // first we determine the parent relationships, and sort the
   // elements in an order that we can be sure all of an object's
   // parents will have been handled before it is handled itself..
-  // ( aka topological sort of the tqparent relations graph..
+  // ( aka topological sort of the parent relations graph..
   std::vector<KGeoHierarchyElement> elems;
   elems.reserve( number );
 
@@ -128,9 +128,9 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     TQStrList parents;
     c->readListEntry( "Parents", parents );
     elems.push_back( elem );
-    for ( const char* tqparent = parents.first(); tqparent; tqparent = parents.next() )
+    for ( const char* parent = parents.first(); parent; parent = parents.next() )
     {
-      int parentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok );
+      int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
       if ( ! ok ) KIG_FILTER_PARSE_ERROR;
       if ( parentIndex != 0 )
         elems[i].parents.push_back( parentIndex - 1 );

kig/filters/kseg-filter.cc

@@ -255,9 +255,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
     std::vector<ObjectCalcer*> parents( nparents, 0 );
     for ( short j = 0; j < nparents; ++j )
     {
-      int tqparent;
-      stream >> tqparent;
-      parents[j] = ret[tqparent]->calcer();
+      int parent;
+      stream >> parent;
+      parents[j] = ret[parent]->calcer();
     };
 
     // read the object..
@@ -335,9 +335,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
           double p;
           stream >> p;
           if ( nparents != 1 ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = parents[0];
-          assert( tqparent );
-          o = fact->constrainedPointCalcer( tqparent, p );
+          ObjectCalcer* parent = parents[0];
+          assert( parent );
+          o = fact->constrainedPointCalcer( parent, p );
           break;
         }
         case G_INTERSECTION_POINT:

kig/filters/native-filter.cc

@@ -316,13 +316,13 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
           };
 
           if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = retcalcers[i->parents[0] -1];
-          QCStringList propnames = tqparent->imp()->propertiesInternalNames();
+          ObjectCalcer* parent = retcalcers[i->parents[0] -1];
+          QCStringList propnames = parent->imp()->propertiesInternalNames();
           int propid = propnames.findIndex( propname );
           if ( propid == -1 )
             KIG_FILTER_PARSE_ERROR;
 
-          o = new ObjectPropertyCalcer( tqparent, propid );
+          o = new ObjectPropertyCalcer( parent, propid );
         }
         else if ( e.tagName() == "Object" )
         {
@@ -443,9 +443,9 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
           uint parentid = tmp.toInt( &ok );
           if ( ! ok ) KIG_FILTER_PARSE_ERROR;
           if ( parentid == 0 || parentid > calcers.size() ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = calcers[parentid - 1].get();
-          if ( ! tqparent ) KIG_FILTER_PARSE_ERROR;
-          parents.push_back( tqparent );
+          ObjectCalcer* parent = calcers[parentid - 1].get();
+          if ( ! parent ) KIG_FILTER_PARSE_ERROR;
+          parents.push_back( parent );
         }
 
         ObjectCalcer* o = 0;
@@ -468,11 +468,11 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
           if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
           TQCString propname = e.attribute( "which" ).latin1();
 
-          ObjectCalcer* tqparent = parents[0];
-          int propid = tqparent->imp()->propertiesInternalNames().findIndex( propname );
+          ObjectCalcer* parent = parents[0];
+          int propid = parent->imp()->propertiesInternalNames().findIndex( propname );
           if ( propid == -1 ) KIG_FILTER_PARSE_ERROR;
 
-          o = new ObjectPropertyCalcer( tqparent, propid );
+          o = new ObjectPropertyCalcer( parent, propid );
         }
         else if ( e.tagName() == "Object" )
         {
@@ -604,7 +604,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
       const ObjectPropertyCalcer* o = static_cast<const ObjectPropertyCalcer*>( *i );
       objectelem = doc.createElement( "Property" );
 
-      TQCString propname = o->tqparent()->imp()->propertiesInternalNames()[o->propId()];
+      TQCString propname = o->parent()->imp()->propertiesInternalNames()[o->propId()];
       objectelem.setAttribute( TQString("which"), TQString(propname) );
     }
     else if ( dynamic_cast<const ObjectTypeCalcer*>( *i ) )

kig/filters/tests/locus.fgeo

@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8293DE0"/><tqparent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><tqparent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8338A50"/><tqparent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><tqparent ref="8172970"/><tqparent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8342478"/></locus></drgeo></drgenius>
+<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8293DE0"/><parent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><parent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8338A50"/><parent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><parent ref="8172970"/><parent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8342478"/></locus></drgeo></drgenius>

kig/kfile/kfile_drgeo.cpp

@@ -29,8 +29,8 @@ typedef KGenericFactory<DrgeoPlugin> drgeoFactory;
 
 K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) )
 
-DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList &args )
-    : KFilePlugin( tqparent, name, args )
+DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args )
+    : KFilePlugin( parent, name, args )
 {
   info = addMimeTypeInfo( "application/x-drgeo" );
 

kig/kfile/kfile_drgeo.h

@@ -31,7 +31,7 @@ class DrgeoPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    DrgeoPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& metainfo, uint what);
 protected:

kig/kfile/kfile_kig.cpp

@@ -35,8 +35,8 @@ typedef KGenericFactory<KigPlugin> kigFactory;
 
 K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) )
 
-KigPlugin::KigPlugin( TQObject *tqparent, const char *name, const TQStringList &args )
-    : KFilePlugin( tqparent, name, args )
+KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args )
+    : KFilePlugin( parent, name, args )
 {
   KFileMimeTypeInfo::ItemInfo* item;
   

kig/kfile/kfile_kig.h

@@ -31,7 +31,7 @@ class KigPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KigPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KigPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& metainfo, uint what);
 protected:

kig/kig/kig_part.cpp

@@ -87,13 +87,13 @@ class SetCoordinateSystemAction
 {
   KigPart& md;
 public:
-  SetCoordinateSystemAction( KigPart& d, KActionCollection* tqparent );
+  SetCoordinateSystemAction( KigPart& d, KActionCollection* parent );
   void slotActivated( int index );
 };
 
 SetCoordinateSystemAction::SetCoordinateSystemAction(
-  KigPart& d, KActionCollection* tqparent )
-  : KSelectAction( i18n( "&Set Coordinate System" ), 0, tqparent, "settings_set_coordinate_system" ),
+  KigPart& d, KActionCollection* parent )
+  : KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ),
     md( d )
 {
   setItems( CoordinateSystemFactory::names() );
@@ -112,7 +112,7 @@ class KigPrintDialogPage
   : public KPrintDialogPage
 {
 public:
-  KigPrintDialogPage( TQWidget* tqparent = 0, const char* name = 0 );
+  KigPrintDialogPage( TQWidget* parent = 0, const char* name = 0 );
   ~KigPrintDialogPage();
 
   void getOptions( TQMap<TQString,TQString>& opts, bool );
@@ -124,8 +124,8 @@ private:
   TQCheckBox *showaxes;
 };
 
-KigPrintDialogPage::KigPrintDialogPage( TQWidget* tqparent, const char* name )
- : KPrintDialogPage( tqparent, name )
+KigPrintDialogPage::KigPrintDialogPage( TQWidget* parent, const char* name )
+ : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "Kig Options" ) );
 
@@ -166,9 +166,9 @@ bool KigPrintDialogPage::isValid( TQString& )
 }
 
 KigPart::KigPart( TQWidget *parentWidget, const char *,
-			  TQObject *tqparent, const char *name,
+			  TQObject *parent, const char *name,
 			  const TQStringList& )
-  : KParts::ReadWritePart( tqparent, name ),
+  : KParts::ReadWritePart( parent, name ),
     mMode( 0 ), mdocument( new KigDocument() )
 {
   // we need an instance
@@ -281,7 +281,7 @@ void KigPart::setupActions()
 #endif
 #endif
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
-  a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->tqparent()),"fullscreen" );
+  a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
 #else
   tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar );
   a = new KAction(

kig/kig/kig_part.h

@@ -67,7 +67,7 @@ public:
    * Default constructor
    */
   KigPart( TQWidget* parentWidget, const char* widgetName,
-	       TQObject* tqparent = 0, const char* name = 0,
+	       TQObject* parent = 0, const char* name = 0,
 	       const TQStringList& = TQStringList()
 	       );
 

kig/kig/kig_view.cpp

@@ -55,10 +55,10 @@ kdbgstream& operator<< ( kdbgstream& s, const TQPoint& t )
 
 KigWidget::KigWidget( KigPart* part,
                       KigView* view,
-                      TQWidget* tqparent,
+                      TQWidget* parent,
                       const char* name,
                       bool fullscreen )
-  : TQWidget( tqparent, name,
+  : TQWidget( parent, name,
              fullscreen ? WStyle_Customize | WStyle_NoBorder : 0 ),
     mpart( part ),
     mview( view ),
@@ -287,9 +287,9 @@ void KigWidget::updateScrollBars()
 
 KigView::KigView( KigPart* part,
                   bool fullscreen,
-                  TQWidget* tqparent,
+                  TQWidget* parent,
                   const char* name )
-  : TQWidget( tqparent, name ),
+  : TQWidget( parent, name ),
     mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
     mupdatingscrollbars( false ),
     mrealwidget( 0 ), mpart( part )

kig/kig/kig_view.h

@@ -105,7 +105,7 @@ public:
    */
   KigWidget( KigPart* doc,
              KigView* view,
-             TQWidget* tqparent = 0,
+             TQWidget* parent = 0,
              const char* name = 0,
              bool fullscreen = false
 	   );
@@ -246,7 +246,7 @@ class KigView
 public:
   KigView( KigPart* part,
            bool fullscreen = false,
-	   TQWidget* tqparent = 0,
+	   TQWidget* parent = 0,
 	   const char* name = 0
 	   );
   ~KigView();

kig/misc/common.cpp

@@ -347,7 +347,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, const Coordinate&
 }
 
 double getDoubleFromUser( const TQString& caption, const TQString& label, double value,
-                          TQWidget* tqparent, bool* ok, double min, double max, int decimals )
+                          TQWidget* parent, bool* ok, double min, double max, int decimals )
 {
 #ifdef KIG_USE_KDOUBLEVALIDATOR
   KDoubleValidator vtor( min, max, decimals, 0, 0 );
@@ -357,12 +357,12 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double
 #if KDE_IS_VERSION( 3, 1, 90 )
   TQString input = KInputDialog::getText(
     caption, label, KGlobal::locale()->formatNumber( value, decimals ),
-    ok, tqparent, "getDoubleFromUserDialog", &vtor );
+    ok, parent, "getDoubleFromUserDialog", &vtor );
 #else
   TQString input =
     KLineEditDlg::getText( caption, label,
                            KGlobal::locale()->formatNumber( value, decimals ),
-                           ok, tqparent, &vtor );
+                           ok, parent, &vtor );
 #endif
 
   bool myok = true;

kig/misc/common.h

@@ -52,7 +52,7 @@ extern const double double_inf;
  */
 
 double getDoubleFromUser( const TQString& caption, const TQString& label, double value,
-                          TQWidget* tqparent, bool* ok, double min, double max, int decimals );
+                          TQWidget* parent, bool* ok, double min, double max, int decimals );
 
 /**
  * Simple class representing a line.  Used by various functions in Kig.

kig/misc/guiaction.cc

@@ -81,13 +81,13 @@ void ConstructibleAction::act( KigPart& d )
 
 KigGUIAction::KigGUIAction( GUIAction* act,
                             KigPart& doc,
-                            TQObject* tqparent )
+                            TQObject* parent )
   : KAction( act->descriptiveName(),
              doc.instance()->iconLoader()->loadIcon(
                act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ),
              act->shortcut(),
              0, 0,              // no slot connection
-             tqparent, act->actionName() ),
+             parent, act->actionName() ),
   mact( act ),
   mdoc( doc )
 {

kig/misc/guiaction.h

@@ -41,7 +41,7 @@ class KigGUIAction
 public:
   KigGUIAction( GUIAction* act,
                 KigPart& doc,
-                TQObject* tqparent );
+                TQObject* parent );
   void slotActivated();
 
   GUIAction* guiAction();

kig/misc/kigfiledialog.cc

@@ -25,8 +25,8 @@
 #include <kmessagebox.h>
 
 KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter,
-              const TQString& caption,  TQWidget* tqparent )
-  : KFileDialog( startDir, filter, tqparent, "kigfiledialog", true ),
+              const TQString& caption,  TQWidget* parent )
+  : KFileDialog( startDir, filter, parent, "kigfiledialog", true ),
     mow( 0L )
 {
   setCaption( caption );

kig/misc/kigfiledialog.h

@@ -46,17 +46,17 @@ public:
    *                 documentation of KFileDialog for more help about this
    * \param filter the filter for the file dialog
    * \param caption the caption of this file dialog
-   * \param tqparent the tqparent for this file dialog
+   * \param parent the parent for this file dialog
    */
   KigFileDialog( const TQString& startDir, const TQString& filter,
-                 const TQString& caption, TQWidget *tqparent );
+                 const TQString& caption, TQWidget *parent );
 
   /**
    * Use this to set the widget containing the options of eg an export filter.
    * The option widget will be popped up in a dialog right after the user
    * presses OK and before the dialog is closed.
    *
-   * You can construct the option widget with no tqparent, as it will be
+   * You can construct the option widget with no parent, as it will be
    * reparented.
    *
    * \param w the option widget

kig/misc/kiginputdialog.cc

@@ -65,8 +65,8 @@ KigInputDialogPrivate::KigInputDialogPrivate()
 }
 
 KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
-      TQWidget* tqparent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 )
-  : KDialogBase( tqparent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ),
+      TQWidget* parent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 )
+  : KDialogBase( parent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ),
     d( new KigInputDialogPrivate() )
 {
   d->m_coord1 = c1 ? Coordinate( *c1 ) : Coordinate::invalidCoord();
@@ -121,8 +121,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
   enableButtonOK( ok );
 }
 
-KigInputDialog::KigInputDialog( TQWidget* tqparent, const Goniometry& g )
-  : KDialogBase( tqparent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ),
+KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g )
+  : KDialogBase( parent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ),
     d( new KigInputDialogPrivate() )
 {
   d->m_gonio = g;
@@ -247,16 +247,16 @@ Goniometry KigInputDialog::goniometry() const
 }
 
 void KigInputDialog::getCoordinate( const TQString& caption, const TQString& label,
-      TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue )
+      TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue )
 {
-  getTwoCoordinates( caption, label, tqparent, ok, doc, cvalue, 0 );
+  getTwoCoordinates( caption, label, parent, ok, doc, cvalue, 0 );
 }
 
 void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& label,
-      TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
+      TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
       Coordinate* cvalue2 )
 {
-  KigInputDialog dlg( caption, label, tqparent, doc, cvalue, cvalue2 );
+  KigInputDialog dlg( caption, label, parent, doc, cvalue, cvalue2 );
 
   *ok = ( dlg.exec() == Accepted );
 
@@ -273,9 +273,9 @@ void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString&
 
 }
 
-Goniometry KigInputDialog::getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g )
+Goniometry KigInputDialog::getAngle( TQWidget* parent, bool* ok, const Goniometry& g )
 {
-  KigInputDialog dlg( tqparent, g );
+  KigInputDialog dlg( parent, g );
 
   *ok = ( dlg.exec() == Accepted );
 

kig/misc/kiginputdialog.h

@@ -46,9 +46,9 @@ Q_OBJECT
 public:
 
 private:
-  KigInputDialog( const TQString& caption, const TQString& label, TQWidget* tqparent,
+  KigInputDialog( const TQString& caption, const TQString& label, TQWidget* parent,
         const KigDocument& doc, Coordinate* c1, Coordinate* c2 );
-  KigInputDialog( TQWidget* tqparent, const Goniometry& g );
+  KigInputDialog( TQWidget* parent, const Goniometry& g );
 
   virtual void keyPressEvent( TQKeyEvent* e );
 
@@ -70,7 +70,7 @@ public:
    *
    * \param caption caption of the dialog
    * \param label text of the label of the dialog
-   * \param tqparent tqparent of the dialog widget
+   * \param parent parent of the dialog widget
    * \param ok it will be set to true if the user pressed Ok after inserting a
    *           well-formatted Coordinate
    * \param doc the actual Kig document
@@ -80,14 +80,14 @@ public:
    *               displayed as initial value of the correspondenting text edit
    */
   static void getCoordinate( const TQString& caption, const TQString& label,
-        TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue );
+        TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue );
 
   /**
    * Static convenience function to get two Coordinates at once from the user.
    *
    * \param caption caption of the dialog
    * \param label text of the label of the dialog
-   * \param tqparent tqparent of the dialog widget
+   * \param parent parent of the dialog widget
    * \param ok it will be set to true if the user pressed Ok after inserting
    *           well-formatted Coordinates
    * \param doc the actual Kig document
@@ -103,14 +103,14 @@ public:
    *                the text edit representing the second Coordinate.
    */
   static void getTwoCoordinates( const TQString& caption, const TQString& label,
-        TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
+        TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue,
         Coordinate* cvalue2 );
 
   /**
    * Static convenience function to get an angle incapsulated in a Goniometry
    * class.
    *
-   * \param tqparent tqparent of the dialog widget
+   * \param parent parent of the dialog widget
    * \param ok it will be set to true if the user pressed Ok after inserting a
    *           well-formatted angle
    * \param g the Goniometry class containing the original angle we are going
@@ -118,7 +118,7 @@ public:
    *
    * \return a Goniometry class containing the new angle
    */
-  static Goniometry getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g );
+  static Goniometry getAngle( TQWidget* parent, bool* ok, const Goniometry& g );
 };
 
 #endif

kig/misc/object_hierarchy.cc

@@ -186,21 +186,21 @@ class FetchPropertyNode
   : public ObjectHierarchy::Node
 {
   mutable int mpropid;
-  int mtqparent;
+  int mparent;
   const TQCString mname;
 public:
-  // propid is a cache of the location of name in the tqparent's
+  // propid is a cache of the location of name in the parent's
   // propertiesInternalNames(), just as it is in PropertyObject.  We
   // don't want to ever save this value, since we cannot guarantee it
   // remains consistent if we add properties some place..
-  FetchPropertyNode( const int tqparent, const TQCString& name, const int propid = -1 )
-    : mpropid( propid ), mtqparent( tqparent ), mname( name ) {}
+  FetchPropertyNode( const int parent, const TQCString& name, const int propid = -1 )
+    : mpropid( propid ), mparent( parent ), mname( name ) {}
   ~FetchPropertyNode();
   Node* copy() const;
 
   void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const;
   void checkArgumentsUsed( std::vector<bool>& usedstack ) const;
-  int tqparent() const { return mtqparent; }
+  int parent() const { return mparent; }
   const TQCString& propinternalname() const { return mname; }
 
   int id() const;
@@ -215,17 +215,17 @@ FetchPropertyNode::~FetchPropertyNode()
 
 void FetchPropertyNode::checkArgumentsUsed( std::vector<bool>& usedstack ) const
 {
-  usedstack[mtqparent] = true;
+  usedstack[mparent] = true;
 }
 
 void FetchPropertyNode::checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const
 {
-  dependsstack[loc] = dependsstack[mtqparent];
+  dependsstack[loc] = dependsstack[mparent];
 }
 
 ObjectHierarchy::Node* FetchPropertyNode::copy() const
 {
-  return new FetchPropertyNode( mtqparent, mname, mpropid );
+  return new FetchPropertyNode( mparent, mname, mpropid );
 }
 
 int FetchPropertyNode::id() const
@@ -236,10 +236,10 @@ int FetchPropertyNode::id() const
 void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
                                int loc, const KigDocument& d ) const
 {
-  assert( stack[mtqparent] );
-  if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().findIndex( mname );
+  assert( stack[mparent] );
+  if ( mpropid == -1 ) mpropid = stack[mparent]->propertiesInternalNames().findIndex( mname );
   if ( mpropid != -1 )
-    stack[loc] = stack[mtqparent]->property( mpropid, d );
+    stack[loc] = stack[mparent]->property( mpropid, d );
   else
     stack[loc] = new InvalidImp();
 }
@@ -247,9 +247,9 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
 void FetchPropertyNode::apply( std::vector<ObjectCalcer*>& stack, int loc ) const
 {
   if ( mpropid == -1 )
-    mpropid = stack[mtqparent]->imp()->propertiesInternalNames().findIndex( mname );
+    mpropid = stack[mparent]->imp()->propertiesInternalNames().findIndex( mname );
   assert( mpropid != -1 );
-  stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid );
+  stack[loc] = new ObjectPropertyCalcer( stack[mparent], mpropid );
 }
 
 std::vector<ObjectImp*> ObjectHierarchy::calc( const Args& a, const KigDocument& doc ) const
@@ -408,7 +408,7 @@ ObjectHierarchy::ObjectHierarchy( const std::vector<ObjectCalcer*>& from, const
   init( from, to );
 }
 
-void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) const
+void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) const
 {
   int id = 1;
   for ( uint i = 0; i < mnumberofargs; ++i )
@@ -424,7 +424,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
 //     TQDomElement ss = doc.createElement( "SelectStatement" );
 //     ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) );
 //     e.appendChild( ss );
-    tqparent.appendChild( e );
+    parent.appendChild( e );
   }
 
   for ( uint i = 0; i < mnodes.size(); ++i )
@@ -440,9 +440,9 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
       e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) );
       for ( uint i = 0; i < node->parents().size(); ++i )
       {
-        int tqparent = node->parents()[i] + 1;
+        int parent = node->parents()[i] + 1;
         TQDomElement arge = doc.createElement( "arg" );
-        arge.appendChild( doc.createTextNode( TQString::number( tqparent ) ) );
+        arge.appendChild( doc.createTextNode( TQString::number( parent ) ) );
         e.appendChild( arge );
       };
     }
@@ -452,7 +452,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
       e.setAttribute( "action", "fetch-property" );
       e.setAttribute( TQString("property"), TQString(node->propinternalname()) );
       TQDomElement arge = doc.createElement( "arg" );
-      arge.appendChild( doc.createTextNode( TQString::number( node->tqparent() + 1 ) ) );
+      arge.appendChild( doc.createTextNode( TQString::number( node->parent() + 1 ) ) );
       e.appendChild( arge );
     }
     else
@@ -464,7 +464,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co
       e.setAttribute( "type", type );
     };
 
-    tqparent.appendChild( e );
+    parent.appendChild( e );
   };
 }
 
@@ -473,7 +473,7 @@ ObjectHierarchy::ObjectHierarchy()
 {
 }
 
-ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error )
+ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error )
 {
 #define KIG_GENERIC_PARSE_ERROR \
   { \
@@ -486,7 +486,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
 
   bool ok = true;
   TQString tmp;
-  TQDomElement e = tqparent.firstChild().toElement();
+  TQDomElement e = parent.firstChild().toElement();
   for (; !e.isNull(); e = e.nextSibling().toElement() )
   {
     if ( e.tagName() != "input" ) break;
@@ -565,9 +565,9 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
       // FetchPropertyNode
       TQCString propname = e.attribute( "property" ).latin1();
       TQDomElement arge = e.firstChild().toElement();
-      int tqparent = arge.text().toInt( &ok );
+      int parent = arge.text().toInt( &ok );
       if ( !ok ) KIG_GENERIC_PARSE_ERROR;
-      newnode = new FetchPropertyNode( tqparent - 1, propname );
+      newnode = new FetchPropertyNode( parent - 1, propname );
     }
     else
     {
@@ -723,12 +723,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec
     }
     else if ( (uint) pl[i] < mnumberofargs )
     {
-      ObjectCalcer* tqparent = o->parents()[i];
+      ObjectCalcer* parent = o->parents()[i];
       std::vector<ObjectCalcer*> opl = o->parents();
 
       margrequirements[pl[i]] =
         lowermost( margrequirements[pl[i]],
-                   o->impRequirement( tqparent, opl ) );
+                   o->impRequirement( parent, opl ) );
       musetexts[pl[i]] = margrequirements[pl[i]]->selectStatement();
     };
   };
@@ -737,12 +737,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec
   else if ( dynamic_cast<const ObjectPropertyCalcer*>( o ) )
   {
     assert( pl.size() == 1 );
-    int tqparent = pl.front();
+    int parent = pl.front();
     ObjectCalcer* op = po.front();
     assert( op );
     uint propid = static_cast<const ObjectPropertyCalcer*>( o )->propId();
     assert( propid < op->imp()->propertiesInternalNames().size() );
-    mnodes.push_back( new FetchPropertyNode( tqparent, op->imp()->propertiesInternalNames()[propid], propid ) );
+    mnodes.push_back( new FetchPropertyNode( parent, op->imp()->propertiesInternalNames()[propid], propid ) );
   }
   else
     assert( false );

kig/misc/object_hierarchy.h

@@ -73,16 +73,16 @@ public:
   std::vector<ObjectImp*> calc( const Args& a, const KigDocument& doc ) const;
 
   /**
-   * saves the ObjectHierarchy data in tqchildren xml tags of \p tqparent ..
+   * saves the ObjectHierarchy data in tqchildren xml tags of \p parent ..
    */
-  void serialize( TQDomElement& tqparent, TQDomDocument& doc ) const;
+  void serialize( TQDomElement& parent, TQDomDocument& doc ) const;
   /**
-   * Deserialize the ObjectHierarchy data from the xml element \p tqparent ..
+   * Deserialize the ObjectHierarchy data from the xml element \p parent ..
    * Since this operation can fail for some reasons, we provide it as a
    * static to return 0 in case of error.
    */
-  static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error );
-//  ObjectHierarchy( const TQDomElement& tqparent );
+  static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error );
+//  ObjectHierarchy( const TQDomElement& parent );
 
   /**
    * build a set of objects that interdepend according to this

kig/modes/edittype.cc

@@ -31,8 +31,8 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-EditType::EditType( TQWidget* tqparent, TQString name, TQString desc, TQString icon )
-  : EditTypeBase( tqparent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon )
+EditType::EditType( TQWidget* parent, TQString name, TQString desc, TQString icon )
+  : EditTypeBase( parent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon )
 {
   // improving GUI look'n'feel...
   buttonHelp->setGuiItem( KStdGuiItem::help() );

kig/modes/edittype.h

@@ -34,7 +34,7 @@ class EditType : public EditTypeBase
   TQString mdesc;
   TQString micon;
 public:
-  EditType( TQWidget* tqparent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() );
+  EditType( TQWidget* parent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() );
   ~EditType();
   const TQString name() const;
   const TQString description() const;

kig/modes/label.cc

@@ -55,8 +55,8 @@ public:
   TQPoint plc;
   // the currently selected coordinate
   Coordinate mcoord;
-  // the possible tqparent object that defines the location of the label..
-  ObjectCalcer* locationtqparent;
+  // the possible parent object that defines the location of the label..
+  ObjectCalcer* locationparent;
 
   // the text is only kept in the text input widget, not here
   // TQString mtext;
@@ -65,7 +65,7 @@ public:
   // to them in the args object, and keep a pointer to them ( or 0 )
   // in the correct order in args ( separately, because we can't use
   // the order of the parents of a ReferenceObject, and certainly
-  // can't give 0 as a tqparent..
+  // can't give 0 as a parent..
   argvect args;
 
   // if we're ReallySelectingArgs, then this var points to the arg
@@ -90,7 +90,7 @@ TextLabelModeBase::~TextLabelModeBase()
 TextLabelModeBase::TextLabelModeBase( KigPart& doc )
   : KigMode( doc ), d( new Private )
 {
-  d->locationtqparent = 0;
+  d->locationparent = 0;
   d->lpc = 0;
   d->mwawd = SelectingLocation;
   d->wiz = new TextLabelWizard( doc.widget(), this );
@@ -212,7 +212,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
   {
     std::vector<ObjectHolder*> os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w );
     bool attachable = false;
-    d->locationtqparent = 0;
+    d->locationparent = 0;
     for ( std::vector<ObjectHolder*>::iterator i = os.begin(); i != os.end(); ++i )
     {
       if( (*i)->imp()->attachPoint().valid() ||
@@ -220,7 +220,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
           (*i)->imp()->inherits( CurveImp::stype() ) )
       {
         attachable = true;
-        d->locationtqparent = (*i)->calcer();
+        d->locationparent = (*i)->calcer();
         break;
       };
     };
@@ -228,7 +228,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
     if ( attachable )
     {
       w->setCursor( KCursor::handCursor() );
-      TQString s = d->locationtqparent->imp()->type()->attachToThisStatement();
+      TQString s = d->locationparent->imp()->type()->attachToThisStatement();
       mdoc.emitStatusBarText( s );
 
       KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() );
@@ -296,7 +296,7 @@ void TextLabelModeBase::finishPressed()
                               "value for. Please remove them or select enough arguments." ) );
   else
   {
-    finish( d->mcoord, s, d->args, needframe, d->locationtqparent );
+    finish( d->mcoord, s, d->args, needframe, d->locationparent );
     killMode();
   };
 }
@@ -452,7 +452,7 @@ TextLabelConstructionMode::~TextLabelConstructionMode()
 void TextLabelConstructionMode::finish(
   const Coordinate& coord, const TQString& s,
   const argvect& props, bool needframe,
-  ObjectCalcer* locationtqparent )
+  ObjectCalcer* locationparent )
 {
   std::vector<ObjectCalcer*> args;
   for ( argvect::const_iterator i = props.begin();
@@ -460,8 +460,8 @@ void TextLabelConstructionMode::finish(
     args.push_back( i->get() );
 
   ObjectHolder* label = 0;
-  if ( locationtqparent )
-    label = ObjectFactory::instance()->attachedLabel( s, locationtqparent, coord, needframe, args, mdoc.document() );
+  if ( locationparent )
+    label = ObjectFactory::instance()->attachedLabel( s, locationparent, coord, needframe, args, mdoc.document() );
   else
     label = ObjectFactory::instance()->label( s, coord, needframe, args, mdoc.document() );
   mdoc.addObject( label );
@@ -507,7 +507,7 @@ TextLabelRedefineMode::~TextLabelRedefineMode()
 void TextLabelRedefineMode::finish(
   const Coordinate& coord, const TQString& s,
   const argvect& props, bool needframe,
-  ObjectCalcer* locationtqparent )
+  ObjectCalcer* locationparent )
 {
   std::vector<ObjectCalcer*> parents = mlabel->parents();
   assert( parents.size() >= 3 );
@@ -552,19 +552,19 @@ void TextLabelRedefineMode::finish(
    * take advantage of the method "getAttachPoint" that should
    * do all the work; it is also used when creating a new label
    */
-  np[1] = ObjectFactory::instance()->getAttachPoint( locationtqparent, coord, mdoc.document() );
+  np[1] = ObjectFactory::instance()->getAttachPoint( locationparent, coord, mdoc.document() );
 
 /* this is the old code, just in case... */
-//  if ( locationtqparent && locationtqparent->imp()->inherits( CurveImp::stype() ) )
+//  if ( locationparent && locationparent->imp()->inherits( CurveImp::stype() ) )
 //  {
-//    double param = static_cast<const CurveImp*>( locationtqparent->imp() )->getParam( coord, mdoc.document() );
-//    np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationtqparent, param );
+//    double param = static_cast<const CurveImp*>( locationparent->imp() )->getParam( coord, mdoc.document() );
+//    np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationparent, param );
 //    np[1]->calc( mdoc.document() );
 //  }
-//  else if ( locationtqparent )
+//  else if ( locationparent )
 //  {
-//    assert( locationtqparent->imp()->inherits( PointImp::stype() ) );
-//    np[1] = locationtqparent;
+//    assert( locationparent->imp()->inherits( PointImp::stype() ) );
+//    np[1] = locationparent;
 //  }
 //  else
 //    np[1] = new ObjectConstCalcer( new PointImp( coord ) );
@@ -585,5 +585,5 @@ void TextLabelModeBase::setFrame( bool f )
 
 void TextLabelModeBase::setLocationParent( ObjectCalcer* o )
 {
-  d->locationtqparent = o;
+  d->locationparent = o;
 }

kig/modes/label.h

@@ -72,7 +72,7 @@ protected:
 
   virtual void finish( const Coordinate& c, const TQString& s,
                        const argvect& props, bool needframe,
-                       ObjectCalcer* locationtqparent ) = 0;
+                       ObjectCalcer* locationparent ) = 0;
 
 private:
   // the KigMode interface..
@@ -111,7 +111,7 @@ public:
 
   void finish( const Coordinate& coord, const TQString& s,
                const argvect& props, bool needframe,
-               ObjectCalcer* locationtqparent );
+               ObjectCalcer* locationparent );
 };
 
 class TextLabelRedefineMode
@@ -120,7 +120,7 @@ class TextLabelRedefineMode
   ObjectTypeCalcer* mlabel;
   void finish( const Coordinate& coord, const TQString& s,
                const argvect& props, bool needframe,
-               ObjectCalcer* locationtqparent );
+               ObjectCalcer* locationparent );
 public:
   TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* label );
   ~TextLabelRedefineMode();

kig/modes/linkslabel.cpp

@@ -38,8 +38,8 @@ public:
   std::vector<KURLLabel*> urllabels;
 };
 
-LinksLabel::LinksLabel( TQWidget* tqparent, const char* name )
-  : TQWidget( tqparent, name )
+LinksLabel::LinksLabel( TQWidget* parent, const char* name )
+  : TQWidget( parent, name )
 {
   p = new Private;
   p->tqlayout = new TQHBoxLayout( this );

kig/modes/linkslabel.h

@@ -33,7 +33,7 @@ class LinksLabel : public TQWidget
   TQ_OBJECT
 
 public:
-  LinksLabel( TQWidget* tqparent = 0, const char* name = 0 );
+  LinksLabel( TQWidget* parent = 0, const char* name = 0 );
   ~LinksLabel();
 
   class LinksLabelEditBuf

kig/modes/macrowizard.cc

@@ -24,8 +24,8 @@
 #include <klineedit.h>
 #include <kapplication.h>
 
-MacroWizard::MacroWizard( TQWidget* tqparent, DefineMacroMode* m )
-  : MacroWizardBase( tqparent, "Define Macro Wizard", false ), mmode( m )
+MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
+  : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
 {
   connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( nameTextChanged( const TQString& ) ) );

kig/modes/macrowizard.h

@@ -27,7 +27,7 @@ class MacroWizard : public MacroWizardBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  MacroWizard( TQWidget* tqparent, DefineMacroMode* m );
+  MacroWizard( TQWidget* parent, DefineMacroMode* m );
   ~MacroWizard();
 
   void back();

kig/modes/popup.cc

@@ -871,7 +871,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup,
       add &= ! prop->inherits( BogusImp::stype() );
       // we don't want to construct PointImp's coordinate property,
       // since it would construct a point at the same place as its
-      // tqparent..
+      // parent..
       add &= ! ( o->imp()->inherits( PointImp::stype() ) &&
                  prop->inherits( PointImp::stype() ) );
     }
@@ -909,11 +909,11 @@ bool PropertiesActionsProvider::executeAction(
   }
   int propid = mprops[menu-1][id];
   assert( os.size() == 1 );
-  ObjectHolder* tqparent = os[0];
+  ObjectHolder* parent = os[0];
   if ( menu == NormalModePopupObjects::ShowMenu )
   {
     std::vector<ObjectCalcer*> args;
-    args.push_back( new ObjectPropertyCalcer( tqparent->calcer(), propid ) );
+    args.push_back( new ObjectPropertyCalcer( parent->calcer(), propid ) );
     args.back()->calc( doc.document() );
 // TODO: recover the cursor position somehow... the following does not work
 // in general...
@@ -924,14 +924,14 @@ bool PropertiesActionsProvider::executeAction(
 //  ///////    Coordinate c = Coordinate::invalidCoord();
     Coordinate c = w.fromScreen( popup.plc() );
     ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
-      TQString::tqfromLatin1( "%1" ), tqparent->calcer(), c,
+      TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
       false, args, doc.document() );
     doc.addObject( label );
   }
   else
   {
     ObjectHolder* h = new ObjectHolder(
-      new ObjectPropertyCalcer( tqparent->calcer(), propid ) );
+      new ObjectPropertyCalcer( parent->calcer(), propid ) );
     h->calc( doc.document() );
     doc.addObject( h );
   };

kig/modes/textlabelwizard.cc

@@ -26,8 +26,8 @@
 
 #include <tqlayout.h>
 
-TextLabelWizard::TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode )
-  : TextLabelWizardBase( tqparent, "TextLabelWizard", false ), mmode( mode )
+TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
+  : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
 {
   connect( labelTextInput, TQT_SIGNAL( textChanged() ),
            TQT_SLOT( textChanged() ) );

kig/modes/textlabelwizard.h

@@ -27,7 +27,7 @@ class TextLabelWizard : public TextLabelWizardBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode );
+  TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode );
   ~TextLabelWizard();
 
   void back();

kig/modes/typesdialog.cpp

@@ -58,8 +58,8 @@ MacroListElement::MacroListElement( KListView* lv, Macro* m )
 {
 }
 
-TypesDialog::TypesDialog( TQWidget* tqparent, KigPart& part )
-  : TypesDialogBase( tqparent, "types_dialog", true ), mpart( part )
+TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
+  : TypesDialogBase( parent, "types_dialog", true ), mpart( part )
 {
   // improving GUI look'n'feel...
   buttonHelp->setGuiItem( KStdGuiItem::help() );

kig/modes/typesdialog.h

@@ -46,7 +46,7 @@ class TypesDialog : public TypesDialogBase
   const KIconLoader* il;
   TQPopupMenu* popup;
 public:
-  TypesDialog( TQWidget* tqparent, KigPart& );
+  TypesDialog( TQWidget* parent, KigPart& );
   ~TypesDialog();
 
 public slots:

kig/objects/locus_imp.h

@@ -24,7 +24,7 @@
 /**
  * LocusImp is an imp that consists of a copy of the curveimp that the
  * moving point moves over, and an ObjectHierarchy that can calc (
- * given a point, and optionally some more tqparent objects the position
+ * given a point, and optionally some more parent objects the position
  * of the moving point.  The hierarchy should take the moving point as
  * its *first* argument and all others after that.  The others are
  * used to make it possible for Locus to be updated when some of the

kig/objects/object_calcer.cc

@@ -131,21 +131,21 @@ const ObjectType* ObjectTypeCalcer::type() const
   return mtype;
 }
 
-ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid )
-  : mimp( 0 ), mtqparent( tqparent ), mpropid( propid )
+ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* parent, int propid )
+  : mimp( 0 ), mparent( parent ), mpropid( propid )
 {
   // Some weird C++ thing prevents me from calling protected members
-  // of ObjectCalcer on mtqparent.. This is an ugly workaround..
-  ( mtqparent->*&ObjectCalcer::addChild )( this );
-  //mtqparent->addChild( this );
+  // of ObjectCalcer on mparent.. This is an ugly workaround..
+  ( mparent->*&ObjectCalcer::addChild )( this );
+  //mparent->addChild( this );
 }
 
 ObjectPropertyCalcer::~ObjectPropertyCalcer()
 {
   // Some weird C++ thing prevents me from calling protected members
-  // of ObjectCalcer on mtqparent.. This is an ugly workaround..
-  ( mtqparent->*&ObjectCalcer::delChild )( this );
-  //mtqparent->delChild( this );
+  // of ObjectCalcer on mparent.. This is an ugly workaround..
+  ( mparent->*&ObjectCalcer::delChild )( this );
+  //mparent->delChild( this );
   delete mimp;
 }
 
@@ -157,13 +157,13 @@ const ObjectImp* ObjectPropertyCalcer::imp() const
 std::vector<ObjectCalcer*> ObjectPropertyCalcer::parents() const
 {
   std::vector<ObjectCalcer*> ret;
-  ret.push_back( mtqparent );
+  ret.push_back( mparent );
   return ret;
 }
 
 void ObjectPropertyCalcer::calc( const KigDocument& doc )
 {
-  ObjectImp* n = mtqparent->imp()->property( mpropid, doc );
+  ObjectImp* n = mparent->imp()->property( mpropid, doc );
   delete mimp;
   mimp = n;
 }
@@ -183,7 +183,7 @@ std::vector<ObjectCalcer*> ObjectCalcer::tqchildren() const
 const ObjectImpType* ObjectPropertyCalcer::impRequirement(
   ObjectCalcer*, const std::vector<ObjectCalcer*>& ) const
 {
-  return mtqparent->imp()->impRequirementForProperty( mpropid );
+  return mparent->imp()->impRequirementForProperty( mpropid );
 }
 
 const ObjectImpType* ObjectConstCalcer::impRequirement(
@@ -276,9 +276,9 @@ void ObjectTypeCalcer::move( const Coordinate& to, const KigDocument& doc )
     mtype->move( *this, to, doc );
 }
 
-ObjectCalcer* ObjectPropertyCalcer::tqparent() const
+ObjectCalcer* ObjectPropertyCalcer::parent() const
 {
-  return mtqparent;
+  return mparent;
 }
 
 ObjectCalcer::ObjectCalcer()
@@ -303,8 +303,8 @@ bool ObjectConstCalcer::isDefinedOnOrThrough( const ObjectCalcer* ) const
 
 bool ObjectPropertyCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const
 {
-  return o == mtqparent &&
-    mtqparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() );
+  return o == mparent &&
+    mparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() );
 }
 
 bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const

kig/objects/object_calcer.h

@@ -90,7 +90,7 @@ public:
    */
   void addChild( ObjectCalcer* c );
   /**
-   * a calcer should call this in its destructor, to inform its tqparent
+   * a calcer should call this in its destructor, to inform its parent
    * that it is no longer a child of this calcer.  This will release
    * the reference taken in addChild..
    */
@@ -106,7 +106,7 @@ public:
 
   virtual ~ObjectCalcer();
   /**
-   * Returns the tqparent ObjectCalcer's of this ObjectCalcer.
+   * Returns the parent ObjectCalcer's of this ObjectCalcer.
    */
   virtual std::vector<ObjectCalcer*> parents() const = 0;
   /**
@@ -124,7 +124,7 @@ public:
    * certain type.  This method returns the ObjectImpType that \p o
    * should have. \p os is a list of all the parents in order, and
    * \p o is part of it. This method will return the ObjectImpType
-   * that the tqparent should *at least* be.  For example, a Translated
+   * that the parent should *at least* be.  For example, a Translated
    * object can translate any sort of object, so it will return
    * ObjectImp::stype() here ( the topmost ObjectImpType, that all
    * other ObjectImpType's inherit ).
@@ -267,7 +267,7 @@ public:
 };
 
 /**
- * This is an ObjectCalcer that has a single tqparent, and gets a
+ * This is an ObjectCalcer that has a single parent, and gets a
  * certain property from it in its calc() method.
  *
  * \see ObjectImp::property
@@ -276,14 +276,14 @@ class ObjectPropertyCalcer
   : public ObjectCalcer
 {
   ObjectImp* mimp;
-  ObjectCalcer* mtqparent;
+  ObjectCalcer* mparent;
   int mpropid;
 public:
   /**
    * Construct a new ObjectPropertyCalcer, that will get the property
-   * from tqparent with number propid.
+   * from parent with number propid.
    */
-  ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid );
+  ObjectPropertyCalcer( ObjectCalcer* parent, int propid );
   ~ObjectPropertyCalcer();
 
   const ObjectImp* imp() const;
@@ -291,7 +291,7 @@ public:
   void calc( const KigDocument& doc );
 
   int propId() const;
-  ObjectCalcer* tqparent() const;
+  ObjectCalcer* parent() const;
 
   const ObjectImpType* impRequirement(
     ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) const;

kig/objects/object_factory.cc

@@ -266,12 +266,12 @@ ObjectCalcer* ObjectFactory::getAttachPoint(
 }
 
 ObjectHolder* ObjectFactory::attachedLabel(
-  const TQString& s, ObjectCalcer* locationtqparent,
+  const TQString& s, ObjectCalcer* locationparent,
   const Coordinate& loc, bool needframe,
   const std::vector<ObjectCalcer*>& parents,
   const KigDocument& doc ) const
 {
-  return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, parents, doc ) );
+  return new ObjectHolder( attachedLabelCalcer( s, locationparent, loc, needframe, parents, doc ) );
 }
 
 ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer(
@@ -299,7 +299,7 @@ void ObjectFactory::redefinePoint(
                   std::mem_fun( calcmeth ) );
   ObjectCalcer* v = 0;
 
-  // we don't want one of our tqchildren as a tqparent...
+  // we don't want one of our tqchildren as a parent...
   std::set<ObjectCalcer*> tqchildren = getAllChildren( point );
   for ( std::vector<ObjectCalcer*>::iterator i = os.begin();
         i != os.end(); ++i )

kig/objects/object_factory.h

@@ -108,10 +108,10 @@ public:
 
   /**
    * this one does the same as the above, only that the new label is
-   * attached to locationtqparent if it is non-null..
+   * attached to locationparent if it is non-null..
    */
   ObjectTypeCalcer* attachedLabelCalcer(
-    const TQString& s, ObjectCalcer* locationtqparent,
+    const TQString& s, ObjectCalcer* locationparent,
     const Coordinate& loc, bool needframe,
     const std::vector<ObjectCalcer*>& parents,
     const KigDocument& doc ) const;
@@ -121,11 +121,11 @@ public:
    * attach point from the method above
    */
   ObjectCalcer* getAttachPoint(
-    ObjectCalcer* locationtqparent,
+    ObjectCalcer* locationparent,
     const Coordinate& loc,
     const KigDocument& doc ) const;
   ObjectHolder* attachedLabel(
-    const TQString& s, ObjectCalcer* locationtqparent,
+    const TQString& s, ObjectCalcer* locationparent,
     const Coordinate& loc, bool needframe,
     const std::vector<ObjectCalcer*>& parents,
     const KigDocument& doc ) const;

kig/objects/object_imp.cc

@@ -178,7 +178,7 @@ bool ObjectImp::canFillInNextEscape() const
   return false;
 }
 
-ObjectImpType::ObjectImpType( const ObjectImpType* tqparent,
+ObjectImpType::ObjectImpType( const ObjectImpType* parent,
                               const char* internalname,
                               const char* translatedname,
                               const char* selectstatement,
@@ -189,7 +189,7 @@ ObjectImpType::ObjectImpType( const ObjectImpType* tqparent,
                               const char* attachtothisstatement,
                               const char* showastatement,
                               const char* hideastatement )
-  : mtqparent( tqparent ), minternalname( internalname ),
+  : mparent( parent ), minternalname( internalname ),
     mtranslatedname( translatedname ), mselectstatement( selectstatement ),
     mselectnamestatement( selectnamestatement ),
     mremoveastatement( removeastatement ), maddastatement( addastatement ),
@@ -207,7 +207,7 @@ ObjectImpType::~ObjectImpType()
 
 bool ObjectImpType::inherits( const ObjectImpType* t ) const
 {
-  return t == this || (mtqparent && mtqparent->inherits( t ) );
+  return t == this || (mparent && mparent->inherits( t ) );
 }
 
 const char* ObjectImpType::internalName() const

kig/objects/object_imp.h

@@ -87,7 +87,7 @@ typedef unsigned int uint;
  */
 class ObjectImpType
 {
-  const ObjectImpType* mtqparent;
+  const ObjectImpType* mparent;
   const char* minternalname;
   const char* mtranslatedname;
   const char* mselectstatement;
@@ -126,12 +126,12 @@ public:
    * hideastatement is a translatable string like "Hide a Segment"
    *
    * All translatable strings should have
-   * I18N_NOOP around them !  @param tqparent is the ObjectImpType of
-   * your tqparent ObjectImp type.  Never give 0 as tqparent, except for
+   * I18N_NOOP around them !  @param parent is the ObjectImpType of
+   * your parent ObjectImp type.  Never give 0 as parent, except for
    * the top ObjectImp ObjectImpType..
    */
   ObjectImpType(
-    const ObjectImpType* tqparent, const char* internalname,
+    const ObjectImpType* parent, const char* internalname,
     const char* translatedname,
     const char* selectstatement,
     const char* selectnamestatement,

kig/objects/object_imp_factory.cc

@@ -48,25 +48,25 @@ ObjectImpFactory::~ObjectImpFactory()
 {
 }
 
-static void addXYElements( const Coordinate& c, TQDomElement& tqparent, TQDomDocument& doc )
+static void addXYElements( const Coordinate& c, TQDomElement& parent, TQDomDocument& doc )
 {
   TQDomElement xe = doc.createElement( "x" );
   xe.appendChild(
     doc.createTextNode(
       TQString::number( c.x ) ) );
-  tqparent.appendChild( xe );
+  parent.appendChild( xe );
   TQDomElement ye = doc.createElement( "y" );
   ye.appendChild(
     doc.createTextNode(
       TQString::number( c.y ) ) );
-  tqparent.appendChild( ye );
+  parent.appendChild( ye );
 }
 
-static void addDoubleElement( const char* name, double d, TQDomElement& tqparent, TQDomDocument& doc )
+static void addDoubleElement( const char* name, double d, TQDomElement& parent, TQDomDocument& doc )
 {
   TQDomElement e = doc.createElement( name );
   e.appendChild( doc.createTextNode( TQString::number( d ) ) );
-  tqparent.appendChild( e );
+  parent.appendChild( e );
 }
 
 static void addCoordinateElement( const char* name, const Coordinate& d, TQDomElement& p, TQDomDocument& doc )
@@ -76,40 +76,40 @@ static void addCoordinateElement( const char* name, const Coordinate& d, TQDomEl
   p.appendChild( e );
 }
 
-TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent,
+TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
                                      TQDomDocument& doc ) const
 {
   if( d.inherits( IntImp::stype() ) )
   {
-    tqparent.appendChild(
+    parent.appendChild(
       doc.createTextNode(
         TQString::number( static_cast<const IntImp&>( d ).data() ) ) );
     return TQString::tqfromLatin1( "int" );
   }
   else if ( d.inherits( DoubleImp::stype() ) )
   {
-    tqparent.appendChild(
+    parent.appendChild(
       doc.createTextNode(
         TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) );
     return TQString::tqfromLatin1( "double" );
   }
   else if( d.inherits( StringImp::stype() ) )
   {
-    tqparent.appendChild(
+    parent.appendChild(
       doc.createTextNode(
         static_cast<const StringImp&>( d ).data() ) );
     return TQString::tqfromLatin1( "string" );
   }
   else if ( d.inherits( TestResultImp::stype() ) )
   {
-    tqparent.appendChild(
+    parent.appendChild(
       doc.createTextNode(
         static_cast<const TestResultImp&>( d ).data() ) );
     return TQString::tqfromLatin1( "testresult" );
   }
   else if( d.inherits( HierarchyImp::stype() ) )
   {
-    static_cast<const HierarchyImp&>( d ).data().serialize( tqparent, doc );
+    static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc );
     return TQString::tqfromLatin1( "hierarchy" );
   }
   else if ( d.inherits( TransformationImp::stype() ) )
@@ -128,20 +128,20 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
         matrixe.appendChild( elel );
       };
     }
-    tqparent.appendChild( matrixe );
+    parent.appendChild( matrixe );
 
     TQDomElement homothetye = doc.createElement( "homothetic" );
     const char* ishomothety = trans.isHomothetic() ? "true" : "false";
     homothetye.appendChild( doc.createTextNode( ishomothety ) );
-    tqparent.appendChild( homothetye );
+    parent.appendChild( homothetye );
 
     return TQString::tqfromLatin1( "transformation" );
   }
   else if( d.inherits( AbstractLineImp::stype() ) )
   {
     LineData l = static_cast<const AbstractLineImp&>( d ).data();
-    addCoordinateElement( "a", l.a, tqparent, doc );
-    addCoordinateElement( "b", l.b, tqparent, doc );
+    addCoordinateElement( "a", l.a, parent, doc );
+    addCoordinateElement( "b", l.b, parent, doc );
     if( d.inherits( SegmentImp::stype() ) )
       return TQString::tqfromLatin1( "segment" );
     else if( d.inherits( RayImp::stype() ) )
@@ -151,34 +151,34 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
   else if( d.inherits( PointImp::stype() ) )
   {
     addXYElements( static_cast<const PointImp&>( d ).coordinate(),
-                   tqparent, doc );
+                   parent, doc );
     return TQString::tqfromLatin1( "point" );
   }
   else if( d.inherits( TextImp::stype() ) )
   {
     TQString text = static_cast<const TextImp&>( d ).text();
-    tqparent.appendChild(
+    parent.appendChild(
       doc.createTextNode( text ) );
     return TQString::tqfromLatin1( "text" );
   }
   else if( d.inherits( AngleImp::stype() ) )
   {
-    addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), tqparent, doc );
+    addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc );
     return TQString::tqfromLatin1( "angle" );
   }
   else if ( d.inherits( ArcImp::stype() ) )
   {
     const ArcImp& a = static_cast<const ArcImp&>( d );
-    addCoordinateElement( "center", a.center(), tqparent, doc );
-    addDoubleElement( "radius", a.radius(), tqparent, doc );
-    addDoubleElement( "startangle", a.startAngle(), tqparent, doc );
-    addDoubleElement( "angle", a.angle(), tqparent, doc );
+    addCoordinateElement( "center", a.center(), parent, doc );
+    addDoubleElement( "radius", a.radius(), parent, doc );
+    addDoubleElement( "startangle", a.startAngle(), parent, doc );
+    addDoubleElement( "angle", a.angle(), parent, doc );
     return TQString::tqfromLatin1( "arc" );
   }
   else if( d.inherits( VectorImp::stype() ) )
   {
     Coordinate dir = static_cast<const VectorImp&>( d ).dir();
-    addXYElements( dir, tqparent, doc );
+    addXYElements( dir, parent, doc );
     return TQString::tqfromLatin1( "vector" );
   }
   else if( d.inherits( LocusImp::stype() ) )
@@ -190,29 +190,29 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
     const CurveImp& curveimp = *locus.curve();
     TQString type = serialize( curveimp, curve, doc );
     curve.setAttribute( "type", type );
-    tqparent.appendChild( curve );
+    parent.appendChild( curve );
 
     // serialize the hierarchy..
     TQDomElement hier = doc.createElement( "calculation" );
     locus.hierarchy().serialize( hier, doc );
-    tqparent.appendChild( hier );
+    parent.appendChild( hier );
 
     return TQString::tqfromLatin1( "locus" );
   }
   else if( d.inherits( CircleImp::stype() ) )
   {
     const CircleImp& c = static_cast<const CircleImp&>( d );
-    addCoordinateElement( "center", c.center(), tqparent, doc );
-    addDoubleElement( "radius", c.radius(), tqparent, doc );
+    addCoordinateElement( "center", c.center(), parent, doc );
+    addDoubleElement( "radius", c.radius(), parent, doc );
     return TQString::tqfromLatin1( "circle" );
   }
   else if( d.inherits( ConicImp::stype() ) )
   {
     const ConicPolarData data = static_cast<const ConicImp&>( d ).polarData();
-    addCoordinateElement( "focus1", data.focus1, tqparent, doc );
-    addDoubleElement( "pdimen", data.pdimen, tqparent, doc );
-    addDoubleElement( "ecostheta0", data.ecostheta0, tqparent, doc );
-    addDoubleElement( "esintheta0", data.esintheta0, tqparent, doc );
+    addCoordinateElement( "focus1", data.focus1, parent, doc );
+    addDoubleElement( "pdimen", data.pdimen, parent, doc );
+    addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc );
+    addDoubleElement( "esintheta0", data.esintheta0, parent, doc );
     return TQString::tqfromLatin1( "conic" );
   }
   else if( d.inherits( CubicImp::stype() ) )
@@ -229,7 +229,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
     addDoubleElement( "a112", data.coeffs[7], coeffs, doc );
     addDoubleElement( "a122", data.coeffs[8], coeffs, doc );
     addDoubleElement( "a222", data.coeffs[9], coeffs, doc );
-    tqparent.appendChild( coeffs );
+    parent.appendChild( coeffs );
     return TQString::tqfromLatin1( "cubic" );
   }
   assert( false );
@@ -285,7 +285,7 @@ static double readDoubleElement( TQDomNode n, bool& ok,
 }
 
 ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
-                                          const TQDomElement& tqparent,
+                                          const TQDomElement& parent,
                                           TQString& error ) const
 {
 #define KIG_GENERIC_PARSE_ERROR \
@@ -298,27 +298,27 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   bool ok = true;
   if ( type == "int" )
   {
-    int ret = tqparent.text().toInt( &ok );
+    int ret = parent.text().toInt( &ok );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     return new IntImp( ret );
   }
   else if ( type == "double" )
   {
-    double ret = tqparent.text().toDouble( &ok );
+    double ret = parent.text().toDouble( &ok );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     return new DoubleImp( ret );
   }
   else if ( type == "string" )
   {
-    return new StringImp( tqparent.text() );
+    return new StringImp( parent.text() );
   }
   else if ( type == "testresult" )
   {
-    return new TestResultImp( tqparent.text() );
+    return new TestResultImp( parent.text() );
   }
   else if ( type == "hierarchy" )
   {
-    ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( tqparent, error );
+    ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( parent, error );
     if ( ! hier ) return 0;
     HierarchyImp* imp = new HierarchyImp( *hier );
     delete hier;
@@ -328,7 +328,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   {
     double data[3][3];
     bool homothetic = false;
-    for ( TQDomElement childe = tqparent.firstChild().toElement();
+    for ( TQDomElement childe = parent.firstChild().toElement();
           ! childe.isNull(); childe = childe.nextSibling().toElement() )
     {
       if ( childe.tagName() == "matrix" )
@@ -357,13 +357,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if ( type == "point" )
   {
-    Coordinate ret = readXYElements( tqparent, ok );
+    Coordinate ret = readXYElements( parent, ok );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     return new PointImp( ret );
   }
   else if ( type == "line" || type == "segment" || type == "ray" )
   {
-    TQDomNode n = tqparent.firstChild();
+    TQDomNode n = parent.firstChild();
     Coordinate a = readCoordinateElement( n, ok, "a" );
     if ( !ok ) KIG_GENERIC_PARSE_ERROR;
     n = n.nextSibling();
@@ -375,13 +375,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if( type == "angle" )
   {
-    double size = readDoubleElement( tqparent.firstChild(), ok, "size" );
+    double size = readDoubleElement( parent.firstChild(), ok, "size" );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     return new AngleImp( Coordinate(), 0, size );
   }
   else if ( type == "arc" )
   {
-    TQDomNode n = tqparent.firstChild();
+    TQDomNode n = parent.firstChild();
     Coordinate center = readCoordinateElement( n, ok, "center" );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     n = n.nextSibling();
@@ -397,13 +397,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if( type == "vector" )
   {
-    Coordinate dir = readXYElements( tqparent, ok );
+    Coordinate dir = readXYElements( parent, ok );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
     return new VectorImp( Coordinate(), dir );
   }
   else if( type == "locus" )
   {
-    TQDomElement curvee = tqparent.firstChild().toElement();
+    TQDomElement curvee = parent.firstChild().toElement();
     if ( curvee.isNull() || curvee.tagName() != "curve" ) KIG_GENERIC_PARSE_ERROR;
     TQString type = curvee.attribute( "type" );
     ObjectImp* oi = deserialize( type, curvee, error );
@@ -417,7 +417,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if( type == "circle" )
   {
-    TQDomNode n = tqparent.firstChild();
+    TQDomNode n = parent.firstChild();
     Coordinate center = readCoordinateElement( n, ok, "center" );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
 
@@ -429,7 +429,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if( type == "conic" )
   {
-    TQDomNode n = tqparent.firstChild();
+    TQDomNode n = parent.firstChild();
     Coordinate focus1 = readCoordinateElement( n, ok, "focus1" );
     if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
 
@@ -450,7 +450,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
   }
   else if( type == "cubic" )
   {
-    TQDomElement coeffse = tqparent.firstChild().toElement();
+    TQDomElement coeffse = parent.firstChild().toElement();
     if ( coeffse.isNull() || coeffse.tagName() != "coefficients" )
       KIG_GENERIC_PARSE_ERROR;
 

kig/objects/object_imp_factory.h

@@ -27,14 +27,14 @@ class ObjectImpFactory
 public:
   static const ObjectImpFactory* instance();
   /**
-   * loads data from \p tqparent , and returns a new ObjectImp from the type
+   * loads data from \p parent , and returns a new ObjectImp from the type
    * string \p type .
    */
-  ObjectImp* deserialize( const TQString& type, const TQDomElement& tqparent, TQString& error ) const;
+  ObjectImp* deserialize( const TQString& type, const TQDomElement& parent, TQString& error ) const;
   /**
-   * adds data to \p tqparent , and returns a type string..
+   * adds data to \p parent , and returns a type string..
    */
-  TQString serialize( const ObjectImp& d, TQDomElement& tqparent, TQDomDocument& doc ) const;
+  TQString serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const;
 };
 
 #endif

kig/objects/other_type.cc

@@ -182,7 +182,7 @@ Args CopyObjectType::sortArgs( const Args& args ) const
 
 bool CopyObjectType::isDefinedOnOrThrough( const ObjectImp*, const Args& ) const
 {
-  // TODO: vragen aan tqparent ?
+  // TODO: vragen aan parent ?
   // TODO: translate the above TODO ?
   return false;
 }

kig/pykig/pykig.py

@@ -457,9 +457,9 @@ class Property(PropObj):
     genealogia:
       Property <- PropObj <- KigDOP <- object
   """
-  def __init__(self, type, tqparent, shown, name, internal,
+  def __init__(self, type, parent, shown, name, internal,
                width, pointstyle, linestyle, color):
-    PropObj.__init__(self, True, type, (tqparent,), shown, name, internal,
+    PropObj.__init__(self, True, type, (parent,), shown, name, internal,
                width, pointstyle, linestyle, color)
 #    print shown
 

kig/scripting/newscriptwizard.cc

@@ -56,8 +56,8 @@ NewScriptWizard::~NewScriptWizard()
   }
 }
 
-NewScriptWizard::NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode )
-  : NewScriptWizardBase( tqparent, "New Script Wizard" ),
+NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
+  : NewScriptWizardBase( parent, "New Script Wizard" ),
     mmode( mode )
 {
   document = KTextEditor::EditorChooser::createDocument( 0, "KTextEditor::Document" );

kig/scripting/newscriptwizard.h

@@ -38,7 +38,7 @@ class NewScriptWizard
   TQ_OBJECT
   ScriptModeBase* mmode;
 public:
-  NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode );
+  NewScriptWizard( TQWidget* parent, ScriptModeBase* mode );
   ~NewScriptWizard();
 
   void back();

kiten/configdictionaries.cpp

@@ -26,8 +26,8 @@
 
 #include "configdictionaries.moc"
 
-ConfigDictionaries::ConfigDictionaries(TQWidget *tqparent, const char* name, WFlags f) :
-	ConfigDictionariesBase(tqparent, name, f)
+ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlags f) :
+	ConfigDictionariesBase(parent, name, f)
 {
 	changed = false;
 	config = Config::self();

kiten/configdictionaries.h

@@ -29,7 +29,7 @@ class ConfigDictionaries : public ConfigDictionariesBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ConfigDictionaries(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0);
+	ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
 	void readDictionaries();
         
 	// KConfig stuff

kiten/edict

@@ -1335,7 +1335,7 @@
 ちょぼちょぼ /(adj-na,adv,n) sparsely/drop-by-drop/
 ちょろい /(adj) easy/simple/
 ちょろちょろ /(adv,n,vs) in trickles/
-ちょんぼ /(n,vs) aptqparent and grievous error/mistake/blunder/goof/
+ちょんぼ /(n,vs) apparent and grievous error/mistake/blunder/goof/
 ちょんまげ /(n) topknot (hair style)/
 ちょん切る [ちょんぎる] /(v5r) to chop something off (e.g. head)/to snip off/to fire/
 ちらちら /(adv,n,vs) fluttering/flickering/intermittently/(P)/
@@ -5521,7 +5521,7 @@
 ガストロノミック /gastronomic/
 ガスパイプライン /(n) gas pipeline/
 ガスボンベ /gas bomb/(P)/
-ガスマスク /(n) gas tqmask/(P)/
+ガスマスク /(n) gas mask/(P)/
 ガスマット /aluminum-foil burner liner (trans: gas mat)/
 ガス液 [ガスえき] /(n) gas liquor/
 ガス化学工業 [ガスかがくこうぎょう] /(n) gas chemical industry/
@@ -10792,7 +10792,7 @@
 デスビキャップ /(abbr) (engine) distributor cap/
 デスペレート /(adj-na) desperate/
 デスポティズム /despotism/
-デスマスク /(n) death tqmask/
+デスマスク /(n) death mask/
 デスマッチ /fight to a finish (trans: death match)/desperate struggle/
 デタッチトコート /detached coat/
 デタレントギャップ /deterrent gap/
@@ -11934,7 +11934,7 @@
 ネットプライス /net price/
 ネットプレー /(n) net play/(P)/
 ネットボール /net ball/
-ネットマスク /net-tqmask/
+ネットマスク /net-mask/
 ネットワーカー /networker/
 ネットワーキング /(n) networking/
 ネットワーク /(n) network/(P)/
@@ -13985,7 +13985,7 @@
 フォアマン /foreman/(P)/
 フォグ /fog/
 フォスターチャイルド /(n) foster child/(P)/
-フォスターペアレント /foster tqparent/
+フォスターペアレント /foster parent/
 フォックス /(n) fox/
 フォックストロット /(n) fox-trot/(P)/
 フォッグライト /fog light/
@@ -15180,7 +15180,7 @@
 ペアスケーティング /pair skating/
 ペアリング /(1) pairing/(2) unmarried couple living together/(P)/
 ペアルック /(n) matching clothing worn by couples (trans: pair look)/
-ペアレント /tqparent/
+ペアレント /parent/
 ペアワイズ /pair-wise/
 ペイ /pay/(P)/
 ペイテレビ /(n) pay TV/
@@ -16028,7 +16028,7 @@
 マスカラ /mascara/
 マスキュリン /masculine/
 マスキング /(n) masking/
-マスク /(n) tqmask/(P)/
+マスク /(n) mask/(P)/
 マスゲーム /(n) mass game/(P)/
 マスコット /(n) mascot/(P)/
 マスコミ /(n) (abbr) mass communication/(P)/
@@ -19233,7 +19233,7 @@
 圧粉磁心 [あっぷんじしん] /(n) dust core/
 圧密 [あつみつ] /(n) consolidation/
 圧密降伏応力 [あつみつこうふくおうりょく] /consolidation yield stress/
-圧面 [べしみ] /(n) beshimi/type of Noh tqmask with a slanted mouth, bulging eyes and large nostrils/
+圧面 [べしみ] /(n) beshimi/type of Noh mask with a slanted mouth, bulging eyes and large nostrils/
 圧力 [あつりょく] /(n,vs) stress/pressure/(P)/
 圧力を加える [あつりょくをくわえる] /(exp) to apply pressure to/to press/
 圧力釜 [あつりょくがま] /(n) pressure vessel/
@@ -19294,9 +19294,9 @@
 絢文 [けんぶん] /colorful pattern/
 絢爛 [けんらん] /(adj-na,n) gorgeous/brilliant/dazzling/gaudy/
 絢爛たる [けんらんたる] /(adj-t) dazzling/gorgeous/flowery (speech)/
-絢緞子 [あやどんす] /datqmask/
+絢緞子 [あやどんす] /damask/
 綾を成して [あやをなして] /in beautiful patterns/
-綾錦 [あやにしき] /(n) twill datqmask and brocade/
+綾錦 [あやにしき] /(n) twill damask and brocade/
 綾絹 [あやぎぬ] /(n) twilled silk fabric/
 綾子 [りんず] /(n) figured satin/
 綾糸 [あやいと] /(n) colored thread/thread of cat's cradle/heddle thread/
@@ -19305,7 +19305,7 @@
 綾織 [あやおり] /(n) twill (fabric)/
 綾織り [あやおり] /(n) twill (fabric)/
 綾織物 [あやおりもの] /(n) figured cloth/twill fabric/
-綾布 [あやぬの] /(n) twill datqmask and brocade/
+綾布 [あやぬの] /(n) twill damask and brocade/
 綾羅 [りょうら] /(n) elaborated cloth/figured silk and thin silk/
 鮎 [あゆ] /(n) sweetfish (freshwater trout)/
 鮎魚女 [あいなめ] /(n) greenling (fish)/
@@ -20582,7 +20582,7 @@
 育ての親 [そだてのおや] /(n) foster parents/
 育てる [そだてる] /(v1,vt) to raise/to rear/to bring up/(P)/
 育て上げる [そだてあげる] /(v1) to raise (to maturity)/to rear/to train/to educate/
-育て親 [そだておや] /foster tqparent/
+育て親 [そだておや] /foster parent/
 育て方 [そだてかた] /method of bringing up/method of raising/
 育む [はぐくむ] /(v5m) to raise/to rear/to bring up/(P)/
 育英 [いくえい] /(n) education/(P)/
@@ -21601,7 +21601,7 @@
 一目散 [いちもくさん] /(n) at full speed/as fast as one can go/
 一目散に [いちもくさんに] /(adv) at full speed/
 一目置く [いちもくおく] /(v5k) to take off one's hat to a person/to acknowledge anothers superiority/to give a piece or stone/
-一目瞭然 [いちもくりょうぜん] /(adj-na,n) aptqparent/obvious/very clear/
+一目瞭然 [いちもくりょうぜん] /(adj-na,n) apparent/obvious/very clear/
 一問 [いちもん] /(n) a question/(P)/
 一問一答 [いちもんいっとう] /(n) answering question by question/
 一門 [いちもん] /(n) the family/dependents/household/kin/clan/(P)/
@@ -24584,7 +24584,7 @@
 王立 [おうりつ] /(n) royal/(P)/
 翁 [おう] /(n) old man/venerable/(P)/
 翁 [おきな] /(n) old man/venerable/
-翁の面 [おきなのめん] /old mans tqmask/
+翁の面 [おきなのめん] /old mans mask/
 翁貝 [おきながい] /lantern shell/
 襖 [ふすま] /(n) sliding screen/(P)/
 鴬 [うぐいす] /(n) (Japanese) nightingale/
@@ -25443,7 +25443,7 @@
 化けの皮 [ばけのかわ] /(n) masking one's true character/disguise/sheep's clothing/
 化けの皮を現す [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/
 化けの皮を現わす [ばけのかわをあらわす] /(exp) to expose one's true colors (character)/
-化けの皮を剥ぐ [ばけのかわをはぐ] /(exp) to untqmask/
+化けの皮を剥ぐ [ばけのかわをはぐ] /(exp) to unmask/
 化ける [ばける] /(v1) to appear in disguise/to take the form of/to change for the worse/(P)/
 化ける [ふける] /(v1) to change with age/to spoil from weathering/
 化けチェック [ばけチェック] /parity check (data, memory, etc.)/
@@ -25552,7 +25552,7 @@
 仮に [かりに] /(adv) temporarily/provisionally/for example/for argument's sake/(P)/
 仮にも [かりにも] /(adv) even for an instant/even as a joke/
 仮の宿り [かりのやどり] /temporary dwelling/this transient world/
-仮の親 [かりのおや] /foster tqparent/expedient tqparent/
+仮の親 [かりのおや] /foster parent/expedient parent/
 仮の世 [かりのよ] /(n) this transient world/
 仮の名 [かりのな] /alias/assumed name/
 仮の命 [かりのいのち] /this transient life/
@@ -25574,7 +25574,7 @@
 仮採用 [かりさいよう] /(n) appointment on trial (probation)/provisional appointment/
 仮作 [かさく] /(n) a fiction/
 仮刷り [かりずり] /(n) proof printing/
-仮死 [かし] /(n) asphyxiation/aptqparent death/
+仮死 [かし] /(n) asphyxiation/apparent death/
 仮歯 [かし] /(n) false tooth/
 仮字 [かな] /(n) (uk) Japanese syllabary (alphabets)/kana/
 仮執行 [かりしっこう] /(n) provisional execution/
@@ -25686,7 +25686,7 @@
 仮免 [かりめん] /(n) temporary licence/provisional licence/
 仮免許 [かりめんきょ] /(n) temporary license/
 仮免状 [かりめんじょう] /(n) temporary certificate/
-仮面 [かめん] /(n) (1) tqmask/(2) disguise/(P)/
+仮面 [かめん] /(n) (1) mask/(2) disguise/(P)/
 仮面劇 [かめんげき] /(n) masque/
 仮面舞踏会 [かめんぶとうかい] /masquerade ball/
 仮役 [かりやく] /temporary post/
@@ -33544,7 +33544,7 @@
 鬼百合 [おにゆり] /(n) tiger lily/
 鬼武者 [おにむしゃ] /daredevil warrior/
 鬼兵隊 [きへいたい] /cavalry/
-鬼面 [きめん] /(n) tqmask of a devil/startling appearance/devil's face/
+鬼面 [きめん] /(n) mask of a devil/startling appearance/devil's face/
 鬼面伝心 [きめんでんしん] /of a fearsome countenance, but kind as a Buddha/
 鬼門 [きもん] /(n) the northeastern (unlucky) direction/person or thing to be avoided/
 鬼蓮 [おにばす] /(n) prickly water lily/
@@ -34090,7 +34090,7 @@
 逆らう [さからう] /(v5u) to go against/to oppose/to disobey/to defy/(P)/
 逆ポーランド式 [ぎゃくポーランドしき] /reverse Polish notation/RPN/
 逆運 [ぎゃくうん] /(n) a twist of fate/
-逆縁 [ぎゃくえん] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a tqparent for a child/
+逆縁 [ぎゃくえん] /(n) (1) (Buddh) bad deed which ultimately results in the creation of a good Buddhist/(2) older person conducting a funeral service for a younger relative, in particular, a parent for a child/
 逆回転 [ぎゃくかいてん] /(n) spinning the opposite way/backspin (tennis, baseball)/counter/
 逆巻く [さかまく] /(v5k) surging water or waves/
 逆関数 [ぎゃくかんすう] /(n) (math) the inverse function/
@@ -38941,7 +38941,7 @@
 継室 [けいしつ] /(n) second wife/
 継承 [けいしょう] /(n,vs) inheritance/succession/accession/(P)/
 継承者 [けいしょうしゃ] /successor/
-継親 [ままおや] /(n) steptqparent/
+継親 [ままおや] /(n) stepparent/
 継走 [けいそう] /(n) relay race/
 継息子 [ままむすこ] /(n) stepson/
 継続 [けいぞく] /(n,vs) continuation/(P)/
@@ -40527,7 +40527,7 @@
 見え透く [みえすく] /(v5k) to be transparent/
 見かけ [みかけ] /(n) outward appearance/
 見かける [みかける] /(v1) to (happen to) see/to notice/to catch sight of/
-見かけ上 [みかけじょう] /(adj-no) aptqparent/
+見かけ上 [みかけじょう] /(adj-no) apparent/
 見くびる [みくびる] /(v5r) to underrate/to belittle/to look down on/to despise/
 見すぼらしい [みすぼらしい] /(adj) shabby/seedy/
 見す見す [みすみす] /(adv) (uk) before one's own eyes/from under one's very nose/(P)/
@@ -42181,7 +42181,7 @@
 狐 [きつね] /(n) fox/(P)/
 狐に化かされる [きつねにばかされる] /(exp) to be deceived by a fox/
 狐の嫁入り [きつねのよめいり] /(n) rain shower while the sun shines/
-狐の面 [きつねのめん] /tqmask of the fox/
+狐の面 [きつねのめん] /mask of the fox/
 狐を落とす [きつねをおとす] /(exp) to exorcise a fox spirit (from a person)/
 狐猿 [きつねざる] /(n) lemur/
 狐火 [きつねび] /(n) St. Elmo's fire/will-o'-the-wisp/
@@ -46624,7 +46624,7 @@
 黒焼け [くろやけ] /(n) charring/something charred/
 黒焦げ [くろこげ] /(n) something burnt black/
 黒色 [こくしょく] /(n) black colour/(P)/
-黒色尉 [こくしきじょう] /Old Black Joe (a noh tqmask)/
+黒色尉 [こくしきじょう] /Old Black Joe (a noh mask)/
 黒色火薬 [こくしょくかやく] /black powder/gunpowder/
 黒色癌 [こくしょくがん] /melanocarcinoma/melanotic carcinoma/
 黒色腫 [こくしょくしゅ] /melanoma/
@@ -50539,8 +50539,8 @@
 子ども達 [こどもたち] /(n) tqchildren/
 子の刻 [ねのこく] /midnight/
 子の時 [ねのとき] /midnight/
-子を見ること親に如かず [こをみることおやにしかず] /(exp) The tqparent is the best judge of the child/
-子を見る事親に如かず [こをみることおやにしかず] /(exp) The tqparent is the best judge of the child/
+子を見ること親に如かず [こをみることおやにしかず] /(exp) The parent is the best judge of the child/
+子を見る事親に如かず [こをみることおやにしかず] /(exp) The parent is the best judge of the child/
 子を宿す [こをやどす] /(exp) to be pregnant with a child/
 子マダム [こマダム] /wealthy women who strive to follow the fashions exactly and be seen in all the right place/
 子安貝 [こやすかい] /cowrie shell/
@@ -50590,7 +50590,7 @@
 子殺し [こごろし] /(n) infanticide/
 子子孫孫 [ししそんそん] /(n) posterity/one's descendants/
 子飼い [こがい] /(n) protege/
-子持ち [こもち] /(n) person with kid(s)/tqparent/
+子持ち [こもち] /(n) person with kid(s)/parent/
 子持昆布 [こもちこんぶ] /kelp with herring roe (sushi type)/
 子鹿 [こじか] /(n) fawn/
 子爵 [ししゃく] /(n) viscount/
@@ -51310,7 +51310,7 @@
 獅子身中の虫 [しししんちゅうのむし] /(n) treacherous friend/
 獅子唐 [ししとう] /(n) green pepper/
 獅子唐辛子 [ししとうがらし] /small sweet green pepper/
-獅子頭 [ししがしら] /(n) lion tqmask/
+獅子頭 [ししがしら] /(n) lion mask/
 獅子鼻 [ししばな] /(n) pug nose/
 獅子舞 [ししまい] /(n) lion dance/
 獅子舞い [ししまい] /(n) lion dance/
@@ -51619,7 +51619,7 @@
 視神経 [ししんけい] /(n) optic nerve/
 視診 [ししん] /(n) visual examination/
 視線 [しせん] /(n) one's eyes/glance/look/(P)/
-視地平 [しちへい] /aptqparent horizon/
+視地平 [しちへい] /apparent horizon/
 視聴 [しちょう] /(n) attention/(P)/
 視聴覚 [しちょうかく] /(n) the senses of seeing and hearing/audiovisual/
 視聴覚機器 [しちょうかくきき] /audiovisual aids/
@@ -52120,7 +52120,7 @@
 似非事 [えせごと] /laughable affair/unlaudable affair/something unreliable/
 似非者 [えせもの] /(n) sham/fraud/counterfeit/impostor/pretender/
 似非笑い [えせわらい] /(n) smirk/affected smile/
-似非親 [えせおや] /(n) distant disinterested tqparent/
+似非親 [えせおや] /(n) distant disinterested parent/
 似非理屈 [えせりくつ] /sophistry/
 似付かわしい [につかわしい] /(adj) suitable/appropriate/becoming/
 似付く [につく] /(v5k) to become/to suit/to be like/to match well/
@@ -53534,7 +53534,7 @@
 実情 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/(P)/
 実情調査委員会 [じつじょうちょうさいいんかい] /(n) fact-finding committee/
 実状 [じつじょう] /(n) real condition/actual circumstances/actual state of affairs/
-実親 [じつおや] /(n) true tqparent(s) (as opposed to foster parents, etc.)/
+実親 [じつおや] /(n) true parent(s) (as opposed to foster parents, etc.)/
 実数 [じっすう] /(n) real number/(P)/
 実数体 [じっすうたい] /(n) real number field/
 実勢 [じっせい] /(adj-no,n) actual/real/true/(P)/
@@ -56925,11 +56925,11 @@
 銃猟 [じゅうりょう] /(n) shooting/hunting/
 銃連射 [じゅうれんしゃ] /rapid (weapons) fire/hail of bullets/
 叔世 [しゅくせい] /age of decline (said of a nation)/
-叔父 [おじ] /(n) uncle (younger than one's tqparent)/(P)/
-叔父 [しゅくふ] /(n) uncle (younger than one's tqparent)/
+叔父 [おじ] /(n) uncle (younger than one's parent)/(P)/
+叔父 [しゅくふ] /(n) uncle (younger than one's parent)/
 叔父さん [おじさん] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/
-叔母 [おば] /(n) aunt (younger than one's tqparent)/(P)/
-叔母 [しゅくぼ] /(n) aunt (younger than one's tqparent)/
+叔母 [おば] /(n) aunt (younger than one's parent)/(P)/
+叔母 [しゅくぼ] /(n) aunt (younger than one's parent)/
 叔母さん [おばさん] /(n) (1) aunt/(2) middle-aged lady/(P)/
 夙 [しゅく] /bright and early/early in life/long ago/for a long time/
 夙に [つとに] /(adv) bright and early/early in life/long ago/for a long time/
@@ -58482,7 +58482,7 @@
 女振り [おんなぶり] /(n) woman-like/feminine/
 女神 [じょしん] /(n) goddess/(P)/
 女神 [めがみ] /(n) goddess/
-女親 [おんなおや] /(n) female tqparent/
+女親 [おんなおや] /(n) female parent/
 女人 [にょにん] /(n) women/
 女人禁制 [にょにんきんせい] /prohibited to women/
 女垂らし [おんなたらし] /(n) guy who knows how to play the ladies/skillful playboy/lady-killer/philanderer/Don Juan/
@@ -62910,11 +62910,11 @@
 親しむ [したしむ] /(v5m) to be intimate with/to befriend/(P)/
 親に逆らう [おやにさからう] /(exp) to disobey one's parents/
 親に早く死なれる [おやにはやくしなれる] /(exp) to be orphaned while still young/
-親に叛く [おやにそむく] /(exp) to disobey one's tqparent(s)/
+親に叛く [おやにそむく] /(exp) to disobey one's parent(s)/
 親に迄見放される [おやにまでみはなされる] /(exp) to be the despair of one's parents/
 親の気質を承ける [おやのきしつをうける] /(exp) to inherit one's parents disposition/
 親の言う事を聞く [おやのいうことをきく] /(exp) to obey one's parents/
-親の七光 [おやのななひかり] /(exp) capitalizing on the fame of a tqparent/riding a tqparent's coat-tails/
+親の七光 [おやのななひかり] /(exp) capitalizing on the fame of a parent/riding a parent's coat-tails/
 親の情 [おやのじょう] /parental love/
 親の代 [おやのだい] /one's parents' generation/
 親を苦しめる [おやをくるしめる] /(exp) to cause one's parents distress/
@@ -62926,9 +62926,9 @@
 親王 [しんのう] /(n) prince of royal blood/Imperial prince/
 親王妃 [しんのうひ] /Imperial princess/
 親画面 [おやがめん] /main screen/
-親会社 [おやがいしゃ] /(n) tqparent company/(P)/
+親会社 [おやがいしゃ] /(n) parent company/(P)/
 親掛かり [おやがかり] /(adj-no,n) dependent on one's parents/
-親株 [おやかぶ] /(n) tqparent root or stock/pre-split stock or share/
+親株 [おやかぶ] /(n) parent root or stock/pre-split stock or share/
 親機 [おやき] /(n) main telephone (esp. when there are extensions)/
 親許 [おやもと] /(n) one's parents/one's parents' home/one's home/
 親局 [おやきょく] /(n) (computer) master station/
@@ -62939,7 +62939,7 @@
 親権 [しんけん] /(n) parental authority/
 親権者 [しんけんしゃ] /person exercising parental authority/
 親元 [おやもと] /(n) one's parents/one's parents' home/one's home/
-親御 [おやご] /(n) another's tqparent(s)/
+親御 [おやご] /(n) another's parent(s)/
 親交 [しんこう] /(n) intimacy/(P)/
 親好 [しんこう] /(n) friendship/good fellowship/
 親孝行 [おやこうこう] /(adj-na,n) filial piety/(P)/
@@ -62948,19 +62948,19 @@
 親骨 [おやぼね] /(n) ribs of a folding fan/
 親祭 [しんさい] /(n) rites conducted by the emperor/
 親裁 [しんさい] /(n) matter personally decided by the emperor/
-親子 [おやこ] /(n) tqparent and child/(P)/
-親子 [しんし] /(n) tqparent and child/
-親子関係 [おやこかんけい] /(n) tqparent-child relationship/
+親子 [おやこ] /(n) parent and child/(P)/
+親子 [しんし] /(n) parent and child/
+親子関係 [おやこかんけい] /(n) parent-child relationship/
 親子電話 [おやこでんわ] /extension phone (and its main line)/
-親子丼 [おやこどん] /(n) chicken and egg on rice/tqparent and child donburi/
-親子丼 [おやこどんぶり] /(n) chicken and egg on rice/tqparent and child donburi/
+親子丼 [おやこどん] /(n) chicken and egg on rice/parent and child donburi/
+親子丼 [おやこどんぶり] /(n) chicken and egg on rice/parent and child donburi/
 親思い [おやおもい] /(n) love or affection for one's parents/
 親指 [おやゆび] /(n) thumb/(P)/
 親字 [おやじ] /(n) first character (of a dictionary entry)/
 親署 [しんしょ] /(n) signature of an emperor or noble/
 親書 [しんしょ] /(n) handwritten or autograph letter/(P)/
 親勝り [おやまさり] /(adj-na,n) surpassing one's parents/
-親譲り [おやゆずり] /(n) inheritance from a tqparent/(P)/
+親譲り [おやゆずり] /(n) inheritance from a parent/(P)/
 親心 [おやごころ] /(n) parental love or affection/
 親身 [しんみ] /(adj-na,n) relative/kind/cordial/
 親政 [しんせい] /(n) direct Imperial rule/
@@ -62977,11 +62977,11 @@
 親疎 [しんそ] /(n) degree of intimacy/
 親族 [しんぞく] /(n) relatives/(P)/
 親族関係 [しんぞくかんけい] /(n) kinship/
-親代わり [おやがわり] /(n) (one acting as a) foster tqparent/
+親代わり [おやがわり] /(n) (one acting as a) foster parent/
 親知らず [おやしらず] /(n) wisdom tooth/
 親柱 [おやばしら] /(n) main pillar/
 親潮 [おやしお] /(n) the Kurile Current/
-親鳥 [おやどり] /(n) tqparent bird/
+親鳥 [おやどり] /(n) parent bird/
 親展 [しんてん] /(n) confidential/
 親展書 [しんてんしょ] /confidential letter/
 親電 [しんでん] /(n) telegram sent by an emperor or head of state/
@@ -69778,7 +69778,7 @@
 礎石 [そせき] /(n) foundation stone/cornerstone/(P)/
 祖 [そ] /(n) ancestor/forefather/progenitor/(P)/
 祖型 [そけい] /(n) prototype/
-祖語 [そご] /(n) a tqparent language/
+祖語 [そご] /(n) a parent language/
 祖国 [そこく] /(n) fatherland/native country/(P)/
 祖国愛 [そこくあい] /patriotism/
 祖国復帰 [そこくふっき] /returning to one's fatherland/
@@ -69926,7 +69926,7 @@
 素敵 [すてき] /(adj-na,n) lovely/dreamy/beautiful/great/fantastic/superb/cool/capital/(P)/
 素読 [そどく] /(n) reading without comprehending/
 素読み [すよみ] /(n) reading without comprehending/reading a second draft without checking it against the original/
-素破抜く [すっぱぬく] /(v5k) to disclose/to expose/to untqmask/
+素破抜く [すっぱぬく] /(v5k) to disclose/to expose/to unmask/
 素泊まり [すどまり] /(n) staying overnight without board/
 素泊り [すどまり] /(n) staying overnight without meals/
 素肌 [すはだ] /(n) bare (naked) body/complexion (e.g., face)/
@@ -73319,7 +73319,7 @@
 台無しにする [だいなしにする] /(exp) to spoil/to ruin/to destroy/to make a mess of/
 台無しになる [だいなしになる] /(exp) to come to nothing/to be spoiled/
 台名 [たいめい] /command of a shogun or a high official/
-台木 [だいぎ] /(n) (gun) stock/unworked block of wood/tqparent-tree stock (in grafting)/
+台木 [だいぎ] /(n) (gun) stock/unworked block of wood/parent-tree stock (in grafting)/
 台覧 [たいらん] /(n) inspection by the empress or the crown prince/
 台臨 [たいりん] /(n) visit by the empress or the crown prince/
 台輪 [だいわ] /(n) architrave/
@@ -75097,7 +75097,7 @@
 男色 [なんしょく] /(n) sodomy/male homosexuality/
 男心 [おとこごころ] /(n) male instincts/male frivolity/
 男振り [おとこぶり] /(n) manliness/good-looking/
-男親 [おとこおや] /(n) father/male tqparent/
+男親 [おとこおや] /(n) father/male parent/
 男性 [だんせい] /(n) male/man/(P)/
 男性ホルモン [だんせいホルモン] /(n) male hormone/
 男性的 [だんせいてき] /(adj-na) manly/(P)/
@@ -78730,7 +78730,7 @@
 弟子 [ていし] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/
 弟子 [でし] /(n) pupil/disciple/adherent/follower/apprentice/young person/teacher's student-helper/(P)/
 弟子入り [でしいり] /(n) apprenticeship/enrolling/(P)/
-弟小父 [おとおじ] /tqparent's younger brother/uncle/
+弟小父 [おとおじ] /parent's younger brother/uncle/
 弟息子 [おとうとむすこ] /(n) younger sons/
 弟息子 [おとむすこ] /(n) younger sons/
 弟弟子 [おとうとでし] /(n) pupil/new disciple/
@@ -85471,7 +85471,7 @@
 能弁 [のうべん] /(adj-na,n) eloquence/oratory/
 能弁家 [のうべんか] /orator/
 能無し [のうなし] /(n) incompetence/ne'er-do-well/
-能面 [のうめん] /(n) Noh tqmask/(P)/
+能面 [のうめん] /(n) Noh mask/(P)/
 能役者 [のうやくしゃ] /(n) noh actor/
 能吏 [のうり] /(n) able official/capable official/
 能率 [のうりつ] /(n) efficiency/(P)/
@@ -86475,12 +86475,12 @@
 伯仲 [はくちゅう] /(n,vs) match someone/be equal with/(P)/
 伯備線 [はくびせん] /Hakubi Line (West Tottori-Okayama Railway)/
 伯夫人 [はくふじん] /(n) countess/
-伯父 [おじ] /(n) (hum) uncle (older than one's tqparent)/(P)/
-伯父 [はくふ] /(n) (hum) uncle (older than one's tqparent)/
+伯父 [おじ] /(n) (hum) uncle (older than one's parent)/(P)/
+伯父 [はくふ] /(n) (hum) uncle (older than one's parent)/
 伯父さん [おじさん] /(n) (hon) (uk) middle-aged gentleman/uncle/(P)/
 伯父貴 [おじき] /(n) uncle/
-伯母 [おば] /(n) (hum) aunt (older than one's tqparent)/(P)/
-伯母 [はくぼ] /(n) (hum) aunt (older than one's tqparent)/
+伯母 [おば] /(n) (hum) aunt (older than one's parent)/(P)/
+伯母 [はくぼ] /(n) (hum) aunt (older than one's parent)/
 伯母さん [おばさん] /(n) (hon) aunt/(P)/
 伯林 [べるりん] /Berlin/
 伯剌西爾 [ぶらじる] /Brazil/
@@ -91241,7 +91241,7 @@
 舞う [まう] /(v5u,vi) to dance/to flutter about/to revolve/(P)/
 舞を舞う [まいをまう] /(exp) to dance/to perform a dance/
 舞楽 [ぶがく] /(n) court dance and music/(P)/
-舞楽面 [ぶがくめん] /(n) tqmask worn by a bugaku dancer/
+舞楽面 [ぶがくめん] /(n) mask worn by a bugaku dancer/
 舞妓 [まいこ] /(n) (Kyoto) dancing girl/
 舞曲 [ぶきょく] /(n) musical dance/music and dancing/
 舞子 [まいこ] /(n) apprentice geisha/dancing girl/
@@ -91883,7 +91883,7 @@
 複利 [ふくり] /(n) compound interest/(P)/
 複利法 [ふくりほう] /(n) compound interest method/
 覆い [おおい] /(n) mantle/cover/shroud/
-覆い隠す [おおいかくす] /(v5s) to tqmask/to cover/
+覆い隠す [おおいかくす] /(v5s) to mask/to cover/
 覆う [おおう] /(v5u) to cover/to hide/to conceal/to wrap/to disguise/(P)/
 覆す [くつがえす] /(v5s) to overturn/to upset/to overthrow/to undermine/(P)/
 覆った説 [くつがえったせつ] /overthrown theory/
@@ -91894,7 +91894,7 @@
 覆土 [ふくど] /(n,vs) covering up seeds with soil/
 覆没 [ふくぼつ] /(n,vs) capsizing and sinking/
 覆滅 [ふくめつ] /(n) ruination/
-覆面 [ふくめん] /(n) tqmask/veil/disguise/(P)/
+覆面 [ふくめん] /(n) mask/veil/disguise/(P)/
 覆輪 [ふくりん] /(n) ornamental border/
 淵 [ふち] /(n) deep pool/abyss/the depths/(P)/
 淵源 [えんげん] /(n) origin/
@@ -93716,7 +93716,7 @@
 片手鍋 [かたてなべ] /(n) single-handled pot/
 片手落ち [かたておち] /(adj-na,n) one-sided/partial/unfair/
 片十字締め [かたじゅうじじめ] /cross choke/
-片親 [かたおや] /(n) a or one tqparent/
+片親 [かたおや] /(n) a or one parent/
 片身 [かたみ] /(n) one side of a body/
 片刃 [かたは] /(n) single-edged blade/
 片前 [かたまえ] /(n) single-breasted (jacket, etc.)/
@@ -94390,7 +94390,7 @@
 母子草 [ははこぐさ] /(n) cottonweed/
 母子年金 [ぼしねんきん] /allowance for fatherless families/
 母子寮 [ぼしりょう] /(n) home for mothers and tqchildren/
-母集団 [ぼしゅうだん] /(n) population (statistics)/tqparent set/
+母集団 [ぼしゅうだん] /(n) population (statistics)/parent set/
 母上 [ははうえ] /(n) (pol) mother/
 母親 [ははおや] /(n) mother/(P)/
 母性 [ぼせい] /(n) maternal/(P)/
@@ -95150,7 +95150,7 @@
 亡き後 [なきあと] /(n-adv,n-t) after one's death/
 亡き魂 [なきたま] /departed soul/spirit/
 亡き者 [なきもの] /(n) dead person/
-亡き親 [なきおや] /deceased tqparent/
+亡き親 [なきおや] /deceased parent/
 亡き人 [なきひと] /(n) the deceased/
 亡き母 [なきはは] /dead mother/
 亡くす [なくす] /(v5s) (1) to lose something/(2) to get rid of/(3) to lose someone (wife, child, etc.)/(P)/
@@ -95174,7 +95174,7 @@
 亡失 [ぼうしつ] /(n) loss/
 亡者 [もうじゃ] /(n) the dead/
 亡状 [ぼうじょう] /(n) discourtesy/lawlessness/
-亡親 [ぼうしん] /deceased tqparent/
+亡親 [ぼうしん] /deceased parent/
 亡祖父 [ぼうそふ] /deceased (one's late) grandfather/
 亡夫 [ぼうふ] /(n) my deceased husband/my late husband/(P)/
 亡婦 [ぼうふ] /(n) deceased wife/deceased lady/
@@ -95504,7 +95504,7 @@
 防御部隊 [ぼうぎょぶたい] /defending forces/
 防御率 [ぼうぎょりつ] /(n) earned run average (ERA)/
 防護 [ぼうご] /(n) protection/(P)/
-防護マスク [ぼうごマスク] /protective tqmask/
+防護マスク [ぼうごマスク] /protective mask/
 防護壁 [ぼうごへき] /(n) protective wall/
 防砂林 [ぼうさりん] /(n) stand of trees planted to control the movement of sand/
 防塞 [ぼうさい] /(n) fort/
@@ -95549,7 +95549,7 @@
 防長官 [ぼうちょうかん] /Secretary of Defence/
 防敵 [ぼうてき] /(n) rainproof/treated against drops of water penetrating/
 防毒 [ぼうどく] /(n) gasproofing/
-防毒面 [ぼうどくめん] /(n) gas tqmask/
+防毒面 [ぼうどくめん] /(n) gas mask/
 防熱 [ぼうねつ] /(n) heat resistance/
 防波堤 [ぼうはてい] /(n) breakwater/mole/(P)/
 防犯 [ぼうはん] /(n) prevention of crime/(P)/
@@ -97777,7 +97777,7 @@
 名筆 [めいひつ] /(n) outstanding work of calligraphy/
 名品 [めいひん] /(n) fine product/masterpiece/
 名付ける [なづける] /(v1) to name (someone)/(P)/
-名付け親 [なづけおや] /(n) godtqparent/
+名付け親 [なづけおや] /(n) godparent/
 名物 [めいぶつ] /(n) famous product/special product/speciality/specialty/(P)/
 名分 [めいぶん] /(n) justification/just cause/moral duty/
 名文 [めいぶん] /(n) famous literary composition/
@@ -97870,7 +97870,7 @@
 明々 [あかあか] /(adv) brightly lit/lit up/
 明々と [あかあかと] /(adv) brilliantly/clearly/flaming/
 明々後日 [しあさって] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/
-明々白々 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/
+明々白々 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/
 明い [あかるい] /(io) (adj) bright/cheerful/
 明かす [あかす] /(v5s) to pass/spend/to reveal/to divulge/(P)/
 明かり [あかり] /(n) lamplight/light (in general)/brightness/(P)/
@@ -97976,7 +97976,7 @@
 明明 [あかあか] /(adv) brightly lit/lit up/
 明明と [あかあかと] /(adv) brilliantly/clearly/flaming/
 明明後日 [しあさって] /(n-adv,n-t) (uk) (in) three days time (two days after tomorrow)/(P)/
-明明白白 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly aptqparent/
+明明白白 [めいめいはくはく] /(n,adj-no,adj-na) perfectly evident/as clear as day/strikingly apparent/
 明滅 [めいめつ] /(n,vs) flickering/blinking/
 明亮 [めいりょう] /(adj-na,n) lucid/clear/plain/
 明瞭 [めいりょう] /(adj-na,n) clarity/(P)/
@@ -98169,13 +98169,13 @@
 緬甸 [めんでん] /Burma/
 面 [おも] /(n) face/
 面 [おもて] /(n) face/(P)/
-面 [つら] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/
-面 [めん] /(n,n-suf) face/mug/surface/facial features/tqmask/face guard/side or facet/corner/page/(P)/
+面 [つら] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/
+面 [めん] /(n,n-suf) face/mug/surface/facial features/mask/face guard/side or facet/corner/page/(P)/
 面々 [めんめん] /(n) each one/all/every direction/(P)/
 面する [めんする] /(vs-s) to face on/to look out on to/(P)/
 面と向かって [めんとむかって] /right to one's face/
 面を取る [めんをとる] /(exp) to plane off the corners/
-面を着ける [めんをつける] /(exp) to put a tqmask on/
+面を着ける [めんをつける] /(exp) to put a mask on/
 面影 [おもかげ] /(n) face/looks/vestiges/trace/(P)/
 面映ゆい [おもはゆい] /(adj) embarrassed/self-conscious/bashful/abashed/
 面汚し [つらよごし] /(n) disgrace/shame/
@@ -98753,7 +98753,7 @@
 目溢し [めこぼし] /(n) connivance/overlook/
 目印 [めじるし] /(n,vs) mark/sign/landmark/(P)/
 目引き袖引き [めひきそでひき] /catching someone's attention by winking and tugging at their sleeve/
-目隠し [めかくし] /(n) eye bandage/blinkers/tqmask/(board) screen/
+目隠し [めかくし] /(n) eye bandage/blinkers/mask/(board) screen/
 目映い [まばゆい] /(adj) dazzling/glaring/dazzlingly beautiful/
 目縁 [まぶち] /(n) eyelid/
 目下 [めした] /(n) subordinate(s)/inferior(s)/junior/(P)/
@@ -102111,7 +102111,7 @@
 里子 [さとご] /(n) foster child/(P)/
 里心 [さとごころ] /(n) homesickness/nostalgia/
 里神楽 [さとかぐら] /(n) kagura performance held somewhere other than a palace/
-里親 [さとおや] /(n) foster tqparent(s)/(P)/
+里親 [さとおや] /(n) foster parent(s)/(P)/
 里人 [さとびと] /(n) villager/village folk/countryfolk/
 里人 [りじん] /(n) villager/village folk/countryfolk/
 里数 [りすう] /(n) mileage/distance/
@@ -106709,7 +106709,7 @@
 綸子 [りんず] /(n) figured satin/
 緘口 [かんこう] /(n) keeping silent/
 緘黙 [かんもく] /(n) keeping silent/
-緞子 [どんす] /(n) silk datqmask/satin datqmask/
+緞子 [どんす] /(n) silk damask/satin damask/
 緞帳 [どんちょう] /(n) thick curtain/drop curtain/
 緻密 [ちみつ] /(adj-na,n) minute/fine/delicate/accurate/elaborate/
 縊り殺す [くびりころす] /(v5s) to strangle to death/

kiten/edict_doc.html

@@ -392,7 +392,7 @@ ktb	Kantou-ben
 tsb	Tosa-ben
 </PRE>
 <P>
-In the case of gairaigo which have a meaning which is not aptqparent from the
+In the case of gairaigo which have a meaning which is not apparent from the
 original (English) words, the literal transcription is included, with
 the tag (lit).
 </P>

kiten/kanjidic

@@ -1446,7 +1446,7 @@
 臣 3F43 U81e3 B131 G4 S7 F1249 N3837 V4894 H3068 DK1948 L848 K981 O527 DO435 MN30068 MP9.0386 E512 IN835 DS436 DT484 DJ1003 DG1805 P3-3-4 I2t4.3 Q7171.7 DR3475 Ychen2 Wsin シン ジン T1 おみ たか と とみ み {retainer} {subject} 
 芯 3F44 U82af B140 S7 S8 F2202 N3905 V4976 H2423 L2368 MN30732X MP9.0536 P2-3-4 I3k4.2 Q4433.0 ZRP2-4-4 ZSP2-3-4 Yxin1 Yxin4 Wsim シン {wick} 
 薪 3F45 U85aa B140 G8 S16 F2182 N4069 V5222 H2374 DK1538 L1503 K2024 DO1560 MN32149P MP9.0963 E1445 IN1910 DJ1838 DG669 P2-3-13 I3k13.3 Q4492.1 DR1954 Yxin1 Wsin シン たきぎ まき {fuel} {firewood} {kindling} 
-親 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin シン おや おや- した.しい した.しむ T1 ぎ ちか のり {tqparent} {intimacy} {relative} {familiarity} {dealer (cards)} 
+親 3F46 U89aa B147 G2 S16 F406 N4293 V5534 H1799 DK1172 L1504 K381 O2544 DO211 MN34918 MP10.0332 E149 IN175 DS260 DT237 DC315 DJ249 DB3.6 DG1647 P1-9-7 I5b11.1 Q0691.0 DR457 Yqin1 Yqing4 Wchin シン おや おや- した.しい した.しむ T1 ぎ ちか のり {parent} {intimacy} {relative} {familiarity} {dealer (cards)} 
 診 3F47 U8a3a B149 G8 S12 F1019 N4338 V5586 H1504 DK1008 L1724 K1069 DO1081 MN35337 MP10.0422 E1440 IN1214 DJ1361 DG1674 P1-7-5 I7a5.9 Q0862.2 DR3060 Yzhen3 Yzhen1 Wjin シン み.る {checkup} {seeing} {diagnose} {examine} 
 身 3F48 U8eab B158 G3 S7 F320 N4601 V5928 H3553 DK2213 L1248 K331 O546 DO791 MN38034 MP10.0968 E323 IN59 DS255 DT285 DC174 DJ394 DG1768 P4-7-3 I0a7.5 Q2740.0 DR847 ZPP4-7-4 Yshen1 Yjuan1 Wsin シン み {somebody} {person} {one's station in life} 
 辛 3F49 U8f9b B160 G8 S7 F1607 N4646 V5996 H2038 DK1287 L1496 K1628 O493 DO1312 MN38630 MP10.1072 E1432 IN1487 DJ344 DG1784 P2-2-5 I5b2.2 Q0040.1 DR455 ZPP2-5-2 Yxin1 Wsin シン から.い つら.い -づら.い かのと {spicy} {bitter} {hot} {acrid} 
@@ -2674,7 +2674,7 @@
 棉 4C49 U68c9 B75 S12 N2295 V2741 H988 L2512 DO539 MN14919 MP6.0389 P1-4-8 I4a8.18 Q4692.7 Ymian2 Wmyeon メン わた {cotton} 
 綿 4C4A U7dbf B120 G5 S14 F1495 N3566 V4531 H1373 DK929 L1367 K854 O2538 MN27592 MP8.1109 E798 IN1191 DS725 DT803 DJ881 DG1544 P1-6-8 I6a8.8 Q2692.7 DR2744 Ymian2 Wmyeon メン わた T1 う {cotton} 
 緬 4C4B U7dec B120 S15 N3574 V4542 H1390 MN27674 MP8.1130 P1-6-9 I6a9.12 Q2196.0 Ymian3 Wmyeon メン ベン {fine thread} {Burma} 
-面 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon メン ベン おも おもて つら T1 お ずら ほおつき も {tqmask} {face} {features} {surface} 
+面 4C4C U9762 B176 G3 S9 XJ16737 F186 N5087 V6566 H2087 DK1324 L1892 K165 O904 DO321 MN42618 MP12.0140 E395 IN274 DS322 DT347 DC117 DJ438 DB2.16 DG1876 P2-2-7 I3s6.1 Q1060.0 DR3176 ZPP3-5-4 Ymian4 Wmyeon メン ベン おも おもて つら T1 お ずら ほおつき も {mask} {face} {features} {surface} 
 麺 4C4D U9eba B199 S16 XJ07351 XJ16C70 F2331 N5389 V7038 L2752 O2910 MN47827X MP12.0936 P3-7-9 Q4124.6 Q4140.6 ZRP3-11-9 Ymian4 Wmyeon メン ベン むぎこ {noodles} {wheat flour} 
 摸 4C4E U6478 B64 S13 N1974 V2250 H691 O1836 MN12644X MP5.0371 P1-3-10 I3c10.13 Q5403.4 ZRP1-3-11 Ymo1 Ymo2 Wmo Wmag モ モウ バク ボ マク {search} {imitate} {copy} 
 模 4C4F U6a21 B75 G6 S14 F668 N2345 V2825 H1050 DK720 L229 K691 O2104 DO1218 MN15453X MP6.0533 E980 IN1425 DT980 DJ1160 DG1109 P1-4-10 I4a10.16 Q4493.4 DR1863 Ymo2 Ymu2 Wmo モ ボ T1 がみ {imitation} {copy} {tqmock} 
@@ -2822,7 +2822,7 @@
 痢 4E21 U75e2 B104 G8 S12 F2037 N3049 V3810 H3283 DK2063 L1687 K1455 DO1716 MN22213 MP7.1177 E1895 IN1811 DJ1737 DG1355 P3-5-7 I5i7.2 Q0012.0 DR543 Yli4 Wri リ {diarrhea} 
 裏 4E22 U88cf B8 C145 G6 S13 F812 N327 V5462 H2138 DK1354 L399 K755 O2176 DO1076 MN34294 MP10.0216 E992 IN273 DT969 DJ436 DG1627 P2-2-11 I2j11.2 Q0073.2 DR465 Yli3 Wri リ うら {back} {amidst} {in} {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} 
 裡 4E23 U88e1 B145 S12 XH327 N4235 V5463 H1196 L2973 MN34295 MP10.0217 P1-5-7 Q3621.4 Yli3 Wri リ うち うら {reverse} {inside} {palm} {sole} {rear} {lining} {wrong side} 
-里 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri リ さと T1 さ {ri} {village} {tqparent's home} {league} 
+里 4E24 U91cc B166 G2 S7 F1096 N4813 V6206 H3542 DK2206 L173 K1077 O517 DO101 MN40131 MP11.0412 E219 IN142 DS332 DT154 DJ1025 DG1801 P4-7-1 I0a7.9 Q6010.4 DR3672 Yli3 Wri リ さと T1 さ {ri} {village} {parent's home} {league} 
 離 4E25 U96e2 B172 G8 S18 F555 N5040 V6517 H1836 DK1195 L1492 K641 O2889 DO909 MN42140X MP11.1042 E1897 IN1281 DJ1008 DG1857 P1-10-8 I8c10.3 Q0041.4 DR475 ZSP1-11-8 Yli2 Wri リ はな.れる はな.す {detach} {separation} {disjoin} {digress} 
 陸 4E26 U9678 B170 G4 S11 F736 N5005 V6461 H543 DK399 L1513 K651 O1312 DO193 MN41708 MP11.0912 E597 IN647 DS529 DT579 DC445 DJ833 DG740 P1-3-8 I2d8.4 Q7421.4 DR3672 ZSP1-2-8 Ylu4 Yliu4 Wryug リク ロク おか T1 くが たち みち む むつ {land} {six} 
 律 4E27 U5f8b B60 G6 S9 F992 N1608 V1740 H363 DK268 L874 K1048 O787 DO526 MN10097 MP4.0825 E993 IN667 DS877 DT895 DJ519 DG627 P1-3-6 I3i6.1 Q2520.7 DR2055 Ylu:4 Wryul リツ リチ レツ T1 たかし のり {rhythm} {law} {regulation} {gauge} {control} 
@@ -4980,7 +4980,7 @@
 緘 6548 U7dd8 B120 S15 N3577 V4545 MN27638 MP8.1115 P1-6-9 I6a9.16 Q2395.0 Yjian1 Wham カン かん.する と.じる {shut} {seal} 
 緝 6549 U7ddd B120 S15 V4537 O2658 MN27645 MP8.1120 P1-6-9 I6a9.9 Q2694.1 Yji1 Yqi1 Yqi4 Wjib Wjeub シュウ つむ.ぐ {spin thread} {bring together} {shine} 
 緤 654A U7de4 B120 S15 V4538 MN27657 MP8.1125 P1-6-9 I6a9.6 Q2499.4 Yxie4 Wseol セツ セチ きずな つな.ぐ {leash} 
-緞 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ドン タン {datqmask} 
+緞 654B U7dde B120 S15 N3578 V4546 MN27646 MP8.1121 P1-6-9 I6a9.4 Q2794.7 Yduan4 Wdan Wha ドン タン {damask} 
 緻 654C U7dfb B120 S15 F2460 N3575 V4557 MN27700 MP8.1137 P1-6-9 I6a10.1 Q2894.0 Yzhi4 Wchi チ こまか.い {fine (i.e. not coarse)} 
 緲 654D U7df2 B120 S15 V4539 MN27687 MP8.1133 P1-6-9 I6a9.3 Q2992.0 Ymiao3 Wmyo ビョウ ミョウ {faint} {far off} 
 緡 654E U7de1 B120 S15 XJ1542F N3573 V4541 MN27652 MP8.1122 P1-6-9 I6a9.5 Q2796.4 Ymin2 Wmin ビン コン ミン さし つりいと なわ ぜにさし {paper string} 

kiten/kiten.cpp

@@ -46,7 +46,7 @@
 
 #include <cassert>
 
-TopLevel::TopLevel(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name)
+TopLevel::TopLevel(TQWidget *parent, const char *name) : KMainWindow(parent, name)
 {
 #if KDE_VERSION > 305
 	    setStandardToolBarMenuEnabled(true);

kiten/kiten.h

@@ -44,7 +44,7 @@ class KDE_EXPORT TopLevel : public KMainWindow
   TQ_OBJECT
 
 public:
-	TopLevel(TQWidget *tqparent = 0, const char *name = 0);
+	TopLevel(TQWidget *parent = 0, const char *name = 0);
     ~TopLevel();
 
 signals:

kiten/kromajiedit.cpp

@@ -28,8 +28,8 @@
 
 #include "kromajiedit.h"
 
-KRomajiEdit::KRomajiEdit(TQWidget *tqparent, const char *name)
-	: KLineEdit(tqparent, name)
+KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name)
+	: KLineEdit(parent, name)
 {
 	kana = "unset";
 

kiten/kromajiedit.h

@@ -36,7 +36,7 @@ class KRomajiEdit : public KLineEdit
   TQ_OBJECT
 	
 	public:
-	KRomajiEdit(TQWidget *tqparent, const char *name);
+	KRomajiEdit(TQWidget *parent, const char *name);
 	~KRomajiEdit();
 
 	public slots:

kiten/learn.cpp

@@ -46,8 +46,8 @@
 #include "ksaver.h"
 #include "learn.h"
 
-LearnItem::LearnItem(TQListView *tqparent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8)
-	: TQListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8)
+LearnItem::LearnItem(TQListView *parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8)
+	: TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
 }
 
@@ -60,8 +60,8 @@ int LearnItem::compare(TQListViewItem *item, int col, bool ascending) const
 
 const int Learn::numberOfAnswers = 5;
 
-Learn::Learn(Dict::Index *parentDict, TQWidget *tqparent, const char *name)
-	: KMainWindow(tqparent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
+Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name)
+	: KMainWindow(parent, name), initialized(false), isMod(false), prevItem(0), curItem(0)
 {
 	index = parentDict;
 

kiten/learn.h

@@ -39,7 +39,7 @@ class TQTabWidget;
 class LearnItem : public TQListViewItem
 {
 public:
-	LearnItem(TQListView *tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString());
+	LearnItem(TQListView *parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString());
 	int compare(TQListViewItem *item, int col, bool ascending) const;
 };
 
@@ -49,7 +49,7 @@ class Learn : public KMainWindow
   TQ_OBJECT
 	
 	public:
-	Learn(Dict::Index *, TQWidget *tqparent = 0, const char *name = 0);
+	Learn(Dict::Index *, TQWidget *parent = 0, const char *name = 0);
 	~Learn();
 
 	bool closeWindow();

kiten/optiondialog.cpp

@@ -40,7 +40,7 @@
 #include "configlearn.h"
 #include "configsearching.h"
 
-ConfigureDialog::ConfigureDialog(TQWidget *tqparent, const char *name) : KConfigDialog(tqparent, name, Config::self())
+ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self())
 {
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
 	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));

kiten/optiondialog.h

@@ -43,7 +43,7 @@ class ConfigureDialog : public KConfigDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ConfigureDialog(TQWidget *tqparent=0, const char *name=0);
+	ConfigureDialog(TQWidget *parent=0, const char *name=0);
 	~ConfigureDialog();
 signals:
 	void settingsUpdated();

kiten/rad.cpp

@@ -218,7 +218,7 @@ Rad::~Rad()
 
 ///////////////////////////////////////////////
 
-RadWidget::RadWidget(Rad *_rad, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
+RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(parent, name)
 {
 	hotlistNum = 3;
 

kiten/rad.h

@@ -78,7 +78,7 @@ class KDE_EXPORT RadWidget : public TQWidget
   TQ_OBJECT
 
 	public:
-	RadWidget(Rad *, TQWidget *tqparent = 0, const char *name = 0);
+	RadWidget(Rad *, TQWidget *parent = 0, const char *name = 0);
 	~RadWidget();
 
 	signals:

kiten/widgets.cpp

@@ -43,8 +43,8 @@
 #include "kromajiedit.h"
 #include "widgets.h"
 
-ResultView::ResultView(bool showLinks, TQWidget *tqparent, const char *name)
-	: KTextBrowser(tqparent, name)
+ResultView::ResultView(bool showLinks, TQWidget *parent, const char *name)
+	: KTextBrowser(parent, name)
 {
 	setReadOnly(true);
 	setLinkUnderline(false);
@@ -292,8 +292,8 @@ void ResultView::updateFont()
 /////////////////////////////////////////////////////
 // nice EDICT dictionary editor
 
-eEdit::eEdit(const TQString &_filename, TQWidget *tqparent, const char *name)
-	: KMainWindow(tqparent, name)
+eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name)
+	: KMainWindow(parent, name)
 	, filename(_filename)
 {
 	List = new KListView(this);
@@ -436,8 +436,8 @@ void eEdit::del()
 /////////////////////////////////////////////////////
 // sorta taken from konqy
 
-EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name)
-    : KAction(text, accel, tqparent, name)
+EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name)
+    : KAction(text, accel, parent, name)
 {
 	m_receiver = receiver;
 	m_member = member;

kiten/widgets.h

@@ -40,7 +40,7 @@ class KDE_EXPORT ResultView : public KTextBrowser
   TQ_OBJECT
 	
 	public:
-	ResultView(bool showLinks, TQWidget *tqparent = 0, const char *name = 0);
+	ResultView(bool showLinks, TQWidget *parent = 0, const char *name = 0);
 
 	void addResult(Dict::Entry result, bool common = false);
 	void addKanjiResult(Dict::Entry, bool common = false, Radical = Radical());
@@ -70,7 +70,7 @@ class KDE_EXPORT eEdit : public KMainWindow
   TQ_OBJECT
 	
 	public:
-	eEdit(const TQString &, TQWidget *tqparent = 0, const char *name = 0);
+	eEdit(const TQString &, TQWidget *parent = 0, const char *name = 0);
 	~eEdit();
 
 	private slots:
@@ -95,7 +95,7 @@ class KDE_EXPORT EditAction : public KAction
 	Q_OBJECT
   TQ_OBJECT
 	public:
-	EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* tqparent, const char* name );
+	EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name );
 	virtual ~EditAction();
 
 	virtual int plug( TQWidget *w, int index = -1 );

klatin/klatin/klatin.cpp

@@ -32,8 +32,8 @@
 #include "klatin.h"
 #include "settings.h"
 
-KLatin::KLatin(TQWidget* tqparent, const char *name)
-	: KMainWindow(tqparent, name)
+KLatin::KLatin(TQWidget* parent, const char *name)
+	: KMainWindow(parent, name)
 {
 	m_section = 0;
 	

klatin/klatin/klatin.h

@@ -38,7 +38,7 @@ class KLatin : public KMainWindow
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KLatin(TQWidget* tqparent=0, const char *name=0);
+	KLatin(TQWidget* parent=0, const char *name=0);
 	~KLatin();
 
 	void setupActions();

klatin/klatin/klatingrammar.cpp

@@ -30,8 +30,8 @@
 
 #include "klatingrammar.h"
 
-KLatinGrammar::KLatinGrammar(TQWidget* tqparent, const char *name)
-	: KLatinGrammarWidget(tqparent, name)
+KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name)
+	: KLatinGrammarWidget(parent, name)
 {
 	// Set defaults
 	m_total = 0;

klatin/klatin/klatingrammar.h

@@ -29,7 +29,7 @@ class KLatinGrammar : public KLatinGrammarWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KLatinGrammar(TQWidget* tqparent=0, const char *name=0);
+	KLatinGrammar(TQWidget* parent=0, const char *name=0);
 	~KLatinGrammar();
 
 	/// Load next question

klatin/klatin/klatinverbs.cpp

@@ -30,8 +30,8 @@
 
 #include "klatinverbs.h"
 
-KLatinVerbs::KLatinVerbs(TQWidget* tqparent, const char *name)
-	: KLatinVerbsWidget(tqparent, name)
+KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name)
+	: KLatinVerbsWidget(parent, name)
 {
 	OKButton->setIconSet(KGlobal::iconLoader()->loadIconSet("button_ok", KIcon::Small));
 	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));

klatin/klatin/klatinverbs.h

@@ -43,7 +43,7 @@ class KLatinVerbs : public KLatinVerbsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KLatinVerbs(TQWidget* tqparent=0, const char *name=0);
+	KLatinVerbs(TQWidget* parent=0, const char *name=0);
 	~KLatinVerbs();
 
 	/// Load next question

klatin/klatin/klatinvocab.cpp

@@ -32,8 +32,8 @@
 #include "klatinvocab.h"
 #include "settings.h"
 
-KLatinVocab::KLatinVocab(TQWidget* tqparent, const char *name)
-	: KLatinVocabWidget(tqparent, name)
+KLatinVocab::KLatinVocab(TQWidget* parent, const char *name)
+	: KLatinVocabWidget(parent, name)
 {
 	BackButton->setIconSet(KGlobal::iconLoader()->loadIconSet("back", KIcon::Small));
 

klatin/klatin/klatinvocab.h

@@ -33,7 +33,7 @@ class KLatinVocab : public KLatinVocabWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-	KLatinVocab(TQWidget* tqparent=0, const char *name=0);
+	KLatinVocab(TQWidget* parent=0, const char *name=0);
 	~KLatinVocab();
 
 	/// Load vocabulary from file @p customFile

klettres/klettres/klettres.cpp

@@ -507,7 +507,7 @@ TQString KLettres::charIcon(const TQChar & c)
     p.setPen(TQt::black);
     p.drawText(r, TQt::AlignCenter, (TQString) c);
 
-    ///Create transparency tqmask
+    ///Create transparency mask
     TQBitmap bm(128, 128);
     bm.fill(TQt::color0);
     TQPainter b(&bm);

klettres/klettres/klettresview.cpp

@@ -33,10 +33,10 @@
 #include "klettresview.h"
 #include "prefs.h"
 
-KLettresView::KLettresView(KLettres *tqparent)
-        : TQWidget(tqparent)
+KLettresView::KLettresView(KLettres *parent)
+        : TQWidget(parent)
 {
-    m_klettres = tqparent;
+    m_klettres = parent;
 
     setMinimumSize( TQSize( 640, 480 ) );
     setMaximumSize( TQSize( 640, 480 ) );

klettres/klettres/klettresview.h

@@ -46,7 +46,7 @@ public:
     /**
      * Default constructor
      */
-    KLettresView(KLettres *tqparent);
+    KLettresView(KLettres *parent);
 
     /**
      * Destructor

klettres/klettres/soundfactory.cpp

@@ -33,10 +33,10 @@
 #include "prefs.h"
 
 
-SoundFactory::SoundFactory(KLettres *tqparent, const char *name)
-        : TQObject(tqparent, name)
+SoundFactory::SoundFactory(KLettres *parent, const char *name)
+        : TQObject(parent, name)
 {
-    klettres = tqparent;
+    klettres = parent;
 
     namesList = filesList = 0;
     sounds = 0;

klettres/klettres/soundfactory.h

@@ -45,7 +45,7 @@ class SoundFactory : public TQObject
 
 public:
 
-	SoundFactory(KLettres *tqparent, const char *name);
+	SoundFactory(KLettres *parent, const char *name);
 	~SoundFactory();
 	
 	///Call the main instance of the program

kmplot/kmplot/FktDlg.cpp

@@ -49,7 +49,7 @@
 
 #include <kdebug.h>
 
-FktDlg::FktDlg( TQWidget* tqparent, View *view ) : FktDlgData( tqparent, "editPlots" ), m_view(view)
+FktDlg::FktDlg( TQWidget* parent, View *view ) : FktDlgData( parent, "editPlots" ), m_view(view)
 {
 	connect( cmdCopyFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction()) );
 	connect( cmdMoveFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunction()) );

kmplot/kmplot/FktDlg.h

@@ -50,10 +50,10 @@ class FktDlg : public FktDlgData
 public:
 	/** 
 	 * The constructor gets the current parser instance
-	 * @param tqparent Parent widget.
+	 * @param parent Parent widget.
 	 * @param view points to the current view instance.
 	 */
-	FktDlg( TQWidget* tqparent, View* view );
+	FktDlg( TQWidget* parent, View* view );
 	/// Empty destructor.
 	virtual ~FktDlg();
 	/// Fill the widgets with plots contained in the parser instance.

kmplot/kmplot/MainDlg.cpp

@@ -63,7 +63,7 @@ class KmPlotIO;
 
 bool MainDlg::oldfileversion;
 
-MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name) :  DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( tqparent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget)
+MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name) :  DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget)
 {
 	// we need an instance
 	setInstance( KmPlotPartFactory::instance() );
@@ -786,11 +786,11 @@ KmPlotPartFactory::~KmPlotPartFactory()
 }
 
 KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-        TQObject *tqparent, const char *name,
+        TQObject *parent, const char *name,
         const char *, const TQStringList & )
 {
 	// Create an instance of our Part
-	MainDlg* obj = new MainDlg( parentWidget, widgetName, tqparent, name );
+	MainDlg* obj = new MainDlg( parentWidget, widgetName, parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
@@ -815,8 +815,8 @@ extern "C"
 
 
 /// BrowserExtension class
-BrowserExtension::BrowserExtension(MainDlg* tqparent)
-		: KParts::BrowserExtension( tqparent, "KmPlot::BrowserExtension" )
+BrowserExtension::BrowserExtension(MainDlg* parent)
+		: KParts::BrowserExtension( parent, "KmPlot::BrowserExtension" )
 {
 	emit enableAction("print", true);
 	setURLDropHandlingEnabled(true);
@@ -824,7 +824,7 @@ BrowserExtension::BrowserExtension(MainDlg* tqparent)
 
 void BrowserExtension::print()
 {
-	static_cast<MainDlg*>(tqparent())->slotPrint();
+	static_cast<MainDlg*>(parent())->slotPrint();
 }
 
 

kmplot/kmplot/MainDlg.h

@@ -74,11 +74,11 @@ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface
 
 public:
 	/** Constuctor.
-	 * @param parentWidget tqparent widget for this part
-	 * @param tqparent tqparent object
+	 * @param parentWidget parent widget for this part
+	 * @param parent parent object
 	 * @param name name of this dialog
 	 */
-	MainDlg(TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name);
+	MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name);
 	/// Cleaning up a bit.
 	virtual ~MainDlg();
 	/// This class needs access to private members, too.
@@ -185,7 +185,7 @@ private:
 	KmPlotIO *kmplotio;
 	/// Set to true if the application is readonly
 	bool m_readonly;
-	/// MainDlg's tqparent widget
+	/// MainDlg's parent widget
 	TQWidget *m_parent;
 	/// Current file
 	KURL m_currentfile;
@@ -222,7 +222,7 @@ public:
 	KmPlotPartFactory();
 	virtual ~KmPlotPartFactory();
 	virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-	                                        TQObject *tqparent, const char *name,
+	                                        TQObject *parent, const char *name,
 	                                        const char *classname, const TQStringList &args );
 	static KInstance* instance();
 

kmplot/kmplot/View.cpp

@@ -56,7 +56,7 @@ double View::xmin = 0;
 double View::xmax = 0;
 
 
-View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* tqparent, const char* name ) : DCOPObject("View"), TQWidget( tqparent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient())
+View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ),  buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient())
 {
 	csmode = csparam = -1;
 	cstype = 0;

kmplot/kmplot/View.h

@@ -70,7 +70,7 @@ class View : public TQWidget, virtual public ViewIface
   TQ_OBJECT
 public:
 	/// Contructor sets up the parser, too.
-  View(bool, bool &, KPopupMenu *, TQWidget* tqparent=NULL, const char* name=NULL );
+  View(bool, bool &, KPopupMenu *, TQWidget* parent=NULL, const char* name=NULL );
 	void setMinMaxDlg(KMinMax *);
 	virtual ~View();
 

kmplot/kmplot/coordsconfigdialog.cpp

@@ -32,8 +32,8 @@
 #include "settingspagecoords.h"
 #include "coordsconfigdialog.h"
 
-CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *tqparent)
-	: KConfigDialog(tqparent, "coords", Settings::self()), m_parser(p)
+CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *parent)
+	: KConfigDialog(parent, "coords", Settings::self()), m_parser(p)
 {
 	configAxesDialog = new SettingsPageCoords( 0, "coordsSettings" );
 	addPage(configAxesDialog , i18n( "Coords" ), "coords", i18n( "Edit Coordinate System" ) );

kmplot/kmplot/coordsconfigdialog.h

@@ -41,7 +41,7 @@ class CoordsConfigDialog : public KConfigDialog
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		CoordsConfigDialog(XParser *p, TQWidget *tqparent = 0);
+		CoordsConfigDialog(XParser *p, TQWidget *parent = 0);
 		~CoordsConfigDialog();
 	protected slots:
 		virtual void slotOk();

kmplot/kmplot/editfunction.cpp

@@ -56,8 +56,8 @@
 #include "editintegralpage.h"
 #include "kparametereditor.h"
 
-EditFunction::EditFunction( XParser* parser, TQWidget* tqparent, const char* name ) : 
-	KDialogBase( IconList, "Caption", Help|Ok|Cancel, Ok, tqparent, name ), m_parser(parser)
+EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name ) : 
+	KDialogBase( IconList, "Caption", Help|Ok|Cancel, Ok, parent, name ), m_parser(parser)
 {
 	TQVBox *page0 = addVBoxPage( i18n("Function"), i18n( "Function" ), SmallIcon( "func", 32 ) );
 	editfunctionpage = new EditFunctionPage( page0 );

kmplot/kmplot/editfunction.h

@@ -42,9 +42,9 @@ class EditFunction : public KDialogBase
   TQ_OBJECT
 	public:
 		/// @param parser points to the parser instance.
-		/// @param tqparent points to the tqparent widget.
+		/// @param parent points to the parent widget.
 		/// @param name of this instance.
-		EditFunction( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL );
+		EditFunction( XParser* parser, TQWidget* parent = NULL, const char* name = NULL );
 		/// Nothing special to do.
 		virtual ~EditFunction() {}
 		/// Fill the dialog's widgets with the properties of the parser function number index.

kmplot/kmplot/kconstanteditor.cpp

@@ -40,8 +40,8 @@
 #include "kconstanteditor.h"
 
 
-KConstantEditor::KConstantEditor(View *v, TQWidget *tqparent, const char *name)
-	: QConstantEditor(tqparent,name), m_view(v)
+KConstantEditor::KConstantEditor(View *v, TQWidget *parent, const char *name)
+	: QConstantEditor(parent,name), m_view(v)
 {
 	TQString str_value;
 	TQValueVector<Constant>::iterator it;

kmplot/kmplot/kconstanteditor.h

@@ -39,7 +39,7 @@ class KConstantEditor : public QConstantEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-    KConstantEditor(View *, TQWidget *tqparent = 0, const char *name = 0);
+    KConstantEditor(View *, TQWidget *parent = 0, const char *name = 0);
     ~KConstantEditor();
     
 public slots:

kmplot/kmplot/keditconstant.cpp

@@ -32,8 +32,8 @@
 
 #include "keditconstant.h"
 
-KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *tqparent, const char *name)
-	: QEditConstant(tqparent, name,TQt::WDestructiveClose), constant(c), value(v), m_parser(p)
+KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *parent, const char *name)
+	: QEditConstant(parent, name,TQt::WDestructiveClose), constant(c), value(v), m_parser(p)
 {
 	if ( constant != '0' )
 	{

kmplot/kmplot/keditconstant.h

@@ -38,7 +38,7 @@ class KEditConstant : public QEditConstant
   Q_OBJECT
   TQ_OBJECT
 public:
-    KEditConstant(XParser *p, char &, TQString &,TQWidget *tqparent = 0, const char *name = 0);
+    KEditConstant(XParser *p, char &, TQString &,TQWidget *parent = 0, const char *name = 0);
     ~KEditConstant();
    
 public slots:

kmplot/kmplot/keditparametric.cpp

@@ -41,8 +41,8 @@
 #include "xparser.h"
 #include "View.h"
 
-KEditParametric::KEditParametric( XParser* parser, TQWidget* tqparent, const char* name ) : 
-	QEditParametric( tqparent, name ), m_parser(parser)
+KEditParametric::KEditParametric( XParser* parser, TQWidget* parent, const char* name ) : 
+	QEditParametric( parent, name ), m_parser(parser)
 {
 	connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) );
 	connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) );

kmplot/kmplot/keditparametric.h

@@ -39,9 +39,9 @@ class KEditParametric : public QEditParametric
 	TQ_OBJECT
 	public:
 		/// @param parser points to the parser instance.
-		/// @param tqparent points to the tqparent widget.
+		/// @param parent points to the parent widget.
 		/// @param name of this instance.
-		KEditParametric( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL );
+		KEditParametric( XParser* parser, TQWidget* parent = NULL, const char* name = NULL );
 		/// Nothing special to do.
 		virtual ~KEditParametric() {}
 		

kmplot/kmplot/keditpolar.cpp

@@ -42,8 +42,8 @@
 #include "xparser.h"
 #include "View.h"
 
-KEditPolar::KEditPolar( XParser* parser, TQWidget* tqparent, const char* name ) : 
-	QEditPolar( tqparent, name ),m_parser(parser)
+KEditPolar::KEditPolar( XParser* parser, TQWidget* parent, const char* name ) : 
+	QEditPolar( parent, name ),m_parser(parser)
 {
 	connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) );
 	connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) );

kmplot/kmplot/keditpolar.h

@@ -39,9 +39,9 @@ class KEditPolar : public QEditPolar
 	TQ_OBJECT
 	public:
 		/// @param parser points to the parser instance.
-		/// @param tqparent points to the tqparent widget.
+		/// @param parent points to the parent widget.
 		/// @param name of this instance.
-		KEditPolar( XParser* parser, TQWidget* tqparent = NULL, const char* name = NULL );
+		KEditPolar( XParser* parser, TQWidget* parent = NULL, const char* name = NULL );
 		/// Nothing special to do.
 		virtual ~KEditPolar() {}
 		

kmplot/kmplot/kminmax.cpp

@@ -36,8 +36,8 @@
 #include "kminmax.h"
 #include "xparser.h"
 
-KMinMax::KMinMax(View *v, TQWidget *tqparent, const char *name)
-	: QMinMax(tqparent, name), m_view(v)
+KMinMax::KMinMax(View *v, TQWidget *parent, const char *name)
+	: QMinMax(parent, name), m_view(v)
 {
 	m_mode=-1;
 	connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ));

kmplot/kmplot/kminmax.h

@@ -38,7 +38,7 @@ class KMinMax : public QMinMax
 Q_OBJECT
   TQ_OBJECT
 public:
-    KMinMax(View *, TQWidget *tqparent = 0, const char *name = 0);
+    KMinMax(View *, TQWidget *parent = 0, const char *name = 0);
     /// called every time the dialog is opened
     void init(char);
     /// update the list with functions

kmplot/kmplot/kmplotio.h

@@ -60,7 +60,7 @@ class KmPlotIO
 	private:
 		/** Esay way to add a tag to the Dom tree
 		 * @param &doc The document.
-		 * @param parentTag The tqparent tag to support encapsulated tags.
+		 * @param parentTag The parent tag to support encapsulated tags.
 		 * @param tagName The Name of the tag.
 		 * @param tagValue The data between the opening and cloding tag.
 		 */

kmplot/kmplot/kmplotprogress.cpp

@@ -29,7 +29,7 @@
 #include "kmplotprogress.h"
 //#include "kmplotprogress.tqmoc.cpp"
 
-KmPlotProgress::KmPlotProgress( TQWidget* tqparent, const char* name ) : TQWidget( tqparent, name) 
+KmPlotProgress::KmPlotProgress( TQWidget* parent, const char* name ) : TQWidget( parent, name) 
 {
  button = new KPushButton(this);
  button->setPixmap( SmallIcon( "cancel" ) );

kmplot/kmplot/kmplotprogress.h

@@ -35,7 +35,7 @@ class KmPlotProgress: public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KmPlotProgress( TQWidget* tqparent = 0, const char* name = 0 );
+	KmPlotProgress( TQWidget* parent = 0, const char* name = 0 );
 	~KmPlotProgress();
 	void increase();
 

kmplot/kmplot/kparametereditor.cpp

@@ -42,8 +42,8 @@
 
 class ParameterValueList;
 
-KParameterEditor::KParameterEditor(XParser *m, TQValueList<ParameterValueItem> *l, TQWidget *tqparent, const char *name)
-	: QParameterEditor(tqparent,name, true, TQt::WDestructiveClose), m_parameter(l), m_parser(m)
+KParameterEditor::KParameterEditor(XParser *m, TQValueList<ParameterValueItem> *l, TQWidget *parent, const char *name)
+	: QParameterEditor(parent,name, true, TQt::WDestructiveClose), m_parameter(l), m_parser(m)
 {
 	for (  TQValueList<ParameterValueItem>::Iterator it = m_parameter->begin(); it != m_parameter->end(); ++it )
 		list->insertItem( (*it).expression );

kmplot/kmplot/kparametereditor.h

@@ -40,7 +40,7 @@ class KParameterEditor : public QParameterEditor
 Q_OBJECT
   TQ_OBJECT
 public:
-    KParameterEditor(XParser *, TQValueList<ParameterValueItem> *, TQWidget *tqparent = 0, const char *name = 0);
+    KParameterEditor(XParser *, TQValueList<ParameterValueItem> *, TQWidget *parent = 0, const char *name = 0);
     ~KParameterEditor();
     
 public slots:

kmplot/kmplot/kprinterdlg.cpp

@@ -33,8 +33,8 @@
 // local includes
 #include "kprinterdlg.h"
 
-KPrinterDlg::KPrinterDlg( TQWidget *tqparent, const char *name )
-		: KPrintDialogPage( tqparent, name )
+KPrinterDlg::KPrinterDlg( TQWidget *parent, const char *name )
+		: KPrintDialogPage( parent, name )
 {
 	setTitle( i18n( "KmPlot Options" ) );
 	TQVBoxLayout *tqlayout = new TQVBoxLayout( this );

kmplot/kmplot/kprinterdlg.h

@@ -45,7 +45,7 @@ class KPrinterDlg : public KPrintDialogPage
   TQ_OBJECT
 public:
 	/// Getting the common arguments.
-	KPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 );
+	KPrinterDlg( TQWidget *parent = 0, const char *name = 0 );
 
 	/// Reimplemented.
 	void getOptions( TQMap<TQString, TQString>& opts, bool include_def = false );

kmplot/kmplot/ksliderwindow.cpp

@@ -42,8 +42,8 @@
 // local includes
 #include "ksliderwindow.h"
 
-KSliderWindow::KSliderWindow(TQWidget* tqparent, int num ) :
-	SliderWindow( tqparent, "", false, TQt::WStyle_Tool-TQt::WStyle_Maximize ), m_num(num)
+KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
+	SliderWindow( parent, "", false, TQt::WStyle_Tool-TQt::WStyle_Maximize ), m_num(num)
 {
 	setCaption(i18n( "Slider %1" ).tqarg( num+1 ) );
 	TQToolTip::add( slider, i18n( "Slider no. %1" ).tqarg( num+1 ));

kmplot/kmplot/ksliderwindow.h

@@ -36,9 +36,9 @@ class KSliderWindow : public SliderWindow
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		/// @param tqparent points to the tqparent widget.
+		/// @param parent points to the parent widget.
 		/// @param num number of this instance.
-		KSliderWindow(TQWidget* tqparent, int num );
+		KSliderWindow(TQWidget* parent, int num );
 		virtual ~KSliderWindow();
 
 	private slots:

kpercentage/kpercentage/kanswer.cpp

@@ -40,9 +40,9 @@
 #include "kanimation.h"
 #include "kanswer.h"
 
-KAnswer::KAnswer( TQWidget *tqparent ): KDialog( tqparent, "answer", TRUE )
+KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE )
 {
-    setFont( tqparent->font() );
+    setFont( parent->font() );
     // fix size for the background pixmap
     setFixedSize( TQSize( 430, 190 ) );
 

kpercentage/kpercentage/kanswer.h

@@ -50,12 +50,12 @@ class KAnswer : public KDialog
   TQ_OBJECT
     public:
         /**
-        * The constructor doesn't need any parameters but the tqparent,
+        * The constructor doesn't need any parameters but the parent,
         * because it will not be used in any other context.
         *
-        * @param tqparent Parent widget for modal functionality
+        * @param parent Parent widget for modal functionality
         */
-        KAnswer( TQWidget *tqparent );
+        KAnswer( TQWidget *parent );
 
         // public functions
         /** setting/changing feedback text and pic */

kpercentage/kpercentage/kpercentage.docbook

@@ -251,7 +251,7 @@ taken from that reference and shortened a bit for readability. -->
 <refnamediv>
 <refname>XtUnmanageChildren
 </refname>
-<refpurpose>remove a list of tqchildren from a tqparent widget's managed list.
+<refpurpose>remove a list of tqchildren from a parent widget's managed list.
 </refpurpose>
 <indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
 <indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm>
@@ -293,13 +293,13 @@ class RectObj or any subclass thereof.
 <title>Description
 </title>
 <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their tqparent's tqgeometry management.
+and removes them from their parent's tqgeometry management.
 The widgets will disappear from the screen, and (depending
-on its tqparent) may no longer have screen space allocated for
+on its parent) may no longer have screen space allocated for
 them.
 </para>
 <para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
-the same tqparent.
+the same parent.
 </para>
 <para>See the &ldquo;Algorithm&rdquo; section below for full details of the
 widget unmanagement procedure.
@@ -324,7 +324,7 @@ often more convenient to call <function>XtUnmanageChild()</function>
 several times than it is to declare and initialize an array
 of widgets to pass to <function>XtUnmanageChildren()</function>.  Calling
 <function>XtUnmanageChildren()</function> is more efficient, however,
-because it only calls the tqparent's <function>change_managed()</function>
+because it only calls the parent's <function>change_managed()</function>
 method once.
 </para>
 </refsect1>

kpercentage/kpercentage/kpercentmain.cpp

@@ -42,10 +42,10 @@
 #include "kpercentage.h"
 
 
-KPercentMain::KPercentMain( TQWidget *tqparent, const char *name ) :
-        KDialog( tqparent, name, TRUE )  // TRUE for modal dialog
+KPercentMain::KPercentMain( TQWidget *parent, const char *name ) :
+        KDialog( parent, name, TRUE )  // TRUE for modal dialog
 {
-    setFont( tqparent->font() );
+    setFont( parent->font() );
     /** load and set the background pixmap */
     TQPixmap bgp( locate( "data", TQApplication::reverseLayout() ? "kpercentage/pics/kpercentmain_bg_rtl.png" : "kpercentage/pics/kpercentmain_bg.png" ) );
 //    resize( 520, 220 );

kpercentage/kpercentage/kpercentmain.h

@@ -46,7 +46,7 @@ class KPercentMain : public KDialog
     Q_OBJECT
   TQ_OBJECT
     public:
-        KPercentMain( TQWidget *tqparent, const char *name = 0 );
+        KPercentMain( TQWidget *parent, const char *name = 0 );
         /** checks, if the task is solved right */
         bool validateTask();
         /** prepares the dialog for a new task */

kstars/TODO

@@ -33,7 +33,7 @@
 
 - OpsDialog: zoomed-out faint limit not restricted to be <= zoomed-in limit
 
-- OpsDialog: child widgets should disable when tqparent deselected:
+- OpsDialog: child widgets should disable when parent deselected:
 	   Stars, Asteroids, Comets, CNames, MW, Hide obj.
 
 - OpsDialog: Remove All Trails button does nothing

kstars/kstars/addcatdialog.cpp

@@ -30,8 +30,8 @@
 
 #include "addcatdialog.h"
 
-AddCatDialog::AddCatDialog( TQWidget *tqparent )
-	: KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, tqparent ) {
+AddCatDialog::AddCatDialog( TQWidget *parent )
+	: KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, parent ) {
 
 	TQFrame *page = plainPage();
 	setMainWidget(page);
@@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() {
  * Position angle: floating-point value (position angle, in degrees)
  */
 bool AddCatDialog::validateDataFile() {
-	KStars *ksw = (KStars*) tqtopLevelWidget()->tqparent(); 
+	KStars *ksw = (KStars*) tqtopLevelWidget()->parent(); 
 
 	//Create the catalog file contents: first the header
 	CatalogContents = writeCatalogHeader();

kstars/kstars/addcatdialog.h

@@ -40,7 +40,7 @@ class AddCatDialog : public KDialogBase  {
 public:
 /**Default constructor
 	*/
-	AddCatDialog( TQWidget *tqparent=0 );
+	AddCatDialog( TQWidget *parent=0 );
 
 /**Destructor (empty)
 	*/

kstars/kstars/addlinkdialog.cpp

@@ -25,8 +25,8 @@
 #include "addlinkdialog.h"
 #include "skyobject.h"
 
-AddLinkDialog::AddLinkDialog( TQWidget *tqparent, const TQString &oname )
-	: KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, tqparent ), ObjectName( oname ) {
+AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname )
+	: KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) {
 
 	TQFrame *page = plainPage();
 	setMainWidget(page);

kstars/kstars/addlinkdialog.h

@@ -39,7 +39,7 @@ class AddLinkDialog : public KDialogBase  {
   TQ_OBJECT
 public:
 /**Constructor. */
-	AddLinkDialog( TQWidget* tqparent = 0, const TQString &oname=i18n("object") );
+	AddLinkDialog( TQWidget* parent = 0, const TQString &oname=i18n("object") );
 
 /**Destructor (empty) */
 	~AddLinkDialog() {}

kstars/kstars/ccdpreviewwg.cpp

@@ -49,7 +49,7 @@
 
 FILE *CCDwfp;
 
- CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : CCDPreviewForm(tqparent, name)
+ CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : CCDPreviewForm(parent, name)
  {
  
    stdDev         = inStdDev;
@@ -277,7 +277,7 @@ void CCDPreviewWG::captureImage()
 }
 
 
-CCDVideoWG::CCDVideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase)
+CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase)
 {
   streamImage    = NULL;
   streamBuffer	  = NULL;

kstars/kstars/ccdpreviewwg.h

@@ -34,7 +34,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2};
   TQ_OBJECT
    
     public:
-      CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0);
+      CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0);
       ~CCDPreviewWG();
  
    friend class CCDVideoWG;
@@ -77,7 +77,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2};
   TQ_OBJECT
    
     public:
-      CCDVideoWG(TQWidget * tqparent =0, const char * name =0);
+      CCDVideoWG(TQWidget * parent =0, const char * name =0);
       ~CCDVideoWG();
       
       friend class CCDPreviewWG;

kstars/kstars/conbridlg.cpp

@@ -36,13 +36,13 @@
  
 //TODO find a better and faster way to implement this, this operation can be memory and CPU intensive.
 
-ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *tqparent) :
-    KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, tqparent )
+ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) :
+    KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, parent )
 {
     
   float pixdiff, datadiff;
   contrast = brightness = 0;
-  viewer = (FITSViewer *) tqparent;
+  viewer = (FITSViewer *) parent;
   displayImage = viewer->image->displayImage;
   tempImage    = new TQImage(displayImage->copy());
   width  = displayImage->width();

kstars/kstars/conbridlg.h

@@ -31,7 +31,7 @@ class ContrastBrightnessDlg : public KDialogBase {
 	Q_OBJECT
   TQ_OBJECT
  public:
-   ContrastBrightnessDlg(TQWidget *tqparent=0);
+   ContrastBrightnessDlg(TQWidget *parent=0);
    ~ContrastBrightnessDlg();
    
   TQSize tqsizeHint() const;

kstars/kstars/detaildialog.cpp

@@ -57,7 +57,7 @@
 #include "devicemanager.h"
 #include "indistd.h"
 
-LogEdit::LogEdit( TQWidget *tqparent, const char *name ) : KTextEdit( tqparent, name ) 
+LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name ) 
 {
 	setFrameStyle( TQFrame::StyledPanel );
 	setFrameShadow( TQFrame::Plain );
@@ -69,13 +69,13 @@ void LogEdit::focusOutEvent( TQFocusEvent *e ) {
 	TQWidget::focusOutEvent(e);
 }
 
-ClickLabel::ClickLabel( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) 
+ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name ) 
 {}
 
 DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, 
-		TQWidget *tqparent, const char *name ) : 
-		KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, tqparent, name ) ,
-		selectedObject(o), ksw((KStars*)tqparent), Data(0), Pos(0), Links(0), Adv(0), Log(0)
+		TQWidget *parent, const char *name ) : 
+		KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, parent, name ) ,
+		selectedObject(o), ksw((KStars*)parent), Data(0), Pos(0), Links(0), Adv(0), Log(0)
 {
 	//Modify color palette
 	setPaletteBackgroundColor( palette().color( TQPalette::Active, TQColorGroup::Base ) );
@@ -774,7 +774,7 @@ bool DetailDialog::readUserFile(int type)//, int sourceFileType)
 	return true;
 }
 
-void DetailDialog::populateADVTree(TQListViewItem *tqparent)
+void DetailDialog::populateADVTree(TQListViewItem *parent)
 {
 	// list done
 	if (!treeIt->current())
@@ -782,20 +782,20 @@ void DetailDialog::populateADVTree(TQListViewItem *tqparent)
 
 	// if relative top level [KSLABEL]
 	if (treeIt->current()->Type == 0)
-		forkTree(tqparent);
+		forkTree(parent);
 
 	while (treeIt->current())
 	{
 		if (treeIt->current()->Type == 0)
 		{
-			forkTree(tqparent);
+			forkTree(parent);
 			continue;
 		}
 		else if (treeIt->current()->Type == 1)
 			break;
 
-		if (tqparent)
-			new TQListViewItem( tqparent, treeIt->current()->Name);
+		if (parent)
+			new TQListViewItem( parent, treeIt->current()->Name);
 		else
 			new TQListViewItem( Adv->ADVTree, treeIt->current()->Name);
 
@@ -803,11 +803,11 @@ void DetailDialog::populateADVTree(TQListViewItem *tqparent)
 	}
 }
 
-void DetailDialog::forkTree(TQListViewItem *tqparent)
+void DetailDialog::forkTree(TQListViewItem *parent)
 {
 	TQListViewItem *current = 0;
-	if (tqparent)
-		current = new TQListViewItem(tqparent, treeIt->current()->Name);
+	if (parent)
+		current = new TQListViewItem(parent, treeIt->current()->Name);
 	else
 		current = new TQListViewItem(Adv->ADVTree, treeIt->current()->Name);
 

kstars/kstars/detaildialog.h

@@ -58,7 +58,7 @@ class LogEdit : public KTextEdit {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	LogEdit( TQWidget *tqparent=0, const char *name=0 );
+	LogEdit( TQWidget *parent=0, const char *name=0 );
 	~LogEdit() {}
 	
 signals:
@@ -76,7 +76,7 @@ class ClickLabel : public TQLabel {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ClickLabel( TQWidget *tqparent=0, const char *name=0 );
+	ClickLabel( TQWidget *parent=0, const char *name=0 );
 	~ClickLabel() {}
 	
 signals:
@@ -110,7 +110,7 @@ class DetailDialog : public KDialogBase  {
 public: 
 /**Constructor
 	*/
-	DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *tqparent=0, const char *name=0);
+	DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *parent=0, const char *name=0);
 	
 /**Destructor (empty)
 	*/
@@ -214,11 +214,11 @@ private:
 
 /**Populate the TreeView of known astronomical databases in the Advanced Tab
 	*/
-	void populateADVTree(TQListViewItem *tqparent);
+	void populateADVTree(TQListViewItem *parent);
 
 /**For the databases TreeView
 	*/
-	void forkTree(TQListViewItem *tqparent);
+	void forkTree(TQListViewItem *parent);
 
 /**Data for the Advanced Tab TreeView is stored in the file advinterface.dat.
 	*This function parses advinterface.dat.

kstars/kstars/devicemanager.cpp

@@ -42,14 +42,14 @@
 ** This allow KStars to control multiple devices distributed acorss
 ** multiple servers seemingly in a way that is completely transparent
 ** to devices and drivers alike.
-** The device Manager can be thought of as the 'networking' tqparent
-** of devices, while indimenu is 'GUI' tqparent of devices
+** The device Manager can be thought of as the 'networking' parent
+** of devices, while indimenu is 'GUI' parent of devices
 *******************************************************************/
 
-DeviceManager::DeviceManager(INDIMenu *INDItqparent, int inID) 
+DeviceManager::DeviceManager(INDIMenu *INDIparent, int inID) 
 {
 
- tqparent = INDItqparent;
+ parent = INDIparent;
  mgrID  = inID;
 
  indi_dev.setAutoDelete(true);
@@ -154,7 +154,7 @@ void DeviceManager::dataReceived()
             tcflush(serverFD, TCIFLUSH);
 	    sNotifier->disconnect();
 	    close(serverFD);
-	    tqparent->removeDeviceMgr(mgrID);
+	    parent->removeDeviceMgr(mgrID);
 	    KMessageBox::error(0, TQString::tqfromLatin1(errmsg));
 
             return;
@@ -309,17 +309,17 @@ INDI_D * DeviceManager::addDevice (XMLEle *dep, char errmsg[])
 	if (!ap)
 	    return NULL;
 
-	if (tqparent->currentLabel.isEmpty())
-	 tqparent->setCustomLabel(valuXMLAtt(ap));
+	if (parent->currentLabel.isEmpty())
+	 parent->setCustomLabel(valuXMLAtt(ap));
 
-	dp = new INDI_D(tqparent, this, TQString(valuXMLAtt(ap)), tqparent->currentLabel);
+	dp = new INDI_D(parent, this, TQString(valuXMLAtt(ap)), parent->currentLabel);
 
 	indi_dev.append(dp);
 	
 	emit newDevice();
 	
 	// Reset label
-	tqparent->currentLabel = "";
+	parent->currentLabel = "";
 	
        /* ok */
 	return dp;
@@ -405,7 +405,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp)
        txt_w->insert( TQString(valuXMLAtt(message)) + TQString("\n"));
        
        if ( Options::indiMessages() )
-	    	tqparent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0);
+	    	parent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0);
 
 }
 

kstars/kstars/devicemanager.h

@@ -28,10 +28,10 @@ class DeviceManager : public TQObject
    Q_OBJECT
   TQ_OBJECT
    public:
-   DeviceManager(INDIMenu *INDItqparent, int inID);
+   DeviceManager(INDIMenu *INDIparent, int inID);
    ~DeviceManager();
 
-   INDIMenu *tqparent;
+   INDIMenu *parent;
 
    TQPtrList<INDI_D> indi_dev;
 

kstars/kstars/dms.h

@@ -313,7 +313,7 @@ public:
 	void setRadians( const double &a );
 
 /**return the equivalent angle between 0 and 360 degrees.
-	*@warning does not change the value of the tqparent angle itself.
+	*@warning does not change the value of the parent angle itself.
 	*/
 	const dms reduce( void ) const;
 

kstars/kstars/dmsbox.cpp

@@ -26,8 +26,8 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-dmsBox::dmsBox(TQWidget *tqparent, const char *name, bool dg) 
-	: KLineEdit(tqparent,name), EmptyFlag(true) {
+dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) 
+	: KLineEdit(parent,name), EmptyFlag(true) {
 	setMaxLength(14);
 	setMaximumWidth(160);
 	setDegType( dg );

kstars/kstars/dmsbox.h

@@ -47,12 +47,12 @@ TQ_PROPERTY (bool degType READ degType WRITE setDegType)
 
 public:
 	/**Constructor for the dmsBox object.
-		*@param tqparent pointer to the tqparent TQWidget
+		*@param parent pointer to the parent TQWidget
 		*@param ni the name of the object
 		*@param deg if TRUE use deg/arcmin/arcsec; otherwise 
 		*           use hours/min/sec.
 		*/
-	dmsBox(TQWidget *tqparent, const char *ni=0, bool deg=TRUE);
+	dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE);
 
 	/**Destructor (empty)*/
 	~dmsBox();

kstars/kstars/draglistbox.cpp

@@ -21,8 +21,8 @@
 
 #include "draglistbox.h"
 
-DragListBox::DragListBox( TQWidget *tqparent, const char *name, WFlags f ) 
-		: KListBox( tqparent, name, f ) {
+DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) 
+		: KListBox( parent, name, f ) {
 
 	setAcceptDrops( TRUE );
 	dragging = FALSE;

kstars/kstars/draglistbox.h

@@ -36,7 +36,7 @@ class DragListBox : public KListBox {
 public:
 /**@short Default constructor
  */
-	DragListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 );
+	DragListBox( TQWidget *parent = 0, const char *name = 0, WFlags = 0 );
 
 /**@short Default destructor
  */

kstars/kstars/finddialog.cpp

@@ -33,8 +33,8 @@
 #include "objectnamelist.h"
 
 
-FindDialog::FindDialog( TQWidget* tqparent ) :
-		KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, tqparent ),
+FindDialog::FindDialog( TQWidget* parent ) :
+		KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, parent ),
 		vlay(0), hlay(0), SearchList(0), SearchBox(0), filterTypeLabel(0), filterType(0),
 		currentitem(0)
 {
@@ -114,7 +114,7 @@ void FindDialog::init() {
 }
 
 void FindDialog::filter() {  //Filter the list of names with the string in the SearchBox
-	KStars *p = (KStars *)tqparent();
+	KStars *p = (KStars *)parent();
 
 	SearchList->clear();
 	ObjectNameList &ObjNames = p->data()->ObjNames;
@@ -136,7 +136,7 @@ void FindDialog::filter() {  //Filter the list of names with the string in the S
 }
 
 void FindDialog::filterByType() {
-	KStars *p = (KStars *)tqparent();
+	KStars *p = (KStars *)parent();
 
 	SearchList->clear();	// TQListBox
 	TQString searchFor = SearchBox->text().lower();  // search string

kstars/kstars/finddialog.h

@@ -52,7 +52,7 @@ public:
 /**Constructor. Creates all widgets and packs them in TQLayouts.  Connects
 	*Signals and Slots.  Runs initObjectList().
 	*/
-	FindDialog( TQWidget* tqparent = 0 );
+	FindDialog( TQWidget* parent = 0 );
 
 /**Destructor
 	*/

kstars/kstars/fitshistogram.cpp

@@ -37,9 +37,9 @@
  
  
  
- FITSHistogram::FITSHistogram(TQWidget *tqparent, const char * name) : histDialog(tqparent, name)
+ FITSHistogram::FITSHistogram(TQWidget *parent, const char * name) : histDialog(parent, name)
  {
-   viewer = (FITSViewer *) tqparent;
+   viewer = (FITSViewer *) parent;
    
    setModal(false);
    
@@ -234,9 +234,9 @@ int FITSHistogram::findMax()
   return max;
 }
 
-FITSHistogramCommand::FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax)
+FITSHistogramCommand::FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax)
 {
-  viewer    = (FITSViewer *) tqparent;
+  viewer    = (FITSViewer *) parent;
   type      = newType;
   histo     = inHisto;
   oldImage  = new TQImage();

kstars/kstars/fitshistogram.h

@@ -32,7 +32,7 @@
   TQ_OBJECT
    
    public:
-    FITSHistogram(TQWidget *tqparent, const char * name = 0);
+    FITSHistogram(TQWidget *parent, const char * name = 0);
     ~FITSHistogram();
     
     void constructHistogram(float *buffer);
@@ -64,7 +64,7 @@
  class FITSHistogramCommand : public KCommand
 {
   public:
-        FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax);
+        FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax);
 	~FITSHistogramCommand();
             
         void execute();

kstars/kstars/fitsimage.cpp

@@ -64,9 +64,9 @@ static FITSLoadVals plvals =
   0         /* Dont compose images */
 };
 
-FITSImage::FITSImage(TQWidget * tqparent, const char * name) : TQScrollView(tqparent, name), zoomFactor(1.2)
+FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent, name), zoomFactor(1.2)
 {
-  viewer = (FITSViewer *) tqparent;
+  viewer = (FITSViewer *) parent;
   reducedImgBuffer = NULL;
   displayImage     = NULL;
   
@@ -459,7 +459,7 @@ void FITSImage::fitsZoomDefault()
 
 }
 
-FITSFrame::FITSFrame(FITSImage * img, TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase)
+FITSFrame::FITSFrame(FITSImage * img, TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase)
 {
   image = img;
   setPaletteBackgroundColor(image->viewport()->paletteBackgroundColor());

kstars/kstars/fitsimage.h

@@ -57,7 +57,7 @@ class FITSImage : public TQScrollView  {
 	friend class FITSChangeCommand;
 	friend class FITSProcessCommand;
 	
-	FITSImage(TQWidget * tqparent, const char * name = 0);
+	FITSImage(TQWidget * parent, const char * name = 0);
 	~FITSImage();
 	
 	enum scaleType { FITSAuto = 0 , FITSLinear, FITSLog, FITSSqrt, FITSCustom };
@@ -74,7 +74,7 @@ class FITSImage : public TQScrollView  {
 	void clearMem();
 	
 	private:
-	FITSViewer *viewer;					/* tqparent FITSViewer */
+	FITSViewer *viewer;					/* parent FITSViewer */
 	FITSFrame  *imgFrame;					/* Frame holding the image */
 	TQImage  *displayImage;					/* FITS image that is displayed in the GUI */
 	TQImage  *templateImage;					/* backup image for currentImage */
@@ -112,7 +112,7 @@ class FITSFrame : public TQFrame
   TQ_OBJECT
   
     public:
-      FITSFrame(FITSImage * img, TQWidget * tqparent = 0, const char * name = 0);
+      FITSFrame(FITSImage * img, TQWidget * parent = 0, const char * name = 0);
       ~FITSFrame();
     
     private:

kstars/kstars/fitsprocess.cpp

@@ -31,13 +31,13 @@
  
  #define ELEM_SWAP(a,b) { register float t=(a);(a)=(b);(b)=t; }
  
- FITSProcess::FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode)
+ FITSProcess::FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode)
  {
    float * buffer      = NULL;
    darkCombineMode     = darkMode;
    flatCombineMode     = flatMode;
    darkflatCombineMode = darkflatMode;
-   viewer              = tqparent;
+   viewer              = parent;
    finalDark           = NULL;
    finalFlat           = NULL;
    finalDarkFlat       = NULL;
@@ -311,10 +311,10 @@ void FITSProcess::reduce()
 
 } 
  
-FITSProcessCommand::FITSProcessCommand(FITSViewer *tqparent)
+FITSProcessCommand::FITSProcessCommand(FITSViewer *parent)
 {
  
-   viewer  = tqparent;
+   viewer  = parent;
    oldImage  = new TQImage();
    // TODO apply maximum compression against this buffer
    buffer = (float *) malloc (viewer->image->width * viewer->image->height * sizeof(float));

kstars/kstars/fitsprocess.h

@@ -36,7 +36,7 @@ class TQImage;
 class FITSProcess
 {
    public:
-     FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode);
+     FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode);
      ~FITSProcess();
      
      TQPtrList<float> darkFrames;
@@ -67,7 +67,7 @@ class FITSProcessCommand : public KCommand
 {
   public:
   
-  FITSProcessCommand(FITSViewer *tqparent);
+  FITSProcessCommand(FITSViewer *parent);
   ~FITSProcessCommand();
  
   void execute();

kstars/kstars/fitsviewer.cpp

@@ -91,8 +91,8 @@ extern int fits_ieee64_motorola;
    uc[4] = p[3]; uc[5] = p[2]; uc[6] = p[1]; uc[7] = p[0]; \
    val = *(FITS_BITPIXM64 *)uc; } else val = *(FITS_BITPIXM64 *)p; }	  
 
-FITSViewer::FITSViewer (const KURL *url, TQWidget *tqparent, const char *name)
-	: KMainWindow (tqparent, name)
+FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
+	: KMainWindow (parent, name)
 {
     image      = NULL;
     currentURL = *url;
@@ -553,7 +553,7 @@ void FITSViewer::fileSave()
 	
 	if (TQFile::exists(currentURL.path()))
         {
-            int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()),
+            int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
             i18n( "A file named \"%1\" already exists. "
                   "Overwrite it?" ).tqarg(currentURL.fileName()),
             i18n( "Overwrite File?" ),
@@ -952,9 +952,9 @@ void FITSViewer::fitsHeader()
 }
 
 
-FITSChangeCommand::FITSChangeCommand(TQWidget * tqparent, int inType, TQImage* newIMG, TQImage *oldIMG)
+FITSChangeCommand::FITSChangeCommand(TQWidget * parent, int inType, TQImage* newIMG, TQImage *oldIMG)
 {
-  viewer    = (FITSViewer *) tqparent;
+  viewer    = (FITSViewer *) parent;
   newImage  = new TQImage();
   oldImage  = new TQImage();
   *newImage = newIMG->copy();

kstars/kstars/fitsviewer.h

@@ -60,7 +60,7 @@ class FITSViewer : public KMainWindow  {
 	friend class FITSProcessCommand;
 	
 	/**Constructor. */
-	FITSViewer (const KURL *imageName, TQWidget *tqparent, const char *name = 0);
+	FITSViewer (const KURL *imageName, TQWidget *parent, const char *name = 0);
 	~FITSViewer();
 
 	
@@ -125,7 +125,7 @@ class FITSViewer : public KMainWindow  {
 class FITSChangeCommand : public KCommand
 {
   public:
-        FITSChangeCommand(TQWidget * tqparent, int inType, TQImage *newIMG, TQImage *oldIMG);
+        FITSChangeCommand(TQWidget * parent, int inType, TQImage *newIMG, TQImage *oldIMG);
 	~FITSChangeCommand();
             
         void execute();

kstars/kstars/focusdialog.cpp

@@ -32,8 +32,8 @@
 #include "dmsbox.h"
 #include "focusdialog.h"
 
-FocusDialog::FocusDialog( TQWidget *tqparent )
-	: KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, tqparent ) {
+FocusDialog::FocusDialog( TQWidget *parent )
+	: KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, parent ) {
 
 	Point = 0; //initialize pointer to null
 	UsedAltAz = false; //assume RA/Dec by default
@@ -81,7 +81,7 @@ void FocusDialog::validatePoint() {
 	dms dec( fdlg->decBox->createDms( true, &decOk ) );
 	TQString message;
 
-	KStars *ks = (KStars*) tqparent();
+	KStars *ks = (KStars*) parent();
 
 	if ( raOk && decOk ) {
 		//make sure values are in valid range

kstars/kstars/focusdialog.h

@@ -38,7 +38,7 @@ class FocusDialog : public KDialogBase {
   TQ_OBJECT
 public:
 	/**Constructor. */
-	FocusDialog( TQWidget *tqparent=0 );
+	FocusDialog( TQWidget *parent=0 );
 
 	/**Destructor (empty). */
 	~FocusDialog();

kstars/kstars/fovdialog.cpp

@@ -39,10 +39,10 @@
 
 
 //---------FOVDialog---------------//
-FOVDialog::FOVDialog( TQWidget *tqparent )
-	: KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, tqparent ) {
+FOVDialog::FOVDialog( TQWidget *parent )
+	: KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) {
 
-	ks = (KStars*)TQT_TQWIDGET(tqparent);
+	ks = (KStars*)TQT_TQWIDGET(parent);
 
 	TQFrame *page = plainPage();
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );
@@ -192,8 +192,8 @@ void FOVDialog::slotRemoveFOV() {
 }
 
 //-------------NewFOV------------------//
-NewFOV::NewFOV( TQWidget *tqparent )
-	: KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, tqparent ), f() {
+NewFOV::NewFOV( TQWidget *parent )
+	: KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, parent ), f() {
 	TQFrame *page = plainPage();
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );
 	ui = new NewFOVUI( page );

kstars/kstars/fovdialog.h

@@ -36,7 +36,7 @@ class FOVDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	FOVDialog( TQWidget *tqparent=0 );
+	FOVDialog( TQWidget *parent=0 );
 	~FOVDialog();
 	unsigned int currentItem() const;
 	TQPtrList<FOV> FOVList;
@@ -66,7 +66,7 @@ class NewFOV : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	NewFOV( TQWidget *tqparent=0 );
+	NewFOV( TQWidget *parent=0 );
 	~NewFOV() {}
 	NewFOVUI *ui;
 

kstars/kstars/imagereductiondlg.cpp

@@ -24,7 +24,7 @@
  
  #include "imagereductiondlg.h"
  
- ImageReductionDlg::ImageReductionDlg(TQWidget * tqparent, const char * name) : imageReductionUI(tqparent, name)
+ ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name)
 {
   connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile()));
   connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile()));

kstars/kstars/imagereductiondlg.h

@@ -26,7 +26,7 @@
   TQ_OBJECT
 
     public:
-     ImageReductionDlg(TQWidget * tqparent, const char * name = 0);
+     ImageReductionDlg(TQWidget * parent, const char * name = 0);
      ~ImageReductionDlg();
 
 

kstars/kstars/imagesequence.cpp

@@ -37,11 +37,11 @@
 #define RETRY_MAX	12
 #define RETRY_PERIOD	5000
 
-imagesequence::imagesequence(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: imgSequenceDlg(tqparent,name, modal,fl)
+imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: imgSequenceDlg(parent,name, modal,fl)
 {
   
-  ksw = (KStars *) tqparent;
+  ksw = (KStars *) parent;
   INDIMenu *devMenu = ksw->getINDIMenu();
 
   if (devMenu)

kstars/kstars/imagesequence.h

@@ -24,7 +24,7 @@ class imagesequence : public imgSequenceDlg
   TQ_OBJECT
 
 public:
-  imagesequence(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~imagesequence();
   
 

kstars/kstars/imageviewer.cpp

@@ -29,8 +29,8 @@
 
 #include <kapplication.h>
 
-ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *tqparent, const char *name)
-	: KMainWindow (tqparent, name), imageURL (*url), fileIsImage (false),
+ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name)
+	: KMainWindow (parent, name), imageURL (*url), fileIsImage (false),
 	  ctrl (false), key_s (false), key_q (false), downloadJob(0)
 {
 // toolbar can dock only on top-position and can't be minimized
@@ -86,7 +86,7 @@ void ImageViewer::resizeEvent (TQResizeEvent */*ev*/)
 void ImageViewer::closeEvent (TQCloseEvent *ev)
 {
 	if (ev)	// not if closeEvent (0) is called, because segfault
-		ev->accept();	// tqparent-widgets should not get this event, so it will be filtered
+		ev->accept();	// parent-widgets should not get this event, so it will be filtered
 	this->~ImageViewer();	// destroy the object, so the object can only allocated with operator new, not as a global/local variable
 }
 
@@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc()
 		TQFile f (newURL.directory() + "/" +  newURL.fileName());
 		if (f.exists())
 		{
-			int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()),
+			int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
 									i18n( "A file named \"%1\" already exists. "
 											"Overwrite it?" ).tqarg(newURL.fileName()),
 									i18n( "Overwrite File?" ),

kstars/kstars/imageviewer.h

@@ -37,7 +37,7 @@
 	*save these files. For other formats, like PNG, this is not so important 
 	*because they can directly saved by TQImage.
 	*
-	*The download-slave works asynchron so the tqparent-widget can be used at 
+	*The download-slave works asynchron so the parent-widget can be used at 
 	*this time. The save-slave works synchronously, but this is not important 
 	*because the files are at this time local saved and this works not so long.
 	*/
@@ -51,7 +51,7 @@ class ImageViewer : public KMainWindow  {
 
 	public:
 	/**Constructor. */
-		ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *tqparent, const char *name = 0);
+		ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *parent, const char *name = 0);
 
 	/**Destructor. If there is a partially downloaded image file, delete it.*/
 		~ImageViewer();

kstars/kstars/indi/apogee/CameraIO_Linux.h

@@ -271,7 +271,7 @@ public:
 	// Mask user requested set of IRQS
 //	void MaskIrqs();
 
-	// Restore default IRQ tqmask
+	// Restore default IRQ mask
 //	void UnmaskIrqs();
 
 	// Starts flushing the camera (which should be the normal idle state)

kstars/kstars/indi/celestrongps.cpp

@@ -125,7 +125,7 @@ CelestronGPS::CelestronGPS()
 
    JD = 0;
 
-   // Children call tqparent routines, this is the default
+   // Children call parent routines, this is the default
    IDLog("initilizaing from Celeston GPS device...\n");
 
 }

kstars/kstars/indi/indiapi.h

@@ -136,7 +136,7 @@ typedef struct {
     char label[MAXINDILABEL];		
     /** malloced text string */
     char *text;				
-    /** pointer to tqparent */
+    /** pointer to parent */
     struct _ITextVectorProperty *tvp;	
     /** handy place to hang helper info */
     void *aux0;   			
@@ -182,7 +182,7 @@ typedef struct {
     double min, max;			/** range, ignore if min == max */
     double step;			/** step size, ignore if step == 0 */
     double value;			/** current value */
-    struct _INumberVectorProperty *nvp;	/** pointer to tqparent */
+    struct _INumberVectorProperty *nvp;	/** pointer to parent */
     void *aux0, *aux1;			/** handy place to hang helper info */
 } INumber;
 
@@ -235,7 +235,7 @@ typedef struct {
     char name[MAXINDINAME];		/** index name */
     char label[MAXINDILABEL];		/** this switch's label */
     ISState s;				/** this switch's state */
-    struct _ISwitchVectorProperty *svp;	/** pointer to tqparent */
+    struct _ISwitchVectorProperty *svp;	/** pointer to parent */
     void *aux;				/** handy place to hang helper info */
 } ISwitch;
 
@@ -276,7 +276,7 @@ typedef struct {
     char name[MAXINDINAME];		/** index name */
     char label[MAXINDILABEL];		/** this lights's label */
     IPState s;				/** this lights's state */
-    struct _ILightVectorProperty *lvp;	/** pointer to tqparent */
+    struct _ILightVectorProperty *lvp;	/** pointer to parent */
     void *aux;				/** handy place to hang helper info */
 } ILight;
 
@@ -320,7 +320,7 @@ typedef struct {			/* one BLOB descriptor */
   int bloblen;			
   /** n uncompressed bytes */
   int size;				
-  /** pointer to tqparent */
+  /** pointer to parent */
   struct _IBLOBVectorProperty *bvp;	
   /** handy place to hang helper info */
   void *aux0, *aux1, *aux2;		

kstars/kstars/indi/indicom.h

@@ -169,7 +169,7 @@ void aberrate(double *RA, double *Dec);
 */
 void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec);
 
-/** \brief Calculate the aptqparent coordiantes for RA and Dec from any epoch to any epoch.
+/** \brief Calculate the apparent coordiantes for RA and Dec from any epoch to any epoch.
     \param jd0 starting epoch.
     \param jdf final epoch.
     \param RA a pointer to a double containing the Right ascension in hours. The function stores the processed Right ascension back in this variable.

kstars/kstars/indi/indiserver.c

@@ -316,7 +316,7 @@ startDvr (DvrInfo *dp)
 	    /* go -- should never return */
 	    execlp (dp->name, dp->name, NULL);
 	    fprintf (stderr, "Driver %s: %s\n", dp->name, strerror(errno));
-	    _exit (1);	/* tqparent will notice EOF shortly */
+	    _exit (1);	/* parent will notice EOF shortly */
 	}
 
 	/* don't need child's side of pipes */

kstars/kstars/indi/lilxml.c

@@ -78,7 +78,7 @@ struct _LilXML {
 /* internal representation of a (possibly nested) XML element */
 struct _xml_ele {
     char *tag;			/* element tag */
-    struct _xml_ele *pe;	/* tqparent element, or NULL if root */
+    struct _xml_ele *pe;	/* parent element, or NULL if root */
     XMLAtt **at;		/* list of attributes */
     int nat;			/* number of attributes */
     int ait;			/* used to iterate over at[] */
@@ -294,14 +294,14 @@ nextXMLAtt (XMLEle *ep, int init)
 	return (ep->at[ait]);
 }
 
-/* return tqparent of given XMLEle */
+/* return parent of given XMLEle */
 XMLEle *
 parentXMLEle (XMLEle *ep)
 {
 	return (ep->pe);
 }
 
-/* return tqparent element of given XMLAtt */
+/* return parent element of given XMLAtt */
 XMLEle *
 parentXMLAtt (XMLAtt *ap)
 {
@@ -632,7 +632,7 @@ pushXMLEle(LilXML *lp)
 	resetEndTag(lp);
 }
 
-/* point ce to tqparent of current ce.
+/* point ce to parent of current ce.
  * endtag no longer valid.
  */
 static void

kstars/kstars/indi/lilxml.h

@@ -130,13 +130,13 @@ extern XMLEle *nextXMLEle (XMLEle *ep, int first);
 extern XMLAtt *nextXMLAtt (XMLEle *ep, int first);
 
 /* tree functions */
-/** \brief Return the tqparent of an XML element.
-    \return a pointer to the XML element tqparent.
+/** \brief Return the parent of an XML element.
+    \return a pointer to the XML element parent.
 */
 extern XMLEle *parentXMLEle (XMLEle *ep);
 
-/** \brief Return the tqparent of an XML attribute.
-    \return a pointer to the XML element tqparent.
+/** \brief Return the parent of an XML attribute.
+    \return a pointer to the XML element parent.
 */
 extern XMLEle *parentXMLAtt (XMLAtt *ap);
 
@@ -171,13 +171,13 @@ extern char *valuXMLAtt (XMLAtt *ap);
 */
 extern int pcdatalenXMLEle (XMLEle *ep);
 
-/** \brief Return the number of nested XML elements in a tqparent XML element.
+/** \brief Return the number of nested XML elements in a parent XML element.
     \param ep a pointer to an XML element.
     \return the number of nested XML elements.
 */
 extern int nXMLEle (XMLEle *ep);
 
-/** \brief Return the number of XML attributes in a tqparent XML element.
+/** \brief Return the number of XML attributes in a parent XML element.
     \param ep a pointer to an XML element.
     \return the number of XML attributes within the XML element.
 */

kstars/kstars/indi/lx200_16.cpp

@@ -101,7 +101,7 @@ void LX200_16::ISGetProperties (const char *dev)
 if (dev && strcmp (thisDevice, dev))
     return;
 
-  // process tqparent first
+  // process parent first
   LX200Autostar::ISGetProperties(dev);
 
   IDDefNumber (&horNum, NULL);

kstars/kstars/indi/lx200autostar.cpp

@@ -148,7 +148,7 @@ void LX200Autostar::ISNewNumber (const char *dev, const char *name, double value
 
    IDSetText(&VersionInfo, NULL);
    
-   // process tqparent
+   // process parent
    LX200Generic::getBasicData();
 
  }

kstars/kstars/indi/lx200classic.cpp

@@ -327,7 +327,7 @@ void LX200Classic::ISNewNumber (const char *dev, const char *name, double values
  void LX200Classic::getBasicData()
  {
 
-   // process tqparent first
+   // process parent first
    LX200Generic::getBasicData();
 
  }

kstars/kstars/indi/lx200generic.cpp

@@ -328,7 +328,7 @@ LX200Generic::LX200Generic()
    
    IDLog("Julian Day is %g\n", JD);
    
-   // Children call tqparent routines, this is the default
+   // Children call parent routines, this is the default
    IDLog("initilizaing from generic LX200 device...\n");
    IDLog("INDI Version: 2004-02-17\n");
  

kstars/kstars/indi/lx200gps.cpp

@@ -83,7 +83,7 @@ void LX200GPS::ISGetProperties (const char *dev)
 if (dev && strcmp (thisDevice, dev))
     return;
 
-// process tqparent first
+// process parent first
    LX200_16::ISGetProperties(dev);
 
 IDDefSwitch (&GPSPowerSw, NULL);
@@ -334,7 +334,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[],
    //getOTATemp(&OTATemp.np[0].value);
    //IDSetNumber(&OTATemp, NULL);
    
-   // process tqparent
+   // process parent
    LX200_16::getBasicData();
  }
 

kstars/kstars/indi/v4lphilips.cpp

@@ -46,7 +46,7 @@ void V4L_Philips::initCamBase()
 void V4L_Philips::initProperties(const char *dev)
 {
 
-  // Call tqparent
+  // Call parent
   V4L_Driver::initProperties(dev);
 
   fillSwitch(&BackLightS[0], "ON", "", ISS_OFF);
@@ -375,7 +375,7 @@ void V4L_Philips::ISNewSwitch (const char *dev, const char *name, ISState *state
      }
      #endif
 
-     // Call tqparent
+     // Call parent
      V4L_Driver::ISNewSwitch(dev, name, states, names, n);
         
      
@@ -481,7 +481,7 @@ void V4L_Philips::ISNewNumber (const char *dev, const char *name, double values[
 
    #endif
 
-   // Call tqparent 
+   // Call parent 
    V4L_Driver::ISNewNumber(dev, name, values, names, n);
 
 }

kstars/kstars/indi/webcam/pwc-ioctl.h

@@ -43,7 +43,7 @@
 
 /* The frame rate is encoded in the video_window.flags parameter using
    the upper 16 bits, since some flags are defined nowadays. The following
-   defines provide a tqmask and shift to filter out this value.
+   defines provide a mask and shift to filter out this value.
    
    In 'Snapshot' mode the camera freezes its automatic exposure and colour 
    balance controls.

kstars/kstars/indidevice.cpp

@@ -91,7 +91,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa
 {
   name      = inName;
   label     = inLabel;
-  tqparent    = menuParent;
+  parent    = menuParent;
   parentMgr = parentManager;
   
   gl.setAutoDelete(true);
@@ -105,7 +105,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa
 
  dataBuffer = (unsigned char *) malloc (1);
  
- stdDev 	= new INDIStdDevice(this, tqparent->ksw);
+ stdDev 	= new INDIStdDevice(this, parent->ksw);
 
  curGroup       = NULL;
 

kstars/kstars/indidevice.h

@@ -96,7 +96,7 @@ class INDI_D : public KDialogBase
     INDI_G        *curGroup;
     bool	  INDIStdSupport;
 
-    INDIMenu      *tqparent;
+    INDIMenu      *parent;
     DeviceManager *parentMgr;
     
     enum DTypes { DATA_FITS, DATA_STREAM, DATA_OTHER, DATA_CCDPREVIEW };

kstars/kstars/indidriver.cpp

@@ -48,7 +48,7 @@
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent )
+INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
 
 {
 
@@ -56,7 +56,7 @@ INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent )
     lastGroup = NULL;
     lastDevice = NULL;
 
-    ksw = (KStars *) tqparent;
+    ksw = (KStars *) parent;
 
     //FormLayout =  makeVBoxMainWidget();
 

kstars/kstars/indidriver.h

@@ -84,7 +84,7 @@ class INDIDriver : public devManager
 
    public:
 
-   INDIDriver(TQWidget * tqparent = 0);
+   INDIDriver(TQWidget * parent = 0);
    ~INDIDriver();
 
     KListView* deviceContainer;

kstars/kstars/indielement.h

@@ -96,7 +96,7 @@ class INDI_E : public TQObject
     TQString name;			/*  name */
     TQString label;			/* label is the name by default, unless specefied */
     PState state;			/* control on/off t/f etc */
-    INDI_P *pp;				/* tqparent property */
+    INDI_P *pp;				/* parent property */
 
     TQHBoxLayout    *EHBox;   		/*Qt::Horizontal tqlayout */
     

kstars/kstars/indifitsconf.cpp

@@ -23,8 +23,8 @@
 
 #include "Options.h"
 
-INDIFITSConf::INDIFITSConf(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: INDIConf(tqparent,name, modal,fl)
+INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: INDIConf(parent,name, modal,fl)
 {
 
   KIconLoader *icons = KGlobal::iconLoader();

kstars/kstars/indifitsconf.h

@@ -18,7 +18,7 @@ class INDIFITSConf : public INDIConf
   TQ_OBJECT
 
 public:
-  INDIFITSConf(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~INDIFITSConf();
   /*$PUBLIC_FUNCTIONS$*/
 

kstars/kstars/indigroup.cpp

@@ -36,7 +36,7 @@ INDI_G::INDI_G(INDI_D *parentDevice, TQString inName)
 
   pl.setAutoDelete(true);
   
-  // FIXME what's the tqparent exactly?
+  // FIXME what's the parent exactly?
   // You can do this eaither way:
   // 1. Propertycontainer is a TQFrame, then you make TQVBoxLayout for it (check form1.cpp)
   // 2. Keep it as TQVBox and let it handle its tqchildren.

kstars/kstars/indimenu.cpp

@@ -59,10 +59,10 @@
 ** INDI Menu: Handles communication to server and fetching basic XML
 ** data.
 *******************************************************************/
-INDIMenu::INDIMenu(TQWidget *tqparent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, tqparent, name, false)
+INDIMenu::INDIMenu(TQWidget *parent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, parent, name, false)
 {
 
- ksw = (KStars *) tqparent;
+ ksw = (KStars *) parent;
 
  mgrCounter = 0;
  

kstars/kstars/indimenu.h

@@ -50,7 +50,7 @@ class INDIMenu : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
  public:
-   INDIMenu(TQWidget * tqparent = 0 , const char *name = 0);
+   INDIMenu(TQWidget * parent = 0 , const char *name = 0);
    ~INDIMenu();
 
    /*****************************************************************

kstars/kstars/indiproperty.cpp

@@ -59,7 +59,7 @@ INDI_P::INDI_P(INDI_G *parentGroup, TQString inName)
   
   stdID 	  = -1;
   
-  indistd 	  = new INDIStdProperty(this, pg->dp->tqparent->ksw, pg->dp->stdDev);
+  indistd 	  = new INDIStdProperty(this, pg->dp->parent->ksw, pg->dp->stdDev);
   
   PHBox           = new TQHBoxLayout(0, 0, KDialogBase::spacingHint());
   PVBox           = new TQVBoxLayout(0, 0, KDialogBase::spacingHint());

kstars/kstars/indiproperty.h

@@ -42,7 +42,7 @@ class INDI_P : public TQObject
     TQString	name;			/* property name */
     TQString     label;			/* property label */
     
-    INDI_G	*pg;			/* tqparent group */
+    INDI_G	*pg;			/* parent group */
     KPopupMenu  *assosiatedPopup;	/* assosiated popup menu, if any */
     INDIStdProperty *indistd;		/* Assosciated std routines class */
     double	timeout;		/* timeout, seconds */
@@ -72,7 +72,7 @@ class INDI_P : public TQObject
     /* First step in adding a new GUI element */
     void addGUI(XMLEle *root);
     
-    /* Set Property's tqparent group */
+    /* Set Property's parent group */
     void setGroup(INDI_G *parentGroup) { pg = parentGroup; }
     
     /* Find an element within the property */

kstars/kstars/infobox.h

@@ -185,10 +185,10 @@ public:
 	/**Set the box to be anchored to the bottom window edge*/
 	void setAnchorBottom( const bool ab );
 
-	/**@return the box's anchor flag bittqmask.*/
+	/**@return the box's anchor flag bitmask.*/
 	int  anchorFlag() const { return AnchorFlag; }
 
-	/**Set the box's anchor flag bittqmask*/
+	/**Set the box's anchor flag bitmask*/
 	void setAnchorFlag( const int af ) { AnchorFlag = af; }
 
 	enum AnchorType { 

kstars/kstars/ksnewstuff.cpp

@@ -37,10 +37,10 @@
 #include "objectnamelist.h"
 #include "skymap.h"
 
-KSNewStuff::KSNewStuff( TQWidget *tqparent ) :
-  TQObject(), KNewStuff( "kstars", tqparent ), NGCUpdated( false )
+KSNewStuff::KSNewStuff( TQWidget *parent ) :
+  TQObject(), KNewStuff( "kstars", parent ), NGCUpdated( false )
 {
-	ks = (KStars*)tqparent;
+	ks = (KStars*)parent;
 	kdw = new KDirWatch( this );
 	kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) );
 }

kstars/kstars/ksnewstuff.h

@@ -48,9 +48,9 @@ class KSNewStuff : public TQObject, public KNewStuff
 	public:
 	/**
 		*Constructor
-		*@p tqparent pointer to the tqparent widget
+		*@p parent pointer to the parent widget
 		*/
-		KSNewStuff( TQWidget *tqparent = 0 );
+		KSNewStuff( TQWidget *parent = 0 );
 
 	/**
 		*Install new application data

kstars/kstars/ksplanetbase.cpp

@@ -95,7 +95,7 @@ bool KSPlanetBase::isMajorPlanet() const {
 }
 
 void KSPlanetBase::localizeCoords( const KSNumbers *num, const dms *lat, const dms *LST ) {
-	//convert geocentric coordinates to local aptqparent coordinates (topocentric coordinates)
+	//convert geocentric coordinates to local apparent coordinates (topocentric coordinates)
 	dms HA, HA2; //Hour Angle, before and after correction
 	double rsinp, rcosp, u, sinHA, cosHA, sinDec, cosDec, D;
 	double cosHA2;

kstars/kstars/ksplanetbase.h

@@ -317,7 +317,7 @@ protected:
 private:
 /**@short correct the position for the fact that the location is not at the center of the Earth,
 	*but a position on its surface.  This causes a small parallactic shift in a solar system
-	*body's aptqparent position.  The effect is most significant for the Moon.
+	*body's apparent position.  The effect is most significant for the Moon.
 	*This function is private, and should only be called from the public findPosition() function.
 	*@param num pointer to a ksnumbers object for the target date/time
 	*@param lat pointer to the geographic latitude of the location.

kstars/kstars/kspopupmenu.cpp

@@ -32,10 +32,10 @@
 #include "indigroup.h"
 #include "indiproperty.h"
 
-KSPopupMenu::KSPopupMenu( TQWidget *tqparent, const char *name )
- : KPopupMenu( tqparent, name )
+KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name )
+ : KPopupMenu( parent, name )
 {
-	ksw = ( KStars* )tqparent;
+	ksw = ( KStars* )parent;
 }
 
 KSPopupMenu::~KSPopupMenu()

kstars/kstars/kspopupmenu.h

@@ -42,7 +42,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 /**Default constructor*/
-	KSPopupMenu( TQWidget *tqparent = 0, const char *name = 0 );
+	KSPopupMenu( TQWidget *parent = 0, const char *name = 0 );
 	
 /**Destructor (empty)*/
 	~KSPopupMenu();

kstars/kstars/kssun.cpp

@@ -125,7 +125,7 @@ bool KSSun::findGeocentricPosition( const KSNumbers *num, const KSPlanetBase *Ea
 	nutate(num);
 	aberrate(num);
 
-	// We obtain the aptqparent geocentric ecliptic coordinates. That is, after 
+	// We obtain the apparent geocentric ecliptic coordinates. That is, after 
 	// nutation and aberration have been applied.
 	EquatorialToEcliptic( num->obliquity() );
 	

kstars/kstars/kstars.h

@@ -669,7 +669,7 @@ class KStars::privatedata {
 		KStarsData *kstarsData;
 
 		/**Constructor */
-		privatedata(KStars *tqparent) : ks(tqparent), splash(0), kstarsData(0) {}
+		privatedata(KStars *parent) : ks(parent), splash(0), kstarsData(0) {}
 		/**Destructor */
 		~privatedata();
 

kstars/kstars/kstarsactions.cpp

@@ -450,7 +450,7 @@ void KStars::slotExportImage() {
 	//Warn user if file exists!
 	if (TQFile::exists(fileURL.path()))
 	{
-		int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()),
+		int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
 								i18n( "A file named \"%1\" already exists. "
 										"Overwrite it?" ).tqarg(fileURL.fileName()),
 								i18n( "Overwrite File?" ),

kstars/kstars/kstarsdata.h

@@ -327,7 +327,7 @@ public:
 	//TODO JM: ADV tree should use XML instead
 	/**Read Advanced interface structure to be used later to construct the list view in
 		*the advanced tab in the Detail Dialog.
-		*@li KSLABEL designates a top-level tqparent label
+		*@li KSLABEL designates a top-level parent label
 		*@li KSINTERFACE designates a common URL interface for several objects
 		*@li END designates the end of a sub tree structure
 		*@short read Advanted interface structure.

kstars/kstars/kstarsdatetime.cpp

@@ -116,7 +116,7 @@ dms KStarsDateTime::GSTat0hUT() const {
 	double t1 = 6.697374558 + 2400.051336*t + 0.000025862*t*t +
 		0.000000002*t*t*t;
 
-	// To obtain the aptqparent sidereal time, we have to correct the
+	// To obtain the apparent sidereal time, we have to correct the
 	// mean greenwich sidereal time with nutation in longitude multiplied
 	// by the cosine of the obliquity of the ecliptic. This correction
 	// is called nutation in right ascention, and may amount to 0.3 secs.

kstars/kstars/kstarssplash.cpp

@@ -25,9 +25,9 @@
 #include "kstarssplash.h"
 #include "ksutils.h"
 
-KStarsSplash::KStarsSplash( TQWidget *tqparent, const char* name )
+KStarsSplash::KStarsSplash( TQWidget *parent, const char* name )
 	: KDialogBase( KDialogBase::Plain, i18n( "Loading KStars..." ),
-			0 /*no buttons*/, Ok, tqparent, name, false /*not modal*/ ) {
+			0 /*no buttons*/, Ok, parent, name, false /*not modal*/ ) {
 
 	//Set up widgets for splashscreen.
 	TQFrame *page = plainPage();

kstars/kstars/kstarssplash.h

@@ -38,7 +38,7 @@ class KStarsSplash : public KDialogBase
 	public:
 	/**Constructor. Create widgets.  Load KStars logo.  Start load timer.
 		*/
-		KStarsSplash( TQWidget *tqparent, const char* name );
+		KStarsSplash( TQWidget *parent, const char* name );
 
 	/**Destructor
 		*/

kstars/kstars/kswizard.cpp

@@ -31,10 +31,10 @@
 #include "kswizardui.h"
 #include "kswizard.h"
 
-KSWizard::KSWizard( TQWidget *tqparent, const char *name )
- : KSWizardUI( tqparent, name )
+KSWizard::KSWizard( TQWidget *parent, const char *name )
+ : KSWizardUI( parent, name )
 {
-	ksw = (KStars *)tqparent;
+	ksw = (KStars *)parent;
 	GeoID.resize(10000);
 	
 	//Removing telescope page for now...

kstars/kstars/kswizard.h

@@ -43,10 +43,10 @@ Q_OBJECT
 public:
 	/**
 		*Constructor
-		*@p tqparent pointer to the tqparent widget
+		*@p parent pointer to the parent widget
 		*@p name name for the KSWizard object
 		*/
-	KSWizard( TQWidget *tqparent=0, const char *name=0 );
+	KSWizard( TQWidget *parent=0, const char *name=0 );
 
 	/**Destructor */
 	~KSWizard();

kstars/kstars/locationdialog.cpp

@@ -36,10 +36,10 @@
 #include "mapcanvas.h"
 #include "dmsbox.h"
 
-LocationDialog::LocationDialog( TQWidget* tqparent )
-    : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, tqparent ) {
+LocationDialog::LocationDialog( TQWidget* parent )
+    : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, parent ) {
 
-	KStars *p = (KStars *)tqparent;
+	KStars *p = (KStars *)parent;
 
 	TQFrame *page = plainPage();
 	CityBox = new TQGroupBox( page, "CityBox" );
@@ -217,7 +217,7 @@ LocationDialog::~LocationDialog(){
 }
 
 void LocationDialog::initCityList( void ) {
-	KStars *p = (KStars *)tqparent();
+	KStars *p = (KStars *)parent();
 	for (GeoLocation *loc = p->data()->geoList.first(); loc; loc = p->data()->geoList.next())
 	{
 		GeoBox->insertItem( loc->fullName() );
@@ -252,7 +252,7 @@ void LocationDialog::initCityList( void ) {
 }
 
 void LocationDialog::filterCity( void ) {
-	KStars *p = (KStars *)tqparent();
+	KStars *p = (KStars *)parent();
 	GeoBox->clear();
 	filteredCityList.clear();
 	
@@ -302,7 +302,7 @@ void LocationDialog::changeCity( void ) {
 
 	//Fill the fields at the bottom of the window with the selected city's data.
 	if ( SelectedCity ) {
-		KStars *p = (KStars *)tqparent();
+		KStars *p = (KStars *)parent();
 		NewCityName->setText( SelectedCity->translatedName() );
 		NewProvinceName->setText( SelectedCity->translatedProvince() );
 		NewCountryName->setText( SelectedCity->translatedCountry() );
@@ -328,7 +328,7 @@ void LocationDialog::changeCity( void ) {
 }
 
 void LocationDialog::addCity( void ) {
-	KStars *p = (KStars *)tqparent();
+	KStars *p = (KStars *)parent();
 	bCityAdded = false;
 
 	if ( !nameModified && !dataModified ) {
@@ -417,7 +417,7 @@ void LocationDialog::addCity( void ) {
 }
 
 void LocationDialog::findCitiesNear( int lng, int lat ) {
-	KStars *ks = (KStars *)tqparent();
+	KStars *ks = (KStars *)parent();
 
 	//find all cities within 3 degrees of (lng, lat); list them in GeoBox
 	GeoBox->clear();

kstars/kstars/locationdialog.h

@@ -65,7 +65,7 @@ public:
 	*Constructor.  Create all widgets, and pack them into TQLayouts.
 	*Connect Signals to Slots.  Run initCityList().
 	*/
-	LocationDialog( TQWidget* tqparent = 0 );
+	LocationDialog( TQWidget* parent = 0 );
 /**
 	*Destructor (empty)
 	*/

kstars/kstars/magnitudespinbox.cpp

@@ -17,13 +17,13 @@
 
 #include "magnitudespinbox.h"
 
-MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * tqparent , const char * name )
-	: KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, tqparent, name)
+MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * parent , const char * name )
+	: KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, parent, name)
 {
 }
 
 MagnitudeSpinBox::MagnitudeSpinBox( double minValue, double maxValue,
-	TQWidget * tqparent , const char * name )
-	: KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, tqparent, name)
+	TQWidget * parent , const char * name )
+	: KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, parent, name)
 {
 }

kstars/kstars/magnitudespinbox.h

@@ -36,11 +36,11 @@ class MagnitudeSpinBox  : public KDoubleNumInput
 
 /**Default Constructor.
 	*/
-	MagnitudeSpinBox( TQWidget* tqparent = 0, const char* name = 0);
+	MagnitudeSpinBox( TQWidget* parent = 0, const char* name = 0);
 
 /**Constructor.  Set minimum and maximum values for the spinbox.
 	*/
-	MagnitudeSpinBox( double minValue, double maxValue, TQWidget* tqparent = 0, const char* name = 0);
+	MagnitudeSpinBox( double minValue, double maxValue, TQWidget* parent = 0, const char* name = 0);
 };
 
 

kstars/kstars/mapcanvas.cpp

@@ -25,14 +25,14 @@
 #include "kstars.h"
 #include "kstarsdata.h"
 
-MapCanvas::MapCanvas(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	BGColor = "#33A";
 	setBackgroundColor( TQColor( BGColor ) );
 	setBackgroundMode( TQWidget::NoBackground );
 	Canvas = new TQPixmap();
 	bgImage = new TQPixmap();
 	LocationDialog *ld = (LocationDialog *)tqtopLevelWidget();
-	KStars *ks = (KStars *)ld->tqparent();
+	KStars *ks = (KStars *)ld->parent();
 	TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" );
 	bgImage->load( bgFile, "PNG" );
 }
@@ -69,7 +69,7 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) {
 void MapCanvas::paintEvent( TQPaintEvent * ) {
 	TQPainter pcanvas;
 	LocationDialog *ld = (LocationDialog *)tqtopLevelWidget();
-  KStars *ks = (KStars *)ld->tqparent();
+  KStars *ks = (KStars *)ld->parent();
 
 	//prepare the canvas
 	pcanvas.begin( Canvas );

kstars/kstars/mapcanvas.h

@@ -42,9 +42,9 @@ class MapCanvas : public TQWidget  {
 public: 
 	/**Default constructor.  Initialize the widget: create pixmaps, load the
 		*world map bitmap, set pointers to the main window and the
-		*LocationDialog tqparent.
+		*LocationDialog parent.
 		*/
-	MapCanvas(TQWidget *tqparent=0, const char *name=0);
+	MapCanvas(TQWidget *parent=0, const char *name=0);
 	/**Destructor (empty)
 		*/
 	~MapCanvas();

kstars/kstars/opsadvanced.h

@@ -39,7 +39,7 @@ class OpsAdvanced : public OpsAdvancedUI
   TQ_OBJECT
 
 public:
-	OpsAdvanced( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 );
+	OpsAdvanced( TQWidget *parent=0, const char *name=0, WFlags fl = 0 );
 	~OpsAdvanced();
 
 private slots:

kstars/kstars/opscatalog.h

@@ -42,7 +42,7 @@ class OpsCatalog : public OpsCatalogUI
   TQ_OBJECT
 
 public:
-	OpsCatalog( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 );
+	OpsCatalog( TQWidget *parent=0, const char *name=0, WFlags fl = 0 );
 	~OpsCatalog();
 
 private slots:

kstars/kstars/opscolors.h

@@ -44,7 +44,7 @@ class OpsColors : public OpsColorsUI
   TQ_OBJECT
 
 public:
-	OpsColors( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 );
+	OpsColors( TQWidget *parent=0, const char *name=0, WFlags fl = 0 );
 	~OpsColors();
 
 private slots:

kstars/kstars/opsguides.cpp

@@ -18,8 +18,8 @@
 #include <tqcheckbox.h>
 #include "opsguides.h"
 
-OpsGuides::OpsGuides( TQWidget* tqparent, const char* name, WFlags fl )
-    : OpsGuidesUI( tqparent, name, fl )
+OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl )
+    : OpsGuidesUI( parent, name, fl )
 {
 	connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), 
 					 this, TQT_SLOT( slotToggleConstellOptions() ) );

kstars/kstars/opsguides.h

@@ -25,7 +25,7 @@ class OpsGuides : public OpsGuidesUI
   TQ_OBJECT
 
 public:
-	OpsGuides( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+	OpsGuides( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~OpsGuides();
 
 private slots:

kstars/kstars/opssolarsystem.cpp

@@ -21,10 +21,10 @@
 #include "kstars.h"
 #include "magnitudespinbox.h"
 
-OpsSolarSystem::OpsSolarSystem( TQWidget *tqparent, const char *name, WFlags fl )
- : OpsSolarSystemUI( tqparent, name, fl )
+OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl )
+ : OpsSolarSystemUI( parent, name, fl )
 {
-	ksw = (KStars *)tqparent;
+	ksw = (KStars *)parent;
 	
 	connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) );
 	connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) );

kstars/kstars/opssolarsystem.h

@@ -35,7 +35,7 @@ class OpsSolarSystem : public OpsSolarSystemUI
   TQ_OBJECT
 
 public:
-	OpsSolarSystem( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 );
+	OpsSolarSystem( TQWidget *parent=0, const char *name=0, WFlags fl = 0 );
 	~OpsSolarSystem();
 
 private slots:

kstars/kstars/simclock.cpp

@@ -25,9 +25,9 @@ int SimClock::idgen = 1;
 
 int SimClock::TimerInterval = 100; //msec
 
-SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) :
+SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) :
 		DCOPObject("clock#" + TQCString().setNum(idgen++)),
-		TQObject(tqparent),
+		TQObject(parent),
 		tmr(this)
 {
 	if (! when.isValid() ) tmr.stop();
@@ -43,7 +43,7 @@ SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) :
 
 SimClock::SimClock (const SimClock &old) :
 		DCOPObject("clock#" + TQCString().setNum(idgen++)),
-		TQObject(old.tqparent()),
+		TQObject(old.parent()),
 		SimClockInterface(),
 		tmr(this)
 {

kstars/kstars/simclock.h

@@ -37,10 +37,10 @@ class SimClock : public TQObject, public SimClockInterface {
 	public:
 		/**
 		 * Constructor
-		 * @param tqparent tqparent object for the clock
+		 * @param parent parent object for the clock
 		 * @param when the date/time to which the SimClock should be initialized in UTC
 		 */
-		SimClock(TQObject *tqparent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() );
+		SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() );
 		/**
 		 * Constructor
 		 * @param old a SimClock to initialize from.

kstars/kstars/skymap.cpp

@@ -51,13 +51,13 @@
 #include "starobject.h"
 #include "customcatalog.h"
 
-SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name )
-	: TQWidget (tqparent,name), computeSkymap(true), angularDistanceMode(false),
+SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name )
+	: TQWidget (parent,name), computeSkymap(true), angularDistanceMode(false),
 		ksw(0), data(d), pmenu(0), sky(0), sky2(0), IBoxes(0), 
 		ClickedObject(0), FocusObject(0), TransientObject(0),
 		starpix(0), pts(0), sp(0)
 {
-	if ( tqparent ) ksw = (KStars*) tqparent->tqparent();
+	if ( parent ) ksw = (KStars*) parent->parent();
 	else ksw = 0;
 	
 	pts = new TQPointArray( 2000 );  // points for milkyway and horizon
@@ -121,7 +121,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name )
 	connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) );
 
 	//Initialize Refraction correction lookup table arrays.  RefractCorr1 is for calculating
-	//the aptqparent altitude from the true altitude, and RefractCorr2 is for the reverse.
+	//the apparent altitude from the true altitude, and RefractCorr2 is for the reverse.
 	for ( unsigned int index = 0; index <184; ++index ) {
 		double alt = -1.75 + index*0.5;  //start at -1.75 degrees to get midpoint value for each interval.
 
@@ -1102,7 +1102,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con
 		az = focus()->az()->Degrees() + deltaAz.Degrees();
 		alt.setRadians( asin( cosc*sinAlt0 + ( dy*sinc*cosAlt0 )/r ) );
 
-		if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() );  //find true altitude from aptqparent altitude
+		if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() );  //find true altitude from apparent altitude
 
 		az.SinCos( sinAz, cosAz );
 		alt.SinCos( sinAlt, cosAlt );
@@ -1141,7 +1141,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con
 	}
 }
 
-dms SkyMap::refract( const dms *alt, bool findAptqparent ) {
+dms SkyMap::refract( const dms *alt, bool findApparent ) {
 	if ( alt->Degrees() <= -2.000 ) return dms( alt->Degrees() );
 
 	int index = int( ( alt->Degrees() + 2.0 )*2. );  //RefractCorr arrays start at alt=-2.0 degrees.
@@ -1152,7 +1152,7 @@ dms SkyMap::refract( const dms *alt, bool findAptqparent ) {
 		return dms( alt->Degrees() );
 	}
 
-	if ( findAptqparent ) {
+	if ( findApparent ) {
 		result.setD( alt->Degrees() + RefractCorr1[index] );
 	} else {
 		result.setD( alt->Degrees() + RefractCorr2[index] );
@@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor()
 	p.drawLine( mx + 5, my + 5, mx + 11, my + 11 );
 	p.end();
 
-// create a tqmask to make parts of the pixmap invisible
-	TQBitmap tqmask (32, 32);
-	tqmask.fill (color0);	// all is invisible
+// create a mask to make parts of the pixmap invisible
+	TQBitmap mask (32, 32);
+	mask.fill (color0);	// all is invisible
 
-	p.begin (&tqmask);
+	p.begin (&mask);
 // paint over the parts which should be visible
 	p.setPen (TQPen (color1, 3));
 	p.drawEllipse( mx - 7, my - 7, 14, 14 );
 	p.drawLine( mx + 5, my + 5, mx + 12, my + 12 );
 	p.end();
 	
-	cursorPix.setMask (tqmask);	// set the tqmask
+	cursorPix.setMask (mask);	// set the mask
 	TQCursor cursor (cursorPix);
 	setCursor (cursor);
 }
@@ -1289,11 +1289,11 @@ void SkyMap::setDefaultMouseCursor()
 	p.drawLine (mx + 2, my - 2, mx + 8, mx - 8);
 	p.end();
 
-// create a tqmask to make parts of the pixmap invisible
-	TQBitmap tqmask (32, 32);
-	tqmask.fill (color0);	// all is invisible
+// create a mask to make parts of the pixmap invisible
+	TQBitmap mask (32, 32);
+	mask.fill (color0);	// all is invisible
 
-	p.begin (&tqmask);
+	p.begin (&mask);
 // paint over the parts which should be visible
 	p.setPen (TQPen (color1, 3));
 // 1. diagonal
@@ -1304,7 +1304,7 @@ void SkyMap::setDefaultMouseCursor()
 	p.drawLine (mx + 2, my - 2, mx + 8, mx - 8);
 	p.end();
 
-	cursorPix.setMask (tqmask);	// set the tqmask
+	cursorPix.setMask (mask);	// set the mask
 	TQCursor cursor (cursorPix);
 	setCursor (cursor);
 }

kstars/kstars/skymap.h

@@ -64,7 +64,7 @@ public:
 	*Constructor.  Read stored settings from KConfig object (focus position,
 	*zoom factor, sky color, etc.).  Run initPopupMenus().
 	*/
-	SkyMap( KStarsData *d, TQWidget *tqparent=0, const char *name=0);
+	SkyMap( KStarsData *d, TQWidget *parent=0, const char *name=0);
 
 /**
 	*Destructor (empty)
@@ -428,13 +428,13 @@ public slots:
 	*simply assigned the nearest stored value.  The precaclulated values are stored in the 
 	*RefractCorr1 and RefractCorr2 arrays, and these are initialized in the SkyMap constructor.
 	*
-	*There are two cases:  the true altitude is known, and the aptqparent altitude is needed;
-	*or the aptqparent altitude is known and the true altitude is needed.
+	*There are two cases:  the true altitude is known, and the apparent altitude is needed;
+	*or the apparent altitude is known and the true altitude is needed.
 	*@param alt The input altitude
-	*@param findAptqparent if TRUE, then alt is the true altitude, and we'll find the aptqparent alt.
+	*@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt.
 	*@return the corrected altitude, as a dms object.
 	*/
-	dms refract( const dms *alt, bool findAptqparent );
+	dms refract( const dms *alt, bool findApparent );
 
 /**Step the Focus point toward the Destination point.  Do this iteratively, redrawing the Sky 
 	*Map after each step, until the Focus point is within 1 step of the Destination point.

kstars/kstars/skyobjectname.cpp

@@ -23,8 +23,8 @@ SkyObjectName::SkyObjectName( const TQString &str, SkyObject *obj )
 {
 }
 
-SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *tqparent, SkyObjectName *obj )
-	: TQListBoxText ( tqparent ), object ( obj )
+SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *parent, SkyObjectName *obj )
+	: TQListBoxText ( parent ), object ( obj )
 {
 	setText( obj->text() );
 }

kstars/kstars/skyobjectname.h

@@ -79,7 +79,7 @@ class SkyObjectNameListItem : public TQListBoxText  {
 	
 	public:
 	/**Constructor */
-		SkyObjectNameListItem (TQListBox *tqparent, SkyObjectName *name );
+		SkyObjectNameListItem (TQListBox *parent, SkyObjectName *name );
 
 	/**Destructor (empty)*/
 		~SkyObjectNameListItem() {}

kstars/kstars/skypoint.h

@@ -292,7 +292,7 @@ public:
 	*/
 	virtual void updateCoords( KSNumbers *num, bool includePlanets=true, const dms *lat=0, const dms *LST=0 );
 
-/**Computes the aptqparent coordinates for this SkyPoint for any epoch,
+/**Computes the apparent coordinates for this SkyPoint for any epoch,
 	*accounting for the effects of precession, nutation, and aberration.
 	*Similar to updateCoords(), but the starting epoch need not be
 	*J2000, and the target epoch need not be the present time.

kstars/kstars/stardatasink.cpp

@@ -20,8 +20,8 @@
 #include "dms.h"
 #include "kstarsdata.h"
 
-StarDataSink::StarDataSink(KStarsData *tqparent, const char *name) : TQObject(tqparent, name) {
-	ksData = tqparent;
+StarDataSink::StarDataSink(KStarsData *parent, const char *name) : TQObject(parent, name) {
+	ksData = parent;
 	receivedBlocks = 0;
 	nameListCount = ksData->ObjNames.count();
 }

kstars/kstars/stardatasink.h

@@ -42,7 +42,7 @@ class StarDataSink : public TQObject, public TQDataSink {
 
 	public:
 	/** constructor	*/
-		StarDataSink( KStarsData *tqparent, const char *name=0 );
+		StarDataSink( KStarsData *parent, const char *name=0 );
 
 	/** destructor */
 		~StarDataSink();

kstars/kstars/starpixmap.cpp

@@ -69,7 +69,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) {
 	if (colorIntensity < 0) colorIntensity = 0;	// min
 
 	TQPixmap pix (STARSIZE, STARSIZE);
-	TQBitmap tqmask (STARSIZE, STARSIZE);
+	TQBitmap mask (STARSIZE, STARSIZE);
 	TQImage image;
 	TQPainter p;
 	TQMemArray<TQColor> starColor;
@@ -104,9 +104,9 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) {
 			p.end();
 		}
 
-		tqmask.fill (TQt::color0);
+		mask.fill (TQt::color0);
 
-		p.begin (&tqmask);
+		p.begin (&mask);
 		p.setPen (TQPen ( TQt::color1, 1));
 		p.setBrush( TQBrush( TQt::color1 ) );
 		p.drawEllipse(0, 0, STARSIZE, STARSIZE);
@@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) {
 		TQImage tmp = pix.convertToImage();
 		pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) );
 
-		pix.setMask (tqmask);	// set the tqmask
+		pix.setMask (mask);	// set the mask
 		image = pix.convertToImage();	// create the image for smoothScale()
 
 		for (int i = 0; i < 26; i++)

kstars/kstars/streamwg.cpp

@@ -40,7 +40,7 @@
 
 FILE *wfp;
 
- StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : streamForm(tqparent, name)
+ StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : streamForm(parent, name)
  {
  
    stdDev         = inStdDev;
@@ -268,7 +268,7 @@ void StreamWG::captureImage()
 }
 
 
-VideoWG::VideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase)
+VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase)
 {
   streamImage    = NULL;
   grayTable=new TQRgb[256];

kstars/kstars/streamwg.h

@@ -32,7 +32,7 @@
   TQ_OBJECT
    
     public:
-      StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0);
+      StreamWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0);
       ~StreamWG();
  
    friend class VideoWG;
@@ -70,7 +70,7 @@
   TQ_OBJECT
    
     public:
-      VideoWG(TQWidget * tqparent =0, const char * name =0);
+      VideoWG(TQWidget * parent =0, const char * name =0);
       ~VideoWG();
       
       friend class StreamWG;

kstars/kstars/telescopeprop.cpp

@@ -29,11 +29,11 @@
 #include "indimenu.h"
 #include "indidriver.h"
 
-telescopeProp::telescopeProp(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: scopeProp(tqparent,name, modal,fl)
+telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: scopeProp(parent,name, modal,fl)
 {
 
-  ksw = (KStars *) tqparent;
+  ksw = (KStars *) parent;
   
   ksw->establishINDI();
   indi_driver = ksw->getINDIDriver();

kstars/kstars/telescopeprop.h

@@ -29,7 +29,7 @@ class telescopeProp : public scopeProp
   TQ_OBJECT
 
 public:
-  telescopeProp(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~telescopeProp();
   /*$PUBLIC_FUNCTIONS$*/
 

kstars/kstars/telescopewizardprocess.cpp

@@ -40,7 +40,7 @@
 
 #define TIMEOUT_THRESHHOLD	20
 
-telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* name ) : telescopeWizard(tqparent, name)
+telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* name ) : telescopeWizard(parent, name)
 {
    currentPort  = -1;
    timeOutCount = 0;
@@ -57,7 +57,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char*
    backB->hide();
    currentPage = INTRO_P;
 
-   ksw = (KStars *) tqparent;
+   ksw = (KStars *) parent;
 
    ksw->establishINDI();
 
@@ -91,7 +91,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char*
     portList << "/dev/ttyS0" <<  "/dev/ttyS1" << "/dev/ttyS2" << "/dev/ttyS3" << "/dev/ttyS4"
              << "/dev/ttyUSB0" << "/dev/ttyUSB1" << "/dev/ttyUSB2" << "/dev/ttyUSB3";// << "/dev/ttyUSB4";
 
-   connect(helpB, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(appHelpActivated()));
+   connect(helpB, TQT_SIGNAL(clicked()), parent, TQT_SLOT(appHelpActivated()));
    connect(nextB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processNext()));
    connect(backB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processBack()));
    connect(setTimeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTime()));

kstars/kstars/telescopewizardprocess.h

@@ -29,7 +29,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	telescopeWizardProcess( TQWidget* tqparent = 0, const char* name = 0);
+	telescopeWizardProcess( TQWidget* parent = 0, const char* name = 0);
 	~telescopeWizardProcess();
 
 	unsigned int currentPage;

kstars/kstars/thumbnaileditor.cpp

@@ -29,10 +29,10 @@
 #include "thumbnaileditorui.h"
 #include "thumbnailpicker.h"
 
-ThumbnailEditor::ThumbnailEditor( TQWidget *tqparent, const char *name )
- : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name )
+ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name )
+ : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, parent, name )
 {
-	tp = (ThumbnailPicker*)tqparent;
+	tp = (ThumbnailPicker*)parent;
 
 	TQFrame *page = plainPage();
 	TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, 0 );
@@ -75,7 +75,7 @@ TQPixmap ThumbImage::croppedImage() {
 	return result;
 }
 
-ThumbImage::ThumbImage( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name )
+ThumbImage::ThumbImage( TQWidget *parent, const char *name ) : TQLabel( parent, name )
 {
 	setBackgroundMode( TQWidget::NoBackground );
 	bMouseButtonDown = false;

kstars/kstars/thumbnaileditor.h

@@ -30,7 +30,7 @@ class ThumbImage : public TQLabel
 Q_OBJECT
   TQ_OBJECT
 public:
-	ThumbImage( TQWidget *tqparent, const char *name = 0 );
+	ThumbImage( TQWidget *parent, const char *name = 0 );
 	~ThumbImage();
 
 	void setImage( TQPixmap *pm ) { Image = pm; setFixedSize( Image->width(), Image->height() ); }
@@ -65,7 +65,7 @@ class ThumbnailEditor : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	ThumbnailEditor( TQWidget *tqparent, const char *name=0 );
+	ThumbnailEditor( TQWidget *parent, const char *name=0 );
 	~ThumbnailEditor();
 	TQPixmap thumbnail();
 

kstars/kstars/thumbnailpicker.cpp

@@ -43,9 +43,9 @@
 #include "detaildialog.h"
 #include "skyobject.h"
 
-ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap &current, TQWidget *tqparent, const char *name )
- : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ),
-		SelectedImageIndex(-1), dd((DetailDialog*)tqparent), Object(o), bImageFound( false )
+ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap &current, TQWidget *parent, const char *name )
+ : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, parent, name ),
+		SelectedImageIndex(-1), dd((DetailDialog*)parent), Object(o), bImageFound( false )
 {
 	Image = new TQPixmap( current );
 	ImageRect = new TQRect( 0, 0, 200, 200 );

kstars/kstars/thumbnailpicker.h

@@ -39,7 +39,7 @@ class ThumbnailPicker : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	ThumbnailPicker( SkyObject *o, const TQPixmap &current, TQWidget *tqparent=0, const char *name=0 );
+	ThumbnailPicker( SkyObject *o, const TQPixmap &current, TQWidget *parent=0, const char *name=0 );
 	~ThumbnailPicker();
 
 	TQPixmap* image() { return Image; }

kstars/kstars/timebox.cpp

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <kdebug.h>
 
-timeBox::timeBox(TQWidget *tqparent, const char *name, bool tt) : TQLineEdit(tqparent,name) 
+timeBox::timeBox(TQWidget *parent, const char *name, bool tt) : TQLineEdit(parent,name) 
 { 
 
 	if (tt) { 

kstars/kstars/timebox.h

@@ -38,12 +38,12 @@ class timeBox : public TQLineEdit  {
 public:
 	/**
 	 * Constructor for the timeBox object.
-	 * @param tqparent is the tqparent TQWidget
+	 * @param parent is the parent TQWidget
 	 * @param n name is the name of the object
 	 * @param tt boolean. true means that the object will hold a Time.
 	 * false means that the object will hold a Date.
 	 */
-	timeBox(TQWidget *tqparent, const char *n, bool tt=TRUE);
+	timeBox(TQWidget *parent, const char *n, bool tt=TRUE);
 
 	~timeBox();
 

kstars/kstars/timedialog.cpp

@@ -29,10 +29,10 @@
 #include "simclock.h"
 #include "libkdeedu/extdate/extdatepicker.h"
 
-TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* tqparent )
-    : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, tqparent )
+TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent )
+    : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, parent )
 {
-	ksw = (KStars*) tqparent;
+	ksw = (KStars*) parent;
 	TQFrame *page = plainPage();
 
 	vlay = new TQVBoxLayout( page, 2, 2 );

kstars/kstars/timedialog.h

@@ -49,7 +49,7 @@ public:
 	*Constructor.  Creates widgets and packs them into TQLayouts.
 	*Connects	Signals and Slots.
 	*/
-	TimeDialog( const KStarsDateTime &now, TQWidget* tqparent = 0 );
+	TimeDialog( const KStarsDateTime &now, TQWidget* parent = 0 );
 
 /**
 	*Destructor (empty)

kstars/kstars/timespinbox.cpp

@@ -37,8 +37,8 @@
 #define SIDEREAL_YEAR 31558149.77
 #define TROPICAL_YEAR 31556925.19
 
-TimeSpinBox::TimeSpinBox( TQWidget *tqparent, const char *name, bool _daysonly )
-	: TQSpinBox ( -41, 41, 1 /* step */, tqparent, name )
+TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly )
+	: TQSpinBox ( -41, 41, 1 /* step */, parent, name )
 {
 	setValidator( 0 );
 	setButtonSymbols( TQSpinBox::PlusMinus );

kstars/kstars/timespinbox.h

@@ -33,7 +33,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 /**Constructor */
-	TimeSpinBox( TQWidget *tqparent, const char* name=0, bool daysOnly = false );
+	TimeSpinBox( TQWidget *parent, const char* name=0, bool daysOnly = false );
 /**Destructor (empty)*/
 	~TimeSpinBox() {}
 

kstars/kstars/timestepbox.cpp

@@ -23,8 +23,8 @@
 
 #include "timestepbox.h"
 
-TimeStepBox::TimeStepBox( TQWidget *tqparent, const char* name, bool daysonly )
-	: TQFrame( tqparent, name ) {
+TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly )
+	: TQFrame( parent, name ) {
 
 	timeBox = new TimeSpinBox( this, "timebox", daysonly );
 	unitBox = new TimeUnitBox( this, "unitbox", daysonly );

kstars/kstars/timestepbox.h

@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	/**Constructor. */
-	TimeStepBox( TQWidget *tqparent=0, const char* name=0, bool daysonly=false );
+	TimeStepBox( TQWidget *parent=0, const char* name=0, bool daysonly=false );
 	/**Destructor. (empty)*/
 	~TimeStepBox() {}
 

kstars/kstars/timeunitbox.cpp

@@ -22,8 +22,8 @@
 #include <tqpushbutton.h>
 
 
-TimeUnitBox::TimeUnitBox(TQWidget *tqparent, const char *name, bool daysonly )
-	: TQVBox( tqparent, name ) {
+TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly )
+	: TQVBox( parent, name ) {
 
 	UpButton = new TQPushButton( "+", this );
 	UpButton->setMaximumWidth( 22 );

kstars/kstars/timeunitbox.h

@@ -48,7 +48,7 @@ class TimeUnitBox : public TQVBox {
   TQ_OBJECT
 public:
 	/**Constructor*/
-	TimeUnitBox(TQWidget *tqparent=0, const char *name=0, bool daysonly = false);
+	TimeUnitBox(TQWidget *parent=0, const char *name=0, bool daysonly = false);
 	/**Destructor (empty)*/
 	~TimeUnitBox();
 	/**@return the value of UnitStep for the current spinbox value() */

kstars/kstars/toggleaction.cpp

@@ -19,8 +19,8 @@
 
 ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
 	const TQString& offtext, const TQIconSet& offpix,
-	int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) :
-		KAction(ontext, onpix, accel, receiver, slot, tqparent, name),
+	int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
+		KAction(ontext, onpix, accel, receiver, slot, parent, name),
 		officon(offpix),
 		onicon(onpix),
 		offcap(offtext),
@@ -29,8 +29,8 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
 {}
 
 ToggleAction::ToggleAction(const TQString& ontext, const TQString& offtext,
-	int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) :
-		KAction(ontext, accel, receiver, slot, tqparent, name),
+	int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
+		KAction(ontext, accel, receiver, slot, parent, name),
 		officon(),
 		onicon(),
 		offcap(offtext),

kstars/kstars/toggleaction.h

@@ -35,9 +35,9 @@ class ToggleAction : public KAction {
 		
 	public:
 		/**Constructor. */
-		ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ;
+		ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ;
 		/**Constructor. Same as above, but without icons. */
-		ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ;
+		ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ;
 
 		/**Sets the ToolTip text for the "on" state. 
 			*@p tip the tooltip string

kstars/kstars/tools/altvstime.cpp

@@ -41,10 +41,10 @@
 #include "kstarsdatetime.h"
 #include "libkdeedu/extdate/extdatetimeedit.h"
 
-AltVsTime::AltVsTime( TQWidget* tqparent)  :
-	KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, tqparent )
+AltVsTime::AltVsTime( TQWidget* parent)  :
+	KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, parent )
 {
-	ks = (KStars*) tqparent;
+	ks = (KStars*) parent;
 
 	TQFrame *page = plainPage();
 
@@ -495,8 +495,8 @@ double AltVsTime::getEpoch (TQString eName)
 	return epoch;
 }
 
-AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name )
-	: KStarsPlotWidget( x1, x2, y1, y2, tqparent, name )
+AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name )
+	: KStarsPlotWidget( x1, x2, y1, y2, parent, name )
 {
 	//Default SunRise/SunSet values
 	SunRise = 0.25;

kstars/kstars/tools/altvstime.h

@@ -52,7 +52,7 @@ class AVTPlotWidget : public KStarsPlotWidget
 public:
 /**Constructor
 	*/
-	AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 );
+	AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 );
 
 /**Set the fractional positions of the Sunrise and Sunset positions, 
 	*in units where last midnight was 0.0, and next midnight is 1.0.  
@@ -99,7 +99,7 @@ class AltVsTime : public KDialogBase
 public:
 /**Constructor
 	*/
-	AltVsTime( TQWidget* tqparent = 0);
+	AltVsTime( TQWidget* parent = 0);
 	
 /**Destructor
 	*/

kstars/kstars/tools/astrocalc.cpp

@@ -38,8 +38,8 @@
 #include <tqtextview.h>
 
 
-AstroCalc::AstroCalc( TQWidget* tqparent ) :
-	KDialogBase( tqparent, "starscalculator", true, i18n("Calculator"), Close ),
+AstroCalc::AstroCalc( TQWidget* parent ) :
+	KDialogBase( parent, "starscalculator", true, i18n("Calculator"), Close ),
 	JDFrame(0), GeodCoordFrame(0), GalFrame(0), SidFrame(0), PrecFrame(0),
 	AppFrame(0), DayFrame(0), AzelFrame(0), PlanetsFrame(0), EquinoxFrame(0),
 	EclFrame(0), AngDistFrame(0)
@@ -78,7 +78,7 @@ AstroCalc::AstroCalc( TQWidget* tqparent ) :
 	TQListViewItem * coordItem = new TQListViewItem(navigationPanel,i18n("Celestial Coordinates"));
 	new TQListViewItem(coordItem,i18n("Galactic Coordinates"));
 	new TQListViewItem(coordItem,i18n("Precession"));
-	new TQListViewItem(coordItem,i18n("Aptqparent Coordinates"));
+	new TQListViewItem(coordItem,i18n("Apparent Coordinates"));
 	new TQListViewItem(coordItem,i18n("Horizontal Coordinates"));
 	new TQListViewItem(coordItem,i18n("Ecliptic Coordinates"));
 	new TQListViewItem(coordItem,i18n("Angular Distance"));
@@ -119,7 +119,7 @@ void AstroCalc::slotItemSelection(TQListViewItem *item)
 		genGalFrame();
 	if(!(election.compare(i18n("Precession"))))
 		genPrecFrame();
-	if(!(election.compare(i18n("Aptqparent Coordinates"))))
+	if(!(election.compare(i18n("Apparent Coordinates"))))
 		genAppFrame();
 	if(!(election.compare(i18n("Horizontal Coordinates"))))
 		genAzelFrame();
@@ -190,7 +190,7 @@ void AstroCalc::genCoordText(void)
 														 "</LI><LI>"
 														 "<B>Galactic:</B> Galactic/Equatorial coordinates conversion"
 														 "</LI><LI>"
-														 "<B>Aptqparent:</B> Computation of current equatorial coordinates"
+														 "<B>Apparent:</B> Computation of current equatorial coordinates"
 														 " from a given epoch"
 														 "</LI><LI>"
 														 "<B>Ecliptic:</B> Ecliptic/Equatorial coordinates conversion"
@@ -270,7 +270,7 @@ void AstroCalc::delRightPanel(void)
 		delete EclFrame;
 	else if (rightPanel == Precessor)
 		delete PrecFrame;
-	else if (rightPanel == Aptqparent)
+	else if (rightPanel == Apparent)
 		delete AppFrame;
 	else if (rightPanel == Azel)
 		delete AzelFrame;
@@ -342,8 +342,8 @@ void AstroCalc::genPrecFrame(void)
 void AstroCalc::genAppFrame(void)
 {
 	delRightPanel();
-	AppFrame = new modCalcApCoord(split,"Aptqparent");
-	rightPanel = Aptqparent;
+	AppFrame = new modCalcApCoord(split,"Apparent");
+	rightPanel = Apparent;
 }
 
 void AstroCalc::genAzelFrame(void)

kstars/kstars/tools/astrocalc.h

@@ -60,7 +60,7 @@ Q_OBJECT
 TQ_OBJECT
 	public:
     /** construtor */
-	AstroCalc(TQWidget *tqparent = 0);
+	AstroCalc(TQWidget *parent = 0);
 
     /** destructor */
 	~AstroCalc();
@@ -101,7 +101,7 @@ TQ_OBJECT
 		/**Generate frame for Precession frame. */
 		void genPrecFrame(void);
 
-		/**Generate frame for aptqparent coordinates frame. */
+		/**Generate frame for apparent coordinates frame. */
 		void genAppFrame(void);
 
 		/**Generate frame for horizontal coordinates frame. */
@@ -137,7 +137,7 @@ TQ_OBJECT
 		TQVBox *vbox, *rightBox;
 		TQString previousElection;
 
-		enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Aptqparent, Azel, Planets, Ecliptic, AngDist, Vlsr};
+		enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Apparent, Azel, Planets, Ecliptic, AngDist, Vlsr};
 		typeOfPanel rightPanel;
 
 		modCalcJD *JDFrame;

kstars/kstars/tools/jmoontool.cpp

@@ -30,10 +30,10 @@
 #include "dms.h"
 #include "ksnumbers.h"
 
-JMoonTool::JMoonTool(TQWidget *tqparent, const char *name)
- : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, tqparent, name )
+JMoonTool::JMoonTool(TQWidget *parent, const char *name)
+ : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, parent, name )
 {
-	ksw = (KStars*)tqparent;
+	ksw = (KStars*)parent;
 	
 	TQFrame *page = plainPage();
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );

kstars/kstars/tools/jmoontool.h

@@ -32,7 +32,7 @@ class JMoonTool : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	JMoonTool(TQWidget *tqparent = 0, const char *name = 0);
+	JMoonTool(TQWidget *parent = 0, const char *name = 0);
 	~JMoonTool();
 
 protected:

kstars/kstars/tools/kstarsplotwidget.cpp

@@ -28,8 +28,8 @@
 
 
 
-KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name )
- : KPlotWidget( x1, x2, y1, y2, tqparent, name ),
+KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name )
+ : KPlotWidget( x1, x2, y1, y2, parent, name ),
    dXtick2(0.0), dYtick2(0.0),
    nmajX2(0), nminX2(0), nmajY2(0), nminY2(0),
    XAxisType(DOUBLE), YAxisType(DOUBLE), XAxisType_0(DOUBLE), YAxisType_0(DOUBLE),
@@ -283,7 +283,7 @@ void KStarsPlotWidget::updateTickmarks() {
 void KStarsPlotWidget::drawBox( TQPainter *p ) {
 	int pW = PixRect.width(), pH = PixRect.height();
 
-	//First, fill in padding region with bgColor() to tqmask out-of-bounds plot data
+	//First, fill in padding region with bgColor() to mask out-of-bounds plot data
 	p->setPen( bgColor() );
 	p->setBrush( bgColor() );
 

kstars/kstars/tools/kstarsplotwidget.h

@@ -42,7 +42,7 @@ class KStarsPlotWidget : public KPlotWidget {
 public:
 /**Constructor
 	*/
-	KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 );
+	KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 );
 
 /**Destructor (empty)
 	*/

kstars/kstars/tools/lcgenerator.cpp

@@ -39,11 +39,11 @@
 
 #include <kapplication.h>
 
-LCGenerator::LCGenerator( TQWidget* tqparent)
-    : KDialogBase( tqparent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600)
+LCGenerator::LCGenerator( TQWidget* parent)
+    : KDialogBase( parent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600)
 {
 
-  ksw = (KStars*) tqparent;
+  ksw = (KStars*) parent;
   createGUI();
   
   downloadJob = 0;
@@ -398,7 +398,7 @@ void LCGenerator::DownloadCurve(TQString FinalStartDate, TQString FinalEndDate,
 
 	KURL url(buf);
 	TQString message = i18n( "Light Curve produced by the American Amateur Variable Star Observers" );
-	// tqparent of imageview is KStars
+	// parent of imageview is KStars
 	new ImageViewer(&url, message, ksw, "lightcurve");
         
 }
@@ -471,7 +471,7 @@ downloadJob = 0;
 void LCGenerator::closeEvent (TQCloseEvent *ev)
 {
 	if (ev)	// not if closeEvent (0) is called, because segfault
-		ev->accept();	// tqparent-widgets should not get this event, so it will be filtered
+		ev->accept();	// parent-widgets should not get this event, so it will be filtered
 	//this->~LCGenerator();	// destroy the object, so the object can only allocated with operator new, not as a global/local variable
 }
 

kstars/kstars/tools/lcgenerator.h

@@ -58,9 +58,9 @@ Q_OBJECT
 
 public:
 /**Constructor 
-	*@p tqparent pointer to the tqparent widget
+	*@p parent pointer to the parent widget
 	*/
-	LCGenerator( TQWidget* tqparent = 0);
+	LCGenerator( TQWidget* parent = 0);
 /**Destructor */
 	~LCGenerator();
 

kstars/kstars/tools/modcalcapcoord.cpp

@@ -62,7 +62,7 @@ SkyPoint modCalcApCoord::getEquCoords (void) {
 
 void modCalcApCoord::showCurrentTime (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent();
+	KStars *ks = (KStars*) parent()->parent()->parent();
 
 	KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
 	datBox->setDate( dt.date() );

kstars/kstars/tools/modcalcapcoorddlg.ui

@@ -13,7 +13,7 @@
         </rect>
     </property>
     <property name="caption">
-        <string>Aptqparent Coordinates</string>
+        <string>Apparent Coordinates</string>
     </property>
     <property name="focusPolicy">
         <enum>StrongFocus</enum>
@@ -272,7 +272,7 @@
                             <cstring>outputBox</cstring>
                         </property>
                         <property name="title">
-                            <string>Aptqparent Coordinates</string>
+                            <string>Apparent Coordinates</string>
                         </property>
                         <hbox>
                             <property name="name">

kstars/kstars/tools/modcalcazel.cpp

@@ -79,7 +79,7 @@ SkyPoint modCalcAzel::getHorCoords (void)
 
 void modCalcAzel::showCurrentDateTime (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent();
+	KStars *ks = (KStars*) parent()->parent()->parent();
 
 	KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
 
@@ -130,7 +130,7 @@ void modCalcAzel::getGeoLocation (void)
 
 void modCalcAzel::initGeo(void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	geoPlace = new GeoLocation( ks->geo() );
 }
 
@@ -139,7 +139,7 @@ void modCalcAzel::initGeo(void)
 void modCalcAzel::showLongLat(void)
 {
 
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	longBox->show( ks->geo()->lng() );
 	latBox->show( ks->geo()->lat() );
 	longBoxBatch->show( ks->geo()->lng() );

kstars/kstars/tools/modcalcazeldlg.ui

@@ -184,7 +184,7 @@
                                     <cstring>radioApCoords</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Aptqparent coordinates</string>
+                                    <string>Apparent coordinates</string>
                                 </property>
                                 <property name="checked">
                                     <bool>true</bool>

kstars/kstars/tools/modcalcdaylength.cpp

@@ -46,7 +46,7 @@ void modCalcDayLength::showCurrentDate (void)
 
 void modCalcDayLength::initGeo(void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	geoPlace = ks->geo();
 	longBox->show( geoPlace->lng() );
 	latBox->show( geoPlace->lat() );
@@ -96,7 +96,7 @@ void modCalcDayLength::slotComputePosTime()
 	getGeoLocation();
 
 	KSNumbers * num = new KSNumbers(jd0);
-	KSSun *Sun = new KSSun(((KStars*) tqparent()->tqparent()->tqparent())->data());
+	KSSun *Sun = new KSSun(((KStars*) parent()->parent()->parent())->data());
 	Sun->findPosition(num);
 
 	TQTime setTQtime = Sun->riseSetTime( jd0 , geoPlace, false );

kstars/kstars/tools/modcalcequinox.cpp

@@ -64,7 +64,7 @@ void modCalcEquinox::slotComputeEquinoxesAndSolstices (void)
 {
 	long double julianDay = 0., jdf = 0.;
 	float deltaJd;
-	KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent();
+	KStarsData *kd = (KStarsData*) parent()->parent()->parent();
 	KSSun *Sun = new KSSun(kd);
 	int year0 = getYear( yearEdit->text() );
 	
@@ -174,7 +174,7 @@ void modCalcEquinox::processLines( TQTextStream &istream ) {
 	int yearB;
 	int i = 0;
 	long double jdsp = 0., jdsu = 0., jdau = 0., jdwin = 0., jdsp1 = 0.;
-	KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent();
+	KStarsData *kd = (KStarsData*) parent()->parent()->parent();
 	KSSun *Sun = new KSSun(kd);
 
 	while ( ! istream.eof() ) {

kstars/kstars/tools/modcalcgeodcoord.cpp

@@ -58,7 +58,7 @@ modCalcGeodCoord::~modCalcGeodCoord(){
 void modCalcGeodCoord::showLongLat(void)
 {
 
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	lonGeoBox->show( ks->geo()->lng() );
 	latGeoBox->show( ks->geo()->lat() );
 	altGeoBox->setText( TQString("0.0") );

kstars/kstars/tools/modcalcjd.cpp

@@ -101,7 +101,7 @@ void modCalcJD::slotClearTime (void)
 
 void modCalcJD::showCurrentTime (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent();
+	KStars *ks = (KStars*) parent()->parent()->parent();
 
 	KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
 	datBox->setDate( dt.date() );

kstars/kstars/tools/modcalcplanets.cpp

@@ -50,7 +50,7 @@ modCalcPlanets::~modCalcPlanets(){
 
 void modCalcPlanets::showCurrentDateTime (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
 
 	dateBox->setDate( dt.date() );
@@ -68,7 +68,7 @@ KStarsDateTime modCalcPlanets::getDateTime (void)
 void modCalcPlanets::showLongLat(void)
 {
 
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	longBox->show( ks->geo()->lng() );
 	latBox->show( ks->geo()->lat() );
 
@@ -90,7 +90,7 @@ GeoLocation modCalcPlanets::getObserverPosition (void)
 
 void modCalcPlanets::slotComputePosition (void)
 {
-	KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent();
+	KStarsData *kd = (KStarsData*) parent()->parent()->parent();
 	KStarsDateTime dt = getDateTime(); 
 	long double julianDay = dt.djd();
 	GeoLocation position( getObserverPosition() );
@@ -366,7 +366,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
 	ExtDate dtB;
 	dms longB, latB, hlongB, hlatB, glongB, glatB, raB, decB, azmB, altB;
 	double rSunB(0.0), rEarthB(0.0);
-	KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStarsData *kd = (KStarsData*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	PlanetCatalog PCat( kd ); 
 	PCat.initialize();
 

kstars/kstars/tools/modcalcsidtime.cpp

@@ -44,7 +44,7 @@ modCalcSidTime::~modCalcSidTime(void) {
 
 void modCalcSidTime::showCurrentTimeAndLong (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent();
+	KStars *ks = (KStars*) parent()->parent()->parent();
 	 // modCalcSidTimeDlg -> TQSplitter->AstroCalc->KStars
 
 	showUT( ks->data()->ut().time() );

kstars/kstars/tools/modcalcvlsr.cpp

@@ -141,7 +141,7 @@ void modCalcVlsr::getGeoLocation (void)
 
 void modCalcVlsr::showCurrentDateTime (void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent();
+	KStars *ks = (KStars*) parent()->parent()->parent();
 
 	KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
 
@@ -154,7 +154,7 @@ void modCalcVlsr::showCurrentDateTime (void)
 // SIRVE para algo?
 void modCalcVlsr::initGeo(void)
 {
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	geoPlace = new GeoLocation( ks->geo() );
 }
 
@@ -163,7 +163,7 @@ void modCalcVlsr::initGeo(void)
 void modCalcVlsr::showLongLat(void)
 {
 
-	KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars
+	KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
 	longBox->show( ks->geo()->lng() );
 	latBox->show( ks->geo()->lat() );
 	longBoxBatch->show( ks->geo()->lng() );

kstars/kstars/tools/observinglist.cpp

@@ -53,9 +53,9 @@
 #include "devicemanager.h"
 #include "indistd.h"
 
-ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent )
+ObservingList::ObservingList( KStars *_ks, TQWidget* parent )
 		: KDialogBase( KDialogBase::Plain, i18n( "Observing List" ), 
-				Close, Close, tqparent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), 
+				Close, Close, parent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), 
 				noNameStars(0), isModified(false), bIsLarge(true)
 {
 	TQFrame *page = plainPage();

kstars/kstars/tools/observinglist.h

@@ -63,7 +63,7 @@ class ObservingList : public KDialogBase
 public:
 /**@short Cunstructor
 	*/
-	ObservingList( KStars *_ks, TQWidget* tqparent = 0 );
+	ObservingList( KStars *_ks, TQWidget* parent = 0 );
 /**@short Destuctor (empty)
 	*/
 	~ObservingList() {}

kstars/kstars/tools/obslistwizard.cpp

@@ -34,10 +34,10 @@
 
 #include "obslistwizard.h"
 
-ObsListWizard::ObsListWizard( TQWidget *tqparent, const char *name ) 
-  : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, tqparent, name )
+ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) 
+  : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, parent, name )
 {
-	ksw = (KStars*)tqparent;
+	ksw = (KStars*)parent;
 	TQFrame *page = plainPage();
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );
 

kstars/kstars/tools/obslistwizard.h

@@ -35,7 +35,7 @@ class ObsListWizard : public KDialogBase
 	public:
 	/**@short Constructor
 		*/
-		ObsListWizard( TQWidget *tqparent = 0, const char *name = 0 );
+		ObsListWizard( TQWidget *parent = 0, const char *name = 0 );
 	/**@short Destructor
 		*/
 		~ObsListWizard();

kstars/kstars/tools/planetviewer.cpp

@@ -35,8 +35,8 @@
 
 #define AUMAX 48
 
-PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name)
- : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, tqparent, name ), PCat( ((KStars*)tqparent)->data() ), scale(1.0), isClockRunning(false), tmr(this)
+PlanetViewer::PlanetViewer(TQWidget *parent, const char *name)
+ : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, parent, name ), PCat( ((KStars*)parent)->data() ), scale(1.0), isClockRunning(false), tmr(this)
 {
 	TQFrame *page = plainPage();
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() );
@@ -49,7 +49,7 @@ PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name)
 	pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep
 
 	pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) );
-	pw->dateBox->setDate( ((KStars*)tqparent)->data()->lt().date() );
+	pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() );
 	
 	vlay->addWidget( pw );
 	resize( 500, 500 );
@@ -68,7 +68,7 @@ PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name)
 	setCenterPlanet("");
 	
 	PCat.initialize();
-	ut = ((KStars*)tqparent)->data()->ut();
+	ut = ((KStars*)parent)->data()->ut();
 	KSNumbers num( ut.djd() );
 	PCat.findPosition( &num, 0, 0 ); //NULL args: don't need geocent. coords.
 	
@@ -168,7 +168,7 @@ void PlanetViewer::updatePlanets() {
 }
 
 void PlanetViewer::slotToday() {
-	KStars *ks = (KStars*)tqparent();
+	KStars *ks = (KStars*)parent();
 	pw->dateBox->setDate( ks->data()->lt().date() );
 }
 
@@ -236,8 +236,8 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget
 	pv = (PlanetViewer*)tqtopLevelWidget();
 }
 
-PVPlotWidget::PVPlotWidget( TQWidget *tqparent, const char *name ) :
-			KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, tqparent, name ), 
+PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) :
+			KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), 
 			mouseButtonDown(false), oldx(0), oldy(0) {
 	setFocusPolicy( TQ_StrongFocus );
 	setMouseTracking (true);

kstars/kstars/tools/planetviewer.h

@@ -36,7 +36,7 @@ class PlanetViewer : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	PlanetViewer(TQWidget *tqparent = 0, const char *name = 0);
+	PlanetViewer(TQWidget *parent = 0, const char *name = 0);
 	~PlanetViewer();
 
 	TQString centerPlanet() const { return CenterPlanet; }
@@ -81,8 +81,8 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	PVPlotWidget( double x1, double x2, double y1, double y2, 
-			TQWidget *tqparent=0, const char *name=0 );
-	PVPlotWidget( TQWidget *tqparent=0, const char *name=0 );
+			TQWidget *parent=0, const char *name=0 );
+	PVPlotWidget( TQWidget *parent=0, const char *name=0 );
 	~PVPlotWidget();
 
 public slots:

kstars/kstars/tools/scriptbuilder.cpp

@@ -100,14 +100,14 @@
 #include "timestepbox.h"
 #include "libkdeedu/extdate/extdatewidget.h"
 
-ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name )
- : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, tqparent, name ), 
+ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name )
+ : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, parent, name ), 
 		UnsavedChanges(false), currentFileURL(), currentDir( TQDir::homeDirPath() ), 
 		currentScriptName(), currentAuthor() {
 
 	TQFrame *page = plainPage();
 
-	ks = (KStars*)tqparent;
+	ks = (KStars*)parent;
 	TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 );
 	sb = new ScriptBuilderUI( page );
 	vlay->addWidget( sb );
@@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() {
 			
 			//Warn user if file exists
 			if (TQFile::exists(currentFileURL.path())) {
-				int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()),
+				int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
 						i18n( "A file named \"%1\" already exists. "
 								"Overwrite it?" ).tqarg(currentFileURL.fileName()),
 						i18n( "Overwrite File?" ),
@@ -935,7 +935,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
 			ostream << mainpre  << sf->scriptLine() << endl;
 			if (sb->AppendINDIWait->isChecked() && !sf->INDIProperty().isEmpty())
 			{
-			  // Special case for telescope action, we need to know the tqparent property
+			  // Special case for telescope action, we need to know the parent property
 			  if (sf->INDIProperty() == "CHECK")
 			  {
 			    if (sf->argVal(1) == "SLEW" || sf->argVal(1) == "TRACK" || sf->argVal(1) == "SYNC")

kstars/kstars/tools/scriptbuilder.h

@@ -70,7 +70,7 @@ class ScriptBuilder : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	ScriptBuilder( TQWidget *tqparent, const char *name=0 );
+	ScriptBuilder( TQWidget *parent, const char *name=0 );
 	~ScriptBuilder();
 
 	bool unsavedChanges() const { return UnsavedChanges; }
@@ -169,7 +169,7 @@ private:
 
 	ScriptBuilderUI *sb;
 
-	KStars *ks; //tqparent needed for sub-dialogs
+	KStars *ks; //parent needed for sub-dialogs
 	TQPtrList<ScriptFunction> KStarsFunctionList;
 	TQPtrList<ScriptFunction> INDIFunctionList;
 	TQPtrList<ScriptFunction> ScriptList;

ktouch/src/ktouchchartwidget.cpp

@@ -20,8 +20,8 @@
 #include <numeric>  // for mathematical functions
 #include <cmath>
 
-KTouchChartWidget::KTouchChartWidget(TQWidget* tqparent, const char *name)
-  : KPlotWidget(0.0, 1.0, 0.0, 1.0, tqparent, name)
+KTouchChartWidget::KTouchChartWidget(TQWidget* parent, const char *name)
+  : KPlotWidget(0.0, 1.0, 0.0, 1.0, parent, name)
 {
 	setShowGrid( false ); // no grid please
 	setBGColor( TQColor( "white" ) );

ktouch/src/ktouchchartwidget.h

@@ -27,7 +27,7 @@ class KTouchChartWidget : public KPlotWidget {
   TQ_OBJECT
   public:
     /// Constructor.
-    KTouchChartWidget(TQWidget* tqparent, const char *name=0);
+    KTouchChartWidget(TQWidget* parent, const char *name=0);
     /// Destructor.
     ~KTouchChartWidget();
 };

ktouch/src/ktouchcoloreditor.cpp

@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-KTouchColorEditor::KTouchColorEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: KTouchColorEditorDlg(tqparent,name, modal,fl)
+KTouchColorEditor::KTouchColorEditor(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: KTouchColorEditorDlg(parent,name, modal,fl)
 {
 }
 // ----------------------------------------------------------------------------

ktouch/src/ktouchcoloreditor.h

@@ -31,7 +31,7 @@ class KTouchColorEditor : public KTouchColorEditorDlg
 
 public:
 	/// Constructor
-	KTouchColorEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	/// Destructor
 	~KTouchColorEditor();
 

ktouch/src/ktouchkeyboardeditor.cpp

@@ -34,8 +34,8 @@
 // ***** Public functions ***
 // **************************
 
-KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-  : KTouchKeyboardEditorDlg(tqparent,name, modal,fl)
+KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* parent, const char* name, bool modal, WFlags fl)
+  : KTouchKeyboardEditorDlg(parent,name, modal,fl)
 {
 }
 // -----------------------------------------------------------------------------

ktouch/src/ktouchkeyboardeditor.h

@@ -45,7 +45,7 @@ class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg {
 
   public:
     /// Constructor.
-    KTouchKeyboardEditor(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     /// Default destructor.
     ~KTouchKeyboardEditor() {}
     /// Shows and executes the dialog (argument is the url to the default or 

ktouch/src/ktouchkeyboardwidget.cpp

@@ -35,8 +35,8 @@ TQMap<TQChar, int>	 			KTouchKeyboardWidget::m_keyCharMap;
 // --------------------------------------------------------------------------
 
 
-KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *tqparent)
-  : TQWidget(tqparent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""),
+KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *parent)
+  : TQWidget(parent), m_keyboardWidth(100), m_keyboardHeight(60), m_currentLayout(""),
 	m_hideKeyboard(false)
 {
     setMinimumHeight(100);          // when it's smaller you won't see anything

ktouch/src/ktouchkeyboardwidget.h

@@ -44,7 +44,7 @@ class KTouchKeyboardWidget : public TQWidget {
   TQ_OBJECT
   public:
     /// Constructor
-    KTouchKeyboardWidget(TQWidget *tqparent);
+    KTouchKeyboardWidget(TQWidget *parent);
     /// Reads a keyboard tqlayout from the given URL.
     /// The function returns 'true' when the reading was successful or 'false' if not. In this
     /// case the optional parameter errorMsg contains the error message.

ktouch/src/ktouchlectureeditor.cpp

@@ -41,8 +41,8 @@
 // ***** Public functions ***
 // **************************
 
-KTouchLectureEditor::KTouchLectureEditor(TQWidget *tqparent, const char* name, bool modal, WFlags fl)
- : KTouchLectureEditorDlg(tqparent, name, modal, fl)
+KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, bool modal, WFlags fl)
+ : KTouchLectureEditorDlg(parent, name, modal, fl)
 {
     levelListView->setSorting(-1); // don't sort my level list view!
 

ktouch/src/ktouchlectureeditor.h

@@ -44,7 +44,7 @@ class KTouchLectureEditor : public KTouchLectureEditorDlg {
   TQ_OBJECT
   public:
     /// Constructor
-    KTouchLectureEditor(TQWidget *tqparent, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+    KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
     /// Destructor
     ~KTouchLectureEditor() {}
     /// Shows and executes the dialog (argument is the url to the default or 

ktouch/src/ktouchopenrequest.cpp

@@ -26,8 +26,8 @@
 #include "ktouchopenrequest.h"
 #include "ktouchopenrequest.moc"
 
-KTouchOpenRequest::KTouchOpenRequest(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: KTouchOpenRequestDlg(tqparent,name, modal,fl)
+KTouchOpenRequest::KTouchOpenRequest(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: KTouchOpenRequestDlg(parent,name, modal,fl)
 {
 }
 

ktouch/src/ktouchopenrequest.h

@@ -56,7 +56,7 @@ class KTouchOpenRequest : public KTouchOpenRequestDlg {
  
   public:
     /// Default constructor.
-    KTouchOpenRequest(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     /// Default destructor.
     ~KTouchOpenRequest() {}
     /// Sets up the dialog and runs it.

ktouch/src/ktouchslideline.cpp

@@ -41,8 +41,8 @@
 // --- don't touch the lines above ---
 
 
-KTouchSlideLine::KTouchSlideLine(TQWidget *tqparent)
-  : TQWidget( tqparent ),
+KTouchSlideLine::KTouchSlideLine(TQWidget *parent)
+  : TQWidget( parent ),
     m_teacherPixmap(NULL),
     m_studentPixmap(NULL),
     m_slideTimer(this),

ktouch/src/ktouchslideline.h

@@ -36,7 +36,7 @@ class KTouchSlideLine : public TQWidget {
   TQ_OBJECT
   public:
     /// Constructor
-    KTouchSlideLine(TQWidget *tqparent);
+    KTouchSlideLine(TQWidget *parent);
     /// Destructor, free memory allocated for the line pixmap.
     ~KTouchSlideLine();
     /// Applies the preferences (font and colours).

ktouch/src/ktouchstatistics.cpp

@@ -34,8 +34,8 @@
 #include "ktouch.h"
 #include "ktouchchartwidget.h"
 
-KTouchStatistics::KTouchStatistics(TQWidget* tqparent)
-	: KTouchStatisticsDlg(tqparent)
+KTouchStatistics::KTouchStatistics(TQWidget* parent)
+	: KTouchStatisticsDlg(parent)
 {
 	sessionsRadio->setChecked(true);
 	WPMRadio->setChecked(true);

ktouch/src/ktouchstatistics.h

@@ -30,7 +30,7 @@ class KTouchStatistics : public KTouchStatisticsDlg {
   TQ_OBJECT
   public:
     /// Constructor, takes a pointer to the trainer object.
-    KTouchStatistics(TQWidget* tqparent);
+    KTouchStatistics(TQWidget* parent);
 
 	/// Fills the statistics dialog with data and executes it.
 	void run(const KURL& currentLecture, const KTouchStatisticsData& stats,

ktouch/src/ktouchstatus.cpp

@@ -20,8 +20,8 @@
 #include <kpushbutton.h>
 #include "prefs.h"
 
-KTouchtqStatus::KTouchtqStatus(TQWidget *tqparent)
- : KTouchStatusLayout(tqparent)
+KTouchtqStatus::KTouchtqStatus(TQWidget *parent)
+ : KTouchStatusLayout(parent)
 {
     applyPreferences();
 }

ktouch/src/ktouchstatus.h

@@ -30,7 +30,7 @@ class KTouchtqStatus : public KTouchStatusLayout {
   TQ_OBJECT
   public:
     /// Constructor
-    KTouchtqStatus(TQWidget *tqparent);
+    KTouchtqStatus(TQWidget *parent);
 	/// Called when the preferences have changed in the configuration dialog.
 	void applyPreferences();
     /// Sets the new characters text.

kturtle/src/canvas.cpp

@@ -75,10 +75,10 @@ const double DEG2RAD = 3.14159265358979323846/180;
 
 // BEGIN public methods
 
-Canvas::Canvas(TQWidget *tqparent, const char *name) : TQCanvasView(0, tqparent, name)
+Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name)
 {
 	// Create a new canvas for this view
-	canvas = new TQCanvas(TQT_TQOBJECT(tqparent));
+	canvas = new TQCanvas(TQT_TQOBJECT(parent));
 	canvas->setAdvancePeriod(250);  // refresh-rate in [ms]
 	
 	// set initial values

kturtle/src/canvas.h

@@ -28,7 +28,7 @@ class Canvas : public TQCanvasView
   TQ_OBJECT
 
 	public:
-		Canvas(TQWidget *tqparent = 0, const char *name = 0);
+		Canvas(TQWidget *parent = 0, const char *name = 0);
 		~Canvas();
 		
 		TQPixmap* canvas2Pixmap();

kturtle/src/dialogs.cpp

@@ -25,8 +25,8 @@
 
 // BEGIN class ErrorMessage dialog
 
-ErrorMessage::ErrorMessage (TQWidget *tqparent)
-	: KDialogBase (tqparent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") )
+ErrorMessage::ErrorMessage (TQWidget *parent)
+	: KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") )
 {
 	connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) );
 	connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) );
@@ -140,8 +140,8 @@ void ErrorMessage::errorMessageHelp()
 
 // BEGIN class ColorPicker dialog
 
-ColorPicker::ColorPicker(TQWidget *tqparent)
-	: KDialogBase(tqparent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true )
+ColorPicker::ColorPicker(TQWidget *parent)
+	: KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true )
 {
 	// connect to help
 	connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) );
@@ -297,8 +297,8 @@ void ColorPicker::slotColorPickerHelp()
 
 // BEGIN class RestartOrBack dialog
 
-RestartOrBack::RestartOrBack (TQWidget *tqparent)
-	: KDialogBase (tqparent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") )
+RestartOrBack::RestartOrBack (TQWidget *parent)
+	: KDialogBase (parent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") )
 {
 	setPlainCaption( i18n("Finished Execution") );
 	setButtonWhatsThis( KDialogBase::User1, i18n("Click here to restart the current logo program.") );

kturtle/src/dialogs.h

@@ -56,7 +56,7 @@ class ErrorMessage : public KDialogBase
   TQ_OBJECT
 	
 	public:
-		ErrorMessage(TQWidget *tqparent);
+		ErrorMessage(TQWidget *parent);
 		~ErrorMessage() {}
 	
 		bool containsErrors();
@@ -101,7 +101,7 @@ class ColorPicker : public KDialogBase
   TQ_OBJECT
   
 	public:
-		ColorPicker(TQWidget *tqparent);
+		ColorPicker(TQWidget *parent);
 		virtual ~ColorPicker() {}
 
 
@@ -154,7 +154,7 @@ class RestartOrBack : public KDialogBase
   TQ_OBJECT
 	
 	public:
-		RestartOrBack (TQWidget *tqparent);
+		RestartOrBack (TQWidget *parent);
 		~RestartOrBack() {}
 
 	protected:

kturtle/src/treenode.cpp

@@ -58,7 +58,7 @@ TreeNode::~TreeNode()
 void TreeNode::init()
 {
 	clear();
-	tqparent = NULL;
+	parent = NULL;
 	// fTok.look (TQString) and fTok.value (Value) are properly init'ed when constructed
 	fTok.start.row = 0;
 	fTok.start.col = 0;
@@ -77,23 +77,23 @@ void TreeNode::appendChild(TreeNode* node)
 
 void TreeNode::appendSibling(TreeNode* node)
 {
-	node->tqparent = tqparent;
-	if (tqparent != NULL) tqparent->push_back(node);
+	node->parent = parent;
+	if (parent != NULL) parent->push_back(node);
 }
 
 
 TreeNode* TreeNode::nextSibling()
 {
-	if (tqparent)
+	if (parent)
 	{
 		TreeNode::iterator i = lookup();
-		if ( i != tqparent->end() )
+		if ( i != parent->end() )
 		{
 			++i;
 			// Must check after i has been incremented
 			// to make sure i isn't at the end before
 			// returning the contained pointer value.
-			if ( i != tqparent->end() ) return *i;
+			if ( i != parent->end() ) return *i;
 		}
 	}
 	return NULL;
@@ -101,13 +101,13 @@ TreeNode* TreeNode::nextSibling()
 
 TreeNode* TreeNode::prevSibling()
 {
-	if (tqparent)
+	if (parent)
 	{
 		TreeNode::iterator i = lookup();
 		// Must make sure we aren't at beginning as well
 		// or we can crash when decrementing since we shouldn't
 		// decrement before the start of the list.
-		if ( ( i != tqparent->end() ) && ( i != tqparent->begin() ) )
+		if ( ( i != parent->end() ) && ( i != parent->begin() ) )
 		{
 			--i;
 			return *i;
@@ -184,10 +184,10 @@ TreeNode* TreeNode::lastChild()
 
 TreeNode::iterator TreeNode::lookup()
 {
-	if (tqparent != NULL)
+	if (parent != NULL)
 	{
-		TreeNode::iterator i = tqparent->begin();
-		while ( (*i != this) && (i != tqparent->end() ) ) ++i;
+		TreeNode::iterator i = parent->begin();
+		while ( (*i != this) && (i != parent->end() ) ) ++i;
 		return i;
 	}
 	return end();
@@ -201,7 +201,7 @@ TreeNode& TreeNode::operator= (const TreeNode& t)
 	{
 		fType  = t.fType;
 		fTok   = t.fTok;
-		tqparent = t.tqparent;
+		parent = t.parent;
 		
 		clear();
 		for (TreeNode::const_iterator i = t.begin(); i != t.end(); ++i)

kturtle/src/treenode.h

@@ -213,14 +213,14 @@ class TreeNode : public list<TreeNode*> /*, public Value  <-- maybe oneday */
 {
 	public:
 		TreeNode(); // used for creation of the first node called 'tree', in the contructor of the parser 
-		TreeNode( TreeNode* ); // give tqparent
+		TreeNode( TreeNode* ); // give parent
 		TreeNode( Token, NodeType = Unknown, TQString = TQString() );
 		virtual ~TreeNode();
 	
 		void init();
 	
 		void appendChild(TreeNode*);
-		void appendSibling(TreeNode*); // works only if it has tqparent set!
+		void appendSibling(TreeNode*); // works only if it has parent set!
 	
 		TreeNode* firstChild();
 		TreeNode* secondChild();
@@ -232,8 +232,8 @@ class TreeNode : public list<TreeNode*> /*, public Value  <-- maybe oneday */
 		TreeNode* nextSibling();   
 		TreeNode* prevSibling();
 	
-		void      setParent(TreeNode* p)     { tqparent = p; }
-		TreeNode* getParent() const          { return tqparent; }
+		void      setParent(TreeNode* p)     { parent = p; }
+		TreeNode* getParent() const          { return parent; }
 		
 		void      setToken(Token t)          { fTok = t; }
 		Token&    getToken()                 { return fTok; }
@@ -254,7 +254,7 @@ class TreeNode : public list<TreeNode*> /*, public Value  <-- maybe oneday */
 		uint      getCol() const             { return fTok.start.col; }
 	
 		bool hasChildren() const             { return size() != 0; }
-		TreeNode::iterator lookup(); // gives location in tqparent list as iterator (used by prevSibling and nextSibling)
+		TreeNode::iterator lookup(); // gives location in parent list as iterator (used by prevSibling and nextSibling)
 	
 		TreeNode& operator=(const TreeNode&);
 	
@@ -270,7 +270,7 @@ class TreeNode : public list<TreeNode*> /*, public Value  <-- maybe oneday */
 	
 	
 	protected:
-		TreeNode    *tqparent;
+		TreeNode    *parent;
 };
 
 #endif // _TREENODE_H_

kverbos/kverbos/kerfassen.cpp

@@ -31,8 +31,8 @@
 // Die Konstruktoren sollen sicherstellen, dass am Anfang die Karteikarten und
 // die Eingabefelder für Gerund und Partizip nicht aktiviert sind.
 // Das Dialogfeld in den Zustand nicht geändert versetzen.
-KErfassen::KErfassen(spanishVerbList& l, int pos, TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: QErfassen(tqparent, name, modal, fl), liste(l)
+KErfassen::KErfassen(spanishVerbList& l, int pos, TQWidget* parent, const char* name, bool modal, WFlags fl)
+: QErfassen(parent, name, modal, fl), liste(l)
 {
 	formEdit[0][0] = EditYo2_1;
 	formEdit[1][0] = EditTu2_1;

kverbos/kverbos/kerfassen.h

@@ -38,7 +38,7 @@ public:
    *  Verben in die Liste eingef<EFBFBD>gt werden k<EFBFBD>nnen. Es wird auch ein Iterator <EFBFBD>bergeben, der
    *  anzeigt, wo mit dem editieren begonnen werden soll.
    */
-  KErfassen(spanishVerbList& l, int pos = -1, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+  KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
   /** der Destruktor */
   virtual ~KErfassen();
   /** Gibt zur<75>ck, ob durch den Ablauf des Dialoges eine <20>nderung an der

kverbos/kverbos/kresult.cpp

@@ -23,8 +23,8 @@
 
 #include <klocale.h>
 
-KResult::KResult(KVerbosUser* pU, TQWidget* tqparent, const char* name, bool modal, WFlags fl )
-: QResult(tqparent, name, modal, fl)
+KResult::KResult(KVerbosUser* pU, TQWidget* parent, const char* name, bool modal, WFlags fl )
+: QResult(parent, name, modal, fl)
 {
 	int sessions;
 	TQString date[10];

kverbos/kverbos/kresult.h

@@ -28,7 +28,7 @@
 
 class KResult : public QResult  {
 public: 
-	KResult(KVerbosUser* pU, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );	
+	KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );	
 	~KResult();
 public slots:	
   /** Wird durch den OK-Button aufgerufen und beendet den Dialog.

kverbos/kverbos/kstartuplogo.cpp

@@ -20,8 +20,8 @@
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
-KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name)
-: TQWidget(tqparent,name,WStyle_Customize | WStyle_NoBorder  )
+KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
+: TQWidget(parent,name,WStyle_Customize | WStyle_NoBorder  )
 { 	
   TQPixmap pm;
   pm.load(locate("appdata", "pics/startuplogo.png"));

kverbos/kverbos/kstartuplogo.h

@@ -28,7 +28,7 @@ class KStartupLogo : public TQWidget  {
    Q_OBJECT
   TQ_OBJECT
 public:
-	KStartupLogo(TQWidget *tqparent=0, const char *name=0);
+	KStartupLogo(TQWidget *parent=0, const char *name=0);
 	~KStartupLogo();
 protected:
   virtual bool event(TQEvent*);

kverbos/kverbos/kverbedit.cpp

@@ -24,8 +24,8 @@
  *  die Liste der Verben bearbeitet werden kann. Zu Beginn mssen alle Verben
  *  aus der Liste in eine dialogeigene Liste und die TQListView bertragen werden.
  */
-KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* tqparent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/)
-: QVerbEdit(tqparent, name, modal, fl), list(l)
+KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/)
+: QVerbEdit(parent, name, modal, fl), list(l)
 {
 	// Die Spaltenbreiten anpassen
 	ListView1->setColumnWidthMode(0, TQListView::Manual);

kverbos/kverbos/kverbedit.h

@@ -34,7 +34,7 @@ public:
   /** An die Dialogklasse wird direkt die Verbliste <20>bergeben, damit
    *  die Liste der Verben bearbeitet werden kann.
    */
-  KVerbEdit(spanishVerbList& l, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+  KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
   ~KVerbEdit();
   /** kopiert die Liste in die ListView. */
   void listToView();

kverbos/kverbos/kverbos.h

@@ -64,7 +64,7 @@ class KVerbosApp : public KMainWindow
   public:
     /** construtor of KVerbosApp, calls all init functions to create the application.
      */
-    KVerbosApp(TQWidget* tqparent=0, const char* name=0);
+    KVerbosApp(TQWidget* parent=0, const char* name=0);
     ~KVerbosApp();
     /** opens a file specified by commandline option
      */

kverbos/kverbos/kverbosdoc.cpp

@@ -39,7 +39,7 @@
 
 TQPtrList<KVerbosView> *KVerbosDoc::pViewList = 0L;
 
-KVerbosDoc::KVerbosDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name)
+KVerbosDoc::KVerbosDoc(TQWidget *parent, const char *name) : TQObject(parent, name)
 {
 	if(!pViewList)
 	{
@@ -101,7 +101,7 @@ bool KVerbosDoc::saveModified()
 
   if(modified)
   {
-    KVerbosApp *win=(KVerbosApp *) tqparent();
+    KVerbosApp *win=(KVerbosApp *) parent();
     int want_save = KMessageBox::warningYesNoCancel(win,
                 i18n("The current file has been modified.\nDo you want to save it?"),
                 i18n("Warning"),KStdGuiItem::save(),KStdGuiItem::discard());
@@ -689,7 +689,7 @@ TQString KVerbosDoc::getAuswahl(TQString s[][3], int &t)
 	int ti[MAX_TIEMPOS*MAX_SUBTYPES], ty[MAX_TIEMPOS*MAX_SUBTYPES];
 	bool op[MAX_TIEMPOS][MAX_SUBTYPES];
 	int zeitenZahl = 0;
-	KVerbosApp *app = dynamic_cast<KVerbosApp*>(tqparent());
+	KVerbosApp *app = dynamic_cast<KVerbosApp*>(parent());
 	if (app) {
 		app->getTimeOptions(op);
 	}

kverbos/kverbos/kverbosdoc.h

@@ -66,7 +66,7 @@ class KVerbosDoc : public TQObject
     /**
      * Constructor for the fileclass of the application
      */
-    KVerbosDoc(TQWidget *tqparent, const char *name=0);
+    KVerbosDoc(TQWidget *parent, const char *name=0);
     /**
      * Destructor for the fileclass of the application
      */

kverbos/kverbos/kverbosoptions.cpp

@@ -19,8 +19,8 @@
 #include "tqcheckbox.h"
 #include "kverbosoptions.h"
 
-KVerbosOptions::KVerbosOptions( TQWidget* tqparent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ )
-: QVerbosOptions(tqparent, name, modal, fl)
+KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ )
+: QVerbosOptions(parent, name, modal, fl)
 {
 	// some times are disabled because they aren't ready yet.
 	LabelSubPasado->setEnabled(false);

kverbos/kverbos/kverbosoptions.h

@@ -27,7 +27,7 @@
 
 class KVerbosOptions : public QVerbosOptions  {
 public:
-  KVerbosOptions( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+  KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
   ~KVerbosOptions();
 
 public slots:

kverbos/kverbos/kverbosview.cpp

@@ -33,7 +33,7 @@
 #include "verbspanish.h"
 
 
-KVerbosView::KVerbosView(TQWidget *tqparent, const char *name) : QLernen/*TQWidget*/(tqparent, name)
+KVerbosView::KVerbosView(TQWidget *parent, const char *name) : QLernen/*TQWidget*/(parent, name)
 {
   // Hier wird gesetzt, wie der Hintergrund des Fensters zu zeichnen ist.
   setBackgroundMode(PaletteBackground);
@@ -258,7 +258,7 @@ void KVerbosView::slotCorregir()
 		richtig = false;
 	};
 	// die Formen vergleichen
-	KVerbosApp* kApp = dynamic_cast<KVerbosApp*>(tqparent());
+	KVerbosApp* kApp = dynamic_cast<KVerbosApp*>(parent());
 	if (!kApp) {
 		return;
 	}

kverbos/kverbos/kverbosview.h

@@ -63,11 +63,11 @@ class KVerbosView : public QLernen /*TQWidget*/
   TQ_OBJECT
 public:
   /** Constructor for the main view */
-  KVerbosView(TQWidget *tqparent = 0, const char *name=0);
+  KVerbosView(TQWidget *parent = 0, const char *name=0);
   /** Destructor for the main view */
   ~KVerbosView();
 
-  /** returns a pointer to the document connected to the view instance. Mind that this method requires a KVerbosApp instance as a tqparent
+  /** returns a pointer to the document connected to the view instance. Mind that this method requires a KVerbosApp instance as a parent
    * widget to get to the window document pointer by calling the KVerbosApp::getDocument() method.
    *
    * @see KVerbosApp#getDocument

kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp

@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 
-ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* tqparent, const char* name)
-  : ProgressDlgForm( tqparent, name )
+ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name)
+  : ProgressDlgForm( parent, name )
 {
   doc = 0;
   setCaption (title);

kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h

@@ -44,7 +44,7 @@ public:
         const TQString &doctitle,
         const TQString &filename,
         const TQString &title,
-        TQWidget* tqparent = NULL,
+        TQWidget* parent = NULL,
         const char* name = NULL
     );
 

kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp

@@ -74,8 +74,8 @@ static ListRef date_itemlist [] =
 };
 
 
-BlockOptions::BlockOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: BlockOptionsBase(tqparent, name, fl)
+BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl)
+: BlockOptionsBase(parent, name, fl)
 {
    connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
    connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));

kvoctrain/kvoctrain/common-dialogs/blockoptions.h

@@ -39,7 +39,7 @@ class BlockOptions : public BlockOptionsBase
   TQ_OBJECT
 
 public:
-  BlockOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  BlockOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   void updateWidgets();
   bool hasChanged();
   bool isDefault();

kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp

@@ -29,8 +29,8 @@
 
 #include "generaloptions.h"
 
-GeneralOptions::GeneralOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: GeneralOptionsBase(tqparent,name,fl)
+GeneralOptions::GeneralOptions(TQWidget* parent, const char* name, WFlags fl)
+: GeneralOptionsBase(parent,name,fl)
 {
  kcfg_BackupTime->setEnabled(kcfg_AutoBackup->isChecked());
 }

kvoctrain/kvoctrain/common-dialogs/generaloptions.h

@@ -34,7 +34,7 @@ class GeneralOptions : public GeneralOptionsBase
   TQ_OBJECT
 
 public:
-  GeneralOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  GeneralOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 };
 
 #endif

kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp

@@ -28,8 +28,8 @@
 
 #include "groupoptions.h"
 
-GroupOptions::GroupOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: GroupOptionsBase(tqparent,name,fl)
+GroupOptions::GroupOptions(TQWidget* parent, const char* name, WFlags fl)
+: GroupOptionsBase(parent,name,fl)
 {
 
 }

kvoctrain/kvoctrain/common-dialogs/groupoptions.h

@@ -34,7 +34,7 @@ class GroupOptions : public GroupOptionsBase
   TQ_OBJECT
 
 public:
-  GroupOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  GroupOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateButtons();
 };

kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp

@@ -54,10 +54,10 @@ static const char unapplied[] = I18N_NOOP(
     "If you save a profile, those changes will not be included.\n"
     "Do you wish to continue?");
 
-KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent,
+KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent,
   const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
   bool /*modal*/)
-  : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
+  : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
 {
   m_config = config;
   m_queryManager = m;

kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h

@@ -47,7 +47,7 @@ public:
   /**
    * Creates a configuration dialog.
    */
-  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent=0,
+  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
     const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 

kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp

@@ -677,8 +677,8 @@ KV_ISO639_Code kv_iso639_2[] = {
 };
 */
 
-LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* tqparent, const char* name, WFlags fl)
-  : LanguageOptionsBase(tqparent, name, fl), m_langSet(langset)
+LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char* name, WFlags fl)
+  : LanguageOptionsBase(parent, name, fl), m_langSet(langset)
 {
   langset_popup = 0;
 

kvoctrain/kvoctrain/common-dialogs/languageoptions.h

@@ -37,7 +37,7 @@ class LanguageOptions : public LanguageOptionsBase
   TQ_OBJECT
 
 public:
-  LanguageOptions(LangSet & langset, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  LanguageOptions(LangSet & langset, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~LanguageOptions ();
 
   LangSet getLangSet () const;

kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp

@@ -50,8 +50,8 @@ static const char *separator_id[] =
   0
 };
 
-PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent, const char* name, WFlags fl)
-: PasteOptionsBase(tqparent,name,fl), m_langSet(langset)
+PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent, const char* name, WFlags fl)
+: PasteOptionsBase(parent,name,fl), m_langSet(langset)
 {
   OrderList->setEnabled(!kcfg_UseCurrent->isChecked());
   UpButton->setEnabled(!kcfg_UseCurrent->isChecked());

kvoctrain/kvoctrain/common-dialogs/pasteoptions.h

@@ -37,7 +37,7 @@ class PasteOptions : public PasteOptionsBase
   TQ_OBJECT
 
 public:
-  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();

kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp

@@ -39,8 +39,8 @@ SettingsProfile::SettingsProfile(TQString n, TQString q, TQString t, TQString b)
 {
 }
 
-ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *tqparent, const char *name, bool modal)
- : KDialogBase(Swallow, i18n("Profiles"), Close, Close, tqparent, name, modal, false)
+ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *name, bool modal)
+ : KDialogBase(Swallow, i18n("Profiles"), Close, Close, parent, name, modal, false)
 {
   m_queryManager = m;
   mw = new GroupOptions(this);

kvoctrain/kvoctrain/common-dialogs/profilesdialog.h

@@ -49,7 +49,7 @@ class ProfilesDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-  ProfilesDialog(QueryManager * m, TQWidget *tqparent = 0, const char *name = 0, bool modal = true);
+  ProfilesDialog(QueryManager * m, TQWidget *parent = 0, const char *name = 0, bool modal = true);
 
 signals:
   void profileActivated();

kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp

@@ -34,8 +34,8 @@
 #include "queryoptions.h"
 #include "prefs.h"
 
-QueryOptions::QueryOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: QueryOptionsBase(tqparent,name,fl)
+QueryOptions::QueryOptions(TQWidget* parent, const char* name, WFlags fl)
+: QueryOptionsBase(parent,name,fl)
 {
   kcfg_MaxTimePer->setDisabled(r_no_limit->isChecked());
   kcfg_ShowCounter->setDisabled(r_no_limit->isChecked());

kvoctrain/kvoctrain/common-dialogs/queryoptions.h

@@ -34,7 +34,7 @@ class QueryOptions : public QueryOptionsBase
   TQ_OBJECT
 
 public:
-  QueryOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  QueryOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
 };

kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp

@@ -101,8 +101,8 @@ static ThreshListRef Threshdate_itemlist [] =
       };
 
 
-ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent, const char* name, WFlags fl)
-: ThresholdOptionsBase(tqparent, name, fl), m_lessons(lessons)
+ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl)
+: ThresholdOptionsBase(parent, name, fl), m_lessons(lessons)
 {
   connect(lessoncomp,  TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int)));
   connect(lessonlist,  TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified()));

kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h

@@ -37,7 +37,7 @@ class ThresholdOptions : public ThresholdOptionsBase
   TQ_OBJECT
 
 public:
-  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();

kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp

@@ -27,8 +27,8 @@
 
 #include "viewoptions.h"
 
-ViewOptions::ViewOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: ViewOptionsBase(tqparent,name,fl)
+ViewOptions::ViewOptions(TQWidget* parent, const char* name, WFlags fl)
+: ViewOptionsBase(parent,name,fl)
 {
   kcfg_GradeCol0->setEnabled(kcfg_UseGradeCol->isChecked());
   kcfg_GradeCol1->setEnabled(kcfg_UseGradeCol->isChecked());

kvoctrain/kvoctrain/common-dialogs/viewoptions.h

@@ -34,7 +34,7 @@ class ViewOptions : public ViewOptionsBase
   TQ_OBJECT
 
 public:
-  ViewOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  ViewOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
 };
 

kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp

@@ -28,7 +28,7 @@
 
 #include <tqcheckbox.h>
 
-DocOptionsPage::DocOptionsPage(bool sort, TQWidget *tqparent, const char *name):DocOptionsPageForm(tqparent, name)
+DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):DocOptionsPageForm(parent, name)
 {
   sorter = sort;
   docsort->setChecked(sort);

kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h

@@ -36,7 +36,7 @@ class DocOptionsPage : public DocOptionsPageForm
 
 public:
 
-  DocOptionsPage(bool sort, TQWidget *tqparent, const char *name);
+  DocOptionsPage(bool sort, TQWidget *parent, const char *name);
 
   bool getSorting () const { return sorter; }
 

kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp

@@ -47,12 +47,12 @@ DocPropsDlg::DocPropsDlg
   vector<TQString>  types,
   vector<TQString>  tenses,
   vector<TQString>  usages,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name,
   bool             modal
 )
   :
-  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, tqparent, name, modal)
+  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
   TQFrame *page = addPage( i18n("&General") );
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );

kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h

@@ -60,7 +60,7 @@ public:
     vector<TQString>  types,
     vector<TQString>  tenses,
     vector<TQString>  usages,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL,
     bool             modal = true
   );

kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp

@@ -42,9 +42,9 @@
 
 class kvoctraindoc;
 
-DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent, const char *name, bool modal)
+DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent, const char *name, bool modal)
   :
-  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, tqparent, name, modal)
+  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
   TQFrame * page;
   TQVBoxLayout * topLayout;

kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h

@@ -43,7 +43,7 @@ class DocPropsLangDlg : public KDialogBase
 
 public:
 
-  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true);
+  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
 
   Conjugation getConjugation(int idx) const;
   Article     getArticle(int idx) const;

kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp

@@ -40,11 +40,11 @@ LangPropPage::LangPropPage
   TQString            curr_lang,
   const Conjugation &conjug,
   const Article     &art,
-  TQWidget           *tqparent,
+  TQWidget           *parent,
   const char        *name
 )
   :
-  LangPropPageForm( tqparent, name ),
+  LangPropPageForm( parent, name ),
   doc(_doc),
   conjugations(conjug),
   articles(art)

kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h

@@ -46,7 +46,7 @@ public:
     TQString            curr_lang,
     const Conjugation &conjugations,
     const Article     &article,
-    TQWidget           *tqparent = NULL,
+    TQWidget           *parent = NULL,
     const char        *name = NULL
   );
 

kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp

@@ -42,11 +42,11 @@ LessOptPage::LessOptPage
 (
   TQComboBox     *lessons,
   kvoctrainDoc  *_doc,
-  TQWidget       *tqparent,
+  TQWidget       *parent,
   const char    *name
 )
   :
-  LessOptPageForm( tqparent, name )
+  LessOptPageForm( parent, name )
 {
   connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) );
   connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) );

kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h

@@ -45,7 +45,7 @@ public:
   (
     TQComboBox     *lessons,
     kvoctrainDoc  *doc,
-    TQWidget       *tqparent = NULL,
+    TQWidget       *parent = NULL,
     const char    *name = NULL
   );
 

kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp

@@ -40,11 +40,11 @@ TenseOptPage::TenseOptPage
 (
   const vector<TQString> &tenses,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  TenseOptPageForm( tqparent, name )
+  TenseOptPageForm( parent, name )
 {
   connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );

kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h

@@ -46,7 +46,7 @@ public:
   (
     const vector<TQString> &tenses,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 

kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp

@@ -39,11 +39,11 @@ TitlePage::TitlePage
   TQString  _author,
   TQString  _license,
   TQString  _doc_remark,
-  TQWidget* tqparent,
+  TQWidget* parent,
   const char* name
 )
   :
-  TitlePageForm( tqparent, name )
+  TitlePageForm( parent, name )
 {
   title = _title;
   author = _author;

kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h

@@ -42,7 +42,7 @@ public:
     TQString      author,
     TQString      license,
     TQString      doc_remark,
-    TQWidget     *tqparent = NULL,
+    TQWidget     *parent = NULL,
     const char  *name = NULL
   );
 

kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp

@@ -40,11 +40,11 @@ TypeOptPage::TypeOptPage
 (
   const vector<TQString> &types,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  TypeOptPageForm( tqparent, name ),
+  TypeOptPageForm( parent, name ),
   doc(_doc)
 {
   connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );

kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h

@@ -45,7 +45,7 @@ public:
   (
     const vector<TQString> &types,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 

kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp

@@ -41,11 +41,11 @@ UsageOptPage::UsageOptPage
 (
   const vector<TQString> &usages,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  UsageOptPageForm( tqparent, name ),
+  UsageOptPageForm( parent, name ),
   doc(_doc)
 {
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );

kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h

@@ -47,7 +47,7 @@ public:
   (
     const vector<TQString> &usages,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 

kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp

@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent, const char *name)
-  : AdjEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name)
+  : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   comparisons = comp;
 

kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h

@@ -38,7 +38,7 @@ class AdjEntryPage : public AdjEntryPageForm
   TQ_OBJECT
 
 public:
-  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent = NULL, const char *name = NULL);
+  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData (bool multi_sel, const Comparison  &comp);
 

kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp

@@ -41,10 +41,10 @@ AuxInfoEntryPage::AuxInfoEntryPage
   TQString     exam,
   TQString     rem,
   TQString     para,
-  TQWidget    *tqparent,
+  TQWidget    *parent,
   const char *name
 )
- : AuxInfoEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+ : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook)
 
 {
   TQFontMetrics fm (synonym_line->font());

kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h

@@ -45,7 +45,7 @@ public:
     TQString     example,
     TQString     remark,
     TQString     para,
-    TQWidget    *tqparent = 0,
+    TQWidget    *parent = 0,
     const char *name = 0
   );
 

kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp

@@ -63,11 +63,11 @@ CommonEntryPage::CommonEntryPage
   QueryManager &_querymanager,
   bool          active,
   const TQFont&  _ipafont,
-  TQWidget      *tqparent,
+  TQWidget      *parent,
   const char   *name
 )
   :
-  CommonEntryPageForm( tqparent, name ),
+  CommonEntryPageForm( parent, name ),
   pronunce(pron),
   expression(expr),
   usageCollection (act_usage),

kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h

@@ -56,7 +56,7 @@ public:
     QueryManager &querymanager,
     bool          active,
     const TQFont&  ipafont,
-    TQWidget* tqparent = NULL,
+    TQWidget* parent = NULL,
     const char* name = NULL
   );
 

kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp

@@ -73,11 +73,11 @@ EntryDlg::EntryDlg(
   const TQString &title,
   bool           active,
   const TQFont&   ipafont,
-  TQWidget       *tqparent,
+  TQWidget       *parent,
   const char    *name,
   bool           modal)
   :
-  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false,
+  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false,
     KGuiItem(i18n("&Reset")),
     KGuiItem(TQString(), "view_left_right"),
     KGuiItem(TQString(), "view_top_bottom"))

kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h

@@ -90,7 +90,7 @@ public:
     const TQString &title,
     bool           active,
     const TQFont&   ipafont,
-    TQWidget       *tqparent = 0,
+    TQWidget       *parent = 0,
     const char    *name = 0,
     bool           modal = false
   );

kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp

@@ -54,11 +54,11 @@ FromToEntryPage::FromToEntryPage
   count_t     _bcount,
   TQString     faux,
   TQString     label,
-  TQWidget    *tqparent,
+  TQWidget    *parent,
   const char *name
 )
   :
-  FromToEntryPageForm( tqparent, name ), fauxami(faux), dlgbook(_dlgbook)
+  FromToEntryPageForm( parent, name ), fauxami(faux), dlgbook(_dlgbook)
 {
   monthnames.clear();
   monthnames.append ("");

kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h

@@ -52,7 +52,7 @@ public:
       count_t     _bcount,
       TQString     faux,
       TQString     label,
-      TQWidget    *tqparent = NULL,
+      TQWidget    *parent = NULL,
       const char *name = NULL
   );
 

kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp

@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent, const char *name)
-  : MCEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name)
+  : MCEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   multiplechoice = mc;
 

kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h

@@ -38,7 +38,7 @@ class MCEntryPage : public MCEntryPageForm
   TQ_OBJECT
 
 public:
-  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent = NULL, const char *name = NULL);
+  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData(bool multi_sel, const MultipleChoice &mc);
 

kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp

@@ -27,7 +27,7 @@
 
 #include "MySpinBox.h"
 
-MySpinBox::MySpinBox (TQWidget* tqparent, const char* name ): TQSpinBox(tqparent, name ), spin_names (0)
+MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0)
 {
   setWrapping(true);
 }

kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h

@@ -33,7 +33,7 @@ class TQStringlist;
 class MySpinBox : public TQSpinBox
 {
 public:
-  MySpinBox (TQWidget* tqparent = 0, const char* name = 0);
+  MySpinBox (TQWidget* parent = 0, const char* name = 0);
 
   void setSpecial(const TQString &str);
   void setData (TQStringList *names, int minValue, int maxValue);

kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp

@@ -175,8 +175,8 @@ void PhoneticButton::slotClicked()
 }
 
 
-PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent, const char *name, bool modal)
-  : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, tqparent, name, modal)
+PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
+  : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
   int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
   TQFrame * phoneticbox = plainPage();

kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h

@@ -37,7 +37,7 @@ class PhoneticEntryPage : public KDialogBase
   TQ_OBJECT
 
 public:
-  PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent = 0, const char *name = 0, bool modal = false);
+  PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false);
 
 signals:
   void charSelected(wchar_t);
@@ -55,8 +55,8 @@ class PhoneticButton : public TQPushButton
   TQ_OBJECT
 
 public:
-  PhoneticButton (const TQString & text, TQWidget * tqparent, PhoneticEntryPage *_page, const char * name = 0)
-  : TQPushButton (text, tqparent, name), page(_page) {}
+  PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0)
+  : TQPushButton (text, parent, name), page(_page) {}
 
 protected slots:
   void slotClicked();

kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp

@@ -39,10 +39,10 @@ TenseEntryPage::TenseEntryPage
   bool               multi_sel,
   const Conjugation &con_prefix,
   const Conjugation &conjug,
-  TQWidget           *tqparent,
+  TQWidget           *parent,
   const char        *name
 )
-  : TenseEntryPageForm( tqparent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
+  : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
 {
 
   connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );