TDE
/
soundkonverter
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/16/head
Michele Calgaro 5 months ago
parent 530df12196
commit 3233612280
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File

36
src/filelist.cpp
Unescape View File

@ -160,25 +160,25 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi
grid->setColStretch( 1, 2 ); grid->setColStretch( 1, 2 );
contextMenu = new TDEPopupMenu( this ); contextMenu = new TDEPopupMenu( this );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
TQT_TQOBJECT(this), TQT_SLOT(showContextMenu( TQListViewItem*, const TQPoint&, int )) this, TQT_SLOT(showContextMenu( TQListViewItem*, const TQPoint&, int ))
); );
// we haven't got access to the action collection of soundKonverter, so let's create a new one // we haven't got access to the action collection of soundKonverter, so let's create a new one
actionCollection = new TDEActionCollection( this ); actionCollection = new TDEActionCollection( this );
edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" ); edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, this, TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" );
start = new TDEAction( i18n("Start conversion"), "system-run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" ); start = new TDEAction( i18n("Start conversion"), "system-run", 0, this, TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" ); stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, this, TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" ); remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
paste = new TDEAction( i18n("Paste"), "edit-paste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" ); // TODO paste paste = new TDEAction( i18n("Paste"), "edit-paste", 0, this, 0, actionCollection, "paste" ); // TODO paste
connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged()), connect( this, TQT_SIGNAL(selectionChanged()),
TQT_TQOBJECT(this), TQT_SLOT(itemsSelected()) this, TQT_SLOT(itemsSelected())
); );
// connect( TQT_TQOBJECT(this), TQT_SIGNAL(clicked(TQListViewItem*,const TQPoint&,int)), // connect( this, TQT_SIGNAL(clicked(TQListViewItem*,const TQPoint&,int)),
// TQT_TQOBJECT(this), TQT_SLOT(clickedSomewhere(TQListViewItem*,const TQPoint&,int)) // this, TQT_SLOT(clickedSomewhere(TQListViewItem*,const TQPoint&,int))
// ); // );
bubble = new TQSimpleRichText( i18n( "<div align=center>" bubble = new TQSimpleRichText( i18n( "<div align=center>"
@ -191,7 +191,7 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi
connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), connect( header(), TQT_SIGNAL(sizeChange( int, int, int )),
TQT_SLOT(columnResizeEvent( int, int, int )) TQT_SLOT(columnResizeEvent( int, int, int ))
); );
connect( TQT_TQOBJECT(this), TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )
); );
@ -764,22 +764,22 @@ void FileList::showOptionsEditorDialog()
return; return;
} }
// } // }
connect( TQT_TQOBJECT(this), TQT_SIGNAL(editItems(TQValueList<FileListItem*>)), connect( this, TQT_SIGNAL(editItems(TQValueList<FileListItem*>)),
optionsEditor, TQT_SLOT(itemsSelected(TQValueList<FileListItem*>)) optionsEditor, TQT_SLOT(itemsSelected(TQValueList<FileListItem*>))
); );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(setPreviousItemEnabled(bool)), connect( this, TQT_SIGNAL(setPreviousItemEnabled(bool)),
optionsEditor, TQT_SLOT(setPreviousEnabled(bool)) optionsEditor, TQT_SLOT(setPreviousEnabled(bool))
); );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(setNextItemEnabled(bool)), connect( this, TQT_SIGNAL(setNextItemEnabled(bool)),
optionsEditor, TQT_SLOT(setNextEnabled(bool)) optionsEditor, TQT_SLOT(setNextEnabled(bool))
); );
connect( optionsEditor, TQT_SIGNAL(user2Clicked()), connect( optionsEditor, TQT_SIGNAL(user2Clicked()),
TQT_TQOBJECT(this), TQT_SLOT(selectPreviousItem()) this, TQT_SLOT(selectPreviousItem())
); );
connect( optionsEditor, TQT_SIGNAL(user1Clicked()), connect( optionsEditor, TQT_SIGNAL(user1Clicked()),
TQT_TQOBJECT(this), TQT_SLOT(selectNextItem()) this, TQT_SLOT(selectNextItem())
); );
/*connect( TQT_TQOBJECT(this), TQT_SIGNAL(moveEditor(int,int)), /*connect( this, TQT_SIGNAL(moveEditor(int,int)),
optionsEditor, TQT_SLOT(moveWindow(int,int)) optionsEditor, TQT_SLOT(moveWindow(int,int))
);*/ );*/
} }

