summaryrefslogtreecommitdiffstats
path: root/ksvg
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg')
-rw-r--r--ksvg/core/CanvasFactory.cpp4
-rw-r--r--ksvg/core/DocumentFactory.cpp2
-rw-r--r--ksvg/core/KSVGLoader.cpp16
-rw-r--r--ksvg/core/KSVGReader.cpp4
-rw-r--r--ksvg/impl/SVGDocumentImpl.cpp8
-rw-r--r--ksvg/impl/SVGImageElementImpl.cpp4
-rw-r--r--ksvg/impl/SVGScriptElementImpl.cpp6
-rw-r--r--ksvg/impl/SVGTimeScheduler.cpp8
-rw-r--r--ksvg/impl/libs/libtext2path/libtext2path.spec41
-rw-r--r--ksvg/plugin/ksvg_factory.cpp4
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp56
-rw-r--r--ksvg/plugin/svgcreator.cpp6
-rw-r--r--ksvg/test/external/SVGTestWidget.cpp4
-rw-r--r--ksvg/test/external/printnodetest.cpp2
14 files changed, 62 insertions, 103 deletions
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/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/KSVGReader.cpp b/ksvg/core/KSVGReader.cpp
index 3fbbefd3..9b465fa3 100644
--- a/ksvg/core/KSVGReader.cpp
+++ 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/impl/SVGDocumentImpl.cpp b/ksvg/impl/SVGDocumentImpl.cpp
index ce6de16e..ce3c1341 100644
--- a/ksvg/impl/SVGDocumentImpl.cpp
+++ b/ksvg/impl/SVGDocumentImpl.cpp
@@ -231,7 +231,7 @@ bool SVGDocumentImpl::open(const ::KURL &url)
if(!m_loader)
m_loader = new KSVGLoader();
- connect(m_loader, TQT_SIGNAL(gotResult(TQIODevice *)), this, TQT_SLOT(slotSVGContent(TQIODevice *)));
+ connect(m_loader, TQ_SIGNAL(gotResult(TQIODevice *)), this, TQ_SLOT(slotSVGContent(TQIODevice *)));
m_loader->getSVGContent(url);
}
else
@@ -257,7 +257,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
args.SVGFragmentId = url.mid(pos + 1);
m_reader = new KSVGReader(this, m_canvas, args);
- connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+ connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
m_t.start();
#if USE_VALGRIND
@@ -277,7 +277,7 @@ void SVGDocumentImpl::parseSVG(TQXmlInputSource *inputSource, bool getURLMode)
args.fit = m_fit;
args.getURLMode = getURLMode;
m_reader = new KSVGReader(this, 0, args);
- connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+ connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
#if USE_VALGRIND
CALLTREE_ZERO_STATS();
@@ -454,7 +454,7 @@ void SVGDocumentImpl::executeScripts()
bool test = executeScriptsRecursiveCheck(*rootElement());
if(!test)
- TQTimer::singleShot(50, this, TQT_SLOT(executeScripts()));
+ TQTimer::singleShot(50, this, TQ_SLOT(executeScripts()));
else
{
executeScriptsRecursive(*rootElement());
diff --git a/ksvg/impl/SVGImageElementImpl.cpp b/ksvg/impl/SVGImageElementImpl.cpp
index 65c678d2..c33d3737 100644
--- a/ksvg/impl/SVGImageElementImpl.cpp
+++ b/ksvg/impl/SVGImageElementImpl.cpp
@@ -273,8 +273,8 @@ void SVGImageElementImpl::createItem(KSVGCanvas *c)
m_doc->ref();
m_doc->attach(c);
- connect(m_doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &)));
- connect(m_doc, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(slotLoadingFinished()));
+ connect(m_doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &)));
+ connect(m_doc, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(slotLoadingFinished()));
KURL file;
diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp
index f97ebf89..ce1aede9 100644
--- a/ksvg/impl/SVGScriptElementImpl.cpp
+++ b/ksvg/impl/SVGScriptElementImpl.cpp
@@ -75,8 +75,8 @@ void SVGScriptElementImpl::setAttributes()
if(m_job == 0)
m_job = TDEIO::get(url, false, false);
- 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 *)));
}
}
@@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(TDEIO::Job *)
m_data[m_data.size() - 1] = '\0';
TQBuffer buf(m_data);
- TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false);
+ TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false);
TQByteArray contents;
if(dev->open(IO_ReadOnly))
contents = dev->readAll();
diff --git a/ksvg/impl/SVGTimeScheduler.cpp b/ksvg/impl/SVGTimeScheduler.cpp
index b38eceaa..cf8bc75d 100644
--- a/ksvg/impl/SVGTimeScheduler.cpp
+++ b/ksvg/impl/SVGTimeScheduler.cpp
@@ -50,7 +50,7 @@ const TQTimer *SVGTimer::qtimer() const
void SVGTimer::start(TQObject *receiver, const char *member)
{
- TQObject::connect(m_timer, TQT_SIGNAL(timeout()), receiver, member);
+ TQObject::connect(m_timer, TQ_SIGNAL(timeout()), receiver, member);
m_timer->start(m_ms, m_singleShot);
}
@@ -165,7 +165,7 @@ void SVGTimeScheduler::startAnimations()
{
SVGTimer *svgTimer = *it;
if(svgTimer && !svgTimer->isActive())
- svgTimer->start(this, TQT_SLOT(slotTimerNotify()));
+ svgTimer->start(this, TQ_SLOT(slotTimerNotify()));
}
}
@@ -174,7 +174,7 @@ void SVGTimeScheduler::toggleAnimations()
if(m_intervalTimer->isActive())
m_intervalTimer->stop();
else
- m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+ m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
}
bool SVGTimeScheduler::animationsPaused() const
@@ -223,7 +223,7 @@ void SVGTimeScheduler::slotTimerNotify()
// by the previous call, and now all connections to the interval timer
// are created and now we just need to fire that timer (Niko)
if(svgTimer != m_intervalTimer && !m_intervalTimer->isActive())
- m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+ m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
}
float SVGTimeScheduler::elapsed() const
diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec
deleted file mode 100644
index e0c217bd..00000000
--- a/ksvg/impl/libs/libtext2path/libtext2path.spec
+++ /dev/null
@@ -1,41 +0,0 @@
-%define distversion %( perl -e 'Creating /home/nikoz/Projects/libtext2path/libtext2path.spec...=\<\>;/(\d+)\.(\d)\.?(\d)?/; print "".(||0)' /etc/*-release)
-Name: libtext2path
-Summary: libtext2path -- Some description
-Version: 0.1
-Release: %{_vendor}_%{distversion}
-Copyright: GPL
-Group: X11/KDE/Utilities
-Source: ftp://ftp.kde.org/pub/kde/unstable/apps/utils/%{name}-%{version}.tar.gz
-Packager: Nikolas Zimmermann <wildfox@kde.org>
-BuildRoot: /tmp/%{name}-%{version}
-Prefix: /usr/kde/cvs
-
-%description
-A long description
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -n %{name}-%{version}
-CFLAGS="" CXXFLAGS="" ./configure --disable-debug --enable-final --prefix=%{prefix}
-
-%build
-# Setup for parallel builds
-numprocs=1
-if [ "" = "0" ]; then
- numprocs=1
-fi
-
-make -j
-
-%install
-make install-strip DESTDIR=$RPM_BUILD_ROOT
-
-cd
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
-find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
-
-%clean
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-rm -rf $RPM_BUILD_DIR/-master.list
-
-%files -f $RPM_BUILD_DIR/%{name}-master.list
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index b856da64..43cd12bf 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -19,10 +19,10 @@
*/
#include <tdeaboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "ksvg_plugin.h"
#include "ksvg_factory.moc"
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 48cf6d56..94414715 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -24,7 +24,7 @@
#include <tdefiledialog.h>
#include <tdelocale.h>
#include <tdetempfile.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeaboutapplication.h>
#include "ksvg_widget.h"
@@ -96,7 +96,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
ksvgd->doc = 0;
ksvgd->window = new KSVGWidget(this, wparent, "Rendering Widget");
- connect(ksvgd->window, TQT_SIGNAL(browseURL(const TQString &)), this, TQT_SLOT(browseURL(const TQString &)));
+ connect(ksvgd->window, TQ_SIGNAL(browseURL(const TQString &)), this, TQ_SLOT(browseURL(const TQString &)));
ksvgd->window->show();
KParts::Part::setWidget(ksvgd->window);
@@ -110,26 +110,26 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
-
- ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
- ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
- ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQT_SLOT(slotZoomReset()), actionCollection(), "zoom_reset");
- ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQT_SLOT(slotStop()), actionCollection(), "stop_anims");
- ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "text-x-generic-template", Key_F6, this, TQT_SLOT(slotViewSource()), actionCollection(), "view_source");
- ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "text-x-generic-template", Key_F7, this, TQT_SLOT(slotViewMemory()), actionCollection(), "view_memory");
- ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQT_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
-// ksvgd->aboutApp = KStdAction::aboutApp(this, TQT_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG");
- ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "image-svg+xml", 0, this, TQT_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app");
- ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQT_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
- ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQT_SLOT(slotProgressiveRendering()), actionCollection(), "progressive");
-
- KSimpleConfig config("ksvgpluginrc", true);
+ ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
+
+ ksvgd->zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection());
+ ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection());
+ ksvgd->zoomResetAction = new TDEAction(i18n("Zoom &Reset"), "viewmag", this, TQ_SLOT(slotZoomReset()), actionCollection(), "zoom_reset");
+ ksvgd->stopAnimationsAction = new TDEAction(i18n("&Stop Animations"), "process-stop", Key_Escape, this, TQ_SLOT(slotStop()), actionCollection(), "stop_anims");
+ ksvgd->viewSourceAction = new TDEAction(i18n("View &Source"), "text-x-generic-template", Key_F6, this, TQ_SLOT(slotViewSource()), actionCollection(), "view_source");
+ ksvgd->viewMemoryAction = new TDEAction(i18n("View &Memory"), "text-x-generic-template", Key_F7, this, TQ_SLOT(slotViewMemory()), actionCollection(), "view_memory");
+ ksvgd->saveToPNG = new TDEAction(i18n("Save to PNG..."), "save", 0, this, TQ_SLOT(slotSaveToPNG()), actionCollection(), "save_to_png");
+// ksvgd->aboutApp = KStdAction::aboutApp(this, TQ_SLOT(slotAboutKSVG()), actionCollection());//, "KSVG");
+ ksvgd->aboutApp = new TDEAction(i18n("About KSVG"), "image-svg+xml", 0, this, TQ_SLOT(slotAboutKSVG()), actionCollection(), "help_about_app");
+ ksvgd->fontKerningAction = new TDEToggleAction(i18n("Use Font &Kerning"), "zoom-fit-best", Key_F8, this, TQ_SLOT(slotFontKerning()), actionCollection(), "font_kerning");
+ ksvgd->progressiveAction = new TDEToggleAction(i18n("Use &Progressive Rendering"), "", Key_F9, this, TQ_SLOT(slotProgressiveRendering()), actionCollection(), "progressive");
+
+ TDESimpleConfig config("ksvgpluginrc", true);
config.setGroup("Rendering");
ksvgd->fontKerningAction->setChecked(config.readBoolEntry("FontKerning", true));
ksvgd->progressiveAction->setChecked(config.readBoolEntry("ProgressiveRendering", true));
- ksvgd->renderingBackendAction = new TDESelectAction(i18n("Rendering &Backend"), 0, this, TQT_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend");
+ ksvgd->renderingBackendAction = new TDESelectAction(i18n("Rendering &Backend"), 0, this, TQ_SLOT(slotRenderingBackend()), actionCollection(), "rendering_backend");
TQStringList items;
TQPtrList<KSVG::CanvasInfo> canvasList = KSVG::CanvasFactory::self()->canvasList();
@@ -204,12 +204,12 @@ bool KSVGPlugin::openURL(const KURL &url)
ksvgd->doc->addToDocumentDict(ksvgd->doc->handle(), ksvgd->doc);
ksvgd->doc->setReferrer(ksvgd->extension->urlArgs().metaData()["referrer"]);
- connect(ksvgd->doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &)));
- connect(ksvgd->doc, TQT_SIGNAL(finishedRendering()), this, TQT_SLOT(slotRenderingFinished()));
- connect(ksvgd->doc, TQT_SIGNAL(gotDescription(const TQString &)), this, TQT_SLOT(slotSetDescription(const TQString &)));
- connect(ksvgd->doc, TQT_SIGNAL(gotTitle(const TQString &)), this, TQT_SLOT(slotSetTitle(const TQString &)));
- connect(ksvgd->doc, TQT_SIGNAL(gotURL(const TQString &)), this, TQT_SLOT(slotGotURL(const TQString &)));
- connect(ksvgd->window, TQT_SIGNAL(redraw(const TQRect &)), this, TQT_SLOT(slotRedraw(const TQRect &)));
+ connect(ksvgd->doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &)));
+ connect(ksvgd->doc, TQ_SIGNAL(finishedRendering()), this, TQ_SLOT(slotRenderingFinished()));
+ connect(ksvgd->doc, TQ_SIGNAL(gotDescription(const TQString &)), this, TQ_SLOT(slotSetDescription(const TQString &)));
+ connect(ksvgd->doc, TQ_SIGNAL(gotTitle(const TQString &)), this, TQ_SLOT(slotSetTitle(const TQString &)));
+ connect(ksvgd->doc, TQ_SIGNAL(gotURL(const TQString &)), this, TQ_SLOT(slotGotURL(const TQString &)));
+ connect(ksvgd->window, TQ_SIGNAL(redraw(const TQRect &)), this, TQ_SLOT(slotRedraw(const TQRect &)));
ksvgd->backgroundPixmap->fill();
bitBlt(ksvgd->window, 0, 0, ksvgd->backgroundPixmap, 0, 0, ksvgd->backgroundPixmap->width(), ksvgd->backgroundPixmap->height());
@@ -266,7 +266,7 @@ void KSVGPlugin::slotViewMemory()
void KSVGPlugin::slotFontKerning()
{
- KSimpleConfig config("ksvgpluginrc", false);
+ TDESimpleConfig config("ksvgpluginrc", false);
config.setGroup("Rendering");
config.writeEntry("FontKerning", ksvgd->fontKerningAction->isChecked());
@@ -283,14 +283,14 @@ void KSVGPlugin::slotFontKerning()
void KSVGPlugin::slotProgressiveRendering()
{
- KSimpleConfig config("ksvgpluginrc", false);
+ TDESimpleConfig config("ksvgpluginrc", false);
config.setGroup("Rendering");
config.writeEntry("ProgressiveRendering", ksvgd->progressiveAction->isChecked());
}
void KSVGPlugin::slotRenderingBackend()
{
- KSimpleConfig config("ksvgpluginrc", false);
+ TDESimpleConfig config("ksvgpluginrc", false);
config.setGroup("Canvas");
config.writeEntry("ActiveCanvas", KSVG::CanvasFactory::self()->internalNameFor(ksvgd->renderingBackendAction->currentText()));
config.sync();
@@ -299,7 +299,7 @@ void KSVGPlugin::slotRenderingBackend()
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
+ ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
openURL(m_url);
}
diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp
index 60328855..a3c5d825 100644
--- a/ksvg/plugin/svgcreator.cpp
+++ b/ksvg/plugin/svgcreator.cpp
@@ -59,16 +59,16 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im
pix.fill(TQt::white);
KSVG::KSVGCanvas *c = KSVG::CanvasFactory::self()->loadCanvas(width, height);
- c->setup(TQT_TQPAINTDEVICE(&pix), TQT_TQPAINTDEVICE(&pix));
+ c->setup(&pix, &pix);
doc->attach(c);
- connect(doc, TQT_SIGNAL(finishedRendering()), TQT_SLOT(slotFinished()));
+ connect(doc, TQ_SIGNAL(finishedRendering()), TQ_SLOT(slotFinished()));
doc->open( KURL::fromPathOrURL(path));
m_finished = false;
while(!m_finished) {
- kapp->processOneEvent();
+ tdeApp->processOneEvent();
}
doc->deref();
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index 0e0d5f9d..64944736 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -20,7 +20,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
setMouseTracking(true);
setFocusPolicy(TQWidget::WheelFocus);
- m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished()));
+ m_doc = DocumentFactory::self()->requestDocument(this, TQ_SLOT(slotRenderingFinished()));
if(!m_doc)
return;
@@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
if(!m_canvas)
return;
- m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this));
+ m_canvas->setup(this, this);
if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc))
return;
diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp
index 3597d5bb..355e4f0e 100644
--- a/ksvg/test/external/printnodetest.cpp
+++ b/ksvg/test/external/printnodetest.cpp
@@ -21,7 +21,7 @@ static TDECmdLineOptions options[] =
Worker::Worker(const KURL &url)
{
- m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotParsingFinished(bool, const TQString &)));
+ m_doc = DocumentFactory::self()->requestDocument(this, TQ_SLOT(slotParsingFinished(bool, const TQString &)));
if(!m_doc)
return;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 11:49:30 +0000