diff options
Diffstat (limited to 'ksvg')
39 files changed, 84 insertions, 1036 deletions
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.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/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h index dc289191..f0fd2042 100644 --- a/ksvg/ecma/ksvg_window.h +++ b/ksvg/ecma/ksvg_window.h @@ -99,7 +99,7 @@ public: }; class WindowQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: WindowQObject(Window *w); 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/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt index 098f836d..29ab129e 100644 --- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt +++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt @@ -46,4 +46,4 @@ tde_add_library( text2path SHARED VERSION 0.0.0 LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} -)
\ No newline at end of file +) diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h index 6f6ca705..531135e0 100644 --- a/ksvg/impl/libs/libtext2path/src/Cache.h +++ b/ksvg/impl/libs/libtext2path/src/Cache.h @@ -25,8 +25,7 @@ #include <string> #include <vector> #include <iostream> - -#include "myboost/shared_ptr.h" +#include <memory> namespace T2P { @@ -50,7 +49,7 @@ namespace T2P class Cache { public: - typedef myboost::shared_ptr<T> SharedT; + typedef std::shared_ptr<T> SharedT; Cache(int maxSize = 10) : m_size(0), m_maxSize(maxSize) { } ~Cache() { clear(); } diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp index 88af02ae..6434798e 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.cpp +++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp @@ -22,7 +22,6 @@ #include <math.h> -#include "myboost/shared_ptr.h" #include <fontconfig/fontconfig.h> #include <fribidi/fribidi.h> diff --git a/ksvg/impl/libs/libtext2path/src/Converter.h b/ksvg/impl/libs/libtext2path/src/Converter.h index 864812be..7f76533f 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.h +++ b/ksvg/impl/libs/libtext2path/src/Converter.h @@ -44,8 +44,8 @@ namespace T2P class GlyphLayoutParams; class GlyphRenderParams; - typedef myboost::shared_ptr<Font> SharedFont; - typedef myboost::shared_ptr<Glyph> SharedGlyph; + typedef std::shared_ptr<Font> SharedFont; + typedef std::shared_ptr<Glyph> SharedGlyph; class Converter { diff --git a/ksvg/impl/libs/libtext2path/src/myboost/assert.h b/ksvg/impl/libs/libtext2path/src/myboost/assert.h deleted file mode 100644 index ebedcd32..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/assert.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// boost/assert.h - BOOST_ASSERT(expr) -// -// Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd. -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// -// Note: There are no include guards. This is intentional. -// -// See http://www.boost.org/libs/utility/assert.html for documentation. -// - -#ifndef ASSERT_H -#define ASSERT_H - -#undef BOOST_ASSERT - -# include <assert.h> -# define BOOST_ASSERT(expr) assert(expr) - -#endif diff --git a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h b/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h deleted file mode 100644 index ba5b534c..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef BOOST_CHECKED_DELETE_H_INCLUDED -#define BOOST_CHECKED_DELETE_H_INCLUDED - -// -// boost/checked_delete.h -// -// Copyright (c) 1999, 2000, 2001, 2002 boost.org -// Copyright (c) 2002, 2003 Peter Dimov -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// -// See http://www.boost.org/libs/utility/checked_delete.html for documentation. -// - -namespace myboost -{ - -// verify that types are complete for increased safety - -template<class T> inline void checked_delete(T * x) -{ - // Intel 7 accepts sizeof(incomplete) as 0 in system headers - typedef char type_must_be_complete[ sizeof(T)? 1: -1 ]; - delete x; -} - -template<class T> inline void checked_array_delete(T * x) -{ - typedef char type_must_be_complete[ sizeof(T)? 1: -1 ]; - delete [] x; -} - -template<class T> struct checked_deleter -{ - typedef void result_type; - typedef T * argument_type; - - void operator()(T * x) const - { - // boost:: disables ADL - myboost::checked_delete(x); - } -}; - -template<class T> struct checked_array_deleter -{ - typedef void result_type; - typedef T * argument_type; - - void operator()(T * x) const - { - myboost::checked_array_delete(x); - } -}; - -} // namespace myboost - -#endif // #ifndef BOOST_CHECKED_DELETE_H_INCLUDED diff --git a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h b/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h deleted file mode 100644 index 2c09ca8b..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED -#define BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED - -// -// boost/detail/lwm_pthreads.h -// -// Copyright (c) 2002 Peter Dimov and Multi Media Ltd. -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// - -#include <pthread.h> - -namespace myboost -{ - -namespace detail -{ - -class lightweight_mutex -{ -private: - - pthread_mutex_t m_; - - lightweight_mutex(lightweight_mutex const &); - lightweight_mutex & operator=(lightweight_mutex const &); - -public: - - lightweight_mutex() - { - pthread_mutex_init(&m_, 0); - } - - ~lightweight_mutex() - { - pthread_mutex_destroy(&m_); - } - - class scoped_lock; - friend class scoped_lock; - - class scoped_lock - { - private: - - pthread_mutex_t & m_; - - scoped_lock(scoped_lock const &); - scoped_lock & operator=(scoped_lock const &); - - public: - - scoped_lock(lightweight_mutex & m): m_(m.m_) - { - pthread_mutex_lock(&m_); - } - - ~scoped_lock() - { - pthread_mutex_unlock(&m_); - } - }; -}; - -} // namespace detail - -} // namespace myboost - -#endif // #ifndef BOOST_DETAIL_LWM_PTHREADS_H_INCLUDED diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h b/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h deleted file mode 100644 index b240ff8f..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.h +++ /dev/null @@ -1,367 +0,0 @@ -#ifndef BOOST_DETAIL_SHARED_COUNT_H_INCLUDED -#define BOOST_DETAIL_SHARED_COUNT_H_INCLUDED - -// -// detail/shared_count.h -// -// Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd. -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// - -#include "myboost/checked_delete.h" -#include "myboost/throw_exception.h" -#include "myboost/lightweight_mutex.h" - -#include <memory> // std::auto_ptr, std::allocator -#include <functional> // std::less -#include <exception> // std::exception -#include <new> // std::bad_alloc -#include <typeinfo> // std::type_info in get_deleter -#include <cstddef> // std::size_t - -namespace myboost -{ - -class bad_weak_ptr: public std::exception -{ -public: - - virtual char const * what() const throw() - { - return "myboost::bad_weak_ptr"; - } -}; - -namespace detail -{ - -class sp_counted_base -{ -private: - - typedef detail::lightweight_mutex mutex_type; - -public: - - sp_counted_base(): use_count_(1), weak_count_(1) - { - } - - virtual ~sp_counted_base() // nothrow - { - } - - // dispose() is called when use_count_ drops to zero, to release - // the resources managed by *this. - - virtual void dispose() = 0; // nothrow - - // destruct() is called when weak_count_ drops to zero. - - virtual void destruct() // nothrow - { - delete this; - } - - virtual void * get_deleter(std::type_info const & ti) = 0; - - void add_ref_copy() - { - mutex_type::scoped_lock lock(mtx_); - ++use_count_; - } - - void add_ref_lock() - { - mutex_type::scoped_lock lock(mtx_); - if(use_count_ == 0) myboost::throw_exception(myboost::bad_weak_ptr()); - ++use_count_; - } - - void release() // nothrow - { - { - mutex_type::scoped_lock lock(mtx_); - long new_use_count = --use_count_; - - if(new_use_count != 0) return; - } - - dispose(); - weak_release(); - } - - void weak_add_ref() // nothrow - { - mutex_type::scoped_lock lock(mtx_); - ++weak_count_; - } - - void weak_release() // nothrow - { - long new_weak_count; - - { - mutex_type::scoped_lock lock(mtx_); - new_weak_count = --weak_count_; - } - - if(new_weak_count == 0) - { - destruct(); - } - } - - long use_count() const // nothrow - { - mutex_type::scoped_lock lock(mtx_); - return use_count_; - } - -private: - - sp_counted_base(sp_counted_base const &); - sp_counted_base & operator= (sp_counted_base const &); - - long use_count_; // #shared - long weak_count_; // #weak + (#shared != 0) - - mutable mutex_type mtx_; -}; - -template<class P, class D> class sp_counted_base_impl: public sp_counted_base -{ -private: - - P ptr; // copy constructor must not throw - D del; // copy constructor must not throw - - sp_counted_base_impl(sp_counted_base_impl const &); - sp_counted_base_impl & operator= (sp_counted_base_impl const &); - - typedef sp_counted_base_impl<P, D> this_type; - -public: - - // pre: initial_use_count <= initial_weak_count, d(p) must not throw - - sp_counted_base_impl(P p, D d): ptr(p), del(d) - { - } - - virtual void dispose() // nothrow - { - del(ptr); - } - - virtual void * get_deleter(std::type_info const & ti) - { - return ti == typeid(D)? &del: 0; - } - - void * operator new(std::size_t) - { - return std::allocator<this_type>().allocate(1, static_cast<this_type *>(0)); - } - - void operator delete(void * p) - { - std::allocator<this_type>().deallocate(static_cast<this_type *>(p), 1); - } -}; - -class weak_count; - -class shared_count -{ -private: - - sp_counted_base * pi_; - - friend class weak_count; - -public: - - shared_count(): pi_(0) // nothrow - { - } - - template<class P, class D> shared_count(P p, D d): pi_(0) - { - - try - { - pi_ = new sp_counted_base_impl<P, D>(p, d); - } - catch(...) - { - d(p); // delete p - throw; - } - - - pi_ = new sp_counted_base_impl<P, D>(p, d); - - if(pi_ == 0) - { - d(p); // delete p - myboost::throw_exception(std::bad_alloc()); - } - } - - // auto_ptr<Y> is special cased to provide the strong guarantee - - template<class Y> - explicit shared_count(std::auto_ptr<Y> & r): pi_(new sp_counted_base_impl< Y *, checked_deleter<Y> >(r.get(), checked_deleter<Y>())) - { - r.release(); - } - - ~shared_count() // nothrow - { - if(pi_ != 0) pi_->release(); - } - - shared_count(shared_count const & r): pi_(r.pi_) // nothrow - { - if(pi_ != 0) pi_->add_ref_copy(); - } - - explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0 - - shared_count & operator= (shared_count const & r) // nothrow - { - sp_counted_base * tmp = r.pi_; - if(tmp != 0) tmp->add_ref_copy(); - if(pi_ != 0) pi_->release(); - pi_ = tmp; - - return *this; - } - - void swap(shared_count & r) // nothrow - { - sp_counted_base * tmp = r.pi_; - r.pi_ = pi_; - pi_ = tmp; - } - - long use_count() const // nothrow - { - return pi_ != 0? pi_->use_count(): 0; - } - - bool unique() const // nothrow - { - return use_count() == 1; - } - - friend inline bool operator==(shared_count const & a, shared_count const & b) - { - return a.pi_ == b.pi_; - } - - friend inline bool operator<(shared_count const & a, shared_count const & b) - { - return std::less<sp_counted_base *>()(a.pi_, b.pi_); - } - - void * get_deleter(std::type_info const & ti) const - { - return pi_? pi_->get_deleter(ti): 0; - } -}; - -class weak_count -{ -private: - - sp_counted_base * pi_; - - friend class shared_count; - -public: - - weak_count(): pi_(0) // nothrow - { - } - - weak_count(shared_count const & r): pi_(r.pi_) // nothrow - { - if(pi_ != 0) pi_->weak_add_ref(); - } - - weak_count(weak_count const & r): pi_(r.pi_) // nothrow - { - if(pi_ != 0) pi_->weak_add_ref(); - } - - ~weak_count() // nothrow - { - if(pi_ != 0) pi_->weak_release(); - } - - weak_count & operator= (shared_count const & r) // nothrow - { - sp_counted_base * tmp = r.pi_; - if(tmp != 0) tmp->weak_add_ref(); - if(pi_ != 0) pi_->weak_release(); - pi_ = tmp; - - return *this; - } - - weak_count & operator= (weak_count const & r) // nothrow - { - sp_counted_base * tmp = r.pi_; - if(tmp != 0) tmp->weak_add_ref(); - if(pi_ != 0) pi_->weak_release(); - pi_ = tmp; - - return *this; - } - - void swap(weak_count & r) // nothrow - { - sp_counted_base * tmp = r.pi_; - r.pi_ = pi_; - pi_ = tmp; - } - - long use_count() const // nothrow - { - return pi_ != 0? pi_->use_count(): 0; - } - - friend inline bool operator==(weak_count const & a, weak_count const & b) - { - return a.pi_ == b.pi_; - } - - friend inline bool operator<(weak_count const & a, weak_count const & b) - { - return std::less<sp_counted_base *>()(a.pi_, b.pi_); - } -}; - -inline shared_count::shared_count(weak_count const & r): pi_(r.pi_) -{ - if(pi_ != 0) - { - pi_->add_ref_lock(); - } - else - { - myboost::throw_exception(myboost::bad_weak_ptr()); - } -} - -} // namespace detail - -} // namespace myboost - -#endif // #ifndef BOOST_DETAIL_SHARED_COUNT_H_INCLUDED diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h deleted file mode 100644 index 435be678..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.h +++ /dev/null @@ -1,395 +0,0 @@ -#ifndef BOOST_SHARED_PTR_H_INCLUDED -#define BOOST_SHARED_PTR_H_INCLUDED - -// shared_ptr.h -// -// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. -// Copyright (c) 2001, 2002, 2003 Peter Dimov -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// -// See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. -// - -#include "myboost/assert.h" -#include "myboost/checked_delete.h" -#include "myboost/throw_exception.h" -#include "myboost/shared_count.h" - -#include <memory> // for std::auto_ptr -#include <algorithm> // for std::swap -#include <functional> // for std::less -#include <typeinfo> // for std::bad_cast -#include <iosfwd> // for std::basic_ostream - -namespace myboost -{ - -template<class T> class weak_ptr; -template<class T> class enable_shared_from_this; - -namespace detail -{ - -struct static_cast_tag {}; -struct const_cast_tag {}; -struct dynamic_cast_tag {}; -struct polymorphic_cast_tag {}; - -template<class T> struct shared_ptr_traits -{ - typedef T & reference; -}; - -template<> struct shared_ptr_traits<void> -{ - typedef void reference; -}; - -template<> struct shared_ptr_traits<void const> -{ - typedef void reference; -}; - -template<> struct shared_ptr_traits<void volatile> -{ - typedef void reference; -}; - -template<> struct shared_ptr_traits<void const volatile> -{ - typedef void reference; -}; - -// enable_shared_from_this support - -template<class T, class Y> void sp_enable_shared_from_this(myboost::enable_shared_from_this<T> * pe, Y * px, shared_count const & pn) -{ - if(pe != 0) pe->_internal_weak_this._internal_assign(px, pn); -} - -inline void sp_enable_shared_from_this(void const *, void const *, shared_count const &) -{ -} - -} // namespace detail - - -// -// shared_ptr -// -// An enhanced relative of scoped_ptr with reference counted copy semantics. -// The object pointed to is deleted when the last shared_ptr pointing to it -// is destroyed or reset. -// - -template<class T> class shared_ptr -{ -private: - - // Borland 5.5.1 specific workaround - typedef shared_ptr<T> this_type; - -public: - - typedef T element_type; - typedef T value_type; - typedef T * pointer; - typedef typename detail::shared_ptr_traits<T>::reference reference; - - shared_ptr(): px(0), pn() // never throws in 1.30+ - { - } - - template<class Y> - explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete - { - detail::sp_enable_shared_from_this(p, p, pn); - } - - // - // Requirements: D's copy constructor must not throw - // - // shared_ptr will release p by calling d(p) - // - - template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d) - { - detail::sp_enable_shared_from_this(p, p, pn); - } - -// generated copy constructor, assignment, destructor are fine... -// except that Borland C++ has a bug, and g++ with -Wsynth warns - shared_ptr & operator=(shared_ptr const & r) // never throws - { - px = r.px; - pn = r.pn; // shared_count::op= doesn't throw - return *this; - } - - template<class Y> - explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw - { - // it is now safe to copy r.px, as pn(r.pn) did not throw - px = r.px; - } - - template<class Y> - shared_ptr(shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws - { - } - - template<class Y> - shared_ptr(shared_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn) - { - } - - template<class Y> - shared_ptr(shared_ptr<Y> const & r, detail::const_cast_tag): px(const_cast<element_type *>(r.px)), pn(r.pn) - { - } - - template<class Y> - shared_ptr(shared_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) - { - if(px == 0) // need to allocate new counter -- the cast failed - { - pn = detail::shared_count(); - } - } - - template<class Y> - shared_ptr(shared_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn) - { - if(px == 0) - { - myboost::throw_exception(std::bad_cast()); - } - } - - template<class Y> - explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn() - { - Y * tmp = r.get(); - pn = detail::shared_count(r); - detail::sp_enable_shared_from_this(tmp, tmp, pn); - } - - template<class Y> - shared_ptr & operator=(shared_ptr<Y> const & r) // never throws - { - px = r.px; - pn = r.pn; // shared_count::op= doesn't throw - return *this; - } - - template<class Y> - shared_ptr & operator=(std::auto_ptr<Y> & r) - { - this_type(r).swap(*this); - return *this; - } - - void reset() // never throws in 1.30+ - { - this_type().swap(*this); - } - - template<class Y> void reset(Y * p) // Y must be complete - { - BOOST_ASSERT(p == 0 || p != px); // catch self-reset errors - this_type(p).swap(*this); - } - - template<class Y, class D> void reset(Y * p, D d) - { - this_type(p, d).swap(*this); - } - - reference operator* () const // never throws - { - BOOST_ASSERT(px != 0); - return *px; - } - - T * operator-> () const // never throws - { - BOOST_ASSERT(px != 0); - return px; - } - - T * get() const // never throws - { - return px; - } - - typedef T * (this_type::*unspecified_bool_type)() const; - - operator unspecified_bool_type() const // never throws - { - return px == 0? 0: &this_type::get; - } - - // operator! is redundant, but some compilers need it - - bool operator! () const // never throws - { - return px == 0; - } - - bool unique() const // never throws - { - return pn.unique(); - } - - long use_count() const // never throws - { - return pn.use_count(); - } - - void swap(shared_ptr<T> & other) // never throws - { - std::swap(px, other.px); - pn.swap(other.pn); - } - - template<class Y> bool _internal_less(shared_ptr<Y> const & rhs) const - { - return pn < rhs.pn; - } - - void * _internal_get_deleter(std::type_info const & ti) const - { - return pn.get_deleter(ti); - } - -// Tasteless as this may seem, making all members public allows member templates -// to work in the absence of member template friends. (Matthew Langston) - -# if __GNUC__ >= 2 && __GNUC_MINOR__ >= 97 -private: - - template<class Y> friend class shared_ptr; - template<class Y> friend class weak_ptr; -#endif - - T * px; // contained pointer - detail::shared_count pn; // reference counter - -}; // shared_ptr - -template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b) -{ - return a.get() == b.get(); -} - -template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b) -{ - return a.get() != b.get(); -} - -#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96 - -// Resolve the ambiguity between our op!= and the one in rel_ops - -template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b) -{ - return a.get() != b.get(); -} - -#endif - -template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b) -{ - return a._internal_less(b); -} - -template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b) -{ - a.swap(b); -} - -template<class T, class U> shared_ptr<T> static_pointer_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::static_cast_tag()); -} - -template<class T, class U> shared_ptr<T> const_pointer_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::const_cast_tag()); -} - -template<class T, class U> shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::dynamic_cast_tag()); -} - -// shared_*_cast names are deprecated. Use *_pointer_cast instead. - -template<class T, class U> shared_ptr<T> shared_static_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::static_cast_tag()); -} - -template<class T, class U> shared_ptr<T> shared_dynamic_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::dynamic_cast_tag()); -} - -template<class T, class U> shared_ptr<T> shared_polymorphic_cast(shared_ptr<U> const & r) -{ - return shared_ptr<T>(r, detail::polymorphic_cast_tag()); -} - -template<class T, class U> shared_ptr<T> shared_polymorphic_downcast(shared_ptr<U> const & r) -{ - BOOST_ASSERT(dynamic_cast<T *>(r.get()) == r.get()); - return shared_static_cast<T>(r); -} - -// get_pointer() enables boost::mem_fn to recognize shared_ptr - -template<class T> inline T * get_pointer(shared_ptr<T> const & p) -{ - return p.get(); -} - -// operator<< - - -template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p) -{ - os << p.get(); - return os; -} - - -// get_deleter (experimental) - -#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238)) - -// g++ 2.9x doesn't allow static_cast<X const *>(void *) -// apparently EDG 2.38 also doesn't accept it - -template<class D, class T> D * get_deleter(shared_ptr<T> const & p) -{ - void const * q = p._internal_get_deleter(typeid(D)); - return const_cast<D *>(static_cast<D const *>(q)); -} - -#else - -template<class D, class T> D * get_deleter(shared_ptr<T> const & p) -{ - return static_cast<D *>(p._internal_get_deleter(typeid(D))); -} - -#endif - -} // namespace boost - - -#endif // #ifndef BOOST_SHARED_PTR_H_INCLUDED diff --git a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h b/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h deleted file mode 100644 index 3223b564..00000000 --- a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef BOOST_THROW_EXCEPTION_H_INCLUDED -#define BOOST_THROW_EXCEPTION_H_INCLUDED - - -// -// boost/throw_exception.h -// -// Copyright (c) 2002 Peter Dimov and Multi Media Ltd. -// -// Permission to copy, use, modify, sell and distribute this software -// is granted provided this copyright notice appears in all copies. -// This software is provided "as is" without express or implied -// warranty, and with no claim as to its suitability for any purpose. -// -// http://www.boost.org/libs/utility/throw_exception.html -// - -# include <exception> - -namespace myboost -{ - -template<class E> void throw_exception(E const & e) -{ - throw e; -} - -} // namespace myboost - -#endif // #ifndef BOOST_THROW_EXCEPTION_H_INCLUDED diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c index 8383246b..99ff4fdf 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c @@ -22,6 +22,7 @@ #include <X11/Xlib.h> /*#include <gdk-pixbuf/gdk-pixbuf-private.h>*/ #include "gdk-pixbuf-xlib-private.h" +#include "gdk-pixbuf-xlibrgb.h" Display *gdk_pixbuf_dpy = NULL; int gdk_pixbuf_screen = -1; diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h index e0785460..185c7a98 100644 --- a/ksvg/plugin/backends/agg/AggCanvasFactory.h +++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h @@ -35,7 +35,7 @@ public: AggCanvasFactory(); virtual ~AggCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; }; diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h index 6afd958d..f13d43c1 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h +++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h @@ -35,7 +35,7 @@ public: LibartCanvasFactory(); virtual ~LibartCanvasFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList()); }; } diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index 0141915e..3c19ca70 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/ksvg/plugin/ksvg_factory.h @@ -29,7 +29,7 @@ class TDEInstance; class KSVGPluginFactory : public KParts::Factory { -Q_OBJECT +TQ_OBJECT public: KSVGPluginFactory(TQObject *parent = 0, const char *name = 0); @@ -46,7 +46,7 @@ private: class KSVGPluginBrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT friend class KSVGPlugin; diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 48cf6d56..aac100f5 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -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->canvas->setup(ksvgd->backgroundPixmap, 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"); + 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"); KSimpleConfig 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()); @@ -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/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h index 7097f728..de35bd62 100644 --- a/ksvg/plugin/ksvg_plugin.h +++ b/ksvg/plugin/ksvg_plugin.h @@ -34,7 +34,7 @@ namespace KSVG class KSVGPlugin : public KParts::ReadOnlyPart { -Q_OBJECT +TQ_OBJECT public: KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, unsigned int width = 0, unsigned int height = 0); diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp index 2e65f012..be8d0559 100644 --- a/ksvg/plugin/ksvg_widget.cpp +++ b/ksvg/plugin/ksvg_widget.cpp @@ -31,7 +31,7 @@ KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name) : TQWidget(parent, name), m_part(part) { setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setBackgroundMode(NoBackground); @@ -74,11 +74,11 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T } int button = 0; - if(event->stateAfter() & Qt::LeftButton) + if(event->stateAfter() & TQt::LeftButton) button = 1; - else if(event->stateAfter() & Qt::MidButton) + else if(event->stateAfter() & TQt::MidButton) button = 2; - else if(event->stateAfter() & Qt::RightButton) + else if(event->stateAfter() & TQt::RightButton) button = 3; KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type @@ -104,7 +104,7 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T void KSVGWidget::mouseMoveEvent(TQMouseEvent *event) { - if(event->state() & TQt::ControlButton && event->state() & Qt::LeftButton) + if(event->state() & TQt::ControlButton && event->state() & TQt::LeftButton) { if(m_panningPos.isNull()) m_panningPos = event->pos(); @@ -186,7 +186,7 @@ void KSVGWidget::mousePressEvent(TQMouseEvent *event) if(event->state() & TQt::ControlButton) return; - if(event->button() == Qt::RightButton) + if(event->button() == TQt::RightButton) { if(part() && part()->factory()) { diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h index eadc57a7..e2c194b3 100644 --- a/ksvg/plugin/ksvg_widget.h +++ b/ksvg/plugin/ksvg_widget.h @@ -30,7 +30,7 @@ class KSVGPlugin; class KSVGWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name); diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp index 60328855..bbc59e2a 100644 --- a/ksvg/plugin/svgcreator.cpp +++ b/ksvg/plugin/svgcreator.cpp @@ -59,10 +59,10 @@ 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; diff --git a/ksvg/plugin/svgcreator.h b/ksvg/plugin/svgcreator.h index f788895b..faf5b308 100644 --- a/ksvg/plugin/svgcreator.h +++ b/ksvg/plugin/svgcreator.h @@ -26,7 +26,7 @@ class SVGCreator : public TQObject, public ThumbCreator { - Q_OBJECT + TQ_OBJECT public: SVGCreator(); diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp index 895b5357..64944736 100644 --- a/ksvg/test/external/SVGTestWidget.cpp +++ b/ksvg/test/external/SVGTestWidget.cpp @@ -18,9 +18,9 @@ SVGTestWidget::SVGTestWidget(const KURL &url) { setBackgroundColor(TQt::white); setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + 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; @@ -88,11 +88,11 @@ KSVG::SVGMouseEventImpl *newMouseEvent(SVGDocument *doc, KSVG::SVGEventImpl::Eve } int button = 0; - if(event->stateAfter() & Qt::LeftButton) + if(event->stateAfter() & TQt::LeftButton) button = 1; - else if(event->stateAfter() & Qt::MidButton) + else if(event->stateAfter() & TQt::MidButton) button = 2; - else if(event->stateAfter() & Qt::RightButton) + else if(event->stateAfter() & TQt::RightButton) button = 3; KSVG::SVGMouseEventImpl *mev = new KSVG::SVGMouseEventImpl(id, // type diff --git a/ksvg/test/external/SVGTestWidget.h b/ksvg/test/external/SVGTestWidget.h index 0e7cb478..f1fae4fe 100644 --- a/ksvg/test/external/SVGTestWidget.h +++ b/ksvg/test/external/SVGTestWidget.h @@ -8,7 +8,7 @@ class SVGTestWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: SVGTestWidget(const KURL &url); 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; diff --git a/ksvg/test/external/printnodetest.h b/ksvg/test/external/printnodetest.h index 39903b75..f42e93ad 100644 --- a/ksvg/test/external/printnodetest.h +++ b/ksvg/test/external/printnodetest.h @@ -10,7 +10,7 @@ namespace KSVG class SVGDocument; class Worker : public TQObject { -Q_OBJECT +TQ_OBJECT public: Worker(const KURL &url); |