summaryrefslogtreecommitdiffstats
path: root/ksvg/impl
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/impl')
-rw-r--r--ksvg/impl/SVGDocumentImpl.cpp8
-rw-r--r--ksvg/impl/SVGDocumentImpl.h2
-rw-r--r--ksvg/impl/SVGGlyphElementImpl.cpp2
-rw-r--r--ksvg/impl/SVGImageElementImpl.cpp4
-rw-r--r--ksvg/impl/SVGImageElementImpl.h2
-rw-r--r--ksvg/impl/SVGScriptElementImpl.cpp6
-rw-r--r--ksvg/impl/SVGScriptElementImpl.h2
-rw-r--r--ksvg/impl/SVGTimeScheduler.cpp8
-rw-r--r--ksvg/impl/SVGTimeScheduler.h2
-rw-r--r--ksvg/impl/libs/libtext2path/libtext2path.spec41
10 files changed, 18 insertions, 59 deletions
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/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h
index e9d12a0d..58babf96 100644
--- a/ksvg/impl/SVGDocumentImpl.h
+++ b/ksvg/impl/SVGDocumentImpl.h
@@ -71,7 +71,7 @@ class SVGDocumentImpl : public TQObject,
public DOM::Document,
public SVGDOMNodeBridge
{
-Q_OBJECT
+TQ_OBJECT
public:
SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0);
diff --git a/ksvg/impl/SVGGlyphElementImpl.cpp b/ksvg/impl/SVGGlyphElementImpl.cpp
index 9b909960..b267fe18 100644
--- a/ksvg/impl/SVGGlyphElementImpl.cpp
+++ b/ksvg/impl/SVGGlyphElementImpl.cpp
@@ -46,7 +46,7 @@ TQString SVGGlyphElementImpl::d() const
unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly
glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly
d SVGGlyphElementImpl::D DontDelete|ReadOnly
- orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly
+ orientation SVGGlyphElementImpl::Orientation DontDelete|ReadOnly
arabic-form SVGGlyphElementImpl::ArabicForm DontDelete|ReadOnly
lang SVGGlyphElementImpl::Lang DontDelete|ReadOnly
horiz-adv-x SVGGlyphElementImpl::HorizAdvX DontDelete|ReadOnly
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/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h
index 96985440..c0858ba8 100644
--- a/ksvg/impl/SVGImageElementImpl.h
+++ b/ksvg/impl/SVGImageElementImpl.h
@@ -51,7 +51,7 @@ class SVGImageElementImpl : public TQObject,
public SVGStylableImpl,
public SVGTransformableImpl
{
-Q_OBJECT
+TQ_OBJECT
public:
SVGImageElementImpl(DOM::ElementImpl *);
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/SVGScriptElementImpl.h b/ksvg/impl/SVGScriptElementImpl.h
index 2850af9d..d6c03cf9 100644
--- a/ksvg/impl/SVGScriptElementImpl.h
+++ b/ksvg/impl/SVGScriptElementImpl.h
@@ -41,7 +41,7 @@ class SVGScriptElementImpl : public TQObject,
public SVGURIReferenceImpl,
public SVGExternalResourcesRequiredImpl
{
-Q_OBJECT
+TQ_OBJECT
public:
SVGScriptElementImpl(DOM::ElementImpl *);
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/SVGTimeScheduler.h b/ksvg/impl/SVGTimeScheduler.h
index cc897a57..605a5173 100644
--- a/ksvg/impl/SVGTimeScheduler.h
+++ b/ksvg/impl/SVGTimeScheduler.h
@@ -66,7 +66,7 @@ typedef TQValueList<SVGTimer *> SVGTimerList;
class SVGDocumentImpl;
class SVGTimeScheduler : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
SVGTimeScheduler(SVGDocumentImpl *doc);
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