summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-10-15 15:58:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-10-15 15:58:56 +0200
commitad9498f8b888f7851a8612b8d654a2bc89005925 (patch)
treeff7e98ce301121fdddf44f2fc8cb42bd2b1fac4f /vcl/generic
parenteea16cb3e65a4308caddb7618d31a76ca259dbb1 (diff)
More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with > Index: lib/Sema/SemaDeclCXX.cpp > =================================================================== > --- lib/Sema/SemaDeclCXX.cpp (revision 219190) > +++ lib/Sema/SemaDeclCXX.cpp (working copy) > @@ -1917,9 +1917,10 @@ > const Type *T = FD.getType()->getBaseElementTypeUnsafe(); > // FIXME: Destruction of ObjC lifetime types has side-effects. > if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl()) > - return !RD->isCompleteDefinition() || > - !RD->hasTrivialDefaultConstructor() || > - !RD->hasTrivialDestructor(); > + return !RD->hasAttr<WarnUnusedAttr>() && > + (!RD->isCompleteDefinition() || > + !RD->hasTrivialDefaultConstructor() || > + !RD->hasTrivialDestructor()); > return false; > } > > @@ -3517,9 +3518,11 @@ > bool addFieldInitializer(CXXCtorInitializer *Init) { > AllToInit.push_back(Init); > > +#if 0 > // Check whether this initializer makes the field "used". > if (Init->getInit()->HasSideEffects(S.Context)) > S.UnusedPrivateFields.remove(Init->getAnyMember()); > +#endif > > return false; > } to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about initializations with side effects (cf. <http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html> "-Wunused-private-field distracted by side effects"). Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/print/prtsetup.cxx5
-rw-r--r--vcl/generic/print/prtsetup.hxx6
2 files changed, 3 insertions, 8 deletions
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 84a8b5bb2b09..561845e3bdab 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -71,10 +71,9 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
* RTSDialog
*/
-RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent)
+RTSDialog::RTSDialog(const PrinterInfo& rJobData, vcl::Window* pParent)
: TabDialog(pParent, "PrinterPropertiesDialog", "vcl/ui/printerpropertiesdialog.ui")
, m_aJobData(rJobData)
- , m_aPrinter(rPrinter)
, m_pPaperPage(NULL)
, m_pDevicePage(NULL)
, m_aInvalidString(VclResId(SV_PRINT_INVALID_TXT))
@@ -474,7 +473,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
int SetupPrinterDriver(::psp::PrinterInfo& rJobData)
{
int nRet = 0;
- RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, NULL );
+ RTSDialog aDialog( rJobData, NULL );
if( aDialog.Execute() )
{
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 8f3d43d3a199..08fb22d9309e 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -43,7 +43,6 @@ class RTSDialog : public TabDialog
friend class RTSDevicePage;
::psp::PrinterInfo m_aJobData;
- OUString m_aPrinter;
// controls
TabControl* m_pTabControl;
@@ -63,7 +62,7 @@ class RTSDialog : public TabDialog
// helper functions
void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
public:
- RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent = NULL);
+ RTSDialog(const ::psp::PrinterInfo& rJobData, vcl::Window* pParent = NULL);
virtual ~RTSDialog();
const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
@@ -98,9 +97,6 @@ class RTSDevicePage : public TabPage
{
RTSDialog* m_pParent;
- OUString m_aSpaceColor;
- OUString m_aSpaceGray;
-
ListBox* m_pPPDKeyBox;
ListBox* m_pPPDValueBox;
const psp::PPDValue* m_pCustomValue;