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/kdemultimedia@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

74 files changed, 125 insertions, 125 deletions

diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 056b9a72..b327b33f 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -13,9 +13,9 @@
             <height>484</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -37,7 +37,7 @@
             <property name="frameShadow">
                 <enum>Plain</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <vbox>
                 <property name="name">
@@ -63,7 +63,7 @@
             <property name="name">
                 <cstring>spacerLayout</cstring>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <vbox>
                 <property name="name">
@@ -358,5 +358,5 @@
 <Q_SLOTS>
     <slot access="protected">setTitleFont()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index 2cf5b614..de6da9e7 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -94,7 +94,7 @@ module Arts {
 	};
 
 	/**
-		Some tqalignmentflags used by various widgets.
+		Some alignmentflags used by various widgets.
 		Taken from Qt. (akrille)
 		*/
 	enum Align {
@@ -117,7 +117,7 @@ module Arts {
 	/** The LayoutBox. - Arrange your widgets vertical or horizontal.
 
 		Usage is quite simple: Add the widgets you have in the right order
-		to the tqlayoutbox by calling addWidget().
+		to the layoutbox by calling addWidget().
 		Thats it, no ._addChild or .tqparent with this widget.
 
 		For more information see QBoxLayout.
@@ -156,7 +156,7 @@ module Arts {
 		/// The spacing between all widgets.
 		attribute long spacing;
 		/// The margin at the outsideborder.
-		attribute long tqlayoutmargin;
+		attribute long layoutmargin;
 	};
 
 	/** IMHO (akrille) this should be removed and everywhere replaced with the LayoutBox... */
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index e94ed1ec..6cbe9873 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -41,14 +41,14 @@ KLayoutBox_impl::~KLayoutBox_impl() {
 
 void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) {
 	widget.tqparent( self() );
-	this->_addChild( widget, "tqlayoutbox_item" );
+	this->_addChild( widget, "layoutbox_item" );
 	TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
 	_layout->addWidget( tmp, stretch, align );
 }
 
 void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) {
 	widget.tqparent( self() );
-	this->_addChild( widget, "tqlayoutbox_item" );
+	this->_addChild( widget, "layoutbox_item" );
 	TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
 	_layout->insertWidget( index, tmp, stretch, align );
 }
@@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align
 long KLayoutBox_impl::spacing() { return _layout->spacing(); }
 void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); }
 
-long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); }
-void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
+long KLayoutBox_impl::layoutmargin() { return _layout->margin(); }
+void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
 
 Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); }
 void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); }
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index a8272fe3..d4a2ec59 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -72,8 +72,8 @@ public:
 	long spacing();
 	void spacing( long );
 
-	long tqlayoutmargin();
-	void tqlayoutmargin( long );
+	long layoutmargin();
+	void layoutmargin( long );
 }; // class
 
 } // namespace
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 6beed787..d7cf50df 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -64,11 +64,11 @@ struct KPoti::KPotiPrivate
 
 			// create tqmask
 			TQBitmap tqmask( bgdb.size(), true );
-			TQPainter tqmaskpainter( &tqmask );
-			tqmaskpainter.setPen( TQt::NoPen );
-			tqmaskpainter.setBrush( TQt::color1 );
-			tqmaskpainter.drawEllipse( drawRect );
-			tqmaskpainter.end();
+			TQPainter maskpainter( &tqmask );
+			maskpainter.setPen( TQt::NoPen );
+			maskpainter.setBrush( TQt::color1 );
+			maskpainter.drawEllipse( drawRect );
+			maskpainter.end();
 			bgdb.setMask( tqmask );
 
 			// inset shadow
@@ -104,11 +104,11 @@ struct KPoti::KPotiPrivate
 
 			// create tqmask
 			TQBitmap tqmask( potidb.size(), true );
-			TQPainter tqmaskpainter( &tqmask );
-			tqmaskpainter.setPen( TQt::NoPen );
-			tqmaskpainter.setBrush( TQt::color1 );
-			tqmaskpainter.drawEllipse( drawRect );
-			tqmaskpainter.end();
+			TQPainter maskpainter( &tqmask );
+			maskpainter.setPen( TQt::NoPen );
+			maskpainter.setBrush( TQt::color1 );
+			maskpainter.drawEllipse( drawRect );
+			maskpainter.end();
 			potidb.setMask( tqmask );
 
 			KPixmap gradient( potidb.size() );
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 0891458c..827687e2 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -110,7 +110,7 @@ public:
 
 		Arts::LayoutBox hbox;
 		hbox.direction( Arts::LeftToRight );
