Commit 7036146c authored by Boudewijn Rempt's avatar Boudewijn Rempt

Remove superfluous kdeversion.h header

svn path=/trunk/koffice/; revision=996354
parent e8c2e765
EXCLUDE explicit cpp qclasses typedefs
SKIP /colorspaces/wetsticky/ws/\|/colorspaces/wet/wetdreams/\|/plugins/filters/cimg/CImg\.h\|/ui/obsolete|/plugins/painterlyframework.old|sdk|plugins/viewplugins/tonemapping/libpfs/\|/plugins/viewplugins/tonemapping/operators/
SKIP /colorspaces/wetsticky/ws/\|/colorspaces/wet/wetdreams/\|/plugins/filters/cimg/CImg\.h\|/ui/obsolete|/plugins/painterlyframework.old|sdk|plugins/viewplugins/tonemapping/libpfs/\|/plugins/extensions/tonemapping/operators/\|/plugins/extensions/tonemapping/libpfs/
......@@ -99,7 +99,7 @@ void KisMacro::play(const KisPlayInfo& info) const
for (QList<KisRecordedAction*>::iterator it = d->actions.begin(); it != d->actions.end(); ++it) {
if ( *it ) {
QList<KisNodeSP> nodes = (*it)->nodeQueryPath().queryNodes(info.image(), info.currentNode());
foreach(KisNodeSP node, nodes)
foreach(const KisNodeSP node, nodes)
{
dbgImage << "Play action : " << (*it)->name();
(*it)->play(node, info);
......
......@@ -161,7 +161,7 @@ QString KisNodeQueryPath::toString() const
switch(pe.type)
{
case PathElement::Wildcard:
str += "*";
str += '*';
break;
case PathElement::Parent:
str += "..";
......
......@@ -86,7 +86,7 @@ inline double norm2(const QPointF& p)
void KisRulerAssistantTool::mousePressEvent(KoPointerEvent *event)
{
m_handleDrag = 0;
foreach(KisPaintingAssistantHandleSP handle, m_handles)
foreach(const KisPaintingAssistantHandleSP handle, m_handles)
{
if( norm2(event->point - *handle ) < 10)
{
......@@ -123,7 +123,7 @@ void KisRulerAssistantTool::mouseReleaseEvent(KoPointerEvent *event)
void KisRulerAssistantTool::paint(QPainter& _gc, const KoViewConverter &_converter)
{
foreach(KisPaintingAssistantHandleSP handle, m_handles)
foreach(const KisPaintingAssistantHandleSP handle, m_handles)
{
if( handle == m_handleDrag ) {
_gc.setBrush( QColor(0,0,0,125) );
......
......@@ -16,8 +16,8 @@ class RulerAssistant;
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _KIS_TOOL_RULER_ASSISTANT_TOOL_H_
#define _KIS_TOOL_RULER_ASSISTANT_TOOL_H_
#ifndef _KIS_RULER_ASSISTANT_TOOL_H_
#define _KIS_RULER_ASSISTANT_TOOL_H_
#include <kis_tool.h>
#include <KoToolFactory.h>
......
......@@ -14,6 +14,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "ruler_assistant_tool.h"
#include "kis_ruler_assistant_tool.h"
#include <stdlib.h>
......@@ -33,7 +34,6 @@
#include <kis_types.h>
#include <KoToolRegistry.h>
#include "ruler_assistant_tool.h"
typedef KGenericFactory<RulerAssistantToolPlugin> RulerAssistantToolFactory;
......
......@@ -221,7 +221,7 @@ bool KoCtlColorSpaceInfo::load()
// Parse color
if( e.hasAttribute("color") )
{
QStringList colorlist = e.attribute("color").split(",");
QStringList colorlist = e.attribute("color").split(',');
if(colorlist.size() != 3) return false;
info->d->color = QColor( colorlist[0].toInt(), colorlist[1].toInt(), colorlist[2].toInt() );
}
......
......@@ -38,7 +38,7 @@ KoID KoCtlParser::generateDepthID(const QString& depth, const QString& type)
return Float16BitsColorDepthID;
else if(depth == "32" )
return Float32BitsColorDepthID;
else if(depth == "" )
else if(depth.isEmpty() )
return KoID("F", i18n("Float"));
}
dbgPlugins << "Invalid type";
......
......@@ -16,6 +16,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef KO_CTL_PARSER
#define KO_CTL_PARSER
class QString;
class KoID;
......@@ -24,3 +26,5 @@ namespace KoCtlParser {
KoID generateDepthID(const QString& depth, const QString& type);
}
#endif
......@@ -51,7 +51,7 @@ WdgBackgrounds::WdgBackgrounds(QWidget* parent)
noneItem->setData(Qt::DecorationRole, none);
noneItem->setData(Qt::UserRole + 1, "none");
foreach(QString fileName, backgroundFileNames) {
foreach(const QString& fileName, backgroundFileNames) {
QImage img = QImage(fileName).copy(0, 0, 64, 64);
QListWidgetItem* item = new QListWidgetItem(lstBackgrounds);
//item->setData(Qt::DisplayRole, fileName);
......
......@@ -14,6 +14,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef EXTENSIONS_MANAGER
#define EXTENSIONS_MANAGER
#include <QList>
......@@ -35,3 +37,5 @@ class ExtensionsManager {
QList<Extension*> m_installedExtension;
static ExtensionsManager* s_instance;
};
#endif
......@@ -976,7 +976,7 @@
</item>
<item>
<property name="text" >
<string>Color sequencial area sensor</string>
<string>Color sequential area sensor</string>
</property>
</item>
<item>
......@@ -986,7 +986,7 @@
</item>
<item>
<property name="text" >
<string>Color sequencial linear sensor</string>
<string>Color sequential linear sensor</string>
</property>
</item>
</widget>
......
......@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtCore>
#include <QtCore/QtCore>
#include <QtXml/QtXml>
/*
......
......@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtCore>
#include <QtCore/QtCore>
#include <QtXml/QtXml>
/*
......
......@@ -14,11 +14,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include "kis_image_alignment_projective_model.h"
#include "models/kis_image_alignment_projective_model.h"
#include "kis_image_alignment_model_p.h"
#include "kis_image_alignment_model_p.h"
#include "kis_matched_point.h"
#include "imagoptim_p.h"
#include "imagoptim_functions.h"
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KROSS_KRITACOREHISTOGRAM_H
#define KROSS_KRITACOREHISTOGRAM_H
#ifndef KRS_HISTOGRAM_H
#define KRS_HISTOGRAM_H
#include <QObject>
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRITA_KROSS_KRITACOREMODULE_H
#define KRITA_KROSS_KRITACOREMODULE_H
#ifndef KRS_MODULE_H
#define KRS_MODULE_H
#include <QString>
#include <QVariant>
......
......@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRITA_KROSS_KRITACOREMONITOR_H
#define KRITA_KROSS_KRITACOREMONITOR_H
#ifndef KRS_MONITOR_H
#define KRS_MONITOR_H
#include <QObject>
#include "krosskritacore_export.h"
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRITACOREPROGRESS_H
#define KRITACOREPROGRESS_H
#ifndef KRS_PROGRESS_H
#define KRS_PROGRESS_H
#include "krosskritacore_export.h"
......
......@@ -67,4 +67,5 @@ KoColorTransformation* KisFilterInvert::createTransformation(const KoColorSpace*
{
Q_UNUSED(config);
return cs->createInvertTransformation();
}
\ No newline at end of file
}
......@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
// Local includes.
#include "kgradientslider.h"
// C++ includes.
......@@ -34,8 +36,6 @@
#include <QBrush>
#include <QLinearGradient>
// Local includes.
#include "kgradientslider.h"
KGradientSlider::KGradientSlider(QWidget *parent)
......
......@@ -32,7 +32,7 @@
#include <qfileinfo.h>
#include <qstring.h>
#include <kdeversion.h>
#include <kis_debug.h>
#include <kapplication.h>
#include <klocale.h>
......@@ -298,7 +298,7 @@ void exportAnnotationsForImage(Image * dst, vKisAnnotationSP_it& it, vKisAnnotat
dbgFile << "Trying to store annotation of type" << (*it) -> type() << " of size" << (*it) -> annotation() . size();
if ((*it) -> type().startsWith("krita_attribute:")) { // Attribute
if ((*it) -> type().startsWith(QLatin1String("krita_attribute:"))) { // Attribute
if (!SetImageAttribute(dst,
(*it) -> type().mid(strlen("krita_attribute:")).ascii(),
(*it) -> annotation() . data())) {
......
......@@ -12,7 +12,6 @@ Name[x-test]=xxKritaxx
Name[zh_TW]=繪圖_Krita
Type=Application
NoDisplay=true
Path=
StartupNotify=true
Terminal=false
X-DBUS-StartupType=Multi
......
......@@ -578,7 +578,7 @@ KisImageBuilder_Result KisJPEGConverter::buildFile(const KUrl& uri, KisPaintLaye
dbgFile << "Trying to store annotation of type" << (*it) -> type() << " of size" << (*it) -> annotation() . size();
if ((*it) -> type().startsWith("krita_attribute:")) { // Attribute
if ((*it) -> type().startsWith(QLatin1String("krita_attribute:"))) { // Attribute
// FIXME
dbgFile << "cannot save this annotation :" << (*it) -> type();
} else { // Profile
......
......@@ -10,7 +10,6 @@ Name[ne]=क्रिता
Name[ta]=கிரிட்டா
Name[x-test]=xxKritaxx
Name[zh_TW]=繪圖_Krita
Path=
StartupNotify=true
Terminal=false
Type=Application
......
......@@ -11,7 +11,6 @@ Name[ne]=क्रिता
Name[ta]=கிரிட்டா
Name[x-test]=xxKritaxx
Name[zh_TW]=繪圖_Krita
Path=
StartupNotify=true
Terminal=false
Type=Application
......
......@@ -10,7 +10,6 @@ Name[ne]=क्रिता
Name[ta]=கிரிட்டா
Name[x-test]=xxKritaxx
Name[zh_TW]=繪圖_Krita
Path=
StartupNotify=true
Terminal=false
Type=Application
......
......@@ -14,3 +14,4 @@ X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
X-DBUS-ServiceName=org.koffice.krita
NoDisplay=true
Type=Application
......@@ -11,7 +11,6 @@ Name[ta]=கிரிட்டா
Name[x-test]=xxKritaxx
Name[zh_TW]=繪圖_Krita
NoDisplay=true
Path=
StartupNotify=true
Terminal=false
Type=Application
......
......@@ -146,4 +146,5 @@ bool KisDeformPaintOpSettingsWidget::useOldData() const{
qreal KisDeformPaintOpSettingsWidget::spacing() const{
return m_options->spacingKDNumInp->value();
}
\ No newline at end of file
}
......@@ -15,7 +15,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_brush_registry.h"
#include <QString>
......@@ -33,7 +32,6 @@
#include "kis_brush_server.h"
#include "kis_brush_factory.h"
#include "kis_brush_registry.h"
#include "kis_auto_brush_factory.h"
#include "kis_gbr_brush_factory.h"
#include "kis_text_brush_factory.h"
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_GENERATOR_REGISTRY_H_
#define KIS_GENERATOR_REGISTRY_H_
#ifndef KIS_BRUSH_REGISTRY_H_
#define KIS_BRUSH_REGISTRY_H_
#include <QObject>
......
......@@ -54,4 +54,5 @@ class Metaball{
};
#endif // _METABALL_H_
\ No newline at end of file
#endif // _METABALL_H_
......@@ -131,7 +131,7 @@ void KisToolBrush::leave(QEvent */*e*/)
void KisToolBrush::slotSetRate(int rate) {
m_rate = rate;
m_sliderRate->setToolTip( QString::number(m_rate) + " " + i18n("ms") );
m_sliderRate->setToolTip( QString::number(m_rate) + ' ' + i18n("ms") );
}
void KisToolBrush::slotSetSmoothness(int smoothness)
......@@ -160,7 +160,7 @@ QWidget * KisToolBrush::createOptionWidget()
m_sliderRate->setMaximum(MAXIMUM_RATE);
connect(m_sliderRate, SIGNAL(valueChanged(int)), SLOT(slotSetRate(int)));
m_sliderRate->setValue( m_rate );
m_sliderRate->setToolTip( QString::number(m_rate) + " " + i18n("ms") );
m_sliderRate->setToolTip( QString::number(m_rate) + ' ' + i18n("ms") );
m_spinRate = new QSpinBox(optionWidget);
m_spinRate->setMinimum(0);
......
......@@ -108,7 +108,8 @@ KisShapeController::KisShapeController(KisDoc2 * doc, KisNameServer *nameServer)
m_d->nameServer = nameServer;
m_d->image = 0;
// Ask every shapefactory to populate the dataCenterMap
foreach(KoShapeFactory * shapeFactory, KoShapeRegistry::instance()->values()) {
QList<KoShapeFactory*> shapeFactories = KoShapeRegistry::instance()->values();
foreach(const KoShapeFactory * shapeFactory, shapeFactories) {
shapeFactory->populateDataCenterMap(m_d->dataCenterMap);
}
}
......
......@@ -71,9 +71,8 @@ struct KisFiltersModel::Private {
KisFiltersModel::KisFiltersModel(KisPaintDeviceSP thumb) : d(new Private)
{
d->thumb = thumb;
KisFilterRegistry* registry = KisFilterRegistry::instance();
foreach(const QString & key, registry->keys()) {
KisFilterSP filter = registry->get(key);
QList<KisFilterSP> filters = KisFilterRegistry::instance()->values();
foreach(const KisFilterSP filter, filters) {
Q_ASSERT(filter);
if (!d->categories.contains(filter->menuCategory().id())) {
Private::Category cat;
......
......@@ -88,14 +88,14 @@ KisPaintingAssistant::KisPaintingAssistant(const QString& id, const QString& nam
void KisPaintingAssistant::initHandles(QList<KisPaintingAssistantHandleSP> _handles) {
Q_ASSERT(d->handles.isEmpty());
d->handles = _handles;
foreach(KisPaintingAssistantHandleSP handle, _handles) {
foreach(const KisPaintingAssistantHandleSP handle, _handles) {
handle->registerAssistant(this);
}
}
KisPaintingAssistant::~KisPaintingAssistant()
{
foreach(KisPaintingAssistantHandleSP handle, d->handles) {
foreach(const KisPaintingAssistantHandleSP handle, d->handles) {
handle->unregisterAssistant(this);
}
delete d;
......
......@@ -103,7 +103,7 @@ QList<KisPaintingAssistantHandleSP> KisPaintingAssistantsManager::handles() {
QList<KisPaintingAssistantHandleSP> hs;
foreach(KisPaintingAssistant* assistant, d->assistants)
{
foreach(KisPaintingAssistantHandleSP handle, assistant->handles())
foreach(const KisPaintingAssistantHandleSP handle, assistant->handles())
{
if(!hs.contains(handle)) {
hs.push_back(handle);
......
......@@ -165,7 +165,7 @@ Exiv2::Value* kmdValueToExivValue(const KisMetaData::Value& value, Exiv2::TypeId
Exiv2::StringValue* ev = new Exiv2::StringValue();
for (int i = 0; i < value.asArray().size(); ++i) {
ev->value_ += qVariantValue<QString>(value.asArray()[i].asVariant()).toAscii().data();
if( i != value.asArray().size() - 1) ev->value_ += ",";
if( i != value.asArray().size() - 1) ev->value_ += ',';
}
return ev;
}
......
......@@ -171,9 +171,9 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
Q_ASSERT( it->getValue()->typeId() == Exiv2::string );
QString data = it->getValue()->toString().c_str();
QStringList list = data.split(",");
QStringList list = data.split(',');
QList<KisMetaData::Value> values;
foreach( QString entry, list)
foreach( const QString entry, list)
{
values.push_back(KisMetaData::Value(entry));
}
......
......@@ -91,10 +91,9 @@ void KisWdgGenerator::init(KisPaintDeviceSP dev)
d->dev = dev;
d->uiWdgGenerators.setupUi(this);
d->widgetLayout = new QGridLayout(d->uiWdgGenerators.centralWidgetHolder);
KisGeneratorRegistry * registry = KisGeneratorRegistry::instance();
QList<KisGeneratorSP> generators = KisGeneratorRegistry::instance()->values();
foreach(const QString & key, registry->keys()) {
KisGeneratorSP generator = registry->get(key);
foreach(const KisGeneratorSP generator, generators) {
Q_ASSERT(generator);
KisGeneratorItem * item = new KisGeneratorItem(generator->name(),
d->uiWdgGenerators.lstGenerators,
......
......@@ -26,7 +26,7 @@
#include <QPixmap>
#include <kdebug.h>
#include <kdeversion.h>
#include "KoPictureKey.h"
#include "KoPictureBase.h"
......
......@@ -36,7 +36,7 @@
#include <kglobal.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <ktemporaryfile.h>
#include <kshell.h>
......
......@@ -22,7 +22,7 @@
#include "kotext_export.h"
#include <kdeversion.h>
#include <QtCore/QStringList>
#include <QtCore/QChar>
......
......@@ -28,7 +28,7 @@
#include <QString>
#include <QTextCharFormat>
#include "kotext_export.h"
#include <kdeversion.h>
class StylePrivate;
class QTextBlock;
......@@ -174,16 +174,15 @@ public:
/// Return how the text should be capitalized
QFont::Capitalization fontCapitalization() const;
#if QT_VERSION >= KDE_MAKE_VERSION(4,5,0)
/// See similar named method on QTextCharFormat (Qt 4.5 and above)
/// See similar named method on QTextCharFormat
void setFontStyleHint(QFont::StyleHint styleHint);
/// See similar named method on QTextCharFormat (Qt 4.5 and above)
/// See similar named method on QTextCharFormat
QFont::StyleHint fontStyleHint() const;
/// See similar named method on QTextCharFormat (Qt 4.5 and above)
/// See similar named method on QTextCharFormat
void setFontKerning(bool enable);
/// See similar named method on QTextCharFormat (Qt 4.5 and above)
/// See similar named method on QTextCharFormat
bool fontKerning() const;
#endif
/// See similar named method on QTextCharFormat
void setBackground(const QBrush &brush);
/// See similar named method on QTextCharFormat
......
......@@ -25,7 +25,7 @@
#include <KoXmlReader.h>
#include <ktar.h>
#include <ktemporaryfile.h>
#include <kdeversion.h>
#include <kfilterdev.h>
#include <kdebug.h>
......
......@@ -43,7 +43,7 @@
#include <QToolBar>
#include <QApplication>
#include <Q3ValueList>
#include <kdeversion.h>
//static
QString KoView::newObjectName()
......
......@@ -23,7 +23,7 @@
#include <QtTest>
#include <QtGui>
#include <kdeversion.h>
#include <KoDocument.h>
#include <KoDocumentInfo.h>
......
......@@ -34,7 +34,7 @@
#include <kurl.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
......
......@@ -26,7 +26,7 @@
#include <ktar.h>
#include <kdebug.h>
#include <kurl.h>
#include <kdeversion.h>
#include <kio/netaccess.h>
KoTarStore::KoTarStore(const QString & _filename, Mode _mode, const QByteArray & appIdentification)
......
......@@ -87,7 +87,7 @@
#include <QVector>
#include <kdeversion.h>
/*
......
......@@ -25,7 +25,7 @@
#include <kzip.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kurl.h>
#include <kio/netaccess.h>
......
......@@ -27,7 +27,7 @@
#include <kdesktopfile.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kcomponentdata.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
......
......@@ -27,7 +27,7 @@
#include <kdesktopfile.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kcomponentdata.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
......
......@@ -27,7 +27,7 @@
#include <kdesktopfile.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kdeversion.h>
#include <kcomponentdata.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment