Fix kdegraphics FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 35 insertions, 38 deletions

diff --git a/kfile-plugins/pdf/Makefile.am b/kfile-plugins/pdf/Makefile.am
index 65a7742b..0b5bf202 100644
--- a/kfile-plugins/pdf/Makefile.am
+++ b/kfile-plugins/pdf/Makefile.am
@@ -1,19 +1,16 @@
 ## Makefile.am for the pdf file meta info plugin
 
-subdirs=poppler-qt
-
 # set the include path for X, qt and KDE
-INCLUDES         = $(all_includes) -I$(top_srcdir)/kfile-plugins/pdf/poppler-qt
+INCLUDES         = $(all_includes) -I$(top_srcdir)/kfile-plugins/dependencies/poppler-tqt
 
 # these are the headers for your project
 noinst_HEADERS   = kfile_pdf.h
 
 kde_module_LTLIBRARIES = kfile_pdf.la
 
-kfile_pdf_la_COMPILE_FIRST = poppler-qt
 kfile_pdf_la_SOURCES = kfile_pdf.cpp
 kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/pdf/poppler-qt/ -lpoppler-qt
+kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/kfile-plugins/ps/Makefile.am b/kfile-plugins/ps/Makefile.am
index 9c5b20a3..b374ebc1 100644
--- a/kfile-plugins/ps/Makefile.am
+++ b/kfile-plugins/ps/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for the ps file meta info plugin
 
 # set the include path for X, qt and KDE
-INCLUDES         = -I$(top_srcdir)/kghostview $(all_includes)
+INCLUDES         = -I$(top_srcdir)/kghostview/dscparse $(all_includes)
 
 # these are the headers for your project
 noinst_HEADERS   = kfile_ps.h gscreator.h
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index 93209382..e087a0f0 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = data
 
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(top_srcdir)/kghostview/dscparse
 
 ####### Files
 
@@ -33,12 +33,12 @@ kghostview_LDADD = libkghostviewlib.la
 
 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
 libdscparse_la_LIBADD = $(LIB_QT)
-libdscparse_la_SOURCES = dscparse.cpp dscparse_adapter.cpp
+libdscparse_la_SOURCES = $(top_srcdir)/kghostview/dscparse/dscparse.cpp $(top_srcdir)/kghostview/dscparse/dscparse_adapter.cpp
 
 noinst_HEADERS =  marklist.h logwindow.h infodialog.h kgvshell.h \
 	kpswidget.h kgvpageview.h ps.h kgv_miniwidget.h kgv_view.h scrollbox.h \
-	kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h dscparse.h \
-	dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \
+	kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h $(top_srcdir)/kghostview/dscparse/dscparse.h \
+	$(top_srcdir)/kghostview/dscparse/dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \
 	fullscreenfilter.h kgvfactory.h thumbnailservice.h
 
 METASOURCES = AUTO
diff --git a/kghostview/dscparse/dscparse_adapter.h b/kghostview/dscparse/dscparse_adapter.h
index 5fefa631..3c9c5734 100644
--- a/kghostview/dscparse/dscparse_adapter.h
+++ b/kghostview/dscparse/dscparse_adapter.h
@@ -185,7 +185,7 @@ public:
 	For                   = CDSC_FOR,
 	LanguageLevel         = CDSC_LANGUAGELEVEL,
 	BoundingBox           = CDSC_BOUNDINGBOX,
-	Qt::Orientation           = CDSC_ORIENTATION,
+	Orientation           = CDSC_ORIENTATION,
 	PageOrder             = CDSC_PAGEORDER,
 	DocumentMedia         = CDSC_DOCUMENTMEDIA,
 	DocumentPaperSizes    = CDSC_DOCUMENTPAPERSIZES,
@@ -206,7 +206,7 @@ public:
 	// Defaults section
 	BeginDefaults         = CDSC_BEGINDEFAULTS,
 	EndDefaults           = CDSC_ENDDEFAULTS,