-		hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
+		hbox.layoutmargin( 5 ); hbox.spacing( 5 );
 
 		Arts::Poti lowgain; lowgain.caption( i18n( "Low Gain" ).utf8().data() );
 		lowgain.min( -24 ); lowgain.max( 24 );
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index f0fa3690..e6e0c54c 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -47,7 +47,7 @@ KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayo
 	this->dbmax( 6 );
 	_left.framestyle( Arts::Raised|Arts::Panel ); _left.linewidth( 4 );
 	_right.framestyle( Arts::Raised|Arts::Panel ); _right.linewidth( 4 );
-	this->tqlayoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
+	this->layoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
 }
 
 void KStereoVolumeControlGui_impl::constructor( Arts::StereoVolumeControl svc ) {
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index d5209ebd..e5a985fc 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -85,7 +85,7 @@ public:
 		connect( bon, "pressed_changed", comp, "thru" );
 
 		LayoutBox hbox;
-		hbox.direction( LeftToRight ); hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
+		hbox.direction( LeftToRight ); hbox.layoutmargin( 5 ); hbox.spacing( 5 );
 		PopupBox timesbox;
 		timesbox.name( "Timings" ); timesbox.direction( LeftToRight );
 		LayoutBox times;
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 17332ee5..7fe75949 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -189,7 +189,7 @@ module Arts {
 		// Position: how the port is positioned when the structure is used
 		// as module - 0 is leftmost, higher numbers are more right
 		readonly attribute long x, y, position;
-		readonly attribute StructureDesc tqparentStructure;
+		readonly attribute StructureDesc parentStructure;
 
 		// if the port is associated with an inherited interface of the
 		// tqparent structure, then it should be setup here
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc
index 72de0de7..5c392e91 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cc
@@ -169,7 +169,7 @@ public:
 	void inheritedInterface(const string& iface);
 
 	void internalSetPosition(long position);
-	StructureDesc tqparentStructure();
+	StructureDesc parentStructure();
 	bool moveTo( long X, long Y );
 
 	void loadFromList(const vector<string>& list);
@@ -1202,7 +1202,7 @@ void StructurePortDesc_impl::internalSetPosition(long position)
 	_position = position;
 }
 
-StructureDesc StructurePortDesc_impl::tqparentStructure()
+StructureDesc StructurePortDesc_impl::parentStructure()
 {
 	return _parentStructure;
 }
diff --git a/arts/tools/midimanagerdlg.ui b/arts/tools/midimanagerdlg.ui
index 5ec555a8..cef2d36b 100644
--- a/arts/tools/midimanagerdlg.ui
+++ b/arts/tools/midimanagerdlg.ui
@@ -64,9 +64,9 @@
             <property name="lineWidth">
                 <number>0</number>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -147,5 +147,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/arts/tools/midimanagerwidget.ui b/arts/tools/midimanagerwidget.ui
index b487c09d..8dc70f95 100644
--- a/arts/tools/midimanagerwidget.ui
+++ b/arts/tools/midimanagerwidget.ui
@@ -64,9 +64,9 @@
             <property name="lineWidth">
                 <number>0</number>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -131,5 +131,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/juk/HACKING b/juk/HACKING
index 47ddf410..4d9f7781 100644
--- a/juk/HACKING
+++ b/juk/HACKING
@@ -84,7 +84,7 @@ Spaces
 ================================================================================
 
 Spaces should not be used between the conditional / loop type and the
-conditional statement.  They should also not be used after tqparenthesis.  However
+conditional statement.  They should also not be used after parenthesis.  However
 the should be to mark of mathematical or comparative operators.
 
 if ( foo == bar )
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index 63feaa4b..b32c9aac 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -198,7 +198,7 @@
     <slot>slotArtistClicked(TQListViewItem *item)</slot>
     <slot>slotContextRequested(TQIconViewItem *, const TQPoint &amp;pt)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <forwards>
     <forward>class TQIconViewItem;</forward>
 </forwards>
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index 49bf0f55..ec926213 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -225,9 +225,9 @@ void CoverInfo::popup() const
 TQString CoverInfo::coverLocation(CoverSize size) const
 {
     TQString fileName(TQFile::encodeName(m_file.tag()->artist() + " - " + m_file.tag()->album()));
-    TQRegExp tqmaskedFileNameChars("[ /?:\"]");
+    TQRegExp maskedFileNameChars("[ /?:\"]");
 
-    fileName.tqreplace(tqmaskedFileNameChars, "_");
+    fileName.tqreplace(maskedFileNameChars, "_");
     fileName.append(".png");
 
     TQString dataDir = KGlobal::dirs()->saveLocation("appdata");
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 0c3036fe..50e13fe7 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -136,7 +136,7 @@
 <Q_SLOTS>
     <slot access="protected">slotShouldDelete(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 48a7f516..64a23800 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -102,8 +102,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="0"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint"/>
+<layoutdefaults spacing="6" margin="0"/>
+<layoutfunctions spacing="KDialog::spacingHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui
index 93ff566a..386f7d2d 100644
--- a/juk/exampleoptionsbase.ui
+++ b/juk/exampleoptionsbase.ui
@@ -276,7 +276,7 @@
     <slot access="protected">exampleDataChanged()</slot>
     <slot access="protected">exampleFileChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui
index b6cc2667..dfd5d0fd 100644
--- a/juk/filerenamerbase.ui
+++ b/juk/filerenamerbase.ui
@@ -365,7 +365,7 @@
     <slot access="protected">toggleExampleDialog()</slot>
     <slot access="protected">insertCategory()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index e795232c..265685dc 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -418,7 +418,7 @@
     <slot access="protected">slotTrackWidthChanged()</slot>
     <slot access="protected">slotEmptyActionChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index a0d8b5c8..69a5ec8d 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -230,15 +230,15 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName)
     setupPlaylist(playlist, iconName, 0);
 }
 
-void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *tqparentItem)
+void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem)
 {
     connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)),
 	    TQT_SLOT(slotPlaylistItemsDropped(Playlist *)));
 
     PlaylistCollection::setupPlaylist(playlist, iconName);
 
