summaryrefslogtreecommitdiffstats
path: root/ksvg/core
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/core')
-rw-r--r--ksvg/core/CMakeLists.txt2
-rw-r--r--ksvg/core/CanvasFactory.cpp4
-rw-r--r--ksvg/core/DocumentFactory.cpp2
-rw-r--r--ksvg/core/KSVGCanvas.h6
-rw-r--r--ksvg/core/KSVGLoader.cpp16
-rw-r--r--ksvg/core/KSVGLoader.h2
-rw-r--r--ksvg/core/KSVGReader.cpp (renamed from ksvg/core/KSVGReader.cc)4
-rw-r--r--ksvg/core/KSVGReader.h2
-rw-r--r--ksvg/core/Makefile.am2
9 files changed, 20 insertions, 20 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 55610a2b..f8b7fc50 100644
--- a/ksvg/core/CanvasFactory.cpp
+++ b/ksvg/core/CanvasFactory.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeparts/componentfactory.h>
#include "KSVGCanvas.h"
@@ -88,7 +88,7 @@ KSVGCanvas *CanvasFactory::loadCanvas(int width, int height)
{
queryCanvas();
- KSimpleConfig *config = new KSimpleConfig("ksvgpluginrc", false);
+ TDESimpleConfig *config = new TDESimpleConfig("ksvgpluginrc", false);
config->setGroup("Canvas");
TQString load = config->readEntry("ActiveCanvas", "libart");
delete config;
diff --git a/ksvg/core/DocumentFactory.cpp b/ksvg/core/DocumentFactory.cpp
index ea02163a..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);
}
diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h
index d758fdb9..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);
diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index f075d2ff..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
diff --git a/ksvg/core/KSVGLoader.h b/ksvg/core/KSVGLoader.h
index 10cd19ac..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();
diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cpp
index 3fbbefd3..9b465fa3 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tqmap.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <KSVGCanvas.h>
#include "KSVGReader.moc"
#include "SVGSVGElementImpl.h"
@@ -167,7 +167,7 @@ bool InputHandler::startDocument()
m_currentNode = 0;
m_noRendering = false;
- KSimpleConfig config("ksvgpluginrc");
+ TDESimpleConfig config("ksvgpluginrc");
config.setGroup("Rendering");
m_progressive = config.readBoolEntry("ProgressiveRendering", true);
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/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)
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 10:27:53 +0000