28
src/replaygainfilelist.cpp
Unescape View File

@ -203,20 +203,20 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
grid->setColStretch( 1, 2 ); grid->setColStretch( 1, 2 );
contextMenu = new TDEPopupMenu( this ); contextMenu = new TDEPopupMenu( this );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
TQT_TQOBJECT(this), TQT_SLOT(showContextMenu(TQListViewItem*,const TQPoint&,int)) this, TQT_SLOT(showContextMenu(TQListViewItem*,const TQPoint&,int))
); );
// we haven't got access to the action collection of soundKonverter, so let's create a new one // we haven't got access to the action collection of soundKonverter, so let's create a new one
actionCollection = new TDEActionCollection( this ); actionCollection = new TDEActionCollection( this );
calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" ); calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, this, TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" );
remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" ); remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, this, TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" );
remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" ); remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, this, TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
paste = new TDEAction( i18n("Paste"), "edit-paste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" ); paste = new TDEAction( i18n("Paste"), "edit-paste", 0, this, 0, actionCollection, "paste" );
newalbum = new TDEAction( i18n("New album"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" ); newalbum = new TDEAction( i18n("New album"), "document-new", 0, this, TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" );
open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, TQT_TQOBJECT(this), TQT_SLOT(openAlbums()), actionCollection, "open_albums" ); open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, this, TQT_SLOT(openAlbums()), actionCollection, "open_albums" );
close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(closeAlbums()), actionCollection, "close_albums" ); close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, this, TQT_SLOT(closeAlbums()), actionCollection, "close_albums" );
replayGain = new ReplayGain( config, logger ); replayGain = new ReplayGain( config, logger );
@ -232,24 +232,24 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), connect( header(), TQT_SIGNAL(sizeChange( int, int, int )),
TQT_SLOT(columnResizeEvent( int, int, int )) TQT_SLOT(columnResizeEvent( int, int, int ))
); );
connect( TQT_TQOBJECT(this), TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), connect( this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ) TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )
); );
process = new TDEProcess(); process = new TDEProcess();
connect( process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), connect( process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
TQT_TQOBJECT(this), TQT_SLOT(processOutput(TDEProcess*,char*,int)) this, TQT_SLOT(processOutput(TDEProcess*,char*,int))
); );
connect( process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), connect( process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
TQT_TQOBJECT(this), TQT_SLOT(processOutput(TDEProcess*,char*,int)) this, TQT_SLOT(processOutput(TDEProcess*,char*,int))
); );
connect( process, TQT_SIGNAL(processExited(TDEProcess*)), connect( process, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_TQOBJECT(this), TQT_SLOT(processExit(TDEProcess*)) this, TQT_SLOT(processExit(TDEProcess*))
); );
tUpdateProgress = new TQTimer( this, "tUpdateProgress" ); tUpdateProgress = new TQTimer( this, "tUpdateProgress" );
connect( tUpdateProgress, TQT_SIGNAL(timeout()), connect( tUpdateProgress, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(this), TQT_SLOT(update()) this, TQT_SLOT(update())
); );
} }

110
src/soundkonverter.cpp
Unescape View File