-    if(tqparentItem)
-	new Item(tqparentItem, iconName, playlist->name(), playlist);
+    if(parentItem)
+	new Item(parentItem, iconName, playlist->name(), playlist);
     else
 	new Item(this, iconName, playlist->name(), playlist);
 }
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index cc8159a2..27f48f45 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -66,7 +66,7 @@ public:
 
     Item *dropItem() const { return m_dropItem; }
 
-    void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *tqparentItem = 0);
+    void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem = 0);
 
 public slots:
     void paste();
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 36c6874e..16b1da6d 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -54,7 +54,7 @@ public:
         TQLabel(text, tqparent, name)
     {
         m_textColor = paletteForegroundColor();
-        m_bgColor = tqparentWidget()->paletteBackgroundColor();
+        m_bgColor = parentWidget()->paletteBackgroundColor();
         setBackgroundMode(NoBackground);
     }
 
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 4e5299ae..9ae3e057 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -73,7 +73,7 @@ public:
 protected:
     virtual void maybeTip(const TQPoint &)
     {
-	tip(tqparentWidget()->rect(), m_editor->items().first()->file().absFilePath());
+	tip(parentWidget()->rect(), m_editor->items().first()->file().absFilePath());
     }
 private:
     TagEditor *m_editor;
@@ -85,8 +85,8 @@ public:
     FixedHLayout(TQWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0) :
 	TQHBoxLayout(tqparent, margin, spacing, name),
 	m_width(-1) {}
