10 files changed, 17 insertions, 17 deletions
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>