Remove some unused parts of FilePrinter

This commit is contained in:
Sune Vuorela 2023-12-13 10:19:29 +01:00 committed by Albert Astals Cid
parent 3823115a94
commit b4a95259e2
2 changed files with 1 additions and 128 deletions

View file

@ -144,11 +144,6 @@ FilePrinter::doPrintFiles(QPrinter &printer, const QStringList &fileList, FileDe
return ret;
}
QList<int> FilePrinter::pageList(QPrinter &printer, int lastPage, const QList<int> &selectedPageList)
{
return pageList(printer, lastPage, 0, selectedPageList);
}
QList<int> FilePrinter::pageList(QPrinter &printer, int lastPage, int currentPage, const QList<int> &selectedPageList)
{
if (printer.printRange() == QPrinter::Selection) {
@ -176,50 +171,6 @@ QList<int> FilePrinter::pageList(QPrinter &printer, int lastPage, int currentPag
return list;
}
QString FilePrinter::pageRange(QPrinter &printer, int lastPage, const QList<int> &selectedPageList)
{
if (printer.printRange() == QPrinter::Selection) {
return pageListToPageRange(selectedPageList);
}
if (printer.printRange() == QPrinter::PageRange) {
return QStringLiteral("%1-%2").arg(printer.fromPage()).arg(printer.toPage());
}
return QStringLiteral("1-%2").arg(lastPage);
}
QString FilePrinter::pageListToPageRange(const QList<int> &pageList)
{
QString pageRange;
int count = pageList.count();
int i = 0;
int seqStart = i;
int seqEnd;
while (i != count) {
if (i + 1 == count || pageList[i] + 1 != pageList[i + 1]) {
seqEnd = i;
if (!pageRange.isEmpty()) {
pageRange.append(QLatin1Char(','));
}
if (seqStart == seqEnd) {
pageRange.append(pageList[i]);
} else {
pageRange.append(QStringLiteral("%1-%2").arg(seqStart).arg(seqEnd));
}
seqStart = i + 1;
}
i++;
}
return pageRange;
}
bool FilePrinter::ps2pdfAvailable()
{
return (!QStandardPaths::findExecutable(QStringLiteral("ps2pdf")).isEmpty());
@ -245,50 +196,6 @@ bool FilePrinter::cupsAvailable()
#endif
}
bool FilePrinter::detectCupsService()
{
QTcpSocket qsock;
qsock.connectToHost(QStringLiteral("localhost"), 631);
bool rtn = qsock.waitForConnected() && qsock.isValid();
qsock.abort();
return rtn;
}
bool FilePrinter::detectCupsConfig()
{
if (QFile::exists(QStringLiteral("/etc/cups/cupsd.conf"))) {
return true;
}
if (QFile::exists(QStringLiteral("/usr/etc/cups/cupsd.conf"))) {
return true;
}
if (QFile::exists(QStringLiteral("/usr/local/etc/cups/cupsd.conf"))) {
return true;
}
if (QFile::exists(QStringLiteral("/opt/etc/cups/cupsd.conf"))) {
return true;
}
if (QFile::exists(QStringLiteral("/opt/local/etc/cups/cupsd.conf"))) {
return true;
}
return false;
}
QSize FilePrinter::psPaperSize(QPrinter &printer)
{
QSize size = printer.pageLayout().pageSize().sizePoints();
if (printer.pageLayout().pageSize().id() == QPageSize::Custom) {
return QSize((int)printer.widthMM() * (25.4 / 72), (int)printer.heightMM() * (25.4 / 72));
}
if (printer.pageLayout().orientation() == QPageLayout::Landscape) {
size.transpose();
}
return size;
}
QStringList FilePrinter::printArguments(QPrinter &printer,
FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy,

View file

@ -100,31 +100,6 @@ public:
*/
static QList<int> pageList(QPrinter &printer, int lastPage, int currentPage, const QList<int> &selectedPageList);
/** Return the list of pages selected by the user in the Print Dialog
*
* @param printer the print settings to use
* @param lastPage the last page number, needed if AllPages option is selected
* @param selectedPageList list of pages to use if Selection option is selected
* @returns Returns list of pages to print
*/
static QList<int> pageList(QPrinter &printer, int lastPage, const QList<int> &selectedPageList);
/** Return the range of pages selected by the user in the Print Dialog
*
* @param printer the print settings to use
* @param lastPage the last page number, needed if AllPages option is selected
* @param selectedPageList list of pages to use if Selection option is selected
* @returns Returns range of pages to print
*/
static QString pageRange(QPrinter &printer, int lastPage, const QList<int> &selectedPageList);
/** convert a Page List into a Page Range
*
* @param pageList list of pages to convert
* @returns Returns equivalent page range
*/
static QString pageListToPageRange(const QList<int> &pageList);
/** Return if Ghostscript ps2pdf is available on this system
*
* @returns Returns true if Ghostscript ps2pdf available
@ -137,22 +112,13 @@ public:
*/
static bool pdf2psAvailable();
private:
/** Return if CUPS Print System is available on this system
*
* @returns Returns true if CUPS available
*/
static bool cupsAvailable();
/** Returns the postscript standard page size
*
* @returns Returns paper size in ps points
*/
static QSize psPaperSize(QPrinter &printer);
protected:
bool detectCupsService();
bool detectCupsConfig();
Document::PrintError
doPrintFiles(QPrinter &printer, const QStringList &fileList, FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy, const QString &pageRange, QPageLayout::Orientation documentOrientation, ScaleMode scaleMode);