-    FixedHLayout(TQLayout *tqparentLayout, int spacing = -1, const char *name = 0) :
-	TQHBoxLayout(tqparentLayout, spacing, name),
+    FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) :
+	TQHBoxLayout(parentLayout, spacing, name),
 	m_width(-1) {}
     void setWidth(int w = -1)
     {
diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui
index 194651bc..08a03ed6 100644
--- a/juk/tagguesserconfigdlgwidget.ui
+++ b/juk/tagguesserconfigdlgwidget.ui
@@ -148,8 +148,8 @@ Note that the order in which the schemes appear in the list is relevant, since t
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="0"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint"/>
+<layoutdefaults spacing="6" margin="0"/>
+<layoutfunctions spacing="KDialog::spacingHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui
index ce882b72..8f20c43d 100644
--- a/juk/trackpickerdialogbase.ui
+++ b/juk/trackpickerdialogbase.ui
@@ -172,7 +172,7 @@
 <tabstops>
     <tabstop>trackList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp
index 52da900e..df286166 100644
--- a/juk/upcomingplaylist.cpp
+++ b/juk/upcomingplaylist.cpp
@@ -208,7 +208,7 @@ void UpcomingPlaylist::UpcomingSequenceIterator::setCurrent(PlaylistItem *curren
     }
 
     // If the upcoming playlist is playing something, clear it out since
-    // aptqparently the user didn't want to hear it.
+    // apparently the user didn't want to hear it.
 
     PlaylistItem *playingItem = m_playlist->playingItem();
     if(playingItem && playingItem->playlist() == m_playlist && currentItem != playingItem)
diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui
index 5d708f88..cc317a9e 100644
--- a/kaudiocreator/cdconfig.ui
+++ b/kaudiocreator/cdconfig.ui
@@ -57,5 +57,5 @@
 <Q_SLOTS>
     <slot access="protected" specifier="non virtual">configureAudioCD()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui
index c1c84cc5..ccbb6313 100644
--- a/kaudiocreator/encodefile.ui
+++ b/kaudiocreator/encodefile.ui
@@ -335,7 +335,7 @@
     <tabstop>encodeButton</tabstop>
     <tabstop>closeButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui
index 958477ca..67f256c0 100644
--- a/kaudiocreator/encoderconfig.ui
+++ b/kaudiocreator/encoderconfig.ui
@@ -289,5 +289,5 @@
 <Q_SLOTS>
     <slot>encoderWizard()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui
index cca64af6..f5c3c072 100644
--- a/kaudiocreator/encoderedit.ui
+++ b/kaudiocreator/encoderedit.ui
@@ -94,5 +94,5 @@
     <tabstop>kcfg_commandLine</tabstop>
     <tabstop>kcfg_extension</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui
index 30588c73..94779b68 100644
--- a/kaudiocreator/encoderoutput.ui
+++ b/kaudiocreator/encoderoutput.ui
@@ -99,5 +99,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui
index 09c09a27..765cbb1c 100644
--- a/kaudiocreator/general.ui
+++ b/kaudiocreator/general.ui
@@ -281,5 +281,5 @@
 <Q_SLOTS>
     <slot access="protected" specifier="non virtual">updateExample()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui
index 9b935640..1add6372 100644
--- a/kaudiocreator/infodialog.ui
+++ b/kaudiocreator/infodialog.ui
@@ -293,5 +293,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui
index ef0c831f..3c76a257 100644
--- a/kaudiocreator/jobque.ui
+++ b/kaudiocreator/jobque.ui
@@ -128,5 +128,5 @@
     <tabstop>removeAll</tabstop>
     <tabstop>removeSelected</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui
index 6f81e586..8c47615b 100644
--- a/kaudiocreator/ripconfig.ui
+++ b/kaudiocreator/ripconfig.ui
@@ -182,7 +182,7 @@
     <tabstop>kcfg_autoEjectAfterRip</tabstop>
     <tabstop>kcfg_autoEjectDelay</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui
index 1d54f789..8b7e5a5e 100644
--- a/kaudiocreator/tracks.ui
+++ b/kaudiocreator/tracks.ui
@@ -217,7 +217,7 @@
     <tabstop>selectAllTracksButton</tabstop>
     <tabstop>deselectAllTracksButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui
index 29605ec3..f289cb2d 100644
--- a/kaudiocreator/wizard.ui
+++ b/kaudiocreator/wizard.ui
@@ -406,5 +406,5 @@
     <slot>commentPressed()</slot>
     <slot>fileFormatTextChanged( const TQString &amp; text )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index e57c6d32..448749a9 100644
--- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -12,9 +12,9 @@
             <height>563</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -38,9 +38,9 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -621,7 +621,7 @@
 <Q_SLOTS>
     <slot>toggleLowpass()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
index b0d911ca..3951bb00 100644
--- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
+++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
@@ -926,5 +926,5 @@
     <tabstop>kcfg_set_hpf_width</tabstop>
     <tabstop>kcfg_highfilterwidth</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
index 62d31d1a..2d5fd2dc 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
@@ -417,7 +417,7 @@
     <tabstop>kcfg_vorbis_quality</tabstop>
     <tabstop>kcfg_vorbis_comments</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp
index 16618f7d..5e800aaa 100644
--- a/kmid/kmid_part.cpp
+++ b/kmid/kmid_part.cpp
@@ -37,11 +37,11 @@ KMidFactory::~KMidFactory()
   s_instance = 0;
 }
 
