diff options
Diffstat (limited to 'ksvg/test/external')
| -rw-r--r-- | ksvg/test/external/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ksvg/test/external/Makefile.am | 2 | ||||
| -rw-r--r-- | ksvg/test/external/SVGTestWidget.cpp (renamed from ksvg/test/external/SVGTestWidget.cc) | 14 | ||||
| -rw-r--r-- | ksvg/test/external/SVGTestWidget.h | 2 | ||||
| -rw-r--r-- | ksvg/test/external/printnodetest.cpp | 2 | ||||
| -rw-r--r-- | ksvg/test/external/printnodetest.h | 4 | ||||
| -rw-r--r-- | ksvg/test/external/svgdisplay.cpp (renamed from ksvg/test/external/svgdisplay.cc) | 0 |
7 files changed, 12 insertions, 15 deletions
diff --git a/ksvg/test/external/CMakeLists.txt b/ksvg/test/external/CMakeLists.txt index 69eafac7..a07e0406 100644 --- a/ksvg/test/external/CMakeLists.txt +++ b/ksvg/test/external/CMakeLists.txt @@ -25,13 +25,14 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${ART_LIBRARY_DIRS} ) ##### svgdisplay (executable) ################### tde_add_executable( svgdisplay AUTOMOC - SOURCES SVGTestWidget.cc svgdisplay.cc + SOURCES SVGTestWidget.cpp svgdisplay.cpp LINK ksvg-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am index 9a624667..b2b8c494 100644 --- a/ksvg/test/external/Makefile.am +++ b/ksvg/test/external/Makefile.am @@ -4,7 +4,7 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) bin_PROGRAMS = svgdisplay printnodetest -svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc +svgdisplay_SOURCES = SVGTestWidget.cpp svgdisplay.cpp svgdisplay_LDADD = $(LIB_TDECORE) ../../libksvg.la svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/ksvg/test/external/SVGTestWidget.cc b/ksvg/test/external/SVGTestWidget.cpp index ba17bc37..64944736 100644 --- a/ksvg/test/external/SVGTestWidget.cc +++ 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 @@ -202,5 +202,3 @@ void SVGTestWidget::keyReleaseEvent(TQKeyEvent *event) } } */ - -// vim:ts=4:noet 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 6c799000..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); @@ -29,5 +29,3 @@ private: } #endif - -// vim:ts=4:noet diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cpp index de1172dc..de1172dc 100644 --- a/ksvg/test/external/svgdisplay.cc +++ b/ksvg/test/external/svgdisplay.cpp |