@ -113,17 +113,17 @@ soundKonverter::soundKonverter()
options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), widget, "options" ); options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), widget, "options" );
fileList = new FileList( cdManager, tagEngine, config, options, logger, widget, "fileList" ); fileList = new FileList( cdManager, tagEngine, config, options, logger, widget, "fileList" );
startAction = new TDEAction( i18n("&Start conversion"), "system-run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" ); startAction = new TDEAction( i18n("&Start conversion"), "system-run", 0, fileList, TQT_SLOT(startConversion()), actionCollection(), "start" );
startAction->setEnabled( false ); startAction->setEnabled( false );
new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" ); new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, this, TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" );
//new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" ); //new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, this, TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" );
new TDEAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" ); new TDEAction( i18n("C&uesheet Editor ..."), "kwrite", CTRL+Key_U, this, TQT_SLOT(showCuesheetEditor()), actionCollection(), "cuesheeteditor" );
new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showLogViewer()), actionCollection(), "log" ); new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, this, TQT_SLOT(showLogViewer()), actionCollection(), "log" );
// new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" ); // new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, this, TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" );
stopAction = new TDEAction( i18n("S&top after current file is complete"), "process-stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" ); stopAction = new TDEAction( i18n("S&top after current file is complete"), "process-stop", CTRL+Key_O, fileList, TQT_SLOT(stopConversion()), actionCollection(), "stop" );
continueAction = new TDEAction( i18n("&Continue after current file is complete"), "system-run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" ); continueAction = new TDEAction( i18n("&Continue after current file is complete"), "system-run", CTRL+Key_T, fileList, TQT_SLOT(continueConversion()), actionCollection(), "continue" );
killAction = new TDEAction( i18n("Stop &immediately"), "system-log-out", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" ); killAction = new TDEAction( i18n("Stop &immediately"), "system-log-out", CTRL+Key_K, fileList, TQT_SLOT(killConversion()), actionCollection(), "kill" );
stopActionMenu = new TDEActionMenu( i18n("Stop"), "process-stop", actionCollection(), "stopMenu" ); stopActionMenu = new TDEActionMenu( i18n("Stop"), "process-stop", actionCollection(), "stopMenu" );
stopActionMenu->setDelayed( false ); stopActionMenu->setDelayed( false );
stopActionMenu->setEnabled( false ); stopActionMenu->setEnabled( false );
@ -131,16 +131,16 @@ soundKonverter::soundKonverter()
// stopActionMenu->insert( continueAction ); // stopActionMenu->insert( continueAction );
// stopActionMenu->insert( killAction ); // stopActionMenu->insert( killAction );
/* veryHighPriorityAction = new TDEToggleAction( i18n("Very hi&gh"), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" ); /* veryHighPriorityAction = new TDEToggleAction( i18n("Very hi&gh"), CTRL+Key_1, this, TQT_SLOT(priorityChanged()), actionCollection(), "veryhigh" );
veryHighPriorityAction->setExclusiveGroup("priorityActionMenu"); veryHighPriorityAction->setExclusiveGroup("priorityActionMenu");
highPriorityAction = new TDEToggleAction( i18n("&High"), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "high" ); highPriorityAction = new TDEToggleAction( i18n("&High"), CTRL+Key_2, this, TQT_SLOT(priorityChanged()), actionCollection(), "high" );
highPriorityAction->setExclusiveGroup("priorityActionMenu"); highPriorityAction->setExclusiveGroup("priorityActionMenu");
normalPriorityAction = new TDEToggleAction( i18n("&Normal"), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "nomal" ); normalPriorityAction = new TDEToggleAction( i18n("&Normal"), CTRL+Key_3, this, TQT_SLOT(priorityChanged()), actionCollection(), "nomal" );
normalPriorityAction->setExclusiveGroup("priorityActionMenu"); normalPriorityAction->setExclusiveGroup("priorityActionMenu");
normalPriorityAction->setChecked(true); normalPriorityAction->setChecked(true);
lowPriorityAction = new TDEToggleAction( i18n("&Low"), CTRL+Key_4, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "low" ); lowPriorityAction = new TDEToggleAction( i18n("&Low"), CTRL+Key_4, this, TQT_SLOT(priorityChanged()), actionCollection(), "low" );
lowPriorityAction->setExclusiveGroup("priorityActionMenu"); lowPriorityAction->setExclusiveGroup("priorityActionMenu");
veryLowPriorityAction = new TDEToggleAction( i18n("Very lo&w"), CTRL+Key_5, TQT_TQOBJECT(this), TQT_SLOT(priorityChanged()), actionCollection(), "verylow" ); veryLowPriorityAction = new TDEToggleAction( i18n("Very lo&w"), CTRL+Key_5, this, TQT_SLOT(priorityChanged()), actionCollection(), "verylow" );
veryLowPriorityAction->setExclusiveGroup("priorityActionMenu"); veryLowPriorityAction->setExclusiveGroup("priorityActionMenu");
priorityActionMenu = new TDEActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" ); priorityActionMenu = new TDEActionMenu( i18n("En-/Decoder priority"), "ksysguard", actionCollection(), "priorityMenu" );
priorityActionMenu->setDelayed( false ); priorityActionMenu->setDelayed( false );
@ -151,22 +151,22 @@ soundKonverter::soundKonverter()
priorityActionMenu->insert(veryLowPriorityAction);*/ priorityActionMenu->insert(veryLowPriorityAction);*/
//priorityChanged(); //priorityChanged();
new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" ); new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, this, TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" ); new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, this, TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
new TDEAction( i18n("Add CD &tracks ..."), "media-optical-cdaudio-unmounted", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); new TDEAction( i18n("Add CD &tracks ..."), "media-optical-cdaudio-unmounted", CTRL+Key_T, this, TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" );
new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" ); new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, this, TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
new TDEAction( i18n("L&oad file list"), "document-open", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" ); new TDEAction( i18n("L&oad file list"), "document-open", 0, fileList, TQT_SLOT(load()), actionCollection(), "load" );
new TDEAction( i18n("Sa&ve file list"), "document-save", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" ); new TDEAction( i18n("Sa&ve file list"), "document-save", 0, fileList, TQT_SLOT(save()), actionCollection(), "save" );
// TODO //KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteFiles()), actionCollection() ); // TODO //KStdAction::paste( this, TQT_SLOT(pasteFiles()), actionCollection() );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() ); KStdAction::preferences( this, TQT_SLOT(showConfigDialog()), actionCollection() );
showToolBarAction = KStdAction::showToolbar( TQT_TQOBJECT(this), TQT_SLOT(showToolbar()), actionCollection() ); showToolBarAction = KStdAction::showToolbar( this, TQT_SLOT(showToolbar()), actionCollection() );
//KStdAction::showStatusbar( 0, 0, actionCollection() ); //KStdAction::showStatusbar( 0, 0, actionCollection() );
KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(editToolbar()), actionCollection() ); KStdAction::configureToolbars( this, TQT_SLOT(editToolbar()), actionCollection() );
createGUI(); createGUI();
@ -186,10 +186,10 @@ soundKonverter::soundKonverter()
// NOTE created above because of some dependences // NOTE created above because of some dependences
//options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), this, "options" ); //options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), this, "options" );
connect( options, TQT_SIGNAL(showConfigPluginsPage()), connect( options, TQT_SIGNAL(showConfigPluginsPage()),
TQT_TQOBJECT(this), TQT_SLOT(showConfigPluginsPage()) this, TQT_SLOT(showConfigPluginsPage())
); );
connect( options, TQT_SIGNAL(showConfigEnvironmentPage()), connect( options, TQT_SIGNAL(showConfigEnvironmentPage()),
TQT_TQOBJECT(this), TQT_SLOT(showConfigEnvironmentPage()) this, TQT_SLOT(showConfigEnvironmentPage())
); );
gridLayout->addWidget( options, 0, 0 ); gridLayout->addWidget( options, 0, 0 );
@ -198,27 +198,27 @@ soundKonverter::soundKonverter()
//fileList = new FileList( cdManager, tagEngine, config, options, this, "fileList" ); //fileList = new FileList( cdManager, tagEngine, config, options, this, "fileList" );
gridLayout->addWidget( fileList, 1, 0 ); gridLayout->addWidget( fileList, 1, 0 );
gridLayout->setRowStretch( 1, 1 ); gridLayout->setRowStretch( 1, 1 );
/*connect( TQT_TQOBJECT(this), TQT_SIGNAL(windowMoved(int,int)), /*connect( this, TQT_SIGNAL(windowMoved(int,int)),
TQT_TQOBJECT(fileList), TQT_SLOT(moveOptionsEditor(int,int)) fileList, TQT_SLOT(moveOptionsEditor(int,int))
);*/ );*/
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(fileCountChanged(int)), connect( fileList, TQT_SIGNAL(fileCountChanged(int)),
TQT_TQOBJECT(this), TQT_SLOT(fileCountChanged(int)) this, TQT_SLOT(fileCountChanged(int))
); );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(startedConversion()), connect( fileList, TQT_SIGNAL(startedConversion()),
TQT_TQOBJECT(this), TQT_SLOT(startedConversion()) this, TQT_SLOT(startedConversion())
); );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(stopClicked()), connect( fileList, TQT_SIGNAL(stopClicked()),
TQT_TQOBJECT(this), TQT_SLOT(stopClicked()) this, TQT_SLOT(stopClicked())
); );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(continueClicked()), connect( fileList, TQT_SIGNAL(continueClicked()),
TQT_TQOBJECT(this), TQT_SLOT(continueClicked()) this, TQT_SLOT(continueClicked())
); );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(stoppedConversion()), connect( fileList, TQT_SIGNAL(stoppedConversion()),
TQT_TQOBJECT(this), TQT_SLOT(stoppedConversion()) this, TQT_SLOT(stoppedConversion())
); );
convert = new Convert( config, tagEngine, cdManager, fileList, logger ); convert = new Convert( config, tagEngine, cdManager, fileList, logger );
// connect( TQT_TQOBJECT(this), TQT_SIGNAL(setPriority(int)), // connect( this, TQT_SIGNAL(setPriority(int)),
// convert, TQT_SLOT(priorityChanged(int)) // convert, TQT_SLOT(priorityChanged(int))
// ); // );
@ -238,7 +238,7 @@ soundKonverter::soundKonverter()
cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") ); cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") );
addBox->addWidget( cAdd ); addBox->addWidget( cAdd );
connect( cAdd, TQT_SIGNAL(clicked(int)), connect( cAdd, TQT_SIGNAL(clicked(int)),
TQT_TQOBJECT(this), TQT_SLOT(addClicked(int)) this, TQT_SLOT(addClicked(int))
); );
addBox->addSpacing( 18 ); addBox->addSpacing( 18 );
@ -248,7 +248,7 @@ soundKonverter::soundKonverter()
pStart->setEnabled( false ); pStart->setEnabled( false );
addBox->addWidget( pStart ); addBox->addWidget( pStart );
connect( pStart, TQT_SIGNAL(clicked()), connect( pStart, TQT_SIGNAL(clicked()),
TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()) fileList, TQT_SLOT(startConversion())
); );
pStop = new KPushButton( iconLoader->loadIcon("process-stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" ); pStop = new KPushButton( iconLoader->loadIcon("process-stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" );
@ -261,16 +261,16 @@ soundKonverter::soundKonverter()
progressIndicator = new ProgressIndicator( systemTray, widget, "progressIndicator" ); progressIndicator = new ProgressIndicator( systemTray, widget, "progressIndicator" );
addBox->addWidget( progressIndicator ); addBox->addWidget( progressIndicator );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(increaseTime(float)), connect( fileList, TQT_SIGNAL(increaseTime(float)),
progressIndicator, TQT_SLOT(increaseTime(float)) progressIndicator, TQT_SLOT(increaseTime(float))
); );
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(decreaseTime(float)), connect( fileList, TQT_SIGNAL(decreaseTime(float)),
progressIndicator, TQT_SLOT(decreaseTime(float)) progressIndicator, TQT_SLOT(decreaseTime(float))
); );
/*connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(setTime(float)), /*connect( fileList, TQT_SIGNAL(setTime(float)),
progressIndicator, TQT_SLOT(setTime(float)) progressIndicator, TQT_SLOT(setTime(float))
);*/ );*/
connect( TQT_TQOBJECT(fileList), TQT_SIGNAL(finished(float)), connect( fileList, TQT_SIGNAL(finished(float)),
progressIndicator, TQT_SLOT(finished(float)) progressIndicator, TQT_SLOT(finished(float))
); );
connect( convert, TQT_SIGNAL(countTime(float)), connect( convert, TQT_SIGNAL(countTime(float)),
@ -283,7 +283,7 @@ soundKonverter::soundKonverter()
progressIndicator, TQT_SLOT(update(float)) progressIndicator, TQT_SLOT(update(float))
); );
connect( progressIndicator, TQT_SIGNAL(setTitle(const TQString&)), connect( progressIndicator, TQT_SIGNAL(setTitle(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(setTitle(const TQString&)) this, TQT_SLOT(setTitle(const TQString&))
); );
cAdd->increaseHeight( /*progressIndicator->height() - cAdd->height()*/ 10 ); // FIXME detect the height automaticly cAdd->increaseHeight( /*progressIndicator->height() - cAdd->height()*/ 10 ); // FIXME detect the height automaticly
@ -344,7 +344,7 @@ void soundKonverter::openArgFiles( const TQStringList &files )
options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) options, TQT_SLOT(setCurrentOptions(const ConversionOptions&))
); );
connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), connect( dialog, TQT_SIGNAL(addFiles(TQStringList)),
TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) fileList, TQT_SLOT(addFiles(TQStringList))
); );
TQ_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
@ -532,7 +532,7 @@ void soundKonverter::showCdDialog( bool intern )
options, TQT_SLOT(setCurrentOptions(const ConversionOptions&)) options, TQT_SLOT(setCurrentOptions(const ConversionOptions&))
); );
// connect( dialog, TQT_SIGNAL(addFiles(TQStringList)), // connect( dialog, TQT_SIGNAL(addFiles(TQStringList)),
// TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) // fileList, TQT_SLOT(addFiles(TQStringList))
// ); // );
TQ_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
@ -595,13 +595,13 @@ void soundKonverter::showCdDialog( bool intern )
if( !dialog->noCD ) if( !dialog->noCD )
{ {
connect( dialog, TQT_SIGNAL(addTracks(const TQString&,TQValueList<int>)), connect( dialog, TQT_SIGNAL(addTracks(const TQString&,TQValueList<int>)),
TQT_TQOBJECT(fileList), TQT_SLOT(addTracks(const TQString&,TQValueList<int>)) fileList, TQT_SLOT(addTracks(const TQString&,TQValueList<int>))
); );
connect( dialog, TQT_SIGNAL(addDisc(const TQString&)), connect( dialog, TQT_SIGNAL(addDisc(const TQString&)),
TQT_TQOBJECT(fileList), TQT_SLOT(addDisc(const TQString&)) fileList, TQT_SLOT(addDisc(const TQString&))
); );
/*connect( dialog, TQT_SIGNAL(openCuesheetEditor(const TQString&)), /*connect( dialog, TQT_SIGNAL(openCuesheetEditor(const TQString&)),
TQT_TQOBJECT(this), TQT_SLOT(openCuesheetEditor(const TQString&)) this, TQT_SLOT(openCuesheetEditor(const TQString&))
);*/ );*/
dialog->exec(); dialog->exec();
@ -639,7 +639,7 @@ void soundKonverter::showReplayGainScanner()
// TODO error message // TODO error message
return; return;
} }
// connect( TQT_TQOBJECT(this), TQT_SIGNAL(addFilesToReplayGainScanner(TQStringList)), // connect( this, TQT_SIGNAL(addFilesToReplayGainScanner(TQStringList)),
// replayGainScanner, TQT_SLOT(addFiles(TQStringList)) // replayGainScanner, TQT_SLOT(addFiles(TQStringList))
// ); // );
} }
@ -748,7 +748,7 @@ void soundKonverter::editToolbar()
saveMainWindowSettings( kapp->config(), "MainWindow" ); saveMainWindowSettings( kapp->config(), "MainWindow" );
KEditToolbar dlg( actionCollection() ); KEditToolbar dlg( actionCollection() );
connect( &dlg, TQT_SIGNAL(newToolbarConfig()), connect( &dlg, TQT_SIGNAL(newToolbarConfig()),
TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()) this, TQT_SLOT(newToolbarConfig())
); );
dlg.exec(); dlg.exec();
} }

Write Preview
Loading…
Cancel
Save