From 698b4759335411886a449e2e15ca98e7f6453ef8 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 24 May 2016 13:13:26 -0400 Subject: [PATCH] 2016-05-24 Fred Gleason * Removed all CVS tags. * Removed 'const char *name' parameter from all QObject contructors. --- ChangeLog | 3 + Makefile.am | 4 +- acinclude.m4 | 4 +- autogen.sh | 4 +- cae/Makefile.am | 4 +- cae/cae.cpp | 2 +- cae/cae_hpi.cpp | 6 +- cae/cae_socket.cpp | 4 +- cae/cae_socket.h | 4 +- conf/rd-bin.conf.in | 4 +- debian/Makefile.am | 5 +- debian/patches/Makefile.am | 5 +- docs/examples/Makefile.am | 5 +- get_distro.sh | 4 +- get_target.sh | 4 +- helpers/Makefile.am | 5 +- helpers/cwrap.cpp | 5 +- helpers/cwrap.h | 5 +- helpers/rdpack.sh | 5 +- helpers/rdtrans.sh | 5 +- helpers/rdtransgui.sh | 5 +- helpers/setenvvar.sh | 5 +- icons/Makefile.am | 5 +- importers/Makefile.am | 5 +- importers/export_slax | 5 +- importers/nexgen_filter.cpp | 8 +- importers/nexgen_filter.h | 4 +- importers/panel_copy.cpp | 9 +- importers/panel_copy.h | 7 +- importers/rdcatch_copy.cpp | 11 +- importers/rdcatch_copy.h | 7 +- importers/rivendell_filter.cpp | 9 +- importers/rivendell_filter.h | 5 +- importers/sas_filter.cpp | 11 +- importers/sas_filter.h | 5 +- importers/wings_filter.cpp | 9 +- importers/wings_filter.h | 5 +- install-init.sh | 4 +- ios/Makefile.am | 4 +- ios/rmlsend/Classes/Makefile.am | 4 +- ios/rmlsend/Classes/RMLSendAppDelegate.h | 4 +- ios/rmlsend/Classes/RMLSendAppDelegate.m | 4 +- ios/rmlsend/Classes/RMLSendViewController.h | 4 +- ios/rmlsend/Classes/RMLSendViewController.m | 4 +- ios/rmlsend/Classes/TextFieldDelegate.h | 4 +- ios/rmlsend/Classes/TextFieldDelegate.m | 4 +- ios/rmlsend/Makefile.am | 4 +- ios/rmlsend/RMLSend.xcodeproj/Makefile.am | 4 +- ios/rmlsend/RMLSend_Prefix.pch | 4 +- ios/rmlsend/main.m | 4 +- lib/export_bmiemr.cpp | 4 +- lib/export_deltaflex.cpp | 4 +- lib/export_musicclassical.cpp | 4 +- lib/export_musicplayout.cpp | 4 +- lib/export_musicsummary.cpp | 4 +- lib/export_nprsoundex.cpp | 4 +- lib/export_radiotraffic.cpp | 4 +- lib/export_soundex.cpp | 4 +- lib/export_technical.cpp | 4 +- lib/export_textlog.cpp | 4 +- lib/gpio.h | 4 +- lib/html_gpl2_win32.cpp | 4 +- lib/rd.h | 4 +- lib/rdadd_cart.cpp | 8 +- lib/rdadd_cart.h | 7 +- lib/rdadd_log.cpp | 9 +- lib/rdadd_log.h | 7 +- lib/rdairplay_conf.cpp | 4 +- lib/rdairplay_conf.h | 4 +- lib/rdaudio_exists.cpp | 4 +- lib/rdaudio_exists.h | 6 +- lib/rdaudio_port.cpp | 4 +- lib/rdaudio_port.h | 4 +- lib/rdaudioconvert.cpp | 5 +- lib/rdaudioconvert.h | 3 +- lib/rdaudioexport.cpp | 8 +- lib/rdaudioexport.h | 7 +- lib/rdaudioimport.cpp | 6 +- lib/rdaudioimport.h | 5 +- lib/rdaudioinfo.cpp | 9 +- lib/rdaudioinfo.h | 7 +- lib/rdaudiosettings.cpp | 4 +- lib/rdaudiosettings.h | 4 +- lib/rdaudiosettings_dialog.cpp | 9 +- lib/rdaudiosettings_dialog.h | 6 +- lib/rdaudiostore.cpp | 7 +- lib/rdaudiostore.h | 5 +- lib/rdbusybar.cpp | 9 +- lib/rdbusybar.h | 6 +- lib/rdbusydialog.cpp | 8 +- lib/rdbusydialog.h | 7 +- lib/rdbutton_dialog.cpp | 8 +- lib/rdbutton_dialog.h | 14 +- lib/rdbutton_panel.cpp | 4 +- lib/rdbutton_panel.h | 4 +- lib/rdcae.cpp | 7 +- lib/rdcae.h | 5 +- lib/rdcardselector.cpp | 8 +- lib/rdcardselector.h | 7 +- lib/rdcart.cpp | 2 +- lib/rdcart.h | 4 +- lib/rdcart_dialog.cpp | 4 +- lib/rdcart_dialog.h | 4 +- lib/rdcart_search_text.cpp | 4 +- lib/rdcart_search_text.h | 6 +- lib/rdcartdrag.cpp | 4 +- lib/rdcartdrag.h | 4 +- lib/rdcartslot.cpp | 4 +- lib/rdcartslot.h | 4 +- lib/rdcastsearch.cpp | 4 +- lib/rdcastsearch.h | 4 +- lib/rdcatch_conf.cpp | 5 +- lib/rdcatch_conf.h | 5 +- lib/rdcatch_connect.cpp | 8 +- lib/rdcatch_connect.h | 7 +- lib/rdcddblookup.cpp | 8 +- lib/rdcddblookup.h | 6 +- lib/rdcddbrecord.cpp | 5 +- lib/rdcddbrecord.h | 4 +- lib/rdcdplayer.cpp | 8 +- lib/rdcdplayer.h | 6 +- lib/rdcdripper.cpp | 4 +- lib/rdcdripper.h | 4 +- lib/rdcheck_daemons.cpp | 4 +- lib/rdcheck_daemons.h | 7 +- lib/rdcheck_version.cpp | 4 +- lib/rdcheck_version.h | 7 +- lib/rdclock.cpp | 8 +- lib/rdclock.h | 10 +- lib/rdcmd_cache.cpp | 4 +- lib/rdcmd_cache.h | 5 +- lib/rdcmd_switch.cpp | 4 +- lib/rdcmd_switch.h | 4 +- lib/rdcodetrap.cpp | 8 +- lib/rdcodetrap.h | 8 +- lib/rdcombobox.cpp | 8 +- lib/rdcombobox.h | 6 +- lib/rdconfig.cpp | 7 +- lib/rdconfig.h | 5 +- lib/rdcopyaudio.cpp | 4 +- lib/rdcopyaudio.h | 4 +- lib/rdcreate_log.cpp | 4 +- lib/rdcreate_log.h | 4 +- lib/rdcreateauxfieldstable.cpp | 4 +- lib/rdcreateauxfieldstable.h | 4 +- lib/rdcueedit.cpp | 38 +- lib/rdcueedit.h | 6 +- lib/rdcueeditdialog.cpp | 5 +- lib/rdcueeditdialog.h | 4 +- lib/rdcut.h | 4 +- lib/rdcut_dialog.cpp | 47 +- lib/rdcut_dialog.h | 7 +- lib/rdcut_path.cpp | 4 +- lib/rdcut_path.h | 6 +- lib/rddatedecode.cpp | 4 +- lib/rddatedecode.h | 8 +- lib/rddatedialog.cpp | 12 +- lib/rddatedialog.h | 8 +- lib/rddatepicker.cpp | 9 +- lib/rddatepicker.h | 7 +- lib/rddb.cpp | 3 +- lib/rddb.h | 4 +- lib/rddbheartbeat.cpp | 8 +- lib/rddbheartbeat.h | 13 +- lib/rddebug.cpp | 5 +- lib/rddebug.h | 8 +- lib/rddeck.cpp | 4 +- lib/rddeck.h | 10 +- lib/rddelete.cpp | 8 +- lib/rddelete.h | 6 +- lib/rddownload.cpp | 9 +- lib/rddownload.h | 7 +- lib/rddropbox.cpp | 5 +- lib/rddropbox.h | 4 +- lib/rdedit_audio.cpp | 154 ++-- lib/rdedit_audio.h | 7 +- lib/rdedit_panel_name.cpp | 10 +- lib/rdedit_panel_name.h | 7 +- lib/rdemptycart.cpp | 9 +- lib/rdemptycart.h | 7 +- lib/rdencoder.cpp | 4 +- lib/rdencoder.h | 4 +- lib/rdencoderlist.cpp | 4 +- lib/rdencoderlist.h | 4 +- lib/rdescape_string.cpp | 4 +- lib/rdescape_string.h | 4 +- lib/rdevent.cpp | 4 +- lib/rdevent.h | 4 +- lib/rdevent_line.cpp | 5 +- lib/rdevent_line.h | 11 +- lib/rdevent_player.cpp | 8 +- lib/rdevent_player.h | 13 +- lib/rdexception_dialog.cpp | 9 +- lib/rdexception_dialog.h | 7 +- lib/rdfeed.cpp | 12 +- lib/rdfeed.h | 14 +- lib/rdfeedlog.cpp | 5 +- lib/rdfeedlog.h | 4 +- lib/rdflacdecode.cpp | 5 +- lib/rdflacdecode.h | 4 +- lib/rdformpost.h | 4 +- lib/rdgain_envelope.cpp | 5 +- lib/rdgain_envelope.h | 4 +- lib/rdget_ath.cpp | 9 +- lib/rdget_ath.h | 7 +- lib/rdgetpasswd.cpp | 9 +- lib/rdgetpasswd.h | 7 +- lib/rdgpio.cpp | 9 +- lib/rdgpio.h | 7 +- lib/rdgpioselector.cpp | 8 +- lib/rdgpioselector.h | 7 +- lib/rdgrid.cpp | 5 +- lib/rdgrid.h | 5 +- lib/rdgroup.cpp | 4 +- lib/rdgroup.h | 4 +- lib/rdgroup_list.cpp | 5 +- lib/rdgroup_list.h | 6 +- lib/rdhotkeylist.cpp | 174 +++-- lib/rdhotkeylist.h | 12 +- lib/rdhotkeys.cpp | 4 +- lib/rdhotkeys.h | 18 +- lib/rdidvalidator.cpp | 4 +- lib/rdidvalidator.h | 4 +- lib/rdinstancelock.cpp | 5 +- lib/rdinstancelock.h | 5 +- lib/rdintegerdialog.cpp | 8 +- lib/rdintegerdialog.h | 6 +- lib/rdintegeredit.cpp | 9 +- lib/rdintegeredit.h | 8 +- lib/rdlabel.cpp | 16 +- lib/rdlabel.h | 12 +- lib/rdlibrary_conf.cpp | 6 +- lib/rdlibrary_conf.h | 4 +- lib/rdlicense.cpp | 8 +- lib/rdlicense.h | 9 +- lib/rdlineedit.cpp | 12 +- lib/rdlineedit.h | 12 +- lib/rdlist_groups.cpp | 8 +- lib/rdlist_groups.h | 8 +- lib/rdlist_logs.cpp | 8 +- lib/rdlist_logs.h | 9 +- lib/rdlistselector.cpp | 10 +- lib/rdlistselector.h | 8 +- lib/rdlistsvcs.cpp | 4 +- lib/rdlistsvcs.h | 4 +- lib/rdlistview.cpp | 9 +- lib/rdlistview.h | 8 +- lib/rdlistviewitem.cpp | 6 +- lib/rdlistviewitem.h | 11 +- lib/rdlivewire.cpp | 8 +- lib/rdlivewire.h | 6 +- lib/rdlivewiredestination.cpp | 5 +- lib/rdlivewiredestination.h | 5 +- lib/rdlivewiresource.cpp | 5 +- lib/rdlivewiresource.h | 5 +- lib/rdlog.cpp | 5 +- lib/rdlog.h | 4 +- lib/rdlog_event.cpp | 4 +- lib/rdlog_event.h | 5 +- lib/rdlog_line.h | 1 - lib/rdlogedit_conf.cpp | 4 +- lib/rdlogedit_conf.h | 5 +- lib/rdmacro.cpp | 4 +- lib/rdmacro_event.cpp | 5 +- lib/rdmacro_event.h | 4 +- lib/rdmarker_bar.cpp | 8 +- lib/rdmarker_bar.h | 7 +- lib/rdmarker_button.cpp | 17 +- lib/rdmarker_button.h | 14 +- lib/rdmarker_edit.cpp | 12 +- lib/rdmarker_edit.h | 10 +- lib/rdmatrix.cpp | 4 +- lib/rdmatrix.h | 9 +- lib/rdmeteraverage.cpp | 5 +- lib/rdmeteraverage.h | 5 +- lib/rdmixer.cpp | 5 +- lib/rdmixer.h | 12 +- lib/rdmonitor_config.cpp | 4 +- lib/rdmonitor_config.h | 4 +- lib/rdmp4.h | 1 + lib/rdnownext.cpp | 4 +- lib/rdnownext.h | 4 +- lib/rdoneshot.cpp | 6 +- lib/rdoneshot.h | 6 +- lib/rdpam.cpp | 4 +- lib/rdpam.h | 4 +- lib/rdpanel_button.cpp | 8 +- lib/rdpanel_button.h | 8 +- lib/rdpasswd.cpp | 9 +- lib/rdpasswd.h | 7 +- lib/rdpaths.h.in | 4 +- lib/rdpeaksexport.cpp | 6 +- lib/rdpeaksexport.h | 7 +- lib/rdplay_deck.cpp | 8 +- lib/rdplay_deck.h | 6 +- lib/rdplaymeter.cpp | 10 +- lib/rdplaymeter.h | 7 +- lib/rdpodcast.cpp | 4 +- lib/rdpodcast.h | 4 +- lib/rdprofile.cpp | 6 +- lib/rdprofile.h | 7 +- lib/rdprofileline.cpp | 6 +- lib/rdprofileline.h | 7 +- lib/rdprofilesection.cpp | 5 +- lib/rdprofilesection.h | 6 +- lib/rdpushbutton.cpp | 17 +- lib/rdpushbutton.h | 13 +- lib/rdrecording.cpp | 4 +- lib/rdrecording.h | 4 +- lib/rdreplicator.cpp | 4 +- lib/rdreplicator.h | 4 +- lib/rdreport.cpp | 6 +- lib/rdreport.h | 6 +- lib/rdringbuffer.cpp | 4 +- lib/rdringbuffer.h | 4 +- lib/rdripc.cpp | 11 +- lib/rdripc.h | 6 +- lib/rdschedcodes_dialog.cpp | 4 +- lib/rdschedcodes_dialog.h | 4 +- lib/rdsegmeter.cpp | 9 +- lib/rdsegmeter.h | 7 +- lib/rdsimpleplayer.cpp | 16 +- lib/rdsimpleplayer.h | 8 +- lib/rdslider.cpp | 16 +- lib/rdslider.h | 11 +- lib/rdslotbox.cpp | 4 +- lib/rdslotbox.h | 6 +- lib/rdslotdialog.cpp | 4 +- lib/rdslotdialog.h | 4 +- lib/rdslotoptions.cpp | 4 +- lib/rdslotoptions.h | 4 +- lib/rdsocket.cpp | 10 +- lib/rdsocket.h | 9 +- lib/rdsound_panel.cpp | 19 +- lib/rdsound_panel.h | 7 +- lib/rdstation.cpp | 4 +- lib/rdstation.h | 4 +- lib/rdstatus.cpp | 4 +- lib/rdstatus.h | 5 +- lib/rdstereometer.cpp | 12 +- lib/rdstereometer.h | 8 +- lib/rdstringlist.cpp | 6 +- lib/rdstringlist.h | 6 +- lib/rdsvc.cpp | 8 +- lib/rdsvc.h | 12 +- lib/rdsystem.cpp | 4 +- lib/rdsystem.h | 4 +- lib/rdsystemuser.cpp | 4 +- lib/rdsystemuser.h | 4 +- lib/rdtextfile.cpp | 4 +- lib/rdtextfile.h | 4 +- lib/rdtextvalidator.cpp | 5 +- lib/rdtextvalidator.h | 8 +- lib/rdtimeedit.cpp | 15 +- lib/rdtimeedit.h | 6 +- lib/rdtimeengine.cpp | 10 +- lib/rdtimeengine.h | 9 +- lib/rdtimeevent.cpp | 6 +- lib/rdtimeevent.h | 7 +- lib/rdtransportbutton.cpp | 8 +- lib/rdtransportbutton.h | 10 +- lib/rdtrimaudio.cpp | 9 +- lib/rdtrimaudio.h | 7 +- lib/rdtty.cpp | 5 +- lib/rdtty.h | 4 +- lib/rdttydevice.cpp | 6 +- lib/rdttydevice.h | 5 +- lib/rdttydevice_win32.cpp | 4 +- lib/rdttyout.cpp | 4 +- lib/rdttyout.h | 12 +- lib/rdupload.cpp | 9 +- lib/rdupload.h | 7 +- lib/rdurl.cpp | 6 +- lib/rdurl.h | 5 +- lib/rduser.cpp | 4 +- lib/rduser.h | 4 +- lib/rdversion.cpp | 5 +- lib/rdversion.h | 4 +- lib/rdwavedata.cpp | 5 +- lib/rdwavedata.h | 5 +- lib/rdwavedata_dialog.cpp | 4 +- lib/rdwavedata_dialog.h | 4 +- lib/rdwavefile.h | 9 +- lib/rdwavepainter.cpp | 4 +- lib/rdwavepainter.h | 4 +- lib/rdwebresult.cpp | 4 +- lib/rdwebresult.h | 4 +- lib/rdwin32.cpp | 5 +- lib/rdwin32.h | 6 +- lib/schedcartlist.cpp | 3 - lib/schedcartlist.h | 6 +- lib/schedruleslist.cpp | 2 - lib/schedruleslist.h | 3 - make_slack.in | 4 +- pam_rd/Makefile.am | 2 - pam_rd/pam_rd.cpp | 2 - rdadmin/Makefile.am | 4 +- rdadmin/add_aux_field.cpp | 24 +- rdadmin/add_aux_field.h | 8 +- rdadmin/add_encoder.cpp | 18 +- rdadmin/add_encoder.h | 8 +- rdadmin/add_feed.cpp | 24 +- rdadmin/add_feed.h | 7 +- rdadmin/add_group.cpp | 33 +- rdadmin/add_group.h | 7 +- rdadmin/add_hostvar.cpp | 28 +- rdadmin/add_hostvar.h | 7 +- rdadmin/add_matrix.cpp | 26 +- rdadmin/add_matrix.h | 7 +- rdadmin/add_replicator.cpp | 24 +- rdadmin/add_replicator.h | 7 +- rdadmin/add_report.cpp | 23 +- rdadmin/add_report.h | 7 +- rdadmin/add_schedcodes.cpp | 23 +- rdadmin/add_schedcodes.h | 4 +- rdadmin/add_station.cpp | 21 +- rdadmin/add_station.h | 7 +- rdadmin/add_svc.cpp | 13 +- rdadmin/add_svc.h | 7 +- rdadmin/add_user.cpp | 20 +- rdadmin/add_user.h | 7 +- rdadmin/autofill_carts.cpp | 19 +- rdadmin/autofill_carts.h | 6 +- rdadmin/createdb.h | 4 +- rdadmin/edit_audios.cpp | 57 +- rdadmin/edit_audios.h | 7 +- rdadmin/edit_aux_field.cpp | 22 +- rdadmin/edit_aux_field.h | 7 +- rdadmin/edit_backup.cpp | 28 +- rdadmin/edit_backup.h | 7 +- rdadmin/edit_cartslots.cpp | 6 +- rdadmin/edit_cartslots.h | 7 +- rdadmin/edit_channelgpios.cpp | 9 +- rdadmin/edit_channelgpios.h | 6 +- rdadmin/edit_dropbox.cpp | 9 +- rdadmin/edit_dropbox.h | 7 +- rdadmin/edit_encoder.cpp | 8 +- rdadmin/edit_encoder.h | 6 +- rdadmin/edit_endpoint.cpp | 39 +- rdadmin/edit_endpoint.h | 7 +- rdadmin/edit_feed.cpp | 178 ++--- rdadmin/edit_feed.h | 8 +- rdadmin/edit_feed_perms.cpp | 15 +- rdadmin/edit_feed_perms.h | 7 +- rdadmin/edit_gpi.cpp | 40 +- rdadmin/edit_gpi.h | 7 +- rdadmin/edit_group.cpp | 83 +-- rdadmin/edit_group.h | 7 +- rdadmin/edit_hostvar.cpp | 29 +- rdadmin/edit_hostvar.h | 7 +- rdadmin/edit_hotkeys.cpp | 744 ++++++++++---------- rdadmin/edit_hotkeys.h | 93 +-- rdadmin/edit_jack.cpp | 13 +- rdadmin/edit_jack.h | 6 +- rdadmin/edit_jack_client.cpp | 13 +- rdadmin/edit_jack_client.h | 6 +- rdadmin/edit_livewiregpio.cpp | 12 +- rdadmin/edit_livewiregpio.h | 8 +- rdadmin/edit_matrix.cpp | 8 +- rdadmin/edit_matrix.h | 6 +- rdadmin/edit_node.cpp | 36 +- rdadmin/edit_node.h | 7 +- rdadmin/edit_now_next.cpp | 126 ++-- rdadmin/edit_now_next.h | 7 +- rdadmin/edit_nownextplugin.cpp | 12 +- rdadmin/edit_nownextplugin.h | 8 +- rdadmin/edit_rdairplay.cpp | 22 +- rdadmin/edit_rdairplay.h | 7 +- rdadmin/edit_rdpanel.cpp | 87 +-- rdadmin/edit_rdpanel.h | 7 +- rdadmin/edit_replicator.cpp | 74 +- rdadmin/edit_replicator.h | 6 +- rdadmin/edit_report.cpp | 13 +- rdadmin/edit_report.h | 7 +- rdadmin/edit_sas_resource.cpp | 28 +- rdadmin/edit_sas_resource.h | 8 +- rdadmin/edit_schedcodes.cpp | 25 +- rdadmin/edit_schedcodes.h | 4 +- rdadmin/edit_settings.cpp | 44 +- rdadmin/edit_settings.h | 6 +- rdadmin/edit_station.cpp | 10 +- rdadmin/edit_station.h | 6 +- rdadmin/edit_svc.cpp | 143 ++-- rdadmin/edit_svc.h | 6 +- rdadmin/edit_svc_perms.cpp | 15 +- rdadmin/edit_svc_perms.h | 7 +- rdadmin/edit_ttys.cpp | 53 +- rdadmin/edit_ttys.h | 7 +- rdadmin/edit_user.cpp | 248 +++---- rdadmin/edit_user.h | 7 +- rdadmin/edit_user_perms.cpp | 15 +- rdadmin/edit_user_perms.h | 7 +- rdadmin/edit_vguest_resource.cpp | 33 +- rdadmin/edit_vguest_resource.h | 8 +- rdadmin/globals.h | 5 +- rdadmin/help_audios.cpp | 12 +- rdadmin/help_audios.h | 8 +- rdadmin/importfields.cpp | 174 ++--- rdadmin/importfields.h | 6 +- rdadmin/info_dialog.cpp | 32 +- rdadmin/info_dialog.h | 8 +- rdadmin/list_aux_fields.cpp | 23 +- rdadmin/list_aux_fields.h | 7 +- rdadmin/list_dropboxes.cpp | 23 +- rdadmin/list_dropboxes.h | 8 +- rdadmin/list_encoders.cpp | 23 +- rdadmin/list_encoders.h | 7 +- rdadmin/list_endpoints.cpp | 19 +- rdadmin/list_endpoints.h | 8 +- rdadmin/list_feeds.cpp | 25 +- rdadmin/list_feeds.h | 7 +- rdadmin/list_gpis.cpp | 25 +- rdadmin/list_gpis.h | 8 +- rdadmin/list_groups.cpp | 32 +- rdadmin/list_groups.h | 7 +- rdadmin/list_hostvars.cpp | 30 +- rdadmin/list_hostvars.h | 7 +- rdadmin/list_livewiregpios.cpp | 18 +- rdadmin/list_livewiregpios.h | 7 +- rdadmin/list_matrices.cpp | 18 +- rdadmin/list_matrices.h | 7 +- rdadmin/list_nodes.cpp | 19 +- rdadmin/list_nodes.h | 7 +- rdadmin/list_replicator_carts.cpp | 21 +- rdadmin/list_replicator_carts.h | 9 +- rdadmin/list_replicators.cpp | 26 +- rdadmin/list_replicators.h | 7 +- rdadmin/list_reports.cpp | 29 +- rdadmin/list_reports.h | 7 +- rdadmin/list_sas_resources.cpp | 22 +- rdadmin/list_sas_resources.h | 8 +- rdadmin/list_schedcodes.cpp | 7 +- rdadmin/list_schedcodes.h | 5 +- rdadmin/list_stations.cpp | 23 +- rdadmin/list_stations.h | 9 +- rdadmin/list_svcs.cpp | 26 +- rdadmin/list_svcs.h | 7 +- rdadmin/list_users.cpp | 25 +- rdadmin/list_users.h | 7 +- rdadmin/list_vguest_resources.cpp | 27 +- rdadmin/list_vguest_resources.h | 7 +- rdadmin/login.cpp | 26 +- rdadmin/login.h | 8 +- rdadmin/mysql_login.cpp | 27 +- rdadmin/mysql_login.h | 8 +- rdadmin/opendb.cpp | 4 +- rdadmin/opendb.h | 8 +- rdadmin/rdadmin.cpp | 62 +- rdadmin/rdadmin.h | 6 +- rdadmin/rdadmin.pro | 4 +- rdadmin/rename_group.cpp | 24 +- rdadmin/rename_group.h | 7 +- rdadmin/test_import.cpp | 25 +- rdadmin/test_import.h | 8 +- rdadmin/view_adapters.cpp | 9 +- rdadmin/view_adapters.h | 7 +- rdadmin/view_node_info.cpp | 70 +- rdadmin/view_node_info.h | 7 +- rdadmin/xpm_info_banner1.cpp | 4 +- rdadmin/xpm_info_banner2.cpp | 4 +- rdairplay/Makefile.am | 4 +- rdairplay/button_log.cpp | 12 +- rdairplay/button_log.h | 6 +- rdairplay/colors.h | 5 +- rdairplay/edit_event.cpp | 9 +- rdairplay/edit_event.h | 6 +- rdairplay/globals.h | 6 +- rdairplay/hourselector.cpp | 8 +- rdairplay/hourselector.h | 6 +- rdairplay/lib_listview.cpp | 8 +- rdairplay/lib_listview.h | 6 +- rdairplay/list_log.cpp | 36 +- rdairplay/list_log.h | 6 +- rdairplay/list_logs.cpp | 13 +- rdairplay/list_logs.h | 6 +- rdairplay/local_macros.cpp | 4 +- rdairplay/log_play.cpp | 4 +- rdairplay/log_play.h | 4 +- rdairplay/log_traffic.cpp | 1 - rdairplay/log_traffic.h | 5 +- rdairplay/loglinebox.cpp | 9 +- rdairplay/loglinebox.h | 7 +- rdairplay/mode_display.cpp | 4 +- rdairplay/mode_display.h | 4 +- rdairplay/nownext.cpp | 4 +- rdairplay/pie_counter.cpp | 8 +- rdairplay/pie_counter.h | 6 +- rdairplay/post_counter.cpp | 8 +- rdairplay/post_counter.h | 6 +- rdairplay/rdairplay.cpp | 63 +- rdairplay/rdairplay.h | 7 +- rdairplay/rdairplay.pro | 4 +- rdairplay/rlmhost.cpp | 8 +- rdairplay/rlmhost.h | 6 +- rdairplay/start_button.cpp | 9 +- rdairplay/start_button.h | 6 +- rdairplay/stop_counter.cpp | 8 +- rdairplay/stop_counter.h | 6 +- rdairplay/wall_clock.cpp | 8 +- rdairplay/wall_clock.h | 6 +- rdcartslots/Makefile.am | 4 +- rdcartslots/local_macros.cpp | 4 +- rdcartslots/rdcartslots.cpp | 4 +- rdcartslots/rdcartslots.h | 5 +- rdcartslots/rdcartslots.pro | 4 +- rdcastmanager/Makefile.am | 4 +- rdcastmanager/edit_cast.cpp | 94 +-- rdcastmanager/edit_cast.h | 7 +- rdcastmanager/globals.h | 4 +- rdcastmanager/list_casts.cpp | 37 +- rdcastmanager/list_casts.h | 7 +- rdcastmanager/pick_report_dates.cpp | 27 +- rdcastmanager/pick_report_dates.h | 8 +- rdcastmanager/rdcastmanager.cpp | 16 +- rdcastmanager/rdcastmanager.h | 8 +- rdcastmanager/rdcastmanager.pro | 4 +- rdcatch/Makefile.am | 4 +- rdcatch/add_recording.cpp | 6 +- rdcatch/add_recording.h | 4 +- rdcatch/catch_listview.cpp | 13 +- rdcatch/catch_listview.h | 9 +- rdcatch/catch_monitor.cpp | 5 +- rdcatch/catch_monitor.h | 5 +- rdcatch/colors.h | 5 +- rdcatch/deckmon.cpp | 1 - rdcatch/deckmon.h | 1 - rdcatch/edit_cartevent.cpp | 87 +-- rdcatch/edit_cartevent.h | 7 +- rdcatch/edit_download.cpp | 136 ++-- rdcatch/edit_download.h | 7 +- rdcatch/edit_playout.cpp | 86 +-- rdcatch/edit_playout.h | 7 +- rdcatch/edit_recording.cpp | 6 +- rdcatch/edit_recording.h | 4 +- rdcatch/edit_switchevent.cpp | 98 ++- rdcatch/edit_switchevent.h | 8 +- rdcatch/edit_upload.cpp | 135 ++-- rdcatch/edit_upload.h | 7 +- rdcatch/globals.h | 5 +- rdcatch/list_reports.cpp | 18 +- rdcatch/list_reports.h | 8 +- rdcatch/rdcatch.cpp | 73 +- rdcatch/rdcatch.h | 15 +- rdcatch/rdcatch.pro | 4 +- rdcatch/vbox.cpp | 5 +- rdcatch/vbox.h | 4 +- rdcatchd/batch.cpp | 2 +- rdcatchd/catch_event.cpp | 4 +- rdcatchd/catch_event.h | 4 +- rdcatchd/local_macros.cpp | 4 +- rdcatchd/rdcatchd.cpp | 34 +- rdcatchd/rdcatchd.h | 8 +- rdcatchd/rdcatchd_socket.cpp | 10 +- rdcatchd/rdcatchd_socket.h | 8 +- rdhpi/Makefile.am | 4 +- rdhpi/rdhpi.pro | 4 +- rdhpi/rdhpicardselector.cpp | 20 +- rdhpi/rdhpicardselector.h | 6 +- rdhpi/rdhpiinformation.cpp | 4 +- rdhpi/rdhpiinformation.h | 4 +- rdhpi/rdhpiplaystream.cpp | 11 +- rdhpi/rdhpiplaystream.h | 8 +- rdhpi/rdhpirecordstream.cpp | 9 +- rdhpi/rdhpirecordstream.h | 2 +- rdhpi/rdhpisoundcard.cpp | 9 +- rdhpi/rdhpisoundcard.h | 7 +- rdhpi/rdhpisoundselector.cpp | 10 +- rdhpi/rdhpisoundselector.h | 8 +- rdlibrary/Makefile.am | 4 +- rdlibrary/audio_cart.cpp | 30 +- rdlibrary/audio_cart.h | 6 +- rdlibrary/audio_controls.h | 4 +- rdlibrary/cart_tip.cpp | 4 +- rdlibrary/cart_tip.h | 4 +- rdlibrary/cdripper.cpp | 54 +- rdlibrary/cdripper.h | 6 +- rdlibrary/disk_gauge.cpp | 8 +- rdlibrary/disk_gauge.h | 6 +- rdlibrary/disk_ripper.cpp | 13 +- rdlibrary/disk_ripper.h | 7 +- rdlibrary/edit_cart.cpp | 167 ++--- rdlibrary/edit_cart.h | 4 +- rdlibrary/edit_macro.cpp | 18 +- rdlibrary/edit_macro.h | 7 +- rdlibrary/edit_notes.cpp | 14 +- rdlibrary/edit_notes.h | 6 +- rdlibrary/edit_schedulercodes.cpp | 15 +- rdlibrary/edit_schedulercodes.h | 5 +- rdlibrary/filter.cpp | 20 +- rdlibrary/filter.h | 8 +- rdlibrary/globals.h | 8 +- rdlibrary/lib_listview.cpp | 8 +- rdlibrary/lib_listview.h | 6 +- rdlibrary/list_reports.cpp | 17 +- rdlibrary/list_reports.h | 7 +- rdlibrary/macro_cart.cpp | 34 +- rdlibrary/macro_cart.h | 7 +- rdlibrary/rdlibrary.cpp | 71 +- rdlibrary/rdlibrary.h | 7 +- rdlibrary/rdlibrary.pro | 4 +- rdlibrary/record_cut.cpp | 170 ++--- rdlibrary/record_cut.h | 8 +- rdlibrary/validate_cut.cpp | 4 +- rdlibrary/validate_cut.h | 4 +- rdlogedit/Makefile.am | 4 +- rdlogedit/add_meta.cpp | 19 +- rdlogedit/add_meta.h | 7 +- rdlogedit/drop_listview.cpp | 8 +- rdlogedit/drop_listview.h | 6 +- rdlogedit/edit_chain.cpp | 41 +- rdlogedit/edit_chain.h | 6 +- rdlogedit/edit_log.cpp | 158 ++--- rdlogedit/edit_log.h | 2 +- rdlogedit/edit_logline.cpp | 50 +- rdlogedit/edit_logline.h | 6 +- rdlogedit/edit_marker.cpp | 37 +- rdlogedit/edit_marker.h | 6 +- rdlogedit/edit_track.cpp | 33 +- rdlogedit/edit_track.h | 6 +- rdlogedit/globals.h | 4 +- rdlogedit/import_track.cpp | 19 +- rdlogedit/import_track.h | 7 +- rdlogedit/list_listviewitem.cpp | 6 +- rdlogedit/list_listviewitem.h | 6 +- rdlogedit/list_logs.cpp | 15 +- rdlogedit/list_logs.h | 7 +- rdlogedit/list_reports.cpp | 27 +- rdlogedit/list_reports.h | 6 +- rdlogedit/log_listview.cpp | 9 +- rdlogedit/log_listview.h | 7 +- rdlogedit/rdlogedit.cpp | 31 +- rdlogedit/rdlogedit.h | 3 +- rdlogedit/rdlogedit.pro | 4 +- rdlogedit/voice_tracker.cpp | 54 +- rdlogedit/voice_tracker.h | 7 +- rdlogin/Makefile.am | 4 +- rdlogin/rdlogin.cpp | 32 +- rdlogin/rdlogin.h | 8 +- rdlogin/rdlogin.pro | 4 +- rdlogmanager/Makefile.am | 4 +- rdlogmanager/add_clock.cpp | 19 +- rdlogmanager/add_clock.h | 7 +- rdlogmanager/add_event.cpp | 19 +- rdlogmanager/add_event.h | 7 +- rdlogmanager/clock_listview.cpp | 11 +- rdlogmanager/clock_listview.h | 6 +- rdlogmanager/commandline_ops.cpp | 4 +- rdlogmanager/edit_clock.cpp | 8 +- rdlogmanager/edit_clock.h | 2 +- rdlogmanager/edit_event.cpp | 287 ++++---- rdlogmanager/edit_event.h | 6 +- rdlogmanager/edit_eventline.cpp | 4 +- rdlogmanager/edit_eventline.h | 4 +- rdlogmanager/edit_grid.cpp | 1 - rdlogmanager/edit_grid.h | 1 - rdlogmanager/edit_note.cpp | 14 +- rdlogmanager/edit_note.h | 6 +- rdlogmanager/edit_perms.cpp | 15 +- rdlogmanager/edit_perms.h | 8 +- rdlogmanager/edit_schedcoderules.cpp | 227 +++--- rdlogmanager/edit_schedcoderules.h | 54 +- rdlogmanager/edit_schedrules.cpp | 20 +- rdlogmanager/edit_schedrules.h | 2 - rdlogmanager/edit_track.cpp | 14 +- rdlogmanager/edit_track.h | 7 +- rdlogmanager/generate_log.cpp | 52 +- rdlogmanager/generate_log.h | 6 +- rdlogmanager/globals.h | 5 +- rdlogmanager/import_listview.cpp | 21 +- rdlogmanager/import_listview.h | 8 +- rdlogmanager/lib_listview.cpp | 10 +- rdlogmanager/lib_listview.h | 7 +- rdlogmanager/list_clocks.cpp | 8 +- rdlogmanager/list_clocks.h | 1 - rdlogmanager/list_events.cpp | 22 +- rdlogmanager/list_events.h | 7 +- rdlogmanager/list_grids.h | 5 +- rdlogmanager/list_svcs.cpp | 19 +- rdlogmanager/list_svcs.h | 7 +- rdlogmanager/pick_report_dates.cpp | 33 +- rdlogmanager/pick_report_dates.h | 8 +- rdlogmanager/rdlogmanager.cpp | 5 +- rdlogmanager/rdlogmanager.h | 2 - rdlogmanager/rdlogmanager.pro | 4 +- rdlogmanager/rename_item.cpp | 15 +- rdlogmanager/rename_item.h | 7 +- rdlogmanager/svc_rec.cpp | 32 +- rdlogmanager/svc_rec.h | 7 +- rdlogmanager/svc_rec_dialog.cpp | 16 +- rdlogmanager/svc_rec_dialog.h | 9 +- rdmonitor/Makefile.am | 4 +- rdmonitor/positiondialog.cpp | 4 +- rdmonitor/positiondialog.h | 4 +- rdmonitor/rdmonitor.cpp | 11 +- rdmonitor/rdmonitor.h | 6 +- rdmonitor/rdmonitor.pro | 4 +- rdmonitor/status_tip.cpp | 4 +- rdmonitor/status_tip.h | 4 +- rdpanel/Makefile.am | 4 +- rdpanel/globals.h | 4 +- rdpanel/rdpanel.cpp | 23 +- rdpanel/rdpanel.h | 7 +- rdpanel/rdpanel.pro | 4 +- rdrepld-suse.in | 4 +- rdrepld/Makefile.am | 4 +- rdrepld/citadelxds.cpp | 4 +- rdrepld/citadelxds.h | 4 +- rdrepld/globals.h | 5 +- rdrepld/rdrepld.cpp | 13 +- rdrepld/rdrepld.h | 6 +- rdrepld/replconfig.cpp | 4 +- rdrepld/replconfig.h | 4 +- rdrepld/replfactory.cpp | 4 +- rdrepld/replfactory.h | 4 +- rdselect/Makefile.am | 4 +- rdselect/rdselect.cpp | 11 +- rdselect/rdselect.h | 6 +- rdselect/rdselect.pro | 4 +- ripcd/acu1p.cpp | 9 +- ripcd/acu1p.h | 6 +- ripcd/am16.cpp | 9 +- ripcd/am16.h | 6 +- ripcd/bt10x1.cpp | 8 +- ripcd/bt10x1.h | 6 +- ripcd/bt16x1.cpp | 9 +- ripcd/bt16x1.h | 6 +- ripcd/bt16x2.cpp | 9 +- ripcd/bt16x2.h | 6 +- ripcd/bt8x2.cpp | 9 +- ripcd/bt8x2.h | 6 +- ripcd/btacs82.cpp | 11 +- ripcd/btacs82.h | 7 +- ripcd/btadms4422.cpp | 5 +- ripcd/btadms4422.h | 3 +- ripcd/btgpi16.cpp | 7 +- ripcd/btgpi16.h | 5 +- ripcd/btsentinel4web.cpp | 9 +- ripcd/btsentinel4web.h | 6 +- ripcd/btsrc16.cpp | 9 +- ripcd/btsrc16.h | 7 +- ripcd/btsrc8iii.cpp | 8 +- ripcd/btsrc8iii.h | 6 +- ripcd/btss124.cpp | 9 +- ripcd/btss124.h | 8 +- ripcd/btss164.cpp | 9 +- ripcd/btss164.h | 6 +- ripcd/btss42.cpp | 9 +- ripcd/btss42.h | 6 +- ripcd/btss44.cpp | 8 +- ripcd/btss44.h | 6 +- ripcd/btss82.cpp | 9 +- ripcd/btss82.h | 6 +- ripcd/globals.h | 10 +- ripcd/harlond.cpp | 4 +- ripcd/harlond.h | 4 +- ripcd/livewire_lwrpaudio.cpp | 9 +- ripcd/livewire_lwrpaudio.h | 6 +- ripcd/livewire_lwrpgpio.cpp | 9 +- ripcd/livewire_lwrpgpio.h | 6 +- ripcd/livewire_mcastgpio.cpp | 8 +- ripcd/livewire_mcastgpio.h | 6 +- ripcd/local_audio.cpp | 9 +- ripcd/local_audio.h | 6 +- ripcd/local_gpio.cpp | 10 +- ripcd/local_gpio.h | 6 +- ripcd/local_macros.cpp | 4 +- ripcd/maint_routines.cpp | 4 +- ripcd/modemlines.cpp | 6 +- ripcd/modemlines.h | 4 +- ripcd/quartz1.cpp | 8 +- ripcd/quartz1.h | 6 +- ripcd/ripcd.cpp | 23 +- ripcd/ripcd.h | 6 +- ripcd/ripcd.pro | 4 +- ripcd/ripcd_connection.cpp | 4 +- ripcd/ripcd_connection.h | 4 +- ripcd/ripcd_socket.cpp | 13 +- ripcd/ripcd_socket.h | 26 +- ripcd/rossnkscp.cpp | 6 +- ripcd/rossnkscp.h | 4 +- ripcd/sas16000.cpp | 6 +- ripcd/sas16000.h | 4 +- ripcd/sas32000.cpp | 9 +- ripcd/sas32000.h | 6 +- ripcd/sas64000.cpp | 9 +- ripcd/sas64000.h | 6 +- ripcd/sas64000gpi.cpp | 8 +- ripcd/sas64000gpi.h | 6 +- ripcd/sasusi.cpp | 10 +- ripcd/sasusi.h | 4 +- ripcd/starguide3.cpp | 9 +- ripcd/starguide3.h | 6 +- ripcd/starguide_feed.cpp | 5 +- ripcd/starguide_feed.h | 4 +- ripcd/swauthority.cpp | 10 +- ripcd/swauthority.h | 4 +- ripcd/switcher.cpp | 8 +- ripcd/switcher.h | 6 +- ripcd/unity4000.cpp | 9 +- ripcd/unity4000.h | 6 +- ripcd/unity_feed.cpp | 4 +- ripcd/unity_feed.h | 4 +- ripcd/vguest.cpp | 8 +- ripcd/vguest.h | 6 +- rivendell-gentoo | 4 +- rivendell-suse.in | 4 +- rivendell.pro | 4 +- rivendell.spec.in | 2 +- rlm/Makefile.am | 4 +- scripts/Makefile.am | 4 +- scripts/crc-unity4k.sh | 4 +- scripts/kill_rd | 4 +- scripts/rd_audio_sync | 4 +- scripts/rd_backup | 4 +- scripts/rd_backup_system.sh | 4 +- scripts/rd_config | 4 +- scripts/rd_create_db | 4 +- scripts/rd_memmon.sh | 4 +- scripts/rd_mysql_enable_host.sh | 4 +- scripts/rd_restore_system.sh | 4 +- scripts/rdmemcheck.sh | 4 +- scripts/sage_endec_rwt.sh | 4 +- scripts/start-rdmonitor.sh | 6 +- scripts/start_rd | 4 +- scripts/start_traverso.sh | 4 +- slack_doinst.sh | 4 +- tests/Makefile.am | 4 +- tests/audio_convert_test.cpp | 8 +- tests/audio_convert_test.h | 4 +- tests/audio_export_test.cpp | 10 +- tests/audio_export_test.h | 6 +- tests/audio_import_test.cpp | 10 +- tests/audio_import_test.h | 6 +- tests/audio_peaks_test.cpp | 4 +- tests/datedecode_test.cpp | 10 +- tests/datedecode_test.h | 6 +- tests/reserve_carts_test.cpp | 10 +- tests/reserve_carts_test.h | 6 +- tests/sas_switch_torture.cpp | 11 +- tests/sas_switch_torture.h | 7 +- tests/sas_torture.cpp | 11 +- tests/sas_torture.h | 7 +- tests/stringcode_test.cpp | 10 +- tests/stringcode_test.h | 6 +- tests/test_pam.cpp | 10 +- tests/test_pam.h | 6 +- tests/timer_test.cpp | 10 +- tests/timer_test.h | 6 +- tests/upload_test.cpp | 10 +- tests/upload_test.h | 6 +- utils/rdalsaconfig/Makefile.am | 4 +- utils/rdalsaconfig/alsaitem.cpp | 4 +- utils/rdalsaconfig/alsaitem.h | 4 +- utils/rdalsaconfig/rdalsa.cpp | 4 +- utils/rdalsaconfig/rdalsa.h | 4 +- utils/rdalsaconfig/rdalsaconfig.cpp | 19 +- utils/rdalsaconfig/rdalsaconfig.h | 9 +- utils/rdcheckcuts/Makefile.am | 4 +- utils/rdcheckcuts/rdcheckcuts.cpp | 10 +- utils/rdcheckcuts/rdcheckcuts.h | 7 +- utils/rdchunk/Makefile.am | 4 +- utils/rdchunk/rdchunk.cpp | 32 +- utils/rdchunk/rdchunk.h | 10 +- utils/rdchunk/rdchunk.pro | 4 +- utils/rdcleandirs/rdcleandirs.cpp | 8 +- utils/rdcleandirs/rdcleandirs.h | 4 +- utils/rdcollect/Makefile.am | 4 +- utils/rdcollect/rdcollect.cpp | 10 +- utils/rdcollect/rdcollect.h | 7 +- utils/rdcollect/rdcollect.pro | 4 +- utils/rddbcheck/Makefile.am | 4 +- utils/rddbcheck/rddbcheck.cpp | 10 +- utils/rddbcheck/rddbcheck.h | 8 +- utils/rddelete/Makefile.am | 4 +- utils/rddelete/rddelete.cpp | 23 +- utils/rddelete/rddelete.h | 7 +- utils/rddgimport/Makefile.am | 4 +- utils/rddgimport/event.cpp | 4 +- utils/rddgimport/event.h | 4 +- utils/rddgimport/rddgimport.cpp | 10 +- utils/rddgimport/rddgimport.h | 6 +- utils/rddgimport/rddgimport.pro | 4 +- utils/rddiscimport/Makefile.am | 4 +- utils/rddiscimport/metalibrary.cpp | 4 +- utils/rddiscimport/metalibrary.h | 4 +- utils/rddiscimport/metarecord.cpp | 4 +- utils/rddiscimport/metarecord.h | 4 +- utils/rddiscimport/rddiscimport.cpp | 12 +- utils/rddiscimport/rddiscimport.h | 6 +- utils/rddiscimport/rddiscimport.pro | 4 +- utils/rdexport/rdexport.cpp | 6 +- utils/rdexport/rdexport.h | 2 +- utils/rdgen/Makefile.am | 4 +- utils/rdgen/rdgen.c | 4 +- utils/rdgen/wavlib.c | 4 +- utils/rdgen/wavlib.h | 4 +- utils/rdgpimon/Makefile.am | 4 +- utils/rdgpimon/gpi_label.cpp | 8 +- utils/rdgpimon/gpi_label.h | 8 +- utils/rdgpimon/rdgpimon.cpp | 9 +- utils/rdgpimon/rdgpimon.h | 8 +- utils/rdgpimon/rdgpimon.pro | 4 +- utils/rdhpiinfo/Makefile.am | 4 +- utils/rdhpiinfo/change_mode.cpp | 8 +- utils/rdhpiinfo/change_mode.h | 7 +- utils/rdhpiinfo/rdhpiinfo.cpp | 11 +- utils/rdhpiinfo/rdhpiinfo.h | 7 +- utils/rdimport/Makefile.am | 4 +- utils/rdimport/rdimport.cpp | 8 +- utils/rdimport/rdimport.h | 7 +- utils/rdmaint/Makefile.am | 4 +- utils/rdmaint/rdmaint.cpp | 6 +- utils/rdmaint/rdmaint.h | 8 +- utils/rdmarkerset/Makefile.am | 4 +- utils/rdmarkerset/rdmarkerset.cpp | 10 +- utils/rdmarkerset/rdmarkerset.h | 6 +- utils/rdpopup/Makefile.am | 4 +- utils/rdpopup/rdpopup.cpp | 4 +- utils/rdpopup/rdpopup.h | 6 +- utils/rdpurgecasts/Makefile.am | 4 +- utils/rdpurgecasts/rdpurgecasts.cpp | 10 +- utils/rdpurgecasts/rdpurgecasts.h | 8 +- utils/rdrevert/rdrevert.cpp | 6 +- utils/rdrevert/rdrevert.h | 2 +- utils/rdsoftkeys/Makefile.am | 4 +- utils/rdsoftkeys/rdsoftkeys.cpp | 11 +- utils/rdsoftkeys/rdsoftkeys.h | 6 +- utils/rdsoftkeys/rdsoftkeys.pro | 4 +- utils/rmlsend/Makefile.am | 4 +- utils/rmlsend/rmlsend.cpp | 13 +- utils/rmlsend/rmlsend.h | 6 +- utils/rmlsend/rmlsend.pro | 4 +- utils/sas_shim/Makefile.am | 4 +- utils/sas_shim/rc.sas_shim | 4 +- utils/sas_shim/sas_shim.cpp | 10 +- utils/sas_shim/sas_shim.h | 6 +- utils/utils.pro | 4 +- web/Makefile.am | 4 +- web/rdcastmanager/Makefile.am | 4 +- web/rdcastmanager/rdcastmanager.cpp | 10 +- web/rdcastmanager/rdcastmanager.h | 7 +- web/rdcastmanager/rdcastmanager.js | 4 +- web/rdfeed/Makefile.am | 4 +- web/rdfeed/rdfeed_script.cpp | 10 +- web/rdfeed/rdfeed_script.h | 8 +- web/rdxport/Makefile.am | 4 +- web/rdxport/audioinfo.cpp | 4 +- web/rdxport/audiostore.cpp | 2 +- web/rdxport/copyaudio.cpp | 4 +- web/rdxport/deleteaudio.cpp | 4 +- web/rdxport/exportpeaks.cpp | 4 +- web/rdxport/groups.cpp | 4 +- web/rdxport/import.cpp | 4 +- web/rdxport/logs.cpp | 4 +- web/rdxport/rdxport.cpp | 10 +- web/rdxport/rdxport.h | 4 +- web/rdxport/services.cpp | 4 +- web/rdxport/trimaudio.cpp | 4 +- xdg/Makefile.am | 2 - 1059 files changed, 4810 insertions(+), 7950 deletions(-) diff --git a/ChangeLog b/ChangeLog index c89f8fc28..c67f3ab23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15155,3 +15155,6 @@ 'LOGS.START_DATE' and 'LOGS.END_DATE' fields in the database [GitHub issue #000121]. * Incremented the database version to 257. +2016-05-24 Fred Gleason + * Removed all CVS tags. + * Removed 'const char *name' parameter from all QObject contructors. diff --git a/Makefile.am b/Makefile.am index d9001aec4..209377091 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2010 Fred Gleason -## -## $Id: Makefile.am,v 1.65.6.6 2013/01/14 16:35:58 cvs Exp $ +## (C) Copyright 2002-2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/acinclude.m4 b/acinclude.m4 index 482bcdc9a..f7507397a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2,13 +2,11 @@ dnl acinclude.m4 dnl dnl Local Autoconf macro definitions for LibRHpi dnl -dnl (C) Copyright 2006 Fred Gleason +dnl (C) Copyright 2006,2016 Fred Gleason dnl dnl BNV_HAVE_QT Macro Copyright (C) 2001, 2002, 2003, 2005, 2006 dnl Bastiaan Veelo dnl -dnl $Id: acinclude.m4,v 1.7.8.2 2012/08/08 19:48:29 cvs Exp $ -dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License version 2 as dnl published by the Free Software Foundation. diff --git a/autogen.sh b/autogen.sh index 68b0a997f..83f57436f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,6 @@ #!/bin/sh ## -## (C) Copyright 2002-2003 Fred Gleason -## -## $Id: autogen.sh,v 1.5 2010/07/29 19:32:30 cvs Exp $ +## (C) Copyright 2002-2003,2016 Fred Gleason ## ## Adapted from './autogen.sh' in the Jack Audio Connection Kit. ## Copyright (C) 2001-2003 Paul Davis, et al. diff --git a/cae/Makefile.am b/cae/Makefile.am index 48ed5aed6..dcd54112a 100644 --- a/cae/Makefile.am +++ b/cae/Makefile.am @@ -2,9 +2,7 @@ ## ## Core Audio Engine Makefile.am for Rivendell ## -## Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.33.8.1 2012/11/29 01:37:34 cvs Exp $ +## Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/cae/cae.cpp b/cae/cae.cpp index f4ec328f9..e2cb6c4ec 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -392,7 +392,7 @@ void MainObject::newConnection(int fd) close(fd); return; } - socket[i]=new RDSocket(i,this,"socket_0"); + socket[i]=new RDSocket(i,this); socket[i]->setSocket(fd); connect(socket[i],SIGNAL(readyReadID(int)),this,SLOT(socketData(int))); connect(socket[i],SIGNAL(connectionClosedID(int)), diff --git a/cae/cae_hpi.cpp b/cae/cae_hpi.cpp index b0135f011..6e5717f37 100644 --- a/cae/cae_hpi.cpp +++ b/cae/cae_hpi.cpp @@ -2,9 +2,7 @@ // // The HPI Driver for the Core Audio Engine component of Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: cae_hpi.cpp,v 1.38.6.2 2012/11/30 16:14:58 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,7 +31,7 @@ void MainObject::hpiInit(RDStation *station) play[i][j]=NULL; } } - sound_card=new RDHPISoundCard(this,"sound_card"); + sound_card=new RDHPISoundCard(this); sound_card->setFadeProfile(RD_FADE_TYPE); for(int i=0;igetCardQuantity();i++) { cae_driver[i]=RDStation::Hpi; diff --git a/cae/cae_socket.cpp b/cae/cae_socket.cpp index 07c7be794..b35dd2e9c 100644 --- a/cae/cae_socket.cpp +++ b/cae/cae_socket.cpp @@ -2,9 +2,7 @@ // // The Core Audio Engine component of Rivendell // -// (C) Copyright 2002 Fred Gleason -// -// $Id: cae_socket.cpp,v 1.9 2010/07/29 19:32:30 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/cae/cae_socket.h b/cae/cae_socket.h index d9fc6ad5f..6a88a0f18 100644 --- a/cae/cae_socket.h +++ b/cae/cae_socket.h @@ -2,9 +2,7 @@ // // The Core Audio Engine component of Rivendell // -// (C) Copyright 2002 Fred Gleason -// -// $Id: cae_socket.h,v 1.7 2010/07/29 19:32:30 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/conf/rd-bin.conf.in b/conf/rd-bin.conf.in index 858a74ea0..5a686a74e 100644 --- a/conf/rd-bin.conf.in +++ b/conf/rd-bin.conf.in @@ -2,9 +2,7 @@ # # This is the Apache Web Server configuration for Rivendell. # -# (C) Copyright 2007,2010 Fred Gleason -# -# $Id: rd-bin.conf.in,v 1.5 2011/06/23 19:47:28 cvs Exp $ +# (C) Copyright 2007,2010,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/debian/Makefile.am b/debian/Makefile.am index bcf3a99a6..c9d2afe2b 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -4,10 +4,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2005 Fred Gleason -## -## $Id: Makefile.am,v 1.9.14.1 2012/11/29 01:37:35 cvs Exp $ -## $Date: 2012/11/29 01:37:35 $ +## (C) Copyright 2002-2005,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/debian/patches/Makefile.am b/debian/patches/Makefile.am index 8123cf537..3a249fe6e 100644 --- a/debian/patches/Makefile.am +++ b/debian/patches/Makefile.am @@ -4,10 +4,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2005 Fred Gleason -## -## $Id: Makefile.am,v 1.1 2007/06/07 15:09:43 grauf Exp $ -## $Date: 2007/06/07 15:09:43 $ +## (C) Copyright 2002-2005,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 883ec522e..836c19ba9 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -2,10 +2,7 @@ ## ## docs/examples/automake.am for Rivendell ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.1.6.1 2013/12/10 21:25:49 cvs Exp $ -## $Date: 2013/12/10 21:25:49 $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/get_distro.sh b/get_distro.sh index 9ecbe2e67..4dd7012c6 100755 --- a/get_distro.sh +++ b/get_distro.sh @@ -5,9 +5,7 @@ # Try to determine the distribution name and version of the host machine. # Used as part of the AR_GET_DISTRO() macro. # -# (C) Copyright 2012 Fred Gleason -# -# $Id: get_distro.sh,v 1.1.1.1 2014/02/17 13:26:17 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/get_target.sh b/get_target.sh index b24a8faac..ad071a068 100755 --- a/get_target.sh +++ b/get_target.sh @@ -5,9 +5,7 @@ # Return machine target information from gcc(1) # Used as part of the AR_GCC_TARGET() macro. # -# (C) Copyright 2012 Fred Gleason -# -# $Id: get_target.sh,v 1.1.1.1 2014/02/17 13:26:17 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as diff --git a/helpers/Makefile.am b/helpers/Makefile.am index 0d5ab5a34..f1d2a1cd2 100644 --- a/helpers/Makefile.am +++ b/helpers/Makefile.am @@ -2,10 +2,7 @@ ## ## helper/ Automake.am for Rivendell ## -## (C) Copyright 2003-2005 Fred Gleason -## -## $Id: Makefile.am,v 1.9.6.1 2012/11/29 01:37:35 cvs Exp $ -## $Date: 2012/11/29 01:37:35 $ +## (C) Copyright 2003-2005,2016 Fred Gleason ## ## Use automake to process this into a Makefile.in ## diff --git a/helpers/cwrap.cpp b/helpers/cwrap.cpp index ac7ee4078..c7ceddb28 100644 --- a/helpers/cwrap.cpp +++ b/helpers/cwrap.cpp @@ -3,10 +3,7 @@ // A utility for wrapping arbitrary file data in C-compaibile source // statements. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: cwrap.cpp,v 1.3 2007/02/14 21:48:41 fredg Exp $ -// $Date: 2007/02/14 21:48:41 $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/helpers/cwrap.h b/helpers/cwrap.h index 399cc4224..9fff2760b 100644 --- a/helpers/cwrap.h +++ b/helpers/cwrap.h @@ -3,10 +3,7 @@ // A utility for wrapping arbitrary file data in C-compaibile source // statements. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: cwrap.h,v 1.3 2007/02/14 21:48:41 fredg Exp $ -// $Date: 2007/02/14 21:48:41 $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/helpers/rdpack.sh b/helpers/rdpack.sh index 912eb67ce..e0691a21b 100755 --- a/helpers/rdpack.sh +++ b/helpers/rdpack.sh @@ -4,10 +4,7 @@ # # A shell utility for packaging Rivendell translation files. # -# (C) Copyright 2005,2008 Fred Gleason -# -# $Id: rdpack.sh,v 1.6 2010/07/29 19:32:32 cvs Exp $ -# $Date: 2010/07/29 19:32:32 $ +# (C) Copyright 2005,2008,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/helpers/rdtrans.sh b/helpers/rdtrans.sh index c5650e79d..b58b0e422 100755 --- a/helpers/rdtrans.sh +++ b/helpers/rdtrans.sh @@ -4,10 +4,7 @@ # # A shell utility for managing Rivendell translation files. # -# (C) Copyright 2005,2008 Fred Gleason -# -# $Id: rdtrans.sh,v 1.7 2010/07/29 19:32:32 cvs Exp $ -# $Date: 2010/07/29 19:32:32 $ +# (C) Copyright 2005,2008,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/helpers/rdtransgui.sh b/helpers/rdtransgui.sh index ca3d3d3cc..cbbf3fb17 100644 --- a/helpers/rdtransgui.sh +++ b/helpers/rdtransgui.sh @@ -5,10 +5,7 @@ # A GUi interface for rdtrans.sh script that is used to manage Rivendell # translation files. # -# (C) Copyright 2010 Frederick Henderson -# -# $Id: rdtransgui.sh,v 1.1 2011/03/01 21:00:07 cvs Exp $ -# $Date: 2011/03/01 21:00:07 $ +# (C) Copyright 2010,2016 Frederick Henderson # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/helpers/setenvvar.sh b/helpers/setenvvar.sh index 2c0933ffc..95204b65a 100644 --- a/helpers/setenvvar.sh +++ b/helpers/setenvvar.sh @@ -5,10 +5,7 @@ # A utility for setting environmental variables to be used by the # rdtrans.sh script that is used to manage Rivendell translation files. # -# (C) Copyright 2010 Frederick Henderson -# -# $Id: setenvvar.sh,v 1.1 2011/03/01 21:00:07 cvs Exp $ -# $Date: 2011/03/01 21:00:07 $ +# (C) Copyright 2010,2016 Frederick Henderson # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/icons/Makefile.am b/icons/Makefile.am index 3c3666cf9..e56b74531 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -2,10 +2,7 @@ ## ## icons/automake.am for Rivendell ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.19.2.3 2013/12/30 19:56:11 cvs Exp $ -## $Date: 2013/12/30 19:56:11 $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/importers/Makefile.am b/importers/Makefile.am index 878232ee0..9da4f88af 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -2,10 +2,7 @@ ## ## Automake.am for rivendell/importers ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.18.8.2 2012/11/29 01:37:35 cvs Exp $ -## $Date: 2012/11/29 01:37:35 $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/importers/export_slax b/importers/export_slax index 023807c03..ffcf9ad95 100755 --- a/importers/export_slax +++ b/importers/export_slax @@ -4,10 +4,7 @@ # # Export the current Rivendell archive as a SLAX module. # -# (C) Copyright 2006 Fred Gleason -# -# $Id: export_slax,v 1.4 2007/02/14 21:48:41 fredg Exp $ -# $Date: 2007/02/14 21:48:41 $ +# (C) Copyright 2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index 0b6060c55..c80d7d2bc 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -4,8 +4,6 @@ // // (C) Copyright 2012 Fred Gleason // -// $Id: nexgen_filter.cpp,v 1.1.2.8 2013/06/20 20:24:45 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -55,8 +53,8 @@ RDConfig *rdconfig; -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { QString group_name; QString audio_dir; @@ -708,6 +706,6 @@ void MainObject::Print(const QString &msg) const int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/nexgen_filter.h b/importers/nexgen_filter.h index ba26a6c48..b298899fb 100644 --- a/importers/nexgen_filter.h +++ b/importers/nexgen_filter.h @@ -4,8 +4,6 @@ // // (C) Copyright 2012 Fred Gleason // -// $Id: nexgen_filter.h,v 1.1.2.5 2013/06/20 20:24:45 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -42,7 +40,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void ProcessArchive(const QString &filename); diff --git a/importers/panel_copy.cpp b/importers/panel_copy.cpp index 98616b634..6c6442140 100644 --- a/importers/panel_copy.cpp +++ b/importers/panel_copy.cpp @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2005 Fred Gleason // -// $Id: panel_copy.cpp,v 1.7 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -33,8 +30,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { bool found=false; QString src_hostname; @@ -214,6 +211,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/panel_copy.h b/importers/panel_copy.h index 2d6714a1a..6c13949f5 100644 --- a/importers/panel_copy.h +++ b/importers/panel_copy.h @@ -2,10 +2,7 @@ // // A utility for copying SoundPanel assignments between databases. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: panel_copy.h,v 1.5 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +33,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QSqlDatabase *src_db; diff --git a/importers/rdcatch_copy.cpp b/importers/rdcatch_copy.cpp index 602168dc8..3d6b26e2c 100644 --- a/importers/rdcatch_copy.cpp +++ b/importers/rdcatch_copy.cpp @@ -2,10 +2,7 @@ // // An RDCatch event copier. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcatch_copy.cpp,v 1.8 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +30,8 @@ #include #include -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { bool found=false; QString src_hostname; @@ -330,6 +327,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/rdcatch_copy.h b/importers/rdcatch_copy.h index 9a9bf78c9..c6e89afa4 100644 --- a/importers/rdcatch_copy.h +++ b/importers/rdcatch_copy.h @@ -2,10 +2,7 @@ // // An RDCatch event copier. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcatch_copy.h,v 1.6 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,7 +37,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QSqlDatabase *src_db; diff --git a/importers/rivendell_filter.cpp b/importers/rivendell_filter.cpp index 0b37d7b5f..de6b68daf 100644 --- a/importers/rivendell_filter.cpp +++ b/importers/rivendell_filter.cpp @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2005,2008 Fred Gleason // -// $Id: rivendell_filter.cpp,v 1.3 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -46,8 +43,8 @@ RDConfig *rdconfig; -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { QString ext_dbname; QString ext_hostname; @@ -492,6 +489,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/rivendell_filter.h b/importers/rivendell_filter.h index 91fb528a9..8c36fe6c6 100644 --- a/importers/rivendell_filter.h +++ b/importers/rivendell_filter.h @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2005, 2008 Fred Gleason // -// $Id: rivendell_filter.h,v 1.3 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -36,7 +33,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); }; diff --git a/importers/sas_filter.cpp b/importers/sas_filter.cpp index 1ef095e2f..90367ec0e 100644 --- a/importers/sas_filter.cpp +++ b/importers/sas_filter.cpp @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2004 Fred Gleason // -// $Id: sas_filter.cpp,v 1.11 2011/06/21 22:20:43 cvs Exp $ -// $Date: 2011/06/21 22:20:43 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -42,8 +39,8 @@ // -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { bool skip_db_check=false; unsigned schema=0; @@ -95,7 +92,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // RDCatchd Connection // - filter_connect=new RDCatchConnect(0,this,"filter_connect"); + filter_connect=new RDCatchConnect(0,this); filter_connect->connectHost("localhost",RDCATCHD_TCP_PORT, rd_config->password()); @@ -278,6 +275,6 @@ void MainObject::InjectCartEvent(QString sql,int gpo) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/sas_filter.h b/importers/sas_filter.h index 39595c7a6..a3455d0f4 100644 --- a/importers/sas_filter.h +++ b/importers/sas_filter.h @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2004 Fred Gleason // -// $Id: sas_filter.h,v 1.7 2010/07/29 19:32:32 cvs Exp $ -// $Date: 2010/07/29 19:32:32 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -40,7 +37,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void InsertList(); diff --git a/importers/wings_filter.cpp b/importers/wings_filter.cpp index 0038df18d..7342b9d49 100644 --- a/importers/wings_filter.cpp +++ b/importers/wings_filter.cpp @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2004 Fred Gleason // -// $Id: wings_filter.cpp,v 1.13 2010/07/29 19:32:33 cvs Exp $ -// $Date: 2010/07/29 19:32:33 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -43,8 +40,8 @@ RDConfig *rdconfig; -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { // // Read Command Options @@ -324,6 +321,6 @@ void MainObject::TrimSpaces(char *str) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(NULL); return a.exec(); } diff --git a/importers/wings_filter.h b/importers/wings_filter.h index f7eaa2df6..d47b1fc07 100644 --- a/importers/wings_filter.h +++ b/importers/wings_filter.h @@ -4,9 +4,6 @@ // // (C) Copyright 2002-2005 Fred Gleason // -// $Id: wings_filter.h,v 1.9 2010/07/29 19:32:33 cvs Exp $ -// $Date: 2010/07/29 19:32:33 $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -56,7 +53,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: bool ImportCut(RDGroup *group,struct WingsRecord *rec,RDWaveFile *wavefile); diff --git a/install-init.sh b/install-init.sh index 2ffd3ebc7..a140f0c4b 100755 --- a/install-init.sh +++ b/install-init.sh @@ -4,9 +4,7 @@ # # Install the init scripts for Rivendell # -# (C) Copyright 2005 Fred Gleason -# -# $Id: install-init.sh,v 1.7 2010/07/29 19:32:30 cvs Exp $ +# (C) Copyright 2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/ios/Makefile.am b/ios/Makefile.am index 33b2b1a44..46749a2f6 100644 --- a/ios/Makefile.am +++ b/ios/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/ios ## -## (C) Copyright 2011 Fred Gleason -## -## $Id: Makefile.am,v 1.1.6.1 2012/11/29 01:37:35 cvs Exp $ +## (C) Copyright 2011,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as diff --git a/ios/rmlsend/Classes/Makefile.am b/ios/rmlsend/Classes/Makefile.am index 8945707a4..f30c3ad7f 100644 --- a/ios/rmlsend/Classes/Makefile.am +++ b/ios/rmlsend/Classes/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/ios/rmlsend/Classes ## -## (C) Copyright 2011 Fred Gleason -## -## $Id: Makefile.am,v 1.1 2011/05/27 16:53:00 cvs Exp $ +## (C) Copyright 2011,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as diff --git a/ios/rmlsend/Classes/RMLSendAppDelegate.h b/ios/rmlsend/Classes/RMLSendAppDelegate.h index 20a26fe41..d0f6de25e 100644 --- a/ios/rmlsend/Classes/RMLSendAppDelegate.h +++ b/ios/rmlsend/Classes/RMLSendAppDelegate.h @@ -2,10 +2,8 @@ // RMLSendAppDelegate.h // RMLSend // -// (C) Copyright 2010 Fred Gleason +// (C) Copyright 2010,2016 Fred Gleason // -// $Id: RMLSendAppDelegate.h,v 1.2 2011/05/27 17:20:14 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/ios/rmlsend/Classes/RMLSendAppDelegate.m b/ios/rmlsend/Classes/RMLSendAppDelegate.m index b1525b9c8..4a9056cf8 100644 --- a/ios/rmlsend/Classes/RMLSendAppDelegate.m +++ b/ios/rmlsend/Classes/RMLSendAppDelegate.m @@ -2,9 +2,7 @@ // RMLSendAppDelegate.m // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id: RMLSendAppDelegate.m,v 1.3 2011/05/31 22:47:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/Classes/RMLSendViewController.h b/ios/rmlsend/Classes/RMLSendViewController.h index f8b212ff7..36c5d48fa 100644 --- a/ios/rmlsend/Classes/RMLSendViewController.h +++ b/ios/rmlsend/Classes/RMLSendViewController.h @@ -2,9 +2,7 @@ // RMLSendViewController.h // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id: RMLSendViewController.h,v 1.3 2011/05/31 22:47:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/Classes/RMLSendViewController.m b/ios/rmlsend/Classes/RMLSendViewController.m index 9f67605d0..162608b36 100644 --- a/ios/rmlsend/Classes/RMLSendViewController.m +++ b/ios/rmlsend/Classes/RMLSendViewController.m @@ -2,9 +2,7 @@ // RMLSendViewController.m // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id: RMLSendViewController.m,v 1.3 2011/05/31 22:47:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/Classes/TextFieldDelegate.h b/ios/rmlsend/Classes/TextFieldDelegate.h index 9317e8c90..9cc9edebc 100644 --- a/ios/rmlsend/Classes/TextFieldDelegate.h +++ b/ios/rmlsend/Classes/TextFieldDelegate.h @@ -2,9 +2,7 @@ // TextFieldDelegate.h // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id: TextFieldDelegate.h,v 1.2 2011/05/27 17:20:14 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/Classes/TextFieldDelegate.m b/ios/rmlsend/Classes/TextFieldDelegate.m index 768d9e149..a5a46a95d 100644 --- a/ios/rmlsend/Classes/TextFieldDelegate.m +++ b/ios/rmlsend/Classes/TextFieldDelegate.m @@ -2,9 +2,7 @@ // TextFieldDelegate.m // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id: TextFieldDelegate.m,v 1.2 2011/05/27 17:20:14 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/Makefile.am b/ios/rmlsend/Makefile.am index 39a0c481a..3d5f7a0d3 100644 --- a/ios/rmlsend/Makefile.am +++ b/ios/rmlsend/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/ios/rmlsend ## -## (C) Copyright 2011 Fred Gleason -## -## $Id: Makefile.am,v 1.1.6.1 2012/11/29 01:37:35 cvs Exp $ +## (C) Copyright 2011,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as diff --git a/ios/rmlsend/RMLSend.xcodeproj/Makefile.am b/ios/rmlsend/RMLSend.xcodeproj/Makefile.am index 054d1db92..a2d3e64bc 100644 --- a/ios/rmlsend/RMLSend.xcodeproj/Makefile.am +++ b/ios/rmlsend/RMLSend.xcodeproj/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/ios/rmlsend/RMLSend.xcodeproj ## -## (C) Copyright 2011 Fred Gleason -## -## $Id: Makefile.am,v 1.1.6.1 2012/11/29 01:37:35 cvs Exp $ +## (C) Copyright 2011,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as diff --git a/ios/rmlsend/RMLSend_Prefix.pch b/ios/rmlsend/RMLSend_Prefix.pch index 827e56dc3..88e458ba1 100644 --- a/ios/rmlsend/RMLSend_Prefix.pch +++ b/ios/rmlsend/RMLSend_Prefix.pch @@ -1,9 +1,7 @@ // // Prefix header for all source files of the 'RMLSend' target in the 'RMLSend' project // -// (C) Copyright 2010 Fred Gleason -// -// $Id:$ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ios/rmlsend/main.m b/ios/rmlsend/main.m index 62e6a42af..3338582ac 100644 --- a/ios/rmlsend/main.m +++ b/ios/rmlsend/main.m @@ -2,9 +2,7 @@ // main.m // RMLSend // -// (C) Copyright 2010 Fred Gleason -// -// $Id:$ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_bmiemr.cpp b/lib/export_bmiemr.cpp index 952b1cc67..5a1dc08e2 100644 --- a/lib/export_bmiemr.cpp +++ b/lib/export_bmiemr.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to BMI EMR Format // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: export_bmiemr.cpp,v 1.10.8.1.2.1 2014/03/19 23:50:20 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_deltaflex.cpp b/lib/export_deltaflex.cpp index dc128834f..ac9d6be64 100644 --- a/lib/export_deltaflex.cpp +++ b/lib/export_deltaflex.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to CBSI DeltaFlex // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: export_deltaflex.cpp,v 1.12.6.1 2013/02/08 21:41:44 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_musicclassical.cpp b/lib/export_musicclassical.cpp index fd0c835d4..666eec5ff 100644 --- a/lib/export_musicclassical.cpp +++ b/lib/export_musicclassical.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Classical Music Playout report // -// (C) Copyright 2014 Fred Gleason -// -// $Id: export_musicclassical.cpp,v 1.1.2.1 2014/05/20 22:39:33 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_musicplayout.cpp b/lib/export_musicplayout.cpp index abe2b8839..72cf9faa7 100644 --- a/lib/export_musicplayout.cpp +++ b/lib/export_musicplayout.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to an ASCII Text File. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: export_musicplayout.cpp,v 1.1.2.2.2.1 2014/05/20 22:39:33 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_musicsummary.cpp b/lib/export_musicsummary.cpp index d961c0756..b042f4e77 100644 --- a/lib/export_musicsummary.cpp +++ b/lib/export_musicsummary.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to an ASCII Text File. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: export_musicsummary.cpp,v 1.1.2.1 2012/08/13 20:08:27 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_nprsoundex.cpp b/lib/export_nprsoundex.cpp index 475d74f4e..612315301 100644 --- a/lib/export_nprsoundex.cpp +++ b/lib/export_nprsoundex.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell NPR SoundExchange Report to an ASCII Text File. // -// (C) Copyright 2002-2006,2013 Fred Gleason -// -// $Id: export_nprsoundex.cpp,v 1.1.2.2.2.1 2014/06/24 18:27:03 cvs Exp $ +// (C) Copyright 2002-2006,2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_radiotraffic.cpp b/lib/export_radiotraffic.cpp index 7544b5f40..f5ca6bc5c 100644 --- a/lib/export_radiotraffic.cpp +++ b/lib/export_radiotraffic.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to RadioTraffic.com // -// (C) Copyright 2002-2005,2009 Fred Gleason -// -// $Id: export_radiotraffic.cpp,v 1.2.8.1 2013/02/08 21:41:44 cvs Exp $ +// (C) Copyright 2002-2005,2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_soundex.cpp b/lib/export_soundex.cpp index 33b56f246..757976567 100644 --- a/lib/export_soundex.cpp +++ b/lib/export_soundex.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell SoundExchange Report to an ASCII Text File. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: export_soundex.cpp,v 1.9 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_technical.cpp b/lib/export_technical.cpp index bfdc014a6..c75e1ff56 100644 --- a/lib/export_technical.cpp +++ b/lib/export_technical.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Technical Report to an ASCII Text File. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: export_technical.cpp,v 1.9.8.1 2012/11/16 18:10:39 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/export_textlog.cpp b/lib/export_textlog.cpp index 5ca10fc63..b29a7de53 100644 --- a/lib/export_textlog.cpp +++ b/lib/export_textlog.cpp @@ -2,9 +2,7 @@ // // Export a Rivendell Report to an ASCII Text File. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: export_textlog.cpp,v 1.11.8.1 2012/11/16 18:10:39 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/gpio.h b/lib/gpio.h index 6c06aebe8..db6c14741 100644 --- a/lib/gpio.h +++ b/lib/gpio.h @@ -2,9 +2,7 @@ // // A device driver for MeasurementComputing GPIO cards. // -// Copyright 2002-2003 Fred Gleason -// -// $Id: gpio.h,v 1.1 2007/09/18 11:20:00 fredg Exp $ +// Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/html_gpl2_win32.cpp b/lib/html_gpl2_win32.cpp index 577398253..c35a1c174 100644 --- a/lib/html_gpl2_win32.cpp +++ b/lib/html_gpl2_win32.cpp @@ -1,8 +1,6 @@ // html_gpl2_win32.cpp // -// Copyright 2002-2003 Fred Gleason -// -// $Id: html_gpl2_win32.cpp,v 1.1 2007/09/14 14:06:24 fredg Exp $ +// Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rd.h b/lib/rd.h index 9a87290ae..31bd8a19c 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -2,9 +2,7 @@ // // System-Wide Values for Rivendell // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rd.h,v 1.194.6.14.2.1 2014/05/22 14:30:44 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdadd_cart.cpp b/lib/rdadd_cart.cpp index 92636b77e..28b66e311 100644 --- a/lib/rdadd_cart.cpp +++ b/lib/rdadd_cart.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Cart // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdadd_cart.cpp,v 1.8.10.1 2014/05/19 19:31:15 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title, const QString &username,RDSystem *system, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; diff --git a/lib/rdadd_cart.h b/lib/rdadd_cart.h index 269555d7b..607302897 100644 --- a/lib/rdadd_cart.h +++ b/lib/rdadd_cart.h @@ -2,9 +2,7 @@ // // Add a Rivendell Cart // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdadd_cart.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,7 @@ class RDAddCart : public QDialog Q_OBJECT public: RDAddCart(QString *group,RDCart::Type *type,QString *title, - const QString &username,RDSystem *system, - QWidget *parent=0,const char *name=0); + const QString &username,RDSystem *system,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdadd_log.cpp b/lib/rdadd_log.cpp index 1c80442b4..14a91bc9a 100644 --- a/lib/rdadd_log.cpp +++ b/lib/rdadd_log.cpp @@ -2,9 +2,7 @@ // // Create a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdadd_log.cpp,v 1.15.10.2 2014/05/21 20:29:01 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,9 +37,8 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname,RDStation *station, - QString caption,QWidget *parent,const char *name, - RDUser *rduser) - : QDialog(parent,name,true) + QString caption,QWidget *parent,RDUser *rduser) + : QDialog(parent,"",true) { QStringList services_list; log_name=logname; diff --git a/lib/rdadd_log.h b/lib/rdadd_log.h index c4069876d..14dcefe84 100644 --- a/lib/rdadd_log.h +++ b/lib/rdadd_log.h @@ -5,9 +5,7 @@ // This class creates a basic dialog requesting from the user a name and // corresponding service that is later used to create a new log. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdadd_log.h,v 1.8.10.1 2014/05/21 18:19:42 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,8 +45,7 @@ class RDAddLog : public QDialog * user security should be used instead of host based security. */ RDAddLog(QString *logname,QString *svcname,RDStation *station, - QString caption,QWidget *parent=0,const char *name=0, - RDUser *rduser=0); + QString caption,QWidget *parent=0,RDUser *rduser=0); ~RDAddLog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdairplay_conf.cpp b/lib/rdairplay_conf.cpp index 7a083de8f..12d85b288 100644 --- a/lib/rdairplay_conf.cpp +++ b/lib/rdairplay_conf.cpp @@ -2,9 +2,7 @@ // // Abstract an RDAirPlay Configuration. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdairplay_conf.cpp,v 1.35.8.6 2014/02/10 20:45:09 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdairplay_conf.h b/lib/rdairplay_conf.h index cbfc71f26..2d0c685d9 100644 --- a/lib/rdairplay_conf.h +++ b/lib/rdairplay_conf.h @@ -2,9 +2,7 @@ // // Abstract RDAirPlay Configuration // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdairplay_conf.h,v 1.36.8.5 2014/02/10 20:45:09 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdaudio_exists.cpp b/lib/rdaudio_exists.cpp index 7a076a1e1..ccf69fb23 100644 --- a/lib/rdaudio_exists.cpp +++ b/lib/rdaudio_exists.cpp @@ -2,9 +2,7 @@ // // Test for the existence of audio in a Rivendell Audio Cut. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudio_exists.cpp,v 1.10 2010/09/13 23:14:25 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdaudio_exists.h b/lib/rdaudio_exists.h index fa0de0bd9..4c4dd31ec 100644 --- a/lib/rdaudio_exists.h +++ b/lib/rdaudio_exists.h @@ -2,9 +2,7 @@ // // Test for the existence of a Rivendell Audio Cut. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudio_exists.h,v 1.3 2007/02/14 21:48:41 fredg Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,4 +24,4 @@ bool RDAudioExists(QString cutname); -#endif +#endif // RDAUDIO_EXISTS_H diff --git a/lib/rdaudio_port.cpp b/lib/rdaudio_port.cpp index 825f8e874..4ba3c13c7 100644 --- a/lib/rdaudio_port.cpp +++ b/lib/rdaudio_port.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Audio Port. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudio_port.cpp,v 1.12.8.1 2012/08/03 16:52:39 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdaudio_port.h b/lib/rdaudio_port.h index 226111bae..7bc026676 100644 --- a/lib/rdaudio_port.h +++ b/lib/rdaudio_port.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Audio Port // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudio_port.h,v 1.9.8.1 2012/08/03 16:52:39 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdaudioconvert.cpp b/lib/rdaudioconvert.cpp index 6e75a8202..aa78ddcb6 100644 --- a/lib/rdaudioconvert.cpp +++ b/lib/rdaudioconvert.cpp @@ -56,9 +56,8 @@ #define STAGE2_XFER_SIZE 2048 #define STAGE2_BUFFER_SIZE 49152 -RDAudioConvert::RDAudioConvert(const QString &station_name, - QObject *parent,const char *name) - : QObject(parent,name) +RDAudioConvert::RDAudioConvert(const QString &station_name,QObject *parent) + : QObject(parent) { conv_start_point=-1; conv_end_point=-1; diff --git a/lib/rdaudioconvert.h b/lib/rdaudioconvert.h index c53f7d3c8..e41a531bc 100644 --- a/lib/rdaudioconvert.h +++ b/lib/rdaudioconvert.h @@ -48,8 +48,7 @@ class RDAudioConvert : public QObject ErrorNoDestination=3,ErrorInvalidSource=4,ErrorInternal=5, ErrorFormatNotSupported=6,ErrorNoDisc=7,ErrorNoTrack=8, ErrorInvalidSpeed=9,ErrorFormatError=10,ErrorNoSpace=11}; - RDAudioConvert(const QString &station_name, - QObject *parent=0,const char *name=0); + RDAudioConvert(const QString &station_name,QObject *parent=0); ~RDAudioConvert(); void setSourceFile(const QString &filename); void setDestinationFile(const QString &filename); diff --git a/lib/rdaudioexport.cpp b/lib/rdaudioexport.cpp index e1535292f..8096a4375 100644 --- a/lib/rdaudioexport.cpp +++ b/lib/rdaudioexport.cpp @@ -2,9 +2,7 @@ // // Export an Audio File using the RdXport Web Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdaudioexport.cpp,v 1.8.4.1 2013/11/13 23:36:30 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -54,8 +52,8 @@ int ExportProgressCallback(void *clientp,double dltotal,double dlnow, RDAudioExport::RDAudioExport(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) + QObject *parent) + : QObject(parent) { conv_station=station; conv_config=config; diff --git a/lib/rdaudioexport.h b/lib/rdaudioexport.h index 9346275b5..8354df519 100644 --- a/lib/rdaudioexport.h +++ b/lib/rdaudioexport.h @@ -2,9 +2,7 @@ // // Export an Audio File using the RdXport Web Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdaudioexport.h,v 1.4.4.1 2013/11/13 23:36:30 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,8 +36,7 @@ class RDAudioExport : public QObject ErrorNoDestination=3,ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorConverter=11}; - RDAudioExport(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDAudioExport(RDStation *station,RDConfig *config,QObject *parent=0); void setCartNumber(unsigned cartnum); void setCutNumber(unsigned cutnum); void setDestinationFile(const QString &filename); diff --git a/lib/rdaudioimport.cpp b/lib/rdaudioimport.cpp index 816e58fa9..3589b5d95 100644 --- a/lib/rdaudioimport.cpp +++ b/lib/rdaudioimport.cpp @@ -2,7 +2,7 @@ // // Import an Audio File using the RdXport Web Service // -// (C) Copyright 2010-2014 Fred Gleason +// (C) Copyright 2010-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -63,8 +63,8 @@ int ImportProgressCallback(void *clientp,double dltotal,double dlnow, RDAudioImport::RDAudioImport(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) + QObject *parent) + : QObject(parent) { conv_station=station; conv_config=config; diff --git a/lib/rdaudioimport.h b/lib/rdaudioimport.h index bf484b973..b4eb05a2d 100644 --- a/lib/rdaudioimport.h +++ b/lib/rdaudioimport.h @@ -2,7 +2,7 @@ // // Import an Audio File using the RdXport Web Service // -// (C) Copyright 2010-2014 Fred Gleason +// (C) Copyright 2010-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +36,7 @@ class RDAudioImport : public QObject ErrorNoDestination=3,ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorConverter=11}; - RDAudioImport(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDAudioImport(RDStation *station,RDConfig *config,QObject *parent=0); void setCartNumber(unsigned cartnum); void setCutNumber(unsigned cutnum); void setSourceFile(const QString &filename); diff --git a/lib/rdaudioinfo.cpp b/lib/rdaudioinfo.cpp index d6f914290..ef7622854 100644 --- a/lib/rdaudioinfo.cpp +++ b/lib/rdaudioinfo.cpp @@ -2,9 +2,7 @@ // // Get information about a cut in the audio store. // -// (C) Copyright 2011 Fred Gleason -// -// $Id: rdaudioinfo.cpp,v 1.3.4.3 2013/11/13 23:36:30 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,9 +45,8 @@ size_t RDAudioInfoCallback(void *ptr,size_t size,size_t nmemb,void *userdata) } -RDAudioInfo::RDAudioInfo(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) +RDAudioInfo::RDAudioInfo(RDStation *station,RDConfig *config,QObject *parent) + : QObject(parent) { conv_station=station; conv_config=config; diff --git a/lib/rdaudioinfo.h b/lib/rdaudioinfo.h index a7306b570..219092c2b 100644 --- a/lib/rdaudioinfo.h +++ b/lib/rdaudioinfo.h @@ -2,9 +2,7 @@ // // Get information about a cut in the audio store. // -// (C) Copyright 2011 Fred Gleason -// -// $Id: rdaudioinfo.h,v 1.1.6.2 2013/11/13 23:36:31 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,8 +33,7 @@ class RDAudioInfo : public QObject public: enum ErrorCode {ErrorOk=0,ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorNoAudio=10}; - RDAudioInfo(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDAudioInfo(RDStation *station,RDConfig *config,QObject *parent=0); RDWaveFile::Format format() const; unsigned channels() const; unsigned sampleRate() const; diff --git a/lib/rdaudiosettings.cpp b/lib/rdaudiosettings.cpp index 834b17a46..7fcbd1059 100644 --- a/lib/rdaudiosettings.cpp +++ b/lib/rdaudiosettings.cpp @@ -2,9 +2,7 @@ // // Common Audio Settings // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudiosettings.cpp,v 1.1 2007/09/14 14:06:24 fredg Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdaudiosettings.h b/lib/rdaudiosettings.h index b62c7a5b4..a82117b09 100644 --- a/lib/rdaudiosettings.h +++ b/lib/rdaudiosettings.h @@ -2,9 +2,7 @@ // // A container class for audio settings. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudiosettings.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdaudiosettings_dialog.cpp b/lib/rdaudiosettings_dialog.cpp index ba825e92e..54bb46073 100644 --- a/lib/rdaudiosettings_dialog.cpp +++ b/lib/rdaudiosettings_dialog.cpp @@ -2,9 +2,7 @@ // // Edit an RDAudioSettings object. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudiosettings_dialog.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -37,9 +35,8 @@ RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, - bool mpeg, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + bool mpeg,QWidget *parent) + : QDialog(parent,"",true) { lib_lib=settings; diff --git a/lib/rdaudiosettings_dialog.h b/lib/rdaudiosettings_dialog.h index a2843f504..75e2829b5 100644 --- a/lib/rdaudiosettings_dialog.h +++ b/lib/rdaudiosettings_dialog.h @@ -2,9 +2,7 @@ // // Edit Rivendell Audio Settings // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdaudiosettings_dialog.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -35,7 +33,7 @@ class RDAudioSettingsDialog : public QDialog Q_OBJECT public: RDAudioSettingsDialog(RDAudioSettings *settings,bool mpeg=true, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~RDAudioSettingsDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdaudiostore.cpp b/lib/rdaudiostore.cpp index d07fbd54a..3fe62af1c 100644 --- a/lib/rdaudiostore.cpp +++ b/lib/rdaudiostore.cpp @@ -2,7 +2,7 @@ // // Get information about the audio store. // -// (C) Copyright 2014 Fred Gleason +// (C) Copyright 2014-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -45,9 +45,8 @@ size_t RDAudioStoreCallback(void *ptr,size_t size,size_t nmemb,void *userdata) } -RDAudioStore::RDAudioStore(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) +RDAudioStore::RDAudioStore(RDStation *station,RDConfig *config,QObject *parent) + : QObject(parent) { conv_station=station; conv_config=config; diff --git a/lib/rdaudiostore.h b/lib/rdaudiostore.h index a06ed6bb3..f1dda6269 100644 --- a/lib/rdaudiostore.h +++ b/lib/rdaudiostore.h @@ -2,7 +2,7 @@ // // Get information about the audio store. // -// (C) Copyright 2014 Fred Gleason +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,8 +34,7 @@ class RDAudioStore : public QObject public: enum ErrorCode {ErrorOk=0,ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorNoAudio=10}; - RDAudioStore(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDAudioStore(RDStation *station,RDConfig *config,QObject *parent=0); uint64_t freeBytes() const; uint64_t totalBytes() const; RDAudioStore::ErrorCode runStore(const QString &username, diff --git a/lib/rdbusybar.cpp b/lib/rdbusybar.cpp index c8ca38271..1a078e5c4 100644 --- a/lib/rdbusybar.cpp +++ b/lib/rdbusybar.cpp @@ -2,11 +2,8 @@ // // A 'progress bar' widget that shows busy state. // -// (C) Copyright 2010 Fred Gleason +// (C) Copyright 2010,2016 Fred Gleason // -// $Id: rdbusybar.cpp,v 1.2 2010/07/29 19:32:33 cvs Exp $ -// -// This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License // version 2 as published by the Free Software Foundation. // @@ -23,8 +20,8 @@ #include -RDBusyBar::RDBusyBar(QWidget *parent,const char *name,WFlags f) - : QFrame(parent,name,f) +RDBusyBar::RDBusyBar(QWidget *parent,WFlags f) + : QFrame(parent,"",f) { bar_pos=0; setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); diff --git a/lib/rdbusybar.h b/lib/rdbusybar.h index c3712c5a9..acb41d845 100644 --- a/lib/rdbusybar.h +++ b/lib/rdbusybar.h @@ -2,9 +2,7 @@ // // A 'progress bar' widget that shows busy state. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdbusybar.h,v 1.2.8.1 2012/11/26 20:19:36 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -34,7 +32,7 @@ class RDBusyBar : public QFrame Q_OBJECT public: - RDBusyBar(QWidget *parent=0,const char *name=0,WFlags f=0); + RDBusyBar(QWidget *parent=0,WFlags f=0); public slots: void activate(bool state); diff --git a/lib/rdbusydialog.cpp b/lib/rdbusydialog.cpp index f9b40e86f..ea0932d8d 100644 --- a/lib/rdbusydialog.cpp +++ b/lib/rdbusydialog.cpp @@ -2,9 +2,7 @@ // // A 'progress dialog' widget that shows busy state. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdbusydialog.cpp,v 1.1.2.1 2012/11/26 20:19:36 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -23,8 +21,8 @@ #include -RDBusyDialog::RDBusyDialog(QWidget *parent,const char *name,WFlags f) - : QDialog(parent,name,true,f) +RDBusyDialog::RDBusyDialog(QWidget *parent,WFlags f) + : QDialog(parent,"",true,f) { QFont font("helvetica",16,QFont::Bold); font.setPixelSize(16); diff --git a/lib/rdbusydialog.h b/lib/rdbusydialog.h index bc4fe452a..ffbfe34a1 100644 --- a/lib/rdbusydialog.h +++ b/lib/rdbusydialog.h @@ -2,9 +2,7 @@ // // A 'progress dialog' widget that shows busy state. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdbusydialog.h,v 1.1.2.1 2012/11/26 20:19:36 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDBUSYDIALOG_H #define RDBUSYDIALOG_H @@ -33,7 +30,7 @@ class RDBusyDialog : public QDialog { Q_OBJECT; public: - RDBusyDialog(QWidget *parent=0,const char *name=0,WFlags f=0); + RDBusyDialog(QWidget *parent=0,WFlags f=0); ~RDBusyDialog(); QSize sizeHint() const; void show(const QString &caption,const QString &label); diff --git a/lib/rdbutton_dialog.cpp b/lib/rdbutton_dialog.cpp index 21d4d47cd..6ee7ff6eb 100644 --- a/lib/rdbutton_dialog.cpp +++ b/lib/rdbutton_dialog.cpp @@ -2,9 +2,7 @@ // // Event Editor for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdbutton_dialog.cpp,v 1.23.6.1.2.1 2014/03/21 15:41:44 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +31,8 @@ RDButtonDialog::RDButtonDialog(QString station_name, const QString &label_template, RDCartDialog *cart_dialog,const QString &svcname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size diff --git a/lib/rdbutton_dialog.h b/lib/rdbutton_dialog.h index 9a14b228d..154945105 100644 --- a/lib/rdbutton_dialog.h +++ b/lib/rdbutton_dialog.h @@ -1,11 +1,8 @@ - // rdbutton_dialog.h // // Button Editor for the SoundPanel in RDAirPlay. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdbutton_dialog.h,v 1.14.8.1 2012/11/26 20:19:36 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,14 +34,7 @@ class RDButtonDialog : public QDialog public: RDButtonDialog(QString station_name,const QString &label_template, RDCartDialog *cart_dialog,const QString &svcname, - QWidget *parent=0,const char *name=0); -/* - RDButtonDialog(QString station_name,const QString &label_template, - RDCae *cae,RDRipc *ripc,RDStation *station, - int audition_card,int audition_port, - const QString &editor_cmd, - QWidget *parent=0,const char *name=0); -*/ + QWidget *parent=0); ~RDButtonDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdbutton_panel.cpp b/lib/rdbutton_panel.cpp index 98e57a68b..4526c01c9 100644 --- a/lib/rdbutton_panel.cpp +++ b/lib/rdbutton_panel.cpp @@ -2,9 +2,7 @@ // // The sound panel widget for RDAirPlay // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdbutton_panel.cpp,v 1.12.6.4 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdbutton_panel.h b/lib/rdbutton_panel.h index 445afed30..861350ed4 100644 --- a/lib/rdbutton_panel.h +++ b/lib/rdbutton_panel.h @@ -2,9 +2,7 @@ // // The sound panel widget for RDAirPlay // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdbutton_panel.h,v 1.10.6.2 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcae.cpp b/lib/rdcae.cpp index e92fb982f..0e17be955 100644 --- a/lib/rdcae.cpp +++ b/lib/rdcae.cpp @@ -2,7 +2,7 @@ // // Connection to the Rivendell Core Audio Engine // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,9 +35,8 @@ #include #include -RDCae::RDCae(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) +RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent) + : QObject(parent) { cae_station=station; cae_config=config; diff --git a/lib/rdcae.h b/lib/rdcae.h index 1945d6863..60ac58569 100644 --- a/lib/rdcae.h +++ b/lib/rdcae.h @@ -2,7 +2,7 @@ // // Connection to the Rivendell Core Audio Engine // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,8 +42,7 @@ class RDCae : public QObject enum ChannelMode {Normal=0,Swap=1,LeftOnly=2,RightOnly=3}; enum SourceType {Analog=0,AesEbu=1}; enum AudioCoding {Pcm16=0,MpegL1=1,MpegL2=2,MpegL3=3,Pcm24=4}; - RDCae(RDStation *station,RDConfig *config, - QObject *parent=0,const char *name=0); + RDCae(RDStation *station,RDConfig *config,QObject *parent=0); ~RDCae(); void connectHost(); bool loadPlay(int card,QString name,int *stream,int *handle); diff --git a/lib/rdcardselector.cpp b/lib/rdcardselector.cpp index d1393aa75..fe4214a0f 100644 --- a/lib/rdcardselector.cpp +++ b/lib/rdcardselector.cpp @@ -2,9 +2,7 @@ // // Audio card selector widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcardselector.cpp,v 1.21.8.1 2013/03/22 15:11:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,8 +36,8 @@ #include -RDCardSelector::RDCardSelector(QWidget *parent,const char *name) - : QWidget(parent,name) +RDCardSelector::RDCardSelector(QWidget *parent) + : QWidget(parent) { card_id=-1; yoffset=0; diff --git a/lib/rdcardselector.h b/lib/rdcardselector.h index 7f52d9539..33c6d24c3 100644 --- a/lib/rdcardselector.h +++ b/lib/rdcardselector.h @@ -2,9 +2,7 @@ // // Audio Card Selector Widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcardselector.h,v 1.9.8.1 2013/03/22 15:11:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,12 +27,11 @@ #include - class RDCardSelector : public QWidget { Q_OBJECT public: - RDCardSelector(QWidget *parent=0,const char *name=0); + RDCardSelector(QWidget *parent=0); ~RDCardSelector(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index 284237094..c50167072 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -2,7 +2,7 @@ // // Abstract a Rivendell Cart. // -// (C) Copyright 2002-2004 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcart.h b/lib/rdcart.h index 16521bd74..c3f8e802c 100644 --- a/lib/rdcart.h +++ b/lib/rdcart.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Cart // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdcart.h,v 1.39.6.5.2.5 2014/05/30 00:26:28 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index 0d4572e3c..8fde434ab 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Cart. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcart_dialog.cpp,v 1.48.4.8 2014/02/11 23:46:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcart_dialog.h b/lib/rdcart_dialog.h index 29c506751..61a3941dd 100644 --- a/lib/rdcart_dialog.h +++ b/lib/rdcart_dialog.h @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Cart. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcart_dialog.h,v 1.21.4.3 2014/02/11 23:46:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcart_search_text.cpp b/lib/rdcart_search_text.cpp index 89a5efb69..66ceae139 100644 --- a/lib/rdcart_search_text.cpp +++ b/lib/rdcart_search_text.cpp @@ -2,9 +2,7 @@ // // Generates a standardized SQL 'WHERE' clause for filtering Rivendell carts. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcart_search_text.cpp,v 1.21.4.2 2013/12/11 20:54:15 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcart_search_text.h b/lib/rdcart_search_text.h index 026439c6e..bde7f132f 100644 --- a/lib/rdcart_search_text.h +++ b/lib/rdcart_search_text.h @@ -2,9 +2,7 @@ // // Generates a standardized SQL 'WHERE' clause for filtering Rivendell carts. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcart_search_text.h,v 1.10.4.1 2012/10/09 00:12:29 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,4 +32,4 @@ QString RDAllCartSearchText(const QString &filter,const QString &schedcode, const QString &user,bool incl_cuts); -#endif +#endif // RDCART_SEARCH_TEXT_H diff --git a/lib/rdcartdrag.cpp b/lib/rdcartdrag.cpp index 9f8ad643c..12f9b1568 100644 --- a/lib/rdcartdrag.cpp +++ b/lib/rdcartdrag.cpp @@ -2,9 +2,7 @@ // // Stored value drag object for Rivendell carts. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rdcartdrag.cpp,v 1.1.2.7 2014/01/20 19:13:29 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcartdrag.h b/lib/rdcartdrag.h index f8dce8390..fbb9ac395 100644 --- a/lib/rdcartdrag.h +++ b/lib/rdcartdrag.h @@ -2,9 +2,7 @@ // // Stored value drag object for Rivendell carts. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rdcartdrag.h,v 1.1.2.4 2014/01/20 19:13:29 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcartslot.cpp b/lib/rdcartslot.cpp index 3379285c3..f3250fe47 100644 --- a/lib/rdcartslot.cpp +++ b/lib/rdcartslot.cpp @@ -2,9 +2,7 @@ // // The cart slot widget. // -// (C) Copyright 2012-2014 Fred Gleason -// -// $Id: rdcartslot.cpp,v 1.13.2.19.2.2 2014/06/24 18:27:03 cvs Exp $ +// (C) Copyright 2012-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcartslot.h b/lib/rdcartslot.h index 2190967c9..f2db589e1 100644 --- a/lib/rdcartslot.h +++ b/lib/rdcartslot.h @@ -2,9 +2,7 @@ // // The cart slot widget. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdcartslot.h,v 1.8.2.11 2014/01/07 23:23:17 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcastsearch.cpp b/lib/rdcastsearch.cpp index cbeb08f38..931ae814d 100644 --- a/lib/rdcastsearch.cpp +++ b/lib/rdcastsearch.cpp @@ -2,9 +2,7 @@ // // SQL search clause for RDCastManager // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdcastsearch.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcastsearch.h b/lib/rdcastsearch.h index e1ebf177f..d6adcd2d1 100644 --- a/lib/rdcastsearch.h +++ b/lib/rdcastsearch.h @@ -2,9 +2,7 @@ // // SQL search clause for RDCastManager // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdcastsearch.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcatch_conf.cpp b/lib/rdcatch_conf.cpp index a3a82cd87..d87ef1f5f 100644 --- a/lib/rdcatch_conf.cpp +++ b/lib/rdcatch_conf.cpp @@ -2,9 +2,7 @@ // // Abstract an RDCatch Configuration. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcatch_conf.cpp,v 1.8 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include #include - // // Global Classes // diff --git a/lib/rdcatch_conf.h b/lib/rdcatch_conf.h index 22306f057..cd62bdf92 100644 --- a/lib/rdcatch_conf.h +++ b/lib/rdcatch_conf.h @@ -2,9 +2,7 @@ // // Abstract RDCatch Configuration // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcatch_conf.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - class RDCatchConf { public: diff --git a/lib/rdcatch_connect.cpp b/lib/rdcatch_connect.cpp index cea88cfd4..48b8f4881 100644 --- a/lib/rdcatch_connect.cpp +++ b/lib/rdcatch_connect.cpp @@ -2,9 +2,7 @@ // // Connect to the Rivendell Netcatcher Daemon. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcatch_connect.cpp,v 1.26 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include -RDCatchConnect::RDCatchConnect(int serial,QObject *parent,const char *name) - : QObject(parent,name) +RDCatchConnect::RDCatchConnect(int serial,QObject *parent) + : QObject(parent) { cc_serial=serial; diff --git a/lib/rdcatch_connect.h b/lib/rdcatch_connect.h index 6fb143fec..a802b2a8a 100644 --- a/lib/rdcatch_connect.h +++ b/lib/rdcatch_connect.h @@ -2,9 +2,7 @@ // // Connect to the Rivendell Netcatcher Daemon. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcatch_connect.h,v 1.19 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,12 +35,11 @@ #define CC_MAX_LENGTH 256 #define CC_HEARTBEAT_INTERVAL 15000 - class RDCatchConnect : public QObject { Q_OBJECT; public: - RDCatchConnect(int serial,QObject *parent=0,const char *name=0); + RDCatchConnect(int serial,QObject *parent=0); ~RDCatchConnect(); void connectHost(QString hostname,Q_UINT16 hostport,QString password); RDDeck::Status status(unsigned chan) const; diff --git a/lib/rdcddblookup.cpp b/lib/rdcddblookup.cpp index 56c414b0c..599d2b0d0 100644 --- a/lib/rdcddblookup.cpp +++ b/lib/rdcddblookup.cpp @@ -2,9 +2,7 @@ // // A Qt class for accessing the FreeDB CD Database. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdcddblookup.cpp,v 1.5.8.3 2014/01/14 17:35:31 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -30,8 +28,8 @@ #include #include -RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent,const char *name) - : QObject(parent,name) +RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent) + : QObject(parent) { lookup_state=0; lookup_profile_msgs=profile_msgs; diff --git a/lib/rdcddblookup.h b/lib/rdcddblookup.h index d5dbbced7..42baa03fb 100644 --- a/lib/rdcddblookup.h +++ b/lib/rdcddblookup.h @@ -2,9 +2,7 @@ // // A Qt class for accessing the FreeDB CD Database. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdcddblookup.h,v 1.3.8.2 2014/01/14 17:35:31 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -51,7 +49,7 @@ class RDCddbLookup : public QObject public: enum Result {ExactMatch=0,PartialMatch=1,NoMatch=2, ProtocolError=3,NetworkError=4}; - RDCddbLookup(FILE *profile_msgs,QObject *parent=0,const char *name=0); + RDCddbLookup(FILE *profile_msgs,QObject *parent=0); ~RDCddbLookup(); void setCddbRecord(RDCddbRecord *); void lookupRecord(const QString &cdda_dir,const QString &cdda_dev, diff --git a/lib/rdcddbrecord.cpp b/lib/rdcddbrecord.cpp index 405cbc608..7b7145df9 100644 --- a/lib/rdcddbrecord.cpp +++ b/lib/rdcddbrecord.cpp @@ -2,9 +2,7 @@ // // A Container Class for CDDB Data. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdcddbrecord.cpp,v 1.1 2007/09/14 14:06:24 fredg Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include diff --git a/lib/rdcddbrecord.h b/lib/rdcddbrecord.h index 9bd4fdf6b..1031f8707 100644 --- a/lib/rdcddbrecord.h +++ b/lib/rdcddbrecord.h @@ -2,9 +2,7 @@ // // A Container Class for CDDB Data. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdcddbrecord.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdcdplayer.cpp b/lib/rdcdplayer.cpp index 9a7dc18ba..521ddf4ab 100644 --- a/lib/rdcdplayer.cpp +++ b/lib/rdcdplayer.cpp @@ -2,9 +2,7 @@ // // Abstract a Linux CDROM Device. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcdplayer.cpp,v 1.5.2.2 2014/01/10 18:52:24 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -34,8 +32,8 @@ #include -RDCdPlayer::RDCdPlayer(FILE *profile_msgs,QWidget *parent,const char *name) - : QObject(parent,name) +RDCdPlayer::RDCdPlayer(FILE *profile_msgs,QWidget *parent) + : QObject(parent) { cdrom_profile_msgs=profile_msgs; cdrom_fd=-1; diff --git a/lib/rdcdplayer.h b/lib/rdcdplayer.h index b30a3df7e..cb3ae8906 100644 --- a/lib/rdcdplayer.h +++ b/lib/rdcdplayer.h @@ -2,9 +2,7 @@ // // Abstract a Linux CDROM Device. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcdplayer.h,v 1.4.8.2 2014/01/10 18:52:24 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -50,7 +48,7 @@ class RDCdPlayer : public QObject Xa21=CDS_XA_2_1,Xa22=CDS_XA_2_2,Mixed=CDS_MIXED}; enum State {NoStateInfo=0,Stopped=1,Playing=2,Paused=3}; enum PlayMode {Single=0,Continuous=1}; - RDCdPlayer(FILE *profile_msgs,QWidget *parent=0,const char *name=0); + RDCdPlayer(FILE *profile_msgs,QWidget *parent=0); ~RDCdPlayer(); QString device() const; void setDevice(QString device); diff --git a/lib/rdcdripper.cpp b/lib/rdcdripper.cpp index 2c424bbc3..d439daa96 100644 --- a/lib/rdcdripper.cpp +++ b/lib/rdcdripper.cpp @@ -2,9 +2,7 @@ // // Rip an audio from from CD // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdcdripper.cpp,v 1.4.6.3 2014/01/10 02:25:35 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcdripper.h b/lib/rdcdripper.h index f39ecb2ab..60a541d35 100644 --- a/lib/rdcdripper.h +++ b/lib/rdcdripper.h @@ -2,9 +2,7 @@ // // Rip an audio from from CD // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdcdripper.h,v 1.2.8.3 2014/01/10 02:25:35 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcheck_daemons.cpp b/lib/rdcheck_daemons.cpp index 68556ab35..b38d52e7f 100644 --- a/lib/rdcheck_daemons.cpp +++ b/lib/rdcheck_daemons.cpp @@ -2,9 +2,7 @@ // // Get the status of the Rivendell system daemons. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcheck_daemons.cpp,v 1.12 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcheck_daemons.h b/lib/rdcheck_daemons.h index 5a8885aac..1ea22f189 100644 --- a/lib/rdcheck_daemons.h +++ b/lib/rdcheck_daemons.h @@ -2,9 +2,7 @@ // // Get the status of the Rivendell system daemons. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcheck_daemons.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - void RDInitializeDaemons(); bool RDCheckDaemon(QString name); bool RDCheckDaemons(); @@ -33,5 +30,5 @@ bool RDStartDaemons(); bool RDKillDaemons(); -#endif +#endif // RDCHECK_DAEMONS_H diff --git a/lib/rdcheck_version.cpp b/lib/rdcheck_version.cpp index ab34bc828..f000447d5 100644 --- a/lib/rdcheck_version.cpp +++ b/lib/rdcheck_version.cpp @@ -2,9 +2,7 @@ // // Get the current Rivendell Database Version,. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcheck_version.cpp,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcheck_version.h b/lib/rdcheck_version.h index dd19f8737..c676178f5 100644 --- a/lib/rdcheck_version.h +++ b/lib/rdcheck_version.h @@ -2,9 +2,7 @@ // // Get the current Rivendell Database Version. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcheck_version.h,v 1.3 2007/02/14 21:48:41 fredg Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,5 +24,4 @@ int RDCheckVersion(); -#endif - +#endif // RDCHECK_VERSION_H diff --git a/lib/rdclock.cpp b/lib/rdclock.cpp index 909175ef9..e5001a92b 100644 --- a/lib/rdclock.cpp +++ b/lib/rdclock.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Clock. // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: rdclock.cpp,v 1.23.10.1 2014/06/24 18:27:03 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -238,7 +236,7 @@ bool RDClock::insert(const QString &event_name,int line) clock_events.push_back(RDEventLine()); } else { - vector::iterator it=clock_events.begin()+line; + std::vector::iterator it=clock_events.begin()+line; clock_events.insert(it,1,RDEventLine()); } clock_events[line].setName(event_name); @@ -249,7 +247,7 @@ bool RDClock::insert(const QString &event_name,int line) void RDClock::remove(int line) { - vector::iterator it=clock_events.begin()+line; + std::vector::iterator it=clock_events.begin()+line; clock_events.erase(it,it+1); } diff --git a/lib/rdclock.h b/lib/rdclock.h index bbef68156..f9d5162b1 100644 --- a/lib/rdclock.h +++ b/lib/rdclock.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Clock // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdclock.h,v 1.17.10.1 2014/06/24 18:27:03 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCLOCK_H #define RDCLOCK_H @@ -30,9 +27,6 @@ #include -using namespace std; - - class RDClock { public: @@ -69,7 +63,7 @@ class RDClock QString clock_short_name; QColor clock_color; QString clock_remarks; - vector clock_events; + std::vector clock_events; unsigned artistsep; bool rules_modified; }; diff --git a/lib/rdcmd_cache.cpp b/lib/rdcmd_cache.cpp index 00cc5f4b6..a3c4a7611 100644 --- a/lib/rdcmd_cache.cpp +++ b/lib/rdcmd_cache.cpp @@ -2,9 +2,7 @@ // // A low-level container class for a CAE command. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcmd_cache.cpp,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcmd_cache.h b/lib/rdcmd_cache.h index 39ffbe595..1c4701af8 100644 --- a/lib/rdcmd_cache.h +++ b/lib/rdcmd_cache.h @@ -2,9 +2,7 @@ // // A low-level container class for a CAE command. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcmd_cache.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - class RDCmdCache { public: diff --git a/lib/rdcmd_switch.cpp b/lib/rdcmd_switch.cpp index abe84441d..6f51a3489 100644 --- a/lib/rdcmd_switch.cpp +++ b/lib/rdcmd_switch.cpp @@ -2,9 +2,7 @@ // // Process Rivendell Command-Line Switches // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcmd_switch.cpp,v 1.13.8.1 2012/05/10 23:12:42 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcmd_switch.h b/lib/rdcmd_switch.h index f60ae1a54..2e982e5d7 100644 --- a/lib/rdcmd_switch.h +++ b/lib/rdcmd_switch.h @@ -2,9 +2,7 @@ // // Process Rivendell Command-Line Switches // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcmd_switch.h,v 1.8.8.1 2012/05/10 23:12:42 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcodetrap.cpp b/lib/rdcodetrap.cpp index a7679d770..c6c2fbd34 100644 --- a/lib/rdcodetrap.cpp +++ b/lib/rdcodetrap.cpp @@ -2,9 +2,7 @@ // // A class for trapping arbitrary character sequences. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcodetrap.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -26,8 +24,8 @@ #include -RDCodeTrap::RDCodeTrap(QObject *parent,const char *name) - : QObject(parent,name) +RDCodeTrap::RDCodeTrap(QObject *parent) + : QObject(parent) { } diff --git a/lib/rdcodetrap.h b/lib/rdcodetrap.h index 2b9f19fe2..6a3bd7ba1 100644 --- a/lib/rdcodetrap.h +++ b/lib/rdcodetrap.h @@ -2,9 +2,7 @@ // // A class for trapping arbitrary character sequences. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcodetrap.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,12 +17,10 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDCODETRAP_H #define RDCODETRAP_H - #include #include @@ -44,7 +40,7 @@ class RDCodeTrap : public QObject { Q_OBJECT public: - RDCodeTrap(QObject *parent=0,const char *name=0); + RDCodeTrap(QObject *parent=0); ~RDCodeTrap(); void addTrap(int id,const char *code,int length); void removeTrap(int id); diff --git a/lib/rdcombobox.cpp b/lib/rdcombobox.cpp index 656d75b60..6dc1cfe96 100644 --- a/lib/rdcombobox.cpp +++ b/lib/rdcombobox.cpp @@ -2,9 +2,7 @@ // // A Combo Box widget for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcombobox.cpp,v 1.8 2011/05/18 18:57:54 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +21,8 @@ #include -RDComboBox::RDComboBox(QWidget *parent,const char *name) - : QComboBox(parent,name) +RDComboBox::RDComboBox(QWidget *parent) + : QComboBox(parent) { combo_setup_mode=false; } diff --git a/lib/rdcombobox.h b/lib/rdcombobox.h index 82e5cd409..707edac7b 100644 --- a/lib/rdcombobox.h +++ b/lib/rdcombobox.h @@ -2,9 +2,7 @@ // // A Combo Box widget for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcombobox.h,v 1.7 2011/05/18 18:57:54 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,7 +29,7 @@ class RDComboBox : public QComboBox { Q_OBJECT public: - RDComboBox(QWidget *parent=0,const char *name=0); + RDComboBox(QWidget *parent=0); void insertItem(const QString &str,bool unique=false); void setSetupMode(bool state); void addIgnoredKey(int key); diff --git a/lib/rdconfig.cpp b/lib/rdconfig.cpp index 704584f63..ce84e0a4c 100644 --- a/lib/rdconfig.cpp +++ b/lib/rdconfig.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell Base Configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdconfig.cpp,v 1.24.6.7 2013/11/13 23:36:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,7 @@ #include #include #include -#endif +#endif // WIN32 #include #include @@ -34,7 +32,6 @@ #include #include - RDConfig *RDConfiguration(void) { static RDConfig *config = NULL; diff --git a/lib/rdconfig.h b/lib/rdconfig.h index 233eb90b0..fdac426e9 100644 --- a/lib/rdconfig.h +++ b/lib/rdconfig.h @@ -2,9 +2,7 @@ // // A container class for a Rivendell Base Configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdconfig.h,v 1.18.8.7 2013/11/13 23:36:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,6 @@ #include - class RDConfig { public: diff --git a/lib/rdcopyaudio.cpp b/lib/rdcopyaudio.cpp index 507844207..0879311cd 100644 --- a/lib/rdcopyaudio.cpp +++ b/lib/rdcopyaudio.cpp @@ -2,9 +2,7 @@ // // Get the trim points for an audio cut. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdcopyaudio.cpp,v 1.3.4.1 2013/11/13 23:36:32 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcopyaudio.h b/lib/rdcopyaudio.h index f38e76f7b..b432b6559 100644 --- a/lib/rdcopyaudio.h +++ b/lib/rdcopyaudio.h @@ -2,9 +2,7 @@ // // Copy an audio file in the audio store. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdcopyaudio.h,v 1.1.6.1 2013/11/13 23:36:32 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcreate_log.cpp b/lib/rdcreate_log.cpp index 4f38be4e8..6223bc6e2 100644 --- a/lib/rdcreate_log.cpp +++ b/lib/rdcreate_log.cpp @@ -2,9 +2,7 @@ // // Create a new, empty Rivendell log table. // -// (C) Copyright 2002-2014 Fred Gleason -// -// $Id: rdcreate_log.cpp,v 1.38.8.1.2.2 2014/06/24 18:27:04 cvs Exp $ +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcreate_log.h b/lib/rdcreate_log.h index 237d74f2c..33e2f4f7c 100644 --- a/lib/rdcreate_log.h +++ b/lib/rdcreate_log.h @@ -2,9 +2,7 @@ // // Create a new, empty Rivendell log table. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcreate_log.h,v 1.10 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcreateauxfieldstable.cpp b/lib/rdcreateauxfieldstable.cpp index dc83bce17..5ec428a42 100644 --- a/lib/rdcreateauxfieldstable.cpp +++ b/lib/rdcreateauxfieldstable.cpp @@ -2,9 +2,7 @@ // // Create a new, empty Rivendell log table. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcreateauxfieldstable.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcreateauxfieldstable.h b/lib/rdcreateauxfieldstable.h index 37b30a765..92e944687 100644 --- a/lib/rdcreateauxfieldstable.h +++ b/lib/rdcreateauxfieldstable.h @@ -2,9 +2,7 @@ // // Create a new, empty Rivendell log table. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcreateauxfieldstable.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcueedit.cpp b/lib/rdcueedit.cpp index 73f3615d5..df44a1c08 100644 --- a/lib/rdcueedit.cpp +++ b/lib/rdcueedit.cpp @@ -2,9 +2,7 @@ // // Cueing Editor for RDLogLine-based Events // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rdcueedit.cpp,v 1.1.2.3.2.1 2014/05/20 01:45:16 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,9 +24,8 @@ #include #include -RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, - QWidget *parent,const char *name) - : QWidget(parent,name) +RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) + : QWidget(parent) { edit_cae=cae; edit_play_card=card; @@ -61,23 +58,23 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, edit_start_color=palette(); edit_start_color.setColor(QColorGroup::Foreground,RD_CUEEDITOR_START_MARKER); - edit_position_label=new QLabel(this,"edit_position_label"); + edit_position_label=new QLabel(this); edit_position_label->setGeometry(0,0,sizeHint().width()-30,30); edit_position_label->setBackgroundColor(QColor(white)); edit_position_label->setLineWidth(1); edit_position_label->setMidLineWidth(0); edit_position_label->setFrameStyle(QFrame::Box|QFrame::Plain); - edit_position_bar=new RDMarkerBar(this,"edit_position_bar"); + edit_position_bar=new RDMarkerBar(this); edit_position_bar->setGeometry(85,8,sizeHint().width()-200,14); - edit_up_label=new QLabel("00:00:00",this,"edit_up_label"); + edit_up_label=new QLabel("00:00:00",this); edit_up_label->setGeometry(5,8,70,14); edit_up_label->setBackgroundColor(white); edit_up_label->setFont(label_font); edit_up_label->setAlignment(AlignRight|AlignVCenter); - edit_down_label=new QLabel("00:00:00",this,"edit_down_label"); + edit_down_label=new QLabel("00:00:00",this); edit_down_label->setGeometry(sizeHint().width()-110,8,70,14); edit_down_label->setBackgroundColor(white); edit_down_label->setFont(label_font); @@ -86,7 +83,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Position Slider // - edit_slider=new RDSlider(RDSlider::Right,this,"edit_slider"); + edit_slider=new RDSlider(RDSlider::Right,this); edit_slider->setGeometry(60,30,sizeHint().width()-150,50); edit_slider->setKnobSize(50,50); edit_slider->setKnobColor(QColor(RD_CUEEDITOR_KNOB_COLOR)); @@ -99,7 +96,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Button Area // - QLabel *label=new QLabel(this,"button_area"); + QLabel *label=new QLabel(this); label->setGeometry(0,85,sizeHint().width()-30,60); label->setBackgroundColor(QColor(gray)); label->setLineWidth(1); @@ -109,8 +106,8 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Audition Button // - edit_audition_button=new RDTransportButton(RDTransportButton::PlayBetween, - this,"edit_audition_button"); + edit_audition_button= + new RDTransportButton(RDTransportButton::PlayBetween,this); edit_audition_button->setGeometry(sizeHint().width()/2-130,90,80,50); edit_audition_button-> setPalette(QPalette(backgroundColor(),QColor(gray))); @@ -122,8 +119,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Pause Button // - edit_pause_button=new RDTransportButton(RDTransportButton::Pause, - this,"edit_pause_button"); + edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this); edit_pause_button->setGeometry(sizeHint().width()/2-40,90,80,50); edit_pause_button-> setPalette(QPalette(backgroundColor(),QColor(gray))); @@ -134,8 +130,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Stop Button // - edit_stop_button=new RDTransportButton(RDTransportButton::Stop, - this,"edit_stop_button"); + edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this); edit_stop_button->setGeometry(sizeHint().width()/2+50,90,80,50); edit_stop_button->setOnColor(QColor(red)); edit_stop_button-> @@ -147,7 +142,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Start Marker Control // - edit_start_button=new RDPushButton(this,"button"); + edit_start_button=new RDPushButton(this); edit_start_button->setToggleButton(true); edit_start_button->setGeometry(0,155,66,45); edit_start_button->setFlashColor(backgroundColor()); @@ -189,14 +184,13 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port, // // Audition Stop Timer // - edit_audition_timer=new QTimer(this,"edit_audition_timer"); + edit_audition_timer=new QTimer(this); connect(edit_audition_timer,SIGNAL(timeout()),this,SLOT(auditionTimerData())); // // Play Deck // - edit_play_deck=new RDPlayDeck(edit_cae,RDPLAYDECK_AUDITION_ID, - this,"edit_play_deck"); + edit_play_deck=new RDPlayDeck(edit_cae,RDPLAYDECK_AUDITION_ID,this); connect(edit_play_deck,SIGNAL(stateChanged(int,RDPlayDeck::State)),this, SLOT(stateChangedData(int,RDPlayDeck::State))); connect(edit_play_deck,SIGNAL(position(int,int)), diff --git a/lib/rdcueedit.h b/lib/rdcueedit.h index 1f2b136c9..72356bb15 100644 --- a/lib/rdcueedit.h +++ b/lib/rdcueedit.h @@ -2,9 +2,7 @@ // // Cueing Editor for RDLogLine-based Events // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: rdcueedit.h,v 1.1.2.2.2.1 2014/05/20 01:45:16 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class RDCueEdit : public QWidget { Q_OBJECT public: - RDCueEdit(RDCae *cae,int card,int port,QWidget *parent=0,const char *name=0); + RDCueEdit(RDCae *cae,int card,int port,QWidget *parent=0); ~RDCueEdit(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdcueeditdialog.cpp b/lib/rdcueeditdialog.cpp index 103aedd16..354853ca9 100644 --- a/lib/rdcueeditdialog.cpp +++ b/lib/rdcueeditdialog.cpp @@ -2,9 +2,7 @@ // // A Dialog Box for using an RDCueEdit widget. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: rdcueeditdialog.cpp,v 1.1.2.1 2013/07/05 22:44:17 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include diff --git a/lib/rdcueeditdialog.h b/lib/rdcueeditdialog.h index aa4ef5dc3..e17339d4b 100644 --- a/lib/rdcueeditdialog.h +++ b/lib/rdcueeditdialog.h @@ -2,9 +2,7 @@ // // A Dialog Box for using an RDCueEdit widget. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: rdcueeditdialog.h,v 1.1.2.1 2013/07/05 22:44:17 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdcut.h b/lib/rdcut.h index 80703c148..bac8075c0 100644 --- a/lib/rdcut.h +++ b/lib/rdcut.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Cut // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcut.h,v 1.44.6.2.2.1 2014/05/22 14:30:45 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcut_dialog.cpp b/lib/rdcut_dialog.cpp index 39527ae9b..fcd578532 100644 --- a/lib/rdcut_dialog.cpp +++ b/lib/rdcut_dialog.cpp @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Cut. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcut_dialog.cpp,v 1.31.4.2 2013/11/15 18:24:08 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,6 @@ #include #include - // // Icons // @@ -48,8 +45,8 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, QString *filter,QString *group,QString *schedcode, QString username,bool show_clear,bool allow_add, - bool exclude_tracks,QWidget *parent,const char *name) - : QDialog(parent,name,true) + bool exclude_tracks,QWidget *parent) + : QDialog(parent,"",true) { cut_cutname=cutname; cut_exclude_tracks=exclude_tracks; @@ -111,8 +108,8 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Filter Selector // - cut_filter_edit=new QLineEdit(this,"cut_filter_edit"); - label=new QLabel(cut_filter_edit,tr("Cart Filter:"),this,"cut_filter_label"); + cut_filter_edit=new QLineEdit(this); + label=new QLabel(cut_filter_edit,tr("Cart Filter:"),this); label->setGeometry(10,10,85,20); label->setAlignment(AlignRight|AlignVCenter); label->setFont(label_font); @@ -122,7 +119,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Filter Search Button // - cut_search_button=new QPushButton(this,"cut_search_button"); + cut_search_button=new QPushButton(this); cut_search_button->setGeometry(sizeHint().width()-140,8,60,24); cut_search_button->setText(tr("&Search")); cut_search_button->setFont(label_font); @@ -131,7 +128,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Filter Clear Button // - cut_clear_button=new QPushButton(this,"cut_clear_button"); + cut_clear_button=new QPushButton(this); cut_clear_button->setGeometry(sizeHint().width()-70,8,60,24); cut_clear_button->setFont(label_font); cut_clear_button->setText(tr("C&lear")); @@ -140,9 +137,9 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Group Selector // - cut_group_box=new QComboBox(this,"cut_clear_box"); + cut_group_box=new QComboBox(this); cut_group_box->setGeometry(100,40,140,20); - label=new QLabel(cut_filter_edit,tr("Group:"),this,"cut_group_label"); + label=new QLabel(cut_filter_edit,tr("Group:"),this); label->setGeometry(10,40,85,20); label->setAlignment(AlignRight|AlignVCenter); label->setFont(label_font); @@ -152,10 +149,9 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Scheduler Code Selector // - cut_schedcode_box=new QComboBox(this,"cut_schedcode_box"); + cut_schedcode_box=new QComboBox(this); cut_schedcode_box->setGeometry(380,40,sizeHint().width()-390,20); - cut_schedcode_label=new QLabel(cut_schedcode_box,tr("Scheduler Code:"), - this,"cut_schedcode_label"); + cut_schedcode_label=new QLabel(cut_schedcode_box,tr("Scheduler Code:"),this); cut_schedcode_label->setGeometry(260,40,115,20); cut_schedcode_label->setAlignment(AlignRight|AlignVCenter); cut_schedcode_label->setFont(label_font); @@ -165,13 +161,12 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Search Limit Checkbox // - cart_limit_box=new QCheckBox(this,"cart_limit_box"); + cart_limit_box=new QCheckBox(this); cart_limit_box->setGeometry(100,72,15,15); cart_limit_box->setChecked(true); label=new QLabel(cart_limit_box,tr("Show Only First")+ QString().sprintf(" %d ", - RD_LIMITED_CART_SEARCH_QUANTITY)+tr("Matches"), - this,"cart_limit_label"); + RD_LIMITED_CART_SEARCH_QUANTITY)+tr("Matches"),this); label->setGeometry(120,70,300,20); label->setAlignment(AlignLeft|AlignVCenter); label->setFont(label_font); @@ -181,7 +176,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Cart List // - cut_cart_list=new RDListView(this,"cut_cart_list"); + cut_cart_list=new RDListView(this); cut_cart_list->setGeometry(10,120,300,200); cut_cart_list->setAllColumnsShowFocus(true); cut_cart_list->setItemMargin(5); @@ -189,7 +184,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, this,SLOT(selectionChangedData())); connect(cut_cart_list,SIGNAL(clicked(QListViewItem *)), this,SLOT(cartClickedData(QListViewItem *))); - label=new QLabel(cut_cart_list,tr("Carts"),this,"cut_cart_label"); + label=new QLabel(cut_cart_list,tr("Carts"),this); label->setGeometry(15,100,100,20); label->setFont(label_font); cut_cart_list->addColumn(""); @@ -206,11 +201,11 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Cut List // - cut_cut_list=new QListView(this,"cut_cut_list"); + cut_cut_list=new QListView(this); cut_cut_list->setGeometry(320,120,sizeHint().width()-330,200); cut_cut_list->setAllColumnsShowFocus(true); cut_cut_list->setItemMargin(5); - label=new QLabel(cut_cut_list,tr("Cuts"),this,"cut_cut_label"); + label=new QLabel(cut_cut_list,tr("Cuts"),this); label->setGeometry(325,100,100,20); label->setFont(label_font); cut_cut_list->addColumn(tr("DESCRIPTION")); @@ -225,7 +220,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Add Button // - button=new QPushButton(tr("&Add New\nCart"),this,"add_button"); + button=new QPushButton(tr("&Add New\nCart"),this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(label_font); connect(button,SIGNAL(clicked()),this,SLOT(addButtonData())); @@ -236,7 +231,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Clear Button // - button=new QPushButton(tr("&Clear"),this,"clear_button"); + button=new QPushButton(tr("&Clear"),this); button->setFont(label_font); connect(button,SIGNAL(clicked()),this,SLOT(clearButtonData())); if(!show_clear) { @@ -252,7 +247,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // OK Button // - cut_ok_button=new QPushButton(tr("&OK"),this,"ok_button"); + cut_ok_button=new QPushButton(tr("&OK"),this); cut_ok_button-> setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); cut_ok_button->setFont(label_font); @@ -262,7 +257,7 @@ RDCutDialog::RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, // // Cancel Button // - cut_cancel_button=new QPushButton(tr("&Cancel"),this,"cancel_button"); + cut_cancel_button=new QPushButton(tr("&Cancel"),this); cut_cancel_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); cut_cancel_button->setFont(label_font); diff --git a/lib/rdcut_dialog.h b/lib/rdcut_dialog.h index 5bb2803fe..b1839215f 100644 --- a/lib/rdcut_dialog.h +++ b/lib/rdcut_dialog.h @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Cut. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcut_dialog.h,v 1.14 2011/08/30 23:35:43 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,7 @@ class RDCutDialog : public QDialog RDCutDialog(QString *cutname,RDStation *station,RDSystem *system, QString *filter=0,QString *group=0,QString *schedcode=NULL, QString username="",bool show_clear=false,bool allow_add=false, - bool exclude_tracks=false, - QWidget *parent=0,const char *name=0); + bool exclude_tracks=false,QWidget *parent=0); ~RDCutDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdcut_path.cpp b/lib/rdcut_path.cpp index 6f5748b96..8235f2aac 100644 --- a/lib/rdcut_path.cpp +++ b/lib/rdcut_path.cpp @@ -2,9 +2,7 @@ // // Get the full Cut Path for a given Cut Name. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcut_path.cpp,v 1.9 2012/01/12 16:24:50 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdcut_path.h b/lib/rdcut_path.h index d3f786157..3ba28b0ff 100644 --- a/lib/rdcut_path.h +++ b/lib/rdcut_path.h @@ -2,9 +2,7 @@ // // Get the full Cut Path for a given Cut Name. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdcut_path.h,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,5 +26,5 @@ QString RDCutPath(QString cutname); -#endif +#endif // RDCUT_PATH_H diff --git a/lib/rddatedecode.cpp b/lib/rddatedecode.cpp index a2134b1e0..6fce5ccf3 100644 --- a/lib/rddatedecode.cpp +++ b/lib/rddatedecode.cpp @@ -2,9 +2,7 @@ // // Decode Rivendell Date Macros // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddatedecode.cpp,v 1.10.8.4 2012/05/10 23:40:16 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rddatedecode.h b/lib/rddatedecode.h index 74e39abbf..48fb9fe89 100644 --- a/lib/rddatedecode.h +++ b/lib/rddatedecode.h @@ -2,9 +2,7 @@ // // Decode Rivendell Date Macros // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddatedecode.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,12 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include - - #ifndef RDDATEDECODE_H #define RDDATEDECODE_H +#include QString RDDateDecode(QString str,QDate date); QString RDDateTimeDecode(QString str,QDateTime datetime); diff --git a/lib/rddatedialog.cpp b/lib/rddatedialog.cpp index a7d2ec459..f15fa2168 100644 --- a/lib/rddatedialog.cpp +++ b/lib/rddatedialog.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for testing General Purpose Outputs (GPO). // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rddatedialog.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -39,9 +36,8 @@ // // Global Classes // -RDDateDialog::RDDateDialog(int low_year,int high_year, - QWidget *parent,const char *name) - :QDialog(parent,name,true) +RDDateDialog::RDDateDialog(int low_year,int high_year,QWidget *parent) + :QDialog(parent,"",true) { QFont font; @@ -53,7 +49,7 @@ RDDateDialog::RDDateDialog(int low_year,int high_year, // // Datepicker // - date_picker=new RDDatePicker(low_year,high_year,this,"date_picker"); + date_picker=new RDDatePicker(low_year,high_year,this); date_picker->setGeometry(10,10, date_picker->sizeHint().width(), date_picker->sizeHint().height()); diff --git a/lib/rddatedialog.h b/lib/rddatedialog.h index 329eeadd0..54097eed3 100644 --- a/lib/rddatedialog.h +++ b/lib/rddatedialog.h @@ -2,9 +2,7 @@ // // A Dialog Box for using an RDatePicker widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rddatedialog.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -35,13 +33,11 @@ #include - class RDDateDialog : public QDialog { Q_OBJECT public: - RDDateDialog(int low_year,int high_year,QWidget *parent=0, - const char *name=0); + RDDateDialog(int low_year,int high_year,QWidget *parent=0); ~RDDateDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rddatepicker.cpp b/lib/rddatepicker.cpp index 4166a52f3..0d6d48595 100644 --- a/lib/rddatepicker.cpp +++ b/lib/rddatepicker.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for testing General Purpose Outputs (GPO). // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rddatepicker.cpp,v 1.3.8.1 2013/01/22 18:33:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -31,9 +29,8 @@ // // Global Classes // -RDDatePicker::RDDatePicker(int low_year,int high_year, - QWidget *parent,const char *name) - :QWidget(parent,name) +RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) + :QWidget(parent) { pick_low_year=low_year; pick_high_year=high_year; diff --git a/lib/rddatepicker.h b/lib/rddatepicker.h index 49fd7d083..892138890 100644 --- a/lib/rddatepicker.h +++ b/lib/rddatepicker.h @@ -2,9 +2,7 @@ // // A Calendar Widget. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddatepicker.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -47,8 +45,7 @@ class RDDatePicker : public QWidget { Q_OBJECT public: - RDDatePicker(int low_year,int high_year,QWidget *parent=0, - const char *name=0); + RDDatePicker(int low_year,int high_year,QWidget *parent=0); ~RDDatePicker(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rddb.cpp b/lib/rddb.cpp index 5fed964cb..ae834f448 100644 --- a/lib/rddb.cpp +++ b/lib/rddb.cpp @@ -3,8 +3,7 @@ // Database driver with automatic reconnect // // (C) Copyright 2007 Dan Mills -// -// $Id: rddb.cpp,v 1.13.4.2.2.2 2014/03/21 15:41:45 cvs Exp $ +// (C) Copyright 2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rddb.h b/lib/rddb.h index 240de1ceb..0a6e20198 100644 --- a/lib/rddb.h +++ b/lib/rddb.h @@ -3,8 +3,7 @@ // Database driver with automatic reconnect // // (C) Copyright 2007 Dan Mills -// -// $Id: rddb.h,v 1.9 2011/06/21 22:20:43 cvs Exp $ +// (C) Copyright 2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,7 +28,6 @@ #include - class RDSqlDatabaseStatus : public QObject { Q_OBJECT diff --git a/lib/rddbheartbeat.cpp b/lib/rddbheartbeat.cpp index 0ad1696fb..ab8f6c389 100644 --- a/lib/rddbheartbeat.cpp +++ b/lib/rddbheartbeat.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Cart // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rddbheartbeat.cpp,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +21,8 @@ #include #include -RDDbHeartbeat::RDDbHeartbeat(int interval,QObject *parent,const char *name) - : QObject(parent,name) +RDDbHeartbeat::RDDbHeartbeat(int interval,QObject *parent) + : QObject(parent) { QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(intervalTimeoutData())); diff --git a/lib/rddbheartbeat.h b/lib/rddbheartbeat.h index 61c064b3f..115510900 100644 --- a/lib/rddbheartbeat.h +++ b/lib/rddbheartbeat.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Cart // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rddbheartbeat.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,19 +18,18 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDDBHEARTBEAT_H +#define RDDBHEARTBEAT_H + #include #include #include - -#ifndef RDDBHEARTBEAT_H -#define RDDBHEARTBEAT_H - class RDDbHeartbeat : public QObject { Q_OBJECT; public: - RDDbHeartbeat(int interval,QObject *parent=0,const char *name=0); + RDDbHeartbeat(int interval,QObject *parent=0); private slots: void intervalTimeoutData(); diff --git a/lib/rddebug.cpp b/lib/rddebug.cpp index 315a40df9..7d6f5c9d6 100644 --- a/lib/rddebug.cpp +++ b/lib/rddebug.cpp @@ -2,9 +2,7 @@ // // Debugging Utility Functions for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddebug.cpp,v 1.8 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,7 +22,6 @@ #include - void RDTimePoint(QString label) { printf("RDTimePoint - %s: %s\n",(const char *)label, diff --git a/lib/rddebug.h b/lib/rddebug.h index b02dd603e..c8af3c79a 100644 --- a/lib/rddebug.h +++ b/lib/rddebug.h @@ -2,9 +2,7 @@ // // Debugging Utility Functions for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddebug.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,12 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include - - #ifndef RDDEBUG_H #define RDDEBUG_H +#include void RDTimePoint(QString label); diff --git a/lib/rddeck.cpp b/lib/rddeck.cpp index 83d96d726..f8205bc17 100644 --- a/lib/rddeck.cpp +++ b/lib/rddeck.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Deck. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rddeck.cpp,v 1.17 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rddeck.h b/lib/rddeck.h index 19a5f27ef..ed0113d0b 100644 --- a/lib/rddeck.h +++ b/lib/rddeck.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Record/Play Deck // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rddeck.h,v 1.20 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,14 +18,14 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDDECK_H +#define RDDECK_H + #include #include #include -#ifndef RDDECK_H -#define RDDECK_H - class RDDeck { public: diff --git a/lib/rddelete.cpp b/lib/rddelete.cpp index 8821540be..48b873905 100644 --- a/lib/rddelete.cpp +++ b/lib/rddelete.cpp @@ -2,9 +2,7 @@ // // Delete a file from the audio store via the Rivendell Web Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rddelete.cpp,v 1.3 2011/12/23 23:07:00 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -69,8 +67,8 @@ int DeleteErrorCallback(CURL *curl,curl_infotype type,char *msg,size_t size, } -RDDelete::RDDelete(QObject *parent,const char *name) - : QObject(parent,name) +RDDelete::RDDelete(QObject *parent) + : QObject(parent) { } diff --git a/lib/rddelete.h b/lib/rddelete.h index 05889c530..10032c9ff 100644 --- a/lib/rddelete.h +++ b/lib/rddelete.h @@ -2,9 +2,7 @@ // // Delete a Remote File // -// (C) Copyright 2011 Fred Gleason -// -// $Id: rddelete.h,v 1.1 2011/10/17 18:48:40 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class RDDelete : public QObject ErrorUnspecified=8,ErrorInvalidUser=9, ErrorInvalidLogin=11,ErrorRemoteAccess=12, ErrorRemoteConnection=13,ErrorUnknown=14}; - RDDelete(QObject *parent=0,const char *name=0); + RDDelete(QObject *parent=0); void setTargetUrl(const QString &url); RDDelete::ErrorCode runDelete(const QString &username, const QString &password, diff --git a/lib/rddownload.cpp b/lib/rddownload.cpp index 7ed12d50d..13ce23a55 100644 --- a/lib/rddownload.cpp +++ b/lib/rddownload.cpp @@ -2,9 +2,7 @@ // // Download a File // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rddownload.cpp,v 1.5.4.2 2013/01/30 15:03:53 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -70,9 +68,8 @@ int DownloadErrorCallback(CURL *curl,curl_infotype type,char *msg,size_t size, } -RDDownload::RDDownload(const QString &station_name, - QObject *parent,const char *name) - : QObject(parent,name) +RDDownload::RDDownload(const QString &station_name,QObject *parent) + : QObject(parent) { conv_aborting=false; } diff --git a/lib/rddownload.h b/lib/rddownload.h index ca6336d77..0eb430952 100644 --- a/lib/rddownload.h +++ b/lib/rddownload.h @@ -2,9 +2,7 @@ // // Download a File // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rddownload.h,v 1.2 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,7 @@ class RDDownload : public QObject ErrorUnspecified=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorInvalidLogin=11,ErrorRemoteAccess=12, ErrorRemoteConnection=13}; - RDDownload(const QString &station_name, - QObject *parent=0,const char *name=0); + RDDownload(const QString &station_name,QObject *parent=0); void setSourceUrl(const QString &url); void setDestinationFile(const QString &filename); int totalSteps() const; diff --git a/lib/rddropbox.cpp b/lib/rddropbox.cpp index fd9b0be69..5e089edcf 100644 --- a/lib/rddropbox.cpp +++ b/lib/rddropbox.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell dropbox configuration. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rddropbox.cpp,v 1.9.8.1 2013/12/11 20:17:13 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include #include - // // Global Classes // diff --git a/lib/rddropbox.h b/lib/rddropbox.h index 93bcde55b..78c1fe0e4 100644 --- a/lib/rddropbox.h +++ b/lib/rddropbox.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Dropbox Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rddropbox.h,v 1.6.8.1 2013/12/11 20:17:13 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdedit_audio.cpp b/lib/rdedit_audio.cpp index 4759f1183..48e292b17 100644 --- a/lib/rdedit_audio.cpp +++ b/lib/rdedit_audio.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Audio // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdedit_audio.cpp,v 1.26.6.3 2014/01/16 02:44:59 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, RDStation *station,RDConfig *config,int card, - int port,int preroll, - int trim_level,QWidget *parent,const char *name) - : QDialog(parent,name,true) + int port,int preroll,int trim_level,QWidget *parent) + : QDialog(parent,"",true) { edit_cae=cae; edit_station=station; @@ -166,37 +163,34 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // Transport Buttons // - edit_play_cursor_button=new RDTransportButton(RDTransportButton::PlayBetween, - this,"edit_play_cursor_button"); + edit_play_cursor_button= + new RDTransportButton(RDTransportButton::PlayBetween,this); edit_play_cursor_button->setGeometry(20,425,65,45); edit_play_cursor_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_play_cursor_button,SIGNAL(clicked()), this,SLOT(playCursorData())); - edit_play_start_button=new RDTransportButton(RDTransportButton::Play, - this,"edit_play_start_button"); + edit_play_start_button= + new RDTransportButton(RDTransportButton::Play,this); edit_play_start_button->setGeometry(90,425,65,45); edit_play_start_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_play_start_button,SIGNAL(clicked()), this,SLOT(playStartData())); - edit_pause_button=new RDTransportButton(RDTransportButton::Pause, - this,"edit_pause_button"); + edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this); edit_pause_button->setGeometry(160,425,65,45); edit_pause_button->setOnColor(QColor(red)); edit_pause_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseData())); - edit_stop_button=new RDTransportButton(RDTransportButton::Stop, - this,"edit_stop_button"); + edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this); edit_stop_button->setGeometry(230,425,65,45); edit_stop_button->on(); edit_stop_button->setOnColor(QColor(red)); edit_stop_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); - edit_loop_button=new RDTransportButton(RDTransportButton::Loop, - this,"edit_loop_button"); + edit_loop_button=new RDTransportButton(RDTransportButton::Loop,this); edit_loop_button->setGeometry(300,425,65,45); edit_loop_button->off(); edit_loop_button->setEnabled((edit_card>=0)&&(edit_port>=0)); @@ -206,8 +200,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // Time Origin Scroll Bar // edit_hscroll=new QScrollBar(0,0,EDITAUDIO_PAN_SIZE/10, - EDITAUDIO_PAN_SIZE,0,Qt::Horizontal, - this,"edit_hscroll"); + EDITAUDIO_PAN_SIZE,0,Qt::Horizontal,this); edit_hscroll->setGeometry(10,10+EDITAUDIO_WAVEFORM_HEIGHT, EDITAUDIO_WAVEFORM_WIDTH,20); connect(edit_hscroll,SIGNAL(valueChanged(int)),this,SLOT(hscrollData(int))); @@ -221,15 +214,15 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, amp_label->setFont(button_font); amp_label->setText(tr("Amplitude")); - RDTransportButton *y_up_button=new RDTransportButton(RDTransportButton::Up, - this,"y_up_button"); + RDTransportButton *y_up_button= + new RDTransportButton(RDTransportButton::Up,this); y_up_button->setGeometry(747,22,70,50); y_up_button->setFont(QFont("Helvetica",12,QFont::Bold)); y_up_button->setText(tr("Zoom\nIn")); connect(y_up_button,SIGNAL(clicked()),this,SLOT(yUp())); - RDTransportButton *y_down_button=new RDTransportButton(RDTransportButton::Down, - this,"y_down_button"); + RDTransportButton *y_down_button= + new RDTransportButton(RDTransportButton::Down,this); y_down_button->setGeometry(747,72,70,50); y_down_button->setFont(QFont("Helvetica",12,QFont::Bold)); y_down_button->setText(tr("Zoom\nOut")); @@ -238,33 +231,33 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // Time Buttons // - QLabel *time_label=new QLabel(this,"time_label"); + QLabel *time_label=new QLabel(this); time_label->setGeometry(760,143,40,16); time_label->setAlignment(AlignHCenter|AlignVCenter); time_label->setFont(button_font); time_label->setText(tr("Time")); - QPushButton *x_full_in_button=new QPushButton(this,"x_full_in_button"); + QPushButton *x_full_in_button=new QPushButton(this); x_full_in_button->setGeometry(747,160,70,50); x_full_in_button->setFont(button_font); x_full_in_button->setText(tr("Full\nIn")); connect(x_full_in_button,SIGNAL(clicked()),this,SLOT(xFullIn())); - RDTransportButton *x_up_button=new RDTransportButton(RDTransportButton::Up, - this,"x_up_button"); + RDTransportButton *x_up_button= + new RDTransportButton(RDTransportButton::Up,this); x_up_button->setGeometry(747,212,70,50); x_up_button->setFont(button_font); x_up_button->setText(tr("Zoom\nIn")); connect(x_up_button,SIGNAL(clicked()),this,SLOT(xUp())); - RDTransportButton *x_down_button=new RDTransportButton(RDTransportButton::Down, - this,"x_down_button"); + RDTransportButton *x_down_button= + new RDTransportButton(RDTransportButton::Down,this); x_down_button->setGeometry(747,262,70,50); x_down_button->setFont(button_font); x_down_button->setText(tr("Zoom\nOut")); connect(x_down_button,SIGNAL(clicked()),this,SLOT(xDown())); - QPushButton *x_full_button=new QPushButton(this,"x_full_button"); + QPushButton *x_full_button=new QPushButton(this); x_full_button->setGeometry(747,312,70,50); x_full_button->setFont(button_font); x_full_button->setText(tr("Full\nOut")); @@ -273,25 +266,25 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // GoTo Buttons // - QLabel *goto_label=new QLabel(this,"goto_label"); + QLabel *goto_label=new QLabel(this); goto_label->setGeometry(760,378,40,16); goto_label->setAlignment(AlignHCenter|AlignVCenter); goto_label->setFont(button_font); goto_label->setText(tr("Goto")); - QPushButton *goto_cursor_button=new QPushButton(this,"goto_cursor_button"); + QPushButton *goto_cursor_button=new QPushButton(this); goto_cursor_button->setGeometry(747,393,70,50); goto_cursor_button->setFont(button_font); goto_cursor_button->setText(tr("Cursor")); connect(goto_cursor_button,SIGNAL(clicked()),this,SLOT(gotoCursorData())); - QPushButton *goto_home_button=new QPushButton(this,"goto_home_button"); + QPushButton *goto_home_button=new QPushButton(this); goto_home_button->setGeometry(747,443,70,50); goto_home_button->setFont(button_font); goto_home_button->setText(tr("Home")); connect(goto_home_button,SIGNAL(clicked()),this,SLOT(gotoHomeData())); - QPushButton *goto_end_button=new QPushButton(this,"goto_end_button"); + QPushButton *goto_end_button=new QPushButton(this); goto_end_button->setGeometry(747,493,70,50); goto_end_button->setFont(button_font); goto_end_button->setText(tr("End")); @@ -300,14 +293,14 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // Cursor Readouts // - QSignalMapper *button_mapper=new QSignalMapper(this,"button_mapper"); + QSignalMapper *button_mapper=new QSignalMapper(this); connect(button_mapper,SIGNAL(mapped(int)),this,SLOT(cuePointData(int))); - QSignalMapper *edit_mapper=new QSignalMapper(this,"edit_mapper"); + QSignalMapper *edit_mapper=new QSignalMapper(this); connect(edit_mapper,SIGNAL(mapped(int)),this,SLOT(cueEditData(int))); - QSignalMapper *esc_mapper=new QSignalMapper(this,"esc_mapper"); + QSignalMapper *esc_mapper=new QSignalMapper(this); connect(esc_mapper,SIGNAL(mapped(int)),this,SLOT(cueEscData(int))); - edit_cursor_edit[RDEditAudio::Start]=new RDMarkerEdit(this,"edit_start_edit"); + edit_cursor_edit[RDEditAudio::Start]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::Start]->setGeometry(88,496,70,21); edit_cursor_edit[RDEditAudio::Start]->setReadOnly(true); edit_cursor_edit[RDEditAudio::Start]->setDragEnabled(false); @@ -322,7 +315,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cursor_edit[RDEditAudio::Start],SIGNAL(escapePressed()), esc_mapper,SLOT(map())); - edit_cue_button[RDEditAudio::Start]=new RDMarkerButton(this,"StartButton"); + edit_cue_button[RDEditAudio::Start]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::Start]->setToggleButton(true); edit_cue_button[RDEditAudio::Start]->setGeometry(20,485,66,45); edit_cue_button[RDEditAudio::Start]->setFlashColor(backgroundColor()); @@ -338,7 +331,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::Start],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::End]=new RDMarkerEdit(this,"edit_end_edit"); + edit_cursor_edit[RDEditAudio::End]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::End]->setGeometry(88,541,70,21); edit_cursor_edit[RDEditAudio::End]->setReadOnly(true); edit_cursor_edit[RDEditAudio::End]->setDragEnabled(false); @@ -352,7 +345,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::End]-> setFont(label_font); - edit_cue_button[RDEditAudio::End]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::End]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::End]->setToggleButton(true); edit_cue_button[RDEditAudio::End]->setGeometry(20,530,66,45); edit_cue_button[RDEditAudio::End]->setFlashColor(backgroundColor()); @@ -369,8 +362,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::End],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::TalkStart]= - new RDMarkerEdit(this,"edit_talk_start_edit"); + edit_cursor_edit[RDEditAudio::TalkStart]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::TalkStart]->setGeometry(243,596,70,21); edit_cursor_edit[RDEditAudio::TalkStart]->setReadOnly(true); edit_cursor_edit[RDEditAudio::TalkStart]->setDragEnabled(false); @@ -384,7 +376,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_mapper,SLOT(map())); connect(edit_cursor_edit[RDEditAudio::TalkStart],SIGNAL(escapePressed()), esc_mapper,SLOT(map())); - edit_cue_button[RDEditAudio::TalkStart]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::TalkStart]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::TalkStart]->setToggleButton(true); edit_cue_button[RDEditAudio::TalkStart]->setGeometry(175,585,66,45); edit_cue_button[RDEditAudio::TalkStart]->setFlashColor(backgroundColor()); @@ -401,8 +393,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::TalkStart],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::TalkEnd]= - new RDMarkerEdit(this,"edit_talk_end_edit"); + edit_cursor_edit[RDEditAudio::TalkEnd]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::TalkEnd]->setGeometry(243,641,70,21); edit_cursor_edit[RDEditAudio::TalkEnd]->setReadOnly(true); edit_cursor_edit[RDEditAudio::TalkEnd]->setDragEnabled(false); @@ -416,7 +407,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::TalkEnd]-> setFont(label_font); - edit_cue_button[RDEditAudio::TalkEnd]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::TalkEnd]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::TalkEnd]->setToggleButton(true); edit_cue_button[RDEditAudio::TalkEnd]->setGeometry(175,630,66,45); edit_cue_button[RDEditAudio::TalkEnd]->setFlashColor(backgroundColor()); @@ -433,8 +424,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::TalkEnd],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::SegueStart]= - new RDMarkerEdit(this,"edit_segue_start_edit"); + edit_cursor_edit[RDEditAudio::SegueStart]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::SegueStart]->setGeometry(398,596,70,21); edit_cursor_edit[RDEditAudio::SegueStart]->setReadOnly(true); edit_cursor_edit[RDEditAudio::SegueStart]->setDragEnabled(false); @@ -450,7 +440,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::SegueStart]-> setFont(label_font); - edit_cue_button[RDEditAudio::SegueStart]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::SegueStart]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::SegueStart]->setToggleButton(true); edit_cue_button[RDEditAudio::SegueStart]->setGeometry(330,585,66,45); edit_cue_button[RDEditAudio::SegueStart]->setFlashColor(backgroundColor()); @@ -468,8 +458,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::SegueStart],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::SegueEnd]= - new RDMarkerEdit(this,"edit_segue_end_edit"); + edit_cursor_edit[RDEditAudio::SegueEnd]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::SegueEnd]->setGeometry(398,641,70,21); edit_cursor_edit[RDEditAudio::SegueEnd]->setReadOnly(true); edit_cursor_edit[RDEditAudio::SegueEnd]->setDragEnabled(false); @@ -483,7 +472,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::SegueEnd]-> setFont(label_font); - edit_cue_button[RDEditAudio::SegueEnd]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::SegueEnd]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::SegueEnd]->setToggleButton(true); edit_cue_button[RDEditAudio::SegueEnd]->setGeometry(330,630,66,45); edit_cue_button[RDEditAudio::SegueEnd]->setFlashColor(backgroundColor()); @@ -499,7 +488,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::SegueEnd],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::FadeUp]=new RDMarkerEdit(this,"edit_fadeup_edit"); + edit_cursor_edit[RDEditAudio::FadeUp]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::FadeUp]->setGeometry(88,596,70,21); edit_cursor_edit[RDEditAudio::FadeUp]->setReadOnly(true); edit_cursor_edit[RDEditAudio::FadeUp]->setDragEnabled(false); @@ -513,7 +502,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::FadeUp]-> setFont(label_font); - edit_cue_button[RDEditAudio::FadeUp]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::FadeUp]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::FadeUp]->setToggleButton(true); edit_cue_button[RDEditAudio::FadeUp]->setGeometry(20,585,66,45); edit_cue_button[RDEditAudio::FadeUp]->setFlashColor(backgroundColor()); @@ -529,8 +518,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::FadeUp],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::FadeDown]= - new RDMarkerEdit(this,"edit_fadedown_edit"); + edit_cursor_edit[RDEditAudio::FadeDown]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::FadeDown]->setGeometry(88,641,70,21); edit_cursor_edit[RDEditAudio::FadeDown]->setReadOnly(true); edit_cursor_edit[RDEditAudio::FadeDown]->setDragEnabled(false); @@ -544,7 +532,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, esc_mapper,SLOT(map())); edit_cursor_edit[RDEditAudio::FadeDown]-> setFont(label_font); - edit_cue_button[RDEditAudio::FadeDown]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::FadeDown]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::FadeDown]->setToggleButton(true); edit_cue_button[RDEditAudio::FadeDown]->setGeometry(20,630,66,45); edit_cue_button[RDEditAudio::FadeDown]->setFlashColor(backgroundColor()); @@ -560,7 +548,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::FadeDown],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::HookStart]=new RDMarkerEdit(this,"edit_hook_start_edit"); + edit_cursor_edit[RDEditAudio::HookStart]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::HookStart]->setGeometry(553,596,70,21); edit_cursor_edit[RDEditAudio::HookStart]->setReadOnly(true); edit_cursor_edit[RDEditAudio::HookStart]->setDragEnabled(false); @@ -577,7 +565,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_cursor_edit[RDEditAudio::HookStart]-> setFont(label_font); edit_cursor_edit[RDEditAudio::HookStart]->setReadOnly(true); - edit_cue_button[RDEditAudio::HookStart]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::HookStart]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::HookStart]->setToggleButton(true); edit_cue_button[RDEditAudio::HookStart]->setGeometry(485,585,66,45); edit_cue_button[RDEditAudio::HookStart]->setFlashColor(backgroundColor()); @@ -595,8 +583,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, connect(edit_cue_button[RDEditAudio::HookStart],SIGNAL(clicked()), button_mapper,SLOT(map())); - edit_cursor_edit[RDEditAudio::HookEnd]= - new RDMarkerEdit(this,"edit_hook_end_edit"); + edit_cursor_edit[RDEditAudio::HookEnd]=new RDMarkerEdit(this); edit_cursor_edit[RDEditAudio::HookEnd]->setGeometry(553,641,70,21); edit_cursor_edit[RDEditAudio::HookEnd]->setReadOnly(true); edit_cursor_edit[RDEditAudio::HookEnd]->setDragEnabled(false); @@ -610,7 +597,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_mapper,SLOT(map())); connect(edit_cursor_edit[RDEditAudio::HookEnd],SIGNAL(escapePressed()), esc_mapper,SLOT(map())); - edit_cue_button[RDEditAudio::HookEnd]=new RDMarkerButton(this,"button"); + edit_cue_button[RDEditAudio::HookEnd]=new RDMarkerButton(this); edit_cue_button[RDEditAudio::HookEnd]->setToggleButton(true); edit_cue_button[RDEditAudio::HookEnd]->setGeometry(485,630,66,45); edit_cue_button[RDEditAudio::HookEnd]->setFlashColor(backgroundColor()); @@ -630,7 +617,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // AutoTrim Buttons // - edit_trim_box=new QSpinBox(this,"edit_head_trim_box"); + edit_trim_box=new QSpinBox(this); edit_trim_box->setGeometry(243,529,70,21); edit_trim_box->setAcceptDrops(false); edit_trim_box->setValidator(0); @@ -638,11 +625,11 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_trim_box->setRange(-99,0); edit_trim_box-> setValue((trim_level+REFERENCE_LEVEL)/100); - QLabel *label=new QLabel(tr("Threshold"),this,"label"); + QLabel *label=new QLabel(tr("Threshold"),this); label->setGeometry(238,513,70,15); label->setAlignment(AlignHCenter); label->setFont(QFont(small_font)); - QPushButton *trim_start_button=new QPushButton(this,"trim_start_button"); + QPushButton *trim_start_button=new QPushButton(this); trim_start_button->setGeometry(175,485,66,45); trim_start_button-> setPalette(QPalette(QColor(RD_START_END_MARKER_COLOR),backgroundColor())); @@ -650,7 +637,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, trim_start_button->setText(tr("Trim\nStart")); connect(trim_start_button,SIGNAL(clicked()),this,SLOT(trimHeadData())); - QPushButton *trim_end_button=new QPushButton(this,"trim_end_button"); + QPushButton *trim_end_button=new QPushButton(this); trim_end_button->setGeometry(175,530,66,45); trim_end_button-> setPalette(QPalette(QColor(RD_START_END_MARKER_COLOR),backgroundColor())); @@ -664,34 +651,34 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_gain_control=new QRangeControl(); edit_gain_control->setRange(-1000,1000); edit_gain_control->setSteps(10,10); - edit_gain_edit=new RDMarkerEdit(this,"edit_gain_edit"); + edit_gain_edit=new RDMarkerEdit(this); edit_gain_edit->setGeometry(398,529,70,21); edit_gain_edit->setAcceptDrops(false); connect(edit_gain_edit,SIGNAL(returnPressed()),this,SLOT(gainChangedData())); - label=new QLabel(tr("Cut Gain"),this,"label"); + label=new QLabel(tr("Cut Gain"),this); label->setGeometry(388,513,70,15); label->setAlignment(AlignHCenter); label->setFont(QFont(small_font)); RDTransportButton *gain_up_button=new - RDTransportButton(RDTransportButton::Up,this,"button"); + RDTransportButton(RDTransportButton::Up,this); gain_up_button->setGeometry(330,485,66,45); gain_up_button->off(); connect(gain_up_button,SIGNAL(pressed()),this,SLOT(gainUpPressedData())); connect(gain_up_button,SIGNAL(released()),this,SLOT(gainReleasedData())); RDTransportButton *gain_down_button= - new RDTransportButton(RDTransportButton::Down,this,"button"); + new RDTransportButton(RDTransportButton::Down,this); gain_down_button->setGeometry(330,530,66,45); gain_down_button->off(); connect(gain_down_button,SIGNAL(pressed()),this,SLOT(gainDownPressedData())); connect(gain_down_button,SIGNAL(released()),this,SLOT(gainReleasedData())); - edit_gain_timer=new QTimer(this,"edit_gain_timer"); + edit_gain_timer=new QTimer(this); connect(edit_gain_timer,SIGNAL(timeout()),this,SLOT(gainTimerData())); // // Marker Remove Button // - edit_remove_button=new RDPushButton(this,"edit_remove_button"); + edit_remove_button=new RDPushButton(this); edit_remove_button->setFlashPeriod(EDITAUDIO_BUTTON_FLASH_PERIOD); edit_remove_button->setGeometry(485,510,66,45); edit_remove_button->setFont(button_font); @@ -703,10 +690,9 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // Segue Fade Box // - edit_overlap_box=new QCheckBox(this,"edit_overlap_box"); + edit_overlap_box=new QCheckBox(this); edit_overlap_box->setGeometry(570,515,15,15); - label=new QLabel(edit_overlap_box,tr("No Fade on Segue Out"), - this,"label"); + label=new QLabel(edit_overlap_box,tr("No Fade on Segue Out"),this); label->setGeometry(590,513,130,20); label->setFont(small_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -714,37 +700,37 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // Time Counters // - label=new QLabel(tr("Position"),this,"label"); + label=new QLabel(tr("Position"),this); label->setGeometry(60,385,70,20); label->setFont(QFont(small_font)); label->setAlignment(Qt::AlignHCenter); label-> setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); - edit_overall_edit=new QLineEdit(this,"edit_overall_edit"); + edit_overall_edit=new QLineEdit(this); edit_overall_edit->setAcceptDrops(false); edit_overall_edit->setGeometry(60,400,70,21); edit_overall_edit->setFont(label_font); edit_overall_edit->setReadOnly(true); - edit_region_edit_label=new QLabel("Region",this,"label"); + edit_region_edit_label=new QLabel("Region",this); edit_region_edit_label->setGeometry(158,385,70,20); edit_region_edit_label->setFont(QFont(small_font)); edit_region_edit_label->setAlignment(Qt::AlignHCenter); edit_region_edit_label-> setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); - edit_region_edit=new QLineEdit(this,"edit_region_edit"); + edit_region_edit=new QLineEdit(this); edit_region_edit->setAcceptDrops(false); edit_region_edit->setGeometry(158,400,70,21); edit_region_edit->setFont(label_font); edit_region_edit->setReadOnly(true); - label=new QLabel(tr("Length"),this,"label"); + label=new QLabel(tr("Length"),this); label->setGeometry(256,385,70,20); label->setFont(QFont(small_font)); label->setAlignment(Qt::AlignHCenter); label-> setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); - edit_size_edit=new QLineEdit(this,"edit_size_edit"); + edit_size_edit=new QLineEdit(this); edit_size_edit->setAcceptDrops(false); edit_size_edit->setGeometry(256,400,70,21); edit_size_edit->setFont(label_font); @@ -753,12 +739,12 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // The Audio Meter // - edit_meter=new RDStereoMeter(this,"edit_meter"); + edit_meter=new RDStereoMeter(this); edit_meter->setGeometry(380,398,edit_meter->geometry().width(), edit_meter->geometry().height()); edit_meter->setSegmentSize(5); edit_meter->setMode(RDSegMeter::Peak); - edit_meter_timer=new QTimer(this,"meter_timer"); + edit_meter_timer=new QTimer(this); connect(edit_meter_timer,SIGNAL(timeout()),this,SLOT(meterData())); // @@ -780,7 +766,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, // // The Edit Menu // - edit_menu=new QPopupMenu(this,"edit_menu"); + edit_menu=new QPopupMenu(this); connect(edit_menu,SIGNAL(aboutToShow()),this,SLOT(updateMenuData())); edit_menu->insertItem(tr("Delete Talk Markers"),this, SLOT(deleteTalkData()),0,RDEditAudio::TalkStart); diff --git a/lib/rdedit_audio.h b/lib/rdedit_audio.h index 5e079de17..4aa79f7bc 100644 --- a/lib/rdedit_audio.h +++ b/lib/rdedit_audio.h @@ -2,9 +2,7 @@ // // Edit Rivendell Audio // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdedit_audio.h,v 1.9.6.2 2013/11/13 23:36:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -78,8 +76,7 @@ class RDEditAudio : public QDialog public: RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, RDStation *station,RDConfig *config,int card,int port, - int preroll,int trim_level, - QWidget *parent=0,const char *name=0); + int preroll,int trim_level,QWidget *parent=0); ~RDEditAudio(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdedit_panel_name.cpp b/lib/rdedit_panel_name.cpp index 8732f9913..122e5ac49 100644 --- a/lib/rdedit_panel_name.cpp +++ b/lib/rdedit_panel_name.cpp @@ -2,9 +2,7 @@ // // Edit a SoundPanel Panel Name // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdedit_panel_name.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,10 +23,8 @@ #include - -RDEditPanelName::RDEditPanelName(QString *panelname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDEditPanelName::RDEditPanelName(QString *panelname,QWidget *parent) + : QDialog(parent,"",true) { panel_name=panelname; diff --git a/lib/rdedit_panel_name.h b/lib/rdedit_panel_name.h index 003ebaafb..216c6315a 100644 --- a/lib/rdedit_panel_name.h +++ b/lib/rdedit_panel_name.h @@ -2,9 +2,7 @@ // // Edit a SoundPanel Panel Name // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdedit_panel_name.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,12 +24,11 @@ #include #include - class RDEditPanelName : public QDialog { Q_OBJECT public: - RDEditPanelName(QString *panelname,QWidget *parent=0,const char *name=0); + RDEditPanelName(QString *panelname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdemptycart.cpp b/lib/rdemptycart.cpp index 6ac305868..3d5422058 100644 --- a/lib/rdemptycart.cpp +++ b/lib/rdemptycart.cpp @@ -2,9 +2,7 @@ // // A drag source for an empty cart. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rdemptycart.cpp,v 1.1.2.2 2014/01/20 19:13:29 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include // @@ -28,8 +25,8 @@ // #include "../icons/trashcan-32x32.xpm" -RDEmptyCart::RDEmptyCart(QWidget *parent,const char *name) - : QWidget(parent,name) +RDEmptyCart::RDEmptyCart(QWidget *parent) + : QWidget(parent) { empty_label=new QLabel(this); empty_label->setPixmap(QPixmap(trashcan_xpm)); diff --git a/lib/rdemptycart.h b/lib/rdemptycart.h index d28138ce7..1f40a4f0e 100644 --- a/lib/rdemptycart.h +++ b/lib/rdemptycart.h @@ -2,9 +2,7 @@ // // A drag source for an empty cart. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rdemptycart.h,v 1.1.2.1 2013/12/30 20:37:01 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDEMPTYCART_H #define RDEMPTYCART_H @@ -33,7 +30,7 @@ class RDEmptyCart : public QWidget { Q_OBJECT public: - RDEmptyCart(QWidget *parent=0,const char *name=0); + RDEmptyCart(QWidget *parent=0); ~RDEmptyCart(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdencoder.cpp b/lib/rdencoder.cpp index c4b360bda..a137a5240 100644 --- a/lib/rdencoder.cpp +++ b/lib/rdencoder.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Custom Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdencoder.cpp,v 1.1 2008/09/18 19:02:07 fredg Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdencoder.h b/lib/rdencoder.h index 95b450b0e..6ff339531 100644 --- a/lib/rdencoder.h +++ b/lib/rdencoder.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Custom Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdencoder.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdencoderlist.cpp b/lib/rdencoderlist.cpp index 41fe2f749..ea4ca4deb 100644 --- a/lib/rdencoderlist.cpp +++ b/lib/rdencoderlist.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Custom Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdencoderlist.cpp,v 1.1 2008/09/18 19:02:07 fredg Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdencoderlist.h b/lib/rdencoderlist.h index 9bf37796c..58def3728 100644 --- a/lib/rdencoderlist.h +++ b/lib/rdencoderlist.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Custom Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdencoderlist.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdescape_string.cpp b/lib/rdescape_string.cpp index afb0fdc1f..89dd9caa0 100644 --- a/lib/rdescape_string.cpp +++ b/lib/rdescape_string.cpp @@ -2,9 +2,7 @@ // // Escape non-valid characters in a string. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdescape_string.cpp,v 1.17.10.2 2014/06/24 18:27:04 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdescape_string.h b/lib/rdescape_string.h index 3974a9468..32ffac3ff 100644 --- a/lib/rdescape_string.h +++ b/lib/rdescape_string.h @@ -2,9 +2,7 @@ // // Escape non-valid characters in a string. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdescape_string.h,v 1.7.10.1 2014/06/24 18:27:04 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdevent.cpp b/lib/rdevent.cpp index 2933b49ea..5d6689974 100644 --- a/lib/rdevent.cpp +++ b/lib/rdevent.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Event. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdevent.cpp,v 1.14.8.1 2014/01/13 18:36:57 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdevent.h b/lib/rdevent.h index 6d4171e68..d01fde820 100644 --- a/lib/rdevent.h +++ b/lib/rdevent.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdevent.h,v 1.11.8.1 2014/01/13 18:36:57 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 2842b304f..0055deab9 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Event // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdevent_line.cpp,v 1.60.2.4.2.2 2014/06/24 18:27:04 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,6 @@ #include #include - RDEventLine::RDEventLine() { event_preimport_log=new RDLogEvent(); diff --git a/lib/rdevent_line.h b/lib/rdevent_line.h index d61bce029..6015c2b15 100644 --- a/lib/rdevent_line.h +++ b/lib/rdevent_line.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdevent_line.h,v 1.18 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,16 +18,15 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDEVENT_LINE_H +#define RDEVENT_LINE_H + #include #include #include #include - -#ifndef RDEVENT_LINE_H -#define RDEVENT_LINE_H - class RDEventLine { public: diff --git a/lib/rdevent_player.cpp b/lib/rdevent_player.cpp index f0efd9646..9f4f402b7 100644 --- a/lib/rdevent_player.cpp +++ b/lib/rdevent_player.cpp @@ -2,9 +2,7 @@ // // Execute a list of RML commands asynchronously. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdevent_player.cpp,v 1.6.8.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +21,8 @@ #include -RDEventPlayer::RDEventPlayer(RDRipc *ripc,QObject *parent,const char *name) - : QObject(parent,name) +RDEventPlayer::RDEventPlayer(RDRipc *ripc,QObject *parent) + : QObject(parent) { player_ripc=ripc; diff --git a/lib/rdevent_player.h b/lib/rdevent_player.h index 87975ef5a..a7192108e 100644 --- a/lib/rdevent_player.h +++ b/lib/rdevent_player.h @@ -2,9 +2,7 @@ // // Execute a list of RML commands asynchronously. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdevent_player.h,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,6 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDEVENT_PLAYER_H +#define RDEVENT_PLAYER_H + #include #include #include @@ -28,17 +29,13 @@ #include #include - -#ifndef RDEVENT_PLAYER_H -#define RDEVENT_PLAYER_H - #define RDEVENT_PLAYER_MAX_EVENTS 10 class RDEventPlayer : public QObject { Q_OBJECT public: - RDEventPlayer(RDRipc *ripc,QObject *parent=0,const char *name=0); + RDEventPlayer(RDRipc *ripc,QObject *parent=0); ~RDEventPlayer(); bool exec(const QString &rml); bool exec(unsigned cartnum); diff --git a/lib/rdexception_dialog.cpp b/lib/rdexception_dialog.cpp index d58d146cf..2745593e5 100644 --- a/lib/rdexception_dialog.cpp +++ b/lib/rdexception_dialog.cpp @@ -2,9 +2,7 @@ // // A dialog for displaying exception reports. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdexception_dialog.cpp,v 1.8 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,9 +26,8 @@ #include -RDExceptionDialog::RDExceptionDialog(QString report, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDExceptionDialog::RDExceptionDialog(QString report,QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Rivendell Exception Report")); diff --git a/lib/rdexception_dialog.h b/lib/rdexception_dialog.h index eab8ed387..0f271337f 100644 --- a/lib/rdexception_dialog.h +++ b/lib/rdexception_dialog.h @@ -2,9 +2,7 @@ // // A dialog for displaying exception reports. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdexception_dialog.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,12 +24,11 @@ #include #include - class RDExceptionDialog : public QDialog { Q_OBJECT public: - RDExceptionDialog(QString report,QWidget *parent=0,const char *name=0); + RDExceptionDialog(QString report,QWidget *parent=0); ~RDExceptionDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index 6976a2283..2c5d7f129 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell RSS Feed // -// (C) Copyright 2002-2007,2010 Fred Gleason -// -// $Id: rdfeed.cpp,v 1.17.2.2 2013/11/13 23:36:33 cvs Exp $ +// (C) Copyright 2002-2007,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,8 @@ #include #include -RDFeed::RDFeed(const QString &keyname,QObject *parent,const char *name) - : QObject(parent,name) +RDFeed::RDFeed(const QString &keyname,QObject *parent) + : QObject(parent) { RDSqlQuery *q; QString sql; @@ -57,8 +55,8 @@ RDFeed::RDFeed(const QString &keyname,QObject *parent,const char *name) } -RDFeed::RDFeed(unsigned id,QObject *parent,const char *name) - : QObject(parent,name) +RDFeed::RDFeed(unsigned id,QObject *parent) + : QObject(parent) { RDSqlQuery *q; QString sql; diff --git a/lib/rdfeed.h b/lib/rdfeed.h index cdffe5076..67bd2c19b 100644 --- a/lib/rdfeed.h +++ b/lib/rdfeed.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdfeed.h,v 1.9.4.1 2013/11/13 23:36:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,6 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDFEED_H +#define RDFEED_H + #include #include @@ -28,9 +29,6 @@ #include #include -#ifndef RDFEED_H -#define RDFEED_H - #define RDFEED_TOTAL_POST_STEPS 4 class RDFeed : public QObject @@ -40,8 +38,8 @@ class RDFeed : public QObject enum Error {ErrorOk=0,ErrorNoFile=1,ErrorCannotOpenFile=2, ErrorUnsupportedType=3,ErrorUploadFailed=4,ErrorGeneral=5}; enum MediaLinkMode {LinkNone=0,LinkDirect=1,LinkCounted=2}; - RDFeed(const QString &keyname,QObject *parent=0,const char *name=0); - RDFeed(unsigned id,QObject *parent=0,const char *name=0); + RDFeed(const QString &keyname,QObject *parent=0); + RDFeed(unsigned id,QObject *parent=0); QString keyName() const; unsigned id() const; bool exists() const; diff --git a/lib/rdfeedlog.cpp b/lib/rdfeedlog.cpp index d06db5b8d..dd9b388ed 100644 --- a/lib/rdfeedlog.cpp +++ b/lib/rdfeedlog.cpp @@ -2,9 +2,7 @@ // // Functions for manipulating RSS feed log tables. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdfeedlog.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,7 +24,6 @@ #include #include - void RDCreateFeedLog(QString keyname) { QString sql; diff --git a/lib/rdfeedlog.h b/lib/rdfeedlog.h index f84928e48..4b96ec8d6 100644 --- a/lib/rdfeedlog.h +++ b/lib/rdfeedlog.h @@ -2,9 +2,7 @@ // // Functions for manipulating RSS feed log tables. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdfeedlog.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdflacdecode.cpp b/lib/rdflacdecode.cpp index c0e4780e2..ff95e2a6d 100644 --- a/lib/rdflacdecode.cpp +++ b/lib/rdflacdecode.cpp @@ -2,9 +2,7 @@ // // Decode FLAC Files using libFLAC++ // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdflacdecode.cpp,v 1.5.6.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - #ifdef HAVE_FLAC RDFlacDecode::RDFlacDecode(SNDFILE *dst_sf) : FLAC::Decoder::File() diff --git a/lib/rdflacdecode.h b/lib/rdflacdecode.h index 240790834..72dcc0546 100644 --- a/lib/rdflacdecode.h +++ b/lib/rdflacdecode.h @@ -2,9 +2,7 @@ // // Decode FLAC Files using libFLAC++ // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdflacdecode.h,v 1.4 2010/11/24 18:03:30 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdformpost.h b/lib/rdformpost.h index 6393adc5d..67c3ded11 100644 --- a/lib/rdformpost.h +++ b/lib/rdformpost.h @@ -2,9 +2,7 @@ // // Handle POST data from an HTML form. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdformpost.h,v 1.2 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdgain_envelope.cpp b/lib/rdgain_envelope.cpp index 9da331503..8122a0a83 100644 --- a/lib/rdgain_envelope.cpp +++ b/lib/rdgain_envelope.cpp @@ -2,9 +2,7 @@ // // A Container Class for Rivendell Event Segue Parameters // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdgain_envelope.cpp,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,7 +21,6 @@ #include #include - RDGainEnvelope::RDGainEnvelope() { clear(); diff --git a/lib/rdgain_envelope.h b/lib/rdgain_envelope.h index 3830fda43..98f46b37e 100644 --- a/lib/rdgain_envelope.h +++ b/lib/rdgain_envelope.h @@ -2,9 +2,7 @@ // // A Container Class for Rivendell Event Segue Parameters // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdgain_envelope.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdget_ath.cpp b/lib/rdget_ath.cpp index f4b9bb304..5e9e2e16a 100644 --- a/lib/rdget_ath.cpp +++ b/lib/rdget_ath.cpp @@ -2,9 +2,7 @@ // // Get an Aggreggate Tuning Hours (ATH) Figure. // -// (C) Copyright 2006 Fred Gleason -// -// $Id: rdget_ath.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include - -RDGetAth::RDGetAth(double *ath,QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDGetAth::RDGetAth(double *ath,QWidget *parent) + : QDialog(parent,"",true) { ath_ath=ath; diff --git a/lib/rdget_ath.h b/lib/rdget_ath.h index 510ab078d..1ed4ea2e4 100644 --- a/lib/rdget_ath.h +++ b/lib/rdget_ath.h @@ -2,9 +2,7 @@ // // Get an Agreggate Tuning Hours (ATH) Figure. // -// (C) Copyright 2006 Fred Gleason -// -// $Id: rdget_ath.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,12 +24,11 @@ #include #include - class RDGetAth : public QDialog { Q_OBJECT public: - RDGetAth(double *ath,QWidget *parent=0,const char *name=0); + RDGetAth(double *ath,QWidget *parent=0); ~RDGetAth(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdgetpasswd.cpp b/lib/rdgetpasswd.cpp index 06aaa5b71..452580001 100644 --- a/lib/rdgetpasswd.cpp +++ b/lib/rdgetpasswd.cpp @@ -2,9 +2,7 @@ // // Prompt for a password. // -// (C) Copyright 2006-2007 Fred Gleason -// -// $Id: rdgetpasswd.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2006-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include - -RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent) + : QDialog(parent,"",true) { pw_password=passwd; diff --git a/lib/rdgetpasswd.h b/lib/rdgetpasswd.h index c47fa7022..2687e9262 100644 --- a/lib/rdgetpasswd.h +++ b/lib/rdgetpasswd.h @@ -2,9 +2,7 @@ // // Prompt for a password. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdgetpasswd.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,12 +24,11 @@ #include #include - class RDGetPasswd : public QDialog { Q_OBJECT public: - RDGetPasswd(QString *passwd,QWidget *parent=0,const char *name=0); + RDGetPasswd(QString *passwd,QWidget *parent=0); ~RDGetPasswd(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdgpio.cpp b/lib/rdgpio.cpp index 35ea10d68..5746d0749 100644 --- a/lib/rdgpio.cpp +++ b/lib/rdgpio.cpp @@ -2,9 +2,7 @@ // // A driver for General-Purpose I/O devices. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdgpio.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -31,9 +29,8 @@ #include - -RDGpio::RDGpio(QObject *parent,const char *name) - : QObject(parent,name) +RDGpio::RDGpio(QObject *parent) + : QObject(parent) { Clear(); diff --git a/lib/rdgpio.h b/lib/rdgpio.h index a66cb3994..edfe3b946 100644 --- a/lib/rdgpio.h +++ b/lib/rdgpio.h @@ -2,9 +2,7 @@ // // A driver for General-Purpose I/O devices. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdgpio.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDGPIO_H #define RDGPIO_H @@ -40,7 +37,7 @@ class RDGpio : public QObject Q_OBJECT public: enum Mode {Auto=GPIO_MODE_AUTO,Input=GPIO_MODE_INPUT,Output=GPIO_MODE_OUTPUT}; - RDGpio(QObject *parent=0,const char *name=0); + RDGpio(QObject *parent=0); QString device() const; void setDevice(QString dev); QString description() const; diff --git a/lib/rdgpioselector.cpp b/lib/rdgpioselector.cpp index c000888de..d1f91c526 100644 --- a/lib/rdgpioselector.cpp +++ b/lib/rdgpioselector.cpp @@ -2,9 +2,7 @@ // // GPIO Pin selector widget for Rivendell // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdgpioselector.cpp,v 1.8 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,8 @@ #include -RDGpioSelector::RDGpioSelector(QWidget *parent,const char *name) - : QWidget(parent,name) +RDGpioSelector::RDGpioSelector(QWidget *parent) + : QWidget(parent) { // // Pin diff --git a/lib/rdgpioselector.h b/lib/rdgpioselector.h index d59a02ec0..d9db0276c 100644 --- a/lib/rdgpioselector.h +++ b/lib/rdgpioselector.h @@ -2,9 +2,7 @@ // // GPIO Pin Selector Widget for Rivendell // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdgpioselector.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,12 +25,11 @@ #include #include - class RDGpioSelector : public QWidget { Q_OBJECT public: - RDGpioSelector(QWidget *parent=0,const char *name=0); + RDGpioSelector(QWidget *parent=0); ~RDGpioSelector(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdgrid.cpp b/lib/rdgrid.cpp index 1b6a58290..60eebb806 100644 --- a/lib/rdgrid.cpp +++ b/lib/rdgrid.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Grid. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgrid.cpp,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,7 +20,6 @@ #include - RDGrid::RDGrid(QString svc_name) { grid_name=svc_name; diff --git a/lib/rdgrid.h b/lib/rdgrid.h index 0fec9105e..fc75de9ae 100644 --- a/lib/rdgrid.h +++ b/lib/rdgrid.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log Manager Grid // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgrid.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDGRID_H #define RDGRID_H diff --git a/lib/rdgroup.cpp b/lib/rdgroup.cpp index c63060f7a..4f4adaca1 100644 --- a/lib/rdgroup.cpp +++ b/lib/rdgroup.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Group. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgroup.cpp,v 1.23.8.1.2.3 2014/06/02 18:52:21 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdgroup.h b/lib/rdgroup.h index a53c6643c..f95068c8a 100644 --- a/lib/rdgroup.h +++ b/lib/rdgroup.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Service // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgroup.h,v 1.17.8.1.2.1 2014/05/30 00:26:28 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdgroup_list.cpp b/lib/rdgroup_list.cpp index ddceedbd7..3e15358ac 100644 --- a/lib/rdgroup_list.cpp +++ b/lib/rdgroup_list.cpp @@ -2,9 +2,7 @@ // // A container class for Rivendell Groups // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgroup_list.cpp,v 1.9 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,7 +21,6 @@ #include #include - RDGroupList::RDGroupList() { clear(); diff --git a/lib/rdgroup_list.h b/lib/rdgroup_list.h index 23cb8081b..c116800b7 100644 --- a/lib/rdgroup_list.h +++ b/lib/rdgroup_list.h @@ -2,9 +2,7 @@ // // A container class for Rivendell Groups // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdgroup_list.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,4 +41,4 @@ class RDGroupList }; -#endif +#endif // RDGROUP_LIST_H diff --git a/lib/rdhotkeylist.cpp b/lib/rdhotkeylist.cpp index c755667ea..0e3e627ba 100644 --- a/lib/rdhotkeylist.cpp +++ b/lib/rdhotkeylist.cpp @@ -2,9 +2,7 @@ // // An Abstract of the rdhotkeylist // -// (C) Copyright 2002-2004,2010 Fred Gleason -// -// $Id: rdhotkeylist.cpp,v 1.2.6.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2002-2004,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,110 +26,110 @@ RDHotKeyList::RDHotKeyList( ) { - - hotkeylist.resize(0); - BuildKeyList(); + hotkeylist.resize(0); + BuildKeyList(); } RDHotKeyList::~RDHotKeyList() { - hotkeylist.clear(); + hotkeylist.clear(); } void RDHotKeyList::BuildKeyList( ) { - char qtpath[256]; - char keyfile[256]; - char line[256]; - FILE *hkeyfile; + char qtpath[256]; + char keyfile[256]; + char line[256]; + FILE *hkeyfile; - char enumstring[11] = "enum Key {"; - QString KeyString; - QString KeyHex; - QString Filestring; - keyList CurKey; - char *p = {0}; + char enumstring[11] = "enum Key {"; + QString KeyString; + QString KeyHex; + QString Filestring; + keyList CurKey; + char *p = {0}; - if(getenv("QTDIR")==NULL) { - return; - } - strcpy(qtpath, (const char *) getenv("QTDIR")); - strcpy(keyfile,qtpath); - strcat(keyfile,"/include/qnamespace.h"); - hkeyfile = fopen(keyfile,"r"); - if (hkeyfile==NULL) { - return; + if(getenv("QTDIR")==NULL) { + return; + } + strcpy(qtpath, (const char *) getenv("QTDIR")); + strcpy(keyfile,qtpath); + strcat(keyfile,"/include/qnamespace.h"); + hkeyfile = fopen(keyfile,"r"); + if (hkeyfile==NULL) { + return; + } + if (fgets(line,256,hkeyfile) !=NULL) { + while ((p = strstr(line,enumstring))== NULL ) { + if (fgets(line,256,hkeyfile) == NULL) { + break; + } } - if (fgets(line,256,hkeyfile) !=NULL) { - while ((p = strstr(line,enumstring))== NULL ) { - if (fgets(line,256,hkeyfile) == NULL) { - break; - } - } - if (p != NULL) { - while ( ( fgets(line,256,hkeyfile) != NULL) && (!(strstr(line,"}")) ) ) { - QString buf = cleanStrings(QString().sprintf("%s",line)); - int acomment = buf.find("//"); - int eqsign = buf.find("="); - if ((eqsign != -1) && (acomment != 0) ) { - KeyString = buf.left((eqsign )); - KeyString = KeyString.mid(4); // Remove 'Key_' - int comma = buf.find(","); - if (comma != -1) { - KeyHex = buf.mid((eqsign + 1), - (comma - eqsign)-1 ); - } - else { - int comment = buf.find("//"); - if (comment != -1) { - KeyHex = buf.mid( (eqsign+1), - (comment - eqsign) ); - } - else { - KeyHex = buf.mid( (eqsign+1), - (buf.length() - eqsign) ); - } - } - bool ok; - int hotkey_int = KeyHex.toInt(&ok,16); //Convert to decimal - if (ok) { - CurKey.decvalue = hotkey_int; - CurKey.stringvalue = KeyString; - hotkeylist.push_back(CurKey) ; - } - } - } - } + if (p != NULL) { + while ( ( fgets(line,256,hkeyfile) != NULL) && (!(strstr(line,"}")) ) ) { + QString buf = cleanStrings(QString().sprintf("%s",line)); + int acomment = buf.find("//"); + int eqsign = buf.find("="); + if ((eqsign != -1) && (acomment != 0) ) { + KeyString = buf.left((eqsign )); + KeyString = KeyString.mid(4); // Remove 'Key_' + int comma = buf.find(","); + if (comma != -1) { + KeyHex = buf.mid((eqsign + 1), + (comma - eqsign)-1 ); + } + else { + int comment = buf.find("//"); + if (comment != -1) { + KeyHex = buf.mid( (eqsign+1), + (comment - eqsign) ); + } + else { + KeyHex = buf.mid( (eqsign+1), + (buf.length() - eqsign) ); + } + } + bool ok; + int hotkey_int = KeyHex.toInt(&ok,16); //Convert to decimal + if (ok) { + CurKey.decvalue = hotkey_int; + CurKey.stringvalue = KeyString; + hotkeylist.push_back(CurKey) ; + } + } + } } - fclose(hkeyfile); + } + fclose(hkeyfile); } + QString RDHotKeyList::cleanStrings( const QString sent) { - QString cleanstring; - for (unsigned i=0 ; i -// -// $Id: rdhotkeylist.h,v 1.2 2010/10/04 18:11:46 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,14 +17,14 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// written by Todd Baker bakert@rfa.org +// written by Todd Baker bakert@rfa.org -#include -#include -#include #ifndef RDHOTKEYLIST_H #define RDHOTKEYLIST_H +#include +#include +#include struct keyList { int decvalue ; diff --git a/lib/rdhotkeys.cpp b/lib/rdhotkeys.cpp index a2ca57081..b3202ae99 100644 --- a/lib/rdhotkeys.cpp +++ b/lib/rdhotkeys.cpp @@ -2,9 +2,7 @@ // // Abstract an RDHotKeys Configuration. // -// (C) Copyright 2002-2004,2010 Fred Gleason -// -// $Id: rdhotkeys.cpp,v 1.2.6.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2002-2004,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdhotkeys.h b/lib/rdhotkeys.h index cb687490f..923e0ebc5 100644 --- a/lib/rdhotkeys.h +++ b/lib/rdhotkeys.h @@ -2,13 +2,27 @@ // // Abstract RDHotkeys Configuration // +// (C) Copyright 2002-2003,2016 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// #ifndef RDHOTKEYS_H #define RDHOTKEYS_H #include - class RDHotkeys { public: @@ -23,4 +37,4 @@ class RDHotkeys }; -#endif +#endif // RDHOTKEYS_H diff --git a/lib/rdidvalidator.cpp b/lib/rdidvalidator.cpp index d561c1a0f..13b86f2a6 100644 --- a/lib/rdidvalidator.cpp +++ b/lib/rdidvalidator.cpp @@ -3,9 +3,7 @@ // Validate a string as being valid for a MySQL identifier. // See http://dev.mysql.com/doc/refman/5.0/en/identifiers.html // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdidvalidator.cpp,v 1.1.2.1 2014/05/21 18:19:42 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdidvalidator.h b/lib/rdidvalidator.h index 2c1c94bdb..10b86e70a 100644 --- a/lib/rdidvalidator.h +++ b/lib/rdidvalidator.h @@ -3,9 +3,7 @@ // Validate a string as being valid for a MySQL identifier. // See http://dev.mysql.com/doc/refman/5.0/en/identifiers.html // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdidvalidator.h,v 1.1.2.1 2014/05/21 18:19:42 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdinstancelock.cpp b/lib/rdinstancelock.cpp index 655a5b007..f6d840145 100644 --- a/lib/rdinstancelock.cpp +++ b/lib/rdinstancelock.cpp @@ -2,9 +2,7 @@ // // An abstract instance-locking class. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdinstancelock.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -33,7 +31,6 @@ #include - RDInstanceLock::RDInstanceLock(QString path) { lock_path=path; diff --git a/lib/rdinstancelock.h b/lib/rdinstancelock.h index ebecfc9a4..d29a1fe54 100644 --- a/lib/rdinstancelock.h +++ b/lib/rdinstancelock.h @@ -2,9 +2,7 @@ // // An abstract instance-locking class. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdinstancelock.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -24,7 +22,6 @@ #ifndef RDINSTANCELOCK_H #define RDINSTANCELOCK_H - class RDInstanceLock { public: diff --git a/lib/rdintegerdialog.cpp b/lib/rdintegerdialog.cpp index c9ddd7c5a..835100452 100644 --- a/lib/rdintegerdialog.cpp +++ b/lib/rdintegerdialog.cpp @@ -2,9 +2,7 @@ // // A widget to set an integer value. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdintegerdialog.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include RDIntegerDialog::RDIntegerDialog(int *value,const QString &lbl,int low,int high, - QWidget *parent,const char *name) - : QDialog(parent,name,false) + QWidget *parent) + : QDialog(parent,"",false) { int_value=value; diff --git a/lib/rdintegerdialog.h b/lib/rdintegerdialog.h index f37a97c3a..232ee8b83 100644 --- a/lib/rdintegerdialog.h +++ b/lib/rdintegerdialog.h @@ -2,9 +2,7 @@ // // A widget to set an integer value. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdintegerdialog.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,7 +29,7 @@ class RDIntegerDialog : public QDialog Q_OBJECT public: RDIntegerDialog(int *value,const QString &lbl,int low,int high, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~RDIntegerDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdintegeredit.cpp b/lib/rdintegeredit.cpp index af56285f7..a88ab5f37 100644 --- a/lib/rdintegeredit.cpp +++ b/lib/rdintegeredit.cpp @@ -2,9 +2,7 @@ // // A widget for editing a list of integer values. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdintegeredit.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,14 +17,13 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include RDIntegerEdit::RDIntegerEdit(const QString &lbl,int low,int high, - QWidget *parent,const char *name) - : QWidget(parent,name) + QWidget *parent) + : QWidget(parent) { edit_low=low; edit_high=high; diff --git a/lib/rdintegeredit.h b/lib/rdintegeredit.h index e5bca571d..aaade2e10 100644 --- a/lib/rdintegeredit.h +++ b/lib/rdintegeredit.h @@ -2,9 +2,7 @@ // // A widget for editing a list of integer values. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdintegeredit.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDINTEGEREDIT_H #define RDINTEGEREDIT_H @@ -35,8 +32,7 @@ class RDIntegerEdit : public QWidget { Q_OBJECT public: - RDIntegerEdit(const QString &lbl,int low,int high, - QWidget *parent,const char *name=0); + RDIntegerEdit(const QString &lbl,int low,int high,QWidget *parent); QSize sizeHint() const; QSizePolicy sizePolicy() const; unsigned values(std::vector *v) const; diff --git a/lib/rdlabel.cpp b/lib/rdlabel.cpp index 5a781c6d4..d04038365 100644 --- a/lib/rdlabel.cpp +++ b/lib/rdlabel.cpp @@ -2,9 +2,7 @@ // // Multiline button labelling that is smart about spaces and the like // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlabel.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -35,15 +33,15 @@ #include -RDLabel::RDLabel(QWidget *parent,const char *name,WFlags f) - : QLabel(parent,name,f) +RDLabel::RDLabel(QWidget *parent,WFlags f) + : QLabel(parent,"",f) { label_wrap=false; } -RDLabel::RDLabel(const QString &text,QWidget *parent=0,const char *name=0, - WFlags f) : QLabel(text,parent,name,f) +RDLabel::RDLabel(const QString &text,QWidget *parent=0,WFlags f) + : QLabel(text,parent,"",f) { label_wrap=false; label_text=text; @@ -51,8 +49,8 @@ RDLabel::RDLabel(const QString &text,QWidget *parent=0,const char *name=0, } -RDLabel::RDLabel(QWidget *buddy,const QString &text,QWidget *parent, - const char *name,WFlags f): QLabel(buddy,text,parent,name,f) +RDLabel::RDLabel(QWidget *buddy,const QString &text,QWidget *parent,WFlags f) + : QLabel(buddy,text,parent,"",f) { label_wrap=false; label_text=text; diff --git a/lib/rdlabel.h b/lib/rdlabel.h index 6d09937d0..a3c97ecf3 100644 --- a/lib/rdlabel.h +++ b/lib/rdlabel.h @@ -2,9 +2,7 @@ // // An label widget with word wrap. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlabel.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -32,16 +30,14 @@ #include #include - class RDLabel : public QLabel { Q_OBJECT public: - RDLabel(QWidget *parent=0,const char *name=0,WFlags f=0); - RDLabel(const QString &text,QWidget *parent,const char *name,WFlags f=0); - RDLabel(QWidget *buddy,const QString &text,QWidget *parent,const char *name, - WFlags f=0); + RDLabel(QWidget *parent=0,WFlags f=0); + RDLabel(const QString &text,QWidget *parent,WFlags f=0); + RDLabel(QWidget *buddy,const QString &text,QWidget *parent,WFlags f=0); QString text() const; void setFont(const QFont &font); bool wordWrapEnabled() const; diff --git a/lib/rdlibrary_conf.cpp b/lib/rdlibrary_conf.cpp index 378a8bd1a..a3669e67f 100644 --- a/lib/rdlibrary_conf.cpp +++ b/lib/rdlibrary_conf.cpp @@ -2,9 +2,7 @@ // // Abstract an RDLibrary Configuration. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlibrary_conf.cpp,v 1.25.8.1 2014/01/09 01:03:54 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,12 +17,12 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // + #include #include #include #include - // // Global Classes // diff --git a/lib/rdlibrary_conf.h b/lib/rdlibrary_conf.h index 895de7bae..0195ea847 100644 --- a/lib/rdlibrary_conf.h +++ b/lib/rdlibrary_conf.h @@ -2,9 +2,7 @@ // // Abstract RDLibrary Configuration // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlibrary_conf.h,v 1.22.8.1 2014/01/09 01:03:54 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlicense.cpp b/lib/rdlicense.cpp index 728591f5b..38c02e5c5 100644 --- a/lib/rdlicense.cpp +++ b/lib/rdlicense.cpp @@ -2,9 +2,7 @@ // // Display License Text. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlicense.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -27,8 +25,8 @@ #include -RDLicense::RDLicense(QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDLicense::RDLicense(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size diff --git a/lib/rdlicense.h b/lib/rdlicense.h index 94aaf5d11..06dbd4e68 100644 --- a/lib/rdlicense.h +++ b/lib/rdlicense.h @@ -2,9 +2,7 @@ // // Display License Text. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlicense.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -22,18 +20,17 @@ // #ifndef RDLICENSE_H -#define RDLICENSE_H4 +#define RDLICENSE_H #include #include - class RDLicense : public QDialog { Q_OBJECT public: enum License {GplV2=0}; - RDLicense(QWidget *parent=0,const char *name=0); + RDLicense(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdlineedit.cpp b/lib/rdlineedit.cpp index b1319591f..66e45ec34 100644 --- a/lib/rdlineedit.cpp +++ b/lib/rdlineedit.cpp @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlineedit.cpp,v 1.1 2007/09/14 14:06:24 fredg Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -23,14 +21,14 @@ #include -RDLineEdit::RDLineEdit(QWidget *parent,const char *name) - : QLineEdit(parent,name) +RDLineEdit::RDLineEdit(QWidget *parent) + : QLineEdit(parent) { } -RDLineEdit::RDLineEdit(const QString &contents,QWidget *parent,const char *name) - : QLineEdit(contents,parent,name) +RDLineEdit::RDLineEdit(const QString &contents,QWidget *parent) + : QLineEdit(contents,parent) { } diff --git a/lib/rdlineedit.h b/lib/rdlineedit.h index f3699dc32..cfd6a19c8 100644 --- a/lib/rdlineedit.h +++ b/lib/rdlineedit.h @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlineedit.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDLINEEDIT_H #define RDLINEEDIT_H @@ -34,8 +31,8 @@ class RDLineEdit : public QLineEdit Q_OBJECT public: - RDLineEdit(QWidget *parent,const char *name); - RDLineEdit(const QString &contents,QWidget *parent,const char *name); + RDLineEdit(QWidget *parent); + RDLineEdit(const QString &contents,QWidget *parent); signals: void escapePressed(); @@ -45,5 +42,4 @@ class RDLineEdit : public QLineEdit }; - -#endif +#endif // RDLINEEDIT_H diff --git a/lib/rdlist_groups.cpp b/lib/rdlist_groups.cpp index e7c0c9c8c..420a8b898 100644 --- a/lib/rdlist_groups.cpp +++ b/lib/rdlist_groups.cpp @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Group. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdlist_groups.cpp,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ RDListGroups::RDListGroups(QString *groupname,const QString &username, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size diff --git a/lib/rdlist_groups.h b/lib/rdlist_groups.h index 8259cad45..5da4e15a0 100644 --- a/lib/rdlist_groups.h +++ b/lib/rdlist_groups.h @@ -2,9 +2,7 @@ // // A widget to select a Rivendell Group. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdlist_groups.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,13 +25,11 @@ #include #include - class RDListGroups : public QDialog { Q_OBJECT public: - RDListGroups(QString *groupname,const QString &username, - QWidget *parent=0,const char *name=0); + RDListGroups(QString *groupname,const QString &username,QWidget *parent=0); ~RDListGroups(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdlist_logs.cpp b/lib/rdlist_logs.cpp index 7b683fa78..2b8eacaee 100644 --- a/lib/rdlist_logs.cpp +++ b/lib/rdlist_logs.cpp @@ -2,9 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlist_logs.cpp,v 1.12 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include RDListLogs::RDListLogs(QString *logname,const QString &stationname, - QWidget *parent,const char *name,RDUser *rduser) - : QDialog(parent,name,true) + QWidget *parent,RDUser *rduser) + : QDialog(parent,"",true) { list_stationname=stationname; list_logname=logname; diff --git a/lib/rdlist_logs.h b/lib/rdlist_logs.h index df04ccab4..f92459d48 100644 --- a/lib/rdlist_logs.h +++ b/lib/rdlist_logs.h @@ -2,15 +2,13 @@ // // Select a Rivendell Log // +// (C) Copyright 2007,2016 Fred Gleason +// // The RDListLogs class creates a basic dialog that displays a list of logs // (log name, description, and service) and allows the user to select one. If // user security is enabled (by passing a an RDUser object to the constructor) // then the list of logs is filtered based on the users permissions. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlist_logs.h,v 1.8 2010/07/29 19:32:33 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -34,7 +32,6 @@ #include #include - class RDListLogs : public QDialog { Q_OBJECT @@ -47,7 +44,7 @@ class RDListLogs : public QDialog * user security should be used instead of host based security. */ RDListLogs(QString *logname,const QString &stationname, - QWidget *parent=0,const char *name=0,RDUser *rduser=0); + QWidget *parent=0,RDUser *rduser=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdlistselector.cpp b/lib/rdlistselector.cpp index ed0456ed2..1a20dcc8c 100644 --- a/lib/rdlistselector.cpp +++ b/lib/rdlistselector.cpp @@ -2,9 +2,7 @@ // // A List Selector Widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlistselector.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -32,9 +29,8 @@ #include - -RDListSelector::RDListSelector(QWidget *parent,const char *name) - : QHBox(parent,name) +RDListSelector::RDListSelector(QWidget *parent) + : QHBox(parent) { QFont font; diff --git a/lib/rdlistselector.h b/lib/rdlistselector.h index 461d9345b..48769cd9e 100644 --- a/lib/rdlistselector.h +++ b/lib/rdlistselector.h @@ -2,9 +2,7 @@ // // An listselector widget with word wrap. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdlistselector.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDLISTSELECTOR_H #define RDLISTSELECTOR_H @@ -31,13 +28,12 @@ #include #include - class RDListSelector : public QHBox { Q_OBJECT public: - RDListSelector(QWidget *parent=0,const char *name=0); + RDListSelector(QWidget *parent=0); uint sourceCount() const; uint destCount() const; void sourceSetLabel(QString label); diff --git a/lib/rdlistsvcs.cpp b/lib/rdlistsvcs.cpp index 706a4a721..d2451e71b 100644 --- a/lib/rdlistsvcs.cpp +++ b/lib/rdlistsvcs.cpp @@ -2,9 +2,7 @@ // // Service Picker dialog // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdlistsvcs.cpp,v 1.1.2.2 2012/11/16 18:10:40 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlistsvcs.h b/lib/rdlistsvcs.h index b331c6a56..885ddba14 100644 --- a/lib/rdlistsvcs.h +++ b/lib/rdlistsvcs.h @@ -2,9 +2,7 @@ // // Service Picker dialog // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdlistsvcs.h,v 1.1.2.2 2012/11/16 18:10:40 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlistview.cpp b/lib/rdlistview.cpp index 69a08380b..13f684707 100644 --- a/lib/rdlistview.cpp +++ b/lib/rdlistview.cpp @@ -2,9 +2,7 @@ // // A contiguous-selection only QListView widget for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlistview.cpp,v 1.12 2011/09/06 17:35:07 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,9 +24,8 @@ #include #include - -RDListView::RDListView(QWidget *parent,const char *name) - : QListView(parent,name) +RDListView::RDListView(QWidget *parent) + : QListView(parent) { list_hard_sort_column=-1; connect(this, diff --git a/lib/rdlistview.h b/lib/rdlistview.h index 5c0e1b956..4c08ac467 100644 --- a/lib/rdlistview.h +++ b/lib/rdlistview.h @@ -2,9 +2,7 @@ // // A contiguous-selection only QListView widget for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlistview.h,v 1.12.4.1 2013/02/21 02:46:23 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDLISTVIEW_H #define RDLISTVIEW_H @@ -29,14 +26,13 @@ #include #include - class RDListView : public QListView { Q_OBJECT public: enum SortType {NormalSort=0,TimeSort=1,LineSort=2,GpioSort=3}; - RDListView(QWidget *parent,const char *name=0); + RDListView(QWidget *parent); int hardSortColumn() const; void setHardSortColumn(int col); RDListView::SortType columnSortType(int column) const; diff --git a/lib/rdlistviewitem.cpp b/lib/rdlistviewitem.cpp index e6614353e..467eb794e 100644 --- a/lib/rdlistviewitem.cpp +++ b/lib/rdlistviewitem.cpp @@ -2,9 +2,7 @@ // // A color-selectable QListViewItem class for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlistviewitem.cpp,v 1.20.6.1 2013/02/21 02:46:23 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -27,7 +24,6 @@ #include #include - RDListViewItem::RDListViewItem(QListView *parent) : QListViewItem(parent) { diff --git a/lib/rdlistviewitem.h b/lib/rdlistviewitem.h index 6d3770056..d33156d5d 100644 --- a/lib/rdlistviewitem.h +++ b/lib/rdlistviewitem.h @@ -2,9 +2,7 @@ // // A color-selectable QListViewItem class for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlistviewitem.h,v 1.10 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDLISTVIEWITEM_H #define RDLISTVIEWITEM_H @@ -31,8 +28,6 @@ #include -using namespace std; - class RDListViewItem : public QListViewItem { public: @@ -53,8 +48,8 @@ class RDListViewItem : public QListViewItem private: int item_line; int item_id; - vector item_text_color; - vector item_text_weight; + std::vector item_text_color; + std::vector item_text_weight; QColor item_background_color; RDListView *list_parent; }; diff --git a/lib/rdlivewire.cpp b/lib/rdlivewire.cpp index 9b4539edd..b3f71ff18 100644 --- a/lib/rdlivewire.cpp +++ b/lib/rdlivewire.cpp @@ -2,9 +2,7 @@ // // A LiveWire Node Driver for Rivendell // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewire.cpp,v 1.7.8.2 2013/11/17 02:03:19 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -74,8 +72,8 @@ QStringList AString::split(const QString &sep,const QString &esc) const } -RDLiveWire::RDLiveWire(unsigned id,QObject *parent,const char *name) - : QObject(parent,name) +RDLiveWire::RDLiveWire(unsigned id,QObject *parent) + : QObject(parent) { live_id=id; live_sources=0; diff --git a/lib/rdlivewire.h b/lib/rdlivewire.h index 6e53cc08f..42bebb079 100644 --- a/lib/rdlivewire.h +++ b/lib/rdlivewire.h @@ -2,9 +2,7 @@ // // A LiveWire Node Driver for Rivendell // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewire.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -54,7 +52,7 @@ class RDLiveWire : public QObject { Q_OBJECT public: - RDLiveWire(unsigned id,QObject *parent=0,const char *name=0); + RDLiveWire(unsigned id,QObject *parent=0); unsigned id() const; QString hostname() const; Q_UINT16 tcpPort() const; diff --git a/lib/rdlivewiredestination.cpp b/lib/rdlivewiredestination.cpp index b9b09ee80..f49eeed1a 100644 --- a/lib/rdlivewiredestination.cpp +++ b/lib/rdlivewiredestination.cpp @@ -2,9 +2,7 @@ // // Accessor Methods for LiveWire Destination Parameters // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewiredestination.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,7 +21,6 @@ #include #include - RDLiveWireDestination::RDLiveWireDestination() { clear(); diff --git a/lib/rdlivewiredestination.h b/lib/rdlivewiredestination.h index 837601341..cab9b04c3 100644 --- a/lib/rdlivewiredestination.h +++ b/lib/rdlivewiredestination.h @@ -2,9 +2,7 @@ // // Accessor Methods for LiveWire Destination Parameters // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewiredestination.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - class RDLiveWireDestination { public: diff --git a/lib/rdlivewiresource.cpp b/lib/rdlivewiresource.cpp index 45076e304..54da60b15 100644 --- a/lib/rdlivewiresource.cpp +++ b/lib/rdlivewiresource.cpp @@ -2,9 +2,7 @@ // // Accessor Methods for LiveWire Source Parameters // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewiresource.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include #include - RDLiveWireSource::RDLiveWireSource() { clear(); diff --git a/lib/rdlivewiresource.h b/lib/rdlivewiresource.h index dc1230363..4a28e5e5f 100644 --- a/lib/rdlivewiresource.h +++ b/lib/rdlivewiresource.h @@ -2,9 +2,7 @@ // // Accessor Methods for LiveWire Source Parameters // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdlivewiresource.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - class RDLiveWireSource { public: diff --git a/lib/rdlog.cpp b/lib/rdlog.cpp index b53b0e58a..ec7c145cc 100644 --- a/lib/rdlog.cpp +++ b/lib/rdlog.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlog.cpp,v 1.23.4.7.2.3 2014/06/24 18:27:04 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,6 +17,7 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // + #include #include #include diff --git a/lib/rdlog.h b/lib/rdlog.h index 55df9cda0..0cb95486b 100644 --- a/lib/rdlog.h +++ b/lib/rdlog.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlog.h,v 1.16.6.5.2.1 2014/05/20 14:01:49 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlog_event.cpp b/lib/rdlog_event.cpp index 1152885d6..898617ae5 100644 --- a/lib/rdlog_event.cpp +++ b/lib/rdlog_event.cpp @@ -2,9 +2,7 @@ // // Abstract Rivendell Log Events. // -// (C) Copyright 2002-2014 Fred Gleason -// -// $Id: rdlog_event.cpp,v 1.101.4.13.2.2 2014/05/22 19:37:44 cvs Exp $ +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlog_event.h b/lib/rdlog_event.h index 989a01d71..b6d3994a1 100644 --- a/lib/rdlog_event.h +++ b/lib/rdlog_event.h @@ -2,9 +2,7 @@ // // Abstract Rivendell Log Events // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdlog_event.h,v 1.36.6.4.2.1 2014/05/22 19:37:44 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,7 +25,6 @@ #include - #ifndef RDLOG_EVENT_H #define RDLOG_EVENT_H diff --git a/lib/rdlog_line.h b/lib/rdlog_line.h index 1cdeff738..487c96f65 100644 --- a/lib/rdlog_line.h +++ b/lib/rdlog_line.h @@ -28,7 +28,6 @@ #include #include - class RDLogLine { public: diff --git a/lib/rdlogedit_conf.cpp b/lib/rdlogedit_conf.cpp index b47e33d29..f1f4dd6de 100644 --- a/lib/rdlogedit_conf.cpp +++ b/lib/rdlogedit_conf.cpp @@ -2,9 +2,7 @@ // // Abstract an RDLogedit Configuration. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdlogedit_conf.cpp,v 1.12.8.1 2014/01/08 18:14:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdlogedit_conf.h b/lib/rdlogedit_conf.h index 3c0e5a053..0866f982c 100644 --- a/lib/rdlogedit_conf.h +++ b/lib/rdlogedit_conf.h @@ -2,9 +2,7 @@ // // Abstract RDLogedit Configuration // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdlogedit_conf.h,v 1.10.8.1 2014/01/08 18:14:35 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,6 @@ #endif // WIN32 #include - class RDLogeditConf { public: diff --git a/lib/rdmacro.cpp b/lib/rdmacro.cpp index f139d99b7..c18b0cb80 100644 --- a/lib/rdmacro.cpp +++ b/lib/rdmacro.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell Macro Language Command // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdmacro.cpp,v 1.37.4.2.2.1 2014/05/22 19:37:44 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdmacro_event.cpp b/lib/rdmacro_event.cpp index 7126a9414..4db48cb14 100644 --- a/lib/rdmacro_event.cpp +++ b/lib/rdmacro_event.cpp @@ -2,9 +2,7 @@ // // A container class for a list of RML macros. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdmacro_event.cpp,v 1.22 2011/03/01 20:35:52 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,7 +24,6 @@ #include #include - RDMacroEvent::RDMacroEvent(RDRipc *ripc,QObject *parent,const char *name) : QObject(parent,name) { diff --git a/lib/rdmacro_event.h b/lib/rdmacro_event.h index 1c2eadc38..c03d3f7fd 100644 --- a/lib/rdmacro_event.h +++ b/lib/rdmacro_event.h @@ -2,9 +2,7 @@ // // A container class for a list of RML macros. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdmacro_event.h,v 1.14 2011/01/04 22:50:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdmarker_bar.cpp b/lib/rdmarker_bar.cpp index 9fd22b796..2e03c8436 100644 --- a/lib/rdmarker_bar.cpp +++ b/lib/rdmarker_bar.cpp @@ -2,9 +2,7 @@ // // A marker widget for the RDCueEdit widget. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: rdmarker_bar.cpp,v 1.1.2.1 2013/07/05 21:07:28 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include -RDMarkerBar::RDMarkerBar(QWidget *parent,const char *name) - : QLabel(parent,name) +RDMarkerBar::RDMarkerBar(QWidget *parent) + : QLabel(parent) { for(int i=0;i -// -// $Id: rdmarker_bar.h,v 1.1.2.1 2013/07/05 21:07:28 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDMARKER_BAR_H #define RDMARKER_BAR_H @@ -34,7 +31,7 @@ class RDMarkerBar : public QLabel Q_OBJECT public: enum Marker {Play=0,Start=1,End=2,MaxSize=3}; - RDMarkerBar(QWidget *parent=0,const char *name=0); + RDMarkerBar(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdmarker_button.cpp b/lib/rdmarker_button.cpp index a653f1dd0..296de3407 100644 --- a/lib/rdmarker_button.cpp +++ b/lib/rdmarker_button.cpp @@ -2,9 +2,7 @@ // // Marker Button for RDLibrary // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdmarker_button.cpp,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,22 +20,21 @@ #include -RDMarkerButton::RDMarkerButton(QWidget *parent,const char *name) - : RDPushButton(parent,name) +RDMarkerButton::RDMarkerButton(QWidget *parent) + : RDPushButton(parent) { } -RDMarkerButton::RDMarkerButton(const QString &text,QWidget *parent, - const char *name) - : RDPushButton(text,parent,name) +RDMarkerButton::RDMarkerButton(const QString &text,QWidget *parent) + : RDPushButton(text,parent) { } RDMarkerButton::RDMarkerButton(const QIconSet &icon,const QString &text, - QWidget *parent,const char *name) - : RDPushButton(icon,text,parent,name) + QWidget *parent) + : RDPushButton(icon,text,parent) { } diff --git a/lib/rdmarker_button.h b/lib/rdmarker_button.h index 73edce4d3..753f52a53 100644 --- a/lib/rdmarker_button.h +++ b/lib/rdmarker_button.h @@ -2,9 +2,7 @@ // // Marker Button for RDLibrary // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdmarker_button.h,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,15 +27,13 @@ class RDMarkerButton : public RDPushButton { public: - RDMarkerButton(QWidget *parent,const char *name=0); - RDMarkerButton(const QString &text,QWidget *parent,const char *name=0); - RDMarkerButton(const QIconSet &icon,const QString &text,QWidget *parent, - const char *name=0); + RDMarkerButton(QWidget *parent); + RDMarkerButton(const QString &text,QWidget *parent); + RDMarkerButton(const QIconSet &icon,const QString &text,QWidget *parent); protected: void keyPressEvent(QKeyEvent *e); }; -#endif - +#endif // RDMARKER_BUTTON_H diff --git a/lib/rdmarker_edit.cpp b/lib/rdmarker_edit.cpp index 6a2f9f530..4a31dc082 100644 --- a/lib/rdmarker_edit.cpp +++ b/lib/rdmarker_edit.cpp @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdmarker_edit.cpp,v 1.3 2007/02/14 21:48:41 fredg Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,14 +21,14 @@ #include -RDMarkerEdit::RDMarkerEdit(QWidget *parent,const char *name) - : QLineEdit(parent,name) +RDMarkerEdit::RDMarkerEdit(QWidget *parent) + : QLineEdit(parent) { } -RDMarkerEdit::RDMarkerEdit(const QString &contents,QWidget *parent,const char *name) - : QLineEdit(contents,parent,name) +RDMarkerEdit::RDMarkerEdit(const QString &contents,QWidget *parent) + : QLineEdit(contents,parent) { } diff --git a/lib/rdmarker_edit.h b/lib/rdmarker_edit.h index e39d3fc51..abfaee34b 100644 --- a/lib/rdmarker_edit.h +++ b/lib/rdmarker_edit.h @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdmarker_edit.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDMARKEREDIT_H #define RDMARKEREDIT_H @@ -29,14 +26,13 @@ #include #include - class RDMarkerEdit : public QLineEdit { Q_OBJECT public: - RDMarkerEdit(QWidget *parent,const char *name); - RDMarkerEdit(const QString &contents,QWidget *parent,const char *name); + RDMarkerEdit(QWidget *parent); + RDMarkerEdit(const QString &contents,QWidget *parent); signals: void escapePressed(); diff --git a/lib/rdmatrix.cpp b/lib/rdmatrix.cpp index 9d435ea87..2c5c89510 100644 --- a/lib/rdmatrix.cpp +++ b/lib/rdmatrix.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Switcher Matrix // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdmatrix.cpp,v 1.28.8.11 2014/02/17 02:19:01 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdmatrix.h b/lib/rdmatrix.h index 48702951c..7be22d73c 100644 --- a/lib/rdmatrix.h +++ b/lib/rdmatrix.h @@ -2,7 +2,7 @@ // // Abstract a Rivendell Switcher Matrix // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,13 +18,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include - #ifndef RDMATRIX_H #define RDMATRIX_H +#include +#include +#include class RDMatrix { diff --git a/lib/rdmeteraverage.cpp b/lib/rdmeteraverage.cpp index 3fd71b3e2..23172f81d 100644 --- a/lib/rdmeteraverage.cpp +++ b/lib/rdmeteraverage.cpp @@ -2,9 +2,7 @@ // // Average sucessive levels for a meter. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdmeteraverage.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,7 +20,6 @@ #include - RDMeterAverage::RDMeterAverage(int maxsize) { avg_maxsize=maxsize; diff --git a/lib/rdmeteraverage.h b/lib/rdmeteraverage.h index ec2d5ebf3..e658eaec1 100644 --- a/lib/rdmeteraverage.h +++ b/lib/rdmeteraverage.h @@ -2,9 +2,7 @@ // // Average sucessive levels for a meter. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdmeteraverage.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,7 +22,6 @@ #include - class RDMeterAverage { public: diff --git a/lib/rdmixer.cpp b/lib/rdmixer.cpp index c6ad4bdaf..f23609197 100644 --- a/lib/rdmixer.cpp +++ b/lib/rdmixer.cpp @@ -2,9 +2,7 @@ // // Mixer Functions for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdmixer.cpp,v 1.13.8.2 2012/08/03 16:52:39 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - void RDSetMixerPorts(QString station,RDCae *cae) { for(int i=0;i -// -// $Id: rdmixer.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,14 +18,14 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include - #ifndef RDMIXER_H #define RDMIXER_H +#include +#include + void RDSetMixerPorts(QString station,RDCae *cae); void RDSetMixerOutputPort(RDCae *cae,int card,int stream,int port); -#endif +#endif // RDMIXER_H diff --git a/lib/rdmonitor_config.cpp b/lib/rdmonitor_config.cpp index 982f89acc..0bcdd83c8 100644 --- a/lib/rdmonitor_config.cpp +++ b/lib/rdmonitor_config.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell RDMonitor Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdmonitor_config.cpp,v 1.1.2.2 2013/11/08 03:57:14 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdmonitor_config.h b/lib/rdmonitor_config.h index ba88c3dbb..ce7855e50 100644 --- a/lib/rdmonitor_config.h +++ b/lib/rdmonitor_config.h @@ -2,9 +2,7 @@ // // A container class for a Rivendell RDMonitor Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdmonitor_config.h,v 1.1.2.2 2013/11/08 03:57:14 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdmp4.h b/lib/rdmp4.h index abdf016da..06f046b7d 100644 --- a/lib/rdmp4.h +++ b/lib/rdmp4.h @@ -21,6 +21,7 @@ #ifndef RDMP4_H #define RDMP4_H + #ifdef HAVE_MP4_LIBS #include diff --git a/lib/rdnownext.cpp b/lib/rdnownext.cpp index 7d0f24324..0df493214 100644 --- a/lib/rdnownext.cpp +++ b/lib/rdnownext.cpp @@ -2,9 +2,7 @@ // // Rivendell Now & Next Implementation // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdnownext.cpp,v 1.3.8.5 2014/01/07 18:18:29 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdnownext.h b/lib/rdnownext.h index 519b2ad8b..281b8ffd1 100644 --- a/lib/rdnownext.h +++ b/lib/rdnownext.h @@ -2,9 +2,7 @@ // // Rivendell Now & Next Implementation // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdnownext.h,v 1.3.8.2 2014/01/07 18:18:29 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdoneshot.cpp b/lib/rdoneshot.cpp index 63b9a2396..d966f5ccf 100644 --- a/lib/rdoneshot.cpp +++ b/lib/rdoneshot.cpp @@ -2,7 +2,7 @@ // // A class for providing one-shot single use timers. // -// (C) Copyright 2008 Fred Gleason +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ #include -RDOneShot::RDOneShot(QObject *parent,const char *name) - : QObject(parent,name) +RDOneShot::RDOneShot(QObject *parent) + : QObject(parent) { // // Timeout Mapper diff --git a/lib/rdoneshot.h b/lib/rdoneshot.h index 83e242a4c..5b7e0c4f4 100644 --- a/lib/rdoneshot.h +++ b/lib/rdoneshot.h @@ -2,9 +2,7 @@ // // A class for providing one-shot single use timers. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdoneshot.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,7 +31,7 @@ class RDOneShot : public QObject { Q_OBJECT public: - RDOneShot(QObject *parent=0,const char *name=0); + RDOneShot(QObject *parent=0); void start(int value,int msecs); signals: diff --git a/lib/rdpam.cpp b/lib/rdpam.cpp index a65ca8f6e..609ac5b4e 100644 --- a/lib/rdpam.cpp +++ b/lib/rdpam.cpp @@ -2,9 +2,7 @@ // // Authenticate a PAM name. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdpam.cpp,v 1.2.8.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdpam.h b/lib/rdpam.h index 82f845deb..a65da5a1d 100644 --- a/lib/rdpam.h +++ b/lib/rdpam.h @@ -2,9 +2,7 @@ // // Authenticate a PAM name. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdpam.h,v 1.2 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdpanel_button.cpp b/lib/rdpanel_button.cpp index 559d8623a..a27eeaa8f 100644 --- a/lib/rdpanel_button.cpp +++ b/lib/rdpanel_button.cpp @@ -2,9 +2,7 @@ // // The SoundPanel Button for RDAirPlay. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdpanel_button.cpp,v 1.26.6.9 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include RDPanelButton::RDPanelButton(int row,int col,RDStation *station,bool flash, - QWidget *parent,const char *name) - : QPushButton(parent,name) + QWidget *parent) + : QPushButton(parent) { button_row=row; button_col=col; diff --git a/lib/rdpanel_button.h b/lib/rdpanel_button.h index 58af43603..11c901722 100644 --- a/lib/rdpanel_button.h +++ b/lib/rdpanel_button.h @@ -2,9 +2,7 @@ // // The SoundPanel Button for RDAirPlay. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdpanel_button.h,v 1.18.6.5 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,8 +39,8 @@ class RDPanelButton : public QPushButton { Q_OBJECT public: - RDPanelButton(int row,int col,RDStation *station,bool flash,QWidget *parent=0, - const char *name=0); + RDPanelButton(int row,int col,RDStation *station,bool flash, + QWidget *parent=0); void clear(); QString text() const; void setText(const QString &text); diff --git a/lib/rdpasswd.cpp b/lib/rdpasswd.cpp index fce1ad5bd..eb256ec84 100644 --- a/lib/rdpasswd.cpp +++ b/lib/rdpasswd.cpp @@ -2,9 +2,7 @@ // // Set Password widget for Rivendell. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdpasswd.cpp,v 1.12 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include #include - -RDPasswd::RDPasswd(QString *password,QWidget *parent,const char *name) - : QDialog(parent,name,true) +RDPasswd::RDPasswd(QString *password,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size diff --git a/lib/rdpasswd.h b/lib/rdpasswd.h index 5a0d4c37d..ec2309fd9 100644 --- a/lib/rdpasswd.h +++ b/lib/rdpasswd.h @@ -2,9 +2,7 @@ // // Set Password Widget for Rivendell. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdpasswd.h,v 1.6 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,12 +27,11 @@ #include #include - class RDPasswd : public QDialog { Q_OBJECT public: - RDPasswd(QString *password,QWidget *parent=0,const char *name=0); + RDPasswd(QString *password,QWidget *parent=0); ~RDPasswd(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdpaths.h.in b/lib/rdpaths.h.in index 7f988f3fe..6f32906da 100644 --- a/lib/rdpaths.h.in +++ b/lib/rdpaths.h.in @@ -2,9 +2,7 @@ // // Install-Dependent Path Values for Rivendell // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdpaths.h.in,v 1.6 2011/03/26 01:37:33 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdpeaksexport.cpp b/lib/rdpeaksexport.cpp index 49a562bc3..13d084ccc 100644 --- a/lib/rdpeaksexport.cpp +++ b/lib/rdpeaksexport.cpp @@ -2,9 +2,7 @@ // // Export peak data using the RdXport Web Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdpeaksexport.cpp,v 1.6.4.5 2013/11/13 23:36:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -66,7 +64,7 @@ RDPeaksExport::~RDPeaksExport() RDPeaksExport::RDPeaksExport(RDStation *station,RDConfig *config, - QObject *parent,const char *name) + QObject *parent) { conv_station=station; conv_config=config; diff --git a/lib/rdpeaksexport.h b/lib/rdpeaksexport.h index bc30bb13d..4a71b0ae9 100644 --- a/lib/rdpeaksexport.h +++ b/lib/rdpeaksexport.h @@ -2,9 +2,7 @@ // // Export peak data using the RdXport Web Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdpeaksexport.h,v 1.1.6.1 2013/11/13 23:36:33 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,8 +33,7 @@ class RDPeaksExport enum ErrorCode {ErrorOk=0,ErrorNoSource=2, ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorAborted=10}; - RDPeaksExport(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDPeaksExport(RDStation *station,RDConfig *config,QObject *parent=0); ~RDPeaksExport(); void setCartNumber(unsigned cartnum); void setCutNumber(unsigned cutnum); diff --git a/lib/rdplay_deck.cpp b/lib/rdplay_deck.cpp index a0f53aaad..20c2d378a 100644 --- a/lib/rdplay_deck.cpp +++ b/lib/rdplay_deck.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Playback Deck // -// (C) Copyright 2003-2004 Fred Gleason -// -// $Id: rdplay_deck.cpp,v 1.85.8.5 2013/05/21 19:04:44 cvs Exp $ +// (C) Copyright 2003-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include #include -RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent,const char *name) - : QObject(parent,name) +RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent) + : QObject(parent) { play_id=id; play_state=RDPlayDeck::Stopped; diff --git a/lib/rdplay_deck.h b/lib/rdplay_deck.h index 4b955d0f8..574a95311 100644 --- a/lib/rdplay_deck.h +++ b/lib/rdplay_deck.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Playback Deck // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdplay_deck.h,v 1.36.8.1 2013/05/21 19:04:44 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,7 +42,7 @@ class RDPlayDeck : public QObject public: enum State {Stopped=0,Stopping=1,Playing=2,Paused=3,Finished=4}; - RDPlayDeck(RDCae *cae,int id,QObject *parent=0,const char *name=0); + RDPlayDeck(RDCae *cae,int id,QObject *parent=0); ~RDPlayDeck(); int id() const; void setId(int id); diff --git a/lib/rdplaymeter.cpp b/lib/rdplaymeter.cpp index 0eb1a80aa..1560b5a2e 100644 --- a/lib/rdplaymeter.cpp +++ b/lib/rdplaymeter.cpp @@ -3,9 +3,7 @@ // This implements a widget that represents a stereo audio level meter, // complete with labels and scale. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdplaymeter.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -37,14 +35,14 @@ #include -RDPlayMeter::RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent,const char *name) - : QWidget(parent,name) +RDPlayMeter::RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent) + : QWidget(parent) { meter_label=QString(""); setBackgroundColor(black); orientation=orient; makeFont(); - meter=new RDSegMeter(orientation,this,"meter"); + meter=new RDSegMeter(orientation,this); meter->setSegmentSize(5); meter->setSegmentGap(1); } diff --git a/lib/rdplaymeter.h b/lib/rdplaymeter.h index 72d3d0c11..3cde7e0af 100644 --- a/lib/rdplaymeter.h +++ b/lib/rdplaymeter.h @@ -2,9 +2,7 @@ // // A playback audio meter widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdplaymeter.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -39,8 +37,7 @@ class RDPlayMeter : public QWidget { Q_OBJECT public: - RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent=0, - const char *name=0); + RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setRange(int min,int max); diff --git a/lib/rdpodcast.cpp b/lib/rdpodcast.cpp index 3e39ba857..267c61889 100644 --- a/lib/rdpodcast.cpp +++ b/lib/rdpodcast.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Podcast // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdpodcast.cpp,v 1.11 2010/11/24 16:57:38 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdpodcast.h b/lib/rdpodcast.h index 368cd859e..c4080e943 100644 --- a/lib/rdpodcast.h +++ b/lib/rdpodcast.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Podcast Entry // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdpodcast.h,v 1.7 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdprofile.cpp b/lib/rdprofile.cpp index 65b5c4317..67f5e6474 100644 --- a/lib/rdprofile.cpp +++ b/lib/rdprofile.cpp @@ -2,9 +2,7 @@ // // A class to read an ini formatted configuration file. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofile.cpp,v 1.4.8.1 2014/01/20 19:13:30 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -27,7 +24,6 @@ #include - RDProfile::RDProfile() { } diff --git a/lib/rdprofile.h b/lib/rdprofile.h index 4702239ad..2d51d2eef 100644 --- a/lib/rdprofile.h +++ b/lib/rdprofile.h @@ -2,9 +2,7 @@ // // A class to read an ini formatted configuration file. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofile.h,v 1.4.8.1 2014/01/20 19:13:30 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,13 +17,10 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// - #ifndef RDPROFILE_H #define RDPROFILE_H - #include #include diff --git a/lib/rdprofileline.cpp b/lib/rdprofileline.cpp index 47f742ab0..5e8edeec8 100644 --- a/lib/rdprofileline.cpp +++ b/lib/rdprofileline.cpp @@ -2,9 +2,7 @@ // // A container class for profile lines. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofileline.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,8 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// - #include diff --git a/lib/rdprofileline.h b/lib/rdprofileline.h index 255fb3c39..7bdc948a5 100644 --- a/lib/rdprofileline.h +++ b/lib/rdprofileline.h @@ -2,9 +2,7 @@ // // A container class for profile lines. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofileline.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,15 +17,12 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// - #ifndef RDPROFILELINE_H #define RDPROFILELINE_H #include - class RDProfileLine { public: diff --git a/lib/rdprofilesection.cpp b/lib/rdprofilesection.cpp index 3361d1ceb..1043b12ff 100644 --- a/lib/rdprofilesection.cpp +++ b/lib/rdprofilesection.cpp @@ -2,9 +2,7 @@ // // A container class for profile sections. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofilesection.cpp,v 1.1 2007/09/14 14:06:24 fredg Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include diff --git a/lib/rdprofilesection.h b/lib/rdprofilesection.h index 65bd85d25..56abb44c0 100644 --- a/lib/rdprofilesection.h +++ b/lib/rdprofilesection.h @@ -2,9 +2,7 @@ // // A container class for profile sections. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdprofilesection.h,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,8 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// - #ifndef RDPROFILESECTION_H #define RDPROFILESECTION_H diff --git a/lib/rdpushbutton.cpp b/lib/rdpushbutton.cpp index b9fd63459..6db4b900a 100644 --- a/lib/rdpushbutton.cpp +++ b/lib/rdpushbutton.cpp @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdpushbutton.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -30,23 +28,22 @@ #include -RDPushButton::RDPushButton(QWidget *parent=0,const char *name) : - QPushButton(parent,name) +RDPushButton::RDPushButton(QWidget *parent=0) + : QPushButton(parent) { Init(); } -RDPushButton::RDPushButton(const QString &text,QWidget *parent, - const char *name) - : QPushButton(text,parent,name) +RDPushButton::RDPushButton(const QString &text,QWidget *parent) + : QPushButton(text,parent) { Init(); } RDPushButton::RDPushButton(const QIconSet &icon,const QString &text, - QWidget *parent,const char *name) - : QPushButton(text,parent,name) + QWidget *parent) + : QPushButton(text,parent) { Init(); } diff --git a/lib/rdpushbutton.h b/lib/rdpushbutton.h index 28393e0f3..d57ad73b2 100644 --- a/lib/rdpushbutton.h +++ b/lib/rdpushbutton.h @@ -2,9 +2,7 @@ // // An flashing button widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdpushbutton.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDPUSHBUTTON_H #define RDPUSHBUTTON_H @@ -35,16 +32,14 @@ #define RDPUSHBUTTON_DEFAULT_FLASH_PERIOD 300 #define RDPUSHBUTTON_DEFAULT_FLASH_COLOR blue - class RDPushButton : public QPushButton { Q_OBJECT public: enum ClockSource {InternalClock=0,ExternalClock=1}; - RDPushButton(QWidget *parent,const char *name=0); - RDPushButton(const QString &text,QWidget *parent,const char *name=0); - RDPushButton(const QIconSet &icon,const QString &text, - QWidget *parent,const char *name=0); + RDPushButton(QWidget *parent); + RDPushButton(const QString &text,QWidget *parent); + RDPushButton(const QIconSet &icon,const QString &text,QWidget *parent); QColor flashColor() const; void setFlashColor(QColor color); int flashPeriod() const; diff --git a/lib/rdrecording.cpp b/lib/rdrecording.cpp index e32b7385c..b698aa908 100644 --- a/lib/rdrecording.cpp +++ b/lib/rdrecording.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Netcatch Recording. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdrecording.cpp,v 1.30 2012/01/12 16:24:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdrecording.h b/lib/rdrecording.h index 4116bcbe4..8b45fe77e 100644 --- a/lib/rdrecording.h +++ b/lib/rdrecording.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell RDCatch Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdrecording.h,v 1.29 2011/06/21 18:31:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdreplicator.cpp b/lib/rdreplicator.cpp index 51f2be8e9..04cc32e19 100644 --- a/lib/rdreplicator.cpp +++ b/lib/rdreplicator.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell replicator configuration // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdreplicator.cpp,v 1.3 2010/08/03 17:52:18 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdreplicator.h b/lib/rdreplicator.h index da6e341dc..9940c57cd 100644 --- a/lib/rdreplicator.h +++ b/lib/rdreplicator.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell replicator configuration // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdreplicator.h,v 1.3 2010/08/03 17:52:18 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdreport.cpp b/lib/rdreport.cpp index 4fe0bcc0c..8bf1b0d2e 100644 --- a/lib/rdreport.cpp +++ b/lib/rdreport.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Report Descriptor // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdreport.cpp,v 1.27.4.8.2.4 2014/06/24 18:27:05 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ #include #include -RDReport::RDReport(const QString &rptname,QObject *parent,const char *name) +RDReport::RDReport(const QString &rptname,QObject *parent) { report_name=rptname; report_error_code=RDReport::ErrorOk; diff --git a/lib/rdreport.h b/lib/rdreport.h index c85aea385..782b96bbb 100644 --- a/lib/rdreport.h +++ b/lib/rdreport.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Report Descriptor // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdreport.h,v 1.17.8.7.2.4 2014/05/22 01:21:35 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class RDReport enum ExportType {Generic=0,Traffic=1,Music=2}; enum StationType {TypeOther=0,TypeAm=1,TypeFm=2,TypeLast=3}; enum ErrorCode {ErrorOk=0,ErrorCanceled=1,ErrorCantOpen=2}; - RDReport(const QString &rptname,QObject *parent=0,const char *name=0); + RDReport(const QString &rptname,QObject *parent=0); QString name() const; bool exists() const; QString description() const; diff --git a/lib/rdringbuffer.cpp b/lib/rdringbuffer.cpp index 1da428c15..f8e88b39b 100644 --- a/lib/rdringbuffer.cpp +++ b/lib/rdringbuffer.cpp @@ -4,9 +4,7 @@ // // (C) Copyright 2000 Paul Davis // (C) Copyright 2003 Rohan Drape -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdringbuffer.cpp,v 1.4 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdringbuffer.h b/lib/rdringbuffer.h index 33624f3f2..35c538c02 100644 --- a/lib/rdringbuffer.h +++ b/lib/rdringbuffer.h @@ -4,9 +4,7 @@ // // (C) Copyright 2000 Paul Davis // (C) Copyright 2003 Rohan Drape -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdringbuffer.h,v 1.5 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdripc.cpp b/lib/rdripc.cpp index b99f5b348..acab3e6fb 100644 --- a/lib/rdripc.cpp +++ b/lib/rdripc.cpp @@ -2,9 +2,7 @@ // // Connection to the Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdripc.cpp,v 1.36.6.2 2013/03/09 00:21:11 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,9 +26,8 @@ #include #include - -RDRipc::RDRipc(QString stationname,QObject *parent,const char *name) - : QObject(parent,name) +RDRipc::RDRipc(QString stationname,QObject *parent) + : QObject(parent) { ripc_stationname=stationname; ripc_onair_flag=false; @@ -44,7 +41,7 @@ RDRipc::RDRipc(QString stationname,QObject *parent,const char *name) // // TCP Connection // - ripc_socket=new QSocket(this,"ripc_socket"); + ripc_socket=new QSocket(this); connect(ripc_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(ripc_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(ripc_socket,SIGNAL(readyRead()),this,SLOT(readyData())); diff --git a/lib/rdripc.h b/lib/rdripc.h index 29c9aaec9..3dc3e1541 100644 --- a/lib/rdripc.h +++ b/lib/rdripc.h @@ -2,9 +2,7 @@ // // Connection to the Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdripc.h,v 1.24.8.1 2012/11/16 18:10:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,7 +38,7 @@ class RDRipc : public QObject { Q_OBJECT public: - RDRipc(QString stationname,QObject *parent=0,const char *name=0); + RDRipc(QString stationname,QObject *parent=0); ~RDRipc(); QString user() const; QString station() const; diff --git a/lib/rdschedcodes_dialog.cpp b/lib/rdschedcodes_dialog.cpp index 1c4782c48..8428579bd 100644 --- a/lib/rdschedcodes_dialog.cpp +++ b/lib/rdschedcodes_dialog.cpp @@ -2,12 +2,10 @@ // // Scheduler code editor dialog // -// (C) Copyright 2014 Fred Gleason +// (C) Copyright 2014,2016 Fred Gleason // // Based on original code by Stefan Gabriel // -// $Id: rdschedcodes_dialog.cpp,v 1.1.2.1 2014/05/28 21:21:40 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/lib/rdschedcodes_dialog.h b/lib/rdschedcodes_dialog.h index c402ddc61..741855d11 100644 --- a/lib/rdschedcodes_dialog.h +++ b/lib/rdschedcodes_dialog.h @@ -2,12 +2,10 @@ // // Scheduler code editor dialog // -// (C) Copyright 2014 Fred Gleason +// (C) Copyright 2014,2016 Fred Gleason // // Based on original code by Stefan Gabriel // -// $Id: rdschedcodes_dialog.h,v 1.1.2.1 2014/05/28 21:21:40 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/lib/rdsegmeter.cpp b/lib/rdsegmeter.cpp index 345cc3a2e..2c0b73523 100644 --- a/lib/rdsegmeter.cpp +++ b/lib/rdsegmeter.cpp @@ -2,9 +2,7 @@ // // An audio meter display widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdsegmeter.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -35,8 +32,8 @@ #include -RDSegMeter::RDSegMeter(RDSegMeter::Orientation o,QWidget *parent,const char *name) - : QWidget(parent,name) +RDSegMeter::RDSegMeter(RDSegMeter::Orientation o,QWidget *parent) + : QWidget(parent) { orient=o; setBackgroundColor(black); diff --git a/lib/rdsegmeter.h b/lib/rdsegmeter.h index dd8073ad7..79ff5bd95 100644 --- a/lib/rdsegmeter.h +++ b/lib/rdsegmeter.h @@ -2,9 +2,7 @@ // // An audio meter display widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdsegmeter.h,v 1.3 2010/07/29 19:32:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDSEGMETER_H #define RDSEGMETER_H @@ -53,7 +50,7 @@ class RDSegMeter : public QWidget public: enum Mode {Independent=0,Peak=1}; enum Orientation {Left=0,Right=1,Up=2,Down=3}; - RDSegMeter(RDSegMeter::Orientation o,QWidget *parent=0,const char *name=0); + RDSegMeter(RDSegMeter::Orientation o,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setRange(int min,int max); diff --git a/lib/rdsimpleplayer.cpp b/lib/rdsimpleplayer.cpp index a7edd87c6..e875dce38 100644 --- a/lib/rdsimpleplayer.cpp +++ b/lib/rdsimpleplayer.cpp @@ -2,9 +2,7 @@ // // A naively simple player for Rivendell Carts. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdsimpleplayer.cpp,v 1.14 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ RDSimplePlayer::RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port, unsigned start_cart,unsigned end_cart, - QWidget *parent,const char *name) - : QWidget(parent,name) + QWidget *parent) + : QWidget(parent) { play_cae=cae; play_ripc=ripc; @@ -48,21 +46,19 @@ RDSimplePlayer::RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port, // // Event Player // - play_event_player=new RDEventPlayer(play_ripc,this,"play_event_player"); + play_event_player=new RDEventPlayer(play_ripc,this); // // Start Button // - play_start_button= - new RDTransportButton(RDTransportButton::Play,parent,"play_start_button"); + play_start_button=new RDTransportButton(RDTransportButton::Play,parent); play_start_button->setEnabled((play_card>=0)&&(play_port>=0)); connect(play_start_button,SIGNAL(clicked()),this,SLOT(play())); // // Stop Button // - play_stop_button= - new RDTransportButton(RDTransportButton::Stop,parent,"play_stop_button"); + play_stop_button=new RDTransportButton(RDTransportButton::Stop,parent); play_stop_button->on(); play_stop_button->setEnabled((play_card>=0)&&(play_port>=0)); connect(play_stop_button,SIGNAL(clicked()),this,SLOT(stop())); diff --git a/lib/rdsimpleplayer.h b/lib/rdsimpleplayer.h index 916003e72..3b2ece4fe 100644 --- a/lib/rdsimpleplayer.h +++ b/lib/rdsimpleplayer.h @@ -2,9 +2,7 @@ // // A naively simple player for Rivendell Carts. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdsimpleplayer.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,14 +30,12 @@ #ifndef RDSIMPLEPLAYER_H #define RDSIMPLEPLAYER_H - class RDSimplePlayer : public QWidget { Q_OBJECT public: RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port, - unsigned start_cart,unsigned end_cart, - QWidget *parent=0,const char *name=0); + unsigned start_cart,unsigned end_cart,QWidget *parent=0); ~RDSimplePlayer(); void setCart(unsigned cart); RDTransportButton *playButton() const; diff --git a/lib/rdslider.cpp b/lib/rdslider.cpp index f67006845..a249ce18e 100644 --- a/lib/rdslider.cpp +++ b/lib/rdslider.cpp @@ -2,9 +2,7 @@ // // An audio- and touchscreen-friendly slider widget. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdslider.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -34,16 +32,16 @@ #include -RDSlider::RDSlider(QWidget *parent=0,const char *name=0) - : QWidget(parent,name),QRangeControl() +RDSlider::RDSlider(QWidget *parent=0) + : QWidget(parent),QRangeControl() { init(RDSlider::Right); update(); } -RDSlider::RDSlider(RDSlider::Orientation orient,QWidget *parent,const char *name) - : QWidget(parent,name),QRangeControl() +RDSlider::RDSlider(RDSlider::Orientation orient,QWidget *parent) + : QWidget(parent),QRangeControl() { init(orient); setOrientation(orient); @@ -51,8 +49,8 @@ RDSlider::RDSlider(RDSlider::Orientation orient,QWidget *parent,const char *name RDSlider::RDSlider(int minValue,int maxValue,int pageStep,int value, - RDSlider::Orientation orient,QWidget *parent,const char *name) - : QWidget(parent,name),QRangeControl() + RDSlider::Orientation orient,QWidget *parent) + : QWidget(parent),QRangeControl() { init(orient); setOrientation(orient); diff --git a/lib/rdslider.h b/lib/rdslider.h index 9342c8899..14aae3d99 100644 --- a/lib/rdslider.h +++ b/lib/rdslider.h @@ -2,9 +2,7 @@ // // An audio- and touchscreen-friendly slider widget. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdslider.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDSLIDER_H #define RDSLIDER_H @@ -37,10 +34,10 @@ class RDSlider : public QWidget,public QRangeControl Q_OBJECT public: enum Orientation {Left=0,Right=1,Up=2,Down=3}; - RDSlider(QWidget *parent,const char *name); - RDSlider(RDSlider::Orientation orient,QWidget *parent,const char *name); + RDSlider(QWidget *parent); + RDSlider(RDSlider::Orientation orient,QWidget *parent); RDSlider(int minValue,int maxValue,int pageStep,int value, - RDSlider::Orientation orient,QWidget *parent,const char *name); + RDSlider::Orientation orient,QWidget *parent); RDSlider::Orientation orientation() const; void setOrientation(RDSlider::Orientation orient); void setTracking(bool enable); diff --git a/lib/rdslotbox.cpp b/lib/rdslotbox.cpp index 8430ea770..4aece788f 100644 --- a/lib/rdslotbox.cpp +++ b/lib/rdslotbox.cpp @@ -2,9 +2,7 @@ // // Cart slot label widget for RDCartSlot // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotbox.cpp,v 1.5.2.8 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdslotbox.h b/lib/rdslotbox.h index 4fda95d7f..5e6f63289 100644 --- a/lib/rdslotbox.h +++ b/lib/rdslotbox.h @@ -2,9 +2,7 @@ // // Cart slot label widget for RDCartSlot // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotbox.h,v 1.3.2.7 2014/02/06 20:43:47 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -52,7 +50,7 @@ class RDSlotBox : public QWidget Q_OBJECT public: enum BarMode {Transitioning=0,Stopping=1}; - RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent=0); + RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent); QSize sizeHint() const; QSizePolicy sizePolicy() const; RDLogLine *logLine(); diff --git a/lib/rdslotdialog.cpp b/lib/rdslotdialog.cpp index 427bd859f..e6ff1b44e 100644 --- a/lib/rdslotdialog.cpp +++ b/lib/rdslotdialog.cpp @@ -2,9 +2,7 @@ // // Slot Editor for RDCartSlots. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotdialog.cpp,v 1.3.2.4 2012/11/28 01:57:38 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdslotdialog.h b/lib/rdslotdialog.h index 109d8a811..9e2bccf5d 100644 --- a/lib/rdslotdialog.h +++ b/lib/rdslotdialog.h @@ -2,9 +2,7 @@ // // Slot Editor for RDCartSlots. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotdialog.h,v 1.3.2.3 2012/11/28 01:57:38 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdslotoptions.cpp b/lib/rdslotoptions.cpp index 3927f2e99..a297924eb 100644 --- a/lib/rdslotoptions.cpp +++ b/lib/rdslotoptions.cpp @@ -2,9 +2,7 @@ // // Container class for RDCartSlot options // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotoptions.cpp,v 1.2.2.5 2012/11/28 18:49:36 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdslotoptions.h b/lib/rdslotoptions.h index f25275c72..271643853 100644 --- a/lib/rdslotoptions.h +++ b/lib/rdslotoptions.h @@ -2,9 +2,7 @@ // // Container class for RDCartSlot options // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdslotoptions.h,v 1.2.2.4 2012/11/28 01:57:38 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdsocket.cpp b/lib/rdsocket.cpp index afeed0573..8b0c25a30 100644 --- a/lib/rdsocket.cpp +++ b/lib/rdsocket.cpp @@ -2,9 +2,7 @@ // // A QSocket object with connection-ID. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdsocket.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -28,9 +25,8 @@ #include - -RDSocket::RDSocket(int id,QObject *parent,const char *name) - : QSocket(parent,name) +RDSocket::RDSocket(int id,QObject *parent) + : QSocket(parent) { id_num=id; connect(this,SIGNAL(hostFound()),this,SLOT(hostFoundData())); diff --git a/lib/rdsocket.h b/lib/rdsocket.h index 0cad24f18..d16a37879 100644 --- a/lib/rdsocket.h +++ b/lib/rdsocket.h @@ -2,9 +2,7 @@ // // A QSocket object with connection-ID. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdsocket.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDSOCKET_H #define RDSOCKET_H @@ -27,13 +24,11 @@ #include #include - class RDSocket : public QSocket { Q_OBJECT - public: - RDSocket(int id,QObject *parent=0,const char *name=0); + RDSocket(int id,QObject *parent=0); signals: void hostFoundID(int id); diff --git a/lib/rdsound_panel.cpp b/lib/rdsound_panel.cpp index 610c9375a..f92fb6fe3 100644 --- a/lib/rdsound_panel.cpp +++ b/lib/rdsound_panel.cpp @@ -34,8 +34,8 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, const QString &label_template,bool extended, RDEventPlayer *player,RDRipc *ripc,RDCae *cae, RDStation *station,RDCartDialog *cart_dialog, - QWidget *parent,const char *name) - : QWidget(parent,name) + QWidget *parent) + : QWidget(parent) { panel_playmode_box=NULL; panel_button_columns=cols; @@ -91,7 +91,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // Load Buttons // - panel_mapper=new QSignalMapper(this,"panel_mapper"); + panel_mapper=new QSignalMapper(this); connect(panel_mapper,SIGNAL(mapped(int)),this,SLOT(buttonMapperData(int))); LoadPanels(); @@ -99,7 +99,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // Panel Selector // - panel_selector_box=new RDComboBox(this,"panel_selector_box"); + panel_selector_box=new RDComboBox(this); panel_selector_box->setFont(button_font); panel_selector_box->addIgnoredKey(Qt::Key_Space); panel_selector_box-> @@ -130,7 +130,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // Play Mode Box // - panel_playmode_box=new QComboBox(this,"panel_playmode_box"); + panel_playmode_box=new QComboBox(this); panel_playmode_box->setFont(button_font); panel_playmode_box-> setGeometry((15+PANEL_BUTTON_SIZE_X)*(panel_button_columns-3)-5, @@ -144,7 +144,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // Reset Button // - panel_reset_button=new RDPushButton(this,"reset_button"); + panel_reset_button=new RDPushButton(this); panel_reset_button-> setGeometry((15+PANEL_BUTTON_SIZE_X)*(panel_button_columns-2), (15+PANEL_BUTTON_SIZE_Y)*panel_button_rows, @@ -158,7 +158,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // All Button // - panel_all_button=new RDPushButton(this,"all_button"); + panel_all_button=new RDPushButton(this); panel_all_button-> setGeometry((15+PANEL_BUTTON_SIZE_X)*(panel_button_columns-1), (15+PANEL_BUTTON_SIZE_Y)*panel_button_rows, @@ -173,7 +173,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // // Setup Button // - panel_setup_button=new RDPushButton(this,"setup_button"); + panel_setup_button=new RDPushButton(this); panel_setup_button-> setGeometry((15+PANEL_BUTTON_SIZE_X)*(panel_button_columns-1), (15+PANEL_BUTTON_SIZE_Y)*panel_button_rows, @@ -189,8 +189,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, // panel_button_dialog= new RDButtonDialog(panel_station->name(),panel_label_template, - panel_cart_dialog,panel_svcname,this, - "panel_button_dialog"); + panel_cart_dialog,panel_svcname,this); // // CAE Setup diff --git a/lib/rdsound_panel.h b/lib/rdsound_panel.h index 6d8e4d0ac..ae63092e4 100644 --- a/lib/rdsound_panel.h +++ b/lib/rdsound_panel.h @@ -2,9 +2,7 @@ // // The sound panel widget for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdsound_panel.h,v 1.32.6.8 2014/02/20 17:29:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -58,8 +56,7 @@ class RDSoundPanel : public QWidget RDSoundPanel(int cols,int rows,int station_panels,int user_panels,bool flash, const QString &label_template,bool extended, RDEventPlayer *player,RDRipc *ripc,RDCae *cae, - RDStation *station,RDCartDialog *cart_dialog, - QWidget *parent=0,const char *name=0); + RDStation *station,RDCartDialog *cart_dialog,QWidget *parent=0); ~RDSoundPanel(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdstation.cpp b/lib/rdstation.cpp index 42bddbc3f..6b81c9ad1 100644 --- a/lib/rdstation.cpp +++ b/lib/rdstation.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Workstation. // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: rdstation.cpp,v 1.30.4.8 2014/02/11 23:46:26 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdstation.h b/lib/rdstation.h index f0f1e371c..0145a8e21 100644 --- a/lib/rdstation.h +++ b/lib/rdstation.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Workstation // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdstation.h,v 1.24.4.7 2014/02/11 23:46:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdstatus.cpp b/lib/rdstatus.cpp index 8f4eba2d7..3f477c208 100644 --- a/lib/rdstatus.cpp +++ b/lib/rdstatus.cpp @@ -2,9 +2,7 @@ // // Functions for getting system status. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdstatus.cpp,v 1.1.2.2 2012/10/22 23:09:39 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdstatus.h b/lib/rdstatus.h index 6d4321b0e..6fdf27829 100644 --- a/lib/rdstatus.h +++ b/lib/rdstatus.h @@ -2,9 +2,7 @@ // // Functions for getting system status. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdstatus.h,v 1.1.2.2 2012/10/22 23:09:39 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -28,4 +26,5 @@ bool RDAudioStoreValid(RDConfig *config); bool RDDbValid(RDConfig *config,int *schema); + #endif // RDCONF_H diff --git a/lib/rdstereometer.cpp b/lib/rdstereometer.cpp index f9cbccedd..493b9a139 100644 --- a/lib/rdstereometer.cpp +++ b/lib/rdstereometer.cpp @@ -3,9 +3,7 @@ // This implements a widget that represents a stereo audio level meter, // complete with labels and scale. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdstereometer.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -38,8 +36,8 @@ #include #include -RDStereoMeter::RDStereoMeter(QWidget *parent,const char *name) - : QWidget(parent,name) +RDStereoMeter::RDStereoMeter(QWidget *parent) + : QWidget(parent) { ref_level=0; clip_light_level=1600; @@ -47,7 +45,7 @@ RDStereoMeter::RDStereoMeter(QWidget *parent,const char *name) label_x=0; meter_label=QString(""); setBackgroundColor(black); - left_meter=new RDSegMeter(RDSegMeter::Right,this,"left_meter"); + left_meter=new RDSegMeter(RDSegMeter::Right,this); left_meter->setGeometry(25,10,300,10); left_meter->setRange(-4600,-800); left_meter->setHighThreshold(-1600); @@ -56,7 +54,7 @@ RDStereoMeter::RDStereoMeter(QWidget *parent,const char *name) left_meter->setSegmentGap(1); left_meter->setSolidBar(-10000); left_meter->setFloatingBar(-10000); - right_meter=new RDSegMeter(RDSegMeter::Right,this,"right_meter"); + right_meter=new RDSegMeter(RDSegMeter::Right,this); right_meter->setGeometry(25,40,300,10); right_meter->setRange(-4600,-800); right_meter->setHighThreshold(-1600); diff --git a/lib/rdstereometer.h b/lib/rdstereometer.h index ca3cac697..aeb5a8857 100644 --- a/lib/rdstereometer.h +++ b/lib/rdstereometer.h @@ -2,9 +2,7 @@ // // A Stereo Audio Meter Widget // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdstereometer.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDSTEREOMETER_H #define RDSTEREOMETER_H @@ -34,12 +31,11 @@ #define CLIP_LIGHT_COLOR red - class RDStereoMeter : public QWidget { Q_OBJECT public: - RDStereoMeter(QWidget *parent=0,const char *name=0); + RDStereoMeter(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setReference(int level); diff --git a/lib/rdstringlist.cpp b/lib/rdstringlist.cpp index d30fd7b8c..0dea5bef8 100644 --- a/lib/rdstringlist.cpp +++ b/lib/rdstringlist.cpp @@ -2,9 +2,7 @@ // // A StringList with quote mode // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdstringlist.cpp,v 1.2.8.1 2012/12/13 22:33:44 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,11 +17,9 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include - RDStringList::RDStringList() : QStringList() { diff --git a/lib/rdstringlist.h b/lib/rdstringlist.h index 4bf7816d5..b0108f2e3 100644 --- a/lib/rdstringlist.h +++ b/lib/rdstringlist.h @@ -2,9 +2,7 @@ // // A StringList with quote mode // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdstringlist.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,14 +17,12 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDSTRINGLIST_H #define RDSTRINGLIST_H #include - class RDStringList : public QStringList { public: diff --git a/lib/rdsvc.cpp b/lib/rdsvc.cpp index 88335cf69..63ef68c74 100644 --- a/lib/rdsvc.cpp +++ b/lib/rdsvc.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell Service. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdsvc.cpp,v 1.71.8.10.2.5 2014/06/24 18:27:05 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,8 @@ // // Global Classes // -RDSvc::RDSvc(QString svcname,QObject *parent,const char *name) - : QObject(parent,name) +RDSvc::RDSvc(QString svcname,QObject *parent) + : QObject(parent) { svc_name=svcname; } diff --git a/lib/rdsvc.h b/lib/rdsvc.h index 909ec1eb5..3c7a1322d 100644 --- a/lib/rdsvc.h +++ b/lib/rdsvc.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell Service // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdsvc.h,v 1.26.8.3.2.1 2014/05/20 22:39:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,14 +18,14 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDSVC_H +#define RDSVC_H + #include #include #include -#ifndef RDSVC_H -#define RDSVC_H - class RDSvc : public QObject { Q_OBJECT @@ -37,7 +35,7 @@ class RDSvc : public QObject enum ImportField {CartNumber=0,ExtData=3,ExtEventId=4,ExtAnncType=5, Title=6,StartHours=7,StartMinutes=8,StartSeconds=9, LengthHours=10,LengthMinutes=11,LengthSeconds=12}; - RDSvc(QString svcname,QObject *parent=0,const char *name=0); + RDSvc(QString svcname,QObject *parent=0); QString name() const; bool exists() const; QString description() const; diff --git a/lib/rdsystem.cpp b/lib/rdsystem.cpp index 98b75e844..5599970bb 100644 --- a/lib/rdsystem.cpp +++ b/lib/rdsystem.cpp @@ -2,9 +2,7 @@ // // System-wide Rivendell settings // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdsystem.cpp,v 1.4.8.1 2012/11/26 20:19:37 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdsystem.h b/lib/rdsystem.h index 230095634..adf5cbb7e 100644 --- a/lib/rdsystem.h +++ b/lib/rdsystem.h @@ -2,9 +2,7 @@ // // System-wide Rivendell settings // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdsystem.h,v 1.3.8.1 2012/11/26 20:19:37 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdsystemuser.cpp b/lib/rdsystemuser.cpp index 31dbc7339..d0143229d 100644 --- a/lib/rdsystemuser.cpp +++ b/lib/rdsystemuser.cpp @@ -2,9 +2,7 @@ // // Abstracts a system (non-Rivendell) user. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdsystemuser.cpp,v 1.2.8.1 2012/12/13 22:33:45 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdsystemuser.h b/lib/rdsystemuser.h index 380611aa5..83112491a 100644 --- a/lib/rdsystemuser.h +++ b/lib/rdsystemuser.h @@ -2,9 +2,7 @@ // // Abstracts a system (non-Rivendell) user. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdsystemuser.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdtextfile.cpp b/lib/rdtextfile.cpp index 9eab3955c..e5d71d7d4 100644 --- a/lib/rdtextfile.cpp +++ b/lib/rdtextfile.cpp @@ -2,9 +2,7 @@ // // Spawn an external text file viewer. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdtextfile.cpp,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdtextfile.h b/lib/rdtextfile.h index 94e0f2299..b41782466 100644 --- a/lib/rdtextfile.h +++ b/lib/rdtextfile.h @@ -2,9 +2,7 @@ // // Spawn an external text file viewer. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdtextfile.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdtextvalidator.cpp b/lib/rdtextvalidator.cpp index 694500600..475a3591a 100644 --- a/lib/rdtextvalidator.cpp +++ b/lib/rdtextvalidator.cpp @@ -2,9 +2,7 @@ // // Validate a string as being valid for a SQL text datatype. // -// (C) Copyright 2004 Fred Gleason -// -// $Id: rdtextvalidator.cpp,v 1.11 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,7 +20,6 @@ #include - RDTextValidator::RDTextValidator(QObject *parent,const char *name,bool allow_quote) : QValidator(parent,name) { diff --git a/lib/rdtextvalidator.h b/lib/rdtextvalidator.h index 40dae2029..2bd4ef1f0 100644 --- a/lib/rdtextvalidator.h +++ b/lib/rdtextvalidator.h @@ -2,9 +2,7 @@ // // Validate a string as being valid for a SQL text datatype. // -// (C) Copyright 2004 Fred Gleason -// -// $Id: rdtextvalidator.h,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,6 @@ #include -using namespace std; - class RDTextValidator : public QValidator { public: @@ -38,7 +34,7 @@ class RDTextValidator : public QValidator static QString stripString(QString str); private: - vector banned_chars; + std::vector banned_chars; }; diff --git a/lib/rdtimeedit.cpp b/lib/rdtimeedit.cpp index 45e5ec6a4..7eb218bb4 100644 --- a/lib/rdtimeedit.cpp +++ b/lib/rdtimeedit.cpp @@ -2,9 +2,7 @@ // // A QTimeEdit with tenth-second precision. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdtimeedit.cpp,v 1.6 2010/10/06 19:24:02 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,9 +22,8 @@ #include - -RDTimeEdit::RDTimeEdit(QWidget *parent,const char *name) - : QFrame(parent,name) +RDTimeEdit::RDTimeEdit(QWidget *parent) + : QFrame(parent) { edit_display=0; edit_section=0; @@ -55,12 +52,10 @@ RDTimeEdit::RDTimeEdit(QWidget *parent,const char *name) edit_sep_labels[1]->setAlignment(Qt::AlignCenter); edit_sep_labels[2]=new QLabel(".",this); edit_sep_labels[2]->setAlignment(Qt::AlignCenter); - edit_up_button= - new RDTransportButton(RDTransportButton::Up,this,"edit_up_button"); + edit_up_button=new RDTransportButton(RDTransportButton::Up,this); edit_up_button->setFocusPolicy(QWidget::NoFocus); connect(edit_up_button,SIGNAL(clicked()),this,SLOT(upClickedData())); - edit_down_button= - new RDTransportButton(RDTransportButton::Down,this,"edit_down_button"); + edit_down_button=new RDTransportButton(RDTransportButton::Down,this); edit_down_button->setFocusPolicy(QWidget::NoFocus); connect(edit_down_button,SIGNAL(clicked()),this,SLOT(downClickedData())); setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes|RDTimeEdit::Seconds); diff --git a/lib/rdtimeedit.h b/lib/rdtimeedit.h index 7894aa4dc..ac82202a5 100644 --- a/lib/rdtimeedit.h +++ b/lib/rdtimeedit.h @@ -2,9 +2,7 @@ // // A QTimeEdit with tenth-second precision. // -// (C) Copyright 2003 Fred Gleason -// -// $Id: rdtimeedit.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class RDTimeEdit : public QFrame Q_OBJECT public: enum Display {Hours=0x01,Minutes=0x02,Seconds=0x04,Tenths=0x08}; - RDTimeEdit(QWidget *parent=0,const char *name=0); + RDTimeEdit(QWidget *parent=0); ~RDTimeEdit(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/lib/rdtimeengine.cpp b/lib/rdtimeengine.cpp index 822db0185..fd1b1cde4 100644 --- a/lib/rdtimeengine.cpp +++ b/lib/rdtimeengine.cpp @@ -2,9 +2,7 @@ // // An event timer engine. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdtimeengine.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,15 +17,13 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// - #include #include -RDTimeEngine::RDTimeEngine(QObject *parent,const char *name) - : QObject(parent,name) +RDTimeEngine::RDTimeEngine(QObject *parent) + : QObject(parent) { engine_pending_id=-1; engine_timer=new QTimer(this,"engine_timer"); diff --git a/lib/rdtimeengine.h b/lib/rdtimeengine.h index f8609ab7a..7178ca804 100644 --- a/lib/rdtimeengine.h +++ b/lib/rdtimeengine.h @@ -2,9 +2,7 @@ // // An event timer engine. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdtimeengine.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,12 +17,10 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDTIMEENGINE_H #define RDTIMEENGINE_H - #include #include @@ -33,12 +29,11 @@ #include - class RDTimeEngine : public QObject { Q_OBJECT public: - RDTimeEngine(QObject *parent=0,const char *name=0); + RDTimeEngine(QObject *parent=0); ~RDTimeEngine(); void clear(); QTime event(int id) const; diff --git a/lib/rdtimeevent.cpp b/lib/rdtimeevent.cpp index 8fd440fad..d022d22e5 100644 --- a/lib/rdtimeevent.cpp +++ b/lib/rdtimeevent.cpp @@ -2,9 +2,7 @@ // // A Container Class for RTimeEngine events. // -// (C) Copyright 2003-2004 Fred Gleason -// -// $Id: rdtimeevent.cpp,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2003-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,11 +17,9 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -/// #include - RDTimeEvent::RDTimeEvent() { clear(); diff --git a/lib/rdtimeevent.h b/lib/rdtimeevent.h index 378e1ccf8..486c7ef9a 100644 --- a/lib/rdtimeevent.h +++ b/lib/rdtimeevent.h @@ -2,9 +2,7 @@ // // A Container Class for RTimeEngine events. // -// (C) Copyright 2003-2004 Fred Gleason -// -// $Id: rdtimeevent.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2003-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDTIMEEVENT_H #define RDTIMEEVENT_H @@ -47,4 +44,4 @@ class RDTimeEvent }; -#endif // RDTIMEEVENTy_H +#endif // RDTIMEEVENT_H diff --git a/lib/rdtransportbutton.cpp b/lib/rdtransportbutton.cpp index 22cd9b32d..0b20f714c 100644 --- a/lib/rdtransportbutton.cpp +++ b/lib/rdtransportbutton.cpp @@ -2,9 +2,7 @@ // // An audio transport button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdtransportbutton.cpp,v 1.4.10.1 2014/05/27 22:49:45 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -33,8 +31,8 @@ RDTransportButton::RDTransportButton(RDTransportButton::TransType type, - QWidget *parent,const char *name) - : QPushButton(parent,name) + QWidget *parent) + : QPushButton(parent) { button_type=type; button_state=RDTransportButton::Off; diff --git a/lib/rdtransportbutton.h b/lib/rdtransportbutton.h index a19200edc..d9f848436 100644 --- a/lib/rdtransportbutton.h +++ b/lib/rdtransportbutton.h @@ -2,9 +2,7 @@ // // An audio transport button widget. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdtransportbutton.h,v 1.3.10.1 2014/05/27 22:49:45 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDTRANSPORTBUTTON_H #define RDTRANSPORTBUTTON_H @@ -29,10 +26,8 @@ #include #include - #define RDTRANSPORTBUTTON_DEFAULT_ON_COLOR green - class RDTransportButton : public QPushButton { Q_OBJECT @@ -41,8 +36,7 @@ class RDTransportButton : public QPushButton Pause=6,PlayFrom=7,PlayBetween=8,Loop=9,Up=10,Down=11, PlayTo=12}; enum TransState {On=0,Off=1,Flashing=2}; - RDTransportButton(RDTransportButton::TransType type,QWidget *parent=0, - const char *name=0); + RDTransportButton(RDTransportButton::TransType type,QWidget *parent=0); RDTransportButton::TransType getType() const; void setType(RDTransportButton::TransType type); QColor onColor() const; diff --git a/lib/rdtrimaudio.cpp b/lib/rdtrimaudio.cpp index c6b9222c1..081b64235 100644 --- a/lib/rdtrimaudio.cpp +++ b/lib/rdtrimaudio.cpp @@ -2,9 +2,7 @@ // // Get the trim points for an audio cut. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdtrimaudio.cpp,v 1.6.4.3 2014/01/16 02:44:59 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,9 +45,8 @@ size_t RDTrimAudioCallback(void *ptr,size_t size,size_t nmemb,void *userdata) } -RDTrimAudio::RDTrimAudio(RDStation *station,RDConfig *config, - QObject *parent,const char *name) - : QObject(parent,name) +RDTrimAudio::RDTrimAudio(RDStation *station,RDConfig *config,QObject *parent) + : QObject(parent) { conv_station=station; conv_config=config; diff --git a/lib/rdtrimaudio.h b/lib/rdtrimaudio.h index da6540bbf..53f9dfd74 100644 --- a/lib/rdtrimaudio.h +++ b/lib/rdtrimaudio.h @@ -2,9 +2,7 @@ // // Get the trim points for an audio cut. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdtrimaudio.h,v 1.1.6.2 2014/01/16 02:44:59 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,8 +32,7 @@ class RDTrimAudio : public QObject public: enum ErrorCode {ErrorOk=0,ErrorInternal=5,ErrorUrlInvalid=7, ErrorService=8,ErrorInvalidUser=9,ErrorNoAudio=10}; - RDTrimAudio(RDStation *station,RDConfig *config,QObject *parent=0, - const char *name=0); + RDTrimAudio(RDStation *station,RDConfig *config,QObject *parent=0); int startPoint() const; int endPoint() const; void setCartNumber(unsigned cartnum); diff --git a/lib/rdtty.cpp b/lib/rdtty.cpp index d226af08e..564c4c3e8 100644 --- a/lib/rdtty.cpp +++ b/lib/rdtty.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell TTY. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdtty.cpp,v 1.10 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,7 +22,6 @@ #include #include - // // Global Classes // diff --git a/lib/rdtty.h b/lib/rdtty.h index 705426d4a..f4e1234ce 100644 --- a/lib/rdtty.h +++ b/lib/rdtty.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell TTY // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdtty.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdttydevice.cpp b/lib/rdttydevice.cpp index 15dd56607..35c6d4008 100644 --- a/lib/rdttydevice.cpp +++ b/lib/rdttydevice.cpp @@ -2,9 +2,7 @@ // // A Qt driver for tty ports on Linux. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdttydevice.cpp,v 1.5 2011/05/04 18:09:06 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -30,7 +27,6 @@ #include - RDTTYDevice::RDTTYDevice() : QIODevice() { Init(); diff --git a/lib/rdttydevice.h b/lib/rdttydevice.h index e4faa4b94..a41e4e097 100644 --- a/lib/rdttydevice.h +++ b/lib/rdttydevice.h @@ -2,9 +2,7 @@ // // A Qt driver for serial ports. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdttydevice.h,v 1.5 2011/05/04 18:09:06 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDTTYDEVICE_H #define RDTTYDEVICE_H diff --git a/lib/rdttydevice_win32.cpp b/lib/rdttydevice_win32.cpp index 4b456cec4..f5b7bb563 100644 --- a/lib/rdttydevice_win32.cpp +++ b/lib/rdttydevice_win32.cpp @@ -2,9 +2,7 @@ // // The Win32 version of a Qt driver for serial ports. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdttydevice_win32.cpp,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License diff --git a/lib/rdttyout.cpp b/lib/rdttyout.cpp index f68b94f77..eed98c525 100644 --- a/lib/rdttyout.cpp +++ b/lib/rdttyout.cpp @@ -2,9 +2,7 @@ // // Output a string on a Rivendell TTY // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdttyout.cpp,v 1.10 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdttyout.h b/lib/rdttyout.h index 56fbceb6a..fccdb7dd7 100644 --- a/lib/rdttyout.h +++ b/lib/rdttyout.h @@ -2,9 +2,7 @@ // // Output a string on a Rivendell TTY // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdttyout.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,15 +18,15 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef RDTTYOUT_H +#define RDTTYOUT_H + #include #include #include -#ifndef RDTTYOUT_H -#define RDTTYOUT_H - bool RDTtyOut(const QString &station,unsigned port_id,const QString &string); -#endif +#endif // RDTTYOUT_H diff --git a/lib/rdupload.cpp b/lib/rdupload.cpp index 5d1a999c8..4891ca3b4 100644 --- a/lib/rdupload.cpp +++ b/lib/rdupload.cpp @@ -2,9 +2,7 @@ // // Upload a File // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdupload.cpp,v 1.5.4.2 2012/05/10 23:12:42 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -72,9 +70,8 @@ int UploadErrorCallback(CURL *curl,curl_infotype type,char *msg,size_t size, } -RDUpload::RDUpload(const QString &station_name, - QObject *parent,const char *name) - : QObject(parent,name) +RDUpload::RDUpload(const QString &station_name,QObject *parent) + : QObject(parent) { conv_aborting=false; } diff --git a/lib/rdupload.h b/lib/rdupload.h index 9a1bf3937..8600bd8e4 100644 --- a/lib/rdupload.h +++ b/lib/rdupload.h @@ -2,9 +2,7 @@ // // Upload a File // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdupload.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,7 @@ class RDUpload : public QObject ErrorUnspecified=8,ErrorInvalidUser=9,ErrorAborted=10, ErrorInvalidLogin=11,ErrorRemoteAccess=12, ErrorRemoteConnection=13}; - RDUpload(const QString &station_name, - QObject *parent=0,const char *name=0); + RDUpload(const QString &station_name,QObject *parent=0); void setSourceFile(const QString &filename); void setDestinationUrl(const QString &url); int totalSteps() const; diff --git a/lib/rdurl.cpp b/lib/rdurl.cpp index 3cda2a6ce..97fda4ca3 100644 --- a/lib/rdurl.cpp +++ b/lib/rdurl.cpp @@ -2,9 +2,7 @@ // // A URL Handling Class with Support for SMB URLs. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdurl.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,11 +17,9 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include - RDUrl::RDUrl() : QUrl() { diff --git a/lib/rdurl.h b/lib/rdurl.h index b258601a4..5071901f7 100644 --- a/lib/rdurl.h +++ b/lib/rdurl.h @@ -2,9 +2,7 @@ // // A URL Handling Class with Support for SMB URLs. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdurl.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -26,7 +24,6 @@ #include - class RDUrl : public QUrl { public: diff --git a/lib/rduser.cpp b/lib/rduser.cpp index 47d9ad8d8..5d7ee73e7 100644 --- a/lib/rduser.cpp +++ b/lib/rduser.cpp @@ -2,9 +2,7 @@ // // Abstract a Rivendell User. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rduser.cpp,v 1.26.8.1 2013/12/03 23:34:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rduser.h b/lib/rduser.h index 2bf76ebd8..d4956925c 100644 --- a/lib/rduser.h +++ b/lib/rduser.h @@ -2,9 +2,7 @@ // // Abstract a Rivendell User // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rduser.h,v 1.22.8.1 2013/12/03 23:34:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdversion.cpp b/lib/rdversion.cpp index c09517f9c..44e8b916c 100644 --- a/lib/rdversion.cpp +++ b/lib/rdversion.cpp @@ -2,9 +2,7 @@ // // Get / Set Version Numbers of Rivendell Components // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdversion.cpp,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,7 +22,6 @@ #include #include - // // Global Classes // diff --git a/lib/rdversion.h b/lib/rdversion.h index e2d48eaa8..f4e38653c 100644 --- a/lib/rdversion.h +++ b/lib/rdversion.h @@ -2,9 +2,7 @@ // // Get / Set Version Numbers of Rivendell Components // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: rdversion.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwavedata.cpp b/lib/rdwavedata.cpp index 1c876923b..273fe2169 100644 --- a/lib/rdwavedata.cpp +++ b/lib/rdwavedata.cpp @@ -2,9 +2,7 @@ // // A Container Class for Audio Meta Data. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdwavedata.cpp,v 1.4.8.3.2.2 2014/07/15 20:02:23 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -23,7 +21,6 @@ #include - RDWaveData::RDWaveData() { clear(); diff --git a/lib/rdwavedata.h b/lib/rdwavedata.h index 02e68efe6..257f8d596 100644 --- a/lib/rdwavedata.h +++ b/lib/rdwavedata.h @@ -2,9 +2,7 @@ // // A Container Class for Audio Meta Data. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdwavedata.h,v 1.5.8.3.2.2 2014/07/15 20:02:23 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDWAVEDATA_H #define RDWAVEDATA_H diff --git a/lib/rdwavedata_dialog.cpp b/lib/rdwavedata_dialog.cpp index 08d3e2ba1..bd8b574ec 100644 --- a/lib/rdwavedata_dialog.cpp +++ b/lib/rdwavedata_dialog.cpp @@ -2,9 +2,7 @@ // // A dialog to edit the contents of an RDWaveData. // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdwavedata_dialog.cpp,v 1.1.2.1 2014/05/28 21:21:41 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwavedata_dialog.h b/lib/rdwavedata_dialog.h index f807c98be..b6ecc9be8 100644 --- a/lib/rdwavedata_dialog.h +++ b/lib/rdwavedata_dialog.h @@ -2,9 +2,7 @@ // // A dialog to edit the contents of an RDWaveData. // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdwavedata_dialog.h,v 1.1.2.1 2014/05/28 21:21:41 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwavefile.h b/lib/rdwavefile.h index 3fddacf42..887cf1a7c 100644 --- a/lib/rdwavefile.h +++ b/lib/rdwavefile.h @@ -2,9 +2,7 @@ // // A class for handling Microsoft WAV files. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdwavefile.h,v 1.10.6.2 2014/01/15 19:56:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -46,9 +44,6 @@ #include #include -using namespace std; - - // // Number of timers allowed in the CartChunk structure. // The official number is '8'. @@ -1176,7 +1171,7 @@ class RDWaveFile QString cutString(char *,unsigned,unsigned); QDate cutDate(char *,unsigned); QTime cutTime(char *,unsigned); - vector energy_data; + std::vector energy_data; bool energy_loaded; unsigned energy_ptr; int wave_id; diff --git a/lib/rdwavepainter.cpp b/lib/rdwavepainter.cpp index cf32222b7..4032f8967 100644 --- a/lib/rdwavepainter.cpp +++ b/lib/rdwavepainter.cpp @@ -2,9 +2,7 @@ // // A Painter Class for Drawing Audio Waveforms // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdwavepainter.cpp,v 1.13.4.2 2013/11/13 23:36:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwavepainter.h b/lib/rdwavepainter.h index f86848fe4..329217425 100644 --- a/lib/rdwavepainter.h +++ b/lib/rdwavepainter.h @@ -2,9 +2,7 @@ // // A Painter Class for Drawing Audio Waveforms // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdwavepainter.h,v 1.10.6.1 2013/11/13 23:36:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwebresult.cpp b/lib/rdwebresult.cpp index 47a6584ca..42dafc332 100644 --- a/lib/rdwebresult.cpp +++ b/lib/rdwebresult.cpp @@ -2,9 +2,7 @@ // // Container class for Rivendel Web Service result messages. // -// (C) Copyright 2011 Fred Gleason -// -// $Id: rdwebresult.cpp,v 1.1 2011/12/23 23:07:00 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwebresult.h b/lib/rdwebresult.h index 0c15ad76c..3d0ad452f 100644 --- a/lib/rdwebresult.h +++ b/lib/rdwebresult.h @@ -2,9 +2,7 @@ // // Container class for Rivendel Web Service result messages. // -// (C) Copyright 2011 Fred Gleason -// -// $Id: rdwebresult.h,v 1.1 2011/12/23 23:07:00 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/lib/rdwin32.cpp b/lib/rdwin32.cpp index 41062b146..1df755d6b 100644 --- a/lib/rdwin32.cpp +++ b/lib/rdwin32.cpp @@ -2,9 +2,7 @@ // // Missing POSIX functions for Win32 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdwin32.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - int isblank(int c) { if(c==' ') { diff --git a/lib/rdwin32.h b/lib/rdwin32.h index e90ad3c28..48f8a98d8 100644 --- a/lib/rdwin32.h +++ b/lib/rdwin32.h @@ -2,9 +2,7 @@ // // Missing POSIX functions for Win32 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdwin32.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,10 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDWIN32_H #define RDWIN32_H int isblank(int c); + #endif // RDWIN32_H diff --git a/lib/schedcartlist.cpp b/lib/schedcartlist.cpp index bac2fbf7c..222a35278 100644 --- a/lib/schedcartlist.cpp +++ b/lib/schedcartlist.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// $Id: schedcartlist.cpp,v 1.4.8.1 2012/12/13 22:33:45 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -22,7 +20,6 @@ #include - SchedCartList::SchedCartList(int listsize) { cartnum=new unsigned[listsize]; diff --git a/lib/schedcartlist.h b/lib/schedcartlist.h index 0a0cef7e4..2cc910f38 100644 --- a/lib/schedcartlist.h +++ b/lib/schedcartlist.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -20,12 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include - - #ifndef SCHEDCARTLIST_H #define SCHEDCARTLIST_H +#include class SchedCartList { diff --git a/lib/schedruleslist.cpp b/lib/schedruleslist.cpp index d8820b3c9..9e7ef1ed3 100644 --- a/lib/schedruleslist.cpp +++ b/lib/schedruleslist.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// $Id: schedruleslist.cpp,v 1.7.8.1 2012/12/13 22:33:45 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/lib/schedruleslist.h b/lib/schedruleslist.h index 87886175f..ced5a799e 100644 --- a/lib/schedruleslist.h +++ b/lib/schedruleslist.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -23,7 +21,6 @@ #ifndef SCHEDRULESLIST_H #define SCHEDRULESLIST_H - #include class SchedRulesList diff --git a/make_slack.in b/make_slack.in index c16af7cfb..1f89c88f7 100755 --- a/make_slack.in +++ b/make_slack.in @@ -4,9 +4,7 @@ # # Make a Slackware package. # -# (C) Copyright 2006 Fred Gleason -# -# $Id: make_slack.in,v 1.15 2010/07/29 19:32:30 cvs Exp $ +# (C) Copyright 2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as diff --git a/pam_rd/Makefile.am b/pam_rd/Makefile.am index 228ecfb0f..05de5a93d 100644 --- a/pam_rd/Makefile.am +++ b/pam_rd/Makefile.am @@ -6,8 +6,6 @@ ## based on work by Fred Gleason and from ## libpam-ldap-178 ## -## $Id: Makefile.am,v 1.9.8.1 2012/11/29 01:37:35 cvs Exp $ -## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as ## published by the Free Software Foundation. diff --git a/pam_rd/pam_rd.cpp b/pam_rd/pam_rd.cpp index c2209037d..f85601d68 100644 --- a/pam_rd/pam_rd.cpp +++ b/pam_rd/pam_rd.cpp @@ -2,8 +2,6 @@ // // (C) Copyright 2006 Federico Grau // -// $Id: pam_rd.cpp,v 1.10 2010/09/10 18:16:27 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am index 93a0ce516..0fdbe6865 100644 --- a/rdadmin/Makefile.am +++ b/rdadmin/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdadmin ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.72.4.6 2013/03/09 00:21:11 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdadmin/add_aux_field.cpp b/rdadmin/add_aux_field.cpp index 5a590a008..c947f6e9d 100644 --- a/rdadmin/add_aux_field.cpp +++ b/rdadmin/add_aux_field.cpp @@ -2,9 +2,7 @@ // // Add an Auxiliary Field for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: add_aux_field.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,10 +23,8 @@ #include #include - -AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id,QWidget *parent) + : QDialog(parent,"",true) { add_feed_id=feed_id; add_field_id=field_id; @@ -54,12 +50,11 @@ AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id, // // Variable Name // - add_varname_edit=new QLineEdit(this,"add_varname_edit"); + add_varname_edit=new QLineEdit(this); add_varname_edit->setGeometry(165,10,130,20); add_varname_edit->setMaxLength(11); QLabel *label= - new QLabel(add_varname_edit,tr("Variable Name: "), - this,"add_varname_label"); + new QLabel(add_varname_edit,tr("Variable Name: "),this); label->setGeometry(10,13,105,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -76,11 +71,10 @@ AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id, // // Caption // - add_caption_edit=new QLineEdit(this,"add_caption_edit"); + add_caption_edit=new QLineEdit(this); add_caption_edit->setGeometry(120,37,sizeHint().width()-130,20); add_caption_edit->setMaxLength(64); - label=new QLabel(add_caption_edit,tr("Caption: "), - this,"add_caption_label"); + label=new QLabel(add_caption_edit,tr("Caption: "),this); label->setGeometry(10,37,105,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -88,7 +82,7 @@ AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id, // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -98,7 +92,7 @@ AddAuxField::AddAuxField(unsigned feed_id,unsigned *field_id, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/add_aux_field.h b/rdadmin/add_aux_field.h index 91f0fba12..ea460bedf 100644 --- a/rdadmin/add_aux_field.h +++ b/rdadmin/add_aux_field.h @@ -2,9 +2,7 @@ // // Add an Auxiliary Field for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: add_aux_field.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,13 +28,11 @@ #include #include - class AddAuxField : public QDialog { Q_OBJECT public: - AddAuxField(unsigned feed_id,unsigned *field_id, - QWidget *parent=0,const char *name=0); + AddAuxField(unsigned feed_id,unsigned *field_id,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_encoder.cpp b/rdadmin/add_encoder.cpp index 75967cfe0..2d3e1ff18 100644 --- a/rdadmin/add_encoder.cpp +++ b/rdadmin/add_encoder.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_encoder.cpp,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,10 +32,9 @@ #include #include - AddEncoder::AddEncoder(QString *encname,const QString &stationname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { encoder_name=encname; encoder_stationname=stationname; @@ -63,11 +60,10 @@ AddEncoder::AddEncoder(QString *encname,const QString &stationname, // // Encoder Name // - encoder_name_edit=new QLineEdit(this,"encoder_name_edit"); + encoder_name_edit=new QLineEdit(this); encoder_name_edit->setGeometry(145,11,sizeHint().width()-150,19); encoder_name_edit->setMaxLength(32); - QLabel *label=new QLabel(encoder_name_edit,tr("&New Encoder Name:"), - this,"encoder_name_label"); + QLabel *label=new QLabel(encoder_name_edit,tr("&New Encoder Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -75,7 +71,7 @@ AddEncoder::AddEncoder(QString *encname,const QString &stationname, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -85,7 +81,7 @@ AddEncoder::AddEncoder(QString *encname,const QString &stationname, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/add_encoder.h b/rdadmin/add_encoder.h index 2f3a87141..7fe6b1045 100644 --- a/rdadmin/add_encoder.h +++ b/rdadmin/add_encoder.h @@ -2,9 +2,7 @@ // // Add a Rivendell Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: add_encoder.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,13 +25,11 @@ #include #include - class AddEncoder : public QDialog { Q_OBJECT public: - AddEncoder(QString *encname,const QString &stationname, - QWidget *parent=0,const char *name=0); + AddEncoder(QString *encname,const QString &stationname,QWidget *parent=0); ~AddEncoder(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_feed.cpp b/rdadmin/add_feed.cpp index a9031ac22..ae48a7103 100644 --- a/rdadmin/add_feed.cpp +++ b/rdadmin/add_feed.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_feed.cpp,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,10 +34,8 @@ #include #include - -AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent, - const char *name) - : QDialog(parent,name,true) +AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent) + : QDialog(parent,"",true) { feed_keyname=keyname; feed_id=id; @@ -65,11 +61,10 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent, // // Enable Users Checkbox // - feed_users_box=new QCheckBox(this,"feed_users_box"); + feed_users_box=new QCheckBox(this); feed_users_box->setGeometry(40,40,15,15); feed_users_box->setChecked(true); - QLabel *label=new QLabel(feed_users_box,tr("Enable Feed for All Users"), - this,"feed_users_label"); + QLabel *label=new QLabel(feed_users_box,tr("Enable Feed for All Users"),this); label->setGeometry(60,38,sizeHint().width()-60,19); label->setFont(user_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -82,12 +77,11 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent, // // Feed Name // - feed_keyname_edit=new QLineEdit(this,"feed_keyname_edit"); + feed_keyname_edit=new QLineEdit(this); feed_keyname_edit->setGeometry(145,11,sizeHint().width()-150,19); feed_keyname_edit->setMaxLength(8); feed_keyname_edit->setValidator(validator); - label=new QLabel(feed_keyname_edit,tr("&New Feed Name:"), - this,"feed_name_label"); + label=new QLabel(feed_keyname_edit,tr("&New Feed Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -95,7 +89,7 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -105,7 +99,7 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/add_feed.h b/rdadmin/add_feed.h index 5c406822e..d99180d3a 100644 --- a/rdadmin/add_feed.h +++ b/rdadmin/add_feed.h @@ -2,9 +2,7 @@ // // Add a Rivendell Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: add_feed.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,12 +32,11 @@ #define DEFAULT_CHANNEL_XML "%TITLE%\n%DESCRIPTION%\n%CATEGORY%\n%LINK%\n%LANGUAGE%\n%COPYRIGHT%\n%BUILD_DATE%\n%PUBLISH_DATE%\n%WEBMASTER%\n%GENERATOR%" #define DEFAULT_ITEM_XML "%ITEM_TITLE%\n%ITEM_LINK%\n%ITEM_GUID%\n%ITEM_DESCRIPTION%\n%ITEM_AUTHOR%\n%ITEM_COMMENTS%\n%ITEM_SOURCE_TEXT%\n\n%ITEM_CATEGORY%\n%ITEM_PUBLISH_DATE%" - class AddFeed : public QDialog { Q_OBJECT public: - AddFeed(unsigned *id,QString *keyname,QWidget *parent=0,const char *name=0); + AddFeed(unsigned *id,QString *keyname,QWidget *parent=0); ~AddFeed(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_group.cpp b/rdadmin/add_group.cpp index ee7dc583b..f68e2874e 100644 --- a/rdadmin/add_group.cpp +++ b/rdadmin/add_group.cpp @@ -1,10 +1,8 @@ // add_group.cpp // -// Add a Rivendell Service +// Add a Rivendell Group // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_group.cpp,v 1.20 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,8 @@ #include #include -AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddGroup::AddGroup(QString *group,QWidget *parent) + : QDialog(parent,"",true) { group_group=group; @@ -65,17 +63,16 @@ AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Group Name // - group_name_edit=new QLineEdit(this,"group_name_edit"); + group_name_edit=new QLineEdit(this); group_name_edit->setGeometry(145,11,sizeHint().width()-150,19); group_name_edit->setMaxLength(10); group_name_edit->setValidator(validator); - QLabel *label=new QLabel(group_name_edit,tr("&New Group Name:"), - this,"group_name_label"); + QLabel *label=new QLabel(group_name_edit,tr("&New Group Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -83,11 +80,10 @@ AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) // // Enable Users Checkbox // - group_users_box=new QCheckBox(this,"group_users_box"); + group_users_box=new QCheckBox(this); group_users_box->setGeometry(40,40,15,15); group_users_box->setChecked(true); - label=new QLabel(group_users_box,tr("Enable Group for All Users"), - this,"group_users_label"); + label=new QLabel(group_users_box,tr("Enable Group for All Users"),this); label->setGeometry(60,38,sizeHint().width()-60,19); label->setFont(user_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -95,11 +91,10 @@ AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) // // Enable Services Checkbox // - group_svcs_box=new QCheckBox(this,"group_svcs_box"); + group_svcs_box=new QCheckBox(this); group_svcs_box->setGeometry(40,61,15,15); group_svcs_box->setChecked(true); - label=new QLabel(group_svcs_box,tr("Enable Group for All Services"), - this,"group_svcs_label"); + label=new QLabel(group_svcs_box,tr("Enable Group for All Services"),this); label->setGeometry(60,58,sizeHint().width()-60,19); label->setFont(user_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -107,7 +102,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -117,7 +112,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); @@ -201,7 +196,7 @@ void AddGroup::okData() delete q; } - EditGroup *group=new EditGroup(group_name_edit->text(),this,"group"); + EditGroup *group=new EditGroup(group_name_edit->text(),this); if(group->exec()<0) { sql=QString().sprintf("delete from USER_PERMS where GROUP_NAME=\"%s\"", (const char *)RDEscapeString(group_name_edit->text())); diff --git a/rdadmin/add_group.h b/rdadmin/add_group.h index 35d6be5fa..f38f74022 100644 --- a/rdadmin/add_group.h +++ b/rdadmin/add_group.h @@ -2,9 +2,7 @@ // // Add a Rivendell Group // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_group.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,12 +25,11 @@ #include #include - class AddGroup : public QDialog { Q_OBJECT public: - AddGroup(QString *group,QWidget *parent=0,const char *name=0); + AddGroup(QString *group,QWidget *parent=0); ~AddGroup(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_hostvar.cpp b/rdadmin/add_hostvar.cpp index 70327241e..0c77c8d76 100644 --- a/rdadmin/add_hostvar.cpp +++ b/rdadmin/add_hostvar.cpp @@ -1,10 +1,8 @@ // add_hostvar.cpp // -// Add a Rivendell Workstation Configuration +// Add a Rivendell Host Variable // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_hostvar.cpp,v 1.9 2012/02/13 19:26:13 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,10 +42,9 @@ #include #include - AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, - QString *remark,QWidget *parent,const char *name) - : QDialog(parent,name,true) + QString *remark,QWidget *parent) + : QDialog(parent,"",true) { add_name=var; add_varvalue=varvalue; @@ -72,10 +69,10 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, // // Variable Name // - add_name_edit=new QLineEdit(this,"add_name_edit"); + add_name_edit=new QLineEdit(this); add_name_edit->setGeometry(125,11,120,19); add_name_edit->setMaxLength(32); - QLabel *label=new QLabel(add_name_edit,tr("Variable Name:"),this,"add_name_label"); + QLabel *label=new QLabel(add_name_edit,tr("Variable Name:"),this); label->setGeometry(10,11,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -83,11 +80,10 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, // // Variable Value // - add_varvalue_edit=new QLineEdit(this,"add_varvalue_edit"); + add_varvalue_edit=new QLineEdit(this); add_varvalue_edit->setGeometry(125,33,sizeHint().width()-135,19); add_varvalue_edit->setMaxLength(255); - label=new QLabel(add_varvalue_edit,tr("Variable Value:"), - this,"add_varvalue_label"); + label=new QLabel(add_varvalue_edit,tr("Variable Value:"),this); label->setGeometry(10,33,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -95,10 +91,10 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, // // Remark // - add_remark_edit=new QLineEdit(this,"add_remark_edit"); + add_remark_edit=new QLineEdit(this); add_remark_edit->setGeometry(125,55,sizeHint().width()-135,19); add_remark_edit->setMaxLength(255); - label=new QLabel(add_remark_edit,tr("Remark:"),this,"add_remark_label"); + label=new QLabel(add_remark_edit,tr("Remark:"),this); label->setGeometry(10,55,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -106,7 +102,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -116,7 +112,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/add_hostvar.h b/rdadmin/add_hostvar.h index 0bfbba39e..be7cd92c5 100644 --- a/rdadmin/add_hostvar.h +++ b/rdadmin/add_hostvar.h @@ -2,9 +2,7 @@ // // Add a Rivendell Host Variable // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_hostvar.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,13 +34,12 @@ #include #include - class AddHostvar : public QDialog { Q_OBJECT public: AddHostvar(QString station,QString *var,QString *varvalue,QString *remark, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~AddHostvar(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_matrix.cpp b/rdadmin/add_matrix.cpp index 0defeb707..e96dc163e 100644 --- a/rdadmin/add_matrix.cpp +++ b/rdadmin/add_matrix.cpp @@ -1,9 +1,7 @@ // // Add a Rivendell Matrix // -// (C) Copyright 2002-2012 Fred Gleason -// -// $Id: add_matrix.cpp,v 1.28.2.3 2014/02/17 02:19:02 cvs Exp $ +// (C) Copyright 2002-2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,8 +32,8 @@ #include "add_matrix.h" #include "rdpasswd.h" -AddMatrix::AddMatrix(QString station,QWidget *parent,const char *name) - : QDialog(parent,name) +AddMatrix::AddMatrix(QString station,QWidget *parent) + : QDialog(parent,"") { add_station=station; @@ -58,11 +56,10 @@ AddMatrix::AddMatrix(QString station,QWidget *parent,const char *name) // // Matrix Number // - add_matrix_box=new QSpinBox(this,"add_matrix_box"); + add_matrix_box=new QSpinBox(this); add_matrix_box->setGeometry(165,11,30,19); add_matrix_box->setRange(0,MAX_MATRICES-1); - QLabel *label=new QLabel(add_matrix_box,tr("&New Matrix Number:"),this, - "matrix_label"); + QLabel *label=new QLabel(add_matrix_box,tr("&New Matrix Number:"),this); label->setGeometry(10,11,150,19); label->setFont(font); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -70,13 +67,12 @@ AddMatrix::AddMatrix(QString station,QWidget *parent,const char *name) // // Matrix Type // - add_type_box=new QComboBox(this,"add_type_box"); + add_type_box=new QComboBox(this); add_type_box->setGeometry(165,36,200,19); for(int i=0;iinsertItem(RDMatrix::typeString((RDMatrix::Type)i)); } - label=new QLabel(add_type_box,tr("&Switcher Type:"),this, - "matrix_label"); + label=new QLabel(add_type_box,tr("&Switcher Type:"),this); label->setGeometry(10,36,150,19); label->setFont(font); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -84,7 +80,7 @@ AddMatrix::AddMatrix(QString station,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -94,9 +90,9 @@ AddMatrix::AddMatrix(QString station,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + QPushButton *cancel_button=new QPushButton(this); + cancel_button-> + setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdadmin/add_matrix.h b/rdadmin/add_matrix.h index cdf65111a..661fa0124 100644 --- a/rdadmin/add_matrix.h +++ b/rdadmin/add_matrix.h @@ -2,9 +2,7 @@ // // Add a Rivendell Matrix // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: add_matrix.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include - class AddMatrix : public QDialog { Q_OBJECT public: - AddMatrix(QString station,QWidget *parent=0,const char *name=0); + AddMatrix(QString station,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_replicator.cpp b/rdadmin/add_replicator.cpp index 6f7b9923e..83b14d293 100644 --- a/rdadmin/add_replicator.cpp +++ b/rdadmin/add_replicator.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Replicator Configuration // -// (C) Copyright 2010 Fred Gleason -// -// $Id: add_replicator.cpp,v 1.2.8.1 2013/07/05 22:44:17 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,9 +36,8 @@ #include #include - -AddReplicator::AddReplicator(QString *rname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddReplicator::AddReplicator(QString *rname,QWidget *parent) + : QDialog(parent,"",true) { repl_name=rname; @@ -70,12 +67,11 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent,const char *name) // // Replicator Name // - repl_name_edit=new QLineEdit(this,"repl_name_edit"); + repl_name_edit=new QLineEdit(this); repl_name_edit->setGeometry(145,11,sizeHint().width()-150,19); repl_name_edit->setMaxLength(10); repl_name_edit->setValidator(validator); - QLabel *label=new QLabel(repl_name_edit,tr("&New Replicator Name:"), - this,"repl_name_label"); + QLabel *label=new QLabel(repl_name_edit,tr("&New Replicator Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -83,7 +79,7 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -93,9 +89,9 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + QPushButton *cancel_button=new QPushButton(this); + cancel_button-> + setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -141,7 +137,7 @@ void AddReplicator::okData() } delete q; - EditReplicator *replicator=new EditReplicator(repl_name_edit->text(),this,"replicator"); + EditReplicator *replicator=new EditReplicator(repl_name_edit->text(),this); if(replicator->exec()<0) { sql=QString().sprintf("delete from REPLICATORS where NAME=\"%s\"", (const char *)repl_name_edit->text()); diff --git a/rdadmin/add_replicator.h b/rdadmin/add_replicator.h index 30a446183..45dbc48a8 100644 --- a/rdadmin/add_replicator.h +++ b/rdadmin/add_replicator.h @@ -2,9 +2,7 @@ // // Add a Rivendell Replicator // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_replicator.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,12 +25,11 @@ #include #include - class AddReplicator : public QDialog { Q_OBJECT public: - AddReplicator(QString *rname,QWidget *parent=0,const char *name=0); + AddReplicator(QString *rname,QWidget *parent=0); ~AddReplicator(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_report.cpp b/rdadmin/add_report.cpp index 5691e300b..51e7e9899 100644 --- a/rdadmin/add_report.cpp +++ b/rdadmin/add_report.cpp @@ -1,10 +1,8 @@ // add_report.cpp // -// Edit a Rivendell Report +// Add a Rivendell Report // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_report.cpp,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,11 +39,9 @@ #include #include - -AddReport::AddReport(QString *rptname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddReport::AddReport(QString *rptname,QWidget *parent) + : QDialog(parent,"",true) { - // // Fix the Window Size // @@ -68,17 +64,16 @@ AddReport::AddReport(QString *rptname,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Report Description // - add_name_edit=new QLineEdit(this,"add_name_edit"); + add_name_edit=new QLineEdit(this); add_name_edit->setGeometry(170,10,sizeHint().width()-180,19); add_name_edit->setMaxLength(64); add_name_edit->setValidator(validator); - QLabel *label=new QLabel(add_name_edit,tr("&Report Name:"),this, - "add_name_label"); + QLabel *label=new QLabel(add_name_edit,tr("&Report Name:"),this); label->setGeometry(10,10,155,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -86,7 +81,7 @@ AddReport::AddReport(QString *rptname,QWidget *parent,const char *name) // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -96,7 +91,7 @@ AddReport::AddReport(QString *rptname,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); diff --git a/rdadmin/add_report.h b/rdadmin/add_report.h index d8ad22d2a..10b74ca2b 100644 --- a/rdadmin/add_report.h +++ b/rdadmin/add_report.h @@ -2,9 +2,7 @@ // // Add a Rivendell Report // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_report.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include - class AddReport : public QDialog { Q_OBJECT public: - AddReport(QString *rptname,QWidget *parent=0,const char *name=0); + AddReport(QString *rptname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_schedcodes.cpp b/rdadmin/add_schedcodes.cpp index 051974ab1..9a0a7ec65 100644 --- a/rdadmin/add_schedcodes.cpp +++ b/rdadmin/add_schedcodes.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -39,9 +37,8 @@ #include #include - -AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent) + : QDialog(parent,"",true) { schedCode_schedCode=schedCode; @@ -72,12 +69,11 @@ AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent,const char *name) // // Code Name // - schedCode_name_edit=new QLineEdit(this,"schedCode_name_edit"); + schedCode_name_edit=new QLineEdit(this); schedCode_name_edit->setGeometry(105,11,sizeHint().width()-150,19); schedCode_name_edit->setMaxLength(10); schedCode_name_edit->setValidator(validator); - QLabel *label=new QLabel(schedCode_name_edit,tr("&New Code:"), - this,"schedCode_name_label"); + QLabel *label=new QLabel(schedCode_name_edit,tr("&New Code:"),this); label->setGeometry(10,11,90,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -85,7 +81,7 @@ AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -95,9 +91,9 @@ AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + QPushButton *cancel_button=new QPushButton(this); + cancel_button-> + setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -144,7 +140,8 @@ void AddSchedCode::okData() } delete q; - EditSchedCode *schedCode=new EditSchedCode(schedCode_name_edit->text(),"", this,"group"); + EditSchedCode *schedCode= + new EditSchedCode(schedCode_name_edit->text(),"",this); if(schedCode->exec()<0) { delete schedCode; done(-1); diff --git a/rdadmin/add_schedcodes.h b/rdadmin/add_schedcodes.h index 1f0104cee..aca810271 100644 --- a/rdadmin/add_schedcodes.h +++ b/rdadmin/add_schedcodes.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -31,7 +29,7 @@ class AddSchedCode : public QDialog { Q_OBJECT public: - AddSchedCode(QString *schedCode,QWidget *parent=0,const char *name=0); + AddSchedCode(QString *schedCode,QWidget *parent=0); ~AddSchedCode(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_station.cpp b/rdadmin/add_station.cpp index be049d6c2..6a9d6d50c 100644 --- a/rdadmin/add_station.cpp +++ b/rdadmin/add_station.cpp @@ -39,9 +39,8 @@ #include #include - -AddStation::AddStation(QString *stationname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddStation::AddStation(QString *stationname,QWidget *parent) + : QDialog(parent,"",true) { add_name=stationname; @@ -64,16 +63,16 @@ AddStation::AddStation(QString *stationname,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Station Name // - add_name_edit=new QLineEdit(this,"add_name_edit"); + add_name_edit=new QLineEdit(this); add_name_edit->setGeometry(130,10,sizeHint().width()-140,19); add_name_edit->setMaxLength(64); add_name_edit->setValidator(validator); - QLabel *label=new QLabel(add_name_edit,tr("New &Host Name:"),this,"label"); + QLabel *label=new QLabel(add_name_edit,tr("New &Host Name:"),this); label->setGeometry(10,10,115,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -81,9 +80,9 @@ AddStation::AddStation(QString *stationname,QWidget *parent,const char *name) // // Exemplar // - add_exemplar_box=new QComboBox(this,"add_exemplar_box"); + add_exemplar_box=new QComboBox(this); add_exemplar_box->setGeometry(130,35,sizeHint().width()-140,19); - label=new QLabel(add_exemplar_box,tr("Base Host On:"),this,"label"); + label=new QLabel(add_exemplar_box,tr("Base Host On:"),this); label->setGeometry(10,35,115,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -91,7 +90,7 @@ AddStation::AddStation(QString *stationname,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60, 80,50); ok_button->setDefault(true); @@ -102,7 +101,7 @@ AddStation::AddStation(QString *stationname,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); @@ -938,7 +937,7 @@ void AddStation::okData() } *add_name=add_name_edit->text(); - EditStation *station=new EditStation(add_name_edit->text(),this,"station"); + EditStation *station=new EditStation(add_name_edit->text(),this); int res=station->exec(); delete station; diff --git a/rdadmin/add_station.h b/rdadmin/add_station.h index 33bd932df..2d65c815a 100644 --- a/rdadmin/add_station.h +++ b/rdadmin/add_station.h @@ -2,9 +2,7 @@ // // Add a Rivendell Workstation // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: add_station.h,v 1.11 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class AddStation : public QDialog { Q_OBJECT public: - AddStation(QString *stationname,QWidget *parent=0,const char *name=0); + AddStation(QString *stationname,QWidget *parent=0); ~AddStation(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_svc.cpp b/rdadmin/add_svc.cpp index cdc2ca5b0..d5baed467 100644 --- a/rdadmin/add_svc.cpp +++ b/rdadmin/add_svc.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_svc.cpp,v 1.20.8.1 2014/01/10 15:58:28 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,9 +36,8 @@ #include #include - -AddSvc::AddSvc(QString *svcname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddSvc::AddSvc(QString *svcname,QWidget *parent) + : QDialog(parent,"",true) { svc_name=svcname; @@ -148,7 +145,7 @@ void AddSvc::okData() return; } - RDSvc *svc=new RDSvc(svc_name_edit->text(),this,"svc"); + RDSvc *svc=new RDSvc(svc_name_edit->text(),this); if(svc->exists()) { QMessageBox::warning(this,tr("Service Exists"), tr("Service Already Exists!")); @@ -164,7 +161,7 @@ void AddSvc::okData() delete svc; *svc_name=svc_name_edit->text(); - EditSvc *edit_svc=new EditSvc(svc_name_edit->text(),this,"svc"); + EditSvc *edit_svc=new EditSvc(svc_name_edit->text(),this); if(edit_svc->exec()<0) { delete edit_svc; done(-1); diff --git a/rdadmin/add_svc.h b/rdadmin/add_svc.h index 45c7bba06..0703cb4f4 100644 --- a/rdadmin/add_svc.h +++ b/rdadmin/add_svc.h @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_svc.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class AddSvc : public QDialog { Q_OBJECT public: - AddSvc(QString *svcname,QWidget *parent=0,const char *name=0); + AddSvc(QString *svcname,QWidget *parent=0); ~AddSvc(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/add_user.cpp b/rdadmin/add_user.cpp index f38d0d2f2..7328d769a 100644 --- a/rdadmin/add_user.cpp +++ b/rdadmin/add_user.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell User // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: add_user.cpp,v 1.20 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,9 +38,8 @@ #include #include - -AddUser::AddUser(QString *username,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddUser::AddUser(QString *username,QWidget *parent) + : QDialog(parent,"",true) { user_name=username; @@ -65,11 +62,10 @@ AddUser::AddUser(QString *username,QWidget *parent,const char *name) // // User Name // - user_name_edit=new QLineEdit(this,"user_name_edit"); + user_name_edit=new QLineEdit(this); user_name_edit->setGeometry(125,11,sizeHint().width()-135,19); user_name_edit->setMaxLength(255); - QLabel *user_name_label=new QLabel(user_name_edit,tr("&New User Name:"),this, - "user_name_label"); + QLabel *user_name_label=new QLabel(user_name_edit,tr("&New User Name:"),this); user_name_label->setGeometry(10,13,110,19); user_name_label->setFont(font); user_name_label->setAlignment(AlignRight|ShowPrefix); @@ -77,7 +73,7 @@ AddUser::AddUser(QString *username,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(size().width()-180,size().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -87,7 +83,7 @@ AddUser::AddUser(QString *username,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(size().width()-90,size().height()-60,80,50); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); @@ -147,7 +143,7 @@ void AddUser::okData() delete q1; } delete q; - EditUser *user=new EditUser(user_name_edit->text(),this,"user"); + EditUser *user=new EditUser(user_name_edit->text(),this); if(user->exec()<0) { sql=QString().sprintf("delete from USER_PERMS where USER_NAME=\"%s\"", (const char *)username); diff --git a/rdadmin/add_user.h b/rdadmin/add_user.h index df7e9098b..6de32a3f0 100644 --- a/rdadmin/add_user.h +++ b/rdadmin/add_user.h @@ -2,9 +2,7 @@ // // Add a Rivendell User // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_user.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class AddUser : public QDialog { Q_OBJECT public: - AddUser(QString *username,QWidget *parent=0,const char *name=0); + AddUser(QString *username,QWidget *parent=0); ~AddUser(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/autofill_carts.cpp b/rdadmin/autofill_carts.cpp index 4bea635e3..3d18559ed 100644 --- a/rdadmin/autofill_carts.cpp +++ b/rdadmin/autofill_carts.cpp @@ -2,9 +2,7 @@ // // Edit a List of Autofill Carts // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: autofill_carts.cpp,v 1.16.8.1 2012/11/26 20:19:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,9 +39,8 @@ #include #include - -AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -72,7 +69,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) // // Cart List // - svc_cart_list=new QListView(this,"svc_cart_list"); + svc_cart_list=new QListView(this); svc_cart_list-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-110); svc_cart_list->setAllColumnsShowFocus(true); @@ -90,7 +87,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) // // Add Button // - QPushButton *button=new QPushButton(this,"add_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(20,sizeHint().height()-90,60,40); button->setFont(font); button->setText(tr("&Add")); @@ -99,7 +96,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) // // Delete Button // - button=new QPushButton(this,"delete_button"); + button=new QPushButton(this); button->setGeometry(90,sizeHint().height()-90,60,40); button->setFont(font); button->setText(tr("&Delete")); @@ -108,7 +105,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -118,7 +115,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); diff --git a/rdadmin/autofill_carts.h b/rdadmin/autofill_carts.h index 2e0da13cf..8964d842f 100644 --- a/rdadmin/autofill_carts.h +++ b/rdadmin/autofill_carts.h @@ -2,9 +2,7 @@ // // Edit a List of Autofill Carts // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: autofill_carts.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,7 +31,7 @@ class AutofillCarts : public QDialog { Q_OBJECT public: - AutofillCarts(RDSvc *svc,QWidget *parent=0,const char *name=0); + AutofillCarts(RDSvc *svc,QWidget *parent=0); ~AutofillCarts(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/createdb.h b/rdadmin/createdb.h index ce199ad65..32a1cddcd 100644 --- a/rdadmin/createdb.h +++ b/rdadmin/createdb.h @@ -2,9 +2,7 @@ // // Create a Rivendell Database // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: createdb.h,v 1.8 2011/06/23 22:30:44 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdadmin/edit_audios.cpp b/rdadmin/edit_audios.cpp index 3464dfaae..5d15d5763 100644 --- a/rdadmin/edit_audios.cpp +++ b/rdadmin/edit_audios.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Audio Port Configuration // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_audios.cpp,v 1.16.2.3 2012/08/07 15:48:04 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,9 +31,8 @@ #include - -EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -62,21 +59,23 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // // Card Selector // - edit_card_box=new QComboBox(this,"edit_card_box"); + edit_card_box=new QComboBox(this); edit_card_box->setGeometry(75,10,60,26); edit_card_box->setInsertionPolicy(QComboBox::NoInsertion); connect(edit_card_box,SIGNAL(activated(int)), this,SLOT(cardSelectedData(int))); - QLabel *label=new QLabel(edit_card_box,tr("Card:"),this,"edit_card_label"); + QLabel *label=new QLabel(edit_card_box,tr("Card:"),this); label->setGeometry(10,16,60,22); label->setFont(font); label->setAlignment(AlignRight); + // // Card Driver - card_driver_edit=new QLineEdit(this,"card_driver_edit"); + // + card_driver_edit=new QLineEdit(this); card_driver_edit->setGeometry(225,15,170,19);//FIXME: size card_driver_edit->setReadOnly(true); - label=new QLabel(edit_card_box,tr("Card Driver:"),this,"card_driver_label"); + label=new QLabel(edit_card_box,tr("Card Driver:"),this); label->setGeometry(140,16,80,22); label->setFont(font); label->setAlignment(AlignRight); @@ -84,10 +83,10 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // // Clock Selector // - edit_clock_box=new QComboBox(this,"edit_clock_box"); + edit_clock_box=new QComboBox(this); edit_clock_box->setGeometry(500,10,150,26); edit_clock_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_clock_label=new QLabel(edit_clock_box,tr("Clock Source:"),this,"edit_clock_label"); + edit_clock_label=new QLabel(edit_clock_box,tr("Clock Source:"),this); edit_clock_label->setGeometry(395,16,100,22); edit_clock_label->setFont(font); edit_clock_label->setAlignment(AlignRight); @@ -98,25 +97,23 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // Input Port Controls // str=QString(tr("Input Port")); - label=new QLabel(QString().sprintf("%s %d",(const char *)str,j*4+i), - this,"input_port_label"); + label=new QLabel(QString().sprintf("%s %d",(const char *)str,j*4+i),this); label->setGeometry(50+170*i,55+j*180,170,22); label->setFont(font); label->setAlignment(AlignHCenter); - QSignalMapper *mapper=new QSignalMapper(this,"input_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(inputMapData(int))); - edit_type_box[j*4+i]=new QComboBox(this,"edit_type_box"); + edit_type_box[j*4+i]=new QComboBox(this); edit_type_box[j*4+i]->setGeometry(95+170*i,75+j*180,110,26); edit_type_box[j*4+i]->insertItem(tr("Analog")); edit_type_box[j*4+i]->insertItem(tr("AES/EBU")); edit_type_box[j*4+i]->insertItem(tr("SP/DIFF")); mapper->setMapping(edit_type_box[j*4+i],j*4+i); connect(edit_type_box[j*4+i],SIGNAL(activated(int)),mapper,SLOT(map())); - edit_type_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Type:"), - this,"edit_type_label"); + edit_type_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Type:"),this); edit_type_label[j*4+i]->setGeometry(50+170*i,81+j*180,40,22); edit_type_label[j*4+i]->setAlignment(AlignRight); - edit_mode_box[j*4+i]=new QComboBox(this,"edit_mode_box"); + edit_mode_box[j*4+i]=new QComboBox(this); edit_mode_box[j*4+i]->setGeometry(95+170*i,105+j*180,110,26); // NOTE: this drop down list box is populated to match RDCae::ChannelMode edit_mode_box[j*4+i]->insertItem(tr("Normal")); @@ -125,17 +122,16 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) edit_mode_box[j*4+i]->insertItem(tr("Right only")); mapper->setMapping(edit_mode_box[j*4+i],j*4+i); connect(edit_mode_box[j*4+i],SIGNAL(activated(int)),mapper,SLOT(map())); - edit_mode_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Mode:"), - this,"edit_mode_label"); + edit_mode_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Mode:"),this); edit_mode_label[j*4+i]->setGeometry(50+170*i,111+j*180,40,22); edit_mode_label[j*4+i]->setAlignment(AlignRight); - edit_input_box[j*4+i]=new QSpinBox(this,"edit_type_box"); + edit_input_box[j*4+i]=new QSpinBox(this); edit_input_box[j*4+i]->setGeometry(95+170*i,135+j*180,60,24); edit_input_box[j*4+i]->setRange(-26,6); edit_input_box[j*4+i]->setSuffix(tr(" dB")); - edit_input_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"), - this,"edit_type_label"); + edit_input_label[j*4+i]= + new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"),this); edit_input_label[j*4+i]->setGeometry(10+170*i,140+j*180,80,22); edit_input_label[j*4+i]->setAlignment(AlignRight); @@ -143,18 +139,17 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // Output Port Controls // str=QString(tr("Output Port")); - label=new QLabel(QString().sprintf("%s %d",(const char *)str,j*4+i), - this,"output_port_label"); + label=new QLabel(QString().sprintf("%s %d",(const char *)str,j*4+i),this); label->setGeometry(50+170*i,170+j*180,170,22); label->setFont(font); label->setAlignment(AlignHCenter); - edit_output_box[j*4+i]=new QSpinBox(this,"edit_type_box"); + edit_output_box[j*4+i]=new QSpinBox(this); edit_output_box[j*4+i]->setGeometry(95+170*i,190+j*180,60,24); edit_output_box[j*4+i]->setRange(-26,6); edit_output_box[j*4+i]->setSuffix(tr(" dB")); edit_output_label[j*4+i]= - new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"),this,"edit_type_label"); + new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"),this); edit_output_label[j*4+i]->setGeometry(10+170*i,195+j*180,80,22); edit_output_label[j*4+i]->setAlignment(AlignRight); } @@ -163,7 +158,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // // Help Button // - QPushButton *help_button=new QPushButton(this,"help_button"); + QPushButton *help_button=new QPushButton(this); help_button->setGeometry(10,sizeHint().height()-60, 80,50); help_button->setFont(font); help_button->setText(tr("&Help")); @@ -172,7 +167,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); close_button->setFont(font); @@ -238,7 +233,7 @@ void EditAudioPorts::inputMapData(int id) void EditAudioPorts::helpData() { - HelpAudioPorts *help_audioports=new HelpAudioPorts(this, "help_audioports"); + HelpAudioPorts *help_audioports=new HelpAudioPorts(this); help_audioports->exec(); delete help_audioports; } diff --git a/rdadmin/edit_audios.h b/rdadmin/edit_audios.h index 0b75f3008..d63e72e25 100644 --- a/rdadmin/edit_audios.h +++ b/rdadmin/edit_audios.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Audio Port Configuration // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_audios.h,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,12 +35,11 @@ #include #include - class EditAudioPorts : public QDialog { Q_OBJECT public: - EditAudioPorts(QString station,QWidget *parent=0,const char *name=0); + EditAudioPorts(QString station,QWidget *parent=0); ~EditAudioPorts(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_aux_field.cpp b/rdadmin/edit_aux_field.cpp index ec01181c9..2beb0cf93 100644 --- a/rdadmin/edit_aux_field.cpp +++ b/rdadmin/edit_aux_field.cpp @@ -2,9 +2,7 @@ // // Edit an Auxiliary Field for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_aux_field.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include -EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -54,12 +52,11 @@ EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent,const char *name) // // Variable Name // - edit_varname_edit=new QLineEdit(this,"edit_varname_edit"); + edit_varname_edit=new QLineEdit(this); edit_varname_edit->setGeometry(120,10,130,20); edit_varname_edit->setReadOnly(true); QLabel *label= - new QLabel(edit_varname_edit,tr("Variable Name: "), - this,"edit_varname_label"); + new QLabel(edit_varname_edit,tr("Variable Name: "),this); label->setGeometry(10,13,105,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -67,11 +64,10 @@ EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent,const char *name) // // Variable Name // - edit_caption_edit=new QLineEdit(this,"edit_caption_edit"); + edit_caption_edit=new QLineEdit(this); edit_caption_edit->setGeometry(120,37,sizeHint().width()-130,20); edit_caption_edit->setMaxLength(64); - label=new QLabel(edit_caption_edit,tr("Caption: "), - this,"edit_caption_label"); + label=new QLabel(edit_caption_edit,tr("Caption: "),this); label->setGeometry(10,37,105,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -79,7 +75,7 @@ EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent,const char *name) // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -89,7 +85,7 @@ EditAuxField::EditAuxField(unsigned feed_id,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_aux_field.h b/rdadmin/edit_aux_field.h index c5e693ed7..f36d7fd0a 100644 --- a/rdadmin/edit_aux_field.h +++ b/rdadmin/edit_aux_field.h @@ -2,9 +2,7 @@ // // Edit an Auxiliary Field for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_aux_field.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include #include - class EditAuxField : public QDialog { Q_OBJECT public: - EditAuxField(unsigned field_id,QWidget *parent=0,const char *name=0); + EditAuxField(unsigned field_id,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_backup.cpp b/rdadmin/edit_backup.cpp index 041bb6815..8fdb37a4d 100644 --- a/rdadmin/edit_backup.cpp +++ b/rdadmin/edit_backup.cpp @@ -2,9 +2,7 @@ // // Edit an automatic backup configuration. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_backup.cpp,v 1.10 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,9 +29,8 @@ #include - -EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditBackup::EditBackup(RDStation *station,QWidget *parent) + : QDialog(parent) { // // Fix the Window Size @@ -54,7 +51,7 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Dialog Name @@ -65,16 +62,16 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) // // Backup Life // - edit_life_box=new QSpinBox(this,"edit_life_box"); + edit_life_box=new QSpinBox(this); edit_life_box->setGeometry(155,10,40,19); edit_life_box->setMinValue(0); edit_life_box->setMaxValue(30); - QLabel *edit_life_box_label=new QLabel(edit_life_box,tr("Keep Backups For:"), - this,"edit_life_box_label"); + QLabel *edit_life_box_label= + new QLabel(edit_life_box,tr("Keep Backups For:"),this); edit_life_box_label->setGeometry(10,10,140,19); edit_life_box_label->setFont(small_font); edit_life_box_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QLabel *edit_life_box_unit=new QLabel(tr("days"),this,"edit_life_box_unit"); + QLabel *edit_life_box_unit=new QLabel(tr("days"),this); edit_life_box_unit->setGeometry(200,10,120,19); edit_life_box_unit->setFont(small_font); edit_life_box_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -84,11 +81,10 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) // // Backup Directory // - edit_path_edit=new QLineEdit(this,"edit_life_box"); + edit_path_edit=new QLineEdit(this); edit_path_edit->setGeometry(155,35,sizeHint().width()-165,19); edit_path_edit->setValidator(validator); - edit_path_label=new QLabel(edit_life_box,tr("Backup Directory:"), - this,"edit_path_label"); + edit_path_label=new QLabel(edit_life_box,tr("Backup Directory:"),this); edit_path_label->setGeometry(10,35,140,19); edit_path_label->setFont(small_font); edit_path_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -96,7 +92,7 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(small_font); @@ -106,7 +102,7 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(small_font); diff --git a/rdadmin/edit_backup.h b/rdadmin/edit_backup.h index 5d84286b3..c6e5f5e8b 100644 --- a/rdadmin/edit_backup.h +++ b/rdadmin/edit_backup.h @@ -2,9 +2,7 @@ // // Edit an automatic backup configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_backup.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,12 +29,11 @@ #include - class EditBackup : public QDialog { Q_OBJECT public: - EditBackup(RDStation *station,QWidget *parent=0,const char *name=0); + EditBackup(RDStation *station,QWidget *parent=0); ~EditBackup(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_cartslots.cpp b/rdadmin/edit_cartslots.cpp index 6678c5bfc..8c3827b51 100644 --- a/rdadmin/edit_cartslots.cpp +++ b/rdadmin/edit_cartslots.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell CartSlot Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: edit_cartslots.cpp,v 1.1.2.7 2013/12/23 18:47:22 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,7 +29,7 @@ #include EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, - QWidget *parent,const char *name) + QWidget *parent) : QDialog(parent) { QString sql; diff --git a/rdadmin/edit_cartslots.h b/rdadmin/edit_cartslots.h index 19b185c50..3ab02dd6b 100644 --- a/rdadmin/edit_cartslots.h +++ b/rdadmin/edit_cartslots.h @@ -2,9 +2,7 @@ // // Edit Rivendell CartSlot Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: edit_cartslots.h,v 1.1.2.5 2013/12/23 18:47:23 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,7 @@ class EditCartSlots : public QDialog { Q_OBJECT public: - EditCartSlots(RDStation *station,RDStation *cae_station, - QWidget *parent=0,const char *name=0); + EditCartSlots(RDStation *station,RDStation *cae_station,QWidget *parent=0); ~EditCartSlots(); QSize sizeHint() const; diff --git a/rdadmin/edit_channelgpios.cpp b/rdadmin/edit_channelgpios.cpp index 212b56522..c776393e0 100644 --- a/rdadmin/edit_channelgpios.cpp +++ b/rdadmin/edit_channelgpios.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Channel GPIO Settings // -// (C) Copyright 2013 Fred Gleason -// -// $Id: edit_channelgpios.cpp,v 1.1.2.3 2013/03/13 15:18:05 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,9 +21,8 @@ #include EditChannelGpios::EditChannelGpios(RDAirPlayConf *conf, - RDAirPlayConf::Channel chan, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + RDAirPlayConf::Channel chan,QWidget *parent) + : QDialog(parent,"",true) { edit_airplay_conf=conf; edit_channel=chan; diff --git a/rdadmin/edit_channelgpios.h b/rdadmin/edit_channelgpios.h index 4676c1879..78625fea7 100644 --- a/rdadmin/edit_channelgpios.h +++ b/rdadmin/edit_channelgpios.h @@ -2,9 +2,7 @@ // // Edit Rivendell Channel GPIO Settings // -// (C) Copyright 2013 Fred Gleason -// -// $Id: edit_channelgpios.h,v 1.1.2.2 2013/03/13 15:18:05 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class EditChannelGpios : public QDialog Q_OBJECT public: EditChannelGpios(RDAirPlayConf *conf,RDAirPlayConf::Channel chan, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; protected: diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index a9aef2b93..a30794164 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Dropbox Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_dropbox.cpp,v 1.11.8.3.2.1 2014/06/03 18:23:35 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,9 +40,8 @@ #include #include - -EditDropbox::EditDropbox(int id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditDropbox::EditDropbox(int id,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; diff --git a/rdadmin/edit_dropbox.h b/rdadmin/edit_dropbox.h index 9f959eedf..794938cde 100644 --- a/rdadmin/edit_dropbox.h +++ b/rdadmin/edit_dropbox.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Dropbox Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_dropbox.h,v 1.5.8.1.2.1 2014/06/03 18:23:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,12 +38,11 @@ #include #include - class EditDropbox : public QDialog { Q_OBJECT public: - EditDropbox(int id,QWidget *parent=0,const char *name=0); + EditDropbox(int id,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_encoder.cpp b/rdadmin/edit_encoder.cpp index 6df977aa4..553b54d06 100644 --- a/rdadmin/edit_encoder.cpp +++ b/rdadmin/edit_encoder.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: edit_encoder.cpp,v 1.4 2012/02/13 19:26:14 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include -EditEncoder::EditEncoder(int encoder_id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditEncoder::EditEncoder(int encoder_id,QWidget *parent) + : QDialog(parent,"",true) { QString sql; QSqlQuery *q; diff --git a/rdadmin/edit_encoder.h b/rdadmin/edit_encoder.h index 3db645336..6c9d037a8 100644 --- a/rdadmin/edit_encoder.h +++ b/rdadmin/edit_encoder.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Encoder // -// (C) Copyright 2008 Fred Gleason -// -// $Id: edit_encoder.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,7 +33,7 @@ class EditEncoder : public QDialog { Q_OBJECT public: - EditEncoder(int encoder_id,QWidget *parent=0,const char *name=0); + EditEncoder(int encoder_id,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_endpoint.cpp b/rdadmin/edit_endpoint.cpp index 753127671..d030cc3f7 100644 --- a/rdadmin/edit_endpoint.cpp +++ b/rdadmin/edit_endpoint.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Endpoint // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_endpoint.cpp,v 1.10 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,12 +24,11 @@ #include - EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, int pointnum,QString *pointname,QString *feedname, RDMatrix::Mode *mode,int *enginenum,int *devicenum, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { edit_type=type; edit_endpoint=endpoint; @@ -73,16 +70,15 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Endpoint Name // - edit_endpoint_edit=new QLineEdit(this,"edit_endpoint_edit"); + edit_endpoint_edit=new QLineEdit(this); edit_endpoint_edit->setGeometry(75,10,sizeHint().width()-85,20); edit_endpoint_edit->setValidator(validator); - QLabel *label= - new QLabel(edit_endpoint_edit,tr("Name: "),this,"edit_endpoint_label"); + QLabel *label=new QLabel(edit_endpoint_edit,tr("Name: "),this); label->setGeometry(10,13,60,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -90,10 +86,10 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Unity Feed // - edit_feed_edit=new QLineEdit(this,"edit_feed_edit"); + edit_feed_edit=new QLineEdit(this); edit_feed_edit->setGeometry(75,40,40,20); edit_feed_edit->setValidator(validator); - label=new QLabel(edit_feed_edit,tr("Feed: "),this,"edit_feed_label"); + label=new QLabel(edit_feed_edit,tr("Feed: "),this); label->setGeometry(10,43,60,20); label->setFont(bold_font); label->setAlignment(AlignRight); @@ -105,8 +101,8 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Unity Mode // - edit_mode_box=new QComboBox(this,"edit_mode_box"); - label=new QLabel(edit_mode_box,tr("Mode: "),this,"edit_feed_label"); + edit_mode_box=new QComboBox(this); + label=new QLabel(edit_mode_box,tr("Mode: "),this); if(edit_type==RDMatrix::StarGuideIII) { edit_mode_box->setGeometry(135,88,85,24); label->setGeometry(10,93,120,20); @@ -129,9 +125,9 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Logitek Engine Number / StarGuide Provider ID // - edit_enginenum_edit=new QLineEdit(this,"edit_enginenum_edit"); + edit_enginenum_edit=new QLineEdit(this); edit_enginenum_edit->setGeometry(135,36,50,20); - label=new QLabel(edit_enginenum_edit,tr("Engine (Hex): "),this,"edit_enginenum_label"); + label=new QLabel(edit_enginenum_edit,tr("Engine (Hex): "),this); if(edit_type==RDMatrix::StarGuideIII) { label->setText(tr("Provider ID:")); } @@ -147,9 +143,9 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Logitek Device Number / StarGuide Service ID // - edit_devicenum_edit=new QLineEdit(this,"edit_devicenum_edit"); + edit_devicenum_edit=new QLineEdit(this); edit_devicenum_edit->setGeometry(135,62,50,20); - label=new QLabel(edit_devicenum_edit,tr("Device (Hex): "),this,"edit_devicenum_label"); + label=new QLabel(edit_devicenum_edit,tr("Device (Hex): "),this); if(edit_type==RDMatrix::StarGuideIII) { label->setText(tr("Service ID:")); } @@ -165,7 +161,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -175,9 +171,8 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); - button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + button=new QPushButton(this); + button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Cancel")); connect(button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdadmin/edit_endpoint.h b/rdadmin/edit_endpoint.h index d141c2f3b..d7849fe84 100644 --- a/rdadmin/edit_endpoint.h +++ b/rdadmin/edit_endpoint.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Endpoint // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_endpoint.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,7 +31,6 @@ #include #include - class EditEndpoint : public QDialog { Q_OBJECT @@ -41,7 +38,7 @@ class EditEndpoint : public QDialog EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, int pointnum,QString *pointname,QString *feedname, RDMatrix::Mode *mode,int *enginenum,int *devicenum, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_feed.cpp b/rdadmin/edit_feed.cpp index 3e4a3f2a3..5a045bc22 100644 --- a/rdadmin/edit_feed.cpp +++ b/rdadmin/edit_feed.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Feed // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,10 +34,8 @@ #include #include - - -EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditFeed::EditFeed(const QString &feed,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -47,7 +45,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - feed_feed=new RDFeed(feed,this,"feed_feed"); + feed_feed=new RDFeed(feed,this); setCaption(tr("Feed: ")+feed); @@ -62,12 +60,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Feed Name // - feed_keyname_edit=new QLineEdit(this,"feed_keyname_edit"); + feed_keyname_edit=new QLineEdit(this); feed_keyname_edit->setGeometry(115,11,100,19); feed_keyname_edit->setMaxLength(8); feed_keyname_edit->setReadOnly(true); - QLabel *feed_keyname_label=new QLabel(feed_keyname_edit,tr("Key Name:"),this, - "feed_keyname_label"); + QLabel *feed_keyname_label=new QLabel(feed_keyname_edit,tr("Key Name:"),this); feed_keyname_label->setGeometry(10,11,100,19); feed_keyname_label->setFont(font); feed_keyname_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -83,12 +80,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Title // - feed_channel_title_edit=new QLineEdit(this,"feed_channel_title_edit"); + feed_channel_title_edit=new QLineEdit(this); feed_channel_title_edit->setGeometry(115,60,375,19); feed_channel_title_edit->setMaxLength(255); feed_channel_title_label= - new QLabel(feed_channel_title_edit,tr("Title:"),this, - "feed_channel_title_label"); + new QLabel(feed_channel_title_edit,tr("Title:"),this); feed_channel_title_label->setGeometry(20,60,90,19); feed_channel_title_label->setFont(font); feed_channel_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -96,12 +92,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Category // - feed_channel_category_edit=new QLineEdit(this,"feed_channel_category_edit"); + feed_channel_category_edit=new QLineEdit(this); feed_channel_category_edit->setGeometry(115,82,375,19); feed_channel_category_edit->setMaxLength(64); feed_channel_category_label= - new QLabel(feed_channel_category_edit,tr("Category:"),this, - "feed_channel_category_label"); + new QLabel(feed_channel_category_edit,tr("Category:"),this); feed_channel_category_label->setGeometry(20,82,90,19); feed_channel_category_label->setFont(font); feed_channel_category_label-> @@ -110,12 +105,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Link // - feed_channel_link_edit=new QLineEdit(this,"feed_channel_link_edit"); + feed_channel_link_edit=new QLineEdit(this); feed_channel_link_edit->setGeometry(115,104,375,19); feed_channel_link_edit->setMaxLength(255); feed_channel_link_label= - new QLabel(feed_channel_link_edit,tr("Link:"),this, - "feed_channel_link_label"); + new QLabel(feed_channel_link_edit,tr("Link:"),this); feed_channel_link_label->setGeometry(20,104,90,19); feed_channel_link_label->setFont(font); feed_channel_link_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -123,13 +117,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Copyright // - feed_channel_copyright_edit= - new QLineEdit(this,"feed_channel_copyright_edit"); + feed_channel_copyright_edit=new QLineEdit(this); feed_channel_copyright_edit->setGeometry(115,126,375,19); feed_channel_copyright_edit->setMaxLength(64); feed_channel_copyright_label= - new QLabel(feed_channel_copyright_edit,tr("Copyright:"),this, - "feed_channel_copyright_label"); + new QLabel(feed_channel_copyright_edit,tr("Copyright:"),this); feed_channel_copyright_label->setGeometry(20,126,90,19); feed_channel_copyright_label->setFont(font); feed_channel_copyright_label-> @@ -138,13 +130,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Webmaster // - feed_channel_webmaster_edit= - new QLineEdit(this,"feed_channel_webmaster_edit"); + feed_channel_webmaster_edit=new QLineEdit(this); feed_channel_webmaster_edit->setGeometry(115,148,375,19); feed_channel_webmaster_edit->setMaxLength(64); feed_channel_webmaster_label= - new QLabel(feed_channel_webmaster_edit,tr("Webmaster:"),this, - "feed_channel_webmaster_label"); + new QLabel(feed_channel_webmaster_edit,tr("Webmaster:"),this); feed_channel_webmaster_label->setGeometry(20,148,90,19); feed_channel_webmaster_label->setFont(font); feed_channel_webmaster_label-> @@ -153,14 +143,12 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Language // - feed_channel_language_edit= - new QLineEdit(this,"feed_channel_language_edit"); + feed_channel_language_edit=new QLineEdit(this); feed_channel_language_edit-> setGeometry(115,170,60,19); feed_channel_language_edit->setMaxLength(5); feed_channel_language_label= - new QLabel(feed_channel_language_edit,tr("Language:"),this, - "feed_channel_language_label"); + new QLabel(feed_channel_language_edit,tr("Language:"),this); feed_channel_language_label->setGeometry(20,170,90,19); feed_channel_language_label->setFont(font); feed_channel_language_label-> @@ -169,13 +157,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel Description // - feed_channel_description_edit= - new QTextEdit(this,"feed_channel_description_edit"); + feed_channel_description_edit=new QTextEdit(this); feed_channel_description_edit-> setGeometry(115,192,375,76); feed_channel_description_label= - new QLabel(feed_channel_description_edit,tr("Description:"),this, - "feed_channel_description_label"); + new QLabel(feed_channel_description_edit,tr("Description:"),this); feed_channel_description_label->setGeometry(20,192,90,19); feed_channel_description_label->setFont(font); feed_channel_description_label-> @@ -184,15 +170,13 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Purge Audio URL // - feed_purge_url_edit= - new QLineEdit(this,"feed_purge_url_edit"); + feed_purge_url_edit=new QLineEdit(this); feed_purge_url_edit->setGeometry(155,280,335,19); feed_purge_url_edit->setMaxLength(255); connect(feed_purge_url_edit,SIGNAL(textChanged(const QString &)), this,SLOT(purgeUrlChangedData(const QString &))); feed_purge_url_label= - new QLabel(feed_purge_url_edit,tr("Audio Upload URL:"),this, - "feed_purge_url_label"); + new QLabel(feed_purge_url_edit,tr("Audio Upload URL:"),this); feed_purge_url_label->setGeometry(20,280,130,19); feed_purge_url_label->setFont(font); feed_purge_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -200,15 +184,13 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Purge Username // - feed_purge_username_edit= - new QLineEdit(this,"feed_purge_username_edit"); + feed_purge_username_edit=new QLineEdit(this); feed_purge_username_edit->setGeometry(225,302,95,19); feed_purge_username_edit->setMaxLength(64); connect(feed_purge_username_edit,SIGNAL(textChanged(const QString &)), this,SLOT(purgeUsernameChangedData(const QString &))); feed_purge_username_label= - new QLabel(feed_purge_username_edit,tr("Username:"),this, - "feed_purge_username_label"); + new QLabel(feed_purge_username_edit,tr("Username:"),this); feed_purge_username_label->setGeometry(40,302,180,19); feed_purge_username_label->setFont(font); feed_purge_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -216,14 +198,12 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Purge Password // - feed_purge_password_edit= - new QLineEdit(this,"feed_purge_password_edit"); + feed_purge_password_edit=new QLineEdit(this); feed_purge_password_edit->setGeometry(395,302,95,19); feed_purge_password_edit->setMaxLength(64); feed_purge_password_edit->setEchoMode(QLineEdit::Password); feed_purge_password_label= - new QLabel(feed_purge_password_edit,tr("Password:"),this, - "feed_purge_password_label"); + new QLabel(feed_purge_password_edit,tr("Password:"),this); feed_purge_password_label->setGeometry(320,302,70,19); feed_purge_password_label->setFont(font); feed_purge_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -231,15 +211,14 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Audio Format // - feed_format_edit=new QLineEdit(this,"feed_format_edit"); + feed_format_edit=new QLineEdit(this); feed_format_edit->setGeometry(155,324,285,20); feed_format_edit->setReadOnly(true); - feed_format_label=new QLabel(feed_format_edit, - tr("Upload Format:"),this,"feed_format_label"); + feed_format_label=new QLabel(feed_format_edit,tr("Upload Format:"),this); feed_format_label->setGeometry(5,324,145,20); feed_format_label->setFont(font); feed_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - feed_format_button=new QPushButton(this,"format_button"); + feed_format_button=new QPushButton(this); feed_format_button->setGeometry(450,324,40,24); feed_format_button->setFont(small_font); feed_format_button->setText(tr("S&et")); @@ -248,11 +227,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Normalize Check Box // - feed_normalize_box=new QCheckBox(this,"feed_normalize_box"); + feed_normalize_box=new QCheckBox(this); feed_normalize_box->setGeometry(155,348,15,15); feed_normalize_box->setChecked(true); - feed_normalize_check_label=new QLabel(feed_normalize_box,tr("Normalize"), - this,"normalize_check_label"); + feed_normalize_check_label= + new QLabel(feed_normalize_box,tr("Normalize"),this); feed_normalize_check_label->setGeometry(175,346,83,20); feed_normalize_check_label->setFont(font); feed_normalize_check_label->setAlignment(AlignLeft|AlignVCenter); @@ -262,15 +241,14 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Normalize Level // - feed_normalize_spin=new QSpinBox(this,"feed_normalize_spin"); + feed_normalize_spin=new QSpinBox(this); feed_normalize_spin->setGeometry(295,346,40,20); feed_normalize_spin->setRange(-30,-1); - feed_normalize_label=new QLabel(feed_normalize_spin,tr("Level:"), - this,"normalize_spin_label"); + feed_normalize_label=new QLabel(feed_normalize_spin,tr("Level:"),this); feed_normalize_label->setGeometry(245,346,45,20); feed_normalize_label->setFont(font); feed_normalize_label->setAlignment(AlignRight|AlignVCenter); - feed_normalize_unit_label=new QLabel(tr("dBFS"),this,"normalize_unit_label"); + feed_normalize_unit_label=new QLabel(tr("dBFS"),this); feed_normalize_unit_label->setGeometry(340,346,40,20); feed_normalize_unit_label->setFont(font); feed_normalize_unit_label->setAlignment(AlignLeft|AlignVCenter); @@ -278,13 +256,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Base Audio URL // - feed_base_url_edit= - new QLineEdit(this,"feed_base_url_edit"); + feed_base_url_edit=new QLineEdit(this); feed_base_url_edit->setGeometry(155,368,335,19); feed_base_url_edit->setMaxLength(255); feed_base_url_label= - new QLabel(feed_base_url_edit,tr("Audio Download URL:"),this, - "feed_base_url_label"); + new QLabel(feed_base_url_edit,tr("Audio Download URL:"),this); feed_base_url_label->setGeometry(20,368,130,19); feed_base_url_label->setFont(font); feed_base_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -292,11 +268,10 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Keep Expired Metadata Checkbox // - feed_keep_metadata_box=new QCheckBox(this,"feed_keep_metadata_box"); + feed_keep_metadata_box=new QCheckBox(this); feed_keep_metadata_box->setGeometry(155,390,15,15); feed_keep_metadata_label= - new QLabel(feed_keep_metadata_box,tr("Keep Expired Metadata"),this, - "feed_keep_metadata_label"); + new QLabel(feed_keep_metadata_box,tr("Keep Expired Metadata"),this); feed_keep_metadata_label->setGeometry(175,390,180,19); feed_keep_metadata_label->setFont(font); feed_keep_metadata_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -304,11 +279,10 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // AutoPost Checkbox // - feed_autopost_box=new QCheckBox(this,"feed_autopost_box"); + feed_autopost_box=new QCheckBox(this); feed_autopost_box->setGeometry(365,390,15,15); feed_autopost_label= - new QLabel(feed_autopost_box,tr("Enable AutoPost"),this, - "feed_autopost_label"); + new QLabel(feed_autopost_box,tr("Enable AutoPost"),this); feed_autopost_label->setGeometry(385,390,200,19); feed_autopost_label->setFont(font); feed_autopost_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -316,13 +290,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Enclosure Preamble // - feed_base_preamble_edit= - new QLineEdit(this,"feed_base_preamble_edit"); + feed_base_preamble_edit=new QLineEdit(this); feed_base_preamble_edit->setGeometry(155,412,335,19); feed_base_preamble_edit->setMaxLength(255); feed_base_preamble_label= - new QLabel(feed_base_preamble_edit,tr("Enclosure Preamble:"),this, - "feed_base_preamble_label"); + new QLabel(feed_base_preamble_edit,tr("Enclosure Preamble:"),this); feed_base_preamble_label->setGeometry(20,412,130,19); feed_base_preamble_label->setFont(font); feed_base_preamble_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -330,12 +302,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Audio File Extension // - feed_extension_edit=new QLineEdit(this,"feed_extension_edit"); + feed_extension_edit=new QLineEdit(this); feed_extension_edit->setGeometry(155,434,70,19); feed_extension_edit->setMaxLength(16); feed_extension_label= - new QLabel(feed_extension_edit,tr("Audio Extension:"),this, - "feed_extension_label"); + new QLabel(feed_extension_edit,tr("Audio Extension:"),this); feed_extension_label->setGeometry(20,434,130,19); feed_extension_label->setFont(font); feed_extension_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -343,21 +314,18 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Maximum Shelf Life // - feed_max_shelf_life_spin= - new QSpinBox(this,"feed_max_shelf_life_spin"); + feed_max_shelf_life_spin=new QSpinBox(this); feed_max_shelf_life_spin->setGeometry(155,456,60,19); feed_max_shelf_life_spin->setRange(0,365); feed_max_shelf_life_spin->setSpecialValueText(tr("None")); feed_max_shelf_life_label= - new QLabel(feed_max_shelf_life_spin,tr("Maximum Shelf Life:"),this, - "feed_max_shelf_life_label"); + new QLabel(feed_max_shelf_life_spin,tr("Maximum Shelf Life:"),this); feed_max_shelf_life_label->setGeometry(20,456,130,19); feed_max_shelf_life_label->setFont(font); feed_max_shelf_life_label-> setAlignment(AlignRight|AlignVCenter|ShowPrefix); feed_max_shelf_life_unit_label= - new QLabel(feed_max_shelf_life_spin,tr("days"),this, - "feed_max_shelf_life_unit"); + new QLabel(feed_max_shelf_life_spin,tr("days"),this); feed_max_shelf_life_unit_label->setGeometry(220,456,50,19); feed_max_shelf_life_unit_label->setFont(font); feed_max_shelf_life_unit_label-> @@ -366,12 +334,12 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Episode Order // - feed_castorder_box=new QComboBox(this,"feed_castorder_box"); + feed_castorder_box=new QComboBox(this); feed_castorder_box->setGeometry(155,478,100,19); feed_castorder_box->insertItem(tr("Descending")); feed_castorder_box->insertItem(tr("Ascending")); - feed_castorder_label=new QLabel(feed_castorder_box,tr("Episode Sort Order:"), - this,"feed_castorder_label"); + feed_castorder_label= + new QLabel(feed_castorder_box,tr("Episode Sort Order:"),this); feed_castorder_label->setGeometry(20,478,130,19); feed_castorder_label->setFont(font); feed_castorder_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -379,14 +347,13 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Media Link Mode // - feed_media_link_mode_box=new QComboBox(this,"feed_media_link_mode_box"); + feed_media_link_mode_box=new QComboBox(this); feed_media_link_mode_box->setGeometry(155,500,100,19); feed_media_link_mode_box->insertItem(tr("None")); feed_media_link_mode_box->insertItem(tr("Direct")); feed_media_link_mode_box->insertItem(tr("Counted")); - feed_media_link_mode_label=new QLabel(feed_media_link_mode_box, - tr("Media Link Mode:"), - this,"feed_media_link_mode_label"); + feed_media_link_mode_label= + new QLabel(feed_media_link_mode_box,tr("Media Link Mode:"),this); feed_media_link_mode_label->setGeometry(20,500,130,19); feed_media_link_mode_label->setFont(font); feed_media_link_mode_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -394,18 +361,17 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Feed Redirection // - feed_redirect_check=new QCheckBox(this,"feed_redirect_check"); + feed_redirect_check=new QCheckBox(this); feed_redirect_check->setGeometry(20,532,15,15); - QLabel *label=new QLabel(feed_redirect_check,tr("Enable Feed Redirection"), - this,"feed_redirect_label"); + QLabel *label= + new QLabel(feed_redirect_check,tr("Enable Feed Redirection"),this); label->setGeometry(40,532,200,19); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - feed_redirect_edit=new QLineEdit(this,"feed_redirect_edit"); + feed_redirect_edit=new QLineEdit(this); feed_redirect_edit->setGeometry(85,552,405,20); - feed_redirect_label=new QLabel(feed_redirect_edit,tr("URL:"), - this,"feed_redirect_label"); + feed_redirect_label=new QLabel(feed_redirect_edit,tr("URL:"),this); feed_redirect_label->setGeometry(40,552,40,19); feed_redirect_label->setFont(font); feed_redirect_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -413,13 +379,10 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Header XML // - feed_header_xml_edit= - new QTextEdit(this,"feed_header_xml_edit"); + feed_header_xml_edit=new QTextEdit(this); feed_header_xml_edit-> setGeometry(615,10,365,76); - feed_header_xml_label= - new QLabel(feed_header_xml_edit,tr("Header XML:"),this, - "feed_header_xml_label"); + feed_header_xml_label=new QLabel(feed_header_xml_edit,tr("Header XML:"),this); feed_header_xml_label->setGeometry(520,10,90,19); feed_header_xml_label->setFont(font); feed_header_xml_label-> @@ -428,13 +391,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Channel XML // - feed_channel_xml_edit= - new QTextEdit(this,"feed_channel_xml_edit"); + feed_channel_xml_edit=new QTextEdit(this); feed_channel_xml_edit-> setGeometry(615,88,365,176); feed_channel_xml_label= - new QLabel(feed_channel_xml_edit,tr("Channel XML:"),this, - "feed_channel_xml_label"); + new QLabel(feed_channel_xml_edit,tr("Channel XML:"),this); feed_channel_xml_label->setGeometry(520,88,90,19); feed_channel_xml_label->setFont(font); feed_channel_xml_label-> @@ -443,13 +404,10 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Item XML // - feed_item_xml_edit= - new QTextEdit(this,"feed_item_xml_edit"); + feed_item_xml_edit=new QTextEdit(this); feed_item_xml_edit-> setGeometry(615,270,365,176); - feed_item_xml_label= - new QLabel(feed_item_xml_edit,tr("Item XML:"),this, - "feed_item_xml_label"); + feed_item_xml_label=new QLabel(feed_item_xml_edit,tr("Item XML:"),this); feed_item_xml_label->setGeometry(520,270,90,19); feed_item_xml_label->setFont(font); feed_item_xml_label-> @@ -458,7 +416,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Metadata Button // - feed_metadata_button=new QPushButton(this,"feed_metadata_button"); + feed_metadata_button=new QPushButton(this); feed_metadata_button->setGeometry(615,460,150,50); feed_metadata_button->setDefault(true); feed_metadata_button->setFont(font); @@ -468,7 +426,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -478,7 +436,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_feed.h b/rdadmin/edit_feed.h index ef351d55c..fcb1f495b 100644 --- a/rdadmin/edit_feed.h +++ b/rdadmin/edit_feed.h @@ -1,11 +1,8 @@ - // edit_feed.h // // Edit a Rivendell Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_feed.h,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,12 +35,11 @@ #include #include - class EditFeed : public QDialog { Q_OBJECT public: - EditFeed(const QString &feed,QWidget *parent=0,const char *name=0); + EditFeed(const QString &feed,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_feed_perms.cpp b/rdadmin/edit_feed_perms.cpp index f8031e103..edb574543 100644 --- a/rdadmin/edit_feed_perms.cpp +++ b/rdadmin/edit_feed_perms.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell RSS Feed Permissions // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_feed_perms.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,9 +35,8 @@ #include #include - -EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -65,7 +62,7 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent,const char *name) // // Feeds Selector // - feed_host_sel=new RDListSelector(this,"feed_host_sel"); + feed_host_sel=new RDListSelector(this); feed_host_sel->sourceSetLabel(tr("Available Feeds")); feed_host_sel->destSetLabel(tr("Enabled Feeds")); feed_host_sel->setGeometry(10,10,380,130); @@ -73,7 +70,7 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -83,7 +80,7 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_feed_perms.h b/rdadmin/edit_feed_perms.h index 5b9cf9bcb..e3581284e 100644 --- a/rdadmin/edit_feed_perms.h +++ b/rdadmin/edit_feed_perms.h @@ -2,9 +2,7 @@ // // Edit Rivendell RSS Feed Permissions // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_feed_perms.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,12 +27,11 @@ #include - class EditFeedPerms : public QDialog { Q_OBJECT public: - EditFeedPerms(RDUser *user,QWidget *parent=0,const char *name=0); + EditFeedPerms(RDUser *user,QWidget *parent=0); ~EditFeedPerms(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index 8e34aa6fd..3a8287fae 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Gpi // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_gpi.cpp,v 1.17.8.1 2012/11/26 20:19:38 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,11 +27,9 @@ #include #include - EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, - int *offcart,QString *offdesc, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + int *offcart,QString *offdesc,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -66,7 +62,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // On Section Label @@ -79,11 +75,11 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // On Cart Macro Cart // - edit_onmacro_edit=new QLineEdit(this,"edit_onmacro_edit"); + edit_onmacro_edit=new QLineEdit(this); edit_onmacro_edit->setGeometry(120,30,60,20); edit_onmacro_edit->setFont(font); edit_onmacro_edit->setValidator(validator); - label=new QLabel(tr("Cart Number: "),this,"edit_macro_label"); + label=new QLabel(tr("Cart Number: "),this); label->setGeometry(15,30,100,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -91,7 +87,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // On Select Button // - QPushButton *button=new QPushButton(this,"select_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(190,30,60,20); button->setFont(font); button->setText(tr("&Select")); @@ -100,7 +96,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // On Clear Button // - button=new QPushButton(this,"select_button"); + button=new QPushButton(this); button->setGeometry(270,30,60,20); button->setFont(font); button->setText(tr("C&lear")); @@ -109,11 +105,11 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // On Cart Description // - edit_ondescription_edit=new QLineEdit(this,"edit_ondescription_edit"); + edit_ondescription_edit=new QLineEdit(this); edit_ondescription_edit->setGeometry(120,52,sizeHint().width()-140,20); edit_ondescription_edit->setFont(font); edit_ondescription_edit->setReadOnly(true); - label=new QLabel(tr("Description: "),this,"edit_ondescription_label"); + label=new QLabel(tr("Description: "),this); label->setGeometry(15,52,100,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -129,11 +125,11 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Off Cart Macro Cart // - edit_offmacro_edit=new QLineEdit(this,"edit_offmacro_edit"); + edit_offmacro_edit=new QLineEdit(this); edit_offmacro_edit->setGeometry(120,110,60,20); edit_offmacro_edit->setFont(font); edit_offmacro_edit->setValidator(validator); - label=new QLabel(tr("Cart Number: "),this,"edit_macro_label"); + label=new QLabel(tr("Cart Number: "),this); label->setGeometry(15,110,100,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -141,7 +137,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Off Select Button // - button=new QPushButton(this,"select_button"); + button=new QPushButton(this); button->setGeometry(190,110,60,20); button->setFont(font); button->setText(tr("&Select")); @@ -150,7 +146,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Off Clear Button // - button=new QPushButton(this,"select_button"); + button=new QPushButton(this); button->setGeometry(270,110,60,20); button->setFont(font); button->setText(tr("C&lear")); @@ -159,11 +155,11 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Off Cart Description // - edit_offdescription_edit=new QLineEdit(this,"edit_offdescription_edit"); + edit_offdescription_edit=new QLineEdit(this); edit_offdescription_edit->setGeometry(120,132,sizeHint().width()-140,20); edit_offdescription_edit->setFont(font); edit_offdescription_edit->setReadOnly(true); - label=new QLabel(tr("Description: "),this,"edit_offdescription_label"); + label=new QLabel(tr("Description: "),this); label->setGeometry(15,132,100,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -171,7 +167,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -181,7 +177,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_gpi.h b/rdadmin/edit_gpi.h index 722923f41..6d025ff7b 100644 --- a/rdadmin/edit_gpi.h +++ b/rdadmin/edit_gpi.h @@ -2,9 +2,7 @@ // // Edit a Rivendell GPI // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_gpi.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,13 +31,12 @@ #include #include - class EditGpi : public QDialog { Q_OBJECT public: EditGpi(int gpi,int *oncart,QString *ondesc,int *offcart,QString *offdesc, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_group.cpp b/rdadmin/edit_group.cpp index 2b38c72a9..ae67cde48 100644 --- a/rdadmin/edit_group.cpp +++ b/rdadmin/edit_group.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Group // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_group.cpp,v 1.27.8.1 2013/01/07 13:50:22 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,9 +38,8 @@ #include #include - -EditGroup::EditGroup(QString group,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditGroup::EditGroup(QString group,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -68,17 +65,16 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Group Name // - group_name_edit=new QLineEdit(this,"group_name_edit"); + group_name_edit=new QLineEdit(this); group_name_edit->setGeometry(165,11,100,19); group_name_edit->setMaxLength(10); group_name_edit->setReadOnly(true); - QLabel *group_name_label=new QLabel(group_name_edit,tr("&Group Name:"),this, - "group_name_label"); + QLabel *group_name_label=new QLabel(group_name_edit,tr("&Group Name:"),this); group_name_label->setGeometry(10,11,150,19); group_name_label->setFont(font); group_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -86,13 +82,12 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Group Description // - group_description_edit=new QLineEdit(this,"group_description_edit"); + group_description_edit=new QLineEdit(this); group_description_edit->setGeometry(165,32,sizeHint().width()-175,19); group_description_edit->setMaxLength(255); group_description_edit->setValidator(validator); - QLabel *group_description_label=new QLabel(group_description_edit, - tr("Group &Description:"),this, - "group_description_label"); + QLabel *group_description_label= + new QLabel(group_description_edit,tr("Group &Description:"),this); group_description_label->setGeometry(10,32,150,19); group_description_label->setFont(font); group_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -100,13 +95,12 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Default Title // - group_title_edit=new QLineEdit(this,"group_title_edit"); + group_title_edit=new QLineEdit(this); group_title_edit->setGeometry(165,53,sizeHint().width()-175,19); group_title_edit->setMaxLength(255); group_title_edit->setValidator(validator); - QLabel *group_title_label=new QLabel(group_title_edit, - tr("Default Import &Title:"),this, - "group_title_label"); + QLabel *group_title_label= + new QLabel(group_title_edit,tr("Default Import &Title:"),this); group_title_label->setGeometry(10,53,150,19); group_title_label->setFont(font); group_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -114,13 +108,12 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Default Cart Type // - group_carttype_box=new QComboBox(this,"group_carttype_box"); + group_carttype_box=new QComboBox(this); group_carttype_box->setGeometry(165,74,100,19); group_carttype_box->insertItem(tr("Audio")); group_carttype_box->insertItem(tr("Macro")); - QLabel *group_carttype_label=new QLabel(group_carttype_box, - tr("Default Cart &Type:"),this, - "group_carttype_label"); + QLabel *group_carttype_label= + new QLabel(group_carttype_box,tr("Default Cart &Type:"),this); group_carttype_label->setGeometry(10,74,150,19); group_carttype_label->setFont(font); group_carttype_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -128,22 +121,20 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Default Cart Numbers // - group_lowcart_box=new QSpinBox(this,"group_lowcart_box"); + group_lowcart_box=new QSpinBox(this); group_lowcart_box->setGeometry(165,95,70,19); group_lowcart_box->setRange(0,999999); group_lowcart_box->setSpecialValueText(tr("None")); - QLabel *label=new QLabel(group_lowcart_box, - tr("Default Cart Number:"),this, - "group_lowcart_label"); + QLabel *label= + new QLabel(group_lowcart_box,tr("Default Cart Number:"),this); label->setGeometry(10,95,150,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - group_highcart_box=new QSpinBox(this,"group_highcart_box"); + group_highcart_box=new QSpinBox(this); group_highcart_box->setGeometry(265,95,70,19); group_highcart_box->setRange(1,999999); - group_highcart_label=new QLabel(group_highcart_box, - tr("to"),this, - "group_highcart_label"); + group_highcart_label= + new QLabel(group_highcart_box,tr("to"),this); group_highcart_label->setGeometry(240,95,20,19); group_highcart_label->setFont(font); group_highcart_label->setAlignment(AlignCenter|ShowPrefix); @@ -153,11 +144,10 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Enforce Cart Range Checkbox // - group_enforcerange_box=new QCheckBox(this,"group_enforcerange_box"); + group_enforcerange_box=new QCheckBox(this); group_enforcerange_box->setGeometry(20,118,15,15); group_enforcerange_label= - new QLabel(group_enforcerange_box,tr("Enforce Cart Range"), - this,"group_enforcerange_label"); + new QLabel(group_enforcerange_box,tr("Enforce Cart Range"),this); group_enforcerange_label->setGeometry(40,118,sizeHint().width()-50,19); group_enforcerange_label->setFont(font); group_enforcerange_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -165,11 +155,11 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Traffic Report Checkbox // - group_traffic_check=new QCheckBox(this,"group_traffic_check"); + group_traffic_check=new QCheckBox(this); group_traffic_check->setGeometry(20,145,15,15); label= new QLabel(group_traffic_check,tr("Include this group in Traffic reports"), - this,"group_traffic_label"); + this); label->setGeometry(40,143,sizeHint().width()-50,19); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -177,10 +167,10 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Music Report Checkbox // - group_music_check=new QCheckBox(this,"group_music_check"); + group_music_check=new QCheckBox(this); group_music_check->setGeometry(20,166,15,15); label=new QLabel(group_music_check,tr("Include this group in Music reports"), - this,"group_music_label"); + this); label->setGeometry(40,164,sizeHint().width()-50,19); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -188,21 +178,20 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Cut Auto Purging // - group_shelflife_check=new QCheckBox(this,"group_shelflife_check"); + group_shelflife_check=new QCheckBox(this); group_shelflife_check->setGeometry(20,193,15,15); connect(group_shelflife_check,SIGNAL(toggled(bool)), this,SLOT(purgeEnabledData(bool))); - group_shelflife_spin=new QSpinBox(this,"group_shelflife_spin"); + group_shelflife_spin=new QSpinBox(this); group_shelflife_spin->setGeometry(200,191,40,19); group_shelflife_spin->setRange(0,30); group_shelflife_label= - new QLabel(group_shelflife_check,tr("Purge expired cuts after"), - this,"group_shelflife_label"); + new QLabel(group_shelflife_check,tr("Purge expired cuts after"),this); group_shelflife_label->setGeometry(40,193,160,19); group_shelflife_label->setFont(font); group_shelflife_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); group_shelflife_unit= - new QLabel(group_shelflife_check,tr("days"),this,"group_shelflife_unit"); + new QLabel(group_shelflife_check,tr("days"),this); group_shelflife_unit->setGeometry(250,193,50,19); group_shelflife_unit->setFont(font); group_shelflife_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -218,7 +207,7 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Now & Next Data Checkbox // - group_nownext_check=new QCheckBox(this,"group_nownext_check"); + group_nownext_check=new QCheckBox(this); group_nownext_check->setGeometry(20,242,15,15); label=new QLabel(group_nownext_check,tr("Transmit Now && Next data"), this,"group_nownext_label"); @@ -229,13 +218,13 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Services Selector // - group_svcs_sel=new RDListSelector(this,"group_svcs_sel"); + group_svcs_sel=new RDListSelector(this); group_svcs_sel->setGeometry(10,261,380,130); // // Color Button // - group_color_button=new QPushButton(this,"group_colorbutton"); + group_color_button=new QPushButton(this); group_color_button->setGeometry(10,sizeHint().height()-60,80,50); group_color_button->setFont(font); group_color_button->setText(tr("C&olor")); @@ -244,7 +233,7 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -254,7 +243,7 @@ EditGroup::EditGroup(QString group,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_group.h b/rdadmin/edit_group.h index df592ee75..9626795b2 100644 --- a/rdadmin/edit_group.h +++ b/rdadmin/edit_group.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Group // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_group.h,v 1.16.8.1 2013/01/07 13:50:22 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,12 +37,11 @@ #include - class EditGroup : public QDialog { Q_OBJECT public: - EditGroup(QString group,QWidget *parent=0,const char *name=0); + EditGroup(QString group,QWidget *parent=0); ~EditGroup(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_hostvar.cpp b/rdadmin/edit_hostvar.cpp index 712257955..de383f401 100644 --- a/rdadmin/edit_hostvar.cpp +++ b/rdadmin/edit_hostvar.cpp @@ -1,10 +1,8 @@ // edit_hostvar.cpp // -// Edit a Rivendell Workstation Configuration +// Edit a Rivendell Host Variable // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_hostvar.cpp,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,10 +42,9 @@ #include #include - EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, - QString *remark,QWidget *parent,const char *name) - : QDialog(parent,name,true) + QString *remark,QWidget *parent) + : QDialog(parent,"",true) { edit_varvalue=varvalue; edit_remark=remark; @@ -71,11 +68,10 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, // // Variable Name // - edit_name_edit=new QLineEdit(this,"edit_name_edit"); + edit_name_edit=new QLineEdit(this); edit_name_edit->setGeometry(125,11,120,19); edit_name_edit->setReadOnly(true); - QLabel *label=new QLabel(edit_name_edit,tr("Variable Name:"), - this,"edit_name_label"); + QLabel *label=new QLabel(edit_name_edit,tr("Variable Name:"),this); label->setGeometry(10,11,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -83,11 +79,10 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, // // Variable Value // - edit_varvalue_edit=new QLineEdit(this,"edit_varvalue_edit"); + edit_varvalue_edit=new QLineEdit(this); edit_varvalue_edit->setGeometry(125,33,sizeHint().width()-135,19); edit_varvalue_edit->setMaxLength(255); - label=new QLabel(edit_varvalue_edit,tr("Variable Value:"), - this,"edit_varvalue_label"); + label=new QLabel(edit_varvalue_edit,tr("Variable Value:"),this); label->setGeometry(10,33,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -95,10 +90,10 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, // // Remark // - edit_remark_edit=new QLineEdit(this,"edit_remark_edit"); + edit_remark_edit=new QLineEdit(this); edit_remark_edit->setGeometry(125,55,sizeHint().width()-135,19); edit_remark_edit->setMaxLength(255); - label=new QLabel(edit_remark_edit,tr("Remark:"),this,"edit_remark_label"); + label=new QLabel(edit_remark_edit,tr("Remark:"),this); label->setGeometry(10,55,110,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -106,7 +101,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -116,7 +111,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_hostvar.h b/rdadmin/edit_hostvar.h index 679d28ade..9fb962985 100644 --- a/rdadmin/edit_hostvar.h +++ b/rdadmin/edit_hostvar.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Host Variable // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_hostvar.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,13 +34,12 @@ #include #include - class EditHostvar : public QDialog { Q_OBJECT public: EditHostvar(QString station,QString var,QString *varvalue,QString *remark, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~EditHostvar(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_hotkeys.cpp b/rdadmin/edit_hotkeys.cpp index 83e2c3529..7d6825da0 100644 --- a/rdadmin/edit_hotkeys.cpp +++ b/rdadmin/edit_hotkeys.cpp @@ -2,6 +2,21 @@ // // Edit the Hot Key Configuration for a Rivendell Workstation. // +// (C) Copyright 2002-2004,2016 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// #include #include @@ -15,145 +30,141 @@ #include -EditHotkeys::EditHotkeys(const QString &station,const QString &module,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditHotkeys::EditHotkeys(const QString &station,const QString &module, + QWidget *parent) + : QDialog(parent,"",true) { - QString sql; - RDSqlQuery *q; - - hotkey_conf=station; - hotkey_module=module; - station_hotkeys= new RDHotkeys(hotkey_conf,hotkey_module); - myhotkeylist = new RDHotKeyList(); - // - // Create Fonts - // - QFont normal_font=QFont("Helvetica",12,QFont::Normal); - normal_font.setPixelSize(12); - QFont font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - QFont section_font=QFont("Helvetica",14,QFont::Bold); - section_font.setPixelSize(14); - - // - // Fix the Window Size - // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - // - // Hot Key Configuration Label - // - setCaption(hotkey_module.upper()+" "+tr("Hot Key Configuration for")+" "+ - hotkey_conf); - - list_view=new QListView(this,"list_view"); - list_view->setGeometry(10,24,320,220); - QLabel *label=new QLabel(list_view,tr("Host Hot Key Configurations"), - this,"list_view_label"); - label->setFont(font); - label->setGeometry(14,5,sizeHint().width()-28,19); - //list_view->setItemMargin(5); - list_view->setSorting(-1); - list_view->addColumn(tr("Button / Function ")); - list_view->setColumnAlignment(0,AlignLeft|AlignVCenter); - list_view->addColumn(tr("KeyStroke")); - list_view->setColumnAlignment(1,AlignLeft|AlignVCenter); - list_view->setAllColumnsShowFocus(true); + QString sql; + RDSqlQuery *q; + + hotkey_conf=station; + hotkey_module=module; + station_hotkeys= new RDHotkeys(hotkey_conf,hotkey_module); + myhotkeylist = new RDHotKeyList(); + + // + // Create Fonts + // + QFont normal_font=QFont("Helvetica",12,QFont::Normal); + normal_font.setPixelSize(12); + QFont font=QFont("Helvetica",12,QFont::Bold); + font.setPixelSize(12); + QFont section_font=QFont("Helvetica",14,QFont::Bold); + section_font.setPixelSize(14); + + // + // Fix the Window Size + // + setMinimumWidth(sizeHint().width()); + setMaximumWidth(sizeHint().width()); + setMinimumHeight(sizeHint().height()); + setMaximumHeight(sizeHint().height()); + + // + // Hot Key Configuration Label + // + setCaption(hotkey_module.upper()+" "+tr("Hot Key Configuration for")+" "+ + hotkey_conf); + + list_view=new QListView(this); + list_view->setGeometry(10,24,320,220); + QLabel *label=new QLabel(list_view,tr("Host Hot Key Configurations"),this); + label->setFont(font); + label->setGeometry(14,5,sizeHint().width()-28,19); + //list_view->setItemMargin(5); + list_view->setSorting(-1); + list_view->addColumn(tr("Button / Function ")); + list_view->setColumnAlignment(0,AlignLeft|AlignVCenter); + list_view->addColumn(tr("KeyStroke")); + list_view->setColumnAlignment(1,AlignLeft|AlignVCenter); + list_view->setAllColumnsShowFocus(true); - connect(list_view,SIGNAL(clicked(QListViewItem *,const QPoint &,int)), - this,SLOT(showCurrentKey())); - connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(showCurrentKey())); - - - - // Keystroke Value field - keystroke = new QLineEdit(this); - keystroke->setFocusPolicy(QWidget::StrongFocus); - keystroke->setGeometry(sizeHint().width()-270,sizeHint().height()-210,200,35); + connect(list_view,SIGNAL(clicked(QListViewItem *,const QPoint &,int)), + this,SLOT(showCurrentKey())); + connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + this,SLOT(showCurrentKey())); + + // Keystroke Value field + keystroke = new QLineEdit(this); + keystroke->setFocusPolicy(QWidget::StrongFocus); + keystroke->setGeometry(sizeHint().width()-270,sizeHint().height()-210,200,35); - // Set Button - // - QPushButton *set_button = new QPushButton(this,"set_button"); - set_button->setGeometry(sizeHint().width()-290,sizeHint().height()-160,60,30); - set_button->setDefault(true); - set_button->setFont(font); - set_button->setText(tr("Set")); - connect(set_button,SIGNAL(clicked()), this, SLOT(SetButtonClicked()) ); + // Set Button + // + QPushButton *set_button = new QPushButton(this); + set_button->setGeometry(sizeHint().width()-290,sizeHint().height()-160,60,30); + set_button->setDefault(true); + set_button->setFont(font); + set_button->setText(tr("Set")); + connect(set_button,SIGNAL(clicked()), this, SLOT(SetButtonClicked()) ); - // Clear Button - // - QPushButton *clear_button = new QPushButton(this,"clear_button"); - clear_button->setGeometry(sizeHint().width()-215,sizeHint().height()-160,60,30); - clear_button->setDefault(true); - clear_button->setFont(font); - clear_button->setText(tr("Clear")); - connect(clear_button,SIGNAL(clicked()), this, SLOT(clearCurrentItem()) ); + // Clear Button + // + QPushButton *clear_button = new QPushButton(this); + clear_button->setGeometry(sizeHint().width()-215,sizeHint().height()-160,60,30); + clear_button->setDefault(true); + clear_button->setFont(font); + clear_button->setText(tr("Clear")); + connect(clear_button,SIGNAL(clicked()), this, SLOT(clearCurrentItem()) ); - // Clear All Hot Keys Button - // - QPushButton *clear_all_button = new QPushButton(this,"clear_all_button"); - clear_all_button->setGeometry(sizeHint().width()-140,sizeHint().height()-160,130,30); - clear_all_button->setDefault(true); - clear_all_button->setFont(font); - clear_all_button->setText(tr("Clear All Hotkeys")); - connect(clear_all_button,SIGNAL(clicked()), this,SLOT(clearAll_Hotkeys()) ); + // Clear All Hot Keys Button + // + QPushButton *clear_all_button = new QPushButton(this); + clear_all_button->setGeometry(sizeHint().width()-140,sizeHint().height()-160,130,30); + clear_all_button->setDefault(true); + clear_all_button->setFont(font); + clear_all_button->setText(tr("Clear All Hotkeys")); + connect(clear_all_button,SIGNAL(clicked()), this,SLOT(clearAll_Hotkeys()) ); - // Clone Host Drop Box - // - clone_from_host_box=new QComboBox(this,"clone_from_host_box"); - clone_from_host_box->setGeometry(sizeHint().width()-295,sizeHint().height()-110,130,30); - clone_from_host_label=new QLabel(clone_from_host_box,tr("Set From Host:"), - this,"clone_from_host_label"); - clone_from_host_label->setFont(font); - clone_from_host_label->setGeometry(sizeHint().width()-420,sizeHint().height()-110,120,30); - clone_from_host_label->setAlignment(AlignRight|AlignVCenter); - sql=QString().sprintf("select NAME from STATIONS"); - q=new RDSqlQuery(sql); - while(q->next()) { - clone_from_host_box->insertItem(q->value(0).toString()); - if (hotkey_conf == q->value(0).toString()) { - clone_from_host_box->setCurrentItem(clone_from_host_box->count()-1); - current_station_clone_item = clone_from_host_box->count()-1; - } + // Clone Host Drop Box + // + clone_from_host_box=new QComboBox(this); + clone_from_host_box->setGeometry(sizeHint().width()-295,sizeHint().height()-110,130,30); + clone_from_host_label= + new QLabel(clone_from_host_box,tr("Set From Host:"),this); + clone_from_host_label->setFont(font); + clone_from_host_label->setGeometry(sizeHint().width()-420,sizeHint().height()-110,120,30); + clone_from_host_label->setAlignment(AlignRight|AlignVCenter); + sql=QString().sprintf("select NAME from STATIONS"); + q=new RDSqlQuery(sql); + while(q->next()) { + clone_from_host_box->insertItem(q->value(0).toString()); + if (hotkey_conf == q->value(0).toString()) { + clone_from_host_box->setCurrentItem(clone_from_host_box->count()-1); + current_station_clone_item = clone_from_host_box->count()-1; } - delete q; - connect (clone_from_host_box,SIGNAL(activated(const QString&)), - this,SLOT(Clone_RefreshList(const QString&))); + } + delete q; + connect (clone_from_host_box,SIGNAL(activated(const QString&)), + this,SLOT(Clone_RefreshList(const QString&))); - // - // Save Button - // - QPushButton *save_button=new QPushButton(this,"save_button"); - save_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - save_button->setDefault(true); - save_button->setFont(font); - save_button->setText(tr("Save")); - connect(save_button,SIGNAL(clicked()),this,SLOT(save())); + // + // Save Button + // + QPushButton *save_button=new QPushButton(this); + save_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); + save_button->setDefault(true); + save_button->setFont(font); + save_button->setText(tr("Save")); + connect(save_button,SIGNAL(clicked()),this,SLOT(save())); - // - // Cancel Button - // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); - cancel_button->setFont(font); - cancel_button->setText(tr("Cancel")); + // + // Cancel Button + // + QPushButton *cancel_button=new QPushButton(this); + cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, + 80,50); + cancel_button->setFont(font); + cancel_button->setText(tr("Cancel")); + connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancel())); - connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancel())); + keystrokecount=0; + AltKeyHit = false; + CtrlKeyHit = false; - keystrokecount=0; - AltKeyHit = false; - CtrlKeyHit = false; - - - RefreshList(); - + RefreshList(); } @@ -176,320 +187,315 @@ QSizePolicy EditHotkeys::sizePolicy() const void EditHotkeys::save() { - QString sql; - RDSqlQuery *q; + QString sql; + RDSqlQuery *q; - QListViewItemIterator *start; + QListViewItemIterator *start; - start = new QListViewItemIterator(list_view); + start = new QListViewItemIterator(list_view); - QString stringlist [40][45]; // assumes no more than 40 entries... - int cur, top, i = 0; - while (start->current()) { - if (start->current()->text(1).isEmpty()) { - stringlist[i++][0] = QString(""); - } - else { - stringlist[i++][0] = QString().sprintf("%s", - (const char *) start->current()->text(1)); - } - ++(*start); + QString stringlist [40][45]; // assumes no more than 40 entries... + int cur, top, i = 0; + while (start->current()) { + if (start->current()->text(1).isEmpty()) { + stringlist[i++][0] = QString(""); } - delete start; - - for ( top = 0; top < (i- 1) ; top++) { - for (cur = top + 1; cur < i; cur ++) { - if ( (strcmp(stringlist[top][0],stringlist[cur][0]) == 0) && - (!(stringlist[top][0].isEmpty()) ) ){ - QString str = tr(QString().sprintf( \ - "Duplicate Hotkey defined %s\n No Duplicates allowed.", - (const char *)stringlist[cur][0] )); - QMessageBox::warning(this,tr("Duplicate Entries"),str); - return; - } - } + else { + stringlist[i++][0] = QString().sprintf("%s", + (const char *) start->current()->text(1)); } + ++(*start); + } + delete start; + + for ( top = 0; top < (i- 1) ; top++) { + for (cur = top + 1; cur < i; cur ++) { + if ( (strcmp(stringlist[top][0],stringlist[cur][0]) == 0) && + (!(stringlist[top][0].isEmpty()) ) ){ + QString str = tr(QString().sprintf( \ + "Duplicate Hotkey defined %s\n No Duplicates allowed.", + (const char *)stringlist[cur][0] )); + QMessageBox::warning(this,tr("Duplicate Entries"),str); + return; + } + } + } - start = new QListViewItemIterator(list_view); + start = new QListViewItemIterator(list_view); - while (start->current()) { - sql = QString().sprintf("UPDATE RDHOTKEYS SET KEY_VALUE = \"%s\" \ - WHERE KEY_LABEL = \"%s\" AND \ - STATION_NAME = \"%s\" AND \ + while (start->current()) { + sql = QString().sprintf("UPDATE RDHOTKEYS SET KEY_VALUE = \"%s\" \ + WHERE KEY_LABEL = \"%s\" AND \ + STATION_NAME = \"%s\" AND \ MODULE_NAME = \"%s\"", - (const char *)start->current()->text(1), - (const char *)start->current()->text(0), - (const char *)hotkey_conf, - (const char *)hotkey_module); - q=new RDSqlQuery(sql); - delete q; - ++(*start); - } - - delete start; - delete station_hotkeys; - done(0); + (const char *)start->current()->text(1), + (const char *)start->current()->text(0), + (const char *)hotkey_conf, + (const char *)hotkey_module); + q=new RDSqlQuery(sql); + delete q; + ++(*start); + } + + delete start; + delete station_hotkeys; + done(0); } void EditHotkeys::SetHotKey() { + QListViewItem *item=list_view->selectedItem(); + if (item==NULL) return; - QListViewItem *item=list_view->selectedItem(); - if (item==NULL) return; - - item->setText(1,hotkeystrokes); - keyupdated = true; + item->setText(1,hotkeystrokes); + keyupdated = true; } void EditHotkeys::clearAll_Hotkeys() { - switch(QMessageBox::warning(this,tr("Hotkeys Clear"), - "Are you sure - This will Clear All Hot Key Settings!", - QMessageBox::Yes,QMessageBox::No)) { - case QMessageBox::No: - case QMessageBox::NoButton: - return; - default: - break; - } + switch(QMessageBox::warning(this,tr("Hotkeys Clear"), + "Are you sure - This will Clear All Hot Key Settings!", + QMessageBox::Yes,QMessageBox::No)) { + case QMessageBox::No: + case QMessageBox::NoButton: + return; + default: + break; + } - QListViewItem *l = list_view->firstChild(); - while (l) { - l->setText(1,""); - l = l->nextSibling(); - } - keystroke->setText(""); - keystroke->setFocus(); - hotkeystrokes=QString(""); - keystrokecount=0; - keyupdated = true; + QListViewItem *l = list_view->firstChild(); + while (l) { + l->setText(1,""); + l = l->nextSibling(); + } + keystroke->setText(""); + keystroke->setFocus(); + hotkeystrokes=QString(""); + keystrokecount=0; + keyupdated = true; } void EditHotkeys::cancel() { - if (keyupdated) { - switch(QMessageBox::warning(this,tr("Hotkeys Updated"), - "Are you sure - All Hot Keys changes will be Lost!", - QMessageBox::Yes,QMessageBox::No)) { - case QMessageBox::No: - case QMessageBox::NoButton: - return; - default: - break; - } + if (keyupdated) { + switch(QMessageBox::warning(this,tr("Hotkeys Updated"), + "Are you sure - All Hot Keys changes will be Lost!", + QMessageBox::Yes,QMessageBox::No)) { + case QMessageBox::No: + case QMessageBox::NoButton: + return; + default: + break; } - close(); + } + close(); } void EditHotkeys::keyPressEvent (QKeyEvent *e) { - if ( (e->key() == Qt::Key_Backspace) || - (e->key() == Qt::Key_Delete) ) { - keystroke->setText(""); - keystroke->setFocus(); - hotkeystrokes=QString(""); - keystrokecount=0; - return; - } - - if (e->key() == Qt::Key_Alt) { - keystrokecount++; - AltKeyHit = true; - } + if ( (e->key() == Qt::Key_Backspace) || + (e->key() == Qt::Key_Delete) ) { + keystroke->setText(""); + keystroke->setFocus(); + hotkeystrokes=QString(""); + keystrokecount=0; + return; + } - if (e->key() == Qt::Key_Control) { - keystrokecount++; - CtrlKeyHit = true; - } + if (e->key() == Qt::Key_Alt) { + keystrokecount++; + AltKeyHit = true; + } + if (e->key() == Qt::Key_Control) { + keystrokecount++; + CtrlKeyHit = true; + } } void EditHotkeys::keyReleaseEvent (QKeyEvent *e) { - int keyhit = e->key(); - QString mystring=(*myhotkeylist).GetKeyCode(keyhit); - - if (mystring.length() == 0 ) { // should never happen unless shell got it... - keystroke->setFocus(); - keystroke->setText(""); - hotkeystrokes=QString(""); - keystrokecount = 0; - AltKeyHit = false; - CtrlKeyHit = false; - return; - } + int keyhit = e->key(); + QString mystring=(*myhotkeylist).GetKeyCode(keyhit); + + if (mystring.length() == 0 ) { // should never happen unless shell got it... + keystroke->setFocus(); + keystroke->setText(""); + hotkeystrokes=QString(""); + keystrokecount = 0; + AltKeyHit = false; + CtrlKeyHit = false; + return; + } - if ( (e->key() == Qt::Key_Backspace) || - (e->key() == Qt::Key_Space) || - (e->key() == Qt::Key_Delete) ) { - keystroke->setFocus(); - keystroke->setText(""); - hotkeystrokes=QString(""); - keystrokecount = 0; - return; - } + if ( (e->key() == Qt::Key_Backspace) || + (e->key() == Qt::Key_Space) || + (e->key() == Qt::Key_Delete) ) { + keystroke->setFocus(); + keystroke->setText(""); + hotkeystrokes=QString(""); + keystrokecount = 0; + return; + } - if (e->key() == Qt::Key_Shift) { - QWidget::keyReleaseEvent(e); - return; - } + if (e->key() == Qt::Key_Shift) { + QWidget::keyReleaseEvent(e); + return; + } + + if ( (e->key() == Qt::Key_Up) || (e->key() == Qt::Key_Left) || + (e->key() == Qt::Key_Right) || (e->key() == Qt::Key_Down) ) { + QWidget::keyReleaseEvent(e); + keystrokecount = 0; + hotkeystrokes = QString (""); + keystroke->setText(""); + return; + } - if ( (e->key() == Qt::Key_Up) || (e->key() == Qt::Key_Left) || - (e->key() == Qt::Key_Right) || (e->key() == Qt::Key_Down) ) { - QWidget::keyReleaseEvent(e); - keystrokecount = 0; - hotkeystrokes = QString (""); - keystroke->setText(""); - return; + if ( (e->key() == Qt::Key_Tab) || (e->key() == Qt::Key_Left) || + (e->key() == Qt::Key_Right) ){ + QWidget::keyReleaseEvent(e); + keystrokecount = 0; + hotkeystrokes = QString (""); + keystroke->setText(""); + return; + } + + if ((e->key() == Qt::Key_Alt) || + (e->key() == Qt::Key_Control)) { + if (keystrokecount != 0 ) hotkeystrokes = QString (""); + if (AltKeyHit) { + AltKeyHit = false; + if (keystrokecount > 0) keystrokecount--; } - - if ( (e->key() == Qt::Key_Tab) || (e->key() == Qt::Key_Left) || - (e->key() == Qt::Key_Right) ){ - QWidget::keyReleaseEvent(e); - keystrokecount = 0; - hotkeystrokes = QString (""); - keystroke->setText(""); - return; + if (CtrlKeyHit) { + CtrlKeyHit = false; + if (keystrokecount > 0) keystrokecount--; } - - if ((e->key() == Qt::Key_Alt) || - (e->key() == Qt::Key_Control)) { - if (keystrokecount != 0 ) hotkeystrokes = QString (""); - if (AltKeyHit) { - AltKeyHit = false; - if (keystrokecount > 0) keystrokecount--; - } - if (CtrlKeyHit) { - CtrlKeyHit = false; - if (keystrokecount > 0) keystrokecount--; - } - keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); - return; + keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); + return; + } + if (keystrokecount > 2) { + keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); + return; + } + + if (!e->isAutoRepeat()) { + if (keystrokecount == 0) + hotkeystrokes = QString (""); + if (AltKeyHit) { + hotkeystrokes = (*myhotkeylist).GetKeyCode(Qt::Key_Alt); + hotkeystrokes += QString(" + "); } - if (keystrokecount > 2) { - keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); - return; + if (CtrlKeyHit) { + if (AltKeyHit) { + hotkeystrokes += (*myhotkeylist).GetKeyCode(Qt::Key_Control); + hotkeystrokes += QString (" + "); + } + else { + hotkeystrokes = (*myhotkeylist).GetKeyCode(Qt::Key_Control); + hotkeystrokes += QString (" + "); + } } - if (!e->isAutoRepeat()) { - if (keystrokecount == 0) - hotkeystrokes = QString (""); - if (AltKeyHit) { - hotkeystrokes = (*myhotkeylist).GetKeyCode(Qt::Key_Alt); - hotkeystrokes += QString(" + "); - } - if (CtrlKeyHit) { - if (AltKeyHit) { - hotkeystrokes += (*myhotkeylist).GetKeyCode(Qt::Key_Control); - hotkeystrokes += QString (" + "); - } - else { - hotkeystrokes = (*myhotkeylist).GetKeyCode(Qt::Key_Control); - hotkeystrokes += QString (" + "); - } - } - - hotkeystrokes += mystring; - keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); - keystrokecount = 0; - return; - } + hotkeystrokes += mystring; + keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); + keystrokecount = 0; + return; + } } void EditHotkeys::RefreshList() { + station_hotkeys= new RDHotkeys(hotkey_conf,hotkey_module); - station_hotkeys= new RDHotkeys(hotkey_conf,hotkey_module); - - QString sql; - RDSqlQuery *q; - QListViewItem *l; - list_view->clear(); + QString sql; + RDSqlQuery *q; + QListViewItem *l; + list_view->clear(); - keyupdated = false; + keyupdated = false; - // Build Rows of List View I do this in reverse... + // Build Rows of List View I do this in reverse... - sql=QString().sprintf("select KEY_LABEL , KEY_VALUE from RDHOTKEYS \ - where STATION_NAME = \"%s\" AND \ - MODULE_NAME = \"%s\" \ + sql=QString().sprintf("select KEY_LABEL , KEY_VALUE from RDHOTKEYS \ + where STATION_NAME = \"%s\" AND \ + MODULE_NAME = \"%s\" \ ORDER BY KEY_ID DESC", - (const char *)hotkey_conf, - (const char *)hotkey_module); - - q=new RDSqlQuery(sql); - while(q->next()) { - l=new QListViewItem(list_view); - l->setText(0,q->value(0).toString()); - l->setText(1,q->value(1).toString()); - } - delete q; + (const char *)hotkey_conf, + (const char *)hotkey_module); + + q=new RDSqlQuery(sql); + while(q->next()) { + l=new QListViewItem(list_view); + l->setText(0,q->value(0).toString()); + l->setText(1,q->value(1).toString()); + } + delete q; } void EditHotkeys::Clone_RefreshList(const QString& clone_station) { - QString sql; - RDSqlQuery *q; - - QString tmp_hotkey_conf = QString().sprintf("%s", - (const char *)clone_station); - RDHotkeys *tmp_station_hotkeys= new RDHotkeys(tmp_hotkey_conf,hotkey_module); - keyupdated = true; - QListViewItem *l; - list_view->clear(); - - sql=QString().sprintf("select KEY_LABEL , KEY_VALUE from RDHOTKEYS \ - where STATION_NAME = \"%s\" AND \ - MODULE_NAME = \"%s\" \ + QString sql; + RDSqlQuery *q; + + QString tmp_hotkey_conf = QString().sprintf("%s", + (const char *)clone_station); + RDHotkeys *tmp_station_hotkeys= new RDHotkeys(tmp_hotkey_conf,hotkey_module); + keyupdated = true; + QListViewItem *l; + list_view->clear(); + + sql=QString().sprintf("select KEY_LABEL , KEY_VALUE from RDHOTKEYS \ + where STATION_NAME = \"%s\" AND \ + MODULE_NAME = \"%s\" \ ORDER BY ID DESC", - (const char *)tmp_hotkey_conf, - (const char *)hotkey_module); - - q=new RDSqlQuery(sql); - while(q->next()) { - - l=new QListViewItem(list_view); - l->setText(0,q->value(0).toString()); - l->setText(1,q->value(1).toString()); - } - delete q; - hotkeystrokes = QString (""); - keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); - delete tmp_station_hotkeys; + (const char *)tmp_hotkey_conf, + (const char *)hotkey_module); + + q=new RDSqlQuery(sql); + while(q->next()) { + l=new QListViewItem(list_view); + l->setText(0,q->value(0).toString()); + l->setText(1,q->value(1).toString()); + } + delete q; + hotkeystrokes = QString (""); + keystroke->setText(QString().sprintf("%s",(const char *)hotkeystrokes)); + delete tmp_station_hotkeys; } void EditHotkeys::showCurrentKey() { - QListViewItem *item=list_view->selectedItem(); - if (item==NULL) return; - keystroke->setText((const char *)item->text(1)); - keystroke->displayText(); - hotkeystrokes=QString((const char *)item->text(1)); - return; + QListViewItem *item=list_view->selectedItem(); + if (item==NULL) return; + keystroke->setText((const char *)item->text(1)); + keystroke->displayText(); + hotkeystrokes=QString((const char *)item->text(1)); + return; } void EditHotkeys::clearCurrentItem() { - keystrokecount=0; - keystroke->setText(""); - keystroke->setFocus(); - hotkeystrokes=QString(""); - return; + keystrokecount=0; + keystroke->setText(""); + keystroke->setFocus(); + hotkeystrokes=QString(""); + return; } void EditHotkeys::SetButtonClicked() { - - QListViewItem *item=list_view->selectedItem(); - if (item==NULL) { - QMessageBox::warning(this,tr("No Items Selected"), + QListViewItem *item=list_view->selectedItem(); + if (item==NULL) { + QMessageBox::warning(this,tr("No Items Selected"), tr("Please Select an Item From the List")); - return; - } - SetHotKey(); return; + } + SetHotKey(); + return; } diff --git a/rdadmin/edit_hotkeys.h b/rdadmin/edit_hotkeys.h index 94113c3f8..d46228d9a 100644 --- a/rdadmin/edit_hotkeys.h +++ b/rdadmin/edit_hotkeys.h @@ -2,6 +2,8 @@ // // Edit the Hot Keys Configuration for a Workstation // +// (C) Copyright 2002-2004,2016 Fred Gleason +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -32,53 +34,54 @@ #include #include - class EditHotkeys : public QDialog { - Q_OBJECT -public: - EditHotkeys(const QString &station,const QString &module,QWidget *parent,const char *name); - ~EditHotkeys(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; -public slots: - void SetHotKey( ); - void showCurrentKey( ); - void RefreshList( ); - void Clone_RefreshList(const QString &); - void SetButtonClicked( ); - void clearCurrentItem( ); - void clearAll_Hotkeys( ); -private slots: - void save(); - void cancel(); -protected: - void keyReleaseEvent(QKeyEvent *e); - void keyPressEvent(QKeyEvent *e); - QLineEdit *keystroke; -private: - void SetRow(const QString ¶m,QString value) const; - RDHotkeys *station_hotkeys; - QListView *list_view; - QString hotkeystrokes; - QString hotkey_conf; - QString hotkey_module; + Q_OBJECT + public: + EditHotkeys(const QString &station,const QString &module,QWidget *parent); + ~EditHotkeys(); + QSize sizeHint() const; + QSizePolicy sizePolicy() const; - QLabel *clone_from_host_label; - QComboBox *clone_from_host_box; - QPushButton *set_button; - QPushButton *clear_button; - QPushButton *show_original_button; - QPushButton *clear_all_button; - QPushButton *save_button; - QPushButton *cancel_button; - int keystrokecount; - bool keyupdated; - bool AltKeyHit ; - bool CtrlKeyHit; - RDHotKeyList *myhotkeylist ; - int current_station_clone_item; -}; + public slots: + void SetHotKey( ); + void showCurrentKey( ); + void RefreshList( ); + void Clone_RefreshList(const QString &); + void SetButtonClicked( ); + void clearCurrentItem( ); + void clearAll_Hotkeys( ); -#endif + private slots: + void save(); + void cancel(); + + protected: + void keyReleaseEvent(QKeyEvent *e); + void keyPressEvent(QKeyEvent *e); + QLineEdit *keystroke; + + private: + void SetRow(const QString ¶m,QString value) const; + RDHotkeys *station_hotkeys; + QListView *list_view; + QString hotkeystrokes; + QString hotkey_conf; + QString hotkey_module; + QLabel *clone_from_host_label; + QComboBox *clone_from_host_box; + QPushButton *set_button; + QPushButton *clear_button; + QPushButton *show_original_button; + QPushButton *clear_all_button; + QPushButton *save_button; + QPushButton *cancel_button; + int keystrokecount; + bool keyupdated; + bool AltKeyHit ; + bool CtrlKeyHit; + RDHotKeyList *myhotkeylist ; + int current_station_clone_item; +}; +#endif // EDIT_HOTKEYS_H diff --git a/rdadmin/edit_jack.cpp b/rdadmin/edit_jack.cpp index eb81d8234..1eb7413ab 100644 --- a/rdadmin/edit_jack.cpp +++ b/rdadmin/edit_jack.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Jack Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_jack.cpp,v 1.1.4.4 2012/11/15 19:27:13 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,9 +41,8 @@ #include #include - -EditJack::EditJack(RDStation *station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditJack::EditJack(RDStation *station,QWidget *parent) + : QDialog(parent,"",true) { QString sql; @@ -142,7 +139,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent,const char *name) // // Ok Button // - edit_ok_button=new QPushButton(this,"edit_ok_button"); + edit_ok_button=new QPushButton(this); edit_ok_button->setDefault(true); edit_ok_button->setFont(font); edit_ok_button->setText(tr("&OK")); @@ -151,7 +148,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent,const char *name) // // Cancel Button // - edit_cancel_button=new QPushButton(this,"edit_cancel_button"); + edit_cancel_button=new QPushButton(this); edit_cancel_button->setFont(font); edit_cancel_button->setText(tr("&Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdadmin/edit_jack.h b/rdadmin/edit_jack.h index bff8bfc36..8a3d7efb2 100644 --- a/rdadmin/edit_jack.h +++ b/rdadmin/edit_jack.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Jack Configuration // -// (C) Copyright 2002-2011 Fred Gleason -// -// $Id: edit_jack.h,v 1.2.4.4 2012/11/15 19:27:13 cvs Exp $ +// (C) Copyright 2002-2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class EditJack : public QDialog { Q_OBJECT public: - EditJack(RDStation *station,QWidget *parent=0,const char *name=0); + EditJack(RDStation *station,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_jack_client.cpp b/rdadmin/edit_jack_client.cpp index 1d7398ae4..0ff1775c8 100644 --- a/rdadmin/edit_jack_client.cpp +++ b/rdadmin/edit_jack_client.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Jack Client Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: edit_jack_client.cpp,v 1.1.2.1 2012/11/14 02:24:23 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,9 +24,8 @@ #include #include -EditJackClient::EditJackClient(RDStation *station, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditJackClient::EditJackClient(RDStation *station,QWidget *parent) + : QDialog(parent,"",true) { QString sql; @@ -73,7 +70,7 @@ EditJackClient::EditJackClient(RDStation *station, // // Ok Button // - edit_ok_button=new QPushButton(this,"edit_ok_button"); + edit_ok_button=new QPushButton(this); edit_ok_button->setDefault(true); edit_ok_button->setFont(font); edit_ok_button->setText(tr("&OK")); @@ -82,7 +79,7 @@ EditJackClient::EditJackClient(RDStation *station, // // Cancel Button // - edit_cancel_button=new QPushButton(this,"edit_cancel_button"); + edit_cancel_button=new QPushButton(this); edit_cancel_button->setFont(font); edit_cancel_button->setText(tr("&Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdadmin/edit_jack_client.h b/rdadmin/edit_jack_client.h index 251e2efca..33d254c3d 100644 --- a/rdadmin/edit_jack_client.h +++ b/rdadmin/edit_jack_client.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Jack Client Configuration // -// (C) Copyright 2012 Fred Gleason -// -// $Id: edit_jack_client.h,v 1.1.2.1 2012/11/14 02:24:23 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class EditJackClient : public QDialog { Q_OBJECT public: - EditJackClient(RDStation *station,QWidget *parent=0,const char *name=0); + EditJackClient(RDStation *station,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_livewiregpio.cpp b/rdadmin/edit_livewiregpio.cpp index 8c7d0523d..4d6eb6719 100644 --- a/rdadmin/edit_livewiregpio.cpp +++ b/rdadmin/edit_livewiregpio.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Livewire GPIO Slot Association // -// (C) Copyright 2013 Fred Gleason -// -// $Id: edit_livewiregpio.cpp,v 1.1.2.3 2013/03/06 13:28:59 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include EditLiveWireGpio::EditLiveWireGpio(int slot,int *source,QHostAddress *addr, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { edit_slot=slot; edit_source=source; @@ -87,7 +85,7 @@ EditLiveWireGpio::EditLiveWireGpio(int slot,int *source,QHostAddress *addr, // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -97,7 +95,7 @@ EditLiveWireGpio::EditLiveWireGpio(int slot,int *source,QHostAddress *addr, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_livewiregpio.h b/rdadmin/edit_livewiregpio.h index 858890f34..f96ded187 100644 --- a/rdadmin/edit_livewiregpio.h +++ b/rdadmin/edit_livewiregpio.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Livewire GPIO Slot Association // -// (C) Copyright 2013 Fred Gleason -// -// $Id: edit_livewiregpio.h,v 1.1.2.2 2013/03/05 23:59:07 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,13 +28,11 @@ #include - class EditLiveWireGpio : public QDialog { Q_OBJECT public: - EditLiveWireGpio(int slot,int *source,QHostAddress *addr, - QWidget *parent=0,const char *name=0); + EditLiveWireGpio(int slot,int *source,QHostAddress *addr,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index 8cbe1eb20..f771cf50d 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Matrix // -// (C) Copyright 2002-2012 Fred Gleason -// -// $Id: edit_matrix.cpp,v 1.36.6.5.2.1 2014/06/24 18:27:05 cvs Exp $ +// (C) Copyright 2002-2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ #include "list_vguest_resources.h" #include "list_sas_resources.h" -EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent,const char *name) - : QDialog(parent,name) +EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent) + : QDialog(parent) { QString str; diff --git a/rdadmin/edit_matrix.h b/rdadmin/edit_matrix.h index 10f79c5e1..17fe63071 100644 --- a/rdadmin/edit_matrix.h +++ b/rdadmin/edit_matrix.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Matrix // -// (C) Copyright 2002-2012 Fred Gleason -// -// $Id: edit_matrix.h,v 1.17.6.3 2013/02/21 02:46:25 cvs Exp $ +// (C) Copyright 2002-2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,7 +36,7 @@ class EditMatrix : public QDialog { Q_OBJECT public: - EditMatrix(RDMatrix *matrix,QWidget *parent=0,const char *name=0); + EditMatrix(RDMatrix *matrix,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_node.cpp b/rdadmin/edit_node.cpp index 7f05cff27..ad6b8fa97 100644 --- a/rdadmin/edit_node.cpp +++ b/rdadmin/edit_node.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_node.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,9 +30,8 @@ #include #include - -EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) + : QDialog(parent,"",true) { edit_id=id; edit_matrix=matrix; @@ -60,10 +57,10 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Node Hostname // - edit_hostname_edit=new QLineEdit(this,"edit_hostname_edit"); + edit_hostname_edit=new QLineEdit(this); edit_hostname_edit->setGeometry(90,10,190,20); QLabel *label= - new QLabel(edit_hostname_edit,tr("Hostname: "),this,"edit_hostname_label"); + new QLabel(edit_hostname_edit,tr("Hostname: "),this); label->setGeometry(10,10,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -71,10 +68,10 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Node TCP Port // - edit_tcpport_spin=new QSpinBox(this,"edit_tcpport_spin"); + edit_tcpport_spin=new QSpinBox(this); edit_tcpport_spin->setGeometry(335,10,sizeHint().width()-345,20); edit_tcpport_spin->setRange(0,0xFFFF); - label=new QLabel(edit_tcpport_spin,tr("Port: "),this,"edit_tcpport_label"); + label=new QLabel(edit_tcpport_spin,tr("Port: "),this); label->setGeometry(290,10,45,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -82,10 +79,9 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Node Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(90,32,sizeHint().width()-100,20); - label=new QLabel(edit_description_edit,tr("Description: "), - this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description: "),this); label->setGeometry(10,32,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -93,12 +89,12 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Base Output // - edit_output_spin=new QSpinBox(this,"edit_output_spin"); + edit_output_spin=new QSpinBox(this); edit_output_spin->setGeometry(90,54,60,20); edit_output_spin->setRange(0,0x7FFF); edit_output_spin->setSpecialValueText(tr("None")); label= - new QLabel(edit_output_spin,tr("First Output: "),this,"edit_output_label"); + new QLabel(edit_output_spin,tr("First Output: "),this); label->setGeometry(10,54,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -106,14 +102,14 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Node Password // - edit_password_edit=new QLineEdit(this,"edit_password_edit"); + edit_password_edit=new QLineEdit(this); edit_password_edit->setGeometry(245,54,90,20); edit_password_edit->setEchoMode(QLineEdit::Password); edit_password_edit->setText("********"); connect(edit_password_edit,SIGNAL(textChanged(const QString &)), this,SLOT(passwordChangedData(const QString &))); label= - new QLabel(edit_password_edit,tr("Password: "),this,"edit_password_label"); + new QLabel(edit_password_edit,tr("Password: "),this); label->setGeometry(160,54,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -121,7 +117,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // View Node Info Button // - QPushButton *button=new QPushButton(this,"cancel_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&View Node\nInfo")); @@ -130,7 +126,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -140,7 +136,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_node.h b/rdadmin/edit_node.h index 8d712c83e..acb078a4a 100644 --- a/rdadmin/edit_node.h +++ b/rdadmin/edit_node.h @@ -2,9 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_node.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include - class EditNode : public QDialog { Q_OBJECT public: - EditNode(int *id,RDMatrix *matrix,QWidget *parent=0,const char *name=0); + EditNode(int *id,RDMatrix *matrix,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_now_next.cpp b/rdadmin/edit_now_next.cpp index 0338cffa1..1207d09a4 100644 --- a/rdadmin/edit_now_next.cpp +++ b/rdadmin/edit_now_next.cpp @@ -2,9 +2,7 @@ // // Edit the Now & Next Configuration for a Rivendell Workstation. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_now_next.cpp,v 1.10.2.1 2012/11/26 20:19:38 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,9 +30,8 @@ #include #include - -EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -65,21 +62,21 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); QIntValidator *int_validator=new QIntValidator(1,999999,this); // // Button Mappers // - QSignalMapper *now_mapper=new QSignalMapper(this,"nowcart_mapper"); + QSignalMapper *now_mapper=new QSignalMapper(this); connect(now_mapper,SIGNAL(mapped(int)),this,SLOT(editNowcartData(int))); - QSignalMapper *next_mapper=new QSignalMapper(this,"nextcart_mapper"); + QSignalMapper *next_mapper=new QSignalMapper(this); connect(next_mapper,SIGNAL(mapped(int)),this,SLOT(editNextcartData(int))); // // Master Log Label // - QLabel *label=new QLabel(tr("Master Log"),this,"masterlog_label"); + QLabel *label=new QLabel(tr("Master Log"),this); label->setGeometry(10,7,100,19); label->setFont(section_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -87,10 +84,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Master Log UDP Address // - nownext_address_edit[0]=new QLineEdit(this,"nownext_address_edit[0]"); + nownext_address_edit[0]=new QLineEdit(this); nownext_address_edit[0]->setGeometry(135,33,120,19); - label=new QLabel(nownext_address_edit[0],tr("IP Address:"),this, - "nownext_address_label"); + label=new QLabel(nownext_address_edit[0],tr("IP Address:"),this); label->setGeometry(10,33,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -98,10 +94,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Master Log UDP Port // - nownext_port_spin[0]=new QSpinBox(this,"nownext_port_spin[0]"); + nownext_port_spin[0]=new QSpinBox(this); nownext_port_spin[0]->setGeometry(375,33,60,19); nownext_port_spin[0]->setRange(0,65535); - label=new QLabel(nownext_port_spin[0],tr("UDP Port:"),this,"nownext_port_label"); + label=new QLabel(nownext_port_spin[0],tr("UDP Port:"),this); label->setGeometry(270,33,100,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -109,11 +105,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Master Log UDP String // - nownext_string_edit[0]=new QLineEdit(this,"nownext_string_edit[0]"); + nownext_string_edit[0]=new QLineEdit(this); nownext_string_edit[0]->setGeometry(135,55,sizeHint().width()-145,19); - label=new QLabel(nownext_string_edit[0], - tr("UDP String:"),this, - "nownext_string_label"); + label=new QLabel(nownext_string_edit[0],tr("UDP String:"),this); label->setGeometry(10,55,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -121,12 +115,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Master Log RML // - nownext_rml_edit[0]=new QLineEdit(this,"nownext_rml_edit[0]"); + nownext_rml_edit[0]=new QLineEdit(this); nownext_rml_edit[0]->setGeometry(135,77,sizeHint().width()-145,19); nownext_rml_edit[0]->setValidator(validator); - label=new QLabel(nownext_rml_edit[0], - tr("RML:"),this, - "nownext_rml_label"); + label=new QLabel(nownext_rml_edit[0],tr("RML:"),this); label->setGeometry(10,77,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -134,11 +126,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Main Log Default Now Cart // - nownext_nowcart_edit[0]=new QLineEdit(this,"nownext_nowcart_edit[0]"); + nownext_nowcart_edit[0]=new QLineEdit(this); nownext_nowcart_edit[0]->setGeometry(135,104,60,19); nownext_nowcart_edit[0]->setValidator(int_validator); - label=new QLabel(nownext_nowcart_edit[0],tr("Default Now Cart:"),this, - "nownext_nowcart_label"); + label=new QLabel(nownext_nowcart_edit[0],tr("Default Now Cart:"),this); label->setGeometry(10,104,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -152,11 +143,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Main Log Default Next Cart // - nownext_nextcart_edit[0]=new QLineEdit(this,"nownext_nextcart_edit[0]"); + nownext_nextcart_edit[0]=new QLineEdit(this); nownext_nextcart_edit[0]->setGeometry(135,136,60,19); nownext_nextcart_edit[0]->setValidator(int_validator); - label=new QLabel(nownext_nextcart_edit[0],tr("Default Next Cart:"),this, - "nownext_nextcart_label"); + label=new QLabel(nownext_nextcart_edit[0],tr("Default Next Cart:"),this); label->setGeometry(10,136,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -170,7 +160,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 1 Label // - label=new QLabel(tr("Aux Log 1"),this,"masterlog_label"); + label=new QLabel(tr("Aux Log 1"),this); label->setGeometry(10,175,100,19); label->setFont(section_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -178,10 +168,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 1 UDP Address // - nownext_address_edit[1]=new QLineEdit(this,"nownext_address_edit[1]"); + nownext_address_edit[1]=new QLineEdit(this); nownext_address_edit[1]->setGeometry(135,201,120,19); - label=new QLabel(nownext_address_edit[1],tr("IP Address:"),this, - "nownext_address_label"); + label=new QLabel(nownext_address_edit[1],tr("IP Address:"),this); label->setGeometry(10,201,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -189,11 +178,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 1 UDP Port // - nownext_port_spin[1]=new QSpinBox(this,"nownext_port_spin[1]"); + nownext_port_spin[1]=new QSpinBox(this); nownext_port_spin[1]->setGeometry(375,201,60,19); nownext_port_spin[1]->setRange(0,65535); - label=new QLabel(nownext_port_spin[1],tr("UDP Port:"), - this,"nownext_port_label"); + label=new QLabel(nownext_port_spin[1],tr("UDP Port:"),this); label->setGeometry(270,201,100,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -201,10 +189,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 1 UDP String // - nownext_string_edit[1]=new QLineEdit(this,"nownext_string_edit[1]"); + nownext_string_edit[1]=new QLineEdit(this); nownext_string_edit[1]->setGeometry(135,223,sizeHint().width()-145,19); - label=new QLabel(nownext_string_edit[1],tr("UDP String:"),this, - "nownext_string_label"); + label=new QLabel(nownext_string_edit[1],tr("UDP String:"),this); label->setGeometry(10,223,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -212,12 +199,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 1 RML // - nownext_rml_edit[1]=new QLineEdit(this,"nownext_rml_edit[1]"); + nownext_rml_edit[1]=new QLineEdit(this); nownext_rml_edit[1]->setGeometry(135,245,sizeHint().width()-145,19); nownext_rml_edit[1]->setValidator(validator); - label=new QLabel(nownext_rml_edit[1], - tr("RML:"),this, - "nownext_rml_label"); + label=new QLabel(nownext_rml_edit[1],tr("RML:"),this); label->setGeometry(10,245,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -225,11 +210,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux 1 Log Default Now Cart // - nownext_nowcart_edit[1]=new QLineEdit(this,"nownext_nowcart_edit[1]"); + nownext_nowcart_edit[1]=new QLineEdit(this); nownext_nowcart_edit[1]->setGeometry(135,272,60,19); nownext_nowcart_edit[1]->setValidator(int_validator); - label=new QLabel(nownext_nowcart_edit[1],tr("Default Now Cart:"),this, - "nownext_nowcart_label"); + label=new QLabel(nownext_nowcart_edit[1],tr("Default Now Cart:"),this); label->setGeometry(10,272,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -243,11 +227,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux 1 Log Default Next Cart // - nownext_nextcart_edit[1]=new QLineEdit(this,"nownext_nextcart_edit[1]"); + nownext_nextcart_edit[1]=new QLineEdit(this); nownext_nextcart_edit[1]->setGeometry(135,304,60,19); nownext_nextcart_edit[1]->setValidator(int_validator); - label=new QLabel(nownext_nextcart_edit[1],tr("Default Next Cart:"),this, - "nownext_nextcart_label"); + label=new QLabel(nownext_nextcart_edit[1],tr("Default Next Cart:"),this); label->setGeometry(10,304,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -261,7 +244,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 2 Label // - label=new QLabel(tr("Aux Log 2"),this,"masterlog_label"); + label=new QLabel(tr("Aux Log 2"),this); label->setGeometry(10,343,100,19); label->setFont(section_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -269,10 +252,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 2 UDP Address // - nownext_address_edit[2]=new QLineEdit(this,"nownext_address_edit[2]"); + nownext_address_edit[2]=new QLineEdit(this); nownext_address_edit[2]->setGeometry(135,369,120,19); - label=new QLabel(nownext_address_edit[2],tr("IP Address:"),this, - "nownext_address_label"); + label=new QLabel(nownext_address_edit[2],tr("IP Address:"),this); label->setGeometry(10,369,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -280,11 +262,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 2 UDP Port // - nownext_port_spin[2]=new QSpinBox(this,"nownext_port_spin[2]"); + nownext_port_spin[2]=new QSpinBox(this); nownext_port_spin[2]->setGeometry(375,369,60,19); nownext_port_spin[2]->setRange(0,65535); - label=new QLabel(nownext_port_spin[2],tr("UDP Port:"), - this,"nownext_port_label"); + label=new QLabel(nownext_port_spin[2],tr("UDP Port:"),this); label->setGeometry(270,369,100,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -292,10 +273,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 2 UDP String // - nownext_string_edit[2]=new QLineEdit(this,"nownext_string_edit[2]"); + nownext_string_edit[2]=new QLineEdit(this); nownext_string_edit[2]->setGeometry(135,391,sizeHint().width()-145,19); - label=new QLabel(nownext_string_edit[2],tr("UDP String:"),this, - "nownext_string_label"); + label=new QLabel(nownext_string_edit[2],tr("UDP String:"),this); label->setGeometry(10,391,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -303,12 +283,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux Log 2 RML // - nownext_rml_edit[2]=new QLineEdit(this,"nownext_rml_edit[2]"); + nownext_rml_edit[2]=new QLineEdit(this); nownext_rml_edit[2]->setGeometry(135,413,sizeHint().width()-145,19); nownext_rml_edit[2]->setValidator(validator); - label=new QLabel(nownext_rml_edit[2], - tr("RML:"),this, - "nownext_rml_label"); + label=new QLabel(nownext_rml_edit[2],tr("RML:"),this); label->setGeometry(10,413,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -316,11 +294,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux 1 Log Default Now Cart // - nownext_nowcart_edit[2]=new QLineEdit(this,"nownext_nowcart_edit[2]"); + nownext_nowcart_edit[2]=new QLineEdit(this); nownext_nowcart_edit[2]->setGeometry(135,440,60,19); nownext_nowcart_edit[2]->setValidator(int_validator); - label=new QLabel(nownext_nowcart_edit[2],tr("Default Now Cart:"),this, - "nownext_nowcart_label"); + label=new QLabel(nownext_nowcart_edit[2],tr("Default Now Cart:"),this); label->setGeometry(10,440,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -334,11 +311,10 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Aux 1 Log Default Next Cart // - nownext_nextcart_edit[2]=new QLineEdit(this,"nownext_nextcart_edit[2]"); + nownext_nextcart_edit[2]=new QLineEdit(this); nownext_nextcart_edit[2]->setGeometry(135,472,60,19); nownext_nextcart_edit[2]->setValidator(int_validator); - label=new QLabel(nownext_nextcart_edit[2],tr("Default Next Cart:"),this, - "nownext_nextcart_label"); + label=new QLabel(nownext_nextcart_edit[2],tr("Default Next Cart:"),this); label->setGeometry(10,472,120,19); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -365,9 +341,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) this, SLOT(pluginDoubleClickedData(QListViewItem *,const QPoint &,int))); - label=new QLabel(nownext_plugin_list, - tr("Loadable Modules:"),this, - "nownext_plugins_label"); + label=new QLabel(nownext_plugin_list,tr("Loadable Modules:"),this); label->setGeometry(10,518,sizeHint().width()-20,19); label->setFont(section_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -391,7 +365,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -401,9 +375,9 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); - cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + QPushButton *cancel_button=new QPushButton(this); + cancel_button-> + setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdadmin/edit_now_next.h b/rdadmin/edit_now_next.h index ecfce40fd..bb09f610c 100644 --- a/rdadmin/edit_now_next.h +++ b/rdadmin/edit_now_next.h @@ -2,9 +2,7 @@ // // Edit the Now & Next Configuration for a Rivendell Workstation // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_now_next.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,12 +32,11 @@ #include #include - class EditNowNext : public QDialog { Q_OBJECT public: - EditNowNext(RDAirPlayConf *conf,QWidget *parent=0,const char *name=0); + EditNowNext(RDAirPlayConf *conf,QWidget *parent=0); ~EditNowNext(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_nownextplugin.cpp b/rdadmin/edit_nownextplugin.cpp index 61b7c7425..8d8b7dd45 100644 --- a/rdadmin/edit_nownextplugin.cpp +++ b/rdadmin/edit_nownextplugin.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Now & Next Plugin Configuration // -// (C) Copyright 2008 Fred Gleason -// -// $Id: edit_nownextplugin.cpp,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,8 +30,8 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { plugin_path=path; plugin_arg=arg; @@ -85,7 +83,7 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -95,7 +93,7 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_nownextplugin.h b/rdadmin/edit_nownextplugin.h index 989bc26f6..f032b506b 100644 --- a/rdadmin/edit_nownextplugin.h +++ b/rdadmin/edit_nownextplugin.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Now & Next Plugin Configuration // -// (C) Copyright 2008 Fred Gleason -// -// $Id: edit_nownextplugin.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,13 +24,11 @@ #include #include - class EditNowNextPlugin : public QDialog { Q_OBJECT public: - EditNowNextPlugin(QString *path,QString *arg, - QWidget *parent=0,const char *name=0); + EditNowNextPlugin(QString *path,QString *arg,QWidget *parent=0); ~EditNowNextPlugin(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index da3b22544..511e7cd0a 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -2,9 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_rdairplay.cpp,v 1.53.6.9 2014/02/11 23:46:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,8 +44,8 @@ #include EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -811,7 +809,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(small_font); @@ -821,7 +819,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(small_font); button->setText(tr("&Cancel")); @@ -1007,8 +1005,7 @@ void EditRDAirPlay::selectData() { QString logname=air_startlog_edit->text(); - RDListLogs *ll=new RDListLogs(&logname,air_conf->station(),this, - "log",admin_user); + RDListLogs *ll=new RDListLogs(&logname,air_conf->station(),this,admin_user); if(ll->exec()==0) { air_startlog_edit->setText(logname); } @@ -1018,7 +1015,7 @@ void EditRDAirPlay::selectData() void EditRDAirPlay::nownextData() { - EditNowNext *edit=new EditNowNext(air_conf,this,"edit"); + EditNowNext *edit=new EditNowNext(air_conf,this); edit->exec(); delete edit; } @@ -1026,9 +1023,8 @@ void EditRDAirPlay::nownextData() void EditRDAirPlay::editHotKeys() { QString module_name = QString("airplay"); - EditHotkeys *edit_hotkeys=new EditHotkeys(air_conf->station(), - (const char *)module_name, - this,"hotkeys"); + EditHotkeys *edit_hotkeys= + new EditHotkeys(air_conf->station(),(const char *)module_name,this); edit_hotkeys->exec(); delete edit_hotkeys; } diff --git a/rdadmin/edit_rdairplay.h b/rdadmin/edit_rdairplay.h index e228fe4a0..004fc6ecb 100644 --- a/rdadmin/edit_rdairplay.h +++ b/rdadmin/edit_rdairplay.h @@ -2,9 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: edit_rdairplay.h,v 1.29.6.5 2014/02/10 20:45:10 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -48,8 +46,7 @@ class EditRDAirPlay : public QDialog { Q_OBJECT public: - EditRDAirPlay(RDStation *station,RDStation *cae_station, - QWidget *parent=0,const char *name=0); + EditRDAirPlay(RDStation *station,RDStation *cae_station,QWidget *parent=0); ~EditRDAirPlay(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_rdpanel.cpp b/rdadmin/edit_rdpanel.cpp index 65c6484e5..929c2d254 100644 --- a/rdadmin/edit_rdpanel.cpp +++ b/rdadmin/edit_rdpanel.cpp @@ -2,9 +2,7 @@ // // Edit an RDPanel Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_rdpanel.cpp,v 1.9.8.2 2013/12/23 18:35:15 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -73,7 +71,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Dialog Name @@ -83,18 +81,18 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Channel Assignments Section // - QLabel *label=new QLabel(tr("Channel Assignments"),this,"globals_label"); + QLabel *label=new QLabel(tr("Channel Assignments"),this); label->setFont(big_font); label->setGeometry(10,10,200,16); // // Sound Panel First Play Output // - label=new QLabel(tr("SoundPanel First Play Output"),this,"globals_label"); + label=new QLabel(tr("SoundPanel First Play Output"),this); label->setFont(small_font); // label->setGeometry(395,32,300,16); label->setGeometry(20,32,300,16); - air_card_sel[0]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[0]=new RDCardSelector(this); air_card_sel[0]->setGeometry(15,50,120,117); air_start_rml_edit[0]=new QLineEdit(this); air_start_rml_edit[0]->setGeometry(205,50,160,19); @@ -112,10 +110,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Sound Panel Second Play Output // - label=new QLabel(tr("SoundPanel Second Play Output"),this,"globals_label"); + label=new QLabel(tr("SoundPanel Second Play Output"),this); label->setFont(small_font); label->setGeometry(20,100,300,16); - air_card_sel[1]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[1]=new RDCardSelector(this); air_card_sel[1]->setGeometry(15,118,120,117); air_start_rml_edit[1]=new QLineEdit(this); air_start_rml_edit[1]->setGeometry(205,118,160,19); @@ -133,10 +131,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Sound Panel Third Play Output // - label=new QLabel(tr("SoundPanel Third Play Output"),this,"globals_label"); + label=new QLabel(tr("SoundPanel Third Play Output"),this); label->setFont(small_font); label->setGeometry(20,168,300,16); - air_card_sel[2]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[2]=new RDCardSelector(this); air_card_sel[2]->setGeometry(15,186,120,117); air_start_rml_edit[2]=new QLineEdit(this); air_start_rml_edit[2]->setGeometry(205,186,160,19); @@ -154,10 +152,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Sound Panel Fourth Play Output // - label=new QLabel(tr("SoundPanel Fourth Play Output"),this,"globals_label"); + label=new QLabel(tr("SoundPanel Fourth Play Output"),this); label->setFont(small_font); label->setGeometry(20,236,300,16); - air_card_sel[3]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[3]=new RDCardSelector(this); air_card_sel[3]->setGeometry(15,254,120,117); air_start_rml_edit[3]=new QLineEdit(this); air_start_rml_edit[3]->setGeometry(205,254,160,19); @@ -175,11 +173,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Sound Panel Fifth Play Output // - label=new QLabel(tr("SoundPanel Fifth and Later Play Output"), - this,"globals_label"); + label=new QLabel(tr("SoundPanel Fifth and Later Play Output"),this); label->setFont(small_font); label->setGeometry(20,304,300,16); - air_card_sel[4]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[4]=new RDCardSelector(this); air_card_sel[4]->setGeometry(15,322,120,117); air_start_rml_edit[4]=new QLineEdit(this); air_start_rml_edit[4]->setGeometry(205,322,160,19); @@ -197,10 +194,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Sound Panel Cue Play Output // - label=new QLabel(tr("SoundPanel Cue Output"),this,"globals_label"); + label=new QLabel(tr("SoundPanel Cue Output"),this); label->setFont(small_font); label->setGeometry(20,372,300,16); - air_card_sel[5]=new RDCardSelector(this,"air_card5_sel"); + air_card_sel[5]=new RDCardSelector(this); air_card_sel[5]->setGeometry(15,390,120,117); air_start_rml_edit[5]=new QLineEdit(this); air_start_rml_edit[5]->setGeometry(205,390,160,19); @@ -218,27 +215,26 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Display Settings Section // - label=new QLabel(tr("Display Settings"),this,"globals_label"); + label=new QLabel(tr("Display Settings"),this); label->setFont(big_font); label->setGeometry(20,438,200,16); // // Skin Path // - air_skin_edit=new QLineEdit(this,"air_skin_edit"); + air_skin_edit=new QLineEdit(this); air_skin_edit->setGeometry(135,460,180,20); - label=new QLabel(air_skin_edit,tr("Background Image:"), - this,"air_skin_label"); + label=new QLabel(air_skin_edit,tr("Background Image:"),this); label->setGeometry(10,460,115,20); label->setAlignment(AlignRight|AlignVCenter); - QPushButton *button=new QPushButton(tr("Select"),this,"skin_select_button"); + QPushButton *button=new QPushButton(tr("Select"),this); button->setGeometry(320,458,50,25); connect(button,SIGNAL(clicked()),this,SLOT(selectSkinData())); // // Sound Panel Section // - label=new QLabel(tr("Sound Panel Settings"),this,"globals_label"); + label=new QLabel(tr("Sound Panel Settings"),this); label->setFont(big_font); // label->setGeometry(430,179,200,16); label->setGeometry(430,10,200,16); @@ -246,81 +242,74 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // # of Station Panels // - air_station_box=new QSpinBox(this,"air_station_box"); + air_station_box=new QSpinBox(this); air_station_box->setGeometry(510,35,50,20); air_station_box->setRange(0,MAX_PANELS); air_station_box->setSpecialValueText(tr("None")); - air_station_label=new QLabel(air_station_box,tr("Host Panels:"), - this,"air_station_label"); + air_station_label=new QLabel(air_station_box,tr("Host Panels:"),this); air_station_label->setGeometry(405,35,100,20); air_station_label->setAlignment(AlignRight|AlignVCenter); // // # of User Panels // - air_user_box=new QSpinBox(this,"air_user_box"); + air_user_box=new QSpinBox(this); air_user_box->setGeometry(510,57,50,20); air_user_box->setRange(0,MAX_PANELS); air_user_box->setSpecialValueText(tr("None")); - air_user_label=new QLabel(air_user_box,tr("User Panels:"), - this,"air_user_label"); + air_user_label=new QLabel(air_user_box,tr("User Panels:"),this); air_user_label->setGeometry(405,57,100,20); air_user_label->setAlignment(AlignRight|AlignVCenter); // // Flash Active Button // - air_flash_box=new QCheckBox(this,"air_flash_box"); + air_flash_box=new QCheckBox(this); air_flash_box->setGeometry(435,85,15,15); - label=new QLabel(air_flash_box,tr("Flash Active Buttons"), - this,"air_flash_label"); + label=new QLabel(air_flash_box,tr("Flash Active Buttons"),this); label->setGeometry(455,85,150,15); label->setAlignment(AlignLeft|AlignVCenter); // // Pause Panel Button // - air_panel_pause_box=new QCheckBox(this,"air_panel_pause_box"); + air_panel_pause_box=new QCheckBox(this); air_panel_pause_box->setGeometry(435,107,15,15); - label=new QLabel(air_panel_pause_box,tr("Enable Button Pausing"), - this,"air_panel_pause_label"); + label=new QLabel(air_panel_pause_box,tr("Enable Button Pausing"),this); label->setGeometry(455,107,150,15); label->setAlignment(AlignLeft|AlignVCenter); // // Clear Cart Filter // - air_clearfilter_box=new QCheckBox(this,"air_clearfilter_box"); + air_clearfilter_box=new QCheckBox(this); air_clearfilter_box->setGeometry(435,129,15,15); - label=new QLabel(air_clearfilter_box,tr("Clear Cart Search Filter"), - this,"air_clearfilter_label"); + label=new QLabel(air_clearfilter_box,tr("Clear Cart Search Filter"),this); label->setGeometry(455,129,150,15); label->setAlignment(AlignLeft|AlignVCenter); // // Default Service // - air_defaultsvc_box=new QComboBox(this,"air_defaultsvc_box"); + air_defaultsvc_box=new QComboBox(this); air_defaultsvc_box->setGeometry(520,151,100,20); - label=new QLabel(air_defaultsvc_box,tr("Default Service:"), - this,"air_defaultsvc_label"); + label=new QLabel(air_defaultsvc_box,tr("Default Service:"),this); label->setGeometry(385,151,130,20); label->setAlignment(AlignRight|AlignVCenter); // // Label Template // - air_label_template_edit=new QLineEdit(this,"air_label_template_edit"); + air_label_template_edit=new QLineEdit(this); air_label_template_edit->setGeometry(520,173,sizeHint().width()-530,20); - label=new QLabel(air_label_template_edit,tr("Label Template:"), - this,"air_label_template_label"); + label=new QLabel(air_label_template_edit,tr("Label Template:"),this); label->setGeometry(415,173,100,20); label->setAlignment(AlignRight|AlignVCenter); // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(small_font); @@ -330,7 +319,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(small_font); button->setText(tr("&Cancel")); diff --git a/rdadmin/edit_rdpanel.h b/rdadmin/edit_rdpanel.h index 590e6d459..711a5981d 100644 --- a/rdadmin/edit_rdpanel.h +++ b/rdadmin/edit_rdpanel.h @@ -2,9 +2,7 @@ // // Edit an RDPanel Configuration // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_rdpanel.h,v 1.6.8.2 2013/12/23 18:35:15 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -48,8 +46,7 @@ class EditRDPanel : public QDialog { Q_OBJECT public: - EditRDPanel(RDStation *station,RDStation *cae_station, - QWidget *parent=0,const char *name=0); + EditRDPanel(RDStation *station,RDStation *cae_station,QWidget *parent=0); ~EditRDPanel(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_replicator.cpp b/rdadmin/edit_replicator.cpp index 6819e5117..0e4dae5bc 100644 --- a/rdadmin/edit_replicator.cpp +++ b/rdadmin/edit_replicator.cpp @@ -35,11 +35,8 @@ #include #include - - -EditReplicator::EditReplicator(const QString &repl_name, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -68,12 +65,11 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Replicator Name // - repl_name_edit=new QLineEdit(this,"repl_name_edit"); + repl_name_edit=new QLineEdit(this); repl_name_edit->setGeometry(105,11,sizeHint().width()-115,19); repl_name_edit->setMaxLength(32); repl_name_edit->setReadOnly(true); - QLabel *repl_name_label=new QLabel(repl_name_edit,tr("Name:"),this, - "repl_name_label"); + QLabel *repl_name_label=new QLabel(repl_name_edit,tr("Name:"),this); repl_name_label->setGeometry(10,11,90,19); repl_name_label->setFont(font); repl_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -81,11 +77,11 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Replicator Description // - repl_description_edit=new QLineEdit(this,"repl_description_edit"); + repl_description_edit=new QLineEdit(this); repl_description_edit->setGeometry(105,33,sizeHint().width()-115,19); repl_description_edit->setMaxLength(64); - QLabel *repl_description_label=new QLabel(repl_description_edit,tr("Description:"),this, - "repl_description_label"); + QLabel *repl_description_label= + new QLabel(repl_description_edit,tr("Description:"),this); repl_description_label->setGeometry(10,33,90,19); repl_description_label->setFont(font); repl_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -93,7 +89,7 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Replicator Type // - repl_type_box=new QComboBox(this,"repl_type_box"); + repl_type_box=new QComboBox(this); repl_type_box->setGeometry(105,55,sizeHint().width()-115,19); for(unsigned i=0;i<(int)RDReplicator::TypeLast;i++) { repl_type_box->insertItem(RDReplicator::typeString((RDReplicator::Type)i)); @@ -101,8 +97,7 @@ EditReplicator::EditReplicator(const QString &repl_name, repl_type_box->setCurrentItem(i); } } - QLabel *repl_type_label=new QLabel(repl_type_box,tr("Type:"),this, - "repl_type_label"); + QLabel *repl_type_label=new QLabel(repl_type_box,tr("Type:"),this); repl_type_label->setGeometry(10,55,90,19); repl_type_label->setFont(font); repl_type_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -110,7 +105,7 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Host System // - repl_station_box=new QComboBox(this,"repl_station_box"); + repl_station_box=new QComboBox(this); repl_station_box->setGeometry(155,77,sizeHint().width()-165,19); sql="select NAME from STATIONS order by NAME"; q=new RDSqlQuery(sql); @@ -122,7 +117,7 @@ EditReplicator::EditReplicator(const QString &repl_name, } delete q; QLabel *repl_station_label= - new QLabel(repl_station_box,tr("Host System:"),this,"repl_station_label"); + new QLabel(repl_station_box,tr("Host System:"),this); repl_station_label->setGeometry(10,77,140,19); repl_station_label->setFont(font); repl_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -130,13 +125,10 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Upload Audio URL // - repl_url_edit= - new QLineEdit(this,"repl_url_edit"); + repl_url_edit=new QLineEdit(this); repl_url_edit->setGeometry(155,99,335,19); repl_url_edit->setMaxLength(255); - repl_url_label= - new QLabel(repl_url_edit,tr("Audio Upload URL:"),this, - "repl_url_label"); + repl_url_label=new QLabel(repl_url_edit,tr("Audio Upload URL:"),this); repl_url_label->setGeometry(20,99,130,19); repl_url_label->setFont(font); repl_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -144,13 +136,10 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Upload Username // - repl_username_edit= - new QLineEdit(this,"repl_username_edit"); + repl_username_edit=new QLineEdit(this); repl_username_edit->setGeometry(225,121,95,19); repl_username_edit->setMaxLength(64); - repl_username_label= - new QLabel(repl_username_edit,tr("Username:"),this, - "repl_username_label"); + repl_username_label=new QLabel(repl_username_edit,tr("Username:"),this); repl_username_label->setGeometry(40,121,180,19); repl_username_label->setFont(font); repl_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -158,14 +147,11 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Upload Password // - repl_password_edit= - new QLineEdit(this,"repl_password_edit"); + repl_password_edit=new QLineEdit(this); repl_password_edit->setGeometry(395,121,95,19); repl_password_edit->setMaxLength(64); repl_password_edit->setEchoMode(QLineEdit::Password); - repl_password_label= - new QLabel(repl_password_edit,tr("Password:"),this, - "repl_password_label"); + repl_password_label=new QLabel(repl_password_edit,tr("Password:"),this); repl_password_label->setGeometry(320,121,70,19); repl_password_label->setFont(font); repl_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -173,15 +159,14 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Audio Format // - repl_format_edit=new QLineEdit(this,"repl_format_edit"); + repl_format_edit=new QLineEdit(this); repl_format_edit->setGeometry(155,143,285,20); repl_format_edit->setReadOnly(true); - repl_format_label=new QLabel(repl_format_edit, - tr("Upload Format:"),this,"repl_format_label"); + repl_format_label=new QLabel(repl_format_edit,tr("Upload Format:"),this); repl_format_label->setGeometry(5,143,145,20); repl_format_label->setFont(font); repl_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - repl_format_button=new QPushButton(this,"format_button"); + repl_format_button=new QPushButton(this); repl_format_button->setGeometry(450,142,40,24); repl_format_button->setFont(small_font); repl_format_button->setText(tr("S&et")); @@ -190,11 +175,11 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Normalize Check Box // - repl_normalize_box=new QCheckBox(this,"repl_normalize_box"); + repl_normalize_box=new QCheckBox(this); repl_normalize_box->setGeometry(155,167,15,15); repl_normalize_box->setChecked(true); - repl_normalize_check_label=new QLabel(repl_normalize_box,tr("Normalize"), - this,"normalize_check_label"); + repl_normalize_check_label= + new QLabel(repl_normalize_box,tr("Normalize"),this); repl_normalize_check_label->setGeometry(175,165,83,20); repl_normalize_check_label->setFont(font); repl_normalize_check_label->setAlignment(AlignLeft|AlignVCenter); @@ -204,15 +189,14 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Normalize Level // - repl_normalize_spin=new QSpinBox(this,"repl_normalize_spin"); + repl_normalize_spin=new QSpinBox(this); repl_normalize_spin->setGeometry(295,165,40,20); repl_normalize_spin->setRange(-30,-1); - repl_normalize_label=new QLabel(repl_normalize_spin,tr("Level:"), - this,"normalize_spin_label"); + repl_normalize_label=new QLabel(repl_normalize_spin,tr("Level:"),this); repl_normalize_label->setGeometry(245,165,45,20); repl_normalize_label->setFont(font); repl_normalize_label->setAlignment(AlignRight|AlignVCenter); - repl_normalize_unit_label=new QLabel(tr("dBFS"),this,"normalize_unit_label"); + repl_normalize_unit_label=new QLabel(tr("dBFS"),this); repl_normalize_unit_label->setGeometry(340,165,40,20); repl_normalize_unit_label->setFont(font); repl_normalize_unit_label->setAlignment(AlignLeft|AlignVCenter); @@ -220,7 +204,7 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Groups Selector // - repl_groups_sel=new RDListSelector(this,"repl_groups_sel"); + repl_groups_sel=new RDListSelector(this); repl_groups_sel->setGeometry(60,192,380,130); repl_groups_sel->sourceSetLabel(tr("Available Groups")); repl_groups_sel->destSetLabel(tr("Active Groups")); @@ -228,7 +212,7 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -238,7 +222,7 @@ EditReplicator::EditReplicator(const QString &repl_name, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_replicator.h b/rdadmin/edit_replicator.h index 8fec3bd60..1bc739e17 100644 --- a/rdadmin/edit_replicator.h +++ b/rdadmin/edit_replicator.h @@ -3,9 +3,7 @@ // // Edit a Rivendell Replicator // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: edit_replicator.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class EditReplicator : public QDialog { Q_OBJECT public: - EditReplicator(const QString &repl_name,QWidget *parent=0,const char *name=0); + EditReplicator(const QString &repl_name,QWidget *parent=0); ~EditReplicator(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_report.cpp b/rdadmin/edit_report.cpp index a4dd55591..867c2ff3c 100644 --- a/rdadmin/edit_report.cpp +++ b/rdadmin/edit_report.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Report // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_report.cpp,v 1.21.8.1.2.1 2014/05/22 01:21:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,9 +39,8 @@ #include #include - -EditReport::EditReport(QString rptname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditReport::EditReport(QString rptname,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -128,9 +125,7 @@ EditReport::EditReport(QString rptname,QWidget *parent,const char *name) edit_cartzeros_box->setGeometry(170,75,15,15); connect(edit_cartzeros_box,SIGNAL(toggled(bool)), this,SLOT(leadingZerosToggled(bool))); - label=new QLabel(edit_cartzeros_box, - tr("Use Leading Zeros"),this, - "edit_cartzeros_label"); + label=new QLabel(edit_cartzeros_box,tr("Use Leading Zeros"),this); label->setGeometry(187,73,120,19); label->setFont(check_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); diff --git a/rdadmin/edit_report.h b/rdadmin/edit_report.h index 9cb998c4a..a50a8bcaf 100644 --- a/rdadmin/edit_report.h +++ b/rdadmin/edit_report.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Report // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_report.h,v 1.14.8.1.2.1 2014/05/22 01:21:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,12 +34,11 @@ #include - class EditReport : public QDialog { Q_OBJECT public: - EditReport(QString rptname,QWidget *parent=0,const char *name=0); + EditReport(QString rptname,QWidget *parent=0); ~EditReport(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_sas_resource.cpp b/rdadmin/edit_sas_resource.cpp index f8cce3a96..358732385 100644 --- a/rdadmin/edit_sas_resource.cpp +++ b/rdadmin/edit_sas_resource.cpp @@ -2,9 +2,7 @@ // // Edit an SAS Resource Record. // -// (C) Copyright 2002-2005,2011 Fred Gleason -// -// $Id: edit_sas_resource.cpp,v 1.1 2011/05/07 00:32:29 cvs Exp $ +// (C) Copyright 2002-2005,2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { edit_enginenum=enginenum; edit_devicenum=devicenum; @@ -54,10 +52,9 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, // // Console Number // - edit_enginenum_edit=new QLineEdit(this,"edit_enginenum_edit"); + edit_enginenum_edit=new QLineEdit(this); edit_enginenum_edit->setGeometry(135,10,50,20); - QLabel *label=new QLabel(edit_enginenum_edit,tr("Console Number: "), - this,"edit_enginenum_label"); + QLabel *label=new QLabel(edit_enginenum_edit,tr("Console Number: "),this); label->setGeometry(10,10,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -65,10 +62,9 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, // // Source Number // - edit_devicenum_edit=new QLineEdit(this,"edit_devicenum_edit"); + edit_devicenum_edit=new QLineEdit(this); edit_devicenum_edit->setGeometry(135,36,50,20); - label=new QLabel(edit_devicenum_edit,tr("Source Number: "), - this,"edit_devicenum_label"); + label=new QLabel(edit_devicenum_edit,tr("Source Number: "),this); label->setGeometry(10,36,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -76,10 +72,10 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, // // Opto/Relay Number // - edit_relaynum_edit=new QLineEdit(this,"edit_relaynum_edit"); + edit_relaynum_edit=new QLineEdit(this); edit_relaynum_edit->setGeometry(135,62,50,20); - edit_relaynum_label=new QLabel(edit_relaynum_edit,tr("Opto/Relay Number: "), - this,"edit_relaynum_label"); + edit_relaynum_label= + new QLabel(edit_relaynum_edit,tr("Opto/Relay Number: "),this); edit_relaynum_label->setGeometry(10,62,120,20); edit_relaynum_label->setFont(bold_font); edit_relaynum_label->setAlignment(AlignRight|AlignVCenter); @@ -87,7 +83,7 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -97,7 +93,7 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_sas_resource.h b/rdadmin/edit_sas_resource.h index b3bc2a85e..c8b013bcb 100644 --- a/rdadmin/edit_sas_resource.h +++ b/rdadmin/edit_sas_resource.h @@ -2,9 +2,7 @@ // // Edit an SAS Resource Record. // -// (C) Copyright 2002-2005,2011 Fred Gleason -// -// $Id: edit_sas_resource.h,v 1.1 2011/05/07 00:32:29 cvs Exp $ +// (C) Copyright 2002-2005,2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,13 +31,11 @@ #include #include - class EditSasResource : public QDialog { Q_OBJECT public: - EditSasResource(int *enginenum,int *devicenum,int *relaynum, - QWidget *parent=0,const char *name=0); + EditSasResource(int *enginenum,int *devicenum,int *relaynum,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_schedcodes.cpp b/rdadmin/edit_schedcodes.cpp index 6eeb254a9..66e132f9c 100644 --- a/rdadmin/edit_schedcodes.cpp +++ b/rdadmin/edit_schedcodes.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -36,7 +34,9 @@ #include #include -EditSchedCode::EditSchedCode(QString schedCode,QString description,QWidget *parent,const char *name) : QDialog(parent,name,true) +EditSchedCode::EditSchedCode(QString schedCode,QString description, + QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -60,15 +60,17 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description,QWidget *pare // // Text Validators // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); + // // Code Name // - schedCode_name_edit=new QLineEdit(this,"schedCode_name_edit"); + schedCode_name_edit=new QLineEdit(this); schedCode_name_edit->setGeometry(125,11,100,19); schedCode_name_edit->setMaxLength(10); schedCode_name_edit->setReadOnly(true); - QLabel *schedCode_name_label=new QLabel(schedCode_name_edit,tr("Scheduler Code:"),this,"schedCode_name_label"); + QLabel *schedCode_name_label= + new QLabel(schedCode_name_edit,tr("Scheduler Code:"),this); schedCode_name_label->setGeometry(10,11,110,19); schedCode_name_label->setFont(font); schedCode_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -76,13 +78,12 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description,QWidget *pare // // Code Description // - schedCode_description_edit=new QLineEdit(this,"schedCode_description_edit"); + schedCode_description_edit=new QLineEdit(this); schedCode_description_edit->setGeometry(125,32,sizeHint().width()-135,19); schedCode_description_edit->setMaxLength(255); schedCode_description_edit->setValidator(validator); - QLabel *schedCode_description_label=new QLabel(schedCode_description_edit, - tr("Code Description:"),this, - "schedCode_description_label"); + QLabel *schedCode_description_label= + new QLabel(schedCode_description_edit,tr("Code Description:"),this); schedCode_description_label->setGeometry(10,32,110,19); schedCode_description_label->setFont(font); schedCode_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -90,7 +91,7 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description,QWidget *pare // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -100,7 +101,7 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description,QWidget *pare // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_schedcodes.h b/rdadmin/edit_schedcodes.h index 7e0c930ef..4f0222550 100644 --- a/rdadmin/edit_schedcodes.h +++ b/rdadmin/edit_schedcodes.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -34,7 +32,7 @@ class EditSchedCode : public QDialog { Q_OBJECT public: - EditSchedCode(QString schedCode,QString description,QWidget *parent=0,const char *name=0); + EditSchedCode(QString schedCode,QString description,QWidget *parent=0); ~EditSchedCode(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index 8e2665e40..ce33a6bf0 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Systemwide Configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_settings.cpp,v 1.4.8.1 2012/11/26 20:19:38 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,8 @@ #include #include -EditSettings::EditSettings(QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditSettings::EditSettings(QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -73,18 +71,16 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // System Sample Rate // - edit_sample_rate_box=new QComboBox(this,"edit_sample_rate_box"); + edit_sample_rate_box=new QComboBox(this); edit_sample_rate_box->setGeometry(200,10,70,20); edit_sample_rate_box->insertItem("32000"); edit_sample_rate_box->insertItem("44100"); edit_sample_rate_box->insertItem("48000"); - QLabel *label=new QLabel(edit_sample_rate_box, - tr("System Sample Rate:"),this, - "edit_sample_rate_label"); + QLabel *label=new QLabel(edit_sample_rate_box,tr("System Sample Rate:"),this); label->setGeometry(10,10,185,20); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - label=new QLabel(tr("samples/second"),this,"edit_sample_rate_unit"); + label=new QLabel(tr("samples/second"),this); label->setGeometry(275,10,sizeHint().width()-285,20); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -92,11 +88,10 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // Allow Duplicate Cart Titles Box // - edit_duplicate_carts_box=new QCheckBox(this,"edit_duplicate_carts_box"); + edit_duplicate_carts_box=new QCheckBox(this); edit_duplicate_carts_box->setGeometry(20,32,15,15); - label=new QLabel(edit_duplicate_carts_box, - tr("Allow Duplicate Cart Titles"),this, - "edit_duplicate_carts_box"); + label= + new QLabel(edit_duplicate_carts_box,tr("Allow Duplicate Cart Titles"),this); label->setGeometry(40,30,sizeHint().width()-50,20); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -104,10 +99,9 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // ISCI Cross Reference Path // - edit_isci_path_edit=new QLineEdit(this,"edit_isci_path_box"); + edit_isci_path_edit=new QLineEdit(this); edit_isci_path_edit->setGeometry(200,54,sizeHint().width()-210,20); - label=new QLabel(edit_isci_path_edit,tr("ISCI Cross Reference Path:"),this, - "edit_isci_path_label"); + label=new QLabel(edit_isci_path_edit,tr("ISCI Cross Reference Path:"),this); label->setGeometry(10,54,185,20); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -115,16 +109,14 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // Maximum POST Size // - edit_maxpost_spin=new QSpinBox(this,"edit_maxpost_spin"); + edit_maxpost_spin=new QSpinBox(this); edit_maxpost_spin->setGeometry(200,76,60,20); edit_maxpost_spin->setRange(1,1000); - label=new QLabel(edit_maxpost_spin, - tr("Maximum Remote Post Length:"),this, - "edit_maxpost_label"); + label=new QLabel(edit_maxpost_spin,tr("Maximum Remote Post Length:"),this); label->setGeometry(10,76,185,20); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - label=new QLabel(tr("Mbytes"),this,"edit_maxpost_unit"); + label=new QLabel(tr("Mbytes"),this); label->setGeometry(265,76,60,20); label->setFont(font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -148,7 +140,7 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // Duplicate List (initially hidden) // - edit_duplicate_label=new RDLabel(this,"edit_duplicate_label"); + edit_duplicate_label=new RDLabel(this); edit_duplicate_label->setText(tr("The following duplicate titles must be corrected before \"Allow Duplicate Values\" can be turned off.")); edit_duplicate_label->setWordWrapEnabled(true); edit_duplicate_label->setGeometry(15,120,sizeHint().width()-30,50); @@ -163,7 +155,7 @@ EditSettings::EditSettings(QWidget *parent,const char *name) edit_duplicate_list->addColumn(tr("TITLE")); edit_duplicate_list->setColumnAlignment(1,AlignLeft); edit_duplicate_list->hide(); - edit_save_button=new QPushButton(this,"save_button"); + edit_save_button=new QPushButton(this); edit_save_button-> setGeometry(sizeHint().width()-85,370,70,25); edit_save_button->setFont(normal_font); @@ -174,7 +166,7 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // Ok Button // - edit_ok_button=new QPushButton(this,"ok_button"); + edit_ok_button=new QPushButton(this); edit_ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60, 80,50); edit_ok_button->setFont(font); @@ -184,7 +176,7 @@ EditSettings::EditSettings(QWidget *parent,const char *name) // // Cancel Button // - edit_cancel_button=new QPushButton(this,"cancel_button"); + edit_cancel_button=new QPushButton(this); edit_cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); edit_cancel_button->setFont(font); diff --git a/rdadmin/edit_settings.h b/rdadmin/edit_settings.h index 43ab1020b..f330bd85a 100644 --- a/rdadmin/edit_settings.h +++ b/rdadmin/edit_settings.h @@ -2,9 +2,7 @@ // // Edit Rivendell System-wide Settings. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: edit_settings.h,v 1.4.8.1 2012/11/26 20:19:38 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class EditSettings : public QDialog { Q_OBJECT public: - EditSettings(QWidget *parent=0,const char *name=0); + EditSettings(QWidget *parent=0); ~EditSettings(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index a6f326229..d77e50845 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Workstation Configuration // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: edit_station.cpp,v 1.57.4.12 2014/03/05 17:59:39 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -56,8 +54,8 @@ #include #include -EditStation::EditStation(QString sname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditStation::EditStation(QString sname,QWidget *parent) + : QDialog(parent,"",true) { RDSqlQuery *q; QString sql; @@ -886,7 +884,7 @@ void EditStation::editCartSlotsData() void EditStation::viewAdaptersData() { - ViewAdapters *view=new ViewAdapters(station_station,this,"view"); + ViewAdapters *view=new ViewAdapters(station_station,this); view->exec(); delete view; } diff --git a/rdadmin/edit_station.h b/rdadmin/edit_station.h index 26d4304cc..3503e3309 100644 --- a/rdadmin/edit_station.h +++ b/rdadmin/edit_station.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Workstation // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: edit_station.h,v 1.36.4.4 2014/02/11 23:46:27 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,7 +42,7 @@ class EditStation : public QDialog { Q_OBJECT public: - EditStation(QString station,QWidget *parent=0,const char *name=0); + EditStation(QString station,QWidget *parent=0); ~EditStation(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index bd3de5ed3..d841fc6d6 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Service // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: edit_svc.cpp,v 1.43.8.2.2.1 2014/05/21 20:29:02 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ #include #include -EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditSvc::EditSvc(QString svc,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -82,7 +80,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // General Section // - QLabel *label=new QLabel("General",this,"traffic_import_label"); + QLabel *label=new QLabel("General",this); label->setGeometry(10,10,120,24); label->setFont(section_font); label->setAlignment(AlignLeft); @@ -127,8 +125,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) svc_name_template_edit->setGeometry(185,94,240,19); svc_name_template_edit->setMaxLength(255); svc_name_template_edit->setValidator(log_validator); - label=new QLabel(svc_name_template_edit, - tr("Log Name &Template:"),this); + label=new QLabel(svc_name_template_edit,tr("Log Name &Template:"),this); label->setGeometry(10,94,170,19); label->setAlignment(AlignRight|ShowPrefix); @@ -196,43 +193,39 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // svc_loglife_box=new QCheckBox(this,"svc_loglife_box"); svc_loglife_box->setGeometry(460,95,15,15); - label=new QLabel(svc_loglife_box,tr("Purge Logs after"), - this,"svc_loglife_label"); + label=new QLabel(svc_loglife_box,tr("Purge Logs after"),this); label->setGeometry(480,95,200,19); label->setAlignment(AlignLeft|ShowPrefix); - svc_loglife_spin=new QSpinBox(this,"svc_loglife_spin"); + svc_loglife_spin=new QSpinBox(this); svc_loglife_spin->setGeometry(585,93,50,19); svc_loglife_spin->setRange(0,365); connect(svc_loglife_box,SIGNAL(toggled(bool)), svc_loglife_spin,SLOT(setEnabled(bool))); - label=new QLabel(svc_loglife_box,tr("days"), - this,"svc_loglife_unit"); + label=new QLabel(svc_loglife_box,tr("days"),this); label->setGeometry(645,95,40,19); label->setAlignment(AlignLeft|ShowPrefix); // // Purge Expired ELR Data // - svc_shelflife_box=new QCheckBox(this,"svc_shelflife_box"); + svc_shelflife_box=new QCheckBox(this); svc_shelflife_box->setGeometry(460,117,15,15); - label=new QLabel(svc_shelflife_box,tr("Purge ELR Data after"), - this,"svc_shelflife_label"); + label=new QLabel(svc_shelflife_box,tr("Purge ELR Data after"),this); label->setGeometry(480,117,200,19); label->setAlignment(AlignLeft|ShowPrefix); - svc_shelflife_spin=new QSpinBox(this,"svc_shelflife_spin"); + svc_shelflife_spin=new QSpinBox(this); svc_shelflife_spin->setGeometry(610,115,50,19); svc_shelflife_spin->setRange(0,365); connect(svc_shelflife_box,SIGNAL(toggled(bool)), svc_shelflife_spin,SLOT(setEnabled(bool))); - label=new QLabel(svc_shelflife_box,tr("days"), - this,"svc_shelflife_unit"); + label=new QLabel(svc_shelflife_box,tr("days"),this); label->setGeometry(670,117,40,19); label->setAlignment(AlignLeft|ShowPrefix); // // Enable Hosts Button // - button=new QPushButton(this,"hosts_button"); + button=new QPushButton(this); button->setGeometry(625,31,150,50); button->setFont(font); button->setText(tr("Enable &Hosts")); @@ -243,7 +236,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Traffic Import Section // - label=new QLabel(tr("Traffic Data Import"),this,"traffic_import_label"); + label=new QLabel(tr("Traffic Data Import"),this); label->setGeometry(10,213,160,24); label->setFont(section_font); label->setAlignment(AlignLeft); @@ -251,13 +244,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Linux Traffic Import Path // - svc_tfc_path_edit=new QLineEdit(this,"svc_tfc_path_edit"); + svc_tfc_path_edit=new QLineEdit(this); svc_tfc_path_edit->setGeometry(185,234,240,19); svc_tfc_path_edit->setMaxLength(255); svc_tfc_path_edit->setValidator(validator); - label=new QLabel(svc_tfc_path_edit, - tr("Linux Import Path:"),this, - "svc_tfc_path_label"); + label=new QLabel(svc_tfc_path_edit,tr("Linux Import Path:"),this); label->setGeometry(10,234,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_path_edit,SIGNAL(textChanged(const QString &)), @@ -266,12 +257,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Linux Traffic Preimport Command // - svc_tfc_preimport_cmd_edit=new QLineEdit(this,"svc_tfc_preimport_cmd_edit"); + svc_tfc_preimport_cmd_edit=new QLineEdit(this); svc_tfc_preimport_cmd_edit->setGeometry(185,255,240,19); svc_tfc_preimport_cmd_edit->setValidator(validator); - label=new QLabel(svc_tfc_preimport_cmd_edit, - tr("Linux Preimport Command:"),this, - "svc_tfc_preimport_label"); + label= + new QLabel(svc_tfc_preimport_cmd_edit,tr("Linux Preimport Command:"),this); label->setGeometry(10,255,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), @@ -280,12 +270,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Windows Traffic Import Path // - svc_tfc_win_path_edit=new QLineEdit(this,"svc_tfc_win_path_edit"); + svc_tfc_win_path_edit=new QLineEdit(this); svc_tfc_win_path_edit->setGeometry(185,276,240,19); svc_tfc_win_path_edit->setMaxLength(255); - label=new QLabel(svc_tfc_win_path_edit, - tr("Windows Import Path:"),this, - "svc_tfc_win_path_label"); + label=new QLabel(svc_tfc_win_path_edit,tr("Windows Import Path:"),this); label->setGeometry(10,276,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_win_path_edit,SIGNAL(textChanged(const QString &)), @@ -294,12 +282,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Linux Traffic Preimport Command // - svc_tfc_win_preimport_cmd_edit= - new QLineEdit(this,"svc_tfc_win_preimport_cmd_edit"); + svc_tfc_win_preimport_cmd_edit=new QLineEdit(this); svc_tfc_win_preimport_cmd_edit->setGeometry(185,297,240,19); label=new QLabel(svc_tfc_win_preimport_cmd_edit, - tr("Windows Preimport Command:"),this, - "svc_tfc_win_preimport_label"); + tr("Windows Preimport Command:"),this); label->setGeometry(10,297,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), @@ -308,12 +294,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Note Cart // - svc_tfc_label_cart_edit=new QLineEdit(this,"svc_tfc_label_cart_edit"); + svc_tfc_label_cart_edit=new QLineEdit(this); svc_tfc_label_cart_edit->setGeometry(185,318,240,19); svc_tfc_label_cart_edit->setMaxLength(32); - label=new QLabel(svc_tfc_label_cart_edit, - tr("Note Cart String:"),this, - "svc_tfc_label_cart_label"); + label=new QLabel(svc_tfc_label_cart_edit,tr("Note Cart String:"),this); label->setGeometry(10,318,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_label_cart_edit,SIGNAL(textChanged(const QString &)), @@ -322,12 +306,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Track String // - svc_tfc_track_edit=new QLineEdit(this,"svc_tfc_track_edit"); + svc_tfc_track_edit=new QLineEdit(this); svc_tfc_track_edit->setGeometry(185,339,240,19); svc_tfc_track_edit->setMaxLength(32); - label=new QLabel(svc_tfc_track_edit, - tr("Insert Voice Track String:"),this, - "svc_tfc_track_cart_track"); + label=new QLabel(svc_tfc_track_edit,tr("Insert Voice Track String:"),this); label->setGeometry(10,339,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_track_edit,SIGNAL(textChanged(const QString &)), @@ -336,11 +318,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Traffic Import Template // - svc_tfc_import_template_box=new QComboBox(this,"svc_tfc_import_template_box"); + svc_tfc_import_template_box=new QComboBox(this); svc_tfc_import_template_box->setGeometry(185,360,240,19); - label=new QLabel(svc_tfc_import_template_box, - tr("Import Template:"),this, - "svc_tfc_import_template_label"); + label=new QLabel(svc_tfc_import_template_box,tr("Import Template:"),this); label->setGeometry(10,360,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_tfc_import_template_box,SIGNAL(activated(int)), @@ -356,7 +336,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Traffic Test Button // - button=new QPushButton(this,"tfc_button"); + button=new QPushButton(this); button->setGeometry(360,381,60,40); button->setFont(font); button->setText(tr("Test \n&Traffic")); @@ -365,7 +345,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Music Import Section // - label=new QLabel(tr("Music Data Import"),this,"music_import_label"); + label=new QLabel(tr("Music Data Import"),this); label->setGeometry(445,213,160,24); label->setFont(section_font); label->setAlignment(AlignLeft); @@ -373,13 +353,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Linux Music Import Path // - svc_mus_path_edit=new QLineEdit(this,"svc_mus_path_edit"); + svc_mus_path_edit=new QLineEdit(this); svc_mus_path_edit->setGeometry(620,234,240,19); svc_mus_path_edit->setMaxLength(255); svc_mus_path_edit->setValidator(validator); - label=new QLabel(svc_mus_path_edit, - tr("Linux Import Path:"),this, - "svc_mus_path_label"); + label=new QLabel(svc_mus_path_edit,tr("Linux Import Path:"),this); label->setGeometry(450,234,165,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_path_edit,SIGNAL(textChanged(const QString &)), @@ -388,12 +366,11 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Linux Music Preimport Command // - svc_mus_preimport_cmd_edit=new QLineEdit(this,"svc_mus_preimport_cmd_edit"); + svc_mus_preimport_cmd_edit=new QLineEdit(this); svc_mus_preimport_cmd_edit->setGeometry(620,255,240,19); svc_mus_preimport_cmd_edit->setValidator(validator); - label=new QLabel(svc_mus_preimport_cmd_edit, - tr("Linux Preimport Command:"),this, - "svc_mus_preimport_label"); + label= + new QLabel(svc_mus_preimport_cmd_edit,tr("Linux Preimport Command:"),this); label->setGeometry(450,255,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), @@ -402,12 +379,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Windows Music Import Path // - svc_mus_win_path_edit=new QLineEdit(this,"svc_mus_win_path_edit"); + svc_mus_win_path_edit=new QLineEdit(this); svc_mus_win_path_edit->setGeometry(620,276,240,19); svc_mus_win_path_edit->setMaxLength(255); - label=new QLabel(svc_mus_win_path_edit, - tr("Windows Import Path:"),this, - "svc_mus_win_path_label"); + label=new QLabel(svc_mus_win_path_edit,tr("Windows Import Path:"),this); label->setGeometry(450,276,165,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_win_path_edit,SIGNAL(textChanged(const QString &)), @@ -416,12 +391,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Windows Music Preimport Command // - svc_mus_win_preimport_cmd_edit= - new QLineEdit(this,"svc_mus_win_preimport_cmd_edit"); + svc_mus_win_preimport_cmd_edit=new QLineEdit(this); svc_mus_win_preimport_cmd_edit->setGeometry(620,297,240,19); label=new QLabel(svc_mus_win_preimport_cmd_edit, - tr("Windows Preimport Command:"),this, - "svc_mus_win_preimport_label"); + tr("Windows Preimport Command:"),this); label->setGeometry(450,297,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), @@ -430,12 +403,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Label Cart // - svc_mus_label_cart_edit=new QLineEdit(this,"svc_mus_label_cart_edit"); + svc_mus_label_cart_edit=new QLineEdit(this); svc_mus_label_cart_edit->setGeometry(620,318,240,19); svc_mus_label_cart_edit->setMaxLength(32); - label=new QLabel(svc_mus_label_cart_edit, - tr("Note Cart String:"),this, - "svc_mus_label_cart_label"); + label=new QLabel(svc_mus_label_cart_edit,tr("Note Cart String:"),this); label->setGeometry(450,318,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_label_cart_edit,SIGNAL(textChanged(const QString &)), @@ -444,12 +415,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Insert Voice Track String // - svc_mus_track_edit=new QLineEdit(this,"svc_mus_track_edit"); + svc_mus_track_edit=new QLineEdit(this); svc_mus_track_edit->setGeometry(620,339,240,19); svc_mus_track_edit->setMaxLength(255); - label=new QLabel(svc_mus_track_edit, - tr("Insert Voice Track String:"),this, - "svc_mus_track_label"); + label=new QLabel(svc_mus_track_edit,tr("Insert Voice Track String:"),this); label->setGeometry(450,339,165,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_track_edit,SIGNAL(textChanged(const QString &)), @@ -458,12 +427,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Insert Spot Break String // - svc_mus_break_edit=new QLineEdit(this,"svc_mus_break_edit"); + svc_mus_break_edit=new QLineEdit(this); svc_mus_break_edit->setGeometry(620,360,240,19); svc_mus_break_edit->setMaxLength(255); - label=new QLabel(svc_mus_break_edit, - tr("Insert Traffic Break String:"),this, - "svc_mus_break_label"); + label=new QLabel(svc_mus_break_edit,tr("Insert Traffic Break String:"),this); label->setGeometry(450,360,165,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_break_edit,SIGNAL(textChanged(const QString &)), @@ -472,11 +439,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Music Import Template // - svc_mus_import_template_box=new QComboBox(this,"svc_mus_import_template_box"); + svc_mus_import_template_box=new QComboBox(this); svc_mus_import_template_box->setGeometry(620,381,240,19); - label=new QLabel(svc_mus_import_template_box, - tr("Import Template:"),this, - "svc_mus_import_template_label"); + label=new QLabel(svc_mus_import_template_box,tr("Import Template:"),this); label->setGeometry(450,381,170,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(svc_mus_import_template_box,SIGNAL(activated(int)), @@ -492,7 +457,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Music Test Button // - button=new QPushButton(this,"mus_button"); + button=new QPushButton(this); button->setGeometry(795,402,60,40); button->setFont(font); button->setText(tr("Test \n&Music")); @@ -501,7 +466,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -511,7 +476,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); @@ -629,7 +594,7 @@ QSizePolicy EditSvc::sizePolicy() const void EditSvc::autofillData() { - AutofillCarts *autofill=new AutofillCarts(svc_svc,this,"autofill"); + AutofillCarts *autofill=new AutofillCarts(svc_svc,this); autofill->exec(); delete autofill; } @@ -637,7 +602,7 @@ void EditSvc::autofillData() void EditSvc::enableHostsData() { - EditSvcPerms *edit_perms=new EditSvcPerms(svc_svc,this,"edit_perms"); + EditSvcPerms *edit_perms=new EditSvcPerms(svc_svc,this); edit_perms->exec(); delete edit_perms; } @@ -704,7 +669,7 @@ void EditSvc::TestDataImport(RDSvc::ImportSource src) } Save(); } - TestImport *testimport=new TestImport(svc_svc,src,this,"testimport"); + TestImport *testimport=new TestImport(svc_svc,src,this); testimport->exec(); delete testimport; } diff --git a/rdadmin/edit_svc.h b/rdadmin/edit_svc.h index 9d974732b..2ab17123d 100644 --- a/rdadmin/edit_svc.h +++ b/rdadmin/edit_svc.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Service // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: edit_svc.h,v 1.24.8.2 2014/01/10 15:40:15 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class EditSvc : public QDialog { Q_OBJECT public: - EditSvc(QString svc,QWidget *parent=0,const char *name=0); + EditSvc(QString svc,QWidget *parent=0); ~EditSvc(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_svc_perms.cpp b/rdadmin/edit_svc_perms.cpp index 6dc753268..93192c559 100644 --- a/rdadmin/edit_svc_perms.cpp +++ b/rdadmin/edit_svc_perms.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_svc_perms.cpp,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,9 +35,8 @@ #include #include - -EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -65,7 +62,7 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent,const char *name) // // Services Selector // - svc_host_sel=new RDListSelector(this,"svc_host_sel"); + svc_host_sel=new RDListSelector(this); svc_host_sel->sourceSetLabel(tr("Available Hosts")); svc_host_sel->destSetLabel(tr("Enabled Hosts")); svc_host_sel->setGeometry(10,10,380,130); @@ -73,7 +70,7 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -83,7 +80,7 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_svc_perms.h b/rdadmin/edit_svc_perms.h index 450fe8647..d6d961644 100644 --- a/rdadmin/edit_svc_perms.h +++ b/rdadmin/edit_svc_perms.h @@ -2,9 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_svc_perms.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include - class EditSvcPerms : public QDialog { Q_OBJECT public: - EditSvcPerms(RDSvc *svc,QWidget *parent=0,const char *name=0); + EditSvcPerms(RDSvc *svc,QWidget *parent=0); ~EditSvcPerms(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_ttys.cpp b/rdadmin/edit_ttys.cpp index 40540fa71..339c58d3b 100644 --- a/rdadmin/edit_ttys.cpp +++ b/rdadmin/edit_ttys.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell TTY Configuration // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_ttys.cpp,v 1.16 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include #include - -EditTtys::EditTtys(QString station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditTtys::EditTtys(QString station,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -65,17 +62,16 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Port Selector // - edit_port_box=new QComboBox(this,"edit_port_box"); + edit_port_box=new QComboBox(this); edit_port_box->setGeometry(75,10,100,24); edit_port_box->setInsertionPolicy(QComboBox::NoInsertion); connect(edit_port_box,SIGNAL(activated(int)),this,SLOT(idSelectedData())); - QLabel *label=new QLabel(edit_port_box,tr("Port ID:"), - this,"edit_port_label"); + QLabel *label=new QLabel(edit_port_box,tr("Port ID:"),this); label->setGeometry(10,14,60,22); label->setFont(font); label->setAlignment(AlignRight); @@ -83,11 +79,11 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Enable Button // - edit_enable_button=new QCheckBox(this,"edit_enable_button"); + edit_enable_button=new QCheckBox(this); edit_enable_button->setGeometry(265,14,15,15); connect(edit_enable_button,SIGNAL(stateChanged(int)), this,SLOT(enableButtonData(int))); - label=new QLabel(edit_enable_button,tr("Enabled"),this,"edit_enable_button"); + label=new QLabel(edit_enable_button,tr("Enabled"),this); label->setGeometry(200,14,60,22); label->setFont(font); label->setAlignment(AlignRight); @@ -95,11 +91,10 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // The TTY Port // - edit_port_edit=new QLineEdit(this,"edit_port_edit"); + edit_port_edit=new QLineEdit(this); edit_port_edit->setGeometry(145,54,100,20); edit_port_edit->setValidator(validator); - edit_port_label=new QLabel(edit_port_edit,tr("TTY Device:"),this, - "edit_port_edit"); + edit_port_label=new QLabel(edit_port_edit,tr("TTY Device:"),this); edit_port_label->setGeometry(20,56,120,22); edit_port_label->setFont(font); edit_port_label->setAlignment(AlignRight); @@ -107,11 +102,10 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Baudrate Selector // - edit_baudrate_box=new QComboBox(this,"edit_baudrate_box"); + edit_baudrate_box=new QComboBox(this); edit_baudrate_box->setGeometry(145,80,90,24); edit_baudrate_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_baudrate_label=new QLabel(edit_baudrate_box,tr("Baud Rate:"),this, - "edit_baudrate_label"); + edit_baudrate_label=new QLabel(edit_baudrate_box,tr("Baud Rate:"),this); edit_baudrate_label->setGeometry(20,84,120,22); edit_baudrate_label->setFont(font); edit_baudrate_label->setAlignment(AlignRight); @@ -119,11 +113,10 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Parity Selector // - edit_parity_box=new QComboBox(this,"edit_parity_box"); + edit_parity_box=new QComboBox(this); edit_parity_box->setGeometry(145,108,90,24); edit_parity_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_parity_label=new QLabel(edit_parity_box,tr("Parity:"),this, - "edit_parity_label"); + edit_parity_label=new QLabel(edit_parity_box,tr("Parity:"),this); edit_parity_label->setGeometry(20,110,120,22); edit_parity_label->setFont(font); edit_parity_label->setAlignment(AlignRight); @@ -131,11 +124,10 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Data Bits Selector // - edit_databits_box=new QComboBox(this,"edit_databits_box"); + edit_databits_box=new QComboBox(this); edit_databits_box->setGeometry(145,136,60,24); edit_databits_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_databits_label=new QLabel(edit_databits_box,tr("Data Bits:"),this, - "edit_databits_label"); + edit_databits_label=new QLabel(edit_databits_box,tr("Data Bits:"),this); edit_databits_label->setGeometry(20,138,120,22); edit_databits_label->setFont(font); edit_databits_label->setAlignment(AlignRight); @@ -143,11 +135,10 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Stop Bits Selector // - edit_stopbits_box=new QComboBox(this,"edit_stopbits_box"); + edit_stopbits_box=new QComboBox(this); edit_stopbits_box->setGeometry(145,164,60,24); edit_stopbits_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_stopbits_label=new QLabel(edit_stopbits_box,tr("Stop Bits:"),this, - "edit_stopbits_label"); + edit_stopbits_label=new QLabel(edit_stopbits_box,tr("Stop Bits:"),this); edit_stopbits_label->setGeometry(20,166,120,22); edit_stopbits_label->setFont(font); edit_stopbits_label->setAlignment(AlignRight); @@ -155,11 +146,11 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Termination Character Selector // - edit_termination_box=new QComboBox(this,"edit_termination_box"); + edit_termination_box=new QComboBox(this); edit_termination_box->setGeometry(145,192,90,24); edit_termination_box->setInsertionPolicy(QComboBox::NoInsertion); - edit_termination_label=new QLabel(edit_termination_box,tr("Terminator:"), - this,"edit_termination_label"); + edit_termination_label= + new QLabel(edit_termination_box,tr("Terminator:"),this); edit_termination_label->setGeometry(20,194,120,22); edit_termination_label->setFont(font); edit_termination_label->setAlignment(AlignRight); @@ -167,7 +158,7 @@ EditTtys::EditTtys(QString station,QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(210,230,80,50); close_button->setFont(font); close_button->setText(tr("&Close")); diff --git a/rdadmin/edit_ttys.h b/rdadmin/edit_ttys.h index dd0e89848..7ee90a986 100644 --- a/rdadmin/edit_ttys.h +++ b/rdadmin/edit_ttys.h @@ -2,9 +2,7 @@ // // Edit a Rivendell TTY Configuration // -// (C) Copyright 2002 Fred Gleason -// -// $Id: edit_ttys.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,12 +32,11 @@ #include #include - class EditTtys : public QDialog { Q_OBJECT public: - EditTtys(QString station,QWidget *parent=0,const char *name=0); + EditTtys(QString station,QWidget *parent=0); ~EditTtys(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_user.cpp b/rdadmin/edit_user.cpp index ceec99389..c95028b86 100644 --- a/rdadmin/edit_user.cpp +++ b/rdadmin/edit_user.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell User // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_user.cpp,v 1.32 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,9 +40,8 @@ #include #include - -EditUser::EditUser(const QString &user,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditUser::EditUser(const QString &user,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -68,17 +65,16 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // User Name // - user_name_edit=new QLineEdit(this,"user_name_edit"); + user_name_edit=new QLineEdit(this); user_name_edit->setGeometry(100,11,sizeHint().width()-110,19); user_name_edit->setMaxLength(255); user_name_edit->setValidator(validator); - QLabel *user_name_label=new QLabel(user_name_edit,tr("&User Name:"),this, - "user_name_label"); + QLabel *user_name_label=new QLabel(user_name_edit,tr("&User Name:"),this); user_name_label->setGeometry(5,11,90,19); user_name_label->setFont(font); user_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -86,13 +82,12 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Full Name // - user_full_name_edit=new QLineEdit(this,"user_full_name_edit"); + user_full_name_edit=new QLineEdit(this); user_full_name_edit->setGeometry(100,32,sizeHint().width()-110,19); user_full_name_edit->setMaxLength(255); user_full_name_edit->setValidator(validator); QLabel *user_full_name_label= - new QLabel(user_full_name_edit,tr("&Full Name:"),this, - "user_full_name_label"); + new QLabel(user_full_name_edit,tr("&Full Name:"),this); user_full_name_label->setGeometry(10,32,85,19); user_full_name_label->setFont(font); user_full_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -100,13 +95,12 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // User Description // - user_description_edit=new QLineEdit(this,"user_description_edit"); + user_description_edit=new QLineEdit(this); user_description_edit->setGeometry(100,53,sizeHint().width()-110,19); user_description_edit->setMaxLength(255); user_description_edit->setValidator(validator); QLabel *user_description_label= - new QLabel(user_description_edit,tr("&Description:"),this, - "user_description_label"); + new QLabel(user_description_edit,tr("&Description:"),this); user_description_label->setGeometry(5,53,90,19); user_description_label->setFont(font); user_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -114,12 +108,11 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // User Phone // - user_phone_edit=new QLineEdit(this,"user_phone_edit"); + user_phone_edit=new QLineEdit(this); user_phone_edit->setGeometry(100,75,120,19); user_phone_edit->setMaxLength(20); user_phone_edit->setValidator(validator); - QLabel *user_phone_label= - new QLabel(user_phone_edit,tr("&Phone:"),this,"user_phone_label"); + QLabel *user_phone_label=new QLabel(user_phone_edit,tr("&Phone:"),this); user_phone_label->setGeometry(10,75,85,19); user_phone_label->setFont(font); user_phone_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -127,10 +120,9 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Enable Web Login // - user_web_box=new QCheckBox(this,"user_web_box"); + user_web_box=new QCheckBox(this); user_web_box->setGeometry(20,96,15,15); - user_web_label= - new QLabel(user_web_box,tr("Allow Web Logins"),this,"user_web_label"); + user_web_label=new QLabel(user_web_box,tr("Allow Web Logins"),this); user_web_label->setGeometry(40,96,180,19); user_web_label->setFont(font); user_web_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -138,7 +130,7 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Change Password Button // - QPushButton *password_button=new QPushButton(this,"password_button"); + QPushButton *password_button=new QPushButton(this); password_button->setGeometry(230,75,80,50); password_button->setFont(font); password_button->setText(tr("Change\n&Password")); @@ -147,20 +139,17 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Administrative Group Priviledges // - user_admin_group=new QButtonGroup(tr("Administrative Rights"),this, - "user_admin_group"); + user_admin_group=new QButtonGroup(tr("Administrative Rights"),this); user_admin_group->setGeometry(10,125,355,45); user_admin_group->setFont(font); - user_admin_config_button=new QCheckBox(user_admin_group, - "user_admin_config_button"); + user_admin_config_button=new QCheckBox(user_admin_group); user_admin_config_button->setGeometry(10,21,15,15); connect(user_admin_config_button,SIGNAL(toggled(bool)), this,SLOT(adminToggledData(bool))); - QLabel *user_admin_config_label=new QLabel(user_admin_config_button, - tr("Administer S&ystem"), - user_admin_group, - "user_admin_config_label"); + QLabel *user_admin_config_label= + new QLabel(user_admin_config_button,tr("Administer S&ystem"), + user_admin_group); user_admin_config_label->setGeometry(192,21,150,19); user_admin_config_label->setGeometry(30,21,150,19); user_admin_config_label->setFont(small_font); @@ -169,73 +158,56 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Production Group Priviledges // - user_prod_group=new QButtonGroup(tr("Production Rights"),this, - "user_prod_group"); + user_prod_group=new QButtonGroup(tr("Production Rights"),this); user_prod_group->setGeometry(10,180,355,85); user_prod_group->setFont(font); - user_create_carts_button=new QCheckBox(user_prod_group, - "user_create_carts_button"); + user_create_carts_button=new QCheckBox(user_prod_group); user_create_carts_button->setGeometry(10,21,15,15); - user_create_carts_label=new QLabel(user_create_carts_button, - tr("&Create Carts"), - user_prod_group, - "user_create_carts_label"); + user_create_carts_label= + new QLabel(user_create_carts_button,tr("&Create Carts"),user_prod_group); user_create_carts_label->setGeometry(30,21,150,19); user_create_carts_label->setFont(small_font); user_create_carts_label->setAlignment(AlignLeft|ShowPrefix); - user_delete_carts_button=new QCheckBox(user_prod_group, - "user_delete_carts_button"); + user_delete_carts_button=new QCheckBox(user_prod_group); user_delete_carts_button->setGeometry(172,21,15,15); - user_delete_carts_label=new QLabel(user_delete_carts_button, - tr("&Delete Carts"), - user_prod_group, - "user_delete_carts_label"); + user_delete_carts_label= + new QLabel(user_delete_carts_button,tr("&Delete Carts"),user_prod_group); user_delete_carts_label->setGeometry(192,21,150,19); user_delete_carts_label->setFont(small_font); user_delete_carts_label->setAlignment(AlignLeft|ShowPrefix); - user_modify_carts_button=new QCheckBox(user_prod_group, - "user_modify_carts_button"); + user_modify_carts_button=new QCheckBox(user_prod_group); user_modify_carts_button->setGeometry(10,42,15,15); - user_modify_carts_label=new QLabel(user_modify_carts_button, - tr("&Modify Carts"), - user_prod_group, - "user_modify_carts_label"); + user_modify_carts_label= + new QLabel(user_modify_carts_button,tr("&Modify Carts"),user_prod_group); user_modify_carts_label->setGeometry(30,41,150,19); user_modify_carts_label->setFont(small_font); user_modify_carts_label->setAlignment(AlignLeft|ShowPrefix); - user_edit_audio_button=new QCheckBox(user_prod_group, - "user_edit_audio_button"); + user_edit_audio_button=new QCheckBox(user_prod_group); user_edit_audio_button->setGeometry(10,63,15,15); - user_edit_audio_label=new QLabel(user_edit_audio_button, - tr("&Edit Audio"), - user_prod_group, - "user_edit_audio_label"); + user_edit_audio_label= + new QLabel(user_edit_audio_button,tr("&Edit Audio"),user_prod_group); user_edit_audio_label->setGeometry(30,62,150,19); user_edit_audio_label->setFont(small_font); user_edit_audio_label->setAlignment(AlignLeft|ShowPrefix); - user_edit_catches_button=new QCheckBox(user_prod_group, - "user_edit_catches_button"); + user_edit_catches_button=new QCheckBox(user_prod_group); user_edit_catches_button->setGeometry(172,42,15,15); - user_edit_catches_label=new QLabel(user_edit_catches_button, - tr("&Edit Netcatch Schedule"), - user_prod_group, - "user_edit_catches_label"); + user_edit_catches_label= + new QLabel(user_edit_catches_button,tr("&Edit Netcatch Schedule"), + user_prod_group); user_edit_catches_label->setGeometry(192,41,150,19); user_edit_catches_label->setFont(small_font); user_edit_catches_label->setAlignment(AlignLeft|ShowPrefix); - user_voicetrack_log_button=new QCheckBox(user_prod_group, - "user_voicetrack_log_button"); + user_voicetrack_log_button=new QCheckBox(user_prod_group); user_voicetrack_log_button->setGeometry(172,63,15,15); - user_voicetrack_log_label=new QLabel(user_voicetrack_log_button, - tr("&Voicetrack Logs"), - user_prod_group, - "user_voicetrack_log_label"); + user_voicetrack_log_label= + new QLabel(user_voicetrack_log_button,tr("&Voicetrack Logs"), + user_prod_group); user_voicetrack_log_label->setGeometry(192,62,150,19); user_voicetrack_log_label->setFont(small_font); user_voicetrack_log_label->setAlignment(AlignLeft|ShowPrefix); @@ -243,51 +215,40 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Traffic Group Priviledges // - user_traffic_group=new QButtonGroup(tr("Traffic Rights"),this, - "user_traffic_group"); + user_traffic_group=new QButtonGroup(tr("Traffic Rights"),this); user_traffic_group->setGeometry(10,275,355,66); user_traffic_group->setFont(font); - user_create_log_button=new QCheckBox(user_traffic_group, - "user_create_log_button"); + user_create_log_button=new QCheckBox(user_traffic_group); user_create_log_button->setGeometry(10,21,15,15); - user_create_log_label=new QLabel(user_create_log_button, - tr("Create &Log"), - user_traffic_group, - "user_create_log_label"); + user_create_log_label= + new QLabel(user_create_log_button,tr("Create &Log"),user_traffic_group); user_create_log_label->setGeometry(30,21,150,19); user_create_log_label->setFont(small_font); user_create_log_label->setAlignment(AlignLeft|ShowPrefix); - user_delete_log_button=new QCheckBox(user_traffic_group, - "user_delete_log_button"); + user_delete_log_button=new QCheckBox(user_traffic_group); user_delete_log_button->setGeometry(172,21,15,15); - user_delete_log_label=new QLabel(user_delete_log_button, - tr("De&lete Log"), - user_traffic_group, - "user_delete_log_label"); + user_delete_log_label= + new QLabel(user_delete_log_button,tr("De&lete Log"),user_traffic_group); user_delete_log_label->setGeometry(192,21,150,19); user_delete_log_label->setFont(small_font); user_delete_log_label->setAlignment(AlignLeft|ShowPrefix); - user_delete_rec_button=new QCheckBox(user_traffic_group, - "user_delete_rec_button"); + user_delete_rec_button=new QCheckBox(user_traffic_group); user_delete_rec_button->setGeometry(172,42,15,15); - user_delete_rec_label=new QLabel(user_delete_rec_button, - tr("Delete &Report Data"), - user_traffic_group, - "user_delete_rec_label"); + user_delete_rec_label= + new QLabel(user_delete_rec_button,tr("Delete &Report Data"), + user_traffic_group); user_delete_rec_label->setGeometry(192,42,150,19); user_delete_rec_label->setFont(small_font); user_delete_rec_label->setAlignment(AlignLeft|ShowPrefix); - user_modify_template_button=new QCheckBox(user_traffic_group, - "user_modify_template_button"); + user_modify_template_button=new QCheckBox(user_traffic_group); user_modify_template_button->setGeometry(10,42,15,15); - user_modify_template_label=new QLabel(user_modify_template_button, - tr("&Modify Template"), - user_traffic_group, - "user_modify_template_label"); + user_modify_template_label= + new QLabel(user_modify_template_button,tr("&Modify Template"), + user_traffic_group); user_modify_template_label->setGeometry(30,42,100,19); user_modify_template_label->setFont(small_font); user_modify_template_label->setAlignment(AlignLeft|ShowPrefix); @@ -295,62 +256,49 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // OnAir Group Priviledges // - user_onair_group=new QButtonGroup(tr("OnAir Rights"),this, - "user_onair_group"); + user_onair_group=new QButtonGroup(tr("OnAir Rights"),this); user_onair_group->setGeometry(10,351,355,85); user_onair_group->setFont(font); - user_playout_log_button=new QCheckBox(user_onair_group, - "user_playout_log_button"); + user_playout_log_button=new QCheckBox(user_onair_group); user_playout_log_button->setGeometry(10,21,15,15); - user_playout_log_label=new QLabel(user_playout_log_button, - tr("&Playout Logs"), - user_onair_group, - "user_playout_log_label"); + user_playout_log_label= + new QLabel(user_playout_log_button,tr("&Playout Logs"),user_onair_group); user_playout_log_label->setGeometry(30,21,150,19); user_playout_log_label->setFont(small_font); user_playout_log_label->setAlignment(AlignLeft|ShowPrefix); - user_arrange_log_button=new QCheckBox(user_onair_group, - "user_arrange_log_button"); + user_arrange_log_button=new QCheckBox(user_onair_group); user_arrange_log_button->setGeometry(172,21,15,15); - user_arrange_log_label=new QLabel(user_arrange_log_button, - tr("&Rearrange Log Items"), - user_onair_group, - "user_arrange_log_label"); + user_arrange_log_label= + new QLabel(user_arrange_log_button,tr("&Rearrange Log Items"), + user_onair_group); user_arrange_log_label->setGeometry(192,21,150,19); user_arrange_log_label->setFont(small_font); user_arrange_log_label->setAlignment(AlignLeft|ShowPrefix); - user_addto_log_button=new QCheckBox(user_onair_group, - "user_addto_log_button"); + user_addto_log_button=new QCheckBox(user_onair_group); user_addto_log_button->setGeometry(10,42,15,15); - user_addto_log_label=new QLabel(user_addto_log_button, - tr("Add Log &Items"), - user_onair_group, - "user_addto_log_label"); + user_addto_log_label= + new QLabel(user_addto_log_button,tr("Add Log &Items"),user_onair_group); user_addto_log_label->setGeometry(30,42,150,19); user_addto_log_label->setFont(small_font); user_addto_log_label->setAlignment(AlignLeft|ShowPrefix); - user_removefrom_log_button=new QCheckBox(user_onair_group, - "user_removefrom_log_button"); + user_removefrom_log_button=new QCheckBox(user_onair_group); user_removefrom_log_button->setGeometry(172,42,15,15); - user_removefrom_log_label=new QLabel(user_removefrom_log_button, - tr("Delete Lo&g Items"), - user_onair_group, - "user_removefrom_log_label"); + user_removefrom_log_label= + new QLabel(user_removefrom_log_button,tr("Delete Lo&g Items"), + user_onair_group); user_removefrom_log_label->setGeometry(192,42,150,19); user_removefrom_log_label->setFont(small_font); user_removefrom_log_label->setAlignment(AlignLeft|ShowPrefix); - user_config_panels_button=new QCheckBox(user_onair_group, - "user_config_panels_button"); + user_config_panels_button=new QCheckBox(user_onair_group); user_config_panels_button->setGeometry(10,63,15,15); - user_config_panels_label=new QLabel(user_config_panels_button, - tr("Configure System Panels"), - user_onair_group, - "user_config_panels_label"); + user_config_panels_label= + new QLabel(user_config_panels_button,tr("Configure System Panels"), + user_onair_group); user_config_panels_label->setGeometry(30,63,150,19); user_config_panels_label->setFont(small_font); user_config_panels_label->setAlignment(AlignLeft|ShowPrefix); @@ -358,40 +306,32 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Podcast Group Priviledges // - user_podcast_group=new QButtonGroup(tr("Podcasting Rights"),this, - "user_podcast_group"); + user_podcast_group=new QButtonGroup(tr("Podcasting Rights"),this); user_podcast_group->setGeometry(10,446,355,66); user_podcast_group->setFont(font); - user_add_podcast_button=new QCheckBox(user_podcast_group, - "user_add_podcast_button"); + user_add_podcast_button=new QCheckBox(user_podcast_group); user_add_podcast_button->setGeometry(10,21,15,15); - user_add_podcast_label=new QLabel(user_add_podcast_button, - tr("Cre&ate Podcast"), - user_podcast_group, - "user_add_podcast_label"); + user_add_podcast_label= + new QLabel(user_add_podcast_button,tr("Cre&ate Podcast"), + user_podcast_group); user_add_podcast_label->setGeometry(30,21,150,19); user_add_podcast_label->setFont(small_font); user_add_podcast_label->setAlignment(AlignLeft|ShowPrefix); - user_edit_podcast_button=new QCheckBox(user_podcast_group, - "user_edit_podcast_button"); + user_edit_podcast_button=new QCheckBox(user_podcast_group); user_edit_podcast_button->setGeometry(172,21,15,15); - user_edit_podcast_label=new QLabel(user_edit_podcast_button, - tr("E&dit Podcast"), - user_podcast_group, - "user_edit_podcast_label"); + user_edit_podcast_label= + new QLabel(user_edit_podcast_button,tr("E&dit Podcast"),user_podcast_group); user_edit_podcast_label->setGeometry(192,21,150,19); user_edit_podcast_label->setFont(small_font); user_edit_podcast_label->setAlignment(AlignLeft|ShowPrefix); - user_delete_podcast_button=new QCheckBox(user_podcast_group, - "user_delete_podcast_button"); + user_delete_podcast_button=new QCheckBox(user_podcast_group); user_delete_podcast_button->setGeometry(10,42,15,15); - user_delete_podcast_label=new QLabel(user_delete_podcast_button, - tr("Dele&te Podcast"), - user_podcast_group, - "user_delete_podcast_label"); + user_delete_podcast_label= + new QLabel(user_delete_podcast_button,tr("Dele&te Podcast"), + user_podcast_group); user_delete_podcast_label->setGeometry(30,42,150,19); user_delete_podcast_label->setFont(small_font); user_delete_podcast_label->setAlignment(AlignLeft|ShowPrefix); @@ -399,7 +339,7 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Group Permissions Button // - user_assign_perms_button=new QPushButton(this,"user_assign_perms_button"); + user_assign_perms_button=new QPushButton(this); user_assign_perms_button->setGeometry(10,516,sizeHint().width()/2-20,50); user_assign_perms_button->setFont(font); user_assign_perms_button->setText(tr("Assign Group\nPermissions")); @@ -408,7 +348,7 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Feeds Permissions Button // - user_assign_feeds_button=new QPushButton(this,"user_assign_feeds_button"); + user_assign_feeds_button=new QPushButton(this); user_assign_feeds_button-> setGeometry(sizeHint().width()/2+10,516,sizeHint().width()/2-20,50); user_assign_feeds_button->setFont(font); @@ -418,7 +358,7 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -428,7 +368,7 @@ EditUser::EditUser(const QString &user,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); @@ -511,7 +451,7 @@ void EditUser::passwordData() { QString password; - RDPasswd *passwd=new RDPasswd(&password,this,"passwd"); + RDPasswd *passwd=new RDPasswd(&password,this); if(passwd->exec()==0) { user_user->setPassword(password); } @@ -521,7 +461,7 @@ void EditUser::passwordData() void EditUser::groupsData() { - EditUserPerms *dialog=new EditUserPerms(user_user,this,"dialog"); + EditUserPerms *dialog=new EditUserPerms(user_user,this); dialog->exec(); delete dialog; } @@ -529,7 +469,7 @@ void EditUser::groupsData() void EditUser::feedsData() { - EditFeedPerms *dialog=new EditFeedPerms(user_user,this,"dialog"); + EditFeedPerms *dialog=new EditFeedPerms(user_user,this); dialog->exec(); delete dialog; } diff --git a/rdadmin/edit_user.h b/rdadmin/edit_user.h index 5d62305d0..cb54f8f1e 100644 --- a/rdadmin/edit_user.h +++ b/rdadmin/edit_user.h @@ -2,9 +2,7 @@ // // Edit a Rivendell User // -// (C) Copyright 2002 Fred Gleason -// -// $Id: edit_user.h,v 1.21 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,12 +33,11 @@ #include - class EditUser : public QDialog { Q_OBJECT public: - EditUser(const QString &user,QWidget *parent=0,const char *name=0); + EditUser(const QString &user,QWidget *parent=0); ~EditUser(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_user_perms.cpp b/rdadmin/edit_user_perms.cpp index d259869e7..c96feda69 100644 --- a/rdadmin/edit_user_perms.cpp +++ b/rdadmin/edit_user_perms.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_user_perms.cpp,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,9 +35,8 @@ #include #include - -EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -65,7 +62,7 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent,const char *name) // // Groups Selector // - user_host_sel=new RDListSelector(this,"user_host_sel"); + user_host_sel=new RDListSelector(this); user_host_sel->sourceSetLabel(tr("Available Groups")); user_host_sel->destSetLabel(tr("Enabled Groups")); user_host_sel->setGeometry(10,10,380,130); @@ -73,7 +70,7 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -83,7 +80,7 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/edit_user_perms.h b/rdadmin/edit_user_perms.h index a10e4bb75..2d898b660 100644 --- a/rdadmin/edit_user_perms.h +++ b/rdadmin/edit_user_perms.h @@ -2,9 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_user_perms.h,v 1.6 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,12 +27,11 @@ #include - class EditUserPerms : public QDialog { Q_OBJECT public: - EditUserPerms(RDUser *user,QWidget *parent=0,const char *name=0); + EditUserPerms(RDUser *user,QWidget *parent=0); ~EditUserPerms(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/edit_vguest_resource.cpp b/rdadmin/edit_vguest_resource.cpp index 7c57e194c..00f5ba6b5 100644 --- a/rdadmin/edit_vguest_resource.cpp +++ b/rdadmin/edit_vguest_resource.cpp @@ -2,9 +2,7 @@ // // Edit a vGuest Resource Record. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_vguest_resource.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,8 +28,8 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, int *enginenum,int *devicenum, int *surfacenum,int *relaynum, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { edit_type=type; edit_enginenum=enginenum; @@ -58,10 +56,9 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Logitek Engine Number // - edit_enginenum_edit=new QLineEdit(this,"edit_enginenum_edit"); + edit_enginenum_edit=new QLineEdit(this); edit_enginenum_edit->setGeometry(135,10,50,20); - QLabel *label=new QLabel(edit_enginenum_edit,tr("Engine (Hex): "), - this,"edit_enginenum_label"); + QLabel *label=new QLabel(edit_enginenum_edit,tr("Engine (Hex): "),this); label->setGeometry(10,10,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -69,10 +66,9 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Logitek Device Number // - edit_devicenum_edit=new QLineEdit(this,"edit_devicenum_edit"); + edit_devicenum_edit=new QLineEdit(this); edit_devicenum_edit->setGeometry(135,36,50,20); - label=new QLabel(edit_devicenum_edit,tr("Device (Hex): "), - this,"edit_devicenum_label"); + label=new QLabel(edit_devicenum_edit,tr("Device (Hex): "),this); label->setGeometry(10,36,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -80,10 +76,9 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Logitek Surface Number // - edit_surfacenum_edit=new QLineEdit(this,"edit_surfacenum_edit"); + edit_surfacenum_edit=new QLineEdit(this); edit_surfacenum_edit->setGeometry(135,62,50,20); - label=new QLabel(edit_surfacenum_edit,tr("Surface (Hex): "), - this,"edit_surfacenum_label"); + label=new QLabel(edit_surfacenum_edit,tr("Surface (Hex): "),this); label->setGeometry(10,62,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -91,10 +86,10 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Logitek Relay Number // - edit_relaynum_edit=new QLineEdit(this,"edit_relaynum_edit"); + edit_relaynum_edit=new QLineEdit(this); edit_relaynum_edit->setGeometry(135,88,50,20); - edit_relaynum_label=new QLabel(edit_relaynum_edit,tr("Bus/Relay (Hex): "), - this,"edit_relaynum_label"); + edit_relaynum_label= + new QLabel(edit_relaynum_edit,tr("Bus/Relay (Hex): "),this); edit_relaynum_label->setGeometry(10,88,120,20); edit_relaynum_label->setFont(bold_font); edit_relaynum_label->setAlignment(AlignRight|AlignVCenter); @@ -102,7 +97,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -112,7 +107,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/edit_vguest_resource.h b/rdadmin/edit_vguest_resource.h index a4ddcb940..03b918f6b 100644 --- a/rdadmin/edit_vguest_resource.h +++ b/rdadmin/edit_vguest_resource.h @@ -2,9 +2,7 @@ // // Edit a vGuest Resource Record. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_vguest_resource.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,14 +31,12 @@ #include #include - class EditVguestResource : public QDialog { Q_OBJECT public: EditVguestResource(RDMatrix::VguestType type,int *enginenum,int *devicenum, - int *surfacenum,int *relaynum, - QWidget *parent=0,const char *name=0); + int *surfacenum,int *relaynum,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/globals.h b/rdadmin/globals.h index eadc984f3..c84c40a24 100644 --- a/rdadmin/globals.h +++ b/rdadmin/globals.h @@ -2,9 +2,7 @@ // // Global Definitions for RDAdmin // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: globals.h,v 1.11.4.1 2012/11/26 20:19:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef GLOBALS_H #define GLOBALS_H diff --git a/rdadmin/help_audios.cpp b/rdadmin/help_audios.cpp index 6867cc47f..555e51170 100644 --- a/rdadmin/help_audios.cpp +++ b/rdadmin/help_audios.cpp @@ -2,9 +2,7 @@ // // Display help for audio ports (edit_audios.*) // -// (C) Copyright 2006 Fred Gleason -// -// $Id: help_audios.cpp,v 1.7 2012/02/13 19:26:14 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,15 +17,13 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include - -HelpAudioPorts::HelpAudioPorts(QWidget *parent,const char *name) - : QDialog(parent,name,true) +HelpAudioPorts::HelpAudioPorts(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -69,7 +65,7 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent,const char *name) // // Close Button // - QPushButton *button=new QPushButton(this,"close_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Close")); diff --git a/rdadmin/help_audios.h b/rdadmin/help_audios.h index 591cada7b..eeee8ac8b 100644 --- a/rdadmin/help_audios.h +++ b/rdadmin/help_audios.h @@ -2,9 +2,7 @@ // // Display help for audio ports (edit_audios.*) // -// (C) Copyright 2006 Fred Gleason -// -// $Id: help_audios.h,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,7 @@ class HelpAudioPorts : public QDialog { Q_OBJECT public: - HelpAudioPorts(QWidget *parent=0,const char *name=0); + HelpAudioPorts(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -44,4 +42,4 @@ class HelpAudioPorts : public QDialog }; -#endif +#endif // HELP_AUDIOS_H diff --git a/rdadmin/importfields.cpp b/rdadmin/importfields.cpp index b86dce1d2..972672c72 100644 --- a/rdadmin/importfields.cpp +++ b/rdadmin/importfields.cpp @@ -2,9 +2,7 @@ // // Parser Parameters for RDAdmin. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: importfields.cpp,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,14 +17,13 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include -ImportFields::ImportFields(QWidget *parent,const char *name) - : QWidget(parent,name) +ImportFields::ImportFields(QWidget *parent) + : QWidget(parent) { QLabel *label; import_changed=false; @@ -34,20 +31,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Cartname Parser Data Section // - label=new QLabel(tr("Cart Number:"),this, - "_cartname_label"); + label=new QLabel(tr("Cart Number:"),this); label->setGeometry(0,0,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Cart Offset // - cart_offset_spin=new QSpinBox(this,"cart_offset_spin"); + cart_offset_spin=new QSpinBox(this); cart_offset_spin->setGeometry(175,0,50,19); cart_offset_spin->setRange(0,1024); - label=new QLabel(cart_offset_spin, - tr("Offset:"),this, - "cart_win_path_label"); + label=new QLabel(cart_offset_spin,tr("Offset:"),this); label->setGeometry(125,0,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(cart_offset_spin,SIGNAL(valueChanged(int)), @@ -56,12 +50,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Cart Length // - cart_length_spin=new QSpinBox(this,"cart_length_spin"); + cart_length_spin=new QSpinBox(this); cart_length_spin->setGeometry(285,0,50,19); cart_length_spin->setRange(0,6); - label=new QLabel(cart_length_spin, - tr("Length:"),this, - "cart_win_path_label"); + label=new QLabel(cart_length_spin,tr("Length:"),this); label->setGeometry(230,0,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(cart_length_spin,SIGNAL(valueChanged(int)), @@ -70,19 +62,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Title Parser Data Section // - label=new QLabel(tr("Title:"),this,"_cartname_label"); + label=new QLabel(tr("Title:"),this); label->setGeometry(0,21,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Title Cart Offset // - title_offset_spin=new QSpinBox(this,"title_offset_spin"); + title_offset_spin=new QSpinBox(this); title_offset_spin->setGeometry(175,21,50,19); title_offset_spin->setRange(0,1024); - label=new QLabel(title_offset_spin, - tr("Offset:"),this, - "title_win_path_label"); + label=new QLabel(title_offset_spin,tr("Offset:"),this); label->setGeometry(125,21,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(title_offset_spin,SIGNAL(valueChanged(int)), @@ -91,12 +81,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Title Cart Length // - title_length_spin=new QSpinBox(this,"title_length_spin"); + title_length_spin=new QSpinBox(this); title_length_spin->setGeometry(285,21,50,19); title_length_spin->setRange(0,255); - label=new QLabel(title_length_spin, - tr("Length:"),this, - "title_win_path_label"); + label=new QLabel(title_length_spin,tr("Length:"),this); label->setGeometry(230,21,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(title_length_spin,SIGNAL(valueChanged(int)), @@ -105,20 +93,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Hours Parser Data Section // - label=new QLabel(tr("Start Time - Hours:"),this, - "_startname_label"); + label=new QLabel(tr("Start Time - Hours:"),this); label->setGeometry(0,42,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Start Hours Offset // - hours_offset_spin=new QSpinBox(this,"hours_offset_spin"); + hours_offset_spin=new QSpinBox(this); hours_offset_spin->setGeometry(175,42,50,19); hours_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(hours_offset_spin, - tr("Offset:"),this, - "hours_win_path_label"); + label=new QLabel(hours_offset_spin,tr("Offset:"),this); label->setGeometry(125,42,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(hours_offset_spin,SIGNAL(valueChanged(int)), @@ -127,12 +112,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Hours Length // - hours_length_spin=new QSpinBox(this,"hours_length_spin"); + hours_length_spin=new QSpinBox(this); hours_length_spin->setGeometry(285,42,50,19); hours_length_spin->setRange(0,8); - label=new QLabel(hours_length_spin, - tr("Length:"),this, - "hours_win_path_label"); + label=new QLabel(hours_length_spin,tr("Length:"),this); label->setGeometry(230,42,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(hours_length_spin,SIGNAL(valueChanged(int)), @@ -141,20 +124,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Minutes Parser Data Section // - label=new QLabel(tr("Start Time - Minutes:"),this, - "_startname_label"); + label=new QLabel(tr("Start Time - Minutes:"),this); label->setGeometry(0,63,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Start Minutes Offset // - minutes_offset_spin=new QSpinBox(this,"minutes_offset_spin"); + minutes_offset_spin=new QSpinBox(this); minutes_offset_spin->setGeometry(175,63,50,19); minutes_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(minutes_offset_spin, - tr("Offset:"),this, - "minutes_win_path_label"); + label=new QLabel(minutes_offset_spin,tr("Offset:"),this); label->setGeometry(125,63,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(minutes_offset_spin,SIGNAL(valueChanged(int)), @@ -163,12 +143,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Minutes Length // - minutes_length_spin=new QSpinBox(this,"minutes_length_spin"); + minutes_length_spin=new QSpinBox(this); minutes_length_spin->setGeometry(285,63,50,19); minutes_length_spin->setRange(0,8); - label=new QLabel(minutes_length_spin, - tr("Length:"),this, - "minutes_win_path_label"); + label=new QLabel(minutes_length_spin,tr("Length:"),this); label->setGeometry(230,63,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(minutes_length_spin,SIGNAL(valueChanged(int)), @@ -177,20 +155,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Seconds Parser Data Section // - label=new QLabel(tr("Start Time - Seconds:"),this, - "_startname_label"); + label=new QLabel(tr("Start Time - Seconds:"),this); label->setGeometry(0,84,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Start Seconds Offset // - seconds_offset_spin=new QSpinBox(this,"seconds_offset_spin"); + seconds_offset_spin=new QSpinBox(this); seconds_offset_spin->setGeometry(175,84,50,19); seconds_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(seconds_offset_spin, - tr("Offset:"),this, - "seconds_win_path_label"); + label=new QLabel(seconds_offset_spin,tr("Offset:"),this); label->setGeometry(125,84,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(seconds_offset_spin,SIGNAL(valueChanged(int)), @@ -199,12 +174,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Start Seconds Length // - seconds_length_spin=new QSpinBox(this,"seconds_length_spin"); + seconds_length_spin=new QSpinBox(this); seconds_length_spin->setGeometry(285,84,50,19); seconds_length_spin->setRange(0,8); - label=new QLabel(seconds_length_spin, - tr("Length:"),this, - "seconds_win_path_label"); + label=new QLabel(seconds_length_spin,tr("Length:"),this); label->setGeometry(230,84,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(seconds_length_spin,SIGNAL(valueChanged(int)), @@ -213,20 +186,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Hours Parser Data Section // - label=new QLabel(tr("Length - Hours:"),this, - "_lengthname_label"); + label=new QLabel(tr("Length - Hours:"),this); label->setGeometry(0,106,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Length Hours Offset // - len_hours_offset_spin=new QSpinBox(this,"len_hours_offset_spin"); + len_hours_offset_spin=new QSpinBox(this); len_hours_offset_spin->setGeometry(175,106,50,19); len_hours_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(len_hours_offset_spin, - tr("Offset:"),this, - "len_hours_win_path_label"); + label=new QLabel(len_hours_offset_spin,tr("Offset:"),this); label->setGeometry(125,106,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_hours_offset_spin,SIGNAL(valueChanged(int)), @@ -235,12 +205,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Hours Length // - len_hours_length_spin=new QSpinBox(this,"len_hours_length_spin"); + len_hours_length_spin=new QSpinBox(this); len_hours_length_spin->setGeometry(285,106,50,19); len_hours_length_spin->setRange(0,8); - label=new QLabel(len_hours_length_spin, - tr("Length:"),this, - "len_hours_win_path_label"); + label=new QLabel(len_hours_length_spin,tr("Length:"),this); label->setGeometry(230,106,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_hours_length_spin,SIGNAL(valueChanged(int)), @@ -249,20 +217,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Minutes Parser Data Section // - label=new QLabel(tr("Length - Minutes:"),this, - "_lengthname_label"); + label=new QLabel(tr("Length - Minutes:"),this); label->setGeometry(0,127,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Length Minutes Offset // - len_minutes_offset_spin=new QSpinBox(this,"len_minutes_offset_spin"); + len_minutes_offset_spin=new QSpinBox(this); len_minutes_offset_spin->setGeometry(175,127,50,19); len_minutes_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(len_minutes_offset_spin, - tr("Offset:"),this, - "len_minutes_win_path_label"); + label=new QLabel(len_minutes_offset_spin,tr("Offset:"),this); label->setGeometry(125,127,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_minutes_offset_spin,SIGNAL(valueChanged(int)), @@ -271,12 +236,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Minutes Length // - len_minutes_length_spin=new QSpinBox(this,"len_minutes_length_spin"); + len_minutes_length_spin=new QSpinBox(this); len_minutes_length_spin->setGeometry(285,127,50,19); len_minutes_length_spin->setRange(0,8); - label=new QLabel(len_minutes_length_spin, - tr("Length:"),this, - "len_minutes_win_path_label"); + label=new QLabel(len_minutes_length_spin,tr("Length:"),this); label->setGeometry(230,127,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_minutes_length_spin,SIGNAL(valueChanged(int)), @@ -285,20 +248,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Seconds Parser Data Section // - label=new QLabel(tr("Length - Seconds:"),this, - "_lengthname_label"); + label=new QLabel(tr("Length - Seconds:"),this); label->setGeometry(0,148,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Length Seconds Offset // - len_seconds_offset_spin=new QSpinBox(this,"len_seconds_offset_spin"); + len_seconds_offset_spin=new QSpinBox(this); len_seconds_offset_spin->setGeometry(175,148,50,19); len_seconds_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(len_seconds_offset_spin, - tr("Offset:"),this, - "len_seconds_win_path_label"); + label=new QLabel(len_seconds_offset_spin,tr("Offset:"),this); label->setGeometry(125,148,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_seconds_offset_spin,SIGNAL(valueChanged(int)), @@ -307,12 +267,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Length Seconds Length // - len_seconds_length_spin=new QSpinBox(this,"len_seconds_length_spin"); + len_seconds_length_spin=new QSpinBox(this); len_seconds_length_spin->setGeometry(285,148,50,19); len_seconds_length_spin->setRange(0,8); - label=new QLabel(len_seconds_length_spin, - tr("Length:"),this, - "len_seconds_win_path_label"); + label=new QLabel(len_seconds_length_spin,tr("Length:"),this); label->setGeometry(230,148,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(len_seconds_length_spin,SIGNAL(valueChanged(int)), @@ -321,20 +279,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Contract # Parser Data Section // - label=new QLabel(tr("Contract #:"),this, - "_dataname_label"); + label=new QLabel(tr("Contract #:"),this); label->setGeometry(0,169,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Contract # Offset // - data_offset_spin=new QSpinBox(this,"data_offset_spin"); + data_offset_spin=new QSpinBox(this); data_offset_spin->setGeometry(175,169,50,19); data_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(data_offset_spin, - tr("Offset:"),this, - "data_win_path_label"); + label=new QLabel(data_offset_spin,tr("Offset:"),this); label->setGeometry(125,169,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(data_offset_spin,SIGNAL(valueChanged(int)), @@ -343,12 +298,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Contract # Length // - data_length_spin=new QSpinBox(this,"data_length_spin"); + data_length_spin=new QSpinBox(this); data_length_spin->setGeometry(285,169,50,19); data_length_spin->setRange(0,32); - label=new QLabel(data_length_spin, - tr("Length:"),this, - "data_win_path_label"); + label=new QLabel(data_length_spin,tr("Length:"),this); label->setGeometry(230,169,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(data_length_spin,SIGNAL(valueChanged(int)), @@ -357,20 +310,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Event ID Parser Data Section // - label=new QLabel(tr("Event ID:"),this, - "_event_idname_label"); + label=new QLabel(tr("Event ID:"),this); label->setGeometry(0,190,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Event ID Offset // - event_id_offset_spin=new QSpinBox(this,"event_id_offset_spin"); + event_id_offset_spin=new QSpinBox(this); event_id_offset_spin->setGeometry(175,190,50,19); event_id_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(event_id_offset_spin, - tr("Offset:"),this, - "event_id_win_path_label"); + label=new QLabel(event_id_offset_spin,tr("Offset:"),this); label->setGeometry(125,190,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(event_id_offset_spin,SIGNAL(valueChanged(int)), @@ -379,12 +329,10 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Event ID Length // - event_id_length_spin=new QSpinBox(this,"event_id_length_spin"); + event_id_length_spin=new QSpinBox(this); event_id_length_spin->setGeometry(285,190,50,19); event_id_length_spin->setRange(0,8); - label=new QLabel(event_id_length_spin, - tr("Length:"),this, - "event_id_win_path_label"); + label=new QLabel(event_id_length_spin,tr("Length:"),this); label->setGeometry(230,190,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(event_id_length_spin,SIGNAL(valueChanged(int)), @@ -393,20 +341,17 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Announcement Type Parser Data Section // - label=new QLabel(tr("Annc. Type:"),this, - "_annctypename_label"); + label=new QLabel(tr("Annc. Type:"),this); label->setGeometry(0,211,120,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Traffic Announcement Type Offset // - annctype_offset_spin=new QSpinBox(this,"annctype_offset_spin"); + annctype_offset_spin=new QSpinBox(this); annctype_offset_spin->setGeometry(175,211,50,19); annctype_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); - label=new QLabel(annctype_offset_spin, - tr("Offset:"),this, - "annctype_win_path_label"); + label=new QLabel(annctype_offset_spin,tr("Offset:"),this); label->setGeometry(125,211,45,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(annctype_offset_spin,SIGNAL(valueChanged(int)), @@ -415,17 +360,14 @@ ImportFields::ImportFields(QWidget *parent,const char *name) // // Traffic Announcement Type Length // - annctype_length_spin=new QSpinBox(this,"annctype_length_spin"); + annctype_length_spin=new QSpinBox(this); annctype_length_spin->setGeometry(285,211,50,19); annctype_length_spin->setRange(0,8); - label=new QLabel(annctype_length_spin, - tr("Length:"),this, - "annctype_win_path_label"); + label=new QLabel(annctype_length_spin,tr("Length:"),this); label->setGeometry(230,211,50,19); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(annctype_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); - } diff --git a/rdadmin/importfields.h b/rdadmin/importfields.h index d0dbb8368..0d93e2af9 100644 --- a/rdadmin/importfields.h +++ b/rdadmin/importfields.h @@ -2,9 +2,7 @@ // // Parser Parameters for RDAdmin. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: importfields.h,v 1.2 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class ImportFields : public QWidget { Q_OBJECT public: - ImportFields(QWidget *parent=0,const char *name=0); + ImportFields(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; bool changed() const; diff --git a/rdadmin/info_dialog.cpp b/rdadmin/info_dialog.cpp index 581a361a4..7765ea153 100644 --- a/rdadmin/info_dialog.cpp +++ b/rdadmin/info_dialog.cpp @@ -2,9 +2,7 @@ // // Display System Information for Rivendell // -// (C) Copyright 2002-2014 Fred Gleason -// -// $Id: info_dialog.cpp,v 1.17.8.1 2014/01/06 22:35:13 cvs Exp $ +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,8 +45,8 @@ #include #include -InfoDialog::InfoDialog(QWidget *parent,const char *name) - : QDialog(parent,name,true) +InfoDialog::InfoDialog(QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -82,7 +80,7 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) QImage *image=new QImage(460,35,16); image->loadFromData(xpm_info_banner1,strlen((const char *)xpm_info_banner1), "XPM"); - QLabel *label=new QLabel(this,"top_banner"); + QLabel *label=new QLabel(this); QPixmap pix(460,35); pix.convertFromImage(*image); label->setGeometry(0,0,460,35); @@ -90,7 +88,7 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) image->loadFromData(xpm_info_banner2,strlen((const char *)xpm_info_banner2), "XPM"); - label=new QLabel(this,"bottom_banner"); + label=new QLabel(this); pix.convertFromImage(*image); label->setGeometry(0,sizeHint().height()-35,460,35); label->setPixmap(pix); @@ -98,14 +96,14 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) // // Title // - label=new QLabel(tr("Rivendell"),this,"title_label"); + label=new QLabel(tr("Rivendell"),this); label->setGeometry(10,41,120,36); label->setFont(title_font); // // Slogan // - label=new QLabel(tr("A Radio Automation System"),this,"title_label"); + label=new QLabel(tr("A Radio Automation System"),this); label->setGeometry(130,52,200,18); label->setAlignment(AlignVCenter|AlignRight); label->setFont(slogan_font); @@ -114,15 +112,13 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) // Version // str=QString(tr("Version")); - label=new QLabel(QString().sprintf("%s %s",(const char *)str,VERSION), - this,"title_label"); + label=new QLabel(QString().sprintf("%s %s",(const char *)str,VERSION),this); label->setGeometry(10,73,200,14); label->setFont(font); str=QString(tr("Database Schema")); label=new QLabel(QString().sprintf("%s %d",(const char *)str, - RD_VERSION_DATABASE), - this,"title_label"); + RD_VERSION_DATABASE),this); label->setGeometry(210,73,120,14); label->setAlignment(AlignVCenter|AlignRight); label->setFont(font); @@ -132,14 +128,14 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) // str=QString(tr("Copyright 2002-2014")); label=new QLabel(QString().sprintf("%s %s",(const char *)str, - PACKAGE_BUGREPORT),this,"title_label"); + PACKAGE_BUGREPORT),this); label->setGeometry(10,87,sizeHint().width()-20,14); label->setFont(font); // // Disclaimer // - label=new RDLabel(this,"title_label"); + label=new RDLabel(this); label->setGeometry(10,104,sizeHint().width()-20,60); label->setFont(font); label->setText(tr("This program is free software, and comes with ABSOLUTELY NO WARRANTY,\nnot even the implied warranties of MERCHANTIBILITY or FITNESS FOR A\nPARTICULAR PURPOSE. Touch the \"View License\" button for details.")); @@ -147,7 +143,7 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) // // License Button // - QPushButton *button=new QPushButton(this,"license_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()/2-45,174,80,50); button->setFont(button_font); button->setText(tr("View\n&License")); @@ -156,7 +152,7 @@ InfoDialog::InfoDialog(QWidget *parent,const char *name) // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-90, 80,50); button->setFont(button_font); @@ -180,7 +176,7 @@ QSizePolicy InfoDialog::sizePolicy() const void InfoDialog::viewLicenseData() { - RDLicense *lic=new RDLicense(this,"license_dialog"); + RDLicense *lic=new RDLicense(this); lic->exec(RDLicense::GplV2); delete lic; } diff --git a/rdadmin/info_dialog.h b/rdadmin/info_dialog.h index 11074f61b..be6142f66 100644 --- a/rdadmin/info_dialog.h +++ b/rdadmin/info_dialog.h @@ -2,9 +2,7 @@ // // Display System Information for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: info_dialog.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,13 +36,11 @@ extern const unsigned char xpm_infobanner1[]; extern const unsigned char xpm_infobanner2[]; - - class InfoDialog : public QDialog { Q_OBJECT public: - InfoDialog(QWidget *parent=0,const char *name=0); + InfoDialog(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_aux_fields.cpp b/rdadmin/list_aux_fields.cpp index c020dd40f..6d5d668eb 100644 --- a/rdadmin/list_aux_fields.cpp +++ b/rdadmin/list_aux_fields.cpp @@ -2,9 +2,7 @@ // // List Auxiliary Fields for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_aux_fields.cpp,v 1.5 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,9 +29,8 @@ #include #include - -ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent) + : QDialog(parent,"",true) { list_feed_id=feed_id; setCaption(tr("Auxiliary Metadata Fields")); @@ -57,12 +54,10 @@ ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) // // Fields List Box // - list_list_view=new QListView(this,"list_box"); + list_list_view=new QListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); - QLabel *label= - new QLabel(list_list_view,tr("Auxiliary Metadata Fields"), - this,"list_list_view_label"); + QLabel *label=new QLabel(list_list_view,tr("Auxiliary Metadata Fields"),this); label->setFont(bold_font); label->setGeometry(14,5,sizeHint().width()-28,19); list_list_view->setAllColumnsShowFocus(true); @@ -79,7 +74,7 @@ ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) // // Add Button // - QPushButton *button=new QPushButton(this,"add_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Add")); @@ -88,7 +83,7 @@ ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) // // Edit Button // - button=new QPushButton(this,"edit_button"); + button=new QPushButton(this); button->setGeometry(100,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -97,7 +92,7 @@ ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) // // Delete Button // - button=new QPushButton(this,"delete_button"); + button=new QPushButton(this); button->setGeometry(190,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Delete")); @@ -106,7 +101,7 @@ ListAuxFields::ListAuxFields(unsigned feed_id,QWidget *parent,const char *name) // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/list_aux_fields.h b/rdadmin/list_aux_fields.h index 99f7fe534..1da22182b 100644 --- a/rdadmin/list_aux_fields.h +++ b/rdadmin/list_aux_fields.h @@ -2,9 +2,7 @@ // // List Auxiliary Fields for an RSS Feed // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_aux_fields.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,12 +29,11 @@ #include - class ListAuxFields : public QDialog { Q_OBJECT public: - ListAuxFields(unsigned feed_id,QWidget *parent=0,const char *name=0); + ListAuxFields(unsigned feed_id,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_dropboxes.cpp b/rdadmin/list_dropboxes.cpp index 68ddda846..24ce592af 100644 --- a/rdadmin/list_dropboxes.cpp +++ b/rdadmin/list_dropboxes.cpp @@ -2,9 +2,7 @@ // // List Rivendell Dropboxes // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_dropboxes.cpp,v 1.7.8.1 2013/12/11 20:17:14 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include -ListDropboxes::ListDropboxes(const QString &stationname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListDropboxes::ListDropboxes(const QString &stationname,QWidget *parent) + : QDialog(parent,"",true) { list_stationname=stationname; @@ -64,7 +61,7 @@ ListDropboxes::ListDropboxes(const QString &stationname, // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -72,7 +69,7 @@ ListDropboxes::ListDropboxes(const QString &stationname, // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -80,7 +77,7 @@ ListDropboxes::ListDropboxes(const QString &stationname, // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -88,7 +85,7 @@ ListDropboxes::ListDropboxes(const QString &stationname, // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -97,7 +94,7 @@ ListDropboxes::ListDropboxes(const QString &stationname, // // Group List // - list_dropboxes_view=new RDListView(this,"list_dropboxes_view"); + list_dropboxes_view=new RDListView(this); list_dropboxes_view->setFont(list_font); list_dropboxes_view->setAllColumnsShowFocus(true); list_dropboxes_view->addColumn(tr("Group")); @@ -151,7 +148,7 @@ void ListDropboxes::addData() RDDropbox *box=new RDDropbox(-1,list_stationname); int id=box->id(); delete box; - EditDropbox *edit_dropbox=new EditDropbox(id,this,"edit_dropbox"); + EditDropbox *edit_dropbox=new EditDropbox(id,this); if(edit_dropbox->exec()<0) { QString sql=QString().sprintf("delete from DROPBOXES where ID=%d",id); RDSqlQuery *q=new RDSqlQuery(sql); @@ -174,7 +171,7 @@ void ListDropboxes::editData() if(item==NULL) { return; } - EditDropbox *edit_dropbox=new EditDropbox(item->id(),this,"edit_dropbox"); + EditDropbox *edit_dropbox=new EditDropbox(item->id(),this); edit_dropbox->exec(); delete edit_dropbox; RefreshItem(item); diff --git a/rdadmin/list_dropboxes.h b/rdadmin/list_dropboxes.h index 5b64eeaf2..0c11d5c6d 100644 --- a/rdadmin/list_dropboxes.h +++ b/rdadmin/list_dropboxes.h @@ -2,9 +2,7 @@ // // List Rivendell Dropbox Configurations // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_dropboxes.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,13 +30,11 @@ #include #include - class ListDropboxes : public QDialog { Q_OBJECT public: - ListDropboxes(const QString &stationname, - QWidget *parent=0,const char *name=0); + ListDropboxes(const QString &stationname,QWidget *parent=0); ~ListDropboxes(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_encoders.cpp b/rdadmin/list_encoders.cpp index bbb035fa2..7c9123a1a 100644 --- a/rdadmin/list_encoders.cpp +++ b/rdadmin/list_encoders.cpp @@ -2,9 +2,7 @@ // // List a Rivendell Encoders // -// (C) Copyright 2008 Fred Gleason -// -// $Id: list_encoders.cpp,v 1.5 2012/02/13 19:26:14 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,9 +31,8 @@ #include #include -ListEncoders::ListEncoders(const QString &stationname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListEncoders::ListEncoders(const QString &stationname,QWidget *parent) + : QDialog(parent,"",true) { list_stationname=stationname; setCaption(tr("RDAdmin - List Encoders")); @@ -57,9 +54,9 @@ ListEncoders::ListEncoders(const QString &stationname, // // Encoders List Box // - list_list_view=new RDListView(this,"list_box"); - list_list_label=new QLabel(list_list_view,tr("Encoders on")+" "+stationname, - this,"list_list_label"); + list_list_view=new RDListView(this); + list_list_label= + new QLabel(list_list_view,tr("Encoders on")+" "+stationname,this); list_list_label->setFont(bold_font); list_list_view->setAllColumnsShowFocus(true); list_list_view->setItemMargin(5); @@ -80,7 +77,7 @@ ListEncoders::ListEncoders(const QString &stationname, // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(bold_font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -88,7 +85,7 @@ ListEncoders::ListEncoders(const QString &stationname, // // Edit Button // - list_edit_button=new QPushButton(this,"edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(bold_font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -96,7 +93,7 @@ ListEncoders::ListEncoders(const QString &stationname, // // Delete Button // - list_delete_button=new QPushButton(this,"delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(bold_font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -104,7 +101,7 @@ ListEncoders::ListEncoders(const QString &stationname, // // Close Button // - list_close_button=new QPushButton(this,"close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(bold_font); list_close_button->setText(tr("&Close")); diff --git a/rdadmin/list_encoders.h b/rdadmin/list_encoders.h index 3a6d18591..87a951033 100644 --- a/rdadmin/list_encoders.h +++ b/rdadmin/list_encoders.h @@ -2,9 +2,7 @@ // // List Rivendell Encoders // -// (C) Copyright 2008 Fred Gleason -// -// $Id: list_encoders.h,v 1.4 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,12 +30,11 @@ #include #include - class ListEncoders : public QDialog { Q_OBJECT public: - ListEncoders(const QString &stationname,QWidget *parent=0,const char *name=0); + ListEncoders(const QString &stationname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_endpoints.cpp b/rdadmin/list_endpoints.cpp index a457b694e..abb9bb0dc 100644 --- a/rdadmin/list_endpoints.cpp +++ b/rdadmin/list_endpoints.cpp @@ -2,9 +2,7 @@ // // List a Rivendell Endpoints // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_endpoints.cpp,v 1.18.8.1 2013/11/17 04:27:05 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,10 +31,9 @@ #include #include - ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -78,11 +75,11 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, // // Endpoints List Box // - list_list_view=new QListView(this,"list_box"); + list_list_view=new QListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label= - new QLabel(list_list_view,list_table,this,"list_list_view_label"); + new QLabel(list_list_view,list_table,this); label->setFont(bold_font); label->setGeometry(14,5,85,19); list_list_view->setAllColumnsShowFocus(true); @@ -156,7 +153,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, // // Edit Button // - QPushButton *button=new QPushButton(this,"edit_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -166,7 +163,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -176,7 +173,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); diff --git a/rdadmin/list_endpoints.h b/rdadmin/list_endpoints.h index 141872acf..a85ba357d 100644 --- a/rdadmin/list_endpoints.h +++ b/rdadmin/list_endpoints.h @@ -2,9 +2,7 @@ // // List Rivendell Endpoints // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_endpoints.h,v 1.8 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,13 +30,11 @@ #include #include - class ListEndpoints : public QDialog { Q_OBJECT public: - ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, - QWidget *parent=0,const char *name=0); + ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index 2c7edaaf3..af9198ef0 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -2,9 +2,7 @@ // // List Rivendell Feeds // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_feeds.cpp,v 1.9 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -48,8 +46,8 @@ #include #include -ListFeeds::ListFeeds(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListFeeds::ListFeeds(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -72,7 +70,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -80,7 +78,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -88,7 +86,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -96,7 +94,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -105,7 +103,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) // // Group List // - list_feeds_view=new RDListView(this,"list_feeds_view"); + list_feeds_view=new RDListView(this); list_feeds_view->setFont(list_font); list_feeds_view->setAllColumnsShowFocus(true); list_feeds_view->addColumn(tr("Key")); @@ -118,8 +116,7 @@ ListFeeds::ListFeeds(QWidget *parent,const char *name) list_feeds_view->setColumnAlignment(3,AlignVCenter|AlignLeft); list_feeds_view->addColumn(tr("Creation Date")); list_feeds_view->setColumnAlignment(4,AlignCenter); - QLabel *list_box_label=new QLabel(list_feeds_view,tr("&Feeds:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_feeds_view,tr("&Feeds:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_feeds_view, @@ -155,7 +152,7 @@ void ListFeeds::addData() QString sql; RDSqlQuery *q; - AddFeed *add_feed=new AddFeed(&id,&feed,this,"add_feed"); + AddFeed *add_feed=new AddFeed(&id,&feed,this); if(add_feed->exec()<0) { delete add_feed; return; @@ -198,7 +195,7 @@ void ListFeeds::editData() if(item==NULL) { return; } - EditFeed *edit_feed=new EditFeed(item->text(0),this,"edit_feed"); + EditFeed *edit_feed=new EditFeed(item->text(0),this); edit_feed->exec(); delete edit_feed; RefreshItem(item); diff --git a/rdadmin/list_feeds.h b/rdadmin/list_feeds.h index 1e9e2bcf8..6f1a25f3a 100644 --- a/rdadmin/list_feeds.h +++ b/rdadmin/list_feeds.h @@ -2,9 +2,7 @@ // // List Rivendell Feeds // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_feeds.h,v 1.3 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,12 +29,11 @@ #include - class ListFeeds : public QDialog { Q_OBJECT public: - ListFeeds(QWidget *parent=0,const char *name=0); + ListFeeds(QWidget *parent=0); ~ListFeeds(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_gpis.cpp b/rdadmin/list_gpis.cpp index 85be7eaec..309be233d 100644 --- a/rdadmin/list_gpis.cpp +++ b/rdadmin/list_gpis.cpp @@ -1,10 +1,8 @@ // list_gpis.cpp // -// List a Rivendell GPIOs +// List Rivendell GPIOs // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: list_gpis.cpp,v 1.13.8.1 2013/11/17 04:27:05 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,10 +34,8 @@ #include #include - -ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -81,9 +77,9 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, // // Gpis List Box // - list_list_view=new QListView(this,"list_box"); + list_list_view=new QListView(this); list_list_label= - new QLabel(list_list_view,list_label,this,"list_view_label"); + new QLabel(list_list_view,list_label,this); list_list_label->setFont(bold_font); list_list_view->setAllColumnsShowFocus(true); list_list_view->setItemMargin(5); @@ -118,7 +114,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(bold_font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -126,7 +122,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, // // Ok Button // - list_ok_button=new QPushButton(this,"list_ok_button"); + list_ok_button=new QPushButton(this); list_ok_button->setDefault(true); list_ok_button->setFont(bold_font); list_ok_button->setText(tr("&OK")); @@ -135,7 +131,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, // // Cancel Button // - list_cancel_button=new QPushButton(this,"list_cancel_button"); + list_cancel_button=new QPushButton(this); list_cancel_button->setFont(bold_font); list_cancel_button->setText(tr("&Cancel")); connect(list_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -256,8 +252,7 @@ void ListGpis::editData() if(!item->text(3).isEmpty()) { offcart=item->text(3).toInt(); } - EditGpi *gpi_box= - new EditGpi(gpi,&oncart,&ondesc,&offcart,&offdesc,this,"gpi_box"); + EditGpi *gpi_box=new EditGpi(gpi,&oncart,&ondesc,&offcart,&offdesc,this); if(gpi_box->exec()==0) { if(oncart>0) { item->setText(1,QString().sprintf("%06d",oncart)); diff --git a/rdadmin/list_gpis.h b/rdadmin/list_gpis.h index 5249d9d6e..480f386e0 100644 --- a/rdadmin/list_gpis.h +++ b/rdadmin/list_gpis.h @@ -2,9 +2,7 @@ // // List Rivendell GPIs // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_gpis.h,v 1.7 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,13 +30,11 @@ #include #include - class ListGpis : public QDialog { Q_OBJECT public: - ListGpis(RDMatrix *matrix,RDMatrix::GpioType type, - QWidget *parent=0,const char *name=0); + ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_groups.cpp b/rdadmin/list_groups.cpp index 39c211b42..d583f7152 100644 --- a/rdadmin/list_groups.cpp +++ b/rdadmin/list_groups.cpp @@ -2,9 +2,7 @@ // // List Rivendell Groups // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_groups.cpp,v 1.27.6.1 2013/11/13 23:36:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,9 +42,8 @@ #include #include - -ListGroups::ListGroups(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListGroups::ListGroups(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -69,7 +66,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -77,7 +74,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -85,7 +82,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Rename Button // - list_rename_button=new QPushButton(this,"list_rename_button"); + list_rename_button=new QPushButton(this); list_rename_button->setFont(font); list_rename_button->setText(tr("&Rename")); connect(list_rename_button,SIGNAL(clicked()),this,SLOT(renameData())); @@ -93,7 +90,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -101,7 +98,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Report Button // - list_report_button=new QPushButton(this,"list_report_button"); + list_report_button=new QPushButton(this); list_report_button->setFont(font); list_report_button->setText(tr("Generate\n&Report")); connect(list_report_button,SIGNAL(clicked()),this,SLOT(reportData())); @@ -109,7 +106,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -118,7 +115,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) // // Group List // - list_groups_view=new RDListView(this,"list_groups_view"); + list_groups_view=new RDListView(this); list_groups_view->setFont(list_font); list_groups_view->setAllColumnsShowFocus(true); list_groups_view->addColumn(tr("NAME")); @@ -137,8 +134,7 @@ ListGroups::ListGroups(QWidget *parent,const char *name) list_groups_view->setColumnAlignment(7,Qt::AlignHCenter); list_groups_view->addColumn(tr("NOW & NEXT")); list_groups_view->setColumnAlignment(8,Qt::AlignHCenter); - QLabel *list_box_label=new QLabel(list_groups_view,tr("&Groups:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_groups_view,tr("&Groups:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_groups_view, @@ -171,7 +167,7 @@ void ListGroups::addData() { QString group; - AddGroup *add_group=new AddGroup(&group,this,"add_group"); + AddGroup *add_group=new AddGroup(&group,this); if(add_group->exec()<0) { delete add_group; return; @@ -193,7 +189,7 @@ void ListGroups::editData() if(item==NULL) { return; } - EditGroup *edit_group=new EditGroup(item->text(0),this,"edit_group"); + EditGroup *edit_group=new EditGroup(item->text(0),this); edit_group->exec(); delete edit_group; edit_group=NULL; @@ -209,7 +205,7 @@ void ListGroups::renameData() } QString groupname=item->text(0); - RenameGroup *rename_group=new RenameGroup(groupname,this,"rename_group"); + RenameGroup *rename_group=new RenameGroup(groupname,this); rename_group->exec(); delete rename_group; rename_group=NULL; diff --git a/rdadmin/list_groups.h b/rdadmin/list_groups.h index fd09fd2f8..fdcd512b4 100644 --- a/rdadmin/list_groups.h +++ b/rdadmin/list_groups.h @@ -2,9 +2,7 @@ // // List Rivendell Groups // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_groups.h,v 1.13 2010/07/29 19:32:34 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,12 +30,11 @@ #include #include - class ListGroups : public QDialog { Q_OBJECT public: - ListGroups(QWidget *parent=0,const char *name=0); + ListGroups(QWidget *parent=0); ~ListGroups(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_hostvars.cpp b/rdadmin/list_hostvars.cpp index 8d0ae3c29..3a3f52ef1 100644 --- a/rdadmin/list_hostvars.cpp +++ b/rdadmin/list_hostvars.cpp @@ -2,9 +2,7 @@ // // List Rivendell Host Variables // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_hostvars.cpp,v 1.12 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,9 +36,8 @@ #include #include - -ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListHostvars::ListHostvars(QString station,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -68,10 +65,9 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // Matrix List Box // - list_view=new QListView(this,"list_box"); + list_view=new QListView(this); list_view->setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-114); - QLabel *label=new QLabel(list_view,tr("Host Variables"), - this,"list_view_label"); + QLabel *label=new QLabel(list_view,tr("Host Variables"),this); label->setFont(font); label->setGeometry(14,5,sizeHint().width()-28,19); list_view->setAllColumnsShowFocus(true); @@ -90,7 +86,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // Add Button // - QPushButton *add_button=new QPushButton(this,"add_button"); + QPushButton *add_button=new QPushButton(this); add_button->setGeometry(10,sizeHint().height()-80,80,50); add_button->setFont(font); add_button->setText(tr("&Add")); @@ -99,7 +95,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(100,sizeHint().height()-80,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -108,7 +104,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // Delete Button // - QPushButton *delete_button=new QPushButton(this,"delete_button"); + QPushButton *delete_button=new QPushButton(this); delete_button->setGeometry(190,sizeHint().height()-80,80,50); delete_button->setFont(font); delete_button->setText(tr("&Delete")); @@ -117,7 +113,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // OK Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60, 80,50); button->setDefault(true); @@ -128,7 +124,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setDefault(true); @@ -162,8 +158,7 @@ void ListHostvars::addData() QString varvalue; QString varremark; AddHostvar *var_dialog= - new AddHostvar(list_station,&varname,&varvalue,&varremark, - this,"var_dialog"); + new AddHostvar(list_station,&varname,&varvalue,&varremark,this); if(var_dialog->exec()==0) { QListViewItem *item=new QListViewItem(list_view); item->setText(0,varname); @@ -183,8 +178,7 @@ void ListHostvars::editData() QString varvalue=item->text(1); QString varremark=item->text(2); EditHostvar *var_dialog= - new EditHostvar(list_station,item->text(0),&varvalue,&varremark, - this,"var_dialog"); + new EditHostvar(list_station,item->text(0),&varvalue,&varremark,this); if(var_dialog->exec()==0) { item->setText(1,varvalue); item->setText(2,varremark); diff --git a/rdadmin/list_hostvars.h b/rdadmin/list_hostvars.h index 190b58794..63a154a9b 100644 --- a/rdadmin/list_hostvars.h +++ b/rdadmin/list_hostvars.h @@ -2,9 +2,7 @@ // // List Rivendell Host Variables // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_hostvars.h,v 1.5 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include #include - class ListHostvars : public QDialog { Q_OBJECT public: - ListHostvars(QString station,QWidget *parent=0,const char *name=0); + ListHostvars(QString station,QWidget *parent=0); ~ListHostvars(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_livewiregpios.cpp b/rdadmin/list_livewiregpios.cpp index 5344cd9e1..b64cf50fb 100644 --- a/rdadmin/list_livewiregpios.cpp +++ b/rdadmin/list_livewiregpios.cpp @@ -2,9 +2,7 @@ // // List Rivendell Livewire GPIO Slot Associations // -// (C) Copyright 2013 Fred Gleason -// -// $Id: list_livewiregpios.cpp,v 1.1.2.3 2013/03/09 00:21:12 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,8 @@ #include ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -65,9 +63,9 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, // // Matrix List Box // - list_view=new RDListView(this,"list_box"); + list_view=new RDListView(this); list_view->setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); - QLabel *label=new QLabel(list_view,tr("Switchers:"),this,"list_view_label"); + QLabel *label=new QLabel(list_view,tr("Switchers:"),this); label->setFont(font); label->setGeometry(14,5,85,19); list_view->setAllColumnsShowFocus(true); @@ -87,7 +85,7 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(10,sizeHint().height()-60,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -96,7 +94,7 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60, 80,50); ok_button->setDefault(true); @@ -107,7 +105,7 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setDefault(true); diff --git a/rdadmin/list_livewiregpios.h b/rdadmin/list_livewiregpios.h index 5533a4310..4cb491c21 100644 --- a/rdadmin/list_livewiregpios.h +++ b/rdadmin/list_livewiregpios.h @@ -2,9 +2,7 @@ // // List Rivendell Livewire GPIO Slot Associations // -// (C) Copyright 2013 Fred Gleason -// -// $Id: list_livewiregpios.h,v 1.1.2.2 2013/03/05 23:59:07 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,8 +35,7 @@ class ListLiveWireGpios : public QDialog { Q_OBJECT public: - ListLiveWireGpios(RDMatrix *matrix,int slot_quan, - QWidget *parent=0,const char *name=0); + ListLiveWireGpios(RDMatrix *matrix,int slot_quan,QWidget *parent=0); ~ListLiveWireGpios(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_matrices.cpp b/rdadmin/list_matrices.cpp index 12273e582..f035d0252 100644 --- a/rdadmin/list_matrices.cpp +++ b/rdadmin/list_matrices.cpp @@ -2,9 +2,7 @@ // // List Rivendell Matrices // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_matrices.cpp,v 1.28.6.2 2012/12/10 15:40:15 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,8 +36,8 @@ #include #include -ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListMatrices::ListMatrices(QString station,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -72,7 +70,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) // list_view=new QListView(this,"list_box"); list_view->setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); - QLabel *label=new QLabel(list_view,tr("Switchers:"),this,"list_view_label"); + QLabel *label=new QLabel(list_view,tr("Switchers:"),this); label->setFont(font); label->setGeometry(14,5,85,19); list_view->setAllColumnsShowFocus(true); @@ -91,7 +89,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) // // Add Button // - QPushButton *add_button=new QPushButton(this,"add_button"); + QPushButton *add_button=new QPushButton(this); add_button->setGeometry(10,sizeHint().height()-60,80,50); add_button->setFont(font); add_button->setText(tr("&Add")); @@ -100,7 +98,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(100,sizeHint().height()-60,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -109,7 +107,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) // // Delete Button // - QPushButton *delete_button=new QPushButton(this,"delete_button"); + QPushButton *delete_button=new QPushButton(this); delete_button->setGeometry(190,sizeHint().height()-60,80,50); delete_button->setFont(font); delete_button->setText(tr("&Delete")); @@ -118,7 +116,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); close_button->setDefault(true); diff --git a/rdadmin/list_matrices.h b/rdadmin/list_matrices.h index 6c248db64..a86675354 100644 --- a/rdadmin/list_matrices.h +++ b/rdadmin/list_matrices.h @@ -2,9 +2,7 @@ // // List Rivendell Matrices // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_matrices.h,v 1.9.8.1 2012/12/10 15:40:15 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include #include - class ListMatrices : public QDialog { Q_OBJECT public: - ListMatrices(QString station,QWidget *parent=0,const char *name=0); + ListMatrices(QString station,QWidget *parent=0); ~ListMatrices(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_nodes.cpp b/rdadmin/list_nodes.cpp index 37f209064..8eb4b0af0 100644 --- a/rdadmin/list_nodes.cpp +++ b/rdadmin/list_nodes.cpp @@ -2,9 +2,7 @@ // // List Rivendell LiveWire Nodes // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_nodes.cpp,v 1.3 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,9 +32,8 @@ #include #include - -ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent) + : QDialog(parent,"",true) { list_matrix=matrix; setCaption(tr("LiveWire Node List")); @@ -60,7 +57,7 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) // // Nodes List Box // - list_list_view=new RDListView(this,"list_box"); + list_list_view=new RDListView(this); list_list_view-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80); list_list_view->setAllColumnsShowFocus(true); @@ -81,7 +78,7 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) // // Add Button // - QPushButton *button=new QPushButton(this,"add_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Add")); @@ -90,7 +87,7 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) // // Edit Button // - button=new QPushButton(this,"edit_button"); + button=new QPushButton(this); button->setGeometry(100,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -99,7 +96,7 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) // // Delete Button // - button=new QPushButton(this,"delete_button"); + button=new QPushButton(this); button->setGeometry(190,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Delete")); @@ -108,7 +105,7 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent,const char *name) // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); diff --git a/rdadmin/list_nodes.h b/rdadmin/list_nodes.h index 31e45b4b7..7730ff722 100644 --- a/rdadmin/list_nodes.h +++ b/rdadmin/list_nodes.h @@ -2,9 +2,7 @@ // // List Rivendell LiveWire Nodes // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_nodes.h,v 1.3 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include #include - class ListNodes : public QDialog { Q_OBJECT public: - ListNodes(RDMatrix *matrix,QWidget *parent=0,const char *name=0); + ListNodes(RDMatrix *matrix,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_replicator_carts.cpp b/rdadmin/list_replicator_carts.cpp index bb7358e12..645c5e870 100644 --- a/rdadmin/list_replicator_carts.cpp +++ b/rdadmin/list_replicator_carts.cpp @@ -1,10 +1,8 @@ // list_replicator_carts.cpp // -// List Rivendell Replicators +// List Rivendell Replicator Carts // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: list_replicator_carts.cpp,v 1.1 2011/10/17 18:48:40 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,8 +44,8 @@ #include "../icons/play.xpm" #include "../icons/rml5.xpm" -ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListReplicatorCarts::ListReplicatorCarts(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -80,7 +78,7 @@ ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) // // Repost Button // - list_repost_button=new QPushButton(this,"list_repost_button"); + list_repost_button=new QPushButton(this); list_repost_button->setFont(font); list_repost_button->setText(tr("&Repost")); connect(list_repost_button,SIGNAL(clicked()),this,SLOT(repostData())); @@ -88,7 +86,7 @@ ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) // // Repost All Button // - list_repost_all_button=new QPushButton(this,"list_repost_button"); + list_repost_all_button=new QPushButton(this); list_repost_all_button->setFont(font); list_repost_all_button->setText(tr("Repost\n&All")); connect(list_repost_all_button,SIGNAL(clicked()),this,SLOT(repostAllData())); @@ -96,7 +94,7 @@ ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -105,7 +103,7 @@ ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) // // Replicator List // - list_view=new RDListView(this,"list_view"); + list_view=new RDListView(this); list_view->setFont(list_font); list_view->setAllColumnsShowFocus(true); list_view->setItemMargin(5); @@ -114,8 +112,7 @@ ListReplicatorCarts::ListReplicatorCarts(QWidget *parent,const char *name) list_view->addColumn(tr("TITLE")); list_view->addColumn(tr("LAST POSTED")); list_view->addColumn(tr("POSTED FILENAME")); - QLabel *list_box_label=new QLabel(list_view,tr("&Active Carts:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_view,tr("&Active Carts:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); } diff --git a/rdadmin/list_replicator_carts.h b/rdadmin/list_replicator_carts.h index ccc585e95..88ec8be60 100644 --- a/rdadmin/list_replicator_carts.h +++ b/rdadmin/list_replicator_carts.h @@ -1,10 +1,8 @@ // list_replicator_carts.h // -// List Rivendell Replication Configurations +// List Rivendell Replicator Carts // -// (C) Copyright 2012 Fred Gleason -// -// $Id: list_replicator_carts.h,v 1.1 2011/10/17 18:48:40 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include #include - class ListReplicatorCarts : public QDialog { Q_OBJECT public: - ListReplicatorCarts(QWidget *parent=0,const char *name=0); + ListReplicatorCarts(QWidget *parent=0); ~ListReplicatorCarts(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_replicators.cpp b/rdadmin/list_replicators.cpp index 6a3643280..5041dbfa6 100644 --- a/rdadmin/list_replicators.cpp +++ b/rdadmin/list_replicators.cpp @@ -1,10 +1,8 @@ // list_replicators.cpp // -// List Rivendell Replicators +// List Rivendell Replication Configuratins // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: list_replicators.cpp,v 1.3 2011/10/17 18:48:40 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ #include #include -ListReplicators::ListReplicators(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListReplicators::ListReplicators(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -68,7 +66,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -76,7 +74,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -84,7 +82,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -92,7 +90,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // List Carts Button // - list_list_button=new QPushButton(this,"list_list_button"); + list_list_button=new QPushButton(this); list_list_button->setFont(font); list_list_button->setText(tr("&List\nCarts")); connect(list_list_button,SIGNAL(clicked()),this,SLOT(listData())); @@ -100,7 +98,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -109,7 +107,7 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) // // Replicator List // - list_replicators_view=new RDListView(this,"list_replicators_view"); + list_replicators_view=new RDListView(this); list_replicators_view->setFont(list_font); list_replicators_view->setAllColumnsShowFocus(true); list_replicators_view->setItemMargin(5); @@ -117,8 +115,8 @@ ListReplicators::ListReplicators(QWidget *parent,const char *name) list_replicators_view->addColumn(tr("TYPE")); list_replicators_view->addColumn(tr("DESCRIPTION")); list_replicators_view->addColumn(tr("HOST")); - QLabel *list_box_label=new QLabel(list_replicators_view,tr("&Replicators:"), - this,"list_box_label"); + QLabel *list_box_label= + new QLabel(list_replicators_view,tr("&Replicators:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_replicators_view, diff --git a/rdadmin/list_replicators.h b/rdadmin/list_replicators.h index 9f1dd4e30..cb2a02a2c 100644 --- a/rdadmin/list_replicators.h +++ b/rdadmin/list_replicators.h @@ -2,9 +2,7 @@ // // List Rivendell Replication Configurations // -// (C) Copyright 2010 Fred Gleason -// -// $Id: list_replicators.h,v 1.3 2011/10/17 18:48:40 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,12 +30,11 @@ #include #include - class ListReplicators : public QDialog { Q_OBJECT public: - ListReplicators(QWidget *parent=0,const char *name=0); + ListReplicators(QWidget *parent=0); ~ListReplicators(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_reports.cpp b/rdadmin/list_reports.cpp index 030ee6825..b31621e23 100644 --- a/rdadmin/list_reports.cpp +++ b/rdadmin/list_reports.cpp @@ -2,9 +2,7 @@ // // List Rivendell Reports // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_reports.cpp,v 1.12 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include #include - -ListReports::ListReports(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListReports::ListReports(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -61,7 +58,7 @@ ListReports::ListReports(QWidget *parent,const char *name) // // Add Button // - QPushButton *add_button=new QPushButton(this,"add_button"); + QPushButton *add_button=new QPushButton(this); add_button->setGeometry(410,30,80,50); add_button->setFont(font); add_button->setText(tr("&Add")); @@ -70,7 +67,7 @@ ListReports::ListReports(QWidget *parent,const char *name) // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(410,90,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -79,7 +76,7 @@ ListReports::ListReports(QWidget *parent,const char *name) // // Delete Button // - QPushButton *delete_button=new QPushButton(this,"delete_button"); + QPushButton *delete_button=new QPushButton(this); delete_button->setGeometry(410,150,80,50); delete_button->setFont(font); delete_button->setText(tr("&Delete")); @@ -88,7 +85,7 @@ ListReports::ListReports(QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(410,240,80,50); close_button->setDefault(true); close_button->setFont(font); @@ -98,10 +95,9 @@ ListReports::ListReports(QWidget *parent,const char *name) // // Report List Box // - list_box=new QListBox(this,"list_box"); + list_box=new QListBox(this); list_box->setGeometry(10,30,390,260); - QLabel *list_box_label=new QLabel(list_box,tr("R&eports:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_box,tr("R&eports:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,10,85,19); connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), @@ -132,13 +128,13 @@ void ListReports::addData() { QString rptname; - AddReport *add_report=new AddReport(&rptname,this,"add_report"); + AddReport *add_report=new AddReport(&rptname,this); if(add_report->exec()<0) { delete add_report; return; } delete add_report; - EditReport *edit_report=new EditReport(rptname,this,"edit_report"); + EditReport *edit_report=new EditReport(rptname,this); if(edit_report->exec()<0) { DeleteReport(rptname); delete edit_report; @@ -154,8 +150,7 @@ void ListReports::editData() if(list_box->currentItem()<0) { return; } - EditReport *edit_report= - new EditReport(list_box->currentText(),this,"edit_report"); + EditReport *edit_report=new EditReport(list_box->currentText(),this); edit_report->exec(); delete edit_report; } diff --git a/rdadmin/list_reports.h b/rdadmin/list_reports.h index 82a64e79d..28b6deadf 100644 --- a/rdadmin/list_reports.h +++ b/rdadmin/list_reports.h @@ -2,9 +2,7 @@ // // List Rivendell Reports // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_reports.h,v 1.7 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include #include - class ListReports : public QDialog { Q_OBJECT public: - ListReports(QWidget *parent=0,const char *name=0); + ListReports(QWidget *parent=0); ~ListReports(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_sas_resources.cpp b/rdadmin/list_sas_resources.cpp index 2f592571d..400afc597 100644 --- a/rdadmin/list_sas_resources.cpp +++ b/rdadmin/list_sas_resources.cpp @@ -2,9 +2,7 @@ // // List SAS Resources. // -// (C) Copyright 2002-2005,2011 Fred Gleason -// -// $Id: list_sas_resources.cpp,v 1.2 2011/05/23 21:53:22 cvs Exp $ +// (C) Copyright 2002-2005,2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,10 +31,8 @@ #include #include - -ListSasResources::ListSasResources(RDMatrix *matrix,int size, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListSasResources::ListSasResources(RDMatrix *matrix,int size,QWidget *parent) + : QDialog(parent,"",true) { QString sql; QString str; @@ -64,11 +60,11 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size, // // Resources List Box // - list_list_view=new QListView(this,"list_box"); + list_list_view=new QListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label= - new QLabel(list_list_view,list_table,this,"list_list_view_label"); + new QLabel(list_list_view,list_table,this); label->setFont(bold_font); label->setGeometry(14,5,85,19); list_list_view->setAllColumnsShowFocus(true); @@ -89,7 +85,7 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size, // // Edit Button // - QPushButton *button=new QPushButton(this,"edit_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -98,7 +94,7 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -108,7 +104,7 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); @@ -154,7 +150,7 @@ void ListSasResources::editData() relay_num=item->text(3).toInt(); } EditSasResource *dialog= - new EditSasResource(&engine_num,&device_num,&relay_num,this,"dialog"); + new EditSasResource(&engine_num,&device_num,&relay_num,this); if(dialog->exec()==0) { if(engine_num>=0) { item->setText(1,QString().sprintf("%d",engine_num)); diff --git a/rdadmin/list_sas_resources.h b/rdadmin/list_sas_resources.h index 8d72de6cf..84d9bed89 100644 --- a/rdadmin/list_sas_resources.h +++ b/rdadmin/list_sas_resources.h @@ -2,9 +2,7 @@ // // List SAS Resources // -// (C) Copyright 2002-2005,2011 Fred Gleason -// -// $Id: list_sas_resources.h,v 1.1 2011/05/07 00:32:29 cvs Exp $ +// (C) Copyright 2002-2005,2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,13 +30,11 @@ #include #include - class ListSasResources : public QDialog { Q_OBJECT public: - ListSasResources(RDMatrix *matrix,int size, - QWidget *parent=0,const char *name=0); + ListSasResources(RDMatrix *matrix,int size,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_schedcodes.cpp b/rdadmin/list_schedcodes.cpp index 0d0928c82..37f61d5f7 100644 --- a/rdadmin/list_schedcodes.cpp +++ b/rdadmin/list_schedcodes.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -40,8 +37,8 @@ #include #include -ListSchedCodes::ListSchedCodes(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListSchedCodes::ListSchedCodes(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size diff --git a/rdadmin/list_schedcodes.h b/rdadmin/list_schedcodes.h index 06198c0f9..d6364b091 100644 --- a/rdadmin/list_schedcodes.h +++ b/rdadmin/list_schedcodes.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -31,12 +29,11 @@ #include #include - class ListSchedCodes : public QDialog { Q_OBJECT public: - ListSchedCodes(QWidget *parent=0,const char *name=0); + ListSchedCodes(QWidget *parent=0); ~ListSchedCodes(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_stations.cpp b/rdadmin/list_stations.cpp index 32d4e685a..a25ee917c 100644 --- a/rdadmin/list_stations.cpp +++ b/rdadmin/list_stations.cpp @@ -36,9 +36,8 @@ #include #include - -ListStations::ListStations(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListStations::ListStations(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -61,7 +60,7 @@ ListStations::ListStations(QWidget *parent,const char *name) // // Add Button // - QPushButton *add_button=new QPushButton(this,"add_button"); + QPushButton *add_button=new QPushButton(this); add_button->setGeometry(410,30,80,50); add_button->setFont(font); add_button->setText(tr("&Add")); @@ -70,7 +69,7 @@ ListStations::ListStations(QWidget *parent,const char *name) // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(410,90,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -79,7 +78,7 @@ ListStations::ListStations(QWidget *parent,const char *name) // // Delete Button // - QPushButton *delete_button=new QPushButton(this,"delete_button"); + QPushButton *delete_button=new QPushButton(this); delete_button->setGeometry(410,150,80,50); delete_button->setFont(font); delete_button->setText(tr("&Delete")); @@ -88,7 +87,7 @@ ListStations::ListStations(QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(410,240,80,50); close_button->setDefault(true); close_button->setFont(font); @@ -98,10 +97,9 @@ ListStations::ListStations(QWidget *parent,const char *name) // // Station List Box // - list_box=new QListBox(this,"list_box"); + list_box=new QListBox(this); list_box->setGeometry(10,30,390,260); - QLabel *list_box_label=new QLabel(list_box,tr("Ho&sts:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_box,tr("Ho&sts:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,10,85,19); connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), @@ -133,7 +131,7 @@ void ListStations::addData() { QString stationname; - AddStation *add_station=new AddStation(&stationname,this,"add_station"); + AddStation *add_station=new AddStation(&stationname,this); if(add_station->exec()<0) { DeleteStation(stationname); delete add_station; @@ -149,8 +147,7 @@ void ListStations::editData() if(list_box->currentItem()<0) { return; } - EditStation *edit_station=new EditStation(list_box->currentText(), - this,"edit_station"); + EditStation *edit_station=new EditStation(list_box->currentText(),this); edit_station->exec(); delete edit_station; } diff --git a/rdadmin/list_stations.h b/rdadmin/list_stations.h index 3cdacc724..94aec1f3e 100644 --- a/rdadmin/list_stations.h +++ b/rdadmin/list_stations.h @@ -1,10 +1,8 @@ // list_stations.h // -// List Rivendell Stations +// List Rivendell Workstations // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_stations.h,v 1.9 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include #include - class ListStations : public QDialog { Q_OBJECT public: - ListStations(QWidget *parent=0,const char *name=0); + ListStations(QWidget *parent=0); ~ListStations(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index 747a07764..5fdf98c2b 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -2,9 +2,7 @@ // // List Rivendell Services // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_svcs.cpp,v 1.26 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include #include - -ListSvcs::ListSvcs(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListSvcs::ListSvcs(QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -61,7 +58,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Add Button // - QPushButton *add_button=new QPushButton(this,"add_button"); + QPushButton *add_button=new QPushButton(this); add_button->setGeometry(100,30,80,50); add_button->setFont(font); add_button->setText(tr("&Add")); @@ -70,7 +67,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Edit Button // - QPushButton *edit_button=new QPushButton(this,"edit_button"); + QPushButton *edit_button=new QPushButton(this); edit_button->setGeometry(100,90,80,50); edit_button->setFont(font); edit_button->setText(tr("&Edit")); @@ -79,7 +76,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Delete Button // - QPushButton *delete_button=new QPushButton(this,"delete_button"); + QPushButton *delete_button=new QPushButton(this); delete_button->setGeometry(100,150,80,50); delete_button->setFont(font); delete_button->setText(tr("&Delete")); @@ -88,7 +85,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(100,240,80,50); close_button->setDefault(true); close_button->setFont(font); @@ -98,10 +95,9 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Services List Box // - list_box=new QListBox(this,"list_box"); + list_box=new QListBox(this); list_box->setGeometry(10,30,80,260); - QLabel *list_box_label=new QLabel(list_box,tr("&Services:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_box,tr("&Services:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), @@ -133,7 +129,7 @@ void ListSvcs::addData() { QString svcname; - AddSvc *add_svc=new AddSvc(&svcname,this,"add_svc"); + AddSvc *add_svc=new AddSvc(&svcname,this); if(add_svc->exec()<0) { delete add_svc; return; @@ -148,7 +144,7 @@ void ListSvcs::editData() if(list_box->currentItem()<0) { return; } - EditSvc *edit_svc=new EditSvc(list_box->currentText(),this,"edit_svc"); + EditSvc *edit_svc=new EditSvc(list_box->currentText(),this); edit_svc->exec(); delete edit_svc; } diff --git a/rdadmin/list_svcs.h b/rdadmin/list_svcs.h index 231de4c30..93bb1696a 100644 --- a/rdadmin/list_svcs.h +++ b/rdadmin/list_svcs.h @@ -2,9 +2,7 @@ // // List Rivendell Services // -// (C) Copyright 2002 Fred Gleason -// -// $Id: list_svcs.h,v 1.10 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include #include - class ListSvcs : public QDialog { Q_OBJECT public: - ListSvcs(QWidget *parent=0,const char *name=0); + ListSvcs(QWidget *parent=0); ~ListSvcs(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_users.cpp b/rdadmin/list_users.cpp index 11122e629..40d544b12 100644 --- a/rdadmin/list_users.cpp +++ b/rdadmin/list_users.cpp @@ -2,9 +2,7 @@ // // List Rivendell Users // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: list_users.cpp,v 1.24 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -48,8 +46,8 @@ #include "../icons/admin.xpm" #include "../icons/user.xpm" -ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListUsers::ListUsers(const QString &admin_name,QWidget *parent) + : QDialog(parent,"",true) { list_admin_name=admin_name; @@ -80,7 +78,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) // // Add Button // - list_add_button=new QPushButton(this,"list_add_button"); + list_add_button=new QPushButton(this); list_add_button->setFont(font); list_add_button->setText(tr("&Add")); connect(list_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -88,7 +86,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -96,7 +94,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -104,7 +102,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); @@ -113,7 +111,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) // // User List // - list_users_view=new RDListView(this,"list_users_view"); + list_users_view=new RDListView(this); list_users_view->setFont(list_font); list_users_view->setAllColumnsShowFocus(true); list_users_view->setItemMargin(5); @@ -121,8 +119,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent,const char *name) list_users_view->addColumn(tr("USER NAME")); list_users_view->addColumn(tr("FULL NAME")); list_users_view->addColumn(tr("DESCRIPTION")); - QLabel *list_box_label=new QLabel(list_users_view,tr("&Users:"), - this,"list_box_label"); + QLabel *list_box_label=new QLabel(list_users_view,tr("&Users:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_users_view, @@ -155,7 +152,7 @@ void ListUsers::addData() { QString user; - AddUser *add_user=new AddUser(&user,this,"add_user"); + AddUser *add_user=new AddUser(&user,this); if(add_user->exec()<0) { delete add_user; return; @@ -177,7 +174,7 @@ void ListUsers::editData() if(item==NULL) { return; } - EditUser *edit_user=new EditUser(item->text(1),this,"edit_user"); + EditUser *edit_user=new EditUser(item->text(1),this); if(edit_user->exec()==0) { RefreshItem(item); } diff --git a/rdadmin/list_users.h b/rdadmin/list_users.h index e4b117aaa..75afcbb4c 100644 --- a/rdadmin/list_users.h +++ b/rdadmin/list_users.h @@ -2,9 +2,7 @@ // // List Rivendell Users // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: list_users.h,v 1.11 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include #include - class ListUsers : public QDialog { Q_OBJECT public: - ListUsers(const QString &admin_name,QWidget *parent=0,const char *name=0); + ListUsers(const QString &admin_name,QWidget *parent=0); ~ListUsers(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/list_vguest_resources.cpp b/rdadmin/list_vguest_resources.cpp index f2a148142..b22373497 100644 --- a/rdadmin/list_vguest_resources.cpp +++ b/rdadmin/list_vguest_resources.cpp @@ -2,9 +2,7 @@ // // List vGuest Resources. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: list_vguest_resources.cpp,v 1.7 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,11 +30,10 @@ #include #include - ListVguestResources::ListVguestResources(RDMatrix *matrix, RDMatrix::VguestType type,int size, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; QString str; @@ -64,11 +61,10 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, // // Resources List Box // - list_list_view=new QListView(this,"list_box"); + list_list_view=new QListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); - QLabel *label= - new QLabel(list_list_view,list_table,this,"list_list_view_label"); + QLabel *label=new QLabel(list_list_view,list_table,this); label->setFont(bold_font); label->setGeometry(14,5,85,19); list_list_view->setAllColumnsShowFocus(true); @@ -111,7 +107,7 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, // // Edit Button // - QPushButton *button=new QPushButton(this,"edit_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -120,7 +116,7 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -130,7 +126,7 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(bold_font); @@ -186,10 +182,9 @@ void ListVguestResources::editData() case RDMatrix::VguestTypeDisplay: break; } - EditVguestResource *dialog=new EditVguestResource(list_type,&engine_num, - &device_num,&surface_num, - &relay_num, - this,"dialog"); + EditVguestResource *dialog= + new EditVguestResource(list_type,&engine_num,&device_num,&surface_num, + &relay_num,this); if(dialog->exec()==0) { if(engine_num>=0) { item->setText(1,QString().sprintf("%04X",engine_num)); diff --git a/rdadmin/list_vguest_resources.h b/rdadmin/list_vguest_resources.h index b919aad6f..5fb77f4da 100644 --- a/rdadmin/list_vguest_resources.h +++ b/rdadmin/list_vguest_resources.h @@ -2,9 +2,7 @@ // // List vGuest Resources // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: list_vguest_resources.h,v 1.5 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,13 +30,12 @@ #include #include - class ListVguestResources : public QDialog { Q_OBJECT public: ListVguestResources(RDMatrix *matrix,RDMatrix::VguestType type,int size, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/login.cpp b/rdadmin/login.cpp index 15f16ece9..52c7a9df6 100644 --- a/rdadmin/login.cpp +++ b/rdadmin/login.cpp @@ -2,9 +2,7 @@ // // Login widget for RDAdmin. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: login.cpp,v 1.14 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,9 +36,8 @@ #include - -Login::Login(QString *username,QString *password,QWidget *parent, - const char *name) : QDialog(parent,name,true) +Login::Login(QString *username,QString *password,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -63,12 +60,12 @@ Login::Login(QString *username,QString *password,QWidget *parent, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // OK Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(10,60,100,55); ok_button->setFont(font); ok_button->setText(tr("&OK")); @@ -78,7 +75,7 @@ Login::Login(QString *username,QString *password,QWidget *parent, // // CANCEL Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(120,60,100,55); cancel_button->setFont(font); cancel_button->setText(tr("&Cancel")); @@ -87,13 +84,12 @@ Login::Login(QString *username,QString *password,QWidget *parent, // // Login Name // - login_name_edit=new QLineEdit(this,"login_name_edit"); + login_name_edit=new QLineEdit(this); login_name_edit->setGeometry(100,10,100,19); login_name_edit->setMaxLength(16); login_name_edit->setFocus(); login_name_edit->setValidator(validator); - QLabel *login_name_label=new QLabel(login_name_edit,tr("User &Name:"),this, - "login_name_label"); + QLabel *login_name_label=new QLabel(login_name_edit,tr("User &Name:"),this); login_name_label->setGeometry(10,10,85,19); login_name_label->setFont(font); login_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -101,13 +97,13 @@ Login::Login(QString *username,QString *password,QWidget *parent, // // Login Password // - login_password_edit=new QLineEdit(this,"login_password_edit"); + login_password_edit=new QLineEdit(this); login_password_edit->setGeometry(100,31,100,19); login_password_edit->setMaxLength(16); login_password_edit->setEchoMode(QLineEdit::Password); login_password_edit->setValidator(validator); - QLabel *login_password_label=new QLabel(login_password_edit,tr("&Password:"), - this,"login_password_label"); + QLabel *login_password_label= + new QLabel(login_password_edit,tr("&Password:"),this); login_password_label->setGeometry(10,31,85,19); login_password_label->setFont(font); login_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); diff --git a/rdadmin/login.h b/rdadmin/login.h index 973b055bd..a306c2c6a 100644 --- a/rdadmin/login.h +++ b/rdadmin/login.h @@ -2,9 +2,7 @@ // // Login Widget for RDAdmin. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: login.h,v 1.6 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,13 +27,11 @@ #include #include - - class Login : public QDialog { Q_OBJECT public: - Login(QString *username,QString *password,QWidget *parent=0,const char *name=0); + Login(QString *username,QString *password,QWidget *parent=0); ~Login(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/mysql_login.cpp b/rdadmin/mysql_login.cpp index 59071f07c..3e6908e14 100644 --- a/rdadmin/mysql_login.cpp +++ b/rdadmin/mysql_login.cpp @@ -2,9 +2,7 @@ // // mySQL Administrative Login widget for RDAdmin. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: mysql_login.cpp,v 1.9 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,10 +34,9 @@ #include - MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("mySQL Admin")); login_name=username; @@ -54,7 +51,7 @@ MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, // // Message Label // - RDLabel *label=new RDLabel(msg,this,"message_label"); + RDLabel *label=new RDLabel(msg,this); label->setFont(font); label->setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-130); label->setAlignment(AlignCenter); @@ -63,13 +60,12 @@ MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, // // MySql Login Name // - login_name_edit=new QLineEdit(this,"login_name_edit"); + login_name_edit=new QLineEdit(this); login_name_edit->setFont(font); login_name_edit->setGeometry(100,sizeHint().height()-110,100,19); login_name_edit->setMaxLength(16); login_name_edit->setFocus(); - QLabel *login_name_label=new QLabel(login_name_edit,tr("User &Name:"),this, - "login_name_label"); + QLabel *login_name_label=new QLabel(login_name_edit,tr("User &Name:"),this); login_name_label->setFont(font); login_name_label->setGeometry(10,sizeHint().height()-109,85,19); login_name_label->setAlignment(AlignRight|ShowPrefix); @@ -77,13 +73,12 @@ MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, // // MySql Login Password // - login_password_edit=new QLineEdit(this,"login_password_edit"); + login_password_edit=new QLineEdit(this); login_password_edit->setFont(font); login_password_edit->setGeometry(100,sizeHint().height()-90,100,19); login_password_edit->setMaxLength(16); login_password_edit->setEchoMode(QLineEdit::Password); - QLabel *login_password_label=new QLabel(login_password_edit,tr("&Password:"), - this,"login_password_label"); + QLabel *login_password_label=new QLabel(login_password_edit,tr("&Password:")); login_password_label->setFont(font); login_password_label->setGeometry(10,sizeHint().height()-88,85,19); login_password_label->setAlignment(AlignRight|ShowPrefix); @@ -91,7 +86,7 @@ MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, // // OK Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setFont(font); ok_button->setText(tr("&OK")); @@ -99,9 +94,9 @@ MySqlLogin::MySqlLogin(QString msg,QString *username,QString *password, connect(ok_button,SIGNAL(clicked()),this,SLOT(okData())); // - // CANCEL Button + // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/mysql_login.h b/rdadmin/mysql_login.h index 178228819..15b91e75c 100644 --- a/rdadmin/mysql_login.h +++ b/rdadmin/mysql_login.h @@ -2,9 +2,7 @@ // // mySQL Administrative Login Widget for RDAdmin. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: mysql_login.h,v 1.7 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,14 +27,12 @@ #include #include - - class MySqlLogin : public QDialog { Q_OBJECT public: MySqlLogin(QString msg,QString *username,QString *password, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~MySqlLogin(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/opendb.cpp b/rdadmin/opendb.cpp index 13a7f9322..3d0ed8a3d 100644 --- a/rdadmin/opendb.cpp +++ b/rdadmin/opendb.cpp @@ -2,9 +2,7 @@ // // Open a Rivendell Database // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: opendb.cpp,v 1.38.4.1 2013/11/13 00:12:54 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdadmin/opendb.h b/rdadmin/opendb.h index 78c09b5c2..e3cfb8d28 100644 --- a/rdadmin/opendb.h +++ b/rdadmin/opendb.h @@ -2,9 +2,7 @@ // // Open a Rivendell Database // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: opendb.h,v 1.8 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,10 +23,8 @@ #include - bool OpenDb(QString dbname,QString username,QString password,QString hostname, QString stationname,bool interactive); -#endif - +#endif // OPENDB_H diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index c1026dbaa..b2a3680e6 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -2,9 +2,7 @@ // // The Administrator Utility for Rivendell. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdadmin.cpp,v 1.72.4.7 2014/02/11 23:46:27 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -115,8 +113,8 @@ void PrintError(const QString &str,bool interactive) } -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { QString str; @@ -179,7 +177,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) char temp[256]; GetPrivateProfileString(RD_CONF_FILE,"Identity","Password", temp,"",255); - rdripc=new RDRipc(admin_config->stationName(),this,"rdripc"); + rdripc=new RDRipc(admin_config->stationName(),this); rdripc->connectHost("localhost",RIPCD_TCP_PORT,temp); admin_station=new RDStation(admin_config->stationName(),this); admin_system=new RDSystem(); @@ -187,7 +185,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Log In // - Login *login=new Login(&admin_username,&admin_password,this,"login"); + Login *login=new Login(&admin_username,&admin_password,this); if(login->exec()!=0) { exit(0); } @@ -214,13 +212,13 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // User Labels // - QLabel *name_label=new QLabel(this,"name_label"); + QLabel *name_label=new QLabel(this); name_label->setGeometry(0,5,sizeHint().width(),20); name_label->setAlignment(Qt::AlignVCenter|Qt::AlignCenter); name_label->setFont(font); name_label->setText(QString().sprintf("USER: %s",(const char *)admin_user->name())); - QLabel *description_label=new QLabel(this,"description_label"); + QLabel *description_label=new QLabel(this); description_label->setGeometry(0,24,sizeHint().width(),14); description_label->setAlignment(Qt::AlignVCenter|Qt::AlignCenter); name_label->setFont(font); @@ -229,7 +227,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Users Button // - QPushButton *users_button=new QPushButton(this,"users_button"); + QPushButton *users_button=new QPushButton(this); users_button->setGeometry(10,50,80,60); users_button->setFont(font); users_button->setText(tr("Manage\n&Users")); @@ -238,7 +236,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Groups Button // - QPushButton *groups_button=new QPushButton(this,"groups_button"); + QPushButton *groups_button=new QPushButton(this); groups_button->setGeometry(10,120,80,60); groups_button->setFont(font); groups_button->setText(tr("Manage\n&Groups")); @@ -247,7 +245,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Services Button // - QPushButton *services_button=new QPushButton(this,"services_button"); + QPushButton *services_button=new QPushButton(this); services_button->setGeometry(100,50,80,60); services_button->setFont(font); services_button->setText(tr("Manage\n&Services")); @@ -256,7 +254,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Stations (Hosts) Button // - QPushButton *stations_button=new QPushButton(this,"stations_button"); + QPushButton *stations_button=new QPushButton(this); stations_button->setGeometry(100,120,80,60); stations_button->setFont(font); stations_button->setText(tr("Manage\nHo&sts")); @@ -265,7 +263,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Reports // - QPushButton *reports_button=new QPushButton(this,"reports_button"); + QPushButton *reports_button=new QPushButton(this); reports_button->setGeometry(190,50,80,60); reports_button->setFont(font); reports_button->setText(tr("Manage\nR&eports")); @@ -274,7 +272,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Podcasts // - QPushButton *podcasts_button=new QPushButton(this,"podcasts_button"); + QPushButton *podcasts_button=new QPushButton(this); podcasts_button->setGeometry(280,50,80,60); podcasts_button->setFont(font); podcasts_button->setText(tr("Manage\n&Feeds")); @@ -283,7 +281,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // System Wide Settings Button // - QPushButton *system_button=new QPushButton(this,"system_button"); + QPushButton *system_button=new QPushButton(this); system_button->setGeometry(190,120,80,60); system_button->setFont(font); system_button->setText(tr("System\nSettings")); @@ -292,7 +290,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Scheduler Codes Button // - QPushButton *schedcodes_button=new QPushButton(this,"schedcodes_button"); + QPushButton *schedcodes_button=new QPushButton(this); schedcodes_button->setGeometry(280,120,80,60); schedcodes_button->setFont(font); schedcodes_button->setText(tr("Scheduler\nCodes")); @@ -301,7 +299,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Manage Replicators Button // - QPushButton *repl_button=new QPushButton(this,"repl_button"); + QPushButton *repl_button=new QPushButton(this); repl_button->setGeometry(10,190,80,60); repl_button->setFont(font); repl_button->setText(tr("Manage\nReplicators")); @@ -310,7 +308,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // System Info Button // - QPushButton *info_button=new QPushButton(this,"info_button"); + QPushButton *info_button=new QPushButton(this); info_button->setGeometry(100,190,80,60); info_button->setFont(font); info_button->setText(tr("System\nInfo")); @@ -319,7 +317,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Backup Database Button // - QPushButton *backup_button=new QPushButton(this,"backup_button"); + QPushButton *backup_button=new QPushButton(this); backup_button->setGeometry(190,190,80,60); backup_button->setFont(font); backup_button->setText(tr("&Backup\nDatabase")); @@ -328,7 +326,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Restore Database Button // - QPushButton *restore_button=new QPushButton(this,"restore_button"); + QPushButton *restore_button=new QPushButton(this); restore_button->setGeometry(280,190,80,60); restore_button->setFont(font); restore_button->setText(tr("&Restore\nDatabase")); @@ -337,7 +335,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Quit Button // - QPushButton *quit_button=new QPushButton(this,"quit_button"); + QPushButton *quit_button=new QPushButton(this); quit_button->setGeometry(10,sizeHint().height()-70,sizeHint().width()-20,60); quit_button->setFont(font); quit_button->setText(tr("&Quit")); @@ -367,7 +365,7 @@ QSizePolicy MainWidget::sizePolicy() const void MainWidget::manageUsersData() { - ListUsers *list_users=new ListUsers(admin_user->name(),this,"list_users"); + ListUsers *list_users=new ListUsers(admin_user->name(),this); list_users->exec(); delete list_users; } @@ -375,21 +373,21 @@ void MainWidget::manageUsersData() void MainWidget::manageGroupsData() { - ListGroups *list_groups=new ListGroups(this,"list_groups"); + ListGroups *list_groups=new ListGroups(this); list_groups->exec(); delete list_groups; } void MainWidget::manageSchedCodes() { - ListSchedCodes *list_schedCodes=new ListSchedCodes(this,"list_schedCodes"); + ListSchedCodes *list_schedCodes=new ListSchedCodes(this); list_schedCodes->exec(); delete list_schedCodes; } void MainWidget::manageServicesData() { - ListSvcs *list_svcs=new ListSvcs(this,"list_svcs"); + ListSvcs *list_svcs=new ListSvcs(this); list_svcs->exec(); delete list_svcs; } @@ -397,7 +395,7 @@ void MainWidget::manageServicesData() void MainWidget::manageStationsData() { - ListStations *list_stations=new ListStations(this,"list_stations"); + ListStations *list_stations=new ListStations(this); list_stations->exec(); delete list_stations; } @@ -405,7 +403,7 @@ void MainWidget::manageStationsData() void MainWidget::systemSettingsData() { - EditSettings *edit_settings=new EditSettings(this,"edit_settings"); + EditSettings *edit_settings=new EditSettings(this); edit_settings->exec(); delete edit_settings; } @@ -501,7 +499,7 @@ void MainWidget::manageReplicatorsData() void MainWidget::systemInfoData() { - InfoDialog *info=new InfoDialog(this,"info_dialog"); + InfoDialog *info=new InfoDialog(this); info->exec(); delete info; } @@ -509,7 +507,7 @@ void MainWidget::systemInfoData() void MainWidget::reportsData() { - ListReports *list_reports=new ListReports(this,"list_reports"); + ListReports *list_reports=new ListReports(this); list_reports->exec(); delete list_reports; } @@ -517,7 +515,7 @@ void MainWidget::reportsData() void MainWidget::podcastsData() { - ListFeeds *list_feeds=new ListFeeds(this,"list_feeds"); + ListFeeds *list_feeds=new ListFeeds(this); list_feeds->exec(); delete list_feeds; } @@ -575,7 +573,7 @@ int gui_main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); if(exiting) { exit(0); } diff --git a/rdadmin/rdadmin.h b/rdadmin/rdadmin.h index 8550bcd5c..3bd6cc858 100644 --- a/rdadmin/rdadmin.h +++ b/rdadmin/rdadmin.h @@ -2,9 +2,7 @@ // // The Administration Utility for Rivendell. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdadmin.h,v 1.28.4.1 2013/11/13 00:12:55 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); ~MainWidget(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/rdadmin.pro b/rdadmin/rdadmin.pro index 47452cfb7..2ba9cf55a 100644 --- a/rdadmin/rdadmin.pro +++ b/rdadmin/rdadmin.pro @@ -2,9 +2,7 @@ // // The QMake project file for RDAdmin. // -// (C) Copyright 2003-2005 Fred Gleason -// -// $Id: rdadmin.pro,v 1.14.2.5 2013/02/21 02:46:25 cvs Exp $ +// (C) Copyright 2003-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdadmin/rename_group.cpp b/rdadmin/rename_group.cpp index 540141674..ccc4e9a33 100644 --- a/rdadmin/rename_group.cpp +++ b/rdadmin/rename_group.cpp @@ -2,9 +2,7 @@ // // Rename a Rivendell Group // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rename_group.cpp,v 1.14 2010/08/03 16:26:03 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,8 +40,8 @@ #include -RenameGroup::RenameGroup(QString group,QWidget *parent,const char *name) - : QDialog(parent,name,true) +RenameGroup::RenameGroup(QString group,QWidget *parent) + : QDialog(parent,"",true) { group_name=group; @@ -66,18 +64,17 @@ RenameGroup::RenameGroup(QString group,QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Current Group Name // - group_name_edit=new QLineEdit(this,"group_name_edit"); + group_name_edit=new QLineEdit(this); group_name_edit->setGeometry(165,11,sizeHint().width()-175,19); group_name_edit->setMaxLength(10); group_name_edit->setReadOnly(true); QLabel *group_name_label= - new QLabel(group_name_edit,tr("Current Group Name:"), - this,"group_name_label"); + new QLabel(group_name_edit,tr("Current Group Name:"),this); group_name_label->setGeometry(10,11,150,19); group_name_label->setFont(font); group_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -85,13 +82,12 @@ RenameGroup::RenameGroup(QString group,QWidget *parent,const char *name) // // New Group Name // - group_newname_edit=new QLineEdit(this,"group_newname_edit"); + group_newname_edit=new QLineEdit(this); group_newname_edit->setGeometry(165,33,sizeHint().width()-175,19); group_newname_edit->setMaxLength(10); group_newname_edit->setValidator(validator); QLabel *group_newname_label= - new QLabel(group_newname_edit,tr("New &Group Name:"), - this,"group_newname_label"); + new QLabel(group_newname_edit,tr("New &Group Name:"),this); group_newname_label->setGeometry(10,33,150,19); group_newname_label->setFont(font); group_newname_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -99,7 +95,7 @@ RenameGroup::RenameGroup(QString group,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -109,7 +105,7 @@ RenameGroup::RenameGroup(QString group,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdadmin/rename_group.h b/rdadmin/rename_group.h index 375be417d..c61b80f20 100644 --- a/rdadmin/rename_group.h +++ b/rdadmin/rename_group.h @@ -2,9 +2,7 @@ // // Rename a Rivendell Group // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rename_group.h,v 1.6 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class RenameGroup : public QDialog { Q_OBJECT public: - RenameGroup(QString group,QWidget *parent=0,const char *name=0); + RenameGroup(QString group,QWidget *parent=0); ~RenameGroup(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/test_import.cpp b/rdadmin/test_import.cpp index 4de0f93ad..051712c4a 100644 --- a/rdadmin/test_import.cpp +++ b/rdadmin/test_import.cpp @@ -2,9 +2,7 @@ // // Test a Rivendell Log Import // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: test_import.cpp,v 1.22 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,10 +33,8 @@ #include #include - -TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent) + : QDialog(parent,"",true) { QString sql; QDate current_date=QDate::currentDate(); @@ -106,18 +102,17 @@ TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src, // // Import Filename // - test_filename_edit=new QLineEdit(this,"test_filename_edit"); + test_filename_edit=new QLineEdit(this); test_filename_edit->setReadOnly(true); test_filename_edit->setGeometry(10,133,sizeHint().width()-20,18); - label=new QLabel(test_filename_edit,tr("Using source file:"), - this,"test_filename_label"); + label=new QLabel(test_filename_edit,tr("Using source file:"),this); label->setGeometry(15,115,sizeHint().width()-30,18); label->setFont(font); // // Events List // - test_events_list=new RDListView(this,"test_events_list"); + test_events_list=new RDListView(this); test_events_list-> setGeometry(10,178,sizeHint().width()-20,sizeHint().height()-248); test_events_list->setItemMargin(2); @@ -144,7 +139,7 @@ TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src, // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); @@ -174,9 +169,9 @@ QSizePolicy TestImport::sizePolicy() const void TestImport::selectData() { - RDDateDialog *datedialog=new RDDateDialog(QDate::currentDate().year(), - QDate::currentDate().year()+1, - this,"timedialog"); + RDDateDialog *datedialog= + new RDDateDialog(QDate::currentDate().year(),QDate::currentDate().year()+1, + this); QDate date=test_date_edit->date(); if(datedialog->exec(&date)<0) { delete datedialog; diff --git a/rdadmin/test_import.h b/rdadmin/test_import.h index 70676cf4b..bbf1544f9 100644 --- a/rdadmin/test_import.h +++ b/rdadmin/test_import.h @@ -2,9 +2,7 @@ // // Test a Rivendell Log Import // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: test_import.h,v 1.6 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,13 +29,11 @@ #include #include - class TestImport : public QDialog { Q_OBJECT public: - TestImport(RDSvc *svc,RDSvc::ImportSource src, - QWidget *parent=0,const char *name=0); + TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent=0); ~TestImport(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/view_adapters.cpp b/rdadmin/view_adapters.cpp index 504002051..c516f0c2a 100644 --- a/rdadmin/view_adapters.cpp +++ b/rdadmin/view_adapters.cpp @@ -2,9 +2,7 @@ // // Display Audio Adapter Information // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: view_adapters.cpp,v 1.14 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,9 +28,8 @@ #include -ViewAdapters::ViewAdapters(RDStation *rdstation, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) + : QDialog(parent,"",true) { QString str1; QString str2; diff --git a/rdadmin/view_adapters.h b/rdadmin/view_adapters.h index 4b6bbcf33..26cee540e 100644 --- a/rdadmin/view_adapters.h +++ b/rdadmin/view_adapters.h @@ -2,9 +2,7 @@ // // Display Audio Adapter Information // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: view_adapters.h,v 1.7 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,12 +32,11 @@ #include #include - class ViewAdapters : public QDialog { Q_OBJECT public: - ViewAdapters(RDStation *station,QWidget *parent=0,const char *name=0); + ViewAdapters(RDStation *station,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/view_node_info.cpp b/rdadmin/view_node_info.cpp index edcb1417c..effc3472c 100644 --- a/rdadmin/view_node_info.cpp +++ b/rdadmin/view_node_info.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: view_node_info.cpp,v 1.3.8.1 2013/01/30 21:06:04 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,9 +29,8 @@ #include - -ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ViewNodeInfo::ViewNodeInfo(QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Viewing LiveWire Node")); @@ -56,7 +53,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // LiveWire Driver // - view_livewire=new RDLiveWire(0,this,"view_livewire"); + view_livewire=new RDLiveWire(0,this); connect(view_livewire,SIGNAL(connected(unsigned)), this,SLOT(connectedData(unsigned))); connect(view_livewire,SIGNAL(sourceChanged(unsigned,RDLiveWireSource *)), @@ -69,11 +66,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Node Hostname // - view_hostname_edit=new QLineEdit(this,"view_hostname_edit"); + view_hostname_edit=new QLineEdit(this); view_hostname_edit->setGeometry(90,10,190,20); view_hostname_edit->setReadOnly(true); - QLabel *label= - new QLabel(view_hostname_edit,tr("Hostname:"),this,"view_hostname_label"); + QLabel *label=new QLabel(view_hostname_edit,tr("Hostname:"),this); label->setGeometry(10,10,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -81,10 +77,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Node TCP Port // - view_tcpport_edit=new QLineEdit(this,"view_tcpport_edit"); + view_tcpport_edit=new QLineEdit(this); view_tcpport_edit->setGeometry(335,10,sizeHint().width()-345,20); view_tcpport_edit->setReadOnly(true); - label=new QLabel(view_tcpport_edit,tr("Port:"),this,"view_tcpport_label"); + label=new QLabel(view_tcpport_edit,tr("Port:"),this); label->setGeometry(305,10,30,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -92,11 +88,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // System Version // - view_system_edit=new QLineEdit(this,"view_system_edit"); + view_system_edit=new QLineEdit(this); view_system_edit->setGeometry(135,32,70,20); view_system_edit->setReadOnly(true); - label=new QLabel(view_system_edit,tr("System Version:"), - this,"view_system_label"); + label=new QLabel(view_system_edit,tr("System Version:"),this); label->setGeometry(10,32,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -104,11 +99,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Protocol Version // - view_protocol_edit=new QLineEdit(this,"view_protocol_edit"); + view_protocol_edit=new QLineEdit(this); view_protocol_edit->setGeometry(335,32,40,20); view_protocol_edit->setReadOnly(true); - label=new QLabel(view_protocol_edit,tr("Protocol Version:"), - this,"view_protocol_label"); + label=new QLabel(view_protocol_edit,tr("Protocol Version:"),this); label->setGeometry(210,32,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -116,11 +110,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Sources // - view_sources_edit=new QLineEdit(this,"view_sources_edit"); + view_sources_edit=new QLineEdit(this); view_sources_edit->setGeometry(75,54,30,20); view_sources_edit->setReadOnly(true); - label=new QLabel(view_sources_edit,tr("Sources:"), - this,"view_sources_label"); + label=new QLabel(view_sources_edit,tr("Sources:"),this); label->setGeometry(10,54,60,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -128,11 +121,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Destinations // - view_destinations_edit=new QLineEdit(this,"view_destinations_edit"); + view_destinations_edit=new QLineEdit(this); view_destinations_edit->setGeometry(225,54,30,20); view_destinations_edit->setReadOnly(true); - label=new QLabel(view_destinations_edit,tr("Destinations:"), - this,"view_destinations_label"); + label=new QLabel(view_destinations_edit,tr("Destinations:"),this); label->setGeometry(120,54,100,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -140,11 +132,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Channels // - view_channels_edit=new QLineEdit(this,"view_channels_edit"); + view_channels_edit=new QLineEdit(this); view_channels_edit->setGeometry(360,54,30,20); view_channels_edit->setReadOnly(true); - label=new QLabel(view_channels_edit,tr("Channels:"), - this,"view_channels_label"); + label=new QLabel(view_channels_edit,tr("Channels:"),this); label->setGeometry(260,54,95,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -152,11 +143,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // GPIs // - view_gpis_edit=new QLineEdit(this,"view_gpis_edit"); + view_gpis_edit=new QLineEdit(this); view_gpis_edit->setGeometry(135,76,70,20); view_gpis_edit->setReadOnly(true); - label=new QLabel(view_gpis_edit,tr("GPIs:"), - this,"view_gpis_label"); + label=new QLabel(view_gpis_edit,tr("GPIs:"),this); label->setGeometry(10,76,120,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -164,11 +154,10 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // GPOs // - view_gpos_edit=new QLineEdit(this,"view_gpos_edit"); + view_gpos_edit=new QLineEdit(this); view_gpos_edit->setGeometry(305,76,70,20); view_gpos_edit->setReadOnly(true); - label=new QLabel(view_gpos_edit,tr("GPOs:"), - this,"view_gpos_label"); + label=new QLabel(view_gpos_edit,tr("GPOs:"),this); label->setGeometry(210,76,90,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -176,14 +165,12 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Sources List // - label=new QLabel(view_gpos_edit,tr("Sources"), - this,"view_sources_label"); + label=new QLabel(view_gpos_edit,tr("Sources"),this); label->setGeometry(15,98,90,20); label->setFont(bold_font); label->setAlignment(AlignLeft|AlignVCenter); - view_sources_view=new RDListView(this,"view_sources_view"); - view_sources_view-> - setGeometry(10,118,sizeHint().width()-20,200); + view_sources_view=new RDListView(this); + view_sources_view->setGeometry(10,118,sizeHint().width()-20,200); view_sources_view->setAllColumnsShowFocus(true); view_sources_view->setItemMargin(5); view_sources_view->addColumn(tr("#")); @@ -205,12 +192,11 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Destinations List // - label=new QLabel(view_gpos_edit,tr("Destinations"), - this,"view_destinations_label"); + label=new QLabel(view_gpos_edit,tr("Destinations"),this); label->setGeometry(15,325,90,20); label->setFont(bold_font); label->setAlignment(AlignLeft|AlignVCenter); - view_destinations_view=new RDListView(this,"view_destinations_view"); + view_destinations_view=new RDListView(this); view_destinations_view-> setGeometry(10,345,sizeHint().width()-20,200); view_destinations_view->setAllColumnsShowFocus(true); @@ -232,7 +218,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent,const char *name) // // Close Button // - QPushButton *button=new QPushButton(this,"close_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); diff --git a/rdadmin/view_node_info.h b/rdadmin/view_node_info.h index 471ad0966..7b604d5ff 100644 --- a/rdadmin/view_node_info.h +++ b/rdadmin/view_node_info.h @@ -2,9 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: view_node_info.h,v 1.3 2010/07/29 19:32:35 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,12 +30,11 @@ #include #include - class ViewNodeInfo : public QDialog { Q_OBJECT public: - ViewNodeInfo(QWidget *parent=0,const char *name=0); + ViewNodeInfo(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdadmin/xpm_info_banner1.cpp b/rdadmin/xpm_info_banner1.cpp index a6d5b807c..6323b8933 100644 --- a/rdadmin/xpm_info_banner1.cpp +++ b/rdadmin/xpm_info_banner1.cpp @@ -2,9 +2,7 @@ // // Elvish Script for the Copyright Screen // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: xpm_info_banner1.cpp,v 1.3 2007/02/14 21:51:02 fredg Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdadmin/xpm_info_banner2.cpp b/rdadmin/xpm_info_banner2.cpp index c6bdbbf71..096425517 100644 --- a/rdadmin/xpm_info_banner2.cpp +++ b/rdadmin/xpm_info_banner2.cpp @@ -2,9 +2,7 @@ // // Elvish Script for the Copyright Screen // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: xpm_info_banner2.cpp,v 1.3 2007/02/14 21:51:02 fredg Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am index e7aa2d4ab..b1351a4f3 100644 --- a/rdairplay/Makefile.am +++ b/rdairplay/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdairplay ## -## (C) 2002-2008 Fred Gleason -## -## $Id: Makefile.am,v 1.48.8.5 2013/12/28 00:00:33 cvs Exp $ +## (C) 2002-2008,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/button_log.cpp b/rdairplay/button_log.cpp index effc89777..3f7958002 100644 --- a/rdairplay/button_log.cpp +++ b/rdairplay/button_log.cpp @@ -2,9 +2,7 @@ // // The button log widget for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: button_log.cpp,v 1.46.6.3 2014/02/06 20:43:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,8 +29,8 @@ #include ButtonLog::ButtonLog(LogPlay *log,RDCae *cae,int id,RDAirPlayConf *conf, - bool allow_pause,QWidget *parent,const char *name) - : QWidget(parent,name) + bool allow_pause,QWidget *parent) + : QWidget(parent) { log_id=id; log_log=log; @@ -59,12 +57,12 @@ ButtonLog::ButtonLog(LogPlay *log,RDCae *cae,int id,RDAirPlayConf *conf, // // Edit Event Dialog // - log_event_edit=new EditEvent(log_log,log_cae,this,"list_event_edit"); + log_event_edit=new EditEvent(log_log,log_cae,this); // // Line Boxes / Start Buttons // - QSignalMapper *mapper=new QSignalMapper(this,"start_button_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)), this,SLOT(startButton(int))); for(int i=0;i -// -// $Id: button_log.h,v 1.17.6.2 2014/01/07 18:18:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -53,7 +51,7 @@ class ButtonLog : public QWidget Q_OBJECT public: ButtonLog(LogPlay *log,RDCae *cae,int id,RDAirPlayConf *conf, - bool allow_pause=false,QWidget *parent=0,const char *name=0); + bool allow_pause=false,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; RDAirPlayConf::OpMode opMode() const; diff --git a/rdairplay/colors.h b/rdairplay/colors.h index e11f8bef0..750a6230c 100644 --- a/rdairplay/colors.h +++ b/rdairplay/colors.h @@ -2,9 +2,7 @@ // // The color definitions for RDAirPlay. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: colors.h,v 1.37.4.2 2013/07/05 21:07:28 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef COLORS_H #define COLORS_H diff --git a/rdairplay/edit_event.cpp b/rdairplay/edit_event.cpp index 1bddf84f9..d02c91821 100644 --- a/rdairplay/edit_event.cpp +++ b/rdairplay/edit_event.cpp @@ -2,9 +2,7 @@ // // Event Editor for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_event.cpp,v 1.48.8.3.2.3 2014/05/20 18:46:17 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,9 +28,8 @@ #include #include - -EditEvent::EditEvent(LogPlay *log,RDCae *cae,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditEvent::EditEvent(LogPlay *log,RDCae *cae,QWidget *parent) + : QDialog(parent,"",true) { edit_log=log; edit_cae=cae; diff --git a/rdairplay/edit_event.h b/rdairplay/edit_event.h index 400e8d085..9314a6e36 100644 --- a/rdairplay/edit_event.h +++ b/rdairplay/edit_event.h @@ -2,9 +2,7 @@ // // Event Editor for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_event.h,v 1.25.8.2.2.1 2014/05/20 01:45:17 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -49,7 +47,7 @@ class EditEvent : public QDialog { Q_OBJECT public: - EditEvent(LogPlay *log,RDCae *cae,QWidget *parent=0,const char *name=0); + EditEvent(LogPlay *log,RDCae *cae,QWidget *parent=0); ~EditEvent(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdairplay/globals.h b/rdairplay/globals.h index 7a72a87d2..5a77da846 100644 --- a/rdairplay/globals.h +++ b/rdairplay/globals.h @@ -1,11 +1,8 @@ - // globals.h // // Global Variable Declarations for RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: globals.h,v 1.12.14.1 2012/11/26 20:19:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -50,4 +47,5 @@ extern void LogLine(RDConfig::LogPriority prio,const QString &line); extern QString logfile; extern RDConfig *air_config; + #endif // GLOBALS_H diff --git a/rdairplay/hourselector.cpp b/rdairplay/hourselector.cpp index c733e9b35..70bb949bd 100644 --- a/rdairplay/hourselector.cpp +++ b/rdairplay/hourselector.cpp @@ -2,9 +2,7 @@ // // Hour Selector widget for RDAirPlay // -// (C) Copyright 2012 Fred Gleason -// -// $Id: hourselector.cpp,v 1.1.2.1 2012/11/13 23:45:13 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,8 +22,8 @@ #include -HourSelector::HourSelector(QWidget *parent,const char *name) - : QWidget(parent,name) +HourSelector::HourSelector(QWidget *parent) + : QWidget(parent) { // // Fonts diff --git a/rdairplay/hourselector.h b/rdairplay/hourselector.h index 338facf6d..c824985b7 100644 --- a/rdairplay/hourselector.h +++ b/rdairplay/hourselector.h @@ -2,9 +2,7 @@ // // Hour Selector widget for RDAirPlay // -// (C) Copyright 2012 Fred Gleason -// -// $Id: hourselector.h,v 1.1.2.1 2012/11/13 23:45:13 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class HourSelector : public QWidget { Q_OBJECT public: - HourSelector(QWidget *parent=0,const char *name=0); + HourSelector(QWidget *parent=0); QSizePolicy sizePolicy() const; void setTimeMode(RDAirPlayConf::TimeMode mode); void updateHours(bool states[24]); diff --git a/rdairplay/lib_listview.cpp b/rdairplay/lib_listview.cpp index 3d85b55b8..b8cbee106 100644 --- a/rdairplay/lib_listview.cpp +++ b/rdairplay/lib_listview.cpp @@ -2,9 +2,7 @@ // // The Log ListView widget for RDAirPlay's Full Log widget. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: lib_listview.cpp,v 1.1.2.2 2014/02/20 00:43:22 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include -LibListView::LibListView(QWidget *parent,const char *name) - : RDListView(parent,name) +LibListView::LibListView(QWidget *parent) + : RDListView(parent) { setAcceptDrops(true); } diff --git a/rdairplay/lib_listview.h b/rdairplay/lib_listview.h index 62ba85b5f..f2835fdc1 100644 --- a/rdairplay/lib_listview.h +++ b/rdairplay/lib_listview.h @@ -2,9 +2,7 @@ // // The Log ListView widget for RDAirPlay's Full Log widget. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: lib_listview.h,v 1.1.2.1 2013/12/28 00:00:33 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,7 @@ class LibListView : public RDListView { Q_OBJECT public: - LibListView(QWidget *parent,const char *name=0); + LibListView(QWidget *parent); signals: void cartDropped(int line,RDLogLine *ll); diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index d798eda56..3d30f2769 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -2,9 +2,7 @@ // // The full log list for RDAirPlay // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_log.cpp,v 1.105.6.11.2.1 2014/05/21 18:19:42 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,8 +45,8 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, - QWidget *parent,const char *name) - : QWidget(parent,name) + QWidget *parent) + : QWidget(parent) { list_id=id; list_log=log; @@ -160,7 +158,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Log List // - list_log_list=new LibListView(this,"list_log_list"); + list_log_list=new LibListView(this); list_log_list->setFont(list_font); int y=0; int h=sizeHint().height()-60; @@ -225,7 +223,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // List Logs Dialog // - list_logs_dialog=new ListLogs(list_log,this,"list_logs"); + list_logs_dialog=new ListLogs(list_log,this); // // Time Counter Section @@ -242,7 +240,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Stop Time Counter // - list_stoptime_edit=new QLineEdit(this,"list_stoptime_edit"); + list_stoptime_edit=new QLineEdit(this); list_stoptime_edit->setGeometry(407,sizeHint().height()-100,70,18); list_stoptime_label=new QLabel(list_stoptime_edit,tr("Next Stop:"),this); list_stoptime_label->setGeometry(337,sizeHint().height()-100,65,18); @@ -257,7 +255,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // End Time Counter // - list_endtime_edit=new QLineEdit(this,"list_endtime_edit"); + list_endtime_edit=new QLineEdit(this); list_endtime_edit->setGeometry(407,sizeHint().height()-80,70,18); list_endtime_label=new QLabel(list_endtime_edit,tr("Log End:"),this); list_endtime_label->setGeometry(337,sizeHint().height()-80,65,18); @@ -272,7 +270,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Select Button // - list_take_button=new QPushButton(this,"list_take_button"); + list_take_button=new QPushButton(this); list_take_button->setGeometry(10,sizeHint().height()-55,80,50); list_take_button->setFont(font); list_take_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -284,7 +282,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Audition Head Button // - list_head_button=new QPushButton(this,"list_head_button"); + list_head_button=new QPushButton(this); list_head_button->setGeometry(10,sizeHint().height()-113,80,50); list_head_button->setFont(font); list_head_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -298,7 +296,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Audition Tail Button // - list_tail_button=new QPushButton(this,"list_tail_button"); + list_tail_button=new QPushButton(this); list_tail_button->setGeometry(90,sizeHint().height()-113,80,50); list_tail_button->setFont(font); list_tail_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -312,7 +310,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Play Button // - list_play_button=new QPushButton(this,"list_play_button"); + list_play_button=new QPushButton(this); list_play_button->setGeometry(10,sizeHint().height()-55,80,50); list_play_button->setFont(font); list_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -324,7 +322,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Next Button // - list_next_button=new QPushButton(this,"list_next_button"); + list_next_button=new QPushButton(this); list_next_button->setGeometry(90,sizeHint().height()-55,80,50); list_next_button->setFont(font); list_next_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -336,7 +334,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Modify Button // - list_modify_button=new QPushButton(this,"list_modify_button"); + list_modify_button=new QPushButton(this); list_modify_button->setGeometry(170,sizeHint().height()-55,80,50); list_modify_button->setFont(font); list_modify_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -348,7 +346,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Scroll Button // - list_scroll_button=new QPushButton(this,"list_scroll_button"); + list_scroll_button=new QPushButton(this); list_scroll_button->setGeometry(250,sizeHint().height()-55,80,50); list_scroll_button->setFont(font); list_scroll_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -360,7 +358,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Refresh Button // - list_refresh_button=new QPushButton(this,"list_refresh_button"); + list_refresh_button=new QPushButton(this); list_refresh_button->setGeometry(330,sizeHint().height()-55,80,50); list_refresh_button->setFont(font); list_refresh_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); @@ -373,7 +371,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Log Load // - list_load_button=new QPushButton(this,"list_load_button"); + list_load_button=new QPushButton(this); list_load_button->setGeometry(sizeHint().width()-90,sizeHint().height()-55, 80,50); list_load_button->setFont(font); @@ -385,7 +383,7 @@ ListLog::ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause, // // Edit Event Dialog // - list_event_edit=new EditEvent(list_log,list_cae,this,"list_event_edit"); + list_event_edit=new EditEvent(list_log,list_cae,this); // // Map Slots diff --git a/rdairplay/list_log.h b/rdairplay/list_log.h index c476e960d..c095a21fe 100644 --- a/rdairplay/list_log.h +++ b/rdairplay/list_log.h @@ -2,9 +2,7 @@ // // The full log list widget for RDAirPlay. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: list_log.h,v 1.36.6.2 2013/12/28 00:00:33 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,7 +44,7 @@ class ListLog : public QWidget Q_OBJECT public: ListLog(LogPlay *log,RDCae *cae,int id,bool allow_pause=false, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void refresh(); diff --git a/rdairplay/list_logs.cpp b/rdairplay/list_logs.cpp index 7521e59f5..958b20f82 100644 --- a/rdairplay/list_logs.cpp +++ b/rdairplay/list_logs.cpp @@ -2,9 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_logs.cpp,v 1.22.6.1 2012/08/10 19:07:21 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include #include -ListLogs::ListLogs(LogPlay *log,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListLogs::ListLogs(LogPlay *log,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -179,10 +177,9 @@ void ListLogs::saveAsButtonData() RDAddLog *log; if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { log=new RDAddLog(&logname,&svcname,rdstation_conf, - tr("Rename Log"),this,"log", rduser); + tr("Rename Log"),this,rduser); } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,rdstation_conf, - tr("Rename Log"),this,"log"); + log=new RDAddLog(&logname,&svcname,rdstation_conf,tr("Rename Log"),this); } if(log->exec()<0) { diff --git a/rdairplay/list_logs.h b/rdairplay/list_logs.h index 14839dc73..843c90bb8 100644 --- a/rdairplay/list_logs.h +++ b/rdairplay/list_logs.h @@ -2,9 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_logs.h,v 1.10 2010/10/11 16:07:12 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,7 +33,7 @@ class ListLogs : public QDialog Q_OBJECT public: - ListLogs(LogPlay *log,QWidget *parent=0,const char *name=0); + ListLogs(LogPlay *log,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdairplay/local_macros.cpp b/rdairplay/local_macros.cpp index 1733902e5..a9738e358 100644 --- a/rdairplay/local_macros.cpp +++ b/rdairplay/local_macros.cpp @@ -2,9 +2,7 @@ // // Local RML Macros for the Rivendell's RDAirPlay // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: local_macros.cpp,v 1.31.6.3.2.2 2014/05/22 19:37:45 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/log_play.cpp b/rdairplay/log_play.cpp index 7ad390971..24f0ba2f6 100644 --- a/rdairplay/log_play.cpp +++ b/rdairplay/log_play.cpp @@ -2,9 +2,7 @@ // // Rivendell Log Playout Machine // -// (C) Copyright 2002-2009 Fred Gleason -// -// $Id: log_play.cpp,v 1.197.8.7.2.2 2014/05/22 19:37:45 cvs Exp $ +// (C) Copyright 2002-2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/log_play.h b/rdairplay/log_play.h index eb3d822e3..4d42b4012 100644 --- a/rdairplay/log_play.h +++ b/rdairplay/log_play.h @@ -2,9 +2,7 @@ // // Rivendell Log Playout Machine // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: log_play.h,v 1.90.8.3.2.1 2014/05/22 19:37:45 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/log_traffic.cpp b/rdairplay/log_traffic.cpp index 7649c922a..f1cee81de 100644 --- a/rdairplay/log_traffic.cpp +++ b/rdairplay/log_traffic.cpp @@ -28,7 +28,6 @@ #include #include - void LogTraffic(const QString &svcname,const QString &logname, RDLogLine *logline,RDLogLine::PlaySource src, RDAirPlayConf::TrafficAction action,bool onair_flag) diff --git a/rdairplay/log_traffic.h b/rdairplay/log_traffic.h index 3ed46413b..6a0f2556b 100644 --- a/rdairplay/log_traffic.h +++ b/rdairplay/log_traffic.h @@ -2,9 +2,7 @@ // // Add an entry to the reconciliation table. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: log_traffic.h,v 1.9 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,7 +24,6 @@ #include #include - void LogTraffic(const QString &svcname,const QString &logname, RDLogLine *logline,RDLogLine::PlaySource src, RDAirPlayConf::TrafficAction action,bool onair_flag); diff --git a/rdairplay/loglinebox.cpp b/rdairplay/loglinebox.cpp index 3d6489729..1f7f3b366 100644 --- a/rdairplay/loglinebox.cpp +++ b/rdairplay/loglinebox.cpp @@ -2,9 +2,7 @@ // // On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: loglinebox.cpp,v 1.89.6.8 2014/02/06 20:43:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,9 +38,8 @@ #include "../icons/traffic.xpm" #include "../icons/music.xpm" - -LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) - : QWidget(parent,name) +LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) + : QWidget(parent) { line_status=RDLogLine::Scheduled; line_type=RDLogLine::UnknownType; diff --git a/rdairplay/loglinebox.h b/rdairplay/loglinebox.h index a9423a9e0..89193fc4d 100644 --- a/rdairplay/loglinebox.h +++ b/rdairplay/loglinebox.h @@ -2,9 +2,7 @@ // // On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: loglinebox.h,v 1.47.8.6 2014/02/06 20:43:51 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef LOGLINEBOX_H #define LOGLINEBOX_H @@ -56,7 +53,7 @@ class LogLineBox : public QWidget public: enum Mode {Full=0,Half=1}; enum BarMode {Transitioning=0,Stopping=1}; - LogLineBox(RDAirPlayConf *conf,QWidget *parent=0,const char *name=0); + LogLineBox(RDAirPlayConf *conf,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; LogLineBox::Mode mode() const; diff --git a/rdairplay/mode_display.cpp b/rdairplay/mode_display.cpp index a312e7186..2c3938625 100644 --- a/rdairplay/mode_display.cpp +++ b/rdairplay/mode_display.cpp @@ -2,9 +2,7 @@ // // The mode display widget for RDAirPlay in Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: mode_display.cpp,v 1.17.6.1 2014/02/10 20:45:13 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/mode_display.h b/rdairplay/mode_display.h index 36faa46e6..6212d3ebb 100644 --- a/rdairplay/mode_display.h +++ b/rdairplay/mode_display.h @@ -2,9 +2,7 @@ // // The mode display widget for RDAirPlay in Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: mode_display.h,v 1.12.6.1 2014/02/10 20:45:13 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/nownext.cpp b/rdairplay/nownext.cpp index efa7e13d7..c550090ba 100644 --- a/rdairplay/nownext.cpp +++ b/rdairplay/nownext.cpp @@ -2,9 +2,7 @@ // // Rivendell Now & Next Implementation // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: nownext.cpp,v 1.4.8.3 2014/01/13 16:51:21 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index 6a85ecff5..4af01c500 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -2,9 +2,7 @@ // // The pie counter widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: pie_counter.cpp,v 1.39 2010/10/06 19:24:02 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include #include -PieCounter::PieCounter(int count_length,QWidget *parent,const char *name) - : QWidget(parent,name) +PieCounter::PieCounter(int count_length,QWidget *parent) + : QWidget(parent) { pie_length=0; pie_time=0; diff --git a/rdairplay/pie_counter.h b/rdairplay/pie_counter.h index d47974cb7..5c7634d92 100644 --- a/rdairplay/pie_counter.h +++ b/rdairplay/pie_counter.h @@ -2,9 +2,7 @@ // // The pie counter widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: pie_counter.h,v 1.20 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -54,7 +52,7 @@ class PieCounter : public QWidget { Q_OBJECT public: - PieCounter(int count_length,QWidget *parent=0,const char *name=0); + PieCounter(int count_length,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; int line() const; diff --git a/rdairplay/post_counter.cpp b/rdairplay/post_counter.cpp index 6c56fc69e..fb5661766 100644 --- a/rdairplay/post_counter.cpp +++ b/rdairplay/post_counter.cpp @@ -2,9 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: post_counter.cpp,v 1.22.6.1 2012/11/26 20:19:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include #include -PostCounter::PostCounter(QWidget *parent,const char *name) - : QPushButton(parent,name) +PostCounter::PostCounter(QWidget *parent) + : QPushButton(parent) { post_running=false; post_time_format="hh:mm:ss"; diff --git a/rdairplay/post_counter.h b/rdairplay/post_counter.h index cdcb6803c..ac04e8c1f 100644 --- a/rdairplay/post_counter.h +++ b/rdairplay/post_counter.h @@ -2,9 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: post_counter.h,v 1.13 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class PostCounter : public QPushButton { Q_OBJECT public: - PostCounter(QWidget *parent=0,const char *name=0); + PostCounter(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setTimeMode(RDAirPlayConf::TimeMode mode); diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 3593ab76d..127ab5fc6 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -2,9 +2,7 @@ // // The On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: rdairplay.cpp,v 1.189.2.24 2014/03/02 03:21:52 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -100,8 +98,8 @@ void MainWidget::logLine(RDConfig::LogPriority prio,const QString &s) LogLine(prio,s); } -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { prog_ptr=this; QString str; @@ -133,7 +131,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // air_splash_screen=new QSplashScreen(QPixmap(rivendell_128x128_xpm)); air_splash_screen->hide(); - QTimer *timer=new QTimer(this,"splash_timer"); + QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(clearSplashData())); timer->start(AIR_PLAY_SPLASH_TIME,true); @@ -254,7 +252,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Master Clock Timer // - air_master_timer=new QTimer(this,"air_master_timer"); + air_master_timer=new QTimer(this); connect(air_master_timer,SIGNAL(timeout()),this,SLOT(masterTimerData())); air_master_timer->start(MASTER_TIMER_INTERVAL); @@ -327,7 +325,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // CAE Connection // - air_cae=new RDCae(rdstation_conf,air_config,parent,name); + air_cae=new RDCae(rdstation_conf,air_config,parent); air_cae->connectHost(); // @@ -365,9 +363,9 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Log Machines // - QSignalMapper *reload_mapper=new QSignalMapper(this,"reload_mapper"); + QSignalMapper *reload_mapper=new QSignalMapper(this); connect(reload_mapper,SIGNAL(mapped(int)),this,SLOT(logReloadedData(int))); - QSignalMapper *rename_mapper=new QSignalMapper(this,"rename_mapper"); + QSignalMapper *rename_mapper=new QSignalMapper(this); connect(rename_mapper,SIGNAL(mapped(int)),this,SLOT(logRenamedData(int))); QString default_svcname=rdairplay_conf->defaultSvc(); for(int i=0;i setGeometry(10,5,clock->sizeHint().width(),clock->sizeHint().height()); clock->setCheckSyncEnabled(rdairplay_conf->checkTimesync()); @@ -448,7 +446,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Post Counter // - air_post_counter=new PostCounter(this,"air_post_counter"); + air_post_counter=new PostCounter(this); air_post_counter->setGeometry(220,5,air_post_counter->sizeHint().width(), air_post_counter->sizeHint().height()); air_post_counter->setPostPoint(QTime(),0,false,false); @@ -461,8 +459,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Pie Counter // - air_pie_counter=new PieCounter(rdairplay_conf->pieCountLength(), - this,"air_pie_counter"); + air_pie_counter=new PieCounter(rdairplay_conf->pieCountLength(),this); air_pie_counter->setGeometry(426,5,air_pie_counter->sizeHint().width(), air_pie_counter->sizeHint().height()); air_pie_counter->setCountLength(rdairplay_conf->pieCountLength()); @@ -486,7 +483,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Audio Meter // - air_stereo_meter=new RDStereoMeter(this,"air_stereo_meter"); + air_stereo_meter=new RDStereoMeter(this); air_stereo_meter->setGeometry(50,70,air_stereo_meter->sizeHint().width(), air_stereo_meter->sizeHint().height()); air_stereo_meter->setMode(RDSegMeter::Peak); @@ -498,7 +495,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Message Label // - air_message_label=new RDLabel(this,"air_message_label"); + air_message_label=new RDLabel(this); air_message_label->setGeometry(sizeHint().width()-425,70, MESSAGE_WIDGET_WIDTH,air_stereo_meter->sizeHint().height()); air_message_label->setWordWrapEnabled(true); @@ -511,7 +508,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Stop Counter // - air_stop_counter=new StopCounter(this,"air_stop_counter"); + air_stop_counter=new StopCounter(this); air_stop_counter->setGeometry(600,5,air_stop_counter->sizeHint().width(), air_stop_counter->sizeHint().height()); air_stop_counter->setTime(QTime(0,0,0)); @@ -557,7 +554,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Add Button // - air_add_button=new RDPushButton(this,"air_add_button"); + air_add_button=new RDPushButton(this); air_add_button->setGeometry(10,sizeHint().height()-65,80,60); air_add_button->setFont(button_font); air_add_button->setText(tr("ADD")); @@ -567,7 +564,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Delete Button // - air_delete_button=new RDPushButton(this,"air_delete_button"); + air_delete_button=new RDPushButton(this); air_delete_button->setGeometry(100,sizeHint().height()-65,80,60); air_delete_button->setFont(button_font); air_delete_button->setText(tr("DEL")); @@ -578,7 +575,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Move Button // - air_move_button=new RDPushButton(this,"air_move_button"); + air_move_button=new RDPushButton(this); air_move_button->setGeometry(190,sizeHint().height()-65,80,60); air_move_button->setFont(button_font); air_move_button->setText(tr("MOVE")); @@ -589,7 +586,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Copy Button // - air_copy_button=new RDPushButton(this,"air_copy_button"); + air_copy_button=new RDPushButton(this); air_copy_button->setGeometry(280,sizeHint().height()-65,80,60); air_copy_button->setFont(button_font); air_copy_button->setText(tr("COPY")); @@ -600,7 +597,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Refresh Indicator // - air_refresh_label=new RDLabel(this,"air_refresh_label"); + air_refresh_label=new RDLabel(this); air_refresh_label->setGeometry(390,sizeHint().height()-65,120,60); air_refresh_label->setFont(button_font); QPalette p=palette(); @@ -619,7 +616,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Meter Timer // - timer=new QTimer(this,"meter_timer"); + timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(meterData())); timer->start(RD_METER_UPDATE_INTERVAL); @@ -636,7 +633,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) rdairplay_conf->flashPanel(), rdairplay_conf->buttonLabelTemplate(),false, rdevent_player,rdripc,air_cae,rdstation_conf, - rdcart_dialog,this,"air_panel"); + rdcart_dialog,this); air_panel->setLogfile(air_config->airplayLogname()); air_panel->setGeometry(510,140,air_panel->sizeHint().width(), air_panel->sizeHint().height()); @@ -755,8 +752,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // air_pause_enabled=rdairplay_conf->pauseEnabled(); for(int i=0;isetGeometry(510,140,air_log_list[i]->sizeHint().width(), air_log_list[i]->sizeHint().height()); air_log_list[i]->hide(); @@ -769,7 +765,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Full Log Buttons // - QSignalMapper *mapper=new QSignalMapper(this,"log_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(fullLogButtonData(int))); for(int i=0;isetGeometry(562,sizeHint().height()-65,80,60); air_panel_button->setFont(button_font); air_panel_button->setText(tr("Sound\nPanel")); @@ -898,11 +894,10 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // Create the HotKeyList object // - rdkeylist = new RDHotKeyList(); - rdhotkeys = new RDHotkeys(RDEscapeString(air_config->stationName()), - "airplay"); - AltKeyHit = false; - CtrlKeyHit = false; + rdkeylist=new RDHotKeyList(); + rdhotkeys=new RDHotkeys(air_config->stationName(),"rdairplay"); + AltKeyHit=false; + CtrlKeyHit=false; // // Set Signal Handlers @@ -2555,7 +2550,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h index 5eb1aab50..ed76edd37 100644 --- a/rdairplay/rdairplay.h +++ b/rdairplay/rdairplay.h @@ -2,9 +2,7 @@ // // The On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdairplay.h,v 1.89.4.9 2014/02/10 20:45:14 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -90,12 +88,11 @@ #define MESSAGE_WIDGET_WIDTH 410 #define RDAIRPLAY_USAGE "[=[:[+]]] [...]\n\nWhere refers to one of the three log machines\n('--log1', '--log2' or '--log3') and to the line number\nto do a 'make next' to after the log is loaded (default = 0). If the\n'+' is appended, then the log is started after the 'make next'.\n\nExamples:\n rdairplay --log1=MyLog\n Load 'MyLog' into the Main Log machine\n\n rdairplay --log2=MyLog:14+\n Load 'MyLog' into the Aux Log 1 machine, 'Make Next'\n to line 14 and then start the log.\n\n rdairplay --log1=YourLog --log2=MyLog\n Load 'YourLog' into the Main Log machine and 'MyLog' into the\n Aux Log 1 machine.\n" - class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdairplay/rdairplay.pro b/rdairplay/rdairplay.pro index 6264ed911..c3414a374 100644 --- a/rdairplay/rdairplay.pro +++ b/rdairplay/rdairplay.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDAirPlay. # -# (C) Copyright 2003-2005 Fred Gleason -# -# $Id: rdairplay.pro,v 1.8.4.4 2013/12/28 00:00:34 cvs Exp $ +# (C) Copyright 2003-2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdairplay/rlmhost.cpp b/rdairplay/rlmhost.cpp index 20f59b952..75fcce868 100644 --- a/rdairplay/rlmhost.cpp +++ b/rdairplay/rlmhost.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell Loadable Module host. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rlmhost.cpp,v 1.7.6.9.2.1 2014/03/19 19:25:18 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +31,8 @@ RLMHost::RLMHost(const QString &path,const QString &arg, - QSocketDevice *udp_socket,QObject *parent,const char *name) - : QObject(parent,name) + QSocketDevice *udp_socket,QObject *parent) + : QObject(parent) { plugin_path=path; plugin_arg=arg; diff --git a/rdairplay/rlmhost.h b/rdairplay/rlmhost.h index e4afa086f..c334e6dbc 100644 --- a/rdairplay/rlmhost.h +++ b/rdairplay/rlmhost.h @@ -2,9 +2,7 @@ // // A container class for a Rivendell Loadable Module host. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rlmhost.h,v 1.6.6.3 2013/11/05 20:16:41 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class RLMHost : public QObject Q_OBJECT public: RLMHost(const QString &path,const QString &arg,QSocketDevice *udp_socket, - QObject *parent=0,const char *name=0); + QObject *parent=0); ~RLMHost(); QString pluginPath() const; QString pluginArg() const; diff --git a/rdairplay/start_button.cpp b/rdairplay/start_button.cpp index 19fafa177..3495b2bdc 100644 --- a/rdairplay/start_button.cpp +++ b/rdairplay/start_button.cpp @@ -2,9 +2,7 @@ // // The Start Button for RDAirPlay Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: start_button.cpp,v 1.27 2011/02/11 23:06:05 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,9 +26,8 @@ #include #include - -StartButton::StartButton(bool allow_pause,QWidget *parent,const char *name) - : QPushButton(parent,name) +StartButton::StartButton(bool allow_pause,QWidget *parent) + : QPushButton(parent) { start_time_mode=RDAirPlayConf::TwentyFourHour; start_time=QTime(); diff --git a/rdairplay/start_button.h b/rdairplay/start_button.h index 734fa48b1..47b152ecc 100644 --- a/rdairplay/start_button.h +++ b/rdairplay/start_button.h @@ -2,9 +2,7 @@ // // The Start Button for RDAirPlay Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: start_button.h,v 1.16 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class StartButton : public QPushButton public: enum Mode {Stop=0,Play=1,Pause=2,AddFrom=3,AddTo=4,DeleteFrom=5, MoveFrom=6,MoveTo=7,CopyFrom=8,CopyTo=9,Disabled=10,Error=11}; - StartButton(bool allow_pause=false,QWidget *parent=0,const char *name=0); + StartButton(bool allow_pause=false,QWidget *parent=0); void setTime(QString); void setTime(QTime); void setPort(QString port); diff --git a/rdairplay/stop_counter.cpp b/rdairplay/stop_counter.cpp index b88dcf6ac..33abdec47 100644 --- a/rdairplay/stop_counter.cpp +++ b/rdairplay/stop_counter.cpp @@ -2,9 +2,7 @@ // // The stop counter widget for Rivendell // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: stop_counter.cpp,v 1.21 2011/01/10 19:27:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include #include -StopCounter::StopCounter(QWidget *parent,const char *name) - : QPushButton(parent,name) +StopCounter::StopCounter(QWidget *parent) + : QPushButton(parent) { stop_running=false; diff --git a/rdairplay/stop_counter.h b/rdairplay/stop_counter.h index 126a3ecca..018615e26 100644 --- a/rdairplay/stop_counter.h +++ b/rdairplay/stop_counter.h @@ -2,9 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: stop_counter.h,v 1.11 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,7 @@ class StopCounter : public QPushButton { Q_OBJECT public: - StopCounter(QWidget *parent=0,const char *name=0); + StopCounter(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setState(bool state); diff --git a/rdairplay/wall_clock.cpp b/rdairplay/wall_clock.cpp index 8901ed9d0..8adcd5d7d 100644 --- a/rdairplay/wall_clock.cpp +++ b/rdairplay/wall_clock.cpp @@ -2,9 +2,7 @@ // // A wall-clock widget with date. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: wall_clock.cpp,v 1.21 2011/01/11 12:20:31 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,8 @@ #include #include -WallClock::WallClock(QWidget *parent,const char *name) - :QPushButton(parent,name) +WallClock::WallClock(QWidget *parent) + :QPushButton(parent) { time_offset=rdstation_conf->timeOffset(); previous_time=QTime::currentTime().addMSecs(time_offset); diff --git a/rdairplay/wall_clock.h b/rdairplay/wall_clock.h index ad40420dd..3813587a7 100644 --- a/rdairplay/wall_clock.h +++ b/rdairplay/wall_clock.h @@ -2,9 +2,7 @@ // // The wall clock widget for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: wall_clock.h,v 1.14 2011/01/11 12:20:31 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,7 +33,7 @@ class WallClock : public QPushButton { Q_OBJECT public: - WallClock(QWidget *parent=0,const char *name=0); + WallClock(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; void setDateDisplay(bool state); diff --git a/rdcartslots/Makefile.am b/rdcartslots/Makefile.am index fa6821e83..7f7725bfd 100644 --- a/rdcartslots/Makefile.am +++ b/rdcartslots/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdcartslots ## -## (C) Copyright 2012 Fred Gleason -## -## $Id: Makefile.am,v 1.4.2.2 2012/11/16 18:10:40 cvs Exp $ +## (C) Copyright 2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdcartslots/local_macros.cpp b/rdcartslots/local_macros.cpp index e7f0995aa..156672a39 100644 --- a/rdcartslots/local_macros.cpp +++ b/rdcartslots/local_macros.cpp @@ -2,9 +2,7 @@ // // A Dedicated Cart Slot Utility for Rivendell. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: local_macros.cpp,v 1.2.2.3 2012/11/28 21:44:08 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 818fcc49e..aa38d42c8 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -2,9 +2,7 @@ // // A Dedicated Cart Slot Utility for Rivendell. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdcartslots.cpp,v 1.8.2.13 2014/02/11 23:46:29 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcartslots/rdcartslots.h b/rdcartslots/rdcartslots.h index 6f483daca..15233c94a 100644 --- a/rdcartslots/rdcartslots.h +++ b/rdcartslots/rdcartslots.h @@ -2,9 +2,7 @@ // // A Dedicated Cart Slot Utility for Rivendell. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdcartslots.h,v 1.5.2.6 2014/01/07 23:23:18 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCARTSLOTS_H #define RDCARTSLOTS_H diff --git a/rdcartslots/rdcartslots.pro b/rdcartslots/rdcartslots.pro index 68e283bf6..811b4a4e5 100644 --- a/rdcartslots/rdcartslots.pro +++ b/rdcartslots/rdcartslots.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDCartSlots. # -# (C) Copyright 2012 Fred Gleason -# -# $Id: rdcartslots.pro,v 1.1.2.2 2012/11/16 18:10:41 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdcastmanager/Makefile.am b/rdcastmanager/Makefile.am index 37ebb8189..6240b2fdb 100644 --- a/rdcastmanager/Makefile.am +++ b/rdcastmanager/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdcastmanager ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.8.8.2 2013/01/01 21:36:30 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdcastmanager/edit_cast.cpp b/rdcastmanager/edit_cast.cpp index f55afad11..3c028b579 100644 --- a/rdcastmanager/edit_cast.cpp +++ b/rdcastmanager/edit_cast.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Cast // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_cast.cpp,v 1.11 2011/09/09 20:23:28 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,9 +37,8 @@ #include #include - -EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditCast::EditCast(unsigned cast_id,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -64,12 +61,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Media Link // - cast_item_medialink_edit=new QLineEdit(this,"cast_item_medialink_edit"); + cast_item_medialink_edit=new QLineEdit(this); cast_item_medialink_edit->setGeometry(115,10,sizeHint().width()-125,20); cast_item_medialink_edit->setReadOnly(true); QLabel *cast_item_medialink_label= - new QLabel(cast_item_medialink_edit,tr("Media Link:"),this, - "cast_item_medialink_label"); + new QLabel(cast_item_medialink_edit,tr("Media Link:"),this); cast_item_medialink_label->setGeometry(20,10,90,20); cast_item_medialink_label->setFont(font); cast_item_medialink_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -85,12 +81,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Title // - cast_item_title_edit=new QLineEdit(this,"cast_item_title_edit"); + cast_item_title_edit=new QLineEdit(this); cast_item_title_edit->setGeometry(115,ypos,sizeHint().width()-125,20); cast_item_title_edit->setMaxLength(255); QLabel *cast_item_title_label= - new QLabel(cast_item_title_edit,tr("Title:"),this, - "cast_item_title_label"); + new QLabel(cast_item_title_edit,tr("Title:"),this); cast_item_title_label->setGeometry(20,ypos,90,20); cast_item_title_label->setFont(font); cast_item_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -98,12 +93,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Author // - cast_item_author_edit=new QLineEdit(this,"cast_item_author_edit"); + cast_item_author_edit=new QLineEdit(this); cast_item_author_edit->setGeometry(115,ypos+22,sizeHint().width()-125,20); cast_item_author_edit->setMaxLength(255); QLabel *cast_item_author_label= - new QLabel(cast_item_author_edit,tr("Author E-Mail:"),this, - "cast_item_author_label"); + new QLabel(cast_item_author_edit,tr("Author E-Mail:"),this); cast_item_author_label->setGeometry(20,ypos+22,90,20); cast_item_author_label->setFont(font); cast_item_author_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -111,12 +105,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Category // - cast_item_category_edit=new QLineEdit(this,"cast_item_category_edit"); + cast_item_category_edit=new QLineEdit(this); cast_item_category_edit->setGeometry(115,ypos+44,sizeHint().width()-125,20); cast_item_category_edit->setMaxLength(64); QLabel *cast_item_category_label= - new QLabel(cast_item_category_edit,tr("Category:"),this, - "cast_item_category_label"); + new QLabel(cast_item_category_edit,tr("Category:"),this); cast_item_category_label->setGeometry(20,ypos+44,90,20); cast_item_category_label->setFont(font); cast_item_category_label-> @@ -125,12 +118,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Link // - cast_item_link_edit=new QLineEdit(this,"cast_item_link_edit"); + cast_item_link_edit=new QLineEdit(this); cast_item_link_edit->setGeometry(115,ypos+66,sizeHint().width()-125,20); cast_item_link_edit->setMaxLength(255); QLabel *cast_item_link_label= - new QLabel(cast_item_link_edit,tr("Link URL:"),this, - "cast_item_link_label"); + new QLabel(cast_item_link_edit,tr("Link URL:"),this); cast_item_link_label->setGeometry(20,ypos+66,90,20); cast_item_link_label->setFont(font); cast_item_link_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -138,13 +130,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Description // - cast_item_description_edit= - new QTextEdit(this,"cast_item_description_edit"); + cast_item_description_edit=new QTextEdit(this); cast_item_description_edit-> setGeometry(115,ypos+88,sizeHint().width()-125,76); QLabel *cast_item_description_label= - new QLabel(cast_item_description_edit,tr("Description:"),this, - "cast_item_description_label"); + new QLabel(cast_item_description_edit,tr("Description:"),this); cast_item_description_label->setGeometry(20,ypos+88,90,20); cast_item_description_label->setFont(font); cast_item_description_label-> @@ -153,12 +143,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Source Text // - cast_item_sourcetext_edit=new QLineEdit(this,"cast_item_sourcetext_edit"); + cast_item_sourcetext_edit=new QLineEdit(this); cast_item_sourcetext_edit->setGeometry(115,ypos+169,sizeHint().width()-125,20); cast_item_sourcetext_edit->setMaxLength(64); QLabel *cast_item_sourcetext_label= - new QLabel(cast_item_sourcetext_edit,tr("Source Text:"),this, - "cast_item_sourcetext_label"); + new QLabel(cast_item_sourcetext_edit,tr("Source Text:"),this); cast_item_sourcetext_label->setGeometry(20,ypos+169,90,20); cast_item_sourcetext_label->setFont(font); cast_item_sourcetext_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -166,12 +155,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Source URL // - cast_item_sourceurl_edit=new QLineEdit(this,"cast_item_sourceurl_edit"); + cast_item_sourceurl_edit=new QLineEdit(this); cast_item_sourceurl_edit->setGeometry(115,ypos+191,sizeHint().width()-125,20); cast_item_sourceurl_edit->setMaxLength(64); QLabel *cast_item_sourceurl_label= - new QLabel(cast_item_sourceurl_edit,tr("Source URL:"),this, - "cast_item_sourceurl_label"); + new QLabel(cast_item_sourceurl_edit,tr("Source URL:"),this); cast_item_sourceurl_label->setGeometry(20,ypos+191,90,20); cast_item_sourceurl_label->setFont(font); cast_item_sourceurl_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -179,12 +167,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Comments // - cast_item_comments_edit=new QLineEdit(this,"cast_item_comments_edit"); + cast_item_comments_edit=new QLineEdit(this); cast_item_comments_edit->setGeometry(115,ypos+213,sizeHint().width()-125,20); cast_item_comments_edit->setMaxLength(64); QLabel *cast_item_comments_label= - new QLabel(cast_item_comments_edit,tr("Comments URL:"),this, - "cast_item_comments_label"); + new QLabel(cast_item_comments_edit,tr("Comments URL:"),this); cast_item_comments_label->setGeometry(10,ypos+213,100,20); cast_item_comments_label->setFont(font); cast_item_comments_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -230,12 +217,11 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) cast_item_effective_edit=new QDateTimeEdit(this); cast_item_effective_edit-> setGeometry(115,cast_ypos,165,20); - label=new QLabel(cast_item_effective_edit,tr("Air Date/Time:"),this, - "cast_item_effective_label"); + label=new QLabel(cast_item_effective_edit,tr("Air Date/Time:"),this); label->setGeometry(20,cast_ypos,90,20); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"cast_item_effective_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(290,cast_ypos-3,50,25); button->setFont(select_font); button->setText(tr("&Select")); @@ -245,13 +231,12 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Origin // - cast_item_origin_edit=new QLineEdit(this,"cast_item_origin_edit"); + cast_item_origin_edit=new QLineEdit(this); cast_item_origin_edit->setReadOnly(true); cast_item_origin_edit->setGeometry(115,cast_ypos,165,20); cast_item_origin_edit->setMaxLength(64); QLabel *cast_item_origin_label= - new QLabel(cast_item_origin_edit,tr("Posted At:"),this, - "cast_item_origin_label"); + new QLabel(cast_item_origin_edit,tr("Posted At:"),this); cast_item_origin_label->setGeometry(20,cast_ypos,90,20); cast_item_origin_label->setFont(font); cast_item_origin_label-> @@ -261,13 +246,13 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Item Expiration // - cast_item_expiration_box=new QComboBox(this,"cast_item_expiration_box"); + cast_item_expiration_box=new QComboBox(this); cast_item_expiration_box->setGeometry(115,cast_ypos,50,20); cast_item_expiration_box->insertItem(tr("No")); cast_item_expiration_box->insertItem(tr("Yes")); connect(cast_item_expiration_box,SIGNAL(activated(int)), this,SLOT(expirationSelectedData(int))); - label=new QLabel(cast_item_expiration_box,tr("Cast Expires:"),this,"label"); + label=new QLabel(cast_item_expiration_box,tr("Cast Expires:"),this); label->setGeometry(20,cast_ypos,90,20); label->setFont(font); label-> @@ -279,14 +264,12 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) cast_item_expiration_edit=new QDateEdit(this); cast_item_expiration_edit->setGeometry(115,cast_ypos,95,20); cast_item_expiration_label= - new QLabel(cast_item_expiration_edit,tr("Expires On:"),this, - "cast_item_expiration_label"); + new QLabel(cast_item_expiration_edit,tr("Expires On:"),this); cast_item_expiration_label->setGeometry(20,cast_ypos,90,20); cast_item_expiration_label->setFont(font); cast_item_expiration_label-> setAlignment(AlignRight|AlignVCenter|ShowPrefix); - cast_item_expiration_button= - new QPushButton(this,"cast_item_expiration_button"); + cast_item_expiration_button=new QPushButton(this); cast_item_expiration_button->setGeometry(220,cast_ypos-3,50,25); cast_item_expiration_button->setFont(select_font); cast_item_expiration_button->setText(tr("&Select")); @@ -302,14 +285,14 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Cast Status // - cast_item_status_group=new QButtonGroup(this,"cast_item_status_group"); + cast_item_status_group=new QButtonGroup(this); cast_item_status_group->setExclusive(true); cast_item_status_group->hide(); - QRadioButton *rbutton=new QRadioButton(this,"hold_button"); + QRadioButton *rbutton=new QRadioButton(this); rbutton->setGeometry(120,cast_ypos,15,15); cast_item_status_group->insert(rbutton); - label=new QLabel(rbutton,tr("Hold"),this,"hold_label"); + label=new QLabel(rbutton,tr("Hold"),this); label->setFont(select_font); label->setGeometry(140,cast_ypos,30,15); label->setAlignment(AlignVCenter|AlignLeft); @@ -317,16 +300,15 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) label->setEnabled(cast_status!=RDPodcast::StatusExpired); rbutton->setEnabled(cast_status!=RDPodcast::StatusExpired); - rbutton=new QRadioButton(this,"active_button"); + rbutton=new QRadioButton(this); rbutton->setGeometry(190,cast_ypos,15,15); cast_item_status_group->insert(rbutton); - label=new QLabel(rbutton,tr("Active"),this,"hold_label"); + label=new QLabel(rbutton,tr("Active"),this); label->setFont(select_font); label->setGeometry(210,cast_ypos,80,15); label->setAlignment(AlignVCenter|AlignLeft); label->setEnabled(cast_status!=RDPodcast::StatusExpired); - label=new QLabel(cast_item_status_group,tr("Posting Status:"),this, - "cast_item_status_label"); + label=new QLabel(cast_item_status_group,tr("Posting Status:"),this); label->setGeometry(20,cast_ypos-1,90,20); label->setFont(font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -336,7 +318,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Report Button // - button=new QPushButton(this,"button"); + button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(font); button->setText(tr("Episode\n&Report")); @@ -345,7 +327,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Ok Button // - button=new QPushButton(this,"button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -355,7 +337,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(font); diff --git a/rdcastmanager/edit_cast.h b/rdcastmanager/edit_cast.h index bebdf5f2a..865511c46 100644 --- a/rdcastmanager/edit_cast.h +++ b/rdcastmanager/edit_cast.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Cast // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_cast.h,v 1.8 2011/09/09 20:23:28 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,12 +37,11 @@ #include #include - class EditCast : public QDialog { Q_OBJECT public: - EditCast(unsigned cast_id,QWidget *parent=0,const char *name=0); + EditCast(unsigned cast_id,QWidget *parent=0); ~EditCast(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcastmanager/globals.h b/rdcastmanager/globals.h index 423a8cb9d..bf28798e8 100644 --- a/rdcastmanager/globals.h +++ b/rdcastmanager/globals.h @@ -2,9 +2,7 @@ // // Global Variable Declarations for RDCastManager // -// (C) Copyright 2007 Fred Gleason -// -// $Id: globals.h,v 1.5 2011/08/30 23:35:44 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcastmanager/list_casts.cpp b/rdcastmanager/list_casts.cpp index b5c28d56d..7d3635971 100644 --- a/rdcastmanager/list_casts.cpp +++ b/rdcastmanager/list_casts.cpp @@ -2,9 +2,7 @@ // // List Rivendell Casts // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_casts.cpp,v 1.18.4.1 2013/11/13 23:36:35 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -64,9 +62,8 @@ #include "../icons/greenball.xpm" #include "../icons/whiteball.xpm" - -ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListCasts::ListCasts(unsigned feed_id,QWidget *parent) + : QDialog(parent,"",true) { list_feed_id=feed_id; @@ -114,9 +111,9 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Filter // - list_filter_edit=new QLineEdit(this,"list_filter_edit"); + list_filter_edit=new QLineEdit(this); list_filter_label= - new QLabel(list_filter_edit,tr("Filter:"),this,"list_filter_label"); + new QLabel(list_filter_edit,tr("Filter:"),this); list_filter_label->setFont(font); list_filter_label->setAlignment(AlignRight|AlignVCenter); connect(list_filter_edit,SIGNAL(textChanged(const QString &)), @@ -125,10 +122,9 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Unexpired Check Box // - list_unexpired_check=new QCheckBox(this,"list_unexpired_check"); + list_unexpired_check=new QCheckBox(this); list_unexpired_label= - new QLabel(list_unexpired_check,tr("Only Show Unexpired Casts"),this, - "list_unexpired_label"); + new QLabel(list_unexpired_check,tr("Only Show Unexpired Casts"),this); list_unexpired_label->setFont(font); list_unexpired_label->setAlignment(AlignLeft|AlignVCenter); connect(list_unexpired_check,SIGNAL(toggled(bool)), @@ -137,10 +133,9 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Active Check Box // - list_active_check=new QCheckBox(this,"list_active_check"); + list_active_check=new QCheckBox(this); list_active_label= - new QLabel(list_active_check,tr("Only Show Active Casts"),this, - "list_active_label"); + new QLabel(list_active_check,tr("Only Show Active Casts"),this); list_active_label->setFont(font); list_active_label->setAlignment(AlignLeft|AlignVCenter); connect(list_active_check,SIGNAL(toggled(bool)), @@ -149,7 +144,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Group List // - list_casts_view=new RDListView(this,"list_casts_view"); + list_casts_view=new RDListView(this); list_casts_view->setAllColumnsShowFocus(true); list_casts_view->setItemMargin(5); list_casts_view->addColumn(tr(" ")); @@ -176,7 +171,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Post Cart Button // - list_cart_button=new QPushButton(this,"list_cart_button"); + list_cart_button=new QPushButton(this); list_cart_button->setFont(font); list_cart_button->setText(tr("Post From\nCar&t/Cut")); connect(list_cart_button,SIGNAL(clicked()),this,SLOT(addCartData())); @@ -184,7 +179,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Post File Button // - list_file_button=new QPushButton(this,"list_file_button"); + list_file_button=new QPushButton(this); list_file_button->setFont(font); list_file_button->setText(tr("Post From\n&File")); connect(list_file_button,SIGNAL(clicked()),this,SLOT(addFileData())); @@ -192,7 +187,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Edit Button // - list_edit_button=new QPushButton(this,"list_edit_button"); + list_edit_button=new QPushButton(this); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); connect(list_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -200,7 +195,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Delete Button // - list_delete_button=new QPushButton(this,"list_delete_button"); + list_delete_button=new QPushButton(this); list_delete_button->setFont(font); list_delete_button->setText(tr("&Delete")); connect(list_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -208,7 +203,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Report Button // - list_report_button=new QPushButton(this,"list_report_button"); + list_report_button=new QPushButton(this); list_report_button->setFont(font); list_report_button->setText(tr("Subscription\n&Report")); connect(list_report_button,SIGNAL(clicked()),this,SLOT(reportData())); @@ -216,7 +211,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"list_close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(font); list_close_button->setText(tr("&Close")); diff --git a/rdcastmanager/list_casts.h b/rdcastmanager/list_casts.h index 215d90bd8..4c574bb72 100644 --- a/rdcastmanager/list_casts.h +++ b/rdcastmanager/list_casts.h @@ -2,9 +2,7 @@ // // List Rivendell Casts // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: list_casts.h,v 1.9 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,12 +34,11 @@ #include #include - class ListCasts : public QDialog { Q_OBJECT public: - ListCasts(unsigned feed_id,QWidget *parent=0,const char *name=0); + ListCasts(unsigned feed_id,QWidget *parent=0); ~ListCasts(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcastmanager/pick_report_dates.cpp b/rdcastmanager/pick_report_dates.cpp index 6b2f74046..a0849b8c5 100644 --- a/rdcastmanager/pick_report_dates.cpp +++ b/rdcastmanager/pick_report_dates.cpp @@ -2,9 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: pick_report_dates.cpp,v 1.5 2011/09/07 13:44:59 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,10 +34,9 @@ #include #include - PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -75,15 +72,14 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // Start Date // - edit_startdate_edit=new QDateEdit(this,"edit_startdate_edit"); + edit_startdate_edit=new QDateEdit(this); edit_startdate_edit->setGeometry(150,10,100,20); edit_startdate_edit->setDate(yesterday_date.addMonths(-1)); - QLabel *label=new QLabel(edit_startdate_edit,tr("&Start Date:"), - this,"edit_startdate_label"); + QLabel *label=new QLabel(edit_startdate_edit,tr("&Start Date:"),this); label->setGeometry(75,10,70,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"startdate_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(260,7,50,27); button->setFont(font); button->setText(tr("&Select")); @@ -92,15 +88,14 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // End Date // - edit_enddate_edit=new QDateEdit(this,"edit_enddate_edit"); + edit_enddate_edit=new QDateEdit(this); edit_enddate_edit->setGeometry(150,40,100,20); edit_enddate_edit->setDate(yesterday_date); - label=new QLabel(edit_enddate_edit,tr("&End Date:"), - this,"edit_enddate_label"); + label=new QLabel(edit_enddate_edit,tr("&End Date:"),this); label->setGeometry(75,40,70,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - button=new QPushButton(this,"enddate_button"); + button=new QPushButton(this); button->setGeometry(260,37,50,27); button->setFont(font); button->setText(tr("&Select")); @@ -109,7 +104,7 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // Generate Button // - button=new QPushButton(this,"list_purge_button"); + button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Generate\nReport")); @@ -118,7 +113,7 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); diff --git a/rdcastmanager/pick_report_dates.h b/rdcastmanager/pick_report_dates.h index 6b524b44b..8c6eecec1 100644 --- a/rdcastmanager/pick_report_dates.h +++ b/rdcastmanager/pick_report_dates.h @@ -2,9 +2,7 @@ // // Select a Set of Dates for a Rivendell Podcast Report // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: pick_report_dates.h,v 1.3 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,13 +26,11 @@ #include #include - class PickReportDates : public QDialog { Q_OBJECT public: - PickReportDates(unsigned feed_id,unsigned cast_id, - QWidget *parent=0,const char *name=0); + PickReportDates(unsigned feed_id,unsigned cast_id,QWidget *parent=0); ~PickReportDates(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index 73723e4c7..3084e8f31 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -2,9 +2,7 @@ // // A PodCast Management Utility for Rivendell. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdcastmanager.cpp,v 1.15.4.3 2014/01/21 21:59:31 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -69,8 +67,8 @@ RDStation *rdstation_conf; RDConfig *config; RDSystem *cast_system=NULL; -MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) - :QMainWindow(parent,name,f) +MainWidget::MainWidget(QWidget *parent) + :QMainWindow(parent) { QString str1; QString str2; @@ -168,7 +166,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Feed List // - cast_feed_list=new RDListView(this,"cast_feed_list"); + cast_feed_list=new RDListView(this); cast_feed_list->setFont(default_font); cast_feed_list->setAllColumnsShowFocus(true); cast_feed_list->setItemMargin(5); @@ -190,7 +188,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Open Button // - cast_open_button=new QPushButton(this,"cast_open_button"); + cast_open_button=new QPushButton(this); cast_open_button->setFont(button_font); cast_open_button->setText(tr("&View\nFeed")); connect(cast_open_button,SIGNAL(clicked()),this,SLOT(openData())); @@ -198,7 +196,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Close Button // - cast_close_button=new QPushButton(this,"cast_close_button"); + cast_close_button=new QPushButton(this); cast_close_button->setFont(button_font); cast_close_button->setText(tr("&Close")); connect(cast_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); @@ -395,7 +393,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main",0); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(w->geometry().x(),w->geometry().y(),w->sizeHint().width(),w->sizeHint().height()); w->show(); diff --git a/rdcastmanager/rdcastmanager.h b/rdcastmanager/rdcastmanager.h index b8f9d0bd8..b3e36bdbe 100644 --- a/rdcastmanager/rdcastmanager.h +++ b/rdcastmanager/rdcastmanager.h @@ -2,9 +2,7 @@ // // A RSS Feed Management Utility for Rivendell. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdcastmanager.h,v 1.6 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCASTMANAGER_H #define RDCASTMANAGER_H @@ -40,12 +37,11 @@ #include #include - class MainWidget : public QMainWindow { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0,WFlags f=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcastmanager/rdcastmanager.pro b/rdcastmanager/rdcastmanager.pro index 4361a4056..a3a4099b9 100644 --- a/rdcastmanager/rdcastmanager.pro +++ b/rdcastmanager/rdcastmanager.pro @@ -2,9 +2,7 @@ # # The rdcastmanager/ QMake project file for Rivendell # -# (C) Copyright 2003-2004 Fred Gleason -# -# $Id: rdcastmanager.pro,v 1.5.2.1 2013/01/01 21:36:30 cvs Exp $ +# (C) Copyright 2003-2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdcatch/Makefile.am b/rdcatch/Makefile.am index 2a0b0f54b..e00690b46 100644 --- a/rdcatch/Makefile.am +++ b/rdcatch/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdcatch ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.40.8.2 2013/01/01 21:36:30 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdcatch/add_recording.cpp b/rdcatch/add_recording.cpp index 295c0b4cc..e0fc51e20 100644 --- a/rdcatch/add_recording.cpp +++ b/rdcatch/add_recording.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_recording.cpp,v 1.26.8.1 2014/01/07 23:40:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,10 +44,8 @@ #include #include - extern RDStation *rdstation_conf; - AddRecording::AddRecording(int id,QString *filter,QWidget *parent) : QDialog(parent,"",true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) { diff --git a/rdcatch/add_recording.h b/rdcatch/add_recording.h index a48270dcf..0b8b229f0 100644 --- a/rdcatch/add_recording.h +++ b/rdcatch/add_recording.h @@ -2,9 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_recording.h,v 1.15 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatch/catch_listview.cpp b/rdcatch/catch_listview.cpp index 1325dd850..497e8e26a 100644 --- a/rdcatch/catch_listview.cpp +++ b/rdcatch/catch_listview.cpp @@ -2,15 +2,12 @@ // // Events List Widget for RDCatch // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: catch_listview.cpp,v 1.5.6.1 2013/11/13 23:36:35 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. // -// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include @@ -31,16 +27,15 @@ #include #include - -CatchListView::CatchListView(QWidget *parent,const char *name) - : RDListView(parent,name) +CatchListView::CatchListView(QWidget *parent) + : RDListView(parent) { catch_parent=parent; // // Right-Click Menu // - catch_menu=new QPopupMenu(NULL,"catch_menu"); + catch_menu=new QPopupMenu(NULL); connect(catch_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); catch_menu-> insertItem(tr("Edit Cue Markers"),this,SLOT(editAudioMenuData()),0,0); diff --git a/rdcatch/catch_listview.h b/rdcatch/catch_listview.h index 9acab9184..3bbb26c44 100644 --- a/rdcatch/catch_listview.h +++ b/rdcatch/catch_listview.h @@ -2,15 +2,12 @@ // // Events List Widget for RDCatch // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: catch_listview.h,v 1.4 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. // -// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef CATCH_LISTVIEW_H #define CATCH_LISTVIEW_H @@ -29,13 +25,12 @@ #include - class CatchListView : public RDListView { Q_OBJECT public: - CatchListView(QWidget *parent,const char *name=0); + CatchListView(QWidget *parent); private slots: void aboutToShowData(); diff --git a/rdcatch/catch_monitor.cpp b/rdcatch/catch_monitor.cpp index ac5927688..f37727930 100644 --- a/rdcatch/catch_monitor.cpp +++ b/rdcatch/catch_monitor.cpp @@ -2,9 +2,7 @@ // // A container class for RDCatch deck monitors and assorted metadata. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: catch_monitor.cpp,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,7 +20,6 @@ #include - CatchMonitor::CatchMonitor() { catch_deck_mon=NULL; diff --git a/rdcatch/catch_monitor.h b/rdcatch/catch_monitor.h index d3fd30692..515542ec5 100644 --- a/rdcatch/catch_monitor.h +++ b/rdcatch/catch_monitor.h @@ -2,9 +2,7 @@ // // A container class for RDCatch deck monitors and assorted metadata. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: catch_monitor.h,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,7 +23,6 @@ #include - class CatchMonitor { public: diff --git a/rdcatch/colors.h b/rdcatch/colors.h index 6d447b95d..cdafcb4ee 100644 --- a/rdcatch/colors.h +++ b/rdcatch/colors.h @@ -2,9 +2,7 @@ // // The color definitions for RDCatch // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: colors.h,v 1.10 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef COLORS_H #define COLORS_H diff --git a/rdcatch/deckmon.cpp b/rdcatch/deckmon.cpp index 6927dd11c..6cda5020a 100644 --- a/rdcatch/deckmon.cpp +++ b/rdcatch/deckmon.cpp @@ -26,7 +26,6 @@ #include #include - DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent) : QFrame(parent) { diff --git a/rdcatch/deckmon.h b/rdcatch/deckmon.h index 96a0b6247..82513463a 100644 --- a/rdcatch/deckmon.h +++ b/rdcatch/deckmon.h @@ -30,7 +30,6 @@ #include #include - class DeckMon : public QFrame { Q_OBJECT diff --git a/rdcatch/edit_cartevent.cpp b/rdcatch/edit_cartevent.cpp index c9598696f..b86fbbbca 100644 --- a/rdcatch/edit_cartevent.cpp +++ b/rdcatch/edit_cartevent.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Netcatch Cart Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_cartevent.cpp,v 1.27.8.1 2012/11/26 20:19:41 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,10 +37,8 @@ #include #include - -EditCartEvent::EditCartEvent(int id,std::vector *adds, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -75,7 +71,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // The Recording Record @@ -91,10 +87,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Active Button // - edit_active_button=new QCheckBox(this,"edit_active_button"); + edit_active_button=new QCheckBox(this); edit_active_button->setGeometry(10,11,20,20); - QLabel *label=new QLabel(edit_active_button, - tr("Event Active"),this,"edit_active_label"); + QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -102,10 +97,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); - label=new QLabel(edit_station_box,tr("Location:"),this, - "edit_station_label"); + label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -113,10 +107,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Start Time // - edit_starttime_edit=new QTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); - label=new QLabel(edit_starttime_edit, - tr("Start Time:"),this,"edit_starttime_label"); + label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -124,11 +117,10 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(115,43,sizeHint().width()-125,20); edit_description_edit->setValidator(validator); - label=new QLabel(edit_description_edit, - tr("Description:"),this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,100,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -136,15 +128,14 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Cart Number // - edit_destination_edit=new QLineEdit(this,"edit_destination_edit"); + edit_destination_edit=new QLineEdit(this); edit_destination_edit->setGeometry(115,70,60,20); edit_destination_edit->setReadOnly(false); - label=new QLabel(edit_destination_edit, - tr("Cart Number:"),this,"edit_destination_label"); + label=new QLabel(edit_destination_edit,tr("Cart Number:"),this); label->setGeometry(10,73,100,19); label->setFont(label_font); label->setAlignment(AlignRight|ShowPrefix); - QPushButton *button=new QPushButton(this,"destination_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(185,68,60,24); button->setFont(day_font); button->setText(tr("&Select")); @@ -153,7 +144,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Button Label // - label=new QLabel(tr("Active Days"),this,"active_days_label"); + label=new QLabel(tr("Active Days"),this); label->setGeometry(47,101,90,19); label->setFont(label_font); label->setAlignment(AlignHCenter|ShowPrefix); @@ -161,10 +152,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Monday Button // - edit_mon_button=new QCheckBox(this,"edit_mon_button"); + edit_mon_button=new QCheckBox(this); edit_mon_button->setGeometry(20,120,20,20); - label=new QLabel(edit_mon_button, - tr("Monday"),this,"edit_mon_label"); + label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -172,10 +162,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Tuesday Button // - edit_tue_button=new QCheckBox(this,"edit_tue_button"); + edit_tue_button=new QCheckBox(this); edit_tue_button->setGeometry(115,120,20,20); - label=new QLabel(edit_tue_button, - tr("Tuesday"),this,"edit_tue_label"); + label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -183,10 +172,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Wednesday Button // - edit_wed_button=new QCheckBox(this,"edit_wed_button"); + edit_wed_button=new QCheckBox(this); edit_wed_button->setGeometry(215,120,20,20); - label=new QLabel(edit_wed_button, - tr("Wednesday"),this,"edit_wed_label"); + label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -194,10 +182,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Thursday Button // - edit_thu_button=new QCheckBox(this,"edit_thu_button"); + edit_thu_button=new QCheckBox(this); edit_thu_button->setGeometry(335,120,20,20); - label=new QLabel(edit_thu_button, - tr("Thursday"),this,"edit_thu_label"); + label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -205,10 +192,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Friday Button // - edit_fri_button=new QCheckBox(this,"edit_fri_button"); + edit_fri_button=new QCheckBox(this); edit_fri_button->setGeometry(440,120,20,20); - label=new QLabel(edit_fri_button, - tr("Friday"),this,"edit_fri_label"); + label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,120,40,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -216,10 +202,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Saturday Button // - edit_sat_button=new QCheckBox(this,"edit_sat_button"); + edit_sat_button=new QCheckBox(this); edit_sat_button->setGeometry(130,145,20,20); - label=new QLabel(edit_sat_button, - tr("Saturday"),this,"edit_sat_label"); + label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,145,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -227,10 +212,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Sunday Button // - edit_sun_button=new QCheckBox(this,"edit_sun_button"); + edit_sun_button=new QCheckBox(this); edit_sun_button->setGeometry(300,145,20,20); - label=new QLabel(edit_sun_button, - tr("Sunday"),this,"edit_sun_label"); + label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,145,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -238,10 +222,9 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // OneShot Button // - edit_oneshot_box=new QCheckBox(this,"edit_oneshot_box"); + edit_oneshot_box=new QCheckBox(this); edit_oneshot_box->setGeometry(20,180,15,15); - label=new QLabel(edit_oneshot_box, - tr("Make OneShot"),this,"edit_oneshot_label"); + label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,178,115,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -249,7 +232,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Save As Button // - button=new QPushButton(this,"saveas_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Save As\nNew")); @@ -261,7 +244,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -271,7 +254,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdcatch/edit_cartevent.h b/rdcatch/edit_cartevent.h index f1660873d..9a04cf6ad 100644 --- a/rdcatch/edit_cartevent.h +++ b/rdcatch/edit_cartevent.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Netcatch Cart Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_cartevent.h,v 1.11 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,8 +40,7 @@ class EditCartEvent : public QDialog { Q_OBJECT public: - EditCartEvent(int id,std::vector *adds, - QWidget *parent=0,const char *name=0); + EditCartEvent(int id,std::vector *adds,QWidget *parent=0); ~EditCartEvent(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/edit_download.cpp b/rdcatch/edit_download.cpp index a478b7795..ed5d8ff15 100644 --- a/rdcatch/edit_download.cpp +++ b/rdcatch/edit_download.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Download Event // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_download.cpp,v 1.20 2011/08/30 23:35:44 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,10 +40,9 @@ #include #include - EditDownload::EditDownload(int id,std::vector *adds,QString *filter, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -88,10 +85,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Active Button // - edit_active_button=new QCheckBox(this,"edit_active_button"); + edit_active_button=new QCheckBox(this); edit_active_button->setGeometry(10,11,20,20); - QLabel *label=new QLabel(edit_active_button, - tr("Event Active"),this,"edit_active_label"); + QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -99,10 +95,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); - label=new QLabel(edit_station_box,tr("Location:"),this, - "edit_station_label"); + label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -110,10 +105,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Start Time // - edit_starttime_edit=new QTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); - label=new QLabel(edit_starttime_edit, - tr("Start Time:"),this,"edit_starttime_label"); + label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -121,11 +115,10 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(115,43,sizeHint().width()-125,20); edit_description_edit->setValidator(validator); - label=new QLabel(edit_description_edit, - tr("Description:"),this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,100,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -133,13 +126,13 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Url // - edit_url_edit=new QLineEdit(this,"edit_url_edit"); + edit_url_edit=new QLineEdit(this); edit_url_edit->setGeometry(115,70,sizeHint().width()-125,20); edit_url_edit->setMaxLength(255); edit_url_edit->setValidator(validator); connect(edit_url_edit,SIGNAL(textChanged(const QString &)), this,SLOT(urlChangedData(const QString &))); - label=new QLabel(edit_url_edit,tr("Url:"),this,"edit_url_label"); + label=new QLabel(edit_url_edit,tr("Url:"),this); label->setGeometry(10,70,100,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -147,12 +140,11 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Username // - edit_username_edit=new QLineEdit(this,"edit_username_edit"); + edit_username_edit=new QLineEdit(this); edit_username_edit->setGeometry(115,97,150,20); edit_username_edit->setMaxLength(64); edit_username_edit->setValidator(validator); - edit_username_label=new QLabel(edit_username_edit, - tr("Username:"),this,"edit_username_label"); + edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this); edit_username_label->setGeometry(10,97,100,20); edit_username_label->setFont(label_font); edit_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -160,13 +152,12 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Password // - edit_password_edit=new QLineEdit(this,"edit_password_edit"); + edit_password_edit=new QLineEdit(this); edit_password_edit->setGeometry(360,97,sizeHint().width()-370,20); edit_password_edit->setEchoMode(QLineEdit::Password); edit_password_edit->setMaxLength(64); edit_username_edit->setValidator(validator); - edit_password_label=new QLabel(edit_password_edit, - tr("Password:"),this,"edit_password_label"); + edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this); edit_password_label->setGeometry(275,97,80,20); edit_password_label->setFont(label_font); edit_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -174,15 +165,14 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Destination // - edit_destination_edit=new QLineEdit(this,"edit_destination_edit"); + edit_destination_edit=new QLineEdit(this); edit_destination_edit->setGeometry(115,124,sizeHint().width()-195,20); edit_destination_edit->setReadOnly(true); - label=new QLabel(edit_destination_edit, - tr("Destination:"),this,"edit_destination_label"); + label=new QLabel(edit_destination_edit,tr("Destination:"),this); label->setGeometry(10,127,100,19); label->setFont(label_font); label->setAlignment(AlignRight|ShowPrefix); - QPushButton *button=new QPushButton(this,"destination_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,122,60,24); button->setFont(day_font); button->setText(tr("&Select")); @@ -191,12 +181,11 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Channels // - edit_channels_box=new QComboBox(this,"edit_channels_box"); + edit_channels_box=new QComboBox(this); edit_channels_box->setGeometry(190,149,40,20); edit_channels_box->insertItem("1"); edit_channels_box->insertItem("2"); - label= - new QLabel(edit_channels_box,tr("Channels:"),this,"edit_autotrim_label"); + label=new QLabel(edit_channels_box,tr("Channels:"),this); label->setGeometry(120,149,70,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignLeft); @@ -204,7 +193,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Autotrim Controls // - edit_autotrim_box=new QCheckBox(this,"edit_autotrim_box"); + edit_autotrim_box=new QCheckBox(this); edit_autotrim_box->setGeometry(120,175,15,15); connect(edit_autotrim_box,SIGNAL(toggled(bool)), this,SLOT(autotrimToggledData(bool))); @@ -212,16 +201,14 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label->setGeometry(140,173,80,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignLeft); - edit_autotrim_spin=new QSpinBox(this,"edit_autotrim_spin"); + edit_autotrim_spin=new QSpinBox(this); edit_autotrim_spin->setGeometry(265,173,40,20); edit_autotrim_spin->setRange(-99,-1); - edit_autotrim_label= - new QLabel(edit_autotrim_spin,tr("Level:"),this,"edit_autotrim_label"); + edit_autotrim_label=new QLabel(edit_autotrim_spin,tr("Level:"),this); edit_autotrim_label->setGeometry(220,173,40,20); edit_autotrim_label->setFont(label_font); edit_autotrim_label->setAlignment(AlignVCenter|AlignRight); - edit_autotrim_unit= - new QLabel(edit_autotrim_spin,tr("dBFS"),this,"edit_autotrim_unit"); + edit_autotrim_unit=new QLabel(edit_autotrim_spin,tr("dBFS"),this); edit_autotrim_unit->setGeometry(310,173,40,20); edit_autotrim_unit->setFont(label_font); edit_autotrim_unit->setAlignment(AlignVCenter|AlignLeft); @@ -229,7 +216,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Normalize Controls // - edit_normalize_box=new QCheckBox(this,"edit_normalize_box"); + edit_normalize_box=new QCheckBox(this); edit_normalize_box->setGeometry(120,199,15,15); connect(edit_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeToggledData(bool))); @@ -237,16 +224,14 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label->setGeometry(140,197,80,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignLeft); - edit_normalize_spin=new QSpinBox(this,"edit_normalize_spin"); + edit_normalize_spin=new QSpinBox(this); edit_normalize_spin->setGeometry(265,197,40,20); edit_normalize_spin->setRange(-99,-1); - edit_normalize_label= - new QLabel(edit_normalize_spin,tr("Level:"),this,"edit_normalize_label"); + edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this); edit_normalize_label->setGeometry(220,197,40,20); edit_normalize_label->setFont(label_font); edit_normalize_label->setAlignment(AlignVCenter|AlignRight); - edit_normalize_unit= - new QLabel(edit_normalize_spin,tr("dBFS"),this,"edit_normalize_unit"); + edit_normalize_unit=new QLabel(edit_normalize_spin,tr("dBFS"),this); edit_normalize_unit->setGeometry(310,197,40,20); edit_normalize_unit->setFont(label_font); edit_normalize_unit->setAlignment(AlignVCenter|AlignLeft); @@ -254,10 +239,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Export Metadata Box // - edit_metadata_box=new QCheckBox(this,"edit_metadata_box"); + edit_metadata_box=new QCheckBox(this); edit_metadata_box->setGeometry(120,222,15,15); - label=new QLabel(edit_metadata_box,tr("Update Library Metadata"), - this,"metadata_check_label"); + label=new QLabel(edit_metadata_box,tr("Update Library Metadata"),this); label->setGeometry(140,222,160,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -265,7 +249,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Button Label // - label=new QLabel(tr("Active Days"),this,"active_days_label"); + label=new QLabel(tr("Active Days"),this); label->setGeometry(47,254,90,19); label->setFont(label_font); label->setAlignment(AlignHCenter|ShowPrefix); @@ -273,10 +257,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Monday Button // - edit_mon_button=new QCheckBox(this,"edit_mon_button"); + edit_mon_button=new QCheckBox(this); edit_mon_button->setGeometry(20,273,20,20); - label=new QLabel(edit_mon_button, - tr("Monday"),this,"edit_mon_label"); + label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,273,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -284,10 +267,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Tuesday Button // - edit_tue_button=new QCheckBox(this,"edit_tue_button"); + edit_tue_button=new QCheckBox(this); edit_tue_button->setGeometry(115,273,20,20); - label=new QLabel(edit_tue_button, - tr("Tuesday"),this,"edit_tue_label"); + label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,273,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -295,10 +277,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Wednesday Button // - edit_wed_button=new QCheckBox(this,"edit_wed_button"); + edit_wed_button=new QCheckBox(this); edit_wed_button->setGeometry(215,273,20,20); - label=new QLabel(edit_wed_button, - tr("Wednesday"),this,"edit_wed_label"); + label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,273,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -306,10 +287,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Thursday Button // - edit_thu_button=new QCheckBox(this,"edit_thu_button"); + edit_thu_button=new QCheckBox(this); edit_thu_button->setGeometry(335,273,20,20); - label=new QLabel(edit_thu_button, - tr("Thursday"),this,"edit_thu_label"); + label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,273,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -317,10 +297,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Friday Button // - edit_fri_button=new QCheckBox(this,"edit_fri_button"); + edit_fri_button=new QCheckBox(this); edit_fri_button->setGeometry(440,273,20,20); - label=new QLabel(edit_fri_button, - tr("Friday"),this,"edit_fri_label"); + label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,273,40,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -328,10 +307,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Saturday Button // - edit_sat_button=new QCheckBox(this,"edit_sat_button"); + edit_sat_button=new QCheckBox(this); edit_sat_button->setGeometry(130,298,20,20); - label=new QLabel(edit_sat_button, - tr("Saturday"),this,"edit_sat_label"); + label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,298,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -339,10 +317,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Sunday Button // - edit_sun_button=new QCheckBox(this,"edit_sun_button"); + edit_sun_button=new QCheckBox(this); edit_sun_button->setGeometry(300,298,20,20); - label=new QLabel(edit_sun_button, - tr("Sunday"),this,"edit_sun_label"); + label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,298,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -350,10 +327,9 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // OneShot Button // - edit_oneshot_box=new QCheckBox(this,"edit_oneshot_box"); + edit_oneshot_box=new QCheckBox(this); edit_oneshot_box->setGeometry(20,335,15,15); - label=new QLabel(edit_oneshot_box, - tr("Make OneShot"),this,"edit_oneshot_label"); + label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,333,115,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -361,16 +337,14 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Event Offset // - edit_eventoffset_spin=new QSpinBox(this,"edit_eventoffset_spin"); + edit_eventoffset_spin=new QSpinBox(this); edit_eventoffset_spin->setGeometry(245,333,45,20); edit_eventoffset_spin->setRange(-30,30); - label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"), - this,"edit_eventoffset_label"); + label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this); label->setGeometry(140,333,100,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignRight); - label=new QLabel(edit_eventoffset_spin,tr("days"), - this,"edit_eventoffset_unit"); + label=new QLabel(edit_eventoffset_spin,tr("days"),this); label->setGeometry(295,333,40,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignLeft); @@ -378,7 +352,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Save As Button // - button=new QPushButton(this,"saveas_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Save As\nNew")); @@ -390,7 +364,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -400,7 +374,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdcatch/edit_download.h b/rdcatch/edit_download.h index c11efb6b6..ab80af8da 100644 --- a/rdcatch/edit_download.h +++ b/rdcatch/edit_download.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Download Event // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_download.h,v 1.10 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,8 +40,7 @@ class EditDownload : public QDialog { Q_OBJECT public: - EditDownload(int id,std::vector *adds,QString *filter, - QWidget *parent=0,const char *name=0); + EditDownload(int id,std::vector *adds,QString *filter,QWidget *parent=0); ~EditDownload(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/edit_playout.cpp b/rdcatch/edit_playout.cpp index 0a37b5405..e9941de9d 100644 --- a/rdcatch/edit_playout.cpp +++ b/rdcatch/edit_playout.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell RDCatch Playout // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_playout.cpp,v 1.23.4.1 2014/01/07 23:40:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,10 +38,9 @@ #include #include - EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString temp; @@ -74,7 +71,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // The Recording Record @@ -84,10 +81,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Active Button // - edit_active_button=new QCheckBox(this,"edit_active_button"); + edit_active_button=new QCheckBox(this); edit_active_button->setGeometry(10,11,20,20); - QLabel *label=new QLabel(edit_active_button, - tr("Event Active"),this,"edit_active_label"); + QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -95,10 +91,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); - label=new QLabel(edit_station_box,tr("Location:"),this, - "edit_station_label"); + label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -108,10 +103,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Start Time // - edit_starttime_edit=new QTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); - label=new QLabel(edit_starttime_edit, - tr("Start Time:"),this,"edit_starttime_label"); + label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -119,11 +113,10 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(105,43,sizeHint().width()-115,20); edit_description_edit->setValidator(validator); - label=new QLabel(edit_description_edit, - tr("Description:"),this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,90,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -131,15 +124,14 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Destination // - edit_destination_edit=new QLineEdit(this,"edit_destination_edit"); + edit_destination_edit=new QLineEdit(this); edit_destination_edit->setGeometry(105,70,sizeHint().width()-185,20); edit_destination_edit->setReadOnly(true); - label=new QLabel(edit_destination_edit, - tr("Destination:"),this,"edit_destination_label"); + label=new QLabel(edit_destination_edit,tr("Destination:"),this); label->setGeometry(10,70,90,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"destination_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,65,60,30); button->setFont(day_font); button->setText(tr("&Select")); @@ -148,7 +140,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Button Label // - label=new QLabel(tr("Active Days"),this,"active_days_label"); + label=new QLabel(tr("Active Days"),this); label->setGeometry(47,101,90,19); label->setFont(label_font); label->setAlignment(AlignHCenter|ShowPrefix); @@ -156,10 +148,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Monday Button // - edit_mon_button=new QCheckBox(this,"edit_mon_button"); + edit_mon_button=new QCheckBox(this); edit_mon_button->setGeometry(20,120,20,20); - label=new QLabel(edit_mon_button, - tr("Monday"),this,"edit_mon_label"); + label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -167,10 +158,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Tuesday Button // - edit_tue_button=new QCheckBox(this,"edit_tue_button"); + edit_tue_button=new QCheckBox(this); edit_tue_button->setGeometry(115,120,20,20); - label=new QLabel(edit_tue_button, - tr("Tuesday"),this,"edit_tue_label"); + label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -178,10 +168,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Wednesday Button // - edit_wed_button=new QCheckBox(this,"edit_wed_button"); + edit_wed_button=new QCheckBox(this); edit_wed_button->setGeometry(215,120,20,20); - label=new QLabel(edit_wed_button, - tr("Wednesday"),this,"edit_wed_label"); + label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -189,10 +178,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Thursday Button // - edit_thu_button=new QCheckBox(this,"edit_thu_button"); + edit_thu_button=new QCheckBox(this); edit_thu_button->setGeometry(335,120,20,20); - label=new QLabel(edit_thu_button, - tr("Thursday"),this,"edit_thu_label"); + label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,120,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -200,10 +188,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Friday Button // - edit_fri_button=new QCheckBox(this,"edit_fri_button"); + edit_fri_button=new QCheckBox(this); edit_fri_button->setGeometry(440,120,20,20); - label=new QLabel(edit_fri_button, - tr("Friday"),this,"edit_fri_label"); + label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,120,40,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -211,10 +198,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Saturday Button // - edit_sat_button=new QCheckBox(this,"edit_sat_button"); + edit_sat_button=new QCheckBox(this); edit_sat_button->setGeometry(130,145,20,20); - label=new QLabel(edit_sat_button, - tr("Saturday"),this,"edit_sat_label"); + label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,145,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -222,10 +208,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Sunday Button // - edit_sun_button=new QCheckBox(this,"edit_sun_button"); + edit_sun_button=new QCheckBox(this); edit_sun_button->setGeometry(300,145,20,20); - label=new QLabel(edit_sun_button, - tr("Sunday"),this,"edit_sun_label"); + label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,145,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -233,10 +218,9 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // OneShot Button // - edit_oneshot_box=new QCheckBox(this,"edit_oneshot_box"); + edit_oneshot_box=new QCheckBox(this); edit_oneshot_box->setGeometry(20,180,15,15); - label=new QLabel(edit_oneshot_box, - tr("Make OneShot"),this,"edit_oneshot_label"); + label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,178,115,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -244,7 +228,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Save As Button // - button=new QPushButton(this,"saveas_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Save As\nNew")); @@ -256,7 +240,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -266,7 +250,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdcatch/edit_playout.h b/rdcatch/edit_playout.h index 5334eaa77..3614c866d 100644 --- a/rdcatch/edit_playout.h +++ b/rdcatch/edit_playout.h @@ -2,9 +2,7 @@ // // Edit a Rivendell RDCatch Playout // -// (C) Copyright 2002-2004 Fred Gleason / -// -// $Id: edit_playout.h,v 1.9 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason / // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,8 +39,7 @@ class EditPlayout : public QDialog { Q_OBJECT public: - EditPlayout(int id,std::vector *adds,QString *filter, - QWidget *parent=0,const char *name=0); + EditPlayout(int id,std::vector *adds,QString *filter,QWidget *parent=0); ~EditPlayout(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index 27c188f98..eff86c2f1 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell RDCatch Recording // -// (C) Copyright 2002-2005,2014 Fred Gleason +// (C) Copyright 2002-2005,2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -91,7 +91,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); QLabel * label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); @@ -103,7 +103,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, // // Start Parameters // - edit_starttype_group=new QButtonGroup(this,"edit_starttype_group"); + edit_starttype_group=new QButtonGroup(this); edit_starttype_group->setGeometry(10,47,sizeHint().width()-20,104); connect(edit_starttype_group,SIGNAL(clicked(int)), this,SLOT(startTypeClickedData(int))); diff --git a/rdcatch/edit_recording.h b/rdcatch/edit_recording.h index 8f7912a7c..e46a0229d 100644 --- a/rdcatch/edit_recording.h +++ b/rdcatch/edit_recording.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Netcatch Recording // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_recording.h,v 1.22 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatch/edit_switchevent.cpp b/rdcatch/edit_switchevent.cpp index 78f88ff9e..a82a253b1 100644 --- a/rdcatch/edit_switchevent.cpp +++ b/rdcatch/edit_switchevent.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Netcatch Cart Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_switchevent.cpp,v 1.24 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,9 +37,8 @@ #include -EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -74,7 +71,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // The Recording Record @@ -84,10 +81,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Active Button // - edit_active_button=new QCheckBox(this,"edit_active_button"); + edit_active_button=new QCheckBox(this); edit_active_button->setGeometry(10,11,20,20); - QLabel *label=new QLabel(edit_active_button, - tr("Event Active"),this,"edit_active_label"); + QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -95,10 +91,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); - label=new QLabel(edit_station_box,tr("Location:"),this, - "edit_station_label"); + label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -106,10 +101,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Start Time // - edit_starttime_edit=new QTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); - label=new QLabel(edit_starttime_edit, - tr("Start Time:"),this,"edit_starttime_label"); + label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -117,11 +111,10 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(120,43,sizeHint().width()-130,20); edit_description_edit->setValidator(validator); - label=new QLabel(edit_description_edit, - tr("Description:"),this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,105,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -129,10 +122,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Switch Matrix // - edit_matrix_box=new QComboBox(this,"edit_matrix_box"); + edit_matrix_box=new QComboBox(this); edit_matrix_box->setGeometry(120,70,sizeHint().width()-130,20); - label=new QLabel(edit_matrix_box,tr("Switch Matrix:"), - this,"edit_matrix_label"); + label=new QLabel(edit_matrix_box,tr("Switch Matrix:"),this); label->setGeometry(10,70,105,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -142,14 +134,13 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Switch Input // - edit_input_box=new QComboBox(this,"edit_input_box"); + edit_input_box=new QComboBox(this); edit_input_box->setGeometry(120,100,sizeHint().width()-130,20); - label=new QLabel(edit_input_box,tr("Switch Input:"), - this,"edit_input_label"); + label=new QLabel(edit_input_box,tr("Switch Input:"),this); label->setGeometry(10,100,105,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - edit_input_spin=new QSpinBox(this,"edit_input_spin"); + edit_input_spin=new QSpinBox(this); edit_input_spin->setGeometry(140,125,50,20); connect(edit_input_box,SIGNAL(activated(const QString &)), this,SLOT(activateInputData(const QString &))); @@ -157,14 +148,13 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Switch Output // - edit_output_box=new QComboBox(this,"edit_output_box"); + edit_output_box=new QComboBox(this); edit_output_box->setGeometry(120,155,sizeHint().width()-130,20); - label=new QLabel(edit_output_box,tr("Switch Output:"), - this,"edit_output_label"); + label=new QLabel(edit_output_box,tr("Switch Output:"),this); label->setGeometry(10,155,105,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - edit_output_spin=new QSpinBox(this,"edit_input_spin"); + edit_output_spin=new QSpinBox(this); edit_output_spin->setGeometry(140,180,50,20); connect(edit_output_box,SIGNAL(activated(const QString &)), this,SLOT(activateOutputData(const QString &))); @@ -172,7 +162,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Button Label // - label=new QLabel(tr("Active Days"),this,"active_days_label"); + label=new QLabel(tr("Active Days"),this); label->setGeometry(47,210,80,19); label->setFont(label_font); label->setAlignment(AlignHCenter|ShowPrefix); @@ -180,10 +170,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Monday Button // - edit_mon_button=new QCheckBox(this,"edit_mon_button"); + edit_mon_button=new QCheckBox(this); edit_mon_button->setGeometry(20,228,20,20); - label=new QLabel(edit_mon_button, - tr("Monday"),this,"edit_mon_label"); + label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,228,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -191,10 +180,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Tuesday Button // - edit_tue_button=new QCheckBox(this,"edit_tue_button"); + edit_tue_button=new QCheckBox(this); edit_tue_button->setGeometry(115,228,20,20); - label=new QLabel(edit_tue_button, - tr("Tuesday"),this,"edit_tue_label"); + label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,228,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -202,10 +190,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Wednesday Button // - edit_wed_button=new QCheckBox(this,"edit_wed_button"); + edit_wed_button=new QCheckBox(this); edit_wed_button->setGeometry(215,228,20,20); - label=new QLabel(edit_wed_button, - tr("Wednesday"),this,"edit_wed_label"); + label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,228,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -213,10 +200,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Thursday Button // - edit_thu_button=new QCheckBox(this,"edit_thu_button"); + edit_thu_button=new QCheckBox(this); edit_thu_button->setGeometry(335,228,20,20); - label=new QLabel(edit_thu_button, - tr("Thursday"),this,"edit_thu_label"); + label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,228,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -224,10 +210,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Friday Button // - edit_fri_button=new QCheckBox(this,"edit_fri_button"); + edit_fri_button=new QCheckBox(this); edit_fri_button->setGeometry(440,228,20,20); - label=new QLabel(edit_fri_button, - tr("Friday"),this,"edit_fri_label"); + label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,228,40,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -235,10 +220,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Saturday Button // - edit_sat_button=new QCheckBox(this,"edit_sat_button"); + edit_sat_button=new QCheckBox(this); edit_sat_button->setGeometry(130,253,20,20); - label=new QLabel(edit_sat_button, - tr("Saturday"),this,"edit_sat_label"); + label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,253,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -246,10 +230,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Sunday Button // - edit_sun_button=new QCheckBox(this,"edit_sun_button"); + edit_sun_button=new QCheckBox(this); edit_sun_button->setGeometry(300,253,20,20); - label=new QLabel(edit_sun_button, - tr("Sunday"),this,"edit_sun_label"); + label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,253,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -257,10 +240,9 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // OneShot Button // - edit_oneshot_box=new QCheckBox(this,"edit_oneshot_box"); + edit_oneshot_box=new QCheckBox(this); edit_oneshot_box->setGeometry(20,290,15,15); - label=new QLabel(edit_oneshot_box, - tr("Make OneShot"),this,"edit_oneshot_label"); + label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,288,115,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -268,7 +250,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Save As Button // - QPushButton *button=new QPushButton(this,"saveas_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Save As\nNew")); @@ -280,7 +262,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -290,7 +272,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdcatch/edit_switchevent.h b/rdcatch/edit_switchevent.h index 4f923754c..ce77985e0 100644 --- a/rdcatch/edit_switchevent.h +++ b/rdcatch/edit_switchevent.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Netcatch Cart Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_switchevent.h,v 1.12 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,13 +36,11 @@ #include #include - class EditSwitchEvent : public QDialog { Q_OBJECT public: - EditSwitchEvent(int id,std::vector *adds, - QWidget *parent=0,const char *name=0); + EditSwitchEvent(int id,std::vector *adds,QWidget *parent=0); ~EditSwitchEvent(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/edit_upload.cpp b/rdcatch/edit_upload.cpp index a7e646ede..515d8b770 100644 --- a/rdcatch/edit_upload.cpp +++ b/rdcatch/edit_upload.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Upload Event // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,10 +40,9 @@ #include #include - EditUpload::EditUpload(int id,std::vector *adds,QString *filter, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -76,7 +75,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // The Recording Record @@ -86,10 +85,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Active Button // - edit_active_button=new QCheckBox(this,"edit_active_button"); + edit_active_button=new QCheckBox(this); edit_active_button->setGeometry(10,11,20,20); - QLabel *label=new QLabel(edit_active_button, - tr("Event Active"),this,"edit_active_label"); + QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -97,12 +95,11 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Station // - edit_station_box=new QComboBox(this,"edit_station_box"); + edit_station_box=new QComboBox(this); edit_station_box->setGeometry(200,10,140,23); connect(edit_station_box,SIGNAL(textChanged(const QString &)), this,SLOT(stationChangedData(const QString &))); - label=new QLabel(edit_station_box,tr("Location:"),this, - "edit_station_label"); + label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -110,10 +107,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Start Time // - edit_starttime_edit=new QTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new QTimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); - label=new QLabel(edit_starttime_edit, - tr("Start Time:"),this,"edit_starttime_label"); + label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -121,11 +117,10 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // RSS Feed // - edit_feed_box=new QComboBox(this,"edit_feed_box"); + edit_feed_box=new QComboBox(this); edit_feed_box->setGeometry(115,43,100,20); edit_feed_box->insertItem(tr("[none]")); - label=new QLabel(edit_feed_box, - tr("RSS Feed:"),this,"edit_feed_label"); + label=new QLabel(edit_feed_box,tr("RSS Feed:"),this); label->setGeometry(10,43,100,19); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -133,15 +128,14 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Source // - edit_destination_edit=new QLineEdit(this,"edit_destination_edit"); + edit_destination_edit=new QLineEdit(this); edit_destination_edit->setGeometry(115,70,sizeHint().width()-195,20); edit_destination_edit->setReadOnly(true); - label=new QLabel(edit_destination_edit, - tr("Source:"),this,"edit_destination_label"); + label=new QLabel(edit_destination_edit,tr("Source:"),this); label->setGeometry(10,70,100,19); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"destination_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,68,60,24); button->setFont(day_font); button->setText(tr("&Select")); @@ -150,11 +144,10 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setGeometry(115,97,sizeHint().width()-125,20); edit_description_edit->setValidator(validator); - label=new QLabel(edit_description_edit, - tr("Description:"),this,"edit_description_label"); + label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,97,100,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -162,13 +155,13 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Url // - edit_url_edit=new QLineEdit(this,"edit_url_edit"); + edit_url_edit=new QLineEdit(this); edit_url_edit->setGeometry(115,124,sizeHint().width()-125,20); edit_url_edit->setMaxLength(255); edit_url_edit->setValidator(validator); connect(edit_url_edit,SIGNAL(textChanged(const QString &)), this,SLOT(urlChangedData(const QString &))); - label=new QLabel(edit_url_edit,tr("Url:"),this,"edit_url_label"); + label=new QLabel(edit_url_edit,tr("Url:"),this); label->setGeometry(10,124,100,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -176,12 +169,11 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Username // - edit_username_edit=new QLineEdit(this,"edit_username_edit"); + edit_username_edit=new QLineEdit(this); edit_username_edit->setGeometry(115,151,150,20); edit_username_edit->setMaxLength(64); edit_username_edit->setValidator(validator); - edit_username_label=new QLabel(edit_username_edit, - tr("Username:"),this,"edit_username_label"); + edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this); edit_username_label->setGeometry(10,151,100,20); edit_username_label->setFont(label_font); edit_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -189,13 +181,12 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Password // - edit_password_edit=new QLineEdit(this,"edit_password_edit"); + edit_password_edit=new QLineEdit(this); edit_password_edit->setGeometry(360,151,sizeHint().width()-370,20); edit_password_edit->setEchoMode(QLineEdit::Password); edit_password_edit->setMaxLength(64); edit_username_edit->setValidator(validator); - edit_password_label=new QLabel(edit_password_edit, - tr("Password:"),this,"edit_password_label"); + edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this); edit_password_label->setGeometry(275,151,80,20); edit_password_label->setFont(label_font); edit_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -203,15 +194,14 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Audio Format // - edit_format_edit=new QLineEdit(this,"edit_format_edit"); + edit_format_edit=new QLineEdit(this); edit_format_edit->setGeometry(115,178,sizeHint().width()-195,20); edit_format_edit->setReadOnly(true); - label=new QLabel(edit_format_edit, - tr("Export Format:"),this,"edit_format_label"); + label=new QLabel(edit_format_edit,tr("Export Format:"),this); label->setGeometry(5,178,105,20); label->setFont(label_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - button=new QPushButton(this,"format_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,176,60,24); button->setFont(day_font); button->setText(tr("S&et")); @@ -220,11 +210,10 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Normalize Check Box // - edit_normalize_box=new QCheckBox(this,"edit_normalize_box"); + edit_normalize_box=new QCheckBox(this); edit_normalize_box->setGeometry(115,208,15,15); edit_normalize_box->setChecked(true); - label=new QLabel(edit_normalize_box,tr("Normalize"), - this,"normalize_check_label"); + label=new QLabel(edit_normalize_box,tr("Normalize"),this); label->setGeometry(135,206,83,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -234,15 +223,14 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Normalize Level // - edit_normalize_spin=new QSpinBox(this,"edit_normalize_spin"); + edit_normalize_spin=new QSpinBox(this); edit_normalize_spin->setGeometry(265,206,40,20); edit_normalize_spin->setRange(-30,0); - edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"), - this,"normalize_spin_label"); + edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this); edit_normalize_label->setGeometry(215,206,45,20); edit_normalize_label->setFont(label_font); edit_normalize_label->setAlignment(AlignRight|AlignVCenter); - edit_normalize_unit=new QLabel(tr("dBFS"),this,"normalize_unit_label"); + edit_normalize_unit=new QLabel(tr("dBFS"),this); edit_normalize_unit->setGeometry(310,206,40,20); edit_normalize_unit->setFont(label_font); edit_normalize_unit->setAlignment(AlignLeft|AlignVCenter); @@ -250,10 +238,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Export Metadata Box // - edit_metadata_box=new QCheckBox(this,"edit_metadata_box"); + edit_metadata_box=new QCheckBox(this); edit_metadata_box->setGeometry(115,231,15,15); - label=new QLabel(edit_metadata_box,tr("Export Library Metadata"), - this,"metadata_check_label"); + label=new QLabel(edit_metadata_box,tr("Export Library Metadata"),this); label->setGeometry(135,231,160,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -261,7 +248,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Button Label // - label=new QLabel(tr("Active Days"),this,"active_days_label"); + label=new QLabel(tr("Active Days"),this); label->setGeometry(47,263,90,19); label->setFont(label_font); label->setAlignment(AlignHCenter|ShowPrefix); @@ -269,10 +256,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Monday Button // - edit_mon_button=new QCheckBox(this,"edit_mon_button"); + edit_mon_button=new QCheckBox(this); edit_mon_button->setGeometry(20,282,20,20); - label=new QLabel(edit_mon_button, - tr("Monday"),this,"edit_mon_label"); + label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,282,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -280,10 +266,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Tuesday Button // - edit_tue_button=new QCheckBox(this,"edit_tue_button"); + edit_tue_button=new QCheckBox(this); edit_tue_button->setGeometry(115,282,20,20); - label=new QLabel(edit_tue_button, - tr("Tuesday"),this,"edit_tue_label"); + label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,282,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -291,10 +276,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Wednesday Button // - edit_wed_button=new QCheckBox(this,"edit_wed_button"); + edit_wed_button=new QCheckBox(this); edit_wed_button->setGeometry(215,282,20,20); - label=new QLabel(edit_wed_button, - tr("Wednesday"),this,"edit_wed_label"); + label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,282,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -302,10 +286,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Thursday Button // - edit_thu_button=new QCheckBox(this,"edit_thu_button"); + edit_thu_button=new QCheckBox(this); edit_thu_button->setGeometry(335,282,20,20); - label=new QLabel(edit_thu_button, - tr("Thursday"),this,"edit_thu_label"); + label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,282,115,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -313,10 +296,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Friday Button // - edit_fri_button=new QCheckBox(this,"edit_fri_button"); + edit_fri_button=new QCheckBox(this); edit_fri_button->setGeometry(440,282,20,20); - label=new QLabel(edit_fri_button, - tr("Friday"),this,"edit_fri_label"); + label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,282,40,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -324,10 +306,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Saturday Button // - edit_sat_button=new QCheckBox(this,"edit_sat_button"); + edit_sat_button=new QCheckBox(this); edit_sat_button->setGeometry(130,307,20,20); - label=new QLabel(edit_sat_button, - tr("Saturday"),this,"edit_sat_label"); + label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,307,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -335,10 +316,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Sunday Button // - edit_sun_button=new QCheckBox(this,"edit_sun_button"); + edit_sun_button=new QCheckBox(this); edit_sun_button->setGeometry(300,307,20,20); - label=new QLabel(edit_sun_button, - tr("Sunday"),this,"edit_sun_label"); + label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,307,60,20); label->setFont(day_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -346,10 +326,9 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // OneShot Button // - edit_oneshot_box=new QCheckBox(this,"edit_oneshot_box"); + edit_oneshot_box=new QCheckBox(this); edit_oneshot_box->setGeometry(20,342,15,15); - label=new QLabel(edit_oneshot_box, - tr("Make OneShot"),this,"edit_oneshot_label"); + label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,343,115,20); label->setFont(label_font); label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -357,16 +336,14 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Event Offset // - edit_eventoffset_spin=new QSpinBox(this,"edit_eventoffset_spin"); + edit_eventoffset_spin=new QSpinBox(this); edit_eventoffset_spin->setGeometry(245,340,45,20); edit_eventoffset_spin->setRange(-30,30); - label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"), - this,"edit_eventoffset_label"); + label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this); label->setGeometry(140,340,100,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignRight); - label=new QLabel(edit_eventoffset_spin,tr("days"), - this,"edit_eventoffset_unit"); + label=new QLabel(edit_eventoffset_spin,tr("days"),this); label->setGeometry(295,335,40,20); label->setFont(label_font); label->setAlignment(AlignVCenter|AlignLeft); @@ -374,7 +351,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Save As Button // - button=new QPushButton(this,"saveas_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Save As\nNew")); @@ -386,7 +363,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -396,7 +373,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdcatch/edit_upload.h b/rdcatch/edit_upload.h index 8bc02a889..68f7e9b77 100644 --- a/rdcatch/edit_upload.h +++ b/rdcatch/edit_upload.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Upload Event // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_upload.h,v 1.12 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,8 +41,7 @@ class EditUpload : public QDialog { Q_OBJECT public: - EditUpload(int id,std::vector *adds,QString *filter, - QWidget *parent=0,const char *name=0); + EditUpload(int id,std::vector *adds,QString *filter,QWidget *parent=0); ~EditUpload(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/globals.h b/rdcatch/globals.h index 2ca2c1c73..089a8151c 100644 --- a/rdcatch/globals.h +++ b/rdcatch/globals.h @@ -2,9 +2,7 @@ // // Global Variable Declarations for RDCatch // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: globals.h,v 1.8 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -48,4 +46,5 @@ extern int catch_audition_card; extern int catch_audition_port; extern RDSystem *catch_system; + #endif // GLOBALS_H diff --git a/rdcatch/list_reports.cpp b/rdcatch/list_reports.cpp index 93408cdba..d5239f5ef 100644 --- a/rdcatch/list_reports.cpp +++ b/rdcatch/list_reports.cpp @@ -2,9 +2,7 @@ // // List and Generate RDCatch Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.cpp,v 1.8 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,10 +32,9 @@ #include #include - ListReports::ListReports(bool today_only,bool active_only,int dow, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { list_today_only=today_only; list_active_only=active_only; @@ -62,13 +59,12 @@ ListReports::ListReports(bool today_only,bool active_only,int dow, // // Reports List // - list_reports_box=new QComboBox(this,"list_reports_box"); + list_reports_box=new QComboBox(this); list_reports_box->setGeometry(50,10,sizeHint().width()-60,19); list_reports_box->insertItem(tr("Event Report")); list_reports_box->insertItem(tr("Upload/Download Report")); QLabel *list_reports_label= - new QLabel(list_reports_box,tr("Type:"), - this,"list_reports_label"); + new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); list_reports_label->setFont(font); list_reports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -76,7 +72,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow, // // Generate Button // - QPushButton *generate_button=new QPushButton(this,"generate_button"); + QPushButton *generate_button=new QPushButton(this); generate_button-> setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); generate_button->setDefault(true); @@ -87,7 +83,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow, // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); close_button->setFont(font); diff --git a/rdcatch/list_reports.h b/rdcatch/list_reports.h index 372bc8744..10d8e0528 100644 --- a/rdcatch/list_reports.h +++ b/rdcatch/list_reports.h @@ -2,9 +2,7 @@ // // List and Generate RDCatch Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.h,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,13 +27,11 @@ #include - class ListReports : public QDialog { Q_OBJECT public: - ListReports(bool active_only,bool today_only,int dow, - QWidget *parent=0,const char *name=0); + ListReports(bool active_only,bool today_only,int dow,QWidget *parent=0); ~ListReports(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 65f04e327..c8b6bfcee 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -19,7 +19,6 @@ // #include -#include #include #include @@ -95,8 +94,8 @@ RDSystem *catch_system=NULL; #include "../icons/rivendell-22x22.xpm" -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { QString str; catch_host_warnings=false; @@ -241,7 +240,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // CAE Connection // - catch_cae=new RDCae(rdstation_conf,catch_config,this,"catch_cae"); + catch_cae=new RDCae(rdstation_conf,catch_config,this); connect(catch_cae,SIGNAL(isConnected(bool)),this,SLOT(initData(bool))); connect(catch_cae,SIGNAL(playing(int)),this,SLOT(playedData(int))); connect(catch_cae,SIGNAL(playStopped(int)), @@ -256,15 +255,14 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Deck Monitors // - catch_monitor_view=new QScrollView(this,"catch_monitor_view", - Qt::WNoAutoErase); + catch_monitor_view=new QScrollView(this,"",Qt::WNoAutoErase); catch_monitor_vbox=new VBox(catch_monitor_view); catch_monitor_vbox->setSpacing(2); catch_monitor_view->addChild(catch_monitor_vbox); - QSignalMapper *mapper=new QSignalMapper(this,"deck_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(abortData(int))); - QSignalMapper *mon_mapper=new QSignalMapper(this,"monitor_mapper"); + QSignalMapper *mon_mapper=new QSignalMapper(this); connect(mon_mapper,SIGNAL(mapped(int)),this,SLOT(monitorData(int))); QString sql; RDSqlQuery *q1; @@ -274,7 +272,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) catch_station_count=0; while(q->next()) { catch_connect[catch_station_count].connect= - new RDCatchConnect(catch_station_count,this,"catch_connect"); + new RDCatchConnect(catch_station_count,this); catch_connect[catch_station_count].station= q->value(0).toString().lower(); connect(catch_connect[catch_station_count].connect, @@ -363,18 +361,16 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); catch_show_active_label->setAlignment(AlignLeft|AlignVCenter); connect(catch_show_active_box,SIGNAL(toggled(bool)), this,SLOT(filterChangedData(bool))); - catch_show_today_box=new QCheckBox(this,"catch_show_today_box"); - catch_show_today_label=new QLabel(catch_show_active_box, - tr("Show Only Today's Events"), - this,"catch_show_today_label"); + catch_show_today_box=new QCheckBox(this); + catch_show_today_label= + new QLabel(catch_show_active_box,tr("Show Only Today's Events"),this); catch_show_today_label->setFont(label_font); catch_show_today_label->setAlignment(AlignLeft|AlignVCenter); connect(catch_show_today_box,SIGNAL(toggled(bool)), this,SLOT(filterChangedData(bool))); - catch_dow_box=new QComboBox(this,"catch_down_box"); - catch_dow_label=new QLabel(catch_dow_box,tr("Show DayOfWeek:"), - this,"catch_dow_label"); + catch_dow_box=new QComboBox(this); + catch_dow_label=new QLabel(catch_dow_box,tr("Show DayOfWeek:"),this); catch_dow_label->setFont(label_font); catch_dow_label->setAlignment(AlignRight|AlignVCenter); catch_dow_box->insertItem(tr("All")); @@ -399,7 +395,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Cart List // - catch_recordings_list=new CatchListView(this,"catch_recordings_list"); + catch_recordings_list=new CatchListView(this); catch_recordings_list->setAllColumnsShowFocus(true); catch_recordings_list->setItemMargin(5); catch_recordings_list->setFont(list_font); @@ -481,7 +477,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Add Button // - catch_add_button=new QPushButton(this,"add_button"); + catch_add_button=new QPushButton(this); catch_add_button->setFont(button_font); catch_add_button->setText(tr("&Add")); connect(catch_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -489,7 +485,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Edit Button // - catch_edit_button=new QPushButton(this,"edit_button"); + catch_edit_button=new QPushButton(this); catch_edit_button->setFont(button_font); catch_edit_button->setText(tr("&Edit")); connect(catch_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -497,7 +493,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Delete Button // - catch_delete_button=new QPushButton(this,"delete_button"); + catch_delete_button=new QPushButton(this); catch_delete_button->setFont(button_font); catch_delete_button->setText(tr("&Delete")); connect(catch_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -505,7 +501,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Scroll Button // - catch_scroll_button=new QPushButton(this,"catch_scroll_button"); + catch_scroll_button=new QPushButton(this); catch_scroll_button->setFont(button_font); catch_scroll_button->setText(tr("Scroll")); connect(catch_scroll_button,SIGNAL(clicked()),this,SLOT(scrollButtonData())); @@ -513,7 +509,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Reports Button // - catch_reports_button=new QPushButton(this,"catch_reports_button"); + catch_reports_button=new QPushButton(this); catch_reports_button->setFont(button_font); catch_reports_button->setText(tr("Reports")); connect(catch_reports_button,SIGNAL(clicked()),this,SLOT(reportsButtonData())); @@ -521,34 +517,31 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Wall Clock // - catch_clock_label=new QLabel("00:00:00",this,"catch_clock_label"); + catch_clock_label=new QLabel("00:00:00",this); catch_clock_label->setFont(clock_font); catch_clock_label->setAlignment(AlignCenter); - catch_clock_timer=new QTimer(this,"catch_clock_timer"); + catch_clock_timer=new QTimer(this); connect(catch_clock_timer,SIGNAL(timeout()),this,SLOT(clockData())); clockData(); // // Play Head Button // - catch_head_button= - new RDTransportButton(RDTransportButton::PlayFrom,this,"catch_head_button"); + catch_head_button=new RDTransportButton(RDTransportButton::PlayFrom,this); catch_head_button->setDisabled(true); connect(catch_head_button,SIGNAL(clicked()),this,SLOT(headButtonData())); // // Play Tail Button // - catch_tail_button= - new RDTransportButton(RDTransportButton::PlayTo,this,"catch_tail_button"); + catch_tail_button=new RDTransportButton(RDTransportButton::PlayTo,this); catch_tail_button->setDisabled(true); connect(catch_tail_button,SIGNAL(clicked()),this,SLOT(tailButtonData())); // // Play Stop Button // - catch_stop_button= - new RDTransportButton(RDTransportButton::Stop,this,"catch_stop_button"); + catch_stop_button=new RDTransportButton(RDTransportButton::Stop,this); catch_stop_button->setDisabled(true); catch_stop_button->setOnColor(red); connect(catch_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); @@ -557,7 +550,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Close Button // - catch_close_button=new QPushButton(this,"close_button"); + catch_close_button=new QPushButton(this); catch_close_button->setFont(button_font); catch_close_button->setText(tr("&Close")); catch_close_button->setFocus(); @@ -567,13 +560,13 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // // Next Event Timer // - catch_next_timer=new QTimer(this,"catch_next_timer"); + catch_next_timer=new QTimer(this); connect(catch_next_timer,SIGNAL(timeout()),this,SLOT(nextEventData())); // // Midnight Timer // - catch_midnight_timer=new QTimer(this,"catch_midnight_timer"); + catch_midnight_timer=new QTimer(this); connect(catch_midnight_timer,SIGNAL(timeout()),this,SLOT(midnightData())); midnightData(); LoadGeometry(); @@ -592,7 +585,7 @@ order by CHANNEL",(const char *)q->value(0).toString().lower()); // Silly Resize Workaround // (so that the deck monitors get laid out properly) // - QTimer *timer=new QTimer(this,"resize_timer"); + QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(resizeData())); timer->start(1,true); } @@ -785,7 +778,7 @@ void MainWidget::editData() break; case RDRecording::Playout: - playout=new EditPlayout(id,&new_events,&catch_filter,this,"playout"); + playout=new EditPlayout(id,&new_events,&catch_filter,this); if(playout->exec()>=0) { RefreshLine(item); new_conn=GetConnection(item->text(24)); @@ -801,7 +794,7 @@ void MainWidget::editData() break; case RDRecording::MacroEvent: - event=new EditCartEvent(id,&new_events,this,"recording"); + event=new EditCartEvent(id,&new_events,this); if(event->exec()>=0) { RefreshLine(item); new_conn=GetConnection(item->text(24)); @@ -817,7 +810,7 @@ void MainWidget::editData() break; case RDRecording::SwitchEvent: - switch_event=new EditSwitchEvent(id,&new_events,this,"recording"); + switch_event=new EditSwitchEvent(id,&new_events,this); if(switch_event->exec()>=0) { RefreshLine(item); new_conn=GetConnection(item->text(24)); @@ -833,7 +826,7 @@ void MainWidget::editData() break; case RDRecording::Download: - download=new EditDownload(id,&new_events,&catch_filter,this,"playout"); + download=new EditDownload(id,&new_events,&catch_filter,this); if(download->exec()>=0) { RefreshLine(item); new_conn=GetConnection(item->text(24)); @@ -849,7 +842,7 @@ void MainWidget::editData() break; case RDRecording::Upload: - upload=new EditUpload(id,&new_events,&catch_filter,this,"playout"); + upload=new EditUpload(id,&new_events,&catch_filter,this); if(upload->exec()>=0) { RefreshLine(item); new_conn=GetConnection(item->text(24)); @@ -2631,7 +2624,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->show(); return a.exec(); diff --git a/rdcatch/rdcatch.h b/rdcatch/rdcatch.h index 218cf3ef6..4a04e10db 100644 --- a/rdcatch/rdcatch.h +++ b/rdcatch/rdcatch.h @@ -1,10 +1,8 @@ // rdcatch.h // -// The Netcatch Manager for Rivendell. +// The Event Schedule Manager for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcatch.h,v 1.51 2011/08/30 23:35:44 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCATCH_H #define RDCATCH_H @@ -52,8 +49,6 @@ #include #include -using namespace std; - /* * Widget Settings */ @@ -66,7 +61,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -136,8 +131,8 @@ class MainWidget : public QWidget struct { RDCatchConnect *connect; QString station; - vector chan; - vector mon_id; + std::vector chan; + std::vector mon_id; } catch_connect[RD_MAX_STATIONS]; int catch_station_count; QSqlDatabase *catch_db; diff --git a/rdcatch/rdcatch.pro b/rdcatch/rdcatch.pro index 61b908e16..d159b6803 100644 --- a/rdcatch/rdcatch.pro +++ b/rdcatch/rdcatch.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDCatch. # -# (C) Copyright 2003-2005 Fred Gleason -# -# $Id: rdcatch.pro,v 1.9.8.1 2013/01/01 21:36:30 cvs Exp $ +# (C) Copyright 2003-2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdcatch/vbox.cpp b/rdcatch/vbox.cpp index 000511990..902430d93 100644 --- a/rdcatch/vbox.cpp +++ b/rdcatch/vbox.cpp @@ -2,9 +2,7 @@ // // A QVBox widget with dynamic horizontal resizing. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: vbox.cpp,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,7 +22,6 @@ #include - VBox::VBox(QWidget *parent,const char *name,WFlags f) : QWidget(parent,name,f) { diff --git a/rdcatch/vbox.h b/rdcatch/vbox.h index 91d9b75bd..7ec55b177 100644 --- a/rdcatch/vbox.h +++ b/rdcatch/vbox.h @@ -2,9 +2,7 @@ // // A QVBox widget with dynamic horizontal resizing. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: vbox.h,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatchd/batch.cpp b/rdcatchd/batch.cpp index b61277c00..556c8d87d 100644 --- a/rdcatchd/batch.cpp +++ b/rdcatchd/batch.cpp @@ -2,7 +2,7 @@ // // Batch Routines for the Rivendell netcatcher daemon // -// (C) Copyright 2002-2015, 2010 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatchd/catch_event.cpp b/rdcatchd/catch_event.cpp index 0cedf985d..11414e702 100644 --- a/rdcatchd/catch_event.cpp +++ b/rdcatchd/catch_event.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell netcatch event. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: catch_event.cpp,v 1.21 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatchd/catch_event.h b/rdcatchd/catch_event.h index 23eb9095d..cc6188a21 100644 --- a/rdcatchd/catch_event.h +++ b/rdcatchd/catch_event.h @@ -2,9 +2,7 @@ // // A container class for a Rivendell netcatch event. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: catch_event.h,v 1.22 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatchd/local_macros.cpp b/rdcatchd/local_macros.cpp index fd04e5e02..61361159d 100644 --- a/rdcatchd/local_macros.cpp +++ b/rdcatchd/local_macros.cpp @@ -2,9 +2,7 @@ // // Local macros for the Rivendell netcatcher daemon // -// (C) Copyright 2002-2009 Fred Gleason -// -// $Id: local_macros.cpp,v 1.4 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 950cc2490..76c697581 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -119,8 +119,8 @@ void SigHandler(int signum) } -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { QString sql; RDSqlQuery *q; @@ -198,14 +198,14 @@ MainObject::MainObject(QObject *parent,const char *name) catch_event_free[i]=true; catch_macro_event_id[i]=-1; } - catch_event_mapper=new QSignalMapper(this,"catch_event_mapper"); + catch_event_mapper=new QSignalMapper(this); connect(catch_event_mapper,SIGNAL(mapped(int)), this,SLOT(eventFinishedData(int))); QTimer *timer=new QTimer(this,"free_events_timer"); connect(timer,SIGNAL(timeout()),this,SLOT(freeEventsData())); timer->start(RDCATCHD_FREE_EVENTS_INTERVAL); - server=new RDCatchdSocket(RDCATCHD_TCP_PORT,0,this,"socket"); + server=new RDCatchdSocket(RDCATCHD_TCP_PORT,0,this); if(!server->ok()) { printf("rdcatchd: aborting - couldn't bind socket"); exit(1); @@ -239,17 +239,17 @@ MainObject::MainObject(QObject *parent,const char *name) // // GPI Mappers // - catch_gpi_start_mapper=new QSignalMapper(this,"catch_gpi_start_mapper"); + catch_gpi_start_mapper=new QSignalMapper(this); connect(catch_gpi_start_mapper,SIGNAL(mapped(int)), this,SLOT(startTimerData(int))); - catch_gpi_offset_mapper=new QSignalMapper(this,"catch_gpi_offset_mapper"); + catch_gpi_offset_mapper=new QSignalMapper(this); connect(catch_gpi_offset_mapper,SIGNAL(mapped(int)), this,SLOT(offsetTimerData(int))); // // Xload Timer // - catch_xload_timer=new QTimer(this,"catch_xload_timer"); + catch_xload_timer=new QTimer(this); connect(catch_xload_timer,SIGNAL(timeout()),this,SLOT(updateXloadsData())); // @@ -275,7 +275,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // CAE Connection // - catch_cae=new RDCae(catch_rdstation,catch_config,this,"catch_cae"); + catch_cae=new RDCae(catch_rdstation,catch_config,this); connect(catch_cae,SIGNAL(isConnected(bool)), this,SLOT(isConnectedData(bool))); connect(catch_cae,SIGNAL(recordLoaded(int,int)), @@ -345,7 +345,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // Time Engine // - catch_engine=new RDTimeEngine(this,"catch_engine"); + catch_engine=new RDTimeEngine(this); catch_engine->setTimeOffset(catch_rdstation->timeOffset()); connect(catch_engine,SIGNAL(timeout(int)),this,SLOT(engineData(int))); LoadEngine(); @@ -368,21 +368,21 @@ MainObject::MainObject(QObject *parent,const char *name) // // Start Heartbeat Timer // - timer=new QTimer(this,"heartbeat_timer"); + timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(heartbeatData())); timer->start(RDCATCHD_HEARTBEAT_INTERVAL); // // Meter Timer // - timer=new QTimer(this,"meter_timer"); + timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(meterData())); timer->start(RD_METER_UPDATE_INTERVAL); // // Heartbeat Timer // - catch_heartbeat_timer=new QTimer(this,"catch_heartbeat_timer"); + catch_heartbeat_timer=new QTimer(this); connect(catch_heartbeat_timer,SIGNAL(timeout()), this,SLOT(sysHeartbeatData())); LoadHeartbeat(); @@ -457,7 +457,7 @@ void MainObject::newConnection(int fd) close(fd); return; } - socket[i]=new RDSocket(i,this,"socket_0"); + socket[i]=new RDSocket(i,this); socket[i]->setSocket(fd); connect(socket[i],SIGNAL(readyReadID(int)),this,SLOT(socketData(int))); connect(socket[i],SIGNAL(connectionClosedID(int)), @@ -1144,7 +1144,7 @@ void MainObject::sysHeartbeatData() void MainObject::updateXloadsData() { - vector::iterator it; + std::vector::iterator it; for(unsigned i=0;i::iterator it=catch_events.begin()+event; + std::vector::iterator it=catch_events.begin()+event; catch_events.erase(it,it+1); catch_engine->removeEvent(id); } @@ -2359,7 +2359,7 @@ void MainObject::PurgeEvent(int event) break; } catch_engine->removeEvent(catch_events[event].id()); - vector::iterator it=catch_events.begin()+event; + std::vector::iterator it=catch_events.begin()+event; catch_events.erase(it,it+1); } @@ -2824,6 +2824,6 @@ QString MainObject::GetTempRecordingName(int id) const int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/rdcatchd/rdcatchd.h b/rdcatchd/rdcatchd.h index a0798315d..7a4afb889 100644 --- a/rdcatchd/rdcatchd.h +++ b/rdcatchd/rdcatchd.h @@ -2,9 +2,7 @@ // // The Rivendell Netcatcher. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdcatchd.h,v 1.56 2010/09/16 19:52:08 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +21,6 @@ #ifndef RDCATCHD_H #define RDCATCHD_H - -//#define RDCATCHD_TEMP_DIR "/tmp" #define XLOAD_UPDATE_INTERVAL 1000 #define RDCATCHD_USAGE "[-d][--event-id=]\n\nOptions:\n\n-d\n Set 'debug' mode, causing rdcatchd(8) to stay in the foreground\n and print debugging info on standard output.\n\n--event-id=\n Execute event and then exit.\n\n" @@ -83,7 +79,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); public slots: void newConnection(int fd); diff --git a/rdcatchd/rdcatchd_socket.cpp b/rdcatchd/rdcatchd_socket.cpp index e66753750..a9ec7c0ff 100644 --- a/rdcatchd/rdcatchd_socket.cpp +++ b/rdcatchd/rdcatchd_socket.cpp @@ -2,9 +2,7 @@ // // An automated event executer. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdcatchd_socket.cpp,v 1.7 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -32,9 +29,8 @@ #include -RDCatchdSocket::RDCatchdSocket(Q_UINT16 port,int backlog,QObject *parent, - const char *name) - : QServerSocket(port,0,parent,name) +RDCatchdSocket::RDCatchdSocket(Q_UINT16 port,int backlog,QObject *parent) + : QServerSocket(port,0,parent) { } diff --git a/rdcatchd/rdcatchd_socket.h b/rdcatchd/rdcatchd_socket.h index 61233b6f5..f6a70a9f7 100644 --- a/rdcatchd/rdcatchd_socket.h +++ b/rdcatchd/rdcatchd_socket.h @@ -2,9 +2,7 @@ // // A telephone services server for Mithlond // -// (C) Copyright 2002 Fred Gleason -// -// $Id: rdcatchd_socket.h,v 1.6 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,13 +26,11 @@ #include #include - class RDCatchdSocket : public QServerSocket { Q_OBJECT public: - RDCatchdSocket(Q_UINT16 port,int backlog=0,QObject *parent=0, - const char *name=0); + RDCatchdSocket(Q_UINT16 port,int backlog=0,QObject *parent=0); RDCatchdSocket(const QHostAddress &address,Q_UINT16 port,int backlog=0, QObject *parent=0,const char *name=0); void newConnection(int socket); diff --git a/rdhpi/Makefile.am b/rdhpi/Makefile.am index 547e1d5e8..47f6c04e6 100644 --- a/rdhpi/Makefile.am +++ b/rdhpi/Makefile.am @@ -6,9 +6,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2007 Fred Gleason -## -## $Id: Makefile.am,v 1.7.8.3 2013/01/01 21:36:30 cvs Exp $ +## (C) Copyright 2002-2007,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdhpi/rdhpi.pro b/rdhpi/rdhpi.pro index da3ec4a47..e6deb810b 100644 --- a/rdhpi/rdhpi.pro +++ b/rdhpi/rdhpi.pro @@ -2,9 +2,7 @@ # # The rdhpi/ QMake project file for Rivendell. # -# (C) Copyright 2003-2007 Fred Gleason -# -# $Id: rdhpi.pro,v 1.4.8.1 2013/01/01 21:36:31 cvs Exp $ +# (C) Copyright 2003-2007,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdhpi/rdhpicardselector.cpp b/rdhpi/rdhpicardselector.cpp index dfed07d16..1b40ddd1b 100644 --- a/rdhpi/rdhpicardselector.cpp +++ b/rdhpi/rdhpicardselector.cpp @@ -2,9 +2,7 @@ // // Audio card selector widget for Rivendell // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpicardselector.cpp,v 1.3 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,8 +34,8 @@ #include -RDHPICardSelector::RDHPICardSelector(QWidget *parent,const char *name) - : QWidget(parent,name) +RDHPICardSelector::RDHPICardSelector(QWidget *parent) + : QWidget(parent) { QFont font; @@ -52,7 +50,7 @@ RDHPICardSelector::RDHPICardSelector(QWidget *parent,const char *name) // // Title // - card_title=new QLabel(this,"card_title"); + card_title=new QLabel(this); card_title->setGeometry(0,0,geometry().width(),19); card_title->setFont(font); card_title->setAlignment(AlignHCenter); @@ -61,29 +59,27 @@ RDHPICardSelector::RDHPICardSelector(QWidget *parent,const char *name) // // Card // - card_card_box=new QSpinBox(this,"card_card_box"); + card_card_box=new QSpinBox(this); card_card_box->setGeometry(60,yoffset,50,19); card_card_box->setSpecialValueText("None"); card_card_box->setMinValue(-1); card_card_box->setMaxValue(HPI_MAX_ADAPTERS-1); card_card_box->setValue(-1); connect(card_card_box,SIGNAL(valueChanged(int)),this,SLOT(cardData(int))); - card_card_label=new QLabel(card_card_box,"Card:",this, - "card_card_label"); + card_card_label=new QLabel(card_card_box,"Card:",this); card_card_label->setGeometry(0,yoffset+2,55,19); card_card_label->setAlignment(AlignRight|ShowPrefix); // // Port // - card_port_box=new QSpinBox(this,"card_port_box"); + card_port_box=new QSpinBox(this); card_port_box->setGeometry(60,yoffset+22,50,19); card_port_box->setMinValue(0); card_port_box->setMaxValue(HPI_MAX_NODES-1); card_port_box->setDisabled(true); connect(card_port_box,SIGNAL(valueChanged(int)),this,SLOT(portData(int))); - card_port_label=new QLabel(card_port_box,"Port:",this, - "card_port_label"); + card_port_label=new QLabel(card_port_box,"Port:",this); card_port_label->setGeometry(0,yoffset+24,55,19); card_port_label->setAlignment(AlignRight|ShowPrefix); } diff --git a/rdhpi/rdhpicardselector.h b/rdhpi/rdhpicardselector.h index cedc697c6..50d2bb944 100644 --- a/rdhpi/rdhpicardselector.h +++ b/rdhpi/rdhpicardselector.h @@ -2,9 +2,7 @@ // // Audio Card Selector Widget // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpicardselector.h,v 1.3 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,7 @@ class RDHPICardSelector : public QWidget { Q_OBJECT public: - RDHPICardSelector(QWidget *parent=0,const char *name=0); + RDHPICardSelector(QWidget *parent=0); ~RDHPICardSelector(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdhpi/rdhpiinformation.cpp b/rdhpi/rdhpiinformation.cpp index 89e1bb922..0c0359e65 100644 --- a/rdhpi/rdhpiinformation.cpp +++ b/rdhpi/rdhpiinformation.cpp @@ -2,9 +2,7 @@ // // A Container Class for AudioScience HPI Adapter Info // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpiinformation.cpp,v 1.4 2011/05/18 15:25:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdhpi/rdhpiinformation.h b/rdhpi/rdhpiinformation.h index 4a78bdca2..2722e9033 100644 --- a/rdhpi/rdhpiinformation.h +++ b/rdhpi/rdhpiinformation.h @@ -2,9 +2,7 @@ // // A Container Class for AudioScience HPI Adapter Info // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpiinformation.h,v 1.2 2011/05/18 15:25:33 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdhpi/rdhpiplaystream.cpp b/rdhpi/rdhpiplaystream.cpp index dab05899c..7fd823c55 100644 --- a/rdhpi/rdhpiplaystream.cpp +++ b/rdhpi/rdhpiplaystream.cpp @@ -2,9 +2,7 @@ // // A class for playing Microsoft WAV files. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpiplaystream.cpp,v 1.8.6.1 2012/05/04 14:56:22 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -63,10 +60,8 @@ volatile static int stream_mutex[HPI_MAX_ADAPTERS][HPI_MAX_STREAMS]= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}; #endif - -RDHPIPlayStream::RDHPIPlayStream(RDHPISoundCard *card, - QWidget *parent,const char *name) - :QObject(parent,name),RDWaveFile() +RDHPIPlayStream::RDHPIPlayStream(RDHPISoundCard *card,QWidget *parent) + :QObject(parent),RDWaveFile() { // hpi_err_t hpi_err; int quan; diff --git a/rdhpi/rdhpiplaystream.h b/rdhpi/rdhpiplaystream.h index 975d1cf39..8562946ca 100644 --- a/rdhpi/rdhpiplaystream.h +++ b/rdhpi/rdhpiplaystream.h @@ -2,9 +2,7 @@ // // A class for playing Microsoft WAV files. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpiplaystream.h,v 1.7.6.1 2012/05/04 14:56:22 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,15 +45,13 @@ #define TIMESCALE_HIGH_LIMIT 125000 //#define RPLAYSTREAM_SHOW_SLOTS yes - class RDHPIPlayStream : public QObject,public RDWaveFile { Q_OBJECT - public: enum State {Stopped=0,Playing=1,Paused=2}; enum Error {Ok=0,NoFile=1,NoStream=2,AlreadyOpen=3}; - RDHPIPlayStream(RDHPISoundCard *card,QWidget *parent=0,const char *name=0); + RDHPIPlayStream(RDHPISoundCard *card,QWidget *parent=0); ~RDHPIPlayStream(); QString errorString(RDHPIPlayStream::Error err); bool formatSupported(RDWaveFile::Format format); diff --git a/rdhpi/rdhpirecordstream.cpp b/rdhpi/rdhpirecordstream.cpp index c703ed212..d906f7747 100644 --- a/rdhpi/rdhpirecordstream.cpp +++ b/rdhpi/rdhpirecordstream.cpp @@ -2,7 +2,7 @@ // // A class for recording Microsoft WAV files. // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -33,10 +32,8 @@ #include - -RDHPIRecordStream::RDHPIRecordStream(RDHPISoundCard *card, - QWidget *parent,const char *name) - :QObject(parent,name),RDWaveFile() +RDHPIRecordStream::RDHPIRecordStream(RDHPISoundCard *card,QWidget *parent) + :QObject(parent),RDWaveFile() { int quan; uint16_t type[HPI_MAX_ADAPTERS]; diff --git a/rdhpi/rdhpirecordstream.h b/rdhpi/rdhpirecordstream.h index 6dfe7cd18..4d158277b 100644 --- a/rdhpi/rdhpirecordstream.h +++ b/rdhpi/rdhpirecordstream.h @@ -53,7 +53,7 @@ class RDHPIRecordStream : public QObject,public RDWaveFile enum RecordState {Recording=0,RecordReady=1,Paused=2,Stopped=3, RecordStarted=4}; enum Error {Ok=0,NoFile=1,NoStream=2,AlreadyOpen=3}; - RDHPIRecordStream(RDHPISoundCard *card,QWidget *parent=0,const char *name=0); + RDHPIRecordStream(RDHPISoundCard *card,QWidget *parent=0); ~RDHPIRecordStream(); QString errorString(RDHPIRecordStream::Error err); RDHPIRecordStream::Error createWave(); diff --git a/rdhpi/rdhpisoundcard.cpp b/rdhpi/rdhpisoundcard.cpp index fe3795816..c0c6de315 100644 --- a/rdhpi/rdhpisoundcard.cpp +++ b/rdhpi/rdhpisoundcard.cpp @@ -2,9 +2,7 @@ // // The audio card subsystem for the HPI Library. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpisoundcard.cpp,v 1.10.6.3 2012/08/07 15:48:04 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include @@ -28,8 +25,8 @@ #include -RDHPISoundCard::RDHPISoundCard(QObject *parent,const char *name) - : QObject(parent,name) +RDHPISoundCard::RDHPISoundCard(QObject *parent) + : QObject(parent) { card_quantity=0; fade_type=RDHPISoundCard::Log; diff --git a/rdhpi/rdhpisoundcard.h b/rdhpi/rdhpisoundcard.h index 7cfc64619..4bc5cf882 100644 --- a/rdhpi/rdhpisoundcard.h +++ b/rdhpi/rdhpisoundcard.h @@ -2,9 +2,7 @@ // // Sound card subsystem for the HPI Library. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpisoundcard.h,v 1.5.6.3 2012/08/07 15:48:04 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDHPISOUNDCARD_H #define RDHPISOUNDCARD_H @@ -88,7 +85,7 @@ class RDHPISoundCard : public QObject enum TunerBand {Fm=0,FmStereo=1,Am=2,Tv=3}; enum Subcarrier {Mpx=0,Rds=1}; - RDHPISoundCard(QObject *parent=0,const char *name=0); + RDHPISoundCard(QObject *parent=0); ~RDHPISoundCard(); Driver driver() const; RDHPIInformation *hpiInformation(int card); diff --git a/rdhpi/rdhpisoundselector.cpp b/rdhpi/rdhpisoundselector.cpp index 8a2848f2a..a8b0d482e 100644 --- a/rdhpi/rdhpisoundselector.cpp +++ b/rdhpi/rdhpisoundselector.cpp @@ -2,9 +2,7 @@ // // A selection widget for audio devices. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpisoundselector.cpp,v 1.3 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,10 +35,10 @@ RDHPISoundSelector::RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class, - QWidget *parent, - const char *name) :QListBox(parent,name) + QWidget *parent) + :QListBox(parent) { - sound_card=new RDHPISoundCard(this,"sound_card"); + sound_card=new RDHPISoundCard(this); if(dev_class==RDHPISoundCard::PlayDevice) { for(int i=0;igetCardQuantity();i++) { diff --git a/rdhpi/rdhpisoundselector.h b/rdhpi/rdhpisoundselector.h index 4bbbd4bcc..d3ea4ca4d 100644 --- a/rdhpi/rdhpisoundselector.h +++ b/rdhpi/rdhpisoundselector.h @@ -2,9 +2,7 @@ // // A selection widget for audio devices. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdhpisoundselector.h,v 1.4 2011/05/18 14:38:13 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef RDHPISOUNDSELECTOR_H #define RDHPISOUNDSELECTOR_H @@ -49,8 +46,7 @@ class RDHPISoundSelector : public QListBox Q_OBJECT public: - RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class, - QWidget *parent=0,const char *name=0); + RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class,QWidget *parent=0); signals: void changed(int card,int port); diff --git a/rdlibrary/Makefile.am b/rdlibrary/Makefile.am index 850b394f8..e5575fe91 100644 --- a/rdlibrary/Makefile.am +++ b/rdlibrary/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdlibrary ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.51.8.4 2014/01/08 02:08:37 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/audio_cart.cpp b/rdlibrary/audio_cart.cpp index b5706440e..b5cb40fb8 100644 --- a/rdlibrary/audio_cart.cpp +++ b/rdlibrary/audio_cart.cpp @@ -2,9 +2,7 @@ // // The audio cart editor for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: audio_cart.cpp,v 1.57.6.9.2.2 2014/05/22 14:30:45 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -57,9 +55,8 @@ bool import_active=false; AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, - bool select_cut,bool profile_rip, - QWidget *parent,const char *name) - : QWidget(parent,name) + bool select_cut,bool profile_rip,QWidget *parent) + : QWidget(parent) { rdcart_import_metadata=true; rdcart_controls=controls; @@ -93,7 +90,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Add Cut Button // - QPushButton *add_cut_button=new QPushButton(this,"add_cut_button"); + QPushButton *add_cut_button=new QPushButton(this); add_cut_button->setGeometry(10,0,80,50); add_cut_button->setFont(button_font); add_cut_button->setText(tr("Add")); @@ -102,7 +99,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Delete Cut Button // - QPushButton *delete_cut_button=new QPushButton(this,"delete_cut_button"); + QPushButton *delete_cut_button=new QPushButton(this); delete_cut_button->setGeometry(10,60,80,50); delete_cut_button->setFont(button_font); delete_cut_button->setText(tr("Delete")); @@ -111,7 +108,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Copy Cut Button // - QPushButton *copy_cut_button=new QPushButton(this,"copy_cut_button"); + QPushButton *copy_cut_button=new QPushButton(this); copy_cut_button->setGeometry(10,120,80,50); copy_cut_button->setFont(button_font); copy_cut_button->setText(tr("Copy")); @@ -120,7 +117,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Paste Cut Button // - paste_cut_button=new QPushButton(this,"paste_cut_button"); + paste_cut_button=new QPushButton(this); paste_cut_button->setGeometry(10,180,80,50); paste_cut_button->setFont(button_font); paste_cut_button->setText(tr("Paste")); @@ -129,7 +126,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Cart Cut List // - rdcart_cut_list=new RDListView(this,"rdcart_cut_list"); + rdcart_cut_list=new RDListView(this); rdcart_cut_list->setGeometry(100,0,430,sizeHint().height()); rdcart_cut_list->setAllColumnsShowFocus(true); rdcart_cut_list->setSelectionMode(QListView::Extended); @@ -193,7 +190,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, p->lineTo(70,24); p->drawText((80-m->width(tr("Record")))/2,38,tr("Record")); p->end(); - QPushButton *record_cut_button=new QPushButton(this,"record_cut_button"); + QPushButton *record_cut_button=new QPushButton(this); record_cut_button->setGeometry(550,0,80,50); record_cut_button->setPixmap(*pix); connect(record_cut_button,SIGNAL(clicked()),this,SLOT(recordCutData())); @@ -201,8 +198,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Send to (external) Editor Button (ex: Audacity) // - QPushButton *ext_editor_cut_button= - new QPushButton(this,"ext_editor_cut_button"); + QPushButton *ext_editor_cut_button=new QPushButton(this); ext_editor_cut_button->setGeometry(550,60,80,50); ext_editor_cut_button->setFont(button_font); ext_editor_cut_button->setText(tr("Edit\nAudio")); @@ -218,7 +214,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Edit Cut Button // - QPushButton *edit_cut_button=new QPushButton(this,"edit_cut_button"); + QPushButton *edit_cut_button=new QPushButton(this); edit_cut_button->setGeometry(550,60+yoffset,80,50); edit_cut_button->setFont(button_font); edit_cut_button->setText(tr("Edit\nMarkers")); @@ -237,7 +233,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, p->lineTo(70,24); p->drawText((80-m->width(tr("Export")))/2,38,tr("Export")); p->end(); - QPushButton *import_cut_button=new QPushButton(this,"import_cut_button"); + QPushButton *import_cut_button=new QPushButton(this); import_cut_button->setPixmap(*pix); import_cut_button->setGeometry(550,120+yoffset,80,50); connect(import_cut_button,SIGNAL(clicked()),this,SLOT(importCutData())); @@ -245,7 +241,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Rip Cut Button // - QPushButton *rip_cut_button=new QPushButton(this,"rip_cut_button"); + QPushButton *rip_cut_button=new QPushButton(this); rip_cut_button->setGeometry(550,180+yoffset,80,50); rip_cut_button->setFont(button_font); rip_cut_button->setText(tr("Rip CD")); diff --git a/rdlibrary/audio_cart.h b/rdlibrary/audio_cart.h index 38d710b84..b03d8468b 100644 --- a/rdlibrary/audio_cart.h +++ b/rdlibrary/audio_cart.h @@ -2,9 +2,7 @@ // // The audio cart editor for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: audio_cart.h,v 1.19.8.2.2.1 2014/03/19 22:12:58 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -53,7 +51,7 @@ class AudioCart : public QWidget Q_OBJECT public: AudioCart(AudioControls *controls,RDCart *cart,QString *path,bool select_cut, - bool profile_rip,QWidget *parent=0,const char *name=0); + bool profile_rip,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/audio_controls.h b/rdlibrary/audio_controls.h index e092d68a1..6eec158ab 100644 --- a/rdlibrary/audio_controls.h +++ b/rdlibrary/audio_controls.h @@ -2,9 +2,7 @@ // // A Container Class for RDLibrary Cart Label Controls // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: audio_controls.h,v 1.6.8.1 2013/12/11 18:51:48 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/cart_tip.cpp b/rdlibrary/cart_tip.cpp index bc6d7e205..16a1bb559 100644 --- a/rdlibrary/cart_tip.cpp +++ b/rdlibrary/cart_tip.cpp @@ -2,9 +2,7 @@ // // Custom ToolTip for RDLibrary's Cart List // -// (C) Copyright 2009 Fred Gleason -// -// $Id: cart_tip.cpp,v 1.2 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/cart_tip.h b/rdlibrary/cart_tip.h index 9091d554b..97fc666a9 100644 --- a/rdlibrary/cart_tip.h +++ b/rdlibrary/cart_tip.h @@ -2,9 +2,7 @@ // // Custom ToolTip for RDLibrary's Cart List // -// (C) Copyright 2009 Fred Gleason -// -// $Id: cart_tip.h,v 1.2 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/cdripper.cpp b/rdlibrary/cdripper.cpp index 4b877985f..d86e33b88 100644 --- a/rdlibrary/cdripper.cpp +++ b/rdlibrary/cdripper.cpp @@ -2,9 +2,7 @@ // // CD Ripper Dialog for Rivendell. // -// (C) Copyright 2002-2003, 2009 Fred Gleason -// -// $Id: cdripper.cpp,v 1.41.4.6.2.2 2014/05/20 15:45:08 cvs Exp $ +// (C) Copyright 2002-2003,2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -50,10 +48,9 @@ // bool ripper_running; - CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, - bool profile_rip,QWidget *parent,const char *name) - : QDialog(parent,name) + bool profile_rip,QWidget *parent) + : QDialog(parent) { rip_profile_rip=profile_rip; rip_isrc_read=false; @@ -119,10 +116,10 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // CDDB Stuff // if(rip_profile_rip) { - rip_cddb_lookup=new RDCddbLookup(stdout,this,"rip_cddb_lookup"); + rip_cddb_lookup=new RDCddbLookup(stdout,this); } else { - rip_cddb_lookup=new RDCddbLookup(NULL,this,"rip_cddb_lookup"); + rip_cddb_lookup=new RDCddbLookup(NULL,this); } connect(rip_cddb_lookup,SIGNAL(done(RDCddbLookup::Result)), this,SLOT(cddbDoneData(RDCddbLookup::Result))); @@ -142,7 +139,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_artist_label=new QLabel(tr("Artist:"),this); rip_artist_label->setFont(label_font); rip_artist_label->setAlignment(AlignRight|AlignVCenter); - rip_artist_edit=new QLineEdit(this,"rip_artist_edit"); + rip_artist_edit=new QLineEdit(this); // // Album Edit @@ -150,7 +147,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_album_label=new QLabel(tr("Album:"),this); rip_album_label->setFont(label_font); rip_album_label->setAlignment(AlignRight|AlignVCenter); - rip_album_edit=new QLineEdit(this,"rip_album_edit"); + rip_album_edit=new QLineEdit(this); // // Other Edit @@ -158,17 +155,17 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_other_label=new QLabel(tr("Other:"),this); rip_other_label->setFont(label_font); rip_other_label->setAlignment(AlignRight); - rip_other_edit=new QTextEdit(this,"rip_other_edit"); + rip_other_edit=new QTextEdit(this); rip_other_edit->setReadOnly(true); // // Apply FreeDB Check Box // - rip_apply_box=new QCheckBox(this,"rip_apply_box"); + rip_apply_box=new QCheckBox(this); rip_apply_box->setChecked(true); rip_apply_box->setDisabled(true); - rip_apply_label=new QLabel(rip_apply_box,tr("Apply FreeDB Values to Cart"), - this,"rip_apply_label"); + rip_apply_label= + new QLabel(rip_apply_box,tr("Apply FreeDB Values to Cart"),this); rip_apply_label->setFont(label_font); rip_apply_label->setAlignment(AlignLeft); rip_apply_box->setChecked(false); @@ -200,27 +197,24 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Progress Bar // - rip_bar=new QProgressBar(this,"rip_bar"); + rip_bar=new QProgressBar(this); // // Eject Button // - rip_eject_button=new RDTransportButton(RDTransportButton::Eject, - this,"close_button"); + rip_eject_button=new RDTransportButton(RDTransportButton::Eject,this); connect(rip_eject_button,SIGNAL(clicked()),this,SLOT(ejectButtonData())); // // Play Button // - rip_play_button=new RDTransportButton(RDTransportButton::Play, - this,"close_button"); + rip_play_button=new RDTransportButton(RDTransportButton::Play,this); connect(rip_play_button,SIGNAL(clicked()),this,SLOT(playButtonData())); // // Stop Button // - rip_stop_button=new RDTransportButton(RDTransportButton::Stop, - this,"close_button"); + rip_stop_button=new RDTransportButton(RDTransportButton::Stop,this); rip_stop_button->setOnColor(red); rip_stop_button->on(); connect(rip_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); @@ -228,7 +222,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Rip Track Button // - rip_rip_button=new QPushButton(tr("&Rip\nTrack"),this,"rip_track_button"); + rip_rip_button=new QPushButton(tr("&Rip\nTrack"),this); rip_rip_button->setFont(button_font); rip_rip_button->setDisabled(true); connect(rip_rip_button,SIGNAL(clicked()),this,SLOT(ripTrackButtonData())); @@ -247,13 +241,12 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Normalize Level // - rip_normalize_spin=new QSpinBox(this,"rip_normalize_spin"); + rip_normalize_spin=new QSpinBox(this); rip_normalize_spin->setRange(-30,0); - rip_normalize_label=new QLabel(rip_normalize_spin,tr("Level:"), - this,"normalize_spin_label"); + rip_normalize_label=new QLabel(rip_normalize_spin,tr("Level:"),this); rip_normalize_label->setFont(label_font); rip_normalize_label->setAlignment(AlignRight|AlignVCenter); - rip_normalize_unit=new QLabel(tr("dBFS"),this,"normalize_unit_label"); + rip_normalize_unit=new QLabel(tr("dBFS"),this); rip_normalize_unit->setFont(label_font); rip_normalize_unit->setAlignment(AlignLeft|AlignVCenter); @@ -271,13 +264,12 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Autotrim Level // - rip_autotrim_spin=new QSpinBox(this,"rip_autotrim_spin"); + rip_autotrim_spin=new QSpinBox(this); rip_autotrim_spin->setRange(-99,0); - rip_autotrim_label=new QLabel(rip_autotrim_spin,tr("Level:"), - this,"autotrim_spin_label"); + rip_autotrim_label=new QLabel(rip_autotrim_spin,tr("Level:"),this); rip_autotrim_label->setFont(label_font); rip_autotrim_label->setAlignment(AlignRight|AlignVCenter); - rip_autotrim_unit=new QLabel(tr("dBFS"),this,"autotrim_unit_label"); + rip_autotrim_unit=new QLabel(tr("dBFS"),this); rip_autotrim_unit->setFont(label_font); rip_autotrim_unit->setAlignment(AlignLeft|AlignVCenter); @@ -292,7 +284,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Close Button // - rip_close_button=new QPushButton("&Close",this,"close_button"); + rip_close_button=new QPushButton("&Close",this); rip_close_button->setFont(button_font); connect(rip_close_button,SIGNAL(clicked()),this,SLOT(closeData())); diff --git a/rdlibrary/cdripper.h b/rdlibrary/cdripper.h index 3520e7f07..7060da4e3 100644 --- a/rdlibrary/cdripper.h +++ b/rdlibrary/cdripper.h @@ -2,9 +2,7 @@ // // CD Ripper Dialog for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: cdripper.h,v 1.14.8.5 2014/01/14 18:02:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -51,7 +49,7 @@ class CdRipper : public QDialog Q_OBJECT public: CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, - bool profile_rip,QWidget *parent=0,const char *name=0); + bool profile_rip,QWidget *parent=0); ~CdRipper(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/disk_gauge.cpp b/rdlibrary/disk_gauge.cpp index 63dc8c2d1..18368cc3e 100644 --- a/rdlibrary/disk_gauge.cpp +++ b/rdlibrary/disk_gauge.cpp @@ -2,9 +2,7 @@ // // Disk Gauge Widget for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: disk_gauge.cpp,v 1.7.8.1 2014/01/08 02:08:38 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,8 +28,8 @@ #include #include -DiskGauge::DiskGauge(int samp_rate,int chans,QWidget *parent,const char *name) - : QWidget(parent,name) +DiskGauge::DiskGauge(int samp_rate,int chans,QWidget *parent) + : QWidget(parent) { disk_sample_rate=samp_rate; disk_channels=chans; diff --git a/rdlibrary/disk_gauge.h b/rdlibrary/disk_gauge.h index 2cebca2c0..d55e1d7df 100644 --- a/rdlibrary/disk_gauge.h +++ b/rdlibrary/disk_gauge.h @@ -2,9 +2,7 @@ // // Disk Gauge Widget for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: disk_gauge.h,v 1.6.8.1 2014/01/08 02:08:38 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class DiskGauge : public QWidget { Q_OBJECT public: - DiskGauge(int samp_rate,int chans,QWidget *parent,const char *name=0); + DiskGauge(int samp_rate,int chans,QWidget *parent); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/disk_ripper.cpp b/rdlibrary/disk_ripper.cpp index 4ba30e9a4..28603f774 100644 --- a/rdlibrary/disk_ripper.cpp +++ b/rdlibrary/disk_ripper.cpp @@ -2,9 +2,7 @@ // // CD Ripper Dialog for Rivendell. // -// (C) Copyright 2002-2003,2010 Fred Gleason -// -// $Id: disk_ripper.cpp,v 1.30.4.3.2.7 2014/06/02 18:59:24 cvs Exp $ +// (C) Copyright 2002-2003,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -51,8 +49,8 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, - bool profile_rip,QWidget *parent,const char *name) - : QDialog(parent,name) + bool profile_rip,QWidget *parent) + : QDialog(parent) { rip_isrc_read=false; rip_filter_text=filter; @@ -155,7 +153,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, // // Apply FreeDB Check Box // - rip_apply_box=new QCheckBox(this,"rip_apply_box"); + rip_apply_box=new QCheckBox(this); rip_apply_box->setChecked(true); rip_apply_box->setDisabled(true); rip_apply_label= @@ -539,8 +537,7 @@ void DiskRipper::setCutButtonData() RDCutDialog *dialog=new RDCutDialog(&cutname,rdstation_conf,lib_system, rip_filter_text, rip_group_text,rip_schedcode_text, - lib_user->name(),true, - true,true,this,"cut_dialog"); + lib_user->name(),true,true,true,this); if(dialog->exec()==0) { if(cutname.isEmpty()) { rip_cutnames[item->text(0).toUInt()-1]=""; diff --git a/rdlibrary/disk_ripper.h b/rdlibrary/disk_ripper.h index e03ebf89d..29c74db9c 100644 --- a/rdlibrary/disk_ripper.h +++ b/rdlibrary/disk_ripper.h @@ -2,9 +2,7 @@ // // CD Ripper Dialog for Rivendell // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: disk_ripper.h,v 1.8.4.2.2.3 2014/06/02 17:17:00 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -49,13 +47,12 @@ #include #include - class DiskRipper : public QDialog { Q_OBJECT public: DiskRipper(QString *filter,QString *group,QString *schedcode, - bool profile_rip,QWidget *parent=0,const char *name=0); + bool profile_rip,QWidget *parent=0); ~DiskRipper(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/edit_cart.cpp b/rdlibrary/edit_cart.cpp index 3e1fdc231..d204e0131 100644 --- a/rdlibrary/edit_cart.cpp +++ b/rdlibrary/edit_cart.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Cart // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_cart.cpp,v 1.74.2.7.2.2 2014/05/28 21:21:41 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -55,7 +53,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, QWidget *parent,const char *name,QListView *lib_cart_list) - : QDialog(parent,name,true) + : QDialog(parent,"",true) { bool modification_allowed; rdcart_cart=NULL; @@ -118,13 +116,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Number // - rdcart_number_edit=new QLineEdit(this,"rdcart_number_edit"); + rdcart_number_edit=new QLineEdit(this); rdcart_number_edit->setGeometry(135,11,70,21); rdcart_number_edit->setFont(line_edit_font); rdcart_number_edit->setMaxLength(6); rdcart_number_edit->setReadOnly(true); - QLabel *rdcart_number_label=new QLabel(rdcart_number_edit,tr("Number:"),this, - "rdcart_number_label"); + QLabel *rdcart_number_label=new QLabel(rdcart_number_edit,tr("Number:"),this); rdcart_number_label->setGeometry(10,13,120,19); rdcart_number_label->setFont(button_font); rdcart_number_label->setAlignment(AlignRight|ShowPrefix); @@ -133,7 +130,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Group // - rdcart_group_box=new QComboBox(this,"rdcart_group_box"); + rdcart_group_box=new QComboBox(this); if(lib_cart_list_edit==NULL) { rdcart_group_box->setGeometry(280,11,140,21); } @@ -141,12 +138,11 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, rdcart_group_box->setGeometry(135,38,110,19); } rdcart_group_box->setFont(line_edit_font); - rdcart_group_edit=new QLineEdit(this,"rdcart_group_edit"); + rdcart_group_edit=new QLineEdit(this); rdcart_group_edit->setGeometry(280,11,140,21); rdcart_group_edit->setFont(line_edit_font); rdcart_group_edit->setReadOnly(true); - QLabel *rdcart_group_label=new QLabel(rdcart_group_box,tr("Group:"),this, - "rdcart_group_label"); + QLabel *rdcart_group_label=new QLabel(rdcart_group_box,tr("Group:"),this); if(lib_cart_list_edit==NULL) { rdcart_group_label->setGeometry(215,13,60,19); } @@ -159,13 +155,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Type // - rdcart_type_edit=new QLineEdit(this,"rdcart_type_edit"); + rdcart_type_edit=new QLineEdit(this); rdcart_type_edit->setGeometry(500,11,80,21); rdcart_type_edit->setFont(line_edit_font); rdcart_type_edit->setMaxLength(6); rdcart_type_edit->setReadOnly(true); - QLabel *rdcart_type_label=new QLabel(rdcart_type_edit,tr("Type:"),this, - "rdcart_type_label"); + QLabel *rdcart_type_label=new QLabel(rdcart_type_edit,tr("Type:"),this); rdcart_type_label->setGeometry(440,13,55,19); rdcart_type_label->setFont(button_font); rdcart_type_label->setAlignment(AlignRight|ShowPrefix); @@ -177,15 +172,14 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Average Length // - rdcart_average_length_edit=new QLineEdit(this,"rdcart_average_length_edit"); + rdcart_average_length_edit=new QLineEdit(this); rdcart_average_length_edit->setGeometry(135,36,70,21); rdcart_average_length_edit->setFont(line_edit_font); rdcart_average_length_edit->setMaxLength(10); rdcart_average_length_edit->setAlignment(AlignRight); rdcart_average_length_edit->setReadOnly(true); - QLabel *rdcart_average_length_label=new QLabel(rdcart_average_length_edit, - tr("Average Length:"),this, - "rdcart_average_length_label"); + QLabel *rdcart_average_length_label= + new QLabel(rdcart_average_length_edit,tr("Average Length:"),this); rdcart_average_length_label->setGeometry(10,38,120,19); rdcart_average_length_label->setFont(button_font); rdcart_average_length_label->setAlignment(AlignRight|ShowPrefix); @@ -197,12 +191,10 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Enforce Length // - rdcart_controls.enforce_length_box=new QCheckBox(this, - "rdcart_enforce_length_button"); + rdcart_controls.enforce_length_box=new QCheckBox(this); rdcart_controls.enforce_length_box->setGeometry(285,38,20,15); - QLabel *rdcart_enforce_length_label=new QLabel(rdcart_controls.enforce_length_box, - tr("Enforce Length"),this, - "rdcart_enforce_length_label"); + QLabel *rdcart_enforce_length_label= + new QLabel(rdcart_controls.enforce_length_box,tr("Enforce Length"),this); rdcart_enforce_length_label->setGeometry(305,38,110,19); rdcart_enforce_length_label->setFont(button_font); rdcart_enforce_length_label->setAlignment(AlignLeft|ShowPrefix); @@ -216,21 +208,19 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Forced Length // - rdcart_controls.forced_length_edit= - new RDTimeEdit(this,"rdcart_forced_length_edit"); + rdcart_controls.forced_length_edit=new RDTimeEdit(this); rdcart_controls.forced_length_edit->setGeometry(530,36,85,21); rdcart_controls.forced_length_edit-> setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes|RDTimeEdit::Seconds| RDTimeEdit::Tenths); rdcart_controls.forced_length_edit->setFont(line_edit_font); - rdcart_forced_length_ledit=new QLineEdit(this,"rdcart_forced_length_edit"); + rdcart_forced_length_ledit=new QLineEdit(this); rdcart_forced_length_ledit->setGeometry(535,36,80,21); rdcart_forced_length_ledit->setFont(line_edit_font); rdcart_forced_length_ledit->hide(); rdcart_forced_length_ledit->setReadOnly(true); - rdcart_forced_length_label=new QLabel(rdcart_controls.forced_length_edit, - tr("Forced Length:"),this, - "rdcart_forced_length_label"); + rdcart_forced_length_label= + new QLabel(rdcart_controls.forced_length_edit,tr("Forced Length:"),this); rdcart_forced_length_label->setGeometry(415,38,110,19); rdcart_forced_length_label->setFont(button_font); rdcart_forced_length_label->setAlignment(AlignRight|ShowPrefix); @@ -242,12 +232,10 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Preserve Pitch // - rdcart_preserve_pitch_button=new QCheckBox(this, - "rdcart_preserve_pitch_button"); + rdcart_preserve_pitch_button=new QCheckBox(this); rdcart_preserve_pitch_button->setGeometry(430,38,20,15); - rdcart_preserve_pitch_label=new QLabel(rdcart_preserve_pitch_button, - tr("Preserve Pitch"),this, - "rdcart_preserve_pitch_label"); + rdcart_preserve_pitch_label= + new QLabel(rdcart_preserve_pitch_button,tr("Preserve Pitch"),this); rdcart_preserve_pitch_label->setGeometry(450,38,140,19); rdcart_preserve_pitch_label->setFont(button_font); rdcart_preserve_pitch_label->setAlignment(AlignLeft|ShowPrefix); @@ -258,12 +246,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Title // - rdcart_controls.title_edit=new QLineEdit(this,"rdcart_title_edit"); + rdcart_controls.title_edit=new QLineEdit(this); rdcart_controls.title_edit->setGeometry(135,60,480,21); rdcart_controls.title_edit->setFont(line_edit_font); rdcart_controls.title_edit->setMaxLength(255); - QLabel *rdcart_title_label=new QLabel(rdcart_controls.title_edit,tr("&Title:"),this, - "rdcart_title_label"); + QLabel *rdcart_title_label= + new QLabel(rdcart_controls.title_edit,tr("&Title:"),this); rdcart_title_label->setGeometry(10,62,120,19); rdcart_title_label->setFont(button_font); rdcart_title_label->setAlignment(AlignRight|ShowPrefix); @@ -271,13 +259,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Start Date // - rdcart_start_date_edit=new QLineEdit(this,"rdcart_start_date_edit"); + rdcart_start_date_edit=new QLineEdit(this); rdcart_start_date_edit->setGeometry(135,84,100,21); rdcart_start_date_edit->setFont(line_edit_font); rdcart_start_date_edit->setMaxLength(255); - QLabel *rdcart_start_date_label=new QLabel(rdcart_start_date_edit, - tr("&Start Date:"),this, - "rdcart_start_date_label"); + QLabel *rdcart_start_date_label= + new QLabel(rdcart_start_date_edit,tr("&Start Date:"),this); rdcart_start_date_label->setGeometry(10,86,120,19); rdcart_start_date_label->setFont(button_font); rdcart_start_date_label->setAlignment(AlignRight|ShowPrefix); @@ -287,13 +274,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart End Date // - rdcart_end_date_edit=new QLineEdit(this,"rdcart_end_date_edit"); + rdcart_end_date_edit=new QLineEdit(this); rdcart_end_date_edit->setGeometry(350,84,100,21); rdcart_end_date_edit->setFont(line_edit_font); rdcart_end_date_edit->setMaxLength(255); - QLabel *rdcart_end_date_label=new QLabel(rdcart_end_date_edit, - tr("&End Date:"),this, - "rdcart_end_date_label"); + QLabel *rdcart_end_date_label= + new QLabel(rdcart_end_date_edit,tr("&End Date:"),this); rdcart_end_date_label->setGeometry(260,86,85,19); rdcart_end_date_label->setFont(button_font); rdcart_end_date_label->setAlignment(AlignRight|ShowPrefix); @@ -303,12 +289,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Artist // - rdcart_controls.artist_edit=new QLineEdit(this,"rdcart_artist_edit"); + rdcart_controls.artist_edit=new QLineEdit(this); rdcart_controls.artist_edit->setGeometry(135,84,480,21); rdcart_controls.artist_edit->setFont(line_edit_font); rdcart_controls.artist_edit->setMaxLength(255); - QLabel *rdcart_artist_label=new QLabel(rdcart_controls.artist_edit,tr("&Artist:"), - this,"rdcart_artist_label"); + QLabel *rdcart_artist_label= + new QLabel(rdcart_controls.artist_edit,tr("&Artist:"),this); rdcart_artist_label->setGeometry(10,86,120,19); rdcart_artist_label->setFont(button_font); rdcart_artist_label->setAlignment(AlignRight|ShowPrefix); @@ -318,14 +304,13 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // QIntValidator *val=new QIntValidator(this); val->setBottom(1); - rdcart_controls.year_edit=new QLineEdit(this,"rdcart_year_edit"); + rdcart_controls.year_edit=new QLineEdit(this); rdcart_controls.year_edit->setGeometry(135,110,50,21); rdcart_controls.year_edit->setFont(line_edit_font); rdcart_controls.year_edit->setValidator(val); rdcart_controls.year_edit->setMaxLength(255); - QLabel *rdcart_year_label=new QLabel(rdcart_controls.year_edit, - tr("&Year Released:"),this, - "rdcart_year_label"); + QLabel *rdcart_year_label= + new QLabel(rdcart_controls.year_edit,tr("&Year Released:"),this); rdcart_year_label->setGeometry(10,112,120,19); rdcart_year_label->setFont(button_font); rdcart_year_label->setAlignment(AlignRight|ShowPrefix); @@ -333,7 +318,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Usage Code // - rdcart_usage_box=new QComboBox(this,"rdcart_usage_box"); + rdcart_usage_box=new QComboBox(this); rdcart_usage_box->setGeometry(270,110,150,21); if(lib_cart_list_edit!=0) { rdcart_usage_box->insertItem(""); @@ -341,19 +326,18 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, for(int i=0;i<(int)RDCart::UsageLast;i++) { rdcart_usage_box->insertItem(RDCart::usageText((RDCart::UsageCode)i)); } - QLabel *label= - new QLabel(rdcart_usage_box,tr("U&sage:"),this,"rdcart_usage_label"); + QLabel *label=new QLabel(rdcart_usage_box,tr("U&sage:"),this); label->setGeometry(195,112,70,19); label->setFont(button_font); label->setAlignment(AlignRight|ShowPrefix); - rdcart_usage_edit=new QLineEdit(this,"rdcart_usage_edit"); + rdcart_usage_edit=new QLineEdit(this); rdcart_usage_edit->setGeometry(270,110,150,21); rdcart_usage_edit->setReadOnly(true); // // Scheduler Codes // - QPushButton *sched_codes_button=new QPushButton(this,"sched_codes_button"); + QPushButton *sched_codes_button=new QPushButton(this); sched_codes_button->setGeometry(470,106,150,28); sched_codes_button->setDefault(true); sched_codes_button->setFont(button_font); @@ -390,12 +374,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Album // - rdcart_controls.album_edit=new QLineEdit(this,"rdcart_album_edit"); + rdcart_controls.album_edit=new QLineEdit(this); rdcart_controls.album_edit->setGeometry(135,158,480,21); rdcart_controls.album_edit->setFont(line_edit_font); rdcart_controls.album_edit->setMaxLength(64); - QLabel *rdcart_album_label=new QLabel(rdcart_controls.album_edit,tr("Al&bum:"),this, - "rdcart_album_label"); + QLabel *rdcart_album_label= + new QLabel(rdcart_controls.album_edit,tr("Al&bum:"),this); rdcart_album_label->setGeometry(10,158,120,21); rdcart_album_label->setFont(button_font); rdcart_album_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -403,12 +387,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Label // - rdcart_controls.label_edit=new QLineEdit(this,"rdcart_label_edit"); + rdcart_controls.label_edit=new QLineEdit(this); rdcart_controls.label_edit->setGeometry(135,182,480,21); rdcart_controls.label_edit->setFont(line_edit_font); rdcart_controls.label_edit->setMaxLength(64); - QLabel *rdcart_label_label=new QLabel(rdcart_controls.label_edit,tr("Re&cord Label:"), - this,"rdcart_label_label"); + QLabel *rdcart_label_label= + new QLabel(rdcart_controls.label_edit,tr("Re&cord Label:"),this); rdcart_label_label->setGeometry(10,182,120,21); rdcart_label_label->setFont(button_font); rdcart_label_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -416,12 +400,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Client // - rdcart_controls.client_edit=new QLineEdit(this,"rdcart_client_edit"); + rdcart_controls.client_edit=new QLineEdit(this); rdcart_controls.client_edit->setGeometry(135,206,480,21); rdcart_controls.client_edit->setFont(line_edit_font); rdcart_controls.client_edit->setMaxLength(64); - QLabel *rdcart_client_label=new QLabel(rdcart_controls.label_edit,tr("C&lient:"),this, - "rdcart_client_label"); + QLabel *rdcart_client_label= + new QLabel(rdcart_controls.label_edit,tr("C&lient:"),this); rdcart_client_label->setGeometry(10,206,120,21); rdcart_client_label->setFont(button_font); rdcart_client_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -429,12 +413,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Agency // - rdcart_controls.agency_edit=new QLineEdit(this,"rdcart_agency_edit"); + rdcart_controls.agency_edit=new QLineEdit(this); rdcart_controls.agency_edit->setGeometry(135,230,480,21); rdcart_controls.agency_edit->setFont(line_edit_font); rdcart_controls.agency_edit->setMaxLength(64); - QLabel *rdcart_agency_label=new QLabel(rdcart_controls.label_edit,tr("A&gency:"),this, - "rdcart_agency_label"); + QLabel *rdcart_agency_label= + new QLabel(rdcart_controls.label_edit,tr("A&gency:"),this); rdcart_agency_label->setGeometry(10,230,120,21); rdcart_agency_label->setFont(button_font); rdcart_agency_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -442,13 +426,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Publisher // - rdcart_controls.publisher_edit=new QLineEdit(this,"rdcart_publisher_edit"); + rdcart_controls.publisher_edit=new QLineEdit(this); rdcart_controls.publisher_edit->setGeometry(135,254,480,21); rdcart_controls.publisher_edit->setFont(line_edit_font); rdcart_controls.publisher_edit->setMaxLength(64); - QLabel *rdcart_publisher_label=new QLabel(rdcart_controls.label_edit, - tr("&Publisher:"),this, - "rdcart_publisher_label"); + QLabel *rdcart_publisher_label= + new QLabel(rdcart_controls.label_edit,tr("&Publisher:"),this); rdcart_publisher_label->setGeometry(10,254,120,21); rdcart_publisher_label->setFont(button_font); rdcart_publisher_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -456,13 +439,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Composer // - rdcart_controls.composer_edit=new QLineEdit(this,"rdcart_composer_edit"); + rdcart_controls.composer_edit=new QLineEdit(this); rdcart_controls.composer_edit->setGeometry(135,278,480,21); rdcart_controls.composer_edit->setFont(line_edit_font); rdcart_controls.composer_edit->setMaxLength(64); - QLabel *rdcart_composer_label=new QLabel(rdcart_controls.label_edit, - tr("Compos&er:"),this, - "rdcart_composer_label"); + QLabel *rdcart_composer_label= + new QLabel(rdcart_controls.label_edit,tr("Compos&er:"),this); rdcart_composer_label->setGeometry(10,278,120,21); rdcart_composer_label->setFont(button_font); rdcart_composer_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -470,13 +452,12 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cart Conductor // - rdcart_controls.conductor_edit=new QLineEdit(this,"rdcart_conductor_edit"); + rdcart_controls.conductor_edit=new QLineEdit(this); rdcart_controls.conductor_edit->setGeometry(135,302,480,21); rdcart_controls.conductor_edit->setFont(line_edit_font); rdcart_controls.conductor_edit->setMaxLength(255); QLabel *rdcart_conductor_label= - new QLabel(rdcart_controls.label_edit,tr("Cond&uctor:"),this, - "rdcart_conductor_label"); + new QLabel(rdcart_controls.label_edit,tr("Cond&uctor:"),this); rdcart_conductor_label->setGeometry(10,302,120,21); rdcart_conductor_label->setFont(button_font); rdcart_conductor_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -489,8 +470,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, rdcart_controls.user_defined_edit->setFont(line_edit_font); rdcart_controls.user_defined_edit->setMaxLength(255); QLabel *rdcart_user_defined_label= - new QLabel(rdcart_controls.label_edit,tr("&User Defined:"),this, - "rdcart_user_defined_label"); + new QLabel(rdcart_controls.label_edit,tr("&User Defined:"),this); rdcart_user_defined_label->setGeometry(10,325,120,21); rdcart_user_defined_label->setFont(button_font); rdcart_user_defined_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -498,14 +478,13 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Synchronous Scheduling Policy // - rdcart_syncronous_box=new QCheckBox(this,"rdcart_syncronous_box"); + rdcart_syncronous_box=new QCheckBox(this); rdcart_syncronous_box->setGeometry(135,351,15,15); connect(rdcart_syncronous_box,SIGNAL(toggled(bool)), this,SLOT(asyncronousToggledData(bool))); rdcart_syncronous_box->hide(); - QLabel *rdcart_syncronous_label=new QLabel(rdcart_syncronous_box, - tr("Execute Asynchronously"),this, - "rdcart_syncronous_label"); + QLabel *rdcart_syncronous_label= + new QLabel(rdcart_syncronous_box,tr("Execute Asynchronously"),this); rdcart_syncronous_label->setGeometry(155,351,200,19); rdcart_syncronous_label->setFont(button_font); rdcart_syncronous_label->setAlignment(AlignLeft|ShowPrefix); @@ -546,8 +525,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Notes Button // - rdcart_notes_button=new QPushButton(this,"rdcart_notes_button"); - // rdcart_notes_button->setGeometry(360,304,80,50); + rdcart_notes_button=new QPushButton(this); rdcart_notes_button->setGeometry(10,sizeHint().height()-60,80,50); rdcart_notes_button->setFont(button_font); rdcart_notes_button->setText(tr("&Edit\nNotes")); @@ -556,7 +534,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Script Button // - QPushButton *script_button=new QPushButton(this,"script_button"); + QPushButton *script_button=new QPushButton(this); script_button->setGeometry(450,304,80,50); script_button->setFont(button_font); script_button->setText(tr("&Edit\nScript")); @@ -583,7 +561,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, break; case RDCart::Macro: - rdcart_macro_cart=new MacroCart(rdcart_cart,this,"rdcart_macro_cart"); + rdcart_macro_cart=new MacroCart(rdcart_cart,this); rdcart_macro_cart-> setGeometry(0,378,rdcart_macro_cart->sizeHint().width(), rdcart_macro_cart->sizeHint().height()); @@ -606,7 +584,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); if(lib_cart_list_edit==NULL) ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); else @@ -619,7 +597,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); if(lib_cart_list_edit==NULL) cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); @@ -1108,12 +1086,13 @@ bool EditCart::ValidateLengths() void EditCart::schedCodesData() { if(lib_cart_list_edit==NULL) { - EditSchedulerCodes *dialog=new EditSchedulerCodes(&sched_codes,NULL,this,"dialog"); + EditSchedulerCodes *dialog=new EditSchedulerCodes(&sched_codes,NULL,this); dialog->exec(); delete dialog; } else { - EditSchedulerCodes *dialog=new EditSchedulerCodes(&add_codes,&remove_codes,this,"dialog"); + EditSchedulerCodes *dialog= + new EditSchedulerCodes(&add_codes,&remove_codes,this); dialog->exec(); delete dialog; } diff --git a/rdlibrary/edit_cart.h b/rdlibrary/edit_cart.h index 26aa3e48c..007241bc4 100644 --- a/rdlibrary/edit_cart.h +++ b/rdlibrary/edit_cart.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Cart // -// (C) Copyright 2002 Fred Gleason -// -// $Id: edit_cart.h,v 1.30.2.2 2014/01/13 23:02:42 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/edit_macro.cpp b/rdlibrary/edit_macro.cpp index 2fd57f98c..0da80f2ca 100644 --- a/rdlibrary/edit_macro.cpp +++ b/rdlibrary/edit_macro.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Macro // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_macro.cpp,v 1.11.8.2 2013/12/23 22:04:02 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,10 +27,8 @@ #include - -EditMacro::EditMacro(RDMacro *cmd,bool highlight, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditMacro::EditMacro(RDMacro *cmd,bool highlight,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -53,21 +49,21 @@ EditMacro::EditMacro(RDMacro *cmd,bool highlight, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Macro // edit_macro=cmd; - edit_macro_edit=new QLineEdit(this,"edit_macro_edit"); + edit_macro_edit=new QLineEdit(this); edit_macro_edit->setMaxLength(RD_RML_MAX_LENGTH-1); edit_macro_edit->setValidator(validator); // // Ok Button // - edit_ok_button=new QPushButton(this,"ok_button"); + edit_ok_button=new QPushButton(this); edit_ok_button->setDefault(true); edit_ok_button->setFont(button_font); edit_ok_button->setText(tr("&OK")); @@ -76,7 +72,7 @@ EditMacro::EditMacro(RDMacro *cmd,bool highlight, // // Cancel Button // - edit_cancel_button=new QPushButton(this,"cancel_button"); + edit_cancel_button=new QPushButton(this); edit_cancel_button->setFont(button_font); edit_cancel_button->setText(tr("&Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdlibrary/edit_macro.h b/rdlibrary/edit_macro.h index 5032e19da..a7bc6366b 100644 --- a/rdlibrary/edit_macro.h +++ b/rdlibrary/edit_macro.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Macro // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_macro.h,v 1.8.8.2 2013/12/23 22:04:03 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,12 +28,11 @@ #include #include - class EditMacro : public QDialog { Q_OBJECT public: - EditMacro(RDMacro *cmd,bool highlight,QWidget *parent=0,const char *name=0); + EditMacro(RDMacro *cmd,bool highlight,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/edit_notes.cpp b/rdlibrary/edit_notes.cpp index d3ba82f92..aa1af85cd 100644 --- a/rdlibrary/edit_notes.cpp +++ b/rdlibrary/edit_notes.cpp @@ -2,9 +2,7 @@ // // Edit Cart Notes. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: edit_notes.cpp,v 1.3.4.1 2014/03/19 22:12:59 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include -EditNotes::EditNotes(RDCart *cart,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditNotes::EditNotes(RDCart *cart,QWidget *parent) + : QDialog(parent,"",true) { notes_cart=cart; setCaption("RDLibrary - "+tr("Notes for cart")+ @@ -47,14 +45,14 @@ EditNotes::EditNotes(RDCart *cart,QWidget *parent,const char *name) // // Variable Name // - notes_view=new QTextView(this,"notes_view"); + notes_view=new QTextView(this); notes_view->setTextFormat(QTextView::PlainText); notes_view->setReadOnly(false); // // Ok Button // - notes_ok_button=new QPushButton(this,"notes_ok_button"); + notes_ok_button=new QPushButton(this); notes_ok_button->setDefault(true); notes_ok_button->setFont(button_font); notes_ok_button->setText(tr("&OK")); @@ -64,7 +62,7 @@ EditNotes::EditNotes(RDCart *cart,QWidget *parent,const char *name) // // Cancel Button // - notes_cancel_button=new QPushButton(this,"notes_cancel_button"); + notes_cancel_button=new QPushButton(this); notes_cancel_button->setFont(button_font); notes_cancel_button->setText(tr("&Cancel")); connect(notes_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdlibrary/edit_notes.h b/rdlibrary/edit_notes.h index b1d61f227..66bcec70f 100644 --- a/rdlibrary/edit_notes.h +++ b/rdlibrary/edit_notes.h @@ -2,9 +2,7 @@ // // Edit Cart Notes. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: edit_notes.h,v 1.2 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class EditNotes : public QDialog { Q_OBJECT public: - EditNotes(RDCart *cart,QWidget *parent=0,const char *name=0); + EditNotes(RDCart *cart,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/edit_schedulercodes.cpp b/rdlibrary/edit_schedulercodes.cpp index 18a614443..0166aad93 100644 --- a/rdlibrary/edit_schedulercodes.cpp +++ b/rdlibrary/edit_schedulercodes.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -30,8 +28,9 @@ #include -EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes,QString *remove_codes,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes, + QString *remove_codes,QWidget *parent) + : QDialog(parent,"",true) { edit_sched_codes=sched_codes; edit_remove_codes=remove_codes; @@ -69,7 +68,7 @@ EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes,QString *remove_code // // Services Selector // - codes_sel=new RDListSelector(this,"codes_sel"); + codes_sel=new RDListSelector(this); codes_sel->setFont(listfont); codes_sel->setGeometry(10,10,380,200); codes_sel->sourceSetLabel(tr("Available Codes")); @@ -79,7 +78,7 @@ EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes,QString *remove_code else { codes_sel->destSetLabel(tr("ASSIGN to Carts")); - remove_codes_sel=new RDListSelector(this,"codes_sel"); + remove_codes_sel=new RDListSelector(this); remove_codes_sel->setFont(listfont); remove_codes_sel->setGeometry(sizeHint().width()+10,10,380,200); remove_codes_sel->sourceSetLabel(tr("Available Codes")); @@ -89,7 +88,7 @@ EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes,QString *remove_code // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); if(edit_remove_codes==NULL) ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); else @@ -102,7 +101,7 @@ EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes,QString *remove_code // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); if(edit_remove_codes==NULL) cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); diff --git a/rdlibrary/edit_schedulercodes.h b/rdlibrary/edit_schedulercodes.h index 22b9f281d..22fb45112 100644 --- a/rdlibrary/edit_schedulercodes.h +++ b/rdlibrary/edit_schedulercodes.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -33,7 +31,8 @@ class EditSchedulerCodes : public QDialog { Q_OBJECT public: - EditSchedulerCodes(QString *sched_codes,QString *remove_codes,QWidget *parent=0,const char *name=0); + EditSchedulerCodes(QString *sched_codes,QString *remove_codes, + QWidget *parent=0); ~EditSchedulerCodes(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/filter.cpp b/rdlibrary/filter.cpp index c308bff9c..734446b9f 100644 --- a/rdlibrary/filter.cpp +++ b/rdlibrary/filter.cpp @@ -2,9 +2,7 @@ // // Set Filter widget for RDLibrary. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: filter.cpp,v 1.11 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,9 +32,8 @@ #include - -Filter::Filter(QString *filter,QWidget *parent,const char *name) - : QDialog(parent,name,true) +Filter::Filter(QString *filter,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -60,7 +57,7 @@ Filter::Filter(QString *filter,QWidget *parent,const char *name) // // OK Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(15,40,100,55); ok_button->setFont(button_font); ok_button->setText(tr("&OK")); @@ -70,7 +67,7 @@ Filter::Filter(QString *filter,QWidget *parent,const char *name) // // Clear Button // - QPushButton *clear_button=new QPushButton(this,"clear_button"); + QPushButton *clear_button=new QPushButton(this); clear_button->setGeometry(125,40,100,55); clear_button->setFont(button_font); clear_button->setText(tr("C&lear")); @@ -79,7 +76,7 @@ Filter::Filter(QString *filter,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(235,40,100,55); cancel_button->setFont(button_font); cancel_button->setText(tr("&Cancel")); @@ -88,14 +85,13 @@ Filter::Filter(QString *filter,QWidget *parent,const char *name) // // Filter Text // - filter_text_edit=new QLineEdit(this,"filter_text_edit"); + filter_text_edit=new QLineEdit(this); filter_text_edit->setGeometry(65,10,275,19); filter_text_edit->setMaxLength(16); filter_text_edit->setFocus(); filter_text_edit->setFont(QFont("Helvetica",14,QFont::Normal)); filter_text_edit->setText(*filter); - QLabel *filter_text_label=new QLabel(filter_text_edit,tr("&Filter:"),this, - "filter_text_label"); + QLabel *filter_text_label=new QLabel(filter_text_edit,tr("&Filter:"),this); filter_text_label->setGeometry(10,12,50,19); filter_text_label->setFont(label_font); filter_text_label->setAlignment(AlignRight|ShowPrefix); diff --git a/rdlibrary/filter.h b/rdlibrary/filter.h index 44864748f..598212490 100644 --- a/rdlibrary/filter.h +++ b/rdlibrary/filter.h @@ -2,9 +2,7 @@ // // Set Filter Widget for RDLibrary. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: filter.h,v 1.5 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,13 +27,11 @@ #include #include - - class Filter : public QDialog { Q_OBJECT public: - Filter(QString *filter,QWidget *parent=0,const char *name=0); + Filter(QString *filter,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/globals.h b/rdlibrary/globals.h index b5996642b..43c3a66cd 100644 --- a/rdlibrary/globals.h +++ b/rdlibrary/globals.h @@ -2,9 +2,7 @@ // // Global Resources for RDLibrary. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: globals.h,v 1.17 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef GLOBALS_H #define GLOBALS_H @@ -49,4 +46,5 @@ extern RDSystem *lib_system; extern bool import_running; extern bool ripper_running; -#endif + +#endif // GLOBALS_H diff --git a/rdlibrary/lib_listview.cpp b/rdlibrary/lib_listview.cpp index 39c152c23..de51887b6 100644 --- a/rdlibrary/lib_listview.cpp +++ b/rdlibrary/lib_listview.cpp @@ -2,9 +2,7 @@ // // A drag & drop QListView widget for Rivendell's RDLibrary // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: lib_listview.cpp,v 1.1.2.3.2.1 2014/05/20 14:23:12 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include #include -LibListView::LibListView(QWidget *parent,const char *name) - : RDListView(parent,name) +LibListView::LibListView(QWidget *parent) + : RDListView(parent) { list_move_count=-1; } diff --git a/rdlibrary/lib_listview.h b/rdlibrary/lib_listview.h index de776bca3..d19c35d66 100644 --- a/rdlibrary/lib_listview.h +++ b/rdlibrary/lib_listview.h @@ -2,9 +2,7 @@ // // A drag & drop QListView widget for Rivendell's RDLibrary // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: lib_listview.h,v 1.1.2.2 2014/01/08 00:00:51 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,7 @@ class LibListView : public RDListView { Q_OBJECT public: - LibListView(QWidget *parent,const char *name=0); + LibListView(QWidget *parent); protected: void contentsMousePressEvent(QMouseEvent *e); diff --git a/rdlibrary/list_reports.cpp b/rdlibrary/list_reports.cpp index e1d7071b9..93d561288 100644 --- a/rdlibrary/list_reports.cpp +++ b/rdlibrary/list_reports.cpp @@ -1,10 +1,8 @@ // list_reports.cpp // -// Add a Rivendell Service +// List RDLibrary Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.cpp,v 1.11.4.4.2.1 2014/03/19 22:12:59 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,11 +31,10 @@ #include #include - ListReports::ListReports(const QString &filter,const QString &type_filter, const QString &group,const QString &schedcode, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { list_filter=filter; list_type_filter=type_filter; @@ -63,7 +60,7 @@ ListReports::ListReports(const QString &filter,const QString &type_filter, // // Reports List // - list_reports_box=new QComboBox(this,"list_reports_box"); + list_reports_box=new QComboBox(this); list_reports_box->setGeometry(50,10,sizeHint().width()-60,19); list_reports_box->insertItem(tr("Cart Report")); list_reports_box->insertItem(tr("Cut Report")); @@ -93,7 +90,7 @@ ListReports::ListReports(const QString &filter,const QString &type_filter, // // Generate Button // - QPushButton *generate_button=new QPushButton(this,"generate_button"); + QPushButton *generate_button=new QPushButton(this); generate_button-> setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); generate_button->setDefault(true); @@ -104,7 +101,7 @@ ListReports::ListReports(const QString &filter,const QString &type_filter, // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); + QPushButton *close_button=new QPushButton(this); close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); close_button->setFont(font); diff --git a/rdlibrary/list_reports.h b/rdlibrary/list_reports.h index c519b2118..617264f75 100644 --- a/rdlibrary/list_reports.h +++ b/rdlibrary/list_reports.h @@ -2,9 +2,7 @@ // // List and Generate RDLibrary Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.h,v 1.6.4.1 2013/09/12 23:26:10 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,8 +35,7 @@ class ListReports : public QDialog Q_OBJECT public: ListReports(const QString &filter,const QString &type_filter, - const QString &group,const QString &schedcode, - QWidget *parent=0,const char *name=0); + const QString &group,const QString &schedcode,QWidget *parent=0); ~ListReports(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/macro_cart.cpp b/rdlibrary/macro_cart.cpp index 0585bc107..a21ec2a3d 100644 --- a/rdlibrary/macro_cart.cpp +++ b/rdlibrary/macro_cart.cpp @@ -2,9 +2,7 @@ // // The macro cart editor for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: macro_cart.cpp,v 1.13.8.2 2013/12/23 21:51:44 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ #include -MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) - : QWidget(parent,name) +MacroCart::MacroCart(RDCart *cart,QWidget *parent) + : QWidget(parent) { rdcart_length=0; rdcart_cart=cart; @@ -64,7 +62,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Add Macro Button // - rdcart_add_button=new QPushButton(this,"add_macro_button"); + rdcart_add_button=new QPushButton(this); rdcart_add_button->setGeometry(10,0,80,50); rdcart_add_button->setFont(button_font); rdcart_add_button->setText(tr("Add")); @@ -73,7 +71,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Delete Macro Button // - rdcart_delete_button=new QPushButton(this,"delete_macro_button"); + rdcart_delete_button=new QPushButton(this); rdcart_delete_button->setGeometry(10,60,80,50); rdcart_delete_button->setFont(button_font); rdcart_delete_button->setText(tr("Delete")); @@ -82,7 +80,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Copy Macro Button // - rdcart_copy_button=new QPushButton(this,"copy_macro_button"); + rdcart_copy_button=new QPushButton(this); rdcart_copy_button->setGeometry(10,120,80,50); rdcart_copy_button->setFont(button_font); rdcart_copy_button->setText(tr("Copy")); @@ -91,7 +89,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Paste Macro Button // - paste_macro_button=new QPushButton(this,"paste_macro_button"); + paste_macro_button=new QPushButton(this); paste_macro_button->setGeometry(10,180,80,50); paste_macro_button->setFont(button_font); paste_macro_button->setText(tr("Paste")); @@ -101,11 +99,10 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Cart Macro List // - rdcart_events=new RDMacroEvent(rdstation_conf->address(),rdripc, - this,"rdcart_events"); + rdcart_events=new RDMacroEvent(rdstation_conf->address(),rdripc,this); rdcart_events->load(rdcart_cart->macros()); - rdcart_macro_list=new QListView(this,"rdcart_macro_list"); + rdcart_macro_list=new QListView(this); rdcart_macro_list->setGeometry(100,0,430,sizeHint().height()); rdcart_macro_list->setAllColumnsShowFocus(true); rdcart_macro_list->setItemMargin(5); @@ -121,8 +118,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) rdcart_macro_list->addColumn(tr("COMMAND")); rdcart_macro_list->setColumnAlignment(1,Qt::AlignLeft); - rdcart_macro_list_label=new QLabel(rdcart_macro_list,tr("Macros"), - this,"rdcartmacro_list_label"); + rdcart_macro_list_label=new QLabel(rdcart_macro_list,tr("Macros"),this); rdcart_macro_list_label->setGeometry(105,345,430,22); rdcart_macro_list_label->setFont(QFont("Helvetica",16,QFont::Bold)); @@ -131,7 +127,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Edit Macro Button // - rdcart_edit_button=new QPushButton(this,"edit_edit_button"); + rdcart_edit_button=new QPushButton(this); rdcart_edit_button->setGeometry(550,0,80,50); rdcart_edit_button->setFont(button_font); rdcart_edit_button->setText(tr("Edit")); @@ -140,7 +136,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Run Line Button // - rdcart_runline_button=new QPushButton(this,"run_macro_button"); + rdcart_runline_button=new QPushButton(this); rdcart_runline_button->setGeometry(550,120,80,50); rdcart_runline_button->setFont(button_font); rdcart_runline_button->setText(tr("Run\nLine")); @@ -150,7 +146,7 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent,const char *name) // // Run Cart Button // - rdcart_runcart_button=new QPushButton(this,"run_macro_button"); + rdcart_runcart_button=new QPushButton(this); rdcart_runcart_button->setGeometry(550,180,80,50); rdcart_runcart_button->setFont(button_font); rdcart_runcart_button->setText(tr("Run\nCart")); @@ -206,7 +202,7 @@ void MacroCart::addMacroData() else { line=item->text(0).toUInt()-1; } - EditMacro *edit=new EditMacro(&cmd,true,this,"edit_macro"); + EditMacro *edit=new EditMacro(&cmd,true,this); if(edit->exec()!=-1) { AddLine(line,&cmd); UpdateLength(); @@ -266,7 +262,7 @@ void MacroCart::editMacroData() return; } unsigned line=item->text(0).toUInt()-1; - EditMacro *edit=new EditMacro(rdcart_events->command(line),false,this,"edit"); + EditMacro *edit=new EditMacro(rdcart_events->command(line),false,this); if(edit->exec()!=-1) { RefreshLine(item); UpdateLength(); diff --git a/rdlibrary/macro_cart.h b/rdlibrary/macro_cart.h index b99d0652a..0a5f05bc9 100644 --- a/rdlibrary/macro_cart.h +++ b/rdlibrary/macro_cart.h @@ -2,9 +2,7 @@ // // The macro cart editor for RDLibrary. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: macro_cart.h,v 1.10 2010/07/29 19:32:36 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,12 +40,11 @@ #include #include - class MacroCart : public QWidget { Q_OBJECT public: - MacroCart(RDCart *cart,QWidget *parent=0,const char *name=0); + MacroCart(RDCart *cart,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; unsigned length(); diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 93e92c169..e01aeaf4c 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -2,9 +2,7 @@ // // The Library Utility for Rivendell. // -// (C) Copyright 2002-2010 Fred Gleason -// -// $Id: rdlibrary.cpp,v 1.117.4.18.2.2 2014/05/22 14:30:45 cvs Exp $ +// (C) Copyright 2002-2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -96,8 +94,8 @@ void SigHandler(int signo); #include "../icons/rivendell-22x22.xpm" -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { unsigned schema=0; bool skip_db_check=false; @@ -225,7 +223,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // CAE Connection // - rdcae=new RDCae(rdstation_conf,lib_config,parent,name); + rdcae=new RDCae(rdstation_conf,lib_config,parent); rdcae->connectHost(); // @@ -255,7 +253,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Filter Search Button // - lib_search_button=new QPushButton(tr("&Search"),this,"search_button"); + lib_search_button=new QPushButton(tr("&Search"),this); lib_search_button->setFont(button_font); connect(lib_search_button,SIGNAL(clicked()),this,SLOT(searchClickedData())); switch(lib_filter_mode) { @@ -270,7 +268,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Filter Clear Button // - lib_clear_button=new QPushButton(tr("&Clear"),this,"clear_button"); + lib_clear_button=new QPushButton(tr("&Clear"),this); lib_clear_button->setFont(button_font); lib_clear_button->setDisabled(true); connect(lib_clear_button,SIGNAL(clicked()),this,SLOT(clearClickedData())); @@ -278,10 +276,9 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Group Filter // - lib_group_box=new QComboBox(this,"lib_group_box"); + lib_group_box=new QComboBox(this); lib_group_box->setFont(default_font); - lib_group_label=new QLabel(lib_group_box,tr("Group:"), - this,"lib_group_label"); + lib_group_label=new QLabel(lib_group_box,tr("Group:"),this); lib_group_label->setFont(button_font); lib_group_label->setAlignment(AlignVCenter|AlignRight); connect(lib_group_box,SIGNAL(activated(const QString &)), @@ -290,10 +287,9 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Scheduler Codes Filter // - lib_codes_box=new QComboBox(this,"lib_codes_box"); + lib_codes_box=new QComboBox(this); lib_codes_box->setFont(default_font); - lib_codes_label=new QLabel(lib_codes_box,tr("Scheduler Code:"), - this,"lib_codes_label"); + lib_codes_label=new QLabel(lib_codes_box,tr("Scheduler Code:"),this); lib_codes_label->setFont(button_font); lib_codes_label->setAlignment(AlignVCenter|AlignRight); connect(lib_codes_box,SIGNAL(activated(const QString &)), @@ -318,10 +314,9 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Show Audio Carts Checkbox // - lib_showaudio_box=new QCheckBox(this,"lib_showaudio_box"); + lib_showaudio_box=new QCheckBox(this); lib_showaudio_box->setChecked(true); - lib_showaudio_label=new QLabel(lib_showaudio_box,tr("Show Audio Carts"), - this,"lib_showaudio_label"); + lib_showaudio_label=new QLabel(lib_showaudio_box,tr("Show Audio Carts"),this); lib_showaudio_label->setFont(button_font); lib_showaudio_label->setAlignment(AlignVCenter|AlignLeft); connect(lib_showaudio_box,SIGNAL(stateChanged(int)), @@ -330,10 +325,9 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Show Macro Carts Checkbox // - lib_showmacro_box=new QCheckBox(this,"lib_showmacro_box"); + lib_showmacro_box=new QCheckBox(this); lib_showmacro_box->setChecked(true); - lib_showmacro_label=new QLabel(lib_showmacro_box,tr("Show Macro Carts"), - this,"lib_showmacro_label"); + lib_showmacro_label=new QLabel(lib_showmacro_box,tr("Show Macro Carts"),this); lib_showmacro_label->setFont(button_font); lib_showmacro_label->setAlignment(AlignVCenter|AlignLeft); connect(lib_showmacro_box,SIGNAL(stateChanged(int)), @@ -342,22 +336,21 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Show Cart Notes Checkbox // - lib_shownotes_box=new QCheckBox(this,"lib_shownotes_box"); + lib_shownotes_box=new QCheckBox(this); lib_shownotes_box->setChecked(true); - lib_shownotes_label=new QLabel(lib_shownotes_box,tr("Show Note Bubbles"), - this,"lib_shownotes_label"); + lib_shownotes_label= + new QLabel(lib_shownotes_box,tr("Show Note Bubbles"),this); lib_shownotes_label->setFont(button_font); lib_shownotes_label->setAlignment(AlignVCenter|AlignLeft); // // Show Matches Checkbox // - lib_showmatches_box=new QCheckBox(this,"lib_showmatches_box"); + lib_showmatches_box=new QCheckBox(this); lib_showmatches_label= new QLabel(lib_showmatches_box,tr("Show Only First ")+ QString().sprintf("%d",RD_LIMITED_CART_SEARCH_QUANTITY)+ - tr(" Matches"), - this,"lib_showmatches_label"); + tr(" Matches"),this); lib_showmatches_label->setFont(button_font); lib_showmatches_label->setAlignment(AlignVCenter|AlignLeft); connect(lib_showmatches_box,SIGNAL(stateChanged(int)), @@ -366,7 +359,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Cart List // - lib_cart_list=new LibListView(this,"lib_cart_list"); + lib_cart_list=new LibListView(this); lib_cart_list->setFont(default_font); lib_cart_list->setAllColumnsShowFocus(true); lib_cart_list->setItemMargin(5); @@ -439,7 +432,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Add Button // - lib_add_button=new QPushButton(this,"lib_add_button"); + lib_add_button=new QPushButton(this); lib_add_button->setFont(button_font); lib_add_button->setText(tr("&Add")); connect(lib_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -447,7 +440,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Edit Button // - lib_edit_button=new QPushButton(this,"lib_edit_button"); + lib_edit_button=new QPushButton(this); lib_edit_button->setFont(button_font); lib_edit_button->setText(tr("&Edit")); connect(lib_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -455,7 +448,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Delete Button // - lib_delete_button=new QPushButton(this,"lib_delete_button"); + lib_delete_button=new QPushButton(this); lib_delete_button->setFont(button_font); lib_delete_button->setText(tr("&Delete")); connect(lib_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -464,13 +457,12 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // Disk Gauge // disk_gauge=new DiskGauge(lib_system->sampleRate(), - rdlibrary_conf->defaultChannels(), - this,"disk_gauge"); + rdlibrary_conf->defaultChannels(),this); // // Rip Button // - lib_rip_button=new QPushButton(this,"lib_rip_button"); + lib_rip_button=new QPushButton(this); lib_rip_button->setFont(button_font); lib_rip_button->setText(tr("&Rip\nCD")); connect(lib_rip_button,SIGNAL(clicked()),this,SLOT(ripData())); @@ -478,7 +470,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Reports Button // - lib_reports_button=new QPushButton(this,"lib_reports_button"); + lib_reports_button=new QPushButton(this); lib_reports_button->setFont(button_font); lib_reports_button->setText(tr("Re&ports")); connect(lib_reports_button,SIGNAL(clicked()),this,SLOT(reportsData())); @@ -486,7 +478,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Close Button // - lib_close_button=new QPushButton(this,"lib_close_button"); + lib_close_button=new QPushButton(this); lib_close_button->setFont(button_font); lib_close_button->setText(tr("&Close")); connect(lib_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); @@ -636,8 +628,7 @@ void MainWidget::addData() LockUser(); RDAddCart *add_cart=new RDAddCart(&lib_default_group,&cart_type,&cart_title, - lib_user->name(),lib_system, - this,"add_cart"); + lib_user->name(),lib_system,this); if((cart_num=add_cart->exec())<0) { delete add_cart; UnlockUser(); @@ -832,7 +823,7 @@ void MainWidget::ripData() QString group=lib_group_box->currentText(); QString schedcode=lib_codes_box->currentText(); DiskRipper *dialog=new DiskRipper(&lib_filter_text,&group,&schedcode, - profile_ripping,this,"disk_ripper"); + profile_ripping,this); if(dialog->exec()==0) { for(int i=0;icount();i++) { if(lib_group_box->text(i)==*group) { @@ -855,7 +846,7 @@ void MainWidget::reportsData() ListReports *lr= new ListReports(lib_filter_edit->text(),GetTypeFilter(), lib_group_box->currentText(),lib_codes_box->currentText(), - this,"lr"); + this); lr->exec(); delete lr; UnlockUser(); @@ -1512,7 +1503,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->show(); return a.exec(); diff --git a/rdlibrary/rdlibrary.h b/rdlibrary/rdlibrary.h index a15beb83d..87ba89e6a 100644 --- a/rdlibrary/rdlibrary.h +++ b/rdlibrary/rdlibrary.h @@ -2,9 +2,7 @@ // // The Production Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlibrary.h,v 1.45.8.4 2014/01/21 19:12:42 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDLIBRARY_H #define RDLIBRARY_H @@ -68,7 +65,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/rdlibrary.pro b/rdlibrary/rdlibrary.pro index 273238b77..d56a99d83 100644 --- a/rdlibrary/rdlibrary.pro +++ b/rdlibrary/rdlibrary.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDLibrary. # -# (C) Copyright 2003-2005 Fred Gleason -# -# $Id: rdlibrary.pro,v 1.11.2.3 2014/01/08 02:08:38 cvs Exp $ +# (C) Copyright 2003-2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/record_cut.cpp b/rdlibrary/record_cut.cpp index 614869eb1..5efb6dc02 100644 --- a/rdlibrary/record_cut.cpp +++ b/rdlibrary/record_cut.cpp @@ -2,9 +2,7 @@ // // Record a Rivendell Cut // -// (C) Copyright 2002-2004,2014 Fred Gleason -// -// $Id: record_cut.cpp,v 1.90.6.5 2014/01/09 01:11:14 cvs Exp $ +// (C) Copyright 2002-2004,2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,8 +36,8 @@ #include RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { bool valid; bool is_track=cart->owner().isEmpty(); @@ -129,12 +127,11 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Description // - cut_description_edit=new QLineEdit(this,"cut_description_edit"); + cut_description_edit=new QLineEdit(this); cut_description_edit->setGeometry(10,30,355,19); cut_description_edit->setMaxLength(64); - QLabel *cut_description_label=new QLabel(cut_description_edit, - tr("&Description"),this, - "cut_description_label"); + QLabel *cut_description_label= + new QLabel(cut_description_edit,tr("&Description"),this); cut_description_label->setGeometry(15,11,120,19); cut_description_label->setFont(font); cut_description_label->setAlignment(AlignLeft|ShowPrefix); @@ -142,11 +139,10 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Outcue // - cut_outcue_edit=new QLineEdit(this,"cut_outcue_edit"); + cut_outcue_edit=new QLineEdit(this); cut_outcue_edit->setGeometry(10,75,355,19); cut_outcue_edit->setMaxLength(64); - QLabel *cut_outcue_label=new QLabel(cut_outcue_edit,tr("&Outcue"),this, - "cut_outcue_label"); + QLabel *cut_outcue_label=new QLabel(cut_outcue_edit,tr("&Outcue"),this); cut_outcue_label->setGeometry(15,56,120,19); cut_outcue_label->setFont(font); cut_outcue_label->setAlignment(AlignLeft|ShowPrefix); @@ -154,11 +150,10 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut ISCI Code // - cut_isci_edit=new QLineEdit(this,"cut_isci_edit"); + cut_isci_edit=new QLineEdit(this); cut_isci_edit->setGeometry(10,120,355,19); cut_isci_edit->setMaxLength(32); - QLabel *cut_isci_label=new QLabel(cut_isci_edit,tr("&ISCI Code"),this, - "cut_isci_label"); + QLabel *cut_isci_label=new QLabel(cut_isci_edit,tr("&ISCI Code"),this); cut_isci_label->setGeometry(15,101,120,19); cut_isci_label->setFont(font); cut_isci_label->setAlignment(AlignLeft|ShowPrefix); @@ -166,12 +161,11 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Origin // - cut_origin_edit=new QLineEdit(this,"cut_origin_edit"); + cut_origin_edit=new QLineEdit(this); cut_origin_edit->setGeometry(10,165,190,19); cut_origin_edit->setReadOnly(true); cut_origin_edit->setMaxLength(64); - QLabel *cut_origin_label=new QLabel(cut_origin_edit,tr("Origin"),this, - "cut_origin_label"); + QLabel *cut_origin_label=new QLabel(cut_origin_edit,tr("Origin"),this); cut_origin_label->setGeometry(15,146,120,19); cut_origin_label->setFont(font); cut_origin_label->setAlignment(AlignLeft|ShowPrefix); @@ -179,11 +173,10 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut ISRC // - cut_isrc_edit=new QLineEdit(this,"cut_isrc_edit"); + cut_isrc_edit=new QLineEdit(this); cut_isrc_edit->setGeometry(220,165,145,19); cut_isrc_edit->setMaxLength(64); - QLabel *cut_isrc_label=new QLabel(cut_isrc_edit,tr("ISRC"),this, - "cut_isrc_label"); + QLabel *cut_isrc_label=new QLabel(cut_isrc_edit,tr("ISRC"),this); cut_isrc_label->setGeometry(225,146,120,19); cut_isrc_label->setFont(font); cut_isrc_label->setAlignment(AlignLeft|ShowPrefix); @@ -191,11 +184,10 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Weight // - cut_weight_box=new QSpinBox(this,"cut_weight_box"); + cut_weight_box=new QSpinBox(this); cut_weight_box->setGeometry(10,210,61,19); cut_weight_box->setRange(0,100); - QLabel *cut_weight_label=new QLabel(cut_weight_box,tr("Weight"),this, - "cut_weight_label"); + QLabel *cut_weight_label=new QLabel(cut_weight_box,tr("Weight"),this); cut_weight_label->setGeometry(10,191,61,19); cut_weight_label->setFont(font); cut_weight_label->setAlignment(AlignHCenter|ShowPrefix); @@ -203,12 +195,12 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Play Date Time // - cut_playdate_edit=new QLineEdit(this,"cut_playdate_edit"); + cut_playdate_edit=new QLineEdit(this); cut_playdate_edit->setGeometry(100,210,150,19); cut_playdate_edit->setReadOnly(true); cut_playdate_edit->setMaxLength(64); - QLabel *cut_playdate_label=new QLabel(cut_playdate_edit,tr("Last Played"), - this,"cut_playdate_label"); + QLabel *cut_playdate_label= + new QLabel(cut_playdate_edit,tr("Last Played"),this); cut_playdate_label->setGeometry(105,191,120,19); cut_playdate_label->setFont(font); cut_playdate_label->setAlignment(AlignLeft|ShowPrefix); @@ -216,14 +208,13 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Play Counter // - cut_playcounter_edit=new QLineEdit(this,"cut_playcounter_edit"); + cut_playcounter_edit=new QLineEdit(this); cut_playcounter_edit->setGeometry(285,210,80,19); cut_playcounter_edit->setAlignment(AlignRight); cut_playcounter_edit->setReadOnly(true); cut_playcounter_edit->setMaxLength(64); QLabel *cut_playcounter_label= - new QLabel(cut_playcounter_edit,tr("# of Plays"), - this,"cut_playcounter_label"); + new QLabel(cut_playcounter_edit,tr("# of Plays"),this); cut_playcounter_label->setGeometry(290,191,120,19); cut_playcounter_label->setFont(font); cut_playcounter_label->setAlignment(AlignLeft|ShowPrefix); @@ -231,10 +222,9 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Evergreen Checkbox // - rec_evergreen_box=new QCheckBox(this,"rec_evergreen_box"); + rec_evergreen_box=new QCheckBox(this); rec_evergreen_box->setGeometry(10,245,15,15); - rec_evergreen_label=new QLabel(rec_evergreen_box,tr("Cut is EVERGREEN"), - this,"rec_evergreen_label"); + rec_evergreen_label=new QLabel(rec_evergreen_box,tr("Cut is EVERGREEN"),this); rec_evergreen_label->setGeometry(30,245,sizeHint().width()-40,15); rec_evergreen_label->setFont(font); rec_evergreen_label->setAlignment(AlignVCenter|AlignLeft); @@ -244,35 +234,31 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Cut Air Date Times // - cut_killdatetime_label=new QLabel(tr("Air Date/Time"), - this,"cut_killdatetime_label"); + cut_killdatetime_label=new QLabel(tr("Air Date/Time"),this); cut_killdatetime_label->setGeometry(50,268,100,19); cut_killdatetime_label->setAlignment(Qt::AlignHCenter); cut_killdatetime_label->setFont(font); - QButtonGroup *button_group=new QButtonGroup(this,"air_dates_group"); + QButtonGroup *button_group=new QButtonGroup(this); button_group->hide(); connect(button_group,SIGNAL(clicked(int)),this,SLOT(airDateButtonData(int))); cut_startdatetime_enable_button=new QRadioButton(tr("Enabled"),this, "air_date_enabled_button"); cut_startdatetime_enable_button->setGeometry(40,290,100,20); button_group->insert(cut_startdatetime_enable_button,true); - cut_startdatetime_disable_button=new QRadioButton(tr("Disabled"),this, - "air_date_disabled_button"); + cut_startdatetime_disable_button=new QRadioButton(tr("Disabled"),this); cut_startdatetime_disable_button->setGeometry(40,310,100,20); button_group->insert(cut_startdatetime_disable_button,false); - cut_startdatetime_edit=new QDateTimeEdit(this,"cut_startdatetime_edit"); + cut_startdatetime_edit=new QDateTimeEdit(this); cut_startdatetime_edit->setGeometry(165,289,170,19); - cut_startdatetime_label=new QLabel(cut_startdatetime_edit,tr("&Start"),this, - "cut_startdatetime_label"); + cut_startdatetime_label=new QLabel(cut_startdatetime_edit,tr("&Start"),this); cut_startdatetime_label->setGeometry(120,293,40,12); cut_startdatetime_label->setFont(small_font); cut_startdatetime_label->setAlignment(AlignRight|ShowPrefix); - cut_enddatetime_edit=new QDateTimeEdit(this,"cut_enddatetime_edit"); + cut_enddatetime_edit=new QDateTimeEdit(this); cut_enddatetime_edit->setGeometry(165,309,170,19); - cut_enddatetime_label=new QLabel(cut_enddatetime_edit,tr("End"),this, - "cut_enddatetime_label"); + cut_enddatetime_label=new QLabel(cut_enddatetime_edit,tr("End"),this); cut_enddatetime_label->setGeometry(120,313,40,12); cut_enddatetime_label->setFont(small_font); cut_enddatetime_label->setAlignment(AlignRight|ShowPrefix); @@ -284,30 +270,26 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, cut_daypart_label->setGeometry(50,348,65,19); cut_daypart_label->setAlignment(Qt::AlignHCenter); cut_daypart_label->setFont(font); - button_group=new QButtonGroup(this,"daypart_group"); + button_group=new QButtonGroup(this); button_group->hide(); connect(button_group,SIGNAL(clicked(int)),this,SLOT(daypartButtonData(int))); - cut_starttime_enable_button=new QRadioButton(tr("Enabled"),this, - "daypart_enabled_button"); + cut_starttime_enable_button=new QRadioButton(tr("Enabled"),this); cut_starttime_enable_button->setGeometry(57,370,100,20); button_group->insert(cut_starttime_enable_button,true); - cut_starttime_disable_button=new QRadioButton(tr("Disabled"),this, - "daypart_disabled_button"); + cut_starttime_disable_button=new QRadioButton(tr("Disabled"),this); cut_starttime_disable_button->setGeometry(57,390,100,20); button_group->insert(cut_starttime_disable_button,false); - cut_starttime_edit=new RDTimeEdit(this,"cut_starttime_edit"); + cut_starttime_edit=new RDTimeEdit(this); cut_starttime_edit->setGeometry(222,369,90,19); - cut_starttime_label=new QLabel(cut_starttime_edit,tr("&Start Time"),this, - "cut_starttime_label"); + cut_starttime_label=new QLabel(cut_starttime_edit,tr("&Start Time"),this); cut_starttime_label->setGeometry(137,373,80,12); cut_starttime_label->setFont(small_font); cut_starttime_label->setAlignment(AlignRight|ShowPrefix); - cut_endtime_edit=new RDTimeEdit(this,"cut_endtime_edit"); + cut_endtime_edit=new RDTimeEdit(this); cut_endtime_edit->setGeometry(222,389,90,19); - cut_endtime_label=new QLabel(cut_endtime_edit,tr("End Time"),this, - "cut_endtime_label"); + cut_endtime_label=new QLabel(cut_endtime_edit,tr("End Time"),this); cut_endtime_label->setGeometry(137,393,80,12); cut_endtime_label->setFont(small_font); cut_endtime_label->setAlignment(AlignRight|ShowPrefix); @@ -319,7 +301,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, rec_dayofweek_label->setGeometry(50,428,125,19); rec_dayofweek_label->setAlignment(Qt::AlignHCenter); rec_dayofweek_label->setFont(font); - rec_weekpart_button[0]=new QCheckBox(this,"cut_weekpart_button[0]"); + rec_weekpart_button[0]=new QCheckBox(this); rec_weekpart_button[0]->setGeometry(40,447,15,15); rec_weekpart_label[0]=new QLabel(rec_weekpart_button[0],tr("Monday"), this,"rec_weekpart_label[0]"); @@ -327,60 +309,54 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, rec_weekpart_label[0]->setFont(day_font); rec_weekpart_label[0]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[1]=new QCheckBox(this,"cut_weekpart_button[1]"); + rec_weekpart_button[1]=new QCheckBox(this); rec_weekpart_button[1]->setGeometry(120,447,15,15); - rec_weekpart_label[1]=new QLabel(rec_weekpart_button[1],tr("Tuesday"), - this,"rec_weekpart_label[0]"); + rec_weekpart_label[1]=new QLabel(rec_weekpart_button[1],tr("Tuesday"),this); rec_weekpart_label[1]->setGeometry(142,445,80,20); rec_weekpart_label[1]->setFont(day_font); rec_weekpart_label[1]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[2]=new QCheckBox(this,"cut_weekpart_button[2]"); + rec_weekpart_button[2]=new QCheckBox(this); rec_weekpart_button[2]->setGeometry(200,447,15,15); - rec_weekpart_label[2]=new QLabel(rec_weekpart_button[2],tr("Wednesday"), - this,"rec_weekpart_label[0]"); + rec_weekpart_label[2]=new QLabel(rec_weekpart_button[2],tr("Wednesday"),this); rec_weekpart_label[2]->setGeometry(222,445,80,20); rec_weekpart_label[2]->setFont(day_font); rec_weekpart_label[2]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[3]=new QCheckBox(this,"cut_weekpart_button[3]"); + rec_weekpart_button[3]=new QCheckBox(this); rec_weekpart_button[3]->setGeometry(80,467,15,15); - rec_weekpart_label[3]=new QLabel(rec_weekpart_button[3],tr("Thursday"), - this,"rec_weekpart_label[3]"); + rec_weekpart_label[3]=new QLabel(rec_weekpart_button[3],tr("Thursday"),this); rec_weekpart_label[3]->setGeometry(102,465,80,20); rec_weekpart_label[3]->setFont(day_font); rec_weekpart_label[3]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[4]=new QCheckBox(this,"cut_weekpart_button[4]"); + rec_weekpart_button[4]=new QCheckBox(this); rec_weekpart_button[4]->setGeometry(180,467,15,15); - rec_weekpart_label[4]=new QLabel(rec_weekpart_button[4],tr("Friday"), - this,"rec_weekpart_label[4]"); + rec_weekpart_label[4]=new QLabel(rec_weekpart_button[4],tr("Friday"),this); rec_weekpart_label[4]->setGeometry(202,465,80,20); rec_weekpart_label[4]->setFont(day_font); rec_weekpart_label[4]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[5]=new QCheckBox(this,"cut_weekpart_button[5]"); + rec_weekpart_button[5]=new QCheckBox(this); rec_weekpart_button[5]->setGeometry(80,487,15,15); - rec_weekpart_label[5]=new QLabel(rec_weekpart_button[5],tr("Saturday"), - this,"rec_weekpart_label[5]"); + rec_weekpart_label[5]=new QLabel(rec_weekpart_button[5],tr("Saturday"),this); rec_weekpart_label[5]->setGeometry(102,485,80,20); rec_weekpart_label[5]->setFont(day_font); rec_weekpart_label[5]->setAlignment(AlignVCenter|AlignLeft); - rec_weekpart_button[6]=new QCheckBox(this,"cut_weekpart_button[6]"); + rec_weekpart_button[6]=new QCheckBox(this); rec_weekpart_button[6]->setGeometry(180,485,15,15); - rec_weekpart_label[6]=new QLabel(rec_weekpart_button[6],tr("Sunday"), - this,"rec_weekpart_label[6]"); + rec_weekpart_label[6]=new QLabel(rec_weekpart_button[6],tr("Sunday"),this); rec_weekpart_label[6]->setGeometry(202,485,80,20); rec_weekpart_label[6]->setFont(day_font); rec_weekpart_label[6]->setAlignment(AlignVCenter|AlignLeft); - rec_set_button=new QPushButton(tr("Set All"),this,"rec_set_button"); + rec_set_button=new QPushButton(tr("Set All"),this); rec_set_button->setGeometry(sizeHint().width()-80,441,55,30); rec_set_button->setFont(small_font); connect(rec_set_button,SIGNAL(clicked()),this,SLOT(setAllData())); - rec_clear_button=new QPushButton(tr("Clear All"),this,"rec_clear_button"); + rec_clear_button=new QPushButton(tr("Clear All"),this); rec_clear_button->setGeometry(sizeHint().width()-80,476,55,30); rec_clear_button->setFont(small_font); connect(rec_clear_button,SIGNAL(clicked()),this,SLOT(clearAllData())); @@ -388,19 +364,19 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Audio Meter // - rec_meter=new RDStereoMeter(this,"rec_meter"); + rec_meter=new RDStereoMeter(this); rec_meter->setGeometry(20,520,rec_meter->geometry().width(), rec_meter->geometry().height()); rec_meter->setReference(0); rec_meter->setMode(RDSegMeter::Independent); - QTimer *timer=new QTimer(this,"meter_timer"); + QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(meterData())); timer->start(RD_METER_UPDATE_INTERVAL); // // AES Alarm // - rec_aes_alarm_label=new QLabel(this,"rec_aes_alarm_label"); + rec_aes_alarm_label=new QLabel(this); rec_aes_alarm_label->setGeometry(15,592,110,22); rec_aes_alarm_label->setAlignment(AlignHCenter|AlignVCenter); rec_aes_alarm_label->setFont(large_font); @@ -411,9 +387,9 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Record Timer // - rec_timer=new QTimer(this,"rec_timer"); + rec_timer=new QTimer(this); connect(rec_timer,SIGNAL(timeout()),this,SLOT(recTimerData())); - rec_timer_label=new QLabel(this,"rec_timer_label"); + rec_timer_label=new QLabel(this); rec_timer_label->setGeometry(130,580,120,50); rec_timer_label->setFont(timer_font); rec_timer_label->setAlignment(AlignLeft|AlignVCenter); @@ -422,12 +398,12 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Channels // - rec_channels_box=new QComboBox(this,"rec_channels_box"); + rec_channels_box=new QComboBox(this); rec_channels_box->setGeometry(20,635,60,35); - rec_channels_edit=new QLineEdit(this,"rec_channels_box"); + rec_channels_edit=new QLineEdit(this); rec_channels_edit->setGeometry(20,635,60,35); - QLabel *rec_channels_box_label=new QLabel(rec_channels_box,tr("Channels"), - this,"rec_channels_box_label"); + QLabel *rec_channels_box_label= + new QLabel(rec_channels_box,tr("Channels"),this); rec_channels_box_label->setGeometry(10,616,80,16); rec_channels_box_label->setAlignment(AlignHCenter); rec_channels_box_label->setFont(font); @@ -437,8 +413,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Record Button // - rec_record_button=new RDTransportButton(RDTransportButton::Record, - this,"rec_record_button"); + rec_record_button=new RDTransportButton(RDTransportButton::Record,this); rec_record_button->setGeometry(100,620,80,50); rec_record_button->setDefault(true); connect(rec_record_button,SIGNAL(clicked()),this,SLOT(recordData())); @@ -446,8 +421,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Play Button // - rec_play_button=new RDTransportButton(RDTransportButton::Play, - this,"rec_play_button"); + rec_play_button=new RDTransportButton(RDTransportButton::Play,this); rec_play_button->setGeometry(190,620,80,50); rec_play_button->setDefault(true); connect(rec_play_button,SIGNAL(clicked()),this,SLOT(playData())); @@ -455,8 +429,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Stop Button // - rec_stop_button=new RDTransportButton(RDTransportButton::Stop, - this,"rec_stop_button"); + rec_stop_button=new RDTransportButton(RDTransportButton::Stop,this); rec_stop_button->setGeometry(280,620,80,50); rec_stop_button->setDefault(true); rec_stop_button->setState(RDTransportButton::On); @@ -466,10 +439,9 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Record Mode // - rec_mode_box=new QComboBox(this,"rec_mode_box"); + rec_mode_box=new QComboBox(this); rec_mode_box->setGeometry(10,695,100,35); - QLabel *rec_mode_box_label=new QLabel(rec_mode_box,tr("Record Mode"),this, - "rec_mode_box_label"); + QLabel *rec_mode_box_label=new QLabel(rec_mode_box,tr("Record Mode"),this); rec_mode_box_label->setGeometry(10,676,100,16); rec_mode_box_label->setAlignment(AlignHCenter); rec_mode_box_label->setFont(font); @@ -477,10 +449,9 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // AutoTrim Mode // - rec_trim_box=new QComboBox(this,"rec_trim_box"); + rec_trim_box=new QComboBox(this); rec_trim_box->setGeometry(145,695,70,35); - QLabel *rec_trim_box_label=new QLabel(rec_trim_box,tr("AutoTrim"),this, - "rec_trim_box_label"); + QLabel *rec_trim_box_label=new QLabel(rec_trim_box,tr("AutoTrim"),this); rec_trim_box_label->setGeometry(130,676,100,16); rec_trim_box_label->setAlignment(AlignHCenter); rec_trim_box_label->setFont(font); @@ -488,9 +459,8 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight, // // Close Button // - QPushButton *close_button=new QPushButton(this,"close_button"); - close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, - 80,50); + QPushButton *close_button=new QPushButton(this); + close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); close_button->setDefault(true); close_button->setFont(font); close_button->setText(tr("&Close")); diff --git a/rdlibrary/record_cut.h b/rdlibrary/record_cut.h index 98e039e02..806cfaeac 100644 --- a/rdlibrary/record_cut.h +++ b/rdlibrary/record_cut.h @@ -2,9 +2,7 @@ // // Record a Rivendell cut. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: record_cut.h,v 1.33.6.1 2012/08/02 20:37:58 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -45,13 +43,11 @@ #include - class RecordCut : public QDialog { Q_OBJECT public: - RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent=0, - const char *name=0); + RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent=0); ~RecordCut(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlibrary/validate_cut.cpp b/rdlibrary/validate_cut.cpp index 58cf294bb..ef70b4f92 100644 --- a/rdlibrary/validate_cut.cpp +++ b/rdlibrary/validate_cut.cpp @@ -2,9 +2,7 @@ // // Validate a Rivendell Audio Cut // -// (C) Copyright 2006 Fred Gleason -// -// $Id: validate_cut.cpp,v 1.4.16.2 2014/05/22 19:37:45 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlibrary/validate_cut.h b/rdlibrary/validate_cut.h index 5bc309a37..c9ef2a367 100644 --- a/rdlibrary/validate_cut.h +++ b/rdlibrary/validate_cut.h @@ -2,9 +2,7 @@ // // Validate a Rivendell Audio Cut // -// (C) Copyright 2006 Fred Gleason -// -// $Id: validate_cut.h,v 1.5.10.1 2014/05/22 14:30:46 cvs Exp $ +// (C) Copyright 2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am index 7a689050d..2c87cac2a 100644 --- a/rdlogedit/Makefile.am +++ b/rdlogedit/Makefile.am @@ -4,9 +4,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2005 Fred Gleason -## -## $Id: Makefile.am,v 1.37.8.4 2013/12/27 22:12:28 cvs Exp $ +## (C) Copyright 2002-2005,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdlogedit/add_meta.cpp b/rdlogedit/add_meta.cpp index 0aba30a2d..031b3392d 100644 --- a/rdlogedit/add_meta.cpp +++ b/rdlogedit/add_meta.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_meta.cpp,v 1.9 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,9 +34,8 @@ #include - -AddMeta::AddMeta(QWidget *parent,const char *name) - : QDialog(parent,name,true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) +AddMeta::AddMeta(QWidget *parent) + : QDialog(parent,"",true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) { setCaption(""); @@ -63,7 +60,7 @@ AddMeta::AddMeta(QWidget *parent,const char *name) // // Title Label // - QLabel *label=new QLabel(tr("Insert a:"),this,"title_label"); + QLabel *label=new QLabel(tr("Insert a:"),this); label->setGeometry(0,0,sizeHint().width(),30); label->setFont(label_font); label->setAlignment(AlignCenter); @@ -71,7 +68,7 @@ AddMeta::AddMeta(QWidget *parent,const char *name) // // Marker Button // - QPushButton *button=new QPushButton(this,"marker_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,30,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("&Marker")); @@ -80,7 +77,7 @@ AddMeta::AddMeta(QWidget *parent,const char *name) // // Voice Track Button // - button=new QPushButton(this,"track_button"); + button=new QPushButton(this); button->setGeometry(10,80,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("Voice &Track")); @@ -89,7 +86,7 @@ AddMeta::AddMeta(QWidget *parent,const char *name) // // Chain Button // - button=new QPushButton(this,"chain_button"); + button=new QPushButton(this); button->setGeometry(10,130,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("Log C&hain")); @@ -98,7 +95,7 @@ AddMeta::AddMeta(QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdlogedit/add_meta.h b/rdlogedit/add_meta.h index 6f186b3db..a9a49a76c 100644 --- a/rdlogedit/add_meta.h +++ b/rdlogedit/add_meta.h @@ -2,9 +2,7 @@ // // Add a Rivendell RDCatch Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_meta.h,v 1.6 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,12 +30,11 @@ #include #include - class AddMeta : public QDialog { Q_OBJECT public: - AddMeta(QWidget *parent=0,const char *name=0); + AddMeta(QWidget *parent=0); ~AddMeta(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/drop_listview.cpp b/rdlogedit/drop_listview.cpp index 68f41dcc1..1e0da7c2f 100644 --- a/rdlogedit/drop_listview.cpp +++ b/rdlogedit/drop_listview.cpp @@ -2,9 +2,7 @@ // // The Log ListView widget for RDLogEdit. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: drop_listview.cpp,v 1.1.2.1 2013/12/27 22:12:28 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include -DropListView::DropListView(QWidget *parent,const char *name) - : RDListView(parent,name) +DropListView::DropListView(QWidget *parent) + : RDListView(parent) { setAcceptDrops(true); } diff --git a/rdlogedit/drop_listview.h b/rdlogedit/drop_listview.h index 65b1e4e0f..e0704f13a 100644 --- a/rdlogedit/drop_listview.h +++ b/rdlogedit/drop_listview.h @@ -2,9 +2,7 @@ // // The Log ListView widget for RDLogEdit. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: drop_listview.h,v 1.1.2.1 2013/12/27 22:12:28 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,7 +29,7 @@ class DropListView : public RDListView { Q_OBJECT public: - DropListView(QWidget *parent,const char *name=0); + DropListView(QWidget *parent); signals: void cartDropped(int line,RDLogLine *ll); diff --git a/rdlogedit/edit_chain.cpp b/rdlogedit/edit_chain.cpp index 01edf9e25..7302c0809 100644 --- a/rdlogedit/edit_chain.cpp +++ b/rdlogedit/edit_chain.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Chain Entry // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_chain.cpp,v 1.14 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include #include -EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditChain::EditChain(RDLogLine *line,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -54,10 +52,9 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Time Type // - edit_timetype_box=new QCheckBox(this,"edit_timetype_box"); + edit_timetype_box=new QCheckBox(this); edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"), - this,"edit_timetype_label"); + edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); @@ -65,7 +62,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Start Time // - edit_time_edit=new RDTimeEdit(this,"edit_time_edit"); + edit_time_edit=new RDTimeEdit(this); edit_time_edit->setGeometry(85,19,85,20); edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| RDTimeEdit::Seconds|RDTimeEdit::Tenths); @@ -77,8 +74,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // edit_grace_group =new QButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"), - this,"edit_grace_group"); + tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); edit_grace_group->setRadioButtonExclusive(true); @@ -92,7 +88,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this,"edit_grace_box"); + edit_grace_box=new QTimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), @@ -103,13 +99,12 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Transition Type // - edit_transtype_box=new QComboBox(this,"edit_transtype_box"); + edit_transtype_box=new QComboBox(this); edit_transtype_box->setGeometry(385,68,110,26); edit_transtype_box->insertItem(tr("Play")); edit_transtype_box->insertItem(tr("Segue")); edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"), - this,"edit_transtype_label"); + edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); edit_time_label->setAlignment(AlignRight|AlignVCenter); @@ -117,10 +112,10 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Label // - edit_label_edit=new QLineEdit(this,"edit_label_edit"); + edit_label_edit=new QLineEdit(this); edit_label_edit->setGeometry(10,116,sizeHint().width()-90,18); edit_label_edit->setMaxLength(64); - QLabel *label=new QLabel(tr("Log Name"),this,"label_label"); + QLabel *label=new QLabel(tr("Log Name"),this); label->setFont(label_font); label->setGeometry(12,100,160,14); connect(edit_label_edit,SIGNAL(textChanged(const QString &)), @@ -129,7 +124,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Select Log Button // - QPushButton *button=new QPushButton(this,"select_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,111,60,28); button->setDefault(true); button->setFont(radio_font); @@ -139,17 +134,17 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Comment // - edit_comment_edit=new QLineEdit(this,"edit_comment_edit"); + edit_comment_edit=new QLineEdit(this); edit_comment_edit->setGeometry(10,156,sizeHint().width()-20,18); edit_comment_edit->setReadOnly(true); - label=new QLabel(tr("Log Description"),this,"comment_label"); + label=new QLabel(tr("Log Description"),this); label->setFont(label_font); label->setGeometry(12,140,160,14); // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -159,7 +154,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(button_font); @@ -290,7 +285,7 @@ void EditChain::selectLogData() { QString logname; - ListLogs *list=new ListLogs(&logname,this,"list_log_dialog"); + ListLogs *list=new ListLogs(&logname,this); if(list->exec()<0) { delete list; return; diff --git a/rdlogedit/edit_chain.h b/rdlogedit/edit_chain.h index 191b335fb..4a9eca1cd 100644 --- a/rdlogedit/edit_chain.h +++ b/rdlogedit/edit_chain.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Entry // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_chain.h,v 1.8 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,7 +38,7 @@ class EditChain : public QDialog { Q_OBJECT public: - EditChain(RDLogLine *,QWidget *parent=0,const char *name=0); + EditChain(RDLogLine *,QWidget *parent=0); ~EditChain(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 5313f4982..5960cfbf2 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -63,8 +63,8 @@ #include "../icons/traffic.xpm" EditLog::EditLog(QString logname,vector *clipboard, - vector *new_logs,QWidget *parent,const char *name) - : QDialog(parent,name,true) + vector *new_logs,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -127,7 +127,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Log Header @@ -143,12 +143,11 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Log Name // - edit_logname_label=new QLabel(logname,this,"edit_logname_label"); + edit_logname_label=new QLabel(logname,this); edit_logname_label->setBackgroundColor(QColor(system_mid_color)); edit_logname_label->setAlignment(AlignLeft|AlignVCenter); edit_logname_label->setFont(title_font); - edit_logname_label_label=new QLabel(tr("Log Name:"), - this,"edit_logname_label_label"); + edit_logname_label_label=new QLabel(tr("Log Name:"),this); edit_logname_label_label->setBackgroundColor(QColor(system_mid_color)); edit_logname_label_label->setFont(label_font); edit_logname_label_label->setAlignment(AlignRight|AlignVCenter); @@ -156,12 +155,11 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Track Counts // - edit_track_label=new QLabel(this,"edit_track_label"); + edit_track_label=new QLabel(this); edit_track_label->setBackgroundColor(QColor(system_mid_color)); edit_track_label->setAlignment(AlignLeft|AlignVCenter); edit_track_label->setFont(title_font); - edit_track_label_label=new QLabel(tr("Tracks:"), - this,"edit_track_label_label"); + edit_track_label_label=new QLabel(tr("Tracks:"),this); edit_track_label_label->setBackgroundColor(QColor(system_mid_color)); edit_track_label_label->setFont(label_font); edit_track_label_label->setAlignment(AlignRight|AlignVCenter); @@ -169,14 +167,14 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Log Origin // - edit_origin_label=new QLabel(edit_log->originUser()+QString(" - ")+ - edit_log->originDatetime().toString("MM/dd/yyyy - hh:mm:ss"), - this,"edit_origin_label"); + edit_origin_label= + new QLabel(edit_log->originUser()+QString(" - ")+ + edit_log->originDatetime().toString("MM/dd/yyyy - hh:mm:ss"), + this); edit_origin_label->setBackgroundColor(QColor(system_mid_color)); edit_origin_label->setAlignment(AlignLeft|AlignVCenter); edit_origin_label->setFont(title_font); - edit_origin_label_label=new QLabel(tr("Origin:"), - this,"edit_origin_label_label"); + edit_origin_label_label=new QLabel(tr("Origin:"),this); edit_origin_label_label->setBackgroundColor(QColor(system_mid_color)); edit_origin_label_label->setFont(label_font); edit_origin_label_label->setAlignment(AlignRight|AlignVCenter); @@ -184,26 +182,24 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Description // - edit_description_edit=new QLineEdit(this,"edit_description_edit"); + edit_description_edit=new QLineEdit(this); edit_description_edit->setValidator(validator); connect(edit_description_edit,SIGNAL(textChanged(const QString &)), this,SLOT(descriptionChangedData(const QString &))); - edit_description_label=new QLabel(edit_description_edit,tr("Description:"), - this,"edit_description_label"); + edit_description_label= + new QLabel(edit_description_edit,tr("Description:"),this); edit_description_label->setFont(label_font); edit_description_label->setAlignment(AlignRight|AlignVCenter); // // Purge Date // - edit_purgedate_box=new QCheckBox(this,"edit_purgedate_box"); - edit_purgedate_label=new QLabel(edit_purgedate_box,tr("Delete on"), - this,"edit_purgedate_label"); + edit_purgedate_box=new QCheckBox(this); + edit_purgedate_label=new QLabel(edit_purgedate_box,tr("Delete on"),this); edit_purgedate_label->setFont(label_font); edit_purgedate_label->setAlignment(AlignRight|AlignVCenter); - edit_purgedate_edit=new QDateEdit(this,"edit_purgedate_edit"); - edit_purgedate_button= - new QPushButton(tr("Select"),this,"edit_purgedate_button"); + edit_purgedate_edit=new QDateEdit(this); + edit_purgedate_button=new QPushButton(tr("Select"),this); edit_purgedate_button->setFont(label_font); connect(edit_purgedate_box,SIGNAL(toggled(bool)), edit_purgedate_edit,SLOT(setEnabled(bool))); @@ -215,11 +211,10 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Service // - edit_service_box=new QComboBox(this,"edit_service_box"); - edit_service_edit=new QLineEdit(this,"edit_service_edit"); + edit_service_box=new QComboBox(this); + edit_service_edit=new QLineEdit(this); edit_service_edit->setReadOnly(true); - edit_service_label=new QLabel(edit_service_box,tr("Service:"), - this,"edit_service_label"); + edit_service_label=new QLabel(edit_service_box,tr("Service:"),this); edit_service_label->setFont(label_font); edit_service_label->setAlignment(AlignRight|AlignVCenter); connect(edit_service_box,SIGNAL(activated(const QString &)), @@ -228,23 +223,21 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Auto Refresh // - edit_autorefresh_box=new QComboBox(this,"edit_autorefresh_box"); + edit_autorefresh_box=new QComboBox(this); edit_autorefresh_box->insertItem(tr("Yes")); edit_autorefresh_box->insertItem(tr("No")); - edit_autorefresh_edit=new QLineEdit(this,"edit_autorefresh_edit"); + edit_autorefresh_edit=new QLineEdit(this); edit_autorefresh_edit->setReadOnly(true); edit_autorefresh_label= - new QLabel(edit_autorefresh_box,tr("Enable AutoRefresh:"), - this,"edit_autorefresh_label"); + new QLabel(edit_autorefresh_box,tr("Enable AutoRefresh:"),this); edit_autorefresh_label->setFont(label_font); edit_autorefresh_label->setAlignment(AlignRight|AlignVCenter); // // Start Date // - edit_startdate_edit=new QDateEdit(this,"edit_startdate_edit"); - edit_startdate_label=new QLabel(edit_startdate_edit,tr("Start Date:"),this, - "edit_startdate_label"); + edit_startdate_edit=new QDateEdit(this); + edit_startdate_label=new QLabel(edit_startdate_edit,tr("Start Date:"),this); edit_startdate_label->setFont(label_font); edit_startdate_label->setAlignment(AlignRight|AlignVCenter); connect(edit_startdate_edit,SIGNAL(valueChanged(const QDate &)), @@ -254,9 +247,8 @@ EditLog::EditLog(QString logname,vector *clipboard, // // End Date // - edit_enddate_edit=new QDateEdit(this,"edit_enddate_edit"); - edit_enddate_label=new QLabel(edit_startdate_edit,tr("End Date:"), - this,"edit_enddate_label"); + edit_enddate_edit=new QDateEdit(this); + edit_enddate_label=new QLabel(edit_startdate_edit,tr("End Date:"),this); edit_enddate_label->setFont(label_font); edit_enddate_label->setAlignment(AlignRight|AlignVCenter); connect(edit_enddate_edit,SIGNAL(valueChanged(const QDate &)), @@ -265,22 +257,22 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Start Date Checkbox // - edit_startdate_box=new QCheckBox(this,"edit_startdate_box"); + edit_startdate_box=new QCheckBox(this); connect(edit_startdate_box,SIGNAL(toggled(bool)), this,SLOT(startDateEnabledData(bool))); - edit_startdate_box_label=new QLabel(edit_startdate_box, - tr("Start Date Enabled"),this); + edit_startdate_box_label= + new QLabel(edit_startdate_box,tr("Start Date Enabled"),this); edit_startdate_box_label->setFont(label_font); edit_startdate_box_label->setAlignment(AlignLeft|AlignVCenter); // // End Date Checkbox // - edit_enddate_box=new QCheckBox(this,"edit_enddate_box"); + edit_enddate_box=new QCheckBox(this); connect(edit_enddate_box,SIGNAL(toggled(bool)), this,SLOT(endDateEnabledData(bool))); - edit_enddate_box_label=new QLabel(edit_enddate_box,tr("End Date Enabled"), - this); + edit_enddate_box_label= + new QLabel(edit_enddate_box,tr("End Date Enabled"),this); edit_enddate_box_label->setFont(label_font); edit_enddate_box_label->setAlignment(AlignLeft|AlignVCenter); @@ -294,7 +286,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Stop Time Counter // - edit_stoptime_edit=new QLineEdit(this,"edit_stoptime_edit"); + edit_stoptime_edit=new QLineEdit(this); edit_stoptime_label=new QLabel(edit_stoptime_edit,tr("Next Stop:"),this); edit_stoptime_label->setFont(label_font); edit_stoptime_label->setAlignment(AlignRight|AlignVCenter); @@ -302,7 +294,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // End Time Counter // - edit_endtime_edit=new QLineEdit(this,"edit_endtime_edit"); + edit_endtime_edit=new QLineEdit(this); edit_endtime_label=new QLabel(edit_endtime_edit,tr("Log End:"),this); edit_endtime_label->setFont(label_font); edit_endtime_label->setAlignment(AlignRight|AlignVCenter); @@ -310,7 +302,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Log Event List // - edit_log_list=new DropListView(this,"edit_log_list"); + edit_log_list=new DropListView(this); edit_log_list->setAllColumnsShowFocus(true); edit_log_list->setSelectionMode(QListView::Extended); edit_log_list->setItemMargin(5); @@ -360,7 +352,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Insert Cart Button // - edit_cart_button=new QPushButton(this,"edit_cart_button"); + edit_cart_button=new QPushButton(this); edit_cart_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_cart_button->setFont(button_font); edit_cart_button->setText(tr("Insert\nCart")); @@ -370,7 +362,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Insert Marker Button // - edit_marker_button=new QPushButton(this,"edit_marker_button"); + edit_marker_button=new QPushButton(this); edit_marker_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_marker_button->setFont(button_font); edit_marker_button->setText(tr("Insert\nMeta")); @@ -380,7 +372,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Edit Button // - edit_edit_button=new QPushButton(this,"edit_edit_button"); + edit_edit_button=new QPushButton(this); edit_edit_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_edit_button->setFont(button_font); edit_edit_button->setText(tr("Edit")); @@ -389,7 +381,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Delete Button // - edit_delete_button=new QPushButton(this,"edit_delete_button"); + edit_delete_button=new QPushButton(this); edit_delete_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_delete_button->setFont(button_font); edit_delete_button->setText(tr("Delete")); @@ -398,23 +390,21 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Up Button // - edit_up_button=new RDTransportButton(RDTransportButton::Up, - this,"delete_button"); + edit_up_button=new RDTransportButton(RDTransportButton::Up,this); edit_up_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); connect(edit_up_button,SIGNAL(clicked()),this,SLOT(upButtonData())); // // Down Button // - edit_down_button=new RDTransportButton(RDTransportButton::Down, - this,"delete_button"); + edit_down_button=new RDTransportButton(RDTransportButton::Down,this); edit_down_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); connect(edit_down_button,SIGNAL(clicked()),this,SLOT(downButtonData())); // // Cut Button // - edit_cut_button=new QPushButton(this,"edit_cut_button"); + edit_cut_button=new QPushButton(this); edit_cut_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_cut_button->setFont(button_font); edit_cut_button->setText(tr("Cut")); @@ -423,7 +413,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Copy Button // - edit_copy_button=new QPushButton(this,"edit_copy_button"); + edit_copy_button=new QPushButton(this); edit_copy_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_copy_button->setFont(button_font); edit_copy_button->setText(tr("Copy")); @@ -432,7 +422,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Paste Button // - edit_paste_button=new QPushButton(this,"edit_paste_button"); + edit_paste_button=new QPushButton(this); edit_paste_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); edit_paste_button->setFont(button_font); edit_paste_button->setText(tr("Paste")); @@ -441,7 +431,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Save Button // - edit_save_button=new QPushButton(this,"edit_save_button"); + edit_save_button=new QPushButton(this); edit_save_button->setFont(button_font); edit_save_button->setText(tr("&Save")); connect(edit_save_button,SIGNAL(clicked()),this,SLOT(saveData())); @@ -449,7 +439,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // SaveAs Button // - edit_saveas_button=new QPushButton(this,"edit_saveas_button"); + edit_saveas_button=new QPushButton(this); edit_saveas_button->setFont(button_font); edit_saveas_button->setText(tr("Save\n&As")); connect(edit_saveas_button,SIGNAL(clicked()),this,SLOT(saveasData())); @@ -457,7 +447,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Reports Button // - edit_reports_button=new QPushButton(this,"edit_reports_button"); + edit_reports_button=new QPushButton(this); edit_reports_button->setFont(button_font); edit_reports_button->setText(tr("&Reports")); connect(edit_reports_button,SIGNAL(clicked()),this,SLOT(reportsData())); @@ -470,14 +460,14 @@ EditLog::EditLog(QString logname,vector *clipboard, #else edit_player= new RDSimplePlayer(rdcae,rdripc,edit_output_card,edit_output_port, - edit_start_macro,edit_end_macro,this,"edit_player"); + edit_start_macro,edit_end_macro,this); edit_player->stopButton()->setOnColor(red); #endif // WIN32 // // Ok Button // - edit_ok_button=new QPushButton(this,"edit_ok_button"); + edit_ok_button=new QPushButton(this); edit_ok_button->setDefault(true); edit_ok_button->setFont(button_font); edit_ok_button->setText(tr("&OK")); @@ -486,7 +476,7 @@ EditLog::EditLog(QString logname,vector *clipboard, // // Cancel Button // - edit_cancel_button=new QPushButton(this,"edit_cancel_button"); + edit_cancel_button=new QPushButton(this); edit_cancel_button->setFont(button_font); edit_cancel_button->setText(tr("&Cancel")); connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -691,11 +681,10 @@ void EditLog::insertCartButtonData() edit_log_event->logLine(line)->setTransType(edit_default_trans); edit_log_event->logLine(line)->setFadeupGain(-3000); edit_log_event->logLine(line)->setFadedownGain(-3000); - EditLogLine *edit=new EditLogLine(edit_log_event->logLine(line), - &edit_filter,&edit_group, + EditLogLine *edit= +new EditLogLine(edit_log_event->logLine(line),&edit_filter,&edit_group, edit_service_box->currentText(), - &edit_group_list,edit_log_event,line, - this,"edit_logline"); + &edit_group_list,edit_log_event,line,this); int ret=edit->exec(); if(ret>=0) { edit_log_event->refresh(line); @@ -728,13 +717,12 @@ void EditLog::insertMarkerButtonData() } line=item->text(14).toInt(); id=item->text(13).toInt(); - AddMeta *meta=new AddMeta(this,"add_meta_dialog"); + AddMeta *meta=new AddMeta(this); switch((RDLogLine::Type)meta->exec()) { case RDLogLine::Marker: edit_log_event->insert(line,1); edit_log_event->logLine(line)->setType(RDLogLine::Marker); - edit_marker=new EditMarker(edit_log_event->logLine(line), - this,"edit_marker"); + edit_marker=new EditMarker(edit_log_event->logLine(line),this); ret=edit_marker->exec(); if(ret>=0) { edit_log_event->refresh(line); @@ -751,8 +739,7 @@ void EditLog::insertMarkerButtonData() edit_log_event->logLine(line)->setType(RDLogLine::Track); edit_log_event->logLine(line)->setTransType(RDLogLine::Segue); edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track")); - edit_track=new EditTrack(edit_log_event->logLine(line), - this,"edit_marker"); + edit_track=new EditTrack(edit_log_event->logLine(line),this); ret=edit_track->exec(); if(ret>=0) { edit_log_event->refresh(line); @@ -767,8 +754,7 @@ void EditLog::insertMarkerButtonData() case RDLogLine::Chain: edit_log_event->insert(line,1); edit_log_event->logLine(line)->setType(RDLogLine::Chain); - edit_chain=new EditChain(edit_log_event->logLine(line), - this,"edit_marker"); + edit_chain=new EditChain(edit_log_event->logLine(line),this); ret=edit_chain->exec(); if(ret>=0) { edit_log_event->refresh(line); @@ -841,11 +827,9 @@ void EditLog::editButtonData() switch(edit_log_event->logLine(line)->type()) { case RDLogLine::Cart: case RDLogLine::Macro: - edit_cart=new EditLogLine(edit_log_event->logLine(line),& - edit_filter,&edit_group, - edit_service_box->currentText(), - &edit_group_list,edit_log_event,line, - this,"edit_logline"); + edit_cart=new EditLogLine(edit_log_event->logLine(line),&edit_filter, + &edit_group,edit_service_box->currentText(), + &edit_group_list,edit_log_event,line,this); if(edit_cart->exec()>=0) { edit_log_event->refresh(item->text(14).toInt()); edit_changed=true; @@ -854,8 +838,7 @@ void EditLog::editButtonData() break; case RDLogLine::Marker: - edit_marker=new EditMarker(edit_log_event->logLine(line), - this,"edit_logline"); + edit_marker=new EditMarker(edit_log_event->logLine(line),this); if(edit_marker->exec()>=0) { edit_changed=true; } @@ -863,8 +846,7 @@ void EditLog::editButtonData() break; case RDLogLine::Track: - edit_track=new EditTrack(edit_log_event->logLine(line), - this,"edit_logline"); + edit_track=new EditTrack(edit_log_event->logLine(line),this); if(edit_track->exec()>=0) { edit_changed=true; } @@ -872,8 +854,7 @@ void EditLog::editButtonData() break; case RDLogLine::Chain: - edit_chain=new EditChain(edit_log_event->logLine(line), - this,"edit_logline"); + edit_chain=new EditChain(edit_log_event->logLine(line),this); if(edit_chain->exec()>=0) { edit_changed=true; } @@ -1065,10 +1046,9 @@ void EditLog::saveasData() if(rduser->createLog()) { if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,"add_log", - rduser); + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,rduser); } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,"add_log"); + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); } if(log->exec()<0) { return; @@ -1126,7 +1106,7 @@ void EditLog::reportsData() new ListReports(edit_log->name(),edit_description_edit->text(), edit_service_box->currentText(),start_date,end_date, edit_autorefresh_box->currentItem()==0, - edit_log_event,this,"lr"); + edit_log_event,this); lr->exec(); delete lr; } diff --git a/rdlogedit/edit_log.h b/rdlogedit/edit_log.h index a9a2fd2f4..d791f8c24 100644 --- a/rdlogedit/edit_log.h +++ b/rdlogedit/edit_log.h @@ -52,7 +52,7 @@ class EditLog : public QDialog Q_OBJECT public: EditLog(QString logname,vector *clipboard, - vector *new_logs,QWidget *parent=0,const char *name=0); + vector *new_logs,QWidget *parent=0); ~EditLog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index ad3ebcf53..5ad6d8eec 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Entry // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_logline.cpp,v 1.40.8.1 2012/11/26 20:19:41 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,9 +31,8 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, QString svcname,RDGroupList *grplist, - RDLogEvent *log,int lineno, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + RDLogEvent *log,int lineno,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -70,10 +67,9 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Time Type // - edit_timetype_box=new QCheckBox(this,"edit_timetype_box"); + edit_timetype_box=new QCheckBox(this); edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"), - this,"edit_timetype_label"); + edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,80,17); edit_timetype_label->setFont(label_font); edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); @@ -81,7 +77,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Start Time // - edit_time_edit=new RDTimeEdit(this,"edit_time_edit"); + edit_time_edit=new RDTimeEdit(this); edit_time_edit->setGeometry(85,19,85,20); edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| RDTimeEdit::Seconds|RDTimeEdit::Tenths); @@ -93,8 +89,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // edit_grace_group =new QButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"), - this,"edit_grace_group"); + tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); edit_grace_group->setRadioButtonExclusive(true); @@ -109,7 +104,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_edit=new RDTimeEdit(this,"edit_grace_edit"); + edit_grace_edit=new RDTimeEdit(this); edit_grace_edit->setGeometry(538,31,65,20); edit_grace_edit-> setDisplay(RDTimeEdit::Minutes|RDTimeEdit::Seconds|RDTimeEdit::Tenths); @@ -121,22 +116,21 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Transition Type // - edit_transtype_box=new QComboBox(this,"edit_transtype_box"); + edit_transtype_box=new QComboBox(this); edit_transtype_box->setGeometry(485,68,110,26); edit_transtype_box->insertItem(tr("Play")); edit_transtype_box->insertItem(tr("Segue")); edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"), - this,"edit_transtype_label"); + edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); edit_time_label->setGeometry(190,68,290,26); edit_time_label->setFont(label_font); edit_time_label->setAlignment(AlignRight|AlignVCenter); // Overlap Box - edit_overlap_box=new QCheckBox(this,"edit_overlap_box"); + edit_overlap_box=new QCheckBox(this); edit_overlap_box->setGeometry(30,72,15,15); - edit_overlap_label=new QLabel(edit_overlap_box,tr("No Fade on Segue Out"), - this,"edit_overlap_label"); + edit_overlap_label= + new QLabel(edit_overlap_box,tr("No Fade on Segue Out"),this); edit_overlap_label->setGeometry(50,68,130,26); edit_overlap_label->setFont(button_font); edit_overlap_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); @@ -144,36 +138,36 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Cart Number // - edit_cart_edit=new QLineEdit(this,"edit_cart_edit"); + edit_cart_edit=new QLineEdit(this); edit_cart_edit->setGeometry(10,116,60,18); - QLabel *label=new QLabel(tr("Cart"),this,"cart_label"); + QLabel *label=new QLabel(tr("Cart"),this); label->setFont(label_font); label->setGeometry(12,100,60,14); // // Title // - edit_title_edit=new QLineEdit(this,"edit_title_edit"); + edit_title_edit=new QLineEdit(this); edit_title_edit->setGeometry(75,116,260,18); edit_title_edit->setReadOnly(true); - label=new QLabel(tr("Title"),this,"title_label"); + label=new QLabel(tr("Title"),this); label->setFont(label_font); label->setGeometry(77,100,110,14); // // Artist // - edit_artist_edit=new QLineEdit(this,"edit_artist_edit"); + edit_artist_edit=new QLineEdit(this); edit_artist_edit->setGeometry(340,116,sizeHint().width()-350,18); edit_artist_edit->setReadOnly(true); - label=new QLabel(tr("Artist"),this,"artist_label"); + label=new QLabel(tr("Artist"),this); label->setFont(label_font); label->setGeometry(342,100,110,14); // // Cart Button // - QPushButton *button=new QPushButton(this,"cart_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(20,144,80,50); button->setFont(button_font); button->setText(tr("Select\nCart")); @@ -182,7 +176,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Ok Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -192,7 +186,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(button_font); diff --git a/rdlogedit/edit_logline.h b/rdlogedit/edit_logline.h index 6fc8b591d..7461632c1 100644 --- a/rdlogedit/edit_logline.h +++ b/rdlogedit/edit_logline.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Entry // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_logline.h,v 1.17 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class EditLogLine : public QDialog public: EditLogLine(RDLogLine *,QString *filter,QString *group,QString svcname, RDGroupList *grplist,RDLogEvent *log,int lineno, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~EditLogLine(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/edit_marker.cpp b/rdlogedit/edit_marker.cpp index 71f5b64da..a817ddfe5 100644 --- a/rdlogedit/edit_marker.cpp +++ b/rdlogedit/edit_marker.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Marker Entry // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_marker.cpp,v 1.20 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include -EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditMarker::EditMarker(RDLogLine *line,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -53,10 +51,9 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // // Time Type // - edit_timetype_box=new QCheckBox(this,"edit_timetype_box"); + edit_timetype_box=new QCheckBox(this); edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"), - this,"edit_timetype_label"); + edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); @@ -64,7 +61,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // // Start Time // - edit_time_edit=new RDTimeEdit(this,"edit_time_edit"); + edit_time_edit=new RDTimeEdit(this); edit_time_edit->setGeometry(85,19,85,20); edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| RDTimeEdit::Seconds|RDTimeEdit::Tenths); @@ -76,8 +73,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // edit_grace_group =new QButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"), - this,"edit_grace_group"); + tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); edit_grace_group->setRadioButtonExclusive(true); @@ -91,7 +87,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this,"edit_grace_box"); + edit_grace_box=new QTimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), @@ -102,13 +98,12 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // // Transition Type // - edit_transtype_box=new QComboBox(this,"edit_transtype_box"); + edit_transtype_box=new QComboBox(this); edit_transtype_box->setGeometry(385,68,110,26); edit_transtype_box->insertItem(tr("Play")); edit_transtype_box->insertItem(tr("Segue")); edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,"Transition Type:", - this,"edit_transtype_label"); + edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); edit_time_label->setAlignment(AlignRight|AlignVCenter); @@ -116,27 +111,27 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // // Comment // - edit_comment_edit=new QLineEdit(this,"edit_comment_edit"); + edit_comment_edit=new QLineEdit(this); edit_comment_edit->setGeometry(10,116,sizeHint().width()-20,18); edit_comment_edit->setMaxLength(255); - QLabel *label=new QLabel(tr("Comment"),this,"comment_label"); + QLabel *label=new QLabel(tr("Comment"),this); label->setFont(label_font); label->setGeometry(12,100,70,14); // // Label // - edit_label_edit=new QLineEdit(this,"edit_label_edit"); + edit_label_edit=new QLineEdit(this); edit_label_edit->setGeometry(10,156,100,18); edit_label_edit->setMaxLength(10); - label=new QLabel(tr("Label"),this,"label_label"); + label=new QLabel(tr("Label"),this); label->setFont(label_font); label->setGeometry(12,140,60,14); // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -146,7 +141,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(button_font); diff --git a/rdlogedit/edit_marker.h b/rdlogedit/edit_marker.h index 6887724d7..ad9f076f6 100644 --- a/rdlogedit/edit_marker.h +++ b/rdlogedit/edit_marker.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Entry // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: edit_marker.h,v 1.10 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,7 +38,7 @@ class EditMarker : public QDialog { Q_OBJECT public: - EditMarker(RDLogLine *,QWidget *parent=0,const char *name=0); + EditMarker(RDLogLine *,QWidget *parent=0); ~EditMarker(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/edit_track.cpp b/rdlogedit/edit_track.cpp index e8e36ef93..d2a42054c 100644 --- a/rdlogedit/edit_track.cpp +++ b/rdlogedit/edit_track.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Voice Track Log Entry // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_track.cpp,v 1.9 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include -EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditTrack::EditTrack(RDLogLine *line,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -53,10 +51,9 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // // Time Type // - edit_timetype_box=new QCheckBox(this,"edit_timetype_box"); + edit_timetype_box=new QCheckBox(this); edit_timetype_box->setGeometry(10,22,15,15); - edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"), - this,"edit_timetype_label"); + edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); @@ -64,7 +61,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // // Start Time // - edit_time_edit=new RDTimeEdit(this,"edit_time_edit"); + edit_time_edit=new RDTimeEdit(this); edit_time_edit->setGeometry(85,19,85,20); edit_time_edit->setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes| RDTimeEdit::Seconds|RDTimeEdit::Tenths); @@ -76,8 +73,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // edit_grace_group =new QButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"), - this,"edit_grace_group"); + tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); edit_grace_group->setRadioButtonExclusive(true); @@ -91,7 +87,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this,"edit_grace_box"); + edit_grace_box=new QTimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), @@ -102,13 +98,12 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // // Transition Type // - edit_transtype_box=new QComboBox(this,"edit_transtype_box"); + edit_transtype_box=new QComboBox(this); edit_transtype_box->setGeometry(385,68,110,26); edit_transtype_box->insertItem(tr("Play")); edit_transtype_box->insertItem(tr("Segue")); edit_transtype_box->insertItem(tr("Stop")); - edit_time_label=new QLabel(edit_transtype_box,"Transition Type:", - this,"edit_transtype_label"); + edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); edit_time_label->setAlignment(AlignRight|AlignVCenter); @@ -116,17 +111,17 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // // Comment // - edit_comment_edit=new QLineEdit(this,"edit_comment_edit"); + edit_comment_edit=new QLineEdit(this); edit_comment_edit->setGeometry(10,116,sizeHint().width()-20,18); edit_comment_edit->setMaxLength(255); - QLabel *label=new QLabel(tr("Comment"),this,"comment_label"); + QLabel *label=new QLabel(tr("Comment"),this); label->setFont(label_font); label->setGeometry(12,100,70,14); // // Ok Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(button_font); @@ -136,7 +131,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); button->setFont(button_font); diff --git a/rdlogedit/edit_track.h b/rdlogedit/edit_track.h index a043959f2..a348ce73f 100644 --- a/rdlogedit/edit_track.h +++ b/rdlogedit/edit_track.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Voice Track Log Entry // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_track.h,v 1.8 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,7 +38,7 @@ class EditTrack : public QDialog { Q_OBJECT public: - EditTrack(RDLogLine *,QWidget *parent=0,const char *name=0); + EditTrack(RDLogLine *,QWidget *parent=0); ~EditTrack(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/globals.h b/rdlogedit/globals.h index ddab35104..a53949ace 100644 --- a/rdlogedit/globals.h +++ b/rdlogedit/globals.h @@ -2,9 +2,7 @@ // // Global Variable Declarations for RDLogEdit // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: globals.h,v 1.8 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogedit/import_track.cpp b/rdlogedit/import_track.cpp index 932345b5d..e4eeef713 100644 --- a/rdlogedit/import_track.cpp +++ b/rdlogedit/import_track.cpp @@ -2,9 +2,7 @@ // // Insert Audio for a Voice Track // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: import_track.cpp,v 1.7 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -40,13 +38,10 @@ #include - extern RDStation *rdstation_conf; - -ImportTrack::ImportTrack(QString *filter,QString *group, - QWidget *parent,const char *name) - : QDialog(parent,name,true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) +ImportTrack::ImportTrack(QString *filter,QString *group,QWidget *parent) + : QDialog(parent,"",true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder) { setCaption(""); @@ -74,7 +69,7 @@ ImportTrack::ImportTrack(QString *filter,QString *group, // // Title Label // - QLabel *label=new QLabel(tr("Insert audio from a:"),this,"title_label"); + QLabel *label=new QLabel(tr("Insert audio from a:"),this); label->setGeometry(0,0,sizeHint().width(),30); label->setFont(label_font); label->setAlignment(AlignCenter); @@ -82,7 +77,7 @@ ImportTrack::ImportTrack(QString *filter,QString *group, // // Cart Button // - QPushButton *button=new QPushButton(this,"cart_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,30,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("&Cart")); @@ -99,7 +94,7 @@ ImportTrack::ImportTrack(QString *filter,QString *group, // // Import Button // - button=new QPushButton(this,"import_button"); + button=new QPushButton(this); button->setGeometry(10,80,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("&File")); @@ -116,7 +111,7 @@ ImportTrack::ImportTrack(QString *filter,QString *group, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(10,140,sizeHint().width()-20,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdlogedit/import_track.h b/rdlogedit/import_track.h index 371a69c64..899c6783d 100644 --- a/rdlogedit/import_track.h +++ b/rdlogedit/import_track.h @@ -2,9 +2,7 @@ // // Import Audio for a Voice Track // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: import_track.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,8 +37,7 @@ class ImportTrack : public QDialog { Q_OBJECT public: - ImportTrack(QString *filter,QString *group, - QWidget *parent=0,const char *name=0); + ImportTrack(QString *filter,QString *group,QWidget *parent=0); ~ImportTrack(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/list_listviewitem.cpp b/rdlogedit/list_listviewitem.cpp index d5884f313..1bbd607dc 100644 --- a/rdlogedit/list_listviewitem.cpp +++ b/rdlogedit/list_listviewitem.cpp @@ -2,9 +2,7 @@ // // A QListViewItem class for RDLogEdit. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_listviewitem.cpp,v 1.6 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -30,7 +27,6 @@ #include "../icons/redball.xpm" #include "../icons/whiteball.xpm" - ListListViewItem::ListListViewItem(QListView *parent) : QListViewItem(parent) { diff --git a/rdlogedit/list_listviewitem.h b/rdlogedit/list_listviewitem.h index c6edf93da..9ea7095d2 100644 --- a/rdlogedit/list_listviewitem.h +++ b/rdlogedit/list_listviewitem.h @@ -2,9 +2,7 @@ // // A QListViewItem class for RDLogEdit. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_listviewitem.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef LIST_LISTVIEWITEM_H #define LIST_LISTVIEWITEM_H @@ -29,7 +26,6 @@ #include - class ListListViewItem : public QListViewItem { public: diff --git a/rdlogedit/list_logs.cpp b/rdlogedit/list_logs.cpp index 82c96c102..a38a082db 100644 --- a/rdlogedit/list_logs.cpp +++ b/rdlogedit/list_logs.cpp @@ -2,9 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_logs.cpp,v 1.9 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -ListLogs::ListLogs(QString *logname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListLogs::ListLogs(QString *logname,QWidget *parent) + : QDialog(parent,"",true) { // // Fix the Window Size @@ -50,7 +47,7 @@ ListLogs::ListLogs(QString *logname,QWidget *parent,const char *name) // // Log List // - list_log_list=new QListView(this,"list_log_list"); + list_log_list=new QListView(this); list_log_list->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); list_log_list->setAllColumnsShowFocus(true); @@ -69,7 +66,7 @@ ListLogs::ListLogs(QString *logname,QWidget *parent,const char *name) // // Load Button // - QPushButton *button=new QPushButton(this,"load_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&OK")); @@ -78,7 +75,7 @@ ListLogs::ListLogs(QString *logname,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(button_font); button->setText(tr("&Cancel")); diff --git a/rdlogedit/list_logs.h b/rdlogedit/list_logs.h index 3f0bbfacf..122db8dc6 100644 --- a/rdlogedit/list_logs.h +++ b/rdlogedit/list_logs.h @@ -2,9 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_logs.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,13 +26,12 @@ #include #include - class ListLogs : public QDialog { Q_OBJECT public: - ListLogs(QString *logname,QWidget *parent=0,const char *name=0); + ListLogs(QString *logname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/list_reports.cpp b/rdlogedit/list_reports.cpp index d640931a7..88fbfc839 100644 --- a/rdlogedit/list_reports.cpp +++ b/rdlogedit/list_reports.cpp @@ -2,9 +2,7 @@ // // List and Generate Log Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.cpp,v 1.7 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,13 +31,11 @@ #include #include - ListReports::ListReports(const QString &logname,const QString &description, const QString service_name,const QDate &start_date, const QDate &end_date,bool auto_refresh, - RDLogEvent *events, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + RDLogEvent *events,QWidget *parent) + : QDialog(parent,"",true) { list_log_name=logname; list_description=description; @@ -70,13 +66,12 @@ ListReports::ListReports(const QString &logname,const QString &description, // // Reports List // - list_reports_box=new QComboBox(this,"list_reports_box"); + list_reports_box=new QComboBox(this); list_reports_box->setGeometry(50,10,sizeHint().width()-60,19); list_reports_box->insertItem(tr("Log Listing")); list_reports_box->insertItem(tr("Log Exception Report")); QLabel *list_reports_label= - new QLabel(list_reports_box,tr("Type:"), - this,"list_reports_label"); + new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); list_reports_label->setFont(font); list_reports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -84,15 +79,13 @@ ListReports::ListReports(const QString &logname,const QString &description, // // Effective Date // - list_date_edit=new QDateEdit(this,"list_date_edit"); + list_date_edit=new QDateEdit(this); list_date_edit->setGeometry(110,34,100,19); - QLabel *list_date_label= - new QLabel(list_date_edit,tr("Effective Date:"), - this,"list_date_label"); + QLabel *list_date_label=new QLabel(list_date_edit,tr("Effective Date:"),this); list_date_label->setGeometry(10,34,95,19); list_date_label->setFont(font); list_date_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"select_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(215,32,60,24); button->setFont(select_font); button->setText(tr("&Select")); @@ -102,7 +95,7 @@ ListReports::ListReports(const QString &logname,const QString &description, // // Generate Button // - button=new QPushButton(this,"generate_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(font); @@ -112,7 +105,7 @@ ListReports::ListReports(const QString &logname,const QString &description, // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(font); button->setText(tr("&Close")); diff --git a/rdlogedit/list_reports.h b/rdlogedit/list_reports.h index 04017166b..834438945 100644 --- a/rdlogedit/list_reports.h +++ b/rdlogedit/list_reports.h @@ -2,9 +2,7 @@ // // List and Generate Log Reports // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: list_reports.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,7 +36,7 @@ class ListReports : public QDialog ListReports(const QString &logname,const QString &description, const QString service_name,const QDate &start_date, const QDate &end_date,bool auto_refresh,RDLogEvent *events, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~ListReports(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/log_listview.cpp b/rdlogedit/log_listview.cpp index fc6983e99..6590b716c 100644 --- a/rdlogedit/log_listview.cpp +++ b/rdlogedit/log_listview.cpp @@ -2,9 +2,7 @@ // // The Log ListView widget for RDLogEdit. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: log_listview.cpp,v 1.10 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include - -LogListView::LogListView(QWidget *parent,const char *name) - : RDListView(parent,name) +LogListView::LogListView(QWidget *parent) + : RDListView(parent) { log_parent=parent; diff --git a/rdlogedit/log_listview.h b/rdlogedit/log_listview.h index 127a1a9b2..ac5af90ae 100644 --- a/rdlogedit/log_listview.h +++ b/rdlogedit/log_listview.h @@ -2,9 +2,7 @@ // // The Log ListView widget for RDLogEdit. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: log_listview.h,v 1.7 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef LOG_LISTVIEW_H #define LOG_LISTVIEW_H @@ -39,7 +36,7 @@ class LogListView : public RDListView Q_OBJECT public: - LogListView(QWidget *parent,const char *name=0); + LogListView(QWidget *parent); private slots: void aboutToShowData(); diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 7921d8c15..f12e14c9a 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -2,9 +2,7 @@ // // The Log Editor Utility for Rivendell. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdlogedit.cpp,v 1.77.4.9.2.1 2014/05/21 18:19:43 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -106,8 +104,8 @@ void SigHandler(int signo) #endif // WIN32 -MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) - :QMainWindow(parent,name,f) +MainWidget::MainWidget(QWidget *parent) + :QMainWindow(parent) { QString str1; QString str2; @@ -183,7 +181,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // CAE Connection // #ifndef WIN32 - rdcae=new RDCae(rdstation_conf,log_config,parent,name); + rdcae=new RDCae(rdstation_conf,log_config,parent); rdcae->connectHost(); #endif // WIN32 @@ -300,7 +298,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Log List // - log_log_list=new QListView(this,"log_log_list"); + log_log_list=new QListView(this); log_log_list->setFont(default_font); log_log_list->setAllColumnsShowFocus(true); log_log_list->setItemMargin(5); @@ -340,7 +338,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Add Button // - log_add_button=new QPushButton(this,"log_add_button"); + log_add_button=new QPushButton(this); log_add_button->setFont(button_font); log_add_button->setText(tr("&Add")); connect(log_add_button,SIGNAL(clicked()),this,SLOT(addData())); @@ -348,7 +346,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Edit Button // - log_edit_button=new QPushButton(this,"log_edit_button"); + log_edit_button=new QPushButton(this); log_edit_button->setFont(button_font); log_edit_button->setText(tr("&Edit")); connect(log_edit_button,SIGNAL(clicked()),this,SLOT(editData())); @@ -356,7 +354,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Delete Button // - log_delete_button=new QPushButton(this,"log_delete_button"); + log_delete_button=new QPushButton(this); log_delete_button->setFont(button_font); log_delete_button->setText(tr("&Delete")); connect(log_delete_button,SIGNAL(clicked()),this,SLOT(deleteData())); @@ -364,7 +362,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Tracker Button // - log_track_button=new QPushButton(this,"log_track_button"); + log_track_button=new QPushButton(this); log_track_button->setFont(button_font); log_track_button->setText(tr("Voice\n&Tracker")); connect(log_track_button,SIGNAL(clicked()),this,SLOT(trackData())); @@ -375,7 +373,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Log Report Button // - log_report_button=new QPushButton(this,"log_report_button"); + log_report_button=new QPushButton(this); log_report_button->setFont(button_font); log_report_button->setText(tr("Log\nReport")); connect(log_report_button,SIGNAL(clicked()),this,SLOT(reportData())); @@ -383,7 +381,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name,WFlags f) // // Close Button // - log_close_button=new QPushButton(this,"log_close_button"); + log_close_button=new QPushButton(this); log_close_button->setFont(button_font); log_close_button->setText(tr("&Close")); connect(log_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); @@ -459,10 +457,9 @@ void MainWidget::addData() if(rduser->createLog()) { if (rdstation_conf->broadcastSecurity() == RDStation::UserSec) { - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,"add_log", - rduser); + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,rduser); } else { // RDStation::HostSec - log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this,"add_log"); + log=new RDAddLog(&logname,&svcname,NULL,tr("Add Log"),this); } if(log->exec()!=0) { delete log; @@ -925,7 +922,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(w->geometry().x(),w->geometry().y()), w->sizeHint())); diff --git a/rdlogedit/rdlogedit.h b/rdlogedit/rdlogedit.h index 623c49b65..1c3931181 100644 --- a/rdlogedit/rdlogedit.h +++ b/rdlogedit/rdlogedit.h @@ -43,12 +43,11 @@ #include - class MainWidget : public QMainWindow { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0,WFlags f=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogedit/rdlogedit.pro b/rdlogedit/rdlogedit.pro index fd04cd01e..49cd95843 100644 --- a/rdlogedit/rdlogedit.pro +++ b/rdlogedit/rdlogedit.pro @@ -2,9 +2,7 @@ # # The rdlogedit/ QMake project file for Rivendell # -# (C) Copyright 2003-2004 Fred Gleason -# -# $Id: rdlogedit.pro,v 1.17.2.3 2013/12/27 22:12:29 cvs Exp $ +# (C) Copyright 2003-2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp index a7fd3d815..2d2e54521 100644 --- a/rdlogedit/voice_tracker.cpp +++ b/rdlogedit/voice_tracker.cpp @@ -2,7 +2,7 @@ // // A Rivendell Voice Tracker // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -59,8 +59,8 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { edit_log_name=logname; edit_import_path=import_path; @@ -162,7 +162,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Macro Event Player // - track_event_player=new RDEventPlayer(rdripc,this,"track_event_player"); + track_event_player=new RDEventPlayer(rdripc,this); // // Waveform Pixmaps @@ -271,7 +271,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Track 1 Button // - track_track1_button=new QPushButton(this,"track_track1_button"); + track_track1_button=new QPushButton(this); track_track1_button->setGeometry(sizeHint().width()-90,15,70,70); track_track1_button->setPalette(track_start_palette); track_track1_button->setFont(font); @@ -281,7 +281,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Record Button // - track_record_button=new QPushButton(this,"track_record_button"); + track_record_button=new QPushButton(this); track_record_button->setGeometry(sizeHint().width()-90,95,70,70); track_record_button->setPalette(track_record_palette); track_record_button->setFont(font); @@ -291,7 +291,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Track 2 Button // - track_track2_button=new QPushButton(this,"track_track2_button"); + track_track2_button=new QPushButton(this); track_track2_button->setGeometry(sizeHint().width()-90,175,70,70); track_track2_button->setPalette(track_start_palette); track_track2_button->setFont(font); @@ -304,7 +304,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Finished Button // - track_finished_button=new QPushButton(this,"track_finished_button"); + track_finished_button=new QPushButton(this); if(rdlogedit_conf->enableSecondStart()) { track_finished_button->setGeometry(sizeHint().width()-90,255,70,70); } @@ -319,7 +319,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Previous Button // - track_previous_button=new QPushButton(this,"track_previous_button"); + track_previous_button=new QPushButton(this); track_previous_button-> setGeometry(sizeHint().width()-290,sizeHint().height()-60,80,50); track_previous_button->setFont(font); @@ -329,7 +329,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Next Button // - track_next_button=new QPushButton(this,"track_next_button"); + track_next_button=new QPushButton(this); track_next_button-> setGeometry(sizeHint().width()-200,sizeHint().height()-60,80,50); track_next_button->setFont(font); @@ -339,8 +339,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Play Button // - track_play_button=new RDTransportButton(RDTransportButton::Play,this, - "track_play_button"); + track_play_button=new RDTransportButton(RDTransportButton::Play,this); track_play_button->setGeometry(20,265,80,50); track_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); connect(track_play_button,SIGNAL(clicked()), @@ -349,8 +348,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Stop Button // - track_stop_button=new RDTransportButton(RDTransportButton::Stop,this, - "track_stop_button"); + track_stop_button=new RDTransportButton(RDTransportButton::Stop,this); track_stop_button->setGeometry(110,265,80,50); track_stop_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); track_stop_button->setOnColor(red); @@ -360,17 +358,17 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Audio Meter // - track_meter=new RDStereoMeter(this,"track_meter"); + track_meter=new RDStereoMeter(this); track_meter->setGeometry(205,260,track_meter->sizeHint().width(), track_meter->sizeHint().height()); track_meter->setMode(RDSegMeter::Peak); - track_meter_timer=new QTimer(this,"track_meter_timer"); + track_meter_timer=new QTimer(this); connect(track_meter_timer,SIGNAL(timeout()),this,SLOT(meterData())); // // Track Length Readout // - edit_length_label=new QLabel(this,"edit_length_label"); + edit_length_label=new QLabel(this); edit_length_label->setText("-:--:--.-"); edit_length_label->setGeometry(565,255,110,25); edit_length_label->setAlignment(AlignCenter); @@ -379,23 +377,23 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Tracks Remaining Readout // - QLabel *label=new QLabel(tr("Remaining"),this,"label"); + QLabel *label=new QLabel(tr("Remaining"),this); label->setGeometry(555,288,116,14); label->setFont(small_font); label->setAlignment(Qt::AlignHCenter); label->setPalette(QPalette(backgroundColor(),colorGroup().mid())); - edit_tracks_remaining_label=new QLabel(this,"edit_tracks_remaining_label"); + edit_tracks_remaining_label=new QLabel(this); edit_tracks_remaining_label->setText("0"); edit_tracks_remaining_label->setGeometry(565,313,40,18); edit_tracks_remaining_label->setAlignment(AlignCenter); edit_tracks_remaining_label->setFont(label_font); - label=new QLabel(tr("Tracks"),this,"label"); + label=new QLabel(tr("Tracks"),this); label->setGeometry(565,300,40,14); label->setFont(small_font); label->setAlignment(Qt::AlignHCenter); label->setPalette(QPalette(backgroundColor(),colorGroup().mid())); - edit_time_remaining_label=new QLabel(this,"edit_time_remaining_label"); + edit_time_remaining_label=new QLabel(this); edit_time_remaining_label->setText("0:00:00.0"); edit_time_remaining_label->setGeometry(615,313,60,18); edit_time_remaining_label->setAlignment(AlignCenter); @@ -406,7 +404,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, setColor(QPalette::Active,QColorGroup::Foreground,red); edit_time_remaining_palette[1]. setColor(QPalette::Inactive,QColorGroup::Foreground,red); - label=new QLabel(tr("Time"),this,"label"); + label=new QLabel(tr("Time"),this); label->setGeometry(615,300,60,14); label->setFont(small_font); label->setAlignment(Qt::AlignHCenter); @@ -415,7 +413,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Log List // - track_log_list=new LogListView(this,"track_log_list"); + track_log_list=new LogListView(this); track_log_list-> setGeometry(10,335,sizeHint().width()-120,sizeHint().height()-405); track_log_list->setAllColumnsShowFocus(true); @@ -451,7 +449,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Reset Button // - track_reset_button=new QPushButton(this,"track_reset_button"); + track_reset_button=new QPushButton(this); track_reset_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-160,70,70); track_reset_button->setFont(font); @@ -461,7 +459,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Hit Post Button // - track_post_button=new QPushButton(this,"track_post_button"); + track_post_button=new QPushButton(this); track_post_button->setGeometry(sizeHint().width()-90,360,70,70); track_post_button->setFont(font); track_post_button->setText(tr("Hit Post")); @@ -470,7 +468,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Insert Track Button // - track_insert_button=new QPushButton(this,"track_insert_button"); + track_insert_button=new QPushButton(this); track_insert_button->setGeometry(20,sizeHint().height()-60,80,50); track_insert_button->setFont(font); track_insert_button->setText(tr("Insert\nTrack")); @@ -479,7 +477,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Delete Track Button // - track_delete_button=new QPushButton(this,"track_delete_button"); + track_delete_button=new QPushButton(this); track_delete_button->setGeometry(110,sizeHint().height()-60,80,50); track_delete_button->setFont(font); track_delete_button->setText(tr("Delete\nTrack")); @@ -488,7 +486,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Close Button // - track_close_button=new QPushButton(this,"track_close_button"); + track_close_button=new QPushButton(this); track_close_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); track_close_button->setFont(font); diff --git a/rdlogedit/voice_tracker.h b/rdlogedit/voice_tracker.h index 14a00bbf5..84c7fda79 100644 --- a/rdlogedit/voice_tracker.h +++ b/rdlogedit/voice_tracker.h @@ -2,9 +2,7 @@ // // A Rivendell Voice Tracker // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: voice_tracker.h,v 1.50 2010/09/16 19:52:08 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -78,8 +76,7 @@ class VoiceTracker : public QDialog { Q_OBJECT public: - VoiceTracker(const QString &logname,QString *import_path, - QWidget *parent=0,const char *name=0); + VoiceTracker(const QString &logname,QString *import_path,QWidget *parent=0); ~VoiceTracker(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogin/Makefile.am b/rdlogin/Makefile.am index f686e0f12..dbdc34147 100644 --- a/rdlogin/Makefile.am +++ b/rdlogin/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdlogin ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.22.8.2 2013/01/01 21:36:31 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp index c4ddb3cb5..607ec76ff 100644 --- a/rdlogin/rdlogin.cpp +++ b/rdlogin/rdlogin.cpp @@ -2,9 +2,7 @@ // // The User Login/Logout Utility for Rivendell. // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: rdlogin.cpp,v 1.35.4.2 2014/01/21 21:59:32 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,15 +42,13 @@ #include - // // Icons // #include "../icons/rivendell-22x22.xpm" - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { login_user_width=160; @@ -104,7 +100,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Text Validator // - RDTextValidator *validator=new RDTextValidator(this,"validator"); + RDTextValidator *validator=new RDTextValidator(this); // // Ensure that the system daemons are running @@ -153,7 +149,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // User Label // - login_label=new QLabel(this,"login_label"); + login_label=new QLabel(this); login_label->setFont(label_font); login_label->setAlignment(AlignCenter); login_label->setText(tr("Current User: unknown")); @@ -161,7 +157,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // User Name // - login_username_box=new QComboBox(this,"login_username_box"); + login_username_box=new QComboBox(this); login_username_box->setFont(line_edit_font); login_username_box->setFocus(); QFontMetrics fm(line_edit_font); @@ -178,21 +174,19 @@ MainWidget::MainWidget(QWidget *parent,const char *name) if(login_user_width>900) { login_user_width=900; } - login_username_label=new QLabel(login_username_box,tr("&Username:"), - this,"login_username_label"); + login_username_label=new QLabel(login_username_box,tr("&Username:"),this); login_username_label->setFont(small_label_font); login_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); // // Password // - login_password_edit=new QLineEdit(this,"login_password_edit"); + login_password_edit=new QLineEdit(this); login_password_edit->setFont(line_edit_font); login_password_edit->setMaxLength(16); login_password_edit->setValidator(validator); login_password_edit->setEchoMode(QLineEdit::Password); - login_password_label=new QLabel(login_password_edit,tr("&Password:"), - this,"login_password_label"); + login_password_label=new QLabel(login_password_edit,tr("&Password:"),this); login_password_label->setFont(small_label_font); login_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); connect(login_password_edit,SIGNAL(returnPressed()),this,SLOT(loginData())); @@ -200,7 +194,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Login Button // - login_button=new QPushButton(this,"login_button"); + login_button=new QPushButton(this); login_button->setFont(button_font); login_button->setText(tr("&Set User")); connect(login_button,SIGNAL(clicked()),this,SLOT(loginData())); @@ -208,7 +202,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Logout Button // - logout_button=new QPushButton(this,"logout_button"); + logout_button=new QPushButton(this); logout_button->setFont(button_font); logout_button->setText(tr("&Default\nUser")); connect(logout_button,SIGNAL(clicked()),this,SLOT(logoutData())); @@ -216,7 +210,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Cancel Button // - cancel_button=new QPushButton(this,"cancel_button"); + cancel_button=new QPushButton(this); cancel_button->setFont(button_font); cancel_button->setText(tr("&Cancel")); connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); @@ -353,7 +347,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/rdlogin/rdlogin.h b/rdlogin/rdlogin.h index 912410485..09de5016f 100644 --- a/rdlogin/rdlogin.h +++ b/rdlogin/rdlogin.h @@ -2,9 +2,7 @@ // // The User Login/Logout Utility for Rivendell. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdlogin.h,v 1.14 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDLOGIN_H #define RDLOGIN_H @@ -37,12 +34,11 @@ #include #include - class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); ~MainWidget(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogin/rdlogin.pro b/rdlogin/rdlogin.pro index b7f5fcfed..1932365d1 100644 --- a/rdlogin/rdlogin.pro +++ b/rdlogin/rdlogin.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDLogin. # -# (C) Copyright 2003-2005 Fred Gleason -# -# $Id: rdlogin.pro,v 1.7.8.1 2013/01/01 21:36:31 cvs Exp $ +# (C) Copyright 2003-2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/Makefile.am b/rdlogmanager/Makefile.am index 0ba0cc4c6..c1b458a55 100644 --- a/rdlogmanager/Makefile.am +++ b/rdlogmanager/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdlogmanager ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.39.8.4 2013/01/01 21:36:31 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/add_clock.cpp b/rdlogmanager/add_clock.cpp index be4a44707..0a03d31ff 100644 --- a/rdlogmanager/add_clock.cpp +++ b/rdlogmanager/add_clock.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_clock.cpp,v 1.13.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,9 +35,8 @@ #include #include - -AddClock::AddClock(QString *logname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddClock::AddClock(QString *logname,QWidget *parent) + : QDialog(parent,"",true) { clock_name=logname; @@ -97,12 +94,12 @@ AddClock::AddClock(QString *logname,QWidget *parent,const char *name) // // Clock Name // - clock_name_edit=new QLineEdit(this,"clock_name_edit"); + clock_name_edit=new QLineEdit(this); clock_name_edit->setGeometry(145,11,sizeHint().width()-155,19); clock_name_edit->setMaxLength(58); // MySQL limitation! clock_name_edit->setValidator(validator); - QLabel *clock_name_label=new QLabel(clock_name_edit,tr("&New Clock Name:"), - this,"clock_name_label"); + QLabel *clock_name_label= + new QLabel(clock_name_edit,tr("&New Clock Name:"),this); clock_name_label->setGeometry(10,11,130,19); clock_name_label->setFont(font); clock_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -110,7 +107,7 @@ AddClock::AddClock(QString *logname,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -120,7 +117,7 @@ AddClock::AddClock(QString *logname,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdlogmanager/add_clock.h b/rdlogmanager/add_clock.h index 5d3be5d85..dc9c037a6 100644 --- a/rdlogmanager/add_clock.h +++ b/rdlogmanager/add_clock.h @@ -2,9 +2,7 @@ // // Add a Rivendell Log Manager Clock // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_clock.h,v 1.5.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class AddClock : public QDialog { Q_OBJECT public: - AddClock(QString *logname,QWidget *parent=0,const char *name=0); + AddClock(QString *logname,QWidget *parent=0); ~AddClock(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/add_event.cpp b/rdlogmanager/add_event.cpp index c3f337f8b..6a788ef94 100644 --- a/rdlogmanager/add_event.cpp +++ b/rdlogmanager/add_event.cpp @@ -2,9 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002 Fred Gleason -// -// $Id: add_event.cpp,v 1.13.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,9 +37,8 @@ #include #include - -AddEvent::AddEvent(QString *logname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +AddEvent::AddEvent(QString *logname,QWidget *parent) + : QDialog(parent,"",true) { event_name=logname; @@ -99,12 +96,12 @@ AddEvent::AddEvent(QString *logname,QWidget *parent,const char *name) // // Event Name // - event_name_edit=new QLineEdit(this,"event_name_edit"); + event_name_edit=new QLineEdit(this); event_name_edit->setGeometry(145,11,sizeHint().width()-155,19); event_name_edit->setMaxLength(58); // MySQL limitation! event_name_edit->setValidator(validator); - QLabel *event_name_label=new QLabel(event_name_edit,tr("&New Event Name:"), - this,"event_name_label"); + QLabel *event_name_label= + new QLabel(event_name_edit,tr("&New Event Name:"),this); event_name_label->setGeometry(10,11,130,19); event_name_label->setFont(font); event_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -112,7 +109,7 @@ AddEvent::AddEvent(QString *logname,QWidget *parent,const char *name) // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -122,7 +119,7 @@ AddEvent::AddEvent(QString *logname,QWidget *parent,const char *name) // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdlogmanager/add_event.h b/rdlogmanager/add_event.h index 3b9373482..db687860e 100644 --- a/rdlogmanager/add_event.h +++ b/rdlogmanager/add_event.h @@ -2,9 +2,7 @@ // // Add a Rivendell Log Manager Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: add_event.h,v 1.5.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +31,11 @@ #include - class AddEvent : public QDialog { Q_OBJECT public: - AddEvent(QString *logname,QWidget *parent=0,const char *name=0); + AddEvent(QString *logname,QWidget *parent=0); ~AddEvent(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/clock_listview.cpp b/rdlogmanager/clock_listview.cpp index ffb276b28..ee5453287 100644 --- a/rdlogmanager/clock_listview.cpp +++ b/rdlogmanager/clock_listview.cpp @@ -2,9 +2,7 @@ // // The Clock Carts ListView widget for RDLogManager. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: clock_listview.cpp,v 1.7.10.1 2014/06/02 22:26:19 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,16 +27,15 @@ #include #include - -ClockListView::ClockListView(QWidget *parent,const char *name) - : RDListView(parent,name) +ClockListView::ClockListView(QWidget *parent) + : RDListView(parent) { clock_parent=parent; // // Right Button Menu // - clock_menu=new QPopupMenu(this,"clock_menu"); + clock_menu=new QPopupMenu(this); connect(clock_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); clock_menu-> insertItem(tr("Edit Event"),this,SLOT(editEventData()),0,0); diff --git a/rdlogmanager/clock_listview.h b/rdlogmanager/clock_listview.h index f8191aa59..f78f9f7d6 100644 --- a/rdlogmanager/clock_listview.h +++ b/rdlogmanager/clock_listview.h @@ -2,9 +2,7 @@ // // The Clock ListView widget for RDLogManager. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: clock_listview.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class ClockListView : public RDListView Q_OBJECT public: - ClockListView(QWidget *parent,const char *name=0); + ClockListView(QWidget *parent); signals: void editLine(int count); diff --git a/rdlogmanager/commandline_ops.cpp b/rdlogmanager/commandline_ops.cpp index bb259422d..9d1629199 100644 --- a/rdlogmanager/commandline_ops.cpp +++ b/rdlogmanager/commandline_ops.cpp @@ -2,9 +2,7 @@ // // Command Line Operations for RDLogManager // -// (C) Copyright 2012 Fred Gleason -// -// $Id: commandline_ops.cpp,v 1.1.2.6.2.1 2014/05/20 14:01:50 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index 7be15b1d1..eb288838e 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -420,8 +420,7 @@ void EditClock::schedRules() void EditClock::svcData() { - EditPerms *dialog=new EditPerms(edit_name,EditPerms::ObjectClock, - this,"dialog"); + EditPerms *dialog=new EditPerms(edit_name,EditPerms::ObjectClock,this); dialog->exec(); delete dialog; } @@ -479,7 +478,7 @@ void EditClock::saveAsData() } delete q; - AddClock *addclock=new AddClock(&clockname,this,"addclock"); + AddClock *addclock=new AddClock(&clockname,this); if(addclock->exec()<0) { delete addclock; return; @@ -541,8 +540,7 @@ void EditClock::editEventData(int line) if(event==NULL) { return; } - EditEvent *dialog=new EditEvent(event->name(),false,&new_events, - this,"dialog"); + EditEvent *dialog=new EditEvent(event->name(),false,&new_events,this); if(dialog->exec()<-1) { delete dialog; return; diff --git a/rdlogmanager/edit_clock.h b/rdlogmanager/edit_clock.h index 6ee6f9710..0ddd0d9af 100644 --- a/rdlogmanager/edit_clock.h +++ b/rdlogmanager/edit_clock.h @@ -2,7 +2,7 @@ // // Edit A Rivendell Log Clock // -// (C) Copyright 2002-2004 Fred Gleason +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index afe9c80cb..1c4464504 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Event // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: edit_event.cpp,v 1.53.2.4.2.1 2014/06/24 18:27:06 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -45,11 +43,9 @@ #include "../icons/play.xpm" #include "../icons/rml5.xpm" - EditEvent::EditEvent(QString eventname,bool new_event, - std::vector *new_events, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + std::vector *new_events,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -90,12 +86,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Text Filter // - event_lib_filter_edit=new QLineEdit(this,"event_lib_filter_edit"); + event_lib_filter_edit=new QLineEdit(this); event_lib_filter_edit->setGeometry(55,10,CENTER_LINE-70,14); connect(event_lib_filter_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filterChangedData(const QString &))); - QLabel *label=new QLabel(event_lib_filter_edit,tr("Filter:"), - this,"event_lib_filter_label"); + QLabel *label=new QLabel(event_lib_filter_edit,tr("Filter:"),this); label->setFont(bold_font); label->setGeometry(10,10,40,14); label->setAlignment(AlignVCenter|AlignRight); @@ -103,12 +98,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Group Filter // - event_group_box=new QComboBox(this,"event_group_box"); + event_group_box=new QComboBox(this); event_group_box->setGeometry(55,30,CENTER_LINE-70,18); connect(event_group_box,SIGNAL(activated(const QString &)), this,SLOT(filterActivatedData(const QString &))); - label=new QLabel(event_group_box,tr("Group:"), - this,"event_lib_filter_label"); + label=new QLabel(event_group_box,tr("Group:"),this); label->setFont(bold_font); label->setGeometry(10,30,40,18); label->setAlignment(AlignVCenter|AlignRight); @@ -116,32 +110,32 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Type Filter // - event_lib_type_group=new QButtonGroup(this,"cart_type_filter"); + event_lib_type_group=new QButtonGroup(this); event_lib_type_group->setExclusive(true); event_lib_type_group->hide(); connect(event_lib_type_group,SIGNAL(clicked(int)),this,SLOT(filterClickedData(int))); - QRadioButton *rbutton=new QRadioButton(this,"all_button"); + QRadioButton *rbutton=new QRadioButton(this); rbutton->setGeometry(55,55,15,15); event_lib_type_group->insert(rbutton); - label=new QLabel(rbutton,tr("All"),this,"all_button"); + label=new QLabel(rbutton,tr("All"),this); label->setFont(bold_font); label->setGeometry(75,55,30,15); label->setAlignment(AlignVCenter|AlignLeft); rbutton->setChecked(true); - rbutton=new QRadioButton(this,"audio_button"); + rbutton=new QRadioButton(this); rbutton->setGeometry(125,55,15,15); event_lib_type_group->insert(rbutton); - label=new QLabel(rbutton,tr("Audio Only"),this,"audio_button_label"); + label=new QLabel(rbutton,tr("Audio Only"),this); label->setFont(bold_font); label->setGeometry(145,55,80,15); label->setAlignment(AlignVCenter|AlignLeft); - rbutton=new QRadioButton(this,"macro_button"); + rbutton=new QRadioButton(this); rbutton->setGeometry(235,55,15,15); event_lib_type_group->insert(rbutton); - label=new QLabel(rbutton,tr("Macros Only"),this,"macro_button_label"); + label=new QLabel(rbutton,tr("Macros Only"),this); label->setFont(bold_font); label->setGeometry(255,55,80,15); label->setAlignment(AlignVCenter|AlignLeft); @@ -149,7 +143,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Cart List // - event_lib_list=new LibListView(this,"event_lib_list"); + event_lib_list=new LibListView(this); event_lib_list->setGeometry(10,80,CENTER_LINE-20,sizeHint().height()-300); event_lib_list->setAllColumnsShowFocus(true); event_lib_list->setItemMargin(5); @@ -186,8 +180,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, if(q->first()) { event_player= new RDSimplePlayer(rdcae,rdripc,q->value(0).toInt(),q->value(1).toInt(), - q->value(2).toUInt(),q->value(3).toUInt(), - this,"event_player"); + q->value(2).toUInt(),q->value(3).toUInt(),this); event_player->playButton()-> setGeometry(CENTER_LINE-180,sizeHint().height()-210,80,50); // event_player->stopButton()-> @@ -201,11 +194,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Remarks // - event_remarks_edit=new QTextEdit(this,"event_remarks_edit"); + event_remarks_edit=new QTextEdit(this); event_remarks_edit-> setGeometry(10,sizeHint().height()-150,CENTER_LINE-20,140); event_remarks_edit->setTextFormat(QTextEdit::PlainText); - label=new QLabel(event_remarks_edit,tr("REMARKS"),this,"event_remarks_label"); + label=new QLabel(event_remarks_edit,tr("REMARKS"),this); label->setFont(bold_font); label->setGeometry(15,sizeHint().height()-165,100,15); label->setAlignment(AlignVCenter|AlignLeft); @@ -226,26 +219,25 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Pre-Position Log Section // - event_position_header=new QLabel(tr("PRE-POSITION LOG"), - this,"event_position_header"); + event_position_header=new QLabel(tr("PRE-POSITION LOG"),this); event_position_header->setFont(bold_font); event_position_header->setGeometry(CENTER_LINE+15,10,200,16); - event_position_box=new QCheckBox(this,"event_position_box"); + event_position_box=new QCheckBox(this); event_position_box->setGeometry(CENTER_LINE+15,27,15,22); connect(event_position_box,SIGNAL(toggled(bool)), this,SLOT(prepositionToggledData(bool))); - event_position_label=new QLabel(event_position_box,tr("Cue to this event"), - this,"event_position_label"); + event_position_label= + new QLabel(event_position_box,tr("Cue to this event"),this); event_position_label->setFont(bold_font); event_position_label->setGeometry(CENTER_LINE+35,27,150,22); event_position_label->setAlignment(AlignVCenter|AlignLeft); - event_position_edit=new QTimeEdit(this,"event_position_edit"); + event_position_edit=new QTimeEdit(this); event_position_edit->setGeometry(CENTER_LINE+144,26,60,22); event_position_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); event_position_unit=new QLabel(event_position_box, tr("before scheduled start. (First cart will have a STOP transition.)"), - this,"event_position_unit"); + this); event_position_unit->setFont(bold_font); event_position_unit->setGeometry(CENTER_LINE+212,27, sizeHint().width()-CENTER_LINE-232,22); @@ -254,18 +246,17 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Timed Start Section // - event_timetype_header=new QLabel(tr("TIMED START"), - this,"event_timetype_header"); + event_timetype_header=new QLabel(tr("TIMED START"),this); event_timetype_header->setFont(bold_font); event_timetype_header->setGeometry(CENTER_LINE+15,62,200,16); // // Time Type // - event_timetype_box=new QCheckBox(this,"event_timetype_box"); + event_timetype_box=new QCheckBox(this); event_timetype_box->setGeometry(CENTER_LINE+15,85,15,15); - event_timetype_label=new QLabel(event_timetype_box,tr("Use hard start time"), - this,"event_timetype_label"); + event_timetype_label= + new QLabel(event_timetype_box,tr("Use hard start time"),this); event_timetype_label->setGeometry(CENTER_LINE+35,84,120,16); event_timetype_label->setFont(bold_font); event_timetype_label->setAlignment(AlignLeft|AlignVCenter); @@ -273,10 +264,9 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Post Point // - event_post_box=new QCheckBox(this,"event_post_box"); + event_post_box=new QCheckBox(this); event_post_box->setGeometry(CENTER_LINE+35,108,15,15); - event_post_label=new QLabel(event_post_box,tr("Make Post Point"), - this,"event_post_label"); + event_post_label=new QLabel(event_post_box,tr("Make Post Point"),this); event_post_label->setGeometry(CENTER_LINE+55,107,95,16); event_post_label->setFont(bold_font); event_post_label->setAlignment(AlignLeft|AlignVCenter); @@ -286,14 +276,13 @@ EditEvent::EditEvent(QString eventname,bool new_event, // event_grace_group= new QButtonGroup(1,Qt::Vertical, - tr("Action If Previous Event Still Playing"), - this,"event_grace_group"); + tr("Action If Previous Event Still Playing"),this); event_grace_group->hide(); event_grace_group->setFont(bold_font); event_grace_group->setRadioButtonExclusive(true); - event_grace_label=new QLabel(tr("Action If Previous Event Still Playing"), - this,"event_grace_label"); + event_grace_label= + new QLabel(tr("Action If Previous Event Still Playing"),this); event_grace_label->setGeometry(CENTER_LINE+180,75,225,16); event_grace_label->setFont(bold_font); event_grace_label->setAlignment(AlignCenter); @@ -310,7 +299,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_wait_button->setFont(font); event_grace_group->insert(event_wait_button); - event_grace_edit=new QTimeEdit(this,"event_grace_edit"); + event_grace_edit=new QTimeEdit(this); event_grace_edit->setGeometry(CENTER_LINE+500,95,60,20); event_grace_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); connect(event_timetype_box,SIGNAL(toggled(bool)), @@ -321,7 +310,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Transition Type // - event_transtype_box=new QComboBox(this,"event_transtype_box"); + event_transtype_box=new QComboBox(this); event_transtype_box->setGeometry(CENTER_LINE+390,131,110,26); event_transtype_box->insertItem(tr("Play")); event_transtype_box->insertItem(tr("Segue")); @@ -331,8 +320,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, this,SLOT(timeTransitionData(int))); event_time_label= new QLabel(event_transtype_box, - tr("Transition if previous event ends before start time:"), - this,"event_transtype_label"); + tr("Transition if previous event ends before start time:"),this); event_time_label->setGeometry(CENTER_LINE+15,131,370,26); event_time_label->setFont(bold_font); event_time_label->setAlignment(AlignRight|AlignVCenter); @@ -340,43 +328,40 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Enforcing Length Section // - label=new QLabel(tr("ENFORCING LENGTH"),this,"enforcing_length_label"); + label=new QLabel(tr("ENFORCING LENGTH"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+15,162,200,16); event_autofill_box=new QCheckBox(this,"event_autofill_box"); event_autofill_box->setGeometry(CENTER_LINE+100,182,15,15); - label=new QLabel(event_autofill_box,tr("Use AutoFill"), - this,"event_autofill_label"); + label=new QLabel(event_autofill_box,tr("Use AutoFill"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+120,184,150,15); label->setAlignment(AlignVCenter|AlignLeft); - event_autofill_slop_box=new QCheckBox(this,"event_autofill_slop_box"); + event_autofill_slop_box=new QCheckBox(this); event_autofill_slop_box->setGeometry(CENTER_LINE+210,182,15,15); connect(event_autofill_slop_box,SIGNAL(toggled(bool)), this,SLOT(autofillWarnToggledData(bool))); - event_autofill_slop_label1=new QLabel(event_autofill_slop_box, - tr("Warn if fill is over or under"), - this,"event_autofill_slop_label1"); + event_autofill_slop_label1= + new QLabel(event_autofill_slop_box,tr("Warn if fill is over or under"), + this); event_autofill_slop_label1->setFont(font); event_autofill_slop_label1->setGeometry(CENTER_LINE+230,184,140,15); event_autofill_slop_label1->setAlignment(AlignLeft|AlignVCenter); - event_autofill_slop_edit=new QTimeEdit(this,"event_autofill_slop_edit"); + event_autofill_slop_edit=new QTimeEdit(this); event_autofill_slop_edit->setGeometry(CENTER_LINE+440,179,60,22); event_autofill_slop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); event_autofill_slop_label= - new QLabel(event_autofill_slop_edit, - tr("by at least"),this,"event_autofill_slop_edit"); + new QLabel(event_autofill_slop_edit,tr("by at least"),this); event_autofill_slop_label->setGeometry(CENTER_LINE+370,184,65,15); event_autofill_slop_label->setFont(font); event_autofill_slop_label->setAlignment(AlignRight|AlignVCenter); - event_timescale_box=new QCheckBox(this,"event_timescale_box"); + event_timescale_box=new QCheckBox(this); event_timescale_box->setGeometry(CENTER_LINE+250,182,15,15); - label=new QLabel(event_timescale_box,tr("Use Timescaling"), - this,"event_timescale_label"); + label=new QLabel(event_timescale_box,tr("Use Timescaling"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+270,182,150,15); label->setAlignment(AlignVCenter|AlignLeft); @@ -386,24 +371,23 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Pre-Import Carts Section // - label=new QLabel(tr("PRE-IMPORT CARTS"),this,"preimport_carts_label"); + label=new QLabel(tr("PRE-IMPORT CARTS"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+15,210,200,16); // // Pre-Import Carts List // - event_preimport_length_edit=new QLineEdit(this,"event_preimport_length_edit"); + event_preimport_length_edit=new QLineEdit(this); event_preimport_length_edit->setGeometry(sizeHint().width()-140,208,80,20); event_preimport_length_edit->setReadOnly(true); - label=new QLabel(event_preimport_length_edit,tr("Len:"), - this,"event_preimport_length_label"); + label=new QLabel(event_preimport_length_edit,tr("Len:"),this); label->setFont(bold_font); label->setGeometry(sizeHint().width()-330,210,185,16); label->setAlignment(AlignVCenter|AlignRight); - event_preimport_list=new ImportListView(this,"event_preimport_list"); + event_preimport_list=new ImportListView(this); event_preimport_list->setGeometry(CENTER_LINE+15,227, sizeHint().width()-CENTER_LINE-75,125); event_preimport_list->setAllColumnsShowFocus(true); @@ -426,15 +410,12 @@ EditEvent::EditEvent(QString eventname,bool new_event, this,SLOT(cartClickedData(QListViewItem *))); connect(event_preimport_list,SIGNAL(lengthChanged(int)), this,SLOT(preimportLengthChangedData(int))); - event_preimport_up_button= - new RDTransportButton(RDTransportButton::Up,this, - "event_preimport_up_button"); + event_preimport_up_button=new RDTransportButton(RDTransportButton::Up,this); event_preimport_up_button->setGeometry(sizeHint().width()-50,237,40,40); connect(event_preimport_up_button,SIGNAL(clicked()), this,SLOT(preimportUpData())); event_preimport_down_button= - new RDTransportButton(RDTransportButton::Down,this, - "event_preimport_down_button"); + new RDTransportButton(RDTransportButton::Down,this); event_preimport_down_button->setGeometry(sizeHint().width()-50,302,40,40); connect(event_preimport_down_button,SIGNAL(clicked()), this,SLOT(preimportDownData())); @@ -442,46 +423,42 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Import Section // - label=new QLabel(tr("IMPORT"),this,"preimport_carts_label"); + label=new QLabel(tr("IMPORT"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+15,362,200,16); - event_source_group=new QButtonGroup(this,"event_source_group"); + event_source_group=new QButtonGroup(this); event_source_group->hide(); connect(event_source_group,SIGNAL(clicked(int)), this,SLOT(importClickedData(int))); - rbutton=new QRadioButton(this,"event_noimport_button"); + rbutton=new QRadioButton(this); event_source_group->insert(rbutton); rbutton->setGeometry(CENTER_LINE+100,362,15,15); - label=new QLabel(rbutton,tr("None"), - this,"event_noimport_label"); + label=new QLabel(rbutton,tr("None"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+120,362,150,15); label->setAlignment(AlignVCenter|AlignLeft); - rbutton=new QRadioButton(this,"event_traffic_button"); + rbutton=new QRadioButton(this); event_source_group->insert(rbutton); rbutton->setGeometry(CENTER_LINE+200,362,15,15); - label=new QLabel(rbutton,tr("From Traffic"), - this,"event_traffic_label"); + label=new QLabel(rbutton,tr("From Traffic"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+220,362,150,15); label->setAlignment(AlignVCenter|AlignLeft); - rbutton=new QRadioButton(this,"event_music_button"); + rbutton=new QRadioButton(this); rbutton->setGeometry(CENTER_LINE+300,362,15,15); event_source_group->insert(rbutton); - label=new QLabel(rbutton,tr("From Music"), - this,"event_music_label"); + label=new QLabel(rbutton,tr("From Music"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+320,362,150,15); label->setAlignment(AlignVCenter|AlignLeft); - rbutton=new QRadioButton(this,"event_scheduler_button"); + rbutton=new QRadioButton(this); rbutton->setGeometry(CENTER_LINE+400,362,15,15); event_source_group->insert(rbutton); - label=new QLabel(rbutton,tr("Select from:"), - this,"event_scheduler_label"); + label=new QLabel(rbutton,tr("Select from:"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+420,362,150,15); label->setAlignment(AlignVCenter|AlignLeft); @@ -489,7 +466,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // Scheduler Group - event_sched_group_box=new QComboBox(this,"event_sched_group_box"); + event_sched_group_box=new QComboBox(this); event_sched_group_box->setGeometry(CENTER_LINE+510,359,100,20); QString sql2="select NAME from GROUPS order by NAME"; RDSqlQuery *q2=new RDSqlQuery(sql2); @@ -500,13 +477,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // Title Separation SpinBox - event_title_sep_label= - new QLabel(tr("Title Separation"),this,"event_title_sep_label"); + event_title_sep_label=new QLabel(tr("Title Separation"),this); event_title_sep_label->setFont(bold_font); event_title_sep_label->setGeometry(CENTER_LINE+420,383,100,20); - - event_title_sep_spinbox = new QSpinBox( this, "event_title_sep_spinbox" ); + event_title_sep_spinbox=new QSpinBox(this); event_title_sep_spinbox->setGeometry(CENTER_LINE+510,383,50,20); event_title_sep_spinbox->setMinValue( 0 ); event_title_sep_spinbox->setMaxValue( 50000 ); @@ -514,12 +489,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // Must have code.. - event_have_code_label= - new QLabel(tr("Must have code"),this,"event_have_code_label"); + event_have_code_label=new QLabel(tr("Must have code"),this); event_have_code_label->setFont(bold_font); event_have_code_label->setGeometry(CENTER_LINE+420,404,100,20); - event_have_code_box=new QComboBox(this,"event_have_code_box"); + event_have_code_box=new QComboBox(this); event_have_code_box->setGeometry(CENTER_LINE+510,404,100,20); event_have_code_box->insertItem(""); sql2="select CODE from SCHED_CODES order by CODE"; @@ -531,12 +505,11 @@ EditEvent::EditEvent(QString eventname,bool new_event, // And code - event_have_code2_label= - new QLabel(tr("and code"),this,"event_have_code2_label"); + event_have_code2_label=new QLabel(tr("and code"),this); event_have_code2_label->setFont(bold_font); event_have_code2_label->setGeometry(CENTER_LINE+420,425,100,20); - event_have_code2_box=new QComboBox(this,"event_have_code2_box"); + event_have_code2_box=new QComboBox(this); event_have_code2_box->setGeometry(CENTER_LINE+510,425,100,20); event_have_code2_box->insertItem(""); sql2="select CODE from SCHED_CODES order by CODE"; @@ -550,16 +523,14 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Start Slop Time // - event_startslop_label= - new QLabel(tr("Import carts scheduled"),this,"start_slop_label"); + event_startslop_label=new QLabel(tr("Import carts scheduled"),this); event_startslop_label->setFont(bold_font); event_startslop_label->setGeometry(CENTER_LINE+30,383,140,22); event_startslop_label->setAlignment(AlignVCenter|AlignLeft); - event_startslop_edit=new QTimeEdit(this,"event_startslop_edit"); + event_startslop_edit=new QTimeEdit(this); event_startslop_edit->setGeometry(CENTER_LINE+171,383,60,22); event_startslop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); - event_startslop_unit=new QLabel(tr("prior to the start of this event."), - this,"event_startslop_label"); + event_startslop_unit=new QLabel(tr("prior to the start of this event."),this); event_startslop_unit->setFont(bold_font); event_startslop_unit->setGeometry(CENTER_LINE+235,383, sizeHint().width()-CENTER_LINE-460,22); @@ -568,35 +539,33 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // End Slop Time // - event_endslop_label= - new QLabel(tr("Import carts scheduled"),this,"end_slop_label"); + event_endslop_label=new QLabel(tr("Import carts scheduled"),this); event_endslop_label->setFont(bold_font); event_endslop_label->setGeometry(CENTER_LINE+30,404,140,22); event_endslop_label->setAlignment(AlignVCenter|AlignLeft); - event_endslop_edit=new QTimeEdit(this,"event_endslop_edit"); + event_endslop_edit=new QTimeEdit(this); event_endslop_edit->setGeometry(CENTER_LINE+171,404,60,22); event_endslop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); - event_endslop_unit=new QLabel(tr("after the end of this event."), - this,"event_endslop_label"); + event_endslop_unit=new QLabel(tr("after the end of this event."),this); event_endslop_unit->setFont(bold_font); event_endslop_unit->setGeometry(CENTER_LINE+235,404, - sizeHint().width()-CENTER_LINE-460,22); + sizeHint().width()-CENTER_LINE-460,22); event_endslop_unit->setAlignment(AlignVCenter|AlignLeft); // // First Cart Transition Type // event_firsttrans_label= - new QLabel(tr("First cart has a"),this,"first_cart_label"); + new QLabel(tr("First cart has a"),this); event_firsttrans_label->setFont(bold_font); event_firsttrans_label->setGeometry(CENTER_LINE+30,428,140,22); event_firsttrans_label->setAlignment(AlignVCenter|AlignLeft); - event_firsttrans_box=new QComboBox(this,"event_firsttrans_box"); + event_firsttrans_box=new QComboBox(this); event_firsttrans_box->setGeometry(CENTER_LINE+123,428,90,22); event_firsttrans_box->insertItem(tr("Play")); event_firsttrans_box->insertItem(tr("Segue")); event_firsttrans_box->insertItem(tr("Stop")); - event_firsttrans_unit=new QLabel("transition.",this,"first_cart_label"); + event_firsttrans_unit=new QLabel("transition.",this); event_firsttrans_unit->setFont(bold_font); event_firsttrans_unit->setGeometry(CENTER_LINE+215,428, sizeHint().width()-CENTER_LINE-450,22); @@ -605,18 +574,16 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Default Transition Type // - event_defaulttrans_label=new QLabel(tr("Imported carts have a"), - this,"default_cart_label"); + event_defaulttrans_label=new QLabel(tr("Imported carts have a"),this); event_defaulttrans_label->setFont(bold_font); event_defaulttrans_label->setGeometry(CENTER_LINE+30,451,180,22); event_defaulttrans_label->setAlignment(AlignVCenter|AlignLeft); - event_defaulttrans_box=new QComboBox(this,"event_endslop_edit"); + event_defaulttrans_box=new QComboBox(this); event_defaulttrans_box->setGeometry(CENTER_LINE+163,451,90,22); event_defaulttrans_box->insertItem(tr("Play")); event_defaulttrans_box->insertItem(tr("Segue")); event_defaulttrans_box->insertItem(tr("Stop")); - event_defaulttrans_unit=new QLabel(tr("transition."), - this,"default_cart_unit"); + event_defaulttrans_unit=new QLabel(tr("transition."),this); event_defaulttrans_unit->setFont(bold_font); event_defaulttrans_unit->setGeometry(CENTER_LINE+255,451, sizeHint().width()-CENTER_LINE-420,22); @@ -625,16 +592,14 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Nested Event // - event_nestevent_label=new QLabel(tr("Import inline traffic with the"), - this,"default_cart_label"); + event_nestevent_label=new QLabel(tr("Import inline traffic with the"),this); event_nestevent_label->setFont(bold_font); event_nestevent_label->setGeometry(CENTER_LINE+30,474,190,22); event_nestevent_label->setAlignment(AlignVCenter|AlignLeft); - event_nestevent_box=new QComboBox(this,"event_endslop_edit"); + event_nestevent_box=new QComboBox(this); event_nestevent_box->setGeometry(CENTER_LINE+183,474,365,22); event_nestevent_box->insertItem(tr("[none]")); - event_nestevent_unit=new QLabel(tr("event."), - this,"default_cart_unit"); + event_nestevent_unit=new QLabel(tr("event."),this); event_nestevent_unit->setFont(bold_font); event_nestevent_unit->setGeometry(CENTER_LINE+553,474,40,22); event_nestevent_unit->setAlignment(AlignVCenter|AlignLeft); @@ -642,23 +607,22 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Post-Import Carts Section // - label=new QLabel(tr("POST-IMPORT CARTS"),this,"postimport_carts_label"); + label=new QLabel(tr("POST-IMPORT CARTS"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+15,505,200,16); // // Post-Import Carts List // - event_postimport_length_edit=new QLineEdit(this,"event_postimport_length_edit"); + event_postimport_length_edit=new QLineEdit(this); event_postimport_length_edit->setGeometry(sizeHint().width()-140,503,80,20); event_postimport_length_edit->setReadOnly(true); - label=new QLabel(event_postimport_length_edit,tr("Len:"), - this,"event_postimport_length_label"); + label=new QLabel(event_postimport_length_edit,tr("Len:"),this); label->setFont(bold_font); label->setGeometry(sizeHint().width()-330,505,185,16); label->setAlignment(AlignVCenter|AlignRight); - event_postimport_list=new ImportListView(this,"event_postimport_list"); + event_postimport_list=new ImportListView(this); event_postimport_list->setGeometry(CENTER_LINE+15,522, sizeHint().width()-CENTER_LINE-75,125); event_postimport_list->setAllColumnsShowFocus(true); @@ -681,14 +645,12 @@ EditEvent::EditEvent(QString eventname,bool new_event, connect(event_postimport_list,SIGNAL(lengthChanged(int)), this,SLOT(postimportLengthChangedData(int))); event_postimport_up_button= - new RDTransportButton(RDTransportButton::Up,this, - "event_postimport_up_button"); + new RDTransportButton(RDTransportButton::Up,this); event_postimport_up_button->setGeometry(sizeHint().width()-50,532,40,40); connect(event_postimport_up_button,SIGNAL(clicked()), this,SLOT(postimportUpData())); event_postimport_down_button= - new RDTransportButton(RDTransportButton::Down,this, - "event_postimport_down_button"); + new RDTransportButton(RDTransportButton::Down,this); event_postimport_down_button->setGeometry(sizeHint().width()-50,597,40,40); connect(event_postimport_down_button,SIGNAL(clicked()), this,SLOT(postimportDownData())); @@ -696,7 +658,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Save Button // - QPushButton *button=new QPushButton(this,"save_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(CENTER_LINE+10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Save")); @@ -705,7 +667,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Save As Button // - button=new QPushButton(this,"save_as_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+100,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("Save &As")); @@ -714,7 +676,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Service Association Button // - button=new QPushButton(this,"svc_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+(sizeHint().width()-CENTER_LINE)/2-85, sizeHint().height()-60,80,50); button->setFont(bold_font); @@ -724,7 +686,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Color Button // - event_color_button=new QPushButton(this,"event_color_button"); + event_color_button=new QPushButton(this); event_color_button-> setGeometry(CENTER_LINE+(sizeHint().width()-CENTER_LINE)/2+5, sizeHint().height()-60,80,50); @@ -735,7 +697,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // OK Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -745,7 +707,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Cancel")); @@ -768,32 +730,32 @@ EditEvent::EditEvent(QString eventname,bool new_event, int grace=0; switch(event_event->timeType()) { - case RDLogLine::Relative: - event_timetype_box->setChecked(false); - event_grace_group->setButton(0); - timeToggledData(false); - break; + case RDLogLine::Relative: + event_timetype_box->setChecked(false); + event_grace_group->setButton(0); + timeToggledData(false); + break; - case RDLogLine::Hard: - event_timetype_box->setChecked(true); - event_post_box->setChecked(event_event->postPoint()); - event_transtype_box->setCurrentItem(event_event->firstTransType()); - switch((grace=event_event->graceTime())) { - case 0: - event_grace_group->setButton(0); - event_grace_edit->setTime(QTime()); - break; + case RDLogLine::Hard: + event_timetype_box->setChecked(true); + event_post_box->setChecked(event_event->postPoint()); + event_transtype_box->setCurrentItem(event_event->firstTransType()); + switch((grace=event_event->graceTime())) { + case 0: + event_grace_group->setButton(0); + event_grace_edit->setTime(QTime()); + break; - case -1: - event_grace_group->setButton(1); - event_grace_edit->setTime(QTime()); - break; + case -1: + event_grace_group->setButton(1); + event_grace_edit->setTime(QTime()); + break; - default: - event_grace_group->setButton(2); - event_grace_edit->setTime(QTime().addMSecs(grace)); - break; - } + default: + event_grace_group->setButton(2); + event_grace_edit->setTime(QTime().addMSecs(grace)); + break; + } } event_autofill_box->setChecked(event_event->useAutofill()); @@ -1207,7 +1169,7 @@ void EditEvent::saveAsData() QString str; old_name=event_name; - AddEvent *add_dialog=new AddEvent(&event_name,this,"add_dialog"); + AddEvent *add_dialog=new AddEvent(&event_name,this); if(add_dialog->exec()<0) { delete add_dialog; return; @@ -1255,8 +1217,7 @@ void EditEvent::saveAsData() void EditEvent::svcData() { - EditPerms *dialog=new EditPerms(event_name,EditPerms::ObjectEvent, - this,"dialog"); + EditPerms *dialog=new EditPerms(event_name,EditPerms::ObjectEvent,this); dialog->exec(); delete dialog; } @@ -1264,8 +1225,8 @@ void EditEvent::svcData() void EditEvent::colorData() { - QColor color=QColorDialog::getColor(event_color_button->backgroundColor(), - this,"color_dialog"); + QColor color= + QColorDialog::getColor(event_color_button->backgroundColor(),this); if(color.isValid()) { event_color_button->setPalette(QPalette(color,backgroundColor())); } diff --git a/rdlogmanager/edit_event.h b/rdlogmanager/edit_event.h index 88adb6d54..a31d8020a 100644 --- a/rdlogmanager/edit_event.h +++ b/rdlogmanager/edit_event.h @@ -2,9 +2,7 @@ // // Edit a Rivendell Log Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_event.h,v 1.24.8.1 2013/12/30 20:37:01 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -59,7 +57,7 @@ class EditEvent : public QDialog Q_OBJECT public: EditEvent(QString eventname,bool new_event,std::vector *new_events, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); ~EditEvent(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_eventline.cpp b/rdlogmanager/edit_eventline.cpp index fedbbcfd1..70b6d0379 100644 --- a/rdlogmanager/edit_eventline.cpp +++ b/rdlogmanager/edit_eventline.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Log Eventline // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_eventline.cpp,v 1.16 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/edit_eventline.h b/rdlogmanager/edit_eventline.h index f1fcfd7a8..53a0b4601 100644 --- a/rdlogmanager/edit_eventline.h +++ b/rdlogmanager/edit_eventline.h @@ -2,9 +2,7 @@ // // Edit A Rivendell Log Clock // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_eventline.h,v 1.7 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index cbc637ebf..f2719ade6 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -39,7 +39,6 @@ #include #include - EditGrid::EditGrid(QString servicename,QWidget *parent) : QDialog(parent,"",true) { diff --git a/rdlogmanager/edit_grid.h b/rdlogmanager/edit_grid.h index e21d9f49b..8884d85c1 100644 --- a/rdlogmanager/edit_grid.h +++ b/rdlogmanager/edit_grid.h @@ -31,7 +31,6 @@ #include #include - class EditGrid : public QDialog { Q_OBJECT diff --git a/rdlogmanager/edit_note.cpp b/rdlogmanager/edit_note.cpp index 6a453ff74..4b346360c 100644 --- a/rdlogmanager/edit_note.cpp +++ b/rdlogmanager/edit_note.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_note.cpp,v 1.7.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +31,8 @@ #include -EditNote::EditNote(QString *text,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditNote::EditNote(QString *text,QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Edit Log Note")); edit_text=text; @@ -58,7 +56,7 @@ EditNote::EditNote(QString *text,QWidget *parent,const char *name) // // The Text Editor // - edit_text_edit=new QTextEdit(this,"edit_text_edit"); + edit_text_edit=new QTextEdit(this); edit_text_edit->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_text_edit->setText(*edit_text); @@ -66,7 +64,7 @@ EditNote::EditNote(QString *text,QWidget *parent,const char *name) // // OK Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -76,7 +74,7 @@ EditNote::EditNote(QString *text,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Cancel")); diff --git a/rdlogmanager/edit_note.h b/rdlogmanager/edit_note.h index 79ae76cc6..a89c4fe32 100644 --- a/rdlogmanager/edit_note.h +++ b/rdlogmanager/edit_note.h @@ -2,9 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_note.h,v 1.5.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,7 @@ class EditNote : public QDialog { Q_OBJECT public: - EditNote(QString *text,QWidget *parent=0,const char *name=0); + EditNote(QString *text,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_perms.cpp b/rdlogmanager/edit_perms.cpp index 8053e2357..1495637c7 100644 --- a/rdlogmanager/edit_perms.cpp +++ b/rdlogmanager/edit_perms.cpp @@ -2,9 +2,7 @@ // // Edit RDLogManager Service Associations // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_perms.cpp,v 1.10.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,9 +36,8 @@ #include -EditPerms::EditPerms(QString object_name,ObjectType type, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditPerms::EditPerms(QString object_name,ObjectType type,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -70,7 +67,7 @@ EditPerms::EditPerms(QString object_name,ObjectType type, // // Services Selector // - svc_object_sel=new RDListSelector(this,"svc_object_sel"); + svc_object_sel=new RDListSelector(this); svc_object_sel->setGeometry(10,10,380,130); svc_object_sel->sourceSetLabel(tr("Available Services")); svc_object_sel->destSetLabel(tr("Enabled Services")); @@ -78,7 +75,7 @@ EditPerms::EditPerms(QString object_name,ObjectType type, // // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -88,7 +85,7 @@ EditPerms::EditPerms(QString object_name,ObjectType type, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); diff --git a/rdlogmanager/edit_perms.h b/rdlogmanager/edit_perms.h index 7e5b19c56..339b393e1 100644 --- a/rdlogmanager/edit_perms.h +++ b/rdlogmanager/edit_perms.h @@ -2,9 +2,7 @@ // // Edit RDLogManager Service Associations // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_perms.h,v 1.6.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,14 +28,12 @@ #include - class EditPerms : public QDialog { Q_OBJECT public: enum ObjectType {ObjectEvent=1,ObjectClock=2}; - EditPerms(QString object_name,ObjectType type, - QWidget *parent=0,const char *name=0); + EditPerms(QString object_name,ObjectType type,QWidget *parent=0); ~EditPerms(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp index 378780376..d48092ad5 100644 --- a/rdlogmanager/edit_schedcoderules.cpp +++ b/rdlogmanager/edit_schedcoderules.cpp @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -36,126 +34,123 @@ #include #include - - -editSchedCodeRules::editSchedCodeRules(QListViewItem *item,SchedRulesList *sched_rules_list, QWidget* parent, const char* name) - : QDialog( parent, name, true) +editSchedCodeRules::editSchedCodeRules(QListViewItem *item, + SchedRulesList *sched_rules_list, + QWidget* parent) + : QDialog(parent,"",true) { - item_edit = item; - - if ( !name ) - setName( "editSchedCodeRules" ); - // - // Fix the Window Size - // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - setCaption(tr("Edit Rules for Code")); - - - // Create Font - QFont font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - - - buttonOk = new QPushButton( this, "buttonOk" ); - buttonOk->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); - buttonOk->setText( tr( "&OK" ) ); - buttonOk->setDefault( true ); - buttonOk->setFont( font ); - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( okData() ) ); - - buttonCancel = new QPushButton( this, "buttonCancel" ); - buttonCancel->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); - buttonCancel->setText( tr( "&Cancel" ) ); - buttonCancel->setFont( font ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( cancelData() ) ); + item_edit = item; + + // + // Fix the Window Size + // + setMinimumWidth(sizeHint().width()); + setMaximumWidth(sizeHint().width()); + setMinimumHeight(sizeHint().height()); + setMaximumHeight(sizeHint().height()); - label_code_name = new QLabel( this, "label_code_name" ); - label_code_name->setGeometry( QRect( 40, 10, 150, 20 ) ); - label_code_name->setText( tr( "Code:" ) ); - label_code_name->setFont( font ); - label_code_name->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - label_max_row = new QLabel( this, "label_max_row" ); - label_max_row->setGeometry( QRect( 30, 80, 160, 20 ) ); - label_max_row->setText( tr( "Max. in a row:" ) ); - label_max_row->setFont( font ); - label_max_row->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - label_min_wait = new QLabel( this, "label_min_wait" ); - label_min_wait->setGeometry( QRect( 30, 110, 160, 20 ) ); - label_min_wait->setText( tr( "Min. wait:" ) ); - label_min_wait->setFont( font ); - label_min_wait->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - label_not_after = new QLabel( this, "label_not_after" ); - label_not_after->setGeometry( QRect( 30, 140, 160, 20 ) ); - label_not_after->setText( tr( "Do not schedule after:" ) ); - label_not_after->setFont( font ); - label_not_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - label_or_after = new QLabel( this, "label_or_after" ); - label_or_after->setGeometry( QRect( 30, 180, 160, 20 ) ); - label_or_after->setText( tr( "Or after:" ) ); - label_or_after->setFont( font ); - label_or_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - label_or_after_II = new QLabel( this, "label_or_after_II" ); - label_or_after_II->setGeometry( QRect( 30, 220, 160, 20 ) ); - label_or_after_II->setText( tr( "Or after:" ) ); - label_or_after_II->setFont( font ); - label_or_after_II->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); - - spinBox_max_row = new QSpinBox( this, "spinBox_max_row" ); - spinBox_max_row->setGeometry( QRect( 200, 80, 70, 20 ) ); - spinBox_max_row->setMaxValue( 999 ); - spinBox_max_row->setLineStep( 1 ); - spinBox_max_row->setValue( item->text(1).toInt() ); - - spinBox_min_wait = new QSpinBox( this, "spinBox_min_wait" ); - spinBox_min_wait->setGeometry( QRect( 200, 110, 70, 20 ) ); - spinBox_min_wait->setMaxValue( 999 ); - spinBox_max_row->setLineStep( 1 ); - spinBox_min_wait->setValue( item->text(2).toInt() ); - - label_code = new QLabel( this, "label_code" ); - label_code->setGeometry( QRect( 200, 10, 90, 20 ) ); - label_code->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); - label_code->setText( item->text(0) ); + setCaption(tr("Edit Rules for Code")); + + + // Create Font + QFont font=QFont("Helvetica",12,QFont::Bold); + font.setPixelSize(12); + + buttonOk = new QPushButton(this); + buttonOk->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); + buttonOk->setText( tr( "&OK" ) ); + buttonOk->setDefault( true ); + buttonOk->setFont( font ); + connect( buttonOk, SIGNAL( clicked() ), this, SLOT( okData() ) ); + + buttonCancel = new QPushButton(this); + buttonCancel->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); + buttonCancel->setText( tr( "&Cancel" ) ); + buttonCancel->setFont( font ); + connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( cancelData() ) ); + + label_code_name = new QLabel(this); + label_code_name->setGeometry( QRect( 40, 10, 150, 20 ) ); + label_code_name->setText( tr( "Code:" ) ); + label_code_name->setFont( font ); + label_code_name->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + label_max_row = new QLabel(this); + label_max_row->setGeometry( QRect( 30, 80, 160, 20 ) ); + label_max_row->setText( tr( "Max. in a row:" ) ); + label_max_row->setFont( font ); + label_max_row->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + label_min_wait = new QLabel(this); + label_min_wait->setGeometry( QRect( 30, 110, 160, 20 ) ); + label_min_wait->setText( tr( "Min. wait:" ) ); + label_min_wait->setFont( font ); + label_min_wait->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + label_not_after = new QLabel(this); + label_not_after->setGeometry( QRect( 30, 140, 160, 20 ) ); + label_not_after->setText( tr( "Do not schedule after:" ) ); + label_not_after->setFont( font ); + label_not_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + label_or_after = new QLabel(this); + label_or_after->setGeometry( QRect( 30, 180, 160, 20 ) ); + label_or_after->setText( tr( "Or after:" ) ); + label_or_after->setFont( font ); + label_or_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + label_or_after_II = new QLabel(this); + label_or_after_II->setGeometry( QRect( 30, 220, 160, 20 ) ); + label_or_after_II->setText( tr( "Or after:" ) ); + label_or_after_II->setFont( font ); + label_or_after_II->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + + spinBox_max_row = new QSpinBox(this); + spinBox_max_row->setGeometry( QRect( 200, 80, 70, 20 ) ); + spinBox_max_row->setMaxValue( 999 ); + spinBox_max_row->setLineStep( 1 ); + spinBox_max_row->setValue( item->text(1).toInt() ); + + spinBox_min_wait = new QSpinBox(this); + spinBox_min_wait->setGeometry( QRect( 200, 110, 70, 20 ) ); + spinBox_min_wait->setMaxValue( 999 ); + spinBox_max_row->setLineStep( 1 ); + spinBox_min_wait->setValue( item->text(2).toInt() ); + + label_code = new QLabel(this); + label_code->setGeometry( QRect( 200, 10, 90, 20 ) ); + label_code->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + label_code->setText( item->text(0) ); - comboBox_not_after = new QComboBox( FALSE, this, "comboBox_not_after" ); - comboBox_not_after->setGeometry( QRect( 200, 140, 180, 30 ) ); - comboBox_not_after->setDuplicatesEnabled( FALSE ); - - comboBox_or_after = new QComboBox( FALSE, this, "comboBox_or_after" ); - comboBox_or_after->setGeometry( QRect( 200, 180, 180, 30 ) ); - comboBox_or_after->setDuplicatesEnabled( FALSE ); - - comboBox_or_after_II = new QComboBox( FALSE, this, "comboBox_or_after_II" ); - comboBox_or_after_II->setGeometry( QRect( 200, 220, 180, 30 ) ); - comboBox_or_after_II->setDuplicatesEnabled( FALSE ); - - comboBox_not_after->insertItem(""); - comboBox_or_after->insertItem(""); - comboBox_or_after_II->insertItem(""); - for (int i=0; igetNumberOfItems(); i++) - { + comboBox_not_after = new QComboBox( FALSE, this); + comboBox_not_after->setGeometry( QRect( 200, 140, 180, 30 ) ); + comboBox_not_after->setDuplicatesEnabled( FALSE ); + + comboBox_or_after = new QComboBox( FALSE, this); + comboBox_or_after->setGeometry( QRect( 200, 180, 180, 30 ) ); + comboBox_or_after->setDuplicatesEnabled( FALSE ); + + comboBox_or_after_II = new QComboBox( FALSE, this); + comboBox_or_after_II->setGeometry( QRect( 200, 220, 180, 30 ) ); + comboBox_or_after_II->setDuplicatesEnabled( FALSE ); + + comboBox_not_after->insertItem(""); + comboBox_or_after->insertItem(""); + comboBox_or_after_II->insertItem(""); + for (int i=0; igetNumberOfItems(); i++) + { comboBox_not_after->insertItem(sched_rules_list->getItemSchedCode(i)); comboBox_or_after->insertItem(sched_rules_list->getItemSchedCode(i)); comboBox_or_after_II->insertItem(sched_rules_list->getItemSchedCode(i)); - } - comboBox_not_after->setCurrentText(item->text(3)); - comboBox_or_after->setCurrentText(item->text(4)); - comboBox_or_after->setCurrentText(item->text(5)); - - label_description = new QLabel( this, "label_description" ); - label_description->setGeometry( QRect( 200, 40, 300, 40 ) ); - label_description->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); - label_description->setText( item->text(6) ); + } + comboBox_not_after->setCurrentText(item->text(3)); + comboBox_or_after->setCurrentText(item->text(4)); + comboBox_or_after->setCurrentText(item->text(5)); + + label_description = new QLabel(this); + label_description->setGeometry( QRect( 200, 40, 300, 40 ) ); + label_description->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + label_description->setText( item->text(6) ); } diff --git a/rdlogmanager/edit_schedcoderules.h b/rdlogmanager/edit_schedcoderules.h index 4a5c90cc6..ee85d4a6c 100644 --- a/rdlogmanager/edit_schedcoderules.h +++ b/rdlogmanager/edit_schedcoderules.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -20,8 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - - #ifndef EDIT_SCHEDCODERULES_H #define EDIT_SCHEDCODERULES_H @@ -39,36 +35,36 @@ class QSpinBox; class editSchedCodeRules : public QDialog { - Q_OBJECT + Q_OBJECT + public: + editSchedCodeRules(QListViewItem *item, SchedRulesList *sched_rules_list, + QWidget *parent=0); + ~editSchedCodeRules(); + QSize sizeHint() const; + QSizePolicy sizePolicy() const; -public: - editSchedCodeRules(QListViewItem *item, SchedRulesList *sched_rules_list, QWidget* parent = 0, const char* name = 0); - ~editSchedCodeRules(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - -private: - QPushButton* buttonOk; - QPushButton* buttonCancel; - QLabel* label_code_name; - QLabel* label_max_row; - QLabel* label_min_wait; - QLabel* label_not_after; - QLabel* label_or_after; - QLabel* label_or_after_II; - QSpinBox* spinBox_max_row; - QSpinBox* spinBox_min_wait; - QLabel* label_code; - QComboBox* comboBox_not_after; - QComboBox* comboBox_or_after; - QComboBox* comboBox_or_after_II; - QLabel* label_description; - QListViewItem *item_edit; - private slots: void okData(); void cancelData(); + private: + QPushButton* buttonOk; + QPushButton* buttonCancel; + QLabel* label_code_name; + QLabel* label_max_row; + QLabel* label_min_wait; + QLabel* label_not_after; + QLabel* label_or_after; + QLabel* label_or_after_II; + QSpinBox* spinBox_max_row; + QSpinBox* spinBox_min_wait; + QLabel* label_code; + QComboBox* comboBox_not_after; + QComboBox* comboBox_or_after; + QComboBox* comboBox_or_after_II; + QLabel* label_description; + QListViewItem *item_edit; + protected: void closeEvent(QCloseEvent *e); }; diff --git a/rdlogmanager/edit_schedrules.cpp b/rdlogmanager/edit_schedrules.cpp index e41dced0d..d9b66bbec 100644 --- a/rdlogmanager/edit_schedrules.cpp +++ b/rdlogmanager/edit_schedrules.cpp @@ -61,12 +61,12 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList QFont font=QFont("Helvetica",12,QFont::Bold); font.setPixelSize(12); - artistSepLabel = new QLabel( this, "artistSepLabel" ); + artistSepLabel = new QLabel(this); artistSepLabel->setGeometry( QRect( 10, 10, 130, 20 ) ); artistSepLabel->setFont(font); artistSepLabel->setText(tr("Artist Separation:")); - artistSepSpinBox = new QSpinBox( this, "artistSepSpinBox" ); + artistSepSpinBox = new QSpinBox(this); artistSepSpinBox->setGeometry( QRect( 160, 10, 70, 20 ) ); artistSepSpinBox->setMaxValue( 10000 ); artistSepSpinBox->setValue( *edit_artistsep ); @@ -75,7 +75,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList // // Edit Button // - QPushButton *list_edit_button=new QPushButton(this,"list_edit_button"); + QPushButton *list_edit_button=new QPushButton(this); list_edit_button->setGeometry(10,sizeHint().height()-60,80,50); list_edit_button->setFont(font); list_edit_button->setText(tr("&Edit")); @@ -84,7 +84,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList // // Import Button // - QPushButton *list_import_button=new QPushButton(this,"list_import_button"); + QPushButton *list_import_button=new QPushButton(this); list_import_button->setGeometry(100,sizeHint().height()-60,80,50); list_import_button->setFont(font); list_import_button->setText(tr("&Import")); @@ -92,7 +92,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList // Ok Button // - QPushButton *ok_button=new QPushButton(this,"ok_button"); + QPushButton *ok_button=new QPushButton(this); ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); ok_button->setDefault(true); ok_button->setFont(font); @@ -102,7 +102,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60, 80,50); cancel_button->setFont(font); @@ -111,7 +111,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList // List - list_schedCodes_view=new RDListView(this,"list_schedCodes_view"); + list_schedCodes_view=new RDListView(this); list_schedCodes_view->setGeometry(10,60,size().width()-20,size().height()-140); list_schedCodes_view->setAllColumnsShowFocus(true); list_schedCodes_view->addColumn(tr("CODE")); @@ -122,7 +122,8 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList list_schedCodes_view->addColumn(tr("OR AFTER")); list_schedCodes_view->addColumn(tr("DESCRIPTION")); - QLabel *list_box_label=new QLabel(list_schedCodes_view,tr("Scheduler Codes:"),this,"list_box_label"); + QLabel *list_box_label= + new QLabel(list_schedCodes_view,tr("Scheduler Codes:"),this); list_box_label->setFont(font); list_box_label->setGeometry(10,40,200,20); connect(list_schedCodes_view, @@ -194,7 +195,8 @@ void EditSchedRules::editData() if(item==NULL) { return; } - editSchedCodeRules *edit_CodeRules=new editSchedCodeRules(item,sched_rules_list,this,"edit_CodeRules"); + editSchedCodeRules *edit_CodeRules= + new editSchedCodeRules(item,sched_rules_list,this); if(edit_CodeRules->exec()>=0) { edit_modified=true; diff --git a/rdlogmanager/edit_schedrules.h b/rdlogmanager/edit_schedrules.h index 7cbdff955..a5f0261cf 100644 --- a/rdlogmanager/edit_schedrules.h +++ b/rdlogmanager/edit_schedrules.h @@ -4,8 +4,6 @@ // // Stefan Gabriel // -// -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. diff --git a/rdlogmanager/edit_track.cpp b/rdlogmanager/edit_track.cpp index a3a445d57..5ff2933d2 100644 --- a/rdlogmanager/edit_track.cpp +++ b/rdlogmanager/edit_track.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell LogManager Track // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_track.cpp,v 1.6.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +31,8 @@ #include -EditTrack::EditTrack(QString *text,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditTrack::EditTrack(QString *text,QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Edit Voice Track Marker")); edit_text=text; @@ -58,7 +56,7 @@ EditTrack::EditTrack(QString *text,QWidget *parent,const char *name) // // The Text Editor // - edit_text_edit=new QTextEdit(this,"edit_text_edit"); + edit_text_edit=new QTextEdit(this); edit_text_edit->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_text_edit->setText(*edit_text); @@ -66,7 +64,7 @@ EditTrack::EditTrack(QString *text,QWidget *parent,const char *name) // // OK Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -76,7 +74,7 @@ EditTrack::EditTrack(QString *text,QWidget *parent,const char *name) // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Cancel")); diff --git a/rdlogmanager/edit_track.h b/rdlogmanager/edit_track.h index acc245f04..eb1e03d56 100644 --- a/rdlogmanager/edit_track.h +++ b/rdlogmanager/edit_track.h @@ -2,9 +2,7 @@ // // Edit a Rivendell LogManager Track // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_track.h,v 1.5.8.1 2012/04/23 17:22:47 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,12 +25,11 @@ #include #include - class EditTrack : public QDialog { Q_OBJECT public: - EditTrack(QString *text,QWidget *parent=0,const char *name=0); + EditTrack(QString *text,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/generate_log.cpp b/rdlogmanager/generate_log.cpp index 8f1f6c10f..169177e0d 100644 --- a/rdlogmanager/generate_log.cpp +++ b/rdlogmanager/generate_log.cpp @@ -2,9 +2,7 @@ // // Generate a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: generate_log.cpp,v 1.37.6.2 2014/01/10 21:59:32 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -51,8 +49,9 @@ #include "../icons/redball.xpm" -GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString *cmd_service,QDate *cmd_date) - : QDialog(parent,name,true) +GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, + QDate *cmd_date) + : QDialog(parent,"",true) { QStringList services_list; bool cmdservicefit=false; @@ -103,12 +102,11 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Service Name // - gen_service_box=new QComboBox(this,"gen_service_box"); + gen_service_box=new QComboBox(this); gen_service_box->setGeometry(70,10,sizeHint().width()-80,20); connect(gen_service_box,SIGNAL(activated(int)), this,SLOT(serviceActivatedData(int))); - QLabel *label=new QLabel(gen_service_box,tr("Service:"), - this,"gen_service_label"); + QLabel *label=new QLabel(gen_service_box,tr("Service:"),this); label->setGeometry(10,10,55,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -134,10 +132,9 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Date // - gen_date_edit=new QDateEdit(this,"gen_date_edit"); + gen_date_edit=new QDateEdit(this); gen_date_edit->setGeometry(70,38,100,20); - label=new QLabel(gen_date_edit,tr("Date:"), - this,"gen_date_label"); + label=new QLabel(gen_date_edit,tr("Date:"),this); label->setGeometry(10,38,55,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -152,7 +149,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Date Select Button // - QPushButton *button=new QPushButton(this,"select_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(180,33,50,30); button->setFont(bold_font); button->setText(tr("&Select")); @@ -161,7 +158,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Create Log Button // - gen_create_button=new QPushButton(this,"gen_create_button"); + gen_create_button=new QPushButton(this); gen_create_button->setGeometry(10,70,sizeHint().width()-20,30); gen_create_button->setFont(bold_font); gen_create_button->setText(tr("&Create New Log")); @@ -170,7 +167,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Merge Music Log Button // - gen_music_button=new QPushButton(this,"gen_music_button"); + gen_music_button=new QPushButton(this); gen_music_button->setGeometry(10,130,100,30); gen_music_button->setFont(bold_font); gen_music_button->setText(tr("Merge &Music")); @@ -179,7 +176,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Merge Traffic Log Button // - gen_traffic_button=new QPushButton(this,"gen_traffic_button"); + gen_traffic_button=new QPushButton(this); gen_traffic_button->setGeometry(10,170,100,30); gen_traffic_button->setFont(bold_font); gen_traffic_button->setText(tr("Merge &Traffic")); @@ -208,13 +205,13 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Music Indicators // - gen_mus_avail_label=new QLabel(this,"gen_mus_avail_label"); + gen_mus_avail_label=new QLabel(this); gen_mus_avail_label->setPixmap(*gen_whiteball_map); gen_mus_avail_label->setGeometry(120,139,60,14); gen_mus_avail_label->setFont(small_font); gen_mus_avail_label->setAlignment(AlignCenter); - gen_mus_merged_label=new QLabel(this,"gen_mus_merged_label"); + gen_mus_merged_label=new QLabel(this); gen_mus_merged_label->setPixmap(*gen_whiteball_map); gen_mus_merged_label->setGeometry(180,139,60,14); gen_mus_merged_label->setFont(small_font); @@ -223,13 +220,13 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Traffic Indicators // - gen_tfc_avail_label=new QLabel(this,"gen_tfc_avail_label"); + gen_tfc_avail_label=new QLabel(this); gen_tfc_avail_label->setPixmap(*gen_whiteball_map); gen_tfc_avail_label->setGeometry(120,179,60,14); gen_tfc_avail_label->setFont(small_font); gen_tfc_avail_label->setAlignment(AlignCenter); - gen_tfc_merged_label=new QLabel(this,"gen_tfc_merged_label"); + gen_tfc_merged_label=new QLabel(this); gen_tfc_merged_label->setPixmap(*gen_whiteball_map); gen_tfc_merged_label->setGeometry(180,179,60,14); gen_tfc_merged_label->setFont(small_font); @@ -239,7 +236,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,sizeHint().width()-20,50); button->setDefault(true); button->setFont(bold_font); @@ -251,7 +248,7 @@ GenerateLog::GenerateLog(QWidget *parent,const char *name,int cmd_switch,QString // // File Scan Timer // - QTimer *timer=new QTimer(this,"file_scan_timer"); + QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(fileScanData())); timer->start(GENERATE_LOG_FILESCAN_INTERVAL); @@ -303,8 +300,7 @@ void GenerateLog::selectDateData() QDate current_date=QDate::currentDate(); RDDateDialog *datedialog= - new RDDateDialog(current_date.year(),current_date.year()+1, - this,"datedialog"); + new RDDateDialog(current_date.year(),current_date.year()+1,this); if(datedialog->exec(&date)<0) { delete datedialog; return; @@ -326,7 +322,7 @@ void GenerateLog::createData() // // Generate Log // - RDSvc *svc=new RDSvc(gen_service_box->currentText(),this,"svc"); + RDSvc *svc=new RDSvc(gen_service_box->currentText(),this); QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date()); RDLog *log=new RDLog(logname); if(log->exists()) { @@ -411,7 +407,7 @@ void GenerateLog::musicData() { unsigned tracks=0; - RDSvc *svc=new RDSvc(gen_service_box->currentText(),this,"svc"); + RDSvc *svc=new RDSvc(gen_service_box->currentText(),this); QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date()); RDLog *log=new RDLog(logname); if(((log->linkState(RDLog::SourceMusic)==RDLog::LinkDone)|| @@ -462,7 +458,7 @@ void GenerateLog::musicData() void GenerateLog::trafficData() { - RDSvc *svc=new RDSvc(gen_service_box->currentText(),this,"svc"); + RDSvc *svc=new RDSvc(gen_service_box->currentText(),this); QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date()); RDLog *log=new RDLog(logname); if((log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone)) { @@ -496,7 +492,7 @@ void GenerateLog::trafficData() void GenerateLog::fileScanData() { - RDSvc *svc=new RDSvc(gen_service_box->currentText(),this,"svc"); + RDSvc *svc=new RDSvc(gen_service_box->currentText(),this); QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date()); RDLog *log=new RDLog(logname); if(gen_music_enabled) { @@ -542,7 +538,7 @@ void GenerateLog::closeData() void GenerateLog::UpdateControls() { - RDSvc *svc=new RDSvc(gen_service_box->currentText(),this,"svc"); + RDSvc *svc=new RDSvc(gen_service_box->currentText(),this); QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date()); RDLog *log=new RDLog(logname); if(log->exists()) { diff --git a/rdlogmanager/generate_log.h b/rdlogmanager/generate_log.h index 1874783ce..14c7aaaca 100644 --- a/rdlogmanager/generate_log.h +++ b/rdlogmanager/generate_log.h @@ -2,9 +2,7 @@ // // Generate a Rivendell Log // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: generate_log.h,v 1.9 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,7 +36,7 @@ class GenerateLog : public QDialog { Q_OBJECT public: - GenerateLog(QWidget *parent=0,const char *name=0,int cmd_schwitch=0,QString *cmd_service=NULL,QDate *cmd_date=NULL); + GenerateLog(QWidget *parent=0,int cmd_schwitch=0,QString *cmd_service=NULL,QDate *cmd_date=NULL); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/globals.h b/rdlogmanager/globals.h index b70970b21..b93f84bb5 100644 --- a/rdlogmanager/globals.h +++ b/rdlogmanager/globals.h @@ -2,9 +2,7 @@ // // Global Variable Declarations for RDLogManager // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: globals.h,v 1.7.4.1 2013/11/13 23:36:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,4 +39,5 @@ extern QString *event_filter; extern QString *clock_filter; extern bool skip_db_check; + #endif // GLOBALS_H diff --git a/rdlogmanager/import_listview.cpp b/rdlogmanager/import_listview.cpp index 204f9b133..7f883c50d 100644 --- a/rdlogmanager/import_listview.cpp +++ b/rdlogmanager/import_listview.cpp @@ -2,15 +2,12 @@ // // The Import Carts ListView widget for RDLogManager. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: import_listview.cpp,v 1.21.8.2 2013/12/30 19:56:13 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. // -// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include @@ -42,9 +38,8 @@ #include "../icons/mic16.xpm" #include "../icons/notemarker.xpm" - -ImportListView::ImportListView(QWidget *parent,const char *name) - : QListView(parent,name) +ImportListView::ImportListView(QWidget *parent) + : QListView(parent) { import_parent=parent; @@ -59,7 +54,7 @@ ImportListView::ImportListView(QWidget *parent,const char *name) // // Right Button Menu // - import_menu=new QPopupMenu(this,"import_menu"); + import_menu=new QPopupMenu(this); connect(import_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); import_menu-> insertItem(tr("Insert Log Note"),this,SLOT(insertNoteMenuData()),0,0); @@ -296,7 +291,7 @@ void ImportListView::aboutToShowData() void ImportListView::insertNoteMenuData() { QString note; - EditNote *note_dialog=new EditNote(¬e,this,"note_dialog"); + EditNote *note_dialog=new EditNote(¬e,this); if(note_dialog->exec()<0) { delete note_dialog; return; @@ -319,7 +314,7 @@ void ImportListView::insertNoteMenuData() void ImportListView::editNoteMenuData() { QString text=import_log->logLine(import_menu_line)->markerComment(); - EditNote *edit_dialog=new EditNote(&text,this,"edit_dialog"); + EditNote *edit_dialog=new EditNote(&text,this); if(edit_dialog->exec()<0) { delete edit_dialog; return; @@ -331,7 +326,7 @@ void ImportListView::editNoteMenuData() void ImportListView::insertTrackMenuData() { QString note; - EditTrack *track_dialog=new EditTrack(¬e,this,"track_dialog"); + EditTrack *track_dialog=new EditTrack(¬e,this); if(track_dialog->exec()<0) { delete track_dialog; return; @@ -354,7 +349,7 @@ void ImportListView::insertTrackMenuData() void ImportListView::editTrackMenuData() { QString text=import_log->logLine(import_menu_line)->markerComment(); - EditTrack *edit_dialog=new EditTrack(&text,this,"edit_dialog"); + EditTrack *edit_dialog=new EditTrack(&text,this); if(edit_dialog->exec()<0) { delete edit_dialog; return; diff --git a/rdlogmanager/import_listview.h b/rdlogmanager/import_listview.h index 59fdadcd4..6170294e1 100644 --- a/rdlogmanager/import_listview.h +++ b/rdlogmanager/import_listview.h @@ -2,15 +2,12 @@ // // The Import Carts ListView widget for RDLogManager. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: import_listview.h,v 1.14 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. // -// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,7 +17,6 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #ifndef IMPORT_LISTVIEW_H #define IMPORT_LISTVIEW_H @@ -36,7 +32,7 @@ class ImportListView : public QListView Q_OBJECT public: - ImportListView(QWidget *parent,const char *name=0); + ImportListView(QWidget *parent); void setForceTrans(RDLogLine::TransType trans); void setAllowStop(bool state); void setAllowFirstTrans(bool state); diff --git a/rdlogmanager/lib_listview.cpp b/rdlogmanager/lib_listview.cpp index b3fe8bbc6..17568dded 100644 --- a/rdlogmanager/lib_listview.cpp +++ b/rdlogmanager/lib_listview.cpp @@ -2,15 +2,12 @@ // // The Library ListView widget for RDLogManager. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: lib_listview.cpp,v 1.7.8.1 2013/12/27 22:12:29 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. // -// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -26,9 +23,8 @@ #include - -LibListView::LibListView(QWidget *parent,const char *name) - : QListView(parent,name) +LibListView::LibListView(QWidget *parent) + : QListView(parent) { } diff --git a/rdlogmanager/lib_listview.h b/rdlogmanager/lib_listview.h index 2fa351630..8afa941ea 100644 --- a/rdlogmanager/lib_listview.h +++ b/rdlogmanager/lib_listview.h @@ -2,9 +2,7 @@ // // The Library ListView widget for RDLogManager. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: lib_listview.h,v 1.6 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,13 +26,12 @@ #include #include - class LibListView : public QListView { Q_OBJECT public: - LibListView(QWidget *parent,const char *name=0); + LibListView(QWidget *parent); protected: void focusOutEvent(QFocusEvent *e); diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 35792e56d..e51892fa0 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -2,7 +2,7 @@ // // List Rivendell Log Clocks // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +37,6 @@ #include #include - ListClocks::ListClocks(QString *clockname,QWidget *parent) : QDialog(parent,"",true) { @@ -224,7 +223,7 @@ void ListClocks::addData() RDSqlQuery *q1; std::vector new_clocks; - AddClock *add_dialog=new AddClock(&clockname,this,"add_dialog"); + AddClock *add_dialog=new AddClock(&clockname,this); if(add_dialog->exec()<0) { delete add_dialog; return; @@ -359,8 +358,7 @@ void ListClocks::renameData() return; } QString new_name=item->text(0); - RenameItem *rename_dialog= - new RenameItem(&new_name,"CLOCKS",this,"event_dialog"); + RenameItem *rename_dialog=new RenameItem(&new_name,"CLOCKS",this); if(rename_dialog->exec()<-1) { delete rename_dialog; return; diff --git a/rdlogmanager/list_clocks.h b/rdlogmanager/list_clocks.h index 25ac8a8bd..b0ff06791 100644 --- a/rdlogmanager/list_clocks.h +++ b/rdlogmanager/list_clocks.h @@ -34,7 +34,6 @@ #include #include - class ListClocks : public QDialog { Q_OBJECT diff --git a/rdlogmanager/list_events.cpp b/rdlogmanager/list_events.cpp index 62d95a232..adb5219e3 100644 --- a/rdlogmanager/list_events.cpp +++ b/rdlogmanager/list_events.cpp @@ -2,9 +2,7 @@ // // List a Rivendell Log Event // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_events.cpp,v 1.31.8.2 2014/01/10 19:32:54 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,9 +37,8 @@ #include #include - -ListEvents::ListEvents(QString *eventname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListEvents::ListEvents(QString *eventname,QWidget *parent) + : QDialog(parent,"",true) { QStringList services_list; QString str1=tr("Log Events - User: "); @@ -77,7 +74,7 @@ ListEvents::ListEvents(QString *eventname,QWidget *parent,const char *name) // // Events List // - edit_events_list=new QListView(this,"edit_events_list"); + edit_events_list=new QListView(this); edit_events_list->setAllColumnsShowFocus(true); edit_events_list->setItemMargin(5); edit_events_list->addColumn(tr("Name")); @@ -208,7 +205,7 @@ void ListEvents::addData() RDSqlQuery *q1; std::vector new_events; - AddEvent *add_dialog=new AddEvent(&logname,this,"add_dialog"); + AddEvent *add_dialog=new AddEvent(&logname,this); if(add_dialog->exec()<0) { delete add_dialog; return; @@ -227,8 +224,7 @@ void ListEvents::addData() delete q; event=new RDEvent(logname,true); delete event; - EditEvent *event_dialog=new EditEvent(logname,true,&new_events, - this,"event_dialog"); + EditEvent *event_dialog=new EditEvent(logname,true,&new_events,this); if(event_dialog->exec()<-1) { sql=QString().sprintf("delete from EVENTS where NAME=\"%s\"", (const char *)logname); @@ -276,8 +272,7 @@ void ListEvents::editData() if(item==NULL) { return; } - EditEvent *event_dialog= - new EditEvent(item->text(0),false,&new_events,this,"event_dialog"); + EditEvent *event_dialog=new EditEvent(item->text(0),false,&new_events,this); if(event_dialog->exec()<-1) { delete event_dialog; return; @@ -337,8 +332,7 @@ void ListEvents::renameData() return; } QString new_name=item->text(0); - RenameItem *rename_dialog= - new RenameItem(&new_name,"EVENTS",this,"event_dialog"); + RenameItem *rename_dialog=new RenameItem(&new_name,"EVENTS",this); if(rename_dialog->exec()<-1) { delete rename_dialog; return; diff --git a/rdlogmanager/list_events.h b/rdlogmanager/list_events.h index 6e1754bb2..99c57aadb 100644 --- a/rdlogmanager/list_events.h +++ b/rdlogmanager/list_events.h @@ -2,9 +2,7 @@ // // List Rivendell Log Events // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_events.h,v 1.17.8.2 2014/01/10 19:32:55 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,12 +34,11 @@ #include #include - class ListEvents : public QDialog { Q_OBJECT public: - ListEvents(QString *eventname,QWidget *parent=0,const char *name=0); + ListEvents(QString *eventname,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/list_grids.h b/rdlogmanager/list_grids.h index 96aa8a228..8123ed9b6 100644 --- a/rdlogmanager/list_grids.h +++ b/rdlogmanager/list_grids.h @@ -2,9 +2,7 @@ // // List Rivendell Log Grids // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_grids.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,6 @@ #include #include - class ListGrids : public QDialog { Q_OBJECT diff --git a/rdlogmanager/list_svcs.cpp b/rdlogmanager/list_svcs.cpp index 2f8c6f35c..3b597276d 100644 --- a/rdlogmanager/list_svcs.cpp +++ b/rdlogmanager/list_svcs.cpp @@ -2,9 +2,7 @@ // // List Rivendell Services and Report Ages // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: list_svcs.cpp,v 1.10 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,9 +28,8 @@ #include #include - -ListSvcs::ListSvcs(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListSvcs::ListSvcs(QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Rivendell Services")); @@ -53,7 +50,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Log List // - list_log_list=new QListView(this,"list_log_list"); + list_log_list=new QListView(this); list_log_list->setAllColumnsShowFocus(true); list_log_list->setItemMargin(5); list_log_list->addColumn(tr("SERVICE")); @@ -68,7 +65,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Generate Report Button // - list_generate_button=new QPushButton(this,"list_generate_button"); + list_generate_button=new QPushButton(this); list_generate_button->setFont(bold_font); list_generate_button->setText(tr("&Generate\nReports")); connect(list_generate_button,SIGNAL(clicked()),this,SLOT(generateData())); @@ -76,7 +73,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Purge Button // - list_purge_button=new QPushButton(this,"list_purge_button"); + list_purge_button=new QPushButton(this); list_purge_button->setFont(bold_font); list_purge_button->setText(tr("&Purge\nData")); connect(list_purge_button,SIGNAL(clicked()),this,SLOT(purgeData())); @@ -84,7 +81,7 @@ ListSvcs::ListSvcs(QWidget *parent,const char *name) // // Close Button // - list_close_button=new QPushButton(this,"close_button"); + list_close_button=new QPushButton(this); list_close_button->setDefault(true); list_close_button->setFont(bold_font); list_close_button->setText(tr("C&lose")); @@ -124,7 +121,7 @@ void ListSvcs::purgeData() if(item==NULL) { return; } - SvcRecDialog *dialog=new SvcRecDialog(item->text(0),this,"dialog"); + SvcRecDialog *dialog=new SvcRecDialog(item->text(0),this); dialog->exec(); delete dialog; RefreshLine(item); diff --git a/rdlogmanager/list_svcs.h b/rdlogmanager/list_svcs.h index 8c64255ea..457535862 100644 --- a/rdlogmanager/list_svcs.h +++ b/rdlogmanager/list_svcs.h @@ -2,9 +2,7 @@ // // List Rivendell Services and Report Ages // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: list_svcs.h,v 1.6 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,12 +26,11 @@ #include #include - class ListSvcs : public QDialog { Q_OBJECT public: - ListSvcs(QWidget *parent=0,const char *name=0); + ListSvcs(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp index 5e68c54bc..7094fa825 100644 --- a/rdlogmanager/pick_report_dates.cpp +++ b/rdlogmanager/pick_report_dates.cpp @@ -2,9 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: pick_report_dates.cpp,v 1.8.8.2 2013/01/22 20:59:39 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,10 +30,8 @@ #include #include - -PickReportDates::PickReportDates(const QString &svcname, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +PickReportDates::PickReportDates(const QString &svcname,QWidget *parent) + : QDialog(parent,"",true) { QString sql; RDSqlQuery *q; @@ -63,10 +59,9 @@ PickReportDates::PickReportDates(const QString &svcname, // // Report List // - edit_report_box=new QComboBox(this,"edit_report_box"); + edit_report_box=new QComboBox(this); edit_report_box->setGeometry(75,11,sizeHint().width()-85,19); - QLabel *label=new QLabel(edit_report_box,tr("&Report:"), - this,"edit_report_label"); + QLabel *label=new QLabel(edit_report_box,tr("&Report:"),this); label->setGeometry(10,11,60,19); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); @@ -82,15 +77,14 @@ PickReportDates::PickReportDates(const QString &svcname, // // Start Date // - edit_startdate_edit=new QDateEdit(this,"edit_startdate_edit"); + edit_startdate_edit=new QDateEdit(this); edit_startdate_edit->setGeometry(150,35,100,22); edit_startdate_edit->setDate(yesterday_date); - label=new QLabel(edit_startdate_edit,tr("&Start Date:"), - this,"edit_startdate_label"); + label=new QLabel(edit_startdate_edit,tr("&Start Date:"),this); label->setGeometry(75,36,70,19); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - QPushButton *button=new QPushButton(this,"startdate_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(260,33,50,27); button->setFont(font); button->setText(tr("&Select")); @@ -99,15 +93,14 @@ PickReportDates::PickReportDates(const QString &svcname, // // End Date // - edit_enddate_edit=new QDateEdit(this,"edit_enddate_edit"); + edit_enddate_edit=new QDateEdit(this); edit_enddate_edit->setGeometry(150,65,100,22); edit_enddate_edit->setDate(yesterday_date); - label=new QLabel(edit_enddate_edit,tr("&End Date:"), - this,"edit_enddate_label"); + label=new QLabel(edit_enddate_edit,tr("&End Date:"),this); label->setGeometry(75,66,70,19); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); - button=new QPushButton(this,"enddate_button"); + button=new QPushButton(this); button->setGeometry(260,63,50,27); button->setFont(font); button->setText(tr("&Select")); @@ -116,7 +109,7 @@ PickReportDates::PickReportDates(const QString &svcname, // // Generate Button // - button=new QPushButton(this,"list_purge_button"); + button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Generate\nReport")); @@ -125,7 +118,7 @@ PickReportDates::PickReportDates(const QString &svcname, // // Close Button // - button=new QPushButton(this,"close_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); diff --git a/rdlogmanager/pick_report_dates.h b/rdlogmanager/pick_report_dates.h index d73f5b849..377c24c90 100644 --- a/rdlogmanager/pick_report_dates.h +++ b/rdlogmanager/pick_report_dates.h @@ -2,9 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: pick_report_dates.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,13 +26,11 @@ #include #include - class PickReportDates : public QDialog { Q_OBJECT public: - PickReportDates(const QString &svcname, - QWidget *parent=0,const char *name=0); + PickReportDates(const QString &svcname,QWidget *parent=0); ~PickReportDates(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 003a72240..6a11e7e35 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -2,9 +2,7 @@ // // The Log Editor Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlogmanager.cpp,v 1.43.4.4.2.1 2014/05/20 14:01:50 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -81,7 +79,6 @@ QString *event_filter; QString *clock_filter; bool skip_db_check=false; - #ifndef WIN32 void SigHandler(int signo) { diff --git a/rdlogmanager/rdlogmanager.h b/rdlogmanager/rdlogmanager.h index f218261c6..5b6091d38 100644 --- a/rdlogmanager/rdlogmanager.h +++ b/rdlogmanager/rdlogmanager.h @@ -18,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDLOGMANAGER_H #define RDLOGMANAGER_H @@ -48,7 +47,6 @@ extern int RunReportOperation(int argc,char *argv[],const QString &rptname, bool protect_existing,int start_offset, int end_offset); - class MainWidget : public QWidget { Q_OBJECT diff --git a/rdlogmanager/rdlogmanager.pro b/rdlogmanager/rdlogmanager.pro index 8142c3263..5b570d289 100644 --- a/rdlogmanager/rdlogmanager.pro +++ b/rdlogmanager/rdlogmanager.pro @@ -2,9 +2,7 @@ # # The rdlogmanager/ QMake project file for Rivendell # -# (C) Copyright 2003-2004 Fred Gleason -# -# $Id: rdlogmanager.pro,v 1.21.2.3 2013/01/01 21:36:31 cvs Exp $ +# (C) Copyright 2003-2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdlogmanager/rename_item.cpp b/rdlogmanager/rename_item.cpp index c06b607d9..78fda1047 100644 --- a/rdlogmanager/rename_item.cpp +++ b/rdlogmanager/rename_item.cpp @@ -2,9 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rename_item.cpp,v 1.8 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,9 +32,8 @@ #include -RenameItem::RenameItem(QString *text,QString table, - QWidget *parent,const char *name) - : QDialog(parent,name,true) +RenameItem::RenameItem(QString *text,QString table,QWidget *parent) + : QDialog(parent,"",true) { edit_text=text; edit_tablename=table; @@ -92,7 +89,7 @@ RenameItem::RenameItem(QString *text,QString table, // // The Name Editor // - edit_name_edit=new QLineEdit(this,"edit_name_edit"); + edit_name_edit=new QLineEdit(this); edit_name_edit->setGeometry(10,10,sizeHint().width()-20,20); edit_name_edit->setValidator(validator); edit_name_edit->setText(*text); @@ -100,7 +97,7 @@ RenameItem::RenameItem(QString *text,QString table, // // OK Button // - QPushButton *button=new QPushButton(this,"ok_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50); button->setDefault(true); button->setFont(bold_font); @@ -110,7 +107,7 @@ RenameItem::RenameItem(QString *text,QString table, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(bold_font); button->setText(tr("&Cancel")); diff --git a/rdlogmanager/rename_item.h b/rdlogmanager/rename_item.h index 2ee1518f6..763eb749a 100644 --- a/rdlogmanager/rename_item.h +++ b/rdlogmanager/rename_item.h @@ -2,9 +2,7 @@ // // Rename an RDLogManager Event or Clock // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rename_item.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,12 +25,11 @@ #include #include - class RenameItem : public QDialog { Q_OBJECT public: - RenameItem(QString *text,QString table,QWidget *parent=0,const char *name=0); + RenameItem(QString *text,QString table,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/svc_rec.cpp b/rdlogmanager/svc_rec.cpp index f33994f5f..7f391f982 100644 --- a/rdlogmanager/svc_rec.cpp +++ b/rdlogmanager/svc_rec.cpp @@ -1,10 +1,8 @@ // svc_rec.cpp // -// A Qt-based application for testing General Purpose Outputs (GPO). +// Calendar widget. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: svc_rec.cpp,v 1.8 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -31,9 +28,8 @@ // // Global Classes // -SvcRec::SvcRec(const QString &svcname, - QWidget *parent,const char *name) - :QWidget(parent,name) +SvcRec::SvcRec(const QString &svcname,QWidget *parent) + :QWidget(parent) { QString sql; RDSqlQuery *q; @@ -67,7 +63,7 @@ SvcRec::SvcRec(const QString &svcname, // // Month // - pick_month_box=new QComboBox(this,"pick_month_box"); + pick_month_box=new QComboBox(this); pick_month_box->setGeometry(0,0,120,26); for(int i=1;i<13;i++) { pick_month_box->insertItem(QDate::longMonthName(i)); @@ -78,7 +74,7 @@ SvcRec::SvcRec(const QString &svcname, // // Year // - pick_year_box=new QComboBox(this,"pick_year_box"); + pick_year_box=new QComboBox(this); pick_year_box->setGeometry(130,0,90,26); for(int i=pick_low_year;i<(pick_high_year+1);i++) { pick_year_box->insertItem(QString().sprintf("%04d",i)); @@ -98,43 +94,43 @@ SvcRec::SvcRec(const QString &svcname, palette().color(QPalette::Active, QColorGroup::Mid)); - QLabel *label=new QLabel(tr("Mo"),this,"monday_label"); + QLabel *label=new QLabel(tr("Mo"),this); label->setGeometry(SVC_REC_X_ORIGIN,30,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); - label=new QLabel(tr("Tu"),this,"tuesday_label"); + label=new QLabel(tr("Tu"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); - label=new QLabel(tr("We"),this,"wednesday_label"); + label=new QLabel(tr("We"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*2, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); - label=new QLabel(tr("Th"),this,"thursday_label"); + label=new QLabel(tr("Th"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*3, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); - label=new QLabel(tr("Fr"),this,"friday_label"); + label=new QLabel(tr("Fr"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*4, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); - label=new QLabel(tr("Sa"),this,"saturday_label"); + label=new QLabel(tr("Sa"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*5, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); label->setAlignment(AlignCenter); label->setPalette(weekend_palette); - label=new QLabel(tr("Su"),this,"sunday_label"); + label=new QLabel(tr("Su"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*6, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); @@ -144,7 +140,7 @@ SvcRec::SvcRec(const QString &svcname, for(int i=0;i<6;i++) { for(int j=0;j<7;j++) { - pick_date_label[i][j]=new QLabel(this,"date_label"); + pick_date_label[i][j]=new QLabel(this); pick_date_label[i][j]-> setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*j, SVC_REC_Y_ORIGIN+20+SVC_REC_Y_INTERVAL*i,30,30); diff --git a/rdlogmanager/svc_rec.h b/rdlogmanager/svc_rec.h index 7de45c0a6..70fa1765c 100644 --- a/rdlogmanager/svc_rec.h +++ b/rdlogmanager/svc_rec.h @@ -2,9 +2,7 @@ // // A Calendar Widget. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: svc_rec.h,v 1.5 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef SVC_REC_H #define SVC_REC_H @@ -47,7 +44,7 @@ class SvcRec : public QWidget { Q_OBJECT public: - SvcRec(const QString &svcname,QWidget *parent=0,const char *name=0); + SvcRec(const QString &svcname,QWidget *parent=0); ~SvcRec(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/svc_rec_dialog.cpp b/rdlogmanager/svc_rec_dialog.cpp index 2c3363f6a..3b79f21be 100644 --- a/rdlogmanager/svc_rec_dialog.cpp +++ b/rdlogmanager/svc_rec_dialog.cpp @@ -2,9 +2,7 @@ // // A Services/Reports Management Dialog. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: svc_rec_dialog.cpp,v 1.10 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -43,9 +40,8 @@ // // Global Classes // -SvcRecDialog::SvcRecDialog(const QString &svcname, - QWidget *parent,const char *name) - :QDialog(parent,name,true) +SvcRecDialog::SvcRecDialog(const QString &svcname,QWidget *parent) + :QDialog(parent,"",true) { QFont font; @@ -58,7 +54,7 @@ SvcRecDialog::SvcRecDialog(const QString &svcname, // // Datepicker // - date_picker=new SvcRec(svcname,this,"date_picker"); + date_picker=new SvcRec(svcname,this); date_picker->setGeometry(10,10, date_picker->sizeHint().width(), date_picker->sizeHint().height()); @@ -68,7 +64,7 @@ SvcRecDialog::SvcRecDialog(const QString &svcname, // // Delete Button // - date_delete_button=new QPushButton(this,"date_delete_button"); + date_delete_button=new QPushButton(this); date_delete_button-> setGeometry(10,sizeHint().height()-60,80,50); date_delete_button->setFont(font); @@ -82,7 +78,7 @@ SvcRecDialog::SvcRecDialog(const QString &svcname, // // Close Button // - QPushButton *button=new QPushButton(this,"close_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setFont(font);\ button->setText(tr("&Close")); diff --git a/rdlogmanager/svc_rec_dialog.h b/rdlogmanager/svc_rec_dialog.h index 18f58b294..fa2248081 100644 --- a/rdlogmanager/svc_rec_dialog.h +++ b/rdlogmanager/svc_rec_dialog.h @@ -2,9 +2,7 @@ // // A Services/Reports Management Dialog. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: svc_rec_dialog.h,v 1.6 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef DELETE_SVC_REC_DIALOG_H #define DELETE_SVC_REC_DIALOG_H @@ -35,13 +32,11 @@ #include - class SvcRecDialog : public QDialog { Q_OBJECT public: - SvcRecDialog(const QString &svcname,QWidget *parent=0, - const char *name=0); + SvcRecDialog(const QString &svcname,QWidget *parent=0); ~SvcRecDialog(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdmonitor/Makefile.am b/rdmonitor/Makefile.am index 9c6b1ff17..50a5408d9 100644 --- a/rdmonitor/Makefile.am +++ b/rdmonitor/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdmonitor ## -## (C) Copyright 2012 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.4 2013/11/08 03:57:14 cvs Exp $ +## (C) Copyright 2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdmonitor/positiondialog.cpp b/rdmonitor/positiondialog.cpp index a91822111..befed8198 100644 --- a/rdmonitor/positiondialog.cpp +++ b/rdmonitor/positiondialog.cpp @@ -2,9 +2,7 @@ // // Dialog to set RDMonitor screen position. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: positiondialog.cpp,v 1.1.2.2 2013/11/11 20:34:27 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdmonitor/positiondialog.h b/rdmonitor/positiondialog.h index 7061ddf13..49cbefb47 100644 --- a/rdmonitor/positiondialog.h +++ b/rdmonitor/positiondialog.h @@ -2,9 +2,7 @@ // // Dialog to set RDMonitor screen position. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: positiondialog.h,v 1.1.2.1 2013/11/08 03:57:15 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdmonitor/rdmonitor.cpp b/rdmonitor/rdmonitor.cpp index c0da842d0..bdb55b562 100644 --- a/rdmonitor/rdmonitor.cpp +++ b/rdmonitor/rdmonitor.cpp @@ -2,9 +2,7 @@ // // System Monitor for Rivendell // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdmonitor.cpp,v 1.1.2.13 2014/02/10 20:54:14 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -67,9 +65,8 @@ void SigHandler(int signo) } } - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name,Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WStyle_StaysOnTop|WX11BypassWM) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent,"",Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WStyle_StaysOnTop|WX11BypassWM) { QString str; mon_dialog_x=0; @@ -403,7 +400,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->show(); return a.exec(); diff --git a/rdmonitor/rdmonitor.h b/rdmonitor/rdmonitor.h index 66e262c10..d85628b65 100644 --- a/rdmonitor/rdmonitor.h +++ b/rdmonitor/rdmonitor.h @@ -2,9 +2,7 @@ // // System Monitor Applet for Rivendell // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdmonitor.h,v 1.1.2.6 2013/11/08 03:57:15 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,7 +45,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSizePolicy sizePolicy() const; private slots: diff --git a/rdmonitor/rdmonitor.pro b/rdmonitor/rdmonitor.pro index da8b14dcf..389ffee74 100644 --- a/rdmonitor/rdmonitor.pro +++ b/rdmonitor/rdmonitor.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDMonitor. # -# (C) Copyright 2012 Fred Gleason -# -# $Id: rdmonitor.pro,v 1.1.2.2 2013/01/01 21:36:32 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdmonitor/status_tip.cpp b/rdmonitor/status_tip.cpp index 1727b017e..0e03798b3 100644 --- a/rdmonitor/status_tip.cpp +++ b/rdmonitor/status_tip.cpp @@ -2,9 +2,7 @@ // // Custom ToolTip for RDMonitor's Status Bubble // -// (C) Copyright 2012 Fred Gleason -// -// $Id: status_tip.cpp,v 1.1.2.2 2012/10/22 23:09:39 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdmonitor/status_tip.h b/rdmonitor/status_tip.h index eed76adb6..ced3b5215 100644 --- a/rdmonitor/status_tip.h +++ b/rdmonitor/status_tip.h @@ -2,9 +2,7 @@ // // Custom ToolTip for RDMonitor's Status Bubble // -// (C) Copyright 2012 Fred Gleason -// -// $Id: status_tip.h,v 1.1.2.2 2012/10/22 23:09:39 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdpanel/Makefile.am b/rdpanel/Makefile.am index 13ec5b634..1dcc383be 100644 --- a/rdpanel/Makefile.am +++ b/rdpanel/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdpanel ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.18.8.2 2013/01/01 21:36:32 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdpanel/globals.h b/rdpanel/globals.h index 9d26d29be..05f22f7a0 100644 --- a/rdpanel/globals.h +++ b/rdpanel/globals.h @@ -2,9 +2,7 @@ // // Global Variable Declarations for RDPanel // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: globals.h,v 1.5.14.1 2012/11/26 20:19:41 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index a678a56de..7362fb1fc 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -2,9 +2,7 @@ // // A Dedicated Cart Wall Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdpanel.cpp,v 1.27.4.9 2014/02/11 23:46:30 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -58,7 +56,6 @@ RDCartDialog *panel_cart_dialog; // #include "../icons/rivendell-22x22.xpm" - void SigHandler(int signo) { pid_t pLocalPid; @@ -74,9 +71,8 @@ void SigHandler(int signo) } } - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { QPixmap *pm; QPainter *pd; @@ -146,7 +142,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Master Clock Timer // - panel_master_timer=new QTimer(this,"panel_master_timer"); + panel_master_timer=new QTimer(this); connect(panel_master_timer,SIGNAL(timeout()),this,SLOT(masterTimerData())); panel_master_timer->start(MASTER_TIMER_INTERVAL); @@ -169,7 +165,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // CAE Connection // - panel_cae=new RDCae(rdstation_conf,panel_config,parent,name); + panel_cae=new RDCae(rdstation_conf,panel_config,parent); panel_cae->connectHost(); // @@ -189,7 +185,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Meter Timer // - QTimer *timer=new QTimer(this,"meter_timer"); + QTimer *timer=new QTimer(this); connect(timer,SIGNAL(timeout()),this,SLOT(meterData())); timer->start(METER_INTERVAL); @@ -217,8 +213,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) rdairplay_conf->panels(RDAirPlayConf::UserPanel), rdairplay_conf->flashPanel(), rdairplay_conf->buttonLabelTemplate(),true,panel_player, - rdripc,panel_cae,rdstation_conf,panel_cart_dialog, - this,"panel_panel"); + rdripc,panel_cae,rdstation_conf,panel_cart_dialog,this); panel_panel->setLogfile(panel_config->airplayLogname()); panel_panel->setGeometry(10,10,panel_panel->sizeHint().width(), panel_panel->sizeHint().height()); @@ -328,7 +323,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Audio Meter // - panel_stereo_meter=new RDStereoMeter(this,"panel_stereo_meter"); + panel_stereo_meter=new RDStereoMeter(this); panel_stereo_meter-> setGeometry(20, sizeHint().height()-panel_stereo_meter->sizeHint().height()-7, @@ -460,7 +455,7 @@ int main(int argc,char *argv[]) QTextCodec::locale(),"."); a.installTranslator(&tr); - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/rdpanel/rdpanel.h b/rdpanel/rdpanel.h index 34169482f..48d7560b0 100644 --- a/rdpanel/rdpanel.h +++ b/rdpanel/rdpanel.h @@ -2,9 +2,7 @@ // // A Dedicated Cart Wall Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdpanel.h,v 1.16.4.1 2013/12/30 21:11:59 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDPANEL_H #define RDPANEL_H @@ -50,7 +47,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdpanel/rdpanel.pro b/rdpanel/rdpanel.pro index 277305bfd..adb1160e4 100644 --- a/rdpanel/rdpanel.pro +++ b/rdpanel/rdpanel.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDPanel. # -# (C) Copyright 2003-2007 Fred Gleason -# -# $Id: rdpanel.pro,v 1.3.8.1 2013/01/01 21:36:32 cvs Exp $ +# (C) Copyright 2003-2007,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld-suse.in b/rdrepld-suse.in index 59b839f91..98e16d2dc 100644 --- a/rdrepld-suse.in +++ b/rdrepld-suse.in @@ -2,9 +2,7 @@ ## ## A Rivendell init script for LSB-compliant Linux systems. ## -## (C) Copyright 2010 Fred Gleason -## -## $Id: rdrepld-suse.in,v 1.3 2010/12/16 13:15:37 cvs Exp $ +## (C) Copyright 2010,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of version 2 of the GNU General Public License as diff --git a/rdrepld/Makefile.am b/rdrepld/Makefile.am index cf667c260..8af7f0888 100644 --- a/rdrepld/Makefile.am +++ b/rdrepld/Makefile.am @@ -2,9 +2,7 @@ ## ## rdrepld/ Makefile.am for Rivendell ## -## (C) Copyright 2010 Fred Gleason -## -## $Id: Makefile.am,v 1.2 2010/07/29 19:32:37 cvs Exp $ +## (C) Copyright 2010,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/citadelxds.cpp b/rdrepld/citadelxds.cpp index 3ec2d6299..2038feccf 100644 --- a/rdrepld/citadelxds.cpp +++ b/rdrepld/citadelxds.cpp @@ -2,9 +2,7 @@ // // Replicator implementation for the Citadel XDS Portal // -// (C) Copyright 2010 Fred Gleason -// -// $Id: citadelxds.cpp,v 1.6 2012/03/02 22:33:51 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/citadelxds.h b/rdrepld/citadelxds.h index 9f8dc8966..340ec15fb 100644 --- a/rdrepld/citadelxds.h +++ b/rdrepld/citadelxds.h @@ -2,9 +2,7 @@ // // Replicator implementation for the Citadel XDS Portal // -// (C) Copyright 2010 Fred Gleason -// -// $Id: citadelxds.h,v 1.3 2011/10/17 18:48:41 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/globals.h b/rdrepld/globals.h index 56411ee29..1fdfe31d7 100644 --- a/rdrepld/globals.h +++ b/rdrepld/globals.h @@ -2,9 +2,7 @@ // // The Rivendell Replicator Daemon Global Definitions // -// (C) Copyright 2010 Fred Gleason -// -// $Id: globals.h,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,4 +27,5 @@ extern RDConfig *rdconfig; extern RDSystem *rdsystem; + #endif // GLOBALS_H diff --git a/rdrepld/rdrepld.cpp b/rdrepld/rdrepld.cpp index 5a3d0b206..ef1f9aac8 100644 --- a/rdrepld/rdrepld.cpp +++ b/rdrepld/rdrepld.cpp @@ -2,9 +2,7 @@ // // The Rivendell Replicator Daemon // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdrepld.cpp,v 1.4 2011/06/21 22:20:44 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,6 @@ #include #include - RDConfig *rdconfig; RDSystem *rdsystem; @@ -63,8 +60,8 @@ void SigHandler(int signum) } -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool skip_db_check=false; unsigned schema=0; @@ -153,7 +150,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // Start the Main Loop // - repl_loop_timer=new QTimer(this,"repl_loop_timer"); + repl_loop_timer=new QTimer(this); connect(repl_loop_timer,SIGNAL(timeout()),this,SLOT(mainLoop())); repl_loop_timer->start(RD_RDREPL_SCAN_INTERVAL,true); @@ -296,6 +293,6 @@ void MainObject::FreeReplicators() int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/rdrepld/rdrepld.h b/rdrepld/rdrepld.h index bc815d853..da9932983 100644 --- a/rdrepld/rdrepld.h +++ b/rdrepld/rdrepld.h @@ -2,9 +2,7 @@ // // The Rivendell Replicator Daemon // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdrepld.h,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void mainLoop(); diff --git a/rdrepld/replconfig.cpp b/rdrepld/replconfig.cpp index f15112ec9..e79603e17 100644 --- a/rdrepld/replconfig.cpp +++ b/rdrepld/replconfig.cpp @@ -2,9 +2,7 @@ // // A container class for a Rivendell replication configuration // -// (C) Copyright 2010 Fred Gleason -// -// $Id: replconfig.cpp,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/replconfig.h b/rdrepld/replconfig.h index 5dc93f774..09c904f49 100644 --- a/rdrepld/replconfig.h +++ b/rdrepld/replconfig.h @@ -2,9 +2,7 @@ // // A container class for a Rivendell replication configuration // -// (C) Copyright 2010 Fred Gleason -// -// $Id: replconfig.h,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/replfactory.cpp b/rdrepld/replfactory.cpp index 351964274..3ea27b00d 100644 --- a/rdrepld/replfactory.cpp +++ b/rdrepld/replfactory.cpp @@ -2,9 +2,7 @@ // // Virtual base class for replicator methods // -// (C) Copyright 2010 Fred Gleason -// -// $Id: replfactory.cpp,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdrepld/replfactory.h b/rdrepld/replfactory.h index a01a8f7b2..98346d7da 100644 --- a/rdrepld/replfactory.h +++ b/rdrepld/replfactory.h @@ -2,9 +2,7 @@ // // Virtual base class for replicator methods // -// (C) Copyright 2010 Fred Gleason -// -// $Id: replfactory.h,v 1.2 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/rdselect/Makefile.am b/rdselect/Makefile.am index 800b152aa..4f170377f 100644 --- a/rdselect/Makefile.am +++ b/rdselect/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rdselect ## -## (C) Copyright 2012 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.4 2013/01/01 21:36:32 cvs Exp $ +## (C) Copyright 2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/rdselect/rdselect.cpp b/rdselect/rdselect.cpp index ea0571375..36caa3bd7 100644 --- a/rdselect/rdselect.cpp +++ b/rdselect/rdselect.cpp @@ -2,9 +2,7 @@ // // System Selector for Rivendell // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdselect.cpp,v 1.1.2.9 2014/01/21 21:59:33 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -51,9 +49,8 @@ #include "../icons/greencheckmark.xpm" #include "../icons/redx.xpm" - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { // // Read Command Options @@ -377,7 +374,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->show(); return a.exec(); diff --git a/rdselect/rdselect.h b/rdselect/rdselect.h index 6832949f1..99e76d1d3 100644 --- a/rdselect/rdselect.h +++ b/rdselect/rdselect.h @@ -2,9 +2,7 @@ // // System Selector for Rivendell // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdselect.h,v 1.1.2.3 2012/10/22 18:22:38 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdselect/rdselect.pro b/rdselect/rdselect.pro index d58c1d509..efcbb6999 100644 --- a/rdselect/rdselect.pro +++ b/rdselect/rdselect.pro @@ -2,9 +2,7 @@ # # The QMake project file for RDSelect. # -# (C) Copyright 2012 Fred Gleason -# -# $Id: rdselect.pro,v 1.1.2.2 2013/01/01 21:36:33 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/acu1p.cpp b/ripcd/acu1p.cpp index 0fbd60111..776d692c1 100644 --- a/ripcd/acu1p.cpp +++ b/ripcd/acu1p.cpp @@ -2,9 +2,7 @@ // // Rivendell switcher driver for the Sine Systems ACU-1 (Prophet) // -// (C) Copyright 2012 Fred Gleason -// -// $Id: acu1p.cpp,v 1.1.2.2 2012/12/13 03:14:00 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -Acu1p::Acu1p(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Acu1p::Acu1p(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { char str[9]; diff --git a/ripcd/acu1p.h b/ripcd/acu1p.h index 6f24defee..5fce819cd 100644 --- a/ripcd/acu1p.h +++ b/ripcd/acu1p.h @@ -2,9 +2,7 @@ // // Rivendell switcher driver for the Sine Systems ACU-1 (Prophet) // -// (C) Copyright 2012 Fred Gleason -// -// $Id: acu1p.h,v 1.1.2.2 2012/12/13 03:14:00 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,7 +42,7 @@ class Acu1p : public Switcher { Q_OBJECT public: - Acu1p(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Acu1p(RDMatrix *matrix,QObject *parent=0); ~Acu1p(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/am16.cpp b/ripcd/am16.cpp index 6699d403d..d42f004c0 100644 --- a/ripcd/am16.cpp +++ b/ripcd/am16.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the 360 Systems AM16 // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: am16.cpp,v 1.1.2.1 2013/06/28 00:33:34 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,9 +27,8 @@ #include #include - -Am16::Am16(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Am16::Am16(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { unsigned sockopt; diff --git a/ripcd/am16.h b/ripcd/am16.h index baf8e5a9a..2ddfb0d47 100644 --- a/ripcd/am16.h +++ b/ripcd/am16.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the 360 Systems AM16 // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: am16.h,v 1.1.2.1 2013/06/28 00:33:34 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -68,7 +66,7 @@ class Am16 : public Switcher { Q_OBJECT public: - Am16(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Am16(RDMatrix *matrix,QObject *parent=0); ~Am16(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/bt10x1.cpp b/ripcd/bt10x1.cpp index a69c14618..f3e7530d2 100644 --- a/ripcd/bt10x1.cpp +++ b/ripcd/bt10x1.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 10x1 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: bt10x1.cpp,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include -Bt10x1::Bt10x1(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Bt10x1::Bt10x1(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/bt10x1.h b/ripcd/bt10x1.h index dac463a65..e58de4ce1 100644 --- a/ripcd/bt10x1.h +++ b/ripcd/bt10x1.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 10x1 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: bt10x1.h,v 1.9 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class Bt10x1 : public Switcher { Q_OBJECT public: - Bt10x1(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Bt10x1(RDMatrix *matrix,QObject *parent=0); ~Bt10x1(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/bt16x1.cpp b/ripcd/bt16x1.cpp index b7c11f282..40fc8ec55 100644 --- a/ripcd/bt16x1.cpp +++ b/ripcd/bt16x1.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 16x1 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt16x1.cpp,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -Bt16x1::Bt16x1(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Bt16x1::Bt16x1(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/bt16x1.h b/ripcd/bt16x1.h index 510f57290..40915b78e 100644 --- a/ripcd/bt16x1.h +++ b/ripcd/bt16x1.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 16x1 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt16x1.h,v 1.9 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class Bt16x1 : public Switcher { Q_OBJECT public: - Bt16x1(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Bt16x1(RDMatrix *matrix,QObject *parent=0); ~Bt16x1(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/bt16x2.cpp b/ripcd/bt16x2.cpp index 97e95631b..626d8ec46 100644 --- a/ripcd/bt16x2.cpp +++ b/ripcd/bt16x2.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 16x2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt16x2.cpp,v 1.14 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -Bt16x2::Bt16x2(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Bt16x2::Bt16x2(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/bt16x2.h b/ripcd/bt16x2.h index bc45e6995..408102c4e 100644 --- a/ripcd/bt16x2.h +++ b/ripcd/bt16x2.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 16x2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt16x2.h,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class Bt16x2 : public Switcher { Q_OBJECT public: - Bt16x2(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Bt16x2(RDMatrix *matrix,QObject *parent=0); ~Bt16x2(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/bt8x2.cpp b/ripcd/bt8x2.cpp index 8d2e63d25..bbb4f747b 100644 --- a/ripcd/bt8x2.cpp +++ b/ripcd/bt8x2.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 8x2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt8x2.cpp,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -Bt8x2::Bt8x2(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Bt8x2::Bt8x2(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/bt8x2.h b/ripcd/bt8x2.h index d55bded8e..1ad75454e 100644 --- a/ripcd/bt8x2.h +++ b/ripcd/bt8x2.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 8x2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: bt8x2.h,v 1.9 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class Bt8x2 : public Switcher { Q_OBJECT public: - Bt8x2(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Bt8x2(RDMatrix *matrix,QObject *parent=0); ~Bt8x2(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btacs82.cpp b/ripcd/btacs82.cpp index 5c4e790be..3e440b2ab 100644 --- a/ripcd/btacs82.cpp +++ b/ripcd/btacs82.cpp @@ -1,10 +1,8 @@ // btacs82.cpp // -// A Rivendell switcher driver for the BroadcastTools SS 8.2 +// A Rivendell switcher driver for the BroadcastTools ACS 8.2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: btacs82.cpp,v 1.14 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btacs82.h b/ripcd/btacs82.h index bd5a2b139..dae2ea902 100644 --- a/ripcd/btacs82.h +++ b/ripcd/btacs82.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools ACS 8.2 // -// (C) Copyright 2002-2008 Fred Gleason -// -// $Id: btacs82.h,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,12 +33,11 @@ #define BTACS82_POLL_INTERVAL 100 #define BTACS82_GPIO_PINS 16 - class BtAcs82 : public Switcher { Q_OBJECT public: - BtAcs82(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtAcs82(RDMatrix *matrix,QObject *parent=0); ~BtAcs82(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btadms4422.cpp b/ripcd/btadms4422.cpp index b3e93ac08..586b8e0e4 100644 --- a/ripcd/btadms4422.cpp +++ b/ripcd/btadms4422.cpp @@ -25,9 +25,8 @@ #include #include - -BtAdms4422::BtAdms4422(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtAdms4422::BtAdms4422(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btadms4422.h b/ripcd/btadms4422.h index 93cbad1d9..af619caab 100644 --- a/ripcd/btadms4422.h +++ b/ripcd/btadms4422.h @@ -33,12 +33,11 @@ #define BTADMS4422_POLL_INTERVAL 100 #define BTADMS4422_GPI_PINS 16 - class BtAdms4422 : public Switcher { Q_OBJECT public: - BtAdms4422(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtAdms4422(RDMatrix *matrix,QObject *parent=0); ~BtAdms4422(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btgpi16.cpp b/ripcd/btgpi16.cpp index 6602c2b60..abd4b2f34 100644 --- a/ripcd/btgpi16.cpp +++ b/ripcd/btgpi16.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools GPI-16 // -// (C) Copyright 2002-2005,2010 Fred Gleason +// (C) Copyright 2002-2005,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +25,8 @@ #include #include - -BtGpi16::BtGpi16(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtGpi16::BtGpi16(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btgpi16.h b/ripcd/btgpi16.h index e2f33a900..1d1edf341 100644 --- a/ripcd/btgpi16.h +++ b/ripcd/btgpi16.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools GPI-16 // -// (C) Copyright 2002-2005,2010,2014 Fred Gleason +// (C) Copyright 2002-2005,2010,2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,12 +33,11 @@ #define BTGPI16_POLL_INTERVAL 100 #define BTGPI16_GPIO_PINS 16 - class BtGpi16 : public Switcher { Q_OBJECT public: - BtGpi16(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtGpi16(RDMatrix *matrix,QObject *parent=0); ~BtGpi16(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btsentinel4web.cpp b/ripcd/btsentinel4web.cpp index c79576482..d30bad767 100644 --- a/ripcd/btsentinel4web.cpp +++ b/ripcd/btsentinel4web.cpp @@ -2,9 +2,7 @@ // // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: btsentinel4web.cpp,v 1.1.2.1 2014/02/17 02:19:03 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { bt_address=matrix->ipAddress(RDMatrix::Primary); bt_port=matrix->ipPort(RDMatrix::Primary); diff --git a/ripcd/btsentinel4web.h b/ripcd/btsentinel4web.h index ee2e6367e..8ebd3a827 100644 --- a/ripcd/btsentinel4web.h +++ b/ripcd/btsentinel4web.h @@ -2,9 +2,7 @@ // // Rivendell switcher driver for the BroadcastTools Sentinel4Web AES switcher // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: btsentinel4web.h,v 1.1.2.1 2014/02/17 02:19:03 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,7 +45,7 @@ class BtSentinel4Web : public Switcher { Q_OBJECT public: - BtSentinel4Web(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSentinel4Web(RDMatrix *matrix,QObject *parent=0); ~BtSentinel4Web(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btsrc16.cpp b/ripcd/btsrc16.cpp index 94fcb630b..41a593995 100644 --- a/ripcd/btsrc16.cpp +++ b/ripcd/btsrc16.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SRC-16 // -// (C) Copyright 2002-2005,2010 Fred Gleason -// -// $Id: +// (C) Copyright 2002-2005,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtSrc16::BtSrc16(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSrc16::BtSrc16(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btsrc16.h b/ripcd/btsrc16.h index 32ada7e37..b59d1c81e 100644 --- a/ripcd/btsrc16.h +++ b/ripcd/btsrc16.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SRC-16 // -// (C) Copyright 2002-2005,2010 Fred Gleason -// -// $Id: btsrc16.h,v 1.3 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2005,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,12 +33,11 @@ #define BTSRC16_POLL_INTERVAL 100 #define BTSRC16_GPIO_PINS 16 - class BtSrc16 : public Switcher { Q_OBJECT public: - BtSrc16(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSrc16(RDMatrix *matrix,QObject *parent=0); ~BtSrc16(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btsrc8iii.cpp b/ripcd/btsrc8iii.cpp index 1351e9eed..806252853 100644 --- a/ripcd/btsrc8iii.cpp +++ b/ripcd/btsrc8iii.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SRC-8 III // -// (C) Copyright 2002-2005,2010 Fred Gleason -// -// $Id: btsrc8iii.cpp,v 1.3 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2005,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,8 +26,8 @@ #include -BtSrc8Iii::BtSrc8Iii(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSrc8Iii::BtSrc8Iii(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btsrc8iii.h b/ripcd/btsrc8iii.h index 47a668024..5107f0c5b 100644 --- a/ripcd/btsrc8iii.h +++ b/ripcd/btsrc8iii.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SRC-8 III // -// (C) Copyright 2002-2005,2010 Fred Gleason -// -// $Id: btsrc8iii.h,v 1.3 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2005,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class BtSrc8Iii : public Switcher { Q_OBJECT public: - BtSrc8Iii(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSrc8Iii(RDMatrix *matrix,QObject *parent=0); ~BtSrc8Iii(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btss124.cpp b/ripcd/btss124.cpp index c2a637b7f..f9451e62f 100644 --- a/ripcd/btss124.cpp +++ b/ripcd/btss124.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 12.4 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: btss124.cpp,v 1.11 2010/08/03 23:39:25 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtSs124::BtSs124(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSs124::BtSs124(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/btss124.h b/ripcd/btss124.h index c84038f3b..9994a1e4e 100644 --- a/ripcd/btss124.h +++ b/ripcd/btss124.h @@ -1,10 +1,8 @@ // btss124.h // -// A Rivendell switcher driver for the BroadcastTools SS 8.2 +// A Rivendell switcher driver for the BroadcastTools SS 12.4 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: btss124.h,v 1.9 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class BtSs124 : public Switcher { Q_OBJECT public: - BtSs124(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSs124(RDMatrix *matrix,QObject *parent=0); ~BtSs124(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btss164.cpp b/ripcd/btss164.cpp index 96b0d1a06..89568050d 100644 --- a/ripcd/btss164.cpp +++ b/ripcd/btss164.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 16.4 // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: btss164.cpp,v 1.15 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtSs164::BtSs164(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSs164::BtSs164(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btss164.h b/ripcd/btss164.h index 705a0f9a5..d3dd3c96c 100644 --- a/ripcd/btss164.h +++ b/ripcd/btss164.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS16.4 // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: btss164.h,v 1.10 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class BtSs164 : public Switcher { Q_OBJECT public: - BtSs164(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSs164(RDMatrix *matrix,QObject *parent=0); ~BtSs164(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btss42.cpp b/ripcd/btss42.cpp index 8fdd4da73..ce5ea3427 100644 --- a/ripcd/btss42.cpp +++ b/ripcd/btss42.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.2 // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: btss42.cpp,v 1.12 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtSs42::BtSs42(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSs42::BtSs42(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btss42.h b/ripcd/btss42.h index f1438275e..34023c7d7 100644 --- a/ripcd/btss42.h +++ b/ripcd/btss42.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.2 // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: btss42.h,v 1.10 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class BtSs42 : public Switcher { Q_OBJECT public: - BtSs42(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSs42(RDMatrix *matrix,QObject *parent=0); ~BtSs42(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btss44.cpp b/ripcd/btss44.cpp index 5a644baeb..d30144ddf 100644 --- a/ripcd/btss44.cpp +++ b/ripcd/btss44.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.4 // -// (C) Copyright 2002-2005,2009 Fred Gleason -// -// $Id: btss44.cpp,v 1.3.8.1 2014/03/02 03:15:23 cvs Exp $ +// (C) Copyright 2002-2005,2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include #include -BtSs44::BtSs44(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSs44::BtSs44(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btss44.h b/ripcd/btss44.h index e55bbe947..5dd431599 100644 --- a/ripcd/btss44.h +++ b/ripcd/btss44.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 4.4 // -// (C) Copyright 2002-2005,2009 Fred Gleason -// -// $Id: btss44.h,v 1.3 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class BtSs44 : public Switcher { Q_OBJECT public: - BtSs44(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSs44(RDMatrix *matrix,QObject *parent=0); ~BtSs44(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/btss82.cpp b/ripcd/btss82.cpp index 901b3bee3..ab93adc3a 100644 --- a/ripcd/btss82.cpp +++ b/ripcd/btss82.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 8.2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: btss82.cpp,v 1.14 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -BtSs82::BtSs82(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +BtSs82::BtSs82(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Initialize Data Structures diff --git a/ripcd/btss82.h b/ripcd/btss82.h index f326b9ef6..3d2c889ae 100644 --- a/ripcd/btss82.h +++ b/ripcd/btss82.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools SS 8.2 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: btss82.h,v 1.11.8.1 2012/12/11 03:49:48 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class BtSs82 : public Switcher { Q_OBJECT public: - BtSs82(RDMatrix *matrix,QObject *parent=0,const char *name=0); + BtSs82(RDMatrix *matrix,QObject *parent=0); ~BtSs82(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/globals.h b/ripcd/globals.h index 75d79e5ce..5d60db5a7 100644 --- a/ripcd/globals.h +++ b/ripcd/globals.h @@ -2,9 +2,7 @@ // // Global declarations for the Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: globals.h,v 1.11 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,12 +18,14 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifndef GLOBALS_H +#define GLOBALS_H + #include #include #include #include - // // Global Objects // @@ -35,3 +35,5 @@ extern RDStation *rdstation; extern QString ripcd_active_locks[MAX_MATRICES]; extern void LogLine(RDConfig::LogPriority prio,const QString &line); + +#endif // GLOBALS_H diff --git a/ripcd/harlond.cpp b/ripcd/harlond.cpp index 04ac46130..3831bad99 100644 --- a/ripcd/harlond.cpp +++ b/ripcd/harlond.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Harlond Virtual Mixer // -// (C) Copyright 2002-2012 Fred Gleason -// -// $Id: harlond.cpp,v 1.2.2.2 2012/08/06 00:12:07 cvs Exp $ +// (C) Copyright 2002-2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/harlond.h b/ripcd/harlond.h index ff3af016f..f4612ad41 100644 --- a/ripcd/harlond.h +++ b/ripcd/harlond.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Harlond Virtual Mixer // -// (C) Copyright 2002-2012 Fred Gleason -// -// $Id: harlond.h,v 1.2.2.2 2012/08/06 00:12:07 cvs Exp $ +// (C) Copyright 2002-2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/livewire_lwrpaudio.cpp b/ripcd/livewire_lwrpaudio.cpp index 49c35d7bb..5e2a83079 100644 --- a/ripcd/livewire_lwrpaudio.cpp +++ b/ripcd/livewire_lwrpaudio.cpp @@ -2,9 +2,7 @@ // // A Rivendell LWRP audio switcher driver for LiveWire networks. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: livewire_lwrpaudio.cpp,v 1.1.2.1 2013/11/17 04:27:06 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -LiveWireLwrpAudio::LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +LiveWireLwrpAudio::LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { QString sql; RDSqlQuery *q; diff --git a/ripcd/livewire_lwrpaudio.h b/ripcd/livewire_lwrpaudio.h index 211021bfb..6559fe94f 100644 --- a/ripcd/livewire_lwrpaudio.h +++ b/ripcd/livewire_lwrpaudio.h @@ -2,9 +2,7 @@ // // A Rivendell LWRP audio switcher driver for LiveWire networks. // -// (C) Copyright 2002-2013 Fred Gleason -// -// $Id: livewire_lwrpaudio.h,v 1.1.2.1 2013/11/17 04:27:06 cvs Exp $ +// (C) Copyright 2002-2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class LiveWireLwrpAudio : public Switcher { Q_OBJECT public: - LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent=0,const char *name=0); + LiveWireLwrpAudio(RDMatrix *matrix,QObject *parent=0); ~LiveWireLwrpAudio(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/livewire_lwrpgpio.cpp b/ripcd/livewire_lwrpgpio.cpp index 9a5f9000c..ba7ac1979 100644 --- a/ripcd/livewire_lwrpgpio.cpp +++ b/ripcd/livewire_lwrpgpio.cpp @@ -2,9 +2,7 @@ // // A Rivendell LWRP GPIO driver for LiveWire networks. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: livewire_lwrpgpio.cpp,v 1.1.2.1 2013/11/17 02:03:21 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include "livewire_lwrpgpio.h" -LiveWireLwrpGpio::LiveWireLwrpGpio(RDMatrix *matrix,QObject *parent, - const char *name) - : Switcher(matrix,parent,name) +LiveWireLwrpGpio::LiveWireLwrpGpio(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { gpio_is_virtual=matrix->layer()=='V'; diff --git a/ripcd/livewire_lwrpgpio.h b/ripcd/livewire_lwrpgpio.h index 377132149..6fc586869 100644 --- a/ripcd/livewire_lwrpgpio.h +++ b/ripcd/livewire_lwrpgpio.h @@ -2,9 +2,7 @@ // // A Rivendell LWRP GPIO driver for LiveWire networks. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: livewire_lwrpgpio.h,v 1.1.2.1 2013/11/17 02:03:21 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,7 +44,7 @@ class LiveWireLwrpGpio : public Switcher { Q_OBJECT public: - LiveWireLwrpGpio(RDMatrix *matrix,QObject *parent=0,const char *name=0); + LiveWireLwrpGpio(RDMatrix *matrix,QObject *parent=0); ~LiveWireLwrpGpio(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/livewire_mcastgpio.cpp b/ripcd/livewire_mcastgpio.cpp index f13832a03..ac3a62267 100644 --- a/ripcd/livewire_mcastgpio.cpp +++ b/ripcd/livewire_mcastgpio.cpp @@ -2,9 +2,7 @@ // // A Rivendell multicast GPIO driver for LiveWire networks. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: livewire_mcastgpio.cpp,v 1.1.2.1 2013/11/17 03:40:27 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,8 +32,8 @@ #include #include -LiveWireMcastGpio::LiveWireMcastGpio(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +LiveWireMcastGpio::LiveWireMcastGpio(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { livewire_gpio_notify=NULL; diff --git a/ripcd/livewire_mcastgpio.h b/ripcd/livewire_mcastgpio.h index ffffb23ba..7707fa226 100644 --- a/ripcd/livewire_mcastgpio.h +++ b/ripcd/livewire_mcastgpio.h @@ -2,9 +2,7 @@ // // A Rivendell multicast GPIO driver for LiveWire networks. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: livewire_mcastgpio.h,v 1.1.2.1 2013/11/17 03:40:27 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,7 +45,7 @@ class LiveWireMcastGpio : public Switcher { Q_OBJECT public: - LiveWireMcastGpio(RDMatrix *matrix,QObject *parent=0,const char *name=0); + LiveWireMcastGpio(RDMatrix *matrix,QObject *parent=0); ~LiveWireMcastGpio(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/local_audio.cpp b/ripcd/local_audio.cpp index 0560597b9..7723749d6 100644 --- a/ripcd/local_audio.cpp +++ b/ripcd/local_audio.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 10x1 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: local_audio.cpp,v 1.9 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -LocalAudio::LocalAudio(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +LocalAudio::LocalAudio(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/local_audio.h b/ripcd/local_audio.h index e3c267b91..6887eeb07 100644 --- a/ripcd/local_audio.h +++ b/ripcd/local_audio.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools 10x1 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: local_audio.h,v 1.8 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class LocalAudio : public Switcher { Q_OBJECT public: - LocalAudio(RDMatrix *matrix,QObject *parent=0,const char *name=0); + LocalAudio(RDMatrix *matrix,QObject *parent=0); ~LocalAudio(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/local_gpio.cpp b/ripcd/local_gpio.cpp index 7733b8d86..e2091064b 100644 --- a/ripcd/local_gpio.cpp +++ b/ripcd/local_gpio.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for MeasurementComputing GPIO cards. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: local_gpio.cpp,v 1.16.8.1 2013/03/03 23:30:16 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +23,8 @@ #include #include -LocalGpio::LocalGpio(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +LocalGpio::LocalGpio(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters @@ -45,7 +43,7 @@ LocalGpio::LocalGpio(RDMatrix *matrix,QObject *parent,const char *name) // // Initialize the card // - gpio_gpio=new RDGpio(this,"gpio_gpio"); + gpio_gpio=new RDGpio(this); gpio_gpio->setDevice(matrix->gpioDevice()); if((gpio_open=gpio_gpio->open())) { if(gpio_gpis==0) { diff --git a/ripcd/local_gpio.h b/ripcd/local_gpio.h index 97d9dfd25..e49694c13 100644 --- a/ripcd/local_gpio.h +++ b/ripcd/local_gpio.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for MeasurementComputing GPIO cards. // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: local_gpio.h,v 1.14 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,7 +33,7 @@ class LocalGpio : public Switcher { Q_OBJECT public: - LocalGpio(RDMatrix *matrix,QObject *parent=0,const char *name=0); + LocalGpio(RDMatrix *matrix,QObject *parent=0); ~LocalGpio(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/local_macros.cpp b/ripcd/local_macros.cpp index 0829cf6c2..f4c8b3624 100644 --- a/ripcd/local_macros.cpp +++ b/ripcd/local_macros.cpp @@ -2,9 +2,7 @@ // // Local RML Macros for the Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: local_macros.cpp,v 1.60.2.1 2013/06/20 20:00:09 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/maint_routines.cpp b/ripcd/maint_routines.cpp index 4277df788..46915e8d8 100644 --- a/ripcd/maint_routines.cpp +++ b/ripcd/maint_routines.cpp @@ -2,9 +2,7 @@ // // Rivendell Maintenance Routines // -// (C) Copyright 2008 Fred Gleason -// -// $Id: maint_routines.cpp,v 1.4 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/modemlines.cpp b/ripcd/modemlines.cpp index e688aeb93..5535c31cf 100644 --- a/ripcd/modemlines.cpp +++ b/ripcd/modemlines.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for using TTY modem lines for GPIO // -// (C) Copyright 2015 Fred Gleason +// (C) Copyright 2015-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,8 +28,8 @@ #include #include -ModemLines::ModemLines(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +ModemLines::ModemLines(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { gpio_poll_state=0; gpio_poll_timer=NULL; diff --git a/ripcd/modemlines.h b/ripcd/modemlines.h index 3de8e4ff3..72873407b 100644 --- a/ripcd/modemlines.h +++ b/ripcd/modemlines.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for using TTY modem lines for GPIO // -// (C) Copyright 2015 Fred Gleason +// (C) Copyright 2015,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -38,7 +38,7 @@ class ModemLines : public Switcher { Q_OBJECT public: - ModemLines(RDMatrix *matrix,QObject *parent=0,const char *name=0); + ModemLines(RDMatrix *matrix,QObject *parent=0); ~ModemLines(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/quartz1.cpp b/ripcd/quartz1.cpp index 09ed5abfb..881140c13 100644 --- a/ripcd/quartz1.cpp +++ b/ripcd/quartz1.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Quartz Type 1 Switcher Protocol // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: quartz1.cpp,v 1.11 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,8 +26,8 @@ #include #include -Quartz1::Quartz1(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Quartz1::Quartz1(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { RDTty *tty; sas_matrix=matrix->matrix(); diff --git a/ripcd/quartz1.h b/ripcd/quartz1.h index 58cec9935..1608d7328 100644 --- a/ripcd/quartz1.h +++ b/ripcd/quartz1.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Quartz Type 1 Switcher Protocol // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: quartz1.h,v 1.8 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +39,7 @@ class Quartz1 : public Switcher { Q_OBJECT public: - Quartz1(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Quartz1(RDMatrix *matrix,QObject *parent=0); RDMatrix::Type type(); unsigned gpiQuantity(); unsigned gpoQuantity(); diff --git a/ripcd/ripcd.cpp b/ripcd/ripcd.cpp index 9e5b67091..d02051c3a 100644 --- a/ripcd/ripcd.cpp +++ b/ripcd/ripcd.cpp @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2007,2010 Fred Gleason -// -// $Id: ripcd.cpp,v 1.77.4.3 2013/11/17 04:27:06 cvs Exp $ +// (C) Copyright 2002-2007,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -90,8 +87,8 @@ void SigHandler(int signo) } -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool skip_db_check=false; @@ -135,7 +132,7 @@ MainObject::MainObject(QObject *parent,const char *name) } ripc_onair_flag=false; - server=new RipcdSocket(RIPCD_TCP_PORT,0,this,"socket"); + server=new RipcdSocket(RIPCD_TCP_PORT,0,this); if(!server->ok()) { exit(1); } @@ -144,7 +141,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // Macro Timers // - QSignalMapper *mapper=new QSignalMapper(this,"macro_timer_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(macroTimerData(int))); for(int i=0;iconnectHost(); if(qApp->argc()==1) { @@ -225,7 +222,7 @@ MainObject::MainObject(QObject *parent,const char *name) // // Start RML Polling // - QTimer *timer=new QTimer(this,"timer"); + QTimer *timer=new QTimer(this); timer->changeInterval(RIPCD_RML_READ_INTERVAL); connect(timer,SIGNAL(timeout()),this,SLOT(readRml())); timer->start(true); @@ -234,7 +231,7 @@ MainObject::MainObject(QObject *parent,const char *name) // Database Backup Timer // databaseBackup(); - ripcd_backup_timer=new QTimer(this,"ripcd_backup_timer"); + ripcd_backup_timer=new QTimer(this); connect(ripcd_backup_timer,SIGNAL(timeout()),this,SLOT(databaseBackup())); ripcd_backup_timer->start(86400000); @@ -242,7 +239,7 @@ MainObject::MainObject(QObject *parent,const char *name) // Maintenance Routine Timer // srandom(QTime::currentTime().msec()); - ripcd_maint_timer=new QTimer(this,"ripcd_maint_timer"); + ripcd_maint_timer=new QTimer(this); connect(ripcd_maint_timer,SIGNAL(timeout()),this,SLOT(checkMaintData())); int interval=GetMaintInterval(); if(!ripcd_config->disableMaintChecks()) { @@ -883,6 +880,6 @@ void QApplication::saveState(QSessionManager &sm) { int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/ripcd/ripcd.h b/ripcd/ripcd.h index 18b4c9f34..066ed7b73 100644 --- a/ripcd/ripcd.h +++ b/ripcd/ripcd.h @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: ripcd.h,v 1.55 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -58,7 +56,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); ~MainObject(); public slots: diff --git a/ripcd/ripcd.pro b/ripcd/ripcd.pro index e6b22b9ef..78ca35cea 100644 --- a/ripcd/ripcd.pro +++ b/ripcd/ripcd.pro @@ -2,9 +2,7 @@ # # The ripcd/ QMake project file for Rivendell # -# (C) Copyright 2003-2005 Fred Gleason -# -# $Id: ripcd.pro,v 1.3 2007/02/14 21:57:04 fredg Exp $ +# (C) Copyright 2003-2005,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/ripcd_connection.cpp b/ripcd/ripcd_connection.cpp index a87518a97..57b825f5b 100644 --- a/ripcd/ripcd_connection.cpp +++ b/ripcd/ripcd_connection.cpp @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2010 Fred Gleason -// -// $Id: ripcd_connection.cpp,v 1.1 2010/08/03 18:41:14 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/ripcd_connection.h b/ripcd/ripcd_connection.h index cce77fade..836cfeef4 100644 --- a/ripcd/ripcd_connection.h +++ b/ripcd/ripcd_connection.h @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2010 Fred Gleason -// -// $Id: ripcd_connection.h,v 1.1 2010/08/03 18:41:14 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/ripcd_socket.cpp b/ripcd/ripcd_socket.cpp index e309d50e8..8fb257ba3 100644 --- a/ripcd/ripcd_socket.cpp +++ b/ripcd/ripcd_socket.cpp @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: ripcd_socket.cpp,v 1.9 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,16 +32,15 @@ #include -RipcdSocket::RipcdSocket(Q_UINT16 port,int backlog,QObject *parent, - const char *name) - : QServerSocket(port,0,parent,name) +RipcdSocket::RipcdSocket(Q_UINT16 port,int backlog,QObject *parent) + : QServerSocket(port,0,parent) { } RipcdSocket::RipcdSocket(const QHostAddress &address,Q_UINT16 port,int backlog, - QObject *parent,const char *name) - : QServerSocket(address,port,0,parent,name) + QObject *parent) + : QServerSocket(address,port,0,parent) { } diff --git a/ripcd/ripcd_socket.h b/ripcd/ripcd_socket.h index 3fb1295a4..fcabcdfb3 100644 --- a/ripcd/ripcd_socket.h +++ b/ripcd/ripcd_socket.h @@ -2,9 +2,7 @@ // // Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002 Fred Gleason -// -// $Id: ripcd_socket.h,v 1.6 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,23 +26,21 @@ #include #include - class RipcdSocket : public QServerSocket { Q_OBJECT - public: - RipcdSocket(Q_UINT16 port,int backlog=0,QObject *parent=0, - const char *name=0); - RipcdSocket(const QHostAddress &address,Q_UINT16 port,int backlog=0, - QObject *parent=0,const char *name=0); - void newConnection(int socket); + public: + RipcdSocket(Q_UINT16 port,int backlog=0,QObject *parent=0); + RipcdSocket(const QHostAddress &address,Q_UINT16 port,int backlog=0, + QObject *parent=0); + void newConnection(int socket); - signals: - void connection(int); + signals: + void connection(int); - private: - QServerSocket *socket; + private: + QServerSocket *socket; }; -#endif +#endif // RIPCD_SOCKET_H diff --git a/ripcd/rossnkscp.cpp b/ripcd/rossnkscp.cpp index da0267ae6..bc508aab5 100644 --- a/ripcd/rossnkscp.cpp +++ b/ripcd/rossnkscp.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Ross NK switchers via the SCP/A // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,8 +24,8 @@ #include -RossNkScp::RossNkScp(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +RossNkScp::RossNkScp(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/rossnkscp.h b/ripcd/rossnkscp.h index ad3dce868..a63e01bd8 100644 --- a/ripcd/rossnkscp.h +++ b/ripcd/rossnkscp.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the Ross NK switchers via the SCP/A // -// (C) Copyright 2015 Fred Gleason +// (C) Copyright 2015-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,7 +35,7 @@ class RossNkScp : public Switcher { Q_OBJECT public: - RossNkScp(RDMatrix *matrix,QObject *parent=0,const char *name=0); + RossNkScp(RDMatrix *matrix,QObject *parent=0); ~RossNkScp(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/sas16000.cpp b/ripcd/sas16000.cpp index b0d851807..592c2e317 100644 --- a/ripcd/sas16000.cpp +++ b/ripcd/sas16000.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the SAS USI Protocol (2 digit) // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +23,8 @@ #include #include -Sas16000::Sas16000(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Sas16000::Sas16000(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { RDTty *tty; sas_matrix=matrix->matrix(); diff --git a/ripcd/sas16000.h b/ripcd/sas16000.h index 499261350..dadf5c475 100644 --- a/ripcd/sas16000.h +++ b/ripcd/sas16000.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the SAS 16000(D) Audio Switcher // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +39,7 @@ class Sas16000 : public Switcher { Q_OBJECT public: - Sas16000(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Sas16000(RDMatrix *matrix,QObject *parent=0); RDMatrix::Type type(); unsigned gpiQuantity(); unsigned gpoQuantity(); diff --git a/ripcd/sas32000.cpp b/ripcd/sas32000.cpp index 7691ef71f..6963334c8 100644 --- a/ripcd/sas32000.cpp +++ b/ripcd/sas32000.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the SAS32000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas32000.cpp,v 1.14.8.1 2013/03/03 22:58:22 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -Sas32000::Sas32000(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Sas32000::Sas32000(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/sas32000.h b/ripcd/sas32000.h index c6db66e14..727d5af6d 100644 --- a/ripcd/sas32000.h +++ b/ripcd/sas32000.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the SAS32000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas32000.h,v 1.11.8.1 2013/03/03 22:58:22 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,7 +40,7 @@ class Sas32000 : public Switcher { Q_OBJECT public: - Sas32000(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Sas32000(RDMatrix *matrix,QObject *parent=0); ~Sas32000(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/sas64000.cpp b/ripcd/sas64000.cpp index d601f3e06..d2cf322c8 100644 --- a/ripcd/sas64000.cpp +++ b/ripcd/sas64000.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the SAS64000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas64000.cpp,v 1.12.8.1 2013/03/03 23:30:16 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,9 +23,8 @@ #include #include - -Sas64000::Sas64000(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Sas64000::Sas64000(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/sas64000.h b/ripcd/sas64000.h index caffbf7cb..0ff15c1dc 100644 --- a/ripcd/sas64000.h +++ b/ripcd/sas64000.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the SAS64000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas64000.h,v 1.10.8.1 2013/03/03 23:30:16 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class Sas64000 : public Switcher { Q_OBJECT public: - Sas64000(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Sas64000(RDMatrix *matrix,QObject *parent=0); ~Sas64000(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/sas64000gpi.cpp b/ripcd/sas64000gpi.cpp index 31d11e8f1..3e8cb29f5 100644 --- a/ripcd/sas64000gpi.cpp +++ b/ripcd/sas64000gpi.cpp @@ -3,9 +3,7 @@ // A Rivendell switcher driver for the SAS64000 connected via // a GPI-1600 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas64000gpi.cpp,v 1.13 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +25,8 @@ #include -Sas64000Gpi::Sas64000Gpi(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Sas64000Gpi::Sas64000Gpi(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { // // Get Matrix Parameters diff --git a/ripcd/sas64000gpi.h b/ripcd/sas64000gpi.h index e0c966458..797898a76 100644 --- a/ripcd/sas64000gpi.h +++ b/ripcd/sas64000gpi.h @@ -3,9 +3,7 @@ // A Rivendell switcher driver for the SAS64000 connected via // a GPI-1600 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas64000gpi.h,v 1.10 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -36,7 +34,7 @@ class Sas64000Gpi : public Switcher { Q_OBJECT public: - Sas64000Gpi(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Sas64000Gpi(RDMatrix *matrix,QObject *parent=0); ~Sas64000Gpi(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/sasusi.cpp b/ripcd/sasusi.cpp index 6edd5ceeb..03abc204c 100644 --- a/ripcd/sasusi.cpp +++ b/ripcd/sasusi.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the SAS USI Protocol // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,8 +23,8 @@ #include #include -SasUsi::SasUsi(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +SasUsi::SasUsi(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { QString sql; RDSqlQuery *q; @@ -66,7 +66,7 @@ SasUsi::SasUsi(RDMatrix *matrix,QObject *parent,const char *name) // // Reconnection Timer // - sas_reconnect_timer=new QTimer(this,"sas_reconnect_timer"); + sas_reconnect_timer=new QTimer(this); connect(sas_reconnect_timer,SIGNAL(timeout()),this,SLOT(ipConnect())); // @@ -86,7 +86,7 @@ SasUsi::SasUsi(RDMatrix *matrix,QObject *parent,const char *name) delete tty; case RDMatrix::TcpPort: - sas_socket=new QSocket(this,"sas_socket"); + sas_socket=new QSocket(this); connect(sas_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(sas_socket,SIGNAL(connectionClosed()), this,SLOT(connectionClosedData())); diff --git a/ripcd/sasusi.h b/ripcd/sasusi.h index 3a3f348e8..caf694f22 100644 --- a/ripcd/sasusi.h +++ b/ripcd/sasusi.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the SAS USI Protocol // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +41,7 @@ class SasUsi : public Switcher { Q_OBJECT public: - SasUsi(RDMatrix *matrix,QObject *parent=0,const char *name=0); + SasUsi(RDMatrix *matrix,QObject *parent=0); RDMatrix::Type type(); unsigned gpiQuantity(); unsigned gpoQuantity(); diff --git a/ripcd/starguide3.cpp b/ripcd/starguide3.cpp index b7502715f..27388b0a4 100644 --- a/ripcd/starguide3.cpp +++ b/ripcd/starguide3.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the StarGuide III Satellite Receiver // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: starguide3.cpp,v 1.14 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -StarGuide3::StarGuide3(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +StarGuide3::StarGuide3(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { QString sql; RDSqlQuery *q; diff --git a/ripcd/starguide3.h b/ripcd/starguide3.h index 23ce4ad01..47934b057 100644 --- a/ripcd/starguide3.h +++ b/ripcd/starguide3.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the StarGuide III Satellite Receiver // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: starguide3.h,v 1.9 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class StarGuide3 : public Switcher { Q_OBJECT public: - StarGuide3(RDMatrix *matrix,QObject *parent=0,const char *name=0); + StarGuide3(RDMatrix *matrix,QObject *parent=0); ~StarGuide3(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/starguide_feed.cpp b/ripcd/starguide_feed.cpp index 6caf1d603..6da14d226 100644 --- a/ripcd/starguide_feed.cpp +++ b/ripcd/starguide_feed.cpp @@ -2,9 +2,7 @@ // // A feed data container class for the StarGuide III Satellite Receiver // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: starguide_feed.cpp,v 1.5 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,7 +20,6 @@ #include - StarGuideFeed::StarGuideFeed() { } diff --git a/ripcd/starguide_feed.h b/ripcd/starguide_feed.h index bbe0b6e57..3bfd7ed50 100644 --- a/ripcd/starguide_feed.h +++ b/ripcd/starguide_feed.h @@ -2,9 +2,7 @@ // // A feed data container class for the StarGuide III Satellite Receiver // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: starguide_feed.h,v 1.6 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/swauthority.cpp b/ripcd/swauthority.cpp index b67c079d9..156f51c7d 100644 --- a/ripcd/swauthority.cpp +++ b/ripcd/swauthority.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for systems using Software Authority Protocol // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,8 +27,8 @@ #include #include -SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { swa_matrix=matrix->matrix(); swa_ptr=0; @@ -53,13 +53,13 @@ SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent,const char // // Reconnection Timer // - swa_reconnect_timer=new QTimer(this,"swa_reconnect_timer"); + swa_reconnect_timer=new QTimer(this); connect(swa_reconnect_timer,SIGNAL(timeout()),this,SLOT(ipConnect())); // // Initialize the connection // - swa_socket=new QSocket(this,"swa_socket"); + swa_socket=new QSocket(this); connect(swa_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(swa_socket,SIGNAL(connectionClosed()), this,SLOT(connectionClosedData())); diff --git a/ripcd/swauthority.h b/ripcd/swauthority.h index 7d11b8090..4405076ba 100644 --- a/ripcd/swauthority.h +++ b/ripcd/swauthority.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for systems using Software Authority Protocol // -// (C) Copyright 2002-2015 Fred Gleason +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +41,7 @@ class SoftwareAuthority : public Switcher { Q_OBJECT public: - SoftwareAuthority(RDMatrix *matrix,QObject *parent=0,const char *name=0); + SoftwareAuthority(RDMatrix *matrix,QObject *parent=0); RDMatrix::Type type(); unsigned gpiQuantity(); unsigned gpoQuantity(); diff --git a/ripcd/switcher.cpp b/ripcd/switcher.cpp index d881820c5..14253b793 100644 --- a/ripcd/switcher.cpp +++ b/ripcd/switcher.cpp @@ -2,9 +2,7 @@ // // Abstract base class for Rivendell Switcher/GPIO drivers. // -// (C) Copyright 2002-2007,2010 Fred Gleason -// -// $Id: switcher.cpp,v 1.1.8.3 2013/11/16 01:06:01 cvs Exp $ +// (C) Copyright 2002-2007,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include -Switcher::Switcher(RDMatrix *matrix,QObject *parent,const char *name) - : QObject(parent,name) +Switcher::Switcher(RDMatrix *matrix,QObject *parent) + : QObject(parent) { switcher_station_name=matrix->station(); switcher_matrix_number=matrix->matrix(); diff --git a/ripcd/switcher.h b/ripcd/switcher.h index b6990d06d..9af12fbbc 100644 --- a/ripcd/switcher.h +++ b/ripcd/switcher.h @@ -2,9 +2,7 @@ // // Abstract base class for Rivendell Switcher/GPIO drivers. // -// (C) Copyright 2002-2007,1020 Fred Gleason -// -// $Id: switcher.h,v 1.1.8.3 2013/11/16 01:06:01 cvs Exp $ +// (C) Copyright 2002-2007,2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,7 +32,7 @@ class Switcher : public QObject { Q_OBJECT public: - Switcher(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Switcher(RDMatrix *matrix,QObject *parent=0); ~Switcher(); QString stationName() const; int matrixNumber() const; diff --git a/ripcd/unity4000.cpp b/ripcd/unity4000.cpp index d510b611a..c89ea0304 100644 --- a/ripcd/unity4000.cpp +++ b/ripcd/unity4000.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the UNITY4000 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: unity4000.cpp,v 1.13 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -27,9 +25,8 @@ #include #include - -Unity4000::Unity4000(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +Unity4000::Unity4000(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { QString sql; RDSqlQuery *q; diff --git a/ripcd/unity4000.h b/ripcd/unity4000.h index 3b862b74c..1ac64f689 100644 --- a/ripcd/unity4000.h +++ b/ripcd/unity4000.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the UNITY4000 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: unity4000.h,v 1.9 2010/08/03 23:39:26 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class Unity4000 : public Switcher { Q_OBJECT public: - Unity4000(RDMatrix *matrix,QObject *parent=0,const char *name=0); + Unity4000(RDMatrix *matrix,QObject *parent=0); ~Unity4000(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/ripcd/unity_feed.cpp b/ripcd/unity_feed.cpp index 66580ba84..5adfd2fb7 100644 --- a/ripcd/unity_feed.cpp +++ b/ripcd/unity_feed.cpp @@ -2,9 +2,7 @@ // // A feed data container class for the Unity4000 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: unity_feed.cpp,v 1.5 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/unity_feed.h b/ripcd/unity_feed.h index 7a092f0aa..25cc05289 100644 --- a/ripcd/unity_feed.h +++ b/ripcd/unity_feed.h @@ -2,9 +2,7 @@ // // A feed data container class for the Unity4000 // -// (C) Copyright 2002-2003 Fred Gleason -// -// $Id: unity_feed.h,v 1.6 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2002-2003,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/ripcd/vguest.cpp b/ripcd/vguest.cpp index 125875ff6..118a44b43 100644 --- a/ripcd/vguest.cpp +++ b/ripcd/vguest.cpp @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Logitek vGuest Protocol // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: vguest.cpp,v 1.36.8.3 2013/11/07 23:00:00 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include -VGuest::VGuest(RDMatrix *matrix,QObject *parent,const char *name) - : Switcher(matrix,parent,name) +VGuest::VGuest(RDMatrix *matrix,QObject *parent) + : Switcher(matrix,parent) { RDTty *tty; QString sql; diff --git a/ripcd/vguest.h b/ripcd/vguest.h index 9d99ac550..8bf957267 100644 --- a/ripcd/vguest.h +++ b/ripcd/vguest.h @@ -2,9 +2,7 @@ // // A Rivendell switcher driver for the Logitek vGuest Protocol // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: vguest.h,v 1.17.8.1 2013/11/06 01:32:31 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -50,7 +48,7 @@ class VGuest : public Switcher { Q_OBJECT public: - VGuest(RDMatrix *matrix,QObject *parent=0,const char *name=0); + VGuest(RDMatrix *matrix,QObject *parent=0); ~VGuest(); RDMatrix::Type type(); unsigned gpiQuantity(); diff --git a/rivendell-gentoo b/rivendell-gentoo index 12c5fe7f7..6783a121e 100755 --- a/rivendell-gentoo +++ b/rivendell-gentoo @@ -3,9 +3,7 @@ ## ## A Rivendell init script for Gentoo Linux. ## -## (C) Copyright 2005 Fred Gleason -## -## $Id: rivendell-gentoo,v 1.6 2011/05/02 18:49:36 cvs Exp $ +## (C) Copyright 2005,2016 Fred Gleason ## ## Adapted from the Gentoo init script for Rivendell ## by Andres Toomsalu diff --git a/rivendell-suse.in b/rivendell-suse.in index c263b22b0..a9bc4369f 100755 --- a/rivendell-suse.in +++ b/rivendell-suse.in @@ -2,9 +2,7 @@ ## ## Rivendell init script for LSB and chkconfig(8) compliant Linux systems. ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: rivendell-suse.in,v 1.16.4.1 2013/11/13 18:30:57 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of version 2 of the GNU General Public License as diff --git a/rivendell.pro b/rivendell.pro index a6fad1d8c..d271a38ad 100644 --- a/rivendell.pro +++ b/rivendell.pro @@ -2,9 +2,7 @@ # # The top level QMake project file for Rivendell # -# (C) Copyright 2003-2004 Fred Gleason -# -# $Id: rivendell.pro,v 1.4 2007/02/14 21:48:41 fredg Exp $ +# (C) Copyright 2003-2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/rivendell.spec.in b/rivendell.spec.in index f5b422f61..eeabafcaf 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -1,7 +1,7 @@ ## rivendell.spec.in ## ## The Rivendell Radio Automation System -## Copyright (C) 2002-2014 Fred Gleason +## Copyright (C) 2002-2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of version 2 of the GNU General Public License as diff --git a/rlm/Makefile.am b/rlm/Makefile.am index bf2ecd4f8..340194bf7 100644 --- a/rlm/Makefile.am +++ b/rlm/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/rlm ## -## (C) Copyright 2008 Fred Gleason -## -## $Id: Makefile.am,v 1.7.4.5 2013/09/12 23:26:11 cvs Exp $ +## (C) Copyright 2008,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/scripts/Makefile.am b/scripts/Makefile.am index a608bdf00..242f841ad 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,9 +2,7 @@ ## ## Scripts Directory Makefile.am for Rivendell ## -## (C) Copyright 2002-2012 Fred Gleason -## -## $Id: Makefile.am,v 1.20.6.5 2012/11/29 01:37:37 cvs Exp $ +## (C) Copyright 2002-2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/scripts/crc-unity4k.sh b/scripts/crc-unity4k.sh index fcd988297..4f8bd891a 100755 --- a/scripts/crc-unity4k.sh +++ b/scripts/crc-unity4k.sh @@ -5,9 +5,7 @@ # Create a Unity4000 Switcher Configuration for the # Christian Radio Consortium (CRC) Network # -# (C) Copyright 2004 Fred Gleason -# -# $Id: crc-unity4k.sh,v 1.3 2007/02/14 21:59:12 fredg Exp $ +# (C) Copyright 2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/kill_rd b/scripts/kill_rd index 55cf4e675..8aa765cd7 100755 --- a/scripts/kill_rd +++ b/scripts/kill_rd @@ -2,9 +2,7 @@ # # Shutdown down the Rivendell system daemons # -# (C) Copyright 2003 Fred Gleason -# -# $Id: kill_rd,v 1.5 2007/02/14 21:59:12 fredg Exp $ +# (C) Copyright 2003,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_audio_sync b/scripts/rd_audio_sync index f68176872..61fcc78a3 100755 --- a/scripts/rd_audio_sync +++ b/scripts/rd_audio_sync @@ -4,9 +4,7 @@ # # Syncronize a Rivendell audio archive with the master server. # -# (C) Copyright 2004 Fred Gleason -# -# $Id: rd_audio_sync,v 1.4 2007/05/16 21:07:08 grauf Exp $ +# (C) Copyright 2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_backup b/scripts/rd_backup index 990c482a7..b66cef841 100755 --- a/scripts/rd_backup +++ b/scripts/rd_backup @@ -5,9 +5,7 @@ # Dump the local Rivendell database and copy the dump to one or more # remote hosts. # -# Copyright (C) 2006 Fred Gleason -# -# $Id: rd_backup,v 1.5 2007/10/08 18:37:33 fredg Exp $ +# Copyright (C) 2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_backup_system.sh b/scripts/rd_backup_system.sh index e290eb128..4c52e8afe 100755 --- a/scripts/rd_backup_system.sh +++ b/scripts/rd_backup_system.sh @@ -4,9 +4,7 @@ # # Back up a complete Rivendell setup to removable media. # -# (C) Copyright 2011 Fred Gleason -# -# $Id: rd_backup_system.sh,v 1.3 2011/05/23 11:22:48 cvs Exp $ +# (C) Copyright 2011,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_config b/scripts/rd_config index eb166640d..af3861d9d 100755 --- a/scripts/rd_config +++ b/scripts/rd_config @@ -4,9 +4,7 @@ # # Manage Rivendell configurations. # -# (C) Copyright 2004 Fred Gleason -# -# $Id: rd_config,v 1.4 2011/01/20 15:33:02 cvs Exp $ +# (C) Copyright 2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_create_db b/scripts/rd_create_db index 419bd2aaa..7fb143c57 100755 --- a/scripts/rd_create_db +++ b/scripts/rd_create_db @@ -2,9 +2,7 @@ # # Create and initialize a new database for Rivendell. # -# (C) Copyright 2002-2003 Fred Gleason -# -# $Id: rd_create_db,v 1.25 2007/02/14 21:59:12 fredg Exp $ +# (C) Copyright 2002-2003,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_memmon.sh b/scripts/rd_memmon.sh index 2275529bd..611117e69 100755 --- a/scripts/rd_memmon.sh +++ b/scripts/rd_memmon.sh @@ -4,9 +4,7 @@ # # Display a top session showing Rivendell components # -# (C) Copyright 2010 Fred Gleason -# -# $Id: rd_memmon.sh,v 1.2 2010/10/06 20:40:47 cvs Exp $ +# (C) Copyright 2010,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_mysql_enable_host.sh b/scripts/rd_mysql_enable_host.sh index 273343a0f..b7d2e49c0 100755 --- a/scripts/rd_mysql_enable_host.sh +++ b/scripts/rd_mysql_enable_host.sh @@ -4,9 +4,7 @@ # # Enable a remote host in MySQL # -# (C) Copyright 2011 Fred Gleason -# -# $Id: rd_mysql_enable_host.sh,v 1.1 2011/05/11 21:52:57 cvs Exp $ +# (C) Copyright 2011,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rd_restore_system.sh b/scripts/rd_restore_system.sh index fd5c1e197..67e936721 100755 --- a/scripts/rd_restore_system.sh +++ b/scripts/rd_restore_system.sh @@ -4,9 +4,7 @@ # # Restore a complete Rivendell setup from removable media. # -# (C) Copyright 2011 Fred Gleason -# -# $Id: rd_restore_system.sh,v 1.2 2011/05/23 11:22:48 cvs Exp $ +# (C) Copyright 2011,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/rdmemcheck.sh b/scripts/rdmemcheck.sh index c0fb33cc8..c49ea86d4 100755 --- a/scripts/rdmemcheck.sh +++ b/scripts/rdmemcheck.sh @@ -4,9 +4,7 @@ # # Script for monitoring Rivendell memory usage. # -# (C) Copyright 2010 Fred Gleason -# -# $Id: rdmemcheck.sh,v 1.1 2010/12/21 17:28:43 cvs Exp $ +# (C) Copyright 2010,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/sage_endec_rwt.sh b/scripts/sage_endec_rwt.sh index dc322bdde..c7665f45a 100755 --- a/scripts/sage_endec_rwt.sh +++ b/scripts/sage_endec_rwt.sh @@ -4,9 +4,7 @@ # # Run a Required Weekly Test on a Sage Digital ENDEC # -# (C) Copyright 2012 Fred Gleason -# -# $Id: sage_endec_rwt.sh,v 1.1.2.1 2012/10/11 19:16:27 cvs Exp $ +# (C) Copyright 2012,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/start-rdmonitor.sh b/scripts/start-rdmonitor.sh index 8205a2b8a..edfdb18c9 100755 --- a/scripts/start-rdmonitor.sh +++ b/scripts/start-rdmonitor.sh @@ -4,9 +4,7 @@ ## ## Start the Rivendell RDMonitor applet ## -## (C) Copyright 2012 Fred Gleason -## -## $Id: start-rdmonitor.sh,v 1.1.2.1 2012/10/20 00:24:46 cvs Exp $ +## (C) Copyright 2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of version 2 of the GNU General Public License as @@ -23,4 +21,4 @@ ## Boston, MA 02111-1307 USA ## -rdmonitor & \ No newline at end of file +rdmonitor & diff --git a/scripts/start_rd b/scripts/start_rd index e671279e5..d70e30f3c 100755 --- a/scripts/start_rd +++ b/scripts/start_rd @@ -2,9 +2,7 @@ # # Start up the Rivendell system daemons # -# (C) Copyright 2003 Fred Gleason -# -# $Id: start_rd,v 1.5 2007/02/14 21:59:12 fredg Exp $ +# (C) Copyright 2003,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/scripts/start_traverso.sh b/scripts/start_traverso.sh index a4df88f09..ef422fda9 100755 --- a/scripts/start_traverso.sh +++ b/scripts/start_traverso.sh @@ -5,9 +5,7 @@ # Load an audio file into the traverso audio DAW using OSC. # If traverso is not already running, it is first started. # -# (C) Copyright 2008 Fred Gleason -# -# $Id: start_traverso.sh,v 1.3 2010/07/29 19:32:38 cvs Exp $ +# (C) Copyright 2008,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/slack_doinst.sh b/slack_doinst.sh index cdda4afc8..b0ba4128e 100755 --- a/slack_doinst.sh +++ b/slack_doinst.sh @@ -4,9 +4,7 @@ # # Libradio installation package script for Slackware # -# Copyright 2002-2006 Fred Gleason -# -# $Id: slack_doinst.sh,v 1.3 2007/02/14 21:48:41 fredg Exp $ +# Copyright 2002-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/tests/Makefile.am b/tests/Makefile.am index 17ea6e694..9f2ad1f07 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/tests ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.14.8.4.2.1 2014/05/30 00:26:30 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/tests/audio_convert_test.cpp b/tests/audio_convert_test.cpp index 72d68a0a5..dacdb0700 100644 --- a/tests/audio_convert_test.cpp +++ b/tests/audio_convert_test.cpp @@ -2,7 +2,7 @@ // // Test the Rivendell file format converter. // -// (C) Copyright 2010-2015 Fred Gleason +// (C) Copyright 2010-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +26,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { unsigned schema=0; @@ -196,6 +196,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/audio_convert_test.h b/tests/audio_convert_test.h index 5f2ace57d..49a275c4b 100644 --- a/tests/audio_convert_test.h +++ b/tests/audio_convert_test.h @@ -2,7 +2,7 @@ // // Test the Rivendell file format converter. // -// (C) Copyright 2010-2015 Fred Gleason +// (C) Copyright 2010-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,7 +41,7 @@ RDConfig *rdconfig; class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QString source_filename; diff --git a/tests/audio_export_test.cpp b/tests/audio_export_test.cpp index ccd023f75..f2378e742 100644 --- a/tests/audio_export_test.cpp +++ b/tests/audio_export_test.cpp @@ -2,9 +2,7 @@ // // Test the Rivendell file format exporter. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: audio_export_test.cpp,v 1.5.4.1 2013/11/13 23:36:38 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,8 +27,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { username="user"; password=""; @@ -219,6 +217,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/audio_export_test.h b/tests/audio_export_test.h index 3b4c86862..2bc61aeea 100644 --- a/tests/audio_export_test.h +++ b/tests/audio_export_test.h @@ -2,9 +2,7 @@ // // Test the Rivendell file format converter. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: audio_export_test.h,v 1.2 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ RDConfig *rdconfig; class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QString username; diff --git a/tests/audio_import_test.cpp b/tests/audio_import_test.cpp index f5ae7c67a..2f323eb4c 100644 --- a/tests/audio_import_test.cpp +++ b/tests/audio_import_test.cpp @@ -2,9 +2,7 @@ // // Test Rivendell file importing. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: audio_import_test.cpp,v 1.5.4.1 2013/11/13 23:36:38 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,8 +26,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { username="user"; password=""; @@ -159,6 +157,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/audio_import_test.h b/tests/audio_import_test.h index a209ccc06..4ccb3495c 100644 --- a/tests/audio_import_test.h +++ b/tests/audio_import_test.h @@ -2,9 +2,7 @@ // // Test Rivendell file importing // -// (C) Copyright 2010 Fred Gleason -// -// $Id: audio_import_test.h,v 1.2 2010/07/29 19:32:38 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ RDConfig *rdconfig; class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QString username; diff --git a/tests/audio_peaks_test.cpp b/tests/audio_peaks_test.cpp index f098ae7b4..0a685b515 100644 --- a/tests/audio_peaks_test.cpp +++ b/tests/audio_peaks_test.cpp @@ -2,7 +2,7 @@ // // Test the Rivendell audio peak routines. // -// (C) Copyright 2015 Fred Gleason +// (C) Copyright 2015-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -102,6 +102,6 @@ MainObject::MainObject(QObject *parent) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL); + new MainObject(); return a.exec(); } diff --git a/tests/datedecode_test.cpp b/tests/datedecode_test.cpp index bdc651816..4e9828085 100644 --- a/tests/datedecode_test.cpp +++ b/tests/datedecode_test.cpp @@ -2,9 +2,7 @@ // // Test the Rivendell db connection routines. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: datedecode_test.cpp,v 1.1.2.3 2013/10/16 21:14:37 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,8 +29,8 @@ #include "datedecode_test.h" -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { QString date=""; QString datetime=""; @@ -86,6 +84,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/datedecode_test.h b/tests/datedecode_test.h index a3b3e1454..19f898ceb 100644 --- a/tests/datedecode_test.h +++ b/tests/datedecode_test.h @@ -2,9 +2,7 @@ // // Test the Rivendell date decoder routines. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: datedecode_test.h,v 1.1.2.2 2012/05/10 23:12:43 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); }; diff --git a/tests/reserve_carts_test.cpp b/tests/reserve_carts_test.cpp index f97c2daf8..a5f8b055b 100644 --- a/tests/reserve_carts_test.cpp +++ b/tests/reserve_carts_test.cpp @@ -2,9 +2,7 @@ // // Test the Rivendell db connection routines. // -// (C) Copyright 2012 Fred Gleason -// -// $Id: reserve_carts_test.cpp,v 1.1.2.1 2014/05/30 00:26:31 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -35,8 +33,8 @@ #include "reserve_carts_test.h" -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { RDConfig *config; QString group_name; @@ -128,6 +126,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/reserve_carts_test.h b/tests/reserve_carts_test.h index d7ddca254..2af7c4cd0 100644 --- a/tests/reserve_carts_test.h +++ b/tests/reserve_carts_test.h @@ -2,9 +2,7 @@ // // Test the Rivendell cart reservation routines. // -// (C) Copyright 2014 Fred Gleason -// -// $Id: reserve_carts_test.h,v 1.1.2.1 2014/05/30 00:26:31 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); }; diff --git a/tests/sas_switch_torture.cpp b/tests/sas_switch_torture.cpp index 39d61af22..ca3c20d0d 100644 --- a/tests/sas_switch_torture.cpp +++ b/tests/sas_switch_torture.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for playing Microsoft WAV files. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: sas_switch_torture.cpp,v 1.9 2011/06/21 22:20:44 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,9 +30,8 @@ #include #include - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { unsigned schema=0; @@ -179,7 +176,7 @@ int main(int argc,char *argv[]) { QApplication a(argc,argv); - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/tests/sas_switch_torture.h b/tests/sas_switch_torture.h index 937b74c33..77be5d64c 100644 --- a/tests/sas_switch_torture.h +++ b/tests/sas_switch_torture.h @@ -3,9 +3,7 @@ // Generate Rivendell macro carts and scheduling for torture-testing // an SAS router // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas_switch_torture.h,v 1.6 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,7 +19,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef SAS_SWITCH_TORTURE_H #define SAS_SWITCH_TORTURE_H @@ -43,7 +40,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/tests/sas_torture.cpp b/tests/sas_torture.cpp index 81cd752a6..19fe66319 100644 --- a/tests/sas_torture.cpp +++ b/tests/sas_torture.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for playing Microsoft WAV files. // -// (C) Copyright 2002 Fred Gleason -// -// $Id: sas_torture.cpp,v 1.10 2011/06/21 22:20:44 cvs Exp $ +// (C) Copyright 2002,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,9 +30,8 @@ #include #include - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { unsigned schema=0; @@ -190,7 +187,7 @@ int main(int argc,char *argv[]) { QApplication a(argc,argv); - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/tests/sas_torture.h b/tests/sas_torture.h index c78a4baaa..8ba58b2aa 100644 --- a/tests/sas_torture.h +++ b/tests/sas_torture.h @@ -3,9 +3,7 @@ // Generate Rivendell macro carts and scheduling for torture-testing // an SAS router // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas_torture.h,v 1.8 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,7 +19,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef SAS_TORTURE_H #define SAS_TORTURE_H @@ -43,7 +40,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/tests/stringcode_test.cpp b/tests/stringcode_test.cpp index 764e5183b..f1da8104f 100644 --- a/tests/stringcode_test.cpp +++ b/tests/stringcode_test.cpp @@ -2,9 +2,7 @@ // // Test the Rivendell string encoder routines. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: stringcode_test.cpp,v 1.1.2.1 2013/10/16 21:14:38 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,8 +29,8 @@ #include "stringcode_test.h" -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { char teststr[1024]; QString str; @@ -108,6 +106,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/stringcode_test.h b/tests/stringcode_test.h index 751e0d48a..9ffc930ee 100644 --- a/tests/stringcode_test.h +++ b/tests/stringcode_test.h @@ -2,9 +2,7 @@ // // Test the Rivendell string encoder routines. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: stringcode_test.h,v 1.1.2.1 2013/10/16 21:14:38 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -30,7 +28,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); }; diff --git a/tests/test_pam.cpp b/tests/test_pam.cpp index a0c5ea48b..7580dcdcd 100644 --- a/tests/test_pam.cpp +++ b/tests/test_pam.cpp @@ -2,9 +2,7 @@ // // Test PAM Authentication Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: test_pam.cpp,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -70,8 +68,8 @@ int ConversationResponseCallback(int num_msg,const struct pam_message **msg, } -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { int err; struct pam_conv conv; @@ -115,6 +113,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/test_pam.h b/tests/test_pam.h index 241838de3..0315cfcb6 100644 --- a/tests/test_pam.h +++ b/tests/test_pam.h @@ -2,9 +2,7 @@ // // Test PAM Authentication Service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -37,7 +35,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); }; diff --git a/tests/timer_test.cpp b/tests/timer_test.cpp index 54509855f..704de51ce 100644 --- a/tests/timer_test.cpp +++ b/tests/timer_test.cpp @@ -2,9 +2,7 @@ // // Test QTimer Accuracy // -// (C) Copyright 2013 Fred Gleason -// -// $Id: timer_test.cpp,v 1.1.2.1 2013/02/07 18:22:06 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -26,8 +24,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { // // Timer @@ -80,6 +78,6 @@ double MainObject::Time(struct timeval *tv) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/timer_test.h b/tests/timer_test.h index e89be4efd..0737aa9f6 100644 --- a/tests/timer_test.h +++ b/tests/timer_test.h @@ -2,9 +2,7 @@ // // Test QTimer Accuracy // -// (C) Copyright 2013 Fred Gleason -// -// $Id: timer_test.h,v 1.1.2.1 2013/02/07 18:22:06 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,7 +30,7 @@ class MainObject : public QObject { Q_OBJECT; public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void timeoutData(); diff --git a/tests/upload_test.cpp b/tests/upload_test.cpp index b4fefb93e..be29ed3be 100644 --- a/tests/upload_test.cpp +++ b/tests/upload_test.cpp @@ -2,9 +2,7 @@ // // Test Rivendell file uploading. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: upload_test.cpp,v 1.3 2011/06/21 22:20:44 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,8 +26,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { username=""; password=""; @@ -101,6 +99,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/tests/upload_test.h b/tests/upload_test.h index 2416613e1..333bc4687 100644 --- a/tests/upload_test.h +++ b/tests/upload_test.h @@ -2,9 +2,7 @@ // // Test Rivendell file uploading // -// (C) Copyright 2010 Fred Gleason -// -// $Id: upload_test.h,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,7 +40,7 @@ RDConfig *rdconfig; class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QString username; diff --git a/utils/rdalsaconfig/Makefile.am b/utils/rdalsaconfig/Makefile.am index da081e3ca..b2aa17b77 100644 --- a/utils/rdalsaconfig/Makefile.am +++ b/utils/rdalsaconfig/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for utils/rdalsaconfig ## -## (C) Copyright 2009 Fred Gleason -## -## $Id: Makefile.am,v 1.2.8.1 2012/11/29 01:37:37 cvs Exp $ +## (C) Copyright 2009,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdalsaconfig/alsaitem.cpp b/utils/rdalsaconfig/alsaitem.cpp index 141ae4ac8..e4d0decce 100644 --- a/utils/rdalsaconfig/alsaitem.cpp +++ b/utils/rdalsaconfig/alsaitem.cpp @@ -2,9 +2,7 @@ // // QListBoxItem for ALSA PCM devices. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: alsaitem.cpp,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdalsaconfig/alsaitem.h b/utils/rdalsaconfig/alsaitem.h index 8b7e4a00b..9a99c64b3 100644 --- a/utils/rdalsaconfig/alsaitem.h +++ b/utils/rdalsaconfig/alsaitem.h @@ -2,9 +2,7 @@ // // QListBoxItem for ALSA PCM devices. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: alsaitem.h,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdalsaconfig/rdalsa.cpp b/utils/rdalsaconfig/rdalsa.cpp index 23bd291cb..8e2db5d15 100644 --- a/utils/rdalsaconfig/rdalsa.cpp +++ b/utils/rdalsaconfig/rdalsa.cpp @@ -2,9 +2,7 @@ // // Abstract an ALSA configuration. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdalsa.cpp,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdalsaconfig/rdalsa.h b/utils/rdalsaconfig/rdalsa.h index 8285eed0b..c0f99be88 100644 --- a/utils/rdalsaconfig/rdalsa.h +++ b/utils/rdalsaconfig/rdalsa.h @@ -2,9 +2,7 @@ // // Abstract an ALSA configuration. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdalsa.h,v 1.2 2010/07/29 19:32:39 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdalsaconfig/rdalsaconfig.cpp b/utils/rdalsaconfig/rdalsaconfig.cpp index a33515e00..3e290feb1 100644 --- a/utils/rdalsaconfig/rdalsaconfig.cpp +++ b/utils/rdalsaconfig/rdalsaconfig.cpp @@ -2,9 +2,7 @@ // // A Qt-based application to display info about ALSA cards. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdalsaconfig.cpp,v 1.2.8.3 2014/01/21 21:59:33 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -60,8 +58,8 @@ void StartDaemons() } -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { setCaption(tr("RDAlsaConfig")+" v"+VERSION); @@ -92,15 +90,14 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Up Button // - alsa_up_button= - new RDTransportButton(RDTransportButton::Up,this,"alsa_up_button"); + alsa_up_button=new RDTransportButton(RDTransportButton::Up,this); connect(alsa_up_button,SIGNAL(clicked()),this,SLOT(upData())); // // Down Button // alsa_down_button= - new RDTransportButton(RDTransportButton::Down,this,"alsa_down_button"); + new RDTransportButton(RDTransportButton::Down,this); connect(alsa_down_button,SIGNAL(clicked()),this,SLOT(downData())); // @@ -312,7 +309,7 @@ void MainWidget::MoveItem(QListBox *src,QListBox *dest) } -Autogen::Autogen(QObject *parent,const char *name) +Autogen::Autogen(QObject *parent) { StopDaemons(); @@ -372,7 +369,7 @@ int main(int argc,char *argv[]) // if(alsa_autogen) { QApplication a(argc,argv,false); - new Autogen(NULL,"main"); + new Autogen(); return a.exec(); } @@ -380,7 +377,7 @@ int main(int argc,char *argv[]) // Start GUI // QApplication a(argc,argv); - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rdalsaconfig/rdalsaconfig.h b/utils/rdalsaconfig/rdalsaconfig.h index 231128e4b..5fdb459ad 100644 --- a/utils/rdalsaconfig/rdalsaconfig.h +++ b/utils/rdalsaconfig/rdalsaconfig.h @@ -2,9 +2,7 @@ // // A Qt-based application to display info about ALSA cards. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdalsaconfig.h,v 1.3 2010/09/08 20:38:01 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDALSACONFIG_H #define RDALSACONFIG_H @@ -42,7 +39,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); ~MainWidget(); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -77,7 +74,7 @@ class Autogen : public QObject { Q_OBJECT public: - Autogen(QObject *parent=0,const char *name=0); + Autogen(QObject *parent=0); }; diff --git a/utils/rdcheckcuts/Makefile.am b/utils/rdcheckcuts/Makefile.am index d3c4435eb..39d9b4eb7 100644 --- a/utils/rdcheckcuts/Makefile.am +++ b/utils/rdcheckcuts/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdcheckcuts ## -## (C) Copyright 2012 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.2 2012/11/29 01:37:37 cvs Exp $ +## (C) Copyright 2012,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdcheckcuts/rdcheckcuts.cpp b/utils/rdcheckcuts/rdcheckcuts.cpp index e3c9173f2..9c659f914 100644 --- a/utils/rdcheckcuts/rdcheckcuts.cpp +++ b/utils/rdcheckcuts/rdcheckcuts.cpp @@ -2,9 +2,7 @@ // // Check Rivendell Cuts for Valid Audio // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdcheckcuts.cpp,v 1.1.2.3 2013/11/13 23:36:38 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,8 +31,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { std::vector group_names; std::vector bad_cuts; @@ -183,6 +181,6 @@ void MainObject::CloseDb() int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdcheckcuts/rdcheckcuts.h b/utils/rdcheckcuts/rdcheckcuts.h index 768a7e43e..3bc93dcf6 100644 --- a/utils/rdcheckcuts/rdcheckcuts.h +++ b/utils/rdcheckcuts/rdcheckcuts.h @@ -2,9 +2,7 @@ // // Check Rivendell Cuts for Valid Audio // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rdcheckcuts.h,v 1.1.2.1 2012/10/13 04:53:19 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCHECKCUTS_H #define RDCHECKCUTS_H @@ -35,7 +32,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void RenderCut(const QString &cutname); diff --git a/utils/rdchunk/Makefile.am b/utils/rdchunk/Makefile.am index 6dbcb61ad..0e7c17775 100644 --- a/utils/rdchunk/Makefile.am +++ b/utils/rdchunk/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdchunk ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.5.8.1 2012/11/29 01:37:37 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdchunk/rdchunk.cpp b/utils/rdchunk/rdchunk.cpp index fcff5776a..a43cf9d24 100644 --- a/utils/rdchunk/rdchunk.cpp +++ b/utils/rdchunk/rdchunk.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for playing Microsoft WAV files. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdchunk.cpp,v 1.3.8.3 2014/01/21 21:59:33 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include #include #include @@ -45,9 +42,8 @@ #include - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { y_chunk_button=40; @@ -81,14 +77,14 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Load Button // - QPushButton *button=new QPushButton(tr("Load"),this,"load_button"); + QPushButton *button=new QPushButton(tr("Load"),this); button->setGeometry(10,10,sizeHint().width()-20,30); connect(button,SIGNAL(clicked()),this,SLOT(loadWaveFile())); // // Chunk Label // - wave_chunk_label=new QLabel(tr("Chunks"),this,"wave_chunk_label"); + wave_chunk_label=new QLabel(tr("Chunks"),this); wave_chunk_label->setGeometry(25,55,sizeHint().width()-50,20); wave_chunk_label->setAlignment(AlignCenter); wave_chunk_label->setFont(label_font); @@ -117,7 +113,7 @@ void MainWidget::createChunkButtons() // Create chunk buttons // if(wavefile->getFormatChunk()) { - fmt_button=new QPushButton(this,"fmt"); + fmt_button=new QPushButton(this); fmt_button->setText("Format"); fmt_button->setGeometry(xptr,yptr,80,25); fmt_button->show(); @@ -125,7 +121,7 @@ void MainWidget::createChunkButtons() connect(fmt_button,SIGNAL(clicked()),this,SLOT(displayFmt())); } if(wavefile->getDataChunk()) { - data_button=new QPushButton(this,"data"); + data_button=new QPushButton(this); data_button->setText("Data"); data_button->setGeometry(xptr,yptr,80,25); data_button->show(); @@ -133,7 +129,7 @@ void MainWidget::createChunkButtons() connect(data_button,SIGNAL(clicked()),this,SLOT(displayData())); } if(wavefile->getFactChunk()) { - fact_button=new QPushButton(this,"fact"); + fact_button=new QPushButton(this); fact_button->setText("Fact"); fact_button->setGeometry(xptr,yptr,80,25); fact_button->show(); @@ -141,7 +137,7 @@ void MainWidget::createChunkButtons() connect(fact_button,SIGNAL(clicked()),this,SLOT(displayFact())); } if(wavefile->getCartChunk()) { - cart_button=new QPushButton(this,"cart"); + cart_button=new QPushButton(this); cart_button->setText("Cart"); cart_button->setGeometry(xptr,yptr,80,25); cart_button->show(); @@ -149,7 +145,7 @@ void MainWidget::createChunkButtons() connect(cart_button,SIGNAL(clicked()),this,SLOT(displayCart())); } if(wavefile->getBextChunk()) { - bext_button=new QPushButton(this,"bext"); + bext_button=new QPushButton(this); bext_button->setText("Bext"); bext_button->setGeometry(xptr,yptr,80,25); bext_button->show(); @@ -157,7 +153,7 @@ void MainWidget::createChunkButtons() connect(bext_button,SIGNAL(clicked()),this,SLOT(displayBext())); } if(wavefile->getMextChunk()) { - mext_button=new QPushButton(this,"mext"); + mext_button=new QPushButton(this); mext_button->setText("Mext"); mext_button->setGeometry(xptr,yptr,80,25); mext_button->show(); @@ -165,7 +161,7 @@ void MainWidget::createChunkButtons() connect(mext_button,SIGNAL(clicked()),this,SLOT(displayMext())); } if(wavefile->getLevlChunk()) { - levl_button=new QPushButton(this,"levl"); + levl_button=new QPushButton(this); levl_button->setText("Levl"); levl_button->setGeometry(xptr,yptr,80,25); levl_button->show(); @@ -173,7 +169,7 @@ void MainWidget::createChunkButtons() connect(levl_button,SIGNAL(clicked()),this,SLOT(displayLevl())); } if(wavefile->getAIR1Chunk()) { - AIR1_button=new QPushButton(this,"AIR1"); + AIR1_button=new QPushButton(this); AIR1_button->setText("AIR1"); AIR1_button->setGeometry(xptr,yptr,80,25); AIR1_button->show(); @@ -735,7 +731,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rdchunk/rdchunk.h b/utils/rdchunk/rdchunk.h index b6b294069..09e2643bd 100644 --- a/utils/rdchunk/rdchunk.h +++ b/utils/rdchunk/rdchunk.h @@ -2,9 +2,7 @@ // // Utility for examining chunk data in WAV files. // -// (C) Copyright 2002-2004,2008 Fred Gleason -// -// $Id: rdchunk.h,v 1.3.8.1 2013/12/05 17:37:48 cvs Exp $ +// (C) Copyright 2002-2004,2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCHUNK_H #define RDCHUNK_H @@ -34,12 +31,11 @@ #define MIXER_Y 200 #define METER_UPDATE_INTERVAL 50 - class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -81,4 +77,4 @@ class MainWidget : public QWidget }; -#endif +#endif // RDCHUNK_H diff --git a/utils/rdchunk/rdchunk.pro b/utils/rdchunk/rdchunk.pro index 9d6be157d..e4bc85d55 100644 --- a/utils/rdchunk/rdchunk.pro +++ b/utils/rdchunk/rdchunk.pro @@ -2,9 +2,7 @@ # # The utils/rdchunk/ QMake project file for Rivendell # -# (C) Copyright 2003-2006,2008 Fred Gleason -# -# $Id: rdchunk.pro,v 1.2 2010/08/04 23:07:02 cvs Exp $ +# (C) Copyright 2003-2006,2008,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdcleandirs/rdcleandirs.cpp b/utils/rdcleandirs/rdcleandirs.cpp index 43b640db6..8cbc9b413 100644 --- a/utils/rdcleandirs/rdcleandirs.cpp +++ b/utils/rdcleandirs/rdcleandirs.cpp @@ -2,7 +2,7 @@ // // Remove stale lockfiles from user directories. // -// (C) Copyright 2010 Fred Gleason +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -32,8 +32,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { struct passwd *pwd=NULL; @@ -84,6 +84,6 @@ MainObject::MainObject(QObject *parent,const char *name) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdcleandirs/rdcleandirs.h b/utils/rdcleandirs/rdcleandirs.h index 4bc0ec1b4..aa476bdb8 100644 --- a/utils/rdcleandirs/rdcleandirs.h +++ b/utils/rdcleandirs/rdcleandirs.h @@ -2,7 +2,7 @@ // // Remove stale lockfiles from user directories. // -// (C) Copyright 2015 Fred Gleason +// (C) Copyright 2015,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -29,7 +29,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: }; diff --git a/utils/rdcollect/Makefile.am b/utils/rdcollect/Makefile.am index 05d3b01a7..96205f750 100644 --- a/utils/rdcollect/Makefile.am +++ b/utils/rdcollect/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdcollect ## -## (C) Copyright 2002-2010 Fred Gleason -## -## $Id: Makefile.am,v 1.2.8.2 2012/12/03 16:53:46 cvs Exp $ +## (C) Copyright 2002-2010,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdcollect/rdcollect.cpp b/utils/rdcollect/rdcollect.cpp index 874b63c5e..79a86e564 100644 --- a/utils/rdcollect/rdcollect.cpp +++ b/utils/rdcollect/rdcollect.cpp @@ -2,9 +2,7 @@ // // Collect and combine log exports into a single file. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdcollect.cpp,v 1.2.8.1 2012/08/01 19:21:09 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -31,8 +29,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool ok; int err; @@ -209,6 +207,6 @@ QTime MainObject::ReadTime(const QString &line) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdcollect/rdcollect.h b/utils/rdcollect/rdcollect.h index 49e869e59..7ed3abce0 100644 --- a/utils/rdcollect/rdcollect.h +++ b/utils/rdcollect/rdcollect.h @@ -2,9 +2,7 @@ // // Collect and combine log exports into a single file. // -// (C) Copyright 2010 Fred Gleason -// -// $Id: +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCOLLECT_H #define RDCOLLECT_H @@ -34,7 +31,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: QStringList GetDirectoryList(const QString &src_file); diff --git a/utils/rdcollect/rdcollect.pro b/utils/rdcollect/rdcollect.pro index 976137573..37bb4c682 100644 --- a/utils/rdcollect/rdcollect.pro +++ b/utils/rdcollect/rdcollect.pro @@ -2,9 +2,7 @@ # # The utils/rdcollect QMake project file for Rivendell # -# (C) Copyright 2003-2007 Fred Gleason -# -# $Id: rdcollect.pro,v 1.2 2010/07/29 19:32:39 cvs Exp $ +# (C) Copyright 2003-2007,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddbcheck/Makefile.am b/utils/rddbcheck/Makefile.am index 7f8644f63..f38249023 100644 --- a/utils/rddbcheck/Makefile.am +++ b/utils/rddbcheck/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rddbcheck ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.8.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddbcheck/rddbcheck.cpp b/utils/rddbcheck/rddbcheck.cpp index f6c4e1666..c67cff0de 100644 --- a/utils/rddbcheck/rddbcheck.cpp +++ b/utils/rddbcheck/rddbcheck.cpp @@ -2,9 +2,7 @@ // // A Database Check/Repair Tool for Rivendell. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rddbcheck.cpp,v 1.18.4.1.2.1 2014/06/02 18:52:22 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -49,8 +47,8 @@ // DB connection will be reset when we detect an error! // -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool skip_db_check=false; unsigned schema=0; @@ -815,6 +813,6 @@ bool MainObject::UserResponse() int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rddbcheck/rddbcheck.h b/utils/rddbcheck/rddbcheck.h index 67c698926..5ac20d19d 100644 --- a/utils/rddbcheck/rddbcheck.h +++ b/utils/rddbcheck/rddbcheck.h @@ -2,9 +2,7 @@ // // A Database Check/Repair Tool for Rivendell. // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rddbcheck.h,v 1.10.6.1 2014/06/02 18:52:22 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDDBCHECK_H #define RDDBCHECK_H @@ -41,11 +38,10 @@ // RDConfig *rdconfig; - class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void CheckOrphanedTracks(); diff --git a/utils/rddelete/Makefile.am b/utils/rddelete/Makefile.am index a1877d5e3..531f896c8 100644 --- a/utils/rddelete/Makefile.am +++ b/utils/rddelete/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rddelete ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.1 2013/04/29 22:03:23 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddelete/rddelete.cpp b/utils/rddelete/rddelete.cpp index d016bd445..2383fdbb9 100644 --- a/utils/rddelete/rddelete.cpp +++ b/utils/rddelete/rddelete.cpp @@ -2,9 +2,7 @@ // // A Batch Deleter for Rivendell. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rddelete.cpp,v 1.1.2.2 2013/11/13 23:36:39 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -28,21 +26,8 @@ #include #include -/* -void SigHandler(int signo) -{ - switch(signo) { - case SIGTERM: - case SIGINT: - case SIGHUP: - import_run=false; - break; - } -} -*/ - -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { // // Initialize Data Structures @@ -380,6 +365,6 @@ bool MainObject::GetNextStdinObject(QString *logname) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rddelete/rddelete.h b/utils/rddelete/rddelete.h index 16e3cfe18..7d428eb93 100644 --- a/utils/rddelete/rddelete.h +++ b/utils/rddelete/rddelete.h @@ -2,9 +2,7 @@ // // A Batch Deleter for Rivendell. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rddelete.h,v 1.1.2.1 2013/04/29 22:03:23 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDDELETE_H #define RDDELETE_H @@ -50,7 +47,7 @@ class MainObject : public QObject { Q_OBJECT; public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void userData(); diff --git a/utils/rddgimport/Makefile.am b/utils/rddgimport/Makefile.am index 6bb2e260b..523c5627d 100644 --- a/utils/rddgimport/Makefile.am +++ b/utils/rddgimport/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rddgimport ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.1 2013/01/04 18:41:14 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddgimport/event.cpp b/utils/rddgimport/event.cpp index d0989714c..eb1fe7357 100644 --- a/utils/rddgimport/event.cpp +++ b/utils/rddgimport/event.cpp @@ -2,9 +2,7 @@ // // Abstract a Dial Global Spot Event // -// (C) Copyright 2012 Fred Gleason -// -// $Id: event.cpp,v 1.1.2.1 2013/01/04 18:41:14 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddgimport/event.h b/utils/rddgimport/event.h index ac85fc423..820327119 100644 --- a/utils/rddgimport/event.h +++ b/utils/rddgimport/event.h @@ -2,9 +2,7 @@ // // Abstract a Dial Global Spot Event // -// (C) Copyright 2012 Fred Gleason -// -// $Id: event.h,v 1.1.2.1 2013/01/04 18:41:14 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 80ed66889..40cf31743 100644 --- a/utils/rddgimport/rddgimport.cpp +++ b/utils/rddgimport/rddgimport.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for importing Dial Global CDN downloads // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rddgimport.cpp,v 1.1.2.12 2014/01/21 21:59:33 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -44,8 +42,8 @@ #include -MainWidget::MainWidget(QWidget *parent,const char *name) - : QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + : QWidget(parent) { dg_user=NULL; dg_group=NULL; @@ -662,7 +660,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rddgimport/rddgimport.h b/utils/rddgimport/rddgimport.h index 3bd312388..ee29eed91 100644 --- a/utils/rddgimport/rddgimport.h +++ b/utils/rddgimport/rddgimport.h @@ -2,9 +2,7 @@ // // A Qt-based application for importing Dial Global CDN downloads // -// (C) Copyright 2012 Fred Gleason -// -// $Id: rddgimport.h,v 1.1.2.4 2013/02/05 01:35:35 cvs Exp $ +// (C) Copyright 2012,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -57,7 +55,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; private slots: diff --git a/utils/rddgimport/rddgimport.pro b/utils/rddgimport/rddgimport.pro index b5004222a..7e0cd099c 100644 --- a/utils/rddgimport/rddgimport.pro +++ b/utils/rddgimport/rddgimport.pro @@ -2,9 +2,7 @@ # # The utils/ QMake project file for Rivendell # -# (C) Copyright 2003-2006 Fred Gleason -# -# $Id: rddgimport.pro,v 1.1.2.1 2013/01/04 18:41:14 cvs Exp $ +# (C) Copyright 2003-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/Makefile.am b/utils/rddiscimport/Makefile.am index 482daf611..1f0e2f735 100644 --- a/utils/rddiscimport/Makefile.am +++ b/utils/rddiscimport/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rddiscimport ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.1 2013/12/03 23:34:35 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/metalibrary.cpp b/utils/rddiscimport/metalibrary.cpp index 362ba6e95..074ee9fe3 100644 --- a/utils/rddiscimport/metalibrary.cpp +++ b/utils/rddiscimport/metalibrary.cpp @@ -2,9 +2,7 @@ // // Abstract a library of metadata. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: metalibrary.cpp,v 1.1.2.3 2013/12/04 22:22:49 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/metalibrary.h b/utils/rddiscimport/metalibrary.h index 0c9b7810c..f7b1e2131 100644 --- a/utils/rddiscimport/metalibrary.h +++ b/utils/rddiscimport/metalibrary.h @@ -2,9 +2,7 @@ // // Abstract a library of metadata. // -// (C) Copyright 2013 Fred Gleason -// -// $Id: metalibrary.h,v 1.1.2.1 2013/12/03 23:34:35 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/metarecord.cpp b/utils/rddiscimport/metarecord.cpp index 625fb2e68..a4436f519 100644 --- a/utils/rddiscimport/metarecord.cpp +++ b/utils/rddiscimport/metarecord.cpp @@ -2,9 +2,7 @@ // // Container class for metadata // -// (C) Copyright 2013 Fred Gleason -// -// $Id: metarecord.cpp,v 1.1.2.3 2013/12/04 22:22:49 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/metarecord.h b/utils/rddiscimport/metarecord.h index 69cf0abc8..9aada8bc6 100644 --- a/utils/rddiscimport/metarecord.h +++ b/utils/rddiscimport/metarecord.h @@ -2,9 +2,7 @@ // // Container class for metadata // -// (C) Copyright 2013 Fred Gleason -// -// $Id: metarecord.h,v 1.1.2.3 2013/12/04 22:22:49 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rddiscimport/rddiscimport.cpp b/utils/rddiscimport/rddiscimport.cpp index fc7fe02c3..0d7eff7a8 100644 --- a/utils/rddiscimport/rddiscimport.cpp +++ b/utils/rddiscimport/rddiscimport.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for importing TM Century GoldDisc CDs // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rddiscimport.cpp,v 1.1.2.10 2014/01/21 21:59:33 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -50,8 +48,8 @@ #include -MainWidget::MainWidget(QWidget *parent,const char *name) - : QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + : QWidget(parent) { dg_user=NULL; dg_group=NULL; @@ -292,7 +290,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Eject Button // - dg_eject_button=new RDTransportButton(RDTransportButton::Eject,this,""); + dg_eject_button=new RDTransportButton(RDTransportButton::Eject,this); connect(dg_eject_button,SIGNAL(clicked()),dg_player,SLOT(eject())); // @@ -753,7 +751,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rddiscimport/rddiscimport.h b/utils/rddiscimport/rddiscimport.h index 8ee71f550..ddd95acc5 100644 --- a/utils/rddiscimport/rddiscimport.h +++ b/utils/rddiscimport/rddiscimport.h @@ -2,9 +2,7 @@ // // A Qt-based application for importing TM Century GoldDisc CDs // -// (C) Copyright 2013 Fred Gleason -// -// $Id: rddiscimport.h,v 1.1.2.4 2013/12/04 22:15:21 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -59,7 +57,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; private slots: diff --git a/utils/rddiscimport/rddiscimport.pro b/utils/rddiscimport/rddiscimport.pro index e582cbce8..92c543ed1 100644 --- a/utils/rddiscimport/rddiscimport.pro +++ b/utils/rddiscimport/rddiscimport.pro @@ -2,9 +2,7 @@ # # The utils/ QMake project file for Rivendell # -# (C) Copyright 2003-2006 Fred Gleason -# -# $Id: rddiscimport.pro,v 1.1.2.2 2013/12/04 18:06:36 cvs Exp $ +# (C) Copyright 2003-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index 8d4d8c809..933fe21c4 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -37,8 +37,8 @@ #include "rdexport.h" -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { export_metadata_pattern="%n_%j"; @@ -347,6 +347,6 @@ void MainObject::Verbose(const QString &msg) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL); + new MainObject(); return a.exec(); } diff --git a/utils/rdexport/rdexport.h b/utils/rdexport/rdexport.h index 819e46157..4b52070a0 100644 --- a/utils/rdexport/rdexport.h +++ b/utils/rdexport/rdexport.h @@ -39,7 +39,7 @@ class MainObject : public QObject { Q_OBJECT; public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void userData(); diff --git a/utils/rdgen/Makefile.am b/utils/rdgen/Makefile.am index e3d57324f..d7438d74d 100644 --- a/utils/rdgen/Makefile.am +++ b/utils/rdgen/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdgen ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.6.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdgen/rdgen.c b/utils/rdgen/rdgen.c index 41b476280..744a66982 100644 --- a/utils/rdgen/rdgen.c +++ b/utils/rdgen/rdgen.c @@ -2,9 +2,7 @@ * * A WAV file generator for test tones * - * (C) Copyright 1997-2003 Fred Gleason - * - * $Id: rdgen.c,v 1.4 2010/07/29 19:32:40 cvs Exp $ + * (C) Copyright 1997-2003,2016 Fred Gleason * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdgen/wavlib.c b/utils/rdgen/wavlib.c index 03d337ee6..30e384978 100644 --- a/utils/rdgen/wavlib.c +++ b/utils/rdgen/wavlib.c @@ -2,9 +2,7 @@ * * A C Library for abstracting WAV files * - * (C) Copyright 1997,1999-2003 Fred Gleason - * - * $Id: wavlib.c,v 1.4 2007/02/14 21:59:12 fredg Exp $ + * (C) Copyright 1997,1999-2003,2016 Fred Gleason * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdgen/wavlib.h b/utils/rdgen/wavlib.h index 914241f50..123eace6b 100644 --- a/utils/rdgen/wavlib.h +++ b/utils/rdgen/wavlib.h @@ -2,9 +2,7 @@ * * A C Library for abstracting WAV files * - * (C) Copyright 1997,1999-2003 Fred Gleason - * - * $Id: wavlib.h,v 1.4 2007/02/14 21:59:12 fredg Exp $ + * (C) Copyright 1997,1999-2003,2016 Fred Gleason * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdgpimon/Makefile.am b/utils/rdgpimon/Makefile.am index 2b117afe1..fa8e6a554 100644 --- a/utils/rdgpimon/Makefile.am +++ b/utils/rdgpimon/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdgpimon ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.13.8.2 2013/01/01 21:36:33 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdgpimon/gpi_label.cpp b/utils/rdgpimon/gpi_label.cpp index aa79f147a..0a3dabeaf 100644 --- a/utils/rdgpimon/gpi_label.cpp +++ b/utils/rdgpimon/gpi_label.cpp @@ -2,9 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: gpi_label.cpp,v 1.5 2011/05/27 21:28:25 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -24,8 +22,8 @@ #include -GpiLabel::GpiLabel(QWidget *parent,const char *name) - : QWidget(parent,name) +GpiLabel::GpiLabel(QWidget *parent) + : QWidget(parent) { gpi_line=-1; diff --git a/utils/rdgpimon/gpi_label.h b/utils/rdgpimon/gpi_label.h index 4a75d2373..4e074f270 100644 --- a/utils/rdgpimon/gpi_label.h +++ b/utils/rdgpimon/gpi_label.h @@ -2,9 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: gpi_label.h,v 1.4 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,19 +18,17 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef GPI_LABEL_H #define GPI_LABEL_H #include #include - class GpiLabel : public QWidget { Q_OBJECT public: - GpiLabel(QWidget *parent=0,const char *name=0); + GpiLabel(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; int line() const; diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index 4cd22bf1d..434986362 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for testing General Purpose Input (GPI) devices. // -// (C) Copyright 2002-2014 Fred Gleason +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,9 +46,8 @@ // #include "../icons/rivendell-22x22.xpm" - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { gpi_scroll_mode=false; @@ -781,7 +780,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rdgpimon/rdgpimon.h b/utils/rdgpimon/rdgpimon.h index 9ea89ab93..096876492 100644 --- a/utils/rdgpimon/rdgpimon.h +++ b/utils/rdgpimon/rdgpimon.h @@ -2,9 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdgpimon.h,v 1.9 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDGPIMON_H #define RDGPIMON_H @@ -47,7 +44,6 @@ #include - #define GPIMON_START_UP_DELAY 100 #define GPIMON_ROWS 4 #define GPIMON_COLS 8 @@ -56,7 +52,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); ~MainWidget(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/utils/rdgpimon/rdgpimon.pro b/utils/rdgpimon/rdgpimon.pro index c98818d42..4a59bad2d 100644 --- a/utils/rdgpimon/rdgpimon.pro +++ b/utils/rdgpimon/rdgpimon.pro @@ -2,9 +2,7 @@ # # The utils/ QMake project file for Rivendell # -# (C) Copyright 2003-2006 Fred Gleason -# -# $Id: rdgpimon.pro,v 1.6.8.1 2013/01/01 21:36:33 cvs Exp $ +# (C) Copyright 2003-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdhpiinfo/Makefile.am b/utils/rdhpiinfo/Makefile.am index e21398707..1cb8e80ff 100644 --- a/utils/rdhpiinfo/Makefile.am +++ b/utils/rdhpiinfo/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for utils/rdhpiinfo ## -## (C) Copyright 2002-2007 Fred Gleason -## -## $Id: Makefile.am,v 1.4.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2007,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdhpiinfo/change_mode.cpp b/utils/rdhpiinfo/change_mode.cpp index 68148248a..84780b67d 100644 --- a/utils/rdhpiinfo/change_mode.cpp +++ b/utils/rdhpiinfo/change_mode.cpp @@ -2,7 +2,7 @@ // // Change the mode of an AudioScience Adapter. // -// (C) Copyright 2002-2014 Fred Gleason +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -25,8 +25,8 @@ #include ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -147,7 +147,7 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode, // // Cancel Button // - QPushButton *cancel_button=new QPushButton(this,"cancel_button"); + QPushButton *cancel_button=new QPushButton(this); cancel_button->setGeometry(sizeHint().width()-70,sizeHint().height()-40, 60,30); cancel_button->setFont(font); diff --git a/utils/rdhpiinfo/change_mode.h b/utils/rdhpiinfo/change_mode.h index 3723101ac..b66d44be4 100644 --- a/utils/rdhpiinfo/change_mode.h +++ b/utils/rdhpiinfo/change_mode.h @@ -2,9 +2,7 @@ // // Change the mode of an AudioScience Adapter // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: change_mode.h,v 1.5 2011/05/18 14:38:14 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,13 +31,12 @@ #define HPI_ADAPTER_MODE_MULTICHANNEL (9) #endif - class ChangeMode : public QDialog { Q_OBJECT public: ChangeMode(unsigned short card,unsigned short type,int mode, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/utils/rdhpiinfo/rdhpiinfo.cpp b/utils/rdhpiinfo/rdhpiinfo.cpp index d3963c677..d1d7535f5 100644 --- a/utils/rdhpiinfo/rdhpiinfo.cpp +++ b/utils/rdhpiinfo/rdhpiinfo.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for display information on ASI cards. // -// (C) Copyright 2002-2014 Fred Gleason +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,8 +34,8 @@ #include "change_mode.h" #include "virtdetails.h" -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { setCaption(tr("RDHPIInfo")+" v"+VERSION); @@ -357,8 +357,7 @@ void MainWidget::changeModeData() QString str; hpi_err_t hpi_err; char hpi_text[100]; - ChangeMode *dialog=new ChangeMode(card,hpi_type[card],hpi_mode[card], - this,"change_mode_dialog"); + ChangeMode *dialog=new ChangeMode(card,hpi_type[card],hpi_mode[card],this); if((mode=dialog->exec())<0) { delete dialog; return; @@ -474,7 +473,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rdhpiinfo/rdhpiinfo.h b/utils/rdhpiinfo/rdhpiinfo.h index cb63baaf0..5fa5d2bda 100644 --- a/utils/rdhpiinfo/rdhpiinfo.h +++ b/utils/rdhpiinfo/rdhpiinfo.h @@ -2,9 +2,7 @@ // // A Qt-based application for display info about ASI cards. // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rdhpiinfo.h,v 1.5.6.1 2012/05/04 14:56:23 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDHPIINFO_H #define RDHPIINFO_H @@ -43,7 +40,7 @@ class MainWidget : public QWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); ~MainWidget(); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/utils/rdimport/Makefile.am b/utils/rdimport/Makefile.am index 6c86bb0db..57ccc165c 100644 --- a/utils/rdimport/Makefile.am +++ b/utils/rdimport/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdimport ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.8.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index 3dac0e57b..f02218c7c 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -2,7 +2,7 @@ // // A Batch Importer for Rivendell. // -// (C) Copyright 2002-2014 Fred Gleason +// (C) Copyright 2002-2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -56,8 +56,8 @@ void SigHandler(int signo) } -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { // // Initialize Data Structures @@ -1900,6 +1900,6 @@ bool MainObject::SchedulerCodeExists(const QString &code) const int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdimport/rdimport.h b/utils/rdimport/rdimport.h index 5d0eb153d..a4cfa5235 100644 --- a/utils/rdimport/rdimport.h +++ b/utils/rdimport/rdimport.h @@ -2,9 +2,7 @@ // // A Batch Importer for Rivendell. // -// (C) Copyright 2002-2009 Fred Gleason -// -// $Id: rdimport.h,v 1.17.6.3.2.3 2014/07/15 00:45:17 cvs Exp $ +// (C) Copyright 2002-2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDIMPORT_H #define RDIMPORT_H @@ -57,7 +54,7 @@ class MainObject : public QObject { Q_OBJECT; public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void userData(); diff --git a/utils/rdmaint/Makefile.am b/utils/rdmaint/Makefile.am index f4298c22a..2359f884e 100644 --- a/utils/rdmaint/Makefile.am +++ b/utils/rdmaint/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdmaint ## -## (C) Copyright 2008 Fred Gleason -## -## $Id: Makefile.am,v 1.6.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2008,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdmaint/rdmaint.cpp b/utils/rdmaint/rdmaint.cpp index 541ba045e..2a1a8aae8 100644 --- a/utils/rdmaint/rdmaint.cpp +++ b/utils/rdmaint/rdmaint.cpp @@ -42,8 +42,8 @@ #include #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { QString sql; RDSqlQuery *q; @@ -283,6 +283,6 @@ void MainObject::PurgeGpioEvents() int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdmaint/rdmaint.h b/utils/rdmaint/rdmaint.h index 7fca98eb9..4cc8f3ab5 100644 --- a/utils/rdmaint/rdmaint.h +++ b/utils/rdmaint/rdmaint.h @@ -2,9 +2,7 @@ // // A Utility for running periodic system maintenance. // -// (C) Copyright 2008 Fred Gleason -// -// $Id: rdmaint.h,v 1.6 2010/09/08 20:38:01 cvs Exp $ +// (C) Copyright 2008,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDMAINT_H #define RDMAINT_H @@ -34,11 +31,10 @@ #define RDMAINT_USAGE "[--help] [--verbose] [--system]\n\nRun Rivendell maintenance routines.\n" - class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void RunSystemMaintenance(); diff --git a/utils/rdmarkerset/Makefile.am b/utils/rdmarkerset/Makefile.am index c5acebf4a..e7386e63b 100644 --- a/utils/rdmarkerset/Makefile.am +++ b/utils/rdmarkerset/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdmarkerset ## -## (C) Copyright 2002-2014 Fred Gleason -## -## $Id: Makefile.am,v 1.1.2.1 2014/01/16 02:45:00 cvs Exp $ +## (C) Copyright 2002-2014,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdmarkerset/rdmarkerset.cpp b/utils/rdmarkerset/rdmarkerset.cpp index b035812ee..d47e0db48 100644 --- a/utils/rdmarkerset/rdmarkerset.cpp +++ b/utils/rdmarkerset/rdmarkerset.cpp @@ -2,9 +2,7 @@ // // Command-line tool for setting Rivendell Cut Markers // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdmarkerset.cpp,v 1.1.2.1 2014/01/16 02:45:00 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,8 +44,8 @@ #include #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool ok=false; bool skip_db_check=false; @@ -421,6 +419,6 @@ void MainObject::Print(const QString &msg) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdmarkerset/rdmarkerset.h b/utils/rdmarkerset/rdmarkerset.h index 0cc7881f9..0b7cf74ec 100644 --- a/utils/rdmarkerset/rdmarkerset.h +++ b/utils/rdmarkerset/rdmarkerset.h @@ -2,9 +2,7 @@ // // Command-line tool for setting Rivendell Cut Markers // -// (C) Copyright 2014 Fred Gleason -// -// $Id: rdmarkerset.h,v 1.1.2.1 2014/01/16 02:45:00 cvs Exp $ +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class MainObject : public QObject { Q_OBJECT; public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void userChangedData(); diff --git a/utils/rdpopup/Makefile.am b/utils/rdpopup/Makefile.am index 686bd2f6c..7d4f2565d 100644 --- a/utils/rdpopup/Makefile.am +++ b/utils/rdpopup/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdpopup ## -## (C) Copyright 2009 Fred Gleason -## -## $Id: Makefile.am,v 1.5.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2009,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdpopup/rdpopup.cpp b/utils/rdpopup/rdpopup.cpp index cf25519ef..25382e4da 100644 --- a/utils/rdpopup/rdpopup.cpp +++ b/utils/rdpopup/rdpopup.cpp @@ -2,9 +2,7 @@ // // A utility for displaying messages on the desktop // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdpopup.cpp,v 1.4.8.2 2014/01/21 21:59:34 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdpopup/rdpopup.h b/utils/rdpopup/rdpopup.h index b6a88d76d..e1c9c38d1 100644 --- a/utils/rdpopup/rdpopup.h +++ b/utils/rdpopup/rdpopup.h @@ -2,9 +2,7 @@ // // A utility for displaying messages on the desktop // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdpopup.h,v 1.4 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -23,11 +21,11 @@ #ifndef RDPOPUP_H #define RDPOPUP_H - // // Settings // #define RDPOPUP_USAGE " \n\nWhere is the severity level of the message and is the text to display.\n\nValid severity values are:\n\n 1 - Information\n 2 - Warning\n 3 - Critical\n" #define TEXT_WIDTH 60 + #endif // RDPOPUP_H diff --git a/utils/rdpurgecasts/Makefile.am b/utils/rdpurgecasts/Makefile.am index 06b2a1906..39ced0ab2 100644 --- a/utils/rdpurgecasts/Makefile.am +++ b/utils/rdpurgecasts/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdpurgecasts ## -## (C) Copyright 2007 Fred Gleason -## -## $Id: Makefile.am,v 1.4.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2007-2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdpurgecasts/rdpurgecasts.cpp b/utils/rdpurgecasts/rdpurgecasts.cpp index e6fb4f538..5136ff382 100644 --- a/utils/rdpurgecasts/rdpurgecasts.cpp +++ b/utils/rdpurgecasts/rdpurgecasts.cpp @@ -2,9 +2,7 @@ // // A Utility to Purge Expired Podcasts. // -// (C) Copyright 2007 Fred Gleason -// -// $Id: rdpurgecasts.cpp,v 1.7 2011/06/21 22:20:44 cvs Exp $ +// (C) Copyright 2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,8 +41,8 @@ #include -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { QString sql; RDSqlQuery *q; @@ -173,6 +171,6 @@ void MainObject::PurgeCast(unsigned id) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdpurgecasts/rdpurgecasts.h b/utils/rdpurgecasts/rdpurgecasts.h index 62043382d..8153cfd20 100644 --- a/utils/rdpurgecasts/rdpurgecasts.h +++ b/utils/rdpurgecasts/rdpurgecasts.h @@ -2,9 +2,7 @@ // // A Utility to Purge Expired Podcasts. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdpurgecasts.h,v 1.3 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDPURGECASTS_H #define RDPURGECASTS_H @@ -32,11 +29,10 @@ #define RDPURGECASTS_USAGE "[--help] [--verbose]\n\nPurge expired podcasts.\n" - class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void PurgeCast(unsigned id); diff --git a/utils/rdrevert/rdrevert.cpp b/utils/rdrevert/rdrevert.cpp index 3a23472fd..94935c9d0 100644 --- a/utils/rdrevert/rdrevert.cpp +++ b/utils/rdrevert/rdrevert.cpp @@ -35,8 +35,8 @@ #include "rdrevert.h" -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { bool ok=false; int set_schema=0; @@ -524,6 +524,6 @@ int MainObject::MapSchema(const QString &ver) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/rdrevert/rdrevert.h b/utils/rdrevert/rdrevert.h index a4bd0ee2e..340bcdab5 100644 --- a/utils/rdrevert/rdrevert.h +++ b/utils/rdrevert/rdrevert.h @@ -34,7 +34,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void Revert(int schema) const; diff --git a/utils/rdsoftkeys/Makefile.am b/utils/rdsoftkeys/Makefile.am index e31c0e923..3a4f52550 100644 --- a/utils/rdsoftkeys/Makefile.am +++ b/utils/rdsoftkeys/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rdsoftkeys ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.8.8.2 2012/12/03 16:53:46 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rdsoftkeys/rdsoftkeys.cpp b/utils/rdsoftkeys/rdsoftkeys.cpp index a2e6cc2f6..af2ffa0a4 100644 --- a/utils/rdsoftkeys/rdsoftkeys.cpp +++ b/utils/rdsoftkeys/rdsoftkeys.cpp @@ -2,9 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdsoftkeys.cpp,v 1.7.8.2 2014/01/08 02:08:41 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -49,9 +47,8 @@ // #include "../icons/rivendell-22x22.xpm" - -MainWidget::MainWidget(QWidget *parent,const char *name) - : QMainWindow(parent,name) +MainWidget::MainWidget(QWidget *parent) + : QMainWindow(parent) { key_ysize=70; @@ -315,7 +312,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->setGeometry(w->geometry().x(),w->geometry().y(),w->sizeHint().width(),w->sizeHint().height()); w->show(); diff --git a/utils/rdsoftkeys/rdsoftkeys.h b/utils/rdsoftkeys/rdsoftkeys.h index 668058bba..fd3c8e266 100644 --- a/utils/rdsoftkeys/rdsoftkeys.h +++ b/utils/rdsoftkeys/rdsoftkeys.h @@ -2,9 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2006 Fred Gleason -// -// $Id: rdsoftkeys.h,v 1.5 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2006,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -43,7 +41,7 @@ class MainWidget : public QMainWindow { Q_OBJECT public: - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/utils/rdsoftkeys/rdsoftkeys.pro b/utils/rdsoftkeys/rdsoftkeys.pro index 052eea56d..76855cf13 100644 --- a/utils/rdsoftkeys/rdsoftkeys.pro +++ b/utils/rdsoftkeys/rdsoftkeys.pro @@ -2,9 +2,7 @@ # # The utils/rdsoftkeys QMake project file for Rivendell # -# (C) Copyright 2003-2006 Fred Gleason -# -# $Id: rdsoftkeys.pro,v 1.3.18.1 2013/01/07 15:35:08 cvs Exp $ +# (C) Copyright 2003-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/rmlsend/Makefile.am b/utils/rmlsend/Makefile.am index 3c86fa9cc..a9139a363 100644 --- a/utils/rmlsend/Makefile.am +++ b/utils/rmlsend/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/rmlsend ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.12.8.3 2013/01/01 21:36:33 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/rmlsend/rmlsend.cpp b/utils/rmlsend/rmlsend.cpp index d06a0c155..43d027f37 100644 --- a/utils/rmlsend/rmlsend.cpp +++ b/utils/rmlsend/rmlsend.cpp @@ -2,9 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rmlsend.cpp,v 1.7.8.4 2014/01/21 21:59:34 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -72,9 +70,8 @@ // RDCmdSwitch *rdcmdswitch=NULL; - -MainWidget::MainWidget(QWidget *parent,const char *name) - :QMainWindow(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QMainWindow(parent) { // // Set Window Size @@ -512,7 +509,7 @@ int main(int argc,char *argv[]) if(cli_mode) { #ifndef WIN32 QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); #endif // WIN32 } @@ -554,7 +551,7 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(NULL,"main"); + MainWidget *w=new MainWidget(); a.setMainWidget(w); w->show(); return a.exec(); diff --git a/utils/rmlsend/rmlsend.h b/utils/rmlsend/rmlsend.h index 67d5bf483..befb782e9 100644 --- a/utils/rmlsend/rmlsend.h +++ b/utils/rmlsend/rmlsend.h @@ -2,9 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: rmlsend.h,v 1.5 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2005,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,7 +45,7 @@ class MainWidget : public QMainWindow Q_OBJECT public: enum DestMode {Rml=0,RmlNoEcho=1,Manual=2}; - MainWidget(QWidget *parent=0,const char *name=0); + MainWidget(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/utils/rmlsend/rmlsend.pro b/utils/rmlsend/rmlsend.pro index 48ba9add8..b85e52986 100644 --- a/utils/rmlsend/rmlsend.pro +++ b/utils/rmlsend/rmlsend.pro @@ -2,9 +2,7 @@ # # The utils/ QMake project file for Rivendell # -# (C) Copyright 2003-2007 Fred Gleason -# -# $Id: rmlsend.pro,v 1.7.8.1 2013/01/01 21:36:33 cvs Exp $ +# (C) Copyright 2003-2007,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/sas_shim/Makefile.am b/utils/sas_shim/Makefile.am index cd537e711..fe9e1e19e 100644 --- a/utils/sas_shim/Makefile.am +++ b/utils/sas_shim/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/utils/sas_shim ## -## (C) Copyright 2002-2006 Fred Gleason -## -## $Id: Makefile.am,v 1.7.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2006,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/utils/sas_shim/rc.sas_shim b/utils/sas_shim/rc.sas_shim index ea7b65f3b..7b06d385a 100755 --- a/utils/sas_shim/rc.sas_shim +++ b/utils/sas_shim/rc.sas_shim @@ -1,9 +1,7 @@ #! /bin/sh # # Startup script for the sas_shim Daemon -# (C) Copyright 2003-2004 Fred Gleason -# -# $Id: rc.sas_shim,v 1.5 2010/07/29 19:32:40 cvs Exp $ +# (C) Copyright 2003-2004,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/utils/sas_shim/sas_shim.cpp b/utils/sas_shim/sas_shim.cpp index d0e05309e..2eac3f5d0 100644 --- a/utils/sas_shim/sas_shim.cpp +++ b/utils/sas_shim/sas_shim.cpp @@ -2,9 +2,7 @@ // // An RDCatch event import shim for the SAS64000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas_shim.cpp,v 1.8 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -47,8 +45,8 @@ void SigHandler(int signo) } -MainObject::MainObject(QObject *parent,const char *name) - : QObject(parent,name) +MainObject::MainObject(QObject *parent) + : QObject(parent) { // // Read Command Options @@ -227,6 +225,6 @@ void MainObject::DispatchRml(int input,int output) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/utils/sas_shim/sas_shim.h b/utils/sas_shim/sas_shim.h index 8251480de..ffe644d5c 100644 --- a/utils/sas_shim/sas_shim.h +++ b/utils/sas_shim/sas_shim.h @@ -2,9 +2,7 @@ // // An RDCatch event import shim for the SAS64000 // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: sas_shim.h,v 1.6 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2004,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -39,7 +37,7 @@ class MainObject : public QObject { Q_OBJECT public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private slots: void readTtyData(); diff --git a/utils/utils.pro b/utils/utils.pro index 47387c33f..2d8286bf8 100644 --- a/utils/utils.pro +++ b/utils/utils.pro @@ -2,9 +2,7 @@ # # The utils/ QMake project file for Rivendell # -# (C) Copyright 2003-2006 Fred Gleason -# -# $Id: utils.pro,v 1.9.8.1 2012/11/29 01:37:37 cvs Exp $ +# (C) Copyright 2003-2006,2016 Fred Gleason # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as diff --git a/web/Makefile.am b/web/Makefile.am index 2dce50d47..1a3adbee0 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/web ## -## (C) Copyright 2002-2007 Fred Gleason -## -## $Id: Makefile.am,v 1.4.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2007,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as diff --git a/web/rdcastmanager/Makefile.am b/web/rdcastmanager/Makefile.am index ecff2571b..d89d04081 100644 --- a/web/rdcastmanager/Makefile.am +++ b/web/rdcastmanager/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/web/rdcastmanager ## -## (C) Copyright 2002-2007 Fred Gleason -## -## $Id: Makefile.am,v 1.4.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2007,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/web/rdcastmanager/rdcastmanager.cpp b/web/rdcastmanager/rdcastmanager.cpp index b71dd32d5..8a2c9b3ab 100644 --- a/web/rdcastmanager/rdcastmanager.cpp +++ b/web/rdcastmanager/rdcastmanager.cpp @@ -2,9 +2,7 @@ // // An RSS Feed Generator for Rivendell. // -// (C) Copyright 2002-2009 Fred Gleason -// -// $Id: rdcastmanager.cpp,v 1.14.4.1 2013/11/13 23:36:40 cvs Exp $ +// (C) Copyright 2002-2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -46,8 +44,8 @@ char server_name[PATH_MAX]; -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { // // Initialize Variables @@ -1923,6 +1921,6 @@ void MainObject::Exit(int code) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/web/rdcastmanager/rdcastmanager.h b/web/rdcastmanager/rdcastmanager.h index 5f512480f..06823ce5a 100644 --- a/web/rdcastmanager/rdcastmanager.h +++ b/web/rdcastmanager/rdcastmanager.h @@ -2,9 +2,7 @@ // // Web-Based RSS Podcast Manager for Rivendell. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdcastmanager.h,v 1.5 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDCASTMANAGER_H #define RDCASTMANAGER_H @@ -53,7 +50,7 @@ class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: int AuthenticatePost(); diff --git a/web/rdcastmanager/rdcastmanager.js b/web/rdcastmanager/rdcastmanager.js index fbbf59ae1..b730d4a67 100644 --- a/web/rdcastmanager/rdcastmanager.js +++ b/web/rdcastmanager/rdcastmanager.js @@ -2,9 +2,7 @@ // // Script for displaying an upload progress dialog in a web browser. // -// (C) Copyright 2009 Fred Gleason -// -// $Id: rdcastmanager.js,v 1.2 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2009,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdfeed/Makefile.am b/web/rdfeed/Makefile.am index c123348c4..696605371 100644 --- a/web/rdfeed/Makefile.am +++ b/web/rdfeed/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/web/rdfeed ## -## (C) Copyright 2002-2007 Fred Gleason -## -## $Id: Makefile.am,v 1.7.8.1 2012/11/29 01:37:38 cvs Exp $ +## (C) Copyright 2002-2007,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/web/rdfeed/rdfeed_script.cpp b/web/rdfeed/rdfeed_script.cpp index 4c211b250..d5ffd97e6 100644 --- a/web/rdfeed/rdfeed_script.cpp +++ b/web/rdfeed/rdfeed_script.cpp @@ -2,9 +2,7 @@ // // An RSS Feed Generator for Rivendell. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdfeed_script.cpp,v 1.5.4.1 2013/10/16 21:14:38 cvs Exp $ +// (C) Copyright 2002-2007,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -45,8 +43,8 @@ char server_name[PATH_MAX]; -MainObject::MainObject(QObject *parent,const char *name) - :QObject(parent,name) +MainObject::MainObject(QObject *parent) + :QObject(parent) { char keyname[10]; int cast_id=-1; @@ -392,6 +390,6 @@ void MainObject::Redirect(const QString &url) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new MainObject(NULL,"main"); + new MainObject(); return a.exec(); } diff --git a/web/rdfeed/rdfeed_script.h b/web/rdfeed/rdfeed_script.h index 6c748827c..55ad9d0bb 100644 --- a/web/rdfeed/rdfeed_script.h +++ b/web/rdfeed/rdfeed_script.h @@ -2,9 +2,7 @@ // // An RSS Feed Generator for Rivendell. // -// (C) Copyright 2002-2007 Fred Gleason -// -// $Id: rdfeed_script.h,v 1.2 2010/07/29 19:32:40 cvs Exp $ +// (C) Copyright 2002-2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,7 +18,6 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #ifndef RDFEED_SCRIPT_H #define RDFEED_SCRIPT_H @@ -29,11 +26,10 @@ #include - class MainObject : public QObject { public: - MainObject(QObject *parent=0,const char *name=0); + MainObject(QObject *parent=0); private: void ServeRss(const char *keyname,bool count); diff --git a/web/rdxport/Makefile.am b/web/rdxport/Makefile.am index 9b76806e3..ed34e753d 100644 --- a/web/rdxport/Makefile.am +++ b/web/rdxport/Makefile.am @@ -2,9 +2,7 @@ ## ## Automake.am for rivendell/web/rdxport ## -## (C) Copyright 2010 Fred Gleason -## -## $Id: Makefile.am,v 1.6.6.3 2013/10/11 22:00:52 cvs Exp $ +## (C) Copyright 2010,2016 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/audioinfo.cpp b/web/rdxport/audioinfo.cpp index 96732babb..d396d4b93 100644 --- a/web/rdxport/audioinfo.cpp +++ b/web/rdxport/audioinfo.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- AudioInfo service // -// (C) Copyright 2011 Fred Gleason -// -// $Id: audioinfo.cpp,v 1.4 2012/02/13 23:01:50 cvs Exp $ +// (C) Copyright 2011,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/audiostore.cpp b/web/rdxport/audiostore.cpp index 9cd8642d1..bd56aa143 100644 --- a/web/rdxport/audiostore.cpp +++ b/web/rdxport/audiostore.cpp @@ -2,7 +2,7 @@ // // Rivendell web service portal -- AudioStore service // -// (C) Copyright 2014 Fred Gleason +// (C) Copyright 2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/copyaudio.cpp b/web/rdxport/copyaudio.cpp index 4a3c0115e..d7cf74e84 100644 --- a/web/rdxport/copyaudio.cpp +++ b/web/rdxport/copyaudio.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- CopyAudio service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: copyaudio.cpp,v 1.4 2012/02/13 23:01:50 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/deleteaudio.cpp b/web/rdxport/deleteaudio.cpp index 3c03a13ab..a7ae09c83 100644 --- a/web/rdxport/deleteaudio.cpp +++ b/web/rdxport/deleteaudio.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- DeleteAudio service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: deleteaudio.cpp,v 1.6.2.1 2012/07/17 19:29:43 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/exportpeaks.cpp b/web/rdxport/exportpeaks.cpp index 32eb9ea04..1948526db 100644 --- a/web/rdxport/exportpeaks.cpp +++ b/web/rdxport/exportpeaks.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- ExportPeaks service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: exportpeaks.cpp,v 1.4 2012/02/13 23:01:50 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/groups.cpp b/web/rdxport/groups.cpp index 15acbb5a2..abae4c05d 100644 --- a/web/rdxport/groups.cpp +++ b/web/rdxport/groups.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- Group services // -// (C) Copyright 2010 Fred Gleason -// -// $Id: groups.cpp,v 1.5 2012/02/13 23:01:50 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/import.cpp b/web/rdxport/import.cpp index 1a69f0145..c1a5d8735 100644 --- a/web/rdxport/import.cpp +++ b/web/rdxport/import.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- Import service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: import.cpp,v 1.12.2.2 2014/01/15 19:56:32 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/logs.cpp b/web/rdxport/logs.cpp index 580025bd3..61b71ec10 100644 --- a/web/rdxport/logs.cpp +++ b/web/rdxport/logs.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- Log services // -// (C) Copyright 2013 Fred Gleason -// -// $Id: logs.cpp,v 1.1.2.4 2013/10/23 23:32:54 cvs Exp $ +// (C) Copyright 2013,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/rdxport.cpp b/web/rdxport/rdxport.cpp index ccc33330a..bc61a55ef 100644 --- a/web/rdxport/rdxport.cpp +++ b/web/rdxport/rdxport.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdxport.cpp,v 1.10.2.3 2013/10/14 04:23:54 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -41,8 +39,8 @@ #include -Xport::Xport(QObject *parent,const char *name) - :QObject(parent,name) +Xport::Xport(QObject *parent) + :QObject(parent) { xport_user=NULL; @@ -302,6 +300,6 @@ void Xport::XmlExit(const QString &str,int code,RDAudioConvert::ErrorCode err) int main(int argc,char *argv[]) { QApplication a(argc,argv,false); - new Xport(NULL,"main"); + new Xport(); return a.exec(); } diff --git a/web/rdxport/rdxport.h b/web/rdxport/rdxport.h index f95a806aa..2e70dd244 100644 --- a/web/rdxport/rdxport.h +++ b/web/rdxport/rdxport.h @@ -2,7 +2,7 @@ // // Rivendell web service portal // -// (C) Copyright 2010,2014 Fred Gleason +// (C) Copyright 2010,2014,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -33,7 +33,7 @@ class Xport : public QObject { public: - Xport(QObject *parent=0,const char *name=0); + Xport(QObject *parent=0); private: bool Authenticate(); diff --git a/web/rdxport/services.cpp b/web/rdxport/services.cpp index 94e9fb9a2..87cd4ae90 100644 --- a/web/rdxport/services.cpp +++ b/web/rdxport/services.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- Service services // -// (C) Copyright 2010 Fred Gleason -// -// $Id: services.cpp,v 1.1.2.1 2013/10/11 22:00:53 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/web/rdxport/trimaudio.cpp b/web/rdxport/trimaudio.cpp index a3e47183e..381c21778 100644 --- a/web/rdxport/trimaudio.cpp +++ b/web/rdxport/trimaudio.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- TrimAudio service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: trimaudio.cpp,v 1.4 2012/02/13 23:01:50 cvs Exp $ +// (C) Copyright 2010,2016 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as diff --git a/xdg/Makefile.am b/xdg/Makefile.am index 305a09ee6..660b3aef9 100644 --- a/xdg/Makefile.am +++ b/xdg/Makefile.am @@ -4,8 +4,6 @@ ## ## (C) Copyright 2002-2005 Fred Gleason ## -## $Id: Makefile.am,v 1.11.2.8 2013/12/27 00:04:04 cvs Exp $ -## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as ## published by the Free Software Foundation.