2018-10-19 Fred Gleason <fredg@paravelsystems.com>

* Removed 'build_win32.bat'.
	* Removed all conditional compilation based on 'WIN32'.

rdlogedit/edit_log.cpp

@@ -133,9 +133,8 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   // Dialogs
   //
-#ifndef WIN32
-  edit_render_dialog=new RenderDialog(rda->station(),rda->system(),rda->config(),this);
-#endif  // WIN32
+  edit_render_dialog=
+    new RenderDialog(rda->station(),rda->system(),rda->config(),this);
 
   //
   // Text Validator
@@ -477,12 +476,10 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   //  Render Button
   //
-#ifndef WIN32
   edit_renderas_button=new QPushButton(this);
   edit_renderas_button->setFont(button_font);
   edit_renderas_button->setText(tr("Render"));
   connect(edit_renderas_button,SIGNAL(clicked()),this,SLOT(renderasData()));
-#endif  // WIN32
 
   //
   //  Reports Button
@@ -495,14 +492,10 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   // Cart Player
   //
-#ifdef WIN32
-  edit_player=NULL;
-#else
   edit_player=
     new RDSimplePlayer(rda->cae(),rda->ripc(),edit_output_card,edit_output_port,
 		       edit_start_macro,edit_end_macro,this);
   edit_player->stopButton()->setOnColor(Qt::red);
-#endif  // WIN32
 
   //
   //  Ok Button
@@ -855,7 +848,6 @@ void EditLog::insertMarkerButtonData()
 
 void EditLog::clickedData(Q3ListViewItem *item)
 {
-#ifndef WIN32
   RDListViewItem *rditem=SingleSelection();
   if(rditem==NULL) {
     edit_player->setCart(0);
@@ -864,7 +856,6 @@ void EditLog::clickedData(Q3ListViewItem *item)
   else {
     edit_player->setCart(rditem->text(3).toUInt());
   }
-#endif  // WIN32
 }
 
 
@@ -1178,7 +1169,6 @@ void EditLog::saveasData()
 
 void EditLog::renderasData()
 {
-#ifndef WIN32
   int first_line=-1;
   int last_line=-1;
 
@@ -1200,7 +1190,6 @@ void EditLog::renderasData()
   else {
     edit_render_dialog->exec(rda->user(),edit_log_event,first_line,last_line+1);
   }
-#endif  // WIN32
 }
 
 
@@ -1236,9 +1225,7 @@ void EditLog::okData()
     SaveLog();
     DeleteTracks();
   }
-#ifndef WIN32
   edit_player->stop();
-#endif  // WIN32
   for(unsigned i=0;i<edit_clipboard->size();i++) {
     edit_clipboard->at(i).clearExternalData();
   }
@@ -1269,9 +1256,7 @@ void EditLog::cancelData()
       break;
     }
   }
-#ifndef WIN32
   edit_player->stop();
-#endif  // WIN32
   for(unsigned i=0;i<edit_clipboard->size();i++) {
     edit_clipboard->at(i).clearExternalData();
   }
@@ -1338,11 +1323,9 @@ void EditLog::resizeEvent(QResizeEvent *e)
   edit_save_button->setGeometry(10,size().height()-60,80,50);
   edit_saveas_button->setGeometry(100,size().height()-60,80,50);
   edit_reports_button->setGeometry(300,size().height()-60,80,50);
-#ifndef WIN32
   edit_renderas_button->setGeometry(190,size().height()-60,80,50);
   edit_player->playButton()->setGeometry(410,size().height()-60,80,50);
   edit_player->stopButton()->setGeometry(500,size().height()-60,80,50);
-#endif  // WIN32
   edit_ok_button->
     setGeometry(size().width()-180,size().height()-60,80,50);
   edit_cancel_button->setGeometry(size().width()-90,size().height()-60,80,50);

rdlogedit/edit_log.h

@@ -45,9 +45,7 @@
 
 #include "drop_listview.h"
 #include "list_reports.h"
-#ifndef WIN32
 #include "render_dialog.h"
-#endif  // WIN32
 
 //
 // Widget Settings
@@ -197,10 +195,8 @@ class EditLog : public QDialog
   Q3DateEdit *edit_purgedate_edit;
   QPushButton *edit_purgedate_button;
   RDLogLock *edit_log_lock;
-#ifndef WIN32
   QPushButton *edit_renderas_button;
   RenderDialog *edit_render_dialog;
