diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index c639574..82e09f6 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -929,7 +929,7 @@ void K3bAudioDoc::informAboutNotFoundFiles() for( KURL::List::const_iterator it = m_notFoundFiles.begin(); it != m_notFoundFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), + KMessageBox::informationList( tqApp->activeWindow(), i18n("Could not find the following files:"), l, i18n("Not Found") ); @@ -941,7 +941,7 @@ void K3bAudioDoc::informAboutNotFoundFiles() for( KURL::List::const_iterator it = m_unknownFileFormatFiles.begin(); it != m_unknownFileFormatFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), + KMessageBox::informationList( tqApp->activeWindow(), i18n("

Unable to handle the following files due to an unsupported format:" "

You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index d25e342..7f99ce6 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) void K3bDataDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), + KMessageBox::informationList( tqApp->activeWindow(), i18n("Could not find the following files:"), m_notFoundFiles, i18n("Not Found") ); m_notFoundFiles.clear(); } if( !m_noPermissionFiles.isEmpty() ) { - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"), + KMessageBox::informationList( tqApp->activeWindow(), i18n("No permission to read the following files:"), m_noPermissionFiles, i18n("No Read Permission") ); m_noPermissionFiles.clear(); diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index a4d20d4..77e499c 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -25,14 +25,14 @@ K3bIntValidator::K3bIntValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = m_max = 0; } K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = bottom; m_max = top; diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index d00dddc..66ab37c 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -769,7 +769,7 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::SPIN: if( !m_editorSpinBox ) { m_editorSpinBox = new TQSpinBox( viewport() ); - d->spinBoxLineEdit = static_cast(TQT_TQWIDGET( m_editorSpinBox->child( 0, "TQLineEdit" ) )); + d->spinBoxLineEdit = static_cast( m_editorSpinBox->child( 0, "TQLineEdit" ) ); connect( m_editorSpinBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotEditorSpinBoxValueChanged(int)) ); // m_editorSpinBox->installEventFilter( this ); @@ -782,7 +782,7 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::MSF: if( !m_editorMsfEdit ) { m_editorMsfEdit = new K3bMsfEdit( viewport() ); - d->msfEditLineEdit = static_cast(TQT_TQWIDGET( m_editorMsfEdit->child( 0, "TQLineEdit" ) )); + d->msfEditLineEdit = static_cast( m_editorMsfEdit->child( 0, "TQLineEdit" ) ); connect( m_editorMsfEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotEditorMsfEditValueChanged(int)) ); // m_editorMsfEdit->installEventFilter( this ); diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 0e467dc..822392e 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -36,7 +36,7 @@ K3bMsfValidator::K3bMsfValidator( TQObject* parent, const char* name ) K3bMsfEdit::K3bMsfEdit( TQWidget* parent, const char* name ) : TQSpinBox( parent, name ) { - setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); + setValidator( new K3bMsfValidator( this ) ); setMinValue( 0 ); // some very high value (10000 minutes) setMaxValue( 10000*60*75 ); diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index c502d95..64d228f 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -82,7 +82,7 @@ K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, : KDialog( parent, name ) { d = new Private(); - d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); + d->mapper = new TQSignalMapper( this ); connect( d->mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(done(int)) ); setCaption( caption ); @@ -126,7 +126,7 @@ int K3bMultiChoiceDialog::addButton( const KGuiItem& b ) KPushButton* button = new KPushButton( b, this ); d->buttonLayout->add( button ); d->buttons.append(button); - d->mapper->setMapping( TQT_TQOBJECT(button), d->buttons.count() ); + d->mapper->setMapping( button, d->buttons.count() ); connect( button, TQT_SIGNAL(clicked()), d->mapper, TQT_SLOT(map()) ); return d->buttons.count(); } diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index d91502f..2731eca 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -376,7 +376,7 @@ K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* parent, cons : K3bPluginConfigWidget( parent, name ) { w = new base_K3bSoxEncoderConfigWidget( this ); - w->m_editSamplerate->setValidator( new TQIntValidator( TQT_TQOBJECT(w->m_editSamplerate) ) ); + w->m_editSamplerate->setValidator( new TQIntValidator( w->m_editSamplerate ) ); TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); diff --git a/src/k3b.cpp b/src/k3b.cpp index abebb66..1f0c16f 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -175,9 +175,9 @@ K3bMainWindow::K3bMainWindow() // disable actions at startup slotStateChanged( "state_project_active", KXMLGUIClient::StateReverse ); - connect( k3bappcore->projectManager(), TQT_SIGNAL(newProject(K3bDoc*)), TQT_TQOBJECT(this), TQT_SLOT(createClient(K3bDoc*)) ); - connect( k3bcore->deviceManager(), TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystemTimed()) ); - connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotAudioServerError(const TQString&)) ); + connect( k3bappcore->projectManager(), TQT_SIGNAL(newProject(K3bDoc*)), this, TQT_SLOT(createClient(K3bDoc*)) ); + connect( k3bcore->deviceManager(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotCheckSystemTimed()) ); + connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), this, TQT_SLOT(slotAudioServerError(const TQString&)) ); // FIXME: now make sure the welcome screen is displayed completely resize( 780, 550 ); @@ -211,59 +211,59 @@ void K3bMainWindow::initActions() // see the correct solution?) *actionCollection() += *k3bappcore->appDeviceManager()->actionCollection(); - actionFileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), + actionFileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + actionFileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + actionFileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + actionFileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, this, TQT_SLOT(slotFileSaveAll()), actionCollection(), "file_save_all" ); - actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), + actionFileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, this, TQT_SLOT(slotFileCloseAll()), actionCollection(), "file_close_all" ); - actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); - actionSettingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSettingsConfigure()), actionCollection() ); + actionFileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + actionViewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotViewStatusBar()), actionCollection()); + actionSettingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotSettingsConfigure()), actionCollection() ); // the tip action - (void)KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(slotShowTips()), actionCollection() ); - (void)KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + (void)KStdAction::tipOfDay(this, TQT_SLOT(slotShowTips()), actionCollection() ); + (void)KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); - KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); + KStdAction::showMenubar( this, TQT_SLOT(slotShowMenuBar()), actionCollection() ); actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "document-new", actionCollection(), "file_new" ); - actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), + actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, this, TQT_SLOT(slotNewAudioDoc()), actionCollection(), "file_new_audio"); - actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), + actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, this, TQT_SLOT(slotNewDataDoc()), actionCollection(), "file_new_data"); - actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()), + actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, this, TQT_SLOT(slotNewMixedDoc()), actionCollection(), "file_new_mixed"); - actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()), + actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, this, TQT_SLOT(slotNewVcdDoc()), actionCollection(), "file_new_vcd"); - actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()), + actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, this, TQT_SLOT(slotNewMovixDoc()), actionCollection(), "file_new_movix"); - actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()), + actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, this, TQT_SLOT(slotNewMovixDvdDoc()), actionCollection(), "file_new_movix_dvd"); - actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()), + actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, this, TQT_SLOT(slotNewDvdDoc()), actionCollection(), "file_new_dvd"); - actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()), + actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, this, TQT_SLOT(slotNewVideoDvdDoc()), actionCollection(), "file_new_video_dvd"); - actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()), + actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, this, TQT_SLOT(slotContinueMultisession()), actionCollection(), "file_continue_multisession" ); actionFileNewMenu->setDelayed( false ); actionFileNewMenu->insert( actionFileNewData ); actionFileNewMenu->insert( actionFileNewDvd ); actionFileNewMenu->insert( actionFileContinueMultisession ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewAudio ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewMixed ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewVcd ); actionFileNewMenu->insert( actionFileNewVideoDvd ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewMovix ); actionFileNewMenu->insert( actionFileNewMovixDvd ); @@ -271,53 +271,53 @@ void K3bMainWindow::initActions() - actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), + actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, this, TQT_SLOT(slotProjectAddFiles()), actionCollection(), "project_add_files"); TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); + this, TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); - actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()), + actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, this, TQT_SLOT(slotShowDirTreeView()), actionCollection(), "view_dir_tree"); - actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()), + actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, this, TQT_SLOT(slotShowContentsView()), actionCollection(), "view_contents"); - actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()), + actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, this, TQT_SLOT(slotViewDocumentHeader()), actionCollection(), "view_document_header"); - actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), + actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, this, TQT_SLOT(slotBlankCdrw()), actionCollection(), "tools_blank_cdrw" ); - TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("±"), "formatdvd", 0, TQT_TQOBJECT(this), + TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("±"), "formatdvd", 0, this, TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); - actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), + actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, this, TQT_SLOT(slotWriteCdImage()), actionCollection(), "tools_write_cd_image" ); - TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()), + TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, this, TQT_SLOT(slotWriteDvdIsoImage()), actionCollection(), "tools_write_dvd_iso" ); - actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()), + actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, this, TQT_SLOT(slotCdCopy()), actionCollection(), "tools_copy_cd" ); - TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()), + TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, this, TQT_SLOT(slotDvdCopy()), actionCollection(), "tools_copy_dvd" ); - actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()), + actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, this, TQT_SLOT(slotCddaRip()), actionCollection(), "tools_cdda_rip" ); - actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()), + actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, this, TQT_SLOT(slotVideoDvdRip()), actionCollection(), "tools_videodvd_rip" ); - actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()), + actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, this, TQT_SLOT(slotVideoCdRip()), actionCollection(), "tools_videocd_rip" ); - (void)new TDEAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()), + (void)new TDEAction( i18n("System Check"), 0, 0, this, TQT_SLOT(slotCheckSystem()), actionCollection(), "help_check_system" ); #ifdef HAVE_K3BSETUP - actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()), + actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, this, TQT_SLOT(slotK3bSetup()), actionCollection(), "settings_k3bsetup" ); #endif #ifdef K3B_DEBUG - (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), + (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, this, TQT_SLOT(slotMediaSelectionTester()), actionCollection(), "test_media_selection" ); #endif @@ -408,7 +408,7 @@ void K3bMainWindow::initView() documentHullLayout->addWidget( m_documentHeader, 0, 0 ); documentHullLayout->addWidget( m_documentTab, 1, 0 ); - connect( m_documentTab, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentDocChanged()) ); + connect( m_documentTab, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentDocChanged()) ); d->welcomeWidget = new K3bWelcomeWidget( this, m_documentTab ); m_documentTab->addTab( d->welcomeWidget, i18n("Quickstart") ); @@ -427,8 +427,8 @@ void K3bMainWindow::initView() m_dirTreeDock->setWidget( sidePanel ); m_dirTreeDock->manualDock( mainDock, KDockWidget::DockTop, 4000 ); - connect( m_dirTreeDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); - connect( m_dirTreeDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQT_SIGNAL(hasUndocked()), this, TQT_SLOT(slotDirTreeDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- Contents Dock --------------------------------------------------------------------------- @@ -439,8 +439,8 @@ void K3bMainWindow::initView() m_contentsDock->setWidget( m_dirView ); m_contentsDock->manualDock( m_dirTreeDock, KDockWidget::DockRight, 2000 ); - connect( m_contentsDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); - connect( m_contentsDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQT_SIGNAL(hasUndocked()), this, TQT_SLOT(slotContentsDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- filetreecombobox-toolbar ---------------------------------------------------------------- @@ -456,7 +456,7 @@ void K3bMainWindow::initView() 0, 0, 0, actionCollection(), "quick_dir_selector" ); fileTreeComboAction->setAutoSized(true); - (void)new TDEAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); + (void)new TDEAction( i18n("Go"), "key_enter", 0, m_fileTreeComboBox, TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); // --------------------------------------------------------------------------------------------- } @@ -1468,7 +1468,7 @@ void K3bMainWindow::slotCheckSystemTimed() // run the system check from the event queue so we do not // mess with the device state resetting throughout the app // when called from K3bDeviceManager::changed - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckSystem()) ); } diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index f7483da..c4366e8 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -72,11 +72,11 @@ K3bApplication::K3bApplication() TDEGlobal::locale()->insertCatalogue( "libk3bdevice" ); TDEGlobal::locale()->insertCatalogue( "libk3b" ); - m_core = new Core( TQT_TQOBJECT(this) ); + m_core = new Core( this ); // TODO: move to K3bCore? // from this point on available through K3bAudioServer::instance() - m_audioServer = new K3bAudioServer( TQT_TQOBJECT(this), "K3bAudioServer" ); + m_audioServer = new K3bAudioServer( this, "K3bAudioServer" ); connect( m_core, TQT_SIGNAL(initializationInfo(const TQString&)), TQT_SIGNAL(initializationInfo(const TQString&)) ); diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index e8e1bb9..b0f314f 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -49,11 +49,11 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na bmMan->setUpdate( true ); bmMan->setShowNSBookmarks( false ); - m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" ); + m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", this, "bookmarks" ); m_bmMenu = new KBookmarkMenu( bmMan, this, m_bmPopup->popupMenu(), actionCollection(), true ); (void)new TDEAction( i18n("&Add to Project"), SHIFT+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()), + this, TQT_SLOT(slotAddFilesToProject()), actionCollection(), "add_file_to_project"); } diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index df35a07..7e43a41 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -685,7 +685,7 @@ void K3bEmptyDiscWaiter::slotReloadingAfterErasingFinished( K3bDevice::DeviceHan int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : tqApp->activeWindow() ); int mediaState = K3bDevice::STATE_EMPTY; if( appendable ) mediaState |= K3bDevice::STATE_INCOMPLETE; return d.waitForDisc( mediaState, mediaType ); @@ -698,7 +698,7 @@ int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, const TQString& message, TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : tqApp->activeWindow() ); return d.waitForDisc( mediaState, mediaType, message ); } diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 14a710f..47ee727 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -682,14 +682,14 @@ void K3bJobProgressDialog::blockingInformation( const TQString& text, void K3bJobProgressDialog::slotThemeChanged() { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - TQT_TQWIDGET(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); } } diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp index 006e045..f5ae1b8 100644 --- a/src/k3bprojecttabwidget.cpp +++ b/src/k3bprojecttabwidget.cpp @@ -60,7 +60,7 @@ K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *parent, const char *name, WF tabBar()->setAcceptDrops(true); tabBar()->installEventFilter( this ); - m_projectActionMenu = new TDEActionMenu( i18n("Project"), TQT_TQOBJECT(this) ); + m_projectActionMenu = new TDEActionMenu( i18n("Project"), this ); } diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 334834c..681f12c 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -476,7 +476,7 @@ void K3bWelcomeWidget::slotMoreActions() for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] == '_' ) { - (new TDEActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); + (new TDEActionSeparator( &popup ))->plug( &popup ); } else { m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup ); diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index ea3cdff..c9baae8 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -131,7 +131,7 @@ void K3bBlankingDialog::slotStartClicked() d->debugFile.open(); if( d->job == 0 ) { - d->job = new K3bBlankingJob( this, TQT_TQOBJECT(this) ); + d->job = new K3bBlankingJob( this, this ); connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), d->debugDialog, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index ea56cb5..a38bfab 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -309,7 +309,7 @@ void K3bCdCopyDialog::slotStartClicked() return; } - K3bCloneJob* job = new K3bCloneJob( dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* job = new K3bCloneJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -325,7 +325,7 @@ void K3bCdCopyDialog::slotStartClicked() burnJob = job; } else { - K3bCdCopyJob* job = new K3bCdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bCdCopyJob* job = new K3bCdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -392,7 +392,7 @@ void K3bCdCopyDialog::toggleAll() - TQT_TQWIDGET( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); + static_cast( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); m_checkIgnoreDataReadErrors->setDisabled( m_comboCopyMode->currentItem() == 1 ); diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 6f73194..51431fe 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -126,7 +126,7 @@ K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* parent, const char* setupGui(); - d->md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); + d->md5Job = new K3bMd5Job( 0, this ); connect( d->md5Job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMd5JobFinished(bool)) ); connect( d->md5Job, TQT_SIGNAL(percent(int)), @@ -354,7 +354,7 @@ void K3bCdImageWritingDialog::slotStartClicked() switch( currentImageType() ) { case IMAGE_CDRECORD_CLONE: { - K3bCloneJob* _job = new K3bCloneJob( &dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* _job = new K3bCloneJob( &dlg, this ); _job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); _job->setImagePath( d->imageFile ); _job->setSimulate( m_checkDummy->isChecked() ); @@ -368,7 +368,7 @@ void K3bCdImageWritingDialog::slotStartClicked() case IMAGE_AUDIO_CUE: { - K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, this ); job_->setBurnDevice( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); @@ -387,7 +387,7 @@ void K3bCdImageWritingDialog::slotStartClicked() // for now the K3bBinImageWritingJob decides if it's a toc or a cue file case IMAGE_CDRDAO_TOC: { - K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, this ); job_->setWriter( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 41b2b98..8340c90 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -253,7 +253,7 @@ void K3bDvdCopyDialog::slotStartClicked() dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); } - K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index bb6a3f9..9ea269b 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -128,7 +128,7 @@ void K3bDvdFormattingDialog::slotStartClicked() K3bJobProgressDialog d( kapp->mainWidget(), "formattingProgress", false ); - K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, TQT_TQOBJECT(this) ); + K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, this ); job->setDevice( m_writerSelectionWidget->writerDevice() ); job->setMode( m_writingModeWidget->writingMode() ); job->setForce( m_checkForce->isChecked() ); diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 81f5722..c2942c7 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -102,7 +102,7 @@ K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* parent, const char m_writerSelectionWidget->setSupportedWritingApps( K3b::GROWISOFS ); m_writingModeWidget->setSupportedModes( K3b::DAO|K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR ); - m_md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); + m_md5Job = new K3bMd5Job( 0, this ); connect( m_md5Job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMd5JobFinished(bool)) ); connect( m_md5Job, TQT_SIGNAL(percent(int)), diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index a180f02..d283ebd 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -67,7 +67,7 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "edit-copy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "edit-copy" ) ); - TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + TQValidator* cdTextVal = new K3bCdTextValidator( this ); m_editTitle->setValidator( cdTextVal ); m_editPerformer->setValidator( cdTextVal ); diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 8b89b98..23d9100 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -491,7 +491,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) pix.fill( colorGroup().base() ); TQPainter pixP; - pixP.begin( &pix, TQT_TQOBJECT(this) ); + pixP.begin( &pix, this ); TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 30ff9df..5afa5c9 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -77,7 +77,7 @@ K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* parent, const ch grid->addWidget( m_busyWidget, 1, 0 ); m_analyserThread = new AnalyserThread(); - m_analyserJob = new K3bThreadJob( m_analyserThread, this, TQT_TQOBJECT(this) ); + m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalysingFinished(bool)) ); } diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 80426bb..492c2b0 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -94,11 +94,11 @@ void K3bAudioTrackSplitDialog::setupActions() m_popupMenu = new TDEPopupMenu( this ); TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), + TDEShortcut(), this, TQT_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), + TDEShortcut(), this, TQT_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 5eaf550..2cd161f 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -68,11 +68,11 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const m_currentMouseOverItem(0), m_currentlyPlayingTrack(0) { - m_player = new K3bAudioTrackPlayer( m_doc, TQT_TQOBJECT(this) ); - connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), TQT_TQOBJECT(this), + m_player = new K3bAudioTrackPlayer( m_doc, this ); + connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), this, TQT_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); - connect( m_player, TQT_SIGNAL(paused(bool)), TQT_TQOBJECT(this), TQT_SLOT(togglePauseIndicator(bool)) ); - connect( m_player, TQT_SIGNAL(stopped()), TQT_TQOBJECT(this), TQT_SLOT(removePlayerIndicator()) ); + connect( m_player, TQT_SIGNAL(paused(bool)), this, TQT_SLOT(togglePauseIndicator(bool)) ); + connect( m_player, TQT_SIGNAL(stopped()), this, TQT_SLOT(removePlayerIndicator()) ); setItemMargin( 5 ); setAcceptDrops( true ); @@ -90,13 +90,13 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const setupColumns(); setupActions(); - m_playerItemAnimator = new K3bListViewItemAnimator( TQT_TQOBJECT(this) ); + m_playerItemAnimator = new K3bListViewItemAnimator( this ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAnimation()) ); + connect( m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); m_autoOpenTrackTimer = new TQTimer( this ); - connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDragTimeout()) ); + connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragTimeout()) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); @@ -155,32 +155,32 @@ void K3bAudioTrackView::setupActions() m_popupMenu = new TDEPopupMenu( this ); m_actionProperties = new TDEAction( i18n("Properties"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEShortcut(), this, TQT_SLOT(slotProperties()), actionCollection(), "track_properties" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), + Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "track_remove" ); m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), + TDEShortcut(), this, TQT_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), + TDEShortcut(), this, TQT_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), + TDEShortcut(), this, TQT_SLOT(slotSplitSource()), actionCollection(), "source_split" ); m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), + TDEShortcut(), this, TQT_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), + TDEShortcut(), this, TQT_SLOT(slotEditSource()), actionCollection(), "source_edit" ); m_actionPlayTrack = new TDEAction( i18n("Play Track"), "media-playback-start", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), + TDEShortcut(), this, TQT_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), + TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, this, TQT_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); @@ -394,7 +394,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQL // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index 9c9860e..b285744 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -48,14 +48,14 @@ K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList& tracks // no post-gap for the last track m_editPostGap->setDisabled( tracks.count() == 1 && !tracks.getFirst()->next() ); - K3bCdTextValidator* val = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + K3bCdTextValidator* val = new K3bCdTextValidator( this ); m_editSongwriter->setValidator( val ); m_editArranger->setValidator( val ); m_editComposer->setValidator( val ); m_editMessage->setValidator( val ); m_editTitle->setValidator( val ); m_editPerformer->setValidator( val ); - m_editIsrc->setValidator( K3bValidators::isrcValidator( TQT_TQOBJECT(this) ) ); + m_editIsrc->setValidator( K3bValidators::isrcValidator( this ) ); load(); } diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index eb39b90..9e480b8 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam fillStatusDisplay()->showTime(); // add button for the audio conversion - TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), + TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, this, TQT_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index cd8af5e..6b0b7eb 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -244,7 +244,7 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget miscRoot->setOpen( true ); - m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), TQT_TQOBJECT(this) ) ); + m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), this ) ); // fill charset combo for( int i = 0; mkisofsCharacterSets[i]; i++ ) { diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index f7ca4ae..cf9a9f4 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -89,11 +89,11 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget m_root = new K3bDataRootViewItem( doc, this ); m_itemMap.insert( doc->root(), m_root ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotDocChanged()) ); + connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), this, TQT_SLOT(slotItemAdded(K3bDataItem*)) ); connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), @@ -207,7 +207,7 @@ void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListVie // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } } @@ -280,24 +280,24 @@ void K3bDataDirTreeView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } @@ -393,7 +393,7 @@ void K3bDataDirTreeView::startDropAnimation( K3bDirItem* dir ) d->animationCounter = 0; d->animatedDirItem = vI; d->beforeAniPixmap = TQPixmap( *vI->pixmap(0) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotDropAnimate()) ); } } @@ -426,7 +426,7 @@ void K3bDataDirTreeView::slotDropAnimate() } d->animationCounter++; - TQTimer::singleShot( 300, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 300, this, TQT_SLOT(slotDropAnimate()) ); } } } diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 634e26b..7fb8588 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -79,10 +79,10 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView m_currentDir = doc->root(); checkForNewItems(); - connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), this, TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), this, TQT_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*)) ); connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), @@ -289,7 +289,7 @@ void K3bDataFileView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewIt // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); } } } @@ -319,32 +319,32 @@ void K3bDataFileView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, this, TQT_SLOT(slotParentDir()), actionCollection(), "parent_dir" ); - m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), + m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, this, TQT_SLOT(slotOpen()), actionCollection(), "open" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 970d607..fdf4faa 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -167,7 +167,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge sortingBoxGrid->setSpacing( spacingHint() ); sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); - m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); + m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, m_editSortWeight ) ); m_editSortWeight->setAlignment( TQt::AlignRight ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); @@ -222,7 +222,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge "It sorts the order in which the file data is " "written to the image.") ); - m_editName->setValidator( K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ) ); + m_editName->setValidator( K3bValidators::iso9660Validator( false, this ) ); m_editName->setReadOnly( !dataItem->isRenameable() ); m_editName->setFocus(); } diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index df5c1aa..b637b89 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -91,7 +91,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren grid->addWidget( m_infoLabel, 0, 0 ); grid->addMultiCellWidget( m_progressWidget, 1, 1, 0, 1 ); - m_dirSizeJob = new K3bDirSizeJob( TQT_TQOBJECT(this) ); + m_dirSizeJob = new K3bDirSizeJob( this ); connect( m_dirSizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDirSizeDone(bool)) ); @@ -745,7 +745,7 @@ bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* di { bool ok = true; newName = oldName; - TQValidator* validator = K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ); + TQValidator* validator = K3bValidators::iso9660Validator( false, this ); do { newName = KInputDialog::getText( i18n("Enter New Filename"), i18n("A file with that name already exists. Please enter a new name:"), diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index e42a966..dcdfe8b 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -68,19 +68,19 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotDocChanged()) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); // the data actions - TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), + TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, this, TQT_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), + TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, this, TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, TQT_TQOBJECT(this), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, this, TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); @@ -100,7 +100,7 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) toolBox()->addStretch(); m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); - m_volumeIDEdit->setValidator( new K3bLatin1Validator( TQT_TQOBJECT(m_volumeIDEdit) ) ); + m_volumeIDEdit->setValidator( new K3bLatin1Validator( m_volumeIDEdit ) ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index 580fed6..9a55d0d 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -29,7 +29,7 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* { // the maximal number of characters that can be inserted are set in the ui file! - TQValidator* isoValidator = new K3bLatin1Validator( TQT_TQOBJECT(this) ); + TQValidator* isoValidator = new K3bLatin1Validator( this ); m_editVolumeName->setValidator( isoValidator ); m_editVolumeSetName->setValidator( isoValidator ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index a6efede..8ae7ee1 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -129,7 +129,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) TQPixmap buffer( size() ); buffer.fill( colorGroup().base() ); TQPainter p; - p.begin( &buffer, TQT_TQOBJECT(this) ); + p.begin( &buffer, this ); p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) long long docSize; @@ -344,7 +344,7 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const // d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") ); // d->buttonMenu->setAutoRaise(true); // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); -// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); +// connect( d->buttonMenu, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMenuButtonClicked()) ); TQGridLayout* layout = new TQGridLayout( this ); layout->setSpacing(5); @@ -357,8 +357,8 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const showDvdSizes( false ); - connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) ); + connect( d->doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotDocChanged()) ); + connect( &d->updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateDisplay()) ); connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } @@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu() d->popup = new TDEPopupMenu( this, "popup" ); d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), + d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, this, TQT_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), + d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, this, TQT_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), + d->actionAuto = new TDERadioAction( i18n("Auto"), 0, this, TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, this, TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, this, TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, this, TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), + 0, this, TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); - d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), + d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, TQT_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), + this, TQT_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); @@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionDetermineSize->setExclusiveGroup( "cd_size" ); d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), + this, TQT_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), + this, TQT_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), + this, TQT_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); d->popup->insertTitle( i18n("Show Size In") ); @@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionLoadUserDefaults->plug( d->dvdPopup ); d->actionSaveUserDefaults->plug( d->dvdPopup ); - connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) ); + connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), this, TQT_SLOT(slotPopupMenu(const TQPoint&)) ); } @@ -551,7 +551,7 @@ void K3bFillStatusDisplay::slotCustomSize() d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) : (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, - new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); + new TQRegExpValidator( rx, this ) ); if( ok ) { // determine size if( rx.exactMatch( size ) ) { diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 959c3d7..ebc6fe4 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -51,16 +51,16 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name // setup actions m_actionProperties = new TDEAction( i18n("Properties"), "misc", - 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), + 0, this, TQT_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), + Key_Delete, this, TQT_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "edit-delete", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), + 0, this, TQT_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), + 0, this, TQT_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); m_popupMenu = new TDEPopupMenu( this ); @@ -85,7 +85,7 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name m_doc, TQT_SLOT(setVolumeID(const TQString&)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotDocChanged()) ); } diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 0a6ca8d..76229cf 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -154,7 +154,7 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() // cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(parent), name ), + : K3bJob( new K3bSimpleJobHandler( 0 ), parent, name ), m_canceled( false ) { m_trmThread = new TRMThread(); diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index beb94ff..5dcef2f 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -511,13 +511,13 @@ void K3bVcdBurnDialog::setupLabelTab() m_editPublisher = new TQLineEdit( w, "m_editPublisher" ); // only ISO646 d-Characters - m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); - m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); + m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); m_editVolumeId->setMaxLength( 32 ); m_editAlbumId->setMaxLength( 16 ); // only ISO646 a-Characters - m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, m_editVolumeId ) ); m_editPublisher->setMaxLength( 128 ); m_spinVolumeNumber->setMinValue( 1 ); diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 289e858..84d2938 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -67,8 +67,8 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( showPropertiesDialog() ) ); - connect( m_doc, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateItems() ) ); - connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); + connect( m_doc, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotUpdateItems() ) ); + connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); slotUpdateItems(); } @@ -94,8 +94,8 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, this, TQT_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, this, TQT_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index 717aa7f..8e1ea1a 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), + TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, this, TQT_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, this, TQT_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -139,7 +139,7 @@ void K3bView::addPluginButtons( int projectType ) pp->icon(), pp->toolTip(), pp->whatsThis(), - TQT_TQOBJECT(this), + this, TQT_SLOT(slotPluginButtonClicked()) ); m_plugins.insert( static_cast(button), pp ); } diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index abe5224..52c0f67 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -130,7 +130,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name ) mainGrid->addWidget( m_trackView, 1, 0 ); - m_cddb = new K3bCddb( TQT_TQOBJECT(this) ); + m_cddb = new K3bCddb( this ); connect( m_cddb, TQT_SIGNAL(queryFinished(int)), this, TQT_SLOT(slotCddbQueryFinished(int)) ); @@ -226,32 +226,32 @@ void K3bAudioCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, TQT_SLOT(slotSelect()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, TQT_SLOT(slotDeselect()), actionCollection(), "deselect_track" ); - TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, this, TQT_SLOT(slotEditTrackCddb()), actionCollection(), "edit_track_cddb" ); - TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, this, TQT_SLOT(slotEditAlbumCddb()), actionCollection(), "edit_album_cddb" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, this, TQT_SLOT(startRip()), actionCollection(), "start_rip" ); - TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), + TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, this, TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); - TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, TQT_TQOBJECT(this), + TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, this, TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); // TODO: set the actions tooltips and whatsthis infos diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index f386b80..010e50e 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -196,7 +196,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() K3bJobProgressDialog progressDialog( parentWidget() ); - K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) ); + K3bThreadJob job( thread, &progressDialog, this ); hide(); progressDialog.startJob(&job); diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 335a757..88d7060 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -257,7 +257,7 @@ void K3bAudioRippingDialog::slotStartClicked() K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" ); K3bAudioEncoder* encoder = m_optionWidget->encoder(); - K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) ); + K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, this ); job->setDevice( m_device ); job->setCddbEntry( m_cddbEntry ); job->setTracksToRip( tracksToRip ); diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index 2c8e533..d7d8546 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -41,7 +41,7 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) // additional the filename can never contain a slash / // and the dir should never start with a slash since it should always be a relative path - TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), TQT_TQOBJECT(this) ); + TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), this ); m_comboFilenamePattern->setValidator( dirValidator ); m_comboPlaylistPattern->setValidator( dirValidator ); m_editBlankReplace->setValidator( dirValidator ); diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index 52549e6..4e54196 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -248,7 +248,7 @@ void K3bVideoCdView::reloadMedium() m_videooptions ->setVideoCdSource( device()->devicename() ); - m_videocdinfo = new K3bVideoCdInfo( TQT_TQOBJECT(this) ); + m_videocdinfo = new K3bVideoCdInfo( this ); m_videocdinfo->info( device()->devicename() ); connect( m_videocdinfo, TQT_SIGNAL( infoFinished( bool ) ), @@ -322,19 +322,19 @@ void K3bVideoCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), m_actionCollection, "select_all" ); - TDEAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), + TDEAction* actionDeselectAll = KStdAction::deselect( this, TQT_SLOT( slotDeselectAll() ), m_actionCollection, "deselect_all" ); actionDeselectAll->setText( i18n( "Dese&lect All" ) ); - TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, this, TQT_SLOT( slotSelect() ), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, this, TQT_SLOT( slotDeselect() ), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, this, TQT_SLOT( startRip() ), actionCollection(), "start_rip" ); // TODO: set the actions tooltips and whatsthis infos diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 1025f30..6455dd8 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -612,7 +612,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() // start the job K3bJobProgressDialog dlg( parentWidget() ); - K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, TQT_TQOBJECT(&dlg) ); + K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); job->setVideoDVD( m_dvd ); job->setTitles( titles ); diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index b0106a3..0ab09d4 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -352,7 +352,7 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* pare m_toolTip = new TitleToolTip( this ); - m_previewGen = new K3bVideoDVDRippingPreview( TQT_TQOBJECT(this) ); + m_previewGen = new K3bVideoDVDRippingPreview( this ); connect( m_previewGen, TQT_SIGNAL(previewDone(bool)), this, TQT_SLOT(slotPreviewDone(bool)) ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index c524fa6..7f97e9b 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -218,19 +218,19 @@ void K3bVideoDVDRippingView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, TQT_SLOT(slotCheck()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, TQT_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, this, TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") );