-	// also %%PageMedia, %%PageQt::Orientation, %%PageBoundingBox
+	// also %%PageMedia, %%PageOrientation, %%PageBoundingBox
 
 	// Prolog section 
 	BeginProlog           = CDSC_BEGINPROLOG,
@@ -237,16 +237,16 @@ public:
 	EndPageSetup          = CDSC_ENDPAGESETUP,
 	PageMedia             = CDSC_PAGEMEDIA,
 	// also %%PaperColor, %%PaperForm, %%PaperWeight, %%PaperSize
-	PageQt::Orientation       = CDSC_PAGEORIENTATION,
+	PageOrientation       = CDSC_PAGEORIENTATION,
 	PageBoundingBox       = CDSC_PAGEBOUNDINGBOX,
 	// also %%Begin/EndFont, %%Begin/EndFeature 
 	// also %%Begin/EndResource, %%Begin/EndProcSet 
 	IncludeFont           = CDSC_INCLUDEFONT,
-	ViewingQt::Orientation    = CDSC_VIEWINGORIENTATION,
+	ViewingOrientation    = CDSC_VIEWINGORIENTATION,
 
 	// Trailer section
 	Trailer               = CDSC_TRAILER,
-	// also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder, 
+	// also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder, 
 	// %%DocumentMedia
 	// %%Page is recognised as an error
 	// also %%DocumentNeededFonts, %%DocumentSuppliedFonts
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 46a7221c..7281a4ae 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -188,7 +188,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
 
 void Watcher::slotTimeout()
 {
-    TQTimer *timer = static_cast<TQTimer*>( TQT_TQOBJECT( sender() ) );
+    TQTimer *timer = static_cast<TQTimer*>( TQT_TQOBJECT( const_cast<TQT_BASE_OBJECT_NAME*>(sender()) ) );
     DaemonData *daemon = findDaemonFromTimer( timer );
     if ( daemon )
     {
diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp
index cf5d9987..f0b9f0f0 100644
--- a/kolourpaint/kpdocumentmetainfo.cpp
+++ b/kolourpaint/kpdocumentmetainfo.cpp
@@ -98,7 +98,7 @@ void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
     {
         kdDebug () << "key=" << (*it).key.data()
                    << " lang=" << (*it).lang.data()
-                   << " text=" << text (*it).data()
+                   << " text=" << text (*it).ascii()
                    << endl;
     }
 
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 7137bfbd..3a6c7469 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -108,7 +108,7 @@ const ClassInfo KSVG::Window::s_classInfo = { "Window", 0, &s_hashTable, 0 };
 
 KSVG::Window::Window(KSVG::SVGDocumentImpl *p) : ObjectImp(), m_doc(p)
 {
-	winq = new WindowTQObject(this);
+	winq = new WindowQObject(this);
 }
 
 KSVG::Window::~Window()
@@ -278,7 +278,7 @@ void KSVG::Window::clear(ExecState *exec)
 {
 	kdDebug(26004) << "KSVG::Window::clear " << this << endl;
 	delete winq;
-	winq = new WindowTQObject(this);;
+	winq = new WindowQObject(this);;
 	
 	// Get rid of everything, those user vars could hold references to DOM nodes
 	deleteAllProperties(exec);
@@ -488,18 +488,18 @@ void ScheduledAction::execute(Window *window)
 	}
 }
 
-////////////////////// WindowTQObject ////////////////////////
+////////////////////// WindowQObject ////////////////////////
 
-WindowTQObject::WindowTQObject(Window *w) : tqparent(w)
+WindowQObject::WindowQObject(Window *w) : tqparent(w)
 {
 }
 
-WindowTQObject::~WindowTQObject()
+WindowQObject::~WindowQObject()
 {
 	tqparentDestroyed(); // reuse same code
 }
 
-void WindowTQObject::tqparentDestroyed()
+void WindowQObject::tqparentDestroyed()
 {
 	killTimers();
 	
@@ -513,7 +513,7 @@ void WindowTQObject::tqparentDestroyed()
 	scheduledActions.clear();
 }
 
-int WindowTQObject::installTimeout(const UString &handler, int t, bool singleShot)
+int WindowQObject::installTimeout(const UString &handler, int t, bool singleShot)
 {
 	int id = startTimer(t);
 	ScheduledAction *action = new ScheduledAction(handler.qstring(), singleShot);
@@ -521,7 +521,7 @@ int WindowTQObject::installTimeout(const UString &handler, int t, bool singleSho
 	return id;
 }
 
-int WindowTQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
+int WindowQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
 {
 	Object objFunc = Object::dynamicCast(func);
 	int id = startTimer(t);
@@ -529,7 +529,7 @@ int WindowTQObject::installTimeout(const Value &func, List args, int t, bool sin
 	return id;
 }
 
-void WindowTQObject::clearTimeout(int timerId, bool delAction)
+void WindowQObject::clearTimeout(int timerId, bool delAction)
 {
 	killTimer(timerId);
 	
@@ -545,7 +545,7 @@ void WindowTQObject::clearTimeout(int timerId, bool delAction)
 	}
 }
 
-void WindowTQObject::timerEvent(TQTimerEvent *e)
+void WindowQObject::timerEvent(TQTimerEvent *e)
 {
 	TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(e->timerId());
 	if(it != scheduledActions.end())
@@ -570,9 +570,9 @@ void WindowTQObject::timerEvent(TQTimerEvent *e)
 			delete action;
 	}
 	else
-		kdWarning(6070) << "WindowTQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
+		kdWarning(6070) << "WindowQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
 }
 
-void WindowTQObject::timeoutClose()
+void WindowQObject::timeoutClose()
 {
 }
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 6f1e511a..035dbb59 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -25,14 +25,14 @@
 namespace KSVG {
 
 class SVGDocumentImpl;
-class WindowTQObject;
+class WindowQObject;
 
 // This is currently a fork of khtml's Window object, simplified.
 // However in the long run it could become a base class for it.
 // Author: David Faure <[email protected]>
 class Window : public KJS::ObjectImp {
     friend class WindowFunc;
-    friend class WindowTQObject;
+    friend class WindowQObject;
     friend class ScheduledAction;
 public:
     Window(KSVG::SVGDocumentImpl *p);
@@ -81,7 +81,7 @@ public:
     static const struct KJS::HashTable s_hashTable;
 
 private:
-	WindowTQObject *winq;
+	WindowQObject *winq;
     TQGuardedPtr<KSVG::SVGDocumentImpl> m_doc;
 };
 
@@ -98,12 +98,12 @@ public:
 	bool singleShot;
 };
 
-class WindowTQObject : public TQObject {
+class WindowQObject : public TQObject {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	WindowTQObject(Window *w);
-	~WindowTQObject();
+	WindowQObject(Window *w);
+	~WindowQObject();
 	int installTimeout(const KJS::UString &handler, int t, bool singleShot);
 	int installTimeout(const KJS::Value &func, KJS::List args, int t, bool singleShot);
 	void clearTimeout(int timerId, bool delAction = true);
diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h
index 51736844..fbfeaff0 100644
--- a/kview/kimageviewer/canvas.h
+++ b/kview/kimageviewer/canvas.h
@@ -29,7 +29,6 @@ class TQPoint;
 class TQWidget;
 
 #include <tqstring.h>
-#include <tqobjectdefs.h>
 #include <kdemacros.h>
 namespace KImageViewer
 {
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index 51065027..3afbefdc 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -52,7 +52,8 @@ class PhotoBookPart;
 
 class PhotoBook : public TQSplitter
 {
-TQ_OBJECT	
+Q_OBJECT
+TQ_OBJECT
 	Previews *mList;
 	KAction *mFit;
 	KParts::ReadOnlyPart *mViewer;
@@ -72,7 +73,7 @@ signals:
 
 class Previews : public KFileIconView
 {
-Q_OBJECT
+  Q_OBJECT
   TQ_OBJECT
 	
 	KDirLister mDirLister;