Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 33 insertions, 33 deletions

diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 72fb8200..011aecb6 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -77,7 +77,7 @@ Kalzium::Kalzium()
 	connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) ));
 	connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) ));
 	
-	// tqlayouting
+	// layouting
 	setCentralWidget( centralWidget );
 	centralWidget->show();
 
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index f25cbfc4..a759fee2 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject()
 	KURL url;
 	url.setPath( locate("data", "kalzium/data/"));
 	url.setFileName( "data.xml" );
-	TQFile tqlayoutFile( url.path() );
+	TQFile layoutFile( url.path() );
 
-	if (!tqlayoutFile.exists())
+	if (!layoutFile.exists())
 	{
 		kdDebug() << "data.xml not found, exiting" << endl;
 		kapp->exit(0);
 		return;
 	}
 
-	if (!tqlayoutFile.open(IO_ReadOnly))
+	if (!layoutFile.open(IO_ReadOnly))
 	{
 		kdDebug() << "data.xml IO-error" << endl;
 		return;
 	}
 
 	// Check if the document is well-formed
-	if (!doc.setContent(&tqlayoutFile))
+	if (!doc.setContent(&layoutFile))
 	{
 		kdDebug() << "wrong xml" << endl;
-		tqlayoutFile.close();
+		layoutFile.close();
 		return;
 	}
-	tqlayoutFile.close();
+	layoutFile.close();
 
 	ElementList = readData( doc );
 	m_numOfElements = ElementList.count();
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index 794c9f25..e0e05388 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -139,7 +139,7 @@ void KalziumTip::display()
 
 	m_richText->setWidth(400);
 
-	m_tqmaskEffect = isVisible() ? Plain : Dissolve;
+	m_maskEffect = isVisible() ? Plain : Dissolve;
     	m_dissolveSize = 24;
     	m_dissolveDelta = -1;
 
@@ -178,7 +178,7 @@ void KalziumTip::displayInternal()
 	resize(width, height);
 
 	// create and set transparency tqmask
-    	switch(m_tqmaskEffect)
+    	switch(m_maskEffect)
     	{
         	case Plain:
             		plainMask();
@@ -218,20 +218,20 @@ void KalziumTip::displayInternal()
 
 void KalziumTip::dissolveMask()
 {
-    TQPainter tqmaskPainter(&m_tqmask);
+    TQPainter maskPainter(&m_tqmask);
 
     m_tqmask.fill(TQt::black);
 
-    tqmaskPainter.setBrush(TQt::white);
-    tqmaskPainter.setPen(TQt::white);
-    tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
+    maskPainter.setBrush(TQt::white);
+    maskPainter.setPen(TQt::white);
+    maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
                               1600 / m_tqmask.rect().height());
 
     m_dissolveSize += m_dissolveDelta;
 
     if (m_dissolveSize > 0)
     {
-        tqmaskPainter.setRasterOp(TQt::EraseROP);
+        maskPainter.setRasterOp(TQt::EraseROP);
 
         int x, y, s;
         const int size = 16;
@@ -247,7 +247,7 @@ void KalziumTip::dissolveMask()
                 {
                     s = 0;
                 }
-                tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
+                maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
             }
         }
     }
@@ -269,13 +269,13 @@ void KalziumTip::hide()
 
 void KalziumTip::plainMask()
 {
-    	TQPainter tqmaskPainter(&m_tqmask);
+    	TQPainter maskPainter(&m_tqmask);
 
     	m_tqmask.fill(TQt::black);
 
-    	tqmaskPainter.setBrush(TQt::white);
-    	tqmaskPainter.setPen(TQt::white);
-    	tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
+    	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);
     	m_frameTimer.stop();
diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h
index 8c7b063a..761b6c86 100644
--- a/kalzium/src/kalziumtip.h
+++ b/kalzium/src/kalziumtip.h
@@ -73,7 +73,7 @@ class KalziumTip : public TQWidget
     		TQPixmap m_icon; //icon shown on the tip
 		TQPixmap m_noElemIcon; //icon for element wich have no image
 
