Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 55 insertions, 55 deletions

diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 88681efe..9476ea29 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -348,9 +348,9 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
     row.downButton->setFlat(true);
 
     upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
-    upMapper->setMapping(TQT_TQOBJECT(row.upButton), id);
+    upMapper->setMapping(row.upButton, id);
     downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
-    downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
+    downMapper->setMapping(row.downButton, id);
 
     TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
     TQLabel *label = new TQLabel(labelText, frame);
@@ -360,11 +360,11 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
     TQVBox *options = new TQVBox(frame);
     row.enableButton = new KPushButton(i18n("Remove"), options);
     toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
-    toggleMapper->setMapping(TQT_TQOBJECT(row.enableButton), id);
+    toggleMapper->setMapping(row.enableButton, id);
 
     row.optionsButton = new KPushButton(i18n("Options"), options);
     mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
-    mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id);
+    mapper->setMapping(row.optionsButton, id);
 
     row.widget->show();
     m_rows.append(row);
@@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
 
 void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId)
 {
-    mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId);
-    downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId);
-    upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId);
-    toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId);
+    mapper->setMapping(m_rows[oldId].optionsButton, newId);
+    downMapper->setMapping(m_rows[oldId].downButton, newId);
+    upMapper->setMapping(m_rows[oldId].upButton, newId);
+    toggleMapper->setMapping(m_rows[oldId].enableButton, newId);
 }
 
 bool FileRenamerWidget::removeRow(unsigned id)
@@ -480,10 +480,10 @@ void FileRenamerWidget::createTagRows()
     m_rows.reserve(categoryOrder.count());
     m_folderSwitches.reserve(categoryOrder.count() - 1);
 
-    mapper       = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper");
-    toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper");
-    upMapper     = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper");
-    downMapper   = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper");
+    mapper       = new TQSignalMapper(this, "signal mapper");
+    toggleMapper = new TQSignalMapper(this, "toggle mapper");
+    upMapper     = new TQSignalMapper(this, "up button mapper");
+    downMapper   = new TQSignalMapper(this, "down button mapper");
 
     connect(mapper,       TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int)));
     connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int)));
diff --git a/juk/juk.cpp b/juk/juk.cpp
index c66c19fc..734d39b7 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) :
 
     SplashScreen::finishedLoading();
     TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
-    TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs()));
+    TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
 
     m_sliderAction->slotUpdateOrientation();
 }
@@ -112,15 +112,15 @@ void JuK::setupActions()
 {
     ActionCollection::actions()->setWidget(this);
 
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions());
-    KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions());
-    KStdAction::cut(TQT_TQOBJECT(kapp),   TQT_SLOT(cut()),   ActionCollection::actions());
-    KStdAction::copy(TQT_TQOBJECT(kapp),  TQT_SLOT(copy()),  ActionCollection::actions());
-    KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions());
-    KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
-    KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
+    KStdAction::quit(this, TQT_SLOT(slotQuit()), ActionCollection::actions());
+    KStdAction::undo(this, TQT_SLOT(slotUndo()), ActionCollection::actions());
+    KStdAction::cut(kapp,   TQT_SLOT(cut()),   ActionCollection::actions());
+    KStdAction::copy(kapp,  TQT_SLOT(copy()),  ActionCollection::actions());
+    KStdAction::paste(kapp, TQT_SLOT(paste()), ActionCollection::actions());
+    KStdAction::clear(kapp, TQT_SLOT(clear()), ActionCollection::actions());
+    KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), ActionCollection::actions());
 
-    new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+    new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
 
     TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
     actionMenu->setDelayed(false);
@@ -138,12 +138,12 @@ void JuK::setupActions()
     connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
     actionMenu->insert(ka);
 
-    new TDEAction(i18n("&Play"),  "media-playback-start",  0, TQT_TQOBJECT(m_player), TQT_SLOT(play()),  ActionCollection::actions(), "play");
-    new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
-    new TDEAction(i18n("&Stop"),  "media-playback-stop",  0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
+    new TDEAction(i18n("&Play"),  "media-playback-start",  0, m_player, TQT_SLOT(play()),  ActionCollection::actions(), "play");
+    new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQT_SLOT(pause()), ActionCollection::actions(), "pause");
+    new TDEAction(i18n("&Stop"),  "media-playback-stop",  0, m_player, TQT_SLOT(stop()),  ActionCollection::actions(), "stop");
 