-KParts::Part *KMidFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
                                             TQObject *tqparent, const char *name, const char*,
     const TQStringList& )
 {
-  KParts::Part *obj = new KMidPart(tqparentWidget, widgetName, tqparent, name);
+  KParts::Part *obj = new KMidPart(parentWidget, widgetName, tqparent, name);
   return obj;
 }
 
@@ -65,13 +65,13 @@ KInstance *KMidFactory::instance()
   return s_instance;
 }
 
-  KMidPart::KMidPart(TQWidget *tqparentWidget, const char *widgetName,
+  KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName,
                      TQObject *tqparent, const char *name)
 : KParts::ReadOnlyPart(tqparent, name)
 {
   setInstance(KMidFactory::instance());
 
-  widget = new kmidClient(tqparentWidget, actionCollection());
+  widget = new kmidClient(parentWidget, actionCollection());
   widget->show();
   widget->setFocusPolicy(TQ_ClickFocus);
   setWidget(widget);
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h
index c22d8d43..cb4b2d2c 100644
--- a/kmid/kmid_part.h
+++ b/kmid/kmid_part.h
@@ -17,7 +17,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
     KMidFactory();
     virtual ~KMidFactory();
 
-    virtual KParts::Part* createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+    virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
                 TQObject* tqparent = 0, const char* name = 0,
                 const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                 const TQStringList &args = TQStringList());
@@ -34,7 +34,7 @@ class KMidPart: public KParts::ReadOnlyPart
   Q_OBJECT
   TQ_OBJECT
   public:
-    KMidPart(TQWidget *tqparentWidget, const char *widgetName, 
+    KMidPart(TQWidget *parentWidget, const char *widgetName, 
              TQObject *tqparent, const char *name);
     virtual ~KMidPart();
 
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index 95517cb4..88854444 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -1374,7 +1374,7 @@ void kmidClient::visibleChannelView(int i)
         }
         channelView->show();
         connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *)));
-	connect(kapp,TQT_SIGNAL(shutDown()),tqparentWidget(),TQT_SLOT(shuttingDown()));
+	connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown()));
 
     }
     else if ((channelView!=NULL)&&(i==0))
diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index cf8f2259..d91d9ea9 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -272,5 +272,5 @@
     <include location="global" impldecl="in declaration">klocale.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index 0145d4c4..366263f4 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -53,7 +53,7 @@ void KLedButton::mousePressEvent( TQMouseEvent *e )
 
 bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
     // KLed and thus KLedButtung does not do proper positioning in TQLayout's.
