[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde4support] src: Remove unused CUPS headers
From: John Layt <jlayt () kde ! org>
Date: 2014-02-28 13:11:58
Message-ID: E1WJNEM-0002gJ-21 () scm ! kde ! org
[Download RAW message or body]
Git commit 3534d508fa5a4b427f7d7527e7f82a022910d37f by John Layt.
Committed on 20/02/2014 at 10:53.
Pushed by alexmerry into branch 'master'.
Remove unused CUPS headers
Remove stray headers that are no longer required.
D +0 -139 src/kcupsoptionsjobwidget_p.h
D +0 -96 src/kcupsoptionssettingswidget_p.h
M +0 -1 src/kdeprintdialog.cpp
http://commits.kde.org/kde4support/3534d508fa5a4b427f7d7527e7f82a022910d37f
diff --git a/src/kcupsoptionsjobwidget_p.h b/src/kcupsoptionsjobwidget_p.h
deleted file mode 100644
index d2a8fca..0000000
--- a/src/kcupsoptionsjobwidget_p.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * This file is part of the KDE libraries
- * Copyright (c) 2008 John Layt <john@layt.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef KCUPSOPTIONSJOBWIDGET_H
-#define KCUPSOPTIONSJOBWIDGET_H
-
-#include <qwidget.h>
-
-#include "kcupsoptionswidget_p.h"
-#include "ui_kcupsoptionsjobwidget.h"
-
-class QString;
-class QTime;
-
-/**
- * A widget to add to QPrintDialog to enable extra CUPS options
- * Private, not part of KDE API, not to be accessed by apps
- * Use KDEPrintDialog to create a dialog with widget included.
- *
- * Note that the Cups Options cannot be updated until the dialog is
- * closed otherwise they get overwritten.
- */
-
-class KCupsOptionsJobWidget : public KCupsOptionsWidget
-{
- Q_OBJECT
-
-public:
-
- /**
- * Enum for values of job-hold-until option
- */
- enum JobHoldUntil {
- NoHold = 0, //CUPS Default
- Indefinite,
- DayTime,
- Night,
- SecondShift,
- ThirdShift,
- Weekend,
- SpecificTime
- };
-
- /**
- * Create a widget for extra CUPS options
- */
- explicit KCupsOptionsJobWidget(QPrintDialog *parent);
-
- /**
- * Destructor
- */
- ~KCupsOptionsJobWidget();
-
- /**
- * Set the Job Hold option
- */
- void setJobHold(JobHoldUntil jobHold = NoHold);
-
- /**
- * Returns the selected Job Hold option
- */
- JobHoldUntil jobHold() const;
-
- /**
- * Set the Job Hold Time
- */
- void setJobHoldTime(QTime holdUntilTime);
-
- /**
- * Returns the selected Job Hold Time
- */
- QTime jobHoldTime() const;
-
- /**
- * Set the Job Billing text
- */
- void setJobBilling(QString jobBilling = "");
-
- /**
- * Returns the entered Job Billing text
- */
- QString jobBilling() const;
-
- /**
- * Set Job Priority
- */
- void setJobPriority(int priority = 50);
-
- /**
- * Returns Job Priority
- */
- int jobPriority() const;
-
- /**
- * Set Job options
- */
- void setJobOptions(QStringList jobOptions);
-
- /**
- * Returns the entered Job Options
- */
- QStringList jobOptions() const;
-
-protected:
-
- void setupCupsOptions(QStringList &cupsOptions);
-
-private Q_SLOTS:
-
- void toggleJobHoldTime();
-
-private:
-
- void initJobHold();
- void initJobBilling();
- void initJobPriority();
- void initJobOptions();
-
- Ui_KCupsOptionsJobWidget ui;
-};
-
-#endif // KCUPSOPTIONSJOBWIDGET_H
diff --git a/src/kcupsoptionssettingswidget_p.h b/src/kcupsoptionssettingswidget_p.h
deleted file mode 100644
index a02b6e5..0000000
--- a/src/kcupsoptionssettingswidget_p.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * This file is part of the KDE libraries
- * Copyright (c) 2009 John Layt <john@layt.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef KCUPSOPTIONSSETTINGSWIDGET_H
-#define KCUPSOPTIONSSETTINGSWIDGET_H
-
-#include <qwidget.h>
-#include <QComboBox>
-
-#include "kcupsoptionswidget_p.h"
-
-/**
- * A widget to add to QPrintDialog to enable extra CUPS options
- * Private, not part of KDE API, not to be accessed by apps
- * Use KDEPrintDialog to create a dialog with widget included.
- *
- * Note that the Cups Options cannot be updated until the dialog is
- * closed otherwise they get overwritten.
- */
-
-class KCupsOptionsSettingsWidget : public KCupsOptionsWidget
-{
- Q_OBJECT
-
-public:
-
- /**
- * Enum for valid page set
- */
- enum PageSet {
- AllPages = 0, //CUPS Default
- OddPages,
- EvenPages
- };
-
- /**
- * Create a widget for extra CUPS options
- */
- explicit KCupsOptionsSettingsWidget(QPrintDialog *parent);
-
- /**
- * Destructor
- */
- ~KCupsOptionsSettingsWidget();
-
- /**
- * Set the Page Set
- */
- void setPageSet(PageSet pageSet = AllPages);
-
- /**
- * Returns the selected Page Set
- */
- PageSet pageSet() const;
-
- /**
- * Set the Server Selects Pages Mode
- */
-
- void setSystemSelectsPages(bool systemSelectsPages = true);
-
- /**
- * Returns if set to System Selects Pages mode
- */
- bool systemSelectsPages() const;
-
-protected:
-
- void setupCupsOptions(QStringList &cupsOptions);
-
-private:
-
- void initPageSet();
-
- bool m_systemSelectsPages;
- QComboBox *m_pageSetCombo;
-};
-
-#endif // KCUPSOPTIONSSETTINGSWIDGET_H
diff --git a/src/kdeprintdialog.cpp b/src/kdeprintdialog.cpp
index 1613a51..8f923c8 100644
--- a/src/kdeprintdialog.cpp
+++ b/src/kdeprintdialog.cpp
@@ -24,7 +24,6 @@
#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
#include "kcupsoptionspageswidget_p.h"
-#include "kcupsoptionssettingswidget_p.h"
#endif
#include "klocalizedstring.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic