2018-08-07 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions

View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rdconvert
##
## (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2017-2018 Fred Gleason <fredg@paravelsystems.com>
##
## This 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,8 +17,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
@@ -31,7 +29,7 @@ bin_PROGRAMS = rdconvert
dist_rdconvert_SOURCES = rdconvert.cpp rdconvert.h
rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
CLEANFILES = *~\
*.exe\

View File

@@ -29,7 +29,7 @@
MainObject::MainObject(QObject *parent)
:QObject(parent)
{
unsigned schema=0;
int schema=0;
destination_settings=new RDSettings();
start_point=-1;
@@ -179,8 +179,7 @@ MainObject::MainObject(QObject *parent)
// Open Database
//
QString err (tr("rdconvert: "));
QSqlDatabase *db=RDInitDb(&schema,&err);
if(!db) {
if(!RDOpenDb(&schema,&err,rdconfig)) {
fprintf(stderr,err.ascii());
delete cmd;
exit(256);