rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 22 insertions, 22 deletions

diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 8a9a9c32..e326ef27 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -50,8 +50,8 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y);
 class FlickerFreeLabel : public TQLabel
 {
 public:
-    FlickerFreeLabel(const TQString &text, TQWidget *tqparent, const char *name = 0) :
-        TQLabel(text, tqparent, name)
+    FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) :
+        TQLabel(text, parent, name)
     {
         m_textColor = paletteForegroundColor();
         m_bgColor = parentWidget()->paletteBackgroundColor();
@@ -90,8 +90,8 @@ protected:
     TQColor m_bgColor;
 };
 
-PassiveInfo::PassiveInfo(TQWidget *tqparent, const char *name) :
-    KPassivePopup(tqparent, name), m_timer(new TQTimer), m_justDie(false)
+PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) :
+    KPassivePopup(parent, name), m_timer(new TQTimer), m_justDie(false)
 {
     // I'm so sick and tired of KPassivePopup screwing this up
     // that I'll just handle the timeout myself, thank you very much.
@@ -137,7 +137,7 @@ void PassiveInfo::leaveEvent(TQEvent *)
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-SystemTray::SystemTray(TQWidget *tqparent, const char *name) : KSystemTray(tqparent, name),
+SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, name),
                                                             m_popup(0),
                                                             m_fadeTimer(0),
                                                             m_fade(true)
@@ -299,7 +299,7 @@ void SystemTray::slotMouseInPopup()
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
 
-TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file)
+TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file)
 {
     TQVBox *infoBox = 0;
 
@@ -307,17 +307,17 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
 
         // They go to the left because JuK is on that side
 
-        createButtonBox(tqparent);
-        addSeparatorLine(tqparent);
+        createButtonBox(parent);
+        addSeparatorLine(parent);
 
-        infoBox = new TQVBox(tqparent);
+        infoBox = new TQVBox(parent);
 
         // Another line, and the cover, if there's a cover, and if
         // it's selected to be shown
 
         if(file.coverInfo()->hasCover()) {
-            addSeparatorLine(tqparent);
-            addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
+            addSeparatorLine(parent);
+            addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
         }
     }
     else {
@@ -325,14 +325,14 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
         // Like above, but reversed.
 
         if(file.coverInfo()->hasCover()) {
-            addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
-            addSeparatorLine(tqparent);
+            addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
+            addSeparatorLine(parent);
         }
 
-        infoBox = new TQVBox(tqparent);
+        infoBox = new TQVBox(parent);
 
-        addSeparatorLine(tqparent);
-        createButtonBox(tqparent);
+        addSeparatorLine(parent);
+        createButtonBox(parent);
     }
 
     infoBox->setSpacing(3);
@@ -440,9 +440,9 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName)
     return bgPix;
 }
 
-void SystemTray::createButtonBox(TQWidget *tqparent)
+void SystemTray::createButtonBox(TQWidget *parent)
 {
-    TQVBox *buttonBox = new TQVBox(tqparent);
+    TQVBox *buttonBox = new TQVBox(parent);
     
     buttonBox->setSpacing(3);
 
@@ -472,9 +472,9 @@ void SystemTray::slotForward()
     m_fade = false;
 }
 
-void SystemTray::addSeparatorLine(TQWidget *tqparent)
+void SystemTray::addSeparatorLine(TQWidget *parent)
 {
-    TQFrame *line = new TQFrame(tqparent);
+    TQFrame *line = new TQFrame(parent);
     line->setFrameShape(TQFrame::VLine);
 
     // Cover art takes up 80 pixels, make sure we take up at least 80 pixels
@@ -483,9 +483,9 @@ void SystemTray::addSeparatorLine(TQWidget *tqparent)
     line->setMinimumHeight(80);
 }
 
-void SystemTray::addCoverButton(TQWidget *tqparent, const TQPixmap &cover)
+void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover)
 {
-    TQPushButton *coverButton = new TQPushButton(tqparent);
+    TQPushButton *coverButton = new TQPushButton(parent);
 
     coverButton->setPixmap(cover);
     coverButton->setFixedSize(cover.size());