wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill all the deprecated functions now that we've change ABI anyway

Browse Source
remotes/origin/KDE/4.10
Albert Astals Cid 14 years ago
parent 23d474e6a9
commit a716b3e4e0
4 changed files with 0 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      core/annotations.cpp
  2. 10
      core/annotations.h
  3. 46
      core/fileprinter.cpp
  4. 65
      core/fileprinter.h

12
core/annotations.cpp
Unescape View File

@ -1546,18 +1546,6 @@ QColor GeomAnnotation::geometricalInnerColor() const
return d->m_geomInnerColor;
}
void GeomAnnotation::setGeometricalPointWidth( int width )
{
Q_D( GeomAnnotation );
d->m_style.setWidth( width );
}
int GeomAnnotation::geometricalPointWidth() const
{
Q_D( const GeomAnnotation );
return static_cast< int >( d->m_style.width() );
}
Annotation::SubType GeomAnnotation::subType() const
{
return AGeom;

10
core/annotations.h
Unescape View File

@ -1050,16 +1050,6 @@ class OKULAR_EXPORT GeomAnnotation : public Annotation
*/
QColor geometricalInnerColor() const;
/**
* Sets the point @p width of the geometrical annotation.
*/
KDE_DEPRECATED void setGeometricalPointWidth( int width );
/**
* Returns the point width of the geometrical annotation.
*/
KDE_DEPRECATED int geometricalPointWidth() const;
/**
* Returns the sub type of the geometrical annotation.
*/

46
core/fileprinter.cpp
Unescape View File

@ -33,13 +33,6 @@
using namespace Okular;
// Deprecated overload for binary compatibility
int FilePrinter::printFile( QPrinter &printer, const QString file, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, const QString &pageRange )
{
return printFile( printer, file, QPrinter::Portrait, fileDeletePolicy, pageSelectPolicy, pageRange );
}
int FilePrinter::printFile( QPrinter &printer, const QString file,
QPrinter::Orientation documentOrientation, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, const QString &pageRange )
@ -49,24 +42,6 @@ int FilePrinter::printFile( QPrinter &printer, const QString file,
documentOrientation );
}
// Deprecated function kept for binary compatibility
// This is deprecated because it cannot support different original orientations
// for each document in the list.
int FilePrinter::printFiles( QPrinter &printer, const QStringList &fileList, FileDeletePolicy fileDeletePolicy )
{
FilePrinter fp;
return fp.doPrintFiles( printer, fileList, fileDeletePolicy, FilePrinter::ApplicationSelectsPages, QString(),
QPrinter::Portrait );
}
// Deprecated overload for binary compatibility
int FilePrinter::doPrintFiles( QPrinter &printer, QStringList fileList, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, const QString &pageRange )
{
return doPrintFiles( printer, fileList, fileDeletePolicy, pageSelectPolicy, pageRange,
QPrinter::Portrait );
}
int FilePrinter::doPrintFiles( QPrinter &printer, QStringList fileList, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, const QString &pageRange,
QPrinter::Orientation documentOrientation )
@ -380,15 +355,6 @@ Generator::PrintError FilePrinter::printError( int c )
// Deprecated overload for binary compatibility
QStringList FilePrinter::printArguments( QPrinter &printer, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, bool useCupsOptions,
const QString &pageRange, const QString &version )
{
return printArguments( printer, fileDeletePolicy, pageSelectPolicy, useCupsOptions,
pageRange, version, QPrinter::Portrait );
}
QStringList FilePrinter::printArguments( QPrinter &printer, FileDeletePolicy fileDeletePolicy,
PageSelectPolicy pageSelectPolicy, bool useCupsOptions,
const QString &pageRange, const QString &version,
@ -516,12 +482,6 @@ QStringList FilePrinter::pages( QPrinter &printer, PageSelectPolicy pageSelectPo
return QStringList(); // AllPages
}
// Deprecated overload for binary compatibility
QStringList FilePrinter::cupsOptions( QPrinter &printer )
{
return cupsOptions( printer, QPrinter::Portrait );
}
QStringList FilePrinter::cupsOptions( QPrinter &printer, QPrinter::Orientation documentOrientation )
{
QStringList optionList;
@ -635,12 +595,6 @@ QString FilePrinter::mediaPaperSource( QPrinter &printer )
}
}
// Deprecated overload for binary compatibility
QStringList FilePrinter::optionOrientation( QPrinter &printer )
{
return optionOrientation( printer, QPrinter::Portrait );
}
QStringList FilePrinter::optionOrientation( QPrinter &printer, QPrinter::Orientation documentOrientation )
{
// portrait and landscape options rotate the document according to the document orientation

65
core/fileprinter.h
Unescape View File

@ -18,9 +18,6 @@
#include <QtCore/QString>
#include <QtGui/QPrinter>
// For KDE_DEPRECATED
#include <kdemacros.h>
#include "okular_export.h"
#include "generator.h"
@ -84,60 +81,6 @@ public:
PageSelectPolicy pageSelectPolicy = FilePrinter::ApplicationSelectsPages,
const QString &pageRange = QString() );
/** Print a file using the settings in QPrinter (compatibility overload)
*
* Only supports CUPS and LPR on *NIX. Page Range only supported in CUPS.
* Most settings unsupported by LPR, some settings unsupported by CUPS.
*
* @param printer the print settings to use
* @param file the file to print
* @param fileDeletePolicy if the application or system deletes the file
* @param pageSelectPolicy if the application or system selects the pages to print
* @param pageRange page range to print if SystemSlectsPages and user chooses Selection in Print Dialog
*
* @returns Returns exit code:
* -9 if lpr not found
* -8 if empty file name
* -7 if unable to find file
* -6 if invalid printer state
* -5 if print to file copy failed
* -2 if the KProcess could not be started
* -1 if the KProcess crashed
* otherwise the KProcess exit code
*
* @deprecated Use the overload which takes the documentOrientation instead.
*/
static KDE_DEPRECATED int printFile( QPrinter &printer, const QString file,
FileDeletePolicy fileDeletePolicy = FilePrinter::ApplicationDeletesFiles,
PageSelectPolicy pageSelectPolicy = FilePrinter::ApplicationSelectsPages,
const QString &pageRange = QString() );
/** Print a list of files using the settings in QPrinter
*
* Only supports CUPS and LPR on *NIX.
* Most settings unsupported by LPR, some settings unsupported by CUPS.
*
* @param printer the print settings to use
* @param fileList the files to print
* @param fileDeletePolicy if the application or system deletes the file
*
* @returns Returns exit code:
* -9 if lpr not found
* -8 if empty file list
* -7 if unable to find a file
* -6 if invalid printer state
* -5 if print to file copy failed
* -2 if the KProcess could not be started
* -1 if the KProcess crashed
* otherwise the KProcess exit code
*
* @deprecated Use printFile instead, passing the documentOrientation for each file.
*/
static KDE_DEPRECATED int printFiles( QPrinter &printer, const QStringList &fileList,
FileDeletePolicy fileDeletePolicy = FilePrinter::ApplicationDeletesFiles );
/** Return the list of pages selected by the user in the Print Dialog
*
* @param printer the print settings to use
@ -209,17 +152,11 @@ protected:
bool detectCupsService();
bool detectCupsConfig();
KDE_DEPRECATED int doPrintFiles( QPrinter &printer, const QStringList fileList,
FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy,
const QString &pageRange );
int doPrintFiles( QPrinter &printer, const QStringList fileList,
FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy,
const QString &pageRange,
QPrinter::Orientation documentOrientation );
KDE_DEPRECATED QStringList printArguments( QPrinter &printer,
FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy,
bool useCupsOptions, const QString &pageRange, const QString &version );
QStringList printArguments( QPrinter &printer,
FileDeletePolicy fileDeletePolicy, PageSelectPolicy pageSelectPolicy,
bool useCupsOptions, const QString &pageRange, const QString &version,
@ -233,12 +170,10 @@ protected:
QStringList pages( QPrinter &printer, PageSelectPolicy pageSelectPolicy,
const QString &pageRange, bool useCupsOptions, const QString &version );
KDE_DEPRECATED QStringList cupsOptions( QPrinter &printer );
QStringList cupsOptions( QPrinter &printer, QPrinter::Orientation documentOrientation );
QStringList optionMedia( QPrinter &printer );
QString mediaPageSize( QPrinter &printer );
QString mediaPaperSource( QPrinter &printer );
KDE_DEPRECATED QStringList optionOrientation( QPrinter &printer );
QStringList optionOrientation( QPrinter &printer, QPrinter::Orientation documentOrientation );
QStringList optionDoubleSidedPrinting( QPrinter &printer );
QStringList optionPageOrder( QPrinter &printer );

Write Preview
Loading…
Cancel
Save