diff options
Diffstat (limited to 'ksvg/core')
-rw-r--r-- | ksvg/core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ksvg/core/CanvasFactory.cpp | 2 | ||||
-rw-r--r-- | ksvg/core/CanvasFactory.h | 2 | ||||
-rw-r--r-- | ksvg/core/CanvasItem.h | 2 | ||||
-rw-r--r-- | ksvg/core/CanvasItems.cpp | 2 | ||||
-rw-r--r-- | ksvg/core/CanvasItems.h | 2 | ||||
-rw-r--r-- | ksvg/core/DocumentFactory.cpp | 4 | ||||
-rw-r--r-- | ksvg/core/DocumentFactory.h | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGCanvas.cpp | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGCanvas.h | 8 | ||||
-rw-r--r-- | ksvg/core/KSVGHelper.cpp | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGHelper.h | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGLoader.cpp | 18 | ||||
-rw-r--r-- | ksvg/core/KSVGLoader.h | 4 | ||||
-rw-r--r-- | ksvg/core/KSVGReader.cpp (renamed from ksvg/core/KSVGReader.cc) | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGReader.h | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGTextChunk.cpp | 2 | ||||
-rw-r--r-- | ksvg/core/KSVGTextChunk.h | 2 | ||||
-rw-r--r-- | ksvg/core/Makefile.am | 2 |
19 files changed, 16 insertions, 48 deletions
diff --git a/ksvg/core/CMakeLists.txt b/ksvg/core/CMakeLists.txt index 8506cf76..3818acaf 100644 --- a/ksvg/core/CMakeLists.txt +++ b/ksvg/core/CMakeLists.txt @@ -46,6 +46,6 @@ tde_create_translated_desktop( tde_add_library( ksvgcore STATIC_PIC AUTOMOC SOURCES - KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cc KSVGTextChunk.cpp + KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cpp KSVGTextChunk.cpp CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp ) diff --git a/ksvg/core/CanvasFactory.cpp b/ksvg/core/CanvasFactory.cpp index 8910f879..55610a2b 100644 --- a/ksvg/core/CanvasFactory.cpp +++ b/ksvg/core/CanvasFactory.cpp @@ -172,5 +172,3 @@ TQPtrList<CanvasInfo> CanvasFactory::canvasList() { return m_canvasList; } - -// vim:ts=4:noet diff --git a/ksvg/core/CanvasFactory.h b/ksvg/core/CanvasFactory.h index 24c59ba6..95614a34 100644 --- a/ksvg/core/CanvasFactory.h +++ b/ksvg/core/CanvasFactory.h @@ -65,5 +65,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/CanvasItem.h b/ksvg/core/CanvasItem.h index 1c6b1e34..0288400f 100644 --- a/ksvg/core/CanvasItem.h +++ b/ksvg/core/CanvasItem.h @@ -150,5 +150,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp index 333f4608..cf605d9e 100644 --- a/ksvg/core/CanvasItems.cpp +++ b/ksvg/core/CanvasItems.cpp @@ -505,5 +505,3 @@ void MarkerHelper::doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, doub { doMarker(shape, style, x, y, angle, style->getEndMarker()); } - -// vim:ts=4:noet diff --git a/ksvg/core/CanvasItems.h b/ksvg/core/CanvasItems.h index 9f5eed43..f9fe9762 100644 --- a/ksvg/core/CanvasItems.h +++ b/ksvg/core/CanvasItems.h @@ -129,5 +129,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/DocumentFactory.cpp b/ksvg/core/DocumentFactory.cpp index 4ae743be..f72e2299 100644 --- a/ksvg/core/DocumentFactory.cpp +++ b/ksvg/core/DocumentFactory.cpp @@ -68,7 +68,7 @@ DocumentFactory *DocumentFactory::self() SVGDocument *DocumentFactory::requestDocument(TQObject *notifyObject, const char *notifySlot) const { SVGDocumentImpl *impl = requestDocumentImpl(false); - TQObject::connect(impl, TQT_SIGNAL(finishedParsing(bool, const TQString &)), notifyObject, notifySlot); + TQObject::connect(impl, TQ_SIGNAL(finishedParsing(bool, const TQString &)), notifyObject, notifySlot); return new SVGDocument(impl); } @@ -106,5 +106,3 @@ SVGDocumentImpl *DocumentFactory::requestDocumentImpl(bool bFit) const return impl; } - -// vim:ts=4:noet diff --git a/ksvg/core/DocumentFactory.h b/ksvg/core/DocumentFactory.h index 6225b37d..ba6cf8bf 100644 --- a/ksvg/core/DocumentFactory.h +++ b/ksvg/core/DocumentFactory.h @@ -59,5 +59,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp index d6ae5b5b..39ad9a20 100644 --- a/ksvg/core/KSVGCanvas.cpp +++ b/ksvg/core/KSVGCanvas.cpp @@ -784,5 +784,3 @@ void KSVGCanvas::ChunkManager::clear() { m_chunks.clear(); } - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h index f923e207..75ac574c 100644 --- a/ksvg/core/KSVGCanvas.h +++ b/ksvg/core/KSVGCanvas.h @@ -30,6 +30,8 @@ #include <Converter.h> +#include <CanvasItem.h> + namespace KSVG { @@ -49,8 +51,6 @@ class SVGPolygonElementImpl; class SVGPolylineElementImpl; class SVGClipPathElementImpl; -class CanvasItem; -class CanvasChunk; class CanvasItemList; class CanvasClipPath; class CanvasPaintServer; @@ -58,7 +58,7 @@ class CanvasPaintServer; // Must be a TQObject to be able to be loaded by KLibLoader... class KSVGCanvas : public TQObject { -Q_OBJECT +TQ_OBJECT public: KSVGCanvas(unsigned int width, unsigned int height); @@ -187,5 +187,3 @@ protected: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGHelper.cpp b/ksvg/core/KSVGHelper.cpp index 86d111a6..94773855 100644 --- a/ksvg/core/KSVGHelper.cpp +++ b/ksvg/core/KSVGHelper.cpp @@ -88,5 +88,3 @@ int sRGBFromLinearRGB(int linearRGB8bit) { return KSVGHelper::sRGBFromLinearRGB(linearRGB8bit); } - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGHelper.h b/ksvg/core/KSVGHelper.h index fe68b77e..05f73ff2 100644 --- a/ksvg/core/KSVGHelper.h +++ b/ksvg/core/KSVGHelper.h @@ -140,5 +140,3 @@ int sRGBFromLinearRGB(int linearRGB8bit); #endif // __cplusplus #endif - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp index 01601999..63b22d28 100644 --- a/ksvg/core/KSVGLoader.cpp +++ b/ksvg/core/KSVGLoader.cpp @@ -72,8 +72,8 @@ void KSVGLoader::getSVGContent(::KURL url) m_job->setAutoErrorHandlingEnabled(true); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } } @@ -90,8 +90,8 @@ void KSVGLoader::newImageJob(SVGImageElementImpl *image, ::KURL baseURL) map->imageElement = image; TDEIO::TransferJob *imageJob = TDEIO::get(::KURL(baseURL, map->imageElement->fileName()), false, false); - connect(imageJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(imageJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(imageJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(imageJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); m_imageJobs.insert(imageJob, map); } @@ -128,14 +128,14 @@ void KSVGLoader::slotResult(TDEIO::Job *job) if(check.contains(".svgz") || check.contains(".svg.gz")) { // decode the gzipped svg and emit it - TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip"); + TQIODevice *dev = KFilterDev::device(new TQBuffer(m_data), "application/x-gzip"); dev->open(IO_ReadOnly); emit gotResult(dev); } else { m_job = 0; - emit gotResult(TQT_TQIODEVICE(new TQBuffer(m_data))); + emit gotResult(new TQBuffer(m_data)); m_data.resize(0); } } @@ -162,7 +162,7 @@ void KSVGLoader::slotResult(TDEIO::Job *job) if(buffer.open(IO_ReadOnly)) { - const char *imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer)); + const char *imageFormat = TQImageIO::imageFormat(&buffer); if(imageFormat != 0) { @@ -212,7 +212,7 @@ void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mi m_postUrlData.status = &status; m_postUrlData.callBackFunction = &callBackFunction; - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); } class CharacterDataSearcher : public TQXmlDefaultHandler @@ -445,5 +445,3 @@ SVGElementImpl *KSVGLoader::getSVGFragment(::KURL url, SVGDocumentImpl *doc, con return searcher.result(); } - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGLoader.h b/ksvg/core/KSVGLoader.h index 69d61494..9e18c218 100644 --- a/ksvg/core/KSVGLoader.h +++ b/ksvg/core/KSVGLoader.h @@ -54,7 +54,7 @@ class SVGElementImpl; class SVGDocumentImpl; class KSVGLoader : public TQObject { -Q_OBJECT +TQ_OBJECT public: KSVGLoader(); @@ -89,5 +89,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cpp index 7a62bb74..3fbbefd3 100644 --- a/ksvg/core/KSVGReader.cc +++ b/ksvg/core/KSVGReader.cpp @@ -502,5 +502,3 @@ KSVG::KSVGCanvas *KSVGReader::canvas() { return d->canvas; } - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGReader.h b/ksvg/core/KSVGReader.h index 6ca13337..226124b0 100644 --- a/ksvg/core/KSVGReader.h +++ b/ksvg/core/KSVGReader.h @@ -30,7 +30,7 @@ namespace KSVG class SVGDocumentImpl; class KSVGReader : public TQObject { -Q_OBJECT +TQ_OBJECT public: struct ParsingArgs diff --git a/ksvg/core/KSVGTextChunk.cpp b/ksvg/core/KSVGTextChunk.cpp index 4d8111e8..d2c07ce8 100644 --- a/ksvg/core/KSVGTextChunk.cpp +++ b/ksvg/core/KSVGTextChunk.cpp @@ -65,5 +65,3 @@ void KSVGTextChunk::addText(const TQString &text, SVGTextContentElementImpl *tex m_text.append(text); m_textElements.append(textElement); } - -// vim:ts=4:noet diff --git a/ksvg/core/KSVGTextChunk.h b/ksvg/core/KSVGTextChunk.h index 21efa055..7c88c0a0 100644 --- a/ksvg/core/KSVGTextChunk.h +++ b/ksvg/core/KSVGTextChunk.h @@ -50,5 +50,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/core/Makefile.am b/ksvg/core/Makefile.am index e1867428..c511c165 100644 --- a/ksvg/core/Makefile.am +++ b/ksvg/core/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libksvgcore.la -libksvgcore_la_SOURCES = KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cc KSVGTextChunk.cpp CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp +libksvgcore_la_SOURCES = KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cpp KSVGTextChunk.cpp CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp libksvgcore_la_METASOURCES = AUTO servicetypedir = $(kde_servicetypesdir) |