15 files changed, 22 insertions, 22 deletions
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)