diff --git a/ChangeLog b/ChangeLog index 6a84445b..ccb41750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14750,3 +14750,5 @@ 2015-02-06 Fred Gleason * Added a 'Spin Count' report in 'lib/export_spincount.cpp', 'lib/rdreport.cpp' and 'lib/rdreport.h'. +2015-02-06 Fred Gleason + * Cleaned up Qt object calls in 'rdlogmanager/'. diff --git a/rdlogmanager/compile b/rdlogmanager/compile new file mode 100644 index 00000000..9db2736b --- /dev/null +++ b/rdlogmanager/compile @@ -0,0 +1,41 @@ +-*- mode: compilation; default-directory: "~/rivendell/rdlogmanager/" -*- +Compilation started at Fri Feb 6 19:10:40 + +make -k + CXX edit_grid.o +edit_grid.cpp: In member function ‘void EditGrid::allHourButtonData()’: +edit_grid.cpp:190: error: no matching function for call to ‘ListClocks::ListClocks(QString*, EditGrid* const, const char [11])’ +./list_clocks.h:42: note: candidates are: ListClocks::ListClocks(QString*, QWidget*) +./list_clocks.h:39: note: ListClocks::ListClocks(const ListClocks&) +make: *** [edit_grid.o] Error 1 + CXX edit_schedrules.o +edit_schedrules.cpp: In member function ‘void EditSchedRules::importData()’: +edit_schedrules.cpp:215: error: no matching function for call to ‘ListClocks::ListClocks(QString*, EditSchedRules* const, const char [11])’ +./list_clocks.h:42: note: candidates are: ListClocks::ListClocks(QString*, QWidget*) +./list_clocks.h:39: note: ListClocks::ListClocks(const ListClocks&) +make: *** [edit_schedrules.o] Error 1 + CXX list_clocks.o +list_clocks.cpp: In member function ‘void ListClocks::addData()’: +list_clocks.cpp:252: error: no matching function for call to ‘EditClock::EditClock(QString&, bool, std::vector >*, ListClocks* const, const char [13])’ +./edit_clock.h:50: note: candidates are: EditClock::EditClock(QString, bool, std::vector >*, QWidget*) +./edit_clock.h:47: note: EditClock::EditClock(const EditClock&) +list_clocks.cpp: In member function ‘void ListClocks::editData()’: +list_clocks.cpp:307: error: no matching function for call to ‘EditClock::EditClock(QString, bool, std::vector >*, ListClocks* const, const char [13])’ +./edit_clock.h:50: note: candidates are: EditClock::EditClock(QString, bool, std::vector >*, QWidget*) +./edit_clock.h:47: note: EditClock::EditClock(const EditClock&) +make: *** [list_clocks.o] Error 1 + CXX list_grids.o +list_grids.cpp: In member function ‘void ListGrids::editData()’: +list_grids.cpp:114: error: no matching function for call to ‘EditGrid::EditGrid(QString, ListGrids* const, const char [12])’ +./edit_grid.h:39: note: candidates are: EditGrid::EditGrid(QString, QWidget*) +./edit_grid.h:36: note: EditGrid::EditGrid(const EditGrid&) +make: *** [list_grids.o] Error 1 + CXX rdlogmanager.o +rdlogmanager.cpp: In member function ‘void MainWidget::clocksData()’: +rdlogmanager.cpp:323: error: no matching function for call to ‘ListClocks::ListClocks(NULL, MainWidget* const, const char [12])’ +./list_clocks.h:42: note: candidates are: ListClocks::ListClocks(QString*, QWidget*) +./list_clocks.h:39: note: ListClocks::ListClocks(const ListClocks&) +make: *** [rdlogmanager.o] Error 1 +make: Target `all' not remade because of errors. + +Compilation exited abnormally with code 2 at Fri Feb 6 19:10:42 diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index 8f18ce7b..7be15b1d 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Log Clock // -// (C) Copyright 2002-2005 Fred Gleason -// -// $Id: edit_clock.cpp,v 1.27.10.1 2014/06/24 18:27:05 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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,9 +48,8 @@ EditClock::EditClock(QString clockname,bool new_clock, - std::vector *new_clocks, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + std::vector *new_clocks,QWidget *parent) + : QDialog(parent,"",true) { QString str; @@ -85,14 +82,13 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Clock Names // - edit_clockname_label=new QLabel(clockname,this,"edit_clockname_label"); + edit_clockname_label=new QLabel(clockname,this); edit_clockname_label->setGeometry(10,10,280,20); edit_clockname_label->setFont(bold_font); - edit_shortname_edit=new QLineEdit(this,"edit_shortname_edit"); + edit_shortname_edit=new QLineEdit(this); edit_shortname_edit->setGeometry(350,10,40,20); edit_shortname_edit->setMaxLength(3); - QLabel *label=new QLabel(edit_shortname_edit,tr("Code:"), - this,"edit_shortname_label"); + QLabel *label=new QLabel(edit_shortname_edit,tr("Code:"),this); label->setGeometry(295,10,50,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -100,7 +96,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Clock List // - edit_clocks_list=new ClockListView(this,"edit_clocks_list"); + edit_clocks_list=new ClockListView(this); edit_clocks_list->setGeometry(10,35,CENTER_LINE-20,sizeHint().height()-250); edit_clocks_list->setAllColumnsShowFocus(true); edit_clocks_list->setItemMargin(5); @@ -122,7 +118,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Add Button // - QPushButton *button=new QPushButton(this,"add_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(10,sizeHint().height()-210,80,50); button->setFont(bold_font); button->setText(tr("&Add")); @@ -131,7 +127,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Clone Button // - button=new QPushButton(this,"clone_button"); + button=new QPushButton(this); button->setGeometry(110,sizeHint().height()-210,80,50); button->setFont(bold_font); button->setText(tr("&Clone")); @@ -140,7 +136,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Edit Button // - button=new QPushButton(this,"edit_button"); + button=new QPushButton(this); button->setGeometry(210,sizeHint().height()-210,80,50); button->setFont(bold_font); button->setText(tr("&Edit")); @@ -149,7 +145,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Delete Button // - button=new QPushButton(this,"delete_button"); + button=new QPushButton(this); button->setGeometry(310,sizeHint().height()-210,80,50); button->setFont(bold_font); button->setText(tr("&Delete")); @@ -158,10 +154,10 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Remarks // - edit_remarks_edit=new QTextEdit(this,"edit_remarks_edit"); + edit_remarks_edit=new QTextEdit(this); edit_remarks_edit->setGeometry(10,sizeHint().height()-140,CENTER_LINE-20,130); edit_remarks_edit->setTextFormat(QTextEdit::PlainText); - label=new QLabel(edit_remarks_edit,tr("Remarks"),this,"edit_remarks_label"); + label=new QLabel(edit_remarks_edit,tr("Remarks"),this); label->setGeometry(15,sizeHint().height()-155,CENTER_LINE-20,15); label->setFont(bold_font); label->setAlignment(AlignLeft|AlignVCenter); @@ -169,7 +165,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Scheduler-Rules button // - button=new QPushButton(this,"schedrules_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+20,sizeHint().height()-60,70,50); button->setFont(bold_font); button->setText(tr("Scheduler\nRules")); @@ -178,7 +174,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Save Button // - button=new QPushButton(this,"save_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+110,sizeHint().height()-60,70,50); button->setFont(bold_font); button->setText(tr("&Save")); @@ -187,7 +183,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Save As Button // - button=new QPushButton(this,"saveas_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+190,sizeHint().height()-60,70,50); button->setFont(bold_font); button->setText(tr("Save &As")); @@ -196,7 +192,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Service Associations Button // - button=new QPushButton(this,"svc_button"); + button=new QPushButton(this); button->setGeometry(CENTER_LINE+(sizeHint().width()-CENTER_LINE)/2-25, sizeHint().height()-60,70,50); button->setFont(bold_font); @@ -206,7 +202,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Color Button // - edit_color_button=new QPushButton(this,"edit_color_button"); + edit_color_button=new QPushButton(this); edit_color_button-> setGeometry(CENTER_LINE+(sizeHint().width()-CENTER_LINE)/2+55, sizeHint().height()-60,70,50); @@ -217,7 +213,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Clock Display // - edit_clock_label=new QLabel(this,"edit_clock_label"); + edit_clock_label=new QLabel(this); edit_clock_label-> setGeometry(CENTER_LINE+10,10, sizeHint().width()-CENTER_LINE-20,sizeHint().height()-80); @@ -225,7 +221,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // OK Button // - button=new QPushButton(this,"ok_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-160,sizeHint().height()-60,70,50); button->setDefault(true); button->setFont(bold_font); @@ -235,7 +231,7 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Cancel Button // - button=new QPushButton(this,"cancel_button"); + button=new QPushButton(this); button->setGeometry(sizeHint().width()-80,sizeHint().height()-60,70,50); button->setFont(bold_font); button->setText(tr("&Cancel")); @@ -300,8 +296,8 @@ void EditClock::addData() line=item->text(4).toInt(); } } - EditEventLine *edit_eventline=new EditEventLine(&eventline,edit_clock,-1, - this,"edit_eventline"); + EditEventLine *edit_eventline= + new EditEventLine(&eventline,edit_clock,-1,this); if(edit_eventline->exec()<0) { return; } @@ -325,9 +321,8 @@ void EditClock::editData() return; } int line=item->text(4).toInt(); - EditEventLine *edit_eventline=new EditEventLine(edit_clock->eventLine(line), - edit_clock,line, - this,"edit_eventline"); + EditEventLine *edit_eventline= + new EditEventLine(edit_clock->eventLine(line),edit_clock,line,this); if(edit_eventline->exec()<0) { delete edit_eventline; return; @@ -356,8 +351,8 @@ void EditClock::cloneData() eventline.setStartTime(selectedEventLine->startTime().addMSecs(selectedEventLine->length())); eventline.setLength(selectedEventLine->length()); - EditEventLine *edit_eventline=new EditEventLine(&eventline,edit_clock,-1, - this,"edit_eventline"); + EditEventLine *edit_eventline= + new EditEventLine(&eventline,edit_clock,-1,this); if(edit_eventline->exec()<0) { delete edit_eventline; return; diff --git a/rdlogmanager/edit_clock.h b/rdlogmanager/edit_clock.h index c88d4b8b..6ee6f971 100644 --- a/rdlogmanager/edit_clock.h +++ b/rdlogmanager/edit_clock.h @@ -4,8 +4,6 @@ // // (C) Copyright 2002-2004 Fred Gleason // -// $Id: edit_clock.h,v 1.14 2010/07/29 19:32:37 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. @@ -50,7 +48,7 @@ class EditClock : public QDialog Q_OBJECT public: EditClock(QString clockname,bool new_clock,std::vector *new_clocks, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_eventline.cpp b/rdlogmanager/edit_eventline.cpp index d4c253cf..fedbbcfd 100644 --- a/rdlogmanager/edit_eventline.cpp +++ b/rdlogmanager/edit_eventline.cpp @@ -38,8 +38,8 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, - QWidget *parent,const char *name) - : QDialog(parent,name,true) + QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Edit Event Assignment")); edit_eventline=eventline; @@ -97,12 +97,11 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // Event Name // - edit_eventname_edit=new QLineEdit(this,"edit_eventname_edit"); + edit_eventname_edit=new QLineEdit(this); edit_eventname_edit->setGeometry(65,12,sizeHint().width()-140,18); edit_eventname_edit->setMaxLength(64); edit_eventname_edit->setValidator(validator); - QLabel *label=new QLabel(edit_eventname_edit,tr("Event:"), - this,"edit_eventname_label"); + QLabel *label=new QLabel(edit_eventname_edit,tr("Event:"),this); label->setGeometry(10,12,50,18); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -110,7 +109,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // Event Select Button // - QPushButton *button=new QPushButton(this,"select_button"); + QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-60,7,50,30); button->setFont(font); button->setText(tr("Select")); @@ -119,13 +118,12 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // Start Time // - edit_starttime_edit=new RDTimeEdit(this,"edit_starttime_edit"); + edit_starttime_edit=new RDTimeEdit(this); edit_starttime_edit->setGeometry(150,40,70,20); edit_starttime_edit-> setDisplay(RDTimeEdit::Minutes|RDTimeEdit::Seconds|RDTimeEdit::Tenths); edit_starttime_edit->setFont(font); - 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(65,42,80,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -133,12 +131,11 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // End Time // - edit_endtime_edit=new RDTimeEdit(this,"edit_length_edit"); + edit_endtime_edit=new RDTimeEdit(this); edit_endtime_edit->setGeometry(325,40,70,20); edit_endtime_edit-> setDisplay(RDTimeEdit::Minutes|RDTimeEdit::Seconds|RDTimeEdit::Tenths); - label=new QLabel(edit_endtime_edit,tr("End Time:"), - this,"edit_endtime_label"); + label=new QLabel(edit_endtime_edit,tr("End Time:"),this); label->setGeometry(250,42,70,20); label->setFont(bold_font); label->setAlignment(AlignRight|AlignVCenter); @@ -146,7 +143,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // 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); @@ -156,7 +153,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, // // 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")); @@ -189,7 +186,7 @@ QSizePolicy EditEventLine::sizePolicy() const void EditEventLine::selectData() { QString eventname; - ListEvents *list_events=new ListEvents(&eventname,this,"add_dialog"); + ListEvents *list_events=new ListEvents(&eventname,this); if(list_events->exec()<0) { delete list_events; return; diff --git a/rdlogmanager/edit_eventline.h b/rdlogmanager/edit_eventline.h index 8f91fa23..f1fcfd7a 100644 --- a/rdlogmanager/edit_eventline.h +++ b/rdlogmanager/edit_eventline.h @@ -37,7 +37,7 @@ class EditEventLine : public QDialog Q_OBJECT public: EditEventLine(RDEventLine *eventline,RDClock *clock,int line, - QWidget *parent=0,const char *name=0); + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index b3c38baa..cbc637eb 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -2,9 +2,7 @@ // // Edit Rivendell Log Grid // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_grid.cpp,v 1.12.8.2 2014/01/21 21:28:34 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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 -EditGrid::EditGrid(QString servicename,QWidget *parent,const char *name) - : QDialog(parent,name,true) +EditGrid::EditGrid(QString servicename,QWidget *parent) + : QDialog(parent,"",true) { QString sql; QString str; @@ -75,15 +73,15 @@ EditGrid::EditGrid(QString servicename,QWidget *parent,const char *name) // Hour Buttons // QLabel *label; - QSignalMapper *mapper=new QSignalMapper(this,"hour_button_mapper"); + QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(hourButtonData(int))); for(int i=0;i<5;i++) { - label=new QLabel(QDate::longDayName(i+1),this,"day_label"); + label=new QLabel(QDate::longDayName(i+1),this); label->setGeometry(20,14+75*i,90,16); label->setFont(bold_font); label->setAlignment(AlignCenter); for(int j=0;j<24;j++) { - edit_hour_button[i][j]=new RDPushButton(this,"hour_button"); + edit_hour_button[i][j]=new RDPushButton(this); edit_hour_button[i][j]->setGeometry(10+42*j,30+75*i,42,40); edit_hour_button[i][j]->setFont(button_font); edit_hour_button[i][j]->setId(24*i+j); @@ -95,12 +93,12 @@ EditGrid::EditGrid(QString servicename,QWidget *parent,const char *name) } } for(int i=5;i<7;i++) { - label=new QLabel(QDate::longDayName(i+1),this,"day_label"); + label=new QLabel(QDate::longDayName(i+1),this); label->setGeometry(20,44+75*i,90,16); label->setFont(bold_font); label->setAlignment(AlignCenter); for(int j=0;j<24;j++) { - edit_hour_button[i][j]=new RDPushButton(this,"hour_button"); + edit_hour_button[i][j]=new RDPushButton(this); edit_hour_button[i][j]->setGeometry(10+42*j,60+75*i,42,40); edit_hour_button[i][j]->setFont(button_font); edit_hour_button[i][j]->setId(24*i+j); @@ -115,7 +113,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent,const char *name) // // Right Button Menu // - edit_right_menu=new QPopupMenu(this,"edit_right_menu"); + edit_right_menu=new QPopupMenu(this); connect(edit_right_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); edit_right_menu-> insertItem(tr("Edit Clock"),this,SLOT(editClockData()),0,0); @@ -125,7 +123,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent,const char *name) // // Change All Button // - QPushButton *all_button=new QPushButton(this,"change_all_button"); + QPushButton *all_button=new QPushButton(this); all_button->setGeometry(10,sizeHint().height()-60,80,50); all_button->setDefault(false); all_button->setFont(bold_font); @@ -135,7 +133,7 @@ EditGrid::EditGrid(QString servicename,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); @@ -169,7 +167,7 @@ void EditGrid::hourButtonData(int id) if(clockname.isEmpty()) { clockname=current_clockname; } - ListClocks *listclocks=new ListClocks(&clockname,this,"listclocks"); + ListClocks *listclocks=new ListClocks(&clockname,this); if(listclocks->exec()<0) { delete listclocks; return; @@ -189,7 +187,7 @@ void EditGrid::hourButtonData(int id) void EditGrid::allHourButtonData() { QString clockname=""; - ListClocks *listclocks=new ListClocks(&clockname,this,"listclocks"); + ListClocks *listclocks=new ListClocks(&clockname,this); if(listclocks->exec()<0) { delete listclocks; return; @@ -247,7 +245,7 @@ void EditGrid::editClockData() if(clockname.isEmpty()) { return; } - EditClock *dialog=new EditClock(clockname,false,&new_clocks,this,"dialog"); + EditClock *dialog=new EditClock(clockname,false,&new_clocks,this); if(dialog->exec()<0) { delete dialog; return; diff --git a/rdlogmanager/edit_grid.h b/rdlogmanager/edit_grid.h index d139808a..e21d9f49 100644 --- a/rdlogmanager/edit_grid.h +++ b/rdlogmanager/edit_grid.h @@ -2,9 +2,7 @@ // // Edit A Rivendell Log Grid // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: edit_grid.h,v 1.8.8.1 2013/10/11 17:16:49 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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 EditGrid : public QDialog { Q_OBJECT public: - EditGrid(QString servicename,QWidget *parent=0,const char *name=0); + EditGrid(QString servicename,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/edit_schedrules.cpp b/rdlogmanager/edit_schedrules.cpp index 1421186b..e41dced0 100644 --- a/rdlogmanager/edit_schedrules.cpp +++ b/rdlogmanager/edit_schedrules.cpp @@ -212,7 +212,7 @@ void EditSchedRules::importData() QString sql; RDSqlQuery *q; - ListClocks *listclocks=new ListClocks(&clockname,this,"listclocks"); + ListClocks *listclocks=new ListClocks(&clockname,this); listclocks->setCaption(tr("Import Rules from Clock")); if(listclocks->exec()<0) { delete listclocks; diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 9d0d8371..35792e56 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -2,9 +2,7 @@ // // List Rivendell Log Clocks // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_clocks.cpp,v 1.28.8.2 2014/01/10 19:32:54 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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,8 +38,8 @@ #include -ListClocks::ListClocks(QString *clockname,QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListClocks::ListClocks(QString *clockname,QWidget *parent) + : QDialog(parent,"",true) { QStringList services_list; QString str1=tr("Log Clocks - User: "); @@ -66,7 +64,7 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent,const char *name) // // Event Filter // - edit_filter_box=new QComboBox(this,"edit_filter_box"); + edit_filter_box=new QComboBox(this); edit_filter_label=new QLabel(edit_filter_box,tr("Filter:"),this); edit_filter_label->setFont(bold_font); edit_filter_label->setAlignment(AlignRight|AlignVCenter); @@ -76,7 +74,7 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent,const char *name) // // Clocks List // - edit_clocks_list=new QListView(this,"edit_clocks_list"); + edit_clocks_list=new QListView(this); edit_clocks_list->setAllColumnsShowFocus(true); edit_clocks_list->setItemMargin(5); edit_clocks_list->addColumn(tr("Name")); @@ -250,8 +248,7 @@ void ListClocks::addData() sql=RDCreateClockTableSql(RDClock::tableName(clockname)); q=new RDSqlQuery(sql); delete q; - EditClock *clock_dialog=new EditClock(clockname,true,&new_clocks, - this,"clock_dialog"); + EditClock *clock_dialog=new EditClock(clockname,true,&new_clocks,this); if(clock_dialog->exec()<0) { clockname_esc=clockname; clockname_esc.replace(" ","_"); @@ -305,8 +302,7 @@ void ListClocks::editData() if(item==NULL) { return; } - EditClock *clock_dialog= - new EditClock(item->text(0),false,&new_clocks,this,"clock_dialog"); + EditClock *clock_dialog=new EditClock(item->text(0),false,&new_clocks,this); if(clock_dialog->exec()<0) { delete clock_dialog; return; diff --git a/rdlogmanager/list_clocks.h b/rdlogmanager/list_clocks.h index 7a0e5c0c..25ac8a8b 100644 --- a/rdlogmanager/list_clocks.h +++ b/rdlogmanager/list_clocks.h @@ -2,9 +2,7 @@ // // List Rivendell Log Clocks // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_clocks.h,v 1.15.8.2 2014/01/10 19:32:54 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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 ListClocks : public QDialog { Q_OBJECT public: - ListClocks(QString *clockname=NULL,QWidget *parent=0,const char *name=0); + ListClocks(QString *clockname=NULL,QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/list_grids.cpp b/rdlogmanager/list_grids.cpp index 02669a75..8fd0171e 100644 --- a/rdlogmanager/list_grids.cpp +++ b/rdlogmanager/list_grids.cpp @@ -2,9 +2,7 @@ // // List Rivendell Log Grids // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: list_grids.cpp,v 1.10 2010/07/29 19:32:37 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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 #include -ListGrids::ListGrids(QWidget *parent,const char *name) - : QDialog(parent,name,true) +ListGrids::ListGrids(QWidget *parent) + : QDialog(parent,"",true) { setCaption(tr("Log Grids")); @@ -59,7 +57,7 @@ ListGrids::ListGrids(QWidget *parent,const char *name) // // Grids List // - edit_grids_list=new QListView(this,"edit_grids_list"); + edit_grids_list=new QListView(this); edit_grids_list->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_grids_list->setAllColumnsShowFocus(true); @@ -73,7 +71,7 @@ ListGrids::ListGrids(QWidget *parent,const char *name) // // 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")); @@ -82,7 +80,7 @@ ListGrids::ListGrids(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); @@ -111,7 +109,7 @@ void ListGrids::editData() if(item==NULL) { return; } - EditGrid *grid_dialog=new EditGrid(item->text(0),this,"grid_dialog"); + EditGrid *grid_dialog=new EditGrid(item->text(0),this); grid_dialog->exec(); delete grid_dialog; } diff --git a/rdlogmanager/list_grids.h b/rdlogmanager/list_grids.h index fdceb912..96aa8a22 100644 --- a/rdlogmanager/list_grids.h +++ b/rdlogmanager/list_grids.h @@ -37,7 +37,7 @@ class ListGrids : public QDialog { Q_OBJECT public: - ListGrids(QWidget *parent=0,const char *name=0); + ListGrids(QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 180458e7..003a7224 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -100,8 +100,8 @@ void SigHandler(int signo) #endif // WIN32 -MainWidget::MainWidget(QWidget *parent,const char *name) - :QWidget(parent,name) +MainWidget::MainWidget(QWidget *parent) + :QWidget(parent) { unsigned schema=0; @@ -158,7 +158,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // 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 @@ -202,11 +202,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Title Label // - QLabel *label=new QLabel(tr("RDLogManager"),this,"title_label"); + QLabel *label=new QLabel(tr("RDLogManager"),this); label->setGeometry(0,5,sizeHint().width(),32); label->setFont(label_font); label->setAlignment(AlignHCenter); - label=new QLabel(tr("Select an operation:"),this,"instruction_label"); + label=new QLabel(tr("Select an operation:"),this); label->setGeometry(0,25,sizeHint().width(),16); label->setFont(day_font); label->setAlignment(AlignCenter); @@ -214,7 +214,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Edit Events Button // - log_events_button=new QPushButton(this,"events_button"); + log_events_button=new QPushButton(this); log_events_button->setGeometry(10,45,sizeHint().width()-20,50); log_events_button->setFont(button_font); log_events_button->setText(tr("Edit &Events")); @@ -223,7 +223,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Edit Clocks Button // - log_clocks_button=new QPushButton(this,"clocks_button"); + log_clocks_button=new QPushButton(this); log_clocks_button->setGeometry(10,95,sizeHint().width()-20,50); log_clocks_button->setFont(button_font); log_clocks_button->setText(tr("Edit C&locks")); @@ -232,7 +232,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Edit Grids Button // - log_grids_button=new QPushButton(this,"grid_button"); + log_grids_button=new QPushButton(this); log_grids_button->setGeometry(10,145,sizeHint().width()-20,50); log_grids_button->setFont(button_font); log_grids_button->setText(tr("Edit G&rids")); @@ -241,7 +241,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Generate Logs Button // - log_logs_button=new QPushButton(this,"logs_button"); + log_logs_button=new QPushButton(this); log_logs_button->setGeometry(10,195,sizeHint().width()-20,50); log_logs_button->setFont(button_font); log_logs_button->setText(tr("&Generate Logs")); @@ -250,7 +250,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Generate Reports Button // - log_reports_button=new QPushButton(this,"reports_button"); + log_reports_button=new QPushButton(this); log_reports_button->setGeometry(10,245,sizeHint().width()-20,50); log_reports_button->setFont(button_font); log_reports_button->setText(tr("Manage &Reports")); @@ -259,7 +259,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name) // // Close Button // - log_close_button=new QPushButton(this,"close_button"); + log_close_button=new QPushButton(this); log_close_button->setGeometry(10,sizeHint().height()-60, sizeHint().width()-20,50); log_close_button->setFont(button_font); @@ -312,7 +312,7 @@ void MainWidget::userData() void MainWidget::eventsData() { - ListEvents *events=new ListEvents(NULL,this,"list_events"); + ListEvents *events=new ListEvents(NULL,this); events->exec(); delete events; } @@ -320,7 +320,7 @@ void MainWidget::eventsData() void MainWidget::clocksData() { - ListClocks *clocks=new ListClocks(NULL,this,"list_clocks"); + ListClocks *clocks=new ListClocks(NULL,this); clocks->exec(); delete clocks; } @@ -328,7 +328,7 @@ void MainWidget::clocksData() void MainWidget::gridsData() { - ListGrids *grids=new ListGrids(this,"list_grids"); + ListGrids *grids=new ListGrids(this); grids->exec(); delete grids; } @@ -336,7 +336,7 @@ void MainWidget::gridsData() void MainWidget::generateData() { - GenerateLog *generatelog=new GenerateLog(this,"list_grids"); + GenerateLog *generatelog=new GenerateLog(this); generatelog->exec(); delete generatelog; } @@ -344,7 +344,7 @@ void MainWidget::generateData() void MainWidget::reportsData() { - ListSvcs *recs=new ListSvcs(this,"list_recs"); + ListSvcs *recs=new ListSvcs(this); recs->exec(); delete recs; } @@ -396,7 +396,7 @@ int gui_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/rdlogmanager/rdlogmanager.h b/rdlogmanager/rdlogmanager.h index 5e54686b..f218261c 100644 --- a/rdlogmanager/rdlogmanager.h +++ b/rdlogmanager/rdlogmanager.h @@ -2,9 +2,7 @@ // // The Log Manager Utility for Rivendell. // -// (C) Copyright 2002-2004 Fred Gleason -// -// $Id: rdlogmanager.h,v 1.14.6.2.2.1 2014/05/20 14:01:51 cvs Exp $ +// (C) Copyright 2002-2015 Fred Gleason // // This 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 @@ 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;