mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-12 15:45:59 +01:00
2021-02-23 Fred Gleason <fredg@paravelsystems.com>
* Removed the Qt3Support library from the build system. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
## Makefile.am
|
||||
##
|
||||
## (C) Copyright 2008-2020 Fred Gleason <fredg@paravelsystems.com>
|
||||
## (C) Copyright 2008-2021 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
|
||||
@@ -17,7 +17,7 @@
|
||||
##
|
||||
## Use automake to process this into a Makefile.in
|
||||
|
||||
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
|
||||
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
|
||||
LIBS = -L$(top_srcdir)/lib
|
||||
MOC = @QT_MOC@
|
||||
|
||||
@@ -31,7 +31,7 @@ dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h
|
||||
|
||||
nodist_rdmaint_SOURCES = moc_rdmaint.cpp
|
||||
|
||||
rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
|
||||
rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
|
||||
|
||||
CLEANFILES = *~\
|
||||
*.idb\
|
||||
|
||||
@@ -28,9 +28,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qdir.h>
|
||||
#include <qfile.h>
|
||||
#include <QApplication>
|
||||
|
||||
#include <rd.h>
|
||||
#include <rdapplication.h>
|
||||
@@ -61,7 +59,7 @@ MainObject::MainObject(QObject *parent)
|
||||
//
|
||||
rda=static_cast<RDApplication *>(new RDCoreApplication("rdmaint","rdmaint",RDMAINT_USAGE,this));
|
||||
if(!rda->open(&err_msg)) {
|
||||
fprintf(stderr,"rdmaint: %s\n",(const char *)err_msg);
|
||||
fprintf(stderr,"rdmaint: %s\n",err_msg.toUtf8().constData());
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -85,7 +83,7 @@ MainObject::MainObject(QObject *parent)
|
||||
}
|
||||
if(!rda->cmdSwitch()->processed(i)) {
|
||||
fprintf(stderr,"rdmaint: unknown command option \"%s\"\n",
|
||||
(const char *)rda->cmdSwitch()->key(i));
|
||||
rda->cmdSwitch()->key(i).toUtf8().constData());
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
@@ -404,7 +402,7 @@ void MainObject::RehashCuts()
|
||||
else {
|
||||
if(maint_verbose) {
|
||||
fprintf(stderr,"rehashed cut \"%s\"\n",
|
||||
(const char *)q->value(0).toString());
|
||||
q->value(0).toString().toUtf8().constData());
|
||||
}
|
||||
}
|
||||
sleep(1);
|
||||
|
||||
Reference in New Issue
Block a user