-#endif  // WIN32
 };
 
 

rdlogedit/rdlogedit.cpp

@@ -18,12 +18,11 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#ifndef WIN32
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#endif  // WIN32
+
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qwidget.h>
@@ -56,9 +55,7 @@
 #include "edit_log.h"
 #include "globals.h"
 #include "rdlogedit.h"
-#ifndef WIN32
 #include "voice_tracker.h"
-#endif  // WIN32
 
 //
 // Icons
@@ -116,24 +113,19 @@ MainWidget::MainWidget(QWidget *parent)
   //
   // CAE Connection
   //
-#ifndef WIN32
   connect(rda->cae(),SIGNAL(isConnected(bool)),
           this,SLOT(caeConnectedData(bool)));
   rda->cae()->connectHost();
-#endif  // WIN32
 
   //
   // RIPC Connection
   //
-#ifndef WIN32
   connect(rda->ripc(),SIGNAL(connected(bool)),this,SLOT(connectedData(bool)));
   connect(rda->ripc(),SIGNAL(notificationReceived(RDNotification *)),
 	  this,SLOT(notificationReceivedData(RDNotification *)));
   connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
-  rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
-#else
-  rdripc=NULL;
-#endif  // WIN32
+  rda->ripc()
+    ->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
 
   // 
   // Create Fonts
@@ -155,17 +147,10 @@ MainWidget::MainWidget(QWidget *parent)
   log_greenball_map=new QPixmap(greenball_xpm);
   log_redball_map=new QPixmap(redball_xpm);
 
-  //
-  // User
-  //
-#ifndef WIN32
   //
   // Load Audio Assignments
   //
   RDSetMixerPorts(rda->config()->stationName(),rda->cae());
-#else 
-  rda->user()->setName(RD_USER_LOGIN_NAME);
-#endif  // WIN32
 
   //
   // Log Filter
@@ -247,9 +232,6 @@ MainWidget::MainWidget(QWidget *parent)
   log_track_button->setFont(button_font);
   log_track_button->setText(tr("Voice\n&Tracker"));
   connect(log_track_button,SIGNAL(clicked()),this,SLOT(trackData()));
-#ifdef WIN32
-  log_track_button->hide();
-#endif
 
   //
   // Log Report Button
@@ -267,9 +249,6 @@ MainWidget::MainWidget(QWidget *parent)
   log_close_button->setText(tr("&Close"));
   connect(log_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget()));
 
-#ifdef WIN32
-  RefreshList();
-#endif  // WIN32
   setWindowTitle(QString("RDLogEdit")+"v"+VERSION+" - "+tr("Host")+": "+
 	     rda->config()->stationName()+", "+
 	     tr("User")+": ["+tr("Unknown")+"]");
@@ -347,11 +326,7 @@ void MainWidget::addData()
       return;
     }
     delete log;
-#ifdef WIN32
-    QString username(RD_USER_LOGIN_NAME);
-#else
     QString username(rda->ripc()->user());
-#endif  // WIN32
     QString err_msg;
     if(!RDLog::create(logname,svcname,QDate(),username,&err_msg,
 		      rda->config())) {
@@ -503,7 +478,6 @@ void MainWidget::deleteData()
 
 void MainWidget::trackData()
 {
-#ifndef WIN32
   std::vector<ListListViewItem *> items;
   if(SelectedLogs(&items)!=1) {
     return;
@@ -514,7 +488,6 @@ void MainWidget::trackData()
   delete dialog;
   RefreshItem(items.at(0));
   UnlockList();
-#endif  // WIN32
 }
 
 
@@ -911,17 +884,10 @@ int main(int argc,char *argv[])
   //
   QString tr_path;
   QString qt_path;
-#ifdef WIN32
-  QSettings settings;
-  settings.insertSearchPath(QSettings::Windows,"/SalemRadioLabs");
-  tr_path=QString().sprintf("%s\\",
-			    (const char *)settings.
-			    readEntry("/Rivendell/InstallDir"));
-  qt_path=tr_path;
-#else
+
   tr_path=QString(PREFIX)+QString("/share/rivendell/");
   qt_path=QString("/usr/share/qt4/translation/");
-#endif  // WIN32
+
   QTranslator qt(0);
   qt.load(qt_path+QString("qt_")+QTextCodec::locale(),".");
   a.installTranslator(&qt);