-    		MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain
+    		MaskEffect m_maskEffect; //inidicates to show tqmask effect or plain
     		TQSimpleRichText* m_richText;
 
     		int m_dissolveSize;
diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui
index 63be9624..04760f0d 100644
--- a/kalzium/src/molcalcwidgetbase.ui
+++ b/kalzium/src/molcalcwidgetbase.ui
@@ -127,7 +127,7 @@
 <Q_SLOTS>
     <slot access="protected">slotCalcButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kalzium/src/moleculeparser.cpp b/kalzium/src/moleculeparser.cpp
index b3d19120..6780e65e 100644
--- a/kalzium/src/moleculeparser.cpp
+++ b/kalzium/src/moleculeparser.cpp
@@ -172,7 +172,7 @@ MoleculeParser::parseSubmolecule(double          *_resultMass,
 
 
 // Parse a term within the molecule, i.e. a single atom or a
-// submolecule within tqparenthesis followed by an optional number.
+// submolecule within parenthesis followed by an optional number.
 // Examples: Bk, Mn2, (COOH)2
 //
 // Return true if correct, otherwise return false.  
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index 0e810aff..cb4282d4 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ )
 	//JH: only update() if we were showing a tooltip
 	if ( m_tooltipElementNumber || m_showLegendTooltip )
 	{
-		//this tqinvalidates the number. If the mouse
+		//this invalidates the number. If the mouse
 		//is moved, the number is invalid. 
 		m_tooltipElementNumber = 0;
 		m_showLegendTooltip = false;
diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui
index 3fc89428..06ef3fa5 100644
--- a/kalzium/src/plotsetupwidget.ui
+++ b/kalzium/src/plotsetupwidget.ui
@@ -248,7 +248,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui
index da606dc2..1e025f4f 100644
--- a/kalzium/src/settings_colors.ui
+++ b/kalzium/src/settings_colors.ui
@@ -901,7 +901,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui
index e5480d1a..0e88167d 100644
--- a/kalzium/src/settings_misc.ui
+++ b/kalzium/src/settings_misc.ui
@@ -67,5 +67,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kalzium/src/settings_units.ui b/kalzium/src/settings_units.ui
index e93bd9ca..4bf4031c 100644
--- a/kalzium/src/settings_units.ui
+++ b/kalzium/src/settings_units.ui
@@ -163,5 +163,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui
index bdf953a5..057dc235 100644
--- a/kalzium/src/somwidget.ui
+++ b/kalzium/src/somwidget.ui
@@ -178,7 +178,7 @@ the state of matter</string>
 </customwidgets>
 <connections>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h
index 4d71837f..dcde91cb 100644
--- a/kalzium/src/spectrum.h
+++ b/kalzium/src/spectrum.h
@@ -145,7 +145,7 @@ class Spectrum
 		/**
 		 * @return the tqparent element of this spectrum
 		 */
-		Element* tqparentElement()
+		Element* parentElement()
 		{ return m_parentElement; }
 
 	private:
diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui
index 39dd7f18..89204944 100644
--- a/kalzium/src/spectrumview.ui
+++ b/kalzium/src/spectrumview.ui
@@ -216,7 +216,7 @@
 <Q_SLOTS>
     <slot access="protected">slotExportAsImage()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>spectrumwidget.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index 2431b407..4f487e64 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -415,9 +415,9 @@ TQPixmap SpectrumWidget::pixmap()
 	TQString text;
 
 	if( m_type == EmissionSpectrum )
-		text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() );
+		text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
 	else
-		text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() );
+		text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
 
 	TQPainter p( &tmp );
 	p.setPen( TQt::black );
diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui
index b810b101..28ddf7a5 100644
--- a/kalzium/src/timewidget.ui
+++ b/kalzium/src/timewidget.ui
@@ -194,7 +194,7 @@ of the elements</string>
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>