-    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
-    new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+    new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQT_SLOT(back()), ActionCollection::actions(), "back");
+    new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQT_SLOT(forward()), ActionCollection::actions(), "forward");
     new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
     TDEToggleAction *resizeColumnAction =
         new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
@@ -152,12 +152,12 @@ void JuK::setupActions()
 
     // the following are not visible by default
 
-    new TDEAction(i18n("Mute"),         "mute",        0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()),        ActionCollection::actions(), "mute");
-    new TDEAction(i18n("Volume Up"),    "volumeUp",    0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()),    ActionCollection::actions(), "volumeUp");
-    new TDEAction(i18n("Volume Down"),  "volumeDown",  0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()),  ActionCollection::actions(), "volumeDown");
-    new TDEAction(i18n("Play / Pause"), "playPause",   0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()),   ActionCollection::actions(), "playPause");
-    new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
-    new TDEAction(i18n("Seek Back"),    "seekBack",    0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()),    ActionCollection::actions(), "seekBack");
+    new TDEAction(i18n("Mute"),         "mute",        0, m_player, TQT_SLOT(mute()),        ActionCollection::actions(), "mute");
+    new TDEAction(i18n("Volume Up"),    "volumeUp",    0, m_player, TQT_SLOT(volumeUp()),    ActionCollection::actions(), "volumeUp");
+    new TDEAction(i18n("Volume Down"),  "volumeDown",  0, m_player, TQT_SLOT(volumeDown()),  ActionCollection::actions(), "volumeDown");
+    new TDEAction(i18n("Play / Pause"), "playPause",   0, m_player, TQT_SLOT(playPause()),   ActionCollection::actions(), "playPause");
+    new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+    new TDEAction(i18n("Seek Back"),    "seekBack",    0, m_player, TQT_SLOT(seekBack()),    ActionCollection::actions(), "seekBack");
 
     //////////////////////////////////////////////////
     // settings menu
@@ -175,9 +175,9 @@ void JuK::setupActions()
 			  TDEShortcut(), ActionCollection::actions(), "dockOnClose");
     m_togglePopupsAction =
 	new TDEToggleAction(i18n("Popup &Track Announcement"),
-			  TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
+			  TDEShortcut(), this, 0, ActionCollection::actions(), "togglePopups");
     new TDEToggleAction(i18n("Save &Play Queue on Exit"),
-                      TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
+                      TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks");
 
     connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
 	    this, TQT_SLOT(slotToggleSystemTray(bool)));
@@ -188,13 +188,13 @@ void JuK::setupActions()
     if(m_outputSelectAction)
         m_outputSelectAction->setCurrentItem(0);
 
-    new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+    new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
 		ActionCollection::actions(), "tagGuesserConfig");
 
-    new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+    new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
 		ActionCollection::actions(), "fileRenamerConfig");
 
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
+    KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), ActionCollection::actions());
 
     //////////////////////////////////////////////////
     // just in the toolbar
@@ -213,7 +213,7 @@ void JuK::setupSystemTray()
 	m_toggleDockOnCloseAction->setEnabled(true);
 	m_togglePopupsAction->setEnabled(true);
 
-	connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
+	connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
     }
     else {
 	m_systemTray = 0;
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
 
 void JuK::setupGlobalAccels()
 {
-    m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this));
+    m_accel = new TDEGlobalAccel(this);
 
     KeyDialog::insert(m_accel, "Play",        i18n("Play"),         action("play"),        TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "PlayPause",   i18n("Play / Pause"), action("playPause"),   TQT_SLOT(activate()));
@@ -236,7 +236,7 @@ void JuK::setupGlobalAccels()
     KeyDialog::insert(m_accel, "VolumeUp",    i18n("Volume Up"),    action("volumeUp"),    TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "VolumeDown",  i18n("Volume Down"),  action("volumeDown"),  TQT_SLOT(activate()));
     KeyDialog::insert(m_accel, "Mute",        i18n("Mute"),         action("mute"),        TQT_SLOT(activate()));
-    KeyDialog::insert(m_accel, "ShowHide",    i18n("Show / Hide"),  TQT_TQOBJECT(this),    TQT_SLOT(slotShowHide()));
+    KeyDialog::insert(m_accel, "ShowHide",    i18n("Show / Hide"),  this,    TQT_SLOT(slotShowHide()));
     KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate()));
 
     m_accel->setConfigGroup("Shortcuts");
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 21df8553..cf20a415 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -314,7 +314,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name,
 		   const TQString &iconName) :
     TDEListView(collection->playlistStack(), name.latin1()),
     m_collection(collection),