-    // Thus I listen to my tqparents resize events and do it here ... OUCH, that's ugly
+    // Thus I listen to my parents resize events and do it here ... OUCH, that's ugly
     /* No, this cannot work !
     if ( ev->type() == TQEvent::Resize ) {
 	TQResizeEvent* qre = (TQResizeEvent*)ev;
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 200ee035..51676a57 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -433,7 +433,7 @@ TQSize KMixApplet::tqsizeHint() const {
 }
 
 /**
-   We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does retqlayouts
+   We need widthForHeight() and heigthForWidth() only because KPanelApplet::updateLayout does relayouts
    using this method. Actually we ignore the passed paramater and just return our preferred size.
 */
 int KMixApplet::widthForHeight(int) const {
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 868eae9f..d5c254e6 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -384,9 +384,9 @@ void
 KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
 {
     KAction* showAction = actionCollection()->action("minimizeRestore");
-    if ( tqparentWidget() && showAction )
+    if ( parentWidget() && showAction )
     {
-        if ( tqparentWidget()->isVisible() )
+        if ( parentWidget()->isVisible() )
         {
             showAction->setText( i18n("Hide Mixer Window") );
         }
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 322f2160..b6491015 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -167,7 +167,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase)
 		_views.push_back(vbase);
 		vbase ->createDeviceWidgets();
 		m_ioTab->addTab( vbase , vbase->caption() );
-		connect( vbase, TQT_SIGNAL(toggleMenuBar()), tqparentWidget(), TQT_SLOT(toggleMenuBar()) );
+		connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) );
 	}
 }
 
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 3867af9f..2ea95412 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -239,7 +239,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 } // has Mute LED
 		 else {
 			 // we don't have a MUTE LED. We create a dummy widget
-			 // !! possibly not neccesary any more (we are tqlayouted)
+			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
 			 ledtqlayout->addWidget(qw);
@@ -352,7 +352,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 else
 		 {
 			 // we don't have a RECORD LED. We create a dummy widget
-			 // !! possibly not neccesary any more (we are tqlayouted)
+			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
 			 rectqlayout->addWidget(qw);
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 5dca6d72..1ec64696 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -31,7 +31,7 @@ class MixDevice : public TQObject
 
 
       // The DeviceCategory tells the type of the device
-      // It is used in bittqmasks, so you must use values of 2^n .
+      // It is used in bitmasks, so you must use values of 2^n .
       enum DeviceCategory { UNDEFINED= 0x00, SLIDER=0x01, SWITCH=0x02, ENUM=0x04, ALL=0xff };
 
 
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index 723cb75b..8db5c60f 100644
--- a/kmix/verticaltext.cpp
+++ b/kmix/verticaltext.cpp
@@ -27,7 +27,7 @@
 VerticalText::VerticalText(TQWidget * tqparent, const char * name, WFlags f) : TQWidget(tqparent,name,f)
 {
 	resize(20,100 /*tqparent->height() */ );
-	setMinimumSize(20,10); // neccesary for smooth integration into tqlayouts (we only care for the widths).
+	setMinimumSize(20,10); // neccesary for smooth integration into layouts (we only care for the widths).
 }
 
 VerticalText::~VerticalText() {
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index fd5fde63..1477a193 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -449,7 +449,7 @@
     <slot>kcfg_DigitalPlayback_toggled( bool )</slot>
     <slot>kcfg_SelectEncoding_toggled(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kfontrequester.h</includehint>
diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c
index 6e1c1ed2..530336cf 100644
--- a/kscd/kscdmagic/xlib.c
+++ b/kscd/kscdmagic/xlib.c
@@ -325,7 +325,7 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
     xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask;
     xd->classX = InputOutput;
     xd->xcolor.n = 0;
-    xd->tqparent_window = RootWindow(xd->display, xd->screen);
+    xd->parent_window = RootWindow(xd->display, xd->screen);
     defaultvisual = DefaultVisual(xd->display, xd->screen);
     xd->params = params;
     if (!params->usedefault) {
@@ -403,7 +403,7 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
     xd->lasty = 0;
     xd->font_struct = (XFontStruct *) NULL;
 
-    xd->window = XCreateWindow(xd->display, xd->tqparent_window, xHint, yHint,
+    xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint,
 			      xd->width, xd->height, xd->border_width,
 				vis.depth, xd->classX, xd->visual,
 				xd->attr_tqmask, xd->attributes);
diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h
index fa079775..00b6242e 100644
--- a/kscd/kscdmagic/xlib.h
+++ b/kscd/kscdmagic/xlib.h
@@ -58,7 +58,7 @@ typedef struct {
     int privatecolormap;
     xlibparam *params;
     Display *display;
-    Window tqparent_window;
+    Window parent_window;
     Window window;
     unsigned int width, height;
     unsigned int border_width;
diff --git a/kscd/panel.ui b/kscd/panel.ui
index 58bf1e41..43fd739a 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -464,5 +464,5 @@
     <slot>ejectClicked()</slot>
     <slot returnType="bool">nextClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index 2d2d3c99..d7ab8e4a 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -418,8 +418,8 @@
     <function returnType="TQString">framesTime( unsigned frames )</function>
     <function returnType="KCDDB::CDInfo">info() const</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui
index 3a4dd862..e60d91b3 100644
--- a/libkcddb/cdinfoencodingwidgetbase.ui
+++ b/libkcddb/cdinfoencodingwidgetbase.ui
@@ -66,5 +66,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index 666d440a..ecd8a587 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -585,8 +585,8 @@
     <slot access="protected">showMirrorList()</slot>
     <slot access="protected">needAuthenticationChanged(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="11" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="11" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/mpeglib/COPYING b/mpeglib/COPYING
index d80c8b62..982eea7f 100644
--- a/mpeglib/COPYING
+++ b/mpeglib/COPYING
@@ -244,7 +244,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure tqlayouts and accessors, and small macros and small inline
+structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp
index 0e46f752..1e7df93c 100644
--- a/mpeglib/lib/mpegplay/decoderClass.cpp
+++ b/mpeglib/lib/mpegplay/decoderClass.cpp
@@ -54,7 +54,7 @@ static const int zigzag_direct_mmx[64] = {
 
 
 
-/* Bit tqmasks used by bit i/o operations. */
+/* Bit masks used by bit i/o operations. */
 
 
 
diff --git a/mpeglib/lib/mpegplay/pesSystemStream.cpp b/mpeglib/lib/mpegplay/pesSystemStream.cpp
index b9915fc2..10787f21 100644
--- a/mpeglib/lib/mpegplay/pesSystemStream.cpp
+++ b/mpeglib/lib/mpegplay/pesSystemStream.cpp
@@ -192,7 +192,7 @@ int PESSystemStream::processMPEG2PacketHeader(MpegSystemHeader* mpegHeader){
     //LIVID
     u_char original_or_copy                 : 1;
     u_char copyright                        : 1;
-    u_char data_tqalignment_indicator         : 1;
+    u_char data_alignment_indicator         : 1;
     u_char pes_priority                     : 1;
     u_char pes_scrambling_control           : 2;
     u_char start_code_prefix                : 2;    // 0x02 
diff --git a/mpeglib/lib/util/mmx/mmx_asm.h b/mpeglib/lib/util/mmx/mmx_asm.h
index d1c2a0bd..8717eff5 100644
--- a/mpeglib/lib/util/mmx/mmx_asm.h
+++ b/mpeglib/lib/util/mmx/mmx_asm.h
@@ -208,7 +208,7 @@ typedef	union {
 			      : "X" (mem))
 
 
-#define	tqmaskmovq(regs,tqmaskreg)		mmx_r2ri (tqmaskmovq, regs, tqmaskreg)
+#define	maskmovq(regs,maskreg)		mmx_r2ri (maskmovq, regs, maskreg)
 
 #define	movntq_r2m(mmreg,var)		mmx_r2m (movntq, mmreg, var)
 
diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp
index 0aaf7743..d7b8f052 100644
--- a/mpeglib/lib/util/render/x11/x11Surface.cpp
+++ b/mpeglib/lib/util/render/x11/x11Surface.cpp
@@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) {
   } else {
     // depth is <= 8
     // allocate memory for dithertables
-    // gets the rgb tqmasks
+    // gets the rgb masks
     initColorDisplay(xWindow);
     // create 8 bit dithertables 
     // create private colormap
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 226cc2d6..5163ef8b 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -58,7 +58,7 @@ General::General(TQObject *tqparent)
 	TQWhatsThis::add(mTitleFormat, i18n(
 			"Select a title to use for each file (in the playlist and user interface). "
 			"Each element such as $(title) is replaced with the property with the name "
-			"as given in the tqparentheses. The properties include, but are not limited to: "
+			"as given in the parentheses. The properties include, but are not limited to: "
 			"title, author, date, comments and album."));
 
 	TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this);
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 807f0e71..fe25abcb 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -104,7 +104,7 @@ void EffectView::init(void)
 	setCaption(i18n("Effects - Noatun"));
 	setIcon(SmallIcon("effect"));
 
-	// Create widgets and tqlayouts
+	// Create widgets and layouts
 	TQFrame *box = makeMainWidget();
 	TQVBoxLayout *boxLayout = new TQVBoxLayout(box, 0, KDialog::spacingHint());
 
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index f134c74a..8a4b52eb 100644
--- a/noatun/library/equalizerwidget.ui
+++ b/noatun/library/equalizerwidget.ui
@@ -330,7 +330,7 @@
     <tabstop>removePresetButton</tabstop>
     <tabstop>addPresetButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 621b0240..4e568b5d 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -124,9 +124,9 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename)
 
                     if(pixmap.tqmask())
                     {
-                        TQBitmap tqmaskpart(w,h);
-                        bitBlt(&tqmaskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h);
-                        part->setMask(tqmaskpart);
+                        TQBitmap maskpart(w,h);
+                        bitBlt(&maskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h);
+                        part->setMask(maskpart);
                     }
 
                     i++;
@@ -186,7 +186,7 @@ void KaimanStyleElement::dragEnterEvent( TQDragEnterEvent *event )
 
 void KaimanStyleElement::dropEvent( TQDropEvent *event )
 {
-    ((Kaiman*)(tqparentWidget()->tqparentWidget()))->doDropEvent(event);
+    ((Kaiman*)(parentWidget()->parentWidget()))->doDropEvent(event);
 }
 
 /***************************************************************************/
@@ -511,8 +511,8 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme)
     }
 
     if ( i_b_move ) {
-        TQWidget *p = tqparentWidget()->tqparentWidget();
-        if ( !p ) p = tqparentWidget();
+        TQWidget *p = parentWidget()->parentWidget();
+        if ( !p ) p = parentWidget();
 
         p->move( qme->globalPos() - i_point_dragStart );
     }
diff --git a/noatun/modules/kjofol-skin/ChangeLog b/noatun/modules/kjofol-skin/ChangeLog
index b93bb4ee..47b2caae 100644
--- a/noatun/modules/kjofol-skin/ChangeLog
+++ b/noatun/modules/kjofol-skin/ChangeLog
@@ -51,7 +51,7 @@ ChangeLog (only lists MY changes)
 * added splash-screen for skins supporting it (only skin I know of: K-Nine)
 
 2001-09-30 Stefan Gehn <sgehn@gmx.net>
-* ignore alpha-channel of loaded files, they break applying tqmasks to QPixmaps,
+* ignore alpha-channel of loaded files, they break applying masks to QPixmaps,
   result of this is text without transparency
   (this happened for two skins: adagio and xbs)
 
@@ -72,7 +72,7 @@ ChangeLog (only lists MY changes)
 2001-09-04 Stefan Gehn <sgehn@gmx.net>
 * added support for transparent fonts (a skin named steelforged still got problems though)
   for the moment this disables moving of titletext,
-  I have to find a new way to move it (bitblt on a tqmasked QPixmap is tricky)
+  I have to find a new way to move it (bitblt on a masked QPixmap is tricky)
 
 2001-09-03 Stefan Gehn <sgehn@gmx.net>
 * added support for pitch-slider and its textlabel
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 72db09ff..762d86b9 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -453,7 +453,7 @@
     <tabstop>cmbSysFontColor</tabstop>
     <tabstop>titleScrollSpeed</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
index ecb49f10..229d307e 100644
--- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
+++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
@@ -219,7 +219,7 @@ It can be several lines and usually does not contain anything interesting but st
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index f64073da..8712ed1a 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -344,5 +344,5 @@
 <Q_SLOTS>
     <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui
index 14408b04..f63d7319 100644
--- a/noatun/modules/systray/yhconfigwidget.ui
+++ b/noatun/modules/systray/yhconfigwidget.ui
@@ -329,5 +329,5 @@
     <tabstop>rbActVolume</tabstop>
     <tabstop>rbActTrack</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp
index b3b4917c..9570dac0 100644
--- a/noatun/modules/winskin/waTitleBar.cpp
+++ b/noatun/modules/winskin/waTitleBar.cpp
@@ -25,7 +25,7 @@
 WaTitleBar::WaTitleBar() : WaIndicator(_WA_MAPPING_TITLE, _WA_SKIN_TITLE_ACTIVE, _WA_SKIN_TITLE_INACTIVE)
 {
     moving = false;
-    setState(tqparentWidget()->isActiveWindow());
+    setState(parentWidget()->isActiveWindow());
 }
 
 WaTitleBar::~WaTitleBar()
@@ -73,7 +73,7 @@ void WaTitleBar::mouseMoveEvent(TQMouseEvent * e)
     }
 
     if (moving) 
-	tqparentWidget()->move(e->globalPos() - mDragStart);
+	parentWidget()->move(e->globalPos() - mDragStart);
 }
 
 #include <waTitleBar.moc>