-    m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+    m_fetcher(new WebImageFetcher(this)),
     m_selectedCount(0),
     m_allowDuplicates(false),
     m_polished(false),
@@ -338,7 +338,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
 		   const TQString &name, const TQString &iconName) :
     TDEListView(collection->playlistStack(), name.latin1()),
     m_collection(collection),
-    m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+    m_fetcher(new WebImageFetcher(this)),
     m_selectedCount(0),
     m_allowDuplicates(false),
     m_polished(false),
@@ -363,7 +363,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
 		   const TQString &iconName) :
     TDEListView(collection->playlistStack()),
     m_collection(collection),
-    m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+    m_fetcher(new WebImageFetcher(this)),
     m_selectedCount(0),
     m_allowDuplicates(false),
     m_polished(false),
@@ -387,7 +387,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
 Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
     TDEListView(collection->playlistStack()),
     m_collection(collection),
-    m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+    m_fetcher(new WebImageFetcher(this)),
     m_selectedCount(0),
     m_allowDuplicates(false),
     m_polished(false),
@@ -1547,7 +1547,7 @@ void Playlist::polish()
     // setup header RMB menu
     //////////////////////////////////////////////////
 
-    m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns");
+    m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), this, "showColumns");
 
     m_headerMenu = m_columnVisibleAction->popupMenu();
     m_headerMenu->insertTitle(i18n("Show"));
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 7d4e7f7d..c1aca5aa 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const
     TQObjectList *childList = m_playlistStack->queryList("Playlist");
     TQObject *obj;
     for(obj = childList->first(); obj; obj = childList->next()) {
-        Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj));
+        Playlist *p = static_cast<Playlist *>(obj);
         l.append(p->name());
     }
 
@@ -706,7 +706,7 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist)
 
 void PlaylistCollection::enableDirWatch(bool enable)
 {
-    TQObject *collection = TQT_TQOBJECT(CollectionList::instance());
+    TQObject *collection = CollectionList::instance();
 
     m_dirLister.disconnect(object());
     if(enable) {
@@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const
     TQObject *obj;
 
     for(obj = l->first(); obj; obj = l->next()) {
-        Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj));
+        Playlist *p = static_cast<Playlist*>(obj);
         if(p->name() == name) {
             list = p;
             break;
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index 17da7a07..a55e4747 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -121,7 +121,7 @@ void PlaylistSplitter::setupActions()
         new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch");
     showSearch->setCheckedState(i18n("Hide &Search Bar"));
 
-    new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
+    new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
 }
 
 void PlaylistSplitter::setupLayout()
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index ae3aee32..29c5c436 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -162,7 +162,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
     // Just create this here so that it show up in the DCOP interface and the key
     // bindings dialog.
 
-    new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this),
+    new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this,
                 TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup");
     
     TDEPopupMenu *cm = contextMenu();
@@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
 
     // Pity the actionCollection doesn't keep track of what sub-menus it has.
 
-    TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this));
+    TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), this);
     menu->insert(action("disableRandomPlay"));
     menu->insert(action("randomPlay"));
     menu->insert(action("albumRandomPlay"));
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index c1200e3d..0129680f 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -475,7 +475,7 @@ void TagEditor::setupActions()
     show->setCheckedState(i18n("Hide &Tag Editor"));
     connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool)));
 
-    new TDEAction(i18n("&Save"), "document-save", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
+    new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
 }
 
 void TagEditor::setupLayout()
@@ -526,7 +526,7 @@ void TagEditor::setupLayout()
 						      horizontalSpacing);
 
 	m_fileNameBox = new KLineEdit(this, "fileNameBox");
-	m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox)));	
+	m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox));	
 
 	TQLabel *fileNameIcon = new TQLabel(this);
 	fileNameIcon->setPixmap(SmallIcon("audio-x-generic"));
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index c816f2f4..2c66f120 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo
 
    if(!to.exists() ||
        KMessageBox::warningContinueCancel(
-           TQT_TQWIDGET(parent()),
+           static_cast<TQWidget*>(parent()),
            i18n("This file already exists.\nDo you want to replace it?"),
            i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue)
    {
@@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo)
         action("edit_undo")->setEnabled(false);
 
     if(!errorItems.isEmpty())
-        KMessageBox::errorList(TQT_TQWIDGET(parent()),
+        KMessageBox::errorList(static_cast<TQWidget*>(parent()),
                 i18n("The following files were unable to be changed."),
                 errorItems,
                 i18n("Error"));